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

Merge pull request #3565 from B0pol/retry-button-color

Browse source 
Change retry & subscribe buttons background color based on service color
This commit is contained in:
Stypox 2020-05-13 11:01:40 +02:00 committed by GitHub
commit 6dc7dab154
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
View file

@ -47,6 +47,7 @@ import org.schabi.newpipe.util.ImageDisplayConstants;
import org.schabi.newpipe.util.Localization; import org.schabi.newpipe.util.Localization;
import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.ShareUtils; import org.schabi.newpipe.util.ShareUtils;
import org.schabi.newpipe.util.ThemeHelper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
@ -374,8 +375,8 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
int backgroundDuration = isButtonVisible ? 300 : 0; int backgroundDuration = isButtonVisible ? 300 : 0;
int textDuration = isButtonVisible ? 200 : 0; int textDuration = isButtonVisible ? 200 : 0;
int subscribeBackground = ContextCompat int subscribeBackground = ThemeHelper
.getColor(activity, R.color.subscribe_background_color); .resolveColorFromAttr(activity, R.attr.colorPrimary);
int subscribeText = ContextCompat.getColor(activity, R.color.subscribe_text_color); int subscribeText = ContextCompat.getColor(activity, R.color.subscribe_text_color);
int subscribedBackground = ContextCompat int subscribedBackground = ContextCompat
.getColor(activity, R.color.subscribed_background_color); .getColor(activity, R.color.subscribed_background_color);

12
app/src/main/res/layout-large-land/fragment_video_detail.xml
View file

@ -313,18 +313,6 @@
tools:text="Uploader" /> tools:text="Uploader" />
</LinearLayout> </LinearLayout>
<!--<Button
android:id="@+id/detail_uploader_subscribe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|right"
android:layout_marginRight="12dp"
android:text="@string/rss_button_title"
android:textSize="12sp"
android:theme="@style/RedButton"
android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
tools:ignore="RtlHardcoded"
android:visibility="gone"/>-->
</LinearLayout> </LinearLayout>
<!-- VIEW & THUMBS --> <!-- VIEW & THUMBS -->

2
app/src/main/res/layout/channel_header.xml
View file

@ -108,7 +108,7 @@
android:layout_marginRight="2dp" android:layout_marginRight="2dp"
android:text="@string/subscribe_button_title" android:text="@string/subscribe_button_title"
android:textSize="@dimen/channel_rss_title_size" android:textSize="@dimen/channel_rss_title_size"
android:theme="@style/RedButton" android:theme="@style/ServiceColoredButton"
android:visibility="gone" android:visibility="gone"
tools:ignore="RtlHardcoded" tools:ignore="RtlHardcoded"
tools:visibility="visible" /> tools:visibility="visible" />

2
app/src/main/res/layout/error_retry.xml
View file

@ -28,6 +28,6 @@
android:textAllCaps="true" android:textAllCaps="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp" android:textSize="16sp"
android:theme="@style/RedButton"/> android:theme="@style/ServiceColoredButton"/>
</LinearLayout> </LinearLayout>

12
app/src/main/res/layout/fragment_video_detail.xml
View file

@ -308,18 +308,6 @@
</LinearLayout> </LinearLayout>
<!--<Button
android:id="@+id/detail_uploader_subscribe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|right"
android:layout_marginRight="12dp"
android:text="@string/rss_button_title"
android:textSize="12sp"
android:theme="@style/RedButton"
android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
tools:ignore="RtlHardcoded"
android:visibility="gone"/>-->
</LinearLayout> </LinearLayout>
<!-- VIEW & THUMBS --> <!-- VIEW & THUMBS -->

1
app/src/main/res/values/colors.xml
View file

@ -56,7 +56,6 @@
<color name="background_title_color">#ffffff</color> <color name="background_title_color">#ffffff</color>
<color name="background_subtext_color">#999999</color> <color name="background_subtext_color">#999999</color>
<color name="subscribe_background_color">#e53935</color>
<color name="subscribe_text_color">#fff</color> <color name="subscribe_text_color">#fff</color>
<color name="subscribed_background_color">#d6d6d6</color> <color name="subscribed_background_color">#d6d6d6</color>
<color name="subscribed_text_color">#717171</color> <color name="subscribed_text_color">#717171</color>

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

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="RedButton" parent="Widget.AppCompat.Button.Colored"> <!-- Follows service's primary color -->
<item name="colorButtonNormal">@color/subscribe_background_color</item> <style name="ServiceColoredButton" parent="Widget.AppCompat.Button.Colored">
<item name="colorButtonNormal">?attr/colorPrimary</item>
<item name="android:textColor">@color/subscribe_text_color</item> <item name="android:textColor">@color/subscribe_text_color</item>
<item name="colorControlHighlight">@color/dark_ripple_color</item> <item name="colorControlHighlight">@color/dark_ripple_color</item>
</style> </style>