mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-28 05:13:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'refs/remotes/commons-app/master' into fix-login-3

Browse source
This commit is contained in:
misaochan 2017-03-21 00:29:39 +10:00
commit 8b947241b9
12 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/fr/free/nrw/commons/SettingsActivity.java
View file

@ -24,7 +24,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
getDelegate().installViewFactory();
getDelegate().onCreate(savedInstanceState);
// Check prefs on every activity starts
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
setTheme(R.style.DarkAppTheme);
}else {
setTheme(R.style.LightAppTheme); // default

4
app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
View file

@ -13,7 +13,7 @@ public class BaseActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
currentTheme = true;
setTheme(R.style.DarkAppTheme);
}else {
@ -26,7 +26,7 @@ public class BaseActivity extends Activity {
@Override
protected void onResume() {
// Restart activity if theme is changed
boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false);
boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true);
if(currentTheme!=newTheme){ // is activity theme changed
Intent intent = getIntent();
finish();

4
app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java
View file

@ -12,7 +12,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
currentTheme = true;
setTheme(R.style.DarkAppTheme);
}else {
@ -25,7 +25,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
@Override
protected void onResume() {
// Restart activity if theme is changed
boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false);
boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true);
if(currentTheme!=newTheme){ //is activity theme changed
Intent intent = getIntent();
finish();