MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve locale settings

Browse Source
This commit is contained in:
topjohnwu 2017-07-31 00:44:38 +08:00
parent 5716218f41
commit 53477f0f59
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
View File

@ -44,7 +44,7 @@ public class MagiskManager extends Application {
// Events
public final CallbackEvent magiskHideDone = new CallbackEvent();
public final CallbackEvent reloadMainActivity = new CallbackEvent();
public final CallbackEvent reloadActivity = new CallbackEvent();
public final CallbackEvent moduleLoadDone = new CallbackEvent();
public final CallbackEvent repoLoadDone = new CallbackEvent();
public final CallbackEvent updateCheckDone = new CallbackEvent();

2
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
View File

@ -116,7 +116,7 @@ public class MainActivity extends Activity
@Override
public CallbackEvent[] getRegisterEvents() {
return new CallbackEvent[] { getApplicationContext().reloadMainActivity };
return new CallbackEvent[] { getApplicationContext().reloadActivity };
}
public void checkHideSection() {

34
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View File

@ -25,7 +25,7 @@ import java.util.Locale;
import butterknife.BindView;
import butterknife.ButterKnife;
public class SettingsActivity extends Activity {
public class SettingsActivity extends Activity implements CallbackEvent.Listener {
@BindView(R.id.toolbar) Toolbar toolbar;
@ -57,6 +57,16 @@ public class SettingsActivity extends Activity {
}
@Override
public void onTrigger(CallbackEvent event) {
recreate();
}
@Override
public CallbackEvent[] getRegisterEvents() {
return new CallbackEvent[] { getApplicationContext().reloadActivity };
}
public static class SettingsFragment extends PreferenceFragment
implements SharedPreferences.OnSharedPreferenceChangeListener,
CallbackEvent.Listener {
@ -124,10 +134,10 @@ public class SettingsActivity extends Activity {
}
}
private ListPreference setLocalePreference(ListPreference lp) {
if (lp == null) {
private void setLocalePreference(ListPreference lp) {
boolean isNew = lp == null;
if (isNew) {
lp = new ListPreference(getActivity());
generalCatagory.addPreference(lp);
}
CharSequence[] entries = new CharSequence[magiskManager.locales.size() + 1];
CharSequence[] entryValues = new CharSequence[magiskManager.locales.size() + 1];
@ -143,7 +153,9 @@ public class SettingsActivity extends Activity {
lp.setTitle(R.string.language);
lp.setKey("locale");
lp.setSummary(MagiskManager.locale.getDisplayName(MagiskManager.locale));
return lp;
if (isNew) {
generalCatagory.addPreference(lp);
}
}
@Override
@ -170,8 +182,7 @@ public class SettingsActivity extends Activity {
enabled = prefs.getBoolean("dark_theme", false);
if (magiskManager.isDarkTheme != enabled) {
magiskManager.isDarkTheme = enabled;
magiskManager.reloadMainActivity.trigger(false);
getActivity().recreate();
magiskManager.reloadActivity.trigger(false);
}
break;
case "disable":
@ -232,8 +243,7 @@ public class SettingsActivity extends Activity {
break;
case "locale":
magiskManager.setLocale();
magiskManager.reloadMainActivity.trigger(false);
getActivity().recreate();
magiskManager.reloadActivity.trigger(false);
break;
}
setSummary();
@ -256,11 +266,7 @@ public class SettingsActivity extends Activity {
@Override
public void onTrigger(CallbackEvent event) {
ListPreference language = setLocalePreference((ListPreference) findPreference("locale"));
language.setOnPreferenceClickListener((pref) -> {
setLocalePreference((ListPreference) pref);
return false;
});
setLocalePreference((ListPreference) findPreference("locale"));
}
@Override