Adding tablet UI for home

app/build.gradle.kts

@@ -16,14 +16,13 @@ plugins {
 apply(from = "update_instances.gradle.kts")
 
 android {
-    buildToolsVersion = "34.0.0"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.jerboa"
         namespace = "com.jerboa"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 77
         versionName = "0.0.77"
 
@@ -97,10 +96,6 @@ android {
     }
 }
 
-composeCompiler {
-    featureFlags = setOf(ComposeFeatureFlag.StrongSkipping)
-}
-
 baselineProfile {
     mergeIntoMain = true
     saveInSrc = true
@@ -111,19 +106,22 @@ dependencies {
     // Exporting / importing DB helper
     implementation("com.github.dessalines:room-db-export-import:0.1.0")
 
-    // Unfortunately, ui tooling, and the markdown thing, still brings in the other material2 dependencies
-    // This is the "official" composeBom, but it breaks the imageviewer until 1.7 is released. See:
-    // https://github.com/LemmyNet/jerboa/pull/1502#issuecomment-2137935525
-    // val composeBom = platform("androidx.compose:compose-bom:2024.05.00")
-
-    val composeBom = platform("dev.chrisbanes.compose:compose-bom:2024.08.00-alpha02")
+    // Compose BOM
+    val composeBom = platform("androidx.compose:compose-bom:2024.11.00")
     api(composeBom)
     implementation("androidx.activity:activity-ktx")
     implementation("androidx.activity:activity-compose")
     implementation("androidx.appcompat:appcompat:1.7.0")
     androidTestApi(composeBom)
     testImplementation("androidx.arch.core:core-testing:2.2.0")
 
+    // Adaptive layouts
+    // TODO still need the alphas for pane features
+    implementation("androidx.compose.material3.adaptive:adaptive:1.1.0-alpha06")
+    implementation("androidx.compose.material3.adaptive:adaptive-layout:1.1.0-alpha06")
+    implementation("androidx.compose.material3.adaptive:adaptive-navigation:1.1.0-alpha06")
+    implementation("androidx.compose.material3:material3-adaptive-navigation-suite")
+
     implementation("me.zhanghai.compose.preference:library:1.1.1")
 
     // Markdown support

app/src/main/java/com/jerboa/Utils.kt

@@ -1500,3 +1500,11 @@ fun Context.getVersionCode(): Int =
     }
 
 fun Int.toBool() = this > 0
+
+sealed interface SelectionVisibilityState<out Item> {
+    object NoSelection : SelectionVisibilityState<Nothing>
+
+    data class ShowSelection<Item>(
+        val selectedItem: Item,
+    ) : SelectionVisibilityState<Item>
+}

app/src/main/java/com/jerboa/model/PostViewModel.kt

@@ -49,7 +49,7 @@ import it.vercruysse.lemmyapi.dto.ListingType
 import kotlinx.coroutines.launch
 
 class PostViewModel(
-    val id: Either<PostId, CommentId>,
+    var id: Either<PostId, CommentId>,
 ) : ViewModel() {
     var postRes: ApiState<GetPostResponse> by mutableStateOf(ApiState.Empty)
         private set
@@ -79,6 +79,11 @@ class PostViewModel(
         this.getData()
     }
 
+    fun reInitializeWithNewId(id: Either<PostId, CommentId>) {
+        this.id = id
+        this.getData()
+    }
+
     fun updateSortType(sortType: CommentSortType) {
         this.sortType = sortType
     }

app/src/main/java/com/jerboa/ui/components/common/AccountHelpers.kt

@@ -27,6 +27,9 @@ fun getCurrentAccount(accountViewModel: AccountViewModel): Account {
     return acc
 }
 
+/**
+ * A special case of toEnumSafe, where the int still exists in the DB.
+ */
 fun getPostViewMode(appSettingsViewModel: AppSettingsViewModel): PostViewMode =
     getEnumFromIntSetting<PostViewMode>(appSettingsViewModel.appSettings) {
         it.postViewMode

app/src/main/java/com/jerboa/ui/components/common/AppBars.kt

@@ -1,7 +1,6 @@
 package com.jerboa.ui.components.common
 
 import android.annotation.SuppressLint
-import android.app.Activity
 import androidx.annotation.StringRes
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.animateFloatAsState
@@ -26,8 +25,9 @@ import androidx.compose.material.icons.filled.KeyboardArrowDown
 import androidx.compose.material.icons.filled.KeyboardArrowUp
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.*
+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScope
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -38,7 +38,6 @@ import androidx.compose.ui.draw.scale
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
@@ -112,99 +111,87 @@ fun SimpleTopAppBarPreview() {
     }
 }
 
-@Composable
-fun BottomAppBarAll(
+fun NavigationSuiteScope.adaptiveNavigationBar(
     selectedTab: NavTab,
-    onSelect: (NavTab) -> Unit,
+    onSelectTab: (NavTab) -> Unit,
     userViewType: UserViewType,
     unreadCounts: Long,
     unreadAppCount: Long?,
     unreadReportCount: Long?,
     showTextDescriptionsInNavbar: Boolean,
 ) {
-    // Check for preview mode
-    if (LocalContext.current is Activity) {
-        val window = (LocalContext.current as Activity).window
-        val colorScheme = MaterialTheme.colorScheme
-
-        DisposableEffect(Unit) {
-            window.navigationBarColor = colorScheme.surfaceContainer.toArgb()
-
-            onDispose {
-                window.navigationBarColor = colorScheme.background.toArgb()
-            }
+    for (tab in NavTab.getEntries(userViewType)) {
+        val selected = tab == selectedTab
+        val iconBadgeCount = when (tab) {
+            NavTab.Inbox -> unreadCounts
+            NavTab.RegistrationApplications -> unreadAppCount
+            NavTab.Reports -> unreadReportCount
+            else -> null
         }
-    }
-    // If descriptions are hidden, make the bar shorter
-    val modifier = if (showTextDescriptionsInNavbar) Modifier else Modifier.navigationBarsPadding().height(56.dp)
-    NavigationBar(
-        modifier = modifier,
-    ) {
-        for (tab in NavTab.getEntries(userViewType)) {
-            val selected = tab == selectedTab
-            val iconBadgeCount = when (tab) {
-                NavTab.Inbox -> unreadCounts
-                NavTab.RegistrationApplications -> unreadAppCount
-                NavTab.Reports -> unreadReportCount
-                else -> null
-            }
 
-            NavigationBarItem(
-                icon = {
-                    NavbarIconAndBadge(
-                        iconBadgeCount = iconBadgeCount,
-                        icon =
-                            if (selected) {
-                                tab.iconFilled
-                            } else {
-                                tab.iconOutlined
-                            },
-                        contentDescription = stringResource(tab.contentDescriptionId),
+        item(
+            icon = {
+                NavbarIconAndBadge(
+                    iconBadgeCount = iconBadgeCount,
+                    icon =
+                        if (selected) {
+                            tab.iconFilled
+                        } else {
+                            tab.iconOutlined
+                        },
+                    contentDescription = stringResource(tab.contentDescriptionId),
+                )
+            },
+            label = {
+                if (showTextDescriptionsInNavbar) {
+                    Text(
+                        textAlign = TextAlign.Center,
+                        fontSize = TextUnit(10f, TextUnitType.Sp),
+                        text = stringResource(tab.textId),
                     )
-                },
-                label = {
-                    if (showTextDescriptionsInNavbar) {
-                        Text(
-                            textAlign = TextAlign.Center,
-                            fontSize = TextUnit(10f, TextUnitType.Sp),
-                            text = stringResource(tab.textId),
-                        )
-                    }
-                },
-                selected = selected,
-                onClick = {
-                    onSelect(tab)
-                },
-            )
-        }
+                }
+            },
+            selected = selected,
+            onClick = {
+                onSelectTab(tab)
+            },
+        )
     }
 }
 
 @Preview
 @Composable
-fun BottomAppBarAllPreview() {
-    BottomAppBarAll(
-        selectedTab = NavTab.Home,
-        onSelect = {},
-        unreadCounts = 30,
-        unreadAppCount = 2,
-        unreadReportCount = 8,
-        userViewType = UserViewType.AdminOnly,
-        showTextDescriptionsInNavbar = true,
+fun AdaptiveNavigationBarPreview() {
+    NavigationSuiteScaffold(
+        navigationSuiteItems = {
+            adaptiveNavigationBar(
+                selectedTab = NavTab.Home,
+                onSelectTab = {},
+                unreadCounts = 30,
+                unreadAppCount = 2,
+                unreadReportCount = 8,
+                userViewType = UserViewType.AdminOnly,
+                showTextDescriptionsInNavbar = true,
+            )
+        },
     )
 }
 
 @Preview
 @Composable
-fun BottomAppBarAllNoDescriptionsPreview() {
-    BottomAppBarAll(
-        selectedTab = NavTab.Home,
-        onSelect = {},
-        unreadCounts = 30,
-        unreadAppCount = null,
-        unreadReportCount = null,
-        userViewType = UserViewType.Normal,
-        showTextDescriptionsInNavbar = false,
+fun AdaptiveNavigationBarNoDescriptionsPreview() {
+    NavigationSuiteScaffold(
+        navigationSuiteItems = {
+            adaptiveNavigationBar(
+                selectedTab = NavTab.Home,
+                onSelectTab = {},
+                unreadCounts = 30,
+                unreadAppCount = 2,
+                unreadReportCount = 8,
+                userViewType = UserViewType.AdminOnly,
+                showTextDescriptionsInNavbar = false,
+            )
+        },
     )
 }
 

app/src/main/java/com/jerboa/ui/components/common/DrawerItems.kt

@@ -97,3 +97,7 @@ fun IconAndTextDrawerItemWithMorePreview() {
         more = true,
     )
 }
+
+@Composable
+fun selectedItemContainerColor(selected: Boolean) =
+    if (!selected) MaterialTheme.colorScheme.surface else MaterialTheme.colorScheme.surfaceVariant

app/src/main/java/com/jerboa/ui/components/community/CommunityScreen.kt

@@ -25,6 +25,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import arrow.core.Either
 import com.jerboa.JerboaAppState
 import com.jerboa.R
+import com.jerboa.SelectionVisibilityState
 import com.jerboa.api.ApiState
 import com.jerboa.datatypes.BanFromCommunityData
 import com.jerboa.db.entity.isAnon
@@ -426,6 +427,7 @@ fun CommunityScreen(
                             postActionBarMode = postActionBarMode,
                             showPostAppendRetry = communityViewModel.postsRes is ApiState.AppendingFailure,
                             swipeToActionPreset = swipeToActionPreset,
+                            selectionState = SelectionVisibilityState.NoSelection,
                         )
                     }