mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-09-26 11:19:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

Browse source
This commit is contained in:
Kelvin K 2025-06-18 16:22:51 +02:00
commit 44ff951ec6
5 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/com/futo/platformplayer/Settings.kt
View file

@ -587,18 +587,19 @@ class Settings : FragmentedStorageFileJson() {
@FormField(R.string.hold_playback_speed, FieldForm.DROPDOWN, R.string.hold_playback_speed_description, 27) @FormField(R.string.hold_playback_speed, FieldForm.DROPDOWN, R.string.hold_playback_speed_description, 27)
@DropdownFieldOptionsId(R.array.hold_playback_speeds) @DropdownFieldOptionsId(R.array.hold_playback_speeds)
var holdPlaybackSpeed: Int = 3; var holdPlaybackSpeed: Int = 4;
fun getHoldPlaybackSpeed(): Double { fun getHoldPlaybackSpeed(): Double {
return when(holdPlaybackSpeed) { return when(holdPlaybackSpeed) {
0 -> 1.25 0 -> 1.0
1 -> 1.5 1 -> 1.25
2 -> 1.75 2 -> 1.5
3 -> 2.0 3 -> 1.75
4 -> 2.25 4 -> 2.0
5 -> 2.5 5 -> 2.25
6 -> 2.75 6 -> 2.5
7 -> 3.0 7 -> 2.75
8 -> 3.0
else -> 2.0 else -> 2.0
} }
} }

2
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ChannelFragment.kt
View file

@ -172,7 +172,7 @@ class ChannelFragment : MainFragment() {
_buttonSubscribe = findViewById(R.id.button_subscribe) _buttonSubscribe = findViewById(R.id.button_subscribe)
_buttonSubscriptionSettings = findViewById(R.id.button_sub_settings) _buttonSubscriptionSettings = findViewById(R.id.button_sub_settings)
_overlayLoading = findViewById(R.id.channel_loading_overlay) _overlayLoading = findViewById(R.id.channel_loading_overlay)
_overlayLoadingSpinner = findViewById(R.id.channel_loader) _overlayLoadingSpinner = findViewById(R.id.channel_loader_frag)
_overlayContainer = findViewById(R.id.overlay_container) _overlayContainer = findViewById(R.id.overlay_container)
_buttonSubscribe.onSubscribed.subscribe { _buttonSubscribe.onSubscribed.subscribe {
UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer) UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer)

3
app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt
View file

@ -240,7 +240,8 @@ class GestureControlView : LinearLayout {
&& !_adjustingFullscreenUp && !_adjustingFullscreenUp
&& !_adjustingFullscreenDown && !_adjustingFullscreenDown
&& !_isPanning && !_isPanning
&& !_isZooming) { && !_isZooming
&& Settings.instance.playback.getHoldPlaybackSpeed() > 1.0) {
_speedHolding = true _speedHolding = true
showHoldSpeedControls() showHoldSpeedControls()
onSpeedHoldStart.emit() onSpeedHoldStart.emit()

2
app/src/main/res/layout/fragment_channel.xml
View file

@ -173,7 +173,7 @@
android:background="#77000000" android:background="#77000000"
android:gravity="center"> android:gravity="center">
<ImageView <ImageView
android:id="@+id/channel_loader" android:id="@+id/channel_loader_frag"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
app:srcCompat="@drawable/ic_loader_animated" app:srcCompat="@drawable/ic_loader_animated"

1
app/src/main/res/values/strings.xml
View file

@ -1112,6 +1112,7 @@
<item>5.0</item> <item>5.0</item>
</string-array> </string-array>
<string-array name="hold_playback_speeds"> <string-array name="hold_playback_speeds">
<item>Disabled</item>
<item>1.25</item> <item>1.25</item>
<item>1.5</item> <item>1.5</item>
<item>1.75</item> <item>1.75</item>