[feature/#841] 마이페이지 compose 리팩토링 #854
Open
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
|
s9hn
approved these changes
Sep 18, 2024
| fun MyPageItem( | ||
| text: String, | ||
| modifier: Modifier = Modifier, | ||
| onButtonClick: () -> Unit = {} |
| import org.sopt.official.feature.mypage.model.MyPageUiModel | ||
|
|
||
| @Composable | ||
| fun MyPageSection(items: List<MyPageUiModel>) { |
There was a problem hiding this comment.
@ALL
해당 Composable은 항상 unstable 일 것 같은데, 저희 팀 List 사용에 대한 컨벤션이 있을까요?
There was a problem hiding this comment.
저희 List를 사용하지 않고, ImmutableList만 사용하고 있습니다:)
수정해야할 것 같네요
There was a problem hiding this comment.
kotlinx.collections.immutable 라이브러리를 implementation 하셔야합니다!
chattymin
approved these changes
Sep 18, 2024
Comment on lines
+47
to
+55
| paddingShape: Dp, | ||
| style: TextStyle, | ||
| paddingVertical: Dp, | ||
| @StringRes text: Int, | ||
| onButtonClick: () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| isEnabled: Boolean = true, | ||
| containerColor: Color = White, | ||
| contentColor: Color = Black |
There was a problem hiding this comment.
onButtonClick이라는 이름 보다는 개발자에게 익숙한 onClick을 하는건 어떨까요? 클릭되는 부분이 2개 이상이라면 이름을 지어주는게 좋지만, 하나만 있다면 익숙한 이름 네이밍이 사용하기 편할거같아요
There was a problem hiding this comment.
저는 매개변수를 받을 때 "해당값이 없다면 컴포넌트가 목적에 맞는 형태를 가질 수 없는가?"를 기준으로 옵셔널과 필수를 결정해요. 그렇기 때문에 대부분의 값은 저라면 옵셔널로 할 것 같습니다.
그리고 text라는 value를 받아오기 보다 Composable을 받아오는건 어떨까요? 이 컴포넌트를 호출하는 곳에서 Text에 대한 설정을 해준다면 더욱 재사용성이 좋을 것 같아요
Comment on lines
+53
to
+55
| .clickable { | ||
| onButtonClick() | ||
| }, |
There was a problem hiding this comment.
Suggested change
| .clickable { | |
| onButtonClick() | |
| }, | |
| .clickable ( onClick = onButtonClick ), |
아마 될거에요
Comment on lines
+182
to
+213
| Scaffold(modifier = Modifier | ||
| .background(SoptTheme.colors.background) | ||
| .fillMaxSize(), | ||
| topBar = { | ||
| MyPageTopBar( | ||
| title = R.string.toolbar_mypage, | ||
| onIconClick = { onBackPressedDispatcher.onBackPressed() } | ||
| ) | ||
| } | ||
| ) { innerPadding -> | ||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .padding(innerPadding) | ||
| .background(SoptTheme.colors.background) | ||
| .verticalScroll(scrollState) | ||
| ) { | ||
| Spacer(modifier = Modifier.height(20.dp)) | ||
| MyPageSection(items = serviceSectionItems) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| if (isAuthenticated) { | ||
| MyPageSection(items = notificationSectionItems) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| MyPageSection(items = soptampSectionItems) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| MyPageSection(items = etcSectionItems) | ||
| } else { | ||
| MyPageSection(items = etcLoginSectionItems) | ||
| } | ||
| Spacer(modifier = Modifier.height(32.dp)) | ||
| } | ||
| } |
There was a problem hiding this comment.
저는 Activity에는 Composable을 이용한 화면을 놔두기 보다는 따로 추출하는 편입니다.
Activity에서는 각종 처리들을 하고, Screen과 같은 Composable을 통한 View로서 분리해두는게 가독성이 좋고 나중에 추적하기가 편하다 생각해요
l2hyunwoo
reviewed
Sep 18, 2024
|
|
||
| @Composable | ||
| fun MyPageButton( | ||
| paddingShape: Dp, |
There was a problem hiding this comment.
Suggested change
| paddingShape: Dp, | |
| shape: Shape = RoundedCornerShape(10.dp) |
l2hyunwoo
reviewed
Sep 18, 2024
| fun MyPageButton( | ||
| paddingShape: Dp, | ||
| style: TextStyle, | ||
| paddingVertical: Dp, |
There was a problem hiding this comment.
Suggested change
| paddingVertical: Dp, | |
| contentPadding: Dp, |
l2hyunwoo
reviewed
Sep 18, 2024
| contentColor: Color = Black | ||
| ) { | ||
| Button( | ||
| contentPadding = PaddingValues(paddingVertical), |
There was a problem hiding this comment.
Suggested change
| contentPadding = PaddingValues(paddingVertical), | |
| contentPadding = PaddingValues(vertical = paddingVertical), |
l2hyunwoo
reviewed
Sep 18, 2024
| paddingShape: Dp, | ||
| style: TextStyle, | ||
| paddingVertical: Dp, | ||
| @StringRes text: Int, |
There was a problem hiding this comment.
content: @composable () -> Unit
l2hyunwoo
reviewed
Sep 18, 2024
| paddingVertical: Dp, | ||
| @StringRes text: Int, | ||
| onButtonClick: () -> Unit, | ||
| modifier: Modifier = Modifier, |
There was a problem hiding this comment.
Suggested change
| modifier: Modifier = Modifier, | |
| modifier: Modifier = Modifier.fillMaxWidth(), |
l2hyunwoo
reviewed
Sep 18, 2024
| ) { | ||
| Column( | ||
| modifier = modifier | ||
| .wrapContentSize() |
l2hyunwoo
reviewed
Sep 18, 2024
Comment on lines
+95
to
+99
| Row( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(horizontal = 7.dp) | ||
| ) { |
There was a problem hiding this comment.
Suggested change
| Row( | |
| modifier = Modifier | |
| .fillMaxWidth() | |
| .padding(horizontal = 7.dp) | |
| ) { | |
| Row( | |
| modifier = Modifier | |
| .fillMaxWidth() | |
| .padding(horizontal = 7.dp), | |
| horizontalArragnement = Arrangement.spacedBy(6.dp) | |
| ) { |
l2hyunwoo
reviewed
Sep 18, 2024
| Column( | ||
| modifier = modifier | ||
| .wrapContentSize() | ||
| .padding(horizontal = 25.dp) |
There was a problem hiding this comment.
Suggested change
| .padding(horizontal = 25.dp) | |
| .padding(horizontal = 25.dp) | |
| .padding(bottom = 12.dp, top =26.dp) |
l2hyunwoo
reviewed
Sep 18, 2024
| containerColor = Gray600, | ||
| contentColor = Gray10 | ||
| ) | ||
| Spacer(modifier = Modifier.width(6.dp)) |
There was a problem hiding this comment.
Suggested change
| Spacer(modifier = Modifier.width(6.dp)) |
l2hyunwoo
reviewed
Sep 18, 2024
| onButtonClick = onPositiveButtonClick, | ||
| ) | ||
| } | ||
| Spacer(modifier = Modifier.height(12.dp)) |
There was a problem hiding this comment.
Suggested change
| Spacer(modifier = Modifier.height(12.dp)) |
l2hyunwoo
reviewed
Sep 18, 2024
| ), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| ) { | ||
| Spacer(modifier = Modifier.height(26.dp)) |
There was a problem hiding this comment.
Suggested change
| Spacer(modifier = Modifier.height(26.dp)) |
l2hyunwoo
reviewed
Sep 18, 2024
| fun MyPageSection(items: List<MyPageUiModel>) { | ||
| Column( | ||
| modifier = Modifier | ||
| .padding(horizontal = 20.dp) |
There was a problem hiding this comment.
Suggested change
| .padding(horizontal = 20.dp) | |
| .padding(horizontal = 20.dp) | |
| .padding(top = 16.dp, bottom = 5.dp) |
l2hyunwoo
reviewed
Sep 18, 2024
| @Composable | ||
| fun MyPageTopBar( | ||
| @StringRes title: Int, | ||
| onIconClick: () -> Unit, |
There was a problem hiding this comment.
Suggested change
| onIconClick: () -> Unit, | |
| onNavigationIconClick: () -> Unit, |
l2hyunwoo
reviewed
Sep 18, 2024
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Composable | ||
| fun MyPageTopBar( | ||
| @StringRes title: Int, |
There was a problem hiding this comment.
Suggested change
| @StringRes title: Int, | |
| title: String, |
l2hyunwoo
reviewed
Sep 18, 2024
|
|
||
| enum class ResultCode { | ||
| LOG_IN | ||
| } | ||
|
|
||
| @AndroidEntryPoint | ||
| class MyPageActivity : AppCompatActivity() { | ||
| private val binding by viewBinding(ActivityMyPageBinding::inflate) |
l2hyunwoo
reviewed
Sep 18, 2024
Comment on lines
72
to
74
| enum class ResultCode { | ||
| LOG_IN | ||
| } |
l2hyunwoo
reviewed
Sep 18, 2024
|
|
||
| sealed interface MyPageUiState { | ||
| data object UnInitialized : MyPageUiState | ||
| data class User(val activeState: UserActiveState) : MyPageUiState | ||
| data class Dialog(val action: MyPageAction) : MyPageUiState |
l2hyunwoo
reviewed
Sep 18, 2024
Comment on lines
58
to
59
| val userActiveState = _userActiveState.filterIsInstance<MyPageUiState.User>() | ||
| .map { it.activeState != UserActiveState.UNAUTHENTICATED } |
There was a problem hiding this comment.
Suggested change
| val userActiveState = _userActiveState.filterIsInstance<MyPageUiState.User>() | |
| .map { it.activeState != UserActiveState.UNAUTHENTICATED } | |
| val userActiveState = _userActiveState.filterIsInstance<MyPageUiState.User>() | |
| .map { it.activeState != UserActiveState.UNAUTHENTICATED } | |
| .stateIn(~) |
l2hyunwoo
reviewed
Sep 18, 2024
| private val _userActiveState = MutableStateFlow<MyPageUiState>(MyPageUiState.UnInitialized) | ||
| val userActiveState = _userActiveState.filterIsInstance<MyPageUiState.User>() | ||
| .map { it.activeState != UserActiveState.UNAUTHENTICATED } | ||
|
|
||
| private val _dialogState: MutableStateFlow<MyPageUiState> = MutableStateFlow(MyPageUiState.UnInitialized) | ||
| val dialogState: StateFlow<MyPageUiState> get() = _dialogState.asStateFlow() |
There was a problem hiding this comment.
Suggested change
| val dialogState: StateFlow<MyPageUiState> get() = _dialogState.asStateFlow() | |
| val dialogState: StateFlow<MyPageUiState> = _dialogState.asStateFlow() |
l2hyunwoo
reviewed
Sep 18, 2024
|
|
||
| initNotificationSettingClickListener() | ||
| } | ||
| val serviceSectionItems = listOf( |
There was a problem hiding this comment.
Suggested change
| val serviceSectionItems = listOf( | |
| val serviceSectionItems = remember { persistentListOf( |
l2hyunwoo
reviewed
Sep 18, 2024
Comment on lines
55
to
+56
| ) : ViewModel() { | ||
|
|
There was a problem hiding this comment.
Suggested change
| ) : ViewModel() { | |
| savedStateHandle: SavedStateHandle | |
| ) : ViewModel() { | |
| private val userActiveState = savedStateHandle.get<UserActiveState>("args")?.userActiveState | |
l2hyunwoo
reviewed
Sep 18, 2024
Comment on lines
+160
to
164
| LaunchedEffect(Unit) { | ||
| args?.userActiveState?.let { | ||
| viewModel.setUserActiveState(MyPageUiState.User(it)) | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| LaunchedEffect(Unit) { | |
| args?.userActiveState?.let { | |
| viewModel.setUserActiveState(MyPageUiState.User(it)) | |
| } | |
| } |
l2hyunwoo
approved these changes
Sep 18, 2024
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.
Issue
What is this issue?
Reference
회원
Screen_Recording_20240918_075028_SOPT.DEBUG.mp4
비회원