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

[QA] 마이페이지 2차 QA 수정 #218

Merged
merged 4 commits into from
Aug 19, 2024
Merged

[QA] 마이페이지 2차 QA 수정 #218

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e1ed49
[Qa] 밈 단계 안내 박스 boder값 1로 조정
ze-zeh Aug 17, 2024
1ef96f5
[Qa] 밈이 잘려진 모습이니 정상적으로 보이도록 조정
ze-zeh Aug 17, 2024
6711bbc
[Qa] 저장/취소한 밈이 바로 적용이 안 되는 문제 수정
ze-zeh Aug 17, 2024
5492fd3
[Refactor] 함수명 & 변수명 변경
ze-zeh Aug 18, 2024
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
3 changes: 1 addition & 2 deletions feature/detail/src/main/java/team/ppac/detail/DetailViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ class DetailViewModel @Inject constructor(
}

is DetailIntent.ClickBottomButton.Farmeme -> {
emitRefreshEventUseCase()

if (intent.isSavedMeme) {
deleteSavedMeme()
showSnackbar(message = "파밈을 취소했어요")
Expand All @@ -82,6 +80,7 @@ class DetailViewModel @Inject constructor(
}
)
}
emitRefreshEventUseCase()
}

DetailIntent.CLickRetryButton -> {
Expand Down
5 changes: 3 additions & 2 deletions feature/mypage/src/main/java/team/ppac/mypage/MyPageScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -68,7 +69,7 @@ internal fun MyPageScreen(
},
)

LaunchedEffect(key1 = savedMemeEventFlow) {
LaunchedEffect(key1 = Unit) {
savedMemeEventFlow.collect { event ->
when (event) {
SavedMemeEvent.Refresh -> savedMemes.refresh()
Expand Down Expand Up @@ -100,6 +101,7 @@ internal fun MyPageScreen(
} else {
Column(
modifier = Modifier
.navigationBarsPadding()
.padding(bottom = TabBarHeight)
.verticalScroll(rememberScrollState()),
horizontalAlignment = Alignment.CenterHorizontally,
Expand Down Expand Up @@ -132,7 +134,6 @@ internal fun MyPageScreen(
},
)
}
Spacer(modifier = Modifier.height(50.dp))
}
MyPagePullRefreshIndicator(
isRefreshing = uiState.isRefreshing,
Expand Down
4 changes: 2 additions & 2 deletions feature/mypage/src/main/java/team/ppac/mypage/component/MyPageLevelBox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand All @@ -44,7 +44,7 @@ internal fun MyPageLevelBox(
Spacer(
modifier = Modifier
.fillMaxWidth()
.height(2.dp)
.height(1.dp)
.background(FarmemeTheme.borderColor.tertiary)
)
MyPageLevelBottom(
Expand Down
2 changes: 1 addition & 1 deletion feature/mypage/src/main/java/team/ppac/mypage/component/SavedMemeContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading