Merge pull request #435 from BCSDLab/release

Update v4.0.4
BCSDLab · Oct 26, 2024 · 33fb448 · 33fb448
2 parents 5023d13 + a484a7c
commit 33fb448
Show file tree

Hide file tree

Showing 17 changed files with 304 additions and 74 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,8 +7,8 @@ buildscript {
     }
 
     extra.apply {
-        set("versionName", "4.0.3")
-        set("versionCode", 40003)
+        set("versionName", "4.0.4")
+        set("versionCode", 40004)
     }
 
     dependencies {

diff --git a/...c/main/java/in/koreatech/business/feature/insertstore/startinsetstore/StartInsertStore.kt b/...c/main/java/in/koreatech/business/feature/insertstore/startinsetstore/StartInsertStore.kt
@@ -51,7 +51,6 @@ fun StartInsertScreen(
                 modifier = modifier
                     .width(40.dp)
                     .height(40.dp)
-                    .clickable { }
             )
         }
 

diff --git a/business/src/main/java/in/koreatech/business/feature/signin/SignInViewModel.kt b/business/src/main/java/in/koreatech/business/feature/signin/SignInViewModel.kt
@@ -11,6 +11,7 @@ import `in`.koreatech.koin.domain.util.onFailure
 import `in`.koreatech.koin.domain.util.onSuccess
 import kotlinx.coroutines.launch
 import org.orbitmvi.orbit.ContainerHost
+import org.orbitmvi.orbit.syntax.simple.blockingIntent
 import org.orbitmvi.orbit.syntax.simple.intent
 import org.orbitmvi.orbit.syntax.simple.postSideEffect
 import org.orbitmvi.orbit.syntax.simple.reduce
@@ -26,11 +27,11 @@ class SignInViewModel @Inject constructor(
         SignInState()
     )
 
