Skip to content

Commit a85e8a2

Browse files
B0polStypox
B0pol
authored and
Stypox
committed
Use a list for night themes
Also remove unused strings
1 parent 22b2f52 commit a85e8a2

7 files changed

Lines changed: 114 additions & 76 deletions

File tree

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

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.schabi.newpipe.settings;
22

3-
import android.app.Activity;
43
import android.content.ActivityNotFoundException;
54
import android.content.Intent;
65
import android.os.Build;
@@ -19,57 +18,43 @@ public class AppearanceSettingsFragment extends BasePreferenceFragment {
1918
private static final boolean CAPTIONING_SETTINGS_ACCESSIBLE =
2019
Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
2120

22-
/**
23-
* Theme that was applied when the settings was opened (or recreated after a theme change).
24-
*/
25-
private String startThemeKey;
26-
private final Preference.OnPreferenceChangeListener themePreferenceChange
27-
= new Preference.OnPreferenceChangeListener() {
28-
@Override
29-
public boolean onPreferenceChange(final Preference preference, final Object newValue) {
30-
defaultPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, true).apply();
31-
defaultPreferences.edit()
32-
.putString(getString(R.string.theme_key), newValue.toString()).apply();
33-
34-
if (!newValue.equals(startThemeKey) && getActivity() != null) {
35-
// If it's not the current theme
36-
ActivityCompat.recreate(requireActivity());
37-
}
38-
39-
return false;
40-
}
41-
};
42-
private final Preference.OnPreferenceChangeListener deviceThemePreferenceChange
43-
= new Preference.OnPreferenceChangeListener() {
44-
@Override
45-
public boolean onPreferenceChange(final Preference preference, final Object newValue) {
46-
defaultPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, true).apply();
47-
48-
final Activity activity = getActivity();
49-
if (activity != null) {
50-
activity.recreate();
51-
}
52-
53-
return true;
54-
}
55-
};
5621
private String captionSettingsKey;
5722

5823
@Override
5924
public void onCreate(@Nullable final Bundle savedInstanceState) {
6025
super.onCreate(savedInstanceState);
26+
6127
final String themeKey = getString(R.string.theme_key);
62-
startThemeKey = defaultPreferences
28+
// the key of the active theme when settings were opened (or recreated after theme change)
29+
final String startThemeKey = defaultPreferences
6330
.getString(themeKey, getString(R.string.default_theme_value));
64-
findPreference(themeKey).setOnPreferenceChangeListener(themePreferenceChange);
31+
final String autoDeviceThemeKey = getString(R.string.auto_device_theme_key);
32+
findPreference(themeKey).setOnPreferenceChangeListener((preference, newValue) -> {
33+
if (newValue.toString().equals(autoDeviceThemeKey)) {
34+
Toast.makeText(getContext(), getString(R.string.select_night_theme_toast),
35+
Toast.LENGTH_LONG).show();
36+
}
37+
38+
applyThemeChange(startThemeKey, themeKey, newValue);
39+
return false;
40+
});
41+
42+
final String nightThemeKey = getString(R.string.night_theme_key);
43+
if (startThemeKey.equals(autoDeviceThemeKey)) {
44+
final String startNightThemeKey = defaultPreferences
45+
.getString(nightThemeKey, getString(R.string.default_night_theme_value));
6546

66-
findPreference(getString(R.string.use_device_theme_key))
67-
.setOnPreferenceChangeListener(deviceThemePreferenceChange);
47+
findPreference(nightThemeKey).setOnPreferenceChangeListener((preference, newValue) -> {
48+
applyThemeChange(startNightThemeKey, nightThemeKey, newValue);
49+
return false;
50+
});
51+
} else {
52+
removePreference(nightThemeKey);
53+
}
6854

6955
captionSettingsKey = getString(R.string.caption_settings_key);
7056
if (!CAPTIONING_SETTINGS_ACCESSIBLE) {
71-
final Preference captionSettings = findPreference(captionSettingsKey);
72-
getPreferenceScreen().removePreference(captionSettings);
57+
removePreference(captionSettingsKey);
7358
}
7459
}
7560

