Issues boostcampwm-2022#287 feat: home design 수정

ProjectBeep · Feb 18, 2023 · a67c113 · a67c113
1 parent 0d17dcd
commit a67c113
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 10 deletions.
diff --git a/features/ui-home/src/main/res/drawable/bg_on_surface_12_corner_2.xml b/features/ui-home/src/main/res/drawable/bg_on_surface_12_corner_2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/on_surface_12" />
+
+    <corners
+        android:radius="2dp"/>
+</shape>
diff --git a/features/ui-home/src/main/res/layout/item_gifticon_loading.xml b/features/ui-home/src/main/res/layout/item_gifticon_loading.xml
@@ -10,7 +10,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <com.google.android.material.imageview.ShapeableImageView
+            <View
                 android:id="@+id/iv_product"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -20,6 +20,50 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <View
+                android:id="@+id/tv_title"
+                android:layout_width="60dp"
+                android:layout_height="16dp"
+                android:background="@drawable/bg_on_surface_12_corner_2"
+                android:layout_marginHorizontal="6dp"
+                android:layout_marginTop="6dp"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/iv_product"/>
+
+            <View
+                android:id="@+id/tv_body"
+                android:layout_width="120dp"
+                android:layout_height="19dp"
+                android:background="@drawable/bg_on_surface_12_corner_2"
+                android:layout_marginTop="2dp"
+                android:layout_marginHorizontal="6dp"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_title"/>
+
+            <View
+                android:id="@+id/tv_distance"
+                android:layout_width="40dp"
+                android:layout_height="19dp"
+                android:background="@drawable/bg_on_surface_12_corner_2"
+                android:layout_marginHorizontal="6dp"
+                app:layout_constraintTop_toTopOf="@id/tv_expire_at"
+                app:layout_constraintBottom_toBottomOf="@id/tv_expire_at"
+                app:layout_constraintStart_toStartOf="parent"/>
+
+            <View
+                android:id="@+id/tv_expire_at"
+                android:layout_width="80dp"
+                android:layout_height="16dp"
+                android:background="@drawable/bg_on_surface_12_corner_2"
+                android:layout_marginVertical="8dp"
+                android:layout_marginHorizontal="6dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
 </layout>
diff --git a/features/ui-home/src/main/res/layout/section_card_list.xml b/features/ui-home/src/main/res/layout/section_card_list.xml
@@ -6,10 +6,10 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_card"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/card_height"
+        android:layout_height="@dimen/card_container_height"
         android:orientation="horizontal"
         android:paddingHorizontal="16dp"
         android:clipToPadding="true"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        tools:listitem="@layout/item_gifticon"/>
+        tools:listitem="@layout/item_gifticon_loading"/>
 </layout>
diff --git a/features/ui-home/src/main/res/layout/section_map_empty.xml b/features/ui-home/src/main/res/layout/section_map_empty.xml
@@ -4,7 +4,7 @@
 
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="@dimen/card_height"
+        android:layout_height="@dimen/card_container_height"
         android:gravity="center"
         android:textAppearance="@style/BEEP.TextStyle.Body1"
         android:text="@string/empty_near_brands"/>

diff --git a/features/ui-home/src/main/res/layout/section_map_loading.xml b/features/ui-home/src/main/res/layout/section_map_loading.xml
@@ -6,7 +6,7 @@
     <com.facebook.shimmer.ShimmerFrameLayout
         android:id="@+id/shimmer"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/card_height"
+        android:layout_height="@dimen/card_container_height"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         app:shimmer_auto_start="true">

diff --git a/features/ui-home/src/main/res/values/dimens.xml b/features/ui-home/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="card_width">160dp</dimen>
-    <dimen name="card_height">250dp</dimen>
+    <dimen name="card_height">240dp</dimen>
+    <dimen name="card_container_height">250dp</dimen>
 </resources>
diff --git a/features/ui-home/src/main/res/values/styles.xml b/features/ui-home/src/main/res/values/styles.xml
@@ -2,12 +2,12 @@
 <resources>
 
     <style name="BEEP.GifticonCard" parent="">
-        <item name="android:layout_width">160dp</item>
-        <item name="android:layout_height">250dp</item>
+        <item name="android:layout_width">@dimen/card_width</item>
+        <item name="android:layout_height">@dimen/card_height</item>
         <item name="android:layout_marginStart">4dp</item>
         <item name="android:layout_marginEnd">4dp</item>
-        <item name="android:layout_marginTop">5dp</item>
-        <item name="android:layout_marginBottom">5dp</item>
+        <item name="android:layout_marginTop">6dp</item>
+        <item name="android:layout_marginBottom">6dp</item>
         <item name="cardCornerRadius">4dp</item>
     </style>
 </resources>