Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pr: SIMT-112 현재 근무위치 표시 #87

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Pr: SIMT-112 현재 근무위치 표시 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7036c77
feat: SIMT-112 현재 근무지점과 같은 경우 클릭 불가
kimjjunho Jan 9, 2023
7c7d8d2
feat: SIMT-112 마이페이지에서 근무지점 수정페이지로 현재 근무지점 이름을 넘겨주는 딥링크
kimjjunho Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion feature/feature-mypage/src/main/java/com/comit/feature_mypage/navigation/MyPageNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
}

Expand Down
3 changes: 2 additions & 1 deletion feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/MyPageScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
)
}
)
Expand Down
52 changes: 32 additions & 20 deletions ...-mypage/src/main/java/com/comit/feature_mypage/screen/fix/workplace/FixWorkPlaceScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ private const val CannotChangePlaceTooMuch = "근무지점은 90일 동안 3회
@Composable
fun FixWorkPlaceScreen(
navController: NavController,
currentWorkPlace: String = "",
vm: FixWorkPlaceViewModel = hiltViewModel(),
) {
val toast = rememberToast()
Expand Down Expand Up @@ -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(
Expand All @@ -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()
Expand All @@ -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))
},
)
}
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions feature/feature-mypage/src/main/java/com/comit/feature_mypage/utils/MyPageDeepLinkKeyUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ package com.comit.feature_mypage.utils

object MyPageDeepLinkKeyUtil {
const val EMAIL = "email"

const val WORK_PLACE = "work place"
}