diff --git a/core/designsystem/src/main/kotlin/team/ppac/designsystem/component/toolbar/Toolbar.kt b/core/designsystem/src/main/kotlin/team/ppac/designsystem/component/toolbar/Toolbar.kt index 99f338da..0e66fc41 100644 --- a/core/designsystem/src/main/kotlin/team/ppac/designsystem/component/toolbar/Toolbar.kt +++ b/core/designsystem/src/main/kotlin/team/ppac/designsystem/component/toolbar/Toolbar.kt @@ -35,14 +35,14 @@ fun FarmemeActionToolBar(onClickActionIcon: () -> Unit) { } @Composable -fun FarmemeBackToolBar(title: String, onClickBackIcon: () -> Unit) { +fun FarmemeBackToolBar(title: String, onBackIconClick: () -> Unit) { FarmemeToolbar( title = title, navigationIcon = { FarmemeIcon.Back( modifier = Modifier .size(20.dp) - .noRippleClickable(onClick = onClickBackIcon) + .noRippleClickable(onClick = onBackIconClick) ) } ) diff --git a/feature/detail/src/main/java/team/ppac/detail/DetailScreen.kt b/feature/detail/src/main/java/team/ppac/detail/DetailScreen.kt index 34ea4a7f..aec2ed4b 100644 --- a/feature/detail/src/main/java/team/ppac/detail/DetailScreen.kt +++ b/feature/detail/src/main/java/team/ppac/detail/DetailScreen.kt @@ -43,7 +43,7 @@ internal fun DetailScreen( topBar = { FarmemeBackToolBar( title = "밈 자세히 보기", - onClickBackIcon = onClickBackButton, + onBackIconClick = onClickBackButton, ) }, backgroundImage = { diff --git a/feature/detail/src/main/java/team/ppac/detail/DetailViewModel.kt b/feature/detail/src/main/java/team/ppac/detail/DetailViewModel.kt index 1dfa1a9f..02531163 100644 --- a/feature/detail/src/main/java/team/ppac/detail/DetailViewModel.kt +++ b/feature/detail/src/main/java/team/ppac/detail/DetailViewModel.kt @@ -68,8 +68,6 @@ class DetailViewModel @Inject constructor( } is DetailIntent.ClickBottomButton.Farmeme -> { - emitRefreshEventUseCase() - if (intent.isSavedMeme) { deleteSavedMeme() showSnackbar(message = "파밈을 취소했어요") @@ -82,6 +80,7 @@ class DetailViewModel @Inject constructor( } ) } + emitRefreshEventUseCase() } DetailIntent.CLickRetryButton -> { diff --git a/feature/mypage/src/main/java/team/ppac/mypage/MyPageScreen.kt b/feature/mypage/src/main/java/team/ppac/mypage/MyPageScreen.kt index ee58f6e0..686df15a 100644 --- a/feature/mypage/src/main/java/team/ppac/mypage/MyPageScreen.kt +++ b/feature/mypage/src/main/java/team/ppac/mypage/MyPageScreen.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -68,7 +69,7 @@ internal fun MyPageScreen( }, ) - LaunchedEffect(key1 = savedMemeEventFlow) { + LaunchedEffect(key1 = Unit) { savedMemeEventFlow.collect { event -> when (event) { SavedMemeEvent.Refresh -> savedMemes.refresh() @@ -100,6 +101,7 @@ internal fun MyPageScreen( } else { Column( modifier = Modifier + .navigationBarsPadding() .padding(bottom = TabBarHeight) .verticalScroll(rememberScrollState()), horizontalAlignment = Alignment.CenterHorizontally, @@ -132,7 +134,6 @@ internal fun MyPageScreen( }, ) } - Spacer(modifier = Modifier.height(50.dp)) } MyPagePullRefreshIndicator( isRefreshing = uiState.isRefreshing, diff --git a/feature/mypage/src/main/java/team/ppac/mypage/component/MyPageLevelBox.kt b/feature/mypage/src/main/java/team/ppac/mypage/component/MyPageLevelBox.kt index 146df49e..867df118 100644 --- a/feature/mypage/src/main/java/team/ppac/mypage/component/MyPageLevelBox.kt +++ b/feature/mypage/src/main/java/team/ppac/mypage/component/MyPageLevelBox.kt @@ -32,7 +32,7 @@ internal fun MyPageLevelBox( modifier = modifier .clip(FarmemeRadius.Radius20.shape) .border( - width = 2.dp, + width = 1.dp, color = FarmemeTheme.borderColor.tertiary, shape = FarmemeRadius.Radius20.shape, ) @@ -44,7 +44,7 @@ internal fun MyPageLevelBox( Spacer( modifier = Modifier .fillMaxWidth() - .height(2.dp) + .height(1.dp) .background(FarmemeTheme.borderColor.tertiary) ) MyPageLevelBottom( diff --git a/feature/mypage/src/main/java/team/ppac/mypage/component/SavedMemeContent.kt b/feature/mypage/src/main/java/team/ppac/mypage/component/SavedMemeContent.kt index c6194704..a7e5293f 100644 --- a/feature/mypage/src/main/java/team/ppac/mypage/component/SavedMemeContent.kt +++ b/feature/mypage/src/main/java/team/ppac/mypage/component/SavedMemeContent.kt @@ -64,7 +64,7 @@ private fun SavedMemeList( LazyVerticalStaggeredGrid( modifier = modifier .fillMaxWidth() - .heightIn(max = (FARMEME_MEME_ITEM_MAX_HEIGHT * savedMemes.itemCount / 2).dp) + .heightIn(max = (FARMEME_MEME_ITEM_MAX_HEIGHT * savedMemes.itemCount).dp) .wrapContentHeight(), userScrollEnabled = false, columns = StaggeredGridCells.Fixed(2), diff --git a/feature/search/src/main/java/team/ppac/search/detail/SearchDetailScreen.kt b/feature/search/src/main/java/team/ppac/search/detail/SearchDetailScreen.kt index 137dd4a4..75491ec1 100644 --- a/feature/search/src/main/java/team/ppac/search/detail/SearchDetailScreen.kt +++ b/feature/search/src/main/java/team/ppac/search/detail/SearchDetailScreen.kt @@ -54,7 +54,7 @@ internal fun SearchDetailScreen( Column { FarmemeBackToolBar( title = uiState.memeCategory, - onClickBackIcon = onBackClick + onBackIconClick = onBackClick ) Divider( modifier = Modifier.fillMaxWidth(), diff --git a/feature/setting/src/main/java/team/ppac/setting/SettingScreen.kt b/feature/setting/src/main/java/team/ppac/setting/SettingScreen.kt index 2b7bbe2b..9a4b3ecb 100644 --- a/feature/setting/src/main/java/team/ppac/setting/SettingScreen.kt +++ b/feature/setting/src/main/java/team/ppac/setting/SettingScreen.kt @@ -67,7 +67,7 @@ internal fun SettingScreen( item { FarmemeBackToolBar( title = "설정", - onClickBackIcon = { + onBackIconClick = { viewModel.intent(SettingIntent.ClickBackButton) }, ) diff --git a/feature/setting/src/main/java/team/ppac/setting/SettingViewModel.kt b/feature/setting/src/main/java/team/ppac/setting/SettingViewModel.kt index 63dd27b3..9fc343e2 100644 --- a/feature/setting/src/main/java/team/ppac/setting/SettingViewModel.kt +++ b/feature/setting/src/main/java/team/ppac/setting/SettingViewModel.kt @@ -22,7 +22,7 @@ class SettingViewModel @Inject constructor( override suspend fun handleIntent(intent: SettingIntent) { when (intent) { - SettingIntent.ClickBackButton -> onClickBackButton() + SettingIntent.ClickBackButton -> onBackButtonClick() SettingIntent.ClickPrivacyPolicy -> postSideEffect(SettingSideEffect.NavigateToPrivacyPolicy) is SettingIntent.UpdateButtonVisible -> reduce { copy(updateButtonVisible = intent.isVisible) @@ -30,7 +30,7 @@ class SettingViewModel @Inject constructor( } } - private fun onClickBackButton() { + private fun onBackButtonClick() { postSideEffect(SettingSideEffect.NavigateToBack) } } \ No newline at end of file diff --git a/feature/setting/src/main/java/team/ppac/setting/policy/PrivacyPolicyScreen.kt b/feature/setting/src/main/java/team/ppac/setting/policy/PrivacyPolicyScreen.kt index 51666c1f..c1aa73da 100644 --- a/feature/setting/src/main/java/team/ppac/setting/policy/PrivacyPolicyScreen.kt +++ b/feature/setting/src/main/java/team/ppac/setting/policy/PrivacyPolicyScreen.kt @@ -29,7 +29,7 @@ internal fun PrivacyPolicyScreen( topBar = { FarmemeBackToolBar( title = "개인정보 처리방침", - onClickBackIcon = navigateToBack, + onBackIconClick = navigateToBack, ) } ) {