저장된 버튼 취소 레이아웃 변경

kichan05 · Feb 12, 2022 · 447d1b7 · 447d1b7
1 parent 386a0a2
commit 447d1b7
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 27 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/res/drawable/default_button_round.xml b/app/src/main/res/drawable/default_button_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/buttonBackgroundColor"/>
+    <corners android:radius="@dimen/app_radius"/>
+</shape>
diff --git a/app/src/main/res/drawable/default_button_round_stroke.xml b/app/src/main/res/drawable/default_button_round_stroke.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/gray1"/>
+    <stroke android:color="@color/EDCAN" android:width="2dp"/>
+    <corners android:radius="@dimen/app_radius"/>
+</shape>
diff --git a/...src/main/res/drawable/ic_square_round.xml → .../main/res/drawable/default_rect_round.xml b/...src/main/res/drawable/ic_square_round.xml → .../main/res/drawable/default_rect_round.xml
diff --git a/app/src/main/res/drawable/ic_arrow_left.xml b/app/src/main/res/drawable/ic_arrow_left.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="35">
   <path
       android:pathData="M22.4729,24.1938L15.7938,17.5L22.4729,10.8062L20.4167,8.75L11.6667,17.5L20.4167,26.25L22.4729,24.1938Z"
-      android:fillColor="#000000"/>
+      android:fillColor="?attr/textColor"/>
 </vector>
diff --git a/...rc/main/res/drawable/ic_user_data_img.xml → app/src/main/res/drawable/img_user_data.xml b/...rc/main/res/drawable/ic_user_data_img.xml → app/src/main/res/drawable/img_user_data.xml
diff --git a/app/src/main/res/layout/activity_group_chat.xml b/app/src/main/res/layout/activity_group_chat.xml
@@ -76,7 +76,7 @@
                 android:text="@={viewModel.content}"
                 android:textSize="20sp"
 
-                android:background="@drawable/ic_square_round"
+                android:background="@drawable/default_rect_round"
                 android:backgroundTint="@color/gray3"
 
                 android:paddingHorizontal="4dp"

diff --git a/app/src/main/res/layout/activity_qna_slider.xml b/app/src/main/res/layout/activity_qna_slider.xml
@@ -42,17 +42,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-
-            android:text="@{viewModel.isCurrentQnASave + ``}"
-
-            app:layout_constraintBottom_toTopOf="@id/txt_qna_msg"
-            app:layout_constraintStart_toStartOf="@id/guide_qna_line1"
-            app:layout_constraintEnd_toEndOf="@id/guide_qna_line2"
-            />
-
         <TextView
             android:id="@+id/txt_qna_msg"
             android:layout_width="wrap_content"
@@ -102,6 +91,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
 
+                style="@style/reversedButtonStyle"
+
                 android:layout_weight="1"
 
                 android:text="저장 취소하기"

diff --git a/app/src/main/res/layout/activity_user_data.xml b/app/src/main/res/layout/activity_user_data.xml
@@ -39,7 +39,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
 
-            android:src="@drawable/ic_user_data_img"
+            android:src="@drawable/img_user_data"
 
             android:layout_marginVertical="20dp"
 

diff --git a/app/src/main/res/layout/dialog_save_question.xml b/app/src/main/res/layout/dialog_save_question.xml
@@ -71,6 +71,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
 
+            style="@style/reversedButtonStyle"
+
             android:text="저장 삭제하기"
 
             android:layout_marginVertical="8dp"

diff --git a/app/src/main/res/layout/item_i_chat_recycleritem.xml b/app/src/main/res/layout/item_i_chat_recycleritem.xml
@@ -47,7 +47,7 @@
             android:textColor="@color/white"
             android:textFontWeight="400"
 
-            android:background="@drawable/ic_square_round"
+            android:background="@drawable/default_rect_round"
             android:backgroundTint="@color/EDCAN"
 
             android:paddingVertical="8dp"

diff --git a/app/src/main/res/layout/item_you_chat_recycleritem.xml b/app/src/main/res/layout/item_you_chat_recycleritem.xml
@@ -47,7 +47,7 @@
             android:textSize="14sp"
             android:textFontWeight="400"
 
