-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
[FIX/#50] 홈화면 QA 해결 #51
Merged
+90
−43
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
64d5f94
[FIX/#50] 아이콘 크기 수정
boiledEgg-s 37ed1ee
[FIX/#50] 바텀바 깜빡거림 수정
boiledEgg-s be5a817
[FIX/#50] 전체카테고리 재호출 문제 해결
boiledEgg-s 7d0f14d
[FIX/#50] 화면 전환 모션 수정
boiledEgg-s bac72bd
[DEL/#50] 미사용 라이브러리 삭제
boiledEgg-s ac5bc38
[MERGE/#50] Pulled develop
boiledEgg-s 26bd740
[FIX/#50] 프리뷰 오류 해결
boiledEgg-s File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,10 @@ | ||
package com.sopt.shinmungo.presentation.main.component | ||
|
||
import androidx.compose.animation.AnimatedVisibility | ||
import androidx.compose.animation.fadeIn | ||
import androidx.compose.animation.fadeOut | ||
import androidx.compose.animation.slideIn | ||
import androidx.compose.animation.slideOut | ||
import androidx.compose.foundation.background | ||
import androidx.compose.foundation.layout.Arrangement | ||
import androidx.compose.foundation.layout.Box | ||
|
@@ -24,10 +29,10 @@ import androidx.compose.ui.graphics.vector.ImageVector | |
import androidx.compose.ui.res.stringResource | ||
import androidx.compose.ui.res.vectorResource | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import androidx.compose.ui.unit.IntOffset | ||
import androidx.compose.ui.unit.dp | ||
import com.sopt.shinmungo.core.designsystem.theme.ShinMunGoTheme | ||
import com.sopt.shinmungo.core.extension.noRippleClickable | ||
import com.sopt.shinmungo.core.extension.showIf | ||
import com.sopt.shinmungo.presentation.main.MainTab | ||
|
||
/** | ||
|
@@ -54,38 +59,44 @@ fun MainBottomBars( | |
selectedColor: Color = ShinMunGoTheme.color.primary, | ||
unselectedColor: Color = ShinMunGoTheme.color.gray6, | ||
) { | ||
Card( | ||
elevation = CardDefaults.elevatedCardElevation(defaultElevation = 10.dp), | ||
shape = RectangleShape, | ||
modifier = Modifier.showIf(visibility) | ||
AnimatedVisibility( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Animation은 어렵다,, There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 그냥 if문 쓰면 바텀바가 깜박이는게 안없어지더라구요,, |
||
visible = visibility, | ||
enter = fadeIn() + slideIn { IntOffset(0, 0) }, | ||
exit = fadeOut() + slideOut { IntOffset(0, 0) } | ||
) { | ||
Row( | ||
Card( | ||
elevation = CardDefaults.elevatedCardElevation(defaultElevation = 10.dp), | ||
shape = RectangleShape, | ||
modifier = modifier | ||
.fillMaxWidth() | ||
.background(color = containerColor) | ||
.navigationBarsPadding() | ||
.padding(start = 37.dp, end = 37.dp, top = 8.dp, bottom = 31.dp), | ||
horizontalArrangement = Arrangement.SpaceBetween | ||
) { | ||
tabs.forEach { tab -> | ||
val selected = tab == selectedTab | ||
val color = if (selected) selectedColor else unselectedColor | ||
val icon = if (selected) tab.selectedIconRes else tab.unselectedIconRes | ||
Column( | ||
modifier = Modifier.noRippleClickable { onTabSelect(tab) }, | ||
horizontalAlignment = Alignment.CenterHorizontally | ||
) { | ||
Icon( | ||
imageVector = ImageVector.vectorResource(id = icon), | ||
contentDescription = stringResource(id = tab.title), | ||
tint = color | ||
) | ||
Spacer(modifier = Modifier.height(4.dp)) | ||
Text( | ||
text = stringResource(id = tab.title), | ||
style = ShinMunGoTheme.typography.caption6, | ||
color = color | ||
) | ||
Row( | ||
modifier = Modifier | ||
.fillMaxWidth() | ||
.background(color = containerColor) | ||
.navigationBarsPadding() | ||
.padding(start = 37.dp, end = 37.dp, top = 8.dp, bottom = 31.dp), | ||
horizontalArrangement = Arrangement.SpaceBetween | ||
) { | ||
tabs.forEach { tab -> | ||
val selected = tab == selectedTab | ||
val color = if (selected) selectedColor else unselectedColor | ||
val icon = if (selected) tab.selectedIconRes else tab.unselectedIconRes | ||
Column( | ||
modifier = Modifier.noRippleClickable { onTabSelect(tab) }, | ||
horizontalAlignment = Alignment.CenterHorizontally | ||
) { | ||
Icon( | ||
imageVector = ImageVector.vectorResource(id = icon), | ||
contentDescription = stringResource(id = tab.title), | ||
tint = color | ||
) | ||
Spacer(modifier = Modifier.height(4.dp)) | ||
Text( | ||
text = stringResource(id = tab.title), | ||
style = ShinMunGoTheme.typography.caption6, | ||
color = color | ||
) | ||
} | ||
} | ||
} | ||
} | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
애니메이션 삭제해서 문제를 해결한건가요??
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
그 부분은 메인화면에서 바텀바로 화면 전환할 때 fade 효과가 싫어서 없앤거에요!
QA 건이 아니라 그냥 제 개인적인 욕심에 의해 적용한겁니다ㅎㅎ