tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix theme updates on main activity

Browse source
This commit is contained in:
dkanada 2021-06-05 18:48:31 +09:00
commit 4a4d703973
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
View file

@ -129,7 +129,6 @@ public class SettingsActivity extends AbsBaseActivity {
requireActivity().setTheme(PreferenceUtil.getInstance(getContext()).getTheme().style); requireActivity().setTheme(PreferenceUtil.getInstance(getContext()).getTheme().style);
new DynamicShortcutManager(requireContext()).updateDynamicShortcuts(); new DynamicShortcutManager(requireContext()).updateDynamicShortcuts();
ThemeStore.markChanged(requireContext());
requireActivity().recreate(); requireActivity().recreate();
break; break;
case PreferenceUtil.NOW_PLAYING_SCREEN: case PreferenceUtil.NOW_PLAYING_SCREEN:

22
app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java
View file

@ -6,6 +6,7 @@ import android.view.View;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
import com.dkanada.gramophone.util.NavigationUtil;
import com.kabouzeid.appthemehelper.ATH; import com.kabouzeid.appthemehelper.ATH;
import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.ThemeStore;
import com.kabouzeid.appthemehelper.common.ATHToolbarActivity; import com.kabouzeid.appthemehelper.common.ATHToolbarActivity;
@ -16,6 +17,8 @@ import com.dkanada.gramophone.util.PreferenceUtil;
import com.dkanada.gramophone.util.Util; import com.dkanada.gramophone.util.Util;
public abstract class AbsThemeActivity extends ATHToolbarActivity { public abstract class AbsThemeActivity extends ATHToolbarActivity {
private int currentTheme;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -28,6 +31,25 @@ public abstract class AbsThemeActivity extends ATHToolbarActivity {
} }
} }
@Override
protected void onResume() {
super.onResume();
// for some reason the recreate method has issues here
if (PreferenceUtil.getInstance(this).getTheme().style != currentTheme) {
NavigationUtil.startMain(this);
overridePendingTransition(0, android.R.anim.fade_out);
finish();
}
}
@Override
public void setTheme(int resId) {
currentTheme = resId;
super.setTheme(resId);
}
protected void setDrawUnderStatusBar() { protected void setDrawUnderStatusBar() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
Util.setAllowDrawUnderStatusBar(getWindow()); Util.setAllowDrawUnderStatusBar(getWindow());