Align UI of DetailScreens
This commit is contained in:
parent
1ec6c06974
commit
c8d6bfe4ef
9 changed files with 18 additions and 6 deletions
|
|
@ -37,9 +37,6 @@ val LocalActivity = staticCompositionLocalOf<Activity> {
|
||||||
val LocalSnack = staticCompositionLocalOf<SnackbarHostState> {
|
val LocalSnack = staticCompositionLocalOf<SnackbarHostState> {
|
||||||
error("SnackbarHostState not available")
|
error("SnackbarHostState not available")
|
||||||
}
|
}
|
||||||
val RollSnack = staticCompositionLocalOf<SnackbarHostState> {
|
|
||||||
error("SnackbarHostState not available")
|
|
||||||
}
|
|
||||||
val LocalRollOverlay = compositionLocalOf<BlurredRollOverlayHostState> {
|
val LocalRollOverlay = compositionLocalOf<BlurredRollOverlayHostState> {
|
||||||
error("LocalRollOverlay not yet ready")
|
error("LocalRollOverlay not yet ready")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ import androidx.compose.runtime.Stable
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.staticCompositionLocalOf
|
import androidx.compose.runtime.staticCompositionLocalOf
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.shadow
|
||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
|
|
@ -59,6 +60,7 @@ fun HomeNavHost(
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
topBar = {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
|
modifier = Modifier.shadow(elevation = 4.dp),
|
||||||
title = {
|
title = {
|
||||||
Text(text = stringResource(id = R.string.app_name))
|
Text(text = stringResource(id = R.string.app_name))
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@ import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
import androidx.compose.runtime.rememberCoroutineScope
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.shadow
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.ColorFilter
|
import androidx.compose.ui.graphics.ColorFilter
|
||||||
import androidx.compose.ui.graphics.graphicsLayer
|
import androidx.compose.ui.graphics.graphicsLayer
|
||||||
|
|
@ -201,6 +202,7 @@ private fun CharacterSheetContent(
|
||||||
contentWindowInsets = NO_WINDOW_INSETS,
|
contentWindowInsets = NO_WINDOW_INSETS,
|
||||||
topBar = {
|
topBar = {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
|
modifier = Modifier.shadow(elevation = 4.dp),
|
||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
IconButton(onClick = onBack) {
|
IconButton(onClick = onBack) {
|
||||||
Icon(
|
Icon(
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,7 @@ import androidx.compose.runtime.State
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.shadow
|
||||||
import androidx.compose.ui.geometry.Offset
|
import androidx.compose.ui.geometry.Offset
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.Shadow
|
import androidx.compose.ui.graphics.Shadow
|
||||||
|
|
@ -192,6 +193,7 @@ private fun LexiconDetailContent(
|
||||||
containerColor = Color.Transparent,
|
containerColor = Color.Transparent,
|
||||||
topBar = {
|
topBar = {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
|
modifier = Modifier.shadow(elevation = 4.dp),
|
||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
IconButton(onClick = onBack) {
|
IconButton(onClick = onBack) {
|
||||||
Icon(
|
Icon(
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ import androidx.compose.runtime.State
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.shadow
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
|
|
@ -107,6 +108,7 @@ private fun SearchScreenContent(
|
||||||
containerColor = Color.Transparent,
|
containerColor = Color.Transparent,
|
||||||
topBar = {
|
topBar = {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
|
modifier = Modifier.shadow(elevation = 4.dp),
|
||||||
windowInsets = NO_WINDOW_INSETS,
|
windowInsets = NO_WINDOW_INSETS,
|
||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
IconButton(onClick = onBack) {
|
IconButton(onClick = onBack) {
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ import androidx.compose.runtime.rememberCoroutineScope
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
|
import androidx.compose.ui.draw.shadow
|
||||||
import androidx.compose.ui.geometry.Offset
|
import androidx.compose.ui.geometry.Offset
|
||||||
import androidx.compose.ui.graphics.ColorFilter
|
import androidx.compose.ui.graphics.ColorFilter
|
||||||
import androidx.compose.ui.graphics.RectangleShape
|
import androidx.compose.ui.graphics.RectangleShape
|
||||||
|
|
@ -255,6 +256,7 @@ private fun LocationContent(
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
topBar = {
|
topBar = {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
|
modifier = Modifier.shadow(elevation = 4.dp),
|
||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
IconButton(onClick = onBack) {
|
IconButton(onClick = onBack) {
|
||||||
Icon(
|
Icon(
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.rotate
|
import androidx.compose.ui.draw.rotate
|
||||||
|
import androidx.compose.ui.draw.shadow
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.ColorFilter
|
import androidx.compose.ui.graphics.ColorFilter
|
||||||
import androidx.compose.ui.graphics.graphicsLayer
|
import androidx.compose.ui.graphics.graphicsLayer
|
||||||
|
|
@ -176,11 +177,12 @@ private fun QuestDetailContent(
|
||||||
containerColor = Color.Transparent,
|
containerColor = Color.Transparent,
|
||||||
topBar = {
|
topBar = {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
|
modifier = Modifier.shadow(elevation = 4.dp),
|
||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
IconButton(onClick = onBack) {
|
IconButton(onClick = onBack) {
|
||||||
Icon(
|
Icon(
|
||||||
painter = painterResource(id = R.drawable.ic_arrow_back_ios_new_24),
|
painter = painterResource(id = R.drawable.ic_arrow_back_ios_new_24),
|
||||||
contentDescription = null
|
contentDescription = null,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -219,7 +221,10 @@ private fun QuestDetailContent(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.verticalScroll(state)
|
.verticalScroll(state)
|
||||||
.padding(
|
.padding(
|
||||||
top = MaterialTheme.lexicon.dimens.detailPadding,
|
top = when (annotatedQuest.background) {
|
||||||
|
null -> 16.dp
|
||||||
|
else -> MaterialTheme.lexicon.dimens.detailPadding
|
||||||
|
},
|
||||||
end = 16.dp,
|
end = 16.dp,
|
||||||
bottom = 16.dp,
|
bottom = 16.dp,
|
||||||
start = 16.dp,
|
start = 16.dp,
|
||||||
|
|
|
||||||
|
|
@ -194,6 +194,7 @@ private fun RollOverlayPreview() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Stable
|
||||||
interface BlurredRollOverlayHostState : BlurredOverlayHostState {
|
interface BlurredRollOverlayHostState : BlurredOverlayHostState {
|
||||||
fun prepareRoll(roll: Roll)
|
fun prepareRoll(roll: Roll)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.composed
|
import androidx.compose.ui.composed
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.draw.shadow
|
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.Shape
|
import androidx.compose.ui.graphics.Shape
|
||||||
import androidx.compose.ui.platform.LocalDensity
|
import androidx.compose.ui.platform.LocalDensity
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue