feat: uniform list header component
Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
parent
ba40698ad4
commit
8cd287fb05
|
|
@ -0,0 +1,28 @@
|
||||||
|
package chat.revolt.components.generic
|
||||||
|
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.material3.LocalTextStyle
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.CompositionLocalProvider
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun ListHeader(
|
||||||
|
content: @Composable () -> Unit,
|
||||||
|
) {
|
||||||
|
CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.labelLarge) {
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.background(MaterialTheme.colorScheme.background)
|
||||||
|
.padding(top = 24.dp, bottom = 8.dp, start = 16.dp, end = 16.dp)
|
||||||
|
) {
|
||||||
|
content()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -67,6 +67,7 @@ import chat.revolt.api.RevoltCbor
|
||||||
import chat.revolt.api.RevoltJson
|
import chat.revolt.api.RevoltJson
|
||||||
import chat.revolt.api.settings.GlobalState
|
import chat.revolt.api.settings.GlobalState
|
||||||
import chat.revolt.api.settings.SyncedSettings
|
import chat.revolt.api.settings.SyncedSettings
|
||||||
|
import chat.revolt.components.generic.ListHeader
|
||||||
import chat.revolt.components.generic.PageHeader
|
import chat.revolt.components.generic.PageHeader
|
||||||
import chat.revolt.components.screens.settings.appearance.ColourChip
|
import chat.revolt.components.screens.settings.appearance.ColourChip
|
||||||
import chat.revolt.ui.theme.ClearRippleTheme
|
import chat.revolt.ui.theme.ClearRippleTheme
|
||||||
|
|
@ -280,11 +281,9 @@ fun AppearanceSettingsScreen(
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.verticalScroll(rememberScrollState())
|
.verticalScroll(rememberScrollState())
|
||||||
) {
|
) {
|
||||||
Text(
|
ListHeader {
|
||||||
text = stringResource(id = R.string.settings_appearance_theme),
|
Text(stringResource(R.string.settings_appearance_theme))
|
||||||
style = MaterialTheme.typography.labelLarge,
|
}
|
||||||
modifier = Modifier.padding(start = 20.dp, end = 20.dp, bottom = 10.dp)
|
|
||||||
)
|
|
||||||
|
|
||||||
FlowRow(
|
FlowRow(
|
||||||
horizontalArrangement = Arrangement.spacedBy(10.dp),
|
horizontalArrangement = Arrangement.spacedBy(10.dp),
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,7 @@ import chat.revolt.api.routes.auth.fetchAllSessions
|
||||||
import chat.revolt.api.routes.auth.logoutAllSessions
|
import chat.revolt.api.routes.auth.logoutAllSessions
|
||||||
import chat.revolt.api.routes.auth.logoutSessionById
|
import chat.revolt.api.routes.auth.logoutSessionById
|
||||||
import chat.revolt.api.schemas.Session
|
import chat.revolt.api.schemas.Session
|
||||||
|
import chat.revolt.components.generic.ListHeader
|
||||||
import chat.revolt.components.generic.PageHeader
|
import chat.revolt.components.generic.PageHeader
|
||||||
import chat.revolt.components.generic.UIMarkdown
|
import chat.revolt.components.generic.UIMarkdown
|
||||||
import chat.revolt.components.settings.sessions.SessionItem
|
import chat.revolt.components.settings.sessions.SessionItem
|
||||||
|
|
@ -153,14 +154,9 @@ fun SessionSettingsScreen(
|
||||||
} else {
|
} else {
|
||||||
LazyColumn {
|
LazyColumn {
|
||||||
stickyHeader(key = "thisDevice") {
|
stickyHeader(key = "thisDevice") {
|
||||||
Text(
|
ListHeader {
|
||||||
text = stringResource(id = R.string.settings_sessions_this_device),
|
Text(stringResource(id = R.string.settings_sessions_this_device))
|
||||||
style = MaterialTheme.typography.labelLarge,
|
}
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.background(MaterialTheme.colorScheme.background)
|
|
||||||
.padding(10.dp)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
viewModel.currentSession?.let {
|
viewModel.currentSession?.let {
|
||||||
|
|
@ -172,6 +168,7 @@ fun SessionSettingsScreen(
|
||||||
onLogout = {},
|
onLogout = {},
|
||||||
modifier = Modifier.padding(horizontal = 8.dp)
|
modifier = Modifier.padding(horizontal = 8.dp)
|
||||||
)
|
)
|
||||||
|
Spacer(Modifier.height(8.dp))
|
||||||
}
|
}
|
||||||
} ?: run {
|
} ?: run {
|
||||||
item(key = "noCurrentSession") {
|
item(key = "noCurrentSession") {
|
||||||
|
|
@ -186,14 +183,9 @@ fun SessionSettingsScreen(
|
||||||
}
|
}
|
||||||
|
|
||||||
stickyHeader(key = "otherSessions") {
|
stickyHeader(key = "otherSessions") {
|
||||||
Text(
|
ListHeader {
|
||||||
text = stringResource(id = R.string.settings_sessions_other_sessions),
|
Text(stringResource(id = R.string.settings_sessions_other_sessions))
|
||||||
style = MaterialTheme.typography.labelLarge,
|
}
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.background(MaterialTheme.colorScheme.background)
|
|
||||||
.padding(10.dp)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
item(key = "logoutOtherSessions") {
|
item(key = "logoutOtherSessions") {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue