recloudstream
/
cloudstream
mirror of https://github.com/recloudstream/cloudstream.git
3
3
Fork 1
Code Issues Releases Wiki Activity

Merge 258259f7c1 into db2bf5e7be

This commit is contained in:
KingLucius 2024-05-19 17:53:14 +02:00 committed by GitHub
parent db2bf5e7be 258259f7c1
commit b14aa965c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
View File

@ -703,7 +703,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
playerCenterMenu.isGone = isGone
playerLock.isGone = !isShowing
//player_media_route_button?.isClickable = !isGone
playerGoBackHolder.isGone = isGone
playerGoBackHolder.isGone = isGone || isLayout(TV or EMULATOR)
playerSourcesBtt.isGone = isGone
playerSkipEpisode.isClickable = !isGone
}

4
app/src/main/res/layout/fragment_player_tv.xml
View File

@ -48,8 +48,6 @@
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusLeft="@id/player_loading_go_back"
android:nextFocusUp="@id/player_loading_go_back"
android:text="@string/skip_loading"
android:visibility="gone"
@ -62,11 +60,13 @@
android:layout_height="50dp"
android:layout_gravity="center" />
<!-- Hide the back button for now maybe we need it later -->
<FrameLayout
android:id="@+id/video_go_back_holder_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

32
app/src/main/res/layout/player_custom_layout_tv.xml
View File

@ -240,7 +240,7 @@
android:id="@+id/player_video_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:gravity="center"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
@ -250,25 +250,28 @@
android:id="@+id/player_video_title_rez"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:gravity="center"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="1920x1080" />
<FrameLayout
android:id="@+id/player_episode_filler_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="2dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/player_episode_filler"
style="@style/SmallBlackButton"
android:text="@string/filler" />
</FrameLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/player_episode_filler_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="20dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/player_episode_filler"
style="@style/SmallBlackButton"
android:focusable="false"
android:text="@string/filler" />
</FrameLayout>
<!-- Removed as it has no use anymore-->
<!--<androidx.mediarouter.app.MediaRouteButton
android:id="@+id/player_media_route_button"
@ -281,11 +284,13 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />-->
<!-- Hide the back button for now maybe we need it later -->
<FrameLayout
android:id="@+id/player_go_back_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -306,6 +311,7 @@
android:clickable="true"
android:contentDescription="@string/go_back_img_des"
android:focusable="true"
android:visibility="gone"
android:tag="@string/tv_no_focus_tag" />
</FrameLayout>
</FrameLayout>