diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java index 9d440865a..b0cdc935f 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java @@ -5,8 +5,6 @@ import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; -import com.google.android.material.color.DynamicColors; -import com.google.android.material.color.DynamicColorsOptions; import com.panda3ds.pandroid.AlberDriver; import com.panda3ds.pandroid.R; @@ -32,11 +30,6 @@ public void onCreate() { if (GlobalConfig.get(GlobalConfig.KEY_LOGGER_SERVICE)) { startService(new Intent(this, LoggerService.class)); } - if (GlobalConfig.get(GlobalConfig.KEY_DYNAMIC_COLORS)) { - DynamicColorsOptions dynamicColorsOptions = new DynamicColorsOptions.Builder() - .build(); - DynamicColors.applyToActivitiesIfAvailable(this, dynamicColorsOptions); - } } public static int getThemeId() { diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java index 3e499aab6..04c89d9a0 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java @@ -3,8 +3,6 @@ import android.os.Bundle; import androidx.annotation.Nullable; -import androidx.preference.SwitchPreference; -import com.google.android.material.color.DynamicColors; import com.panda3ds.pandroid.R; import com.panda3ds.pandroid.app.BaseActivity; @@ -25,23 +23,5 @@ public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable S GlobalConfig.set(GlobalConfig.KEY_APP_THEME, (int) value); return false; }); - setItemClick("dynamic_colors", pref -> GlobalConfig.set(GlobalConfig.KEY_DYNAMIC_COLORS, ((SwitchPreference) pref).isChecked())); - - refresh(); - } - - @Override - public void onResume() { - super.onResume(); - refresh(); - } - - private void refresh() { - ((SwitchPreference) findPreference("dynamic_colors")).setChecked(GlobalConfig.get(GlobalConfig.KEY_DYNAMIC_COLORS)); - if (!DynamicColors.isDynamicColorAvailable()) { - ((SwitchPreference) findPreference("dynamic_colors")).setEnabled(false); - } - } - - } +} diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java index f2f5d9b5d..bff1f9e0e 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java @@ -20,7 +20,6 @@ public class GlobalConfig { public static final Key KEY_SHADER_JIT = new Key<>("emu.shader_jit", false); public static final Key KEY_SHOW_PERFORMANCE_OVERLAY = new Key<>("dev.performanceOverlay", false); - public static final Key KEY_DYNAMIC_COLORS = new Key<>("app.dynamic_colors", false); public static final Key KEY_LOGGER_SERVICE = new Key<>("dev.loggerService", false); public static final Key KEY_APP_THEME = new Key<>("app.theme", THEME_ANDROID); public static final Key KEY_SCREEN_GAMEPAD_VISIBLE = new Key<>("app.screen_gamepad.visible", true); diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml index a902816fa..20e6c5c89 100644 --- a/src/pandroid/app/src/main/res/values/strings.xml +++ b/src/pandroid/app/src/main/res/values/strings.xml @@ -34,9 +34,6 @@ Light Dark Black - Colors - Use Dynamic Colors - Dynamic colors will be used. Actions Exit @@ -59,8 +56,8 @@ Show overlay with fps, memory, etc. Logger Store application logs to file. - Graphics Shader JIT Use shader recompiler. + Graphics Loading diff --git a/src/pandroid/app/src/main/res/xml/appearance_preference.xml b/src/pandroid/app/src/main/res/xml/appearance_preference.xml index 2210e71a9..dd1ed4831 100644 --- a/src/pandroid/app/src/main/res/xml/appearance_preference.xml +++ b/src/pandroid/app/src/main/res/xml/appearance_preference.xml @@ -1,7 +1,5 @@ - + - - - - - - - + \ No newline at end of file