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

Fix new theme issue (number 3)

Browse source
This commit is contained in:
Neslihan 2017-03-20 16:46:20 +03:00
parent c783ceeb2d
commit 5ecc48fe70
4 changed files with 6 additions and 6 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().installViewFactory();
getDelegate().onCreate(savedInstanceState); getDelegate().onCreate(savedInstanceState);
// Check prefs on every activity starts // Check prefs on every activity starts
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) { if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
setTheme(R.style.DarkAppTheme); setTheme(R.style.DarkAppTheme);
}else { }else {
setTheme(R.style.LightAppTheme); // default 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 @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) { if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
currentTheme = true; currentTheme = true;
setTheme(R.style.DarkAppTheme); setTheme(R.style.DarkAppTheme);
}else { }else {
@ -26,7 +26,7 @@ public class BaseActivity extends Activity {
@Override @Override
protected void onResume() { protected void onResume() {
// Restart activity if theme is changed // 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 if(currentTheme!=newTheme){ // is activity theme changed
Intent intent = getIntent(); Intent intent = getIntent();
finish(); 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 @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) { if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
currentTheme = true; currentTheme = true;
setTheme(R.style.DarkAppTheme); setTheme(R.style.DarkAppTheme);
}else { }else {
@ -25,7 +25,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
@Override @Override
protected void onResume() { protected void onResume() {
// Restart activity if theme is changed // 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 if(currentTheme!=newTheme){ //is activity theme changed
Intent intent = getIntent(); Intent intent = getIntent();
finish(); finish();

2
app/src/main/res/xml/preferences.xml
View file

@ -21,7 +21,7 @@
<CheckBoxPreference <CheckBoxPreference
android:title="@string/preference_theme" android:title="@string/preference_theme"
android:defaultValue="false" android:defaultValue="true"
android:summary="@string/preference_theme_summary" android:summary="@string/preference_theme_summary"
android:key="theme" /> android:key="theme" />