@@ -90,4 +75,23 @@ public boolean onPreferenceTreeClick(final Preference preference) {
9075

9176
return super.onPreferenceTreeClick(preference);
9277
}
78+
79+
private void removePreference(final String preferenceKey) {
80+
final Preference preference = findPreference(preferenceKey);
81+
if (preference != null) {
82+
getPreferenceScreen().removePreference(preference);
83+
}
84+
}
85+
86+
private void applyThemeChange(final String beginningThemeKey,
87+
final String themeKey,
88+
final Object newValue) {
89+
defaultPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, true).apply();
90+
defaultPreferences.edit().putString(themeKey, newValue.toString()).apply();
91+
92+
if (!newValue.equals(beginningThemeKey) && getActivity() != null) {
93+
// if it's not the current theme
94+
ActivityCompat.recreate(getActivity());
95+
}
96+
}
9397
}

‎app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java‎

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ public static boolean isLightThemeSelected(final Context context) {
7777
final Resources res = context.getResources();
7878

7979
return selectedThemeString.equals(res.getString(R.string.light_theme_key))
80-
|| (shouldFollowDeviceTheme(context) && !isDeviceDarkThemeEnabled(context));
80+
|| (selectedThemeString.equals(res.getString(R.string.auto_device_theme_key))
81+
&& !isDeviceDarkThemeEnabled(context));
8182
}
8283

8384

@@ -140,18 +141,28 @@ public static int getThemeForService(final Context context, final int serviceId)
140141
final String lightTheme = res.getString(R.string.light_theme_key);
141142
final String darkTheme = res.getString(R.string.dark_theme_key);
142143
final String blackTheme = res.getString(R.string.black_theme_key);
144+
final String automaticDeviceTheme = res.getString(R.string.auto_device_theme_key);
143145

144146
final String selectedTheme = getSelectedThemeString(context);
145147

146148
int defaultTheme = R.style.DarkTheme;
147149
if (selectedTheme.equals(lightTheme)) {
148150
defaultTheme = R.style.LightTheme;
149151
} else if (selectedTheme.equals(blackTheme)) {
150-
defaultTheme = shouldFollowDeviceTheme(context) && !isDeviceDarkThemeEnabled(context)
151-
? R.style.LightTheme : R.style.BlackTheme;
152-
} else if (selectedTheme.equals(darkTheme)) {
153-
defaultTheme = shouldFollowDeviceTheme(context) && !isDeviceDarkThemeEnabled(context)
154-
? R.style.LightTheme : R.style.DarkTheme;
152+
defaultTheme = R.style.BlackTheme;
153+
} else if (selectedTheme.equals(automaticDeviceTheme)) {
154+
155+
if (isDeviceDarkThemeEnabled(context)) {
156+
final String selectedNightTheme = getSelectedNightThemeString(context);
157+
if (selectedNightTheme.equals(blackTheme)) {
158+
defaultTheme = R.style.BlackTheme;
159+
} else {
160+
defaultTheme = R.style.DarkTheme;
161+
}
162+
} else {
163+
// there is only one day theme
164+
defaultTheme = R.style.LightTheme;
165+
}
155166
}
156167

