#138: 로그인후 이용제한 확인하기 #144
Merged
#138: 로그인후 이용제한 확인하기 #144
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…m-1-Android into feature/flash159483/#138 # Conflicts: # app/src/main/kotlin/com/bff/wespot/MainActivity.kt # app/src/main/kotlin/com/bff/wespot/viewmodel/MainViewModel.kt
jeongjaino
approved these changes
Aug 28, 2024
Comment on lines
+453
to
+605
| text = stringResource(com.bff.wespot.auth.R.string.confirm), | ||
| paddingValues = PaddingValues( | ||
| start = 0.dp, | ||
| end = 0.dp, | ||
| top = 24.dp, | ||
| bottom = 10.dp | ||
| ), | ||
| ) { | ||
| it.invoke() | ||
| } | ||
| } else { | ||
| Row( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(top = 20.dp), | ||
| horizontalArrangement = Arrangement.spacedBy(10.dp), | ||
| ) { | ||
| Box(modifier = Modifier.weight(1f)) { | ||
| WSButton( | ||
| onClick = { | ||
| coroutineScope.launch { | ||
| bottomSheetState.hide() | ||
| } | ||
| }, | ||
| buttonType = WSButtonType.Secondary, | ||
| text = stringResource(R.string.close), | ||
| paddingValues = PaddingValues(0.dp), | ||
| ) { | ||
| it() | ||
| } | ||
| } | ||
|
|
||
| Box(modifier = Modifier.weight(1f)) { | ||
| WSButton( | ||
| onClick = { | ||
| navigator.navigateToWebLink(context, state.kakaoChannel) | ||
| }, | ||
| text = stringResource(com.bff.wespot.R.string.one_on_one), | ||
| paddingValues = PaddingValues(0.dp), | ||
| ) { | ||
| it() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| private fun BulletPoint(text: String) { | ||
| Row( | ||
| horizontalArrangement = Arrangement.spacedBy(6.dp) | ||
| ) { | ||
| Text( | ||
| text = "•", | ||
| style = StaticTypeScale.Default.body6, | ||
| color = WeSpotThemeManager.colors.txtSubColor, | ||
| ) | ||
|
|
||
| Text( | ||
| text = text, | ||
| style = StaticTypeScale.Default.body6, | ||
| color = WeSpotThemeManager.colors.txtSubColor, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private enum class RestrictionContent( | ||
| @StringRes val title: Int, | ||
| @StringRes val body1: Int, | ||
| @StringRes val body2: Int, | ||
| @StringRes val body3: Int, | ||
| @StringRes val body4: Int? = null, | ||
| val buttonNumber: Int = 1, | ||
| ) { | ||
| TYPE1( | ||
| com.bff.wespot.R.string.restriction_title, | ||
| com.bff.wespot.R.string.restriction_type1_body1, | ||
| com.bff.wespot.R.string.restriction_type1_body2, | ||
| com.bff.wespot.R.string.restriction_type1_body3, | ||
| com.bff.wespot.R.string.restriction_type1_body4, | ||
| ), | ||
|
|
||
| TYPE2( | ||
| com.bff.wespot.R.string.restriction_title, | ||
| com.bff.wespot.R.string.restriction_type1_body1, | ||
| com.bff.wespot.R.string.restriction_type2_body2, | ||
| com.bff.wespot.R.string.restriction_type2_body3, | ||
| ), | ||
|
|
||
| TYPE3( | ||
| com.bff.wespot.R.string.restriction_title, | ||
| com.bff.wespot.R.string.restriction_type1_body1, | ||
| com.bff.wespot.R.string.restriction_type3_body2, | ||
| com.bff.wespot.R.string.restriction_type3_body3, | ||
| null, | ||
| 2, | ||
| ); | ||
| } |
There was a problem hiding this comment.
MainActivity가 계속계속 커지는 느낌이라, 따로 앱 모듈 내에 component 패키지 만들어서 컴포저블 함수 옮기는 건 어떨까요 ??
Comment on lines
141
to
147
| LazyColumn { | ||
| items(pagingData.itemCount, key = { index -> | ||
| pagingData[index]?.id ?: index | ||
| }) { index -> | ||
| items( | ||
| pagingData.itemCount, | ||
| key = pagingData.itemKey { it.id }, | ||
| ) { index -> | ||
| val school = pagingData[index] | ||
|
|
github-actions
bot
added
the
🌟머지 해주세요🌟
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
1. 📄 관련된 이슈 및 소개
close #138
2. 🔥 변경된 점
이용제한을 확인하는 로직이 추가됐어요
3. ✅ 필수 체크 사항
4. 📸 작업물 사진 공유(선택)
untitled.webm
5. 💡알게된 혹은 궁금한 사항