From 7f64fc4203aaa82d909cf0335bf75a870ccc6f7f Mon Sep 17 00:00:00 2001
From: frknkrc44 <krc440002@gmail.com>
Date: Thu, 11 Jan 2024 12:04:24 +0300
Subject: [PATCH] Enable all optimizations

---
 app/build.gradle                                           | 7 +++++--
 .../main/java/org/blinksd/board/SuperBoardApplication.java | 2 +-
 .../board/views/SettingsCategorizedListAdapter.java        | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3979ff1..d63bd59 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,7 +49,10 @@ android {
     buildTypes {
         release {
             signingConfig signingConfigs.release
-            minifyEnabled false
+            debuggable false
+            jniDebuggable false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -66,7 +69,7 @@ dependencies {
 
 android.applicationVariants.configureEach { variant ->
     variant.outputs.configureEach {
-        outputFileName = "FBoard-v${variant.versionName}.apk"
+        outputFileName = "${rootProject.name}-v${variant.versionName}.apk"
     }
 }
 
diff --git a/app/src/main/java/org/blinksd/board/SuperBoardApplication.java b/app/src/main/java/org/blinksd/board/SuperBoardApplication.java
index 6f1d524..e946ed2 100644
--- a/app/src/main/java/org/blinksd/board/SuperBoardApplication.java
+++ b/app/src/main/java/org/blinksd/board/SuperBoardApplication.java
@@ -140,7 +140,7 @@ public static void getNextLanguage() {
         ArrayList<String> ll = LayoutUtils.getKeyListFromLanguageList(languageCache);
         String key = SettingMap.SET_KEYBOARD_LANG_SELECT;
         String sel = appDB.getString(key, (String) settingMap.getDefaults(key));
-        if (!sel.equals("")) {
+        if (!sel.isEmpty()) {
             int index = -1;
             for (int i = 0; i < ll.size(); i++) {
                 if (ll.get(i).equals(sel)) {
diff --git a/app/src/main/java/org/blinksd/board/views/SettingsCategorizedListAdapter.java b/app/src/main/java/org/blinksd/board/views/SettingsCategorizedListAdapter.java
index 0340db7..e973ac1 100644
--- a/app/src/main/java/org/blinksd/board/views/SettingsCategorizedListAdapter.java
+++ b/app/src/main/java/org/blinksd/board/views/SettingsCategorizedListAdapter.java
@@ -290,7 +290,7 @@ private static SettingMap getSettings() {
     public static String getTranslation(Context ctx, String key) {
         String requestedKey = "settings_" + key;
         try {
-            int id = R.string.class.getDeclaredField(requestedKey).getInt(null);
+            int id = ctx.getResources().getIdentifier(requestedKey, "string", ctx.getPackageName());
             return ctx.getString(id);
         } catch (Throwable ignored) {}
         return requestedKey;
@@ -598,7 +598,7 @@ public static void setColorsFromBitmap(Bitmap b) {
     private List<String> getArrayAsList(String key) {
         int id;
         try {
-            id = R.array.class.getDeclaredField("settings_" + key).getInt(null);
+            id = mContext.getResources().getIdentifier("settings_" + key, "array", mContext.getPackageName());
         } catch (Throwable t) {
             id = 0;
         }