Improved darkmode

Closes #10
This commit is contained in:
Michael Schättgen 2018-04-10 00:45:48 +02:00
parent f6bbae3d96
commit ae686c8ae2
14 changed files with 38 additions and 36 deletions

View file

@ -13,7 +13,7 @@ public abstract class AegisActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
_app = (AegisApplication) getApplication();
boolean nightMode = _app.getPreferences().getBoolean("pref_night_mode", false);
boolean nightMode = _app.getPreferences().getBoolean("pref_dark_mode", false);
setPreferredTheme(nightMode);
}

View file

@ -49,6 +49,8 @@ public class EditProfileActivity extends AegisActivity {
private Spinner _spinnerDigits;
private SpinnerItemSelectedListener _selectedListener = new SpinnerItemSelectedListener();
int _dialogStyle = android.R.style.Theme_Material_Light_Dialog_NoActionBar;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -189,8 +191,10 @@ public class EditProfileActivity extends AegisActivity {
@Override
protected void setPreferredTheme(boolean nightMode) {
if (nightMode) {
_dialogStyle = android.R.style.Theme_Material_Dialog_NoActionBar;
setTheme(R.style.AppTheme_Dark_TransparentActionBar);
} else {
_dialogStyle = android.R.style.Theme_Material_Light_Dialog_NoActionBar;
setTheme(R.style.AppTheme_Default_TransparentActionBar);
}
}
@ -202,7 +206,8 @@ public class EditProfileActivity extends AegisActivity {
return;
}
new AlertDialog.Builder(this)
new AlertDialog.Builder(this, _dialogStyle)
.setTitle("Discard changes?")
.setMessage("Your changes have not been saved")
.setPositiveButton(R.string.save, (dialog, which) -> onSave())
.setNegativeButton(R.string.discard, (dialog, which) -> super.onBackPressed())

View file

@ -500,7 +500,7 @@ public class MainActivity extends AegisActivity implements KeyProfileView.Listen
protected void onResume() {
super.onResume();
boolean nightMode = _app.getPreferences().getBoolean("pref_night_mode", false);
boolean nightMode = _app.getPreferences().getBoolean("pref_dark_mode", false);
if (nightMode != _nightMode) {
setPreferredTheme(nightMode);
recreate();

View file

@ -52,7 +52,7 @@ public class PreferencesActivity extends AegisActivity {
// set the result intent in advance
setResult();
Preference nightModePreference = findPreference("pref_night_mode");
Preference nightModePreference = findPreference("pref_dark_mode");
nightModePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {