erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-12 03:45:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

fix(android): Clarify label that shows "Get Started" on startup

Browse source 
PR #2751 cleaned up UI strings, changing the label from `Show "Get Started" on startup` to `Show this menu on startup`. This change was fine for "Get Started" menu, but the label is confusing when reused on the Keyman Settings menu.

This PR reverts the label (while formatting the string to include the localized string for "Get Started".
This commit is contained in:
Darcy Wong 2020-04-24 09:39:03 +07:00
parent 075848cf22
commit e08e6eb797
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/GetStartedActivity.java
View file

@ -70,6 +70,7 @@ public class GetStartedActivity extends AppCompatActivity {
});
final TextView getStartedText = findViewById(R.id.getStartedText);
getStartedText.setText(String.format(getString(R.string.show_get_started), getString(R.string.get_started)));
getStartedText.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

3
android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java
View file

@ -73,7 +73,8 @@ public class KeymanSettingsFragment extends PreferenceFragmentCompat {
SwitchPreference getStartedPreference = new SwitchPreference(context);
getStartedPreference.setKey(GetStartedActivity.showGetStartedKey);
getStartedPreference.setTitle(getString(R.string.show_get_started));
getStartedPreference.setTitle(String.format(getString(R.string.show_get_started), getString(R.string.get_started)));
getStartedPreference.setDefaultValue(true);
// Blocks the default checkmark interaction; we want to control the checkmark's state separately

2
android/KMAPro/kMAPro/src/main/res/values/strings.xml
View file

@ -36,7 +36,7 @@
<string name="enable_system_keyboard">Enable Keyman as system-wide keyboard</string>
<string name="set_keyman_as_default">Set Keyman as default keyboard</string>
<string name="more_info" comment="Open the help page">More info</string>
<string name="show_get_started">Show this menu on startup</string>
<string name="show_get_started">Show \"%1$s\" on startup</string>
<!-- Keyman Settings menu strings -->