From 8399254d618fee0523a847f48ed68523ab650cde Mon Sep 17 00:00:00 2001 From: Do-Re-Min-Woo Date: Fri, 24 Nov 2023 01:25:27 +0900 Subject: [PATCH] =?UTF-8?q?[chore]=20#3=20=EC=BD=94=EB=93=9C=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/response/ResponsePopularStoreDto.kt | 16 +-- .../presentation/store/PopularStoreAdapter.kt | 2 +- ...ack_24px.xml => ic_back_gray_800_24px.xml} | 0 ...y_24px.xml => ic_people_grey_100_24px.xml} | 0 ...ck_8px.xml => ic_polygon_gray_800_8px.xml} | 0 ...00_0.xml => shape_gradient_white_rect.xml} | 2 +- .../res/layout/activity_popular_store.xml | 128 ++++++++++-------- .../main/res/layout/item_popular_store.xml | 41 +++--- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 14 +- app/src/main/res/values/themes.xml | 8 ++ 11 files changed, 116 insertions(+), 97 deletions(-) rename app/src/main/res/drawable/{ic_back_24px.xml => ic_back_gray_800_24px.xml} (100%) rename app/src/main/res/drawable/{ic_people_grey_24px.xml => ic_people_grey_100_24px.xml} (100%) rename app/src/main/res/drawable/{ic_polygon_black_8px.xml => ic_polygon_gray_800_8px.xml} (100%) rename app/src/main/res/drawable/{bg_white_100_0.xml => shape_gradient_white_rect.xml} (81%) diff --git a/app/src/main/java/org/sopt/tabling/data/model/response/ResponsePopularStoreDto.kt b/app/src/main/java/org/sopt/tabling/data/model/response/ResponsePopularStoreDto.kt index cd40867..afe9b6f 100644 --- a/app/src/main/java/org/sopt/tabling/data/model/response/ResponsePopularStoreDto.kt +++ b/app/src/main/java/org/sopt/tabling/data/model/response/ResponsePopularStoreDto.kt @@ -15,22 +15,22 @@ data class ResponsePopularStoreDto( @Serializable data class StoreData( @SerialName("shop_id") - val shop_id: Int, + val shopId: Int, @SerialName("name") val name: String, @SerialName("average_star") - val average_star: Double, + val averageStar: Double, @SerialName("review_count") - val review_count: Int, + val reviewCount: Int, @SerialName("shop_category") - val shop_category: String, + val shopCategory: String, @SerialName("short_address") - val short_address: String, + val shortAddress: String, @SerialName("average_waiting") - val average_waiting: Int, + val averageWaiting: Int, @SerialName("current_waiting") - val current_waiting: Int, + val currentWaiting: Int, @SerialName("profile_photo_url") - val profile_photo_url: String, + val profilePhotoUrl: String, ) } diff --git a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt index 4c689ac..ae3ac60 100644 --- a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt +++ b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt @@ -15,7 +15,7 @@ class PopularStoreAdapter(context: Context) : inner class PopularStoreViewHolder(val binding: ItemPopularStoreBinding) : RecyclerView.ViewHolder(binding.root) { fun onBind(storeData: ResponsePopularStoreDto.StoreData) { - binding.data = storeData + binding.storeData = storeData } } diff --git a/app/src/main/res/drawable/ic_back_24px.xml b/app/src/main/res/drawable/ic_back_gray_800_24px.xml similarity index 100% rename from app/src/main/res/drawable/ic_back_24px.xml rename to app/src/main/res/drawable/ic_back_gray_800_24px.xml diff --git a/app/src/main/res/drawable/ic_people_grey_24px.xml b/app/src/main/res/drawable/ic_people_grey_100_24px.xml similarity index 100% rename from app/src/main/res/drawable/ic_people_grey_24px.xml rename to app/src/main/res/drawable/ic_people_grey_100_24px.xml diff --git a/app/src/main/res/drawable/ic_polygon_black_8px.xml b/app/src/main/res/drawable/ic_polygon_gray_800_8px.xml similarity index 100% rename from app/src/main/res/drawable/ic_polygon_black_8px.xml rename to app/src/main/res/drawable/ic_polygon_gray_800_8px.xml diff --git a/app/src/main/res/drawable/bg_white_100_0.xml b/app/src/main/res/drawable/shape_gradient_white_rect.xml similarity index 81% rename from app/src/main/res/drawable/bg_white_100_0.xml rename to app/src/main/res/drawable/shape_gradient_white_rect.xml index 2c2e93b..0ef5923 100644 --- a/app/src/main/res/drawable/bg_white_100_0.xml +++ b/app/src/main/res/drawable/shape_gradient_white_rect.xml @@ -3,6 +3,6 @@ android:shape="rectangle"> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_popular_store.xml b/app/src/main/res/layout/activity_popular_store.xml index 00a6d72..abcba51 100644 --- a/app/src/main/res/layout/activity_popular_store.xml +++ b/app/src/main/res/layout/activity_popular_store.xml @@ -13,6 +13,7 @@ + app:navigationIcon="@drawable/ic_back_gray_800_24px"> + android:textAppearance="@style/TextAppearance.Body1.SemiBold" + android:textColor="@color/gray_800" + tools:layout_editor_absoluteX="56dp" + tools:layout_editor_absoluteY="22dp" /> + android:src="@drawable/ic_polygon_gray_800_8px" /> - - - - - + app:layout_constraintTop_toBottomOf="@id/tb_popular_store"> - - - - - - - + android:layout_marginStart="16dp" + android:orientation="horizontal" + app:singleLine="true" + app:singleSelection="true"> + + + + + + + + + + + + + + app:layout_constraintTop_toTopOf="@id/hsv_popular_store_chip" /> + app:layout_constraintTop_toBottomOf="@id/hsv_popular_store_chip" /> + app:layout_constraintTop_toBottomOf="@id/view_popular_store_horizontal_1dp" /> + app:layout_constraintBottom_toBottomOf="@id/tv_popular_store_avg_people_number" + app:layout_constraintStart_toEndOf="@id/tv_popular_store_avg_people_number" + app:layout_constraintTop_toTopOf="@id/tv_popular_store_avg_people_number" /> + app:layout_constraintTop_toBottomOf="@id/tv_popular_store_avg_people_number" /> @@ -18,7 +18,7 @@ android:id="@+id/tv_popular_store_number" android:layout_width="0dp" android:layout_height="wrap_content" - android:text="@{String.valueOf(data.shop_id)}" + android:text="@{String.valueOf(storeData.shopId)}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/iv_popular_store" @@ -32,7 +32,7 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:scaleType="centerCrop" - app:image="@{data.profile_photo_url}" + app:image="@{storeData.profilePhotoUrl}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1" app:layout_constraintStart_toEndOf="@id/tv_popular_store_number" @@ -41,17 +41,14 @@ @@ -62,7 +59,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="12dp" - android:text="@{data.name}" + android:text="@{storeData.name}" android:textAppearance="@style/TextAppearance.Body1.SemiBold" android:textColor="@color/gray_400" app:layout_constraintStart_toEndOf="@id/iv_popular_store" @@ -85,7 +82,7 @@ android:layout_height="wrap_content" android:layout_marginStart="3dp" android:layout_marginTop="1dp" - android:text="@{String.valueOf(data.average_star)}" + android:text="@{String.valueOf(storeData.averageStar)}" android:textAppearance="@style/TextAppearance.Body2.Regular" android:textColor="@color/gray_800" app:layout_constraintStart_toEndOf="@id/ic_popular_store_star" @@ -97,7 +94,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="1dp" - android:text="@{String.valueOf(data.review_count)}" + android:text="@{storeData.reviewCount > 300 ? @string/popular_store_review_count_over : @string/popular_store_review_count(storeData.reviewCount) }" android:textAppearance="@style/TextAppearance.Body2.Regular" android:textColor="@color/gray_800" app:layout_constraintStart_toEndOf="@id/tv_popular_store_review" @@ -110,7 +107,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="1dp" - android:text="@{data.shop_category}" + android:text="@{storeData.shopCategory}" android:textAppearance="@style/TextAppearance.Body2.Regular" android:textColor="@color/gray_200" app:layout_constraintStart_toEndOf="@id/iv_popular_store" @@ -132,7 +129,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="1dp" - android:text="@{data.short_address}" + android:text="@{storeData.shortAddress}" android:textAppearance="@style/TextAppearance.Body2.Regular" android:textColor="@color/gray_200" app:layout_constraintBottom_toBottomOf="@id/tv_popular_store_food_type" @@ -148,14 +145,14 @@ android:layout_marginTop="1dp" app:layout_constraintStart_toEndOf="@id/iv_popular_store" app:layout_constraintTop_toBottomOf="@id/tv_popular_store_food_type" - app:srcCompat="@drawable/ic_people_grey_24px" /> + app:srcCompat="@drawable/ic_people_grey_100_24px" /> #FF000000 #FFFFFFFF - #00FFFFFF + #00FFFFFF #F85A40 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 32fc005..be617d7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,11 +8,13 @@ 압구정/청담 선릉/삼성 서초/방배 - 일 평균 대기인원 - 을 기준으로 선정한 + 일 평균 대기인원 + 을 기준으로 선정한 인기 매장 BEST - 일 평균 - 명 대기 - 대기 %d팀 - 대기없음 + (%d) + (300+) + 일 평균 + 명 대기 + 대기 %d팀 + 대기없음 \ 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 9fa8026..7dc0da5 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -69,6 +69,8 @@ + + \ No newline at end of file