Merge pull request #145 from depromeet/fix/#143-all-design

[FIX] 디자인 배포전 일괄 수정
depromeet · Aug 27, 2024 · 5b4a365 · 5b4a365
2 parents 0bbcc1c + 6144271
commit 5b4a365
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/presentation/src/main/java/com/dpm/presentation/scrap/adapter/ScrapDetailAdapter.kt b/presentation/src/main/java/com/dpm/presentation/scrap/adapter/ScrapDetailAdapter.kt
@@ -90,6 +90,12 @@ class ScrapDetailViewHolder(
             ivScrap.load(com.depromeet.designsystem.R.drawable.ic_scrap_active)
         } else {
             ivScrap.load(com.depromeet.designsystem.R.drawable.ic_scrap_inactive)
+            ivScrap.setColorFilter(
+                ContextCompat.getColor(
+                    binding.root.context,
+                    com.depromeet.designsystem.R.color.color_foreground_caption
+                )
+            )
         }
 
 
@@ -163,12 +169,13 @@ class ScrapDetailViewHolder(
     }
 
     private fun initScrapImageAdapter(item: ResponseScrap.ResponseBaseReview) {
-        if(!::scrapImageAdapter.isInitialized){
+        if (!::scrapImageAdapter.isInitialized) {
             scrapImageAdapter = ScrapImageAdapter()
             binding.vpImage.adapter = scrapImageAdapter
             scrapImageAdapter.submitList(item.images.map { it.url })
             setupIndicators(scrapImageAdapter.itemCount)
-            binding.vpImage.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            binding.vpImage.registerOnPageChangeCallback(object :
+                ViewPager2.OnPageChangeCallback() {
                 override fun onPageSelected(position: Int) {
                     updateIndicators(position)
                     if (position >= 0 && position < item.images.size) {

diff --git a/presentation/src/main/java/com/dpm/presentation/seatrecord/adapter/DetailRecordAdapter.kt b/presentation/src/main/java/com/dpm/presentation/seatrecord/adapter/DetailRecordAdapter.kt
@@ -154,6 +154,12 @@ class ReviewDetailViewHolder(
             )
             if (item.isScrapped) {
                 ivRecordScrap.load(com.depromeet.designsystem.R.drawable.ic_scrap_active)
+                ivRecordScrap.setColorFilter(
+                    ContextCompat.getColor(
+                        binding.root.context,
+                        com.depromeet.designsystem.R.color.color_action_enabled
+                    )
+                )
             } else {
                 ivRecordScrap.load(com.depromeet.designsystem.R.drawable.ic_scrap_inactive)
                 ivRecordScrap.setColorFilter(

diff --git a/presentation/src/main/java/com/dpm/presentation/seatreview/dialog/view/SeatShareDialog.kt b/presentation/src/main/java/com/dpm/presentation/seatreview/dialog/view/SeatShareDialog.kt
@@ -35,7 +35,7 @@ class SeatShareDialog : BindingBottomSheetDialog<FragmentSightShareBottomSheetBi
         super.onViewCreated(view, savedInstanceState)
         initEvent()
         initView()
-        binding.csbvSelectImage.setTextPart("시야 사진이 ", 1, "인 경우 선택해주세요")
+        binding.csbvSelectImage.setTextPart("시야 사진이 ", "1장", "인 경우 선택해주세요")
     }
 
     private fun initEvent() {

diff --git a/presentation/src/main/res/layout/fragment_sight_share_bottom_sheet.xml b/presentation/src/main/res/layout/fragment_sight_share_bottom_sheet.xml
@@ -153,8 +153,7 @@
         android:paddingVertical="10dp"
         app:layout_constraintBottom_toTopOf="@+id/clButton"
         app:layout_constraintEnd_toEndOf="parent"
-        app:textAppearance="@style/TextAppearance.Spot.Caption04"
-        app:textColor="@color/color_foreground_body_subtitle">
+        app:textAppearance="@style/TextAppearance.Spot.Caption04">
 
     </com.dpm.presentation.home.customview.CustomSpeechBubbleView>
 

diff --git a/presentation/src/main/res/layout/item_stadium_small_selection.xml b/presentation/src/main/res/layout/item_stadium_small_selection.xml
@@ -67,8 +67,8 @@
         android:layout_marginTop="12dp"
         android:gravity="center"
         android:textColor="@color/color_foreground_body_sebtext"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/iv_stadium"
+        app:layout_constraintStart_toStartOf="@id/iv_stadium"
         app:layout_constraintTop_toBottomOf="@id/iv_stadium"
         tools:text="서울\n잠실야구장" />