mirror/LeanKeyboard
1
0
Fork 0
mirror of https://github.com/yuliskov/LeanKeyboard.git synced 2026-04-18 22:16:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

string fixes

Browse Source
This commit is contained in:
Yuriy Liskov
2020-01-19 23:47:37 +02:00
parent 6fff942296
commit ce710fbb4d
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardContainer.java
View File

@@ -37,6 +37,7 @@ import com.liskovsoft.leankeyboard.keyboard.android.leanback.ime.voice.Recognize
import com.liskovsoft.leankeyboard.keyboard.android.leanback.ime.voice.SpeechLevelSource;
import com.liskovsoft.leankeyboard.keyboard.leanback.ime.LeanbackImeService;
import com.liskovsoft.leankeyboard.settings.kblayout.KbLayoutActivity;
import com.liskovsoft.leankeyboard.settings.settings.KbSettingsActivity;
import com.liskovsoft.leankeyboard.utils.LeanKeyPreferences;
import com.liskovsoft.leankeyboard.addons.KeyboardManager;
import com.liskovsoft.leankeykeyboard.R;
@@ -1408,8 +1409,7 @@ public class LeanbackKeyboardContainer {
}
private void showKbLayoutSettings() {
Intent intent = new Intent(mContext, KbLayoutActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
Intent intent = new Intent(mContext, KbSettingsActivity.class);
mContext.startActivity(intent);
}
}

8
leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/about/AboutFragment.java
View File

@@ -30,8 +30,14 @@ public class AboutFragment extends GuidedStepSupportFragment {
@Override
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
appendInfoAction(AppInfoHelpers.getApplicationName(getActivity()), actions);
appendInfoAction("Version " + AppInfoHelpers.getAppVersionName(getActivity()), actions);
}
private void appendInfoAction(String textLine, List<GuidedAction> actions) {
GuidedAction action = new GuidedAction.Builder(getActivity())
.title(AppInfoHelpers.getAppVersionName(getActivity())).build();
.title(textLine)
.build();
actions.add(action);
}
}

11
leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/AppInfoHelpers.java
View File

@@ -4,6 +4,7 @@ import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
@@ -142,4 +143,14 @@ public class AppInfoHelpers {
return false;
}
public static String getApplicationName(Context context) {
if (context == null) {
return null;
}
ApplicationInfo applicationInfo = context.getApplicationInfo();
int stringId = applicationInfo.labelRes;
return stringId == 0 ? applicationInfo.nonLocalizedLabel.toString() : context.getString(stringId);
}
}