-            android:background="@drawable/ic_square_round"
+            android:background="@drawable/default_rect_round"
             android:backgroundTint="@color/gray2"
 
             android:paddingVertical="8dp"

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="Theme.HowToSunrin" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <!-- Primary brand color. -->
         <item name="colorPrimary">@color/EDCAN</item>
         <item name="colorPrimaryVariant">@color/EDCAN</item>
         <item name="colorOnPrimary">@color/white</item>
@@ -9,11 +10,14 @@
 
         <item name="buttonTextColor">@color/white</item>
         <item name="buttonBackgroundColor">@color/EDCAN</item>
+        <item name="buttonBorderColor">@color/EDCAN</item>
+
+        <item name="reversedButtonFontColor">@color/EDCAN</item>
 
         <item name="editTextBackground">@color/gray1</item>
         <item name="editTextTextColor">@color/black</item>
 
-        <item name="toolBarBackGroundColor">@color/white</item>
+        <item name="toolBarBackGroundColor">@color/black</item>
 
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/EDCAN</item>
@@ -25,7 +29,7 @@
 
         <!-- Customize your theme here. -->
         <item name="android:textViewStyle">@style/customTextStyle</item>
-        <item name="android:buttonStyle">@style/customButtonStyle</item>
+        <item name="android:buttonStyle">@style/defaultButtonStyle</item>
         <item name="editTextStyle">@style/customEditTextStyle</item>
         <item name="toolbarStyle">@style/customToolbarStyle</item>
     </style>

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -4,10 +4,12 @@
 
     <attr name="buttonTextColor" format="color"/>
     <attr name="buttonBackgroundColor" format="color"/>
+    <attr name="buttonBorderColor" format="color"/>
+
+    <attr name="reversedButtonFontColor" format="color"/>
 
     <attr name="editTextBackGroundColor" type="color"/>
     <attr name="editTextTextColor" type="color"/>
 
-
     <attr name="toolBarBackGroundColor" format="color"/>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.HowToSunrin" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="Theme.HowToSunrin" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/EDCAN</item>
         <item name="colorPrimaryVariant">@color/EDCAN</item>
@@ -10,6 +10,9 @@
 
         <item name="buttonTextColor">@color/white</item>
         <item name="buttonBackgroundColor">@color/EDCAN</item>
+        <item name="buttonBorderColor">@color/EDCAN</item>
+
+        <item name="reversedButtonFontColor">@color/EDCAN</item>
 
         <item name="editTextBackground">@color/gray1</item>
         <item name="editTextTextColor">@color/black</item>
@@ -26,7 +29,7 @@
 
         <!-- Customize your theme here. -->
         <item name="android:textViewStyle">@style/customTextStyle</item>
-        <item name="android:buttonStyle">@style/customButtonStyle</item>
+        <item name="android:buttonStyle">@style/defaultButtonStyle</item>
         <item name="editTextStyle">@style/customEditTextStyle</item>
         <item name="toolbarStyle">@style/customToolbarStyle</item>
     </style>
@@ -36,21 +39,28 @@
         <item name="android:fontFamily">@font/font</item>
     </style>
 
-    <style name="customButtonStyle" parent="Widget.AppCompat.Button">
+    <style name="customButtonTheme" parent="Widget.AppCompat.Button">
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">?attr/buttonTextColor</item>
         <item name="android:textFontWeight">800</item>
         <item name="android:fontFamily">@font/font</item>
 
-        <item name="android:background">@drawable/ic_square_round</item>
-        <item name="android:backgroundTint">?attr/buttonBackgroundColor</item>
-
         <item name="android:textAllCaps">false</item>
     </style>
 
+    <style name="defaultButtonStyle" parent="customButtonTheme">
+        <item name="android:background">@drawable/default_button_round</item>
+    </style>
+
+    <style name="reversedButtonStyle" parent="customButtonTheme">
+        <item name="android:background">@drawable/default_button_round_stroke</item>
+
+        <item name="android:textColor">?attr/reversedButtonFontColor</item>
+    </style>
+
     <style name="customEditTextStyle" parent="Widget.AppCompat.EditText">
         <item name="android:textColor">?attr/editTextTextColor</item>
-        <item name="android:background">@drawable/ic_square_round</item>
+        <item name="android:background">@drawable/default_rect_round</item>
         <item name="backgroundTint">?attr/editTextBackground</item>
     </style>