feat: 사진 업로드 어려워요 모달 추가

CChuYong · CChuYong · commit c784800bafef · 2025-06-16T22:43:17.000+09:00
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/CameraCaptureButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/CameraCaptureButton.kt
@@ -14,6 +14,7 @@ import com.no5ing.bbibbi.util.LocalMixpanelProvider
 fun CameraCaptureButton(
     modifier: Modifier = Modifier,
     onClick: () -> Unit = {},
+    onClickDisabled: () -> Unit = {},
     isCapturing: Boolean,
     ignoreDisabledState: Boolean = false,
 ) {
@@ -27,6 +28,8 @@ fun CameraCaptureButton(
                 mixPanel.track("Click_btn_camera")
                 if (!isCapturing || ignoreDisabledState) {
                     onClick()
+                } else {
+                    onClickDisabled()
                 }
             },
         alpha = if (isCapturing) 0.3f else 1.0f,
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/common/GenericPopup.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/common/GenericPopup.kt
@@ -37,10 +37,11 @@ fun GenericPopup(
     cancelText: String,
     onTapConfirm: () -> Unit = {},
     onTapCancel: () -> Unit = {},
+    onTapBackground: () -> Unit = onTapCancel,
 ) {
     if (enabledState) {
         BasicAlertDialog(
-            onDismissRequest = onTapCancel,
+            onDismissRequest = onTapBackground,
             modifier = Modifier,
             properties = DialogProperties()
         ) {
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePage.kt
@@ -51,6 +51,7 @@ fun HomePage(
     onUnsavedPost: (Uri) -> Unit = {},
     onTapViewPost: (LocalDate) -> Unit = {},
     onTapPick: (MainPageTopBarModel) -> Unit = {},
+    onTapNight: () -> Unit = {},
 ) {
     val postViewType by postViewTypeState
     val mainPageState = mainPageViewModel.uiState.collectAsState()
@@ -82,6 +83,7 @@ fun HomePage(
         if (isDayTime) {
             mainPageViewModel.invoke(Arguments())
         } else {
+            mainPageViewModel.invoke(Arguments())
             mainPageNightViewModel.invoke(Arguments())
         }
     }
@@ -159,6 +161,11 @@ fun HomePage(
                             mainPageState.value.data.isMeSurvivalUploadedToday,
                     pickers = if (mainPageState.value.isReady()) mainPageState.value.data.pickers
                     else emptyList(),
+                    onTapDisabled = {
+                        if (gapUntilNext() <= 0) {
+                            onTapNight()
+                        }
+                    }
                 )
             } else {
                 HomePageMissionUploadButton(
@@ -169,6 +176,11 @@ fun HomePage(
                     isMissionUnlocked = mainPageState.value.isReady() && mainPageState.value.data.isMissionUnlocked,
                     isMeMissionUploaded = mainPageState.value.isReady()
                             && mainPageState.value.data.isMeMissionUploadedToday,
+                    onTapDisabled = {
+                        if (gapUntilNext() <= 0) {
+                            onTapNight()
+                        }
+                    }
                 )
             }
 
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageUploadButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageUploadButton.kt
@@ -55,6 +55,7 @@ fun BoxScope.HomePageSurvivalUploadButton(
     isAlreadyUploaded: Boolean = false,
     pickers: List<MainPagePickerModel> = emptyList(),
     onTap: () -> Unit = {},
+    onTapDisabled: () -> Unit = {},
 ) {
     Box(
         modifier = Modifier
@@ -73,18 +74,19 @@ fun BoxScope.HomePageSurvivalUploadButton(
                         pickers = pickers,
                     )
                 } else {
-                    UploadHelperPop(
-                        text =
-                        if (isUploadAbleTime && !isAlreadyUploaded)
-                            stringResource(id = R.string.home_one_image_per_day)
-                        else if (isAlreadyUploaded)
-                            stringResource(id = R.string.home_already_uploaded_today)
-                        else
-                            stringResource(id = R.string.home_not_camera_time)
-                    )
+                    if (isUploadAbleTime) {
+                        UploadHelperPop(
+                            text =
+                            if (!isAlreadyUploaded)
+                                stringResource(id = R.string.home_one_image_per_day)
+                            else
+                                stringResource(id = R.string.home_already_uploaded_today)
+                        )
+                    }
                 }
                 CameraCaptureButton(
                     onClick = onTap,
+                    onClickDisabled = onTapDisabled,
                     isCapturing = !isUploadAbleTime || isAlreadyUploaded,
                 )
             }
@@ -100,6 +102,7 @@ fun BoxScope.HomePageMissionUploadButton(
     isMissionUnlocked: Boolean,
     isMeMissionUploaded: Boolean,
     onTap: () -> Unit = {},
+    onTapDisabled: () -> Unit = {},
 ) {
     Box(
         modifier = Modifier
@@ -128,6 +131,7 @@ fun BoxScope.HomePageMissionUploadButton(
                     onClick = onTap,
                     isCapturing = !(!isMeMissionUploaded && isMissionUnlocked && isMeUploadedToday),
                     ignoreDisabledState = true,
+                    onClickDisabled = onTapDisabled,
                 )
             }
         }
diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/main/HomePageController.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_controller/main/HomePageController.kt
@@ -1,12 +1,14 @@
 package com.no5ing.bbibbi.presentation.feature.view_controller.main
 
+import android.app.Activity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -35,6 +37,7 @@ import com.no5ing.bbibbi.presentation.feature.view_controller.main.UploadMission
 import com.no5ing.bbibbi.presentation.feature.view_model.MainPageViewModel
 import com.no5ing.bbibbi.presentation.feature.view_model.members.PickMemberViewModel
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
+import com.no5ing.bbibbi.util.exit
 import com.no5ing.bbibbi.util.gapUntilNext
 import com.no5ing.bbibbi.util.localResources
 
@@ -49,6 +52,7 @@ object HomePageController : NavigationDestination(
         var isPickDialogVisible by remember { mutableStateOf(false) }
         var isRequireSurvivalDialogVisible by remember { mutableStateOf(false) }
         var isTryMissionPictureDialogVisible by remember { mutableStateOf(false) }
+        var isNightTimeDialogVisible by remember { mutableStateOf(false) }
         var tryPickDialogMember by remember { mutableStateOf<MainPageTopBarModel?>(null) }
         val pickState = pickMemberViewModel.uiState.collectAsState()
         val postViewTypeState = remember { mutableStateOf(PostType.SURVIVAL) }
@@ -121,6 +125,24 @@ object HomePageController : NavigationDestination(
                 isRequireSurvivalDialogVisible = false
             }
         )
+        GenericPopup(
+            enabledState = isNightTimeDialogVisible,
+            title = "현재는 사진 업로드가 어려워요",
+            description = "내일 12시부터 사용이 가능하니,\n조금만 기다려 주세요.",
+            image = painterResource(id = R.drawable.sleep_bibbi),
+            confirmText = "홈으로 이동",
+            cancelText = "앱 종료하기",
+            onTapConfirm = {
+                isNightTimeDialogVisible = false
+            },
+            onTapCancel = {
+                isNightTimeDialogVisible = false
+                navController.context.exit()
+            },
+            onTapBackground = {
+                isNightTimeDialogVisible = false
+            }
+        )
         GenericPopup(
             enabledState = isTryMissionPictureDialogVisible,
             title = stringResource(id = R.string.home_mission_key),
@@ -190,6 +212,9 @@ object HomePageController : NavigationDestination(
             postViewTypeState = postViewTypeState,
             onTapViewPost = { date ->
                 navController.goCalendarDetailPage(date)
+            },
+            onTapNight = {
+                isNightTimeDialogVisible = true
             }
         )
     }
diff --git a/app/src/main/java/com/no5ing/bbibbi/util/KotlinExtension.kt b/app/src/main/java/com/no5ing/bbibbi/util/KotlinExtension.kt
@@ -178,6 +178,13 @@ fun Context.forceRestart() {
     }
 }
 
+fun Context.exit() {
+    if (this is Activity) {
+        Timber.d("[Activity] Exiting application...")
+        this.finishAffinity()
+    }
+}
+
 enum class CustomDialogPosition {
     BOTTOM, TOP
 }
diff --git a/app/src/main/res/drawable/sleep_bibbi.xml b/app/src/main/res/drawable/sleep_bibbi.xml

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,13 @@ fun Context.forceRestart() {`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
	`181`	`+fun Context.exit() {`
	`182`	`+ if (this is Activity) {`
	`183`	`+ Timber.d("[Activity] Exiting application...")`
	`184`	`+ this.finishAffinity()`
	`185`	`+ }`
	`186`	`+}`
	`187`	`+`
`181`	`188`	`enum class CustomDialogPosition {`
`182`	`189`	`BOTTOM, TOP`
`183`	`190`	`}`