Compare commits

...

7 Commits

Author SHA1 Message Date
Kelvin K f2efc603ba Legacy text rendering for subtitles 2025-11-27 11:12:40 -06:00
Kelvin K efe074d272 menu bar contrast removal 2025-11-27 10:38:19 -06:00
Kelvin K 8a9efd3a0f Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay 2025-11-27 10:30:09 -06:00
Kelvin K 251302b9c3 Fix back behavior for Android 16 2025-11-27 10:29:55 -06:00
Koen J 5cdac1405e Reverted javet for compat with android 9. 2025-11-27 17:08:27 +01:00
Koen J 565ea7cb8b Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay 2025-11-27 13:41:55 +01:00
Koen J 9fa3e22d2e Crash fixes related to remoteLast. 2025-11-27 13:41:21 +01:00
7 changed files with 45 additions and 8 deletions
+1 -1
View File
@@ -181,7 +181,7 @@ dependencies {
implementation 'com.google.code.gson:gson:2.13.2' //Used for complex/anonymous cases like during development conversions (eg. V8RemoteObject)
//JS
implementation 'com.caoccao.javet:javet-v8-android:5.0.1'
implementation 'com.caoccao.javet:javet-v8-android:4.1.5'
//Exoplayer
implementation 'androidx.media3:media3-exoplayer:1.8.0'
+2
View File
@@ -29,6 +29,8 @@
android:supportsRtl="true"
android:theme="@style/Theme.FutoVideo"
android:usesCleartextTraffic="true"
tools:replace="android:enableOnBackInvokedCallback"
android:enableOnBackInvokedCallback="false"
tools:targetApi="31"
android:largeHeap="true">
<provider
@@ -8,6 +8,7 @@ import android.content.Intent
import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import android.content.pm.PackageManager
import android.content.res.Configuration
import android.graphics.Color
import android.net.Uri
import android.os.Build
import android.os.Bundle
@@ -332,6 +333,10 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
}
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
window.isNavigationBarContrastEnforced = false
}
//Preload common files to memory
FragmentedStorage.get<SubscriptionStorage>();
FragmentedStorage.get<Settings>();
@@ -124,11 +124,10 @@ class LibraryFilesFragment : MainFragment() {
}
}
fun leaveDirectory() {
if(navStack.size > 1) {
navStack.removeLast();
openDirectory(navStack.last());
if (navStack.size > 1) {
navStack.removeAt(navStack.size - 1)
openDirectory(navStack.last())
}
else {}
}
fun openDirectory(stack: FileStack, addToStack: Boolean = false) {
if(addToStack)
@@ -21,7 +21,7 @@ class StateAssets {
if(part == "." || part == "..") {
if(parentAllowance <= 0)
throw IllegalStateException("Path [${path}] attempted to escape path..");
parts1.removeLast();
parts1.removeAt(parts1.size - 1);
toSkip++;
}
else
@@ -1,17 +1,22 @@
package com.futo.platformplayer.states
import android.content.Context
import android.os.Looper
import android.util.Log
import androidx.annotation.OptIn
import androidx.media3.common.C
import androidx.media3.common.util.UnstableApi
import androidx.media3.exoplayer.DefaultLoadControl
import androidx.media3.exoplayer.DefaultRenderersFactory
import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.exoplayer.Renderer
import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
import androidx.media3.exoplayer.text.TextOutput
import androidx.media3.exoplayer.text.TextRenderer
import androidx.media3.exoplayer.upstream.DefaultAllocator
import com.futo.platformplayer.R
import com.futo.platformplayer.Settings
import com.futo.platformplayer.UIDialogs
import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
import com.futo.platformplayer.api.media.models.video.IPlatformVideo
import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
@@ -21,8 +26,10 @@ import com.futo.platformplayer.logging.Logger
import com.futo.platformplayer.models.Playlist
import com.futo.platformplayer.services.MediaPlaybackService
import com.futo.platformplayer.video.PlayerManager
import com.google.common.collect.Iterables
import kotlin.random.Random
/***
* Used to keep track of queue and other player related stuff
*/
@@ -662,6 +669,30 @@ class StatePlayer {
@OptIn(UnstableApi::class)
private fun createExoPlayer(context : Context): ExoPlayer {
return ExoPlayer.Builder(context)
.setRenderersFactory(
object : DefaultRenderersFactory(context) {
override fun buildTextRenderers(
context: Context,
output: TextOutput,
outputLooper: Looper,
extensionRendererMode: Int,
out: java.util.ArrayList<Renderer>
) {
super.buildTextRenderers(
context,
output,
outputLooper,
extensionRendererMode,
out
)
(Iterables.getLast<Renderer?>(out) as TextRenderer)
.experimentalSetLegacyDecodingEnabled(true)
}
})
.setMediaSourceFactory(
DefaultMediaSourceFactory(context)
.experimentalParseSubtitlesDuringExtraction(false)
)
.setLoadControl(
DefaultLoadControl.Builder()
.setAllocator(DefaultAllocator(true, BUFFER_SIZE))
@@ -11,7 +11,7 @@ class SearchHistoryStorage : FragmentedStorageFileJson() {
if (!lastQueries.contains(text)) {
lastQueries.add(0, text);
if (lastQueries.size > 10)
lastQueries.removeLast();
lastQueries.removeAt(lastQueries.size - 1);
}
else {
lastQueries.remove(text);