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>
pull/27/head
androidacy-user 3 years ago
parent f07627da59
commit dfe53576bd

@ -233,18 +233,9 @@ public class MainApplication extends FoxApplication implements androidx.work.Con
themeResId = monet ? R.style.Theme_MagiskModuleManager_Monet_Light : R.style.Theme_MagiskModuleManager_Light; themeResId = monet ? R.style.Theme_MagiskModuleManager_Monet_Light : R.style.Theme_MagiskModuleManager_Light;
break; break;
} }
// Handle force black theme
if (theme.equals("dark") && isForceBlackThemeEnabled()) {
// just black background
themeResId = monet ? R.style.Theme_MagiskModuleManager_Monet_Black : R.style.Theme_MagiskModuleManager_Black;
}
this.setManagerThemeResId(themeResId); this.setManagerThemeResId(themeResId);
} }
private boolean isForceBlackThemeEnabled() {
return getSharedPreferences().getBoolean("pref_force_black_theme", false);
}
@StyleRes @StyleRes
public int getManagerThemeResId() { public int getManagerThemeResId() {
return managerThemeResId; return managerThemeResId;

@ -153,6 +153,16 @@ public class Http {
builder.enableBrotli(true); builder.enableBrotli(true);
builder.enableHttp2(true); builder.enableHttp2(true);
builder.enableQuic(true); builder.enableQuic(true);
// Cache size is 10MB
// Make the directory if it does not exist
File cacheDir = new File(mainApplication.getCacheDir(), "cronet");
if (!cacheDir.exists()) {
if (!cacheDir.mkdirs()) {
throw new IOException("Failed to create cronet cache directory");
}
}
builder.setStoragePath(mainApplication.getCacheDir().getAbsolutePath() + "/cronet");
builder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 10 * 1024 * 1024);
CronetEngine engine = CronetEngine engine =
builder.build(); builder.build();
httpclientBuilder.addInterceptor(CronetInterceptor.newBuilder(engine).build()); httpclientBuilder.addInterceptor(CronetInterceptor.newBuilder(engine).build());

@ -1,14 +1,8 @@
<resources> <resources>
<!-- If translating, please remove "theme_values"
<string-array name="theme_values" translatable="false">
<item>system</item>
<item>dark</item>
<item>light</item>
</string-array>-->
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Dle systému</item> <item>Dle systému</item>
<item>Tmavá</item> <item>Tmavá</item>
<item>AMOLED Black</item>
<item>Světlá</item> <item>Světlá</item>
</string-array> </string-array>
</resources> </resources>

@ -3,6 +3,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Systemvorgabe</item> <item>Systemvorgabe</item>
<item>Dunkel</item> <item>Dunkel</item>
<item>AMOLED Black</item>
<item>Hell</item> <item>Hell</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Προεπιλογή συστήματως</item> <item>Προεπιλογή συστήματως</item>
<item>Σκωτεινό</item> <item>Σκωτεινό</item>
<item>AMOLED Black</item>
<item>Ανοιχτό</item> <item>Ανοιχτό</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Sistema</item> <item>Sistema</item>
<item>Oscuro</item> <item>Oscuro</item>
<item>AMOLED Black</item>
<item>Claro</item> <item>Claro</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Süsteem</item> <item>Süsteem</item>
<item>Tume</item> <item>Tume</item>
<item>AMOLED Black</item>
<item>Hele</item> <item>Hele</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Système</item> <item>Système</item>
<item>Sombre</item> <item>Sombre</item>
<item>AMOLED Black</item>
<item>Clair</item> <item>Clair</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Sistem</item> <item>Sistem</item>
<item>Gelap</item> <item>Gelap</item>
<item>AMOLED Black</item>
<item>Terang</item> <item>Terang</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Sistema</item> <item>Sistema</item>
<item>Scuro</item> <item>Scuro</item>
<item>AMOLED Black</item>
<item>Chiaro</item> <item>Chiaro</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>システムの設定を使用</item> <item>システムの設定を使用</item>
<item>ダーク</item> <item>ダーク</item>
<item>AMOLED Black</item>
<item>ライト</item> <item>ライト</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item comment="theme_values_names">Zgodny z systemem</item> <item comment="theme_values_names">Zgodny z systemem</item>
<item comment="theme_values_names">Ciemny</item> <item comment="theme_values_names">Ciemny</item>
<item>AMOLED Black</item>
<item comment="theme_values_names">Jasny</item> <item comment="theme_values_names">Jasny</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Sistema</item> <item>Sistema</item>
<item>Escuro</item> <item>Escuro</item>
<item>AMOLED Black</item>
<item>Claro</item> <item>Claro</item>
</string-array> </string-array>
</resources> </resources>

@ -4,6 +4,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Sistem</item> <item>Sistem</item>
<item>Întunecată</item> <item>Întunecată</item>
<item>AMOLED Black</item>
<item>Luminoasă</item> <item>Luminoasă</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Как в системе</item> <item>Как в системе</item>
<item>Тёмная</item> <item>Тёмная</item>
<item>AMOLED Black</item>
<item>Светлая</item> <item>Светлая</item>
</string-array> </string-array>
</resources> </resources>

@ -1,14 +1,8 @@
<resources> <resources>
<!-- If translating, please remove "theme_values"
<string-array name="theme_values" translatable="false">
<item>system</item>
<item>dark</item>
<item>light</item>
</string-array>-->
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Podľa systému</item> <item>Podľa systému</item>
<item>Tmavá</item> <item>Tmavá</item>
<item>AMOLED Black</item>
<item>Svetlá</item> <item>Svetlá</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Sistem</item> <item>Sistem</item>
<item>Koyu</item> <item>Koyu</item>
<item>AMOLED Black</item>
<item>ık</item> <item>ık</item>
</string-array> </string-array>
</resources> </resources>

@ -3,6 +3,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>Hệ thống</item> <item>Hệ thống</item>
<item>Tối</item> <item>Tối</item>
<item>AMOLED Black</item>
<item>Sáng</item> <item>Sáng</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>跟随系统</item> <item>跟随系统</item>
<item>深色模式</item> <item>深色模式</item>
<item>AMOLED Black</item>
<item>明亮模式</item> <item>明亮模式</item>
</string-array> </string-array>
</resources> </resources>

@ -2,6 +2,7 @@
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item>跟隨系統</item> <item>跟隨系統</item>
<item>深色主題</item> <item>深色主題</item>
<item>AMOLED Black</item>
<item>淺色主題</item> <item>淺色主題</item>
</string-array> </string-array>
</resources> </resources>
Loading…
Cancel
Save