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

바텀내비게이션 더보기 탭 red dot 삭제 #248

Merged
merged 3 commits into from
Feb 3, 2024
Merged

바텀내비게이션 더보기 탭 red dot 삭제 #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
603d0d3
BottomNavigation 더보기 탭 reddot 삭제
eastshine2741 Feb 1, 2024
f30d8da
LecturesOfTablePage fillMaxSize 적용
eastshine2741 Feb 1, 2024
1b6d07b
lint
eastshine2741 Feb 1, 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
13 changes: 5 additions & 8 deletions app/src/main/java/com/wafflestudio/snutt2/views/logged_in/home/BottomNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import com.wafflestudio.snutt2.ui.SNUTTColors
internal fun BottomNavigation(
pageState: HomeItem,
onUpdatePageState: (HomeItem) -> Unit,
uncheckedNotification: Boolean,
) {
Row(
modifier = Modifier
Expand Down Expand Up @@ -94,13 +93,11 @@ internal fun BottomNavigation(
onUpdatePageState(HomeItem.Settings)
},
) {
IconWithAlertDot(uncheckedNotification && pageState != HomeItem.Settings) { centerAlignedModifier ->
HorizontalMoreIcon(
modifier = centerAlignedModifier.size(30.dp),
isSelected = pageState == HomeItem.Settings,
colorFilter = ColorFilter.tint(SNUTTColors.Black900),
)
}
HorizontalMoreIcon(
modifier = Modifier.size(30.dp),
isSelected = pageState == HomeItem.Settings,
colorFilter = ColorFilter.tint(SNUTTColors.Black900),
)
}
}
}
1 change: 0 additions & 1 deletion app/src/main/java/com/wafflestudio/snutt2/views/logged_in/home/HomePage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ fun HomePage() {
BottomNavigation(
pageState = pageController.homePageState.value,
onUpdatePageState = { pageController.update(it) },
uncheckedNotification = uncheckedNotification,
)
}
}
Expand Down
6 changes: 5 additions & 1 deletion ...c/main/java/com/wafflestudio/snutt2/views/logged_in/table_lectures/LecturesOfTablePage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ fun LecturesOfTablePage() {
val currentTable: TableDto? by viewModel.currentTable.collectAsState()
val lectureList = currentTable?.lectureList ?: emptyList()

Column(modifier = Modifier.background(SNUTTColors.White900)) {
Column(
modifier = Modifier
.background(SNUTTColors.White900)
.fillMaxSize(),
) {
SimpleTopBar(
title = stringResource(R.string.timetable_app_bar_title),
onClickNavigateBack = { navController.popBackStack() },
Expand Down
Loading