diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index cad0258da69..b2b3cc37d86 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -397,13 +397,14 @@ 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_white_24dp);
+
toolbar.inflateMenu(R.menu.dialog_url);
toolbar.setNavigationOnClickListener(v -> requireDialog().dismiss());
toolbar.setNavigationContentDescription(R.string.cancel);
okButton = toolbar.findViewById(R.id.okay);
+ okButton.setTextColor(getResources().getColor(R.color.white));
okButton.setEnabled(false); // disable until the download service connection is done
toolbar.setOnMenuItemClickListener(item -> {
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
index 709dac36849..96e1b859a56 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
@@ -32,7 +32,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 org.schabi.newpipe.views.ScrollableTabLayout;
import java.util.ArrayList;
@@ -93,7 +92,7 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
viewPager = rootView.findViewById(R.id.pager);
tabLayout.setTabIconTint(ColorStateList.valueOf(
- ThemeHelper.resolveColorFromAttr(requireContext(), R.attr.colorAccent)));
+ getResources().getColor(R.color.white)));
tabLayout.setupWithViewPager(viewPager);
tabLayout.addOnTabSelectedListener(this);
@@ -184,8 +183,10 @@ private void setupTabs() {
}
private void updateTabsIconAndDescription() {
+
for (int i = 0; i < tabsList.size(); i++) {
final TabLayout.Tab tabToSet = tabLayout.getTabAt(i);
+
if (tabToSet != null) {
final Tab tab = tabsList.get(i);
tabToSet.setIcon(tab.getTabIconRes(requireContext()));
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 36e7a206c44..fba3bd92e17 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -743,6 +743,9 @@ private void setupActionBar(final StreamInfo info) {
public void onItemSelected(final AdapterView> parent, final View view,
final int position, final long id) {
selectedVideoStreamIndex = position;
+ RelativeLayout r = (RelativeLayout) parent.getChildAt(0);
+ ((TextView) r.getChildAt(1)).setTextColor(getResources().getColor(R.color.white));
+ ((TextView) r.getChildAt(2)).setTextColor(getResources().getColor(R.color.white));
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
index 93df98c9727..ddb0921c61a 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -43,7 +43,6 @@
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.ShareUtils;
import org.schabi.newpipe.util.StreamDialogEntry;
-import org.schabi.newpipe.util.ThemeHelper;
import java.util.ArrayList;
import java.util.List;
@@ -470,13 +469,12 @@ private void updateBookmarkButtons() {
return;
}
- final int iconAttr = playlistEntity == null
- ? R.attr.ic_playlist_add : R.attr.ic_playlist_check;
+ playlistBookmarkButton.setIcon(playlistEntity == null
+ ? R.drawable.ic_playlist_add_white_24dp
+ : R.drawable.ic_playlist_add_check_white_24dp);
- final int titleRes = playlistEntity == null
- ? R.string.bookmark_playlist : R.string.unbookmark_playlist;
-
- playlistBookmarkButton.setIcon(ThemeHelper.resolveResourceIdFromAttr(activity, iconAttr));
- playlistBookmarkButton.setTitle(titleRes);
+ playlistBookmarkButton.setTitle(playlistEntity == null
+ ? R.string.bookmark_playlist
+ : R.string.unbookmark_playlist);
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
index 2c9c4a42506..53571feed72 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -716,10 +716,8 @@ private void onMaybeMuteChanged() {
//2) Icon change accordingly to current App Theme
// using rootView.getContext() because getApplicationContext() didn't work
item.setIcon(player.isMuted()
- ? ThemeHelper.resolveResourceIdFromAttr(rootView.getContext(),
- R.attr.ic_volume_off)
- : ThemeHelper.resolveResourceIdFromAttr(rootView.getContext(),
- R.attr.ic_volume_up));
+ ? R.drawable.ic_volume_off_white_24dp
+ : R.drawable.ic_volume_up_white_24dp);
}
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
index d06b4b14ebb..5e102be0d26 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
@@ -26,7 +26,6 @@
import org.schabi.newpipe.report.UserAction;
import org.schabi.newpipe.util.KioskTranslator;
import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
import java.util.Objects;
@@ -180,7 +179,7 @@ public String getTabName(final Context context) {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_blank_page);
+ return R.drawable.ic_crop_portrait_white_24dp;
}
@Override
@@ -205,7 +204,7 @@ public String getTabName(final Context context) {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_channel);
+ return R.drawable.ic_tv_white_24dp;
}
@Override
@@ -231,7 +230,7 @@ public String getTabName(final Context context) {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_rss);
+ return R.drawable.ic_rss_feed_white_24dp;
}
@Override
@@ -256,7 +255,7 @@ public String getTabName(final Context context) {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_bookmark);
+ return R.drawable.ic_bookmark_white_24dp;
}
@Override
@@ -281,7 +280,7 @@ public String getTabName(final Context context) {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_history);
+ return R.drawable.ic_history_white_24dp;
}
@Override
@@ -401,7 +400,7 @@ public String getTabName(final Context context) {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_channel);
+ return R.drawable.ic_tv_white_24dp;
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
index b676a1a8840..ac8acb38e4c 100644
--- a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
+++ b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
@@ -55,13 +55,13 @@ public static int getKioskIcon(final String kioskId, final Context c) {
case "Top 50":
case "New & hot":
case "conferences":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_hot);
+ return R.drawable.ic_whatshot_white_24dp;
case "Local":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_local);
+ return R.drawable.ic_home_white_24dp;
case "Recently added":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_recent);
+ return R.drawable.ic_add_circle_outline_white_24dp;
case "Most liked":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_thumb_up);
+ return R.drawable.ic_thumb_up_white_24dp;
default:
return 0;
}
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index 09f4d0c7942..6c994759514 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -225,8 +225,8 @@ private void updateList() {
if (mSwitch != null) {
mSwitch.setIcon(mLinear
- ? ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_grid)
- : ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_list));
+ ? R.drawable.ic_apps_white_24dp
+ : R.drawable.ic_list_white_24dp);
mSwitch.setTitle(mLinear ? R.string.grid : R.string.list);
mPrefs.edit().putBoolean("linear", mLinear).apply();
}
diff --git a/app/src/main/res/drawable/color_cursor.xml b/app/src/main/res/drawable/color_cursor.xml
new file mode 100644
index 00000000000..57c181288ce
--- /dev/null
+++ b/app/src/main/res/drawable/color_cursor.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index fb11677f843..181666a2413 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -14,18 +14,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/appbar_padding_top"
- android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
- app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar">
+ android:theme="@style/ToolbarTheme"
+ app:popupTheme="@style/ToolbarTheme">
diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml
index 71a93506fe0..39fe171ef3a 100644
--- a/app/src/main/res/layout/activity_player_queue_control.xml
+++ b/app/src/main/res/layout/activity_player_queue_control.xml
@@ -12,14 +12,15 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
- app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar">
+ android:theme="@style/ToolbarTheme"
+ app:popupTheme="@style/ToolbarTheme">
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 1a2455691fa..25d936b89a7 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -13,6 +13,7 @@
android:layout_alignParentTop="true"
android:background="?attr/colorPrimary"
app:tabMinWidth="60dp"
+ app:tabIndicatorColor="@color/white"
app:tabGravity="fill"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fae60807477..a0aa28af4a7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -115,6 +115,98 @@
- @style/PreferenceThemeOverlay.v14.Material
+
+
+
+
+