From a7d586c4f9c5dd244cfae714555e8b4e5ecf0ce0 Mon Sep 17 00:00:00 2001 From: Infi Date: Tue, 6 Jun 2023 02:42:56 +0200 Subject: [PATCH] feat: sync app height with animated keyboard height Signed-off-by: Infi --- app/src/main/AndroidManifest.xml | 1 + .../chat/revolt/activities/InviteActivity.kt | 4 +- .../chat/revolt/activities/MainActivity.kt | 5 +- .../activities/media/ImageViewActivity.kt | 3 + .../activities/media/VideoViewActivity.kt | 3 + .../chat/revolt/screens/about/AboutScreen.kt | 22 +++-- .../revolt/screens/about/AttributionScreen.kt | 6 +- .../revolt/screens/about/PlaceholderScreen.kt | 80 ------------------- .../revolt/screens/chat/views/HomeScreen.kt | 5 +- .../chat/views/channel/ChannelScreen.kt | 8 +- .../screens/login/LoginGreetingScreen.kt | 4 +- .../chat/revolt/screens/login/LoginScreen.kt | 26 +++++- .../chat/revolt/screens/login/MfaScreen.kt | 6 +- .../screens/register/OnboardingScreen.kt | 4 +- .../screens/register/RegisterDetailsScreen.kt | 6 +- .../register/RegisterGreetingScreen.kt | 4 +- .../screens/register/RegisterVerifyScreen.kt | 4 +- .../settings/AppearanceSettingsScreen.kt | 2 + .../screens/settings/DebugSettingsScreen.kt | 2 + .../revolt/screens/settings/SettingsScreen.kt | 2 + app/src/main/res/values-v31/themes.xml | 2 + app/src/main/res/values/strings.xml | 2 - app/src/main/res/values/themes.xml | 5 +- 23 files changed, 101 insertions(+), 105 deletions(-) delete mode 100644 app/src/main/java/chat/revolt/screens/about/PlaceholderScreen.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a56a0b1a..ac8e3abc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,6 +34,7 @@ diff --git a/app/src/main/java/chat/revolt/activities/InviteActivity.kt b/app/src/main/java/chat/revolt/activities/InviteActivity.kt index c3534d31..fd890d4b 100644 --- a/app/src/main/java/chat/revolt/activities/InviteActivity.kt +++ b/app/src/main/java/chat/revolt/activities/InviteActivity.kt @@ -1,7 +1,6 @@ package chat.revolt.activities import android.os.Bundle -import android.util.Log import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.background @@ -44,6 +43,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.core.view.WindowCompat import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel @@ -69,7 +69,7 @@ class InviteActivity : ComponentActivity() { val inviteCode = intent.data?.lastPathSegment - Log.d("InviteActivity", "Invite code: $inviteCode") + WindowCompat.setDecorFitsSystemWindows(window, false) setContent { InviteScreen( diff --git a/app/src/main/java/chat/revolt/activities/MainActivity.kt b/app/src/main/java/chat/revolt/activities/MainActivity.kt index 276a8eae..8ccb91fc 100644 --- a/app/src/main/java/chat/revolt/activities/MainActivity.kt +++ b/app/src/main/java/chat/revolt/activities/MainActivity.kt @@ -14,6 +14,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.IntOffset +import androidx.core.view.WindowCompat import androidx.fragment.app.FragmentActivity import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable @@ -24,7 +25,6 @@ import chat.revolt.api.settings.GlobalState import chat.revolt.screens.SplashScreen import chat.revolt.screens.about.AboutScreen import chat.revolt.screens.about.AttributionScreen -import chat.revolt.screens.about.PlaceholderScreen import chat.revolt.screens.chat.ChatRouterScreen import chat.revolt.screens.chat.dialogs.FeedbackDialog import chat.revolt.screens.login.LoginGreetingScreen @@ -51,6 +51,8 @@ class MainActivity : FragmentActivity() { options.release = BuildConfig.VERSION_NAME } + WindowCompat.setDecorFitsSystemWindows(window, false) + setContent { AppEntrypoint() } @@ -130,7 +132,6 @@ fun AppEntrypoint() { composable("about") { AboutScreen(navController) } composable("about/oss") { AttributionScreen(navController) } - composable("about/placeholder") { PlaceholderScreen(navController) } } } } diff --git a/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt b/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt index 2a1119bf..514c2eaa 100644 --- a/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt +++ b/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt @@ -39,6 +39,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.viewinterop.AndroidView +import androidx.core.view.WindowCompat import chat.revolt.R import chat.revolt.api.REVOLT_FILES import chat.revolt.api.RevoltHttp @@ -69,6 +70,8 @@ class ImageViewActivity : ComponentActivity() { return } + WindowCompat.setDecorFitsSystemWindows(window, false) + setContent { ImageViewScreen(resource = autumnResource, onClose = { finish() }) } diff --git a/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt b/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt index 227ff003..d8e94a6a 100644 --- a/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt +++ b/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt @@ -40,6 +40,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.viewinterop.AndroidView +import androidx.core.view.WindowCompat import androidx.media3.common.MediaItem import androidx.media3.exoplayer.ExoPlayer import androidx.media3.ui.PlayerView @@ -72,6 +73,8 @@ class VideoViewActivity : ComponentActivity() { return } + WindowCompat.setDecorFitsSystemWindows(window, false) + setContent { VideoViewScreen(resource = autumnResource, onClose = { finish() }) } diff --git a/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt b/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt index 62e8245e..e97335e8 100644 --- a/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt +++ b/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt @@ -2,8 +2,18 @@ package chat.revolt.screens.about import android.os.Build import android.widget.Toast -import androidx.compose.foundation.layout.* -import androidx.compose.material3.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding +import androidx.compose.material3.ElevatedButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.mutableStateOf @@ -129,8 +139,8 @@ fun AboutScreen( Column( modifier = Modifier - .fillMaxWidth() - .fillMaxHeight(), + .fillMaxSize() + .safeDrawingPadding(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { @@ -170,12 +180,12 @@ fun AboutScreen( Column( modifier = Modifier .fillMaxWidth() - .padding(horizontal = 20.dp, vertical = 30.dp) + .padding(horizontal = 20.dp, vertical = 30.dp), + horizontalAlignment = Alignment.CenterHorizontally ) { ElevatedButton( onClick = { navController.navigate("about/oss") }, modifier = Modifier - .fillMaxWidth() .testTag("view_oss_attribution") ) { Text(text = stringResource(id = R.string.oss_attribution)) diff --git a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt index aa8b7042..ad9c99de 100644 --- a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt +++ b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt @@ -2,6 +2,7 @@ package chat.revolt.screens.about import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -14,7 +15,10 @@ import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults @Composable fun AttributionScreen(navController: NavController) { - Column() { + Column( + modifier = Modifier + .safeDrawingPadding() + ) { PageHeader( text = stringResource(R.string.oss_attribution), showBackButton = true, diff --git a/app/src/main/java/chat/revolt/screens/about/PlaceholderScreen.kt b/app/src/main/java/chat/revolt/screens/about/PlaceholderScreen.kt deleted file mode 100644 index 0ce52f18..00000000 --- a/app/src/main/java/chat/revolt/screens/about/PlaceholderScreen.kt +++ /dev/null @@ -1,80 +0,0 @@ -package chat.revolt.screens.about - -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Button -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.navigation.NavController -import chat.revolt.R - -@Composable -fun PlaceholderScreen( - navController: NavController -) { - Column( - modifier = Modifier - .fillMaxWidth() - .fillMaxHeight(), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Column( - modifier = Modifier - .fillMaxWidth() - .fillMaxHeight() - .weight(1f), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Text( - text = stringResource(R.string.comingsoon_heading), - style = MaterialTheme.typography.displaySmall.copy( - fontSize = 30.sp, - fontWeight = FontWeight.Black, - textAlign = TextAlign.Center - ), - modifier = Modifier - .padding(horizontal = 20.dp, vertical = 10.dp) - .fillMaxWidth(), - ) - - Text( - text = stringResource(R.string.comingsoon_body), - color = MaterialTheme.colorScheme.onBackground.copy( - alpha = 0.5f - ), - textAlign = TextAlign.Center, - modifier = Modifier - .padding(horizontal = 20.dp, vertical = 10.dp) - .fillMaxWidth() - ) - } - - Column( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 20.dp, vertical = 30.dp), - horizontalAlignment = Alignment.CenterHorizontally - ) { - - Button( - onClick = { navController.popBackStack() }, - modifier = Modifier.fillMaxWidth() - ) { - Text(text = stringResource(R.string.back)) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/chat/revolt/screens/chat/views/HomeScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/HomeScreen.kt index d7a21bb4..f95d2b27 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/HomeScreen.kt +++ b/app/src/main/java/chat/revolt/screens/chat/views/HomeScreen.kt @@ -1,6 +1,7 @@ package chat.revolt.screens.chat.views import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Close import androidx.compose.runtime.Composable @@ -35,7 +36,9 @@ class HomeScreenViewModel @Inject constructor( @Composable fun HomeScreen(navController: NavController, viewModel: HomeScreenViewModel = hiltViewModel()) { - Column { + Column( + modifier = Modifier.safeDrawingPadding() + ) { PageHeader(text = stringResource(id = R.string.home)) LinkOnHome( diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt index 11707c4b..276ad3d9 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt +++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt @@ -14,7 +14,9 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState @@ -184,7 +186,11 @@ fun ChannelScreen( return } - Column { + Column( + modifier = Modifier + .imePadding() + .safeDrawingPadding() + ) { ChannelHeader( channel = channel, onChannelClick = { diff --git a/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt b/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt index ee2c4525..501567af 100644 --- a/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt +++ b/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.layout.width import androidx.compose.material3.Button import androidx.compose.material3.ElevatedButton @@ -47,7 +48,8 @@ fun LoginGreetingScreen(navController: NavController) { Column( modifier = Modifier .fillMaxSize() - .padding(vertical = 20.dp, horizontal = 0.dp), + .padding(vertical = 20.dp, horizontal = 0.dp) + .safeDrawingPadding(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { diff --git a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt b/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt index f37200a6..470140b8 100644 --- a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt +++ b/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt @@ -1,6 +1,7 @@ package chat.revolt.screens.login import android.util.Log +import android.widget.Toast import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -8,7 +9,9 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.layout.width import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme @@ -21,6 +24,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight @@ -137,6 +141,8 @@ fun LoginScreen( navController: NavController, viewModel: LoginViewModel = hiltViewModel() ) { + val context = LocalContext.current + LaunchedEffect(viewModel.navigateTo) { when (viewModel.navigateTo) { "mfa" -> { @@ -169,7 +175,9 @@ fun LoginScreen( Column( modifier = Modifier .fillMaxSize() - .padding(20.dp), + .padding(20.dp) + .imePadding() + .safeDrawingPadding(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { @@ -213,7 +221,13 @@ fun LoginScreen( AnyLink( text = stringResource(R.string.password_forgot), - action = { navController.navigate("about/placeholder") }, + action = { + Toast.makeText( + context, + context.getString(R.string.comingsoon_toast), + Toast.LENGTH_SHORT + ).show() + }, modifier = Modifier.padding(vertical = 7.dp) ) @@ -245,7 +259,13 @@ fun LoginScreen( AnyLink( text = stringResource(R.string.resend_verification), - action = { navController.navigate("about/placeholder") }, + action = { + Toast.makeText( + context, + context.getString(R.string.comingsoon_toast), + Toast.LENGTH_SHORT + ).show() + }, modifier = Modifier .padding(vertical = 7.dp) .testTag("resend_verification_link") diff --git a/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt b/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt index 154c7310..896445d9 100644 --- a/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt +++ b/app/src/main/java/chat/revolt/screens/login/MfaScreen.kt @@ -5,7 +5,9 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Button @@ -150,7 +152,9 @@ fun MfaScreen( Column( modifier = Modifier .fillMaxSize() - .padding(20.dp), + .padding(20.dp) + .imePadding() + .safeDrawingPadding(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { diff --git a/app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt b/app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt index be4d6ab3..eb540e99 100644 --- a/app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt +++ b/app/src/main/java/chat/revolt/screens/register/OnboardingScreen.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -62,7 +63,8 @@ fun OnboardingScreen(navController: NavController) { Column( modifier = Modifier .fillMaxSize() - .padding(20.dp), + .padding(20.dp) + .safeDrawingPadding(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { diff --git a/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt b/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt index b765ef66..10cd47cf 100644 --- a/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt @@ -8,7 +8,9 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.layout.width import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme @@ -108,7 +110,9 @@ fun RegisterDetailsScreen( Column( modifier = Modifier .fillMaxSize() - .padding(20.dp), + .padding(20.dp) + .imePadding() + .safeDrawingPadding(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { diff --git a/app/src/main/java/chat/revolt/screens/register/RegisterGreetingScreen.kt b/app/src/main/java/chat/revolt/screens/register/RegisterGreetingScreen.kt index aae24ddc..0ad55bfa 100644 --- a/app/src/main/java/chat/revolt/screens/register/RegisterGreetingScreen.kt +++ b/app/src/main/java/chat/revolt/screens/register/RegisterGreetingScreen.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.material3.Button @@ -32,7 +33,8 @@ fun RegisterGreetingScreen(navController: NavController) { Column( modifier = Modifier .fillMaxSize() - .padding(20.dp), + .padding(20.dp) + .safeDrawingPadding(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { diff --git a/app/src/main/java/chat/revolt/screens/register/RegisterVerifyScreen.kt b/app/src/main/java/chat/revolt/screens/register/RegisterVerifyScreen.kt index 901e5db5..0b3c3b64 100644 --- a/app/src/main/java/chat/revolt/screens/register/RegisterVerifyScreen.kt +++ b/app/src/main/java/chat/revolt/screens/register/RegisterVerifyScreen.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -32,7 +33,8 @@ fun RegisterVerifyScreen(navController: NavController, email: String) { Column( modifier = Modifier .fillMaxSize() - .padding(20.dp), + .padding(20.dp) + .safeDrawingPadding(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { diff --git a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt index 8ef0a19a..5a790e61 100644 --- a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt @@ -5,6 +5,7 @@ import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.MaterialTheme @@ -56,6 +57,7 @@ fun AppearanceSettingsScreen( Column( modifier = Modifier .fillMaxSize() + .safeDrawingPadding() ) { PageHeader( text = stringResource(id = R.string.settings_appearance), diff --git a/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt index 4757ab17..7c722f06 100644 --- a/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ElevatedButton @@ -47,6 +48,7 @@ fun DebugSettingsScreen( Column( modifier = Modifier .fillMaxSize() + .safeDrawingPadding() ) { PageHeader( text = "Debug", diff --git a/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt index 7bd8a997..16b16870 100644 --- a/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt @@ -4,6 +4,7 @@ import android.widget.Toast import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons @@ -33,6 +34,7 @@ fun SettingsScreen( Column( modifier = Modifier .fillMaxSize() + .safeDrawingPadding() ) { PageHeader( text = stringResource(id = R.string.settings), diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml index 16b189b5..2b921285 100644 --- a/app/src/main/res/values-v31/themes.xml +++ b/app/src/main/res/values-v31/themes.xml @@ -2,6 +2,8 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 849defc0..2f02b840 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -74,8 +74,6 @@ Revolt on Android OSS Attribution - Gah, you found me! - The feature you are trying to access is not ready yet, but we are steadily working on polishing it to perfection.. Sorry, this feature is not ready yet. diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 135e8333..015bb476 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,8 @@ - \ No newline at end of file