From e5b65a5aecdeb0d6a5c4eb7cbfd06c29eb7ac75b Mon Sep 17 00:00:00 2001 From: Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com> Date: Thu, 21 Sep 2023 23:15:34 -0400 Subject: Start changing video control UI. --- .../exo_player_control_view_background.xml | 9 ++ app/src/main/res/drawable/ic_fast_forward_24dp.xml | 5 + app/src/main/res/drawable/ic_fast_rewind_24dp.xml | 5 + app/src/main/res/drawable/ic_mute_24dp.xml | 4 +- .../res/drawable/ic_mute_white_rounded_24dp.xml | 9 -- app/src/main/res/drawable/ic_pause_24dp.xml | 9 ++ .../res/drawable/ic_pause_white_rounded_24dp.xml | 9 -- app/src/main/res/drawable/ic_play_arrow_24dp.xml | 9 ++ .../drawable/ic_play_arrow_white_rounded_24dp.xml | 9 -- app/src/main/res/drawable/ic_unmute_24dp.xml | 4 +- .../res/drawable/ic_unmute_white_rounded_24dp.xml | 9 -- .../layout/exo_autoplay_playback_control_view.xml | 6 +- .../exo_autoplay_playback_control_view_legacy.xml | 6 +- .../main/res/layout/exo_playback_control_view.xml | 137 ++++++++++++++++----- 14 files changed, 156 insertions(+), 74 deletions(-) create mode 100644 app/src/main/res/drawable/exo_player_control_view_background.xml create mode 100644 app/src/main/res/drawable/ic_fast_forward_24dp.xml create mode 100644 app/src/main/res/drawable/ic_fast_rewind_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_mute_white_rounded_24dp.xml create mode 100644 app/src/main/res/drawable/ic_pause_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_pause_white_rounded_24dp.xml create mode 100644 app/src/main/res/drawable/ic_play_arrow_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_play_arrow_white_rounded_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_unmute_white_rounded_24dp.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/drawable/exo_player_control_view_background.xml b/app/src/main/res/drawable/exo_player_control_view_background.xml new file mode 100644 index 00000000..839c0a8e --- /dev/null +++ b/app/src/main/res/drawable/exo_player_control_view_background.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_fast_forward_24dp.xml b/app/src/main/res/drawable/ic_fast_forward_24dp.xml new file mode 100644 index 00000000..51869b89 --- /dev/null +++ b/app/src/main/res/drawable/ic_fast_forward_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_fast_rewind_24dp.xml b/app/src/main/res/drawable/ic_fast_rewind_24dp.xml new file mode 100644 index 00000000..1a97291c --- /dev/null +++ b/app/src/main/res/drawable/ic_fast_rewind_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_mute_24dp.xml b/app/src/main/res/drawable/ic_mute_24dp.xml index ff764c78..bc45d400 100644 --- a/app/src/main/res/drawable/ic_mute_24dp.xml +++ b/app/src/main/res/drawable/ic_mute_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> + android:fillColor="@android:color/white" + android:pathData="M3.63,3.63c-0.39,0.39 -0.39,1.02 0,1.41L7.29,8.7 7,9L4,9c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1h3l3.29,3.29c0.63,0.63 1.71,0.18 1.71,-0.71v-4.17l4.18,4.18c-0.49,0.37 -1.02,0.68 -1.6,0.91 -0.36,0.15 -0.58,0.53 -0.58,0.92 0,0.72 0.73,1.18 1.39,0.91 0.8,-0.33 1.55,-0.77 2.22,-1.31l1.34,1.34c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L5.05,3.63c-0.39,-0.39 -1.02,-0.39 -1.42,0zM19,12c0,0.82 -0.15,1.61 -0.41,2.34l1.53,1.53c0.56,-1.17 0.88,-2.48 0.88,-3.87 0,-3.83 -2.4,-7.11 -5.78,-8.4 -0.59,-0.23 -1.22,0.23 -1.22,0.86v0.19c0,0.38 0.25,0.71 0.61,0.85C17.18,6.54 19,9.06 19,12zM10.29,5.71l-0.17,0.17L12,7.76L12,6.41c0,-0.89 -1.08,-1.33 -1.71,-0.7zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v1.79l2.48,2.48c0.01,-0.08 0.02,-0.16 0.02,-0.24z"/> diff --git a/app/src/main/res/drawable/ic_mute_white_rounded_24dp.xml b/app/src/main/res/drawable/ic_mute_white_rounded_24dp.xml deleted file mode 100644 index bc45d400..00000000 --- a/app/src/main/res/drawable/ic_mute_white_rounded_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_pause_24dp.xml b/app/src/main/res/drawable/ic_pause_24dp.xml new file mode 100644 index 00000000..a5e498b5 --- /dev/null +++ b/app/src/main/res/drawable/ic_pause_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_pause_white_rounded_24dp.xml b/app/src/main/res/drawable/ic_pause_white_rounded_24dp.xml deleted file mode 100644 index a5e498b5..00000000 --- a/app/src/main/res/drawable/ic_pause_white_rounded_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_play_arrow_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_24dp.xml new file mode 100644 index 00000000..78fbfbba --- /dev/null +++ b/app/src/main/res/drawable/ic_play_arrow_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_play_arrow_white_rounded_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_rounded_24dp.xml deleted file mode 100644 index 78fbfbba..00000000 --- a/app/src/main/res/drawable/ic_play_arrow_white_rounded_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_unmute_24dp.xml b/app/src/main/res/drawable/ic_unmute_24dp.xml index d2c9bb24..3afb6532 100644 --- a/app/src/main/res/drawable/ic_unmute_24dp.xml +++ b/app/src/main/res/drawable/ic_unmute_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> + android:fillColor="@android:color/white" + android:pathData="M3,10v4c0,0.55 0.45,1 1,1h3l3.29,3.29c0.63,0.63 1.71,0.18 1.71,-0.71L12,6.41c0,-0.89 -1.08,-1.34 -1.71,-0.71L7,9L4,9c-0.55,0 -1,0.45 -1,1zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,4.45v0.2c0,0.38 0.25,0.71 0.6,0.85C17.18,6.53 19,9.06 19,12s-1.82,5.47 -4.4,6.5c-0.36,0.14 -0.6,0.47 -0.6,0.85v0.2c0,0.63 0.63,1.07 1.21,0.85C18.6,19.11 21,15.84 21,12s-2.4,-7.11 -5.79,-8.4c-0.58,-0.23 -1.21,0.22 -1.21,0.85z"/> diff --git a/app/src/main/res/drawable/ic_unmute_white_rounded_24dp.xml b/app/src/main/res/drawable/ic_unmute_white_rounded_24dp.xml deleted file mode 100644 index 3afb6532..00000000 --- a/app/src/main/res/drawable/ic_unmute_white_rounded_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/exo_autoplay_playback_control_view.xml b/app/src/main/res/layout/exo_autoplay_playback_control_view.xml index 4f7020c4..14c2b017 100644 --- a/app/src/main/res/layout/exo_autoplay_playback_control_view.xml +++ b/app/src/main/res/layout/exo_autoplay_playback_control_view.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:padding="8dp" android:layout_toStartOf="@id/fullscreen_exo_playback_control_view" - android:src="@drawable/ic_mute_white_rounded_24dp" + android:src="@drawable/ic_mute_24dp" android:background="@drawable/exo_player_control_button_circular_background" android:clickable="true" android:focusable="true" @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:padding="8dp" android:layout_centerInParent="true" - android:src="@drawable/ic_play_arrow_white_rounded_24dp" + android:src="@drawable/ic_play_arrow_24dp" android:background="@drawable/exo_player_control_button_circular_background" android:clickable="true" android:focusable="true" /> @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:padding="8dp" android:layout_centerInParent="true" - android:src="@drawable/ic_pause_white_rounded_24dp" + android:src="@drawable/ic_pause_24dp" android:background="@drawable/exo_player_control_button_circular_background" android:clickable="true" android:focusable="true" /> diff --git a/app/src/main/res/layout/exo_autoplay_playback_control_view_legacy.xml b/app/src/main/res/layout/exo_autoplay_playback_control_view_legacy.xml index 52899132..bcdcb1cb 100644 --- a/app/src/main/res/layout/exo_autoplay_playback_control_view_legacy.xml +++ b/app/src/main/res/layout/exo_autoplay_playback_control_view_legacy.xml @@ -54,14 +54,14 @@ android:layout_height="wrap_content" android:padding="8dp" android:layout_centerInParent="true" - android:src="@drawable/ic_play_arrow_white_rounded_24dp" /> + android:src="@drawable/ic_play_arrow_24dp" /> + android:src="@drawable/ic_pause_24dp" /> - + + - - + android:orientation="horizontal" + android:paddingTop="4dp"> - - - - - - - - - + + + + + + + + + + - - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + app:strokeWidth="0dp" + app:icon="@drawable/ic_video_quality_24dp" + app:iconSize="24dp" + app:iconTint="@null" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + style="?attr/materialIconButtonOutlinedStyle" /> + + - + android:ellipsize="end" />-->