Use the native android locale picker on android 13+

* Auto clean sensitive clipboard items

* Fix typo :D

* Apply review suggestions

app/build.gradle.kts

@@ -55,6 +55,10 @@ android {
         )
     }
 
+    androidResources {
+        generateLocaleConfig = true
+    }
+
     defaultConfig {
         applicationId = "dev.patrickgold.florisboard"
         minSdk = projectMinSdk.toInt()
@@ -189,6 +193,7 @@ dependencies {
     implementation(libs.androidx.material.icons)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.profileinstaller)
+    implementation(libs.androidx.appcompat)
     ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.runtime)
     implementation(libs.cache4k)

app/src/main/AndroidManifest.xml

@@ -76,6 +76,16 @@
             <meta-data android:name="android.view.textservice.scs" android:resource="@xml/spellchecker"/>
         </service>
 
+        <!-- Service for Locale handling -->
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
+
         <!-- Main App Activity -->
         <activity
             android:name="dev.patrickgold.florisboard.app.FlorisAppActivity"

app/src/main/kotlin/dev/patrickgold/florisboard/app/AppPrefs.kt

@@ -47,10 +47,8 @@ import dev.patrickgold.florisboard.ime.text.key.KeyHintMode
 import dev.patrickgold.florisboard.ime.text.key.UtilityKeyAction
 import dev.patrickgold.florisboard.ime.theme.ThemeMode
 import dev.patrickgold.florisboard.ime.theme.extCoreTheme
-import org.florisboard.lib.android.isOrientationPortrait
 import dev.patrickgold.florisboard.lib.ext.ExtensionComponentName
 import dev.patrickgold.florisboard.lib.observeAsTransformingState
-import org.florisboard.lib.snygg.SnyggLevel
 import dev.patrickgold.florisboard.lib.util.VersionName
 import dev.patrickgold.jetpref.datastore.JetPref
 import dev.patrickgold.jetpref.datastore.model.PreferenceMigrationEntry
@@ -59,6 +57,8 @@ import dev.patrickgold.jetpref.datastore.model.PreferenceType
 import dev.patrickgold.jetpref.datastore.model.observeAsState
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import org.florisboard.lib.android.isOrientationPortrait
+import org.florisboard.lib.snygg.SnyggLevel
 
 fun florisPreferenceModel() = JetPref.getOrCreatePreferenceModel(AppPrefs::class, ::AppPrefs)
 
@@ -118,6 +118,14 @@ class AppPrefs : PreferenceModel("florisboard-app-prefs") {
             key = "clipboard__clean_up_after",
             default = 20,
         )