-    fun insertId(id: String) = intent{
+    fun insertId(id: String) = blockingIntent{
         reduce { state.copy(id = id) }
     }
 
-    fun insertPassword(password: String) = intent{
+    fun insertPassword(password: String) = blockingIntent{
         reduce { state.copy(password = password) }
     }
     fun navigateToSignUp() = intent {

diff --git a/business/src/main/java/in/koreatech/business/feature/store/modifyinfo/ModifyInfoScreen.kt b/business/src/main/java/in/koreatech/business/feature/store/modifyinfo/ModifyInfoScreen.kt
@@ -58,6 +58,7 @@ fun ModifyInfoScreen(
     viewModel: ModifyInfoViewModel = hiltViewModel(),
     storeInfoViewModel: MyStoreDetailViewModel = hiltViewModel(),
     onSettingOperatingClicked: () -> Unit = {},
+    onModifyButtonClicked: () -> Unit = {}
 ) {
     val state = viewModel.collectAsState().value
     val storeInfoState = storeInfoViewModel.collectAsState().value
@@ -249,7 +250,6 @@ fun ModifyInfoScreen(
                                 storeInfoState.storeId,
                                 state.storeInfo
                             )
-                            viewModel.onBackButtonClicked()
                         },
                         modifier = Modifier
                             .width(130.dp)
@@ -279,7 +279,11 @@ fun ModifyInfoScreen(
         when (it) {
             ModifyInfoSideEffect.NavigateToBackScreen -> onBackClicked()
             ModifyInfoSideEffect.NavigateToSettingOperatingTime -> onSettingOperatingClicked()
-            else -> {}
+            ModifyInfoSideEffect.NavigateToMyStoreScreen -> {
+                storeInfoViewModel.modifyStoreInfo(state.storeInfo)
+                storeInfoViewModel.refreshStoreList()
+                onModifyButtonClicked()
+            }
         }
     }
 }

diff --git a/...ness/src/main/java/in/koreatech/business/feature/store/modifyinfo/ModifyInfoSideEffect.kt b/...ness/src/main/java/in/koreatech/business/feature/store/modifyinfo/ModifyInfoSideEffect.kt
@@ -3,4 +3,5 @@ package `in`.koreatech.business.feature.store.modifyinfo
 sealed class ModifyInfoSideEffect {
     data object NavigateToBackScreen :  ModifyInfoSideEffect()
     data object NavigateToSettingOperatingTime :  ModifyInfoSideEffect()
+    data object NavigateToMyStoreScreen :  ModifyInfoSideEffect()
 }
diff --git a/business/src/main/java/in/koreatech/business/feature/store/modifyinfo/ModifyInfoViewModel.kt b/business/src/main/java/in/koreatech/business/feature/store/modifyinfo/ModifyInfoViewModel.kt
@@ -2,6 +2,7 @@ package `in`.koreatech.business.feature.store.modifyinfo
 
 import android.graphics.Bitmap
 import android.net.Uri
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.chargemap.compose.numberpicker.FullHours
@@ -176,11 +177,15 @@ class ModifyInfoViewModel @Inject constructor(
     }
 
     fun modifyStoreInfo(storeId: Int, storeDetailInfo: StoreDetailInfo) {
-        viewModelScope.launch {
-            modifyInfoUseCase.invoke(
-                storeId,
-                storeDetailInfo,
-            )
+        intent {
+            viewModelScope.launch {
+                modifyInfoUseCase.invoke(
+                    storeId,
+                    storeDetailInfo,
+                ).apply {
+                    this ?: postSideEffect(ModifyInfoSideEffect.NavigateToMyStoreScreen)
+                }
+            }
         }
     }
 

diff --git a/...src/main/java/in/koreatech/business/feature/store/modifyinfo/ModifyOperatingTimeScreen.kt b/...src/main/java/in/koreatech/business/feature/store/modifyinfo/ModifyOperatingTimeScreen.kt
@@ -42,7 +42,6 @@ import org.orbitmvi.orbit.compose.collectSideEffect
 @Composable
 fun ModifyOperatingTimeScreen(
     modifier: Modifier = Modifier,
-    myStoreDetailViewModel: MyStoreDetailViewModel = hiltViewModel(),
     viewModel: ModifyInfoViewModel = hiltViewModel(),
     onBackClicked: () -> Unit = {},
 ) {

diff --git a/business/src/main/java/in/koreatech/business/feature/store/navigator/StoreNavigator.kt b/business/src/main/java/in/koreatech/business/feature/store/navigator/StoreNavigator.kt
@@ -1,16 +1,17 @@
 package `in`.koreatech.business.feature.store.navigator
 
+import android.os.Bundle
+import android.util.Log
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
+import androidx.navigation.NavGraph
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
-import androidx.navigation.compose.NavHost
+import androidx.navigation.NavOptions
+import androidx.navigation.Navigator
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navigation
 import `in`.koreatech.business.feature.store.modifyinfo.ModifyInfoScreen
 import `in`.koreatech.business.feature.store.modifyinfo.ModifyInfoViewModel
@@ -19,6 +20,7 @@ import `in`.koreatech.business.feature.store.storedetail.MyStoreDetailScreen
 import `in`.koreatech.business.feature.store.storedetail.MyStoreDetailViewModel
 import `in`.koreatech.business.navigation.MYSTORESCREEN
 import `in`.koreatech.business.navigation.REGISTERSTORESCREEN
+import `in`.koreatech.business.navigation.navigate
 import `in`.koreatech.business.navigation.sharedHiltViewModel
 import `in`.koreatech.business.navigation.toNavigateModifyMenuScreen
 import `in`.koreatech.business.navigation.toNavigateRegisterMenuScreen
@@ -38,7 +40,9 @@ fun NavGraphBuilder.myStoreScreen(
             val modifyInfoViewModel: ModifyInfoViewModel = it.sharedHiltViewModel(navController = navController)
             MyStoreDetailScreen(
                 modifier = Modifier.fillMaxSize(),
-                navigateToModifyScreen = { navController.navigate(StoreRoute.MODIFY_INFO.name) },
+                navigateToModifyScreen = {storeId ->
+                    navController.navigate(StoreRoute.MODIFY_INFO.name)
+                                         },
                 viewModel = myStoreInfoViewModel,
                 modifyInfoViewModel = modifyInfoViewModel,
                 navigateToRegisterStoreScreen = {
@@ -58,11 +62,20 @@ fun NavGraphBuilder.myStoreScreen(
             route = StoreRoute.MODIFY_INFO.name
         ) {
             val modifyInfoViewModel: ModifyInfoViewModel = it.sharedHiltViewModel(navController = navController)
+            val myStoreInfoViewModel: MyStoreDetailViewModel = it.sharedHiltViewModel(navController = navController)
 
             ModifyInfoScreen(
                 viewModel = modifyInfoViewModel,
+                storeInfoViewModel= myStoreInfoViewModel,
                 onSettingOperatingClicked = { navController.navigate(StoreRoute.SETTING_OPERATING_TIME.name) },
-                onBackClicked = { navController.popBackStack() }
+                onBackClicked = { navController.popBackStack() },
+                onModifyButtonClicked = {
+                    navController.navigate(StoreRoute.MY_STORE.name){
+                        popUpTo(StoreRoute.MODIFY_INFO.name){
+                            inclusive = true
+                        }
+                    }
+                }
             )
         }
 
@@ -77,4 +90,24 @@ fun NavGraphBuilder.myStoreScreen(
             )
         }
     }
+}
+
+fun NavController.toNaviGateModifyStoreScreen(storeId: Int){
+    val bundle = Bundle().apply {
+        putInt("storeId", storeId)
+    }
+    navigate(StoreRoute.MODIFY_INFO.name, bundle)
+}
+fun NavController.navigate(
+    route: String,
+    args: Bundle,
+    navOptions: NavOptions? = null,
+    navigatorExtras: Navigator.Extras? = null
+) {
+    val nodes = graph.findNode(MYSTORESCREEN) as? NavGraph
+
+    val nodeId = nodes?.findNode(route)?.id
+    if (nodeId != null) {
+        navigate(nodeId, args, navOptions, navigatorExtras)
+    }
 }
diff --git a/...ness/src/main/java/in/koreatech/business/feature/store/storedetail/MyStoreDetailScreen.kt b/...ness/src/main/java/in/koreatech/business/feature/store/storedetail/MyStoreDetailScreen.kt
@@ -1,16 +1,13 @@
 package `in`.koreatech.business.feature.store.storedetail
 
 import android.annotation.SuppressLint
-import android.util.Log
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
@@ -22,8 +19,6 @@ import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Divider
 import androidx.compose.material.Tab
 import androidx.compose.material.TabRow
@@ -43,13 +38,13 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
 import `in`.koreatech.business.R
 import `in`.koreatech.business.feature.store.OwnerStoreAppBar
 import `in`.koreatech.business.feature.store.modifyinfo.ModifyInfoViewModel
+import `in`.koreatech.business.feature.store.storedetail.dialog.MyStoreSelectDialog
 import `in`.koreatech.business.feature.store.storedetail.event.EventScreen
 import `in`.koreatech.business.feature.store.storedetail.menu.MenuScreen
 import `in`.koreatech.business.ui.theme.Blue2
@@ -70,7 +65,7 @@ fun MyStoreDetailScreen(
     modifyInfoViewModel: ModifyInfoViewModel,
     navigateToLoginScreen: () -> Unit = {},
     navigateToUploadEventScreen: () -> Unit = {},
-    navigateToModifyScreen: () -> Unit = {},
+    navigateToModifyScreen: (Int) -> Unit = {},
     navigateToRegisterStoreScreen: () -> Unit = {},
     navigateToManageMenuScreen: () -> Unit = {},
     navigateToRegisterMenuScreen: (Int) -> Unit = {},
@@ -83,14 +78,19 @@ fun MyStoreDetailScreen(
     val context = LocalContext.current
 
     LaunchedEffect(state.storeInfo) {
-        viewModel.initOwnerShopList()
         modifyInfoViewModel.initStoreInfo(state.storeInfo ?: return@LaunchedEffect)
     }
 
     Column(
         modifier = Modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         OwnerStoreAppBar(stringResource(R.string.my_shop))
+        MyStoreSelectDialog(
+            dialogVisibility = state.selectDialogVisibility,
+            storeList = state.storeList,
+            onClickCancel = viewModel::closeSelectStoreDialog,
+            selectStore = viewModel::changeMyStoreInfo
+        )
         MyStoreScrollScreen(
             state = state,
             listState = listState,
@@ -113,8 +113,8 @@ fun MyStoreDetailScreen(
             }
 
             MyStoreDetailSideEffect.NavigateToUploadEventScreen -> navigateToUploadEventScreen()
-            MyStoreDetailSideEffect.NavigateToModifyScreen -> {
-                navigateToModifyScreen()
+            is MyStoreDetailSideEffect.NavigateToModifyScreen -> {
+                navigateToModifyScreen(it.storeId)
             }
             MyStoreDetailSideEffect.NavigateToRegisterStoreScreen -> navigateToRegisterStoreScreen()
             MyStoreDetailSideEffect.NavigateToManageMenuScreen -> navigateToManageMenuScreen()

diff --git a/.../src/main/java/in/koreatech/business/feature/store/storedetail/MyStoreDetailSideEffect.kt b/.../src/main/java/in/koreatech/business/feature/store/storedetail/MyStoreDetailSideEffect.kt
@@ -3,7 +3,7 @@ package `in`.koreatech.business.feature.store.storedetail
 
 sealed class MyStoreDetailSideEffect {
     data object NavigateToUploadEventScreen : MyStoreDetailSideEffect()
-    data object NavigateToModifyScreen : MyStoreDetailSideEffect()
+    data class NavigateToModifyScreen(val storeId: Int) : MyStoreDetailSideEffect()
     data object NavigateToManageMenuScreen :  MyStoreDetailSideEffect()
     data object NavigateToRegisterMenuScreen :  MyStoreDetailSideEffect()
 

diff --git a/business/src/main/java/in/koreatech/business/feature/store/storedetail/MyStoreDetailState.kt b/business/src/main/java/in/koreatech/business/feature/store/storedetail/MyStoreDetailState.kt
@@ -4,7 +4,6 @@ import `in`.koreatech.koin.domain.model.owner.StoreDetailInfo
 import `in`.koreatech.koin.domain.model.store.ShopEvent
 import `in`.koreatech.koin.domain.model.store.Store
 import `in`.koreatech.koin.domain.model.store.StoreMenuCategories
-import `in`.koreatech.koin.domain.model.store.StoreWithMenu
 import kotlinx.collections.immutable.ImmutableList
 
 data class MyStoreDetailState(
@@ -14,6 +13,7 @@ data class MyStoreDetailState(
     val storeEvent: ImmutableList<ShopEvent>? = null,
     val storeMenu: ImmutableList<StoreMenuCategories>? = null,
     val dialogVisibility: Boolean = false,
+    val selectDialogVisibility: Boolean = false,
     val isEventExpanded: List<Boolean> = List(storeEvent?.size ?: 0) { false },
     val isAllEventSelected: Boolean = false,
     val isSelectedEvent: MutableList<Int> = mutableListOf(),