luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-23 23:39:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename night mode to dark mode in the spots we missed

Browse source
This commit is contained in:
Alexander Bakker 2018-05-10 23:30:38 +02:00
parent e45735faa1
commit 3c2f62de26
7 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/me/impy/aegis/ui/AegisActivity.java
View file

@ -18,13 +18,13 @@ public abstract class AegisActivity extends AppCompatActivity {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
// set the theme
boolean nightMode = _app.getPreferences().getBoolean("pref_dark_mode", false);
setPreferredTheme(nightMode);
boolean darkMode = _app.getPreferences().getBoolean("pref_dark_mode", false);
setPreferredTheme(darkMode);
}
protected AegisApplication getApp() {
return _app;
}
protected abstract void setPreferredTheme(boolean nightMode);
protected abstract void setPreferredTheme(boolean darkMode);
}

4
app/src/main/java/me/impy/aegis/ui/AuthActivity.java
View file

@ -103,8 +103,8 @@ public class AuthActivity extends AegisActivity implements FingerprintUiHelper.C
}
@Override
protected void setPreferredTheme(boolean nightMode) {
if (nightMode) {
protected void setPreferredTheme(boolean darkMode) {
if (darkMode) {
setTheme(R.style.AppTheme_Dark);
} else {
setTheme(R.style.AppTheme_Default);

4
app/src/main/java/me/impy/aegis/ui/EditProfileActivity.java
View file

@ -156,8 +156,8 @@ public class EditProfileActivity extends AegisActivity {
}
@Override
protected void setPreferredTheme(boolean nightMode) {
if (nightMode) {
protected void setPreferredTheme(boolean darkMode) {
if (darkMode) {
_dialogStyle = android.R.style.Theme_Material_Dialog_NoActionBar;
setTheme(R.style.AppTheme_Dark_TransparentActionBar);
} else {

17
app/src/main/java/me/impy/aegis/ui/MainActivity.java
View file

@ -7,7 +7,6 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Rect;
import android.support.design.widget.BottomSheetDialog;
import android.support.v7.app.AlertDialog;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
@ -48,7 +47,7 @@ public class MainActivity extends AegisActivity implements KeyProfileView.Listen
private DatabaseManager _db;
private KeyProfileView _keyProfileView;
private boolean _nightMode = false;
private boolean _darkMode = false;
private Menu _menu;
private FloatingActionsMenu _fabMenu;
@ -139,13 +138,13 @@ public class MainActivity extends AegisActivity implements KeyProfileView.Listen
}
@Override
protected void setPreferredTheme(boolean nightMode) {
if (nightMode) {
protected void setPreferredTheme(boolean darkMode) {
if (darkMode) {
setTheme(R.style.AppTheme_Dark_NoActionBar);
} else if (_nightMode) {
} else if (_darkMode) {
setTheme(R.style.AppTheme_Default_NoActionBar);
}
_nightMode = nightMode;
_darkMode = darkMode;
}
@Override
@ -346,9 +345,9 @@ public class MainActivity extends AegisActivity implements KeyProfileView.Listen
protected void onResume() {
super.onResume();
boolean nightMode = _app.getPreferences().getBoolean("pref_dark_mode", false);
if (nightMode != _nightMode) {
setPreferredTheme(nightMode);
boolean darkMode = _app.getPreferences().getBoolean("pref_dark_mode", false);
if (darkMode != _darkMode) {
setPreferredTheme(darkMode);
recreate();
}

4
app/src/main/java/me/impy/aegis/ui/PreferencesActivity.java
View file

@ -17,8 +17,8 @@ public class PreferencesActivity extends AegisActivity {
}
@Override
protected void setPreferredTheme(boolean nightMode) {
if (nightMode) {
protected void setPreferredTheme(boolean darkMode) {
if (darkMode) {
setTheme(R.style.AppTheme_Dark);
} else {
setTheme(R.style.AppTheme_Default);

6
app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
View file

@ -69,11 +69,11 @@ public class PreferencesFragment extends PreferenceFragment {
// set the result intent in advance
setResult();
Preference nightModePreference = findPreference("pref_dark_mode");
nightModePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
Preference darkModePreference = findPreference("pref_dark_mode");
darkModePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
Toast.makeText(getActivity(), "Night mode will be enabled after closing this screen", Toast.LENGTH_SHORT).show();
Toast.makeText(getActivity(), "Dark mode setting will be applied after closing this screen", Toast.LENGTH_SHORT).show();
return true;
}
});

4
app/src/main/java/me/impy/aegis/ui/SlotManagerActivity.java
View file

@ -103,8 +103,8 @@ public class SlotManagerActivity extends AegisActivity implements SlotAdapter.Li
}
@Override
protected void setPreferredTheme(boolean nightMode) {
if (nightMode) {
protected void setPreferredTheme(boolean darkMode) {
if (darkMode) {
setTheme(R.style.AppTheme_Dark_NoActionBar);
} else {
setTheme(R.style.AppTheme_Default_NoActionBar);