recloudstream/cloudstream
3
3
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases Wiki Activity

refact: fixing code and git

Browse source
This commit is contained in:
int3debug 2024-08-06 17:41:29 +02:00
parent c42f256759
commit 5b3254cc31
8 changed files with 22 additions and 30 deletions

4
app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
View file

@ -485,13 +485,11 @@ abstract class AbstractPlayerFragment(
)
if (player is CS3IPlayer) {
val ctx = context ?: return
// preview bar
val progressBar: PreviewTimeBar? = playerView?.findViewById(R.id.exo_progress)
val previewImageView: ImageView? = playerView?.findViewById(R.id.previewImageView)
val previewFrameLayout: FrameLayout? = playerView?.findViewById(R.id.previewFrameLayout)
val previewSeekThumb = PreferenceManager.getDefaultSharedPreferences(ctx)?.getBoolean(ctx.getString(R.string.preview_seekbar_key),false) == true
if (progressBar != null && previewImageView != null && previewFrameLayout != null && previewSeekThumb) {
if (progressBar != null && previewImageView != null && previewFrameLayout != null) {
var resume = false
progressBar.addOnScrubListener(object : PreviewBar.OnScrubListener {
override fun onScrubStart(previewBar: PreviewBar?) {

9
app/src/main/java/com/lagradost/cloudstream3/ui/player/PreviewGenerator.kt
View file

@ -8,6 +8,9 @@ import android.os.Build
import android.util.Log
import androidx.annotation.WorkerThread
import androidx.core.graphics.scale
import androidx.preference.PreferenceManager
import com.lagradost.cloudstream3.AcraApplication
import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.mvvm.logError
import com.lagradost.cloudstream3.ui.settings.Globals.TV
import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
@ -62,8 +65,12 @@ interface IPreviewGenerator {
companion object {
fun new(): IPreviewGenerator {
val userDisabled = AcraApplication.context?.let { ctx ->
PreferenceManager.getDefaultSharedPreferences(ctx)?.getBoolean(
ctx.getString(R.string.preview_seekbar_key), true) == false
} ?: false
/** because TV has low ram + not show we disable this for now */
return if (isLayout(TV)) {
return if (isLayout(TV) || userDisabled) {
empty()
} else {
PreviewGenerator()

3
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
View file

@ -41,7 +41,8 @@ class SettingsPlayer : PreferenceFragmentCompat() {
listOf(
R.string.pref_category_gestures_key,
R.string.rotate_video_key,
R.string.auto_rotate_video_key
R.string.auto_rotate_video_key,
R.string.preview_seekbar_key
),
TV or EMULATOR
)

4
app/src/debug/res/drawable/preview_seekbar_icon.xml → app/src/main/res/drawable/preview_seekbar_24.xml
View file

@ -5,6 +5,6 @@
android:viewportHeight="960"
android:tint="?attr/white">
<path
android:fillColor="@android:color/white"
android:pathData="m480,540 l240,-160 -240,-160v320ZM508,760h224q-7,26 -24,42t-44,20L228,875q-33,5 -59.5,-15.5T138,806L85,369q-4,-33 16,-59t53,-30l46,-6v80l-36,5 54,437 290,-36ZM360,680q-33,0 -56.5,-23.5T280,600v-440q0,-33 23.5,-56.5T360,80h440q33,0 56.5,23.5T880,160v440q0,33 -23.5,56.5T800,680L360,680ZM360,600h440v-440L360,160v440ZM580,380ZM218,796Z"/>
android:pathData="m480,540 l240,-160 -240,-160v320ZM508,760h224q-7,26 -24,42t-44,20L228,875q-33,5 -59.5,-15.5T138,806L85,369q-4,-33 16,-59t53,-30l46,-6v80l-36,5 54,437 290,-36ZM360,680q-33,0 -56.5,-23.5T280,600v-440q0,-33 23.5,-56.5T360,80h440q33,0 56.5,23.5T880,160v440q0,33 -23.5,56.5T800,680L360,680ZM360,600h440v-440L360,160v440ZM580,380ZM218,796Z"
android:fillColor="@android:color/white"/>
</vector>

10
app/src/main/res/drawable/preview_seekbar_icon.xml
View file

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/white">
<path
android:fillColor="@android:color/white"
android:pathData="m480,540 l240,-160 -240,-160v320ZM508,760h224q-7,26 -24,42t-44,20L228,875q-33,5 -59.5,-15.5T138,806L85,369q-4,-33 16,-59t53,-30l46,-6v80l-36,5 54,437 290,-36ZM360,680q-33,0 -56.5,-23.5T280,600v-440q0,-33 23.5,-56.5T360,80h440q33,0 56.5,23.5T880,160v440q0,33 -23.5,56.5T800,680L360,680ZM360,600h440v-440L360,160v440ZM580,380ZM218,796Z"/>
</vector>

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

@ -811,7 +811,7 @@
<string name="sort_release_date_old">Release Date (Old to New)</string>
<string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
<string name="hide_player_control_names">Hide names of the player\'s controls</string>
<string name="preview_seekbar_key" translatable="false">preview_seekbar_key</string>
<string name="preview_seekbar">Seekbar preview</string>
<string name="preview_seekbar_desc">Enable preview thumbnail on seekbar</string>
<string name="preview_seekbar_key">false</string>
</resources>

10
app/src/main/res/xml/settings_player.xml
View file

@ -99,9 +99,15 @@
android:summary="@string/rotate_video_desc"
app:key="@string/rotate_video_key" />
<SwitchPreference
android:icon="@drawable/preview_seekbar_icon"
android:title="@string/preview_seekbar"
android:icon="@drawable/screen_rotation"
android:title="@string/auto_rotate_video"
app:defaultValue="false"
android:summary="@string/auto_rotate_video_desc"
app:key="@string/auto_rotate_video_key" />
<SwitchPreference
android:icon="@drawable/preview_seekbar_24"
android:title="@string/preview_seekbar"
app:defaultValue="true"
android:summary="@string/preview_seekbar_desc"
app:key="@string/preview_seekbar_key" />
</PreferenceCategory>

10
app/src/prerelease/res/drawable/preview_seekbar_icon.xml
View file

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/white">
<path
android:fillColor="@android:color/white"
android:pathData="m480,540 l240,-160 -240,-160v320ZM508,760h224q-7,26 -24,42t-44,20L228,875q-33,5 -59.5,-15.5T138,806L85,369q-4,-33 16,-59t53,-30l46,-6v80l-36,5 54,437 290,-36ZM360,680q-33,0 -56.5,-23.5T280,600v-440q0,-33 23.5,-56.5T360,80h440q33,0 56.5,23.5T880,160v440q0,33 -23.5,56.5T800,680L360,680ZM360,600h440v-440L360,160v440ZM580,380ZM218,796Z"/>
</vector>