[Refactor] #29 - update resources

CaZaIt · Jan 27, 2023 · d9817fd · d9817fd
1 parent 87daa5d
commit d9817fd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/app/src/main/res/drawable/round_coffee_rectangle.xml b/app/src/main/res/drawable/round_coffee_rectangle.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="20dp" />
+    <corners android:radius="@dimen/cazait_radius" />
     <solid android:color="@color/cazait_coffee" />
 </shape>
diff --git a/app/src/main/res/drawable/round_latte_beige_rectangle.xml b/app/src/main/res/drawable/round_latte_beige_rectangle.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="20dp" />
+    <corners android:radius="@dimen/cazait_radius" />
     <solid android:color="@color/cazait_latte_beige" />
 </shape>
diff --git a/app/src/main/res/drawable/round_white_rectangle.xml b/app/src/main/res/drawable/round_white_rectangle.xml
@@ -2,7 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="20dp" />
+    <corners android:radius="@dimen/cazait_radius" />
     <solid android:color="@color/cazait_white" />
-
 </shape>
diff --git a/app/src/main/res/layout/item_cafe_main.xml b/app/src/main/res/layout/item_cafe_main.xml
@@ -82,19 +82,18 @@
                 <TextView
                     android:id="@+id/tv_state"
                     android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_marginStart="19dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="26dp"
                     android:layout_marginTop="16dp"
-                    android:layout_marginEnd="19dp"
+                    android:layout_marginEnd="26dp"
                     android:layout_marginBottom="15dp"
-                    android:background="@drawable/cafe_item_round_white_rectangle"
+                    android:background="@drawable/round_latte_beige_rectangle"
                     android:contentDescription="@null"
                     android:gravity="center"
+                    android:minHeight="38dp"
                     android:text="@{cafeState.state, default=보통}"
                     android:textAlignment="center"
-                    android:textColor="@color/cazait_black"
                     android:textSize="20sp"
-                    android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -29,6 +29,9 @@
     <color name="darkgray">#757575</color>
 
     <!-- cafe list fragment-->
+    <color name="cafe_list_item_normal">#533329</color>
+    <color name="cafe_list_item_great_congestion">#EF1C1C</color>
+    <color name="cafe_list_item_free">#34A3F2</color>
 
     <!-- cafe information activity-->
     <color name="rating_review_edit">#5D2424</color>

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="cafe_item_space">34dp</dimen>
+    <dimen name="cazait_radius">15dp</dimen>
 </resources>