diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java index a9b703b14cb..b88d375ffba 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java @@ -47,6 +47,7 @@ import org.schabi.newpipe.util.Localization; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.ShareUtils; +import org.schabi.newpipe.util.ThemeHelper; import java.util.ArrayList; import java.util.Iterator; @@ -374,8 +375,8 @@ private void updateSubscribeButton(final boolean isSubscribed) { int backgroundDuration = isButtonVisible ? 300 : 0; int textDuration = isButtonVisible ? 200 : 0; - int subscribeBackground = ContextCompat - .getColor(activity, R.color.subscribe_background_color); + int subscribeBackground = ThemeHelper + .resolveColorFromAttr(activity, R.attr.colorPrimary); int subscribeText = ContextCompat.getColor(activity, R.color.subscribe_text_color); int subscribedBackground = ContextCompat .getColor(activity, R.color.subscribed_background_color); diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml index b119bf761dc..095ccdf7e0c 100644 --- a/app/src/main/res/layout-large-land/fragment_video_detail.xml +++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml @@ -313,18 +313,6 @@ tools:text="Uploader" /> - diff --git a/app/src/main/res/layout/channel_header.xml b/app/src/main/res/layout/channel_header.xml index 0554db48e24..241aa474129 100644 --- a/app/src/main/res/layout/channel_header.xml +++ b/app/src/main/res/layout/channel_header.xml @@ -108,7 +108,7 @@ android:layout_marginRight="2dp" android:text="@string/subscribe_button_title" android:textSize="@dimen/channel_rss_title_size" - android:theme="@style/RedButton" + android:theme="@style/ServiceColoredButton" android:visibility="gone" tools:ignore="RtlHardcoded" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/error_retry.xml b/app/src/main/res/layout/error_retry.xml index 567012f1ebd..583b304f7cd 100644 --- a/app/src/main/res/layout/error_retry.xml +++ b/app/src/main/res/layout/error_retry.xml @@ -28,6 +28,6 @@ android:textAllCaps="true" android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textSize="16sp" - android:theme="@style/RedButton"/> + android:theme="@style/ServiceColoredButton"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml index dfe6435f72a..5f68a9578cc 100644 --- a/app/src/main/res/layout/fragment_video_detail.xml +++ b/app/src/main/res/layout/fragment_video_detail.xml @@ -308,18 +308,6 @@ - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e8067606580..b23a0a50dc8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -56,7 +56,6 @@ #ffffff #999999 - #e53935 #fff #d6d6d6 #717171 diff --git a/app/src/main/res/values/styles_misc.xml b/app/src/main/res/values/styles_misc.xml index aaf401aac64..b4d7901e2c1 100644 --- a/app/src/main/res/values/styles_misc.xml +++ b/app/src/main/res/values/styles_misc.xml @@ -1,8 +1,9 @@ -