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

Add option to disable showing the bottom navigation bar #412

Merged
merged 2 commits into from
Jun 5, 2023
Merged

Add option to disable showing the bottom navigation bar #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf94854
Add option to disable showing the bottom navigation bar
twizmwazin Jun 4, 2023
d833e25
Merge branch 'main' into disable-nav-bar
dessalines Jun 5, 2023
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
1 change: 1 addition & 0 deletions app/src/main/java/com/jerboa/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ class MainActivity : ComponentActivity() {

InboxActivity(
navController = navController,
appSettingsViewModel = appSettingsViewModel,
inboxViewModel = inboxViewModel,
accountViewModel = accountViewModel,
homeViewModel = homeViewModel,
Expand Down
18 changes: 17 additions & 1 deletion app/src/main/java/com/jerboa/db/AppDB.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ data class AppSettings(
defaultValue = "0",
)
val postViewMode: Int,
@ColumnInfo(
name = "show_bottom_nav",
defaultValue = "1",
)
val showBottomNav: Boolean,
)

@Dao
Expand Down Expand Up @@ -287,8 +292,18 @@ val MIGRATION_8_9 = object : Migration(8, 9) {
}
}

val MIGRATION_9_10 = object : Migration(9, 10) {
override fun migrate(database: SupportSQLiteDatabase) {
// Add show_bottom_nav column
database.execSQL(UPDATE_APP_CHANGELOG_UNVIEWED)
database.execSQL(
"ALTER TABLE AppSettings add column show_bottom_nav INTEGER NOT NULL default 1",
)
}
}

