#111 [hotfix] 데일리 루틴 추가 시 아무것도 누르지 않고 추가했을 때 앱 터짐 이슈 해결

app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineadd/DailyRoutineAddActivity.kt

@@ -187,11 +187,12 @@ class DailyRoutineAddActivity :
         })
     }
 
-    private fun getCurrentSelectedRoutine(): Routine {
+    private fun getCurrentSelectedRoutine(): Routine? {
         val currentItem = binding.vpDailyRoutineAddCard.currentItem
         val itemId = dailyRoutineAddCardPagerAdapter.getItemId(currentItem)
         val itemContent = dailyRoutineAddCardPagerAdapter.content
-        return Routine(itemId.toInt(), itemContent)
+            ?: dailyRoutineAddViewModel.dailyRoutineCardThemeList.value?.routine?.get(0)?.content
+        return itemContent?.let { content -> Routine(itemId.toInt(), content) }
     }
 
     private fun getCurrentSelectedRoutineId(): Int {
@@ -205,9 +206,10 @@ class DailyRoutineAddActivity :
             BindingBottomSheet.Builder().build(
                 isDrawable = false,
                 imageDrawable = 0,
-                imageUri = dailyRoutineAddThemeAdapter.clickedThemeIcon,
+                imageUri = dailyRoutineAddThemeAdapter.clickedThemeIcon ?: "",
                 title = getString(R.string.daily_routine_add_question),
-                content = getCurrentSelectedRoutine().content,
+                content = getCurrentSelectedRoutine()?.content
+                    ?: getString(R.string.daily_routine_basic_bottom_sheet_content),
                 isContentVisible = true,
                 contentColor = R.color.gray400,
                 backBtnContent = getString(R.string.daily_routine_add_no),

app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineadd/DailyRoutineAddCardPagerAdapter.kt

@@ -18,7 +18,7 @@ class DailyRoutineAddCardPagerAdapter :
         )
     ) {
     lateinit var background: String
-    lateinit var content: String
+    var content: String? = null
     fun updateBackground(backgroundImg: String) {
         background = backgroundImg
     }
@@ -33,6 +33,7 @@ class DailyRoutineAddCardPagerAdapter :
     }
 
     override fun onBindViewHolder(holder: DailyPagerViewHolder, position: Int) {
+        if (content == null) content = currentList[0].content
         holder.onBind(currentList[position])
     }
 

app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineadd/DailyRoutineAddThemeAdapter.kt

@@ -22,7 +22,7 @@ class DailyRoutineAddThemeAdapter :
     private var onItemClickListener: OnItemClickListener? = null
     private var selectedPosition = 0
     var clickedThemeId: Int = 1
-    lateinit var clickedThemeIcon: String
+    var clickedThemeIcon: String? = null
 
     interface OnItemClickListener {
         fun onItemClick(item: Theme, position: Int)
@@ -113,6 +113,7 @@ class DailyRoutineAddThemeAdapter :
     }
 
     override fun onBindViewHolder(holder: DailyThemeViewHolder, position: Int) {
+        if (clickedThemeIcon == null) clickedThemeIcon = currentList[0].iconImageUrl
         holder.onBind(currentList[position])
     }
 }

app/src/main/res/values/strings.xml

@@ -162,5 +162,6 @@
     <string name="daily_routine_add_no">아니, 더 고민할게</string>
     <string name="daily_routine_add_yes">추가할래</string>
     <string name="daily_routine_snack_bar">데일리 루틴을 1개 추가했어요</string>
+    <string name="daily_routine_basic_bottom_sheet_content">언제든지 변경할 수 있어요!</string>
 
 </resources>