Skip to content
This repository was archived by the owner on May 4, 2023. It is now read-only.

Commit dfe5357

Browse files
Fix crashing for theme switcher
Very hacky but it's better than it crashing for non-english locales Signed-off-by: androidacy-user <opensource@androidacy.com>
1 parent f07627d commit dfe5357

File tree

20 files changed

+28
-23
lines changed

20 files changed

+28
-23
lines changed

app/src/main/java/com/fox2code/mmm/MainApplication.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -233,18 +233,9 @@ public void updateTheme() {
233233
themeResId = monet ? R.style.Theme_MagiskModuleManager_Monet_Light : R.style.Theme_MagiskModuleManager_Light;
234234
break;
235235
}
236-
// Handle force black theme
237-
if (theme.equals("dark") && isForceBlackThemeEnabled()) {
238-
// just black background
239-
themeResId = monet ? R.style.Theme_MagiskModuleManager_Monet_Black : R.style.Theme_MagiskModuleManager_Black;
240-
}
241236
this.setManagerThemeResId(themeResId);
242237
}
243238

244-
private boolean isForceBlackThemeEnabled() {
245-
return getSharedPreferences().getBoolean("pref_force_black_theme", false);
246-
}
247-
248239
@StyleRes
249240
public int getManagerThemeResId() {
250241
return managerThemeResId;

app/src/main/java/com/fox2code/mmm/utils/Http.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,16 @@ public class Http {
153153
builder.enableBrotli(true);
154154
builder.enableHttp2(true);
155155
builder.enableQuic(true);
156+
// Cache size is 10MB
157+
// Make the directory if it does not exist
158+
File cacheDir = new File(mainApplication.getCacheDir(), "cronet");
159+
if (!cacheDir.exists()) {
160+
if (!cacheDir.mkdirs()) {
161+
throw new IOException("Failed to create cronet cache directory");
162+
}
163+
}
164+
builder.setStoragePath(mainApplication.getCacheDir().getAbsolutePath() + "/cronet");
165+
builder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 10 * 1024 * 1024);
156166
CronetEngine engine =
157167
builder.build();
158168
httpclientBuilder.addInterceptor(CronetInterceptor.newBuilder(engine).build());
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
<resources>
2-
<!-- If translating, please remove "theme_values"
3-
<string-array name="theme_values" translatable="false">
4-
<item>system</item>
5-
<item>dark</item>
6-
<item>light</item>
7-
</string-array>-->
8-
92
<string-array name="theme_values_names">
103
<item>Dle systému</item>
114
<item>Tmavá</item>
5+
<item>AMOLED Black</item>
126
<item>Světlá</item>
137
</string-array>
148
</resources>

app/src/main/res/values-de/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<string-array name="theme_values_names">
44
<item>Systemvorgabe</item>
55
<item>Dunkel</item>
6+
<item>AMOLED Black</item>
67
<item>Hell</item>
78
</string-array>
89
</resources>

app/src/main/res/values-el/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<string-array name="theme_values_names">
33
<item>Προεπιλογή συστήματως</item>
44
<item>Σκωτεινό</item>
5+
<item>AMOLED Black</item>
56
<item>Ανοιχτό</item>
67
</string-array>
78
</resources>

app/src/main/res/values-es-rMX/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<string-array name="theme_values_names">
33
<item>Sistema</item>
44
<item>Oscuro</item>
5+
<item>AMOLED Black</item>
56
<item>Claro</item>
67
</string-array>
78
</resources>

app/src/main/res/values-et/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<string-array name="theme_values_names">
33
<item>Süsteem</item>
44
<item>Tume</item>
5+
<item>AMOLED Black</item>
56
<item>Hele</item>
67
</string-array>
78
</resources>

app/src/main/res/values-fr/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<string-array name="theme_values_names">
33
<item>Système</item>
44
<item>Sombre</item>
5+
<item>AMOLED Black</item>
56
<item>Clair</item>
67
</string-array>
78
</resources>

app/src/main/res/values-id/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<string-array name="theme_values_names">
33
<item>Sistem</item>
44
<item>Gelap</item>
5+
<item>AMOLED Black</item>
56
<item>Terang</item>
67
</string-array>
78
</resources>

app/src/main/res/values-it/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<string-array name="theme_values_names">
33
<item>Sistema</item>
44
<item>Scuro</item>
5+
<item>AMOLED Black</item>
56
<item>Chiaro</item>
67
</string-array>
78
</resources>

0 commit comments

Comments
 (0)