diff options
Diffstat (limited to 'app/src/main/res')
3 files changed, 17 insertions, 56 deletions
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 14c2b017..b03d5f2b 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 @@ -23,53 +23,37 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toStartOf="@id/frame_layout" /> + app:layout_constraintEnd_toStartOf="@id/exo_play" /> <ImageView - android:id="@+id/fullscreen_exo_playback_control_view" + android:id="@id/exo_play" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" - android:layout_alignParentEnd="true" - android:src="@drawable/ic_fullscreen_white_rounded_24dp" + android:layout_centerInParent="true" + android:src="@drawable/ic_play_arrow_24dp" android:background="@drawable/exo_player_control_button_circular_background" android:clickable="true" android:focusable="true" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/frame_layout" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> - <FrameLayout - android:id="@+id/frame_layout" + <ImageView + android:id="@+id/fullscreen_exo_playback_control_view" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:padding="8dp" + android:layout_alignParentEnd="true" + android:src="@drawable/ic_fullscreen_white_rounded_24dp" + android:background="@drawable/exo_player_control_button_circular_background" + android:clickable="true" + android:focusable="true" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent"> - - <ImageView android:id="@id/exo_play" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="8dp" - android:layout_centerInParent="true" - android:src="@drawable/ic_play_arrow_24dp" - android:background="@drawable/exo_player_control_button_circular_background" - android:clickable="true" - android:focusable="true" /> - - <ImageView android:id="@id/exo_pause" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="8dp" - android:layout_centerInParent="true" - android:src="@drawable/ic_pause_24dp" - android:background="@drawable/exo_player_control_button_circular_background" - android:clickable="true" - android:focusable="true" /> - - </FrameLayout> + app:layout_constraintStart_toEndOf="@id/exo_play" + app:layout_constraintEnd_toEndOf="parent" /> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" 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 bcdcb1cb..3310987d 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 @@ -56,13 +56,6 @@ android:layout_centerInParent="true" android:src="@drawable/ic_play_arrow_24dp" /> - <ImageView android:id="@id/exo_pause" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="8dp" - android:layout_centerInParent="true" - android:src="@drawable/ic_pause_24dp" /> - <ImageView android:id="@+id/mute_exo_playback_control_view" android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/exo_playback_control_view.xml b/app/src/main/res/layout/exo_playback_control_view.xml index bcbfb44d..d6175ba3 100644 --- a/app/src/main/res/layout/exo_playback_control_view.xml +++ b/app/src/main/res/layout/exo_playback_control_view.xml @@ -72,25 +72,9 @@ app:backgroundTint="@color/colorAccent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/exo_pause" - app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toEndOf="@+id/exo_rew" - style="?attr/materialIconButtonOutlinedStyle" /> - - <com.google.android.material.button.MaterialButton - android:id="@id/exo_pause" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:strokeWidth="0dp" - app:icon="@drawable/ic_pause_24dp" - app:iconSize="36dp" - app:iconTint="@null" - app:backgroundTint="@color/colorAccent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/exo_ffwd" app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toEndOf="@+id/exo_play" + app:layout_constraintStart_toEndOf="@+id/exo_rew" style="?attr/materialIconButtonOutlinedStyle" /> <com.google.android.material.button.MaterialButton @@ -106,7 +90,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toEndOf="@+id/exo_pause" + app:layout_constraintStart_toEndOf="@+id/exo_play" style="?attr/materialIconButtonOutlinedStyle" /> <com.google.android.material.button.MaterialButton |