💄 dark mode

woowacourse-teams · Oct 22, 2024 · ea5913d · ea5913d
1 parent 3aeb62a
commit ea5913d
Show file tree

Hide file tree

Showing 26 changed files with 90 additions and 75 deletions.
diff --git a/android/app/src/main/res/drawable/bg_radius_button.xml b/android/app/src/main/res/drawable/bg_radius_button.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/button_color"/>
+    <solid android:color="@color/next_button_color"/>
     <corners android:radius="16dp"/>
-    <stroke android:color="@color/gray" android:width="1dp" />
+    <stroke android:color="@color/next_button_color" android:width="1dp" />
 </shape>
diff --git a/android/app/src/main/res/drawable/bg_radius_button_filled.xml b/android/app/src/main/res/drawable/bg_radius_button_filled.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/yellow_regular"/>
+    <solid android:color="@color/next_button_color"/>
     <corners android:radius="16dp"/>
-    <stroke android:color="@color/gray" android:width="1dp" />
+    <stroke android:color="@color/next_button_color" android:width="1dp" />
 </shape>
diff --git a/android/app/src/main/res/drawable/bg_radius_filled.xml b/android/app/src/main/res/drawable/bg_radius_filled.xml
@@ -3,5 +3,5 @@
     android:shape="rectangle">
     <solid android:color="@color/gray_300"/>
     <corners android:radius="16dp"/>
-    <stroke android:color="@color/gray" android:width="1dp" />
+    <stroke android:color="@color/image_placeholder_background" android:width="1dp" />
 </shape>
diff --git a/android/app/src/main/res/drawable/bg_radius_outlined.xml b/android/app/src/main/res/drawable/bg_radius_outlined.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@android:color/transparent"/>
+    <solid android:color="@color/image_placeholder_background"/>
     <corners android:radius="16dp"/>
     <stroke android:color="@color/gray" android:width="1dp" />
 </shape>
diff --git a/android/app/src/main/res/drawable/bg_radius_stroke_filled.xml b/android/app/src/main/res/drawable/bg_radius_stroke_filled.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#FFF7F7FB" />
+    <solid android:color="@color/image_placeholder_background" />
     <corners android:radius="16dp"/>
     <stroke android:width="0.5dp" android:color="@color/gray" />
 </shape>
diff --git a/android/app/src/main/res/drawable/ic_category_filled.xml b/android/app/src/main/res/drawable/ic_category_filled.xml
@@ -7,15 +7,15 @@
       android:pathData="M16.042,17.209C16.042,16.564 16.564,16.042 17.208,16.042H22.458C23.103,16.042 23.625,16.564 23.625,17.209V22.459C23.625,23.103 23.103,23.625 22.458,23.625H17.208C16.564,23.625 16.042,23.103 16.042,22.459V17.209Z"
       android:strokeWidth="1.5"
       android:fillColor="#111111"
-      android:strokeColor="#111111"/>
+      android:strokeColor="@color/icon_color"/>
   <path
       android:pathData="M12.99,4.667C13.439,3.889 14.561,3.889 15.01,4.667L18.546,10.792C18.996,11.57 18.434,12.542 17.536,12.542H10.464C9.566,12.542 9.004,11.57 9.453,10.792L12.99,4.667Z"
       android:strokeWidth="1.5"
       android:fillColor="#111111"
-      android:strokeColor="#111111"/>
+      android:strokeColor="@color/icon_color"/>
   <path
       android:pathData="M11.667,19.833C11.667,22.088 9.839,23.917 7.583,23.917C5.328,23.917 3.5,22.088 3.5,19.833C3.5,17.578 5.328,15.75 7.583,15.75C9.839,15.75 11.667,17.578 11.667,19.833Z"
       android:strokeWidth="1.5"
       android:fillColor="#111111"
-      android:strokeColor="#111111"/>
+      android:strokeColor="@color/icon_color"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_favorite_unselected.xml b/android/app/src/main/res/drawable/ic_favorite_unselected.xml
@@ -8,5 +8,5 @@
       android:strokeLineJoin="round"
       android:strokeWidth="1.5"
       android:fillColor="#00000000"
-      android:strokeColor="#111111"/>
+      android:strokeColor="@color/icon_color"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_home_filled.xml b/android/app/src/main/res/drawable/ic_home_filled.xml
@@ -9,5 +9,5 @@
       android:fillType="evenOdd"/>
   <path
       android:pathData="M23.182,12.142L23.696,11.596L23.696,11.596L23.182,12.142ZM15.599,5.005L15.085,5.551V5.551L15.599,5.005ZM4.817,12.142L5.331,12.689H5.331L4.817,12.142ZM12.401,5.005L12.915,5.551V5.551L12.401,5.005ZM23.696,11.596L16.113,4.459L15.085,5.551L22.668,12.689L23.696,11.596ZM24.666,13.842C24.666,12.991 24.315,12.179 23.696,11.596L22.668,12.689C22.986,12.988 23.166,13.405 23.166,13.842H24.666ZM24.666,22.75V13.842H23.166V22.75H24.666ZM22.75,24.667C23.808,24.667 24.666,23.809 24.666,22.75H23.166C23.166,22.98 22.98,23.167 22.75,23.167V24.667ZM5.25,24.667H22.75V23.167H5.25V24.667ZM3.333,22.75C3.333,23.809 4.191,24.667 5.25,24.667V23.167C5.02,23.167 4.833,22.98 4.833,22.75H3.333ZM3.333,13.842V22.75H4.833V13.842H3.333ZM4.303,11.596C3.684,12.179 3.333,12.991 3.333,13.842H4.833C4.833,13.405 5.013,12.988 5.331,12.689L4.303,11.596ZM11.887,4.459L4.303,11.596L5.331,12.689L12.915,5.551L11.887,4.459ZM16.113,4.459C14.926,3.342 13.074,3.342 11.887,4.459L12.915,5.551C13.524,4.978 14.475,4.978 15.085,5.551L16.113,4.459ZM17.334,16.333C17.334,18.174 15.841,19.667 14,19.667V21.167C16.67,21.167 18.834,19.003 18.834,16.333H17.334ZM14,13C15.841,13 17.334,14.493 17.334,16.333H18.834C18.834,13.664 16.67,11.5 14,11.5V13ZM10.667,16.333C10.667,14.493 12.159,13 14,13V11.5C11.331,11.5 9.167,13.664 9.167,16.333H10.667ZM14,19.667C12.159,19.667 10.667,18.174 10.667,16.333H9.167C9.167,19.003 11.331,21.167 14,21.167V19.667Z"