@Database(
version = 9,
version = 10,
entities = [Account::class, AppSettings::class],
exportSchema = true,
)
Expand Down Expand Up @@ -321,6 +336,7 @@ abstract class AppDB : RoomDatabase() {
MIGRATION_6_7,
MIGRATION_7_8,
MIGRATION_8_9,
MIGRATION_9_10,
)
// Necessary because it can't insert data on creation
.addCallback(object : Callback() {
Expand Down
180 changes: 92 additions & 88 deletions app/src/main/java/com/jerboa/ui/components/common/AppBars.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import com.jerboa.datatypes.api.GetUnreadCountResponse
import com.jerboa.datatypes.samplePersonSafe
import com.jerboa.datatypes.samplePost
import com.jerboa.db.Account
import com.jerboa.db.AppSettings
import com.jerboa.loginFirstToast
import com.jerboa.siFormat
import com.jerboa.ui.components.person.PersonProfileLink
Expand Down Expand Up @@ -76,6 +77,7 @@ fun SimpleTopAppBar(
@Composable
fun BottomAppBarAll(
navController: NavController = rememberNavController(),
appSettings: AppSettings? = null,
Copy link
Member

@dessalines dessalines Jun 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since showBottomNav is the only one that's necessary, just pass that in rather than all the settings. If it needs more settings in the future, we can pass in the whole thing.

screen: String,
unreadCounts: GetUnreadCountResponse? = null,
onClickSaved: () -> Unit,
Expand All @@ -84,98 +86,100 @@ fun BottomAppBarAll(
) {
val totalUnreads = unreadCounts?.let { unreadCountTotal(it) }

BottomAppBar {
NavigationBarItem(
icon = {
if (screen == "home") {
Icon(
imageVector = Icons.Filled.Home,
tint = MaterialTheme.colorScheme.primary,
contentDescription = "TODO",
)
} else {
Icon(
imageVector = Icons.Outlined.Home,
contentDescription = "TODO",
)
}
},
selected = false,
onClick = {
navController.navigate("home")
},
)
if (appSettings?.showBottomNav != false) {
BottomAppBar {
NavigationBarItem(
icon = {
if (screen == "home") {
Icon(
imageVector = Icons.Filled.Home,
tint = MaterialTheme.colorScheme.primary,
contentDescription = "TODO",
)
} else {
Icon(
imageVector = Icons.Outlined.Home,
contentDescription = "TODO",
)
}
},
selected = false,
onClick = {
navController.navigate("home")
},
)

NavigationBarItem(
icon = {
Icon(
imageVector = Icons.Outlined.List,
contentDescription = "TODO",
)
},
onClick = {
navController.navigate("communityList")
},
selected = screen == "communityList",
)
NavigationBarItem(
icon = {
if (screen == "inbox") {
InboxIconAndBadge(
iconBadgeCount = totalUnreads,
icon = Icons.Filled.Email,
tint = MaterialTheme.colorScheme.primary,
)
} else {
InboxIconAndBadge(
iconBadgeCount = totalUnreads,
icon = Icons.Outlined.Email,
)
}
},
onClick = {
onClickInbox()
},
selected = false,
)
NavigationBarItem(
icon = {
if (screen == "saved") {
Icon(
imageVector = Icons.Filled.Bookmarks,
tint = MaterialTheme.colorScheme.primary,
contentDescription = "TODO",
)
} else {
Icon(
imageVector = Icons.Outlined.Bookmarks,
contentDescription = "TODO",
)
}
},
onClick = {
onClickSaved()
},
selected = false,
)
NavigationBarItem(
icon = {
if (screen == "profile") {
Icon(
imageVector = Icons.Filled.Person,
tint = MaterialTheme.colorScheme.primary,
contentDescription = "TODO",
)
} else {
NavigationBarItem(
icon = {
Icon(
imageVector = Icons.Outlined.Person,
imageVector = Icons.Outlined.List,
contentDescription = "TODO",
)
}
},
onClick = onClickProfile,
selected = false,
)
},
onClick = {
navController.navigate("communityList")
},
selected = screen == "communityList",
)
NavigationBarItem(
icon = {
if (screen == "inbox") {
InboxIconAndBadge(
iconBadgeCount = totalUnreads,
icon = Icons.Filled.Email,
tint = MaterialTheme.colorScheme.primary,
)
} else {
InboxIconAndBadge(
iconBadgeCount = totalUnreads,
icon = Icons.Outlined.Email,
)
}
},
onClick = {
onClickInbox()
},
selected = false,
)
NavigationBarItem(
icon = {
if (screen == "saved") {
Icon(
imageVector = Icons.Filled.Bookmarks,
tint = MaterialTheme.colorScheme.primary,
contentDescription = "TODO",
)
} else {
Icon(
imageVector = Icons.Outlined.Bookmarks,
contentDescription = "TODO",
)
}
},
onClick = {
onClickSaved()
},
selected = false,
)
NavigationBarItem(
icon = {
if (screen == "profile") {
Icon(
imageVector = Icons.Filled.Person,
tint = MaterialTheme.colorScheme.primary,
contentDescription = "TODO",
)
} else {
Icon(
imageVector = Icons.Outlined.Person,
contentDescription = "TODO",
)
}
},
onClick = onClickProfile,
selected = false,
)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/jerboa/ui/components/community/CommunityActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ fun CommunityActivity(
},
bottomBar = {
BottomAppBarAll(
appSettings = appSettingsViewModel.appSettings.value,
screen = "communityList",
unreadCounts = homeViewModel.unreadCountResponse,
onClickProfile = {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/jerboa/ui/components/home/HomeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ fun HomeActivity(
},
bottomBar = {
BottomAppBarAll(
appSettings = appSettingsViewModel.appSettings.value,
screen = "home",
unreadCounts = homeViewModel.unreadCountResponse,
onClickProfile = {
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/jerboa/ui/components/inbox/InboxActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
import com.jerboa.*
import com.jerboa.db.Account
import com.jerboa.db.AccountViewModel
import com.jerboa.db.AppSettingsViewModel
import com.jerboa.ui.components.comment.mentionnode.CommentMentionNode
import com.jerboa.ui.components.comment.reply.CommentReplyViewModel
import com.jerboa.ui.components.comment.reply.ReplyItem
Expand All @@ -37,6 +38,7 @@ import kotlinx.coroutines.launch
@Composable
fun InboxActivity(
navController: NavController,
appSettingsViewModel: AppSettingsViewModel,
inboxViewModel: InboxViewModel,
homeViewModel: HomeViewModel,
accountViewModel: AccountViewModel,
Expand Down Expand Up @@ -107,6 +109,7 @@ fun InboxActivity(
},
bottomBar = {
BottomAppBarAll(
appSettings = appSettingsViewModel.appSettings.value,
screen = "inbox",
unreadCounts = homeViewModel.unreadCountResponse,
onClickProfile = {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/jerboa/ui/components/person/PersonProfileActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ fun PersonProfileActivity(
},
bottomBar = {
BottomAppBarAll(
appSettings = appSettingsViewModel.appSettings.value,
screen = bottomAppBarScreen,
unreadCounts = homeViewModel.unreadCountResponse,
onClickProfile = {
Expand Down
25 changes: 25 additions & 0 deletions app/src/main/java/com/jerboa/ui/components/settings/lookandfeel/LookAndFeelActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import com.alorma.compose.settings.storage.base.SettingValueState
import com.alorma.compose.settings.storage.base.rememberBooleanSettingState
import com.alorma.compose.settings.storage.base.rememberFloatSettingState
import com.alorma.compose.settings.storage.base.rememberIntSettingState
import com.alorma.compose.settings.ui.SettingsCheckbox
import com.alorma.compose.settings.ui.SettingsList
import com.alorma.compose.settings.ui.SettingsSlider
import com.jerboa.PostViewMode
Expand All @@ -45,6 +47,7 @@ fun LookAndFeelActivity(
?: DEFAULT_FONT_SIZE.toFloat(),
)
val postViewModeState = rememberIntSettingState(settings?.postViewMode ?: 0)
val showBottomNavState = rememberBooleanSettingState(settings?.showBottomNav ?: true)

val snackbarHostState = remember { SnackbarHostState() }

Expand Down Expand Up @@ -75,6 +78,7 @@ fun LookAndFeelActivity(
themeState,
themeColorState,
postViewModeState,
showBottomNavState,
)
},
)
Expand All @@ -98,6 +102,7 @@ fun LookAndFeelActivity(
themeState,
themeColorState,
postViewModeState,
showBottomNavState,
)
},
)
Expand All @@ -121,6 +126,7 @@ fun LookAndFeelActivity(
themeState,
themeColorState,
postViewModeState,
showBottomNavState,
)
},
)
Expand All @@ -144,6 +150,23 @@ fun LookAndFeelActivity(
themeState,
themeColorState,
postViewModeState,
showBottomNavState,
)
},
)
SettingsCheckbox(
state = showBottomNavState,
title = {
Text(text = "Show navigation bar")
},
onCheckedChange = {
updateAppSettings(
appSettingsViewModel,
fontSizeState,
themeState,
themeColorState,
postViewModeState,
showBottomNavState,
)
},
)
Expand All @@ -158,6 +181,7 @@ private fun updateAppSettings(
themeState: SettingValueState<Int>,
themeColorState: SettingValueState<Int>,
postViewModeState: SettingValueState<Int>,
showBottomNav: SettingValueState<Boolean>,
) {
appSettingsViewModel.update(
AppSettings(
Expand All @@ -167,6 +191,7 @@ private fun updateAppSettings(
themeColor = themeColorState.value,
viewedChangelog = appSettingsViewModel.appSettings.value?.viewedChangelog ?: 0,
postViewMode = postViewModeState.value,
showBottomNav = showBottomNav.value,
),
)
}