Skip to content

Commit c0ab8ac

Browse files
authored
Merge pull request #209 from depromeet/fix/bus-course-focus
[#208] : 홈, 토스트, 버스 경로 디자인 QA 적용
2 parents 0c2ce71 + bab1f67 commit c0ab8ac

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

app/src/main/java/com/depromeet/team6/presentation/ui/bus/component/BusStationItem.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import com.depromeet.team6.domain.model.BusStatus
3131
import com.depromeet.team6.domain.model.course.TransportType
3232
import com.depromeet.team6.presentation.ui.common.text.AtChaRemainTimeText
3333
import com.depromeet.team6.presentation.util.view.TransportTypeUiMapper
34+
import com.depromeet.team6.ui.theme.Team6Theme
3435
import com.depromeet.team6.ui.theme.defaultTeam6Colors
3536
import com.depromeet.team6.ui.theme.defaultTeam6Typography
3637

@@ -56,8 +57,15 @@ fun BusStationItem(
5657
afterTurnPoint -> 0.3f to 0.3f
5758
else -> 1f to 1f
5859
}
60+
val backgroundModifier = if (isCurrentStation) {
61+
modifier.background(
62+
color = Team6Theme.colors.gray930
63+
)
64+
} else {
65+
modifier
66+
}
5967
Row(
60-
modifier = modifier
68+
modifier = backgroundModifier
6169
.fillMaxWidth()
6270
.height(IntrinsicSize.Min),
6371
verticalAlignment = Alignment.CenterVertically

app/src/main/java/com/depromeet/team6/presentation/ui/home/HomeScreen.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,6 @@ fun HomeScreen(
630630
.fillMaxSize()
631631
.background(color = colors.black)
632632
.padding(
633-
top = WindowInsets.statusBars.asPaddingValues().calculateTopPadding(),
634633
bottom = padding.calculateBottomPadding()
635634
)
636635
) {
@@ -639,7 +638,7 @@ fun HomeScreen(
639638
contentDescription = stringResource(R.string.mypage_icon_description),
640639
modifier = Modifier
641640
.align(Alignment.TopEnd)
642-
.padding(top = 12.dp, end = 16.dp)
641+
.padding(top = WindowInsets.statusBars.asPaddingValues().calculateTopPadding() + 12.dp, end = 16.dp)
643642
.clickable {
644643
navigateToMypage()
645644
}

app/src/main/java/com/depromeet/team6/presentation/util/toast/AtChaToastMessage.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fun atChaToastMessage(
4444
}
4545

4646
layout.postDelayed({
47-
val slideUp = TranslateAnimation(0f, 0f, 0f, -layout.height.toFloat()).apply {
47+
val slideUp = TranslateAnimation(0f, 0f, 0f, -(layout.height + yOffsetPx).toFloat()).apply {
4848
duration = 500L
4949
fillAfter = true
5050
}

0 commit comments

Comments
 (0)