diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt index 2f536ea4..b801528e 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt @@ -27,6 +27,7 @@ import androidx.compose.material.icons.filled.Whatshot import androidx.compose.material.icons.outlined.FavoriteBorder import androidx.compose.material.icons.outlined.NewReleases import androidx.compose.material.icons.outlined.Whatshot +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -34,6 +35,7 @@ import androidx.compose.material3.Scaffold import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar import androidx.compose.material3.windowsizeclass.WindowSizeClass import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -44,6 +46,7 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource @@ -76,14 +79,13 @@ import dev.msfjarvis.claw.android.ui.rememberPostActions import dev.msfjarvis.claw.android.viewmodel.ClawViewModel import dev.msfjarvis.claw.common.comments.CommentsPage import dev.msfjarvis.claw.common.comments.HTMLConverter -import dev.msfjarvis.claw.common.ui.decorations.ClawAppBar import dev.msfjarvis.claw.common.urllauncher.UrlLauncher import dev.msfjarvis.claw.common.user.UserProfile import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentMapOf import kotlinx.coroutines.launch -@OptIn(ExperimentalComposeUiApi::class) +@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class) @Composable fun LobstersPostsScreen( urlLauncher: UrlLauncher, @@ -155,7 +157,8 @@ fun LobstersPostsScreen( Scaffold( topBar = { - ClawAppBar( + TopAppBar( + modifier = Modifier.shadow(8.dp), navigationIcon = { if ( navController.previousBackStackEntry != null && diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt deleted file mode 100644 index aa3bc2ac..00000000 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright © 2021-2024 Harsh Shandilya. - * Use of this source code is governed by an MIT-style - * license that can be found in the LICENSE file or at - * https://opensource.org/licenses/MIT. - */ -package dev.msfjarvis.claw.common.ui.decorations - -import androidx.compose.foundation.layout.RowScope -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.shadow -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.dp -import dev.msfjarvis.claw.common.theme.LobstersTheme -import dev.msfjarvis.claw.common.ui.preview.DevicePreviews -import dev.msfjarvis.claw.common.ui.preview.ThemePreviews - -@Composable -@OptIn(ExperimentalMaterial3Api::class) -fun ClawAppBar( - modifier: Modifier = Modifier, - navigationIcon: @Composable () -> Unit = {}, - title: @Composable () -> Unit = {}, - actions: @Composable RowScope.() -> Unit = {}, -) { - TopAppBar( - title = title, - modifier = modifier.shadow(8.dp), - navigationIcon = navigationIcon, - actions = actions, - ) -} - -@DevicePreviews -@ThemePreviews -@Composable -private fun ClawAppBarPreview() { - LobstersTheme { ClawAppBar(title = { Text("Claw", fontWeight = FontWeight.Bold) }) } -}