Player overlay buttons redone

This commit is contained in:
xfileFIN 2020-10-15 18:53:00 +03:00
parent d38afae3a7
commit 2d44d81747
20 changed files with 541 additions and 291 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 736 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 690 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector android:constantSize="true"
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_pressed="true" android:drawable="@drawable/quantum_ic_fast_forward_white_36" />
<item android:state_enabled="true" android:drawable="@drawable/quantum_ic_fast_forward_white_36" />
<item android:state_enabled="false" android:drawable="@drawable/quantum_ic_fast_forward_grey600_36" />
</selector>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector android:constantSize="true"
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_pressed="true" android:drawable="@drawable/quantum_ic_fast_rewind_white_36" />
<item android:state_enabled="true" android:drawable="@drawable/quantum_ic_fast_rewind_white_36" />
<item android:state_enabled="false" android:drawable="@drawable/quantum_ic_fast_rewind_grey600_36" />
</selector>

View file

@ -0,0 +1,9 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto"></merge>
<!-- The actual layout file but commented because too lazy to include everything from YouTube
<?xml version="1.0" encoding="utf-8"?>
<merge
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto">
<fi.vanced.libraries.youtube.sponsors.player.ui.NewSegmentLayout android:id="@+id/new_segment_view" android:focusable="true" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/brand_interaction_default_bottom_margin" android:layout_alignParentLeft="true" android:layout_alignParentBottom="true" />
<fi.vanced.libraries.youtube.sponsors.player.ui.SkipSponsorButton android:id="@+id/skip_sponsor_button" android:focusable="true" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/inline_controls_bottom_bar_height" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" />
</merge>
-->

View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<merge
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto">
<LinearLayout android:gravity="start|center" android:orientation="vertical" android:id="@+id/new_segment_container" android:background="#66000000" android:layout_width="wrap_content" android:layout_height="wrap_content">
<LinearLayout android:layout_width="wrap_content" android:layout_height="36.0dip">
<ImageButton android:layout_gravity="start|center" android:id="@+id/new_segment_rewind" android:background="@android:color/transparent" android:paddingTop="3.0dip" android:paddingBottom="3.0dip" android:layout_width="45.0dip" android:layout_height="36.0dip" android:src="@drawable/player_fast_rewind" android:contentDescription="@null" android:alpha="1.0" android:paddingStart="10.0dip" android:paddingEnd="5.0dip" />
<ImageButton android:layout_gravity="start|center" android:id="@+id/new_segment_forward" android:background="@android:color/transparent" android:paddingTop="3.0dip" android:paddingBottom="3.0dip" android:layout_width="45.0dip" android:layout_height="36.0dip" android:src="@drawable/player_fast_forward" android:contentDescription="@null" android:alpha="1.0" android:paddingStart="5.0dip" android:paddingEnd="5.0dip" />
<ImageButton android:layout_gravity="start|center" android:id="@+id/new_segment_adjust" android:background="@android:color/transparent" android:paddingTop="3.0dip" android:paddingBottom="3.0dip" android:layout_width="45.0dip" android:layout_height="36.0dip" android:src="@drawable/ic_sb_adjust" android:contentDescription="@null" android:alpha="1.0" android:paddingStart="5.0dip" android:paddingEnd="10.0dip" />
</LinearLayout>
<LinearLayout android:layout_width="wrap_content" android:layout_height="36.0dip">
<ImageButton android:layout_gravity="start|center" android:id="@+id/new_segment_compare" android:background="@android:color/transparent" android:paddingTop="3.0dip" android:paddingBottom="3.0dip" android:layout_width="45.0dip" android:layout_height="36.0dip" android:src="@drawable/ic_sb_compare" android:contentDescription="@null" android:alpha="1.0" android:paddingStart="10.0dip" android:paddingEnd="5.0dip" />
<ImageButton android:layout_gravity="start|center" android:id="@+id/new_segment_edit" android:background="@android:color/transparent" android:paddingTop="3.0dip" android:paddingBottom="3.0dip" android:layout_width="45.0dip" android:layout_height="36.0dip" android:src="@drawable/ic_sb_edit" android:contentDescription="@null" android:alpha="1.0" android:paddingStart="5.0dip" android:paddingEnd="5.0dip" />
<ImageButton android:layout_gravity="start|center" android:id="@+id/new_segment_publish" android:background="@android:color/transparent" android:paddingTop="3.0dip" android:paddingBottom="3.0dip" android:layout_width="45.0dip" android:layout_height="36.0dip" android:src="@drawable/ic_sb_publish" android:contentDescription="@null" android:alpha="1.0" android:paddingStart="5.0dip" android:paddingEnd="10.0dip" />
</LinearLayout>
</LinearLayout>
</merge>

View file

@ -0,0 +1,11 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto"></merge>
<!-- The actual layout file but commented because too lazy to include everything from YouTube
<?xml version="1.0" encoding="utf-8"?>
<merge
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto">
<LinearLayout android:layout_gravity="center_vertical" android:orientation="horizontal" android:id="@+id/skip_sponsor_button_container" android:padding="8.0dip" android:layout_width="wrap_content" android:layout_height="32.0dip" android:contentDescription="@string/skip_sponsor">
<com.google.android.libraries.youtube.common.ui.YouTubeTextView android:textSize="@dimen/extra_small_font_size" android:textColor="@color/skip_ad_button_foreground_color" android:layout_gravity="center_vertical" android:id="@+id/skip_sponsor_button_text" android:paddingRight="@dimen/ad_overlay_ad_text_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/skip_sponsor" android:singleLine="true" android:includeFontPadding="false" yt:robotoFont="light" />
<ImageView android:layout_gravity="center_vertical" android:id="@+id/skip_sponsor_button_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/quantum_ic_skip_next_white_24" android:contentDescription="@null" android:alpha="0.8" />
</LinearLayout>
</merge>
-->

View file

@ -214,6 +214,8 @@
<string name="sb_guidelines_popup_already_read">Already read</string>
<string name="sb_guidelines_popup_open">Show me</string>
<string name="skip_sponsor">Skip sponsor</string>
<string name="app_name" />
</resources>