baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Migrate to DayNight Theme

Browse source
This commit is contained in:
krlvm 2021-03-26 17:12:20 +03:00
parent 464d0e50b0
commit b3e2418b93
No known key found for this signature in database
GPG key ID: B8552A91FD265536
12 changed files with 47 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/MainActivity.java
View file

@ -133,6 +133,8 @@ public class MainActivity extends AppCompatActivity {
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
TLSSocketFactoryCompat.setAsDefault(); TLSSocketFactoryCompat.setAsDefault();
} }
ThemeHelper.setDayNightMode(this);
ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this)); ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
assureCorrectAppLanguage(this); assureCorrectAppLanguage(this);

3
app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java
View file

@ -13,6 +13,7 @@ import androidx.preference.Preference;
import org.schabi.newpipe.R; import org.schabi.newpipe.R;
import org.schabi.newpipe.util.Constants; import org.schabi.newpipe.util.Constants;
import org.schabi.newpipe.util.ThemeHelper;
public class AppearanceSettingsFragment extends BasePreferenceFragment { public class AppearanceSettingsFragment extends BasePreferenceFragment {
private static final boolean CAPTIONING_SETTINGS_ACCESSIBLE = private static final boolean CAPTIONING_SETTINGS_ACCESSIBLE =
@ -89,6 +90,8 @@ public class AppearanceSettingsFragment extends BasePreferenceFragment {
defaultPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, true).apply(); defaultPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, true).apply();
defaultPreferences.edit().putString(themeKey, newValue.toString()).apply(); defaultPreferences.edit().putString(themeKey, newValue.toString()).apply();
ThemeHelper.setDayNightMode(getContext(), newValue.toString());
if (!newValue.equals(beginningThemeKey) && getActivity() != null) { if (!newValue.equals(beginningThemeKey) && getActivity() != null) {
// if it's not the current theme // if it's not the current theme
ActivityCompat.recreate(getActivity()); ActivityCompat.recreate(getActivity());

19
app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
View file

@ -31,6 +31,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.StyleRes; import androidx.annotation.StyleRes;
import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
@ -120,6 +121,7 @@ public final class ThemeHelper {
final String selectedThemeKey = getSelectedThemeKey(context); final String selectedThemeKey = getSelectedThemeKey(context);
int baseTheme = R.style.DarkTheme; // default to dark theme int baseTheme = R.style.DarkTheme; // default to dark theme
if (selectedThemeKey.equals(lightThemeKey)) { if (selectedThemeKey.equals(lightThemeKey)) {
baseTheme = R.style.LightTheme; baseTheme = R.style.LightTheme;
@ -288,4 +290,21 @@ public final class ThemeHelper {
return false; return false;
} }
} }
public static void setDayNightMode(final Context context) {
setDayNightMode(context, ThemeHelper.getSelectedThemeKey(context));
}
public static void setDayNightMode(final Context context, final String selectedThemeKey) {
final Resources res = context.getResources();
if (selectedThemeKey.equals(res.getString(R.string.light_theme_key))) {
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
} else if (selectedThemeKey.equals(res.getString(R.string.dark_theme_key))
|| selectedThemeKey.equals(res.getString(R.string.black_theme_key))) {
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
} else {
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
}
}
} }

4
app/src/main/res/layout-land/activity_player_queue_control.xml
View file

@ -12,8 +12,8 @@
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar" android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar"> app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"

4
app/src/main/res/layout/activity_about.xml
View file

@ -13,8 +13,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/appbar_padding_top" android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar" android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar"> app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"

4
app/src/main/res/layout/activity_player_queue_control.xml
View file

@ -12,8 +12,8 @@
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar" android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar"> app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"

4
app/src/main/res/layout/activity_recaptcha.xml
View file

@ -12,8 +12,8 @@
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar" android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
app:titleTextAppearance="@style/Toolbar.Title" /> app:titleTextAppearance="@style/Toolbar.Title" />
<WebView <WebView

4
app/src/main/res/layout/dialog_feed_group_create.xml
View file

@ -109,8 +109,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical" android:gravity="center_vertical"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar" android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
app:titleTextAppearance="@style/Toolbar.Title"> app:titleTextAppearance="@style/Toolbar.Title">
<LinearLayout <LinearLayout

4
app/src/main/res/layout/toolbar_layout.xml
View file

@ -14,8 +14,8 @@
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar" android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
app:titleTextAppearance="@style/Toolbar.Title"> app:titleTextAppearance="@style/Toolbar.Title">
<include <include

2
app/src/main/res/values-v29/themes.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Base.V29.LightTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="Base.V29.LightTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:enforceNavigationBarContrast">false</item> <item name="android:enforceNavigationBarContrast">false</item>
</style> </style>

16
app/src/main/res/values/styles.xml
View file

@ -1,6 +1,6 @@
<resources> <resources>
<style name="OpeningTheme" parent="Theme.AppCompat.NoActionBar"> <style name="OpeningTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="colorPrimary">@android:color/transparent</item> <item name="colorPrimary">@android:color/transparent</item>
<item name="colorPrimaryDark">@android:color/transparent</item> <item name="colorPrimaryDark">@android:color/transparent</item>
<item name="colorAccent">@android:color/transparent</item> <item name="colorAccent">@android:color/transparent</item>
@ -9,7 +9,7 @@
</style> </style>
<!-- Base themes --> <!-- Base themes -->
<style name="Base.LightTheme" parent="Theme.AppCompat.Light.NoActionBar" /> <style name="Base.LightTheme" parent="Theme.AppCompat.DayNight.DarkActionBar" />
<style name="LightTheme" parent="Base.LightTheme"> <style name="LightTheme" parent="Base.LightTheme">
<item name="colorPrimary">@color/light_youtube_primary_color</item> <item name="colorPrimary">@color/light_youtube_primary_color</item>
@ -117,7 +117,7 @@
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style> </style>
<style name="Base.V7.DarkTheme" parent="Theme.AppCompat.NoActionBar" /> <style name="Base.V7.DarkTheme" parent="Theme.AppCompat.DayNight.NoActionBar" />
<style name="Base.DarkTheme" parent="Base.V7.DarkTheme" /> <style name="Base.DarkTheme" parent="Base.V7.DarkTheme" />
@ -245,7 +245,7 @@
</style> </style>
<!-- Dialogs --> <!-- Dialogs -->
<style name="LightDialogTheme" parent="Theme.AppCompat.Light.Dialog"> <style name="LightDialogTheme" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorPrimary">@color/light_youtube_primary_color</item> <item name="colorPrimary">@color/light_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item> <item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
<item name="colorAccent">@color/light_youtube_accent_color</item> <item name="colorAccent">@color/light_youtube_accent_color</item>
@ -253,7 +253,7 @@
<item name="windowBackground">@color/light_dialog_background_color</item> <item name="windowBackground">@color/light_dialog_background_color</item>
</style> </style>
<style name="DarkDialogTheme" parent="Theme.AppCompat.Dialog"> <style name="DarkDialogTheme" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorPrimary">@color/dark_youtube_primary_color</item> <item name="colorPrimary">@color/dark_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item> <item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
<item name="colorAccent">@color/dark_youtube_accent_color</item> <item name="colorAccent">@color/dark_youtube_accent_color</item>
@ -261,7 +261,7 @@
<item name="windowBackground">@color/dark_dialog_background_color</item> <item name="windowBackground">@color/dark_dialog_background_color</item>
</style> </style>
<style name="LightDialogMinWidthTheme" parent="Theme.AppCompat.Light.Dialog.MinWidth"> <style name="LightDialogMinWidthTheme" parent="Theme.AppCompat.DayNight.Dialog.MinWidth">
<item name="colorPrimary">@color/light_youtube_primary_color</item> <item name="colorPrimary">@color/light_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item> <item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
<item name="colorAccent">@color/light_youtube_accent_color</item> <item name="colorAccent">@color/light_youtube_accent_color</item>
@ -269,7 +269,7 @@
<item name="windowBackground">@color/light_dialog_background_color</item> <item name="windowBackground">@color/light_dialog_background_color</item>
</style> </style>
<style name="DarkDialogMinWidthTheme" parent="Theme.AppCompat.Dialog.MinWidth"> <style name="DarkDialogMinWidthTheme" parent="Theme.AppCompat.DayNight.Dialog.MinWidth">
<item name="colorPrimary">@color/dark_youtube_primary_color</item> <item name="colorPrimary">@color/dark_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item> <item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
<item name="colorAccent">@color/dark_youtube_accent_color</item> <item name="colorAccent">@color/dark_youtube_accent_color</item>
@ -294,7 +294,7 @@
<item name="android:textSize">18sp</item> <item name="android:textSize">18sp</item>
</style> </style>
<style name="OldVideoPlayerTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="OldVideoPlayerTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
<item name="colorPrimary">@color/light_youtube_primary_color</item> <item name="colorPrimary">@color/light_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item> <item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
<item name="colorAccent">@color/light_youtube_accent_color</item> <item name="colorAccent">@color/light_youtube_accent_color</item>

4
app/src/main/res/values/styles_misc.xml
View file

@ -20,7 +20,7 @@
<item name="alertDialogTheme">@style/FilePickerAlertDialogThemeLight</item> <item name="alertDialogTheme">@style/FilePickerAlertDialogThemeLight</item>
</style> </style>
<style name="FilePickerAlertDialogThemeLight" parent="Theme.AppCompat.Dialog.Alert"> <style name="FilePickerAlertDialogThemeLight" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="colorPrimary">@color/light_youtube_primary_color</item> <item name="colorPrimary">@color/light_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item> <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
<item name="colorAccent">@color/light_settings_accent_color</item> <item name="colorAccent">@color/light_settings_accent_color</item>
@ -36,7 +36,7 @@
<item name="alertDialogTheme">@style/FilePickerAlertDialogThemeDark</item> <item name="alertDialogTheme">@style/FilePickerAlertDialogThemeDark</item>
</style> </style>
<style name="FilePickerAlertDialogThemeDark" parent="Theme.AppCompat.Dialog.Alert"> <style name="FilePickerAlertDialogThemeDark" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="colorPrimary">@color/dark_youtube_primary_color</item> <item name="colorPrimary">@color/dark_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_youtube_dark_color</item> <item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
<item name="colorAccent">@color/dark_settings_accent_color</item> <item name="colorAccent">@color/dark_settings_accent_color</item>