mirror of
https://github.com/recloudstream/cloudstream.git
synced 2024-08-15 01:53:11 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
1b396b0bd0
2 changed files with 7 additions and 6 deletions
|
@ -226,7 +226,7 @@ open class FullScreenPlayer : AbstractPlayerFragment(R.layout.fragment_player) {
|
|||
private fun setPlayBackSpeed(speed: Float) {
|
||||
try {
|
||||
setKey(PLAYBACK_SPEED_KEY, speed)
|
||||
playback_speed_btt?.text =
|
||||
player_speed_btt?.text =
|
||||
getString(R.string.player_speed_text_format).format(speed)
|
||||
.replace(".0x", "x")
|
||||
} catch (e: Exception) {
|
||||
|
@ -989,7 +989,8 @@ open class FullScreenPlayer : AbstractPlayerFragment(R.layout.fragment_player) {
|
|||
// settingsManager.getBoolean(ctx.getString(R.string.use_system_brightness_key), false)
|
||||
}
|
||||
|
||||
playback_speed_btt?.isVisible = playBackSpeedEnabled
|
||||
player_speed_btt?.isVisible = playBackSpeedEnabled
|
||||
player_resize_btt?.isVisible = playerResizeEnabled
|
||||
} catch (e: Exception) {
|
||||
logError(e)
|
||||
}
|
||||
|
@ -1005,7 +1006,7 @@ open class FullScreenPlayer : AbstractPlayerFragment(R.layout.fragment_player) {
|
|||
nextResize()
|
||||
}
|
||||
|
||||
playback_speed_btt?.setOnClickListener {
|
||||
player_speed_btt?.setOnClickListener {
|
||||
autoHide()
|
||||
showSpeedDialog()
|
||||
}
|
||||
|
|
|
@ -483,12 +483,12 @@
|
|||
style="@style/VideoButton"
|
||||
android:nextFocusLeft="@id/player_lock"
|
||||
|
||||
android:nextFocusRight="@id/playback_speed_btt"
|
||||
android:nextFocusRight="@id/player_speed_btt"
|
||||
android:text="@string/video_aspect_ratio_resize"
|
||||
app:icon="@drawable/ic_baseline_aspect_ratio_24" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/playback_speed_btt"
|
||||
android:id="@+id/player_speed_btt"
|
||||
style="@style/VideoButton"
|
||||
android:nextFocusLeft="@id/player_resize_btt"
|
||||
|
||||
|
@ -499,7 +499,7 @@
|
|||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/player_sources_btt"
|
||||
style="@style/VideoButton"
|
||||
android:nextFocusLeft="@id/playback_speed_btt"
|
||||
android:nextFocusLeft="@id/player_speed_btt"
|
||||
|
||||
android:nextFocusRight="@id/player_skip_op"
|
||||
android:text="@string/video_source"
|
||||
|
|
Loading…
Reference in a new issue