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

Fix duplicate "keyboard" / "model" string on install

Browse source
This commit is contained in:
Darcy Wong 2019-02-27 23:13:04 +07:00
parent 0d32390346
commit b568077bf6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java
View file

@ -99,8 +99,8 @@ public class PackageActivity extends AppCompatActivity {
packageActivityTitle.setTextSize(getResources().getDimension(R.dimen.titlebar_label_textsize));
packageActivityTitle.setGravity(Gravity.CENTER);
String pkgTargetTitle = pkgTarget.equals(PackageProcessor.PP_TARGET_KEYBOARDS) ? getString(R.string.install_keyboard_package) :
getString(R.string.install_lexical_model_package);
String pkgTargetTitle = pkgTarget.equals(PackageProcessor.PP_TARGET_KEYBOARDS) ?
getString(R.string.install_keyboard_package) : getString(R.string.install_lexical_model_package);
String titleStr = String.format("%s %s", pkgTargetTitle, pkgVersion);
packageActivityTitle.setText(titleStr);
getSupportActionBar().setCustomView(packageActivityTitle);
@ -162,10 +162,10 @@ public class PackageActivity extends AppCompatActivity {
// No welcome.htm so display minimal package information
String targetString = "";
if (pkgTarget.equals(PackageProcessor.PP_TARGET_KEYBOARDS)) {
targetString = pkgName != null && pkgName.toLowerCase().endsWith(PackageProcessor.PP_TARGET_KEYBOARDS)
targetString = pkgName != null && pkgName.toLowerCase().endsWith("keyboard")
? "" : String.format(" %s", getString(R.string.title_keyboard));
} else if (pkgTarget.equals(PackageProcessor.PP_TARGET_LEXICAL_MODELS)) {
targetString = pkgName != null && pkgName.toLowerCase().endsWith(PackageProcessor.PP_TARGET_LEXICAL_MODELS)
targetString = pkgName != null && pkgName.toLowerCase().endsWith("model")
? "" :String.format(" %s", "model");
}
String htmlString = String.format(