From 447d1b7fb608fb982f390b31f337631d03406a97 Mon Sep 17 00:00:00 2001
From: ckstmznf <ckstmznf@naver.com>
Date: Sat, 12 Feb 2022 23:22:56 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A0=80=EC=9E=A5=EB=90=9C=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EC=B7=A8=EC=86=8C=20=EB=A0=88=EC=9D=B4=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  5 +++-
 .../res/drawable/default_button_round.xml     |  5 ++++
 .../drawable/default_button_round_stroke.xml  |  6 +++++
 ...quare_round.xml => default_rect_round.xml} |  0
 app/src/main/res/drawable/ic_arrow_left.xml   |  2 +-
 ...ic_user_data_img.xml => img_user_data.xml} |  0
 .../main/res/layout/activity_group_chat.xml   |  2 +-
 .../main/res/layout/activity_qna_slider.xml   | 13 ++--------
 .../main/res/layout/activity_user_data.xml    |  2 +-
 .../main/res/layout/dialog_save_question.xml  |  2 ++
 .../res/layout/item_i_chat_recycleritem.xml   |  2 +-
 .../res/layout/item_you_chat_recycleritem.xml |  2 +-
 app/src/main/res/values-night/themes.xml      |  8 +++++--
 app/src/main/res/values/attrs.xml             |  4 +++-
 app/src/main/res/values/themes.xml            | 24 +++++++++++++------
 15 files changed, 50 insertions(+), 27 deletions(-)
 create mode 100644 app/src/main/res/drawable/default_button_round.xml
 create mode 100644 app/src/main/res/drawable/default_button_round_stroke.xml
 rename app/src/main/res/drawable/{ic_square_round.xml => default_rect_round.xml} (100%)
 rename app/src/main/res/drawable/{ic_user_data_img.xml => img_user_data.xml} (100%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index cd19183..6319337 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,10 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/DO_NOT_DELETE/Coding/Project/How-to-Sunrin/app/src/main/res/layout/activity_user_data.xml" value="0.1" />
+        <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/drawable/default_button_round.xml" value="0.1925" />
+        <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/drawable/default_rect_round_solid.xml" value="0.1925" />
         <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/drawable/default_round_10.xml" value="0.3697916666666667" />
+        <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/drawable/ic_arrow_left.xml" value="0.239" />
         <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/drawable/ic_dot_nomal.xml" value="0.124" />
         <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/drawable/ic_dot_select.xml" value="0.1" />
         <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/drawable/ic_square_round.xml" value="0.12777777777777777" />
@@ -16,7 +19,7 @@
         <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/layout/activity_main.xml" value="0.22" />
         <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/layout/activity_on_board.xml" value="0.30337078651685395" />
         <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/layout/activity_qna.xml" value="0.25" />
-        <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/layout/activity_qna_slider.xml" value="0.30337078651685395" />
+        <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/layout/activity_qna_slider.xml" value="0.5" />
         <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/layout/activity_save_question.xml" value="0.33" />
         <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/layout/activity_user_data.xml" value="0.2318840579710145" />
         <entry key="..\:/Users/user/AndroidStudioProjects/EDCAN/How-to-Sunrin/app/src/main/res/layout/dialog_save_question.xml" value="0.33" />
diff --git a/app/src/main/res/drawable/default_button_round.xml b/app/src/main/res/drawable/default_button_round.xml
new file mode 100644
index 0000000..866784b
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/default_button_round_stroke.xml b/app/src/main/res/drawable/default_button_round_stroke.xml
new file mode 100644
index 0000000..a4b581a
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_square_round.xml b/app/src/main/res/drawable/default_rect_round.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_square_round.xml
rename to app/src/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
index 3403445..18e0aad 100644
--- 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/app/src/main/res/drawable/ic_user_data_img.xml b/app/src/main/res/drawable/img_user_data.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_user_data_img.xml
rename to 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
index 5318a88..d2f4b3f 100644
--- 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
index eb7f798..a6f8d41 100644
--- 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
index 30c5df2..c1c1e76 100644
--- 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
index 3c806dc..075e49e 100644
--- 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
index bdc4a2e..d4ade89 100644
--- 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
index ee8dd17..4f66910 100644
--- 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
index f1dbe56..5d325de 100644
--- 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
index b0a4e8f..03b59db 100644
--- 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>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4bbe6ae..c61e1ff 100644
--- 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>