Skip to content

Commit 19a1b64

Browse files
committed
#2107 clarify accessibility restart dialog actions and copy
1 parent 6fc8801 commit 19a1b64

2 files changed

Lines changed: 6 additions & 23 deletions

File tree

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

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package io.github.sds100.keymapper.base.onboarding
22

33
import androidx.compose.foundation.layout.Column
4-
import androidx.compose.foundation.layout.Row
54
import androidx.compose.foundation.layout.Spacer
65
import androidx.compose.foundation.layout.height
7-
import androidx.compose.foundation.layout.width
86
import androidx.compose.material3.AlertDialog
97
import androidx.compose.material3.MaterialTheme
108
import androidx.compose.material3.Text
@@ -41,15 +39,10 @@ fun HandleAccessibilityServiceDialogs(delegate: SetupAccessibilityServiceDelegat
4139
}
4240

4341
is AccessibilityServiceDialog.RestartService -> {
44-
val dontKillMyAppUrl = stringResource(R.string.url_dont_kill_my_app)
4542
RestartAccessibilityServiceDialog(
4643
modifier = Modifier,
4744
onDismissRequest = delegate::onCancelClick,
4845
onRestartClick = delegate::onRestartServiceClick,
49-
onDontKillMyAppClick = {
50-
uriHandler.openUriSafe(context, dontKillMyAppUrl)
51-
},
52-
onIgnoreClick = delegate::onIgnoreCrashedClick,
5346
)
5447
}
5548

@@ -113,8 +106,6 @@ private fun RestartAccessibilityServiceDialog(
113106
modifier: Modifier = Modifier,
114107
onDismissRequest: () -> Unit,
115108
onRestartClick: () -> Unit,
116-
onDontKillMyAppClick: () -> Unit,
117-
onIgnoreClick: () -> Unit,
118109
) {
119110
AlertDialog(
120111
modifier = modifier,
@@ -129,19 +120,13 @@ private fun RestartAccessibilityServiceDialog(
129120
)
130121
},
131122
confirmButton = {
132-
Row {
133-
TextButton(onClick = onRestartClick) {
134-
Text(stringResource(R.string.pos_restart))
135-
}
136-
Spacer(modifier = Modifier.width(8.dp))
137-
TextButton(onClick = onDontKillMyAppClick) {
138-
Text(stringResource(R.string.dialog_button_read_dont_kill_my_app_yes))
139-
}
123+
TextButton(onClick = onRestartClick) {
124+
Text(stringResource(R.string.pos_restart))
140125
}
141126
},
142127
dismissButton = {
143-
TextButton(onClick = onIgnoreClick) {
144-
Text(stringResource(R.string.dialog_button_read_dont_kill_my_app_no))
128+
TextButton(onClick = onDismissRequest) {
129+
Text(stringResource(R.string.neg_cancel))
145130
}
146131
},
147132
)
@@ -238,8 +223,6 @@ private fun RestartAccessibilityServiceDialogPreview() {
238223
RestartAccessibilityServiceDialog(
239224
onDismissRequest = {},
240225
onRestartClick = {},
241-
onDontKillMyAppClick = {},
242-
onIgnoreClick = {},
243226
)
244227
}
245228
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,8 @@
460460
<string name="dialog_message_restart_accessibility_service">Restart the accessibility service by turning it <i>off</i> and <i>on</i>.</string>
461461

462462

463-
<string name="dialog_title_key_mapper_crashed">Key Mapper was interrupted</string>
464-
<string name="dialog_message_key_mapper_crashed">Key Mapper tried to run in the background but was stopped by the system.\nThis can happen if you have battery or memory optimization turned on.\n\nTo fix this, you can try following an online guide. You should also restart the service when you\'re done.</string>
463+
<string name="dialog_title_key_mapper_crashed">Accessibility service needs restarting</string>
464+
<string name="dialog_message_key_mapper_crashed">Key Mapper\'s accessibility service was stopped by the system.\n\nTo fix this, restart it by turning the accessibility service off and then on again.</string>
465465
<string name="dialog_button_read_dont_kill_my_app_yes">Proceed</string>
466466
<string name="dialog_button_read_dont_kill_my_app_no">Ignore</string>
467467

0 commit comments

Comments
 (0)