[Settings/MG]: Small fixes for the settings UI

alexytomi · alexytomi · commit e75e5f1c0efa · 2025-04-10T00:39:51.000+08:00
Refactors to long and adds a limit to maxGlslCacheSize so java is happy with people putting absurdly large numbers on it.
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavApplication.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavApplication.java
@@ -76,6 +76,7 @@ public void onCreate() {
 												.concat("/x86");
 			}
 			AsyncAssetManager.unpackRuntime(getAssets());
+			LauncherPreferences.writeMGRendererSettings();
 		} catch (Throwable throwable) {
 			Intent ferrorIntent = new Intent(this, FatalErrorActivity.class);
 			ferrorIntent.putExtra("throwable", throwable);
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
@@ -15,9 +15,13 @@
 
 import net.kdt.pojavlaunch.*;
 import net.kdt.pojavlaunch.multirt.MultiRTUtils;
+import net.kdt.pojavlaunch.utils.FileUtils;
 import net.kdt.pojavlaunch.utils.JREUtils;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 public class LauncherPreferences {
     public static final String PREF_KEY_CURRENT_PROFILE = "currentProfile";
@@ -232,4 +236,20 @@ public static void computeNotchSize(Activity activity) {
         }
         Tools.updateWindowSize(activity);
     }
+    public static void writeMGRendererSettings() throws IOException {
+        Map<String, Object> MGConfigMap = new LinkedHashMap<>();
+        MGConfigMap.put("enableAngle", Integer.parseInt(MG_ANGLE_OPTION));
+        MGConfigMap.put("enableNoError", Integer.parseInt(MG_NOERROR_OPTION));
+        MGConfigMap.put("enableExtGL43", Integer.parseInt(MG_EXT_GL43));
+        MGConfigMap.put("enableExtComputeShader", Integer.parseInt(MG_EXT_CS));
+        MGConfigMap.put("maxGlslCacheSize", Long.parseLong(MG_GLSL_CACHE_SIZE));
+        MGConfigMap.put("multidrawMode", Integer.parseInt(MG_MULTIDRAWMODE_OPTION));
+        File configFile = new File(Tools.DIR_DATA + "/MobileGlues", "config.json");
+        FileUtils.ensureParentDirectory(configFile);
+        try {
+            Tools.write(configFile.getAbsolutePath(),Tools.GLOBAL_GSON.toJson(MGConfigMap));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceVideoFragment.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceVideoFragment.java
@@ -18,20 +18,17 @@
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.Switch;
+import android.widget.Toast;
 
 import net.kdt.pojavlaunch.R;
 import net.kdt.pojavlaunch.Tools;
 import net.kdt.pojavlaunch.prefs.CustomSeekBarPreference;
 import net.kdt.pojavlaunch.prefs.LauncherPreferences;
-import net.kdt.pojavlaunch.utils.FileUtils;
 
 import com.kdt.ui.dialog.*;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
 
 /**
  * Fragment for any settings video related
@@ -162,19 +159,13 @@ private void mgRendererSettings() {
 
                     }
 
-                    int currentCacheSize;
+                    long currentCacheSize;
                     try {
-                        currentCacheSize = Integer.parseInt(cacheSize);
+                        currentCacheSize = Long.parseLong(cacheSize);
                     } catch (NumberFormatException e) {
                         Log.e("MG maxGlslCacheSize", e.toString());
-
-                        // maxGlslCacheSize.setError(e.toString());
-                        maxGlslCacheSize.setError(getString(R.string.mg_option_glsl_cache_error_unexpected));
-                        return false;
-                    }
-
-                    if (currentCacheSize > 99999) {
-                        maxGlslCacheSize.setError(getString(R.string.mg_option_glsl_cache_error_invalid));
+                        Toast.makeText(getContext(),getString(R.string.mg_option_glsl_cache_error_too_big),Toast.LENGTH_SHORT).show();
+                        maxGlslCacheSize.setText(Long.toString(Long.MAX_VALUE));
                         return false;
                     }
 
@@ -197,7 +188,7 @@ private void mgRendererSettings() {
                             .putString("mg_ext_compute_shader", LauncherPreferences.MG_EXT_CS)
                             .apply();
                     try {
-                        writeRendererSettings();
+                        LauncherPreferences.writeMGRendererSettings();
                     } catch (Exception e) {
                         throw new IOException(e);
                     }
@@ -209,24 +200,4 @@ private void mgRendererSettings() {
                 .build()
                 .show();
     }
-    private void writeRendererSettings() throws IOException {
-        Map<String, Integer> MGConfigMap = new LinkedHashMap<>();
-
-        MGConfigMap.put("enableAngle", Integer.parseInt(LauncherPreferences.MG_ANGLE_OPTION));
-        MGConfigMap.put("enableNoError", Integer.parseInt(LauncherPreferences.MG_NOERROR_OPTION));
-        MGConfigMap.put("enableExtGL43", Integer.parseInt(LauncherPreferences.MG_EXT_GL43));
-        MGConfigMap.put("enableExtComputeShader", Integer.parseInt(LauncherPreferences.MG_EXT_CS));
-        MGConfigMap.put("maxGlslCacheSize", Integer.parseInt(LauncherPreferences.MG_GLSL_CACHE_SIZE));
-        MGConfigMap.put("multidrawMode", Integer.parseInt(LauncherPreferences.MG_MULTIDRAWMODE_OPTION));
-
-        File configFile = new File(Tools.DIR_DATA + "/MobileGlues", "config.json");
-        FileUtils.ensureParentDirectory(configFile);
-        try {
-            Tools.write(configFile.getAbsolutePath(),Tools.GLOBAL_GSON.toJson(MGConfigMap));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
-
-    }
 }
diff --git a/app_pojavlauncher/src/main/res/layout/dialog_mgrenderer_settings.xml b/app_pojavlauncher/src/main/res/layout/dialog_mgrenderer_settings.xml
@@ -91,6 +91,7 @@
                 android:id="@+id/mg_switch_ext_cs"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="32dp"
                 android:text="@string/mg_option_ext_cs"
                 app:layout_constraintBottom_toBottomOf="parent" />
 
diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml
@@ -465,4 +465,5 @@
     <string name="mg_option_multidraw_mode_drawelements">Forcing DrawElements</string>
     <string name="mg_option_ext_gl43">Enable incomplete OpenGL43 extension</string>
     <string name="mg_option_ext_cs">Enable incomplete ARB_compute_shader extension</string>
+    <string name="mg_option_glsl_cache_error_too_big">Error: Value too big. Setting to maximum possible value.</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ public void onCreate() {`
`76`	`76`	`.concat("/x86");`
`77`	`77`	`}`
`78`	`78`	`AsyncAssetManager.unpackRuntime(getAssets());`
	`79`	`+ LauncherPreferences.writeMGRendererSettings();`
`79`	`80`	`} catch (Throwable throwable) {`
`80`	`81`	`Intent ferrorIntent = new Intent(this, FatalErrorActivity.class);`
`81`	`82`	`ferrorIntent.putExtra("throwable", throwable);`