Migrate to Android DayNight Theme, fix Light Theme, minor UI improvements #5927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

TobiGr merged 40 commits into TeamNewPipe:dev from krlvm:daynight

Apr 3, 2021

app/src/debug/res/xml/main_settings.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,50 +6,50 @@
  
        <PreferenceScreen

            android:fragment="org.schabi.newpipe.settings.VideoAudioSettingsFragment"

            android:icon="?attr/ic_headset"

            android:icon="@drawable/ic_headset"

            android:title="@string/settings_category_video_audio_title"

            app:iconSpaceReserved="false" />

        <PreferenceScreen

            android:fragment="org.schabi.newpipe.settings.DownloadSettingsFragment"

            android:icon="?attr/ic_file_download"

            android:icon="@drawable/ic_file_download"

            android:title="@string/settings_category_downloads_title"

            app:iconSpaceReserved="false" />

        <PreferenceScreen

            android:fragment="org.schabi.newpipe.settings.AppearanceSettingsFragment"

            android:icon="?attr/ic_palette"

            android:icon="@drawable/ic_palette"

            android:title="@string/settings_category_appearance_title"

            app:iconSpaceReserved="false" />

        <PreferenceScreen

            android:fragment="org.schabi.newpipe.settings.HistorySettingsFragment"

            android:icon="?attr/ic_history"

            android:icon="@drawable/ic_history"

            android:title="@string/settings_category_history_title"

            app:iconSpaceReserved="false" />

        <PreferenceScreen

            android:fragment="org.schabi.newpipe.settings.ContentSettingsFragment"

            android:icon="?attr/ic_language"

            android:icon="@drawable/ic_language"

            android:title="@string/content"

            app:iconSpaceReserved="false" />

        <PreferenceScreen

            android:fragment="org.schabi.newpipe.settings.NotificationSettingsFragment"

            android:icon="?attr/ic_play_arrow"

            android:icon="@drawable/ic_play_arrow"

            android:title="@string/settings_category_notification_title"

            app:iconSpaceReserved="false" />

        <PreferenceScreen

            android:fragment="org.schabi.newpipe.settings.UpdateSettingsFragment"

            android:icon="?attr/ic_settings_update"

            android:icon="@drawable/ic_cloud_download"

            android:key="update_pref_screen_key"

            android:title="@string/settings_category_updates_title"

            app:iconSpaceReserved="false" />

        <PreferenceScreen

            android:fragment="org.schabi.newpipe.settings.DebugSettingsFragment"

            android:icon="?attr/ic_bug_report"

            android:icon="@drawable/ic_bug_report"

            android:key="@string/debug_pref_screen_key"

            android:title="@string/settings_category_debug_title"

            app:iconSpaceReserved="false" />

app/src/main/java/org/schabi/newpipe/MainActivity.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -133,6 +133,8 @@ protected void onCreate(final Bundle savedInstanceState) {
  
            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {

                TLSSocketFactoryCompat.setAsDefault();

            }

            ThemeHelper.setDayNightMode(this);

            ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));

            assureCorrectAppLanguage(this);

    @@ -180,27 +182,27 @@ private void setupDrawer() throws Exception {
  
            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER,

                            R.string.tab_subscriptions)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));

                    .setIcon(R.drawable.ic_tv);

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_feed_title)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_rss));

                    .setIcon(R.drawable.ic_rss_feed);

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));

                    .setIcon(R.drawable.ic_bookmark);

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_file_download));

                    .setIcon(R.drawable.ic_file_download);

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_history));

                    .setIcon(R.drawable.ic_history);

            //Settings and About

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_settings));

                    .setIcon(R.drawable.ic_settings);

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_info_outline));

                    .setIcon(R.drawable.ic_info_outline);

            toggle = new ActionBarDrawerToggle(this, mainBinding.getRoot(),

                    toolbarLayoutBinding.toolbar, R.string.drawer_open, R.string.drawer_close);

    @@ -346,7 +348,7 @@ private void toggleServices() {
  
        }

        private void showServices() {

            drawerHeaderBinding.drawerArrow.setImageResource(R.drawable.ic_arrow_drop_up_white_24dp);

            drawerHeaderBinding.drawerArrow.setImageResource(R.drawable.ic_arrow_drop_up);

            for (final StreamingService s : NewPipe.getServices()) {

                final String title = s.getServiceInfo().getName()

    @@ -412,7 +414,7 @@ public void onNothingSelected(final AdapterView<?> parent) {
  
        }

        private void showTabs() throws ExtractionException {

            drawerHeaderBinding.drawerArrow.setImageResource(R.drawable.ic_arrow_drop_down_white_24dp);

            drawerHeaderBinding.drawerArrow.setImageResource(R.drawable.ic_arrow_drop_down);

            //Tabs

            final int currentServiceId = ServiceHelper.getSelectedServiceId(this);

    @@ -430,27 +432,27 @@ private void showTabs() throws ExtractionException {
  
            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, R.string.tab_subscriptions)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));

                    .setIcon(R.drawable.ic_tv);

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_feed_title)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_rss));

                    .setIcon(R.drawable.ic_rss_feed);

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));

                    .setIcon(R.drawable.ic_bookmark);

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_file_download));

                    .setIcon(R.drawable.ic_file_download);

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_history));

                    .setIcon(R.drawable.ic_history);

            //Settings and About

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_settings));

                    .setIcon(R.drawable.ic_settings);

            drawerLayoutBinding.navigation.getMenu()

                    .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_info_outline));

                    .setIcon(R.drawable.ic_info_outline);

        }

        @Override

