diff --git a/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageScreen.kt b/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageScreen.kt index cdbb1a94..b41030b7 100644 --- a/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageScreen.kt +++ b/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageScreen.kt @@ -95,7 +95,7 @@ internal fun MyPageScreen( myAlbumImageList = uiState.myAlbumImageList, onMoreBtnClick = onMoreBtnClick, onNavigateToMyAlbumImage = onNavigateToMyAlbumImage, - ) + ) } } @@ -117,7 +117,7 @@ internal fun MyPageContent( myAlbumImageList: List, onMoreBtnClick: () -> Unit, onNavigateToMyAlbumImage: (Int) -> Unit, - ) { +) { val span: (LazyGridItemSpanScope) -> GridItemSpan = { GridItemSpan(2) } val myAlbumCount = myAlbumImageList.size @@ -185,6 +185,7 @@ internal fun MyPageContentUser(albumImgCount: Int) { ) } } + @Composable internal fun MyPageContentEmpty() { Column( @@ -198,8 +199,7 @@ internal fun MyPageContentEmpty() { painter = painterResource(R.drawable.ic_no_img), contentDescription = "no image", contentScale = ContentScale.Fit, - modifier = Modifier - .size(100.dp) + modifier = Modifier.size(100.dp), ) Spacer(modifier = Modifier.height(12.dp)) Text( @@ -217,7 +217,7 @@ internal fun MyAlbumImage( onMoreBtnClick: () -> Unit, onNavigateToMyAlbumImage: (Int) -> Unit, index: Int, - ) { +) { Box( modifier = Modifier .clip(RoundedCornerShape(12.dp)) diff --git a/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageSideEffect.kt b/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageSideEffect.kt index 9c404f6f..b65806b7 100644 --- a/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageSideEffect.kt +++ b/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageSideEffect.kt @@ -1,4 +1,3 @@ package com.nexters.ilab.android.feature.mypage -interface MyPageSideEffect { -} +interface MyPageSideEffect diff --git a/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageState.kt b/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageState.kt index 80c1445c..18e9add2 100644 --- a/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageState.kt +++ b/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageState.kt @@ -1,10 +1,10 @@ package com.nexters.ilab.android.feature.mypage - -data class MyAlbum ( +data class MyAlbum( val myAlbumImage: List> = emptyList(), - val myAlbumKeyword: String = "" + val myAlbumKeyword: String = "", ) + data class MyPageState( val selectedMyAlbum: Int = 0, val myAlbumImageList: List = emptyList(), diff --git a/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageViewModel.kt b/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageViewModel.kt index 67ab31c0..21b3a834 100644 --- a/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageViewModel.kt +++ b/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageViewModel.kt @@ -13,7 +13,7 @@ class MyPageViewModel @Inject constructor() : ViewModel(), ContainerHost(MyPageState()) // for test - val DummyMyAlbumList: List = listOf( + val DummyMyAlbumList: List = listOf( MyAlbum(setDummyImageList(1), "몽환적인"), MyAlbum(setDummyImageList(2), "자연적인"), MyAlbum(setDummyImageList(3), "스케치"), @@ -44,7 +44,7 @@ class MyPageViewModel @Inject constructor() : ViewModel(), ContainerHost> { - return when(index) { + return when (index) { 1 -> listOf( "https://picsum.photos/id/49/1280/792" to "Created Image Example 1", "https://picsum.photos/id/53/1280/1280" to "Created Image Example 2", diff --git a/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/navigation/MyPageNavigation.kt b/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/navigation/MyPageNavigation.kt index 31fa46ce..e681de74 100644 --- a/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/navigation/MyPageNavigation.kt +++ b/feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/navigation/MyPageNavigation.kt @@ -47,7 +47,7 @@ fun NavGraphBuilder.myPageNavGraph( onSettingClick = onSettingClick, onNavigateToMyAlbumImage = onNavigateToMyAlbumImage, onShowErrorSnackBar = onShowErrorSnackBar, - viewModel = viewModel + viewModel = viewModel, ) }