Provide a default implementation of setPreferredTheme

And only override it if needed
This commit is contained in:
Alexander Bakker 2018-05-11 21:53:06 +02:00
parent 17d5d55823
commit 0ed58b4a01
6 changed files with 8 additions and 44 deletions

View file

@ -6,6 +6,7 @@ import android.view.WindowManager;
import me.impy.aegis.AegisApplication; import me.impy.aegis.AegisApplication;
import me.impy.aegis.Preferences; import me.impy.aegis.Preferences;
import me.impy.aegis.R;
public abstract class AegisActivity extends AppCompatActivity { public abstract class AegisActivity extends AppCompatActivity {
private AegisApplication _app; private AegisApplication _app;
@ -32,5 +33,11 @@ public abstract class AegisActivity extends AppCompatActivity {
return _app.getPreferences(); return _app.getPreferences();
} }
protected abstract void setPreferredTheme(boolean darkMode); protected void setPreferredTheme(boolean darkMode) {
if (darkMode) {
setTheme(R.style.AppTheme_Dark);
} else {
setTheme(R.style.AppTheme);
}
}
} }

View file

@ -102,15 +102,6 @@ public class AuthActivity extends AegisActivity implements FingerprintUiHelper.C
}); });
} }
@Override
protected void setPreferredTheme(boolean darkMode) {
if (darkMode) {
setTheme(R.style.AppTheme_Dark);
} else {
setTheme(R.style.AppTheme);
}
}
private void showError() { private void showError() {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Decryption error"); builder.setTitle("Decryption error");

View file

@ -134,15 +134,6 @@ public class MainActivity extends AegisActivity implements KeyProfileView.Listen
} }
} }
@Override
protected void setPreferredTheme(boolean darkMode) {
if (darkMode) {
setTheme(R.style.AppTheme_Dark);
} else {
setTheme(R.style.AppTheme);
}
}
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (data == null) { if (data == null) {

View file

@ -2,8 +2,6 @@ package me.impy.aegis.ui;
import android.os.Bundle; import android.os.Bundle;
import me.impy.aegis.R;
public class PreferencesActivity extends AegisActivity { public class PreferencesActivity extends AegisActivity {
private PreferencesFragment _fragment; private PreferencesFragment _fragment;
@ -16,15 +14,6 @@ public class PreferencesActivity extends AegisActivity {
getFragmentManager().beginTransaction().replace(android.R.id.content, _fragment).commit(); getFragmentManager().beginTransaction().replace(android.R.id.content, _fragment).commit();
} }
@Override
protected void setPreferredTheme(boolean darkMode) {
if (darkMode) {
setTheme(R.style.AppTheme_Dark);
} else {
setTheme(R.style.AppTheme);
}
}
@Override @Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
// pass permission request results to the fragment // pass permission request results to the fragment

View file

@ -87,11 +87,6 @@ public class ScannerActivity extends AegisActivity implements ZXingScannerView.R
} }
} }
@Override
protected void setPreferredTheme(boolean darkMode) {
}
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();

View file

@ -100,15 +100,6 @@ public class SlotManagerActivity extends AegisActivity implements SlotAdapter.Li
return true; return true;
} }
@Override
protected void setPreferredTheme(boolean darkMode) {
if (darkMode) {
setTheme(R.style.AppTheme_Dark);
} else {
setTheme(R.style.AppTheme);
}
}
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {