diff --git a/app/src/main/java/chat/revolt/activities/InviteActivity.kt b/app/src/main/java/chat/revolt/activities/InviteActivity.kt index 6e3dd9c8..17da5854 100644 --- a/app/src/main/java/chat/revolt/activities/InviteActivity.kt +++ b/app/src/main/java/chat/revolt/activities/InviteActivity.kt @@ -71,8 +71,8 @@ class InviteActivity : ComponentActivity() { val inviteCode = intent.data?.lastPathSegment - window.statusBarColor = Color.Transparent.toArgb() WindowCompat.setDecorFitsSystemWindows(window, false) + window.statusBarColor = Color.Transparent.toArgb() setContent { InviteScreen( diff --git a/app/src/main/java/chat/revolt/components/generic/SheetHeaderPadding.kt b/app/src/main/java/chat/revolt/components/generic/SheetHeaderPadding.kt new file mode 100644 index 00000000..a8e29964 --- /dev/null +++ b/app/src/main/java/chat/revolt/components/generic/SheetHeaderPadding.kt @@ -0,0 +1,17 @@ +package chat.revolt.components.generic + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +@Composable +fun SheetHeaderPadding(content: @Composable BoxScope.() -> Unit) { + Box( + Modifier + .padding(start = 16.dp, end = 16.dp, top = 16.dp) + .fillMaxWidth(), content = content) +} \ No newline at end of file diff --git a/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt b/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt index 93642d80..0267837a 100644 --- a/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt @@ -32,6 +32,7 @@ import chat.revolt.R import chat.revolt.activities.InviteActivity import chat.revolt.api.REVOLT_APP import chat.revolt.components.generic.FormTextField +import chat.revolt.components.generic.SheetHeaderPadding @Composable fun AddServerSheet() { @@ -51,14 +52,14 @@ fun AddServerSheet() { ) } - Spacer(modifier = Modifier.height(4.dp)) + SheetHeaderPadding { + Text( + text = stringResource(id = R.string.add_server_sheet_title), + style = MaterialTheme.typography.headlineSmall + ) + } - Text( - text = stringResource(id = R.string.add_server_sheet_title), - style = MaterialTheme.typography.headlineMedium - ) - - Spacer(modifier = Modifier.height(4.dp)) + Spacer(modifier = Modifier.height(16.dp)) ListItem( headlineContent = { diff --git a/app/src/main/java/chat/revolt/sheets/ChangelogSheet.kt b/app/src/main/java/chat/revolt/sheets/ChangelogSheet.kt index 4a74d659..b69c927b 100644 --- a/app/src/main/java/chat/revolt/sheets/ChangelogSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/ChangelogSheet.kt @@ -25,6 +25,7 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.ViewModel import chat.revolt.R +import chat.revolt.components.generic.SheetHeaderPadding import chat.revolt.components.generic.WebMarkdown import chat.revolt.internals.Changelog import chat.revolt.internals.Changelogs @@ -68,18 +69,20 @@ fun ChangelogSheet( } Column { - Text( - text = if (new) { - stringResource(R.string.settings_changelogs_new_header) - } else { - stringResource( - R.string.settings_changelogs_historical_version_header, - viewModel.changelog?.version - ?: stringResource(R.string.settings_changelogs_historical_version_header_placeholder) - ) - }, - style = MaterialTheme.typography.headlineMedium - ) + SheetHeaderPadding { + Text( + text = if (new) { + stringResource(R.string.settings_changelogs_new_header) + } else { + stringResource( + R.string.settings_changelogs_historical_version_header, + viewModel.changelog?.version + ?: stringResource(R.string.settings_changelogs_historical_version_header_placeholder) + ) + }, + style = MaterialTheme.typography.headlineSmall + ) + } if (viewModel.changelogContents == null) { Box( diff --git a/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt b/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt index c3d13170..9b57739e 100644 --- a/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt @@ -44,6 +44,7 @@ import chat.revolt.api.schemas.User import chat.revolt.components.chat.MemberListItem import chat.revolt.components.generic.CountableListHeader import chat.revolt.components.generic.Presence +import chat.revolt.components.generic.SheetHeaderPadding import chat.revolt.components.generic.presenceFromStatus import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext @@ -254,10 +255,12 @@ fun MemberListSheet( } Column { - Text( - text = stringResource(R.string.channel_info_sheet_options_members), - style = MaterialTheme.typography.headlineMedium - ) + SheetHeaderPadding { + Text( + text = stringResource(R.string.channel_info_sheet_options_members), + style = MaterialTheme.typography.headlineSmall + ) + } LazyColumn { viewModel.fullItemList.forEachIndexed { index, item ->