devol/smalltalk-matrix
1
0
Fork 0
mirror of https://github.com/ouchadam/small-talk.git synced 2024-12-31 11:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

applying dynamic colour scheme and fixing appbar/navbar quirks

Browse Source
This commit is contained in:
Adam Brown 2022-09-04 15:35:50 +01:00 committed by Adam Brown
parent 692e179e3f
commit ef7af20853
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
design-library/src/main/kotlin/app/dapk/st/design/components/Theme.kt
View File

@ -3,8 +3,10 @@ package app.dapk.st.design.components
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme
import androidx.compose.material3.dynamicDarkColorScheme
import androidx.compose.runtime.*
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import com.google.accompanist.systemuicontroller.rememberSystemUiController
import kotlin.math.absoluteValue
@ -56,6 +58,7 @@ fun SmallTalkTheme(content: @Composable () -> Unit) {
val systemUiController = rememberSystemUiController()
val systemInDarkTheme = isSystemInDarkTheme()
MaterialTheme(
colorScheme = dynamicDarkColorScheme(LocalContext.current)
// colorScheme = if (systemInDarkTheme) DARK_COLOURS else LIGHT_COLOURS,
) {
val backgroundColor = MaterialTheme.colorScheme.background

23
design-library/src/main/kotlin/app/dapk/st/design/components/Toolbar.kt
View File

@ -2,11 +2,10 @@ package app.dapk.st.design.components
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.offset
import androidx.compose.material3.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
@ -23,32 +22,22 @@ fun Toolbar(
actions: @Composable RowScope.() -> Unit = {}
) {
val navigationIcon = foo(onNavigate)
SmallTopAppBar(
modifier = Modifier.height(72.dp).run {
if (offset == null) {
this
} else {
this.offset(offset)
}
},
modifier = offset?.let { Modifier.offset(it) } ?: Modifier,
colors = TopAppBarDefaults.smallTopAppBarColors(
containerColor = MaterialTheme.colorScheme.background
),
navigationIcon = navigationIcon ?: {},
title = title?.let {
{ Text(it, maxLines = 2) }
} ?: {},
navigationIcon = navigationIcon,
title = title?.let { { Text(it, maxLines = 2) } } ?: {},
actions = actions,
)
Divider(modifier = Modifier.fillMaxWidth(), color = Color.Black.copy(alpha = 0.2f), thickness = 0.5.dp)
}
private fun foo(onNavigate: (() -> Unit)?): (@Composable () -> Unit)? {
private fun foo(onNavigate: (() -> Unit)?): (@Composable () -> Unit) {
return onNavigate?.let {
{ NavigationIcon(it) }
}
} ?: {}
}
@Composable

4
features/home/src/main/kotlin/app/dapk/st/home/HomeScreen.kt
View File

@ -26,7 +26,6 @@ fun HomeScreen(homeViewModel: HomeViewModel) {
homeViewModel.start()
}
when (val state = homeViewModel.state) {
Loading -> CenteredLoading()
is SignedIn -> {
@ -76,8 +75,9 @@ private fun BottomBar(state: SignedIn, homeViewModel: HomeViewModel) {
},
)
Profile -> NavigationBarItem(
icon = {
Box(modifier = Modifier.fillMaxHeight()) {
Box {
CircleishAvatar(state.me.avatarUrl?.value, state.me.displayName ?: state.me.userId.value, size = 25.dp)
}
},