Merge remote-tracking branch 'origin/feat-QA' into feat-QA

# Conflicts: # app/src/main/res/layout/fragment_my_page.xml
GEON-PPANG · Jul 20, 2023 · 4d6b17b · 4d6b17b
2 parents d2d7123 + a6fd2fd
commit 4d6b17b
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 38 deletions.
diff --git a/app/src/main/java/com/sopt/geonppang/domain/model/BestBakery.kt b/app/src/main/java/com/sopt/geonppang/domain/model/BestBakery.kt
@@ -4,7 +4,7 @@ data class BestBakery(
     val bakeryId: Int,
     val bakeryName: String,
     val firstNearStation: String,
-    val secondNearStation: String?,
+    val secondNearStation: String,
     val bookmarkCount: Int,
     val bakeryImage: String,
     val reviewCount: Int,

diff --git a/app/src/main/java/com/sopt/geonppang/presentation/bakeryList/BakeryRecyclerViewAdapter.kt b/app/src/main/java/com/sopt/geonppang/presentation/bakeryList/BakeryRecyclerViewAdapter.kt
@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.sopt.geonppang.databinding.ItemBakeryBinding
 import com.sopt.geonppang.domain.model.Bakery
+import com.sopt.geonppang.util.setVisibility
 
 class BakeryRecyclerViewAdapter(
     private val moveToDetail: (Int) -> Unit
@@ -22,6 +23,7 @@ class BakeryRecyclerViewAdapter(
             binding.root.setOnClickListener {
                 moveToDetail(bakery.bakeryId)
             }
+            binding.chipStation2.setVisibility(bakery.secondNearStation != "")
             binding.executePendingBindings()
         }
     }

diff --git a/app/src/main/java/com/sopt/geonppang/presentation/home/BestBakeryAdapter.kt b/app/src/main/java/com/sopt/geonppang/presentation/home/BestBakeryAdapter.kt
@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.sopt.geonppang.databinding.ItemHomeBestBakeryBinding
 import com.sopt.geonppang.domain.model.BestBakery
 import com.sopt.geonppang.util.ItemDiffCallback
+import com.sopt.geonppang.util.setVisibility
 
 class BestBakeryAdapter(
     private val moveToDetail: (String, Int) -> Unit,
@@ -30,6 +31,8 @@ class BestBakeryAdapter(
             binding.root.setOnClickListener {
                 moveToDetail(MAIN, bakery.bakeryId)
             }
+
+            binding.chipHomeSecondNearStation.setVisibility(bakery.secondNearStation != "")
         }
     }
 

diff --git a/app/src/main/java/com/sopt/geonppang/presentation/mypage/MyPageViewModel.kt b/app/src/main/java/com/sopt/geonppang/presentation/mypage/MyPageViewModel.kt
@@ -7,6 +7,7 @@ import com.sopt.geonppang.domain.model.Bakery
 import com.sopt.geonppang.domain.model.MyReview
 import com.sopt.geonppang.domain.model.Profile
 import com.sopt.geonppang.domain.repository.MypageRepository
+import com.sopt.geonppang.presentation.type.MainPurposeType
 import com.sopt.geonppang.util.UiState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -60,6 +61,14 @@ class MyPageViewModel @Inject constructor(
         }
     }
 
