From 4f2648b68a137e31637440139911bd2dff56167e Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 5 Nov 2024 15:26:30 +0530 Subject: [PATCH 1/2] parental: Handle orientation change --- app/src/main/AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7c7cc41..804cea9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,7 +30,8 @@ + android:exported="true" + android:configChanges="orientation|screenSize"> -- GitLab From 1d5301778c60254acbd1644dcfef9f9a35f8a773 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 5 Nov 2024 15:26:49 +0530 Subject: [PATCH 2/2] parental: Enable scroll on landscape --- .../foundation/e/parentalcontrol/MainActivity.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt b/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt index 7d42e6b..32dd652 100644 --- a/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt +++ b/app/src/main/java/foundation/e/parentalcontrol/MainActivity.kt @@ -22,6 +22,7 @@ import android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE import android.content.ComponentName import android.content.Context import android.content.Intent +import android.content.res.Configuration import android.net.Uri import android.os.Build import android.os.Bundle @@ -73,6 +74,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.LocalClipboardManager +import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.res.colorResource @@ -148,13 +150,11 @@ class MainActivity : ComponentActivity() { fun SetRestrictionsScreen() { BackHandler(onBack = { onStartUp() }) CustomTopAppBar(title = stringResource(R.string.app_name), onClick = { onStartUp() }) - val scrollState = rememberScrollState() Column( modifier = Modifier.fillMaxSize() - .padding(start = Dimens.SCREEN_PADDING, end = Dimens.SCREEN_PADDING) - .verticalScroll(scrollState), + .padding(start = Dimens.SCREEN_PADDING, end = Dimens.SCREEN_PADDING), horizontalAlignment = Alignment.Start, ) { MainUI(mActivity).SetRestrictionsScreen() @@ -882,8 +882,15 @@ class MainActivity : ComponentActivity() { window.statusBarColor = MaterialTheme.colorScheme.background.toArgb() window.navigationBarColor = MaterialTheme.colorScheme.background.toArgb() Surface(color = MaterialTheme.colorScheme.background) { + val configuration = LocalConfiguration.current + val isLandscape = + configuration.orientation == Configuration.ORIENTATION_LANDSCAPE + Column( - modifier = Modifier.fillMaxSize(), + modifier = + Modifier.fillMaxSize().let { + if (isLandscape) it.verticalScroll(rememberScrollState()) else it + }, horizontalAlignment = Alignment.Start, verticalArrangement = Arrangement.Top ) { -- GitLab