mirror of
https://github.com/libre-tube/LibreTube.git
synced 2024-12-13 22:00:30 +05:30
initial structure for prev and next buttons
This commit is contained in:
parent
67132a92d6
commit
27fcf05347
@ -164,6 +164,7 @@ class PlayerFragment : BaseFragment() {
|
||||
private var defaultSubtitleCode = ""
|
||||
private var sponsorBlockEnabled = true
|
||||
private var sponsorBlockNotifications = true
|
||||
private var skipButtonsEnabled = false
|
||||
|
||||
/**
|
||||
* for autoplay
|
||||
@ -204,7 +205,7 @@ class PlayerFragment : BaseFragment() {
|
||||
|
||||
setUserPrefs()
|
||||
|
||||
if (autoplayEnabled == true) playerBinding.autoplayIV.setImageResource(R.drawable.ic_toggle_on)
|
||||
if (autoplayEnabled) playerBinding.autoplayIV.setImageResource(R.drawable.ic_toggle_on)
|
||||
|
||||
val mainActivity = activity as MainActivity
|
||||
if (autoRotationEnabled) {
|
||||
@ -314,6 +315,11 @@ class PlayerFragment : BaseFragment() {
|
||||
if (defaultSubtitleCode.contains("-")) {
|
||||
defaultSubtitleCode = defaultSubtitleCode.split("-")[0]
|
||||
}
|
||||
|
||||
skipButtonsEnabled = PreferenceHelper.getBoolean(
|
||||
PreferenceKeys.SKIP_BUTTONS,
|
||||
false
|
||||
)
|
||||
}
|
||||
|
||||
private fun initializeTransitionLayout() {
|
||||
@ -882,7 +888,7 @@ class PlayerFragment : BaseFragment() {
|
||||
}
|
||||
|
||||
// duration that's not greater than 0 indicates that the video is live
|
||||
if (!(response.duration!! > 0)) {
|
||||
if (response.duration!! <= 0) {
|
||||
isLive = true
|
||||
handleLiveVideo()
|
||||
}
|
||||
@ -1052,6 +1058,14 @@ class PlayerFragment : BaseFragment() {
|
||||
Toast.makeText(context, R.string.login_first, Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
|
||||
// next and previous buttons
|
||||
playerBinding.next.visiblity = if (skipButtonsEnabled) View.VISIBLE else View.INVISIBLE
|
||||
playerBinding.next.visibility = if (skipButtonsEnabled) View.VISIBLE else View.INVISIBLE
|
||||
|
||||
playerBinding.next.setOnClickListener {
|
||||
playNextVideo()
|
||||
}
|
||||
}
|
||||
|
||||
private fun enableDoubleTapToSeek() {
|
||||
|
@ -58,6 +58,7 @@ object PreferenceKeys {
|
||||
const val PLAYER_AUDIO_FORMAT = "player_audio_format"
|
||||
const val PLAYER_AUDIO_QUALITY = "player_audio_quality"
|
||||
const val DEFAULT_SUBTITLE = "default_subtitle"
|
||||
const val SKIP_BUTTONS = "skip_buttons"
|
||||
|
||||
/**
|
||||
* Download
|
||||
|
10
app/src/main/res/drawable/ic_next.xml
Normal file
10
app/src/main/res/drawable/ic_next.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="?attr/colorControlNormal"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
|
||||
</vector>
|
10
app/src/main/res/drawable/ic_prev.xml
Normal file
10
app/src/main/res/drawable/ic_prev.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="?attr/colorControlNormal"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />
|
||||
</vector>
|
@ -19,7 +19,6 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginStart="30dp"
|
||||
android:visibility="invisible">
|
||||
|
||||
<ImageView
|
||||
@ -61,7 +60,6 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginEnd="30dp"
|
||||
android:visibility="invisible">
|
||||
|
||||
<ImageView
|
||||
|
@ -291,12 +291,28 @@
|
||||
android:gravity="center"
|
||||
android:padding="20dp">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/skip_prev"
|
||||
style="@style/PlayerControlCenter"
|
||||
android:background="?android:selectableItemBackgroundBorderless"
|
||||
android:src="@drawable/ic_prev"
|
||||
android:visibility="invisible"
|
||||
app:tint="@android:color/white" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@id/exo_play_pause"
|
||||
style="@style/ExoStyledControls.Button.Center.PlayPause"
|
||||
android:background="?android:selectableItemBackgroundBorderless"
|
||||
app:tint="@android:color/white" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/skip_next"
|
||||
style="@style/PlayerControlCenter"
|
||||
android:background="?android:selectableItemBackgroundBorderless"
|
||||
android:src="@drawable/ic_next"
|
||||
android:visibility="invisible"
|
||||
app:tint="@android:color/white" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</merge>
|
@ -292,4 +292,6 @@
|
||||
<string name="downloadsucceeded">Download succeeded</string>
|
||||
<string name="share_with_time">Share with start time</string>
|
||||
<string name="export_subscriptions">Export Subscriptions</string>
|
||||
<string name="skip_buttons">Skip buttons</string>
|
||||
<string name="skip_buttons_summary">Show buttons to skip to the next or previous video.</string>
|
||||
</resources>
|
||||
|
@ -107,6 +107,14 @@
|
||||
|
||||
</style>
|
||||
|
||||
<style name="PlayerControlCenter">
|
||||
<item name="android:layout_width">42dp</item>
|
||||
<item name="android:layout_height">42dp</item>
|
||||
<item name="android:backgroundTint">@android:color/white</item>
|
||||
<item name="android:layout_marginStart">10dp</item>
|
||||
<item name="android:layout_marginEnd">10dp</item>
|
||||
</style>
|
||||
|
||||
<style name="PlayerControlTop">
|
||||
|
||||
<item name="android:padding">9dp</item>
|
||||
|
@ -77,6 +77,13 @@
|
||||
app:key="default_subtitle"
|
||||
app:title="@string/default_subtitle_language" />
|
||||
|
||||
<SwitchPreferenceCompat
|
||||
android:defaultValue="false"
|
||||
android:icon="@drawable/ic_next"
|
||||
android:summary="@string/skip_buttons_summary"
|
||||
app:key="skip_buttons"
|
||||
app:title="@string/skip_buttons" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory app:title="@string/behavior">
|
||||
|
Loading…
Reference in New Issue
Block a user