#42 [ui] 완료하기 버튼 클릭시 바텀시트 띄우기

Team-Sopetit · Jan 13, 2024 · a649272 · a649272
1 parent b19d3fd
commit a649272
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 10 deletions.
diff --git a/app/src/main/java/com/sopetit/softie/ui/dailyroutine/DailyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/dailyroutine/DailyRoutineFragment.kt
@@ -28,19 +28,63 @@ class DailyRoutineFragment :
 
     private fun initSetDailyRoutineContent() {
         with(binding) {
-            routineItemView(tvDailyRoutineAddNameFirst, tvDailyRoutineIngFirst, 0)
-            routineItemView(tvDailyRoutineAddNameSecond, tvDailyRoutineIngSecond, 1)
-            routineItemView(tvDailyRoutineAddNameThird, tvDailyRoutineIngThird, 2)
+            routineItemView(
+                tvDailyRoutineAddNameFirst,
+                tvDailyRoutineIngFirst,
+                btnDailyRoutineYetFinFirst,
+                0
+            )
+            routineItemView(
+                tvDailyRoutineAddNameSecond,
+                tvDailyRoutineIngSecond,
+                btnDailyRoutineYetFinSecond,
+                1
+            )
+            routineItemView(
+                tvDailyRoutineAddNameThird,
+                tvDailyRoutineIngThird,
+                btnDailyRoutineYetFinThird,
+                2
+            )
         }
     }
 
-    private fun routineItemView(routineTitle: TextView, achieveMsg: TextView, index: Int) {
+    private fun routineItemView(
+        routineTitle: TextView,
+        achieveMsg: TextView,
+        btn: View,
+        index: Int
+    ) {
         viewModel.mockDailyRoutineList.observe(viewLifecycleOwner) { dailyRoutineList ->
             val achieveCountMsg =
                 getString(R.string.daily_routine_ing).format(dailyRoutineList[index].achieveCount)
             achieveMsg.text = achieveCountMsg
             routineTitle.text = dailyRoutineList[index].content
             viewModel.setRoutineAchieve(dailyRoutineList[index].isAchieve, index)
+
+            initSetDailyRoutineAchieve(btn)
+        }
+    }
+
+
+    private fun initSetDailyRoutineAchieve(btn: View) {
+        btn.setOnClickListener {
+            // TODO 서버통신 구현 후 imageUri 버전으로 수정
+
+            BindingBottomSheet.Builder().build(
+                isDrawable = true,
+                imageDrawable = R.drawable.ic_bear_face_crying,
+                imageUri = "",
+                title = "데일리 루틴을 완료했나요?",
+                content = "한 번 완료하면 이전으로 되돌릴 수 없어요",
+                isContentVisible = true,
+                contentColor = R.color.gray400,
+                backBtnContent = "아니, 아직이야!",
+                doBtnContent = "완료했어",
+                doBtnColor = R.drawable.shape_main1_fill_12_rect,
+                backBtnAction = {},
+                doBtnAction = {}
+            ).show(parentFragmentManager, BOTTOM_SHEET_TAG)
         }
     }
 

diff --git a/app/src/main/res/layout/fragment_daily_routine.xml b/app/src/main/res/layout/fragment_daily_routine.xml
@@ -121,10 +121,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="16dp"
-                android:background="@{viewModel.isRoutineAchieveFirst ? @drawable/shape_main1_fill_10_rect: @drawable/shape_gray100_fill_10_rect}"
+                android:background="@{viewModel.isRoutineAchieveFirst ? @drawable/shape_gray100_fill_10_rect : @drawable/shape_main1_fill_10_rect}"
                 android:enabled="@{!viewModel.isRoutineAchieveFirst}"
                 android:clickable="@{!viewModel.isRoutineAchieveFirst}"
-                android:text="@{viewModel.isRoutineAchieveFirst ? @string/daily_routine_fin_btn : @string/daily_routine_fin}"
+                android:text="@{viewModel.isRoutineAchieveFirst ? @string/daily_routine_fin : @string/daily_routine_fin_btn}"
                 android:minHeight="0dp"
                 android:paddingTop="10dp"
                 android:paddingBottom="11dp"
@@ -209,10 +209,10 @@
                 android:layout_height="38dp"
                 android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="16dp"
-                android:background="@{viewModel.isRoutineAchieveSecond ? @drawable/shape_main1_fill_10_rect: @drawable/shape_gray100_fill_10_rect}"
+                android:background="@{viewModel.isRoutineAchieveSecond ? @drawable/shape_gray100_fill_10_rect : @drawable/shape_main1_fill_10_rect}"
                 android:enabled="@{!viewModel.isRoutineAchieveSecond}"
                 android:clickable="@{!viewModel.isRoutineAchieveSecond}"
-                android:text="@{viewModel.isRoutineAchieveSecond ? @string/daily_routine_fin_btn : @string/daily_routine_fin}"
+                android:text="@{viewModel.isRoutineAchieveSecond ? @string/daily_routine_fin : @string/daily_routine_fin_btn}"
                 android:textAppearance="@style/body4"
                 android:textColor="@color/white"
                 android:outlineProvider="none"
@@ -292,10 +292,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="16dp"
-                android:background="@{viewModel.isRoutineAchieveThird ? @drawable/shape_main1_fill_10_rect: @drawable/shape_gray100_fill_10_rect}"
+                android:background="@{viewModel.isRoutineAchieveThird ? @drawable/shape_gray100_fill_10_rect : @drawable/shape_main1_fill_10_rect}"
                 android:enabled="@{!viewModel.isRoutineAchieveThird}"
                 android:clickable="@{!viewModel.isRoutineAchieveThird}"
-                android:text="@{viewModel.isRoutineAchieveThird ? @string/daily_routine_fin_btn : @string/daily_routine_fin}"
+                android:text="@{viewModel.isRoutineAchieveThird ? @string/daily_routine_fin : @string/daily_routine_fin_btn}"
                 android:minHeight="0dp"
                 android:paddingTop="10dp"
                 android:paddingBottom="11dp"