+        val autoCleanSensitive = boolean(
+            key = "clipboard__auto_clean_sensitive",
+            default = false,
+        )
+        val autoCleanSensitiveAfter = int(
+            key = "clipboard__auto_clean_sensitive_after",
+            default = 20,
+        )
         val limitHistorySize = boolean(
             key = "clipboard__limit_history_size",
             default = true,

app/src/main/kotlin/dev/patrickgold/florisboard/app/FlorisAppActivity.kt

@@ -20,8 +20,9 @@ import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
 import android.os.Bundle
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.imePadding
@@ -37,6 +38,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.core.os.LocaleListCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
 import androidx.navigation.NavController
@@ -72,7 +74,7 @@ val LocalNavController = staticCompositionLocalOf<NavController> {
     error("LocalNavController not initialized")
 }
 
-class FlorisAppActivity : ComponentActivity() {
+class FlorisAppActivity : AppCompatActivity() {
     private val prefs by florisPreferenceModel()
     private val cacheManager by cacheManager()
     private var appTheme by mutableStateOf(AppTheme.AUTO)
@@ -92,10 +94,12 @@ class FlorisAppActivity : ComponentActivity() {
             appTheme = it
         }
         prefs.advanced.settingsLanguage.observe(this) {
-            val config = Configuration(resources.configuration)
-            val locale = if (it == "auto") FlorisLocale.default() else FlorisLocale.fromTag(it)
-            config.setLocale(locale.base)
-            resourcesContext = createConfigurationContext(config)
+            val appLocale: LocaleListCompat = if (it == "auto") {
+                LocaleListCompat.getEmptyLocaleList()
+            } else {
+                LocaleListCompat.forLanguageTags(FlorisLocale.fromTag(it).languageTag())
+            }
+            AppCompatDelegate.setApplicationLocales(appLocale)
         }
         if (AndroidVersion.ATMOST_API28_P) {
             prefs.advanced.showAppIcon.observe(this) {

app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionListScreen.kt

@@ -17,10 +17,15 @@
 package dev.patrickgold.florisboard.app.ext
 
 import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Edit
@@ -33,8 +38,13 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import dev.patrickgold.florisboard.R
@@ -46,6 +56,7 @@ import dev.patrickgold.florisboard.lib.compose.FlorisOutlinedBox
 import dev.patrickgold.florisboard.lib.compose.FlorisScreen
 import dev.patrickgold.florisboard.lib.compose.FlorisTextButton
 import dev.patrickgold.florisboard.lib.compose.defaultFlorisOutlinedBox
+import dev.patrickgold.florisboard.lib.compose.florisScrollbar
 import dev.patrickgold.florisboard.lib.compose.stringRes
 import dev.patrickgold.florisboard.lib.ext.ExtensionManager
 import dev.patrickgold.florisboard.lib.observeAsNonNullState
@@ -80,49 +91,66 @@ enum class ExtensionListScreenType(
 fun ExtensionListScreen(type: ExtensionListScreenType, showUpdate: Boolean) = FlorisScreen {
     title = stringRes(type.titleResId)
     previewFieldVisible = false
+    scrollable = false
 
     val context = LocalContext.current
     val navController = LocalNavController.current
     val extensionManager by context.extensionManager()
     val extensionIndex by type.getExtensionIndex(extensionManager).observeAsNonNullState()
 
+    var fabHeight by remember {
+        mutableStateOf(0)
+    }
+    val fabHeightDp = with(LocalDensity.current) { fabHeight.toDp()+16.dp }
+    val listState = rememberLazyListState()
+
     content {
-        if (showUpdate) {
-            UpdateBox(extensionIndex = extensionIndex)
-        }
-        for (ext in extensionIndex) {
-            FlorisOutlinedBox(
-                modifier = Modifier.defaultFlorisOutlinedBox(),
-                title = ext.meta.title,
-                subtitle = ext.meta.id,
-            ) {
-                Text(
-                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
-                    text = ext.meta.description ?: "",
-                    style = MaterialTheme.typography.bodySmall,
-                )
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 6.dp),
+        LazyColumn(
+            modifier = Modifier
+                .fillMaxSize()
+                .florisScrollbar(state = listState, isVertical = true),
+            state = listState,
+            contentPadding = PaddingValues(bottom = fabHeightDp),
+        ) {
+            if (showUpdate) {
+                item {
+                    UpdateBox(extensionIndex = extensionIndex)
+                }
+            }
+            items(extensionIndex) { ext ->
+                FlorisOutlinedBox(
+                    modifier = Modifier.defaultFlorisOutlinedBox(),
+                    title = ext.meta.title,
+                    subtitle = ext.meta.id,
                 ) {
-                    FlorisTextButton(
-                        onClick = {
-                            navController.navigate(Routes.Ext.View(ext.meta.id))
-                        },
-                        icon = Icons.Outlined.Info,
-                        text = stringRes(id = R.string.ext__list__view_details),//stringRes(R.string.action__add),
-                        colors = ButtonDefaults.textButtonColors(),
-                    )
-                    Spacer(modifier = Modifier.weight(1f))
-                    FlorisTextButton(
-                        onClick = {
-                            navController.navigate(Routes.Ext.Edit(ext.meta.id))
-                        },
-                        icon = Icons.Default.Edit,
-                        text = stringRes(R.string.action__edit),
-                        enabled = extensionManager.canDelete(ext),
+                    Text(
+                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
+                        text = ext.meta.description ?: "",
+                        style = MaterialTheme.typography.bodySmall,
                     )
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 6.dp),
+                    ) {
+                        FlorisTextButton(
+                            onClick = {
+                                navController.navigate(Routes.Ext.View(ext.meta.id))
+                            },
+                            icon = Icons.Outlined.Info,
+                            text = stringRes(id = R.string.ext__list__view_details),//stringRes(R.string.action__add),
+                            colors = ButtonDefaults.textButtonColors(),
+                        )
+                        Spacer(modifier = Modifier.weight(1f))
+                        FlorisTextButton(
+                            onClick = {
+                                navController.navigate(Routes.Ext.Edit(ext.meta.id))
+                            },
+                            icon = Icons.Default.Edit,
+                            text = stringRes(R.string.action__edit),
+                            enabled = extensionManager.canDelete(ext),
+                        )
+                    }
                 }
             }
         }
@@ -142,6 +170,9 @@ fun ExtensionListScreen(type: ExtensionListScreenType, showUpdate: Boolean) = Fl
                         text = stringRes(id = R.string.ext__editor__title_create_any),
                     )
                 },
+                modifier = Modifier.onGloballyPositioned {
+                    fabHeight = it.size.height
+                },
                 shape = FloatingActionButtonDefaults.extendedFabShape,
                 onClick = { type.launchExtensionCreate.invoke(navController) },
             )

app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/advanced/AdvancedScreen.kt

@@ -16,6 +16,11 @@
 
 package dev.patrickgold.florisboard.app.settings.advanced
 
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Adb
 import androidx.compose.material.icons.filled.Archive
@@ -26,6 +31,7 @@ import androidx.compose.material.icons.filled.Preview
 import androidx.compose.material.icons.filled.SettingsBackupRestore
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.LocalContext
 import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.app.AppTheme
 import dev.patrickgold.florisboard.app.LocalNavController
@@ -34,7 +40,6 @@ import dev.patrickgold.florisboard.app.enumDisplayEntriesOf
 import dev.patrickgold.florisboard.ime.core.DisplayLanguageNamesIn
 import dev.patrickgold.florisboard.ime.keyboard.IncognitoMode
 import dev.patrickgold.florisboard.lib.FlorisLocale
-import org.florisboard.lib.android.AndroidVersion
 import dev.patrickgold.florisboard.lib.compose.FlorisScreen
 import dev.patrickgold.florisboard.lib.compose.stringRes
 import dev.patrickgold.jetpref.datastore.model.observeAsState
@@ -44,6 +49,7 @@ import dev.patrickgold.jetpref.datastore.ui.PreferenceGroup
 import dev.patrickgold.jetpref.datastore.ui.SwitchPreference
 import dev.patrickgold.jetpref.datastore.ui.listPrefEntries
 import dev.patrickgold.jetpref.datastore.ui.vectorResource
+import org.florisboard.lib.android.AndroidVersion
 
 @Composable
 fun AdvancedScreen() = FlorisScreen {
@@ -51,6 +57,10 @@ fun AdvancedScreen() = FlorisScreen {
     previewFieldVisible = false
 
     val navController = LocalNavController.current
+    val context = LocalContext.current
+
+    val languageSettingsLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {}
 
     content {
         ListPreference(
@@ -67,70 +77,86 @@ fun AdvancedScreen() = FlorisScreen {
                 AndroidVersion.ATLEAST_API31_S
             },
         )
-        ListPreference(
-            prefs.advanced.settingsLanguage,
-            icon = Icons.Default.Language,
-            title = stringRes(R.string.pref__advanced__settings_language__label),
-            entries = listPrefEntries {
-                listOf(
-                    "auto",
-                    "ar",
-                    "bg",
-                    "bs",
-                    "ca",
-                    "ckb",
-                    "cs",
-                    "da",
-                    "de",
-                    "el",
-                    "en",
-                    "eo",
-                    "es",
-                    "fa",
-                    "fi",
-                    "fr",
-                    "hr",
-                    "hu",
-                    "in",
-                    "it",
-                    "iw",
-                    "ja",
-                    "ko-KR",
-                    "ku",
-                    "lv-LV",
-                    "mk",
-                    "nds-DE",
-                    "nl",
-                    "no",
-                    "pl",
-                    "pt",
-                    "pt-BR",
-                    "ru",
-                    "sk",
-                    "sl",
-                    "sr",
-                    "sv",
-                    "tr",
-                    "uk",
-                    "zgh",
-                    "zh-CN",
-                ).map { languageTag ->
-                    if (languageTag == "auto") {
-                        entry(
-                            key = "auto",
-                            label = stringRes(R.string.settings__system_default),
+        if (AndroidVersion.ATLEAST_API33_T) {
+            Preference(
+                title = stringRes(R.string.pref__advanced__settings_language__label),
+                icon = Icons.Default.Language,
+                onClick = {
+                    languageSettingsLauncher.launch(
+                        Intent(
+                            Settings.ACTION_APP_LOCALE_SETTINGS,
+                            Uri.parse("package:${context.packageName}")
                         )
-                    } else {
-                        val displayLanguageNamesIn by prefs.localization.displayLanguageNamesIn.observeAsState()
-                        val locale = FlorisLocale.fromTag(languageTag)
-                        entry(locale.languageTag(), when (displayLanguageNamesIn) {
-                            DisplayLanguageNamesIn.SYSTEM_LOCALE -> locale.displayName()
-                            DisplayLanguageNamesIn.NATIVE_LOCALE -> locale.displayName(locale)
-                        })
+                    )
+                }
+            )
+        } else {
+            ListPreference(
+                prefs.advanced.settingsLanguage,
+                icon = Icons.Default.Language,
+                title = stringRes(R.string.pref__advanced__settings_language__label),
+                entries = listPrefEntries {
+                    listOf(
+                        "auto",
+                        "ar",
+                        "bg",
+                        "bs",
+                        "ca",
+                        "ckb",
+                        "cs",
+                        "da",
+                        "de",
+                        "el",
+                        "en",
+                        "eo",
+                        "es",
+                        "fa",
+                        "fi",
+                        "fr",
+                        "hr",
+                        "hu",
+                        "in",
+                        "it",
+                        "iw",
+                        "ja",
+                        "ko-KR",
+                        "ku",
+                        "lv-LV",
+                        "mk",
+                        "nds-DE",
+                        "nl",
+                        "no",
+                        "pl",
+                        "pt",
+                        "pt-BR",
+                        "ru",
+                        "sk",
+                        "sl",
+                        "sr",
+                        "sv",
+                        "tr",
+                        "uk",
+                        "zgh",
+                        "zh-CN",
+                    ).map { languageTag ->
+                        if (languageTag == "auto") {
+                            entry(
+                                key = "auto",
+                                label = stringRes(R.string.settings__system_default),
+                            )
+                        } else {
+                            val displayLanguageNamesIn by prefs.localization.displayLanguageNamesIn.observeAsState()
+                            val locale = FlorisLocale.fromTag(languageTag)
+                            entry(locale.languageTag(), when (displayLanguageNamesIn) {
+                                DisplayLanguageNamesIn.SYSTEM_LOCALE -> locale.displayName()
+                                DisplayLanguageNamesIn.NATIVE_LOCALE -> locale.displayName(locale)
+                            })
+                        }
                     }
                 }
-            }
-        )
+            )
+        }
+
         SwitchPreference(
             prefs.advanced.showAppIcon,
             icon = Icons.Default.Preview,

app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/clipboard/ClipboardScreen.kt

@@ -25,6 +25,7 @@ import dev.patrickgold.jetpref.datastore.ui.DialogSliderPreference
 import dev.patrickgold.jetpref.datastore.ui.ExperimentalJetPrefDatastoreUi
 import dev.patrickgold.jetpref.datastore.ui.PreferenceGroup
 import dev.patrickgold.jetpref.datastore.ui.SwitchPreference
+import org.florisboard.lib.android.AndroidVersion
 
 @OptIn(ExperimentalJetPrefDatastoreUi::class)
 @Composable
@@ -71,6 +72,22 @@ fun ClipboardScreen() = FlorisScreen {
                 stepIncrement = 5,
                 enabledIf = { prefs.clipboard.historyEnabled isEqualTo true && prefs.clipboard.cleanUpOld isEqualTo true },
             )
+            SwitchPreference(
+                prefs.clipboard.autoCleanSensitive,
+                title = stringRes(R.string.pref__clipboard__auto_clean_sensitive__label),
+                enabledIf = { prefs.clipboard.historyEnabled isEqualTo true },
+                visibleIf = { AndroidVersion.ATLEAST_API33_T },
+            )
+            DialogSliderPreference(
+                prefs.clipboard.autoCleanSensitiveAfter,
+                title = stringRes(R.string.pref__clipboard__auto_clean_sensitive_after__label),
+                valueLabel = { pluralsRes(R.plurals.unit__seconds__written, it, "v" to it) },
+                min = 0,
+                max = 300,
+                stepIncrement = 10,
+                enabledIf = { prefs.clipboard.historyEnabled isEqualTo true && prefs.clipboard.autoCleanSensitive isEqualTo true },
+                visibleIf = { AndroidVersion.ATLEAST_API33_T },
+            )
             SwitchPreference(
                 prefs.clipboard.limitHistorySize,
                 title = stringRes(R.string.pref__clipboard__limit_history_size__label),

app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/ClipboardManager.kt

@@ -254,14 +254,20 @@ class ClipboardManager(
     }
 
     private fun enforceExpiryDate(clipHistory: ClipboardHistory) {
+        val itemsToRemove = mutableSetOf<ClipboardItem>()
         if (prefs.clipboard.cleanUpOld.get()) {
             val nonPinnedItems = clipHistory.recent + clipHistory.other
             val expiryTime = System.currentTimeMillis() - (prefs.clipboard.cleanUpAfter.get() * 60 * 1000)
-            val itemsToRemove = nonPinnedItems.filter { it.creationTimestampMs < expiryTime }
-            if (itemsToRemove.isNotEmpty()) {
-                ioScope.launch {
-                    clipHistoryDao?.delete(itemsToRemove)
-                }
+            itemsToRemove.addAll(nonPinnedItems.filter { it.creationTimestampMs < expiryTime })
+        }
+        if (prefs.clipboard.autoCleanSensitive.get()) {
+            val sensitiveData = clipHistory.all.filter { it.isSensitive }
+            val expiryTime = System.currentTimeMillis() - (prefs.clipboard.autoCleanSensitiveAfter.get() * 1000)
+            itemsToRemove.addAll(sensitiveData.filter { it.creationTimestampMs < expiryTime })
+        }
+        if (itemsToRemove.isNotEmpty()) {
+            ioScope.launch {
+                clipHistoryDao?.delete(itemsToRemove.toList())
             }
         }
     }

app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/provider/ClipboardDatabase.kt

@@ -242,6 +242,7 @@ data class ClipboardItem @OptIn(ExperimentalSerializationApi::class) constructor
         if (uri != other.uri) return false
         if (creationTimestampMs != other.creationTimestampMs) return false
         if (!mimeTypes.contentEquals(other.mimeTypes)) return false
+        if (isSensitive != other.isSensitive) return false
 
         return true
     }
@@ -253,6 +254,7 @@ data class ClipboardItem @OptIn(ExperimentalSerializationApi::class) constructor
         result = 31 * result + (uri?.hashCode() ?: 0)
         result = 31 * result + creationTimestampMs.hashCode()
         result = 31 * result + mimeTypes.contentHashCode()
+        result = 31 * result + isSensitive.hashCode()
         return result
     }
 

app/src/main/kotlin/dev/patrickgold/florisboard/ime/keyboard/FlorisImeSizing.kt

@@ -36,10 +36,10 @@ import dev.patrickgold.florisboard.ime.smartbar.ExtendedActionsPlacement
 import dev.patrickgold.florisboard.ime.smartbar.SmartbarLayout
 import dev.patrickgold.florisboard.ime.text.keyboard.TextKeyboard
 import dev.patrickgold.florisboard.keyboardManager
-import org.florisboard.lib.android.isOrientationLandscape
 import dev.patrickgold.florisboard.lib.observeAsTransformingState
 import dev.patrickgold.florisboard.lib.util.ViewUtils
 import dev.patrickgold.jetpref.datastore.model.observeAsState
+import org.florisboard.lib.android.isOrientationLandscape
 
 private val LocalKeyboardRowBaseHeight = staticCompositionLocalOf { 65.dp }
 private val LocalSmartbarHeight = staticCompositionLocalOf { 40.dp }
@@ -133,7 +133,7 @@ fun ProvideKeyboardRowBaseHeight(content: @Composable () -> Unit) {
 
     CompositionLocalProvider(
         LocalKeyboardRowBaseHeight provides ViewUtils.px2dp(baseRowHeight).dp,
-        LocalSmartbarHeight provides ViewUtils.px2dp(smartbarHeight).dp,
+        LocalSmartbarHeight provides ViewUtils.px2dp(smartbarHeight).toInt().dp,
     ) {
         content()
     }

app/src/main/kotlin/dev/patrickgold/florisboard/ime/onehanded/OneHandedPanel.kt

@@ -55,7 +55,8 @@ fun RowScope.OneHandedPanel(
     Column(
         modifier = modifier
             .weight(weight)
-            .snyggBackground(context, oneHandedPanelStyle),
+            .snyggBackground(context, oneHandedPanelStyle)
+            .height(FlorisImeSizing.imeUiHeight()),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.SpaceEvenly,
     ) {
@@ -77,7 +78,7 @@ fun RowScope.OneHandedPanel(
                 inputFeedbackController.keyPress()
                 prefs.keyboard.oneHandedMode.set(panelSide)
             },
-            modifier = Modifier.height(FlorisImeSizing.keyboardUiHeight()).fillMaxWidth()
+            modifier = Modifier.weight(1f).fillMaxWidth(),
         ) {
             Icon(
                 imageVector = if (panelSide == OneHandedMode.START) {

app/src/main/kotlin/dev/patrickgold/florisboard/lib/util/NetworkUtils.kt

@@ -25,7 +25,7 @@ import org.florisboard.lib.android.AndroidVersion
 object NetworkUtils {
     private val Ipv4Regex = """(?<Ipv4>(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))""".toRegex()
     private val Ipv6Regex = """(?<Ipv6>(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]+|::(ffff(:0{1,4})?:)?((25[0-5]|(2[0-4]|1?[0-9])?[0-9])\.){3}(25[0-5]|(2[0-4]|1?[0-9])?[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1?[0-9])?[0-9])\.){3}(25[0-5]|(2[0-4]|1?[0-9])?[0-9])))""".toRegex()
-    private val HostRegex = """(?<Host>(?:[a-zA-Z\-]+\.)+[a-zA-Z]{2,}|$Ipv4Regex|$Ipv6Regex)""".toRegex()
+    private val HostRegex = """(?<Host>(?:[a-zA-Z0-9][a-zA-Z0-9\-]+[a-zA-Z0-9]\.)+[a-zA-Z]{2,}|$Ipv4Regex|$Ipv6Regex)""".toRegex()
     private val TcpIpPortRegex = """(?<TcpIpPort>6553[0-5]|655[0-2][0-9]|65[0-4][0-9]{2}|6[0-4][0-9]{3}|(?<![0-9])[0-5]?[0-9]{1,4}(?![0-9]))""".toRegex()
     private val UrlRegex = """(?<Url>(?:(?:(?:https?:\/\/)?$HostRegex)|(?:https?:\/\/[a-zA-Z]+))(?::$TcpIpPortRegex)?(?:\/[\p{L}0-9.,;?'\\\/+&%$#=~_\-]*)?)""".toRegex()
     private val EmailRegex = """(?<Email>(?:[a-z0-9!#${'$'}%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#${'$'}%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@$HostRegex)""".toRegex()

app/src/main/kotlin/dev/patrickgold/florisboard/lib/util/ViewUtils.kt

@@ -18,7 +18,6 @@
 package dev.patrickgold.florisboard.lib.util
 
 import android.content.res.Resources
-import android.util.DisplayMetrics
 import android.view.View
 import android.view.Window
 import android.widget.FrameLayout
@@ -84,7 +83,7 @@ object ViewUtils {
      * @return A float value to represent px equivalent to dp depending on device density
      */
     fun dp2px(dp: Float): Float {
-        return dp * (Resources.getSystem().displayMetrics.densityDpi.toFloat() / DisplayMetrics.DENSITY_DEFAULT)
+        return dp * Resources.getSystem().displayMetrics.density
     }
 
     /**
@@ -96,6 +95,6 @@ object ViewUtils {
      * @return A float value to represent dp equivalent to px value
      */
     fun px2dp(px: Float): Float {
-        return px / (Resources.getSystem().displayMetrics.densityDpi.toFloat() / DisplayMetrics.DENSITY_DEFAULT)
+        return (px / Resources.getSystem().displayMetrics.density)
     }
 }

app/src/main/res/resources.properties

@@ -0,0 +1 @@
+unqualifiedResLocale=en-US

app/src/main/res/values/strings.xml

@@ -595,6 +595,8 @@
     <string name="pref__clipboard__enable_clipboard_history__summary">Retain clipboard items for quick access</string>
     <string name="pref__clipboard__clean_up_old__label">Clean up old items</string>
     <string name="pref__clipboard__clean_up_after__label">Clean up old items after</string>
+    <string name="pref__clipboard__auto_clean_sensitive__label">Auto clean sensitive items</string>
+    <string name="pref__clipboard__auto_clean_sensitive_after__label">Auto clean sensitive items after</string>
     <string name="pref__clipboard__limit_history_size__label">Limit history size</string>
     <string name="pref__clipboard__max_history_size__label">Max history size</string>
     <string name="pref__clipboard__clear_primary_clip_deletes_last_item__label">Clear primary clip affects history</string>

app/src/main/res/values/themes.xml

@@ -10,7 +10,7 @@
         <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
     </style>
 
-    <style name="FlorisAppTheme" parent="android:style/Theme.Material.NoActionBar">
+    <style name="FlorisAppTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:colorPrimary">@color/colorPrimary</item>
         <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="android:colorAccent">@color/colorAccent</item>
@@ -31,7 +31,7 @@
         <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
     </style>
 
-    <style name="FlorisAppTheme.Transparent" parent="android:style/Theme.Material.NoActionBar">
+    <style name="FlorisAppTheme.Transparent" parent="Theme.AppCompat.NoActionBar">
         <item name="android:colorPrimary">@android:color/transparent</item>
         <item name="android:colorPrimaryDark">@android:color/transparent</item>
         <item name="android:colorAccent">@android:color/transparent</item>

gradle/libs.versions.toml

@@ -14,6 +14,7 @@ androidx-material-icons = "1.7.3"
 androidx-navigation = "2.8.1"
 androidx-profileinstaller = "1.4.0"
 androidx-room = "2.6.1"
+appcompat = "1.7.0"
 cache4k = "0.7.0"
 kotlin = "2.0.20"
 kotlinx-coroutines = "1.8.1"
@@ -53,6 +54,7 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose
 androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version.ref = "androidx-profileinstaller" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" }
 androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidx-room" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 cache4k = { module = "io.github.reactivecircus.cache4k:cache4k", version.ref = "cache4k" }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }