#1819 change text for restricted settings

Author: sds100

base/src/main/java/io/github/sds100/keymapper/base/onboarding/SetupAccessibilityServiceDialog.kt

@@ -22,6 +22,7 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import io.github.sds100.keymapper.base.R
+import io.github.sds100.keymapper.base.compose.KeyMapperTheme
 import io.github.sds100.keymapper.base.utils.ui.compose.openUriSafe
 
 @Composable
@@ -85,15 +86,16 @@ private fun EnableAccessibilityServiceDialog(
         },
         text = {
             Column {
+                if (isRestrictedSetting) {
+                    RestrictedSettingText()
+                    Spacer(modifier = Modifier.height(16.dp))
+                }
+
                 Text(
                     stringResource(R.string.dialog_message_accessibility_service_explanation),
                     style = MaterialTheme.typography.bodyMedium,
                 )
 
-                if (isRestrictedSetting) {
-                    Spacer(modifier = Modifier.height(16.dp))
-                    RestrictedSettingText()
-                }
             }
         },
         confirmButton = {
@@ -204,14 +206,14 @@ private fun RestrictedSettingText(modifier: Modifier = Modifier) {
     Text(
         modifier = modifier,
         text = annotatedString,
-        style = MaterialTheme.typography.bodyMedium,
+        style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium),
     )
 }
 
 @Preview
 @Composable
 private fun EnableAccessibilityServiceDialogPreview() {
-    MaterialTheme {
+    KeyMapperTheme {
         EnableAccessibilityServiceDialog(
             isRestrictedSetting = false,
             onDismissRequest = {},
@@ -223,7 +225,7 @@ private fun EnableAccessibilityServiceDialogPreview() {
 @Preview
 @Composable
 private fun EnableAccessibilityServiceDialogRestrictedPreview() {
-    MaterialTheme {
+    KeyMapperTheme {
         EnableAccessibilityServiceDialog(
             isRestrictedSetting = true,
             onDismissRequest = {},
@@ -235,7 +237,7 @@ private fun EnableAccessibilityServiceDialogRestrictedPreview() {
 @Preview
 @Composable
 private fun RestartAccessibilityServiceDialogPreview() {
-    MaterialTheme {
+    KeyMapperTheme {
         RestartAccessibilityServiceDialog(
             onDismissRequest = {},
             onRestartClick = {},
@@ -248,7 +250,7 @@ private fun RestartAccessibilityServiceDialogPreview() {
 @Preview
 @Composable
 private fun CantFindAccessibilitySettingsDialogPreview() {
-    MaterialTheme {
+    KeyMapperTheme {
         CantFindAccessibilitySettingsDialog(
             onDismissRequest = {},
             onOpenGuide = {},

base/src/main/java/io/github/sds100/keymapper/base/system/accessibility/ControlAccessibilityServiceUseCase.kt

@@ -47,7 +47,9 @@ class ControlAccessibilityServiceUseCaseImpl @Inject constructor(
 
     override fun isRestrictedSetting(): Boolean {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            packageManagerAdapter.getInstallSourcePackageName() == "com.android.vending"
+            // If the app is installed outside of Google Play then Android disables
+            // the accessibility service until restricted settings are enabled.
+            packageManagerAdapter.getInstallSourcePackageName() != "com.android.vending"
         } else {
             false
         }

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

@@ -455,8 +455,8 @@
     <string name="dialog_title_accessibility_service_explanation">Accessibility service must be enabled</string>
     <string name="dialog_message_accessibility_service_explanation">@string/accessibility_service_explanation</string>
 
-    <string name="dialog_restricted_setting_message">Since you installed Key Mapper from the Google Play Store, you will need to follow some extra steps to enable the accessibility service.</string>
-    <string name="dialog_restricted_setting_link_text">Read instructions.</string>
+    <string name="dialog_restricted_setting_message">You may need to allow Restricted Settings.</string>
+    <string name="dialog_restricted_setting_link_text">Tap to read instructions.</string>
 
     <string name="dialog_title_fix_dnd_trigger_error">Grant Do Not Disturb access</string>
     <string name="dialog_message_fix_dnd_trigger_error">You will be taken to your device\'s settings page to manage which apps can modify the Do Not Disturb state. This is <b>not present on some devices</b> so tap don\'t show again if you do not see Key Mapper in the list.</string>