fix warnings and add some type safety for preferences

This commit is contained in:
dkanada 2021-05-22 12:27:52 +09:00
commit 37eb40e79a
11 changed files with 86 additions and 44 deletions

View file

@ -181,7 +181,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
case PreferenceUtil.ACCENT_COLOR:
case PreferenceUtil.GENERAL_THEME:
// apply theme before reloading shortcuts to apply the new icon colors
requireActivity().setTheme(PreferenceUtil.getThemeResource(key));
requireActivity().setTheme(PreferenceUtil.getInstance(getContext()).getTheme().style);
new DynamicShortcutManager(requireContext()).updateDynamicShortcuts();
ThemeStore.markChanged(requireContext());

View file

@ -18,8 +18,9 @@ import com.dkanada.gramophone.util.Util;
public abstract class AbsThemeActivity extends ATHToolbarActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
setTheme(PreferenceUtil.getInstance(this).getTheme());
super.onCreate(savedInstanceState);
setTheme(PreferenceUtil.getInstance(this).getTheme().style);
MaterialDialogsUtil.updateMaterialDialogsThemeSingleton(this);
if (!ThemeStore.coloredNavigationBar(this)) {