mirror of
https://github.com/topjohnwu/Magisk.git
synced 2026-01-13 05:17:37 -08:00
Update CallbackEvents
This commit is contained in:
@@ -59,7 +59,7 @@ public class SettingsActivity extends Activity {
|
||||
|
||||
public static class SettingsFragment extends PreferenceFragment
|
||||
implements SharedPreferences.OnSharedPreferenceChangeListener,
|
||||
CallbackEvent.Listener<Void>{
|
||||
CallbackEvent.Listener {
|
||||
|
||||
private SharedPreferences prefs;
|
||||
private PreferenceScreen prefScreen;
|
||||
@@ -149,16 +149,14 @@ public class SettingsActivity extends Activity {
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
prefs.registerOnSharedPreferenceChangeListener(this);
|
||||
magiskManager.localeDone.register(this);
|
||||
if (magiskManager.localeDone.isTriggered)
|
||||
onTrigger(null);
|
||||
registerEvents();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
super.onPause();
|
||||
prefs.unregisterOnSharedPreferenceChangeListener(this);
|
||||
magiskManager.localeDone.unRegister(this);
|
||||
unregisterEvents();
|
||||
super.onPause();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -171,7 +169,7 @@ public class SettingsActivity extends Activity {
|
||||
enabled = prefs.getBoolean("dark_theme", false);
|
||||
if (magiskManager.isDarkTheme != enabled) {
|
||||
magiskManager.isDarkTheme = enabled;
|
||||
magiskManager.reloadMainActivity.trigger();
|
||||
magiskManager.reloadMainActivity.trigger(false);
|
||||
getActivity().recreate();
|
||||
}
|
||||
break;
|
||||
@@ -233,7 +231,7 @@ public class SettingsActivity extends Activity {
|
||||
break;
|
||||
case "locale":
|
||||
magiskManager.setLocale();
|
||||
magiskManager.reloadMainActivity.trigger();
|
||||
magiskManager.reloadMainActivity.trigger(false);
|
||||
getActivity().recreate();
|
||||
break;
|
||||
}
|
||||
@@ -256,7 +254,7 @@ public class SettingsActivity extends Activity {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTrigger(CallbackEvent<Void> event) {
|
||||
public void onTrigger(CallbackEvent event) {
|
||||
ListPreference language = setLocalePreference(null);
|
||||
language.setOnPreferenceClickListener((pref) -> {
|
||||
setLocalePreference((ListPreference) pref);
|
||||
@@ -264,6 +262,11 @@ public class SettingsActivity extends Activity {
|
||||
});
|
||||
generalCatagory.addPreference(language);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CallbackEvent[] getRegisterEvents() {
|
||||
return new CallbackEvent[] { magiskManager.localeDone };
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user