Skip to content

Commit aa18471

Browse files
vincetzrTobiGr
authored andcommitted
Added reset button but slightly working as intended.
1 parent 5d101e7 commit aa18471

4 files changed

Lines changed: 16 additions & 20 deletions

File tree

app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,4 @@ private void applyThemeChange(final String beginningThemeKey,
8080
ActivityCompat.recreate(getActivity());
8181
}
8282
}
83-
84-
public void resetToDefault() {
85-
final String themeKey = getString(R.string.theme_key);
86-
final String startThemeKey = defaultPreferences
87-
.getString(themeKey, getString(R.string.default_theme_value));
88-
final String autoDeviceThemeKey = getString(R.string.auto_device_theme_key);
89-
if (startThemeKey.equals(autoDeviceThemeKey)) {
90-
applyThemeChange(startThemeKey, themeKey, autoDeviceThemeKey);
91-
} else {
92-
if (startThemeKey.equals(R.string.light_theme_key)) {
93-
removePreference(getString(R.string.light_theme_key));
94-
} else if (startThemeKey.equals(R.string.dark_theme_key)) {
95-
removePreference(getString(R.string.dark_theme_key));
96-
} else {
97-
removePreference(getString(R.string.black_theme_key));
98-
}
99-
}
100-
}
10183
}

app/src/main/java/org/schabi/newpipe/settings/ResetSettingsFragment.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,22 @@
22

33
import android.os.Bundle;
44

5+
import androidx.core.app.ActivityCompat;
6+
7+
import org.schabi.newpipe.R;
8+
import org.schabi.newpipe.util.Constants;
9+
import org.schabi.newpipe.util.ThemeHelper;
10+
511
public class ResetSettingsFragment extends BasePreferenceFragment {
612

7-
private AppearanceSettingsFragment appearanceSettings;
813
@Override
914
public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
1015
addPreferencesFromResourceRegistry();
1116

12-
appearanceSettings.resetToDefault();
17+
// reset appearance to light theme
18+
defaultPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, true).apply();
19+
defaultPreferences.edit().putString(getString(R.string.theme_key),
20+
getString(R.string.light_theme_key)).apply();
21+
ThemeHelper.setDayNightMode(requireContext(), "light_theme");
1322
}
1423
}

app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ private SettingsResourceRegistry() {
4141
add(UpdateSettingsFragment.class, R.xml.update_settings);
4242
add(VideoAudioSettingsFragment.class, R.xml.video_audio_settings);
4343
add(ExoPlayerSettingsFragment.class, R.xml.exoplayer_settings);
44+
add(ResetSettingsFragment.class, R.xml.main_settings);
4445
}
4546

4647
private SettingRegistryEntry add(
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
</PreferenceScreen>

0 commit comments

Comments
 (0)