From 7036c7798aee3eb924a7e6c2c37ce7b7bf74c453 Mon Sep 17 00:00:00 2001 From: kimjjunho Date: Mon, 9 Jan 2023 12:30:32 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20SIMT-112=20=ED=98=84=EC=9E=AC=20?= =?UTF-8?q?=EA=B7=BC=EB=AC=B4=EC=A7=80=EC=A0=90=EA=B3=BC=20=EA=B0=99?= =?UTF-8?q?=EC=9D=80=20=EA=B2=BD=EC=9A=B0=20=ED=81=B4=EB=A6=AD=20=EB=B6=88?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fix/workplace/FixWorkPlaceScreen.kt | 52 ++++++++++++------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/fix/workplace/FixWorkPlaceScreen.kt b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/fix/workplace/FixWorkPlaceScreen.kt index c552d021..bf3ea04b 100644 --- a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/fix/workplace/FixWorkPlaceScreen.kt +++ b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/fix/workplace/FixWorkPlaceScreen.kt @@ -65,6 +65,7 @@ private const val CannotChangePlaceTooMuch = "근무지점은 90일 동안 3회 @Composable fun FixWorkPlaceScreen( navController: NavController, + currentWorkPlace: String = "성심당본점", vm: FixWorkPlaceViewModel = hiltViewModel(), ) { val toast = rememberToast() @@ -109,20 +110,27 @@ fun FixWorkPlaceScreen( Spacer(modifier = Modifier.height(15.dp)) - LazyColumn() { + LazyColumn { itemsIndexed(fixWorkPlaceState.spotList) { index, item -> + val checkCurrentWorkPlace = item.name == currentWorkPlace Box( modifier = Modifier .height(FixWorkPlaceHeight) .simSelectable( selected = isSelect(index), onClick = { - selectedValue = index - vm.inPutSpotId(UUID.fromString(item.id)) + if (!checkCurrentWorkPlace) { + selectedValue = index + vm.inPutSpotId(msg = UUID.fromString(item.id)) + } }, role = Role.RadioButton, ) ) { + val textColor = + if (checkCurrentWorkPlace) SimTongColor.Gray500 + else SimTongColor.Gray800 + Column( modifier = Modifier .padding( @@ -133,15 +141,16 @@ fun FixWorkPlaceScreen( Body4( text = item.name, - color = SimTongColor.Gray800, + color = textColor, ) Spacer(modifier = Modifier.height(3.dp)) Body8( text = item.location, - color = SimTongColor.Gray800, + color = textColor, ) + Canvas( modifier = Modifier .fillMaxWidth() @@ -165,21 +174,24 @@ fun FixWorkPlaceScreen( ) } } - SimRadioButton( - modifier = Modifier - .fillMaxWidth() - .wrapContentWidth(Alignment.End) - .fillMaxHeight() - .wrapContentHeight(Alignment.CenterVertically) - .padding( - end = 33.dp, - ), - checked = isSelect(index), - onCheckedChange = { - selectedValue = index - vm.inPutSpotId(UUID.fromString(item.id)) - }, - ) + + if (!checkCurrentWorkPlace) { + SimRadioButton( + modifier = Modifier + .fillMaxWidth() + .wrapContentWidth(Alignment.End) + .fillMaxHeight() + .wrapContentHeight(Alignment.CenterVertically) + .padding( + end = 33.dp, + ), + checked = isSelect(index), + onCheckedChange = { + selectedValue = index + vm.inPutSpotId(msg = UUID.fromString(item.id)) + }, + ) + } } } } From 7c7d8d2bc9473be7cab1f9963f375b90e4afebdc Mon Sep 17 00:00:00 2001 From: kimjjunho Date: Mon, 9 Jan 2023 13:52:11 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20SIMT-112=20=EB=A7=88=EC=9D=B4?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EA=B7=BC?= =?UTF-8?q?=EB=AC=B4=EC=A7=80=EC=A0=90=20=EC=88=98=EC=A0=95=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=EB=A1=9C=20=ED=98=84=EC=9E=AC=20=EA=B7=BC?= =?UTF-8?q?=EB=AC=B4=EC=A7=80=EC=A0=90=20=EC=9D=B4=EB=A6=84=EC=9D=84=20?= =?UTF-8?q?=EB=84=98=EA=B2=A8=EC=A3=BC=EB=8A=94=20=EB=94=A5=EB=A7=81?= =?UTF-8?q?=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature_mypage/navigation/MyPageNavigation.kt | 11 ++++++++++- .../com/comit/feature_mypage/screen/MyPageScreen.kt | 3 ++- .../screen/fix/workplace/FixWorkPlaceScreen.kt | 2 +- .../feature_mypage/utils/MyPageDeepLinkKeyUtil.kt | 2 ++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/navigation/MyPageNavigation.kt b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/navigation/MyPageNavigation.kt index 9f295068..775da398 100644 --- a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/navigation/MyPageNavigation.kt +++ b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/navigation/MyPageNavigation.kt @@ -74,10 +74,19 @@ fun NavGraphBuilder.myPageNavigation( } composable( - route = SimTongScreen.MyPage.FIX_WORKPLACE, + route = SimTongScreen.MyPage.FIX_WORKPLACE + MyPageDeepLinkKeyUtil.WORK_PLACE + "{work place}", + arguments = listOf( + navArgument(MyPageDeepLinkKeyUtil.WORK_PLACE) { + type = NavType.StringType + defaultValue = "" + } + ), ) { + val currentWorkPlace = it.arguments?.getString(MyPageDeepLinkKeyUtil.WORK_PLACE) ?: "" + FixWorkPlaceScreen( navController = navController, + currentWorkPlace = currentWorkPlace, ) } diff --git a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/MyPageScreen.kt b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/MyPageScreen.kt index a7c772e3..40b847a0 100644 --- a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/MyPageScreen.kt +++ b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/MyPageScreen.kt @@ -53,6 +53,7 @@ import com.comit.core_design_system.modifier.simClickable import com.comit.core_design_system.typography.Body5 import com.comit.feature_mypage.R import com.comit.feature_mypage.mvi.MyPageSideEffect +import com.comit.feature_mypage.utils.MyPageDeepLinkKeyUtil import com.comit.feature_mypage.vm.ImageLimitSizeInKB import com.comit.feature_mypage.vm.MyPageViewModel import com.comit.navigator.SimTongScreen @@ -154,7 +155,7 @@ fun MyPageScreen( content = myPageInState.spot, onClick = { navController.navigate( - route = SimTongScreen.MyPage.FIX_WORKPLACE, + route = SimTongScreen.MyPage.FIX_WORKPLACE + MyPageDeepLinkKeyUtil.WORK_PLACE + myPageInState.spot, ) } ) diff --git a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/fix/workplace/FixWorkPlaceScreen.kt b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/fix/workplace/FixWorkPlaceScreen.kt index bf3ea04b..49cda62b 100644 --- a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/fix/workplace/FixWorkPlaceScreen.kt +++ b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/fix/workplace/FixWorkPlaceScreen.kt @@ -65,7 +65,7 @@ private const val CannotChangePlaceTooMuch = "근무지점은 90일 동안 3회 @Composable fun FixWorkPlaceScreen( navController: NavController, - currentWorkPlace: String = "성심당본점", + currentWorkPlace: String = "", vm: FixWorkPlaceViewModel = hiltViewModel(), ) { val toast = rememberToast() diff --git a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/utils/MyPageDeepLinkKeyUtil.kt b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/utils/MyPageDeepLinkKeyUtil.kt index 3e4fd10d..484a77a6 100644 --- a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/utils/MyPageDeepLinkKeyUtil.kt +++ b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/utils/MyPageDeepLinkKeyUtil.kt @@ -2,4 +2,6 @@ package com.comit.feature_mypage.utils object MyPageDeepLinkKeyUtil { const val EMAIL = "email" + + const val WORK_PLACE = "work place" }