app/src/main/java/org/schabi/newpipe/RouterActivity.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -91,7 +91,6 @@
  
    import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;

    import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;

    import static org.schabi.newpipe.util.ThemeHelper.resolveResourceIdFromAttr;

    /**

     * Get the url from the intent and open it in the chosen preferred player.

    @@ -231,7 +230,7 @@ private void showUnsupportedUrlDialog(final String url) {
  
            new AlertDialog.Builder(context)

                    .setTitle(R.string.unsupported_url)

                    .setMessage(R.string.unsupported_url_dialog_message)

                    .setIcon(ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_share))

                    .setIcon(R.drawable.ic_share)

                    .setPositiveButton(R.string.open_in_browser,

                            (dialog, which) -> ShareUtils.openUrlInBrowser(this, url))

                    .setNegativeButton(R.string.share,

    @@ -427,16 +426,16 @@ private List<AdapterChoiceItem> getChoicesForService(final StreamingService serv
  
            final AdapterChoiceItem videoPlayer = new AdapterChoiceItem(

                    getString(R.string.video_player_key), getString(R.string.video_player),

                    resolveResourceIdFromAttr(context, R.attr.ic_play_arrow));

                    R.drawable.ic_play_arrow);

            final AdapterChoiceItem showInfo = new AdapterChoiceItem(

                    getString(R.string.show_info_key), getString(R.string.show_info),

                    resolveResourceIdFromAttr(context, R.attr.ic_info_outline));

                    R.drawable.ic_info_outline);

            final AdapterChoiceItem popupPlayer = new AdapterChoiceItem(

                    getString(R.string.popup_player_key), getString(R.string.popup_player),

                    resolveResourceIdFromAttr(context, R.attr.ic_popup));

                    R.drawable.ic_picture_in_picture);

            final AdapterChoiceItem backgroundPlayer = new AdapterChoiceItem(

                    getString(R.string.background_player_key), getString(R.string.background_player),

                    resolveResourceIdFromAttr(context, R.attr.ic_headset));

                    R.drawable.ic_headset);

            if (linkType == LinkType.STREAM) {

                if (isExtVideoEnabled) {

    @@ -481,7 +480,7 @@ private List<AdapterChoiceItem> getChoicesForService(final StreamingService serv
  
            returnList.add(new AdapterChoiceItem(getString(R.string.download_key),

                    getString(R.string.download),

                    resolveResourceIdFromAttr(context, R.attr.ic_file_download)));

                    R.drawable.ic_file_download));

            return returnList;

        }

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -394,8 +394,7 @@ private void initToolbar(final Toolbar toolbar) { @@
             }
             toolbar.setTitle(R.string.download_dialog_title);
-            toolbar.setNavigationIcon(
-                ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_arrow_back));
+            toolbar.setNavigationIcon(R.drawable.ic_arrow_back);
             toolbar.inflateMenu(R.menu.dialog_url);
             toolbar.setNavigationOnClickListener(v -> requireDialog().dismiss());
             toolbar.setNavigationContentDescription(R.string.cancel);
@@ Expand Down @@

app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java

-Original file line number
+Diff line change
@@ Expand Up @@
         protected void onCreate(final Bundle savedInstanceState) {
             assureCorrectAppLanguage(this);
             super.onCreate(savedInstanceState);
+            ThemeHelper.setDayNightMode(this);
             ThemeHelper.setTheme(this);
             activityErrorBinding = ActivityErrorBinding.inflate(getLayoutInflater());
@@ Expand Down @@

app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java

-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     package org.schabi.newpipe.fragments;
     import android.content.Context;
-    import android.content.res.ColorStateList;
     import android.os.Bundle;
     import android.util.Log;
     import android.view.LayoutInflater;
@@ Expand Down Expand Up / @@ -30,7 +29,6 @@ @@
     import org.schabi.newpipe.settings.tabs.TabsManager;
     import org.schabi.newpipe.util.NavigationHelper;
     import org.schabi.newpipe.util.ServiceHelper;
-    import org.schabi.newpipe.util.ThemeHelper;
     import java.util.ArrayList;
     import java.util.List;
@@ Expand Down Expand Up @@
             binding = FragmentMainBinding.bind(rootView);
-            binding.mainTabLayout.setTabIconTint(ColorStateList.valueOf(
-                    ThemeHelper.resolveColorFromAttr(requireContext(), R.attr.colorAccent)));
             binding.mainTabLayout.setupWithViewPager(binding.pager);
             binding.mainTabLayout.addOnTabSelectedListener(this);
+            binding.mainTabLayout.setTabRippleColor(binding.mainTabLayout.getTabRippleColor()
+                    .withAlpha(32));
             setupTabs();
         }
@@ Expand Down @@

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -923,21 +923,21 @@ private void initTabs() {
  
            if (shouldShowComments()) {

                pageAdapter.addFragment(

                        CommentsFragment.getInstance(serviceId, url, title), COMMENTS_TAB_TAG);

                tabIcons.add(R.drawable.ic_comment_white_24dp);

                tabIcons.add(R.drawable.ic_comment);

                tabContentDescriptions.add(R.string.comments_tab_description);

            }

            if (showRelatedItems && binding.relatedItemsLayout == null) {

                // temp empty fragment. will be updated in handleResult

                pageAdapter.addFragment(new EmptyFragment(false), RELATED_TAB_TAG);

                tabIcons.add(R.drawable.ic_art_track_white_24dp);

                tabIcons.add(R.drawable.ic_art_track);

                tabContentDescriptions.add(R.string.related_items_tab_description);

            }

            if (showDescription) {

                // temp empty fragment. will be updated in handleResult

                pageAdapter.addFragment(new EmptyFragment(false), DESCRIPTION_TAB_TAG);

                tabIcons.add(R.drawable.ic_description_white_24dp);

                tabIcons.add(R.drawable.ic_description);

                tabContentDescriptions.add(R.string.description_tab_description);

            }

    @@ -2280,11 +2280,10 @@ private void updateOverlayData(@Nullable final String overlayTitle,
  
        }

        private void setOverlayPlayPauseImage(final boolean playerIsPlaying) {

            final int attr = playerIsPlaying

                    ? R.attr.ic_pause

                    : R.attr.ic_play_arrow;

            binding.overlayPlayPauseButton.setImageResource(

                    ThemeHelper.resolveResourceIdFromAttr(activity, attr));

            final int drawable = playerIsPlaying

                    ? R.drawable.ic_pause

                    : R.drawable.ic_play_arrow;

            binding.overlayPlayPauseButton.setImageResource(drawable);

        }

        private void setOverlayLook(final AppBarLayout appBar,

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -61,7 +61,6 @@
  
    import static org.schabi.newpipe.ktx.ViewUtils.animate;

    import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;

    import static org.schabi.newpipe.util.ThemeHelper.resolveResourceIdFromAttr;

    public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {

        private CompositeDisposable disposables;

    @@ -307,7 +306,7 @@ public void handleResult(@NonNull final PlaylistInfo result) {
  
                        getResources().getColor(R.color.transparent_background_color));

                headerBinding.uploaderAvatarView.setImageDrawable(

                        AppCompatResources.getDrawable(requireContext(),

                        resolveResourceIdFromAttr(requireContext(), R.attr.ic_radio))

                        R.drawable.ic_radio)

                );

            } else {

                IMAGE_LOADER.displayImage(avatarUrl, headerBinding.uploaderAvatarView,

    @@ -461,13 +460,13 @@ private void updateBookmarkButtons() {
  
                return;

            }

            final int iconAttr = playlistEntity == null

                    ? R.attr.ic_playlist_add : R.attr.ic_playlist_check;

            final int drawable = playlistEntity == null

                    ? R.drawable.ic_playlist_add : R.drawable.ic_playlist_add_check;

            final int titleRes = playlistEntity == null

                    ? R.string.bookmark_playlist : R.string.unbookmark_playlist;

            playlistBookmarkButton.setIcon(resolveResourceIdFromAttr(activity, iconAttr));

            playlistBookmarkButton.setIcon(drawable);

            playlistBookmarkButton.setTitle(titleRes);

        }

    }

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -487,6 +487,9 @@ private void showSearchOnStart() { @@
                         + lastSearchedString);
             }
             searchEditText.setText(searchString);
+            if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
+                searchEditText.setHintTextColor(searchEditText.getTextColors().withAlpha(128));
+            }
             if (TextUtils.isEmpty(searchString) || TextUtils.isEmpty(searchEditText.getText())) {
                 searchToolbarContainer.setTranslationX(100);
@@ Expand Down @@

app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java

-Original file line number
+Diff line change
@@ -1,14 +1,12 @@
     package org.schabi.newpipe.fragments.list.search;
     import android.content.Context;
-    import android.content.res.TypedArray;
     import android.view.LayoutInflater;
     import android.view.View;
     import android.view.ViewGroup;
     import android.widget.ImageView;
     import android.widget.TextView;
-    import androidx.annotation.AttrRes;
     import androidx.recyclerview.widget.RecyclerView;
     import org.schabi.newpipe.R;
@@ Expand Down Expand Up / @@ -117,16 +115,8 @@ private SuggestionItemHolder(final View rootView) { @@
                 queryView = rootView.findViewById(R.id.suggestion_search);
                 insertView = rootView.findViewById(R.id.suggestion_insert);
-                historyResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.ic_history);
-                searchResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.ic_search);
-            }
-            private static int resolveResourceIdFromAttr(final Context context,
-                                                         @AttrRes final int attr) {
-                final TypedArray a = context.getTheme().obtainStyledAttributes(new int[]{attr});
-                final int attributeResourceId = a.getResourceId(0, 0);
-                a.recycle();
-                return attributeResourceId;
+                historyResId = R.drawable.ic_history;
+                searchResId = R.drawable.ic_search;
             }
             private void updateFrom(final SuggestionItem item) {
@@ Expand Down @@

app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -40,7 +40,6 @@
  
    import org.schabi.newpipe.util.NavigationHelper;

    import org.schabi.newpipe.util.OnClickGesture;

    import org.schabi.newpipe.util.StreamDialogEntry;

    import org.schabi.newpipe.util.ThemeHelper;

    import java.util.ArrayList;

    import java.util.Arrays;

    @@ -312,14 +311,13 @@ private void toggleSortMode() {
  
            if (sortMode == StatisticSortMode.LAST_PLAYED) {

                sortMode = StatisticSortMode.MOST_PLAYED;

                setTitle(getString(R.string.title_most_played));

                headerBinding.sortButtonIcon.setImageResource(

                    ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_history));

                headerBinding.sortButtonIcon.setImageResource(R.drawable.ic_history);

                headerBinding.sortButtonText.setText(R.string.title_last_played);

            } else {

                sortMode = StatisticSortMode.LAST_PLAYED;

                setTitle(getString(R.string.title_last_played));

                headerBinding.sortButtonIcon.setImageResource(

                    ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_filter_list));

                    R.drawable.ic_filter_list);

                headerBinding.sortButtonText.setText(R.string.title_most_played);

            }

            startLoading(true);

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Migrate to Android DayNight Theme, fix Light Theme, minor UI improvements #5927

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!