Use locale ID + rewrites names for shortcut label

Kaljurand · Sep 27, 2020 · 836bb04 · 836bb04
1 parent 1089ddb
commit 836bb04
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId 'ee.ioc.phon.android.speak'
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 1740
-        versionName '1.7.40'
+        versionCode 1741
+        versionName '1.7.41'
         vectorDrawables.useSupportLibrary = true
         // Keep only en and et resources
         resConfigs "en", "et"

diff --git a/app/src/main/java/ee/ioc/phon/android/speak/model/Combo.java b/app/src/main/java/ee/ioc/phon/android/speak/model/Combo.java
@@ -32,7 +32,7 @@ public Combo(Context context, String id) {
         mComponentName = pair.first;
         mLocaleAsStr = pair.second;
         mServiceLabel = RecognitionServiceManager.getServiceLabel(context, mComponentName);
-        mLocaleShortLabel = RecognitionServiceManager.getDisplayLanguage(mLocaleAsStr);
+        mLocaleShortLabel = mLocaleAsStr;
         mLocaleLongLabel = RecognitionServiceManager.makeLangLabel(mLocaleAsStr);
         mFormatLabelComboItem = context.getString(R.string.labelComboItem);
         mAsString = String.format(context.getString(R.string.labelComboListItem), mServiceLabel, mLocaleLongLabel);

diff --git a/app/src/main/java/ee/ioc/phon/android/speak/utils/Utils.java b/app/src/main/java/ee/ioc/phon/android/speak/utils/Utils.java
@@ -141,7 +141,7 @@ public static AlertDialog getYesNoDialog(Context context, String confirmationMes
 
     public static AlertDialog getTextEntryDialog(Context context, String title, String initialText, final ExecutableString ex) {
         final View textEntryView = LayoutInflater.from(context).inflate(R.layout.alert_dialog_url_entry, null);
-        final EditText et = (EditText) textEntryView.findViewById(R.id.url_edit);
+        final EditText et = textEntryView.findViewById(R.id.url_edit);
         if (initialText != null) {
             et.setText(initialText);
             et.setSelection(initialText.length());
@@ -299,6 +299,10 @@ public static void publishShortcuts(Context context, List<Combo> selectedCombos,
         String[] names = rewriteTables.toArray(new String[rewriteTables.size()]);
         Arrays.sort(names);
         String rewritesId = TextUtils.join(", ", names);
+        String rewritesIdSuffix = "";
+        if (!rewritesId.isEmpty()) {
+            rewritesIdSuffix = "; " + rewritesId;
+        }
 
         for (Combo combo : selectedCombos) {
             Intent intent = new Intent(context, SpeechActionActivity.class);
@@ -314,8 +318,8 @@ public static void publishShortcuts(Context context, List<Combo> selectedCombos,
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
             shortcuts.add(new ShortcutInfo.Builder(context, combo.getId() + rewritesId)
                     .setIntent(intent)
-                    .setShortLabel(combo.getShortLabel())
-                    .setLongLabel(combo.getLongLabel() + "; " + rewritesId)
+                    .setShortLabel(combo.getShortLabel() + rewritesIdSuffix)
+                    .setLongLabel(combo.getLongLabel() + rewritesIdSuffix)
                     .setIcon(Icon.createWithBitmap(drawableToBitmap(combo.getIcon(context))))
                     .build());
             counter++;

diff --git a/speechutils b/speechutils