Align UI of DetailScreens

2023-09-19 09:25:54 +02:00 · 2023-09-19 09:25:54 +02:00 · c8d6bfe4ef
commit c8d6bfe4ef
parent 1ec6c06974
9 changed files with 18 additions and 6 deletions
--- a/app/src/main/java/com/pixelized/rplexicon/MainActivity.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/MainActivity.kt
@ -37,9 +37,6 @@ val LocalActivity = staticCompositionLocalOf<Activity> {
 val LocalSnack = staticCompositionLocalOf<SnackbarHostState> {
    error("SnackbarHostState not available")
 }
-val RollSnack = staticCompositionLocalOf<SnackbarHostState> {
-    error("SnackbarHostState not available")
-}
 val LocalRollOverlay = compositionLocalOf<BlurredRollOverlayHostState> {
    error("LocalRollOverlay not yet ready")
 }
--- a/app/src/main/java/com/pixelized/rplexicon/ui/navigation/HomeNavHost.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/navigation/HomeNavHost.kt
@ -18,6 +18,7 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@ -59,6 +60,7 @@ fun HomeNavHost(
        Scaffold(
            topBar = {
                TopAppBar(
+                    modifier = Modifier.shadow(elevation = 4.dp),
                    title = {
                        Text(text = stringResource(id = R.string.app_name))
                    },
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/CharacterSheetScreen.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/CharacterSheetScreen.kt
@ -38,6 +38,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.graphicsLayer
@ -201,6 +202,7 @@ private fun CharacterSheetContent(
        contentWindowInsets = NO_WINDOW_INSETS,
        topBar = {
            TopAppBar(
+                modifier = Modifier.shadow(elevation = 4.dp),
                navigationIcon = {
                    IconButton(onClick = onBack) {
                        Icon(
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/lexicon/detail/LexiconDetailScreen.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/lexicon/detail/LexiconDetailScreen.kt
@ -36,6 +36,7 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shadow
@ -192,6 +193,7 @@ private fun LexiconDetailContent(
        containerColor = Color.Transparent,
        topBar = {
            TopAppBar(
+                modifier = Modifier.shadow(elevation = 4.dp),
                navigationIcon = {
                    IconButton(onClick = onBack) {
                        Icon(
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/lexicon/search/SearchScreen.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/lexicon/search/SearchScreen.kt
@ -32,6 +32,7 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@ -107,6 +108,7 @@ private fun SearchScreenContent(
        containerColor = Color.Transparent,
        topBar = {
            TopAppBar(
+                modifier = Modifier.shadow(elevation = 4.dp),
                windowInsets = NO_WINDOW_INSETS,
                navigationIcon = {
                    IconButton(onClick = onBack) {
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/location/detail/LocationDetail.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/location/detail/LocationDetail.kt
@ -46,6 +46,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.RectangleShape
@ -255,6 +256,7 @@ private fun LocationContent(
        modifier = modifier,
        topBar = {
            TopAppBar(
+                modifier = Modifier.shadow(elevation = 4.dp),
                navigationIcon = {
                    IconButton(onClick = onBack) {
                        Icon(
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailScreen.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailScreen.kt
@ -32,6 +32,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.graphicsLayer
@ -176,11 +177,12 @@ private fun QuestDetailContent(
        containerColor = Color.Transparent,
        topBar = {
            TopAppBar(
+                modifier = Modifier.shadow(elevation = 4.dp),
                navigationIcon = {
                    IconButton(onClick = onBack) {
                        Icon(
                            painter = painterResource(id = R.drawable.ic_arrow_back_ios_new_24),
-                            contentDescription = null
+                            contentDescription = null,
                        )
                    }
                },
@ -219,7 +221,10 @@ private fun QuestDetailContent(
                    modifier = Modifier
                        .verticalScroll(state)
                        .padding(
-                            top = MaterialTheme.lexicon.dimens.detailPadding,
+                            top = when (annotatedQuest.background) {
+                                null -> 16.dp
+                                else -> MaterialTheme.lexicon.dimens.detailPadding
+                            },
                            end = 16.dp,
                            bottom = 16.dp,
                            start = 16.dp,
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/RollOverlay.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/RollOverlay.kt
@ -194,6 +194,7 @@ private fun RollOverlayPreview() {
    }
 }

+@Stable
 interface BlurredRollOverlayHostState : BlurredOverlayHostState {
    fun prepareRoll(roll: Roll)
 }
--- a/app/src/main/java/com/pixelized/rplexicon/utilitary/extentions/ModifierEx.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/utilitary/extentions/ModifierEx.kt
@ -23,7 +23,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.platform.LocalDensity