+    fun toMainPurposeTitleRes(): Int {
+        return when (mypageInfoState.value?.mainPurpose) {
+            MainPurposeType.DIET.name -> MainPurposeType.DIET.titleRes
+            MainPurposeType.HEALTH.name -> MainPurposeType.HEALTH.titleRes
+            else -> MainPurposeType.VEGAN.titleRes
+        }
+    }
+
     private fun fetchMypageReviewList() {
         viewModelScope.launch {
             mypageRepository.fetchMyReview().onSuccess { myReviewList ->

diff --git a/app/src/main/java/com/sopt/geonppang/presentation/search/BakeryAdapter.kt b/app/src/main/java/com/sopt/geonppang/presentation/search/BakeryAdapter.kt
@@ -7,9 +7,10 @@ import androidx.recyclerview.widget.RecyclerView
 import com.sopt.geonppang.databinding.ItemBakeryBinding
 import com.sopt.geonppang.domain.model.Bakery
 import com.sopt.geonppang.util.ItemDiffCallback
+import com.sopt.geonppang.util.setVisibility
 
 class BakeryAdapter(
-    private val moveToDetail: (Int) -> Unit
+    private val moveToDetail: (Int) -> Unit,
 ) : ListAdapter<Bakery, BakeryAdapter.BakeryViewHolder>(
     ItemDiffCallback<Bakery>(
         onItemsTheSame = { old, new -> old.bakeryId == new.bakeryId },
@@ -22,12 +23,13 @@ class BakeryAdapter(
     ) : RecyclerView.ViewHolder(binding.root) {
         fun onBind(
             bakery: Bakery,
-            moveToDetail: (Int) -> Unit
+            moveToDetail: (Int) -> Unit,
         ) {
             binding.bakery = bakery
             binding.root.setOnClickListener {
                 moveToDetail(bakery.bakeryId)
             }
+            binding.chipStation2.setVisibility(bakery.secondNearStation != "")
             binding.executePendingBindings()
         }
     }

diff --git a/app/src/main/java/com/sopt/geonppang/util/binding/BindingAdapter.kt b/app/src/main/java/com/sopt/geonppang/util/binding/BindingAdapter.kt
@@ -1,15 +1,10 @@
 package com.sopt.geonppang.util
 
-import android.text.Spannable
-import android.text.SpannableString
-import android.text.style.ForegroundColorSpan
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.databinding.BindingAdapter
 import coil.load
-import com.sopt.geonppang.R
 import java.text.DecimalFormat
 
 @BindingAdapter("image")
@@ -34,28 +29,6 @@ fun View.setInvisibility(isInvisible: Boolean?) {
     this.visibility = if (isInvisible) View.VISIBLE else View.INVISIBLE
 }
 
-@BindingAdapter("highlightNumbers")
-fun TextView.highlightNumbers(text: CharSequence?) {
-    if (text.isNullOrEmpty()) {
-        this.text = text
-        return
-    }
-
-    val spannableString = SpannableString.valueOf(text)
-    val numberPattern = "\\d+".toRegex()
-
-    val color = ContextCompat.getColor(context, R.color.point_1)
-    val span = ForegroundColorSpan(color)
-
-    numberPattern.findAll(text).forEach { matchResult ->
-        val startIndex = matchResult.range.start
-        val endIndex = matchResult.range.endInclusive + 1
-        spannableString.setSpan(span, startIndex, endIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-    }
-
-    this.text = spannableString
-}
-
 @BindingAdapter("priceAmount")
 fun applyPriceFormat(view: TextView, price: Int) {
     val decimalFormat = DecimalFormat("#,###")

diff --git a/app/src/main/res/color/selector_bread_lost_filter_background.xml b/app/src/main/res/color/selector_bread_lost_filter_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/main_3" android:state_checked="true" />
-    <item android:color="@color/white" android:state_checked="false" />
+    <item android:color="@color/gray_100" android:state_checked="false" />
 </selector>
diff --git a/app/src/main/res/layout/fragment_bakery_list.xml b/app/src/main/res/layout/fragment_bakery_list.xml
@@ -78,14 +78,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="18dp"
+            android:paddingVertical="@dimen/spacing10"
             android:text="@{viewModle.bakerySort.sortName}"
             android:textAppearance="@style/TextAppearance.CaptionB1"
-            app:chipBackgroundColor="@color/white"
+            app:chipBackgroundColor="@color/gray_100"
             app:chipIcon="@drawable/ic_swap"
             app:chipIconSize="@dimen/spacing16"
             app:chipStrokeColor="@color/gray_200"
             app:chipStrokeWidth="1dp"
-            app:iconStartPadding="8dp"
+            app:iconStartPadding="12dp"
             app:layout_constraintStart_toStartOf="@id/gl_start"
             app:layout_constraintTop_toBottomOf="@id/view_line_top"
             app:textEndPadding="12dp" />

diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
@@ -72,7 +72,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="17dp"
                     android:backgroundTint="@color/point_2"
-                    android:text="@{viewModel.mypageInfoState.mainPurpose}"
+                    android:text="@{viewModel.toMainPurposeTitleRes()}"
                     app:layout_constraintStart_toEndOf="@+id/iv_my_page_profile_img"
                     app:layout_constraintTop_toTopOf="@+id/iv_my_page_profile_img"
                     tools:text="맛 . 다이어트" />

diff --git a/app/src/main/res/layout/item_home_best_bakery.xml b/app/src/main/res/layout/item_home_best_bakery.xml
@@ -129,7 +129,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing4"
             android:backgroundTint="@color/main_3"
-            android:text="@{bakery.secondNearStation == null ? `` : bakery.secondNearStation}"
+            android:text="@{bakery.secondNearStation}"
             app:layout_constraintBottom_toBottomOf="@+id/chip_home_first_near_station"
             app:layout_constraintStart_toEndOf="@id/chip_home_first_near_station"
             app:layout_constraintTop_toTopOf="@+id/chip_home_first_near_station"

diff --git a/app/src/main/res/layout/view_main_purpose_button.xml b/app/src/main/res/layout/view_main_purpose_button.xml
@@ -13,7 +13,6 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/layout_main_purpose"
         android:layout_width="wrap_content"
-        android:foreground="?attr/selectableItemBackground"
         android:layout_height="wrap_content"
         android:background="@drawable/selector_item_3_division_filter_button"
         android:paddingVertical="25dp">

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -119,9 +119,9 @@
         <item name="chipStartPadding">0dp</item>
         <item name="chipCornerRadius">20dp</item>
         <item name="textStartPadding">0dp</item>
-        <item name="iconStartPadding">8dp</item>
+        <item name="iconStartPadding">@dimen/spacing12</item>
         <item name="rippleColor">#00FFFFFF</item>
-        <item name="android:paddingVertical">8dp</item>
+        <item name="android:paddingVertical">@dimen/spacing10</item>
         <item name="chipBackgroundColor">@color/selector_bread_lost_filter_background</item>
         <item name="iconEndPadding">4dp</item>
         <item name="chipIconVisible">true</item>