157168
if (serviceId <= -1) {
@@ -190,17 +201,29 @@ public static int getSettingsThemeStyle(final Context context) {
190201
final String lightTheme = res.getString(R.string.light_theme_key);
191202
final String darkTheme = res.getString(R.string.dark_theme_key);
192203
final String blackTheme = res.getString(R.string.black_theme_key);
204+
final String automaticDeviceTheme = res.getString(R.string.auto_device_theme_key);
205+
193206

194207
final String selectedTheme = getSelectedThemeString(context);
195208

196209
if (selectedTheme.equals(lightTheme)) {
197210
return R.style.LightSettingsTheme;
198211
} else if (selectedTheme.equals(blackTheme)) {
199-
return shouldFollowDeviceTheme(context) && !isDeviceDarkThemeEnabled(context)
200-
? R.style.LightSettingsTheme : R.style.BlackSettingsTheme;
212+
return R.style.BlackSettingsTheme;
201213
} else if (selectedTheme.equals(darkTheme)) {
202-
return shouldFollowDeviceTheme(context) && !isDeviceDarkThemeEnabled(context)
203-
? R.style.LightSettingsTheme : R.style.DarkSettingsTheme;
214+
return R.style.DarkSettingsTheme;
215+
} else if (selectedTheme.equals(automaticDeviceTheme)) {
216+
if (isDeviceDarkThemeEnabled(context)) {
217+
final String selectedNightTheme = getSelectedNightThemeString(context);
218+
if (selectedNightTheme.equals(blackTheme)) {
219+
return R.style.BlackSettingsTheme;
220+
} else {
221+
return R.style.DarkSettingsTheme;
222+
}
223+
} else {
224+
// there is only one day theme
225+
return R.style.LightSettingsTheme;
226+
}
204227
} else {
205228
// Fallback
206229
return R.style.DarkSettingsTheme;
@@ -246,6 +269,14 @@ private static String getSelectedThemeString(final Context context) {
246269
.getString(themeKey, defaultTheme);
247270
}
248271

272+
private static String getSelectedNightThemeString(final Context context) {
273+
final String nightThemeKey = context.getString(R.string.night_theme_key);
274+
final String defaultNightTheme = context.getResources()
275+
.getString(R.string.default_night_theme_value);
276+
return PreferenceManager.getDefaultSharedPreferences(context)
277+
.getString(nightThemeKey, defaultNightTheme);
278+
}
279+
249280
/**
250281
* Sets the title to the activity, if the activity is an {@link AppCompatActivity} and has an
251282
* action bar.
@@ -286,15 +317,4 @@ public static boolean isDeviceDarkThemeEnabled(final Context context) {
286317
return false;
287318
}
288319
}
289-
290-
/**
291-
* Tells if the user wants the theme to follow the device theme.
292-
*
293-
* @param context the context to use
294-
* @return whether the user wants the theme to follow the device's theme
295-
*/
296-
public static boolean shouldFollowDeviceTheme(final Context context) {
297-
return PreferenceManager.getDefaultSharedPreferences(context)
298-
.getBoolean(context.getString(R.string.use_device_theme_key), false);
299-
}
300320
}

‎app/src/main/res/values-eo/strings.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,4 @@
579579
<string name="artists">Artistoj</string>
580580
<string name="albums">Albumoj</string>
581581
<string name="songs">Kantoj</string>
582-
<string name="follow_device_theme_title">Sekvi la etoson de la aparato</string>
583-
<string name="follow_device_theme_summary">La apo sekvos la etoson de la aparato. Ĝi povus malfunkcii se via Android versiono malsupras Android 10.</string>
584582
</resources>

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<string name="use_tor_title">Utiliser Tor</string>
4242
<string name="use_tor_summary">(Expérimental) Forcer la redirection du trafic de téléchargement via Tor pour plus de confidentialité (les flux vidéos ne sont pas encore pris en charge).</string>
4343
<string name="theme_title">Thème</string>
44+
<string name="night_theme_title">Thème nuit</string>
4445
<string name="dark_theme_title">Sombre</string>
4546
<string name="light_theme_title">Clair</string>
4647
<string name="black_theme_title">Noir</string>
@@ -669,6 +670,7 @@
669670
<string name="paid_content">Ce contenu n\'est disponible que pour les abonnés, il ne peut donc pas être diffusé en continu ni téléchargé par NewPipe.</string>
670671
<string name="youtube_music_premium_content">Cette vidéo n\'est disponible que pour les membres de YouTube Music Premium, elle ne peut donc pas être diffusée en continu ni téléchargée par NewPipe.</string>
671672
<string name="private_content">Ce contenu est privé, il ne peut donc pas être diffusé en continu ni téléchargé par NewPipe.</string>
672-
<string name="follow_device_theme_title">Suivre le thème de l\'appareil</string>
673-
<string name="follow_device_theme_summary">L\'application suivera le thème de votre appareil. Il se peut que ça ne marche pas si vous utiliser une version d\'Android inférieure à 10.</string>
673+
<string name="auto_device_theme_title">Automatique (thème de l\'appareil)</string>
674+
<string name="night_theme_summary">Choisissez votre thème nuit favori — %s</string>
675+
<string name="select_night_theme_toast">Vous pouvez chosir votre thème nuit favori</string>
674676
</resources>

‎app/src/main/res/values/settings_keys.xml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,21 +176,33 @@
176176

177177
<!-- THEMES -->
178178
<string name="theme_key" translatable="false">theme</string>
179+
<string name="night_theme_key" translatable="false">night_theme</string>
179180
<string name="light_theme_key" translatable="false">light_theme</string>
180181
<string name="dark_theme_key" translatable="false">dark_theme</string>
181182
<string name="black_theme_key" translatable="false">black_theme</string>
183+
<string name="auto_device_theme_key" translatable="false">auto_device_theme</string>
182184
<string name="default_theme_value" translatable="false">@string/dark_theme_key</string>
185+
<string name="default_night_theme_value" translatable="false">@string/dark_theme_key</string>
183186
<string-array name="theme_values_list" translatable="false">
184187
<item>@string/light_theme_key</item>
185188
<item>@string/dark_theme_key</item>
186189
<item>@string/black_theme_key</item>
190+
<item>@string/auto_device_theme_key</item>
187191
</string-array>
188192
<string-array name="theme_description_list" translatable="false">
189193
<item>@string/light_theme_title</item>
190194
<item>@string/dark_theme_title</item>
191195
<item>@string/black_theme_title</item>
196+
<item>@string/auto_device_theme_title</item>
197+
</string-array>
198+
<string-array name="night_theme_values_list" translatable="false">
199+
<item>@string/dark_theme_key</item>
200+
<item>@string/black_theme_key</item>
201+
</string-array>
202+
<string-array name="night_theme_description_list" translatable="false">
203+
<item>@string/dark_theme_title</item>
204+
<item>@string/black_theme_title</item>
192205
</string-array>
193-
<string name="use_device_theme_key" translatable="false">use_device_theme_key</string>
194206

195207
<!-- Caption Size -->
196208
<string name="caption_settings_key" translatable="false">caption_settings_key</string>

‎app/src/main/res/values/strings.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,10 @@
7979
<string name="default_audio_format_title">Default audio format</string>
8080
<string name="default_video_format_title">Default video format</string>
8181
<string name="theme_title">Theme</string>
82+
<string name="night_theme_title">Night Theme</string>
8283
<string name="light_theme_title">Light</string>
8384
<string name="dark_theme_title">Dark</string>
8485
<string name="black_theme_title">Black</string>
85-
<string name="device_dark_theme_title">Device theme (Dark)</string>
86-
<string name="device_black_theme_title">Device theme (Black)</string>
8786
<string name="popup_remember_size_pos_title">Remember popup properties</string>
8887
<string name="popup_remember_size_pos_summary">Remember last size and position of popup</string>
8988
<string name="use_inexact_seek_title">Use fast inexact seek</string>
@@ -711,6 +710,7 @@
711710
<string name="paid_content">This content is only available to users who have paid, so it cannot be streamed or downloaded by NewPipe.</string>
712711
<string name="featured">Featured</string>
713712
<string name="radio">Radio</string>
714-
<string name="follow_device_theme_title">Follow device theme</string>
715-
<string name="follow_device_theme_summary">The app theme will follow your device theme. It may not work for devices below Android 10.</string>
713+
<string name="auto_device_theme_title">Automatic (device theme)</string>
714+
<string name="night_theme_summary">Select your favorite night theme — %s</string>
715+
<string name="select_night_theme_toast">You can select your favorite night theme below</string>
716716
</resources>

‎app/src/main/res/xml/appearance_settings.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
android:title="@string/theme_title"
1313
app:iconSpaceReserved="false" />
1414

15-
<SwitchPreferenceCompat
16-
android:defaultValue="false"
17-
android:key="@string/use_device_theme_key"
18-
android:summary="@string/follow_device_theme_summary"
19-
android:title="@string/follow_device_theme_title"
15+
<ListPreference
16+
android:defaultValue="@string/default_night_theme_value"
17+
android:entries="@array/night_theme_description_list"
18+
android:entryValues="@array/night_theme_values_list"
19+
android:key="@string/night_theme_key"
20+
android:summary="@string/night_theme_summary"
21+
android:title="@string/night_theme_title"
2022
app:iconSpaceReserved="false" />
2123

2224
<SwitchPreferenceCompat

0 commit comments

Comments
 (0)