diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java index a6fe752f6c..11aa056735 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java @@ -58,7 +58,7 @@ public class InfoActivity extends AppCompatActivity { PackageInfo pInfo; try { pInfo = getPackageManager().getPackageInfo(getPackageName(), 0); - ver = String.format("Version: %s", pInfo.versionName); + ver = String.format("%s: %s", getString(R.string.title_version), pInfo.versionName); } catch (NameNotFoundException e) { // Could not get version number } diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java index 9e17a5d6ae..b886faf4b0 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java @@ -298,7 +298,9 @@ public class MainActivity extends AppCompatActivity implements OnKeyboardEventLi downloadIntent.putExtra("receiver", resultReceiver); progressDialog = new ProgressDialog(MainActivity.this); - progressDialog.setMessage(getString(R.string.downloading_keyboard_package) + "\n" + filename + "..."); + String ellipsisStr = "\u2026"; + progressDialog.setMessage(String.format("%s\n%s%s", + getString(R.string.downloading_keyboard_package), filename, ellipsisStr)); progressDialog.setCancelable(false); progressDialog.show(); @@ -509,7 +511,7 @@ public class MainActivity extends AppCompatActivity implements OnKeyboardEventLi final View textSizeController = inflater.inflate(R.layout.text_size_controller, null); final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MainActivity.this); dialogBuilder.setIcon(R.drawable.ic_light_action_textsize); - dialogBuilder.setTitle(String.format(getString(R.string.text_size) + ": %d", textSize)); + dialogBuilder.setTitle(String.format("%s: %d", getString(R.string.action_text_size), textSize)); dialogBuilder.setView(textSizeController); dialogBuilder.setPositiveButton(getString(R.string.label_ok), new DialogInterface.OnClickListener() { @Override @@ -540,7 +542,7 @@ public class MainActivity extends AppCompatActivity implements OnKeyboardEventLi public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { textSize = progress + minTextSize; textView.setTextSize((float) textSize); - dialog.setTitle(String.format(getString(R.string.text_size) + ": %d", textSize)); + dialog.setTitle(String.format("%s: %d", getString(R.string.action_text_size), textSize)); } }); diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java index 0d5502a648..632609de4b 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java @@ -61,7 +61,8 @@ public class PackageActivity extends AppCompatActivity { try { tempPackagePath = PackageProcessor.unzipKMP(kmpFile); } catch (Exception e) { - String message = getString(R.string.failed_to_extract) + "\n" + kmpFile.getAbsolutePath(); + String message = String.format("%s\n%s", + getString(R.string.failed_to_extract), kmpFile.getAbsolutePath()); showErrorDialog(context, pkgId, message); } @@ -80,7 +81,7 @@ public class PackageActivity extends AppCompatActivity { packageActivityTitle.setTextSize(getResources().getDimension(R.dimen.titlebar_label_textsize)); packageActivityTitle.setGravity(Gravity.CENTER); - String titleStr = getString(R.string.install_keyboard_package) + pkgVersion; + String titleStr = String.format("%s %s", getString(R.string.install_keyboard_package), pkgVersion); packageActivityTitle.setText(titleStr); getSupportActionBar().setCustomView(packageActivityTitle); @@ -139,7 +140,8 @@ public class PackageActivity extends AppCompatActivity { webView.loadUrl("file:///" + files[0].getAbsolutePath()); } else { // No welcome.htm so display minimal package information - String keyboardString = (pkgName != null && pkgName.toLowerCase().endsWith("keyboard")) ? "" : " Keyboard "; + String keyboardString = (pkgName != null && pkgName.toLowerCase().endsWith("keyboard")) ? "" : + String.format(" %s", getString(R.string.title_keyboard)); String htmlString = String.format( "

The %s%s Package

", pkgName, keyboardString); @@ -216,11 +218,12 @@ public class PackageActivity extends AppCompatActivity { private void showErrorDialog(Context context, String pkgId, String message) { AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context); - alertDialogBuilder.setTitle(getString(R.string.title_package) + pkgId + getString(R.string.failed_to_install)); + alertDialogBuilder.setTitle(String.format("%s %s %s", + getString(R.string.title_package), pkgId, getString(R.string.title_failed_to_install))); alertDialogBuilder .setMessage(message) .setCancelable(false) - .setNeutralButton(getString(R.string.label_close),new DialogInterface.OnClickListener() { + .setPositiveButton(getString(R.string.label_close),new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog,int id) { if (dialog != null) { dialog.dismiss(); diff --git a/android/KMAPro/kMAPro/src/main/res/layout/activity_splash_screen.xml b/android/KMAPro/kMAPro/src/main/res/layout/activity_splash_screen.xml index 2bc83c3d18..ef44160278 100644 --- a/android/KMAPro/kMAPro/src/main/res/layout/activity_splash_screen.xml +++ b/android/KMAPro/kMAPro/src/main/res/layout/activity_splash_screen.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:text="@string/splash_version" + android:text="@string/title_version" android:textSize="@dimen/activity_splash_textsize" /> Keyman - Version - Copyright © 1992- + Share Web Browser Text Size More Clear Text Info + Version + Start typing here… - - Text size + + Copyright © 1992- + + Text size up Text size down - - + All text will be cleared - + + + Get Started Add a keyboard for your language Enable Keyman as system-wide keyboard @@ -38,11 +42,11 @@ Url - Package - failed to install + Package + failed to install Downloading keyboard package Failed to extract - Install Keyboard Package + Install Keyboard Package No new touch-optimized keyboards to install No valid touch-optimized keyboards to install diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboardDownloaderActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboardDownloaderActivity.java index e533a6f835..9af503bd46 100644 --- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboardDownloaderActivity.java +++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboardDownloaderActivity.java @@ -106,7 +106,7 @@ public class KMKeyboardDownloaderActivity extends AppCompatActivity { Bundle args = new Bundle(); String title = ""; if (url != null) { - title = "Custom Keyboard: " + filename; + title = String.format("%s: %s", getString(R.string.custom_keyboard), filename); } else if (customKeyboard != null && customLanguage != null && !customKeyboard.trim().isEmpty() && !customLanguage.trim().isEmpty()) { int kbIndex = KMManager.getKeyboardIndex(getApplicationContext(), customKeyboard, customLanguage); @@ -117,10 +117,10 @@ public class KMKeyboardDownloaderActivity extends AppCompatActivity { return; // false } - title = customLanguage + "_" + customKeyboard; + title = String.format("%s_%s", customLanguage, customKeyboard); } else { // Download keyboard from cloud server - title = langName + ": " + kbName; + title = String.format("%s: %s", langName, kbName); } DialogFragment dialog = new ConfirmDialogFragment(); diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java index def0c144d9..b10b76fd36 100644 --- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java +++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java @@ -164,7 +164,7 @@ public final class KeyboardPickerActivity extends AppCompatActivity implements O AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context); dialogBuilder.setTitle(getString(R.string.title_add_keyboard)); dialogBuilder.setIcon(context.getResources().getDrawable(android.R.drawable.ic_input_add)); - dialogBuilder.setMessage("\n" + getString(R.string.cannot_connect) + "\n"); + dialogBuilder.setMessage(String.format("\n%s\n", getString(R.string.cannot_connect))); dialogBuilder.setPositiveButton(getString(R.string.label_ok), null); AlertDialog dialog = dialogBuilder.create(); dialog.show(); @@ -525,7 +525,7 @@ public final class KeyboardPickerActivity extends AppCompatActivity implements O AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context); dialogBuilder.setTitle(context.getString(R.string.title_add_keyboard)); dialogBuilder.setIcon(context.getResources().getDrawable(android.R.drawable.ic_input_add)); - dialogBuilder.setMessage("\n" + context.getString(R.string.cannot_connect) + "\n"); + dialogBuilder.setMessage(String.format("\n%s\n", context.getString(R.string.cannot_connect))); dialogBuilder.setPositiveButton(context.getString(R.string.label_ok), null); AlertDialog dialog = dialogBuilder.create(); dialog.show(); @@ -619,7 +619,7 @@ public final class KeyboardPickerActivity extends AppCompatActivity implements O failedUpdateCount = 0; updateCount = result; AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context); - dialogBuilder.setTitle(context.getString(R.string.keyboard_update_available)); + dialogBuilder.setTitle(context.getString(R.string.keyboard_updates_available)); dialogBuilder.setMessage(context.getString(R.string.confirm_update)); dialogBuilder.setPositiveButton(context.getString(R.string.label_update), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { diff --git a/android/KMEA/app/src/main/res/values/strings.xml b/android/KMEA/app/src/main/res/values/strings.xml index facca5ff0c..f3bdee3797 100644 --- a/android/KMEA/app/src/main/res/values/strings.xml +++ b/android/KMEA/app/src/main/res/values/strings.xml @@ -4,11 +4,12 @@ AndroidMobile - + KMEA Keyboards + Keyboard Add New Keyboard @@ -21,15 +22,18 @@ OK Update + + Cannot connect to Keyman server! - Checking keyboard updates... + Checking keyboard updates… Would you like to download this keyboard? Would you like to update keyboards now? - Downloading keyboard... - Keyboard Updates Available - Loading... - Updating keyboards... + Custom Keyboard + Downloading keyboard… + Keyboard Updates Available + Loading… + Updating keyboards… Keyboard version