Skip to content

Commit 192329a

Browse files
BnyroBnyro
committed
feat(ui): improve appearance of video player info
1 parent b0d3731 commit 192329a

5 files changed

Lines changed: 49 additions & 85 deletions

File tree

‎app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -444,12 +444,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
444444
start()
445445
}
446446
}
447-
playerBinding?.playerVideoTitleRez?.let {
448-
ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
449-
duration = 200
450-
start()
451-
}
452-
}
447+
453448
playerBinding?.playerVideoInfo?.let {
454449
ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
455450
duration = 200
@@ -1005,7 +1000,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
10051000
// video_bar.startAnimation(fadeAnimation)
10061001

10071002
// TITLE
1008-
playerVideoTitleRez.startAnimation(fadeAnimation)
10091003
playerVideoInfo.startAnimation(fadeAnimation)
10101004
playerEpisodeFiller.startAnimation(fadeAnimation)
10111005
playerVideoTitleHolder.startAnimation(fadeAnimation)
@@ -2653,4 +2647,4 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
26532647
.start()
26542648
}
26552649
}
2656-
}
2650+
}

‎app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ class GeneratorPlayer : FullScreenPlayer() {
514514
}
515515
// setEpisodes(viewModel.getAllMeta() ?: emptyList())
516516
isActive = true
517-
setPlayerDimen(null)
517+
updatePlayerInfo(reset = true)
518518
setTitle()
519519
if (!sameEpisode)
520520
hasRequestedStamps = false
@@ -1679,7 +1679,7 @@ class GeneratorPlayer : FullScreenPlayer() {
16791679

16801680
return sortSubs(subtitles).firstOrNull { it.matchesLanguageCode(langCode) }
16811681
}
1682-
1682+
16831683
private fun autoSelectFromSettings(): Boolean {
16841684
// auto select subtitle based on settings
16851685
val langCode = preferredAutoSelectSubtitles
@@ -1812,33 +1812,26 @@ class GeneratorPlayer : FullScreenPlayer() {
18121812
playerBinding?.offlinePin?.isVisible = lastUsedGenerator is DownloadFileGenerator
18131813
}
18141814

1815-
@SuppressLint("SetTextI18n")
1816-
fun setPlayerDimen(widthHeight: Pair<Int, Int>?) {
1817-
val resolution = widthHeight?.let { "${it.first}x${it.second}" }
1818-
val name = currentSelectedLink?.first?.name ?: currentSelectedLink?.second?.name
1819-
val title = getHeaderName()
1820-
1821-
val result = listOfNotNull(
1822-
title?.takeIf { showTitle && it.isNotBlank() },
1823-
name?.takeIf { showName && it.isNotBlank() },
1824-
resolution?.takeIf { showResolution && it.isNotBlank() },
1825-
).joinToString(" - ")
1826-
1827-
playerBinding?.playerVideoTitleRez?.apply {
1828-
text = result
1829-
isVisible = result.isNotBlank()
1815+
/**
1816+
* Show the current playback information (e.g. resolution, codec) in the player info text view.
1817+
*
1818+
* If [reset] is set to `true`, the text view will be cleared instead.
1819+
*/
1820+
private fun updatePlayerInfo(reset: Boolean = false) {
1821+
if (reset) {
1822+
playerBinding?.playerVideoInfo?.text = ""
1823+
playerBinding?.playerVideoInfo?.isGone = true
1824+
return
18301825
}
1831-
}
18321826

1833-
private fun updatePlayerInfo() {
18341827
val tracks = player.getVideoTracks()
18351828

18361829
val videoTrack = tracks.currentVideoTrack
18371830
val audioTrack = tracks.currentAudioTrack
18381831

1839-
val ctx = context ?: return
1840-
val prefs = PreferenceManager.getDefaultSharedPreferences(ctx)
1841-
showMediaInfo = prefs.getBoolean(ctx.getString(R.string.show_media_info_key), false)
1832+
val resolution = videoTrack?.let { "${it.width}x${it.height}" }
1833+
val source = currentSelectedLink?.first?.name ?: currentSelectedLink?.second?.name
1834+
val headerName = getHeaderName().orEmpty()
18421835

18431836
val videoCodec = videoTrack?.sampleMimeType?.substringAfterLast('/')?.uppercase()
18441837
val audioCodec = audioTrack?.sampleMimeType?.substringAfterLast('/')?.uppercase()
@@ -1847,17 +1840,22 @@ class GeneratorPlayer : FullScreenPlayer() {
18471840
fromTagToLanguageName(audioTrack?.language)?.let { "[$it]" }
18481841
).joinToString(" ")
18491842

1850-
val stats = arrayOf(videoCodec, audioCodec, language).filter { !it.isNullOrBlank() }.joinToString(" • ")
1843+
val stats = listOfNotNull(
1844+
source.takeIf { showTitle },
1845+
headerName.takeIf { showName },
1846+
resolution.takeIf { showResolution }
1847+
) + arrayOf(videoCodec, audioCodec, language)
1848+
.takeIf { showMediaInfo }.orEmpty()
18511849

18521850
playerBinding?.playerVideoInfo?.apply {
1853-
text = stats
1854-
isVisible = showMediaInfo && stats.isNotBlank()
1851+
text = stats.filter { !it.isNullOrBlank() }.joinToString(" • ")
1852+
isVisible = text.isNotEmpty()
18551853
}
18561854
}
18571855

18581856
override fun playerDimensionsLoaded(width: Int, height: Int) {
18591857
super.playerDimensionsLoaded(width, height)
1860-
setPlayerDimen(width to height)
1858+
updatePlayerInfo()
18611859
}
18621860

18631861
private fun unwrapBundle(savedInstanceState: Bundle?) {
@@ -2047,6 +2045,7 @@ class GeneratorPlayer : FullScreenPlayer() {
20472045

20482046
context?.let { ctx ->
20492047
val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
2048+
showTitle = settingsManager.getBoolean(ctx.getString(R.string.show_title_key), true)
20502049
showName = settingsManager.getBoolean(ctx.getString(R.string.show_name_key), true)
20512050
showResolution = settingsManager.getBoolean(ctx.getString(R.string.show_resolution_key), true)
20522051
showMediaInfo = settingsManager.getBoolean(ctx.getString(R.string.show_media_info_key), false)

‎app/src/main/res/layout/player_custom_layout.xml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -146,25 +146,15 @@
146146
app:layout_constraintLeft_toLeftOf="parent"
147147
app:layout_constraintTop_toTopOf="parent">
148148

149-
<TextView
150-
android:id="@+id/player_video_title_rez"
151-
android:layout_width="match_parent"
152-
android:layout_height="wrap_content"
153-
android:layout_marginBottom="2.5dp"
154-
android:gravity="center"
155-
android:textColor="@color/white"
156-
tools:text="1920x1080" />
157-
158-
159149
<TextView
160150
android:id="@+id/player_video_info"
161151
android:layout_width="match_parent"
162152
android:layout_height="wrap_content"
153+
android:layout_marginBottom="6dp"
163154
android:gravity="center"
164-
android:layout_marginBottom="2.5dp"
165-
android:textColor="@color/white"
166-
android:visibility="gone"
167-
tools:text="HEVC" />
155+
android:textColor="@color/grayTextColor"
156+
android:textSize="12sp"
157+
tools:text="1920x1080 • HDR10 • HEVC" />
168158

169159
<LinearLayout
170160
android:id="@+id/player_video_title_holder"

‎app/src/main/res/layout/player_custom_layout_tv.xml‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -307,30 +307,17 @@
307307
android:layout_gravity="start"/>
308308
</LinearLayout>
309309

310-
<TextView
311-
android:id="@+id/player_video_title_rez"
312-
android:layout_width="wrap_content"
313-
android:layout_height="wrap_content"
314-
android:layout_gravity="end"
315-
android:gravity="end"
316-
android:maxWidth="600dp"
317-
android:textAlignment="viewEnd"
318-
android:textColor="@color/white"
319-
android:textSize="16sp"
320-
tools:text="1920x1080" />
321-
322310
<TextView
323311
android:id="@+id/player_video_info"
324312
android:layout_width="wrap_content"
325313
android:layout_height="wrap_content"
326314
android:layout_marginStart="6dp"
315+
android:layout_marginTop="6dp"
327316
android:layout_marginBottom="2.5dp"
328317
android:layout_gravity="end"
329-
android:textColor="#B3FFFFFF"
330-
android:textSize="16sp"
331-
android:visibility="gone"
332-
tools:text="HEVC • English • 5.1 • E-AC3" />
333-
318+
android:textColor="@color/white"
319+
android:textSize="12sp"
320+
tools:text="1920x1080 • HDR10 • HEVC" />
334321

335322
<FrameLayout
336323
android:id="@+id/player_episode_filler_holder"
@@ -1076,4 +1063,4 @@
10761063
</androidx.recyclerview.widget.RecyclerView>
10771064
</LinearLayout>
10781065

1079-
</FrameLayout>
1066+
</FrameLayout>

‎app/src/main/res/layout/trailer_custom_layout.xml‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
android:id="@+id/player_top_holder"
8787
android:layout_width="match_parent"
8888
android:layout_height="match_parent"
89-
android:visibility="gone">
89+
>
9090

9191
<LinearLayout
9292
android:layout_width="match_parent"
@@ -96,6 +96,17 @@
9696
android:layout_marginEnd="32dp"
9797
android:orientation="vertical">
9898

99+
<TextView
100+
android:id="@+id/player_video_info"
101+
android:layout_width="match_parent"
102+
android:layout_height="wrap_content"
103+
android:gravity="center"
104+
android:layout_marginBottom="6dp"
105+
android:textColor="@color/grayTextColor"
106+
android:textSize="12sp"
107+
android:ellipsize="end"
108+
tools:text="1920x1080 • HDR10 • HEVC" />
109+
99110
<LinearLayout
100111
android:id="@+id/player_video_title_holder"
101112
android:layout_width="match_parent"
@@ -111,16 +122,7 @@
111122
android:textSize="16sp"
112123
android:textStyle="bold"
113124
tools:text="Hello world" />
114-
<TextView
115-
android:id="@+id/player_video_info"
116-
android:layout_width="wrap_content"
117-
android:layout_height="wrap_content"
118-
android:layout_marginStart="6dp"
119-
android:layout_marginBottom="2.5dp"
120-
android:textColor="@color/white"
121-
android:textSize="10sp"
122-
android:visibility="gone"
123-
tools:text="HDR10 • HEVC" />
125+
124126
<ImageView
125127
android:id="@+id/offline_pin"
126128
android:layout_width="16dp"
@@ -131,14 +133,6 @@
131133
tools:visibility="visible"
132134
android:layout_gravity="center"/>
133135
</LinearLayout>
134-
<TextView
135-
android:id="@+id/player_video_title_rez"
136-
android:layout_width="match_parent"
137-
android:layout_height="wrap_content"
138-
android:gravity="end"
139-
android:textColor="@color/white"
140-
android:textSize="16sp"
141-
tools:text="1920x1080" />
142136

143137
<FrameLayout
144138
android:id="@+id/player_episode_filler_holder"

0 commit comments

Comments
 (0)