-      android:fillColor="#111111"/>
+      android:fillColor="@color/icon_color"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_search.xml b/android/app/src/main/res/drawable/ic_search.xml
@@ -7,11 +7,11 @@
       android:pathData="M21.584,12.833C21.584,17.666 17.666,21.583 12.834,21.583C8.001,21.583 4.084,17.666 4.084,12.833C4.084,8.001 8.001,4.083 12.834,4.083C17.666,4.083 21.584,8.001 21.584,12.833Z"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#111111"/>
+      android:strokeColor="@color/icon_color"/>
   <path
       android:pathData="M23.917,23.917L19.25,19.25"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#111111"
+      android:strokeColor="@color/icon_color"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_user_filled.xml b/android/app/src/main/res/drawable/ic_user_filled.xml
@@ -7,11 +7,11 @@
       android:pathData="M18.667,9.334C18.667,11.911 16.577,14 14,14C11.423,14 9.333,11.911 9.333,9.334C9.333,6.756 11.423,4.667 14,4.667C16.577,4.667 18.667,6.756 18.667,9.334Z"
       android:strokeWidth="1.5"
       android:fillColor="#111111"
-      android:strokeColor="#111111"/>
+      android:strokeColor="@color/icon_color"/>
   <path
       android:pathData="M4.667,21C4.667,17.134 7.801,14 11.667,14H16.333C20.199,14 23.333,17.134 23.333,21V21.583C23.333,22.872 22.288,23.917 21,23.917H7C5.711,23.917 4.667,22.872 4.667,21.583V21Z"
       android:strokeLineJoin="round"
       android:strokeWidth="1.5"
       android:fillColor="#111111"
-      android:strokeColor="#111111"/>
+      android:strokeColor="@color/icon_color"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/shape_button_round_corner.xml b/android/app/src/main/res/drawable/shape_button_round_corner.xml
@@ -2,9 +2,11 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners
+        android:bottomLeftRadius="24dp"
+        android:bottomRightRadius="24dp"
         android:topLeftRadius="24dp"
         android:topRightRadius="24dp" />
-    <solid android:color="@color/yellow_regular" />
+    <solid android:color="@color/next_button_color" />
     <size
         android:width="200dp"
         android:height="100dp" />

diff --git a/android/app/src/main/res/layout/appbar_custom.xml b/android/app/src/main/res/layout/appbar_custom.xml
@@ -35,6 +35,7 @@
                     android:background="@android:color/transparent"
                     android:importantForAccessibility="no"
                     android:src="@drawable/ic_arrow_back_24"
+                    app:tint="@color/icon_color"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintDimensionRatio="1:1"
                     app:layout_constraintStart_toStartOf="parent"

diff --git a/android/app/src/main/res/layout/fragment_comment_menu_bottom.xml b/android/app/src/main/res/layout/fragment_comment_menu_bottom.xml
@@ -26,7 +26,6 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/shape_button_round_corner"
         android:padding="24dp"
         tools:context=".presentation.comment.bottomsheet.CommentMenuBottomFragment">
 
@@ -36,7 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:text="UserName : "
-            android:textColor="@color/yellow_strong"
+            android:textColor="@color/text_color"
             android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
@@ -48,7 +47,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@{comment.userName}"
-            android:textColor="@color/yellow_strong"
+            android:textColor="@color/text_color"
             android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintStart_toEndOf="@id/tv_username_title"
@@ -62,7 +61,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:text="Comment : "
-            android:textColor="@color/yellow_strong"
+            android:textColor="@color/text_color"
             android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="@id/tv_username_title"
@@ -73,7 +72,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@{comment.message}"
-            android:textColor="@color/yellow_strong"
+            android:textColor="@color/text_color"
             android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
@@ -93,7 +92,7 @@
             android:onClick="@{() -> vm.onReport()}"
             android:padding="14dp"
             android:text="Report"
-            android:textColor="@color/yellow_weak"
+            android:textColor="@color/text_color"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/tv_block"
@@ -113,7 +112,7 @@
             android:gravity="center"
             android:padding="14dp"
             android:text="Block"
-            android:textColor="@color/yellow_weak"
+            android:textColor="@color/text_color"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="@id/tv_report"
             app:layout_constraintEnd_toEndOf="parent"
@@ -148,7 +147,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:text="@string/report_title_bottom"
-            android:textColor="@color/yellow_strong"
+            android:textColor="@color/text_color"
             android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"