Update CallbackEvents

This commit is contained in:
topjohnwu
2017-07-23 00:12:15 +08:00
parent bd6585765e
commit 36124ddca4
13 changed files with 125 additions and 131 deletions

View File

@@ -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 };
}
}
}