make it so that the video gets prepped even in background audio mode so that it's possible to switch to video mode later on

Changelog: changed

.gitattributes

@@ -1,6 +1,2 @@
 aar/* filter=lfs diff=lfs merge=lfs -text
 app/aar/* filter=lfs diff=lfs merge=lfs -text
-app/src/main/jniLibs/arm64-v8a filter=lfs diff=lfs merge=lfs -text
-app/src/main/jniLibs/armeabi-v7a filter=lfs diff=lfs merge=lfs -text
-app/src/main/jniLibs/x86 filter=lfs diff=lfs merge=lfs -text
-app/src/main/jniLibs/x86_64 filter=lfs diff=lfs merge=lfs -text

.gitmodules

@@ -64,6 +64,12 @@
 [submodule "app/src/stable/assets/sources/bilibili"]
 	path = app/src/stable/assets/sources/bilibili
 	url = ../plugins/bilibili.git
+[submodule "app/src/stable/assets/sources/spotify"]
+	path = app/src/stable/assets/sources/spotify
+	url = ../plugins/spotify.git
+[submodule "app/src/unstable/assets/sources/spotify"]
+	path = app/src/unstable/assets/sources/spotify
+	url = ../plugins/spotify.git
 [submodule "app/src/stable/assets/sources/bitchute"]
 	path = app/src/stable/assets/sources/bitchute
 	url = ../plugins/bitchute.git

app/aar/ffmpeg-kit-full-6.0-2.LTS.aar

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea10d3c5562c9f449a4e89e9c3dfcf881ed79a952f3409bc005bcc62c2cf4b81
+size 65512557

app/aar/ffmpeg-kit.aar

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22c06ca0d1a5808b2fc0a12227d5915b3126bc0b9b1305cf6bab855f2ec6fcbb
-size 36133152

app/build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.21'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.21'
-    id 'org.ajoberstar.grgit' version '5.3.3'
+    id 'org.ajoberstar.grgit' version '5.2.2'
     id 'com.google.protobuf'
     id 'kotlin-parcelize'
     id 'com.google.devtools.ksp'
@@ -39,7 +39,7 @@ protobuf {
 
 android {
     namespace 'com.futo.platformplayer'
-    compileSdk 36
+    compileSdk 34
     flavorDimensions "buildType"
     productFlavors {
         stable {
@@ -97,7 +97,7 @@ android {
 
     defaultConfig {
         minSdk 28
-        targetSdk 36
+        targetSdk 34
         versionCode gitVersionCode
         versionName gitVersionName
 
@@ -146,7 +146,6 @@ android {
     }
     sourceSets {
         main {
-            jniLibs.srcDirs = ['src/main/jniLibs']
             assets {
                 srcDirs 'src/main/assets', 'src/tests/assets', 'src/test/assets'
             }
@@ -155,85 +154,81 @@ android {
 }
 
 dependencies {
-    //implementation 'com.google.dagger:dagger:2.48'
+    implementation 'com.google.dagger:dagger:2.48'
-    implementation 'androidx.test:monitor:1.8.0'
+    implementation 'androidx.test:monitor:1.7.2'
-    implementation 'com.google.android.material:material:1.13.0'
+    implementation 'com.google.android.material:material:1.12.0'
-    //annotationProcessor 'com.google.dagger:dagger-compiler:2.48'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.48'
 
     //Core
-    implementation 'androidx.core:core-ktx:1.17.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+    implementation 'com.google.android.material:material:1.11.0'
-    implementation 'androidx.documentfile:documentfile:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     //Images
-    annotationProcessor 'com.github.bumptech.glide:compiler:5.0.5'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
-    implementation 'com.github.bumptech.glide:glide:5.0.5'
+    implementation 'com.github.bumptech.glide:glide:4.16.0'
 
     //Async
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
 
     //HTTP
-    implementation "com.squareup.okhttp3:okhttp:5.3.0"
+    implementation "com.squareup.okhttp3:okhttp:4.11.0"
 
     //JSON
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" //Used for structured json
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2" //Used for structured json
-    implementation 'com.google.code.gson:gson:2.13.2' //Used for complex/anonymous cases like during development conversions (eg. V8RemoteObject)
+    implementation 'com.google.code.gson:gson:2.10.1' //Used for complex/anonymous cases like during development conversions (eg. V8RemoteObject)
 
     //JS
-    implementation 'com.caoccao.javet:javet-v8-android:4.1.5'
+    implementation("com.caoccao.javet:javet-android:3.0.2")
+    //implementation 'com.caoccao.javet:javet-v8-android:4.1.4' //Change after extensive testing the freezing edge cases are solved.
 
     //Exoplayer
-    implementation 'androidx.media3:media3-exoplayer:1.8.0'
+    implementation 'androidx.media3:media3-exoplayer:1.2.1'
-    implementation 'androidx.media3:media3-exoplayer-dash:1.8.0'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.2.1'
-    implementation 'androidx.media3:media3-ui:1.8.0'
+    implementation 'androidx.media3:media3-ui:1.2.1'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.8.0'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.2.1'
-    implementation 'androidx.media3:media3-exoplayer-rtsp:1.8.0'
+    implementation 'androidx.media3:media3-exoplayer-rtsp:1.2.1'
-    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.8.0'
+    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.2.1'
-    implementation 'androidx.media3:media3-transformer:1.8.0'
+    implementation 'androidx.media3:media3-transformer:1.2.1'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.6'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.9.6'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'
-    implementation 'androidx.media:media:1.7.1'
+    implementation 'androidx.media:media:1.7.0'
 
     //Other
-    implementation 'org.jsoup:jsoup:1.21.2'
+    implementation 'org.jsoup:jsoup:1.15.3'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation fileTree(dir: 'aar', include: ['*.aar'])
     implementation 'com.arthenica:smart-exception-java:0.2.1'
-    implementation 'org.jetbrains.kotlin:kotlin-reflect:2.2.0'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.0'
     implementation 'com.github.dhaval2404:imagepicker:2.1'
-    implementation 'com.google.zxing:core:3.5.3'
+    implementation 'com.google.zxing:core:3.4.1'
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
     implementation 'com.caverock:androidsvg-aar:1.4'
 
     //Protobuf
-    implementation 'com.google.protobuf:protobuf-javalite:4.33.0'
+    implementation 'com.google.protobuf:protobuf-javalite:3.25.1'
 
     implementation 'com.polycentric.core:app:1.0'
     implementation 'com.futo.futopay:app:1.0'
-    implementation 'androidx.work:work-runtime-ktx:2.11.0'
+    implementation 'androidx.work:work-runtime-ktx:2.9.0'
-    implementation 'androidx.concurrent:concurrent-futures-ktx:1.3.0'
+    implementation 'androidx.concurrent:concurrent-futures-ktx:1.1.0'
 
     //Database
-    implementation("androidx.room:room-runtime:2.8.3")
+    implementation("androidx.room:room-runtime:2.6.1")
-    ksp("androidx.room:room-compiler:2.8.3")
+    annotationProcessor("androidx.room:room-compiler:2.6.1")
-    implementation("androidx.room:room-ktx:2.8.3")
+    ksp("androidx.room:room-compiler:2.6.1")
+    implementation("androidx.room:room-ktx:2.6.1")
 
     //Payment
-    implementation 'com.stripe:stripe-android:22.0.0'
+    implementation 'com.stripe:stripe-android:20.35.1'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
-    testImplementation "org.jetbrains.kotlin:kotlin-test:2.0.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.8.22"
-    testImplementation "org.xmlunit:xmlunit-core:2.11.0"
+    testImplementation "org.xmlunit:xmlunit-core:2.9.1"
-    testImplementation "org.mockito:mockito-core:5.20.0"
+    testImplementation "org.mockito:mockito-core:5.4.0"
-    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-
-    //Rust casting SDK
-    implementation('org.futo.gitlab.videostreaming.fcast-sdk-jitpack:sender-sdk-minimal:0.3.1') {
-        // Polycentricandroid includes this
-        exclude group: 'net.java.dev.jna'
-    }
 }

app/src/main/AndroidManifest.xml

@@ -16,9 +16,6 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS" tools:ignore="ProtectedPermissions"/>
 
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
-    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -29,8 +26,6 @@
         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
@@ -63,7 +58,6 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
             android:exported="true"
             android:theme="@style/Theme.FutoVideo.NoActionBar"
-            android:windowSoftInputMode="adjustPan"
             android:launchMode="singleInstance"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true">
@@ -159,30 +153,30 @@
         </activity>
         <activity
             android:name=".activities.TestActivity"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.SettingsActivity"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.DeveloperActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.ExceptionActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.CaptchaActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.LoginActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.AddSourceActivity"
             android:exported="true"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem">
+            android:theme="@style/Theme.FutoVideo.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -195,62 +189,54 @@
         <activity
             android:name=".activities.AddSourceOptionsActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricHomeActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricBackupActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricCreateProfileActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricProfileActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricWhyActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricImportProfileActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.ManageTabsActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.QRCaptureActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.FCastGuideActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.SyncHomeActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.SyncPairActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.SyncShowPairingCodeActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
-        <activity
-            android:name=".activities.PolycentricModerationActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".activities.QRCodeFullscreenActivity"
-            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
     </application>
 </manifest>

app/src/main/assets/devportal/index.html

@@ -1022,38 +1022,15 @@
 					return x.value
 				});
 
-
-				let settingsToUse = __DEV_SETTINGS ?? {};
-				if (true) {
-                    const settings = this.Plugin?.currentPlugin?.settings;
-                    if (settings) {
-                    	for (let setting of settings) {
-							if (typeof settingsToUse[setting.variable] == "undefined") {
-								switch (setting?.type?.toLowerCase()) {
-									case "boolean":
-										settingsToUse[setting.variable] = setting.default === 'true';
-										break;
-									case "dropdown":
-										let dropDownIndex = parseInt(setting.default);
-										if (dropDownIndex) {
-											settingsToUse[setting.variable] = setting.options[dropDownIndex];
-										}
-										break;
-								}
-							}
-						}
-					}
-				}
-
 				if(name == "enable") {
 					if(parameterVals.length > 0)
 						parameterVals[0] = this.Plugin.currentPlugin;
 					else
 						parameterVals.push(this.Plugin.currentPlugin);
 					if(parameterVals.length > 1)
-						parameterVals[1] = settingsToUse;
+						parameterVals[1] = __DEV_SETTINGS;
 					else
-						parameterVals.push(settingsToUse);
+						parameterVals.push(__DEV_SETTINGS);
 				}
 
 				const func = source[name];

app/src/main/assets/scripts/source.js

@@ -67,7 +67,6 @@ class ScriptException extends Error {
             super(arguments[0]);
             this.plugin_type = "ScriptException";
             this.message = arguments[0];
-            this.msg = arguments[0];
         }
         else {
             super(msg);

app/src/main/java/com/futo/platformplayer/AppCaUpdater.kt

@@ -1,43 +0,0 @@
-package com.futo.platformplayer
-
-import android.content.Context
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.net.HttpURLConnection
-import java.net.URL
-
-object AppCaUpdater {
-    private const val CA_URL = "https://curl.se/ca/cacert.pem"
-    private const val CACHE_FILENAME = "curl-ca-bundle.pem"
-    private const val MAX_AGE_DAYS = 30
-
-    suspend fun ensureCaBundle(context: Context): File = withContext(Dispatchers.IO) {
-        val file = File(context.noBackupFilesDir, CACHE_FILENAME)
-        val needsUpdate = !file.exists() || isOlderThanDays(file, MAX_AGE_DAYS)
-        if (needsUpdate) {
-            downloadToFile(CA_URL, file)
-        }
-        return@withContext file
-    }
-
-    private fun isOlderThanDays(file: File, days: Int): Boolean {
-        val ageMs = System.currentTimeMillis() - file.lastModified()
-        return ageMs > days * 24L * 60L * 60L * 1000L
-    }
-
-    private fun downloadToFile(urlStr: String, dest: File) {
-        val conn = (URL(urlStr).openConnection() as HttpURLConnection).apply {
-            connectTimeout = 15000
-            readTimeout = 15000
-            instanceFollowRedirects = true
-        }
-        conn.inputStream.use { input ->
-            dest.parentFile?.mkdirs()
-            dest.outputStream().use { output ->
-                input.copyTo(output)
-            }
-        }
-        conn.disconnect()
-    }
-}

app/src/main/java/com/futo/platformplayer/Extensions_Network.kt

@@ -216,9 +216,10 @@ private fun ByteArray.toInetAddress(): InetAddress {
     return InetAddress.getByAddress(this);
 }
 
-fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int, timeoutMs: Int = 10_000): Socket? {
+fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int): Socket? {
     ensureNotMainThread()
 
+    val timeout = 10000
     val addresses = if(!Settings.instance.casting.allowIpv6) attemptAddresses.filterIsInstance<Inet4Address>() else attemptAddresses;
     if(addresses.isEmpty())
         throw IllegalStateException("No valid addresses found (ipv6: ${(if(Settings.instance.casting.allowIpv6) "enabled" else "disabled")})");
@@ -231,7 +232,7 @@ fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int, timeoutMs
         val socket = Socket()
 
         try {
-            return socket.apply { this.connect(InetSocketAddress(addresses[0], port), timeoutMs) }
+            return socket.apply { this.connect(InetSocketAddress(addresses[0], port), timeout) }
         } catch (e: Throwable) {
             Log.i("getConnectedSocket", "Failed to connect to: ${addresses[0]}", e)
             socket.close()
@@ -262,7 +263,7 @@ fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int, timeoutMs
                     }
                 }
 
-                socket.connect(InetSocketAddress(address, port), timeoutMs);
+                socket.connect(InetSocketAddress(address, port), timeout);
 
                 synchronized(syncObject) {
                     if (connectedSocket == null) {

app/src/main/java/com/futo/platformplayer/Extensions_V8.kt

@@ -7,14 +7,11 @@ import com.caoccao.javet.values.reference.V8ValueArray
 import com.caoccao.javet.values.reference.V8ValueError
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.caoccao.javet.values.reference.V8ValuePromise
-import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.exceptions.ScriptExecutionException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.logging.Logger
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
@@ -24,6 +21,7 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.selects.SelectClause0
 import kotlinx.coroutines.selects.SelectClause1
+import java.util.concurrent.CancellationException
 import java.util.concurrent.CountDownLatch
 import kotlin.coroutines.AbstractCoroutineContextElement
 import kotlin.coroutines.CoroutineContext
@@ -196,6 +194,7 @@ fun V8ObjectToHashMap(obj: V8ValueObject?): HashMap<String, String> {
     return map;
 }
 
+
 fun <T: V8Value> V8ValuePromise.toV8ValueBlocking(plugin: V8Plugin): T {
     val latch = CountDownLatch(1);
     var promiseResult: T? = null;
@@ -205,19 +204,16 @@ fun <T: V8Value> V8ValuePromise.toV8ValueBlocking(plugin: V8Plugin): T {
             override fun onFulfilled(p0: V8Value?) {
                 if(p0 is V8ValueError)
                     promiseException = ScriptExecutionException(plugin.config, p0.message);
-                else {
+                else
-                    if(p0 is V8ValueObject)
-                        p0.setWeak();
                     promiseResult = p0 as T;
-                }
                 latch.countDown();
             }
             override fun onRejected(p0: V8Value?) {
-                promiseException = p0?.toException(plugin.config);
+                promiseException = (NotImplementedError("onRejected promise not implemented.."));
                 latch.countDown();
             }
             override fun onCatch(p0: V8Value?) {
-                promiseException = p0?.toException(plugin.config);
+                promiseException = (NotImplementedError("onCatch promise not implemented.."));
                 latch.countDown();
             }
         });
@@ -227,25 +223,8 @@ fun <T: V8Value> V8ValuePromise.toV8ValueBlocking(plugin: V8Plugin): T {
         promiseException =  CancellationException("Cancelled by system");
         latch.countDown();
     }
-    //Logger.i("V8", "V8ValueBlocking started (Busy) [" + blockCount + "]" + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString()+ ", " + Thread.currentThread().stackTrace.drop(5)?.firstOrNull()?.toString());
+    plugin.unbusy {
-
+        latch.await();
-
-    if(!promise.isPending) {
-        try {
-            Logger.i("V8", "V8Promise resolved synchronously");
-            if(promise.isFulfilled)
-                promiseResult = promise.getResult<T>();
-            else
-                promiseException = promise.getResult<V8Value>().toException(plugin.config);
-        }
-        catch(ex: Throwable) {
-            promiseException = ex;
-        }
-    }
-    else {
-        plugin.unbusy {
-            latch.await();
-        }
     }
     if(promiseException != null)
         throw promiseException!!;
@@ -270,25 +249,12 @@ fun <T: V8Value> V8ValuePromise.toV8ValueAsync(plugin: V8Plugin): V8Deferred<T>
                 underlyingDef.complete(p0 as T);
             }
             override fun onRejected(p0: V8Value?) {
-                try {
+                plugin.resolvePromise(promise);
-                    plugin.resolvePromise(promise);
+                underlyingDef.completeExceptionally(NotImplementedError("onRejected promise not implemented.."));
-                    val exceptionFound = p0?.toException(plugin.config) ?: NotImplementedError("onRejected promise not implemented..");
-                    Logger.i("V8", "Promise rejected, setting exception");
-                    underlyingDef.completeExceptionally(CancellationException(exceptionFound.message, exceptionFound));
-                }
-                catch(ex: Throwable) {
-                    Logger.e("V8", "Rejection handling failed?" , ex);
-                }
             }
             override fun onCatch(p0: V8Value?) {
-                try {
+                plugin.resolvePromise(promise);
-                    plugin.resolvePromise(promise);
+                underlyingDef.completeExceptionally(NotImplementedError("onCatch promise not implemented.."));
-                    val exceptionFound = p0?.toException(plugin.config) ?: NotImplementedError("onCatch promise not implemented..");
-                    underlyingDef.completeExceptionally(CancellationException(exceptionFound.message, exceptionFound));
-                }
-                catch(ex: Throwable) {
-                    Logger.e("V8", "Catching handling failed?" , ex);
-                }
             }
         });
     }
@@ -299,23 +265,6 @@ fun <T: V8Value> V8ValuePromise.toV8ValueAsync(plugin: V8Plugin): V8Deferred<T>
     return def;
 }
 
-fun V8Value.toException(config: IV8PluginConfig): Throwable {
-    val p0 = this;
-    if(p0 is V8ValueObject) {
-        return V8Plugin.getExceptionFromPlugin(config, p0, null, null, null, "P:");
-        /*
-        val pluginType = p0.getOrDefault(config, "plugin_type", "Promise Exception", "")?.let { if(!it.isNullOrBlank()) it + "" else "" }
-        val msg = p0.getOrDefault<String?>(config, "msg", "Promise Exception", null)
-            ?: p0.getOrDefault(config, "message", "Promise Exception", "");
-        return Throwable("Promise Failed: " + pluginType + msg);
-        */
-    }
-    else if(p0 is V8ValueString)
-        return Throwable("Promise Failed:" + p0.value);
-    else
-        return NotImplementedError("onCatch promise not implemented..");
-}
-
 class V8Deferred<T>(val deferred: Deferred<T>, val estDuration: Int = -1): Deferred<T> by deferred {
 
     fun <R> convert(conversion: (result: T)->R): V8Deferred<R>{
@@ -376,27 +325,4 @@ fun V8ValueObject.invokeV8VoidAsync(method: String, vararg obj: Any?): V8Deferre
         return result;
     }
     return V8Deferred(CompletableDeferred(result));
-}
-
-suspend fun <T> Deferred<T>.awaitCancelConverted(): T {
-    try {
-        return this.await();
-    }
-    catch(ex: CancellationException) {
-        if(ex.cause != null) {
-            throw ex.cause!!;
-        }
-        throw ex;
-    }
-}
-
-fun <T> IPager<T>.toList(): List<T> {
-    val list = this.getResults().toMutableList();
-
-    while(this.hasMorePages()) {
-        this.nextPage();
-        list.addAll(this.getResults());
-    }
-
-    return list.toList();
 }

app/src/main/java/com/futo/platformplayer/RootInsetsController.kt

@@ -1,118 +0,0 @@
-package com.futo.platformplayer
-
-import android.app.Activity
-import android.graphics.Color
-import android.os.Build
-import android.view.ViewGroup
-import android.view.Window
-import android.view.WindowManager
-import androidx.core.graphics.Insets
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsCompat.Type
-import androidx.core.view.WindowInsetsControllerCompat
-import androidx.core.view.doOnAttach
-import androidx.core.view.updatePadding
-import kotlin.math.max
-
-class RootInsetsController private constructor(
-    private val activity: Activity,
-    private val window: Window,
-    private val root: ViewGroup
-) {
-    private val controller by lazy { WindowInsetsControllerCompat(window, root) }
-
-    private val basePaddingLeft = root.paddingLeft
-    private val basePaddingTop = root.paddingTop
-    private val basePaddingRight = root.paddingRight
-    private val basePaddingBottom = root.paddingBottom
-
-    private var currentInsets: WindowInsetsCompat = WindowInsetsCompat.CONSUMED
-    private var fullscreen = false
-
-    init {
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-        window.statusBarColor = Color.TRANSPARENT
-        window.navigationBarColor = Color.TRANSPARENT
-        controller.systemBarsBehavior =
-            WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-
-        ViewCompat.setOnApplyWindowInsetsListener(root) { _, insets ->
-            currentInsets = insets
-            applyPadding()
-            insets
-        }
-
-        root.doOnAttach { ViewCompat.requestApplyInsets(root) }
-    }
-
-    private fun effectiveInsets(): Insets {
-        if (fullscreen) return Insets.NONE
-
-        val sys = currentInsets.getInsets(Type.systemBars())
-        val cut = currentInsets.getInsetsIgnoringVisibility(Type.displayCutout())
-        val portrait = activity.resources.configuration.orientation == android.content.res.Configuration.ORIENTATION_PORTRAIT
-
-        val top = if (portrait) max(sys.top, cut.top) else sys.top
-        return Insets.of(sys.left, top, sys.right, sys.bottom)
-    }
-
-
-    private fun applyPadding() {
-        val e = effectiveInsets()
-        root.updatePadding(
-            left = basePaddingLeft + e.left,
-            top = basePaddingTop + e.top,
-            right = basePaddingRight + e.right,
-            bottom = basePaddingBottom + e.bottom
-        )
-    }
-
-    private fun forceRelayoutAndInsets() {
-        root.post {
-            ViewCompat.requestApplyInsets(root)
-            applyPadding()
-            root.post {
-                ViewCompat.requestApplyInsets(root)
-                applyPadding()
-            }
-        }
-    }
-
-    fun enterFullscreen(allowCutoutShortEdges: Boolean = true) {
-        fullscreen = true
-        if (allowCutoutShortEdges) {
-            window.attributes = window.attributes.apply {
-                layoutInDisplayCutoutMode =
-                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-            }
-        }
-        controller.hide(Type.systemBars())
-        forceRelayoutAndInsets()
-    }
-
-    fun exitFullscreen() {
-        fullscreen = false
-        window.attributes = window.attributes.apply {
-            layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
-        }
-        controller.show(Type.systemBars())
-        forceRelayoutAndInsets()
-    }
-
-    fun onConfigurationChanged() {
-        forceRelayoutAndInsets()
-    }
-
-    fun setLightSystemBarAppearance(lightStatus: Boolean, lightNav: Boolean) {
-        controller.isAppearanceLightStatusBars = lightStatus
-        controller.isAppearanceLightNavigationBars = lightNav
-    }
-
-    companion object {
-        fun attach(activity: Activity, root: ViewGroup): RootInsetsController {
-            return RootInsetsController(activity, activity.window, root)
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/Settings.kt

@@ -10,11 +10,11 @@ import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.ManageTabsActivity
 import com.futo.platformplayer.activities.PolycentricHomeActivity
 import com.futo.platformplayer.activities.PolycentricProfileActivity
+import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.activities.SyncHomeActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.fragment.mainactivity.bottombar.MenuBottomBarFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SettingsFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.serializers.FlexibleBooleanSerializer
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
@@ -25,7 +25,6 @@ import com.futo.platformplayer.states.StateCache
 import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePayment
 import com.futo.platformplayer.states.StatePolycentric
-import com.futo.platformplayer.states.StateSync
 import com.futo.platformplayer.states.StateUpdate
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.FragmentedStorageFileJson
@@ -35,13 +34,13 @@ import com.futo.platformplayer.views.fields.DropdownFieldOptionsId
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.FormField
 import com.futo.platformplayer.views.fields.FormFieldButton
-import com.futo.platformplayer.views.fields.FormFieldWarning
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.io.File
 import java.time.OffsetDateTime
@@ -63,7 +62,7 @@ class Settings : FragmentedStorageFileJson() {
     @FormField(R.string.sync_grayjay, FieldForm.BUTTON, R.string.sync_grayjay_description, -8)
     @FormFieldButton(R.drawable.ic_update)
     fun syncGrayjay() {
-        StateApp?.instance?.activity?.let {
+        SettingsActivity.getActivity()?.let {
             it.startActivity(Intent(it, SyncHomeActivity::class.java))
         }
     }
@@ -72,7 +71,7 @@ class Settings : FragmentedStorageFileJson() {
     @FormField(R.string.manage_polycentric_identity, FieldForm.BUTTON, R.string.manage_your_polycentric_identity, -7)
     @FormFieldButton(R.drawable.ic_person)
     fun managePolycentricIdentity() {
-        StateApp?.instance?.activity?.let {
+        SettingsActivity.getActivity()?.let {
             if (StatePolycentric.instance.enabled) {
                 if (StatePolycentric.instance.processHandle != null) {
                     it.startActivity(Intent(it, PolycentricProfileActivity::class.java));
@@ -90,7 +89,7 @@ class Settings : FragmentedStorageFileJson() {
     fun openFAQ() {
         try {
             val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Settings.URL_FAQ))
-            StateApp?.instance?.activity?.startActivity(browserIntent);
+            SettingsActivity.getActivity()?.startActivity(browserIntent);
         } catch (e: Throwable) {
             //Ignored
         }
@@ -100,7 +99,7 @@ class Settings : FragmentedStorageFileJson() {
     fun openIssues() {
         try {
             val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/futo-org/grayjay-android/issues"))
-            StateApp?.instance?.activity?.startActivity(browserIntent);
+            SettingsActivity.getActivity()?.startActivity(browserIntent);
         } catch (e: Throwable) {
             //Ignored
         }
@@ -131,7 +130,7 @@ class Settings : FragmentedStorageFileJson() {
     @FormFieldButton(R.drawable.ic_tabs)
     fun manageTabs() {
         try {
-            StateApp?.instance?.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 it.startActivity(Intent(it, ManageTabsActivity::class.java));
             }
         } catch (e: Throwable) {
@@ -144,7 +143,7 @@ class Settings : FragmentedStorageFileJson() {
     @FormField(R.string.import_data, FieldForm.BUTTON, R.string.import_data_description, -3)
     @FormFieldButton(R.drawable.ic_move_up)
     fun import() {
-        val act = StateApp.instance.activity ?: return;
+        val act = SettingsActivity.getActivity() ?: return;
         val intent = MainActivity.getImportOptionsIntent(act);
         act.startActivity(intent);
     }
@@ -153,7 +152,7 @@ class Settings : FragmentedStorageFileJson() {
     @FormFieldButton(R.drawable.ic_link)
     fun manageLinks() {
         try {
-            StateApp.instance.activity?.let { UIDialogs.showUrlHandlingPrompt(it) }
+            SettingsActivity.getActivity()?.let { UIDialogs.showUrlHandlingPrompt(it) }
         } catch (e: Throwable) {
             Logger.e(TAG, "Failed to show url handling prompt", e)
         }
@@ -162,7 +161,7 @@ class Settings : FragmentedStorageFileJson() {
     /*@FormField(R.string.disable_battery_optimization, FieldForm.BUTTON, R.string.click_to_go_to_battery_optimization_settings_disabling_battery_optimization_will_prevent_the_os_from_killing_media_sessions, -1)
     @FormFieldButton(R.drawable.battery_full_24px)
     fun ignoreBatteryOptimization() {
-        StateApp.instance.activity?.let {
+        SettingsActivity.getActivity()?.let {
             val intent = Intent()
             val packageName = it.packageName
             val pm = it.getSystemService(POWER_SERVICE) as PowerManager;
@@ -202,8 +201,6 @@ class Settings : FragmentedStorageFileJson() {
                 8 -> "zh";
                 9 -> "ru";
                 10 -> "ar";
-                11 -> "it";
-                12 -> "tr";
                 else -> null
             }
         }
@@ -243,7 +240,7 @@ class Settings : FragmentedStorageFileJson() {
         fun clearHidden() {
             StateMeta.instance.removeAllHiddenCreators();
             StateMeta.instance.removeAllHiddenVideos();
-            StateApp.instance.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 UIDialogs.toast(it, "Creators and videos should show up again");
             }
         }
@@ -373,9 +370,9 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.clear_channel_cache, FieldForm.BUTTON, R.string.clear_channel_cache_description, 16)
         fun clearChannelCache() {
-            UIDialogs.toast(StateApp.instance.activity!!, "Started clearing..");
+            UIDialogs.toast(SettingsActivity.getActivity()!!, "Started clearing..");
             StateCache.instance.clear();
-            UIDialogs.toast(StateApp.instance.activity!!, "Finished clearing");
+            UIDialogs.toast(SettingsActivity.getActivity()!!, "Finished clearing");
         }
     }
 
@@ -407,10 +404,6 @@ class Settings : FragmentedStorageFileJson() {
                 else -> null
             }
         }
-
-        @FormField(R.string.sticky_subtitles, FieldForm.TOGGLE, R.string.sticky_subtitles_description, -1)
-        var stickySubtitles: Boolean = true;
-
         @FormField(R.string.prefer_original_audio, FieldForm.TOGGLE, R.string.prefer_original_audio_description, -1)
         var preferOriginalAudio: Boolean = true;
 
@@ -429,9 +422,6 @@ class Settings : FragmentedStorageFileJson() {
             6 -> 1.75f;
             7 -> 2.0f;
             8 -> 2.25f;
-            9 -> 2.5f;
-            10 -> 2.75f;
-            11 -> 3.0f;
             else -> 1.0f;
         };
 
@@ -613,16 +603,6 @@ class Settings : FragmentedStorageFileJson() {
                 else -> 2.0
             }
         }
-
-
-        @AdvancedField
-        @FormField(R.string.shorts_pregenerate, FieldForm.TOGGLE, R.string.shorts_pregenerate_description, 28)
-        var shortsPregenerate: Boolean = false;
-
-        @AdvancedField
-        @FormField(R.string.shorts_fit_video, FieldForm.TOGGLE, R.string.shorts_fit_video_description, 29)
-        @FormFieldWarning(R.string.shorts_fit_video_warning)
-        var shortsFitVideo: Boolean = false;
     }
 
     @FormField(R.string.comments, "group", R.string.comments_description, 6)
@@ -725,11 +705,6 @@ class Settings : FragmentedStorageFileJson() {
         @Serializable(with = FlexibleBooleanSerializer::class)
         var allowLinkLocalIpv4: Boolean = false;
 
-        @AdvancedField
-        @FormField(R.string.experimental_cast, FieldForm.TOGGLE, R.string.experimental_cast_description, 6)
-        @Serializable(with = FlexibleBooleanSerializer::class)
-        var experimentalCasting: Boolean = true
-
         /*TODO: Should we have a different casting quality?
         @FormField("Preferred Casting Quality", FieldForm.DROPDOWN, "", 3)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
@@ -762,7 +737,7 @@ class Settings : FragmentedStorageFileJson() {
                 try {
                     if (!Logger.submitLogs()) {
                         withContext(Dispatchers.Main) {
-                            StateApp.instance.activity?.let { UIDialogs.toast(it, it.getString(R.string.please_enable_logging_to_submit_logs)) }
+                            SettingsActivity.getActivity()?.let { UIDialogs.toast(it, it.getString(R.string.please_enable_logging_to_submit_logs)) }
                         }
                     }
                 } catch (e: Throwable) {
@@ -779,7 +754,7 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.reset_announcements, FieldForm.BUTTON, R.string.reset_hidden_announcements, 1)
         fun resetAnnouncements() {
             StateAnnouncement.instance.resetAnnouncements();
-            StateApp.instance.activity?.let { UIDialogs.toast(it, it.getString(R.string.announcements_reset)); };
+            SettingsActivity.getActivity()?.let { UIDialogs.toast(it, it.getString(R.string.announcements_reset)); };
         }
     }
 
@@ -847,13 +822,13 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.change_external_general_directory, FieldForm.BUTTON, R.string.change_the_external_directory_for_general_files, 3)
         fun changeStorageGeneral() {
-            StateApp.instance.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 StateApp.instance.changeExternalGeneralDirectory(it);
             }
         }
         @FormField(R.string.change_external_downloads_directory, FieldForm.BUTTON, R.string.change_the_external_storage_for_download_files, 4)
         fun changeStorageDownload() {
-            StateApp.instance.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 StateApp.instance.changeExternalDownloadDirectory(it);
             }
         }
@@ -862,7 +837,7 @@ class Settings : FragmentedStorageFileJson() {
         fun clearStorageDownload() {
             Settings.instance.storage.storage_download = null;
             Settings.instance.save();
-            StateApp.instance.activity?.let { UIDialogs.toast(it, "Cleared download storage directory") };
+            SettingsActivity.getActivity()?.let { UIDialogs.toast(it, "Cleared download storage directory") };
         }
     }
 
@@ -899,13 +874,13 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.manual_check, FieldForm.BUTTON, R.string.manually_check_for_updates, 3)
         fun manualCheck() {
             if (!BuildConfig.IS_PLAYSTORE_BUILD) {
-                StateApp.instance.activity?.let {
+                SettingsActivity.getActivity()?.let {
                     StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                         StateUpdate.instance.checkForUpdates(it, true)
                     }
                 }
             } else {
-                StateApp.instance.activity?.let {
+                SettingsActivity.getActivity()?.let {
                     try {
                         it.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=${it.packageName}")))
                     } catch (e: ActivityNotFoundException) {
@@ -917,7 +892,7 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.view_changelog, FieldForm.BUTTON, R.string.review_the_current_and_past_changelogs, 4)
         fun viewChangelog() {
-            StateApp.instance.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 UIDialogs.toast(it.getString(R.string.retrieving_changelog));
 
                 StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
@@ -957,7 +932,7 @@ class Settings : FragmentedStorageFileJson() {
     class Backup {
         @Serializable(with = OffsetDateTimeSerializer::class)
         var lastAutoBackupTime: OffsetDateTime = OffsetDateTime.MIN;
-        var didAskAutoBackup: Boolean = true;
+        var didAskAutoBackup: Boolean = false;
         var autoBackupPassword: String? = null;
         fun shouldAutomaticBackup() = autoBackupPassword != null;
 
@@ -966,13 +941,13 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.set_automatic_backup, FieldForm.BUTTON, R.string.configure_daily_backup_in_case_of_catastrophic_failure, 1)
         fun configureAutomaticBackup() {
-            UIDialogs.showAutomaticBackupDialog(StateApp.instance.activity!!, autoBackupPassword != null) {
+            UIDialogs.showAutomaticBackupDialog(SettingsActivity.getActivity()!!, autoBackupPassword != null) {
-                SettingsFragment.currentView?.reloadSettings();
+                SettingsActivity.getActivity()?.reloadSettings();
             };
         }
         @FormField(R.string.restore_automatic_backup, FieldForm.BUTTON, R.string.restore_a_previous_automatic_backup, 2)
         fun restoreAutomaticBackup() {
-            val activity = StateApp.instance.activity!!
+            val activity = SettingsActivity.getActivity()!!
 
             if(!StateBackup.hasAutomaticBackup())
                 UIDialogs.toast(activity, activity.getString(R.string.you_don_t_have_any_automatic_backups), false);
@@ -983,9 +958,8 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.export_data, FieldForm.BUTTON, R.string.creates_a_zip_file_with_your_data_which_can_be_imported_by_opening_it_with_grayjay, 3)
         fun export() {
-            val activity = StateApp.instance.activity ?: return;
+            val activity = SettingsActivity.getActivity() ?: return;
-            val fragView = SettingsFragment.currentView ?: return;
+            UISlideOverlays.showOverlay(activity.overlay, "Select export type", null, {},
-            UISlideOverlays.showOverlay(fragView.overlay, "Select export type", null, {},
                 SlideUpMenuItem(activity, R.drawable.ic_share, "Share", "", tag = null, call = {
                     StateBackup.shareExternalBackup();
                 }),
@@ -1001,11 +975,11 @@ class Settings : FragmentedStorageFileJson() {
     @Serializable
     class Payment {
         @FormField(R.string.payment_status, FieldForm.READONLYTEXT, -1, 1)
-        val paymentStatus: String get() = StateApp.instance.activity?.let { if (StatePayment.instance.hasPaid) it.getString(R.string.paid) else it.getString(R.string.not_paid); } ?: "Unknown";
+        val paymentStatus: String get() = SettingsActivity.getActivity()?.let { if (StatePayment.instance.hasPaid) it.getString(R.string.paid) else it.getString(R.string.not_paid); } ?: "Unknown";
 
         @FormField(R.string.license_status, FieldForm.BUTTON, R.string.view_license_status, 2)
         fun viewLicenseStatus() {
-            StateApp.instance.activity?.let {
+            SettingsActivity.getActivity()?.let {
                 try {
                     if (StatePayment.instance.hasPaid) {
                         val paymentKey = StatePayment.instance.getPaymentKey()
@@ -1021,12 +995,12 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.clear_payment, FieldForm.BUTTON, R.string.deletes_license_keys_from_app, 3)
         fun clearPayment() {
-            StateApp.instance.activity?.let { context ->
+            SettingsActivity.getActivity()?.let { context ->
                 UIDialogs.showConfirmationDialog(context, "Are you sure you want to delete your license?", {
                     StatePayment.instance.clearLicenses();
-                    StateApp.instance.activity?.let {
+                    SettingsActivity.getActivity()?.let {
                         UIDialogs.toast(it, it.getString(R.string.licenses_cleared_might_require_app_restart));
-                        SettingsFragment.currentView?.reloadSettings();
+                        it.reloadSettings();
                     }
                 })
             }
@@ -1113,39 +1087,6 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.local_connections, FieldForm.TOGGLE, R.string.local_connections_description, 3)
         var localConnections: Boolean = true;
-
-
-
-        var syncServerUrl: String? = null;
-        @FormField(R.string.relay_server, FieldForm.READONLYTEXT, -1, 6)
-        val syncServer: String get() = if(syncServerUrl?.isBlank() == true) StateSync.RELAY_SERVER else syncServerUrl ?: StateSync.RELAY_SERVER;
-
-        @AdvancedField
-        @FormField(R.string.configure_sync_server, FieldForm.BUTTON, R.string.configure_sync_server_description, 7)
-        fun configureSyncServer() {
-            StateApp.instance.activity?.let { context ->
-                UIDialogs.showDialog(context, R.drawable.device_sync, false,
-                    "Enter the url to your relay server",
-                    "Using your own relay server requires a proper setup with portforwarding.\nUse at your own risk.",
-                    null,
-                    syncServerUrl ?: "",
-                    "YourRelayServerDomain.com", 0,
-                        UIDialogs.Action("Cancel", {}),
-                        UIDialogs.Action("Reset", {
-                            syncServerUrl = null;
-                            instance.save();
-                            SettingsFragment.currentView?.reloadSettings();
-                            UIDialogs.toast("Sync server changes require a restart");
-                        }, UIDialogs.ActionStyle.ACCENT),
-                        UIDialogs.Action.withInput("Configure", {
-                            syncServerUrl = it?.text
-                            instance.save();
-                            SettingsFragment.currentView?.reloadSettings();
-                            UIDialogs.toast("Sync server changes require a restart");
-                        }, UIDialogs.ActionStyle.PRIMARY),
-                    )
-            }
-        }
     }
 
     @FormField(R.string.info, FieldForm.GROUP, -1, 21)

app/src/main/java/com/futo/platformplayer/SettingsDev.kt

@@ -8,7 +8,9 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import com.caoccao.javet.values.primitive.V8ValueInteger
 import com.caoccao.javet.values.primitive.V8ValueString
+import com.futo.platformplayer.activities.DeveloperActivity
 import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
@@ -18,8 +20,6 @@ import com.futo.platformplayer.api.media.platforms.js.SourcePluginDescriptor
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.background.BackgroundWorker
 import com.futo.platformplayer.engine.V8Plugin
-import com.futo.platformplayer.fragment.mainactivity.main.DeveloperFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SettingsFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.serializers.FlexibleBooleanSerializer
 import com.futo.platformplayer.states.StateAnnouncement
@@ -97,10 +97,10 @@ class SettingsDev : FragmentedStorageFileJson() {
         fun subscriptionsCache5000() {
             Logger.i("SettingsDev", "Started caching 5000 sub items");
             UIDialogs.toast(
-                StateApp.instance.activity!!,
+                SettingsActivity.getActivity()!!,
                 "Started caching 5000 sub items"
             );
-            val button = DeveloperFragment.currentView?.getField("subscription_cache_button");
+            val button = DeveloperActivity.getActivity()?.getField("subscription_cache_button");
             if(button is ButtonField)
                 button.setButtonEnabled(false);
             StateApp.instance.scope.launch(Dispatchers.IO) {
@@ -121,7 +121,7 @@ class SettingsDev : FragmentedStorageFileJson() {
                                 val diff = System.currentTimeMillis() - lastToast;
                                 lastToast = System.currentTimeMillis();
                                 UIDialogs.toast(
-                                    StateApp.instance.activity!!,
+                                    SettingsActivity.getActivity()!!,
                                     "Page: ${page}, Total: ${total}, Speed: ${diff}ms"
                                 );
                             }
@@ -130,7 +130,7 @@ class SettingsDev : FragmentedStorageFileJson() {
 
                     withContext(Dispatchers.Main) {
                         UIDialogs.toast(
-                            StateApp.instance.activity!!,
+                            SettingsActivity.getActivity()!!,
                             "FINISHED Page: ${page}, Total: ${total}"
                         );
                     }
@@ -152,10 +152,10 @@ class SettingsDev : FragmentedStorageFileJson() {
         fun historyCache100() {
             Logger.i("SettingsDev", "Started caching 100 history items (from home)");
             UIDialogs.toast(
-                StateApp.instance.activity!!,
+                SettingsActivity.getActivity()!!,
                 "Started caching 100 history items (from home)"
             );
-            val button = DeveloperFragment.currentView?.getField("history_cache_button");
+            val button = DeveloperActivity.getActivity()?.getField("history_cache_button");
             if(button is ButtonField)
                 button.setButtonEnabled(false);
             StateApp.instance.scope.launch(Dispatchers.IO) {
@@ -186,7 +186,7 @@ class SettingsDev : FragmentedStorageFileJson() {
                                 val diff = System.currentTimeMillis() - lastToast;
                                 lastToast = System.currentTimeMillis();
                                 UIDialogs.toast(
-                                    StateApp.instance.activity!!,
+                                    SettingsActivity.getActivity()!!,
                                     "Page: ${page}, Total: ${total}, Speed: ${diff}ms"
                                 );
                             }
@@ -195,7 +195,7 @@ class SettingsDev : FragmentedStorageFileJson() {
 
                     withContext(Dispatchers.Main) {
                         UIDialogs.toast(
-                            StateApp.instance.activity!!,
+                            SettingsActivity.getActivity()!!,
                             "FINISHED Page: ${page}, Total: ${total}"
                         );
                     }
@@ -235,9 +235,9 @@ class SettingsDev : FragmentedStorageFileJson() {
     @FormField(R.string.test_background_worker, FieldForm.BUTTON,
         R.string.test_background_worker_description, 4)
     fun triggerBackgroundUpdate() {
-        val act = StateApp.instance.activity!!;
+        val act = SettingsActivity.getActivity()!!;
         try {
-            UIDialogs.toast(StateApp.instance.activity!!, "Starting test background worker");
+            UIDialogs.toast(SettingsActivity.getActivity()!!, "Starting test background worker");
 
             val wm = WorkManager.getInstance(act);
             val req = OneTimeWorkRequestBuilder<BackgroundWorker>()
@@ -251,9 +251,9 @@ class SettingsDev : FragmentedStorageFileJson() {
     @FormField(R.string.clear_channel_cache, FieldForm.BUTTON,
         R.string.test_background_worker_description, 4)
     fun clearChannelContentCache() {
-        UIDialogs.toast(StateApp.instance.activity!!, "Clearing cache");
+        UIDialogs.toast(SettingsActivity.getActivity()!!, "Clearing cache");
         StateCache.instance.clearToday();
-        UIDialogs.toast(StateApp.instance.activity!!, "Cleared");
+        UIDialogs.toast(SettingsActivity.getActivity()!!, "Cleared");
     }
 
 

app/src/main/java/com/futo/platformplayer/UIDialogs.kt

@@ -113,8 +113,8 @@ class UIDialogs {
                 currentDialog.code,
                 currentDialog.defaultCloseAction,
                 *currentDialog.actions.map {
-                    return@map Action.withInput(it.text, { str ->
+                    return@map Action(it.text, {
-                        it.invokeAction(str);
+                        it.action();
                         multiShowDialog(context, dialogDescriptor.drop(1), finally);
                     }, it.style);
                 }.toTypedArray());
@@ -203,9 +203,7 @@ class UIDialogs {
         fun showDialog(context: Context, icon: Int, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action): AlertDialog {
             return showDialog(context, icon, false, text, textDetails, code, defaultCloseAction, *actions);
         }
-        fun showDialog(context: Context, icon: Int, animated: Boolean, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action): AlertDialog
+        fun showDialog(context: Context, icon: Int, animated: Boolean, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action): AlertDialog {
-            = showDialog(context, icon, animated, text, textDetails, code, null, null, defaultCloseAction, *actions);
-        fun showDialog(context: Context, icon: Int, animated: Boolean, text: String, textDetails: String? = null, code: String? = null, input: String?, placeholder: String?, defaultCloseAction: Int, vararg actions: Action): AlertDialog {
             val builder = AlertDialog.Builder(context);
             val view = LayoutInflater.from(context).inflate(R.layout.dialog_multi_button, null);
             builder.setView(view);
@@ -228,16 +226,6 @@ class UIDialogs {
                     this.text = textDetails;
                 }
             };
-            var inputView = view.findViewById<TextView>(R.id.dialog_text_input);
-            inputView.apply {
-                if (input == null && placeholder == null) this.visibility = View.GONE;
-                else {
-                    this.text = input ?: "";
-                    this.hint = placeholder ?: "";
-                    this.visibility = View.VISIBLE;
-                    this.textAlignment = View.TEXT_ALIGNMENT_VIEW_START
-                }
-            };
             view.findViewById<TextView>(R.id.dialog_text_code).apply {
                 if (code == null) this.visibility = View.GONE;
                 else {
@@ -262,7 +250,7 @@ class UIDialogs {
                     buttonView.textSize = 14f;
                     buttonView.typeface = resources.getFont(R.font.inter_regular);
                     buttonView.text = act.text;
-                    buttonView.setOnClickListener { act.invokeAction(DialogResult(inputView?.text?.toString())); dialog.dismiss(); };
+                    buttonView.setOnClickListener { act.action(); dialog.dismiss(); };
                     when(act.style) {
                         ActionStyle.PRIMARY -> buttonView.setBackgroundResource(R.drawable.background_button_primary);
                         ActionStyle.ACCENT -> buttonView.setBackgroundResource(R.drawable.background_button_accent);
@@ -287,7 +275,7 @@ class UIDialogs {
             };
             dialog.setOnCancelListener {
                 if(defaultCloseAction >= 0 && defaultCloseAction < actions.size)
-                    actions[defaultCloseAction].invokeAction(DialogResult(inputView?.text?.toString()));
+                    actions[defaultCloseAction].action();
             }
             dialog.setOnDismissListener {
                 registerDialogClosed(dialog);
@@ -547,36 +535,17 @@ class UIDialogs {
     }
     class Action {
         val text: String;
-        val action: ((DialogResult?)->Unit);
+        val action: ()->Unit;
         val style: ActionStyle;
         var center: Boolean;
 
         constructor(text: String, action: ()->Unit, style: ActionStyle = ActionStyle.NONE, center: Boolean = false) {
-            this.text = text;
-            this.action = { action() };
-            this.style = style;
-            this.center = center;
-        }
-        protected constructor(text: String, action: (DialogResult?)->Unit, style: ActionStyle = ActionStyle.NONE, center: Boolean = false) {
             this.text = text;
             this.action = action;
             this.style = style;
             this.center = center;
         }
-
-        fun invokeAction(input: DialogResult? = null) {
-            this.action(input);
-        }
-
-        companion object {
-            fun withInput(text: String, action: (DialogResult?)->Unit, style: ActionStyle = ActionStyle.NONE, center: Boolean = false): Action {
-                return Action(text, action, style, center);
-            }
-        }
     }
-    class DialogResult(
-      val text: String?
-    );
     enum class ActionStyle {
         NONE,
         PRIMARY,

app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt

@@ -14,6 +14,7 @@ import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist
 import androidx.media3.exoplayer.hls.playlist.HlsMultivariantPlaylist
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
@@ -73,7 +74,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayInputStream
 import androidx.core.net.toUri
-import com.futo.platformplayer.fragment.mainactivity.main.SettingsFragment
 
 class UISlideOverlays {
     companion object {
@@ -331,9 +331,15 @@ class UISlideOverlays {
                                             0,
                                             UIDialogs.Action("Cancel", {}),
                                             UIDialogs.Action("Configure", {
-                                                StateApp.instance.activity?.let {
+                                                val intent = Intent(
-                                                    it.navigate(it.getFragment<SettingsFragment>(), mainContext.getString(R.string.background_update))
+                                                    mainContext,
-                                                }
+                                                    SettingsActivity::class.java
+                                                );
+                                                intent.putExtra(
+                                                    "query",
+                                                    mainContext.getString(R.string.background_update)
+                                                );
+                                                mainContext.startActivity(intent);
                                             }, UIDialogs.ActionStyle.PRIMARY)
                                         );
                                     }

app/src/main/java/com/futo/platformplayer/Utility.kt

@@ -101,7 +101,7 @@ fun String.isHexColor(): Boolean {
 
 fun IPlatformClient.fromPool(pool: PlatformMultiClientPool) = pool.getClientPooled(this);
 
-fun IPlatformVideo.withTimestamp(sec: Long) = PlatformVideoWithTime(this, sec);
+fun IPlatformVideo.withTimestamp(sec: Long) =  PlatformVideoWithTime(this, sec);
 
 fun DocumentFile.getInputStream(context: Context) = context.contentResolver.openInputStream(this.uri);
 fun DocumentFile.getOutputStream(context: Context) = context.contentResolver.openOutputStream(this.uri);

app/src/main/java/com/futo/platformplayer/activities/AddSourceActivity.kt

@@ -107,9 +107,10 @@ class AddSourceActivity : AppCompatActivity() {
         onNewIntent(intent);
     }
 
-    override fun onNewIntent(intent: Intent) {
+    override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
-        var url = intent.dataString;
+        var url = intent?.dataString;
+
         if(url == null)
             UIDialogs.showDialog(this, R.drawable.ic_error, getString(R.string.no_valid_url_provided), null, null,
                 0, UIDialogs.Action(getString(R.string.ok), { finish() }, UIDialogs.ActionStyle.PRIMARY));

app/src/main/java/com/futo/platformplayer/activities/DeveloperActivity.kt

@@ -0,0 +1,58 @@
+package com.futo.platformplayer.activities
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.widget.ImageButton
+import androidx.appcompat.app.AppCompatActivity
+import com.futo.platformplayer.*
+import com.futo.platformplayer.views.fields.FieldForm
+import com.futo.platformplayer.views.fields.IField
+
+class DeveloperActivity : AppCompatActivity() {
+    private lateinit var _form: FieldForm;
+    private lateinit var _buttonBack: ImageButton;
+
+    fun getField(id: String): IField? {
+        return _form.findField(id);
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState);
+        DeveloperActivity._lastActivity = this;
+        setContentView(R.layout.activity_dev);
+        setNavigationBarColorAndIcons();
+
+        _buttonBack = findViewById(R.id.button_back);
+        _form = findViewById(R.id.settings_form);
+
+        _form.fromObject(SettingsDev.instance);
+        _form.onChanged.subscribe { _, _ ->
+            _form.setObjectValues();
+            SettingsDev.instance.save();
+        };
+
+        _buttonBack.setOnClickListener {
+            finish();
+        }
+    }
+
+    override fun finish() {
+        super.finish()
+        overridePendingTransition(R.anim.slide_lighten, R.anim.slide_out_up)
+    }
+
+
+
+    companion object {
+        //TODO: Temporary for solving Settings issues
+        @SuppressLint("StaticFieldLeak")
+        private var _lastActivity: DeveloperActivity? = null;
+
+        fun getActivity(): DeveloperActivity? {
+            val act = _lastActivity;
+            if(act != null)
+                return act;
+            return null;
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt

@@ -15,7 +15,6 @@ import com.futo.platformplayer.api.media.platforms.js.SourceAuth
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginAuthConfig
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.matchesDomain
 import com.futo.platformplayer.others.LoginWebViewClient
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
@@ -75,26 +74,9 @@ class LoginActivity : AppCompatActivity() {
             finish();
         };
         var isFirstLoad = true;
-        val loginWarnings = authConfig.loginWarnings?.toMutableList() ?: mutableListOf<SourcePluginAuthConfig.Warning>();
-        val uiMods = authConfig.uiMods?.toMutableList() ?: mutableListOf<SourcePluginAuthConfig.UIMod>();
-        var currentScale = 100;
-        var currentDesktop = false;
         webViewClient.onPageLoaded.subscribe { view, url ->
             _textUrl.setText(url ?: "");
 
-            if(loginWarnings.size > 0 && url != null) {
-                synchronized(loginWarnings) {
-                    val warning = loginWarnings.find { url.matches(it.getRegex()) };
-                    if(warning != null) {
-                        if(warning.once == true)
-                            loginWarnings.remove(warning);
-                        UIDialogs.showDialog(this@LoginActivity, R.drawable.ic_warning_yellow, warning.text ?: "", warning.details ?: "", null, 0,
-                            UIDialogs.Action("Understood", {
-                            }, UIDialogs.ActionStyle.PRIMARY));
-                    }
-                }
-            }
-
             if(!isFirstLoad)
                 return@subscribe;
             isFirstLoad = false;
@@ -104,35 +86,6 @@ class LoginActivity : AppCompatActivity() {
                 //TODO: Find most reliable way to wait for page js to finish
                 view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {});
             }
-
-            /*
-            var specifiedScale = false;
-            var specifiedDesktop = false;
-            if(uiMods.size > 0 && url != null) {
-                synchronized(uiMods) {
-                    val uimod = uiMods.find { url.matches(it.getRegex()) };
-                    if(uimod != null) {
-                        if(uimod.scale != null) {
-                            currentScale =(uimod.scale * 100).toInt();
-                            _webView.setInitialScale(currentScale);
-                            specifiedScale = true;
-                        }
-                        if(uimod.desktop != null && uimod.desktop) {
-                            _webView.settings.useWideViewPort = true;
-                            specifiedDesktop = true;
-                        }
-                    }
-                }
-            }
-            if(!specifiedScale && currentScale != 100) {
-                currentScale = (100).toInt();
-                _webView.setInitialScale(currentScale);
-            }
-            if(!specifiedDesktop && currentDesktop) {
-                _webView.settings.useWideViewPort = false;
-                currentDesktop = false;
-            }
-            */
         }
         _webView.settings.domStorageEnabled = true;
 

app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt

@@ -8,7 +8,6 @@ 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
@@ -17,6 +16,7 @@ import android.os.StrictMode.VmPolicy
 import android.util.Log
 import android.util.TypedValue
 import android.view.View
+import android.view.WindowManager
 import android.widget.FrameLayout
 import android.widget.ImageView
 import androidx.activity.result.ActivityResult
@@ -36,11 +36,9 @@ import androidx.lifecycle.withStateAtLeast
 import androidx.media3.common.util.UnstableApi
 import com.futo.platformplayer.BuildConfig
 import com.futo.platformplayer.R
-import com.futo.platformplayer.RootInsetsController
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.api.media.models.video.LocalVideoDetails
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.dp
@@ -53,28 +51,17 @@ import com.futo.platformplayer.fragment.mainactivity.main.CommentsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.ContentSearchResultsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.CreatorSearchResultsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.CreatorsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.DeveloperFragment
 import com.futo.platformplayer.fragment.mainactivity.main.DownloadsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.HistoryFragment
 import com.futo.platformplayer.fragment.mainactivity.main.HomeFragment
 import com.futo.platformplayer.fragment.mainactivity.main.ImportPlaylistsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.ImportSubscriptionsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryAlbumFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryAlbumsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryArtistFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryArtistsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryFilesFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibrarySearchFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryVideosFragment
-import com.futo.platformplayer.fragment.mainactivity.main.LoginFragment
 import com.futo.platformplayer.fragment.mainactivity.main.MainFragment
 import com.futo.platformplayer.fragment.mainactivity.main.PlaylistFragment
 import com.futo.platformplayer.fragment.mainactivity.main.PlaylistSearchResultsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.PlaylistsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.PostDetailFragment
 import com.futo.platformplayer.fragment.mainactivity.main.RemotePlaylistFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SettingsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.ShortsFragment
 import com.futo.platformplayer.fragment.mainactivity.main.SourceDetailFragment
 import com.futo.platformplayer.fragment.mainactivity.main.SourcesFragment
@@ -88,7 +75,6 @@ import com.futo.platformplayer.fragment.mainactivity.main.VideoDetailFragment.St
 import com.futo.platformplayer.fragment.mainactivity.main.WatchLaterFragment
 import com.futo.platformplayer.fragment.mainactivity.main.WebDetailFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.AddTopBarFragment
-import com.futo.platformplayer.fragment.mainactivity.topbar.FilesTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.GeneralTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.ImportTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFragment
@@ -160,7 +146,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     lateinit var _fragTopBarNavigation: NavigationTopBarFragment;
     lateinit var _fragTopBarImport: ImportTopBarFragment;
     lateinit var _fragTopBarAdd: AddTopBarFragment;
-    lateinit var _fragTopBarFiles: FilesTopBarFragment;
 
     //Frags BotBar
     lateinit var _fragBotBarMenu: MenuBottomBarFragment;
@@ -193,17 +178,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     lateinit var _fragBuy: BuyFragment;
     lateinit var _fragSubGroup: SubscriptionGroupFragment;
     lateinit var _fragSubGroupList: SubscriptionGroupListFragment;
-    lateinit var _fragLibrary: LibraryFragment;
-    lateinit var _fragLibraryAlbums: LibraryAlbumsFragment;
-    lateinit var _fragLibraryAlbum: LibraryAlbumFragment;
-    lateinit var _fragLibraryArtists: LibraryArtistsFragment;
-    lateinit var _fragLibraryArtist: LibraryArtistFragment;
-    lateinit var _fragLibraryVideos: LibraryVideosFragment;
-    lateinit var _fragLibrarySearch: LibrarySearchFragment;
-    lateinit var _fragLibraryFiles: LibraryFilesFragment;
-    lateinit var _fragSettings: SettingsFragment;
-    lateinit var _fragDeveloper: DeveloperFragment;
-    lateinit var _fragLogin: LoginFragment;
 
     lateinit var _fragBrowser: BrowserFragment;
 
@@ -212,7 +186,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     //State
     private val _queue: LinkedList<Pair<MainFragment, Any?>> = LinkedList();
-    var fragCurrent: MainFragment? = null; private set;
+    lateinit var fragCurrent: MainFragment private set;
     private var _parameterCurrent: Any? = null;
 
     var fragBeforeOverlay: MainFragment? = null; private set;
@@ -224,7 +198,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     private var _privateModeEnabled = false
     private var _pictureInPictureEnabled = false
     private var _isFullscreen = false
-    private lateinit var _rootInsetsController: RootInsetsController
 
     private val _urlQrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
         val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
@@ -245,19 +218,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             }
         }
     }
-    private val _notifPermission = "android.permission.POST_NOTIFICATIONS";
-    private val _notificationPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
-        if (isGranted)
-            UIDialogs.toast(this, "Notification permission granted");
-        else
-            UIDialogs.toast(this, "Notification permission denied");
-    };
-
-
-
-    fun requestNotificationPermissions() {
-        _notificationPermissionLauncher?.launch(_notifPermission);
-    }
 
     val mainId = UUID.randomUUID().toString().substring(0, 5)
 
@@ -313,7 +273,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     @UnstableApi
     override fun onCreate(savedInstanceState: Bundle?) {
         Logger.w(TAG, "MainActivity Starting [$mainId]");
-
         StateApp.instance.setGlobalContext(this, lifecycleScope, mainId);
         StateApp.instance.mainAppStarting(this);
 
@@ -324,6 +283,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
         setContentView(R.layout.activity_main);
         setNavigationBarColorAndIcons();
+        if (Settings.instance.playback.allowVideoToGoUnderCutout)
+            window.attributes.layoutInDisplayCutoutMode =
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
 
         runBlocking {
             try {
@@ -333,18 +295,11 @@ 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>();
 
         rootView = findViewById(R.id.rootView);
-        _rootInsetsController = RootInsetsController.attach(this, rootView)
-        _rootInsetsController.setLightSystemBarAppearance(lightStatus = false, lightNav = false)
-
         _fragContainerTopBar = findViewById(R.id.fragment_top_bar);
         _fragContainerMain = findViewById(R.id.fragment_main);
         _fragContainerBotBar = findViewById(R.id.fragment_bottom_bar);
@@ -361,7 +316,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragTopBarNavigation = NavigationTopBarFragment.newInstance();
         _fragTopBarImport = ImportTopBarFragment.newInstance();
         _fragTopBarAdd = AddTopBarFragment.newInstance();
-        _fragTopBarFiles = FilesTopBarFragment.newInstance();
 
         //BotBars
         _fragBotBarMenu = MenuBottomBarFragment.newInstance();
@@ -394,17 +348,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragBuy = BuyFragment.newInstance();
         _fragSubGroup = SubscriptionGroupFragment.newInstance();
         _fragSubGroupList = SubscriptionGroupListFragment.newInstance();
-        _fragLibrary = LibraryFragment.newInstance();
-        _fragLibraryAlbums = LibraryAlbumsFragment.newInstance();
-        _fragLibraryAlbum = LibraryAlbumFragment.newInstance();
-        _fragLibraryArtists = LibraryArtistsFragment.newInstance();
-        _fragLibraryArtist = LibraryArtistFragment.newInstance();
-        _fragLibraryVideos = LibraryVideosFragment.newInstance();
-        _fragLibraryFiles = LibraryFilesFragment.newInstance();
-        _fragLibrarySearch = LibrarySearchFragment.newInstance();
-        _fragSettings = SettingsFragment.newInstance();
-        _fragDeveloper = DeveloperFragment.newInstance();
-        _fragLogin = LoginFragment.newInstance();
 
         _fragBrowser = BrowserFragment.newInstance();
 
@@ -467,11 +410,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             Logger.i(TAG, "onFullscreenChanged ${it}");
             _isFullscreen = it
             updatePrivateModeVisibility()
-            if (it) {
-                _rootInsetsController.enterFullscreen(allowCutoutShortEdges = Settings.instance.playback.allowVideoToGoUnderCutout)
-            } else {
-                _rootInsetsController.exitFullscreen()
-            }
         }
 
         _fragVideoDetail.onMinimize.subscribe {
@@ -536,16 +474,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragImportSubscriptions.topBar = _fragTopBarImport;
         _fragImportPlaylists.topBar = _fragTopBarImport;
         _fragSubGroupList.topBar = _fragTopBarAdd;
-        _fragLibrary.topBar = _fragTopBarGeneral;
-        _fragLibraryAlbums.topBar = _fragTopBarNavigation;
-        _fragLibraryAlbum.topBar = _fragTopBarNavigation;
-        _fragLibraryArtists.topBar = _fragTopBarNavigation;
-        _fragLibraryArtist.topBar = _fragTopBarNavigation;
-        _fragLibraryVideos.topBar = _fragTopBarNavigation;
-        _fragLibraryFiles.topBar = _fragTopBarFiles;
-        _fragLibrarySearch.topBar = _fragTopBarSearch;
-        _fragSettings.topBar = _fragTopBarNavigation;
-        _fragDeveloper.topBar = _fragTopBarNavigation;
 
         _fragBrowser.topBar = _fragTopBarNavigation;
 
@@ -571,7 +499,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         defaultTab.action(_fragBotBarMenu);
         StateSubscriptions.instance;
 
-        fragCurrent?.onShown(null, false);
+        fragCurrent.onShown(null, false);
 
         //Other stuff
         rootView.progress = 0f;
@@ -710,11 +638,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     private var _qrCodeLoadingDialog: AlertDialog? = null
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        _rootInsetsController.onConfigurationChanged()
-    }
-
     fun showUrlQrCodeScanner() {
         try {
             _qrCodeLoadingDialog = UIDialogs.showDialog(this, R.drawable.ic_loader_animated, true,
@@ -773,13 +696,17 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _wasStopped = true;
     }
 
-    override fun onNewIntent(intent: Intent) {
+    override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent);
         handleIntent(intent);
     }
 
-    private fun handleIntent(intent: Intent) {
+    private fun handleIntent(intent: Intent?) {
+        if (intent == null)
+            return;
         Logger.i(TAG, "handleIntent started by " + intent.action);
+
+
         var targetData: String? = null;
 
         when (intent.action) {
@@ -841,7 +768,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             if (targetData != null) {
                 lifecycleScope.launch(Dispatchers.Main) {
                     try {
-                        handleUrlAll(targetData, intent)
+                        handleUrlAll(targetData)
                     } catch (e: Throwable) {
                         Logger.e(TAG, "Unhandled exception in handleUrlAll", e)
                     }
@@ -852,9 +779,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
-    suspend fun handleUrlAll(url: String, openIntent: Intent? = null) {
+    suspend fun handleUrlAll(url: String) {
         val uri = Uri.parse(url)
-        val intent = openIntent ?: this.intent;
         when (uri.scheme) {
             "grayjay" -> {
                 if (url.startsWith("grayjay://license/")) {
@@ -881,11 +807,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             }
 
             "content" -> {
-                if (!handleContent(url, intent?.type)) {
+                if (!handleContent(url, intent.type)) {
                     UIDialogs.showSingleButtonDialog(
                         this,
                         R.drawable.ic_play,
-                        getString(R.string.unknown_content_format) + " [${url}]\n[${intent?.type}]",
+                        getString(R.string.unknown_content_format) + " [${url}]\n[${intent.type}]",
                         "Ok",
                         { });
                 }
@@ -1006,12 +932,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         } else if (file.lowercase().endsWith(".txt") || mime == "text/plain") {
             return handleUnknownText(String(data));
         }
-        else if (mime?.let { it.startsWith("video/") || it.startsWith("audio/") } ?: false) {
-            val mediaItem = LocalVideoDetails.fromContent(file, mime);
-            navigateWhenReady(_fragVideoDetail, mediaItem);
-            return true;
-        }
-
         return false;
     }
 
@@ -1126,7 +1046,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         Logger.i(TAG, "handleFCast");
 
         try {
-            StateCasting.instance.handleUrl(url)
+            StateCasting.instance.handleUrl(this, url)
             return true;
         } catch (e: Throwable) {
             Log.e(TAG, "Failed to parse FCast URL '${url}'.", e)
@@ -1158,7 +1078,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         if (_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED && _fragVideoDetail.onBackPressed())
             return;
 
-        if (!(fragCurrent?.onBackPressed() ?: true))
+        if (!fragCurrent.onBackPressed())
             closeSegment();
     }
 
@@ -1209,11 +1129,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
-    inline fun <reified T : Fragment> navigate(parameter: Any? = null, withHistory: Boolean = true, isBack: Boolean = false) {
-        val segment = getFragment<T>();
-        navigate(segment as MainFragment, parameter, withHistory, isBack);
-    }
-
     /**
      * Navigate takes a MainFragment, and makes them the current main visible view
      * A parameter can be provided which becomes available in the onShow of said fragment
@@ -1236,27 +1151,27 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                 return;
             }
 
-            fragCurrent?.onHide();
+            fragCurrent.onHide();
 
             if (segment.isMainView) {
                 var transaction = supportFragmentManager.beginTransaction();
                 if (segment.topBar != null) {
-                    if (segment.topBar != fragCurrent?.topBar) {
+                    if (segment.topBar != fragCurrent.topBar) {
                         transaction = transaction
                             .show(segment.topBar as Fragment)
                             .replace(R.id.fragment_top_bar, segment.topBar as Fragment);
-                        fragCurrent?.topBar?.onHide();
+                        fragCurrent.topBar?.onHide();
                     }
-                } else if (fragCurrent?.topBar != null)
+                } else if (fragCurrent.topBar != null)
-                    transaction.hide(fragCurrent?.topBar as Fragment);
+                    transaction.hide(fragCurrent.topBar as Fragment);
 
                 transaction = transaction.replace(R.id.fragment_main, segment);
 
                 if (segment.hasBottomBar) {
-                    if (!(fragCurrent?.hasBottomBar ?: false))
+                    if (!fragCurrent.hasBottomBar)
                         transaction = transaction.show(_fragBotBarMenu);
                 } else {
-                    if (fragCurrent?.hasBottomBar ?: false)
+                    if (fragCurrent.hasBottomBar)
                         transaction = transaction.hide(_fragBotBarMenu);
                 }
                 transaction.commitNow();
@@ -1269,10 +1184,10 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                 }
             }
 
-            if (fragCurrent?.isHistory ?: false && withHistory && _queue.lastOrNull() != fragCurrent)
+            if (fragCurrent.isHistory && withHistory && _queue.lastOrNull() != fragCurrent)
-                _queue.add(Pair(fragCurrent!!, _parameterCurrent));
+                _queue.add(Pair(fragCurrent, _parameterCurrent));
 
-            if (segment.isOverlay && !(fragCurrent?.isOverlay ?: false) && withHistory)// && fragCurrent.isHistory)
+            if (segment.isOverlay && !fragCurrent.isOverlay && withHistory)// && fragCurrent.isHistory)
                 fragBeforeOverlay = fragCurrent;
 
             fragCurrent = segment;
@@ -1326,7 +1241,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             VideoDetailFragment::class -> _fragVideoDetail as T;
             MenuBottomBarFragment::class -> _fragBotBarMenu as T;
             GeneralTopBarFragment::class -> _fragTopBarGeneral as T;
-            FilesTopBarFragment::class -> _fragTopBarFiles as T;
             SearchTopBarFragment::class -> _fragTopBarSearch as T;
             CreatorsFragment::class -> _fragMainSubscriptions as T;
             CommentsFragment::class -> _fragMainComments as T;
@@ -1351,17 +1265,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             BuyFragment::class -> _fragBuy as T;
             SubscriptionGroupFragment::class -> _fragSubGroup as T;
             SubscriptionGroupListFragment::class -> _fragSubGroupList as T;
-            LibraryFragment::class -> _fragLibrary as T;
-            LibraryAlbumsFragment::class -> _fragLibraryAlbums as T;
-            LibraryAlbumFragment::class -> _fragLibraryAlbum as T;
-            LibraryArtistsFragment::class -> _fragLibraryArtists as T;
-            LibraryArtistFragment::class -> _fragLibraryArtist as T;
-            LibraryVideosFragment::class -> _fragLibraryVideos as T;
-            LibraryFilesFragment::class -> _fragLibraryFiles as T;
-            LibrarySearchFragment::class -> _fragLibrarySearch as T;
-            SettingsFragment:: class -> _fragSettings as T;
-            DeveloperFragment::class -> _fragDeveloper as T;
-            LoginFragment::class -> _fragLogin as T;
             else -> throw IllegalArgumentException("Fragment type ${T::class.java.name} is not available in MainActivity");
         }
     }
@@ -1369,7 +1272,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     private fun updateSegmentPaddings() {
         var paddingBottom = 0f;
-        if (fragCurrent?.hasBottomBar ?: false)
+        if (fragCurrent.hasBottomBar)
             paddingBottom += HEIGHT_MENU_DP;
 
         _fragContainerOverlay.setPadding(
@@ -1386,23 +1289,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         );
     }
 
-    var _callbackPermissionAudio: ((Boolean)->Unit)? = null;
-    var _callbackPermissionVideo: ((Boolean)->Unit)? = null;
-    val permissionReqAudio = registerForActivityResult(ActivityResultContracts.RequestPermission(), { isGranted ->
-        _callbackPermissionAudio?.invoke(isGranted);
-    });
-    val permissionReqVideo = registerForActivityResult(ActivityResultContracts.RequestPermission(), { isGranted ->
-        _callbackPermissionVideo?.invoke(isGranted);
-    });
-    fun requestPermissionAudio(cb: ((Boolean)->Unit)? = null) {
-        _callbackPermissionAudio = cb;
-        permissionReqAudio.launch(android.Manifest.permission.READ_MEDIA_AUDIO);
-    }
-    fun requestPermissionVideo(cb: ((Boolean)->Unit)? = null) {
-        _callbackPermissionVideo = cb;
-        permissionReqVideo.launch(android.Manifest.permission.READ_MEDIA_VIDEO);
-    }
-
 
     val notifPermission = "android.permission.POST_NOTIFICATIONS";
     val requestPermissionLauncher =  registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->

app/src/main/java/com/futo/platformplayer/activities/PolycentricBackupActivity.kt

@@ -13,18 +13,15 @@ import android.view.View
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
-import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateApp.Companion.withContext
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.buttons.BigButton
-import com.futo.platformplayer.activities.QRCodeFullscreenActivity
 import com.futo.polycentric.core.ContentType
 import com.futo.polycentric.core.SignedEvent
 import com.futo.polycentric.core.StorageTypeCRDTItem
@@ -32,10 +29,8 @@ import com.futo.polycentric.core.StorageTypeCRDTSetItem
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.toBase64Url
 import com.google.zxing.BarcodeFormat
-import com.google.zxing.EncodeHintType
 import com.google.zxing.MultiFormatWriter
 import com.google.zxing.common.BitMatrix
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -46,27 +41,11 @@ import userpackage.Protocol.URLInfo
 class PolycentricBackupActivity : AppCompatActivity() {
     private lateinit var _buttonShare: BigButton;
     private lateinit var _buttonCopy: BigButton;
-    private lateinit var _buttonExportFile: BigButton;
     private lateinit var _imageQR: ImageView;
     private lateinit var _exportBundle: String;
     private lateinit var _textQR: TextView;
-    private lateinit var _textQRHint: TextView;
     private lateinit var _loader: View
 
-    private val _createDocumentLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) { uri ->
-        uri?.let { fileUri ->
-            try {
-                contentResolver.openOutputStream(fileUri)?.use { outputStream ->
-                    outputStream.write(_exportBundle.toByteArray())
-                }
-                UIDialogs.toast(this, getString(R.string.profile_saved_successfully))
-            } catch (e: Exception) {
-                Logger.e(TAG, "Failed to write to document", e)
-                UIDialogs.toast(this, "Failed to save profile: ${e.message}")
-            }
-        }
-    }
-
     override fun attachBaseContext(newBase: Context?) {
         super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
     }
@@ -78,10 +57,8 @@ class PolycentricBackupActivity : AppCompatActivity() {
 
         _buttonShare = findViewById(R.id.button_share)
         _buttonCopy = findViewById(R.id.button_copy)
-        _buttonExportFile = findViewById(R.id.button_export_file)
         _imageQR = findViewById(R.id.image_qr)
         _textQR = findViewById(R.id.text_qr)
-        _textQRHint = findViewById(R.id.text_qr_hint)
         _loader = findViewById(R.id.progress_loader)
         findViewById<ImageButton>(R.id.button_back).setOnClickListener {
             finish();
@@ -89,23 +66,14 @@ class PolycentricBackupActivity : AppCompatActivity() {
 
         _imageQR.visibility = View.INVISIBLE
         _textQR.visibility = View.INVISIBLE
-        _textQRHint.visibility = View.INVISIBLE
         _loader.visibility = View.VISIBLE
         _buttonShare.visibility = View.INVISIBLE
         _buttonCopy.visibility = View.INVISIBLE
-        _buttonExportFile.visibility = View.INVISIBLE
 
         lifecycleScope.launch {
-            val bundle = withContext(Dispatchers.IO) { createExportBundle() }
-            _exportBundle = bundle
-            Logger.i(TAG, "Export bundle created, length: ${bundle.length}")
-            
             try {
                 val pair = withContext(Dispatchers.IO) {
-                    if (!isContentSuitableForQRCode(bundle)) {
+                    val bundle = createExportBundle()
-                        throw Exception("Data too big for QR code generation")
-                    }
-                    
                     val dimension = TypedValue.applyDimension(
                         TypedValue.COMPLEX_UNIT_DIP, 200f, resources.displayMetrics
                     ).toInt()
@@ -113,35 +81,18 @@ class PolycentricBackupActivity : AppCompatActivity() {
                     Pair(bundle, qr)
                 }
 
+                _exportBundle = pair.first
                 _imageQR.setImageBitmap(pair.second)
                 _imageQR.visibility = View.VISIBLE
                 _textQR.visibility = View.VISIBLE
-                _textQRHint.visibility = View.VISIBLE
                 _buttonShare.visibility = View.VISIBLE
                 _buttonCopy.visibility = View.VISIBLE
-                
-                _imageQR.setOnClickListener {
-                    val intent = QRCodeFullscreenActivity.createIntent(this@PolycentricBackupActivity, _exportBundle)
-                    startActivity(intent)
-                }
             } catch (e: Exception) {
-                val byteSize = bundle.toByteArray(Charsets.UTF_8).size
+                Logger.e(TAG, getString(R.string.failed_to_generate_qr_code), e)
-                Logger.e(TAG, "QR code generation failed. Bundle length: ${bundle.length} chars, ${byteSize} bytes, Error: ${e.message}", e)
-                
-                if (e.message?.contains("Data too big") == true) {
-                    _textQR.text = getString(R.string.qr_code_too_large_use_file_export)
-                    _buttonExportFile.visibility = View.VISIBLE
-                } else {
-                    _textQR.text = getString(R.string.failed_to_generate_qr_code)
-                }
-                
-                _textQR.visibility = View.VISIBLE
-                _textQRHint.visibility = View.INVISIBLE
-                _buttonShare.visibility = View.VISIBLE
-                _buttonCopy.visibility = View.VISIBLE
-                
-                // Hide QR image since generation failed
                 _imageQR.visibility = View.INVISIBLE
+                _textQR.visibility = View.INVISIBLE
+                _buttonShare.visibility = View.INVISIBLE
+                _buttonCopy.visibility = View.INVISIBLE
             } finally {
                 _loader.visibility = View.GONE
             }
@@ -157,29 +108,11 @@ class PolycentricBackupActivity : AppCompatActivity() {
             val clip = ClipData.newPlainText(getString(R.string.copied_text), _exportBundle);
             clipboard.setPrimaryClip(clip);
         };
-
-        _buttonExportFile.onClick.subscribe {
-            val fileName = "polycentric_profile_${System.currentTimeMillis()}.txt"
-            _createDocumentLauncher.launch(fileName)
-        };
-    }
-
-    private fun isContentSuitableForQRCode(content: String): Boolean {
-        val bytes = content.toByteArray(Charsets.UTF_8)
-        return bytes.size <= 2300  // QR Code Version 40 with Error Correction Level M can hold ~2331 bytes
     }
 
     private fun generateQRCode(content: String, width: Int, height: Int): Bitmap {
-        if (!isContentSuitableForQRCode(content)) {
+        val bitMatrix = MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height);
-            throw Exception("Data too big for QR code generation")
+        return bitMatrixToBitmap(bitMatrix);
-        }
-        
-        val hints = java.util.EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
-        hints[EncodeHintType.ERROR_CORRECTION] = ErrorCorrectionLevel.M
-        hints[EncodeHintType.MARGIN] = 1
-        
-        val bitMatrix = MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints)
-        return bitMatrixToBitmap(bitMatrix)
     }
 
     private fun bitMatrixToBitmap(matrix: BitMatrix): Bitmap {
@@ -270,8 +203,7 @@ class PolycentricBackupActivity : AppCompatActivity() {
             .setBody(exportBundle.toByteString())
             .build();
 
-        val data = urlInfo.toByteArray()
+        return "polycentric://" + urlInfo.toByteArray().toBase64Url()
-        return "polycentric://" + data.toBase64Url()
     }
 
     companion object {

app/src/main/java/com/futo/platformplayer/activities/PolycentricImportProfileActivity.kt

@@ -32,166 +32,100 @@ import userpackage.Protocol
 import userpackage.Protocol.ExportBundle
 
 class PolycentricImportProfileActivity : AppCompatActivity() {
-    private lateinit var _buttonHelp: ImageButton
+    private lateinit var _buttonHelp: ImageButton;
-    private lateinit var _buttonScanProfile: LinearLayout
+    private lateinit var _buttonScanProfile: LinearLayout;
-    private lateinit var _buttonImportFile: LinearLayout
+    private lateinit var _buttonImportProfile: LinearLayout;
-    private lateinit var _buttonImportProfile: LinearLayout
+    private lateinit var _editProfile: EditText;
-    private lateinit var _editProfile: EditText
+    private lateinit var _loaderOverlay: LoaderOverlay;
-    private lateinit var _loaderOverlay: LoaderOverlay
 
-    private val _qrCodeResultLauncher =
+    private val _qrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
-                val scanResult =
+        scanResult?.let {
-                        IntentIntegrator.parseActivityResult(result.resultCode, result.data)
+            if (it.contents != null) {
-                scanResult?.let {
+                val scannedUrl = it.contents
-                    if (it.contents != null) {
+                import(scannedUrl)
-                        val scannedUrl = it.contents
-                        import(scannedUrl)
-                    }
-                }
-            }
-
-    private val _filePickerLauncher =
-            registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
-                uri?.let { fileUri ->
-                    try {
-                        // Check file size before reading
-                        val fileSize =
-                                contentResolver.openFileDescriptor(fileUri, "r")?.statSize ?: 0
-                        val maxFileSize = 10 * 1024 * 1024 // 10MB limit
-
-                        if (fileSize > maxFileSize) {
-                            UIDialogs.toast(this, "File too large. Maximum size is 10MB.")
-                            return@let
-                        }
-
-                        if (fileSize == 0L) {
-                            UIDialogs.toast(this, "Selected file is empty.")
-                            return@let
-                        }
-
-                        val content =
-                                contentResolver
-                                        .openInputStream(fileUri)
-                                        ?.bufferedReader()
-                                        ?.readText()
-                        content?.let { fileContent ->
-                            val trimmedContent = fileContent.trim()
-
-                            // Check if content is empty after trimming
-                            if (trimmedContent.isEmpty()) {
-                                UIDialogs.toast(this, "Selected file contains no data.")
-                                return@let
-                            }
-
-                            // Check if content looks like a valid polycentric URL
-                            if (!trimmedContent.startsWith("polycentric://")) {
-                                UIDialogs.toast(
-                                        this,
-                                        "Selected file does not contain a valid polycentric profile URL."
-                                )
-                                return@let
-                            }
-
-                            import(trimmedContent)
-                        }
-                                ?: run { UIDialogs.toast(this, "Could not read file content.") }
-                    } catch (e: SecurityException) {
-                        Logger.e(TAG, "Security exception reading file", e)
-                        UIDialogs.toast(this, "Permission denied to read file.")
-                    } catch (e: OutOfMemoryError) {
-                        Logger.e(TAG, "Out of memory reading file", e)
-                        UIDialogs.toast(this, "File too large to process.")
-                    } catch (e: Exception) {
-                        Logger.e(TAG, "Failed to read file", e)
-                        UIDialogs.toast(this, "Failed to read file: ${e.message}")
-                    }
-                }
             }
+        }
+    }
 
     override fun attachBaseContext(newBase: Context?) {
         super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_polycentric_import_profile)
+        setContentView(R.layout.activity_polycentric_import_profile);
-        setNavigationBarColorAndIcons()
+        setNavigationBarColorAndIcons();
 
-        _buttonHelp = findViewById(R.id.button_help)
+        _buttonHelp = findViewById(R.id.button_help);
-        _buttonScanProfile = findViewById(R.id.button_scan_profile)
+        _buttonScanProfile = findViewById(R.id.button_scan_profile);
-        _buttonImportFile = findViewById(R.id.button_import_file)
+        _buttonImportProfile = findViewById(R.id.button_import_profile);
-        _buttonImportProfile = findViewById(R.id.button_import_profile)
+        _loaderOverlay = findViewById(R.id.loader_overlay);
-        _loaderOverlay = findViewById(R.id.loader_overlay)
+        _editProfile = findViewById(R.id.edit_profile);
-        _editProfile = findViewById(R.id.edit_profile)
+        findViewById<ImageButton>(R.id.button_back).setOnClickListener {
-        findViewById<ImageButton>(R.id.button_back).setOnClickListener { finish() }
+            finish();
+        };
 
         _buttonHelp.setOnClickListener {
-            startActivity(Intent(this, PolycentricWhyActivity::class.java))
+            startActivity(Intent(this, PolycentricWhyActivity::class.java));
-        }
+        };
 
         _buttonScanProfile.setOnClickListener {
             val integrator = IntentIntegrator(this)
             integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
             integrator.setPrompt(getString(R.string.scan_a_qr_code))
-            integrator.setOrientationLocked(true)
+            integrator.setOrientationLocked(true);
             integrator.setCameraId(0)
             integrator.setBeepEnabled(false)
             integrator.setBarcodeImageEnabled(true)
-            integrator.setCaptureActivity(QRCaptureActivity::class.java)
+            integrator.setCaptureActivity(QRCaptureActivity::class.java);
             _qrCodeResultLauncher.launch(integrator.createScanIntent())
-        }
+        };
-
-        _buttonImportFile.setOnClickListener { _filePickerLauncher.launch("text/plain") }
 
         _buttonImportProfile.setOnClickListener {
             if (_editProfile.text.isEmpty()) {
-                UIDialogs.toast(this, getString(R.string.text_field_does_not_contain_any_data))
+                UIDialogs.toast(this, getString(R.string.text_field_does_not_contain_any_data));
-                return@setOnClickListener
+                return@setOnClickListener;
             }
 
-            import(_editProfile.text.toString())
+            import(_editProfile.text.toString());
-        }
+        };
 
-        val url = intent.getStringExtra("url")
+        val url = intent.getStringExtra("url");
         if (url != null) {
-            import(url)
+            import(url);
         }
     }
 
     private fun import(url: String) {
         if (!url.startsWith("polycentric://")) {
-            UIDialogs.toast(this, getString(R.string.not_a_valid_url))
+            UIDialogs.toast(this, getString(R.string.not_a_valid_url));
-            return
+            return;
         }
 
         _loaderOverlay.show()
 
         lifecycleScope.launch(Dispatchers.IO) {
             try {
-                val data = url.substring("polycentric://".length).base64UrlToByteArray()
+                val data = url.substring("polycentric://".length).base64UrlToByteArray();
-                val urlInfo = Protocol.URLInfo.parseFrom(data)
+                val urlInfo = Protocol.URLInfo.parseFrom(data);
-
                 if (urlInfo.urlType != 3L) {
                     throw Exception("Expected urlInfo struct of type ExportBundle")
                 }
 
-                val exportBundle = ExportBundle.parseFrom(urlInfo.body)
+                val exportBundle = ExportBundle.parseFrom(urlInfo.body);
-                val keyPair = KeyPair.fromProto(exportBundle.keyPair)
+                val keyPair = KeyPair.fromProto(exportBundle.keyPair);
 
-                val existingProcessSecret = Store.instance.getProcessSecret(keyPair.publicKey)
+                val existingProcessSecret = Store.instance.getProcessSecret(keyPair.publicKey);
                 if (existingProcessSecret != null) {
                     withContext(Dispatchers.Main) {
-                        UIDialogs.toast(
+                        UIDialogs.toast(this@PolycentricImportProfileActivity, getString(R.string.this_profile_is_already_imported));
-                                this@PolycentricImportProfileActivity,
-                                getString(R.string.this_profile_is_already_imported)
-                        )
                     }
-                    return@launch
+                    return@launch;
                 }
 
-                val processSecret = ProcessSecret(keyPair, Process.random())
+                val processSecret = ProcessSecret(keyPair, Process.random());
-                Store.instance.addProcessSecret(processSecret)
+                Store.instance.addProcessSecret(processSecret);
 
                 try {
                     PolycentricStorage.instance.addProcessSecret(processSecret)
@@ -199,43 +133,37 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
                     Logger.e(TAG, "Failed to save process secret to secret storage.", e)
                 }
 
-                val processHandle = processSecret.toProcessHandle()
+                val processHandle = processSecret.toProcessHandle();
 
                 for (e in exportBundle.events.eventsList) {
                     try {
-                        val se = SignedEvent.fromProto(e)
+                        val se = SignedEvent.fromProto(e);
-                        Store.instance.putSignedEvent(se)
+                        Store.instance.putSignedEvent(se);
                     } catch (e: Throwable) {
-                        Logger.w(TAG, "Ignored invalid event", e)
+                        Logger.w(TAG, "Ignored invalid event", e);
                     }
                 }
 
-                StatePolycentric.instance.setProcessHandle(processHandle)
+                StatePolycentric.instance.setProcessHandle(processHandle);
-                processHandle.fullyBackfillClient(ApiMethods.SERVER)
+                processHandle.fullyBackfillClient(ApiMethods.SERVER);
                 withContext(Dispatchers.Main) {
-                    startActivity(
+                    startActivity(Intent(this@PolycentricImportProfileActivity, PolycentricProfileActivity::class.java));
-                            Intent(
+                    finish();
-                                    this@PolycentricImportProfileActivity,
-                                    PolycentricProfileActivity::class.java
-                            )
-                    )
-                    finish()
                 }
             } catch (e: Throwable) {
-                Logger.w(TAG, "Failed to import profile", e)
+                Logger.w(TAG, "Failed to import profile", e);
                 withContext(Dispatchers.Main) {
-                    UIDialogs.toast(
+                    UIDialogs.toast(this@PolycentricImportProfileActivity, getString(R.string.failed_to_import_profile) + " '${e.message}'");
-                            this@PolycentricImportProfileActivity,
-                            getString(R.string.failed_to_import_profile) + " '${e.message}'"
-                    )
                 }
             } finally {
-                withContext(Dispatchers.Main) { _loaderOverlay.hide() }
+                withContext(Dispatchers.Main) {
+                    _loaderOverlay.hide();
+                }
             }
         }
     }
 
     companion object {
-        private const val TAG = "PolycentricImportProfileActivity"
+        private const val TAG = "PolycentricImportProfileActivity";
     }
-}
+}

app/src/main/java/com/futo/platformplayer/activities/PolycentricModerationActivity.kt

@@ -1,147 +0,0 @@
-package com.futo.platformplayer.activities
-
-import android.content.Context
-import android.os.Bundle
-import android.widget.ImageButton
-import android.widget.SeekBar
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import com.futo.platformplayer.polycentric.ModerationsManager
-import com.futo.platformplayer.R
-import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.setNavigationBarColorAndIcons
-
-class PolycentricModerationActivity : AppCompatActivity() {
-    private lateinit var _seekbarOffensive: SeekBar
-    private lateinit var _seekbarExplicit: SeekBar
-    private lateinit var _seekbarViolence: SeekBar
-    private lateinit var _textOffensiveDesc: TextView
-    private lateinit var _textExplicitDesc: TextView
-    private lateinit var _textViolenceDesc: TextView
-    private lateinit var _textOffensiveValue: TextView
-    private lateinit var _textExplicitValue: TextView
-    private lateinit var _textViolenceValue: TextView
-    private lateinit var _moderationsManager: ModerationsManager
-
-    override fun attachBaseContext(newBase: Context?) {
-        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_polycentric_moderation)
-        setNavigationBarColorAndIcons()
-        
-        _moderationsManager = ModerationsManager.getInstance()
-        try {
-            _moderationsManager = ModerationsManager.getInstance()
-        } catch (e: IllegalStateException) {
-            finish()
-            return
-        }
-        
-        _seekbarOffensive = findViewById(R.id.seekbar_offensive)
-        _seekbarExplicit = findViewById(R.id.seekbar_explicit)
-        _seekbarViolence = findViewById(R.id.seekbar_violence)
-        _textOffensiveDesc = findViewById(R.id.text_offensive_desc)
-        _textExplicitDesc = findViewById(R.id.text_explicit_desc)
-        _textViolenceDesc = findViewById(R.id.text_violence_desc)
-        _textOffensiveValue = findViewById(R.id.text_offensive_value)
-        _textExplicitValue = findViewById(R.id.text_explicit_value)
-        _textViolenceValue = findViewById(R.id.text_violence_value)
-        
-        findViewById<ImageButton>(R.id.button_back).setOnClickListener {
-            finish()
-        }
-        
-        loadSettings()
-        setupListeners()
-    }
-    
-    private fun loadSettings() {
-        val levels = _moderationsManager.moderationLevels.value ?: mapOf()
-        
-        val offensiveLevel = levels["hate"] ?: 2
-        val explicitLevel = levels["sexual"] ?: 1
-        val violenceLevel = levels["violence"] ?: 1
-        
-        _seekbarOffensive.progress = offensiveLevel
-        _seekbarExplicit.progress = explicitLevel
-        _seekbarViolence.progress = violenceLevel
-        
-        updateDescriptionText(_seekbarOffensive, _textOffensiveDesc, _textOffensiveValue, getOffensiveDescriptions())
-        updateDescriptionText(_seekbarExplicit, _textExplicitDesc, _textExplicitValue, getExplicitDescriptions())
-        updateDescriptionText(_seekbarViolence, _textViolenceDesc, _textViolenceValue, getViolenceDescriptions())
-    }
-    
-    private fun setupListeners() {
-        _seekbarOffensive.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                updateDescriptionText(seekBar, _textOffensiveDesc, _textOffensiveValue, getOffensiveDescriptions())
-                if (fromUser) {
-                    _moderationsManager.setModerationLevel("hate", progress)
-                }
-            }
-            
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {}
-        })
-        
-        _seekbarExplicit.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                updateDescriptionText(seekBar, _textExplicitDesc, _textExplicitValue, getExplicitDescriptions())
-                if (fromUser) {
-                    _moderationsManager.setModerationLevel("sexual", progress)
-                }
-            }
-            
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {}
-        })
-        
-        _seekbarViolence.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                updateDescriptionText(seekBar, _textViolenceDesc, _textViolenceValue, getViolenceDescriptions())
-                if (fromUser) {
-                    _moderationsManager.setModerationLevel("violence", progress)
-                }
-            }
-            
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {}
-        })
-    }
-    
-    private fun updateDescriptionText(seekBar: SeekBar?, textDesc: TextView, textValue: TextView, descriptions: Array<String>) {
-        val progress = seekBar?.progress ?: 0
-        textDesc.text = descriptions[progress]
-        textValue.text = progress.toString()
-    }
-    
-    private fun getOffensiveDescriptions(): Array<String> {
-        return arrayOf(
-            "Neutral, general terms, no bias or hate.",
-            "Mildly sensitive, factual.",
-            "Potentially offensive content",
-            "Offensive content"
-        )
-    }
-    
-    private fun getExplicitDescriptions(): Array<String> {
-        return arrayOf(
-            "No explicit content",
-            "Mildly suggestive, factual or educational",
-            "Moderate sexual content, non-graphic",
-            "Explicit sexual content"
-        )
-    }
-    
-    private fun getViolenceDescriptions(): Array<String> {
-        return arrayOf(
-            "Non-violent",
-            "Mild violence, factual or contextual",
-            "Moderate violence, some graphic content.",
-            "Graphic violence"
-        )
-    }
-} 

app/src/main/java/com/futo/platformplayer/activities/PolycentricProfileActivity.kt

@@ -49,7 +49,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
     private lateinit var _buttonHelp: ImageButton;
     private lateinit var _editName: EditText;
     private lateinit var _buttonExport: BigButton;
-    private lateinit var _buttonModeration: BigButton;
+    private lateinit var _buttonOpenHarborProfile: BigButton;
     private lateinit var _buttonLogout: BigButton;
     private lateinit var _buttonDelete: BigButton;
     private lateinit var _username: String;
@@ -71,7 +71,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
         _imagePolycentric = findViewById(R.id.image_polycentric);
         _editName = findViewById(R.id.edit_profile_name);
         _buttonExport = findViewById(R.id.button_export);
-        _buttonModeration = findViewById(R.id.button_moderation);
+        _buttonOpenHarborProfile = findViewById(R.id.button_open_harbor_profile);
         _buttonLogout = findViewById(R.id.button_logout);
         _buttonDelete = findViewById(R.id.button_delete);
         _loaderOverlay = findViewById(R.id.loader_overlay);
@@ -99,9 +99,15 @@ class PolycentricProfileActivity : AppCompatActivity() {
             startActivity(Intent(this, PolycentricBackupActivity::class.java));
         };
 
-        _buttonModeration.onClick.subscribe {
+        _buttonOpenHarborProfile.onClick.subscribe {
-            startActivity(Intent(this, PolycentricModerationActivity::class.java));
+            val processHandle = StatePolycentric.instance.processHandle!!;
-        };
+            processHandle?.let {
+                val systemState = SystemState.fromStorageTypeSystemState(Store.instance.getSystemState(it.system));
+                val url = it.system.systemToURLInfoSystemLinkUrl(systemState.servers.asIterable());
+                val navUrl = "https://harbor.social/" + url.substring("polycentric://".length)
+                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(navUrl)))
+            }
+        }
 
         _buttonLogout.onClick.subscribe {
             StatePolycentric.instance.setProcessHandle(null);

app/src/main/java/com/futo/platformplayer/activities/QRCodeFullscreenActivity.kt

@@ -1,109 +0,0 @@
-package com.futo.platformplayer.activities
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.Color
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.View
-import android.widget.ImageButton
-import android.widget.ImageView
-import androidx.appcompat.app.AppCompatActivity
-import com.futo.platformplayer.R
-import com.futo.platformplayer.setNavigationBarColorAndIcons
-import com.futo.platformplayer.states.StateApp
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.EncodeHintType
-import com.google.zxing.MultiFormatWriter
-import com.google.zxing.common.BitMatrix
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
-
-class QRCodeFullscreenActivity : AppCompatActivity() {
-    companion object {
-        private const val EXTRA_QR_TEXT = "qr_text"
-        
-        fun createIntent(context: Context, qrText: String): android.content.Intent {
-            return android.content.Intent(context, QRCodeFullscreenActivity::class.java).apply {
-                putExtra(EXTRA_QR_TEXT, qrText)
-            }
-        }
-    }
-
-    override fun attachBaseContext(newBase: Context?) {
-        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_qr_code_fullscreen)
-        setNavigationBarColorAndIcons()
-
-        val qrText = intent.getStringExtra(EXTRA_QR_TEXT)
-
-        val imageQR = findViewById<ImageView>(R.id.image_qr_fullscreen)
-        val buttonBack = findViewById<ImageButton>(R.id.button_back_fullscreen)
-        val buttonClose = findViewById<ImageButton>(R.id.button_close_fullscreen)
-
-        // Generate QR code bitmap from text
-        qrText?.let { text ->
-            try {
-                if (!isContentSuitableForQRCode(text)) {
-                    throw Exception("Data too big for QR code generation")
-                }
-                
-                val dimension = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP, 300f, resources.displayMetrics
-                ).toInt()
-                val qrBitmap = generateQRCode(text, dimension, dimension)
-                imageQR.setImageBitmap(qrBitmap)
-            } catch (e: Exception) {
-                // If QR generation fails, show error or fallback
-                imageQR.setImageResource(R.drawable.ic_qr)
-            }
-        }
-
-        buttonBack.setOnClickListener {
-            finish()
-        }
-
-        buttonClose.setOnClickListener {
-            finish()
-        }
-
-        imageQR.setOnClickListener {
-            finish()
-        }
-    }
-
-    private fun isContentSuitableForQRCode(content: String): Boolean {
-        val bytes = content.toByteArray(Charsets.UTF_8)
-        return bytes.size <= 2300  // QR Code Version 40 with Error Correction Level M can hold ~2331 bytes
-    }
-
-    private fun generateQRCode(content: String, width: Int, height: Int): Bitmap {
-        if (!isContentSuitableForQRCode(content)) {
-            throw Exception("Data too big for QR code generation")
-        }
-        
-        val hints = java.util.EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
-        hints[EncodeHintType.ERROR_CORRECTION] = ErrorCorrectionLevel.M
-        hints[EncodeHintType.MARGIN] = 1
-        
-        val bitMatrix = MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints)
-        return bitMatrixToBitmap(bitMatrix)
-    }
-
-    private fun bitMatrixToBitmap(matrix: BitMatrix): Bitmap {
-        val width = matrix.width
-        val height = matrix.height
-        val bmp = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565)
-
-        for (x in 0 until width) {
-            for (y in 0 until height) {
-                bmp.setPixel(x, y, if (matrix[x, y]) Color.BLACK else Color.WHITE)
-            }
-        }
-        return bmp
-    }
-}
-

app/src/main/java/com/futo/platformplayer/activities/SettingsActivity.kt

@@ -0,0 +1,208 @@
+package com.futo.platformplayer.activities
+
+import android.annotation.SuppressLint
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.ImageButton
+import android.widget.LinearLayout
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import com.futo.platformplayer.*
+import com.futo.platformplayer.constructs.Event0
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.views.LoaderView
+import com.futo.platformplayer.views.fields.FieldForm
+import com.futo.platformplayer.views.fields.ReadOnlyTextField
+import com.google.android.material.button.MaterialButton
+
+class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
+    private lateinit var _form: FieldForm;
+    private lateinit var _buttonBack: ImageButton;
+    private lateinit var _loaderView: LoaderView;
+
+    private lateinit var _devSets: LinearLayout;
+    private lateinit var _buttonDev: MaterialButton;
+
+    private var _isFinished = false;
+
+    lateinit var overlay: FrameLayout;
+
+    val notifPermission = "android.permission.POST_NOTIFICATIONS";
+    val requestPermissionLauncher =  registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
+        if (isGranted)
+            UIDialogs.toast(this, "Notification permission granted");
+        else
+            UIDialogs.toast(this, "Notification permission denied");
+    }
+
+    override fun attachBaseContext(newBase: Context?) {
+        Logger.i("SettingsActivity", "SettingsActivity.attachBaseContext")
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+        setNavigationBarColorAndIcons();
+
+        _form = findViewById(R.id.settings_form);
+        _buttonBack = findViewById(R.id.button_back);
+        _buttonDev = findViewById(R.id.button_dev);
+        _devSets = findViewById(R.id.dev_settings);
+        _loaderView = findViewById(R.id.loader);
+        overlay = findViewById(R.id.overlay_container);
+
+        _form.onChanged.subscribe { field, _ ->
+            Logger.i("SettingsActivity", "Setting [${field.field?.name}] changed, saving");
+            _form.setObjectValues();
+            Settings.instance.save();
+
+            if(field.descriptor?.id == "app_language") {
+                Logger.i("SettingsActivity", "App language change detected, propogating to shared preferences");
+                StateApp.instance.setLocaleSetting(this, Settings.instance.language.getAppLanguageLocaleString());
+            }
+
+            if(field.descriptor?.id == "background_update") {
+                Logger.i("SettingsActivity", "Detected change in background work ${field.value}");
+                if(Settings.instance.subscriptions.subscriptionsBackgroundUpdateInterval > 0) {
+                    val notifManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
+                    if(!notifManager.areNotificationsEnabled()) {
+                        UIDialogs.toast(this, "Notifications aren't enabled");
+
+                        when {
+                            ContextCompat.checkSelfPermission(this, notifPermission) == PackageManager.PERMISSION_GRANTED -> {
+
+                            }
+                            ActivityCompat.shouldShowRequestPermissionRationale(this, notifPermission) -> {
+                                UIDialogs.showDialog(this, R.drawable.ic_notifications, "Notifications Required",
+                                    "Notifications need to be enabled for background updating to function", null, 0,
+                                    UIDialogs.Action("Cancel", {}),
+                                    UIDialogs.Action("Enable", {
+                                        requestPermissionLauncher.launch(notifPermission);
+                                    }, UIDialogs.ActionStyle.PRIMARY));
+                            }
+                            else -> {
+                                requestPermissionLauncher.launch(notifPermission);
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        _buttonBack.setOnClickListener {
+            finish();
+        }
+
+        _buttonDev.setOnClickListener {
+            startActivity(Intent(this, DeveloperActivity::class.java));
+        }
+
+        _lastActivity = this;
+
+        reloadSettings();
+    }
+
+    var isFirstLoad = true;
+    fun reloadSettings() {
+        val firstLoad = isFirstLoad;
+        isFirstLoad = false;
+        _form.setSearchVisible(false);
+        _loaderView.start();
+        _form.fromObject(lifecycleScope, Settings.instance) {
+            _loaderView.stop();
+            _form.setSearchVisible(true);
+
+            var devCounter = 0;
+            _form.findField("code")?.assume<ReadOnlyTextField>()?.setOnClickListener {
+                devCounter++;
+                if(devCounter > 5) {
+                    devCounter = 0;
+                    SettingsDev.instance.developerMode = true;
+                    SettingsDev.instance.save();
+                    updateDevMode();
+                    UIDialogs.toast(this, getString(R.string.you_are_now_in_developer_mode));
+                }
+            };
+
+            if(firstLoad) {
+                val query = intent.getStringExtra("query");
+                if(!query.isNullOrEmpty()) {
+                    _form.setSearchQuery(query);
+                }
+            }
+        };
+    }
+
+    override fun onResume() {
+        super.onResume()
+        updateDevMode();
+    }
+
+    fun updateDevMode() {
+        if(SettingsDev.instance.developerMode)
+            _devSets.visibility = View.VISIBLE;
+        else
+            _devSets.visibility = View.GONE;
+    }
+
+    override fun finish() {
+        super.finish()
+        _isFinished = true;
+        if(_lastActivity == this)
+            _lastActivity = null;
+        overridePendingTransition(R.anim.slide_lighten, R.anim.slide_out_up)
+    }
+
+
+
+
+    private var resultLauncherMap =  mutableMapOf<Int, (ActivityResult)->Unit>();
+    private var requestCode: Int? = -1;
+    private val resultLauncher: ActivityResultLauncher<Intent> = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()) {
+            result: ActivityResult ->
+        val handler = synchronized(resultLauncherMap) {
+            resultLauncherMap.remove(requestCode);
+        }
+        if(handler != null)
+            handler(result);
+    };
+    override fun launchForResult(intent: Intent, code: Int, handler: (ActivityResult)->Unit) {
+        synchronized(resultLauncherMap) {
+            resultLauncherMap[code] = handler;
+        }
+        requestCode = code;
+        resultLauncher.launch(intent);
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        settingsActivityClosed.emit()
+    }
+
+
+    companion object {
+        //TODO: Temporary for solving Settings issues
+        @SuppressLint("StaticFieldLeak")
+        private var _lastActivity: SettingsActivity? = null;
+
+        val settingsActivityClosed = Event0()
+
+        fun getActivity(): SettingsActivity? {
+            val act = _lastActivity;
+            if(act != null && !act._isFinished)
+                return act;
+            return null;
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/activities/SyncPairActivity.kt

@@ -110,19 +110,7 @@ class SyncPairActivity : AppCompatActivity() {
 
             lifecycleScope.launch(Dispatchers.IO) {
                 try {
-                    var wasCompleted = false
+                    StateSync.instance.syncService?.connect(deviceInfo) { complete, message ->
-
-                    StateSync.instance.syncService?.connect(deviceInfo, true) { complete, message ->
-                        if (wasCompleted) {
-                            Logger.i(TAG, "onStatusUpdate(complete = ${complete}, message = '${message} ignored because wasCompleted')")
-                            return@connect
-                        }
-
-                        if (complete == true) {
-                            wasCompleted = true
-                        }
-
-                        Logger.i(TAG, "onStatusUpdate(complete = ${complete}, message = '${message}')")
                         lifecycleScope.launch(Dispatchers.Main) {
                             if (complete != null) {
                                 if (complete) {

app/src/main/java/com/futo/platformplayer/api/http/server/handlers/HttpProxyHandler.kt

@@ -5,7 +5,6 @@ import android.util.Log
 import com.futo.platformplayer.api.http.server.HttpContext
 import com.futo.platformplayer.api.http.server.HttpHeaders
 import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.api.media.models.modifier.IRequest
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.parsers.HttpResponseParser
 import com.futo.platformplayer.readLine
@@ -28,7 +27,6 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String, priv
     private var _injectReferer = false;
 
     private val _client = ManagedHttpClient();
-    private var _requestModifier: ((String, Map<String, String>) -> IRequest)? = null;
 
     override fun handle(context: HttpContext) {
         if (useTcp) {
@@ -45,33 +43,21 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String, priv
         for (injectHeader in _injectRequestHeader)
             proxyHeaders[injectHeader.first] = injectHeader.second;
 
-        val req = _requestModifier?.invoke(targetUrl, proxyHeaders)
+        val parsed = Uri.parse(targetUrl);
-        var url = targetUrl
-        if (req != null) {
-            req.url?.let {
-                url = it
-            }
-            req.headers.let {
-                proxyHeaders.clear()
-                proxyHeaders.putAll(it)
-            }
-        }
-
-        val parsed = Uri.parse(url);
         if(_injectHost)
             proxyHeaders.put("Host", parsed.host!!);
         if(_injectReferer)
-            proxyHeaders.put("Referer", url);
+            proxyHeaders.put("Referer", targetUrl);
 
         val useMethod = if (method == "inherit") context.method else method;
-        Logger.i(TAG, "handleWithOkHttp Proxied Request ${useMethod}: ${url}");
+        Logger.i(TAG, "handleWithOkHttp Proxied Request ${useMethod}: ${targetUrl}");
         Logger.i(TAG, "handleWithOkHttp Headers:" + proxyHeaders.map { "${it.key}: ${it.value}" }.joinToString("\n"));
 
         val resp = when (useMethod) {
-            "GET" -> _client.get(url, proxyHeaders);
+            "GET" -> _client.get(targetUrl, proxyHeaders);
-            "POST" -> _client.post(url, content ?: "", proxyHeaders);
+            "POST" -> _client.post(targetUrl, content ?: "", proxyHeaders);
-            "HEAD" -> _client.head(url, proxyHeaders)
+            "HEAD" -> _client.head(targetUrl, proxyHeaders)
-            else -> _client.requestMethod(useMethod, url, proxyHeaders);
+            else -> _client.requestMethod(useMethod, targetUrl, proxyHeaders);
         };
 
         Logger.i(TAG, "Proxied Response [${resp.code}]");
@@ -105,23 +91,11 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String, priv
         for (injectHeader in _injectRequestHeader)
             proxyHeaders[injectHeader.first] = injectHeader.second;
 
-        val req = _requestModifier?.invoke(targetUrl, proxyHeaders)
+        val parsed = Uri.parse(targetUrl);
-        var url = targetUrl
-        if (req != null) {
-            req.url?.let {
-                url = it
-            }
-            req.headers.let {
-                proxyHeaders.clear()
-                proxyHeaders.putAll(it)
-            }
-        }
-
-        val parsed = Uri.parse(url);
         if(_injectHost)
             proxyHeaders.put("Host", parsed.host!!);
         if(_injectReferer)
-            proxyHeaders.put("Referer", url);
+            proxyHeaders.put("Referer", targetUrl);
 
         val useMethod = if (method == "inherit") context.method else method;
         Logger.i(TAG, "handleWithTcp Proxied Request ${useMethod}: ${parsed}");
@@ -268,10 +242,6 @@ class HttpProxyHandler(method: String, path: String, val targetUrl: String, priv
         _ignoreRequestHeaders.add("referer");
         return this;
     }
-    fun withRequestModifier(modifier: (String, Map<String, String>) -> IRequest) : HttpProxyHandler {
-        _requestModifier = modifier;
-        return this;
-    }
 
     companion object {
         private const val TAG = "HttpProxyHandler"

app/src/main/java/com/futo/platformplayer/api/media/models/PlatformAuthorLink.kt

@@ -54,16 +54,14 @@ interface IPlatformChannelContent : IPlatformContent {
     val subscribers: Long?
 }
 
-open class JSChannelContent(
+open class JSChannelContent : JSContent, IPlatformChannelContent {
-    config: SourcePluginConfig,
+    override val contentType: ContentType get() = ContentType.CHANNEL
-    obj: V8ValueObject
+    override val thumbnail: String?
-) : JSContent(config, obj), IPlatformChannelContent {
+    override val subscribers: Long?
 
-    final override val contentType: ContentType = ContentType.CHANNEL
+    constructor(config: SourcePluginConfig, obj: V8ValueObject) : super(config, obj) {
-
+        val contextName = "Channel";
-    override val thumbnail: String? =
+        thumbnail = obj.getOrDefault<String>(config, "thumbnail", contextName, null)
-        _content.getOrDefault<String>(_pluginConfig, "thumbnail", "Channel", null)
+        subscribers = if(obj.has("subscribers")) obj.getOrThrow(config,"subscribers", contextName) else null
-
+    }
-    override val subscribers: Long? =
+}
-        _content.getOrDefault<Long>(_pluginConfig, "subscribers", "Channel", null)?.toLong()
-}

app/src/main/java/com/futo/platformplayer/api/media/models/comments/PlatformComment.kt

@@ -6,15 +6,25 @@ import com.futo.platformplayer.api.media.models.ratings.IRating
 import com.futo.platformplayer.api.media.structures.IPager
 import java.time.OffsetDateTime
 
-open class PlatformComment(
+open class PlatformComment : IPlatformComment {
-    override val contextUrl: String,
+    override val contextUrl: String;
-    override val author: PlatformAuthorLink,
+    override val author: PlatformAuthorLink;
-    override val message: String,
+    override val message: String;
-    override val rating: IRating,
+    override val rating: IRating;
-    override val date: OffsetDateTime,
+    override val date: OffsetDateTime;
-    override val replyCount: Int? = null
-) : IPlatformComment {
 
-    override fun getReplies(client: IPlatformClient): IPager<IPlatformComment> =
+    override val replyCount: Int?;
-        NoCommentsPager()
+
-}
+    constructor(contextUrl: String, author: PlatformAuthorLink, msg: String, rating: IRating, date: OffsetDateTime, replyCount: Int? = null) {
+        this.contextUrl = contextUrl;
+        this.author = author;
+        this.message = msg;
+        this.rating = rating;
+        this.date = date;
+        this.replyCount = replyCount;
+    }
+
+    override fun getReplies(client: IPlatformClient): IPager<IPlatformComment> {
+        return NoCommentsPager();
+    }
+}

app/src/main/java/com/futo/platformplayer/api/media/models/streams/LocalVideoUnMuxedSourceDescriptor.kt

@@ -2,24 +2,10 @@ package com.futo.platformplayer.api.media.models.streams
 
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
-import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalAudioContentSource
 import com.futo.platformplayer.downloads.VideoLocal
 
 
-class LocalVideoUnMuxedSourceDescriptor : VideoUnMuxedSourceDescriptor {
+class LocalVideoUnMuxedSourceDescriptor(private val video: VideoLocal) : VideoUnMuxedSourceDescriptor() {
-    override val videoSources: Array<IVideoSource>;
+    override val videoSources: Array<IVideoSource> get() = video.videoSource.toTypedArray();
-    override val audioSources: Array<IAudioSource>;
+    override val audioSources: Array<IAudioSource> get() = video.audioSource.toTypedArray();
-
-    constructor(video: VideoLocal) {
-        videoSources = video.videoSource.toTypedArray();
-        audioSources = video.audioSource.toTypedArray();
-    }
-    constructor(audio: LocalAudioContentSource) {
-        videoSources = arrayOf()
-        audioSources = arrayOf(audio);
-    }
-    constructor(videoSources: Array<IVideoSource>, audioSources: Array<IAudioSource>) {
-        this.videoSources = videoSources;
-        this.audioSources = audioSources;
-    }
 }

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/AudioUrlSource.kt

@@ -14,8 +14,7 @@ class AudioUrlSource(
     override val language: String = Language.UNKNOWN,
     override val duration: Long? = null,
     override var priority: Boolean = false,
-    override var original: Boolean = false,
+    override var original: Boolean = false
-    var isLocal: Boolean = false
 ) : IAudioUrlSource, IStreamMetaDataSource{
     override var streamMetaData: StreamMetaData? = null;
 

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/HLSVariantUrlSource.kt

@@ -41,7 +41,6 @@ class HLSVariantSubtitleUrlSource(
     override val format: String,
 ) : ISubtitleSource {
     override val hasFetch: Boolean = false
-    override val language: String? = null
 
     override fun getSubtitles(): String? {
         return null

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/LocalSubtitleSource.kt

@@ -9,15 +9,13 @@ class LocalSubtitleSource : ISubtitleSource {
     override val name: String;
     override val url: String?;
     override val format: String?;
-    override val language: String?
     override val hasFetch: Boolean get() = false;
 
     val filePath: String;
 
-    constructor(name: String, language: String?, format: String?, filePath: String) {
+    constructor(name: String, format: String?, filePath: String) {
         this.name = name;
         this.format = format;
-        this.language = language
         this.filePath = filePath;
         this.url = Uri.fromFile(File(filePath)).toString();
     }
@@ -34,7 +32,6 @@ class LocalSubtitleSource : ISubtitleSource {
         fun fromSource(source: SubtitleRawSource, path: String): LocalSubtitleSource {
             return LocalSubtitleSource(
                 source.name,
-                source.language,
                 source.format,
                 path
             );

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/SubtitleRawSource.kt

@@ -6,7 +6,6 @@ import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 @kotlinx.serialization.Serializable
 class SubtitleRawSource(
     override val name: String,
-    override val language: String?,
     override val format: String?,
     val _subtitles: String,
     override val url: String? = null,

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/VideoUrlSource.kt

@@ -14,8 +14,7 @@ open class VideoUrlSource(
     override val codec : String = "",
     override val bitrate : Int? = 0,
 
-    override var priority: Boolean = false,
+    override var priority: Boolean = false
-    var isLocal: Boolean = false
 ) : IVideoUrlSource, IStreamMetaDataSource {
     override var streamMetaData: StreamMetaData? = null;
 

app/src/main/java/com/futo/platformplayer/api/media/models/subtitles/ISubtitleSource.kt

@@ -7,7 +7,6 @@ interface ISubtitleSource {
     val url: String?;
     val format: String?;
     val hasFetch: Boolean;
-    val language: String?
 
     fun getSubtitles(): String?;
 

app/src/main/java/com/futo/platformplayer/api/media/models/video/LocalPlatformVideoDetails.kt

@@ -1,122 +0,0 @@
-package com.futo.platformplayer.api.media.models.video
-
-import android.annotation.SuppressLint
-import android.net.Uri
-import android.provider.MediaStore
-import android.provider.OpenableColumns
-import androidx.core.net.toUri
-import com.futo.platformplayer.api.media.IPlatformClient
-import com.futo.platformplayer.api.media.PlatformID
-import com.futo.platformplayer.api.media.Serializer
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.Thumbnails
-import com.futo.platformplayer.api.media.models.comments.IPlatformComment
-import com.futo.platformplayer.api.media.models.contents.ContentType
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
-import com.futo.platformplayer.api.media.models.ratings.IRating
-import com.futo.platformplayer.api.media.models.ratings.RatingLikes
-import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.LocalVideoUnMuxedSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.VideoMuxedSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.sources.AudioUrlSource
-import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
-import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
-import com.futo.platformplayer.api.media.models.streams.sources.LocalAudioSource
-import com.futo.platformplayer.api.media.models.streams.sources.LocalVideoSource
-import com.futo.platformplayer.api.media.models.streams.sources.SubtitleRawSource
-import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
-import com.futo.platformplayer.api.media.platforms.local.models.LocalVideoMuxedSourceDescriptor
-import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalAudioContentSource
-import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoContentSource
-import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoFileSource
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.others.Language
-import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
-import com.futo.platformplayer.states.StateApp
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import java.time.OffsetDateTime
-
-@kotlinx.serialization.Serializable
-open class LocalVideoDetails(
-    override val id: PlatformID,
-    override val name: String,
-    override val thumbnails: Thumbnails,
-    override val author: PlatformAuthorLink,
-    override val url: String,
-    override val duration: Long,
-
-    val mimeType: String? = null,
-    @kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
-    override val datetime: OffsetDateTime?
-) : IPlatformVideo, IPlatformVideoDetails {
-    final override val contentType: ContentType get() = ContentType.MEDIA;
-
-    override var playbackTime: Long = -1;
-    @kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
-    override var playbackDate: OffsetDateTime? = null;
-
-    override val isLive: Boolean get() = false;
-
-    override val dash: IDashManifestSource? get() = null;
-    override val hls: IHLSManifestSource? get() = null;
-    override val live: IVideoSource? get() = null;
-
-
-    override val shareUrl: String = ""
-    override val viewCount: Long = -1
-    override val rating: IRating = RatingLikes(0)
-    override val description: String = "";
-    override val video: IVideoSourceDescriptor = (if(mimeType?.startsWith("audio/") ?: false)
-        (LocalVideoUnMuxedSourceDescriptor(
-            arrayOf(),
-            arrayOf(LocalAudioContentSource(url, mimeType ?: "", name))
-        ))
-        else (LocalVideoMuxedSourceDescriptor(
-            LocalVideoContentSource(url, mimeType ?: "", name)
-        ))
-    );
-    override val preview: ISerializedVideoSourceDescriptor? = null;
-
-    override val subtitles: List<SubtitleRawSource> = listOf()
-    override val isShort: Boolean = false
-
-    fun toJson() : String {
-        return Json.encodeToString(this);
-    }
-    fun fromJson(str : String) : SerializedPlatformVideoDetails {
-        return Serializer.json.decodeFromString<SerializedPlatformVideoDetails>(str);
-    }
-
-    override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? = null;
-    override fun getPlaybackTracker(): IPlaybackTracker? = null;
-    override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? = null;
-
-    companion object {
-        fun fromFile(name: String, filePath: String, mimeType: String? = null) : LocalVideoDetails {
-            if(filePath.startsWith("content://"))
-                return fromContent(filePath, mimeType);
-
-            return LocalVideoDetails(PlatformID("FILE", filePath, null, 0, -1),
-                name, Thumbnails(), PlatformAuthorLink.UNKNOWN, filePath, -1, mimeType, null);
-        }
-        fun fromContent(contentUrl: String, mimeType: String? = null) : LocalVideoDetails {
-            var nameToUse = getFileNameFromContentUrl(contentUrl) ?: "File";
-
-            return LocalVideoDetails(PlatformID("FILE", contentUrl, null, 0, -1),
-                nameToUse, Thumbnails(), PlatformAuthorLink.UNKNOWN, contentUrl, -1, mimeType, null);
-        }
-
-        @SuppressLint("Range")
-        private fun getFileNameFromContentUrl(url: String): String? {
-            val cursor = StateApp.instance.context.contentResolver.query(url.toUri(), null, null, null, null);
-            cursor?.moveToFirst();
-            val fileName = cursor?.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
-            cursor?.close();
-            return fileName;
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/JSClient.kt

@@ -103,7 +103,7 @@ open class JSClient : IPlatformClient {
 
     override val id: String get() = config.id;
     override val name: String get() = config.name;
-    override val icon: ImageVariable get() = StatePlatform.instance.getPlatformIcon(config.id) ?: ImageVariable(config.absoluteIconUrl, null, null)
+    override val icon: ImageVariable;
     override var capabilities: PlatformClientCapabilities = PlatformClientCapabilities();
 
     private var _busyAction = "";
@@ -147,14 +147,15 @@ open class JSClient : IPlatformClient {
     constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String? = null) {
         this._context = context;
         this.config = descriptor.config;
+        icon = StatePlatform.instance.getPlatformIcon(config.id) ?: ImageVariable(config.absoluteIconUrl, null, null);
         this.descriptor = descriptor;
         _injectedSaveState = saveState;
         _auth = descriptor.getAuth();
         _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _httpClient = JSHttpClient(this, null, _captcha, config);
+        _httpClient = JSHttpClient(this, null, _captcha);
-        _httpClientAuth = JSHttpClient(this, _auth, _captcha, config);
+        _httpClientAuth = JSHttpClient(this, _auth, _captcha);
         _plugin = V8Plugin(context, descriptor.config, null, _httpClient, _httpClientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");
@@ -177,6 +178,7 @@ open class JSClient : IPlatformClient {
     constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String?, script: String, withoutCredentials: Boolean = false) {
         this._context = context;
         this.config = descriptor.config;
+        icon = StatePlatform.instance.getPlatformIcon(config.id) ?: ImageVariable(config.absoluteIconUrl, null, null);
         this.descriptor = descriptor;
         _injectedSaveState = saveState;
         if(!withoutCredentials)
@@ -186,8 +188,8 @@ open class JSClient : IPlatformClient {
         _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _httpClient = JSHttpClient(this, null, _captcha, config);
+        _httpClient = JSHttpClient(this, null, _captcha);
-        _httpClientAuth = JSHttpClient(this, _auth, _captcha, config);
+        _httpClientAuth = JSHttpClient(this, _auth, _captcha);
         _plugin = V8Plugin(context, descriptor.config, script, _httpClient, _httpClientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginAuthConfig.kt

@@ -1,11 +1,6 @@
 package com.futo.platformplayer.api.media.platforms.js
 
-import kotlinx.serialization.Contextual
+@kotlinx.serialization.Serializable
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import java.util.Dictionary
-
-@Serializable
 class SourcePluginAuthConfig(
     val loginUrl: String,
     val completionUrl: String? = null,
@@ -16,44 +11,5 @@ class SourcePluginAuthConfig(
     val userAgent: String? = null,
     val loginButton: String? = null,
     val domainHeadersToFind: Map<String, List<String>>? = null,
-    val loginWarning: String? = null,
+    val loginWarning: String? = null
-    val loginWarnings: List<Warning>? = null,
+) { }
-    val uiMods: List<UIMod>? = null
-) {
-
-    @Serializable
-    class Warning(
-        val url: String,
-        val text: String?,
-        val details: String? = null,
-        val once: Boolean? = true
-    ) {
-        @Transient
-        private var _regex: Regex? = null;
-
-        fun getRegex(): Regex {
-            return _regex ?: url.let {
-                val reg = Regex(it);
-                _regex = reg;
-                return reg;
-            }
-        }
-    }
-    @Serializable
-    class UIMod(
-        val url: String,
-        val scale: Float?,
-        val desktop: Boolean?
-    ) {
-        @Contextual
-        private var _regex: Regex? = null;
-
-        fun getRegex(): Regex {
-            return _regex ?: url.let {
-                val reg = Regex(it);
-                _regex = reg;
-                return reg;
-            }
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginConfig.kt

@@ -23,7 +23,7 @@ class SourcePluginConfig(
     //Script
     val repositoryUrl: String? = null,
     val scriptUrl: String = "",
-    var version: Int = -1,
+    val version: Int = -1,
 
     val iconUrl: String? = null,
     var id: String = UUID.randomUUID().toString(),

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/internal/JSHttpClient.kt

@@ -23,7 +23,6 @@ import java.util.UUID
 class JSHttpClient : ManagedHttpClient {
     private val _jsClient: JSClient?;
     private val _jsConfig: SourcePluginConfig?;
-    val config get() = _jsConfig
     private val _auth: SourceAuth?;
     private val _captcha: SourceCaptchaData?;
 
@@ -255,76 +254,6 @@ class JSHttpClient : ManagedHttpClient {
 
         return resp;
     }
-    fun processRequest(method: String, responseCode: Int, url: Uri, headers: Map<String, List<String>>) {
-        if(doUpdateCookies) {
-            val domain = url.host?.lowercase() ?: return;
-            val domainParts = domain.split(".");
-            val defaultCookieDomain =
-                "." + domainParts.drop(domainParts.size - 2).joinToString(".");
-            for (header in headers) {
-                if(header.key.lowercase() == "set-cookie") {
-                    var domainToUse = domain;
-                    val cookie = cookieStringToPair(header.value.first());
-                    var cookieValue = cookie.second;
-
-                    if (cookie.first.isNotEmpty() && cookie.second.isNotEmpty()) {
-                        val cookieParts = cookie.second.split(";");
-                        if (cookieParts.size == 0)
-                            continue;
-                        cookieValue = cookieParts[0].trim();
-
-                        val cookieVariables = cookieParts.drop(1).map {
-                            val splitIndex = it.indexOf("=");
-                            if (splitIndex < 0)
-                                return@map Pair(it.trim().lowercase(), "");
-                            return@map Pair<String, String>(
-                                it.substring(0, splitIndex).lowercase().trim(),
-                                it.substring(splitIndex + 1).trim()
-                            );
-                        }.toMap();
-                        domainToUse = if (cookieVariables.containsKey("domain"))
-                            cookieVariables["domain"]!!.lowercase();
-                        else defaultCookieDomain;
-                        //TODO: Make sure this has no negative effect besides apply cookies to root domain
-                        if(!domainToUse.startsWith("."))
-                            domainToUse = ".${domainToUse}";
-                    }
-
-                    if ((_auth != null || _currentCookieMap.isNotEmpty())) {
-                        val cookieMap = if (_currentCookieMap.containsKey(domainToUse))
-                            _currentCookieMap[domainToUse]!!;
-                        else {
-                            val newMap = hashMapOf<String, String>();
-                            _currentCookieMap[domainToUse] = newMap
-                            newMap;
-                        }
-                        if (cookieMap.containsKey(cookie.first) || doAllowNewCookies)
-                            cookieMap[cookie.first] = cookieValue;
-                    }
-                    else {
-                        val cookieMap = if (_otherCookieMap.containsKey(domainToUse))
-                            _otherCookieMap[domainToUse]!!;
-                        else {
-                            val newMap = hashMapOf<String, String>();
-                            _otherCookieMap[domainToUse] = newMap
-                            newMap;
-                        }
-                        if (cookieMap.containsKey(cookie.first) || doAllowNewCookies)
-                            cookieMap[cookie.first] = cookieValue;
-                    }
-                }
-            }
-        }
-
-        if(_jsClient is DevJSClient) {
-            //val peekBody = resp.peekBody(1000 * 1000).string();
-            StateDeveloper.instance.addDevHttpExchange(
-                StateDeveloper.DevHttpExchange(
-                    StateDeveloper.DevHttpRequest(method, url.toString(), mapOf(*headers.map { Pair(it.key, it.value.joinToString(";")) }.toTypedArray()), ""),
-                    StateDeveloper.DevHttpRequest("RESP", url.toString(), mapOf(*headers.map { Pair(it.key, it.value.joinToString(";")) }.toTypedArray()), "", responseCode)
-                ));
-        }
-    }
 
     private fun cookieStringToPair(cookie: String): Pair<String, String> {
         val cookieKey = cookie.substring(0, cookie.indexOf("="));

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSArticle.kt

@@ -23,22 +23,17 @@ import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getOrThrowNullableList
 import com.futo.platformplayer.states.StateDeveloper
 
-open class JSArticle(
+open class JSArticle : JSContent, IPlatformArticle, IPluginSourced {
-    config: SourcePluginConfig,
+    final override val contentType: ContentType get() = ContentType.ARTICLE;
-    obj: V8ValueObject
-) : JSContent(config, obj), IPlatformArticle, IPluginSourced {
 
-    final override val contentType: ContentType = ContentType.ARTICLE
+    override val summary: String;
+    override val thumbnails: Thumbnails?;
 
-    override val summary: String =
+    constructor(config: SourcePluginConfig, obj: V8ValueObject): super(config, obj) {
-        obj.getOrDefault<String>(config, "summary", "PlatformArticle", "") ?: ""
+        val contextName = "PlatformArticle";
 
-    override val thumbnails: Thumbnails? =
+        summary = _content.getOrDefault(config, "summary", contextName, "") ?: "";
-        if (obj.has("thumbnails"))
+        thumbnails = Thumbnails.fromV8(config, _content.getOrThrow(config, "thumbnails", contextName));
-            Thumbnails.fromV8(
+
-                config,
+    }
-                obj.getOrThrow<V8ValueObject>(config, "thumbnails", "PlatformArticle")
+}
-            )
-        else
-            null
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSArticleDetails.kt

@@ -24,37 +24,36 @@ import com.futo.platformplayer.getOrThrowNullableList
 import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.states.StateDeveloper
 
-open class JSArticleDetails(
+open class JSArticleDetails : JSContent, IPlatformArticleDetails, IPluginSourced, IPlatformContentDetails {
-    private val client: JSClient,
+    final override val contentType: ContentType get() = ContentType.ARTICLE;
-    obj: V8ValueObject
-) : JSContent(client.config, obj), IPlatformArticleDetails, IPluginSourced, IPlatformContentDetails {
 
-    final override val contentType: ContentType = ContentType.ARTICLE
+    private val _hasGetComments: Boolean;
+    private val _hasGetContentRecommendations: Boolean;
 
-    private val _hasGetComments: Boolean = _content.has("getComments")
+    override val rating: IRating;
-    private val _hasGetContentRecommendations: Boolean = _content.has("getContentRecommendations")
 
-    override val rating: IRating =
+    override val summary: String;
-        obj.getOrDefault<V8ValueObject>(client.config, "rating", "PlatformArticle", null)
+    override val thumbnails: Thumbnails?;
-            ?.let { IRating.fromV8(client.config, it, "PlatformArticle") }
+    override val segments: List<IJSArticleSegment>;
-            ?: RatingLikes(0)
 
-    override val summary: String =
+    constructor(client: JSClient, obj: V8ValueObject): super(client.config, obj) {
-        _content.getOrThrow(client.config, "summary", "PlatformArticle")
+        val contextName = "PlatformArticle";
 
-    override val thumbnails: Thumbnails? =
+        rating = obj.getOrDefault<V8ValueObject>(client.config, "rating", contextName, null)?.let { IRating.fromV8(client.config, it, contextName) } ?: RatingLikes(0);
-        if (_content.has("thumbnails"))
+        summary = _content.getOrThrow(client.config, "summary", contextName);
-            Thumbnails.fromV8(
+        if(_content.has("thumbnails"))
-                client.config,
+            thumbnails = Thumbnails.fromV8(client.config, _content.getOrThrow(client.config, "thumbnails", contextName));
-                _content.getOrThrow(client.config, "thumbnails", "PlatformArticle")
-            )
         else
-            null
+            thumbnails = null;
 
-    override val segments: List<IJSArticleSegment> =
+
-        obj.getOrThrowNullableList<V8ValueObject>(client.config, "segments", "PlatformArticle")
+        segments = (obj.getOrThrowNullableList<V8ValueObject>(client.config, "segments", contextName)
-            ?.mapNotNull { fromV8Segment(client, it) }
+            ?.map { fromV8Segment(client, it) }
-            ?: emptyList()
+            ?.filterNotNull() ?: listOf());
+
+        _hasGetComments = _content.has("getComments");
+        _hasGetContentRecommendations = _content.has("getContentRecommendations");
+    }
 
     override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? {
         if(!_hasGetComments || _content.isClosed)

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSContent.kt

@@ -16,49 +16,51 @@ import java.time.LocalDateTime
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
 
-open class JSContent(
+open class JSContent : IPlatformContent, IPluginSourced {
-    protected val _pluginConfig: SourcePluginConfig,
+    protected val _pluginConfig: SourcePluginConfig;
-    protected val _content: V8ValueObject
+    protected val _content : V8ValueObject;
-) : IPlatformContent, IPluginSourced {
 
-    override val contentType: ContentType = ContentType.UNKNOWN
+    protected val _hasGetDetails: Boolean;
 
-    protected val _hasGetDetails: Boolean = _content.has("getDetails")
+    override val contentType: ContentType get() = ContentType.UNKNOWN;
 
-    override val id: PlatformID =
+    override val id: PlatformID;
-        PlatformID.fromV8(_pluginConfig, _content.getOrThrow(_pluginConfig, "id", CTX))
+    override val name: String;
+    override val author: PlatformAuthorLink;
+    override val datetime: OffsetDateTime?;
 
-    override val name: String =
+    override val url: String;
-        HtmlCompat.fromHtml(
+    override val shareUrl: String;
-            _content.getOrThrow<String>(_pluginConfig, "name", CTX).decodeUnicode(),
-            HtmlCompat.FROM_HTML_MODE_LEGACY
-        ).toString()
 
-    override val author: PlatformAuthorLink =
+    override val sourceConfig: SourcePluginConfig get() = _pluginConfig;
-        _content.getOrDefault<V8ValueObject>(_pluginConfig, "author", CTX, null)
-            ?.let { PlatformAuthorLink.fromV8(_pluginConfig, it) }
-            ?: PlatformAuthorLink.UNKNOWN
 
-    private val _epoch: Long? =
+    constructor(config: SourcePluginConfig, obj: V8ValueObject) {
-        _content.getOrDefault<Long>(_pluginConfig, "datetime", CTX, null)?.toLong()
+        _pluginConfig = config;
+        _content = obj;
 
-    override val datetime: OffsetDateTime? =
+        val contextName = "PlatformContent";
-        _epoch?.takeIf { it != 0L }?.let {
-            OffsetDateTime.of(LocalDateTime.ofEpochSecond(it, 0, ZoneOffset.UTC), ZoneOffset.UTC)
-        }
 
-    override val url: String =
+        id = PlatformID.fromV8(_pluginConfig, _content.getOrThrow(config, "id", contextName));
-        _content.getOrThrow<String>(_pluginConfig, "url", CTX)
+        name = HtmlCompat.fromHtml(_content.getOrThrow<String>(config, "name", contextName).decodeUnicode(), HtmlCompat.FROM_HTML_MODE_LEGACY).toString();
 
-    override val shareUrl: String =
+        val authorObj = _content.getOrDefault<V8ValueObject>(config, "author", contextName, null);
-        _content.getOrDefault<String>(_pluginConfig, "shareUrl", CTX, null) ?: url
+        if(authorObj != null)
+            author = PlatformAuthorLink.fromV8(_pluginConfig, authorObj);
+        else
+            author = PlatformAuthorLink.UNKNOWN;
 
-    override val sourceConfig: SourcePluginConfig
+        val datetimeInt = _content.getOrDefault<Int>(config, "datetime", contextName, null)?.toLong();
-        get() = _pluginConfig
+        if(datetimeInt == null || datetimeInt == 0.toLong())
+            datetime = null;
+        else
+            datetime = OffsetDateTime.of(LocalDateTime.ofEpochSecond(datetimeInt, 0, ZoneOffset.UTC), ZoneOffset.UTC);
+        url = _content.getOrThrow(config, "url", contextName);
+        shareUrl = _content.getOrDefault<String>(config, "shareUrl", contextName, null) ?: url;
 
-    fun getUnderlyingObject(): V8ValueObject? = _content
+        _hasGetDetails = _content.has("getDetails");
-
-    companion object {
-        private const val CTX = "PlatformContent"
     }
-}
+
+    fun getUnderlyingObject(): V8ValueObject? {
+        return _content;
+    }
+}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPlaylist.kt

@@ -6,16 +6,14 @@ import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.getOrDefault
 
-open class JSPlaylist(
+open class JSPlaylist : JSContent, IPlatformPlaylist {
-    config: SourcePluginConfig,
+    override val contentType: ContentType get() = ContentType.PLAYLIST;
-    obj: V8ValueObject
+    override val thumbnail: String?;
-) : JSContent(config, obj), IPlatformPlaylist {
+    override val videoCount: Int;
 
-    override val contentType: ContentType = ContentType.PLAYLIST
+    constructor(config: SourcePluginConfig, obj: V8ValueObject) : super(config, obj) {
-
+        val contextName = "Playlist";
-    override val thumbnail: String? =
+        thumbnail = obj.getOrDefault(config, "thumbnail", contextName, null);
-        _content.getOrDefault<String>(_pluginConfig, "thumbnail", "Playlist", null)
+        videoCount = obj.getOrDefault(config, "videoCount", contextName, -1)!!;
-
+    }
-    override val videoCount: Int =
+}
-        _content.getOrDefault<Int>(_pluginConfig, "videoCount", "Playlist", null)?.toInt() ?: -1
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSSubtitleSource.kt

@@ -5,7 +5,6 @@ import com.caoccao.javet.values.primitive.V8ValueString
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
-import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getSourcePlugin
 import com.futo.platformplayer.invokeV8
@@ -23,7 +22,6 @@ class JSSubtitleSource : ISubtitleSource {
     override val name: String;
     override val url: String?;
     override val format: String?;
-    override val language: String?
     override val hasFetch: Boolean;
 
     constructor(config: SourcePluginConfig, v8Value: V8ValueObject) {
@@ -31,7 +29,6 @@ class JSSubtitleSource : ISubtitleSource {
 
         val context = "JSSubtitles";
         name = v8Value.getOrThrow(config, "name", context, false);
-        language = v8Value.getOrDefault(config, "language", context, null);
         url = v8Value.getOrThrow(config, "url", context, true);
         format = v8Value.getOrThrow(config, "format", context, true);
         hasFetch = v8Value.has("getSubtitles");

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSAudioUrlSource.kt

@@ -8,44 +8,43 @@ import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 
-open class JSAudioUrlSource(
+open class JSAudioUrlSource : IAudioUrlSource, JSSource {
-    plugin: JSClient,
+    override val name: String;
-    obj: V8ValueObject
+    override val bitrate : Int;
-) : JSSource(TYPE_AUDIOURL, plugin, obj), IAudioUrlSource {
+    override val container : String;
+    override val codec: String;
+    private val url : String;
 
-    private val ctx = "AudioUrlSource"
+    override val language: String;
-    private val cfg = plugin.config
 
-    override val bitrate: Int =
+    override val duration: Long?;
-        _obj.getOrThrow<Int>(cfg, "bitrate", ctx)
 
-    override val container: String =
+    override var priority: Boolean = false;
-        _obj.getOrThrow<String>(cfg, "container", ctx)
 
-    override val codec: String =
+    override var original: Boolean = false;
-        _obj.getOrThrow<String>(cfg, "codec", ctx)
 
-    private val url: String =
+    constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_AUDIOURL, plugin, obj) {
-        _obj.getOrThrow<String>(cfg, "url", ctx)
+        val contextName = "AudioUrlSource";
+        val config = plugin.config;
 
-    override val language: String =
+        bitrate = _obj.getOrThrow(config, "bitrate", contextName);
-        _obj.getOrThrow<String>(cfg, "language", ctx)
+        container = _obj.getOrThrow(config, "container", contextName);
+        codec = _obj.getOrThrow(config, "codec", contextName);
+        url = _obj.getOrThrow(config, "url", contextName);
+        language = _obj.getOrThrow(config, "language", contextName);
+        duration = _obj.getOrDefault(config, "duration", contextName, null);
 
-    override val duration: Long? =
+        name = _obj.getOrDefault(config, "name", contextName, "${container} ${bitrate}") ?: "${container} ${bitrate}";
-        _obj.getOrDefault<Long>(cfg, "duration", ctx, null)?.toLong()
 
-    override val name: String =
+        priority = if(_obj.has("priority")) obj.getOrThrow(config, "priority", contextName) else false;
-        _obj.getOrDefault<String>(cfg, "name", ctx, null)
+        original =  if(_obj.has("original")) obj.getOrThrow(config, "original", contextName) else false;
-            ?: "$container $bitrate"
+    }
 
-    override var priority: Boolean =
+    override fun getAudioUrl() : String {
-        if (_obj.has("priority")) _obj.getOrThrow<Boolean>(cfg, "priority", ctx) else false
+        return url;
+    }
 
-    override var original: Boolean =
+    override fun toString(): String {
-        if (_obj.has("original")) _obj.getOrThrow<Boolean>(cfg, "original", ctx) else false
+        return "(name=$name, container=$container, bitrate=$bitrate, codec=$codec, url=$url, language=$language, duration=$duration)";
-
+    }
-    override fun getAudioUrl(): String = url
+}
-
-    override fun toString(): String =
-        "(name=$name, container=$container, bitrate=$bitrate, codec=$codec, url=$url, language=$language, duration=$duration)"
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawAudioSource.kt

@@ -17,7 +17,6 @@ import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.invokeV8Async
-import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.others.Language
 import com.futo.platformplayer.states.StateDeveloper
 import kotlinx.coroutines.CompletableDeferred
@@ -58,24 +57,12 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
         hasGenerate = _obj.has("generate");
     }
 
-    private var _pregenerate: V8Deferred<String?>? = null;
-    fun pregenerateAsync(scope: CoroutineScope): V8Deferred<String?>? {
-        _pregenerate = generateAsync(scope);
-        return _pregenerate;
-    }
-
     override fun generateAsync(scope: CoroutineScope): V8Deferred<String?> {
         if(!hasGenerate)
             return V8Deferred(CompletableDeferred(manifest));
         if(_obj.isClosed)
             throw IllegalStateException("Source object already closed");
 
-        val pregenerated = _pregenerate;
-        if(pregenerated != null) {
-            Logger.w("JSDashManifestRawAudioSource", "Returning pre-generated audio");
-            return pregenerated;
-        }
-
         val plugin = _plugin.getUnderlyingPlugin();
 
         var result: V8Deferred<V8ValueString>? = null;

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawSource.kt

@@ -18,7 +18,6 @@ import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.invokeV8Async
-import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateDeveloper
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
@@ -31,55 +30,39 @@ interface IJSDashManifestRawSource {
     fun generateAsync(scope: CoroutineScope): Deferred<String?>;
     fun generate(): String?;
 }
-open class JSDashManifestRawSource(
+open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSource, IStreamMetaDataSource {
-    plugin: JSClient,
+    override val container : String;
-    obj: V8ValueObject
+    override val name : String;
-) : JSSource(TYPE_DASH_RAW, plugin, obj), IVideoSource, IJSDashManifestRawSource, IStreamMetaDataSource {
+    override val width: Int;
+    override val height: Int;
+    override val codec: String;
+    override val bitrate: Int?;
+    override val duration: Long;
+    override val priority: Boolean;
 
-    private val ctx = "DashRawSource"
+    val url: String?;
-    private val cfg = plugin.config
+    override var manifest: String?;
 
-    override val container: String =
+    override val hasGenerate: Boolean;
-        _obj.getOrDefault<String>(cfg, "container", ctx, null) ?: "application/dash+xml"
+    val canMerge: Boolean;
 
-    override val name: String =
+    override var streamMetaData: StreamMetaData? = null;
-        _obj.getOrThrow<String>(cfg, "name", ctx)
 
-    override val width: Int =
+    constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_DASH_RAW, plugin, obj) {
-        _obj.getOrDefault<Int>(cfg, "width", ctx, null)?.toInt() ?: 0
+        val contextName = "DashRawSource";
-
+        val config = plugin.config;
-    override val height: Int =
+        name = _obj.getOrThrow(config, "name", contextName);
-        _obj.getOrDefault<Int>(cfg, "height", ctx, null)?.toInt() ?: 0
+        url = _obj.getOrThrow(config, "url", contextName);
-
+        container = _obj.getOrDefault<String>(config, "container", contextName, null) ?: "application/dash+xml";
-    override val codec: String =
+        manifest = _obj.getOrDefault<String>(config, "manifest", contextName, null);
-        _obj.getOrDefault<String>(cfg, "codec", ctx, "") ?: ""
+        width = _obj.getOrDefault(config, "width", contextName, 0) ?: 0;
-
+        height = _obj.getOrDefault(config, "height", contextName, 0) ?: 0;
-    override val bitrate: Int? =
+        codec = _obj.getOrDefault(config, "codec", contextName, "") ?: "";
-        _obj.getOrDefault<Int>(cfg, "bitrate", ctx, null)?.toInt()
+        bitrate = _obj.getOrDefault(config, "bitrate", contextName, 0) ?: 0;
-
+        duration = _obj.getOrDefault(config, "duration", contextName, 0) ?: 0;
-    override val duration: Long =
+        priority = _obj.getOrDefault(config, "priority", contextName, false) ?: false;
-        _obj.getOrDefault<Long>(cfg, "duration", ctx, 0)?.toLong() ?: 0L
+        canMerge = _obj.getOrDefault(config, "canMerge", contextName, false) ?: false;
-
+        hasGenerate = _obj.has("generate");
-    override val priority: Boolean =
-        _obj.getOrDefault<Boolean>(cfg, "priority", ctx, false) ?: false
-
-    val url: String? =
-        _obj.getOrDefault<String>(cfg, "url", ctx, null)
-
-    override var manifest: String? =
-        _obj.getOrDefault<String>(cfg, "manifest", ctx, null)
-
-    override val hasGenerate: Boolean = _obj.has("generate")
-
-    val canMerge: Boolean =
-        _obj.getOrDefault<Boolean>(cfg, "canMerge", ctx, false) ?: false
-
-    override var streamMetaData: StreamMetaData? = null
-
-    private var _pregenerate: V8Deferred<String?>? = null
-    fun pregenerateAsync(scope: CoroutineScope): V8Deferred<String?>? {
-        _pregenerate = generateAsync(scope);
-        return _pregenerate;
     }
 
     override fun generateAsync(scope: CoroutineScope): V8Deferred<String?> {
@@ -87,11 +70,6 @@ open class JSDashManifestRawSource(
             return V8Deferred(CompletableDeferred(manifest));
         if(_obj.isClosed)
             throw IllegalStateException("Source object already closed");
-        val pregenerated = _pregenerate;
-        if(pregenerated != null) {
-            Logger.w("JSDashManifestRawSource", "Returning pre-generated video");
-            return pregenerated;
-        }
 
         val plugin = _plugin.getUnderlyingPlugin();
 

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSVideoUrlSource.kt

@@ -5,47 +5,42 @@ import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
-import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 
-open class JSVideoUrlSource(
+open class JSVideoUrlSource : IVideoUrlSource, JSSource {
-    plugin: JSClient,
+    override val width : Int;
-    obj: V8ValueObject
+    override val height : Int;
-) : JSSource(TYPE_VIDEOURL, plugin, obj), IVideoUrlSource {
+    override val container : String;
+    override val codec: String;
+    override val name : String;
+    override val bitrate : Int;
+    override val duration: Long;
+    private val url : String;
 
-    private val ctx = "JSVideoUrlSource"
+    override var priority: Boolean = false;
-    private val cfg = plugin.config
 
-    override val width: Int =
+    constructor(plugin: JSClient, obj: V8ValueObject): super(TYPE_VIDEOURL, plugin, obj) {
-        _obj.getOrThrow<Int>(cfg, "width", ctx)
+        val contextName = "JSVideoUrlSource";
+        val config = plugin.config;
 
-    override val height: Int =
+        width = _obj.getOrThrow(config, "width", contextName);
-        _obj.getOrThrow<Int>(cfg, "height", ctx)
+        height = _obj.getOrThrow(config, "height", contextName);
+        container = _obj.getOrThrow(config, "container", contextName);
+        codec = _obj.getOrThrow(config, "codec", contextName);
+        name = _obj.getOrThrow(config, "name", contextName);
+        bitrate = _obj.getOrThrow(config, "bitrate", contextName);
+        duration = _obj.getOrThrow<Int>(config, "duration", contextName).toLong();
+        url = _obj.getOrThrow(config, "url", contextName);
 
-    override val container: String =
+        priority = obj.getOrNull(config, "priority", contextName) ?: false;
-        _obj.getOrThrow<String>(cfg, "container", ctx)
+    }
 
-    override val codec: String =
+    override fun getVideoUrl() : String {
-        _obj.getOrThrow<String>(cfg, "codec", ctx)
+        return url;
+    }
 
-    override val name: String =
+    override fun toString(): String {
-        _obj.getOrThrow<String>(cfg, "name", ctx)
+        return "(width=$width, height=$height, container=$container, codec=$codec, name=$name, bitrate=$bitrate, duration=$duration, url=$url)"
-
+    }
-    override val bitrate: Int =
+}
-        _obj.getOrThrow<Int>(cfg, "bitrate", ctx)
-
-    override val duration: Long =
-        _obj.getOrThrow<Long>(cfg, "duration", ctx)
-
-    private val url: String =
-        _obj.getOrThrow<String>(cfg, "url", ctx)
-
-    override var priority: Boolean =
-        _obj.getOrDefault<Boolean>(cfg, "priority", ctx, false) ?: false
-
-    override fun getVideoUrl(): String = url
-
-    override fun toString(): String =
-        "(width=$width, height=$height, container=$container, codec=$codec, name=$name, bitrate=$bitrate, duration=$duration, url=$url)"
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/LocalClient.kt

@@ -1,160 +1,5 @@
 package com.futo.platformplayer.api.media.platforms.local
 
-import android.content.ContentResolver
+class LocalClient {
-import android.net.Uri
+    //TODO
-import android.provider.MediaStore
-import com.futo.platformplayer.R
-import com.futo.platformplayer.api.media.IPlatformClient
-import com.futo.platformplayer.api.media.PlatformClientCapabilities
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.ResultCapabilities
-import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
-import com.futo.platformplayer.api.media.models.chapters.IChapter
-import com.futo.platformplayer.api.media.models.comments.IPlatformComment
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
-import com.futo.platformplayer.api.media.models.live.ILiveChatWindowDescriptor
-import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
-import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.api.media.structures.EmptyPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.engine.exceptions.ScriptUnavailableException
-import com.futo.platformplayer.models.ImageVariable
-import com.futo.platformplayer.states.StateLibrary
-import java.net.MalformedURLException
-
-class LocalClient: IPlatformClient {
-    override val id: String  = "LOCAL"
-    override val name: String = "Local"
-    override val icon: ImageVariable? = ImageVariable.fromResource(R.drawable.ic_library)
-    override val capabilities: PlatformClientCapabilities = PlatformClientCapabilities()
-
-    override fun initialize() {}
-
-    override fun disable() {
-
-    }
-
-    override fun getHome(): IPager<IPlatformContent>
-        = EmptyPager();
-
-    override fun isContentDetailsUrl(url: String): Boolean {
-        try {
-            val uri = Uri.parse(url);
-            return ContentResolver.SCHEME_CONTENT == uri.scheme
-                    && (
-                        MediaStore.AUTHORITY == uri.authority ||
-                        uri.authority == "com.android.externalstorage.documents"
-                    )
-        }
-        catch(ex: MalformedURLException) {
-            return false;
-        }
-    }
-
-    val audioExtensions = listOf(".mp3", ".wav", ".flac", ".mp4a", ".m4a");
-    override fun getContentDetails(url: String): IPlatformContentDetails {
-        val uri = Uri.parse(url);
-
-        if("audio" in uri.pathSegments) {
-            return StateLibrary.getAudioTrack(url) ?: throw Exception("Failed to find ${url}");
-        }
-        else if("video" in uri.pathSegments) {
-            return StateLibrary.getVideoTrack(url) ?: throw Exception("Failed to find ${url}");
-        }
-        else if(uri.toString().contains("com.android.externalstorage.documents")) {
-            if(audioExtensions.any { uri.lastPathSegment?.lowercase()?.endsWith(it) ?: false })
-                return StateLibrary.getAudioTrack(url) ?: throw Exception("Failed to find ${url}");
-            else
-                return StateLibrary.getVideoTrack(url) ?: throw Exception("Failed to find ${url}");
-        }
-        else
-            throw Exception("Unknown content url [${url}]");
-    }
-
-    override fun getSearchCapabilities(): ResultCapabilities
-        = ResultCapabilities();
-    override fun search(query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> {
-        return EmptyPager(); //TODO
-    }
-
-    override fun getSearchChannelContentsCapabilities(): ResultCapabilities
-        = ResultCapabilities();
-    override fun searchChannelContents(channelUrl: String, query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> {
-        return EmptyPager(); //TODO
-    }
-
-    override fun searchChannels(query: String): IPager<PlatformAuthorLink> {
-        return EmptyPager(); //TODO
-    }
-
-    override fun searchChannelsAsContent(query: String): IPager<IPlatformContent> {
-        return EmptyPager(); //TODO
-    }
-
-    override fun isChannelUrl(url: String): Boolean {
-        return false //TODO
-    }
-
-    override fun getChannel(channelUrl: String): IPlatformChannel {
-        throw NotImplementedError();
-    }
-
-    override fun getChannelCapabilities(): ResultCapabilities
-        = ResultCapabilities();
-    override fun getChannelContents(channelUrl: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> {
-        return EmptyPager();
-    }
-
-    override fun getChannelPlaylists(channelUrl: String): IPager<IPlatformPlaylist> {
-        return EmptyPager();
-    }
-
-    override fun getPeekChannelTypes(): List<String> = listOf();
-
-    override fun peekChannelContents(channelUrl: String, type: String?): List<IPlatformContent>
-        = listOf();
-
-    override fun getShorts(): IPager<IPlatformVideo> = EmptyPager();
-
-    override fun searchSuggestions(query: String): Array<String> = arrayOf();
-
-    override fun getChannelUrlByClaim(claimType: Int, claimValues: Map<Int, String>): String?
-            = null;
-
-    override fun getContentChapters(url: String): List<IChapter>
-        = listOf();
-
-    override fun getPlaybackTracker(url: String): IPlaybackTracker?
-        = null;
-
-    override fun getContentRecommendations(url: String): IPager<IPlatformContent>?
-        = null;
-
-    override fun getComments(url: String): IPager<IPlatformComment>
-        = EmptyPager();
-
-    override fun getSubComments(comment: IPlatformComment): IPager<IPlatformComment>
-        = EmptyPager();
-
-    override fun getLiveChatWindow(url: String): ILiveChatWindowDescriptor?
-        = null;
-
-    override fun getLiveEvents(url: String): IPager<IPlatformLiveEvent>?
-        = null;
-
-    override fun searchPlaylists(query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent>
-        = throw NotImplementedError();
-
-    override fun isPlaylistUrl(url: String): Boolean = false;
-
-    override fun getPlaylist(url: String): IPlatformPlaylistDetails
-        = throw NotImplementedError();
-    override fun getUserPlaylists(): Array<String> = throw NotImplementedError();
-    override fun getUserSubscriptions(): Array<String> = throw NotImplementedError();
-    override fun getUserHistory(): IPager<IPlatformContent> = throw NotImplementedError();
-    override fun isClaimTypeSupported(claimType: Int): Boolean = false;
 }

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/LocalVideoMuxedSourceDescriptor.kt

@@ -1,23 +1,13 @@
 package com.futo.platformplayer.api.media.platforms.local.models
 
 import com.futo.platformplayer.api.media.models.streams.VideoMuxedSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.streams.sources.LocalVideoSource
-import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoContentSource
 import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoFileSource
 import com.futo.platformplayer.downloads.VideoLocal
 
-class LocalVideoMuxedSourceDescriptor: VideoMuxedSourceDescriptor {
+class LocalVideoMuxedSourceDescriptor(
-    override val videoSources: Array<IVideoSource>;
+    private val video: LocalVideoFileSource
-
+) : VideoMuxedSourceDescriptor() {
-    constructor(video: LocalVideoFileSource) {
+    override val videoSources: Array<IVideoSource> get() = arrayOf(video);
-        videoSources = arrayOf(video);
-    }
-    constructor(video: LocalVideoContentSource) {
-        videoSources = arrayOf(video);
-    }
-    constructor(videoSources: Array<IVideoSource>) {
-        this.videoSources = videoSources;
-    }
 }

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalAudioContentSource.kt

@@ -1,33 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.local.models.sources
-
-import android.content.Context
-import android.provider.MediaStore
-import android.provider.MediaStore.Video
-import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
-import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
-import com.futo.platformplayer.helpers.VideoHelper
-import com.futo.platformplayer.others.Language
-import java.io.File
-
-class LocalAudioContentSource : IAudioSource {
-
-    override val name: String;
-    override val container: String;
-    override val codec: String = ""
-    override val bitrate: Int = 0
-    override val duration: Long;
-    override val priority: Boolean = false;
-    override val language: String = Language.UNKNOWN
-    override val original: Boolean = false;
-
-    var contentUrl: String;
-
-    constructor(contentUrl: String, mime: String, name: String? = null) {
-        this.name = name ?: "File";
-        container = mime;
-        duration = 0;
-
-        this.contentUrl = contentUrl;
-    }
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalAudioFileSource.kt

@@ -1,34 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.local.models.sources
-
-import android.content.Context
-import android.provider.MediaStore
-import android.provider.MediaStore.Video
-import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
-import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
-import com.futo.platformplayer.helpers.VideoHelper
-import com.futo.platformplayer.others.Language
-import java.io.File
-
-class LocalAudioFileSource: IAudioSource {
-
-
-    override val name: String;
-    override val container: String;
-    override val codec: String = ""
-    override val bitrate: Int = 0
-    override val duration: Long;
-    override val priority: Boolean = false;
-    override val language: String = Language.UNKNOWN;
-    override val original: Boolean = false;
-
-    var file: File;
-
-    constructor(file: File) {
-        this.file = file;
-        name = file.name;
-        container = VideoHelper.videoExtensionToMimetype(file.extension) ?: "";
-        duration = 0;
-    }
-
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoContentSource.kt

@@ -1,33 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.local.models.sources
-
-import android.content.Context
-import android.provider.MediaStore
-import android.provider.MediaStore.Video
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
-import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
-import com.futo.platformplayer.helpers.VideoHelper
-import java.io.File
-
-class LocalVideoContentSource: IVideoSource {
-
-
-    override val name: String;
-    override val width: Int;
-    override val height: Int;
-    override val container: String;
-    override val codec: String = ""
-    override val bitrate: Int = 0
-    override val duration: Long;
-    override val priority: Boolean = false;
-
-    var contentUrl: String;
-
-    constructor(contentUrl: String, mime: String, name: String? = null) {
-        this.name = name ?: "File";
-        width = 0;
-        height = 0;
-        container = mime;
-        duration = 0;
-        this.contentUrl = contentUrl;
-    }
-}

app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoFileSource.kt

@@ -20,10 +20,7 @@ class LocalVideoFileSource: IVideoSource {
     override val duration: Long;
     override val priority: Boolean = false;
 
-    var file: File;
-
     constructor(file: File) {
-        this.file = file;
         name = file.name;
         width = 0;
         height = 0;

app/src/main/java/com/futo/platformplayer/api/media/structures/MultiDistributionContentPager.kt

@@ -12,7 +12,7 @@ class MultiDistributionContentPager<T : IPlatformContent> : MultiPager<T> {
     private val dist : HashMap<IPager<T>, Float>;
     private val distConsumed : HashMap<IPager<T>, Float>;
 
-    constructor(pagers : Map<IPager<T>, Float>, pageSize: Int = 9) : super(pagers.keys.toMutableList(), false, pageSize) {
+    constructor(pagers : Map<IPager<T>, Float>) : super(pagers.keys.toMutableList()) {
         val distTotal = pagers.values.sum();
         dist = HashMap();
 

app/src/main/java/com/futo/platformplayer/casting/AirPlayCastingDevice.kt

@@ -15,7 +15,7 @@ import kotlinx.coroutines.launch
 import java.net.InetAddress
 import java.util.UUID
 
-class AirPlayCastingDevice : CastingDeviceLegacy {
+class AirPlayCastingDevice : CastingDevice {
     //See for more info: https://nto.github.io/AirPlay
 
     override val protocol: CastProtocolType get() = CastProtocolType.AIRPLAY;

app/src/main/java/com/futo/platformplayer/casting/CastingDevice.kt

@@ -2,78 +2,147 @@ package com.futo.platformplayer.casting
 
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.models.CastingDeviceInfo
-import org.fcast.sender_sdk.Metadata
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import java.net.InetAddress
 
-abstract class CastingDevice {
+enum class CastConnectionState {
-    abstract val isReady: Boolean
+    DISCONNECTED,
-    abstract val usedRemoteAddress: InetAddress?
+    CONNECTING,
-    abstract val localAddress: InetAddress?
+    CONNECTED
-    abstract val name: String?
-    abstract val onConnectionStateChanged: Event1<CastConnectionState>
-    abstract val onPlayChanged: Event1<Boolean>
-    abstract val onTimeChanged: Event1<Double>
-    abstract val onDurationChanged: Event1<Double>
-    abstract val onVolumeChanged: Event1<Double>
-    abstract val onSpeedChanged: Event1<Double>
-    abstract var connectionState: CastConnectionState
-    abstract val protocolType: CastProtocolType
-    abstract var isPlaying: Boolean
-    abstract val expectedCurrentTime: Double
-    abstract var speed: Double
-    abstract var time: Double
-    abstract var duration: Double
-    abstract var volume: Double
-    abstract fun canSetVolume(): Boolean
-    abstract fun canSetSpeed(): Boolean
-
-    @Throws
-    abstract fun resumePlayback()
-
-    @Throws
-    abstract fun pausePlayback()
-
-    @Throws
-    abstract fun stopPlayback()
-
-    @Throws
-    abstract fun seekTo(timeSeconds: Double)
-
-    @Throws
-    abstract fun changeVolume(timeSeconds: Double)
-
-    @Throws
-    abstract fun changeSpeed(speed: Double)
-
-    @Throws
-    abstract fun connect()
-
-    @Throws
-    abstract fun disconnect()
-    abstract fun getDeviceInfo(): CastingDeviceInfo
-    abstract fun getAddresses(): List<InetAddress>
-
-    @Throws
-    abstract fun loadVideo(
-        streamType: String,
-        contentType: String,
-        contentId: String,
-        resumePosition: Double,
-        duration: Double,
-        speed: Double?,
-        metadata: Metadata?
-    )
-
-    @Throws
-    abstract fun loadContent(
-        contentType: String,
-        content: String,
-        resumePosition: Double,
-        duration: Double,
-        speed: Double?,
-        metadata: Metadata?
-    )
-
-    abstract fun ensureThreadStarted()
 }
 
+@Serializable(with = CastProtocolType.CastProtocolTypeSerializer::class)
+enum class CastProtocolType {
+    CHROMECAST,
+    AIRPLAY,
+    FCAST;
+
+    object CastProtocolTypeSerializer : KSerializer<CastProtocolType> {
+        override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("CastProtocolType", PrimitiveKind.STRING)
+
+        override fun serialize(encoder: Encoder, value: CastProtocolType) {
+            encoder.encodeString(value.name)
+        }
+
+        override fun deserialize(decoder: Decoder): CastProtocolType {
+            val name = decoder.decodeString()
+            return when (name) {
+                "FASTCAST" -> FCAST // Handle the renamed case
+                else -> CastProtocolType.valueOf(name)
+            }
+        }
+    }
+}
+
+abstract class CastingDevice {
+    abstract val protocol: CastProtocolType;
+    abstract val isReady: Boolean;
+    abstract var usedRemoteAddress: InetAddress?;
+    abstract var localAddress: InetAddress?;
+    abstract val canSetVolume: Boolean;
+    abstract val canSetSpeed: Boolean;
+
+    var name: String? = null;
+    var isPlaying: Boolean = false
+            set(value) {
+                val changed = value != field;
+                field = value;
+                if (changed) {
+                    onPlayChanged.emit(value);
+                }
+            };
+
+    private var lastTimeChangeTime_ms: Long = 0
+    var time: Double = 0.0
+        private set
+
+    protected fun setTime(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
+        if (changeTime_ms > lastTimeChangeTime_ms && value != time) {
+            time = value
+            lastTimeChangeTime_ms = changeTime_ms
+            onTimeChanged.emit(value)
+        }
+    }
+
+    private var lastDurationChangeTime_ms: Long = 0
+    var duration: Double = 0.0
+        private set
+
+    protected fun setDuration(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
+        if (changeTime_ms > lastDurationChangeTime_ms && value != duration) {
+            duration = value
+            lastDurationChangeTime_ms = changeTime_ms
+            onDurationChanged.emit(value)
+        }
+    }
+
+    private var lastVolumeChangeTime_ms: Long = 0
+    var volume: Double = 1.0
+        private set
+
+    protected fun setVolume(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
+        if (changeTime_ms > lastVolumeChangeTime_ms && value != volume) {
+            volume = value
+            lastVolumeChangeTime_ms = changeTime_ms
+            onVolumeChanged.emit(value)
+        }
+    }
+
+    private var lastSpeedChangeTime_ms: Long = 0
+    var speed: Double = 1.0
+        private set
+
+    protected fun setSpeed(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
+        if (changeTime_ms > lastSpeedChangeTime_ms && value != speed) {
+            speed = value
+            lastSpeedChangeTime_ms = changeTime_ms
+            onSpeedChanged.emit(value)
+        }
+    }
+
+    val expectedCurrentTime: Double
+        get() {
+            val diff = if (isPlaying) ((System.currentTimeMillis() - lastTimeChangeTime_ms).toDouble() / 1000.0) else 0.0;
+            return time + diff;
+        };
+    var connectionState: CastConnectionState = CastConnectionState.DISCONNECTED
+        set(value) {
+            val changed = value != field;
+            field = value;
+
+            if (changed) {
+                onConnectionStateChanged.emit(value);
+            }
+        };
+
+    var onConnectionStateChanged = Event1<CastConnectionState>();
+    var onPlayChanged = Event1<Boolean>();
+    var onTimeChanged = Event1<Double>();
+    var onDurationChanged = Event1<Double>();
+    var onVolumeChanged = Event1<Double>();
+    var onSpeedChanged = Event1<Double>();
+
+    abstract fun stopCasting();
+
+    abstract fun seekVideo(timeSeconds: Double);
+    abstract fun stopVideo();
+    abstract fun pauseVideo();
+    abstract fun resumeVideo();
+    abstract fun loadVideo(streamType: String, contentType: String, contentId: String, resumePosition: Double, duration: Double, speed: Double?);
+    abstract fun loadContent(contentType: String, content: String, resumePosition: Double, duration: Double, speed: Double?);
+    open fun changeVolume(volume: Double) { throw NotImplementedError() }
+    open fun changeSpeed(speed: Double) { throw NotImplementedError() }
+
+    abstract fun start();
+    abstract fun stop();
+
+    abstract fun getDeviceInfo(): CastingDeviceInfo;
+
+    abstract fun getAddresses(): List<InetAddress>;
+}

app/src/main/java/com/futo/platformplayer/casting/CastingDeviceExp.kt

@@ -1,271 +0,0 @@
-package com.futo.platformplayer.casting
-
-import android.os.Build
-import com.futo.platformplayer.BuildConfig
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.models.CastingDeviceInfo
-import org.fcast.sender_sdk.ApplicationInfo
-import org.fcast.sender_sdk.GenericKeyEvent
-import org.fcast.sender_sdk.GenericMediaEvent
-import org.fcast.sender_sdk.PlaybackState
-import org.fcast.sender_sdk.Source
-import java.net.InetAddress
-import org.fcast.sender_sdk.CastingDevice as RsCastingDevice;
-import org.fcast.sender_sdk.DeviceEventHandler as RsDeviceEventHandler;
-import org.fcast.sender_sdk.DeviceConnectionState
-import org.fcast.sender_sdk.DeviceFeature
-import org.fcast.sender_sdk.IpAddr
-import org.fcast.sender_sdk.LoadRequest
-import org.fcast.sender_sdk.Metadata
-import org.fcast.sender_sdk.ProtocolType
-import org.fcast.sender_sdk.urlFormatIpAddr
-import java.net.Inet4Address
-import java.net.Inet6Address
-
-private fun ipAddrToInetAddress(addr: IpAddr): InetAddress = when (addr) {
-    is IpAddr.V4 -> Inet4Address.getByAddress(
-        byteArrayOf(
-            addr.o1.toByte(),
-            addr.o2.toByte(),
-            addr.o3.toByte(),
-            addr.o4.toByte()
-        )
-    )
-
-    is IpAddr.V6 -> Inet6Address.getByAddress(
-        byteArrayOf(
-            addr.o1.toByte(),
-            addr.o2.toByte(),
-            addr.o3.toByte(),
-            addr.o4.toByte(),
-            addr.o5.toByte(),
-            addr.o6.toByte(),
-            addr.o7.toByte(),
-            addr.o8.toByte(),
-            addr.o9.toByte(),
-            addr.o10.toByte(),
-            addr.o11.toByte(),
-            addr.o12.toByte(),
-            addr.o13.toByte(),
-            addr.o14.toByte(),
-            addr.o15.toByte(),
-            addr.o16.toByte()
-        )
-    )
-}
-
-class CastingDeviceExp(val device: RsCastingDevice) : CastingDevice() {
-    class EventHandler : RsDeviceEventHandler {
-        var onConnectionStateChanged = Event1<DeviceConnectionState>();
-        var onPlayChanged = Event1<Boolean>()
-        var onTimeChanged = Event1<Double>()
-        var onDurationChanged = Event1<Double>()
-        var onVolumeChanged = Event1<Double>()
-        var onSpeedChanged = Event1<Double>()
-
-        override fun connectionStateChanged(state: DeviceConnectionState) {
-            onConnectionStateChanged.emit(state)
-        }
-
-        override fun volumeChanged(volume: Double) {
-            onVolumeChanged.emit(volume)
-        }
-
-        override fun timeChanged(time: Double) {
-            onTimeChanged.emit(time)
-        }
-
-        override fun playbackStateChanged(state: PlaybackState) {
-            onPlayChanged.emit(state == PlaybackState.PLAYING)
-        }
-
-        override fun durationChanged(duration: Double) {
-            onDurationChanged.emit(duration)
-        }
-
-        override fun speedChanged(speed: Double) {
-            onSpeedChanged.emit(speed)
-        }
-
-        override fun sourceChanged(source: Source) {
-            // TODO
-        }
-
-        override fun keyEvent(event: GenericKeyEvent) {
-            // Unreachable
-        }
-
-        override fun mediaEvent(event: GenericMediaEvent) {
-            // Unreachable
-        }
-
-        override fun playbackError(message: String) {
-            Logger.e(TAG, "Playback error: $message")
-        }
-    }
-
-    val eventHandler = EventHandler()
-    override val isReady: Boolean
-        get() = device.isReady()
-    override val name: String
-        get() = device.name()
-    override var usedRemoteAddress: InetAddress? = null
-    override var localAddress: InetAddress? = null
-    override fun canSetVolume(): Boolean = device.supportsFeature(DeviceFeature.SET_VOLUME)
-    override fun canSetSpeed(): Boolean = device.supportsFeature(DeviceFeature.SET_SPEED)
-
-    override val onConnectionStateChanged =
-        Event1<CastConnectionState>()
-    override val onPlayChanged: Event1<Boolean>
-        get() = eventHandler.onPlayChanged
-    override val onTimeChanged: Event1<Double>
-        get() = eventHandler.onTimeChanged
-    override val onDurationChanged: Event1<Double>
-        get() = eventHandler.onDurationChanged
-    override val onVolumeChanged: Event1<Double>
-        get() = eventHandler.onVolumeChanged
-    override val onSpeedChanged: Event1<Double>
-        get() = eventHandler.onSpeedChanged
-
-    override fun resumePlayback() = device.resumePlayback()
-    override fun pausePlayback() = device.pausePlayback()
-    override fun stopPlayback() = device.stopPlayback()
-    override fun seekTo(timeSeconds: Double) = device.seek(timeSeconds)
-    override fun changeVolume(newVolume: Double) {
-        device.changeVolume(newVolume)
-        volume = newVolume
-    }
-    override fun changeSpeed(speed: Double) = device.changeSpeed(speed)
-    override fun connect() = device.connect(
-        ApplicationInfo(
-            "Grayjay Android",
-            "${BuildConfig.VERSION_NAME}-${BuildConfig.FLAVOR}",
-            "${Build.MANUFACTURER} ${Build.MODEL}"
-        ),
-        eventHandler,
-        1000.toULong()
-    )
-
-    override fun disconnect() = device.disconnect()
-
-    override fun getDeviceInfo(): CastingDeviceInfo {
-        val info = device.getDeviceInfo()
-        return CastingDeviceInfo(
-            info.name,
-            when (info.protocol) {
-                ProtocolType.CHROMECAST -> CastProtocolType.CHROMECAST
-                ProtocolType.F_CAST -> CastProtocolType.FCAST
-            },
-            addresses = info.addresses.map { urlFormatIpAddr(it) }.toTypedArray(),
-            port = info.port.toInt(),
-        )
-    }
-
-    override fun getAddresses(): List<InetAddress> = device.getAddresses().map {
-        ipAddrToInetAddress(it)
-    }
-
-    override fun loadVideo(
-        streamType: String,
-        contentType: String,
-        contentId: String,
-        resumePosition: Double,
-        duration: Double,
-        speed: Double?,
-        metadata: Metadata?
-    ) = device.load(
-        LoadRequest.Video(
-            contentType = contentType,
-            url = contentId,
-            resumePosition = resumePosition,
-            speed = speed,
-            volume = volume,
-            metadata = metadata
-        )
-    )
-
-    override fun loadContent(
-        contentType: String,
-        content: String,
-        resumePosition: Double,
-        duration: Double,
-        speed: Double?,
-        metadata: Metadata?
-    ) = device.load(
-        LoadRequest.Content(
-            contentType = contentType,
-            content = content,
-            resumePosition = resumePosition,
-            speed = speed,
-            volume = volume,
-            metadata = metadata,
-        )
-    )
-
-    override var connectionState = CastConnectionState.DISCONNECTED
-    override val protocolType: CastProtocolType
-        get() = when (device.castingProtocol()) {
-            ProtocolType.CHROMECAST -> CastProtocolType.CHROMECAST
-            ProtocolType.F_CAST -> CastProtocolType.FCAST
-        }
-    override var volume: Double = 1.0
-    override var duration: Double = 0.0
-    private var lastTimeChangeTime_ms: Long = 0
-    override var time: Double = 0.0
-    override var speed: Double = 0.0
-    override var isPlaying: Boolean = false
-
-    override val expectedCurrentTime: Double
-        get() {
-            val diff =
-                if (isPlaying) ((System.currentTimeMillis() - lastTimeChangeTime_ms).toDouble() / 1000.0) else 0.0;
-            return time + diff
-        }
-
-    init {
-        eventHandler.onConnectionStateChanged.subscribe { newState ->
-            when (newState) {
-                is DeviceConnectionState.Connected -> {
-                    usedRemoteAddress = ipAddrToInetAddress(newState.usedRemoteAddr)
-                    localAddress = ipAddrToInetAddress(newState.localAddr)
-                    connectionState = CastConnectionState.CONNECTED
-                    onConnectionStateChanged.emit(CastConnectionState.CONNECTED)
-                }
-
-                DeviceConnectionState.Connecting, DeviceConnectionState.Reconnecting ->  {
-                    connectionState = CastConnectionState.CONNECTING
-                    onConnectionStateChanged.emit(CastConnectionState.CONNECTING)
-                }
-
-                DeviceConnectionState.Disconnected -> {
-                    connectionState = CastConnectionState.CONNECTING
-                    onConnectionStateChanged.emit(CastConnectionState.DISCONNECTED)
-                }
-            }
-
-            if (newState == DeviceConnectionState.Disconnected) {
-                try {
-                    Logger.i(TAG, "Stopping device")
-                    device.disconnect()
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to stop device: $e")
-                }
-            }
-        }
-        eventHandler.onPlayChanged.subscribe { isPlaying = it }
-        eventHandler.onTimeChanged.subscribe {
-            lastTimeChangeTime_ms = System.currentTimeMillis()
-            time = it
-        }
-        eventHandler.onDurationChanged.subscribe { duration = it }
-        eventHandler.onVolumeChanged.subscribe { volume = it }
-        eventHandler.onSpeedChanged.subscribe { speed = it }
-    }
-
-    override fun ensureThreadStarted() {}
-
-    companion object {
-        private val TAG = "CastingDeviceExp"
-    }
-}

app/src/main/java/com/futo/platformplayer/casting/CastingDeviceLegacy.kt

@@ -1,242 +0,0 @@
-package com.futo.platformplayer.casting
-
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.models.CastingDeviceInfo
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import org.fcast.sender_sdk.Metadata
-import java.net.InetAddress
-
-enum class CastConnectionState {
-    DISCONNECTED,
-    CONNECTING,
-    CONNECTED
-}
-
-@Serializable(with = CastProtocolType.CastProtocolTypeSerializer::class)
-enum class CastProtocolType {
-    CHROMECAST,
-    AIRPLAY,
-    FCAST;
-
-    object CastProtocolTypeSerializer : KSerializer<CastProtocolType> {
-        override val descriptor: SerialDescriptor =
-            PrimitiveSerialDescriptor("CastProtocolType", PrimitiveKind.STRING)
-
-        override fun serialize(encoder: Encoder, value: CastProtocolType) {
-            encoder.encodeString(value.name)
-        }
-
-        override fun deserialize(decoder: Decoder): CastProtocolType {
-            val name = decoder.decodeString()
-            return when (name) {
-                "FASTCAST" -> FCAST // Handle the renamed case
-                else -> CastProtocolType.valueOf(name)
-            }
-        }
-    }
-}
-
-abstract class CastingDeviceLegacy {
-    abstract val protocol: CastProtocolType;
-    abstract val isReady: Boolean;
-    abstract var usedRemoteAddress: InetAddress?;
-    abstract var localAddress: InetAddress?;
-    abstract val canSetVolume: Boolean;
-    abstract val canSetSpeed: Boolean;
-
-    var name: String? = null;
-    var isPlaying: Boolean = false
-        set(value) {
-            val changed = value != field;
-            field = value;
-            if (changed) {
-                onPlayChanged.emit(value);
-            }
-        };
-
-    private var lastTimeChangeTime_ms: Long = 0
-    var time: Double = 0.0
-        private set
-
-    protected fun setTime(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
-        if (changeTime_ms > lastTimeChangeTime_ms && value != time) {
-            time = value
-            lastTimeChangeTime_ms = changeTime_ms
-            onTimeChanged.emit(value)
-        }
-    }
-
-    private var lastDurationChangeTime_ms: Long = 0
-    var duration: Double = 0.0
-        private set
-
-    protected fun setDuration(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
-        if (changeTime_ms > lastDurationChangeTime_ms && value != duration) {
-            duration = value
-            lastDurationChangeTime_ms = changeTime_ms
-            onDurationChanged.emit(value)
-        }
-    }
-
-    private var lastVolumeChangeTime_ms: Long = 0
-    var volume: Double = 1.0
-        private set
-
-    protected fun setVolume(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
-        if (changeTime_ms > lastVolumeChangeTime_ms && value != volume) {
-            volume = value
-            lastVolumeChangeTime_ms = changeTime_ms
-            onVolumeChanged.emit(value)
-        }
-    }
-
-    private var lastSpeedChangeTime_ms: Long = 0
-    var speed: Double = 1.0
-        private set
-
-    protected fun setSpeed(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
-        if (changeTime_ms > lastSpeedChangeTime_ms && value != speed) {
-            speed = value
-            lastSpeedChangeTime_ms = changeTime_ms
-            onSpeedChanged.emit(value)
-        }
-    }
-
-    val expectedCurrentTime: Double
-        get() {
-            val diff =
-                if (isPlaying) ((System.currentTimeMillis() - lastTimeChangeTime_ms).toDouble() / 1000.0) else 0.0;
-            return time + diff;
-        };
-    var connectionState: CastConnectionState = CastConnectionState.DISCONNECTED
-        set(value) {
-            val changed = value != field;
-            field = value;
-
-            if (changed) {
-                onConnectionStateChanged.emit(value);
-            }
-        };
-
-    var onConnectionStateChanged = Event1<CastConnectionState>();
-    var onPlayChanged = Event1<Boolean>();
-    var onTimeChanged = Event1<Double>();
-    var onDurationChanged = Event1<Double>();
-    var onVolumeChanged = Event1<Double>();
-    var onSpeedChanged = Event1<Double>();
-
-    abstract fun stopCasting();
-
-    abstract fun seekVideo(timeSeconds: Double);
-    abstract fun stopVideo();
-    abstract fun pauseVideo();
-    abstract fun resumeVideo();
-    abstract fun loadVideo(
-        streamType: String,
-        contentType: String,
-        contentId: String,
-        resumePosition: Double,
-        duration: Double,
-        speed: Double?
-    );
-
-    abstract fun loadContent(
-        contentType: String,
-        content: String,
-        resumePosition: Double,
-        duration: Double,
-        speed: Double?
-    );
-
-    open fun changeVolume(volume: Double) {
-        throw NotImplementedError()
-    }
-
-    open fun changeSpeed(speed: Double) {
-        throw NotImplementedError()
-    }
-
-    abstract fun start();
-    abstract fun stop();
-
-    abstract fun getDeviceInfo(): CastingDeviceInfo;
-
-    abstract fun getAddresses(): List<InetAddress>;
-}
-
-class CastingDeviceLegacyWrapper(val inner: CastingDeviceLegacy) : CastingDevice() {
-    override val isReady: Boolean get() = inner.isReady
-    override val usedRemoteAddress: InetAddress? get() = inner.usedRemoteAddress
-    override val localAddress: InetAddress? get() = inner.localAddress
-    override val name: String? get() = inner.name
-    override val onConnectionStateChanged: Event1<CastConnectionState> get() = inner.onConnectionStateChanged
-    override val onPlayChanged: Event1<Boolean> get() = inner.onPlayChanged
-    override val onTimeChanged: Event1<Double> get() = inner.onTimeChanged
-    override val onDurationChanged: Event1<Double> get() = inner.onDurationChanged
-    override val onVolumeChanged: Event1<Double> get() = inner.onVolumeChanged
-    override val onSpeedChanged: Event1<Double> get() = inner.onSpeedChanged
-    override var connectionState: CastConnectionState
-        get() = inner.connectionState
-        set(_) = Unit
-    override val protocolType: CastProtocolType get() = inner.protocol
-    override var isPlaying: Boolean
-        get() = inner.isPlaying
-        set(_) = Unit
-    override val expectedCurrentTime: Double
-        get() = inner.expectedCurrentTime
-    override var speed: Double
-        get() = inner.speed
-        set(_) = Unit
-    override var time: Double
-        get() = inner.time
-        set(_) = Unit
-    override var duration: Double
-        get() = inner.duration
-        set(_) = Unit
-    override var volume: Double
-        get() = inner.volume
-        set(_) = Unit
-
-    override fun canSetVolume(): Boolean = inner.canSetVolume
-    override fun canSetSpeed(): Boolean = inner.canSetSpeed
-    override fun resumePlayback() = inner.resumeVideo()
-    override fun pausePlayback() = inner.pauseVideo()
-    override fun stopPlayback() = inner.stopVideo()
-    override fun seekTo(timeSeconds: Double) = inner.seekVideo(timeSeconds)
-    override fun changeVolume(timeSeconds: Double) = inner.changeVolume(timeSeconds)
-    override fun changeSpeed(speed: Double) = inner.changeSpeed(speed)
-    override fun connect() = inner.start()
-    override fun disconnect() = inner.stop()
-    override fun getDeviceInfo(): CastingDeviceInfo = inner.getDeviceInfo()
-    override fun getAddresses(): List<InetAddress> = inner.getAddresses()
-    override fun loadVideo(
-        streamType: String,
-        contentType: String,
-        contentId: String,
-        resumePosition: Double,
-        duration: Double,
-        speed: Double?,
-        metadata: Metadata?
-    ) = inner.loadVideo(streamType, contentType, contentId, resumePosition, duration, speed)
-
-    override fun loadContent(
-        contentType: String,
-        content: String,
-        resumePosition: Double,
-        duration: Double,
-        speed: Double?,
-        metadata: Metadata?
-    ) = inner.loadContent(contentType, content, resumePosition, duration, speed)
-
-    override fun ensureThreadStarted() = when (inner) {
-        is FCastCastingDevice -> inner.ensureThreadStarted()
-        is ChromecastCastingDevice -> inner.ensureThreadsStarted()
-        else -> {}
-    }
-}

app/src/main/java/com/futo/platformplayer/casting/ChomecastCastingDevice.kt

@@ -27,7 +27,7 @@ import javax.net.ssl.SSLSocket
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
 
-class ChromecastCastingDevice : CastingDeviceLegacy {
+class ChromecastCastingDevice : CastingDevice {
     //See for more info: https://developers.google.com/cast/docs/media/messages
 
     override val protocol: CastProtocolType get() = CastProtocolType.CHROMECAST;

app/src/main/java/com/futo/platformplayer/casting/FCastCastingDevice.kt

@@ -3,6 +3,7 @@ package com.futo.platformplayer.casting
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.casting.models.FCastDecryptedMessage
 import com.futo.platformplayer.casting.models.FCastEncryptedMessage
@@ -24,6 +25,7 @@ import com.futo.platformplayer.toInetAddress
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
@@ -32,6 +34,7 @@ import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
 import java.math.BigInteger
+import java.net.Inet4Address
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Socket
@@ -69,7 +72,7 @@ enum class Opcode(val value: Byte) {
     }
 }
 
-class FCastCastingDevice : CastingDeviceLegacy {
+class FCastCastingDevice : CastingDevice {
     //See for more info: TODO
 
     override val protocol: CastProtocolType get() = CastProtocolType.FCAST;

app/src/main/java/com/futo/platformplayer/casting/StateCastingExp.kt

@@ -1,178 +0,0 @@
-package com.futo.platformplayer.casting
-
-import android.content.Context
-import android.util.Log
-import com.futo.platformplayer.BuildConfig
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.models.CastingDeviceInfo
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
-import org.fcast.sender_sdk.DeviceInfo as RsDeviceInfo
-import org.fcast.sender_sdk.ProtocolType
-import org.fcast.sender_sdk.CastContext
-import org.fcast.sender_sdk.NsdDeviceDiscoverer
-
-class StateCastingExp : StateCasting() {
-    private val _context = CastContext()
-    var _deviceDiscoverer: NsdDeviceDiscoverer? = null
-
-    class DiscoveryEventHandler(
-        private val onDeviceAdded: (RsDeviceInfo) -> Unit,
-        private val onDeviceRemoved: (String) -> Unit,
-        private val onDeviceUpdated: (RsDeviceInfo) -> Unit,
-    ) : org.fcast.sender_sdk.DeviceDiscovererEventHandler {
-        override fun deviceAvailable(deviceInfo: RsDeviceInfo) {
-            onDeviceAdded(deviceInfo)
-        }
-
-        override fun deviceChanged(deviceInfo: RsDeviceInfo) {
-            onDeviceUpdated(deviceInfo)
-        }
-
-        override fun deviceRemoved(deviceName: String) {
-            onDeviceRemoved(deviceName)
-        }
-    }
-
-    init {
-        if (BuildConfig.DEBUG) {
-            org.fcast.sender_sdk.initLogger(org.fcast.sender_sdk.LogLevelFilter.DEBUG)
-        }
-    }
-
-    override fun handleUrl(url: String) {
-        try {
-            val foundDeviceInfo = org.fcast.sender_sdk.deviceInfoFromUrl(url)!!
-            val foundDevice = _context.createDeviceFromInfo(foundDeviceInfo)
-            connectDevice(CastingDeviceExp(foundDevice))
-        } catch (e: Throwable) {
-            Logger.e(TAG, "Failed to handle URL: $e")
-        }
-    }
-
-    override fun onStop() {
-        val ad = activeDevice ?: return
-        _resumeCastingDevice = ad.getDeviceInfo()
-        Log.i(TAG, "_resumeCastingDevice set to '${ad.name}'")
-        Logger.i(TAG, "Stopping active device because of onStop.")
-        try {
-            ad.disconnect()
-        } catch (e: Throwable) {
-            Logger.e(TAG, "Failed to disconnect from device: $e")
-        }
-    }
-
-    @Synchronized
-    override fun start(context: Context) {
-        if (_started)
-            return
-        _started = true
-
-        Log.i(TAG, "_resumeCastingDevice set null start")
-        _resumeCastingDevice = null
-
-        Logger.i(TAG, "CastingService starting...")
-
-        _castServer.start()
-        enableDeveloper(true)
-
-        Logger.i(TAG, "CastingService started.")
-
-        _deviceDiscoverer = NsdDeviceDiscoverer(
-            context,
-            DiscoveryEventHandler(
-                { deviceInfo -> // Added
-                    Logger.i(TAG, "Device added: ${deviceInfo.name}")
-                    val device = _context.createDeviceFromInfo(deviceInfo)
-                    val deviceHandle = CastingDeviceExp(device)
-                    devices[deviceHandle.device.name()] = deviceHandle
-                    invokeInMainScopeIfRequired {
-                        onDeviceAdded.emit(deviceHandle)
-                    }
-                },
-                { deviceName -> // Removed
-                    invokeInMainScopeIfRequired {
-                        if (devices.containsKey(deviceName)) {
-                            val device = devices.remove(deviceName)
-                            if (device != null) {
-                                onDeviceRemoved.emit(device)
-                            }
-                        }
-                    }
-                },
-                { deviceInfo -> // Updated
-                    Logger.i(TAG, "Device updated: $deviceInfo")
-                    val handle = devices[deviceInfo.name]
-                    if (handle != null && handle is CastingDeviceExp) {
-                        handle.device.setPort(deviceInfo.port)
-                        handle.device.setAddresses(deviceInfo.addresses)
-                        invokeInMainScopeIfRequired {
-                            onDeviceChanged.emit(handle)
-                        }
-                    }
-                },
-            )
-        )
-    }
-
-    @Synchronized
-    override fun stop() {
-        if (!_started) {
-            return
-        }
-
-        _started = false
-
-        Logger.i(TAG, "CastingService stopping.")
-
-        _scopeIO.cancel()
-        _scopeMain.cancel()
-
-        Logger.i(TAG, "Stopping active device because StateCasting is being stopped.")
-        val d = activeDevice
-        activeDevice = null
-        try {
-            d?.disconnect()
-        } catch (e: Throwable) {
-            Logger.e(TAG, "Failed to disconnect device: $e")
-        }
-
-        _castServer.stop()
-        _castServer.removeAllHandlers()
-
-        Logger.i(TAG, "CastingService stopped.")
-
-        _deviceDiscoverer = null
-    }
-
-    override fun startUpdateTimeJob(
-        onTimeJobTimeChanged_s: Event1<Long>,
-        setTime: (Long) -> Unit
-    ): Job? = null
-
-    override fun deviceFromInfo(deviceInfo: CastingDeviceInfo): CastingDeviceExp? {
-        try {
-            val rsAddrs =
-                deviceInfo.addresses.map { org.fcast.sender_sdk.tryIpAddrFromStr(it) }
-            val rsDeviceInfo = RsDeviceInfo(
-                name = deviceInfo.name,
-                protocol = when (deviceInfo.type) {
-                    com.futo.platformplayer.casting.CastProtocolType.CHROMECAST -> ProtocolType.CHROMECAST
-                    com.futo.platformplayer.casting.CastProtocolType.FCAST -> ProtocolType.F_CAST
-                    else -> throw IllegalArgumentException()
-                },
-                addresses = rsAddrs,
-                port = deviceInfo.port.toUShort(),
-            )
-
-            return CastingDeviceExp(_context.createDeviceFromInfo(rsDeviceInfo))
-        } catch (_: Throwable) {
-            return null
-        }
-    }
-
-    companion object {
-        private val TAG = "StateCastingExp"
-    }
-}

app/src/main/java/com/futo/platformplayer/casting/StateCastingLegacy.kt

@@ -1,399 +0,0 @@
-package com.futo.platformplayer.casting
-
-import android.content.Context
-import android.net.Uri
-import android.net.nsd.NsdManager
-import android.net.nsd.NsdServiceInfo
-import android.os.Build
-import android.util.Base64
-import android.util.Log
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.models.CastingDeviceInfo
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.launch
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import java.net.InetAddress
-import kotlinx.coroutines.delay
-
-class StateCastingLegacy : StateCasting() {
-    private var _nsdManager: NsdManager? = null
-
-    private val _discoveryListeners = mapOf(
-        "_googlecast._tcp" to createDiscoveryListener(::addOrUpdateChromeCastDevice),
-        "_airplay._tcp" to createDiscoveryListener(::addOrUpdateAirPlayDevice),
-        "_fastcast._tcp" to createDiscoveryListener(::addOrUpdateFastCastDevice),
-        "_fcast._tcp" to createDiscoveryListener(::addOrUpdateFastCastDevice)
-    )
-
-    override fun handleUrl(url: String) {
-        val uri = Uri.parse(url)
-        if (uri.scheme != "fcast") {
-            throw Exception("Expected scheme to be FCast")
-        }
-
-        val type = uri.host
-        if (type != "r") {
-            throw Exception("Expected type r")
-        }
-
-        val connectionInfo = uri.pathSegments[0]
-        val json =
-            Base64.decode(connectionInfo, Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP)
-                .toString(Charsets.UTF_8)
-        val networkConfig = Json.decodeFromString<FCastNetworkConfig>(json)
-        val tcpService = networkConfig.services.first { v -> v.type == 0 }
-
-        val foundInfo = addRememberedDevice(
-            CastingDeviceInfo(
-                name = networkConfig.name,
-                type = CastProtocolType.FCAST,
-                addresses = networkConfig.addresses.toTypedArray(),
-                port = tcpService.port
-            )
-        )
-
-        if (foundInfo != null) {
-            connectDevice(deviceFromInfo(foundInfo))
-        }
-    }
-
-    override fun onStop() {
-        val ad = activeDevice ?: return;
-        _resumeCastingDevice = ad.getDeviceInfo()
-        Log.i(TAG, "_resumeCastingDevice set to '${ad.name}'")
-        Logger.i(TAG, "Stopping active device because of onStop.");
-        ad.disconnect();
-    }
-
-    @Synchronized
-    override fun start(context: Context) {
-        if (_started)
-            return;
-        _started = true;
-
-        Log.i(TAG, "_resumeCastingDevice set null start")
-        _resumeCastingDevice = null;
-
-        Logger.i(TAG, "CastingService starting...");
-
-        _castServer.start();
-        enableDeveloper(true);
-
-        Logger.i(TAG, "CastingService started.");
-
-        _nsdManager = context.getSystemService(Context.NSD_SERVICE) as NsdManager
-        startDiscovering()
-    }
-
-    @Synchronized
-    private fun startDiscovering() {
-        _nsdManager?.apply {
-            _discoveryListeners.forEach {
-                discoverServices(it.key, NsdManager.PROTOCOL_DNS_SD, it.value)
-            }
-        }
-    }
-
-    @Synchronized
-    private fun stopDiscovering() {
-        _nsdManager?.apply {
-            _discoveryListeners.forEach {
-                try {
-                    stopServiceDiscovery(it.value)
-                } catch (e: Throwable) {
-                    Logger.w(TAG, "Failed to stop service discovery", e)
-                }
-            }
-        }
-    }
-
-    @Synchronized
-    override fun stop() {
-        if (!_started)
-            return;
-
-        _started = false;
-
-        Logger.i(TAG, "CastingService stopping.")
-
-        stopDiscovering()
-        _scopeIO.cancel();
-        _scopeMain.cancel();
-
-        Logger.i(TAG, "Stopping active device because StateCasting is being stopped.")
-        val d = activeDevice;
-        activeDevice = null;
-        d?.disconnect();
-
-        _castServer.stop();
-        _castServer.removeAllHandlers();
-
-        Logger.i(TAG, "CastingService stopped.")
-
-        _nsdManager = null
-    }
-
-    private fun createDiscoveryListener(addOrUpdate: (String, Array<InetAddress>, Int) -> Unit): NsdManager.DiscoveryListener {
-        return object : NsdManager.DiscoveryListener {
-            override fun onDiscoveryStarted(regType: String) {
-                Log.d(TAG, "Service discovery started for $regType")
-            }
-
-            override fun onDiscoveryStopped(serviceType: String) {
-                Log.i(TAG, "Discovery stopped: $serviceType")
-            }
-
-            override fun onServiceLost(service: NsdServiceInfo) {
-                Log.e(TAG, "service lost: $service")
-                // TODO: Handle service lost, e.g., remove device
-            }
-
-            override fun onStartDiscoveryFailed(serviceType: String, errorCode: Int) {
-                Log.e(TAG, "Discovery failed for $serviceType: Error code:$errorCode")
-                try {
-                    _nsdManager?.stopServiceDiscovery(this)
-                } catch (e: Throwable) {
-                    Logger.w(TAG, "Failed to stop service discovery", e)
-                }
-            }
-
-            override fun onStopDiscoveryFailed(serviceType: String, errorCode: Int) {
-                Log.e(TAG, "Stop discovery failed for $serviceType: Error code:$errorCode")
-                try {
-                    _nsdManager?.stopServiceDiscovery(this)
-                } catch (e: Throwable) {
-                    Logger.w(TAG, "Failed to stop service discovery", e)
-                }
-            }
-
-            override fun onServiceFound(service: NsdServiceInfo) {
-                Log.v(TAG, "Service discovery success for ${service.serviceType}: $service")
-                val addresses = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    service.hostAddresses.toTypedArray()
-                } else {
-                    arrayOf(service.host)
-                }
-                addOrUpdate(service.serviceName, addresses, service.port)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    _nsdManager?.registerServiceInfoCallback(
-                        service,
-                        { it.run() },
-                        object : NsdManager.ServiceInfoCallback {
-                            override fun onServiceUpdated(serviceInfo: NsdServiceInfo) {
-                                Log.v(TAG, "onServiceUpdated: $serviceInfo")
-                                addOrUpdate(
-                                    serviceInfo.serviceName,
-                                    serviceInfo.hostAddresses.toTypedArray(),
-                                    serviceInfo.port
-                                )
-                            }
-
-                            override fun onServiceLost() {
-                                Log.v(TAG, "onServiceLost: $service")
-                                // TODO: Handle service lost
-                            }
-
-                            override fun onServiceInfoCallbackRegistrationFailed(errorCode: Int) {
-                                Log.v(TAG, "onServiceInfoCallbackRegistrationFailed: $errorCode")
-                            }
-
-                            override fun onServiceInfoCallbackUnregistered() {
-                                Log.v(TAG, "onServiceInfoCallbackUnregistered")
-                            }
-                        })
-                } else {
-                    _nsdManager?.resolveService(service, object : NsdManager.ResolveListener {
-                        override fun onResolveFailed(serviceInfo: NsdServiceInfo, errorCode: Int) {
-                            Log.v(TAG, "Resolve failed: $errorCode")
-                        }
-
-                        override fun onServiceResolved(serviceInfo: NsdServiceInfo) {
-                            Log.v(TAG, "Resolve Succeeded: $serviceInfo")
-                            addOrUpdate(
-                                serviceInfo.serviceName,
-                                arrayOf(serviceInfo.host),
-                                serviceInfo.port
-                            )
-                        }
-                    })
-                }
-            }
-        }
-    }
-
-    override fun startUpdateTimeJob(
-        onTimeJobTimeChanged_s: Event1<Long>,
-        setTime: (Long) -> Unit
-    ): Job? {
-        val d = activeDevice;
-        if (d is CastingDeviceLegacyWrapper && (d.inner is AirPlayCastingDevice || d.inner is ChromecastCastingDevice)) {
-            return _scopeMain.launch {
-                while (true) {
-                    val device = instance.activeDevice
-                    if (device == null || !device.isPlaying) {
-                        break
-                    }
-
-                    delay(1000)
-                    val time_ms = (device.expectedCurrentTime * 1000.0).toLong()
-                    setTime(time_ms)
-                    onTimeJobTimeChanged_s.emit(device.expectedCurrentTime.toLong())
-                }
-            }
-        }
-        return null
-    }
-
-    override fun deviceFromInfo(deviceInfo: CastingDeviceInfo): CastingDevice {
-        return CastingDeviceLegacyWrapper(
-            when (deviceInfo.type) {
-                CastProtocolType.CHROMECAST -> {
-                    ChromecastCastingDevice(deviceInfo);
-                }
-
-                CastProtocolType.AIRPLAY -> {
-                    AirPlayCastingDevice(deviceInfo);
-                }
-
-                CastProtocolType.FCAST -> {
-                    FCastCastingDevice(deviceInfo);
-                }
-            }
-        )
-    }
-
-    private fun addOrUpdateChromeCastDevice(
-        name: String,
-        addresses: Array<InetAddress>,
-        port: Int
-    ) {
-        return addOrUpdateCastDevice(
-            name,
-            deviceFactory = {
-                CastingDeviceLegacyWrapper(
-                    ChromecastCastingDevice(
-                        name,
-                        addresses,
-                        port
-                    )
-                )
-            },
-            deviceUpdater = { d ->
-                if (d.isReady || d !is CastingDeviceLegacyWrapper || d.inner !is ChromecastCastingDevice) {
-                    return@addOrUpdateCastDevice false;
-                }
-
-                val changed =
-                    addresses.contentEquals(d.inner.addresses) || d.name != name || d.inner.port != port;
-                if (changed) {
-                    d.inner.name = name;
-                    d.inner.addresses = addresses;
-                    d.inner.port = port;
-                }
-
-                return@addOrUpdateCastDevice changed;
-            }
-        );
-    }
-
-    private fun addOrUpdateAirPlayDevice(name: String, addresses: Array<InetAddress>, port: Int) {
-        return addOrUpdateCastDevice(
-            name,
-            deviceFactory = {
-                CastingDeviceLegacyWrapper(
-                    AirPlayCastingDevice(
-                        name,
-                        addresses,
-                        port
-                    )
-                )
-            },
-            deviceUpdater = { d ->
-                if (d.isReady || d !is CastingDeviceLegacyWrapper || d.inner !is AirPlayCastingDevice) {
-                    return@addOrUpdateCastDevice false;
-                }
-
-                val changed =
-                    addresses.contentEquals(addresses) || d.name != name || d.inner.port != port;
-                if (changed) {
-                    d.inner.name = name;
-                    d.inner.port = port;
-                    d.inner.addresses = addresses;
-                }
-
-                return@addOrUpdateCastDevice changed;
-            }
-        );
-    }
-
-    private fun addOrUpdateFastCastDevice(name: String, addresses: Array<InetAddress>, port: Int) {
-        return addOrUpdateCastDevice(
-            name,
-            deviceFactory = { CastingDeviceLegacyWrapper(FCastCastingDevice(name, addresses, port)) },
-            deviceUpdater = { d ->
-                if (d.isReady || d !is CastingDeviceLegacyWrapper || d.inner !is FCastCastingDevice) {
-                    return@addOrUpdateCastDevice false;
-                }
-
-                val changed =
-                    addresses.contentEquals(addresses) || d.name != name || d.inner.port != port;
-                if (changed) {
-                    d.inner.name = name;
-                    d.inner.port = port;
-                    d.inner.addresses = addresses;
-                }
-
-                return@addOrUpdateCastDevice changed;
-            }
-        );
-    }
-
-    private inline fun addOrUpdateCastDevice(
-        name: String,
-        deviceFactory: () -> CastingDevice,
-        deviceUpdater: (device: CastingDevice) -> Boolean
-    ) {
-        var invokeEvents: (() -> Unit)? = null;
-
-        synchronized(devices) {
-            val device = devices[name];
-            if (device != null) {
-                val changed = deviceUpdater(device);
-                if (changed) {
-                    invokeEvents = {
-                        onDeviceChanged.emit(device);
-                    }
-                }
-            } else {
-                val newDevice = deviceFactory();
-                this.devices[name] = newDevice
-
-                invokeEvents = {
-                    onDeviceAdded.emit(newDevice);
-                };
-            }
-        }
-
-        invokeEvents?.let { _scopeMain.launch { it(); }; };
-    }
-
-    @Serializable
-    private data class FCastNetworkConfig(
-        val name: String,
-        val addresses: List<String>,
-        val services: List<FCastService>
-    )
-
-    @Serializable
-    private data class FCastService(
-        val port: Int,
-        val type: Int
-    )
-
-    companion object {
-        private val TAG = "StateCastingLegacy"
-    }
-}

app/src/main/java/com/futo/platformplayer/developer/DeveloperEndpoints.kt

@@ -18,7 +18,6 @@ import com.futo.platformplayer.engine.dev.V8RemoteObject
 import com.futo.platformplayer.engine.dev.V8RemoteObject.Companion.gsonStandard
 import com.futo.platformplayer.engine.dev.V8RemoteObject.Companion.serialize
 import com.futo.platformplayer.engine.packages.PackageHttp
-import com.futo.platformplayer.fragment.mainactivity.main.LoginFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateAssets
@@ -269,15 +268,11 @@ class DeveloperEndpoints(private val context: Context) {
                 context.respondCode(403, "This plugin doesn't support auth");
                 return;
             }
-            LoginFragment.showLogin(config){
-                _testPluginVariables.clear();
-                _testPlugin = V8Plugin(StateApp.instance.context, config, null, JSHttpClient(null, null, null, config), JSHttpClient(null, it, null, config));
-            };
-            /*
             LoginActivity.showLogin(StateApp.instance.context, config) {
                 _testPluginVariables.clear();
                 _testPlugin = V8Plugin(StateApp.instance.context, config, null, JSHttpClient(null, null, null, config), JSHttpClient(null, it, null, config));
-            }; */
+
+            };
             context.respondCode(200, "Login started");
         }
         catch(ex: Throwable) {

app/src/main/java/com/futo/platformplayer/dialogs/CastingAddDialog.kt

@@ -8,13 +8,11 @@ import android.view.View
 import android.view.WindowManager
 import android.widget.*
 import com.futo.platformplayer.R
-import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.casting.CastProtocolType
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.models.CastingDeviceInfo
 import com.futo.platformplayer.toInetAddress
-import com.futo.platformplayer.logging.Logger
 
 
 class CastingAddDialog(context: Context?) : AlertDialog(context) {
@@ -40,13 +38,7 @@ class CastingAddDialog(context: Context?) : AlertDialog(context) {
         _buttonConfirm = findViewById(R.id.button_confirm);
         _buttonTutorial = findViewById(R.id.button_tutorial)
 
-        val deviceTypeArray =  if (Settings.instance.casting.experimentalCasting) {
+        ArrayAdapter.createFromResource(context, R.array.casting_device_type_array, R.layout.spinner_item_simple).also { adapter ->
-            R.array.exp_casting_device_type_array
-        } else {
-            R.array.casting_device_type_array
-        }
-
-        ArrayAdapter.createFromResource(context, deviceTypeArray, R.layout.spinner_item_simple).also { adapter ->
             adapter.setDropDownViewResource(R.layout.spinner_dropdownitem_simple);
             _spinnerType.adapter = adapter;
         };
@@ -109,11 +101,7 @@ class CastingAddDialog(context: Context?) : AlertDialog(context) {
 
             _textError.visibility = View.GONE;
             val castingDeviceInfo = CastingDeviceInfo(name, castProtocolType, arrayOf(ip), port.toInt());
-            try {
+            StateCasting.instance.addRememberedDevice(castingDeviceInfo);
-                StateCasting.instance.addRememberedDevice(castingDeviceInfo)
-            } catch (e: Throwable) {
-                Logger.e(TAG, "Failed to add remembered device: $e")
-            }
             performDismiss();
         };
 

app/src/main/java/com/futo/platformplayer/dialogs/ConnectCastingDialog.kt

@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.Button
+import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -17,6 +18,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.casting.CastConnectionState
+import com.futo.platformplayer.casting.CastingDevice
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
@@ -106,16 +108,15 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
         synchronized(StateCasting.instance.devices) {
             _devices.addAll(StateCasting.instance.devices.values.mapNotNull { it.name })
         }
-        _rememberedDevices.addAll(StateCasting.instance.getRememberedCastingDeviceNames())
 
+        _rememberedDevices.addAll(StateCasting.instance.getRememberedCastingDeviceNames())
         updateUnifiedList()
 
         StateCasting.instance.onDeviceAdded.subscribe(this) { d ->
             val name = d.name
-            if (name != null) {
+            if (name != null)
                 _devices.add(name)
-                updateUnifiedList()
+            updateUnifiedList()
-            }
         }
 
         StateCasting.instance.onDeviceChanged.subscribe(this) { d ->

app/src/main/java/com/futo/platformplayer/dialogs/ConnectedCastingDialog.kt

@@ -12,11 +12,12 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.futo.platformplayer.R
-import com.futo.platformplayer.Settings
 import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.casting.AirPlayCastingDevice
 import com.futo.platformplayer.casting.CastConnectionState
-import com.futo.platformplayer.casting.CastProtocolType
 import com.futo.platformplayer.casting.CastingDevice
+import com.futo.platformplayer.casting.ChromecastCastingDevice
+import com.futo.platformplayer.casting.FCastCastingDevice
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.fragment.mainactivity.main.VideoDetailFragment
 import com.futo.platformplayer.logging.Logger
@@ -68,18 +69,18 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
 
         _buttonPlay = findViewById(R.id.button_play);
         _buttonPlay.setOnClickListener {
-            StateCasting.instance.resumeVideo()
+            StateCasting.instance.activeDevice?.resumeVideo()
         }
 
         _buttonPause = findViewById(R.id.button_pause);
         _buttonPause.setOnClickListener {
-            StateCasting.instance.pauseVideo()
+            StateCasting.instance.activeDevice?.pauseVideo()
         }
 
         _buttonStop = findViewById(R.id.button_stop);
         _buttonStop.setOnClickListener {
             (ownerActivity as MainActivity?)?.getFragment<VideoDetailFragment>()?.closeVideoDetails()
-            StateCasting.instance.stopVideo()
+            StateCasting.instance.activeDevice?.stopVideo()
         }
 
         _buttonNext = findViewById(R.id.button_next);
@@ -89,12 +90,7 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
 
         _buttonClose.setOnClickListener { dismiss(); };
         _buttonDisconnect.setOnClickListener {
-            try {
+            StateCasting.instance.activeDevice?.stopCasting();
-                StateCasting.instance.stopVideo()
-                StateCasting.instance.activeDevice?.disconnect()
-            } catch (e: Throwable) {
-                Logger.e(TAG, "Active device failed to disconnect: $e")
-            }
             dismiss();
         };
 
@@ -103,7 +99,12 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
                 return@OnChangeListener
             }
 
-            StateCasting.instance.videoSeekTo(value.toDouble())
+            val activeDevice = StateCasting.instance.activeDevice ?: return@OnChangeListener;
+            try {
+                activeDevice.seekVideo(value.toDouble());
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Failed to change volume.", e);
+            }
         });
 
         //TODO: Check if volume slider is properly hidden in all cases
@@ -112,7 +113,14 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
                 return@OnChangeListener
             }
 
-            StateCasting.instance.changeVolume(value.toDouble())
+            val activeDevice = StateCasting.instance.activeDevice ?: return@OnChangeListener;
+            if (activeDevice.canSetVolume) {
+                try {
+                    activeDevice.changeVolume(value.toDouble());
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to change volume.", e);
+                }
+            }
         });
 
         setLoading(false);
@@ -164,25 +172,15 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
     private fun updateDevice() {
         val d = StateCasting.instance.activeDevice ?: return;
 
-        when (d.protocolType) {
+        if (d is ChromecastCastingDevice) {
-            CastProtocolType.CHROMECAST -> {
+            _imageDevice.setImageResource(R.drawable.ic_chromecast);
-                _imageDevice.setImageResource(R.drawable.ic_chromecast);
+            _textType.text = "Chromecast";
-                _textType.text = "Chromecast";
+        } else if (d is AirPlayCastingDevice) {
-            }
+            _imageDevice.setImageResource(R.drawable.ic_airplay);
-            CastProtocolType.AIRPLAY -> {
+            _textType.text = "AirPlay";
-                _imageDevice.setImageResource(R.drawable.ic_airplay);
+        } else if (d is FCastCastingDevice) {
-                _textType.text = "AirPlay";
+            _imageDevice.setImageResource(R.drawable.ic_fc);
-            }
+            _textType.text = "FastCast";
-            CastProtocolType.FCAST -> {
-                _imageDevice.setImageResource(
-                    if (Settings.instance.casting.experimentalCasting) {
-                        R.drawable.ic_exp_fc
-                    } else {
-                        R.drawable.ic_fc
-                    }
-                )
-                _textType.text = "FCast";
-            }
         }
 
         _textName.text = d.name;
@@ -194,7 +192,7 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
         _sliderPosition.value = d.time.toFloat().coerceAtLeast(0.0f).coerceAtMost(dur)
         _sliderPosition.valueTo = dur
 
-        if (d.canSetVolume()) {
+        if (d.canSetVolume) {
             _layoutVolumeAdjustable.visibility = View.VISIBLE;
             _layoutVolumeFixed.visibility = View.GONE;
         } else {
@@ -216,7 +214,8 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
             CastConnectionState.CONNECTED -> {
                 enableControls(interactiveControls)
             }
-            CastConnectionState.CONNECTING, CastConnectionState.DISCONNECTED -> {
+            CastConnectionState.CONNECTING,
+            CastConnectionState.DISCONNECTED -> {
                 disableControls(interactiveControls)
             }
         }

app/src/main/java/com/futo/platformplayer/dialogs/PluginUpdateDialog.kt

@@ -48,7 +48,6 @@ class PluginUpdateDialog : AlertDialog {
 
     private lateinit var _buttonCancel1: Button;
     private lateinit var _buttonCancel2: Button;
-    private lateinit var _buttonAlways: LinearLayout;
     private lateinit var _buttonUpdate: LinearLayout;
 
     private lateinit var _buttonOk: LinearLayout;
@@ -59,7 +58,6 @@ class PluginUpdateDialog : AlertDialog {
     private lateinit var _textProgres: TextView;
     private lateinit var _textError: TextView;
     private lateinit var _textResult: TextView;
-    private lateinit var _textChangelogResult: TextView;
 
     private lateinit var _uiChoiceTop: FrameLayout;
     private lateinit var _uiProgressTop: FrameLayout;
@@ -91,7 +89,6 @@ class PluginUpdateDialog : AlertDialog {
 
         _buttonCancel1 = findViewById(R.id.button_cancel_1);
         _buttonCancel2 = findViewById(R.id.button_cancel_2);
-        _buttonAlways = findViewById(R.id.button_always);
         _buttonUpdate = findViewById(R.id.button_update);
 
         _buttonOk = findViewById(R.id.button_ok);
@@ -102,7 +99,6 @@ class PluginUpdateDialog : AlertDialog {
         _textProgres = findViewById(R.id.text_progress);
         _textError = findViewById(R.id.text_error);
         _textResult = findViewById(R.id.text_result);
-        _textChangelogResult = findViewById(R.id.text_changelog_result);
 
         _uiChoiceTop = findViewById(R.id.dialog_ui_choice_top);
         _uiProgressTop = findViewById(R.id.dialog_ui_progress_top);
@@ -123,24 +119,17 @@ class PluginUpdateDialog : AlertDialog {
                 val changelog = _newConfig.changelog!![changelogVersion]!!;
                 if(changelog.size > 1) {
                     _textChangelog.text = "Changelog (${_newConfig.version})\n" + changelog.map { " - " + it.trim() }.joinToString("\n");
-                    _textChangelogResult.text = _textChangelog.text;
                 }
                 else if(changelog.size == 1) {
                     _textChangelog.text = "Changelog (${_newConfig.version})\n" + changelog[0].trim();
-                    _textChangelogResult.text = _textChangelog.text;
                 }
-                else {
+                else
                     _textChangelog.visibility = View.GONE;
-                    _textChangelogResult.visibility = View.GONE;
+            } else
-                }
+                _textChangelog.visibility = View.GONE;
-            } else {
-                    _textChangelog.visibility = View.GONE;
-                    _textChangelogResult.visibility = View.GONE;
-            }
         }
         catch(ex: Throwable) {
             _textChangelog.visibility = View.GONE;
-            _textChangelogResult.visibility = View.GONE;
             Logger.e(TAG, "Invalid changelog? ", ex);
         }
 
@@ -156,18 +145,6 @@ class PluginUpdateDialog : AlertDialog {
             _isUpdating = true;
             update();
         };
-        _buttonAlways.setOnClickListener {
-            if (_isUpdating)
-                return@setOnClickListener;
-            val plugin = StatePlugins.instance.getPlugin(_oldConfig.id);
-            if(plugin != null) {
-                plugin.appSettings.automaticUpdate = true;
-                StatePlugins.instance.savePlugin(_oldConfig.id);
-                UIDialogs.appToast("Automatic update enabled, can be disabled in plugin settings");
-            }
-            _isUpdating = true;
-            update();
-        };
 
         Glide.with(_iconPlugin)
             .load(_oldConfig.absoluteIconUrl)
@@ -181,8 +158,7 @@ class PluginUpdateDialog : AlertDialog {
                 if (_isUpdating)
                     return;
                 _isUpdating = true;
-
+                update();
-                update(true);
             }
         }
     }
@@ -191,7 +167,7 @@ class PluginUpdateDialog : AlertDialog {
         super.dismiss();
     }
 
-    private fun update(automatic: Boolean = false) {
+    private fun update() {
         _uiChoiceTop.visibility = View.GONE;
         _uiRiskTop.visibility = View.GONE;
         _uiChoiceBot.visibility = View.GONE;
@@ -211,16 +187,9 @@ class PluginUpdateDialog : AlertDialog {
         val scope = StateApp.instance.scopeOrNull;
         scope?.launch(Dispatchers.IO) {
             try {
-                withContext(Dispatchers.Main) {
-                    _textProgres.setText("Loading current script file...");
-                }
                 val client = ManagedHttpClient();
-                client.setTimeout(10000);
                 val script = StatePlugins.instance.getScript(_oldConfig.id) ?: "";
 
-                withContext(Dispatchers.Main) {
-                    _textProgres.setText("Requesting new script file...");
-                }
                 val newScript = client.get(_newConfig.absoluteScriptUrl)?.body?.string();
                 if(newScript.isNullOrEmpty())
                     throw IllegalStateException("No script found");

app/src/main/java/com/futo/platformplayer/downloads/VideoDownload.kt

@@ -1,9 +1,6 @@
 package com.futo.platformplayer.downloads
 
 import android.content.Context
-import android.media.MediaCodec
-import android.media.MediaExtractor
-import android.media.MediaMuxer
 import android.util.Log
 import com.arthenica.ffmpegkit.FFmpegKit
 import com.arthenica.ffmpegkit.ReturnCode
@@ -11,7 +8,6 @@ import com.arthenica.ffmpegkit.StatisticsCallback
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.PlatformID
-import com.futo.platformplayer.api.media.models.modifier.IRequestModifier
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.AudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
@@ -140,8 +136,6 @@ class VideoDownload {
 
     var hasVideoRequestExecutor: Boolean = false;
     var hasAudioRequestExecutor: Boolean = false;
-    var hasVideoRequestModifier: Boolean = false;
-    var hasAudioRequestModifier: Boolean = false;
 
     var progress: Double = 0.0;
     var isCancelled = false;
@@ -209,10 +203,8 @@ class VideoDownload {
         this.prepareTime = OffsetDateTime.now();
         this.hasVideoRequestExecutor = videoSource is JSSource && videoSource.hasRequestExecutor;
         this.hasAudioRequestExecutor = audioSource is JSSource && audioSource.hasRequestExecutor;
-        this.hasVideoRequestModifier = videoSource is JSSource && videoSource.hasRequestModifier;
+        this.requiresLiveVideoSource = this.hasVideoRequestExecutor || (videoSource is JSDashManifestRawSource && videoSource.hasGenerate);
-        this.hasAudioRequestModifier = audioSource is JSSource && audioSource.hasRequestModifier;
+        this.requiresLiveAudioSource = this.hasAudioRequestExecutor || (audioSource is JSDashManifestRawAudioSource && audioSource.hasGenerate);
-        this.requiresLiveVideoSource = this.hasVideoRequestModifier || this.hasVideoRequestExecutor || (videoSource is JSDashManifestRawSource && videoSource.hasGenerate);
-        this.requiresLiveAudioSource = this.hasAudioRequestModifier || this.hasAudioRequestExecutor || (audioSource is JSDashManifestRawAudioSource && audioSource.hasGenerate);
         this.targetVideoName = videoSource?.name;
         this.targetAudioName = audioSource?.name;
         this.targetPixelCount = if(videoSource != null) (videoSource.width * videoSource.height).toLong() else null;
@@ -486,8 +478,8 @@ class VideoDownload {
 
                 if(actualVideoSource is IVideoUrlSource)
                     videoFileSize = when (videoSource!!.container) {
-                        "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Video", client, if (actualVideoSource is JSSource) actualVideoSource else null, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
+                        "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
-                        else -> downloadFileSource("Video", client, if (actualVideoSource is JSSource) actualVideoSource else null, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
+                        else -> downloadFileSource("Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
                     }
                 else if(actualVideoSource is JSDashManifestRawSource) {
                     videoFileSize = downloadDashFileSource("Video", client, actualVideoSource, File(downloadDir, videoFileName!!), progressCallback);
@@ -526,8 +518,8 @@ class VideoDownload {
 
                 if(actualAudioSource is IAudioUrlSource)
                     audioFileSize = when (audioSource!!.container) {
-                        "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Audio", client, if (actualAudioSource is JSSource) actualAudioSource else null, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
+                        "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
-                        else -> downloadFileSource("Audio", client, if (actualAudioSource is JSSource) actualAudioSource else null, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
+                        else -> downloadFileSource("Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
                     }
                 else if(actualAudioSource is JSDashManifestRawAudioSource) {
                     audioFileSize = downloadDashFileSource("Audio", client, actualAudioSource, File(downloadDir, audioFileName!!), progressCallback);
@@ -588,12 +580,83 @@ class VideoDownload {
         return cipher.doFinal(encryptedSegment)
     }
 
+    private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
+        if(targetFile.exists())
+            targetFile.delete();
+
+        var downloadedTotalLength = 0L
+
+        val segmentFiles = arrayListOf<File>()
+        try {
+            val response = client.get(hlsUrl)
+            check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
+
+            val vpContent = response.body?.string()
+                ?: throw Exception("Variant playlist content is empty")
+
+            val variantPlaylist = HLS.parseVariantPlaylist(vpContent, hlsUrl)
+            val decryptionInfo: DecryptionInfo? = if (variantPlaylist.decryptionInfo != null) {
+                val keyResponse = client.get(variantPlaylist.decryptionInfo.keyUrl)
+                check(keyResponse.isOk) { "HLS request failed for decryption key: ${keyResponse.code}" }
+                DecryptionInfo(keyResponse.body!!.bytes(), variantPlaylist.decryptionInfo.iv?.hexStringToByteArray())
+            } else {
+                null
+            }
+
+            variantPlaylist.segments.forEachIndexed { index, segment ->
+                if (segment !is HLS.MediaSegment) {
+                    return@forEachIndexed
+                }
+
+                Logger.i(TAG, "Download '$name' segment $index Sequential");
+                val segmentFile = File(context.cacheDir, "segment-${UUID.randomUUID()}")
+                val outputStream = segmentFile.outputStream()
+                try {
+                    segmentFiles.add(segmentFile)
+
+                    val segmentLength = downloadSource_Sequential(client, outputStream, segment.uri, if (index == 0) null else decryptionInfo, index) { segmentLength, totalRead, lastSpeed ->
+                        val averageSegmentLength = if (index == 0) segmentLength else downloadedTotalLength / index
+                        val expectedTotalLength = averageSegmentLength * (variantPlaylist.segments.size - 1) + segmentLength
+                        onProgress(expectedTotalLength, downloadedTotalLength + totalRead, lastSpeed)
+                    }
+
+                    downloadedTotalLength += segmentLength
+                } finally {
+                    outputStream.close()
+                }
+            }
+
+            Logger.i(TAG, "Combining segments into $targetFile");
+            combineSegments(context, segmentFiles, targetFile)
+
+            Logger.i(TAG, "${name} downloadSource Finished");
+        }
+        catch(ioex: IOException) {
+            if(targetFile.exists())
+                targetFile.delete();
+            if(ioex.message?.contains("ENOSPC") ?: false)
+                throw Exception("Not enough space on device", ioex);
+            else
+                throw ioex;
+        }
+        catch(ex: Throwable) {
+            if(targetFile.exists())
+                targetFile.delete();
+            throw ex;
+        }
+        finally {
+            for (segmentFile in segmentFiles) {
+                segmentFile.delete()
+            }
+        }
+        return downloadedTotalLength;
+    }
+
     private suspend fun combineSegments(context: Context, segmentFiles: List<File>, targetFile: File) = withContext(Dispatchers.IO) {
         suspendCancellableCoroutine { continuation ->
-            val fileList = File(context.cacheDir, "fileList-${UUID.randomUUID()}.txt")
+            val cmd =
-            fileList.writeText(segmentFiles.joinToString("\n") { "file '${it.absolutePath}'" })
+                "-i \"concat:${segmentFiles.joinToString("|")}\" -c copy \"${targetFile.absolutePath}\""
 
-            val cmd = "-f concat -safe 0 -i \"${fileList.absolutePath}\" -c copy \"${targetFile.absolutePath}\""
             val statisticsCallback = StatisticsCallback { _ ->
                 //TODO: Show progress?
             }
@@ -602,7 +665,6 @@ class VideoDownload {
             val session = FFmpegKit.executeAsync(cmd,
                 { session ->
                     if (ReturnCode.isSuccess(session.returnCode)) {
-                        fileList.delete()
                         continuation.resumeWith(Result.success(Unit))
                     } else {
                         val errorMessage = if (ReturnCode.isCancel(session.returnCode)) {
@@ -610,7 +672,6 @@ class VideoDownload {
                         } else {
                             "Command failed with state '${session.state}' and return code ${session.returnCode}, stack trace ${session.failStackTrace}"
                         }
-                        fileList.delete()
                         continuation.resumeWithException(RuntimeException(errorMessage))
                     }
                 },
@@ -625,237 +686,6 @@ class VideoDownload {
         }
     }
 
-    private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, source: JSSource?, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
-        if (targetFile.exists())
-            targetFile.delete()
-
-        var downloadedTotalLength = 0L
-        val modifier = if (source is JSSource && source.hasRequestModifier)
-            source.getRequestModifier()
-        else
-            null
-
-        fun downloadBytes(url: String, rangeStart: Long? = null, rangeLength: Long? = null): ByteArray {
-            val headers = mutableMapOf<String, String>()
-
-            if (rangeStart != null) {
-                if (rangeLength != null && rangeLength > 0) {
-                    val end = rangeStart + rangeLength - 1
-                    headers["Range"] = "bytes=$rangeStart-$end"
-                } else {
-                    headers["Range"] = "bytes=$rangeStart-"
-                }
-            }
-
-            val modified = modifier?.modifyRequest(url, headers)
-            val finalUrl = modified?.url ?: url
-            val finalHeaders = modified?.headers?.toMutableMap() ?: headers
-
-            val resp = client.get(finalUrl, finalHeaders)
-            if (!resp.isOk) {
-                resp.body?.close()
-                throw IllegalStateException("Failed to download HLS resource ($finalUrl): HTTP ${resp.code}")
-            }
-
-            val body = resp.body ?: throw IllegalStateException("Failed to download HLS resource ($finalUrl): Empty body")
-            val bytes = body.bytes()
-            body.close()
-            return bytes
-        }
-
-        fun buildSequenceIv(sequenceNumber: Long): ByteArray {
-            return ByteBuffer.allocate(16)
-                .putLong(0L)
-                .putLong(sequenceNumber)
-                .array()
-        }
-
-        val segmentFiles = arrayListOf<File>()
-        try {
-            val playlistHeaders = mutableMapOf<String, String>()
-            val modifiedPlaylistReq = modifier?.modifyRequest(hlsUrl, playlistHeaders)
-            val playlistResp = client.get(
-                modifiedPlaylistReq?.url ?: hlsUrl,
-                modifiedPlaylistReq?.headers?.toMutableMap() ?: playlistHeaders
-            )
-
-            check(playlistResp.isOk) { "Failed to get variant playlist: ${playlistResp.code}" }
-
-            val vpContent = playlistResp.body?.string()
-                ?: throw IllegalStateException("Variant playlist content is empty")
-
-            val variantPlaylist = HLS.parseVariantPlaylist(vpContent, hlsUrl)
-            val hlsDec = variantPlaylist.decryptionInfo
-            val useDecryption = hlsDec != null && !hlsDec.method.equals("NONE", ignoreCase = true)
-            var keyBytes: ByteArray? = null
-            var staticIvBytes: ByteArray? = null
-
-            if (useDecryption) {
-                if (!hlsDec.method.equals("AES-128", ignoreCase = true)) {
-                    throw UnsupportedOperationException("HLS decryption method '${hlsDec.method}' is not supported.")
-                }
-
-                val keyUrl = hlsDec.keyUrl ?: throw IllegalStateException("Encrypted HLS playlist without key URI is not supported.")
-
-                keyBytes = downloadBytes(keyUrl)
-                if (!hlsDec.iv.isNullOrEmpty()) {
-                    staticIvBytes = hlsDec.iv.hexStringToByteArray()
-                }
-            }
-
-            val mediaSequence = variantPlaylist.mediaSequence ?: 0L
-            val rangeOffsets = mutableMapOf<String, Long>()
-
-            if (!variantPlaylist.mapUrl.isNullOrEmpty()) {
-                if (isCancelled) throw CancellationException("Cancelled")
-
-                Logger.i(TAG, "Downloading HLS initialization map")
-
-                var mapRangeStart: Long? = null
-                var mapRangeLength: Long? = null
-
-                if (variantPlaylist.mapBytesLength > 0) {
-                    mapRangeLength = variantPlaylist.mapBytesLength
-
-                    val mapUrl = variantPlaylist.mapUrl
-                    if (variantPlaylist.mapBytesStart >= 0) {
-                        mapRangeStart = variantPlaylist.mapBytesStart
-                        rangeOffsets[mapUrl] =
-                            variantPlaylist.mapBytesStart + variantPlaylist.mapBytesLength
-                    } else {
-                        val offset = rangeOffsets[mapUrl] ?: 0L
-                        mapRangeStart = offset
-                        rangeOffsets[mapUrl] = offset + variantPlaylist.mapBytesLength
-                    }
-                }
-
-                var mapBytes = downloadBytes(variantPlaylist.mapUrl!!, mapRangeStart, mapRangeLength)
-
-                if (useDecryption) {
-                    val kb = keyBytes ?: throw IllegalStateException("Decryption key bytes are missing.")
-                    val iv = staticIvBytes
-                        ?: throw UnsupportedOperationException("Encrypted EXT-X-MAP without explicit IV is not supported.")
-                    mapBytes = decryptSegment(mapBytes, kb, iv)
-                }
-
-                if (mapBytes.size.toLong() > Int.MAX_VALUE) {
-                    throw IllegalStateException("HLS MAP segment too large to handle.")
-                }
-
-                val segmentFile = File(context.cacheDir, "segment-${UUID.randomUUID()}")
-                val outStr = segmentFile.outputStream()
-                try {
-                    segmentFiles.add(segmentFile)
-                    outStr.write(mapBytes)
-                    outStr.flush()
-                } finally {
-                    outStr.close()
-                }
-                downloadedTotalLength += mapBytes.size
-            }
-
-            val totalSegments = variantPlaylist.segments.size
-            var mediaSegmentIndex = 0
-
-            var bytesSinceLastSpeedUpdate = 0L
-            var lastSpeedUpdateTime = System.currentTimeMillis()
-            var lastSpeed = 0L
-
-            variantPlaylist.segments.forEachIndexed { index, segment ->
-                if (segment !is HLS.MediaSegment) return@forEachIndexed
-                if (isCancelled) throw CancellationException("Cancelled")
-
-                Logger.i(TAG, "Download '$name' segment $index sequential")
-
-                var rangeStart: Long? = null
-                var rangeLength: Long? = null
-
-                if (segment.bytesLength > 0) {
-                    rangeLength = segment.bytesLength
-
-                    val urlKey = segment.uri
-                    if (segment.bytesStart >= 0) {
-                        rangeStart = segment.bytesStart
-                        rangeOffsets[urlKey] = segment.bytesStart + segment.bytesLength
-                    } else {
-                        val offset = rangeOffsets[urlKey] ?: 0L
-                        rangeStart = offset
-                        rangeOffsets[urlKey] = offset + segment.bytesLength
-                    }
-                }
-
-                var segmentBytes = downloadBytes(segment.uri, rangeStart, rangeLength)
-
-                if (useDecryption) {
-                    val kb = keyBytes ?: throw IllegalStateException("Decryption key bytes are missing.")
-                    val ivBytes = if (staticIvBytes != null) {
-                        staticIvBytes
-                    } else {
-                        val sequenceNumber = mediaSequence + mediaSegmentIndex
-                        buildSequenceIv(sequenceNumber)
-                    }
-
-                    segmentBytes = decryptSegment(segmentBytes, kb, ivBytes)
-                }
-
-                val segmentLength = segmentBytes.size.toLong()
-                if (segmentLength > Int.MAX_VALUE) {
-                    throw IllegalStateException("HLS media segment too large to handle.")
-                }
-
-                val avgLen = if (index == 0) {
-                    segmentLength
-                } else {
-                    if (index > 0) downloadedTotalLength / index else segmentLength
-                }
-                val expectedTotal = avgLen * (totalSegments - 1) + segmentLength
-
-                val segmentFile = File(context.cacheDir, "segment-${UUID.randomUUID()}")
-                val outStr = segmentFile.outputStream()
-                try {
-                    segmentFiles.add(segmentFile)
-                    outStr.write(segmentBytes)
-                } finally {
-                    outStr.close()
-                }
-                downloadedTotalLength += segmentLength
-
-                bytesSinceLastSpeedUpdate += segmentLength
-                val now = System.currentTimeMillis()
-                val elapsed = now - lastSpeedUpdateTime
-                if (elapsed >= 500 && bytesSinceLastSpeedUpdate > 0) {
-                    lastSpeed = (bytesSinceLastSpeedUpdate * 1000L / elapsed)
-                    bytesSinceLastSpeedUpdate = 0
-                    lastSpeedUpdateTime = now
-                }
-
-                onProgress(expectedTotal, downloadedTotalLength, lastSpeed)
-                mediaSegmentIndex++
-            }
-
-            combineSegments(context, segmentFiles, targetFile)
-            Logger.i(TAG, "Finished HLS Source for $name")
-        } catch (ioex: IOException) {
-            if (targetFile.exists())
-                targetFile.delete()
-            if (ioex.message?.contains("ENOSPC") == true)
-                throw Exception("Not enough space on device", ioex)
-            else
-                throw ioex
-        } catch (ex: Throwable) {
-            if (targetFile.exists())
-                targetFile.delete()
-            throw ex
-        }
-        finally {
-            for (segmentFile in segmentFiles) {
-                segmentFile.delete()
-            }
-        }
-
-        return downloadedTotalLength
-    }
-
     private fun downloadDashFileSource(name: String, client: ManagedHttpClient, source: IJSDashManifestRawSource, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
         if(targetFile.exists())
             targetFile.delete();
@@ -885,30 +715,23 @@ class VideoDownload {
                 source.getRequestExecutor();
             else
                 null;
-
-            val modifier = if (source is JSSource && source.hasRequestModifier)
-                source.getRequestModifier();
-            else
-                null;
             val speedTracker = SpeedTracker(1000);
 
             Logger.i(TAG, "Download $name Dash, CueCount: " + foundCues.count().toString());
 
-            var written: Long = 0;
+            var written = 0;
             var indexCounter = 0;
             onProgress(foundCues.count().toLong(), 0, 0);
             for(cue in foundCues) {
                 val t = cue.groupValues[1];
                 val d = cue.groupValues[2];
 
-
                 val url = foundTemplateUrl.replace("\$Number\$", (indexCounter).toString());
-                val modified = modifier?.modifyRequest(url, mapOf());
 
                 val data = if(executor != null)
-                    executor.executeRequest("GET", modified?.url ?: url, null, modified?.headers ?: mapOf());
+                    executor.executeRequest("GET", url, null, mapOf());
                 else {
-                    val resp = client.get(modified?.url ?: url, modified?.headers?.toMutableMap() ?: mutableMapOf());
+                    val resp = client.get(url, mutableMapOf());
                     if(!resp.isOk)
                         throw IllegalStateException("Dash request failed for index " + indexCounter.toString() + ", with code: " + resp.code.toString());
                     resp.body!!.bytes()
@@ -921,7 +744,7 @@ class VideoDownload {
 
                 indexCounter++;
             }
-            sourceLength = written;
+            sourceLength = written.toLong();
 
             Logger.i(TAG, "$name downloadSource Finished");
         }
@@ -943,7 +766,7 @@ class VideoDownload {
         }
         return sourceLength!!;
     }
-    private fun downloadFileSource(name: String, client: ManagedHttpClient, source: JSSource?, videoUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
+    private fun downloadFileSource(name: String, client: ManagedHttpClient, videoUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
         if(targetFile.exists())
             targetFile.delete();
 
@@ -952,12 +775,7 @@ class VideoDownload {
         val sourceLength: Long?;
         val fileStream = FileOutputStream(targetFile);
 
-        val modifier = if (source is JSSource && source.hasRequestModifier)
+        try{
-            source.getRequestModifier();
-        else
-            null;
-
-        try {
             val head = client.tryHead(videoUrl);
             val relatedPlugin = (video?.url ?: videoDetails?.url)?.let { StatePlatform.instance.getContentClient(it) }?.let { if(it is JSClient) it else null };
             if(Settings.instance.downloads.byteRangeDownload && head?.containsKey("accept-ranges") == true && head.containsKey("content-length"))
@@ -968,12 +786,12 @@ class VideoDownload {
                 Logger.i(TAG, "Download $name ByteRange Parallel (${concurrency}): " + videoUrl);
                 sourceLength = head["content-length"]!!.toLong();
                 onProgress(sourceLength, 0, 0);
-                downloadSource_Ranges(name, client, modifier, fileStream, videoUrl, sourceLength, 1024*512, concurrency, onProgress);
+                downloadSource_Ranges(name, client, fileStream, videoUrl, sourceLength, 1024*512, concurrency, onProgress);
             }
             else {
                 Logger.i(TAG, "Download $name Sequential");
                 try {
-                    sourceLength = downloadSource_Sequential(client, modifier, fileStream, videoUrl, null, 0, onProgress);
+                    sourceLength = downloadSource_Sequential(client, fileStream, videoUrl, null, 0, onProgress);
                 } catch (e: Throwable) {
                     Logger.w(TAG, "Failed to download sequentially (url = $videoUrl)")
                     throw e
@@ -1024,7 +842,7 @@ class VideoDownload {
         }
     }
 
-    private fun downloadSource_Sequential(client: ManagedHttpClient, modifier: IRequestModifier? = null, fileStream: FileOutputStream, url: String, decryptionInfo: DecryptionInfo?, index: Int, onProgress: (Long, Long, Long) -> Unit): Long {
+    private fun downloadSource_Sequential(client: ManagedHttpClient, fileStream: FileOutputStream, url: String, decryptionInfo: DecryptionInfo?, index: Int, onProgress: (Long, Long, Long) -> Unit): Long {
         val progressRate: Int = 4096 * 5;
         var lastProgressCount: Int = 0;
         val speedRate: Int = 4096 * 5;
@@ -1033,12 +851,7 @@ class VideoDownload {
 
         var lastSpeed: Long = 0;
 
-        val result = if (modifier != null) {
+        val result = client.get(url);
-            val modified = modifier.modifyRequest(url, mapOf())
-            client.get(modified.url!!, modified.headers.toMutableMap())
-        } else {
-            client.get(url)
-        }
         if (!result.isOk) {
             result.body?.close()
             throw IllegalStateException("Failed to download source. Web[${result.code}] Error");
@@ -1175,7 +988,7 @@ class VideoDownload {
         onProgress(sourceLength, totalRead, 0)
         return sourceLength
     }*/
-    private fun downloadSource_Ranges(name: String, client: ManagedHttpClient, modifier: IRequestModifier?, fileStream: FileOutputStream, url: String, sourceLength: Long, rangeSize: Int, concurrency: Int = 1, onProgress: (Long, Long, Long) -> Unit) {
+    private fun downloadSource_Ranges(name: String, client: ManagedHttpClient, fileStream: FileOutputStream, url: String, sourceLength: Long, rangeSize: Int, concurrency: Int = 1, onProgress: (Long, Long, Long) -> Unit) {
         val progressRate: Int = 4096 * 5;
         var lastProgressCount: Int = 0;
         val speedRate: Int = 4096 * 5;
@@ -1194,7 +1007,7 @@ class VideoDownload {
 
             Logger.i(TAG, "Download ${name} Batch #${reqCount} [${concurrency}] (${lastSpeed.toHumanBytesSpeed()})");
 
-            val byteRangeResults = requestByteRangeParallel(client, pool, modifier, url, sourceLength, concurrency, totalRead,
+            val byteRangeResults = requestByteRangeParallel(client, pool, url, sourceLength, concurrency, totalRead,
                 rangeSize, 1024 * 64);
 
             for(byteRange in byteRangeResults) {
@@ -1225,7 +1038,7 @@ class VideoDownload {
         onProgress(sourceLength, totalRead, 0);
     }
 
-    private fun requestByteRangeParallel(client: ManagedHttpClient, pool: ForkJoinPool, modifier: IRequestModifier?, url: String, totalLength: Long, concurrency: Int, rangePosition: Long, rangeSize: Int, rangeVariance: Int = -1): List<Triple<ByteArray, Long, Long>> {
+    private fun requestByteRangeParallel(client: ManagedHttpClient, pool: ForkJoinPool, url: String, totalLength: Long, concurrency: Int, rangePosition: Long, rangeSize: Int, rangeVariance: Int = -1): List<Triple<ByteArray, Long, Long>> {
         val tasks = mutableListOf<ForkJoinTask<Triple<ByteArray, Long, Long>>>();
         var readPosition = rangePosition;
         for(i in 0 until concurrency) {
@@ -1239,25 +1052,21 @@ class VideoDownload {
             else readPosition + toRead;
 
             tasks.add(pool.submit<Triple<ByteArray, Long, Long>> {
-                return@submit requestByteRange(client, modifier, url, rangeStart, rangeEnd);
+                return@submit requestByteRange(client, url, rangeStart, rangeEnd);
             });
             readPosition = rangeEnd + 1;
         }
 
         return tasks.map { it.get() };
     }
-    private fun requestByteRange(client: ManagedHttpClient, modifier: IRequestModifier?, url: String, rangeStart: Long, rangeEnd: Long): Triple<ByteArray, Long, Long> {
+    private fun requestByteRange(client: ManagedHttpClient, url: String, rangeStart: Long, rangeEnd: Long): Triple<ByteArray, Long, Long> {
         var retryCount = 0
-        var lastException: Throwable? = null;
+        var lastException: Throwable? = null
-
-        val headers = mutableMapOf(Pair("Range", "bytes=${rangeStart}-${rangeEnd}"));
-        val modified = modifier?.modifyRequest(url, headers);
 
         while (retryCount <= 3) {
             try {
                 val toRead = rangeEnd - rangeStart;
-
+                val req = client.get(url, mutableMapOf(Pair("Range", "bytes=${rangeStart}-${rangeEnd}")));
-                val req = client.get(modified?.url ?: url, modified?.headers?.toMutableMap() ?: headers);
                 if (!req.isOk) {
                     val bodyString = req.body?.string()
                     req.body?.close()

app/src/main/java/com/futo/platformplayer/engine/V8Plugin.kt

@@ -4,8 +4,6 @@ import android.content.Context
 import com.caoccao.javet.exceptions.JavetCompilationException
 import com.caoccao.javet.exceptions.JavetException
 import com.caoccao.javet.exceptions.JavetExecutionException
-import com.caoccao.javet.interfaces.IJavetEntityError
-import com.caoccao.javet.interfaces.IJavetEntityMap
 import com.caoccao.javet.interop.V8Host
 import com.caoccao.javet.interop.V8Runtime
 import com.caoccao.javet.values.V8Value
@@ -20,7 +18,6 @@ import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.engine.exceptions.NoInternetException
 import com.futo.platformplayer.engine.exceptions.PluginEngineStoppedException
-import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.engine.exceptions.ScriptAgeException
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptCompilationException
@@ -36,11 +33,9 @@ import com.futo.platformplayer.engine.internal.V8Converter
 import com.futo.platformplayer.engine.packages.PackageBridge
 import com.futo.platformplayer.engine.packages.PackageDOMParser
 import com.futo.platformplayer.engine.packages.PackageHttp
-import com.futo.platformplayer.engine.packages.PackageHttpImp
 import com.futo.platformplayer.engine.packages.PackageJSDOM
 import com.futo.platformplayer.engine.packages.PackageUtilities
 import com.futo.platformplayer.engine.packages.V8Package
-import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateAssets
@@ -247,12 +242,10 @@ class V8Plugin {
     }
     fun <T> busy(handle: ()->T): T {
         _busyLock.lock();
-        //Logger.i(TAG, "Busy Enter [" + _busyLock.holdCount + "]" + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(5)?.firstOrNull()?.toString())
         try {
             return handle();
         }
         finally {
-            //Logger.i(TAG, "Busy Leave [" + _busyLock.holdCount + "]" + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString()+ ", " + Thread.currentThread().stackTrace.drop(5)?.firstOrNull()?.toString())
             _busyLock.unlock();
         }
         /*
@@ -384,7 +377,6 @@ class V8Plugin {
         return when(packageName) {
             "DOMParser" -> PackageDOMParser(this)
             "Http" -> PackageHttp(this, config)
-            "HttpImp" -> PackageHttpImp(this, config)
             "Utilities" -> PackageUtilities(this, config)
             "JSDOM" -> PackageJSDOM(this, config)
             else -> if(allowNull) null else throw ScriptCompilationException(config, "Unknown package [${packageName}] required for plugin ${config.name}");
@@ -413,12 +405,6 @@ class V8Plugin {
             return _runtimeMap.getOrDefault(runtime, null);
         }
 
-        private fun ctxString(ctx: Any?, key: String): String? = when (ctx) {
-            is Map<*, *> -> ctx[key]?.toString()
-            is V8ValueObject -> if (ctx.has(key)) ctx.getString(key) else null
-            else -> null
-        }
-
         fun <T: Any?> catchScriptErrors(config: IV8PluginConfig, context: String, code: String? = null, handle: ()->T): T {
             var codeStripped = code;
             if(codeStripped != null) { //TODO: Improve code stripped
@@ -452,6 +438,37 @@ class V8Plugin {
                 throw ScriptCompilationException(config, "Compilation: [${context}]: ${scriptEx.message}\n(${scriptEx.scriptingError.lineNumber})[${scriptEx.scriptingError.startColumn}-${scriptEx.scriptingError.endColumn}]: ${scriptEx.scriptingError.sourceLine}", null, codeStripped);
             }
             catch(executeEx: JavetExecutionException) {
+                val obj = executeEx.scriptingError?.context
+                if(obj != null && obj.containsKey("plugin_type") == true) {
+                    val pluginType = obj["plugin_type"].toString();
+
+                    //Captcha
+                    if (pluginType == "CaptchaRequiredException") {
+                        throw ScriptCaptchaRequiredException(config,
+                            obj["url"]?.toString(),
+                            obj["body"]?.toString(),
+                            executeEx, executeEx.scriptingError?.stack, codeStripped);
+                    }
+
+                    //Reload Required
+                    if (pluginType == "ReloadRequiredException") {
+                        throw ScriptReloadRequiredException(config,
+                            obj["msg"]?.toString(),
+                            obj["reloadData"]?.toString(),
+                            executeEx, executeEx.scriptingError?.stack, codeStripped);
+                    }
+
+                    //Others
+                    throwExceptionFromV8(
+                        config,
+                        pluginType,
+                        (extractJSExceptionMessage(executeEx) ?: ""),
+                        executeEx,
+                        executeEx.scriptingError?.stack,
+                        codeStripped
+                    );
+                }
+                /* //Required for newer V8 versions
                 if(executeEx.scriptingError?.context is IJavetEntityError) {
                     val obj = executeEx.scriptingError?.context as IJavetEntityError
                     if(obj.context.containsKey("plugin_type") == true) {
@@ -485,6 +502,7 @@ class V8Plugin {
                     }
 
                 }
+                */
                 throw ScriptExecutionException(config, extractJSExceptionMessage(executeEx) ?: "", null, executeEx.scriptingError?.stack, codeStripped);
             }
             catch(ex: Exception) {
@@ -493,29 +511,18 @@ class V8Plugin {
         }
 
         private fun throwExceptionFromV8(config: IV8PluginConfig, pluginType: String, msg: String, innerEx: Exception? = null, stack: String? = null, code: String? = null) {
-            throw getExceptionFromPlugin(config, pluginType, msg, innerEx, stack, code);
-        }
-        fun getExceptionFromPlugin(config: IV8PluginConfig, obj: V8ValueObject, innerEx: Exception? = null, stack: String? = null, code: String? = null, prefix: String? = null): PluginException {
-            val pluginType = obj.getOrDefault(config, "plugin_type", "Exception Handling", "")?.let { if(!it.isNullOrBlank()) it + "" else "" } ?: "";
-            var msg = obj.getOrDefault<String?>(config, "msg", "Exception Handling", null)
-                ?: obj.getOrDefault(config, "message", "Exception Handling", "");
-            if(!prefix.isNullOrBlank())
-                msg = prefix + msg;
-            return getExceptionFromPlugin(config, pluginType, msg ?: "Unknown exception", innerEx, stack, code);
-        }
-        fun getExceptionFromPlugin(config: IV8PluginConfig, pluginType: String, msg: String, innerEx: Exception? = null, stack: String? = null, code: String? = null): PluginException {
             when(pluginType) {
-                "ScriptException" -> return ScriptException(config, msg, innerEx, stack, code);
+                "ScriptException" -> throw ScriptException(config, msg, innerEx, stack, code);
-                "CriticalException" -> return ScriptCriticalException(config, msg, innerEx, stack, code);
+                "CriticalException" -> throw ScriptCriticalException(config, msg, innerEx, stack, code);
-                "AgeException" -> return ScriptAgeException(config, msg, innerEx, stack, code);
+                "AgeException" -> throw ScriptAgeException(config, msg, innerEx, stack, code);
-                "UnavailableException" -> return ScriptUnavailableException(config, msg, innerEx, stack, code);
+                "UnavailableException" -> throw ScriptUnavailableException(config, msg, innerEx, stack, code);
-                "ScriptLoginRequiredException" -> return ScriptLoginRequiredException(config, msg, innerEx, stack, code);
+                "ScriptLoginRequiredException" -> throw ScriptLoginRequiredException(config, msg, innerEx, stack, code);
-                "ScriptExecutionException" -> return ScriptExecutionException(config, msg, innerEx, stack, code);
+                "ScriptExecutionException" -> throw ScriptExecutionException(config, msg, innerEx, stack, code);
-                "ScriptCompilationException" -> return ScriptCompilationException(config, msg, innerEx, code);
+                "ScriptCompilationException" -> throw ScriptCompilationException(config, msg, innerEx, code);
-                "ScriptImplementationException" -> return ScriptImplementationException(config, msg, innerEx, null, code);
+                "ScriptImplementationException" -> throw ScriptImplementationException(config, msg, innerEx, null, code);
-                "ScriptTimeoutException" -> return ScriptTimeoutException(config, msg, innerEx);
+                "ScriptTimeoutException" -> throw ScriptTimeoutException(config, msg, innerEx);
-                "NoInternetException" -> return NoInternetException(config, msg, innerEx, stack, code);
+                "NoInternetException" -> throw NoInternetException(config, msg, innerEx, stack, code);
-                else -> return ScriptExecutionException(config, msg, innerEx, stack, code);
+                else -> throw ScriptExecutionException(config, msg, innerEx, stack, code);
             }
         }
 

app/src/main/java/com/futo/platformplayer/engine/packages/Libcurl.kt

@@ -1,208 +0,0 @@
-package com.curlbind
-
-import androidx.annotation.Keep
-import java.io.ByteArrayOutputStream
-import java.nio.charset.Charset
-import kotlin.collections.iterator
-import kotlin.math.min
-
-@Keep
-object Libcurl {
-    init {
-        System.loadLibrary("curl-impersonate")
-        System.loadLibrary("curl-impersonate-jni")
-        // CURL_GLOBAL_ALL = 3
-        require(ce_global_init(3) == CURLcode.CURLE_OK) { "curl_global_init failed" }
-    }
-
-    @Keep
-    data class Request(
-        var url: String,
-        var method: String = "GET",
-        var headers: Map<String, String> = emptyMap(),
-        var body: ByteArray? = null,
-        var impersonateTarget: String = "chrome136",
-        var useBuiltInHeaders: Boolean = true,
-        var timeoutMs: Int = 30_000
-    )
-
-    @Keep
-    data class Response(
-        val status: Int,
-        val effectiveUrl: String,
-        val bodyBytes: ByteArray,
-        val headers: Map<String, List<String>>
-    )
-
-    object CURLcode {
-        const val CURLE_OK = 0
-        const val CURLE_UNKNOWN_OPTION = 48
-    }
-
-    object CurlInfoConsts {
-        const val CURLINFO_STRING = 0x100000
-        const val CURLINFO_LONG = 0x200000
-        const val CURLINFO_DOUBLE = 0x300000
-        const val CURLINFO_SLIST = 0x400000
-        const val CURLINFO_PTR = 0x400000
-        const val CURLINFO_SOCKET = 0x500000
-        const val CURLINFO_OFF_T = 0x600000
-        const val CURLINFO_MASK = 0x0fffff
-        const val CURLINFO_TYPEMASK = 0xf00000
-    }
-
-    object CURLINFO {
-        const val NONE = 0
-        const val EFFECTIVE_URL = CurlInfoConsts.CURLINFO_STRING + 1
-        const val RESPONSE_CODE = CurlInfoConsts.CURLINFO_LONG + 2
-    }
-
-    object CURLOPT {
-        const val URL = 10002
-        const val FOLLOWLOCATION = 52
-        const val MAXREDIRS = 68
-        const val CONNECTTIMEOUT_MS = 156
-        const val TIMEOUT_MS = 155
-        const val HTTP_VERSION = 84
-        const val ACCEPT_ENCODING = 10102
-        const val HTTPHEADER = 10023
-        const val COOKIEFILE = 10031
-        const val COOKIEJAR = 10082
-        const val CUSTOMREQUEST = 10036
-        const val IPRESOLVE = 113
-        const val POSTFIELDS = 10015
-        const val POSTFIELDSIZE = 60
-        const val WRITEFUNCTION = 20011
-        const val HEADERFUNCTION = 20079
-        const val WRITEDATA = 10001
-        const val HEADERDATA = 10029
-        const val COPYPOSTFIELDS = 10165
-        const val CURLOPT_DNS_SERVERS = 10211
-        const val CAPATH = 10097
-        const val CAINFO = 10065
-    }
-
-    object CURL_HTTP_VERSION { const val TWO_TLS = 4 }
-    object CURL_IPRESOLVE { const val WHATEVER = 0; const val V4 = 1; const val V6 = 2 }
-
-    @Keep interface WriteCallback { fun onWrite(chunk: ByteArray): Int }
-    @Keep interface HeaderCallback { fun onHeader(line: ByteArray): Int }
-
-    @Volatile private var defaultCAPath: String? = null
-    @Keep fun setDefaultCAPath(path: String) { defaultCAPath = path }
-
-    fun perform(req: Request): Response {
-        val easy = ce_easy_init()
-        require(easy != 0L) { "curl_easy_init failed" }
-
-        var slist: Long = 0L
-        val bodySink = ByteArrayOutputStream(64 * 1024)
-        val rawHeaderLines = ArrayList<String>(64)
-
-        try {
-            val imp = ce_easy_impersonate(easy, req.impersonateTarget, req.useBuiltInHeaders)
-            if (imp != CURLcode.CURLE_OK && imp != CURLcode.CURLE_UNKNOWN_OPTION) {
-                error("curl_easy_impersonate failed: ${ce_easy_strerror(imp)}")
-            }
-
-            checkOK(ce_setopt_str(easy, CURLOPT.URL, req.url))
-            checkOK(ce_setopt_long(easy, CURLOPT.FOLLOWLOCATION, 1))
-            checkOK(ce_setopt_long(easy, CURLOPT.MAXREDIRS, 10))
-            checkOK(ce_setopt_long(easy, CURLOPT.CONNECTTIMEOUT_MS, req.timeoutMs.toLong()))
-            checkOK(ce_setopt_long(easy, CURLOPT.TIMEOUT_MS, req.timeoutMs.toLong()))
-            checkOK(ce_setopt_long(easy, CURLOPT.HTTP_VERSION, CURL_HTTP_VERSION.TWO_TLS.toLong()))
-            checkOK(ce_setopt_str(easy, CURLOPT.ACCEPT_ENCODING, "")) // enable auto-decompress
-
-            if (req.headers.isNotEmpty()) {
-                for ((k, v) in req.headers) slist = ce_slist_append(slist, "$k: $v")
-                if (slist != 0L) checkOK(ce_setopt_ptr(easy, CURLOPT.HTTPHEADER, slist))
-            }
-
-            val method = req.method
-            if (!method.equals("GET", ignoreCase = true)) {
-                checkOK(ce_setopt_str(easy, CURLOPT.CUSTOMREQUEST, method))
-                val body = req.body
-                if (body != null && body.isNotEmpty()) {
-                    checkOK(ce_set_postfields(easy, body))
-                }
-            }
-
-            checkOK(ce_set_write_callback(easy, object : WriteCallback {
-                override fun onWrite(chunk: ByteArray): Int {
-                    bodySink.write(chunk)
-                    return chunk.size
-                }
-            }))
-            checkOK(ce_set_header_callback(easy, object : HeaderCallback {
-                override fun onHeader(line: ByteArray): Int {
-                    // Keep raw but trim CRLF for convenience
-                    val s = line.toString(Charset.forName("ISO-8859-1")).trimEnd('\r', '\n')
-                    if (s.isNotBlank()) rawHeaderLines.add(s)
-                    return line.size
-                }
-            }))
-
-            checkOK(ce_setopt_str(easy, CURLOPT.CURLOPT_DNS_SERVERS, "1.1.1.1,8.8.8.8"));
-            defaultCAPath?.let { checkOK(ce_setopt_str(easy, CURLOPT.CAINFO, it)) }
-
-            val rc = ce_easy_perform(easy)
-            if (rc != CURLcode.CURLE_OK) error("curl_easy_perform failed: ${ce_easy_strerror(rc)}")
-
-            val codeArr = longArrayOf(0)
-            checkOK(ce_easy_getinfo_long(easy, CURLINFO.RESPONSE_CODE, codeArr))
-            val effective = ce_easy_getinfo_string(easy, CURLINFO.EFFECTIVE_URL) ?: req.url
-
-            return Response(
-                status = codeArr[0].toInt(),
-                effectiveUrl = effective,
-                bodyBytes = bodySink.toByteArray(),
-                headers = parseHeaders(rawHeaderLines)
-            )
-        } finally {
-            if (slist != 0L) ce_slist_free_all(slist)
-            ce_easy_cleanup(easy)
-        }
-    }
-
-    private fun defaultCookieJarPath(): String {
-        val tmp = System.getProperty("java.io.tmpdir") ?: "/data/local/tmp"
-        return if (tmp.endsWith("/")) "${tmp}imphttp.cookies.txt" else "$tmp/imphttp.cookies.txt"
-    }
-
-    private fun checkOK(code: Int) {
-        if (code != CURLcode.CURLE_OK) throw IllegalStateException("libcurl error: ${ce_easy_strerror(code)}")
-    }
-
-    private fun parseHeaders(lines: List<String>): Map<String, List<String>> {
-        val map = linkedMapOf<String, MutableList<String>>()
-        for (line in lines) {
-            val idx = line.indexOf(':')
-            if (idx <= 0) continue
-            val name = line.substring(0, idx).trim()
-            val value = line.substring(min(idx + 1, line.length)).trim()
-            map.getOrPut(name) { mutableListOf() }.add(value)
-        }
-        return map
-    }
-
-    @JvmStatic external fun ce_set_write_callback(easy: Long, cb: WriteCallback?): Int
-    @JvmStatic external fun ce_set_header_callback(easy: Long, cb: HeaderCallback?): Int
-
-    @JvmStatic external fun ce_global_init(flags: Long): Int
-    @JvmStatic external fun ce_global_cleanup()
-    @JvmStatic external fun ce_easy_init(): Long
-    @JvmStatic external fun ce_easy_cleanup(easy: Long)
-    @JvmStatic external fun ce_easy_perform(easy: Long): Int
-
-    @JvmStatic external fun ce_easy_impersonate(easy: Long, target: String, defaultHeaders: Boolean): Int
-    @JvmStatic external fun ce_setopt_long(easy: Long, opt: Int, value: Long): Int
-    @JvmStatic external fun ce_setopt_str(easy: Long, opt: Int, value: String): Int
-    @JvmStatic external fun ce_setopt_ptr(easy: Long, opt: Int, ptr: Long): Int
-    @JvmStatic external fun ce_slist_append(list: Long, header: String): Long
-    @JvmStatic external fun ce_slist_free_all(list: Long)
-    @JvmStatic external fun ce_easy_getinfo_long(easy: Long, info: Int, outVal: LongArray): Int
-    @JvmStatic external fun ce_easy_getinfo_string(easy: Long, info: Int): String?
-
-    @JvmStatic external fun ce_set_postfields(easy: Long, body: ByteArray): Int
-    @JvmStatic external fun ce_easy_strerror(code: Int): String
-}

app/src/main/java/com/futo/platformplayer/engine/packages/PackageBridge.kt

@@ -194,11 +194,7 @@ class PackageBridge : V8Package {
 
         val stackTrace = Thread.currentThread().stackTrace;
         val callerMethod = stackTrace.findLast {
-            it.className == JSClient::class.java.name &&
+            it.className == JSClient::class.java.name
-                    it.methodName != "isBusy" &&
-                    it.methodName != "busy" &&
-                    it.methodName != "getCopy" &&
-                    it.methodName != "isBusyWith"
         }?.methodName ?: "";
         val session = StateApp.instance.sessionId;
         val pluginId = _plugin.config.id;

app/src/main/java/com/futo/platformplayer/engine/packages/PackageDOMParser.kt

@@ -55,7 +55,7 @@ class PackageDOMParser : V8Package {
         }
         @V8Property
         fun lastChild(): DOMNode? {
-            val result = _element.lastElementChild()?.let { DOMNode(_package, it) };
+            val result = _element.firstElementChild()?.let { DOMNode(_package, it) };
             if(result != null)
                 _children.add(result);
             return result;

app/src/main/java/com/futo/platformplayer/engine/packages/PackageHttp.kt

@@ -254,7 +254,7 @@ class PackageHttp: V8Package {
 
     //TODO: This object is currently re-wrapped each modification, this is due to an issue passing the same object back and forth, should be fixed in future.
     @V8Convert(mode = V8ConversionMode.AllowOnly, proxyMode = V8ProxyMode.Class)
-    class BatchBuilder(@Transient private val _package: PackageHttp, existingRequests: MutableList<Pair<PackageHttpClient, RequestDescriptor>> = mutableListOf()): V8BindObject() {
+    class BatchBuilder(private val _package: PackageHttp, existingRequests: MutableList<Pair<PackageHttpClient, RequestDescriptor>> = mutableListOf()): V8BindObject() {
         @Transient
         private val _reqs = existingRequests;
 

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/MainActivityFragment.kt

@@ -6,7 +6,7 @@ import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.fragment.mainactivity.main.MainFragment
 
 open class MainActivityFragment : Fragment() {
-    protected val currentMain : MainFragment?
+    protected val currentMain : MainFragment
         get() {
         isValidMainActivity();
         return (activity as MainActivity).fragCurrent;

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt

@@ -8,25 +8,19 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.animation.doOnEnd
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.util.UnstableApi
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.dp
 import com.futo.platformplayer.fragment.mainactivity.MainActivityFragment
 import com.futo.platformplayer.fragment.mainactivity.main.*
@@ -34,10 +28,6 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePayment
 import com.futo.platformplayer.states.StateSubscriptions
-import com.futo.platformplayer.views.AnyAdapterView
-import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.pills.RoundButton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlin.math.floor
@@ -80,15 +70,9 @@ class MenuBottomBarFragment : MainActivityFragment() {
         private val _inflater: LayoutInflater;
         private val _subscribedActivity: MainActivity?;
 
-        private val _containerMoreHeader: ConstraintLayout;
-        private val _toggleAirplaneMode: LinearLayout;
-        private val _togglePrivacy: LinearLayout;
-
         private var _overlayMore: FrameLayout;
         private var _overlayMoreBackground: FrameLayout;
-        private var _layoutMoreButtons: RecyclerView;
+        private var _layoutMoreButtons: LinearLayout;
-        private val _layoutMoreButtonItems = arrayListOf<MenuButtonItem>();
-        private var _layoutMoreButtonsAdapter: AnyAdapterView<MenuButtonItem, MenuButtonItemViewHolder>;
         private var _layoutBottomBarButtons: LinearLayout;
 
         private var _moreVisible = false;
@@ -102,79 +86,15 @@ class MenuBottomBarFragment : MainActivityFragment() {
 
         private var currentButtonDefinitions: List<ButtonDefinition>? = null;
 
-        private var moreColumns = 3;
-
         constructor(fragment: MenuBottomBarFragment, inflater: LayoutInflater) : super(inflater.context) {
             _fragment = fragment;
             _inflater = inflater;
             inflater.inflate(R.layout.fragment_overview_bottom_bar, this);
 
-            _containerMoreHeader = findViewById(R.id.container_more_options);
-            _toggleAirplaneMode = findViewById(R.id.container_toggle_airplane);
-            _togglePrivacy = findViewById(R.id.container_toggle_privacy);
-
-            _toggleAirplaneMode.isVisible = false //TODO: Remove when airplane mode implemented
-
-            StateApp.instance.airplaneModeChanged.subscribe {
-                if(!StateApp.instance.airplaneMode)
-                    _toggleAirplaneMode.setBackgroundResource(R.drawable.background_menu_toggle)
-                else
-                    _toggleAirplaneMode.setBackgroundResource(R.drawable.background_menu_toggle_active)
-            }
-            if(!StateApp.instance.airplaneMode)
-                _toggleAirplaneMode.setBackgroundResource(R.drawable.background_menu_toggle)
-            else
-                _toggleAirplaneMode.setBackgroundResource(R.drawable.background_menu_toggle_active)
-            _toggleAirplaneMode.setOnClickListener {
-                if(StateApp.instance.airplaneMode) {
-                    StateApp.instance.setAirMode(false);
-                    UIDialogs.appToast("Airplane mode disabled");
-                }
-                else {
-                    StateApp.instance.setAirMode(true);
-                    UIDialogs.appToast("Airplane mode enabled");
-                }
-            }
-
-            StateApp.instance.privateModeChanged.subscribe {
-                if(!StateApp.instance.privateMode)
-                    _togglePrivacy.setBackgroundResource(R.drawable.background_menu_toggle)
-                else
-                    _togglePrivacy.setBackgroundResource(R.drawable.background_menu_toggle_active)
-            }
-            if(!StateApp.instance.privateMode)
-                _togglePrivacy.setBackgroundResource(R.drawable.background_menu_toggle)
-            else
-                _togglePrivacy.setBackgroundResource(R.drawable.background_menu_toggle_active)
-            _togglePrivacy.setOnClickListener {
-                if(StateApp.instance.privateMode) {
-                    StateApp.instance.setPrivacyMode(false);
-                    UIDialogs.appToast("Privacy mode disabled");
-                }
-                else {
-                    StateApp.instance.setPrivacyMode(true);
-                    UIDialogs.appToast("Privacy mode enabled");
-                }
-            }
-
             _overlayMore = findViewById(R.id.more_overlay);
             _overlayMoreBackground = findViewById(R.id.more_overlay_background);
             _layoutMoreButtons = findViewById(R.id.more_menu_buttons);
-            _layoutBottomBarButtons = findViewById(R.id.bottom_bar_buttons);
+            _layoutBottomBarButtons = findViewById(R.id.bottom_bar_buttons)
-
-            val totalWidthDp = resources.displayMetrics.widthPixels / resources.displayMetrics.density;
-            val columns = MenuButtonItemViewHolder.getAutoSizeColumns(totalWidthDp);
-            _layoutMoreButtonsAdapter = _layoutMoreButtons.asAny<MenuButtonItem, MenuButtonItemViewHolder>(_layoutMoreButtonItems,
-                RecyclerView.VERTICAL, false, { button ->
-                button.setAutoSize(totalWidthDp);
-                button.parentFragment = this@MenuBottomBarView._fragment;
-                button.onClick.subscribe {
-                    setMoreVisible(false);
-                }
-            })
-            moreColumns = columns;
-            val layoutManager = GridLayoutManager(context, columns, GridLayoutManager.VERTICAL, true);
-            _layoutMoreButtons.layoutManager = layoutManager;
 
             _overlayMoreBackground.setOnClickListener { setMoreVisible(false); };
 
@@ -201,8 +121,6 @@ class MenuBottomBarFragment : MainActivityFragment() {
         }
 
         private fun setMoreVisible(visible: Boolean) {
-
-            //TODO: issues with these bools
             if (_moreVisibleAnimating) {
                 return
             }
@@ -211,12 +129,9 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 return
             }
 
-
-/*
             val height = _moreButtons.firstOrNull()?.let {
                 it.height.toFloat() + (it.layoutParams as MarginLayoutParams).bottomMargin
             } ?: return
-            */
 
             _moreVisibleAnimating = true
             val moreOverlayBackground = _overlayMoreBackground
@@ -228,17 +143,10 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 moreOverlay.visibility = VISIBLE
                 val animations = arrayListOf<Animator>()
                 animations.add(ObjectAnimator.ofFloat(moreOverlayBackground, "alpha", 0.0f, 1.0f).setDuration(duration))
-                animations.add(ObjectAnimator.ofFloat(_layoutMoreButtons, "alpha", 0.0f, 1.0f).setDuration(duration))
-                animations.add(ObjectAnimator.ofFloat(_containerMoreHeader, "alpha", 0.0f, 1.0f).setDuration(duration))
-                _bottomButtons.find { it.definition.id == 99 }?.let {
-                    animations.add(ObjectAnimator.ofFloat(it, "alpha", 0.5f, 1.0f)
-                        .setDuration(duration));
-                }
 
-                animations.add(ObjectAnimator.ofFloat(_layoutMoreButtons, "translationY", resources.displayMetrics.heightPixels.toFloat(), 0.0f).setDuration(duration))
                 for ((index, button) in _moreButtons.withIndex()) {
                     val i = _moreButtons.size - index
-                    //animations.add(ObjectAnimator.ofFloat(button, "translationY", height * staggerFactor * (i + 1), 0.0f).setDuration(duration))
+                    animations.add(ObjectAnimator.ofFloat(button, "translationY", height * staggerFactor * (i + 1), 0.0f).setDuration(duration))
                 }
 
                 val animatorSet = AnimatorSet()
@@ -250,24 +158,11 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 animatorSet.start()
             } else {
                 val animations = arrayListOf<Animator>()
-                animations
+                animations.add(ObjectAnimator.ofFloat(moreOverlayBackground, "alpha", 1.0f, 0.0f).setDuration(duration))
-                    .add(ObjectAnimator.ofFloat(moreOverlayBackground, "alpha", 1.0f, 0.0f)
-                    .setDuration(duration))
-                animations
-                    .add(ObjectAnimator.ofFloat(_layoutMoreButtons, "alpha", 1.0f, 0.0f)
-                        .setDuration(duration))
-                animations
-                    .add(ObjectAnimator.ofFloat(_containerMoreHeader, "alpha", 1.0f, 0.0f)
-                        .setDuration(duration))
-                _bottomButtons.find { it.definition.id == 99 }?.let {
-                    animations.add(ObjectAnimator.ofFloat(it, "alpha", 1.0f, 0.5f)
-                        .setDuration(duration));
-                }
 
-                animations.add(ObjectAnimator.ofFloat(_layoutMoreButtons, "translationY", 0.0f, resources.displayMetrics.heightPixels.toFloat()).setDuration(duration))
                 for ((index, button) in _moreButtons.withIndex()) {
                     val i = _moreButtons.size - index
-                    //animations.add(ObjectAnimator.ofFloat(button, "translationY", 0.0f, height * staggerFactor * (i + 1)).setDuration(duration))
+                    animations.add(ObjectAnimator.ofFloat(button, "translationY", 0.0f, height * staggerFactor * (i + 1)).setDuration(duration))
                 }
 
                 val animatorSet = AnimatorSet()
@@ -279,12 +174,11 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 animatorSet.playTogether(animations)
                 animatorSet.start()
             }
-
         }
 
         private fun updateBottomMenuButtons(buttons: MutableList<ButtonDefinition>, hasMore: Boolean) {
             if (hasMore) {
-                buttons.add(ButtonDefinition(99, R.drawable.ic_more, R.drawable.ic_more, R.string.more, canToggle = false, { false }, { setMoreVisible(!_moreVisible) }))
+                buttons.add(ButtonDefinition(99, R.drawable.ic_more, R.drawable.ic_more, R.string.more, canToggle = false, { false }, { setMoreVisible(true) }))
             }
 
             _bottomButtons.clear();
@@ -324,42 +218,32 @@ class MenuBottomBarFragment : MainActivityFragment() {
             _layoutMoreButtons.removeAllViews();
 
             var insertedButtons = 0;
-            //Force settings to be first
-            val settingsIndex = buttons.indexOfFirst { b -> b.id == 7 };
-            if (settingsIndex != -1) {
-                val button = buttons[settingsIndex]
-                buttons.removeAt(settingsIndex)
-                buttons.add(0, button)
-                //insertedButtons++;
-            }
             //Force buy to be on top for more buttons
             val buyIndex = buttons.indexOfFirst { b -> b.id == 98 };
             if (buyIndex != -1) {
                 val button = buttons[buyIndex]
                 buttons.removeAt(buyIndex)
-                buttons.add(button)
+                buttons.add(0, button)
-                //insertedButtons++;
+                insertedButtons++;
             }
             //Force faq to be second
             val faqIndex = buttons.indexOfFirst { b -> b.id == 97 };
             if (faqIndex != -1) {
                 val button = buttons[faqIndex]
                 buttons.removeAt(faqIndex)
-                buttons.add(button)
+                buttons.add(if (insertedButtons == 1) 1 else 0, button)
-                //insertedButtons++;
+                insertedButtons++;
             }
             //Force privacy to be third
             val privacyIndex = buttons.indexOfFirst { b -> b.id == 96 };
             if (privacyIndex != -1) {
                 val button = buttons[privacyIndex]
                 buttons.removeAt(privacyIndex)
-                buttons.add(button)
+                buttons.add(if (insertedButtons == 2) 2 else (if(insertedButtons == 1) 1 else 0), button)
-                //insertedButtons++;
+                insertedButtons++;
             }
 
-            val newButtons = mutableListOf<MenuButtonItem>();
             for (data in buttons) {
-                /*
                 val button = MenuButton(context, data, _fragment, true);
                 button.setOnClickListener {
                     updateMenuIcons()
@@ -369,19 +253,14 @@ class MenuBottomBarFragment : MainActivityFragment() {
 
                 _moreButtons.add(button);
                 _layoutMoreButtons.addView(button);
-                */
-                val buttonItem = MenuButtonItem(data);
-                newButtons.add(buttonItem);
             }
-            _layoutMoreButtonsAdapter.setData(newButtons);
-            _layoutMoreButtonsAdapter.notifyContentChanged();
         }
 
         private fun updateMenuIcons() {
             for(button in _bottomButtons.toList())
                 button.updateActive(_fragment);
             for(button in _moreButtons.toList())
-                button.updateActive(_fragment, true);
+                button.updateActive(_fragment);
         }
 
         override fun onConfigurationChanged(newConfig: Configuration?) {
@@ -462,71 +341,6 @@ class MenuBottomBarFragment : MainActivityFragment() {
         }
 
 
-        class MenuButtonItem(val def: ButtonDefinition);
-        class MenuButtonItemViewHolder(private val _viewGroup: ViewGroup): AnyAdapter.AnyViewHolder<MenuButtonItem>(
-            LayoutInflater.from(_viewGroup.context).inflate(R.layout.list_menu_tile,
-                _viewGroup, false)) {
-
-            val onClick = Event1<MenuButtonItem>();
-
-            val root: ConstraintLayout;
-            val imageIcon: ImageView;
-            val textName: TextView;
-
-
-            var button: MenuButtonItem? = null;
-
-            var parentFragment: MenuBottomBarFragment? = null;
-
-            init {
-                root = _view.findViewById(R.id.root);
-                imageIcon = _view.findViewById(R.id.image_icon);
-                textName = _view.findViewById(R.id.text_name);
-
-                root.setOnClickListener {
-                    button?.let {
-                        it.def.action(parentFragment ?: return@let);
-                        onClick.emit(it);
-                    }
-                }
-            }
-
-
-            override fun bind(value: MenuButtonItem) {
-                button = value;
-                textName.text = _view.context.getString(value.def.string);
-                imageIcon.setImageResource(value.def.iconActive);
-            }
-
-
-            fun setWidth(dp: Int) {
-                root.updateLayoutParams {
-                    this.width = (dp - 6).dp(_viewGroup.context.resources);
-                    this.height = (dp - 6).dp(_viewGroup.context.resources);
-                }
-                imageIcon.updateLayoutParams {
-                    this.width = (dp - 54).dp(_viewGroup.context.resources);
-                    this.height = (dp - 54).dp(_viewGroup.context.resources);
-                }
-            }
-
-            fun setAutoSize(totalWidth: Float) {
-                val dpWidth = totalWidth;
-                val columns = Math.max(((dpWidth) / viewWidthDp).toInt(), 1);
-                val remainder = dpWidth - columns * viewWidthDp;
-                val targetSize = viewWidthDp + (remainder / columns).toInt();
-                setWidth(targetSize);
-            }
-
-            companion object {
-                val viewWidthDp = 90;
-                fun getAutoSizeColumns(totalWidth: Float): Int {
-                    val dpWidth = totalWidth;
-                    val columns = Math.max(((dpWidth) / viewWidthDp).toInt(), 1);
-                    return columns;
-                }
-            }
-        }
         class MenuButton: LinearLayout {
             val definition: ButtonDefinition;
 
@@ -540,14 +354,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 this.definition = def;
 
                 _buttonImage = findViewById(R.id.image_button);
-                //_buttonImage.setImageResource(if (def.isActive(fragment)) def.iconActive else def.icon);
+                _buttonImage.setImageResource(if (def.isActive(fragment)) def.iconActive else def.icon);
-                _buttonImage.setImageResource(definition.iconActive);
-                if(definition.isActive(fragment) || isMore) {
-                    this.alpha = 1f;
-                }
-                else {
-                    this.alpha = 0.5f;
-                }
 
                 _textButton = findViewById(R.id.text_button);
                 _textButton.text = resources.getString(def.string);
@@ -558,16 +365,8 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 }
             }
 
-            fun updateActive(fragment: MenuBottomBarFragment, isMore: Boolean = false, overrideValue: Boolean? = null) {
+            fun updateActive(fragment: MenuBottomBarFragment) {
-                //_buttonImage.setImageResource(if (definition.isActive(fragment)) definition.iconActive else definition.icon);
+                _buttonImage.setImageResource(if (definition.isActive(fragment)) definition.iconActive else definition.icon);
-                _buttonImage.setImageResource(definition.iconActive);
-                val isActive = overrideValue ?: definition.isActive(fragment) || isMore
-                if(isActive) {
-                    this.alpha = 1f;
-                }
-                else {
-                    this.alpha = 0.5f;
-                }
             }
         }
     }
@@ -590,9 +389,6 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 }
             }),
             ButtonDefinition(1, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscriptions, canToggle = true, { it.currentMain is SubscriptionsFeedFragment }, { it.navigate<SubscriptionsFeedFragment>(withHistory = false) }),
-            //if(Build.VERSION.SDK_INT > Build.VERSION_CODES.P)
-                ButtonDefinition(12, R.drawable.ic_library, R.drawable.ic_library, R.string.library, canToggle = false, { it.currentMain is LibraryFragment }, { it.navigate<LibraryFragment>(withHistory = false) })
-            ,//else null,
             ButtonDefinition(2, R.drawable.ic_creators, R.drawable.ic_creators_filled, R.string.creators, canToggle = false, { it.currentMain is CreatorsFragment }, { it.navigate<CreatorsFragment>(withHistory = false) }),
             ButtonDefinition(3, R.drawable.ic_sources, R.drawable.ic_sources_filled, R.string.sources, canToggle = false, { it.currentMain is SourcesFragment }, { it.navigate<SourcesFragment>(withHistory = false) }),
             ButtonDefinition(4, R.drawable.ic_playlist, R.drawable.ic_playlist_filled, R.string.playlists, canToggle = false, { it.currentMain is PlaylistsFragment }, { it.navigate<PlaylistsFragment>(withHistory = false) }),
@@ -603,8 +399,6 @@ class MenuBottomBarFragment : MainActivityFragment() {
             ButtonDefinition(9, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscription_group_menu, canToggle = true, { it.currentMain is SubscriptionGroupListFragment }, { it.navigate<SubscriptionGroupListFragment>(withHistory = false) }),
             ButtonDefinition(10, R.drawable.ic_help_square, R.drawable.ic_help_square_fill, R.string.tutorials, canToggle = true, { it.currentMain is TutorialFragment }, { it.navigate<TutorialFragment>(withHistory = false) }),
             ButtonDefinition(7, R.drawable.ic_settings, R.drawable.ic_settings_filled, R.string.settings, canToggle = false, { false }, {
-                it.navigate<SettingsFragment>();
-                /*
                 val c = it.context ?: return@ButtonDefinition;
                 Logger.i(TAG, "settings preventPictureInPicture()");
                 it.requireFragment<VideoDetailFragment>().preventPictureInPicture();
@@ -612,8 +406,8 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 c.startActivity(intent);
                 if (c is Activity) {
                     c.overridePendingTransition(R.anim.slide_in_up, R.anim.slide_darken);
-                }*/
+                }
-            }),/*
+            }),
             ButtonDefinition(96, R.drawable.ic_disabled_visible, R.drawable.ic_disabled_visible, R.string.privacy_mode, canToggle = true, { false }, {
                 UIDialogs.showDialog(it.context ?: return@ButtonDefinition, R.drawable.ic_disabled_visible_purple, "Privacy Mode",
                     "All requests will be processed anonymously (any logins will be disabled except for the personalized home page), local playback and history tracking will also be disabled.\n\nTap the icon to disable.", null, 0,
@@ -623,14 +417,14 @@ class MenuBottomBarFragment : MainActivityFragment() {
                     UIDialogs.Action("Enable", {
                         StateApp.instance.setPrivacyMode(true);
                     }, UIDialogs.ActionStyle.PRIMARY));
-            }),*/
+            }),
             ButtonDefinition(97, R.drawable.ic_quiz, R.drawable.ic_quiz_fill, R.string.faq, canToggle = true, { false }, {
                 it.navigate<BrowserFragment>(Settings.URL_FAQ, withHistory = false);
             })
             //96 is reserved for privacy button
             //98 is reserved for buy button
             //99 is reserved for more button
-        ).filterNotNull();
+        );
     }
 
     data class ButtonDefinition(

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/BaseFragment.kt

@@ -1,88 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.Manifest
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.provider.MediaStore
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.recyclerview.widget.RecyclerView
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.dp
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.Artist
-import com.futo.platformplayer.states.ArtistOrdering
-import com.futo.platformplayer.states.FileEntry
-import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
-import com.futo.platformplayer.views.AnyInsertedAdapterView
-import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithTop
-import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithViews
-import com.futo.platformplayer.views.LibrarySection
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapter
-import com.futo.platformplayer.views.adapters.viewholders.AlbumTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.ArtistTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.FileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.LocalVideoTileViewHolder
-import com.futo.platformplayer.views.buttons.BigButton
-
-
-class BaseFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val newView = FragView(this);
-        view = newView;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = BaseFragment().apply {}
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: BaseFragment;
-
-        constructor(fragment: BaseFragment) : super(fragment.requireContext()) {
-            inflate(context, R.layout.fragview_library, this);
-            this.fragment = fragment;
-        }
-
-
-        fun onShown() {
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentFeedView.kt

@@ -64,7 +64,7 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
         player.modifyState("ThumbnailPlayer") { state -> state.muted = true };
         _exoPlayer = player;
 
-        return PreviewContentListAdapter(fragment.lifecycleScope, context, feedStyle ?: FeedStyle.THUMBNAIL, dataset, player, _previewsEnabled, arrayListOf(), arrayListOf(), shouldShowTimeBar).apply {
+        return PreviewContentListAdapter(fragment.lifecycleScope, context, feedStyle, dataset, player, _previewsEnabled, arrayListOf(), arrayListOf(), shouldShowTimeBar).apply {
             attachAdapterEvents(this);
         }
     }

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/DeveloperFragment.kt

@@ -1,91 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.LinearLayout
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.isVisible
-import com.futo.platformplayer.R
-import com.futo.platformplayer.SettingsDev
-import com.futo.platformplayer.views.fields.FieldForm
-import com.futo.platformplayer.views.fields.IField
-
-
-class DeveloperFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val newView = FragView(this);
-        view = newView;
-        _currentView = view;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        _currentView = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = DeveloperFragment().apply {}
-
-        private var _currentView: FragView? = null;
-        val currentView: FragView?
-            get() = _currentView;
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: DeveloperFragment;
-
-        private lateinit var _form: FieldForm;
-        private lateinit var _buttonBack: ImageButton;
-
-        private var _isFinished = false;
-
-        lateinit var overlay: FrameLayout;
-
-        val notifPermission = "android.permission.POST_NOTIFICATIONS";
-
-        constructor(fragment: DeveloperFragment) : super(fragment.requireContext()) {
-            inflate(context, R.layout.activity_dev, this);
-            this.fragment = fragment;
-
-            val activity = fragment.activity;
-            findViewById<LinearLayout>(R.id.container_topbar).isVisible = false;
-
-            _buttonBack = findViewById(R.id.button_back);
-            _form = findViewById(R.id.settings_form);
-
-            _form.fromObject(SettingsDev.instance);
-            _form.onChanged.subscribe { _, _ ->
-                _form.setObjectValues();
-                SettingsDev.instance.save();
-            };
-        }
-
-        fun getField(id: String): IField? {
-            return _form.findField(id);
-        }
-
-        fun onShown() {
-
-        }
-
-    }
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/FeedView.kt

@@ -9,7 +9,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -40,7 +39,6 @@ import java.time.OffsetDateTime
 import kotlin.math.max
 
 abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : LinearLayout where TPager : IPager<TResult>, TViewHolder : RecyclerView.ViewHolder, TFragment : MainFragment {
-    protected val _feedRoot: ConstraintLayout;
     protected val  _recyclerResults: RecyclerView;
     protected val _overlayContainer: FrameLayout;
     protected val _swipeRefresh: SwipeRefreshLayout;
@@ -53,7 +51,6 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
     private val _emptyPagerContainer: FrameLayout;
 
     protected val _toolbarContentView: LinearLayout;
-    protected val _bottomContentView: LinearLayout;
 
     private var _loading: Boolean = true;
 
@@ -70,7 +67,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
     private var _sortByOptions: List<String>? = null;
     private var _activeTags: List<String>? = null;
 
-    private var _nextPageHandler: TaskHandler<TPager, Pair<TPager, List<TResult>>>;
+    private var _nextPageHandler: TaskHandler<TPager, List<TResult>>;
     val recyclerData: RecyclerData<InsertedViewAdapterWithLoader<TViewHolder>, GridLayoutManager, TPager, TResult, TConverted, InsertedViewHolder<TViewHolder>>;
 
     val fragment: TFragment;
@@ -83,7 +80,6 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         this.fragment = fragment;
         inflater.inflate(R.layout.fragment_feed, this);
 
-        _feedRoot = findViewById(R.id.feed_root);
         _textCentered = findViewById(R.id.text_centered);
         _emptyPagerContainer = findViewById(R.id.empty_pager_container);
         _progressBar = findViewById(R.id.progress_bar);
@@ -138,29 +134,24 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         setActiveTags(null);
 
         _toolbarContentView = findViewById(R.id.container_toolbar_content);
-        _bottomContentView = findViewById(R.id.container_bottom);
 
-        _nextPageHandler = TaskHandler<TPager, Pair<TPager, List<TResult>>>({fragment.lifecycleScope}, {
+        _nextPageHandler = TaskHandler<TPager, List<TResult>>({fragment.lifecycleScope}, {
             if (it is IAsyncPager<*>)
                 it.nextPageAsync();
             else
                 it.nextPage();
 
             processPagerExceptions(it);
-            return@TaskHandler Pair(it, it.getResults());
+            return@TaskHandler it.getResults();
         }).success {
-            val pager = it.first;
-            val results = it.second
-
             setLoading(false);
 
             val posBefore = recyclerData.results.size;
-            val filteredResults = filterResults(results);
+            val filteredResults = filterResults(it);
             recyclerData.results.addAll(filteredResults);
-            recyclerData.resultsUnfiltered.addAll(results);
+            recyclerData.resultsUnfiltered.addAll(it);
             recyclerData.adapter.notifyItemRangeInserted(recyclerData.adapter.childToParentPosition(posBefore), filteredResults.size);
-            if(pager.hasMorePages())
+            ensureEnoughContentVisible(filteredResults)
-                ensureEnoughContentVisible(filteredResults)
         }.exception<Throwable> {
             Logger.w(TAG, "Failed to load next page.", it);
             UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_next_page), it, {
@@ -399,9 +390,6 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
     protected fun finishRefreshLayoutLoader() {
         _swipeRefresh.isRefreshing = false;
     }
-    protected fun disableRefreshLayout() {
-        _swipeRefresh.isEnabled = false;
-    }
 
     fun clearResults(){
         setPager(EmptyPager<TResult>() as TPager);
@@ -484,8 +472,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         recyclerData.resultsUnfiltered.addAll(toAdd);
         recyclerData.adapter.notifyDataSetChanged();
         recyclerData.loadedFeedStyle = feedStyle;
-        if(pager.hasMorePages())
+        ensureEnoughContentVisible(filteredResults)
-            ensureEnoughContentVisible(filteredResults)
     }
 
     private fun detachPagerEvents() {

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HistoryFragment.kt

@@ -26,7 +26,6 @@ import com.futo.platformplayer.models.HistoryVideo
 import com.futo.platformplayer.states.StateHistory
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.views.ToggleBar
 import com.futo.platformplayer.views.adapters.HistoryListViewHolder
@@ -244,23 +243,12 @@ class HistoryFragment : MainFragment() {
                 return;
             }
 
+            val inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager;
             val diff = v.video.duration - v.position;
             val vid: Any = if (diff > 5) { v.video.withTimestamp(v.position) } else { v.video };
-
+            StatePlayer.instance.clearQueue();
-            val playlistId = v.playlistId
+            _fragment.navigate<VideoDetailFragment>(vid).maximizeVideoDetail();
-            val playlist = playlistId?.let { StatePlaylists.instance.getPlaylist(it) }
-            val playlistIndex = playlist?.videos?.indexOfFirst { it.url == v.video.url }
-            if (playlist != null && playlistIndex != null && playlistIndex >= 0) {
-                _fragment.navigate<VideoDetailFragment>(vid).maximizeVideoDetail();
-                StatePlayer.instance.setPlaylist(playlist, playlistIndex)
-
-            } else {
-                StatePlayer.instance.clearQueue();
-                _fragment.navigate<VideoDetailFragment>(vid).maximizeVideoDetail();
-            }
-
             _editSearch.clearFocus();
-            val inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager;
             inputMethodManager.hideSoftInputFromWindow(_editSearch.windowToken, 0);
 
             _fragment.lifecycleScope.launch(Dispatchers.Main) {

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt

@@ -279,14 +279,6 @@ class HomeFragment : MainFragment() {
                                     else {
                                         view.setToggle(!active);
                                     }
-                                }, { view, views, enabled ->
-                                    val toDisable = views.filter { it != view && it.tag == "plugins" };
-                                    if(!view.isActive)
-                                        view.handleClick();
-                                    for(tag in toDisable) {
-                                        if(tag.isActive)
-                                            tag.handleClick();
-                                    }
                                 }).withTag("plugins")
                             })
                     else listOf())
@@ -365,10 +357,8 @@ class HomeFragment : MainFragment() {
             finishRefreshLayoutLoader();
             setLoading(false);
             setPager(pager);
-            if(pager.getResults().isEmpty() && !pager.hasMorePages()) {
+            if(pager.getResults().isEmpty() && !pager.hasMorePages())
-                setLoading(false);
                 setEmptyPager(true);
-            }
         }
     }
 

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibraryAlbumFragment.kt

@@ -1,159 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.LinearLayout
-import androidx.core.view.updateLayoutParams
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.futo.platformplayer.UISlideOverlays
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.EmptyPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.dp
-import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFragment
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.toHumanDuration
-import com.futo.platformplayer.views.AlbumHeaderView
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.viewholders.TrackViewHolder
-
-
-class LibraryAlbumFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): android.view.View {
-        val newView = FragView(this, inflater);
-        view = newView;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown(parameter);
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryAlbumFragment().apply {}
-    }
-
-
-    class FragView : FeedView<LibraryAlbumFragment, IPlatformVideo, IPlatformVideo, IPager<IPlatformVideo>, TrackViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        private val _header: AlbumHeaderView;
-
-        private var _album: Album? = null;
-        private var _tracks: List<IPlatformVideo>? = null;
-        private var _url: String? = null;
-
-        constructor(fragment: LibraryAlbumFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-            _header = AlbumHeaderView(context);
-            _toolbarContentView.addView(_header);
-
-            _header.onPlayAll.subscribe {
-                val playlist = _album?.toPlaylist(_tracks);
-                if (playlist != null) {
-                    StatePlayer.instance.setPlaylist(playlist, focus = true);
-                }
-            }
-            _header.onShuffle.subscribe {
-                val playlist = _album?.toPlaylist(_tracks);
-                if (playlist != null) {
-                    StatePlayer.instance.setPlaylist(playlist, focus = true, shuffle = true);
-                }
-            }
-
-            /*
-            _feedRoot.updateLayoutParams<LinearLayout.LayoutParams> {
-                this.setMargins(0,-50.dp(resources),0,0)
-            } */
-        }
-
-        fun onShown(parameter: Any?) {
-            val album = if(parameter is String)
-                StateLibrary.instance.getAlbum(parameter);
-            else if(parameter is Long)
-                StateLibrary.instance.getAlbum(parameter);
-            else if(parameter is Album)
-                parameter;
-            else null;
-            if(album == null) {
-                _album = null;
-                _tracks = null;
-                setPager(EmptyPager());
-                return;
-            }
-            _header.setName(album.name);
-            _header.setThumbnail(album.thumbnail);
-            val tracks = album.getTracks();
-            _album = album;
-            _tracks = tracks;
-            _header.setMetadata("${tracks.size} tracks" +  if(tracks.size > 0) (" • " + tracks.sumOf { it.duration }.toHumanDuration(false)) else "");
-            setPager(AdhocPager({listOf()}, tracks));
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<IPlatformVideo>): InsertedViewAdapterWithLoader<TrackViewHolder> {
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = TrackViewHolder(viewGroup);
-                    holder.onClick.subscribe { c ->
-
-                        val playlist = _album?.toPlaylist(_tracks);
-                        val index = playlist?.videos?.indexOfFirst { it.name == c.name } ?: -1;
-                        if (playlist != null) {
-                            if (index == -1)
-                                return@subscribe;
-
-                            StatePlayer.instance.setPlaylist(playlist, index, true);
-                        }
-                    };
-                    holder.onOptions.subscribe {
-                        if(it is IPlatformVideo)
-                            UISlideOverlays.showVideoOptionsOverlay(it, _overlayContainer);
-                    }
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun updateSpanCount(){ }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, 1)
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                rightMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    8.0f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-            return glmResults
-        }
-
-        companion object {
-            private const val TAG = "LibraryArtistsFragmentsView";
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibraryAlbumsFragment.kt

@@ -1,185 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout.GONE
-import android.widget.LinearLayout.VISIBLE
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UISlideOverlays
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.constructs.Event0
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringStorage
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.LibraryTypeHeaderView
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.SubscriptionAdapter
-import com.futo.platformplayer.views.adapters.viewholders.AlbumTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.SelectablePlaylist
-import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.platform.PlatformIndicator
-
-class LibraryAlbumsFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this, inflater);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryAlbumsFragment().apply {}
-    }
-
-    class FragView : FeedView<LibraryAlbumsFragment, Album, Album, IPager<Album>, AlbumTileViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        val libraryTypeHeader: LibraryTypeHeaderView;
-
-        constructor(fragment: LibraryAlbumsFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-            libraryTypeHeader = LibraryTypeHeaderView(context);
-            libraryTypeHeader.setSelectedType(LibraryTypeHeaderView.SelectedType.Albums);
-            libraryTypeHeader.setMetadata("");
-
-            libraryTypeHeader.onSelectedChanged.subscribe {
-                when(it) {
-                    LibraryTypeHeaderView.SelectedType.Artists -> fragment.navigate<LibraryArtistsFragment>();
-                    else -> {}
-                }
-            }
-
-            _toolbarContentView.addView(libraryTypeHeader);
-            disableRefreshLayout();
-        }
-
-        fun onShown() {
-            val initialAlbums = StateLibrary.instance.getAlbums();
-            Logger.i(TAG, "Initial album count: " + initialAlbums.size);
-
-            libraryTypeHeader.setMetadata("${initialAlbums.size} albums");
-            setPager(AdhocPager<Album>({ listOf(); }, initialAlbums));
-        }
-
-        override fun reload() {
-            super.reload();
-            finishRefreshLayoutLoader();
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<Album>): InsertedViewAdapterWithLoader<AlbumTileViewHolder> {
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = AlbumTileViewHolder(viewGroup);
-                    holder.setAutoSize(resources.displayMetrics.widthPixels / resources.displayMetrics.density)
-                    holder.onClick.subscribe { c -> fragment.navigate<LibraryAlbumFragment>(c) };
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun updateSpanCount(){ }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, AlbumTileViewHolder.getAutoSizeColumns(resources.displayMetrics.widthPixels / resources.displayMetrics.density))
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                leftMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    3f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-
-            return glmResults
-        }
-
-        companion object {
-            private const val TAG = "LibraryAlbumsFragmentsView";
-        }
-    }
-
-    class AlbumViewHolder(private val _viewGroup: ViewGroup) : AnyAdapter.AnyViewHolder<Album>(
-        LayoutInflater.from(_viewGroup.context).inflate(R.layout.list_album,
-            _viewGroup, false)) {
-
-        val onClick = Event1<Album?>();
-
-        protected var _album: Album? = null;
-        protected val _imageThumbnail: ImageView
-        protected val _textName: TextView
-        protected val _textMetadata: TextView
-
-        init {
-            _imageThumbnail = _view.findViewById(R.id.image_thumbnail);
-            _textName = _view.findViewById(R.id.text_name);
-            _textMetadata = _view.findViewById(R.id.text_metadata);
-
-            _view.setOnClickListener { onClick.emit(_album) };
-        }
-
-
-        override fun bind(album: Album) {
-            _album = album;
-            _imageThumbnail?.let {
-                if (album.thumbnail != null)
-                    Glide.with(it)
-                        .load(album.thumbnail)
-                        .placeholder(R.drawable.placeholder_channel_thumbnail)
-                        .into(it)
-                else
-                    Glide.with(it).load(R.drawable.placeholder_channel_thumbnail).into(it);
-            };
-
-            _textName.text = album.name;
-            _textMetadata.text = album.artist ?: "";
-        }
-
-    }
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibraryArtistFragment.kt

@@ -1,634 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.graphics.drawable.Animatable
-import android.net.Uri
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.appcompat.widget.AppCompatImageView
-import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import androidx.viewpager2.widget.ViewPager2
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.UISlideOverlays
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.contents.ContentType
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.models.post.IPlatformPost
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.assume
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.constructs.Event2
-import com.futo.platformplayer.constructs.Event3
-import com.futo.platformplayer.fragment.mainactivity.main.LibraryAlbumsFragment.AlbumViewHolder
-import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFragment
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.models.SearchType
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.Artist
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.states.StatePlatform
-import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.states.StatePlaylists
-import com.futo.platformplayer.states.StateSubscriptions
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.viewholders.AlbumTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.TrackViewHolder
-import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
-import com.futo.platformplayer.views.subscriptions.SubscribeButton
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class LibraryArtistFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var _textMeta: TextView? = null;
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this, inflater);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown(parameter, isBack);
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryArtistFragment().apply {}
-    }
-
-    class FragView(fragment: LibraryArtistFragment, inflater: LayoutInflater) : LinearLayout(inflater.context) {
-        private val _fragment: LibraryArtistFragment = fragment
-
-        private var _textChannel: TextView
-        private var _textChannelSub: TextView
-        private var _creatorThumbnail: CreatorThumbnail
-        private var _imageBanner: AppCompatImageView
-
-        private var _tabs: TabLayout
-        private var _viewPager: ViewPager2
-
-        //        private var _adapter: ChannelViewPagerAdapter;
-        private var _tabLayoutMediator: TabLayoutMediator
-        private var _buttonSubscribe: SubscribeButton
-        private var _buttonSubscriptionSettings: ImageButton
-
-        private var _overlayContainer: FrameLayout
-        private var _overlayLoading: LinearLayout
-        private var _overlayLoadingSpinner: ImageView
-
-        private var _slideUpOverlay: SlideUpMenuOverlay? = null
-
-        private var _isLoading: Boolean = false
-        private var _selectedTabIndex: Int = -1
-        var channel: Artist? = null
-            private set
-        private var _url: String? = null
-
-        private val _onPageChangeCallback = object : ViewPager2.OnPageChangeCallback() {}
-
-        init {
-            inflater.inflate(R.layout.fragment_artist, this)
-
-            val tabs: TabLayout = findViewById(R.id.tabs)
-            val viewPager: ViewPager2 = findViewById(R.id.view_pager)
-            _textChannel = findViewById(R.id.text_channel_name)
-            _textChannelSub = findViewById(R.id.text_metadata)
-            _creatorThumbnail = findViewById(R.id.creator_thumbnail)
-            _imageBanner = findViewById(R.id.image_channel_banner)
-            _buttonSubscribe = findViewById(R.id.button_subscribe)
-            _buttonSubscriptionSettings = findViewById(R.id.button_sub_settings)
-            _overlayLoading = findViewById(R.id.channel_loading_overlay)
-            _overlayLoadingSpinner = findViewById(R.id.channel_loader_frag)
-            _overlayContainer = findViewById(R.id.overlay_container)
-            _buttonSubscribe.onSubscribed.subscribe {
-                UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer)
-                _buttonSubscriptionSettings.visibility =
-                    if (_buttonSubscribe.isSubscribed) View.VISIBLE else View.GONE
-            }
-            _buttonSubscribe.onUnSubscribed.subscribe {
-                _buttonSubscriptionSettings.visibility =
-                    if (_buttonSubscribe.isSubscribed) View.VISIBLE else View.GONE
-            }
-            _buttonSubscriptionSettings.setOnClickListener {
-                val url = channel?.contentUrl ?: _url ?: return@setOnClickListener
-                val sub =
-                    StateSubscriptions.instance.getSubscription(url) ?: return@setOnClickListener
-                UISlideOverlays.showSubscriptionOptionsOverlay(sub, _overlayContainer)
-            }
-
-            //TODO: Determine if this is really the only solution (isSaveEnabled=false)
-            viewPager.isSaveEnabled = false
-            viewPager.registerOnPageChangeCallback(_onPageChangeCallback)
-            val adapter = ArtistViewPagerAdapter(fragment, fragment.childFragmentManager, fragment.lifecycle)
-            adapter.onChannelClicked.subscribe { c -> fragment.navigate<ChannelFragment>(c) }
-            adapter.onContentClicked.subscribe { v, _ ->
-                when (v) {
-                    is IPlatformVideo -> {
-                        StatePlayer.instance.clearQueue()
-                        fragment.navigate<VideoDetailFragment>(v).maximizeVideoDetail()
-                    }
-
-                    is IPlatformPlaylist -> {
-                        fragment.navigate<RemotePlaylistFragment>(v)
-                    }
-
-                    is IPlatformPost -> {
-                        fragment.navigate<PostDetailFragment>(v)
-                    }
-                }
-            }
-            adapter.onShortClicked.subscribe { v, _, pagerPair ->
-                when (v) {
-                    is IPlatformVideo -> {
-                        StatePlayer.instance.clearQueue()
-                        fragment.navigate<ShortsFragment>(Triple(v, pagerPair!!.first, pagerPair.second))
-                    }
-                }
-            }
-            adapter.onAddToClicked.subscribe { content ->
-                _overlayContainer.let {
-                    if (content is IPlatformVideo) _slideUpOverlay =
-                        UISlideOverlays.showVideoOptionsOverlay(content, it)
-                }
-            }
-            adapter.onAddToQueueClicked.subscribe { content ->
-                if (content is IPlatformVideo) {
-                    StatePlayer.instance.addToQueue(content)
-                }
-            }
-            adapter.onAddToWatchLaterClicked.subscribe { content ->
-                if (content is IPlatformVideo) {
-                    if(StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(content), true))
-                        UIDialogs.toast("Added to watch later\n[${content.name}]")
-                    else
-                        UIDialogs.toast(context.getString(R.string.already_in_watch_later))
-                }
-            }
-            adapter.onUrlClicked.subscribe { url ->
-                fragment.navigate<BrowserFragment>(url)
-            }
-            adapter.onContentUrlClicked.subscribe { url, contentType ->
-                when (contentType) {
-                    ContentType.MEDIA -> {
-                        StatePlayer.instance.clearQueue()
-                        fragment.navigate<VideoDetailFragment>(url).maximizeVideoDetail()
-                    }
-
-                    ContentType.URL -> fragment.navigate<BrowserFragment>(url)
-                    else -> {}
-                }
-            }
-            adapter.onLongPress.subscribe { content ->
-                _overlayContainer.let {
-                    if (content is IPlatformVideo) _slideUpOverlay =
-                        UISlideOverlays.showVideoOptionsOverlay(content, it)
-                }
-            }
-            viewPager.adapter = adapter
-            val tabLayoutMediator = TabLayoutMediator(
-                tabs, viewPager, (viewPager.adapter as ArtistViewPagerAdapter)::getTabNames
-            )
-            tabLayoutMediator.attach()
-
-            _tabLayoutMediator = tabLayoutMediator
-            _tabs = tabs
-            _viewPager = viewPager
-            if (_selectedTabIndex != -1) {
-                selectTab(_selectedTabIndex)
-            }
-            setLoading(true)
-        }
-
-        fun selectTab(tab: ArtistTab) {
-            (_viewPager.adapter as ArtistViewPagerAdapter).getTabPosition(tab)
-        }
-
-        fun cleanup() {
-            _tabLayoutMediator.detach()
-            _viewPager.unregisterOnPageChangeCallback(_onPageChangeCallback)
-            hideSlideUpOverlay()
-            (_overlayLoadingSpinner.drawable as Animatable?)?.stop()
-        }
-
-        fun onShown(parameter: Any?, isBack: Boolean) {
-            hideSlideUpOverlay()
-            _selectedTabIndex = -1
-
-            if (!isBack || _url == null) {
-                _imageBanner.setImageDrawable(null)
-
-                when (parameter) {
-                    is String -> {
-                        _buttonSubscribe.setSubscribeChannel(parameter)
-                        _buttonSubscriptionSettings.visibility =
-                            if (_buttonSubscribe.isSubscribed) View.VISIBLE else View.GONE
-
-                        _url = parameter
-
-                        val parsed = Uri.parse(parameter);
-                        val idLong = parsed.lastPathSegment?.toLongOrNull();
-                        if(idLong != null) {
-                            val artist = StateLibrary.instance.getArtist(idLong) ?: return;
-                            showArtist(artist);
-                        }
-                    }
-
-                    is Artist -> {
-                        showArtist(parameter)
-                        _url = parameter.contentUrl
-                    }
-                }
-            }
-        }
-
-        private fun selectTab(selectedTabIndex: Int) {
-            _selectedTabIndex = selectedTabIndex
-            _tabs.selectTab(_tabs.getTabAt(selectedTabIndex))
-        }
-
-        private fun setLoading(isLoading: Boolean) {
-            if (_isLoading == isLoading) {
-                return
-            }
-
-            _isLoading = isLoading
-            if (isLoading) {
-                _overlayLoading.visibility = View.VISIBLE
-                (_overlayLoadingSpinner.drawable as Animatable?)?.start()
-            } else {
-                (_overlayLoadingSpinner.drawable as Animatable?)?.stop()
-                _overlayLoading.visibility = View.GONE
-            }
-        }
-
-        fun onBackPressed(): Boolean {
-            if (_slideUpOverlay != null) {
-                hideSlideUpOverlay()
-                return true
-            }
-
-            return false
-        }
-
-        private fun hideSlideUpOverlay() {
-            _slideUpOverlay?.hide(false)
-            _slideUpOverlay = null
-        }
-
-        private fun showArtist(channel: Artist) {
-            setLoading(false)
-
-            _fragment.topBar?.onShown(channel)
-
-            val buttons = arrayListOf<Pair<Int, ()->Unit>>();
-
-            _fragment.lifecycleScope.launch(Dispatchers.IO) {
-                val plugin = StatePlatform.instance.getChannelClientOrNull(channel.contentUrl ?: return@launch)
-                withContext(Dispatchers.Main) {
-                    buttons.add(Pair(R.drawable.ic_search) {
-                        _fragment.navigate<SuggestionsFragment>(
-                            SuggestionsFragmentData(
-                                "", SearchType.VIDEO
-                            )
-                        )
-                    })
-                    _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(buttons)
-                }
-            }
-
-            _buttonSubscribe.visibility = GONE;
-            _buttonSubscriptionSettings.visibility = View.GONE
-            _textChannel.text = channel.name
-            _textChannelSub.text = "${channel.countTracks} songs, ${channel.countAlbums} albums";
-
-            var supportsPlaylists = false;
-            val playlistPosition = 1
-            // keep the current tab selected
-            if (_viewPager.currentItem >= playlistPosition) {
-                _viewPager.setCurrentItem(_viewPager.currentItem + 1, false)
-            }
-            (_viewPager.adapter as ArtistViewPagerAdapter).insert(
-                playlistPosition,
-                ArtistTab.ALBUMS
-            )
-
-            // sets the channel for each tab
-            for (fragment in _fragment.childFragmentManager.fragments) {
-                (fragment as IArtistTabFragment).setArtist(channel)
-            }
-
-            (_viewPager.adapter as ArtistViewPagerAdapter).artist = channel
-
-
-            _viewPager.adapter!!.notifyDataSetChanged();
-
-            val artistThumbnail = channel.getThumbnailOrAlbum();
-            if(artistThumbnail != null) {
-                _creatorThumbnail.isVisible = true;
-                _creatorThumbnail.setThumbnail(channel.getThumbnailOrAlbum(), true, true);
-                Glide.with(_imageBanner)
-                    .load(artistThumbnail)
-                    .into(_imageBanner);
-            }
-            else {
-                _creatorThumbnail.isVisible = false;
-                Glide.with(_imageBanner).clear(_imageBanner);
-            }
-
-
-            this.channel = channel
-        }
-
-
-        companion object {
-            private const val TAG = "LibraryArtistFragmentsView";
-        }
-    }
-    enum class ArtistTab {
-        SONGS, ALBUMS
-    }
-
-    class ArtistViewPagerAdapter(private val fragment: LibraryArtistFragment, fragmentManager: FragmentManager, lifecycle: Lifecycle) :
-        FragmentStateAdapter(fragmentManager, lifecycle) {
-        private val _supportedFragments = mutableMapOf(
-            ArtistTab.SONGS.ordinal to ArtistTab.SONGS
-        )
-        private val _tabs = arrayListOf(ArtistTab.SONGS, ArtistTab.ALBUMS)
-
-        var artist: Artist? = null
-
-        val onContentUrlClicked = Event2<String, ContentType>()
-        val onUrlClicked = Event1<String>()
-        val onContentClicked = Event2<IPlatformContent, Long>()
-        val onShortClicked = Event3<IPlatformContent, Long, Pair<IPager<IPlatformContent>, ArrayList<IPlatformContent>>?>()
-        val onChannelClicked = Event1<PlatformAuthorLink>()
-        val onAddToClicked = Event1<IPlatformContent>()
-        val onAddToQueueClicked = Event1<IPlatformContent>()
-        val onAddToWatchLaterClicked = Event1<IPlatformContent>()
-        val onLongPress = Event1<IPlatformContent>()
-
-        override fun getItemId(position: Int): Long {
-            return _tabs[position].ordinal.toLong()
-        }
-
-        override fun containsItem(itemId: Long): Boolean {
-            return _supportedFragments.containsKey(itemId.toInt())
-        }
-
-        override fun getItemCount(): Int {
-            return _supportedFragments.size
-        }
-
-        fun getTabPosition(tab: ArtistTab): Int {
-            return _tabs.indexOf(tab)
-        }
-
-        fun getTabNames(tab: TabLayout.Tab, position: Int) {
-            tab.text = _tabs[position].name
-        }
-
-        fun insert(position: Int, tab: ArtistTab) {
-            _supportedFragments[tab.ordinal] = tab
-            _tabs.add(position, tab)
-            notifyItemInserted(position)
-        }
-
-        fun remove(position: Int) {
-            _supportedFragments.remove(_tabs[position].ordinal)
-            _tabs.removeAt(position)
-            notifyItemRemoved(position)
-        }
-
-        override fun createFragment(position: Int): Fragment {
-            val fragment: Fragment
-            when (_tabs[position]) {
-                ArtistTab.SONGS -> {
-                    fragment = ChannelContentsFragment(this.fragment).apply {
-
-                    }
-                }
-
-                ArtistTab.ALBUMS -> {
-                    fragment = ArtistAlbumsFragment(this.fragment).apply {
-
-                    }
-                }
-            }
-            artist?.let { (fragment as IArtistTabFragment).setArtist(it) }
-
-            return fragment
-        }
-    }
-
-    interface IArtistTabFragment {
-        fun setArtist(artist: Artist);
-    }
-
-    class ChannelContentsFragment(private val frag: LibraryArtistFragment) : Fragment(), IArtistTabFragment {
-
-        var view: ArtistContentView? = null;
-
-        private var _lastArtist: Artist? = null;
-
-        override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-            view = ArtistContentView(frag, inflater);
-            _lastArtist?.let {
-                view?.setArtist(it);
-            }
-            return view;
-        }
-
-        override fun onDestroyView() {
-            view = null;
-            super.onDestroyView()
-        }
-
-        override fun setArtist(artist: Artist) {
-            view?.setArtist(artist);
-            _lastArtist = artist;
-        }
-    }
-    class ArtistContentView : FeedView<LibraryArtistFragment, IPlatformContent, IPlatformVideo, IPager<IPlatformContent>, TrackViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        protected var _artist: Artist? = null;
-
-        constructor(fragment: LibraryArtistFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-
-        }
-
-        fun setArtist(artist: Artist) {
-            this._artist = artist;
-            val tracks = artist.getAudioTracks();
-            if(tracks.getResults().isEmpty())
-                UIDialogs.appToast("No tracks found");
-            setPager(tracks);
-        }
-
-        override fun filterResults(results: List<IPlatformContent>): List<IPlatformVideo> {
-            return results.filter { it is IPlatformVideo }.map { it as IPlatformVideo };
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<IPlatformVideo>): InsertedViewAdapterWithLoader<TrackViewHolder> {
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = TrackViewHolder(viewGroup);
-                    holder.onClick.subscribe { c ->
-
-                        val playlist = _artist?.toPlaylist();
-                        if (playlist != null) {
-                            val sameVideo = playlist.videos.find { it.name == c.name };
-                            val index = sameVideo?.let {
-                                playlist.videos.indexOf(sameVideo)
-                            } ?: -1;
-                            if (index == -1)
-                                return@subscribe;
-
-                            StatePlayer.instance.setPlaylist(playlist, index, true);
-                        }
-                    };
-                    holder.onOptions.subscribe {
-                        if(it is IPlatformVideo)
-                            UISlideOverlays.showVideoOptionsOverlay(it, _overlayContainer);
-                    }
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, 1)
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                rightMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    8.0f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-            return glmResults
-        }
-
-        override fun updateSpanCount(){ }
-
-
-        companion object {
-            private const val TAG = "LibraryAlbumsFragmentsView";
-        }
-    }
-    class ArtistAlbumsFragment(private val frag: LibraryArtistFragment) : Fragment(), IArtistTabFragment {
-
-        var view: ArtistAlbumsView? = null;
-
-        private var _lastArtist: Artist? = null;
-
-        override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-            view = ArtistAlbumsView(frag, inflater);
-            _lastArtist?.let {
-                view?.setArtist(it);
-            }
-            return view;
-        }
-
-        override fun onDestroyView() {
-            view = null;
-            super.onDestroyView()
-        }
-
-        override fun setArtist(artist: Artist) {
-            view?.setArtist(artist);
-            _lastArtist = artist;
-        }
-    }
-    class ArtistAlbumsView : FeedView<LibraryArtistFragment, Album, Album, IPager<Album>, AlbumTileViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        constructor(fragment: LibraryArtistFragment, inflater: LayoutInflater) : super(fragment, inflater)
-
-        fun onShown() {
-        }
-
-        fun setArtist(artist: Artist) {
-            val initialAlbums = artist.getAlbums();
-            Logger.i(TAG, "Initial album count: " + initialAlbums.size);
-
-            setPager(AdhocPager({ listOf() }, initialAlbums));
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<Album>): InsertedViewAdapterWithLoader<AlbumTileViewHolder> {
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = AlbumTileViewHolder(viewGroup);
-                    holder.setAutoSize(resources.displayMetrics.widthPixels / resources.displayMetrics.density)
-                    holder.onClick.subscribe { c -> fragment.navigate<LibraryAlbumFragment>(c) };
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun updateSpanCount(){ }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, AlbumTileViewHolder.getAutoSizeColumns(resources.displayMetrics.widthPixels / resources.displayMetrics.density))
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                rightMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    8.0f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-
-            return glmResults
-        }
-
-        companion object {
-            private const val TAG = "LibraryAlbumsFragmentsView";
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibraryArtistsFragment.kt

@@ -1,200 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.LinearLayout.GONE
-import android.widget.LinearLayout.VISIBLE
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UISlideOverlays
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.Artist
-import com.futo.platformplayer.states.ArtistOrdering
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringStorage
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.LibraryTypeHeaderView
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.SubscriptionAdapter
-import com.futo.platformplayer.views.adapters.viewholders.SelectablePlaylist
-import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.platform.PlatformIndicator
-
-class LibraryArtistsFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var _textMeta: TextView? = null;
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this, inflater);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryArtistsFragment().apply {}
-    }
-
-    class FragView : FeedView<LibraryArtistsFragment, Artist, Artist, IPager<Artist>, ArtistViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        val libraryTypeHeader: LibraryTypeHeaderView;
-
-        constructor(fragment: LibraryArtistsFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-            libraryTypeHeader = LibraryTypeHeaderView(context);
-            libraryTypeHeader.setSelectedType(LibraryTypeHeaderView.SelectedType.Artists);
-            libraryTypeHeader.setMetadata("");
-
-            libraryTypeHeader.onSelectedChanged.subscribe {
-                when(it) {
-                    LibraryTypeHeaderView.SelectedType.Albums -> fragment.navigate<LibraryAlbumsFragment>();
-                    else -> {}
-                }
-            }
-
-            _toolbarContentView.addView(libraryTypeHeader);
-            disableRefreshLayout();
-        }
-
-        fun onShown() {
-            reload();
-        }
-
-
-        override fun reload() {
-            try {
-                setLoading(true);
-                val intialArtists = StateLibrary.instance.getArtists(ArtistOrdering.Alphabethic);
-                Logger.i(TAG, "Initial album count: " + intialArtists.size);
-
-                libraryTypeHeader.setMetadata("${intialArtists.size} artists");
-                setPager(AdhocPager<Artist>({ listOf(); }, intialArtists));
-            }
-            finally {
-                setLoading(false);
-            }
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<Artist>): InsertedViewAdapterWithLoader<ArtistViewHolder> {
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = ArtistViewHolder(viewGroup);
-                    holder.onClick.subscribe { c ->
-                        fragment.navigate<LibraryArtistFragment>(c)
-                    };
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun updateSpanCount(){ }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, 1)
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                rightMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    8.0f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-            return glmResults
-        }
-
-        companion object {
-            private const val TAG = "LibraryArtistsFragmentsView";
-        }
-    }
-
-    class ArtistViewHolder(private val _viewGroup: ViewGroup) : AnyAdapter.AnyViewHolder<Artist>(
-        LayoutInflater.from(_viewGroup.context).inflate(R.layout.list_artist,
-            _viewGroup, false)) {
-
-        val onClick = Event1<Artist>();
-
-        protected var _artist: Artist? = null;
-        //protected val _imageThumbnail: ImageView
-        protected val _textName: TextView
-        protected val _textMetadata: TextView
-
-        init {
-            //_imageThumbnail = _view.findViewById(R.id.image_thumbnail);
-            _textName = _view.findViewById(R.id.text_name);
-            _textMetadata = _view.findViewById(R.id.text_metadata);
-
-            _view.setOnClickListener { _artist?.let { onClick.emit(it) } };
-        }
-
-        override fun bind(artist: Artist) {
-            _artist = artist;
-            /*
-            _imageThumbnail?.let {
-                if (artist.thumbnail != null)
-                    Glide.with(it)
-                        .load(artist.thumbnail)
-                        .placeholder(R.drawable.placeholder_channel_thumbnail)
-                        .into(it)
-                else
-                    Glide.with(it).load(R.drawable.placeholder_channel_thumbnail).into(it);
-            };
-            */
-
-            _textName.text = artist.name;
-
-            val metaComps = listOf(
-                artist.countTracks?.let { "${it} tracks" },
-                artist.countAlbums?.let { "${it} albums" }
-            ).filterNotNull();
-
-            _textMetadata.text = metaComps.joinToString(", ");
-        }
-
-    }
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibraryFilesFragment.kt

@@ -1,264 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.net.toUri
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.R
-import com.futo.platformplayer.api.media.models.video.LocalVideoDetails
-import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.EmptyPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.fragment.mainactivity.topbar.FilesTopBarFragment
-import com.futo.platformplayer.models.Playlist
-import com.futo.platformplayer.states.FileEntry
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.NoResultsView
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.viewholders.FileViewHolder
-import com.futo.platformplayer.views.buttons.BigButton
-import com.futo.platformplayer.views.buttons.ButtonsContainer
-
-class LibraryFilesFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this, inflater);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown(parameter);
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryFilesFragment().apply {}
-    }
-
-    class FragView : FeedView<LibraryFilesFragment, FileEntry, FileEntry, IPager<FileEntry>, FileViewHolder> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        val navStack = mutableListOf<FileStack>()
-        var buttonUp: BigButton? = null;
-        var buttonAdd: BigButton? = null;
-
-        private var root: FileEntry? = null;
-
-        constructor(fragment: LibraryFilesFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-            disableRefreshLayout();
-        }
-
-        fun onShown(parameter: Any? = null) {
-            this.root = if(parameter is FileEntry) parameter else null;
-            loadTop();
-        }
-        fun loadTop() {
-            var initialDirectories = listOf<FileEntry>();
-            var path = "";
-            if(root == null) {
-                initialDirectories = StateLibrary.instance.getFileDirectories();
-                if (initialDirectories.size == 0) {
-                    setEmptyPager(true);
-                    setPager(EmptyPager());
-                    buttonAdd?.let {
-                        it.isVisible = false;
-                    }
-                    buttonUp?.let {
-                        it.isVisible = false;
-                    }
-                    return;
-                } else
-                    setEmptyPager(false);
-            }
-            else {
-                buttonAdd?.let {
-                    it.isVisible = false;
-                }
-                buttonUp?.let {
-                    it.isVisible = false;
-                }
-                initialDirectories = root?.getSubFiles() ?: listOf();
-                path = root?.path ?: "";
-            }
-            navStack.clear();
-            val entry = FileStack(path, initialDirectories);
-            navStack.add(entry);
-            openDirectory(navStack.last());
-            fragment.topBar?.let {
-                if(it is FilesTopBarFragment) {
-                    it.setUpNavigate(null);
-                    it.setTitle(entry);
-                }
-            }
-        }
-        fun leaveDirectory() {
-            if (navStack.size > 1) {
-                navStack.removeAt(navStack.size - 1)
-                openDirectory(navStack.last())
-            }
-        }
-        fun openDirectory(stack: FileStack, addToStack: Boolean = false) {
-            if(addToStack)
-                navStack.add(stack);
-
-            fragment.topBar?.let {
-                if(it is FilesTopBarFragment) {
-                    it.setTitle(stack);
-                }
-            }
-
-            buttonAdd?.let {
-                it.isVisible = navStack.size < 2
-            }
-            buttonUp?.let {
-                it.isVisible = navStack.size > 1;
-            }
-            setPager(AdhocPager<FileEntry>({ listOf(); }, stack.files));
-            setLoading(false);
-
-            val allSongs = stack.files.filter { !it.isDirectory };
-            if(allSongs.any()) {
-                _bottomContentView.addView(ButtonsContainer(context,
-                    listOf(
-                        ButtonsContainer.Button("Play All", R.drawable.background_button_primary) {
-                            StatePlayer.instance.setPlaylist(Playlist(stack.path.toUri().lastPathSegment ?: "", allSongs.map {
-                                SerializedPlatformVideo.fromVideo(LocalVideoDetails.fromContent(it.path))
-                            }), focus = true, shuffle = false)
-                        },
-                        ButtonsContainer.Button("Shuffle", R.drawable.background_button_accent) {
-                            StatePlayer.instance.setPlaylist(Playlist(stack.path.toUri().lastPathSegment ?: "", allSongs.map {
-                                SerializedPlatformVideo.fromVideo(LocalVideoDetails.fromContent(it.path))
-                            }), focus = true, shuffle = true)
-                        }
-                    )).apply {
-                        this.layoutParams = LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
-                })
-            }
-            else
-                _bottomContentView.removeAllViews();
-
-            fragment.topBar?.let {
-                if(it is FilesTopBarFragment) {
-                    if(navStack.size > 1)
-                        it.setUpNavigate{
-                          leaveDirectory();
-                        };
-                    else it.setUpNavigate(null);
-                    it.setTitle(stack);
-                }
-            }
-        }
-
-        fun setBack() {
-            fragment.topBar?.view
-        }
-
-        override fun getEmptyPagerView(): View? {
-            return NoResultsView(context, "No Directories Added",
-                "To see files in Grayjay you have to add directories to view",
-                R.drawable.ic_library, listOf(
-                    BigButton(context, "Add Directory", "Select a directory to add", R.drawable.ic_add, {
-                        StateLibrary.instance.addFileDirectory({
-                            loadTop();
-                        }, true);
-                    })
-                ))
-        }
-
-        override fun createAdapter(recyclerResults: RecyclerView, context: Context, dataset: ArrayList<FileEntry>): InsertedViewAdapterWithLoader<FileViewHolder> {
-            /*
-            val buttonUp = BigButton(fragment.requireContext(), "Go up", "Go up a directory", R.drawable.ic_move_up) {
-                if(navStack.size > 1)
-                    leaveDirectory();
-            }
-            val buttonAdd = BigButton(fragment.requireContext(), "Add Directory", "Select a directory to add", R.drawable.ic_add) {
-                StateLibrary.instance.addFileDirectory {
-                    loadTop();
-                };
-            }
-            */
-            //this.buttonUp = buttonUp;
-            //this.buttonAdd = buttonAdd;
-            return InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
-                childCountGetter = { dataset.size },
-                childViewHolderBinder = { viewHolder, position -> viewHolder.bind(dataset[position]); },
-                childViewHolderFactory = { viewGroup, _ ->
-                    val holder = FileViewHolder(viewGroup);
-                    holder.onClick.subscribe { c ->
-                        if (c != null) {
-                            if(c.isDirectory) {
-                                openDirectory(FileStack(c.path, c.getSubFiles()), true);
-                            } else {
-                                fragment.navigate<VideoDetailFragment>(c.path)
-                            }
-                        }
-                    };
-                    holder.onDelete.subscribe { c ->
-                        if(c != null) {
-                            StateLibrary.instance.deleteFileDirectory(c.path);
-                            loadTop();
-                        }
-                    }
-                    return@InsertedViewAdapterWithLoader holder;
-                }
-            );
-        }
-
-        override fun updateSpanCount(){ }
-
-        override fun createLayoutManager(recyclerResults: RecyclerView, context: Context): GridLayoutManager {
-            val glmResults = GridLayoutManager(context, 1)
-
-            _swipeRefresh.layoutParams = (_swipeRefresh.layoutParams as MarginLayoutParams?)?.apply {
-                rightMargin = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    8.0f,
-                    context.resources.displayMetrics
-                ).toInt()
-            }
-
-            return glmResults
-        }
-
-        companion object {
-            private const val TAG = "LibraryAlbumsFragmentsView";
-        }
-    }
-    class FileStack(
-        val path: String,
-        val files: List<FileEntry>
-    )
-
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibraryFragment.kt

@@ -1,393 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
-import android.os.Bundle
-import android.provider.MediaStore
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.collection.emptyLongSet
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.RecyclerView
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.dp
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.Artist
-import com.futo.platformplayer.states.ArtistOrdering
-import com.futo.platformplayer.states.FileEntry
-import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
-import com.futo.platformplayer.views.AnyInsertedAdapterView
-import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithTop
-import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithViews
-import com.futo.platformplayer.views.LibrarySection
-import com.futo.platformplayer.views.NoResultsView
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapter
-import com.futo.platformplayer.views.adapters.viewholders.AlbumTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.ArtistTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.FileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.LocalVideoTileViewHolder
-import com.futo.platformplayer.views.buttons.BigButton
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import okhttp3.Dispatcher
-
-
-class LibraryFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-    private var allowedMusic = false;
-    private var allowedVideo = false;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): android.view.View {
-        val newView = FragView(this, allowedMusic, allowedVideo);
-        view = newView;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-
-        requestPermissionMusic();
-        requestPermissionVideo();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    fun setPermissionResultAudio(access: Boolean) {
-        allowedMusic = access;
-        view?.setMusicPermissions(access);
-        StateApp.instance.hasMediaStoreAudioPermission = (access);
-    }
-    fun setPermissionResultVideo(access: Boolean) {
-        allowedVideo = access;
-        view?.setVideoPermissions(access);
-        StateApp.instance.hasMediaStoreVideoPermission = (access);
-    }
-
-    fun requestPermissionMusic() {
-        when {
-            ContextCompat.checkSelfPermission(requireContext(), android.Manifest.permission.READ_MEDIA_AUDIO) == PackageManager.PERMISSION_GRANTED -> {
-                setPermissionResultAudio(true);
-            }
-            ActivityCompat.shouldShowRequestPermissionRationale(requireActivity(), android.Manifest.permission.READ_MEDIA_AUDIO) -> {
-                UIDialogs.showDialog(requireContext(), R.drawable.ic_library,
-                    "Music permissions", "We require permissions to see your on-device music, denying this will hide the option to see local music.", null, 1,
-                    UIDialogs.Action("Ok", {
-                        StateApp?.instance?.activity?.requestPermissionAudio {
-                            setPermissionResultAudio(it);
-                        }
-                    }, UIDialogs.ActionStyle.PRIMARY),
-                    UIDialogs.Action("Cancel", {
-
-                    }, UIDialogs.ActionStyle.NONE));
-            }
-            else -> {
-                StateApp?.instance?.activity?.requestPermissionAudio {
-                    setPermissionResultAudio(it);
-                }
-            }
-        }
-    }
-    fun requestPermissionVideo() {
-        when {
-            ContextCompat.checkSelfPermission(requireContext(), android.Manifest.permission.READ_MEDIA_VIDEO) == PackageManager.PERMISSION_GRANTED -> {
-                setPermissionResultVideo(true);
-            }
-            ActivityCompat.shouldShowRequestPermissionRationale(requireActivity(), android.Manifest.permission.READ_MEDIA_VIDEO) -> {
-                UIDialogs.showDialog(requireContext(), R.drawable.ic_library, false,
-                    "Videos permissions", "We require permissions to see your on-device videos, denying this will hide the option to see local videos.", null, 1,
-                    UIDialogs.Action("Ok", {
-                        StateApp?.instance?.activity?.requestPermissionVideo {
-                            setPermissionResultVideo(it);
-                        }
-                    }, UIDialogs.ActionStyle.PRIMARY),
-                    UIDialogs.Action("Cancel", {
-
-                    }, UIDialogs.ActionStyle.NONE));
-            }
-            else -> {
-                StateApp?.instance?.activity?.requestPermissionVideo {
-                    setPermissionResultVideo(it);
-                }
-            }
-        }
-    }
-
-
-    companion object {
-        fun newInstance() = LibraryFragment().apply {}
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: LibraryFragment;
-
-        var sectionArtists: LibrarySection;
-        var sectionAlbums: LibrarySection;
-        var sectionVideos: LibrarySection;
-        var sectionFiles: LibrarySection;
-        var noContent: NoResultsView;
-        //var buttonFiles: BigButton;
-
-        val recycler: RecyclerView;
-
-        var adapterFiles: AnyInsertedAdapterView<FileEntry, FileViewHolder>? = null;
-
-        //var metaInfo: TextView;
-
-        var allowMusic: Boolean = false;
-        var allowVideo: Boolean = false;
-
-        constructor(fragment: LibraryFragment, allowMusic: Boolean?, allowVideo: Boolean?) : super(fragment.requireContext()) {
-            inflate(context, R.layout.fragview_library, this);
-            this.fragment = fragment;
-            recycler = findViewById(R.id.recycler);
-            sectionArtists = LibrarySection(context)//findViewById<LibrarySection>(R.id.section_artists);
-            sectionArtists.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 140.dp(resources)).apply {
-                this.setMargins(0,10.dp(resources), 0, 0);
-            }
-            sectionAlbums = LibrarySection(context)//findViewById(R.id.section_albums);
-            sectionAlbums.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 185.dp(resources)).apply {
-                this.setMargins(0,0, 0, 0);
-            }
-            sectionVideos = LibrarySection(context)//findViewById(R.id.section_videos);
-            sectionVideos.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 170.dp(resources)).apply {
-                this.setMargins(0,0, 0, 0);
-            }
-            sectionFiles = LibrarySection(context)//findViewById(R.id.section_videos);
-            sectionFiles.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 40.dp(resources)).apply {
-                this.setMargins(0,0, 0, 0);
-            }
-            sectionFiles.setSection("Directories") {
-                StateLibrary.instance.addFileDirectory({
-                    reloadFiles();
-                }, true)
-            }
-            sectionFiles.setNavIcon(R.drawable.ic_add);
-            //buttonFiles = findViewById<BigButton>(R.id.button_files);
-            //metaInfo = findViewById(R.id.meta_info);
-
-            noContent = NoResultsView(context, "No directories", "No directories have been added.\nAdd them using the (+) icon.", -1, listOf());
-            noContent.isVisible = false;
-
-            this.allowMusic = allowMusic ?: false;
-            this.allowVideo = allowVideo ?: false;
-
-            sectionArtists.setSection("Artists", {
-                if(this.allowMusic)
-                    fragment.navigate<LibraryArtistsFragment>();
-                else
-                    fragment.requestPermissionMusic();
-            });
-
-            sectionAlbums.setSection("Albums", {
-                if(this.allowMusic)
-                    fragment.navigate<LibraryAlbumsFragment>();
-                else
-                    fragment.requestPermissionMusic();
-            });
-
-
-            sectionVideos.setSection("Videos", {
-                if(this.allowVideo)
-                    fragment.navigate<LibraryVideosFragment>();
-                else
-                    fragment.requestPermissionVideo();
-            });
-
-            reloadLibraryUI();
-
-
-            /*
-            buttonFiles.onClick.subscribe {
-                fragment.navigate<LibraryFilesFragment>()
-            } */
-            //buttonFiles.setButtonEnabled(false);
-            setMusicPermissions(allowMusic ?: false);
-            setVideoPermissions(allowVideo ?: false);
-        }
-
-        fun reloadFiles() {
-            val files = StateLibrary.instance.getFileDirectories();
-            adapterFiles?.setData(files);
-            if(files.size == 0) {
-                noContent.isVisible = true;
-            }
-            else
-                noContent.isVisible = false;
-        }
-
-        fun reloadLibraryUI() {
-
-            val adapterAlbums = sectionAlbums.getAnyAdapter<Album, AlbumTileViewHolder>({
-                it.onClick.subscribe {
-                    if(it != null)
-                        fragment.navigate<LibraryAlbumFragment>(it);
-                }
-            });
-            val adapterArtists = sectionArtists.getAnyAdapter<Artist, ArtistTileViewHolder>({
-                it.onClick.subscribe {
-                    if(it != null)
-                        fragment.navigate<LibraryArtistFragment>(it);
-                }
-            });
-            val adapterVideos = sectionVideos.getAnyAdapter<IPlatformVideo, LocalVideoTileViewHolder>({
-                it.onClick.subscribe {
-                    if(it != null)
-                        fragment.navigate<VideoDetailFragment>(it);
-                }
-            });
-
-            if(this.allowMusic) {
-                val artists = StateLibrary.instance.getArtists(ArtistOrdering.TrackCount);
-                adapterArtists.setData(artists);
-                if (artists.size == 0)
-                    sectionArtists.setEmpty(
-                        "No artists",
-                        "No artists were found on your device",
-                        -1
-                    );
-                else
-                    sectionArtists.clearEmpty();
-            }
-            else if(Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-                sectionAlbums.isVisible = false;
-            }
-            else {
-                sectionArtists.setEmpty(
-                    "No Music Permissions",
-                    "You have not granted music access permissions to Grayjay",
-                    -1
-                );
-            }
-
-            if(this.allowMusic) {
-                val albums = StateLibrary.instance.getAlbums();
-                adapterAlbums.setData(albums);
-                if (albums.size == 0)
-                    sectionAlbums.setEmpty("No albums", "No albums were found on your device", -1);
-                else
-                    sectionAlbums.clearEmpty();
-            }
-            else if(Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-                sectionArtists.isVisible = false;
-            }
-            else {
-                sectionAlbums.setEmpty(
-                    "No Music Permissions",
-                    "You have not granted music access permissions to Grayjay",
-                    -1
-                );
-            }
-
-            if(this.allowVideo) {
-                val videos = StateLibrary.instance.getRecentVideos(null, 20);
-                adapterVideos.setData(videos);
-                if (videos.size == 0)
-                    sectionVideos.setEmpty("No videos", "No videos were found on your device", -1);
-                else
-                    sectionVideos.clearEmpty();
-            }
-            else if(Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-                sectionVideos.isVisible = false;
-            }
-            else {
-                sectionVideos.setEmpty(
-                    "No Video Permissions",
-                    "You have not granted video access permissions to Grayjay",
-                    -1
-                );
-            }
-
-            adapterFiles = recycler.asAnyWithViews<FileEntry, FileViewHolder>(
-                arrayListOf(
-                    sectionArtists,
-                    sectionAlbums,
-                    sectionVideos,
-                    sectionFiles,
-                    noContent
-                ),
-                arrayListOf(View(context).apply { this.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 20.dp(resources)) }),
-                RecyclerView.VERTICAL, false, {
-                    it.onClick.subscribe {
-                        if(it != null)
-                            fragment.navigate<LibraryFilesFragment>(it);
-                    }
-                    it.onDelete.subscribe {
-                        if(it != null) {
-                            StateLibrary.instance.deleteFileDirectory(it.path);
-                            reloadFiles();
-                        }
-                    }
-                }
-            );
-            reloadFiles();
-        }
-
-        fun setMusicPermissions(access: Boolean) {
-            allowMusic = access;
-            sectionAlbums.setContentEmptyMessage(R.drawable.ic_library, "No mediastore permissions");
-            sectionArtists.setContentEmptyMessage(R.drawable.ic_library, "No mediastore permissions");
-            //buttonArtists.setButtonEnabled(access);
-            //metaInfo.text = listOf(
-            //    if(!allowMusic) "You did not give access to local music, so these options are disabled" else null,
-            //    if(!allowVideo) "You did not give access to local videos, so these options are disabled" else null
-            //).filterNotNull().joinToString("\n");
-
-            fragment.lifecycleScope.launch(Dispatchers.Main) {
-                reloadLibraryUI();
-            }
-        }
-        fun setVideoPermissions(access: Boolean) {
-            allowVideo = access;
-            sectionVideos.setContentEmptyMessage(R.drawable.ic_library, "No video permissions");
-            //metaInfo.text = listOf(
-            //    if(!allowMusic) "You did not give access to local music, so these options are disabled" else null,
-            //    if(!allowVideo) "You did not give access to local videos, so these options are disabled" else null
-            //).filterNotNull().joinToString("\n");
-            // }
-
-            fragment.lifecycleScope.launch(Dispatchers.Main) {
-                reloadLibraryUI();
-            }
-        }
-
-        fun onShown() {
-            if(didShowAlpha)
-               return;
-            didShowAlpha = true;
-            UIDialogs.appToast("Library is in alpha\nImprovements are coming to local media playback.")
-        }
-        companion object {
-            var didShowAlpha: Boolean = false;
-        }
-    }
-
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibrarySearchFragment.kt

@@ -1,233 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.LinearLayout.GONE
-import android.widget.LinearLayout.VISIBLE
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UISlideOverlays
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.constructs.Event0
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.dp
-import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
-import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.Artist
-import com.futo.platformplayer.states.ArtistOrdering
-import com.futo.platformplayer.states.FileEntry
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringStorage
-import com.futo.platformplayer.views.AnyAdapterView
-import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
-import com.futo.platformplayer.views.AnyInsertedAdapterView
-import com.futo.platformplayer.views.AnyInsertedAdapterView.Companion.asAnyWithViews
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.LibrarySection
-import com.futo.platformplayer.views.LibraryTypeHeaderView
-import com.futo.platformplayer.views.LibraryTypeHeaderView.SelectedType
-import com.futo.platformplayer.views.PillV2
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.SubscriptionAdapter
-import com.futo.platformplayer.views.adapters.viewholders.AlbumTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.ArtistTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.FileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.LocalVideoTileViewHolder
-import com.futo.platformplayer.views.adapters.viewholders.SelectablePlaylist
-import com.futo.platformplayer.views.adapters.viewholders.TrackViewHolder
-import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.platform.PlatformIndicator
-
-class LibrarySearchFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibrarySearchFragment().apply {}
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: LibrarySearchFragment;
-
-        val pillArtist: PillV2;
-        val pillAlbums: PillV2;
-        val pillSongs: PillV2;
-        val pills: List<PillV2>;
-
-        val textMetadata: TextView;
-
-        val recycler: RecyclerView;
-
-        val adapterArtists: AnyAdapterView<Artist, LibraryArtistsFragment.ArtistViewHolder>;
-        val adapterSongs: AnyAdapterView<IPlatformContent, TrackViewHolder>;
-        val adapterAlbums: AnyAdapterView<Album, LibraryAlbumsFragment.AlbumViewHolder>;
-
-
-
-        constructor(fragment: LibrarySearchFragment) : super(fragment.requireContext()) {
-            inflate(context, R.layout.fragview_library_search, this);
-            this.fragment = fragment;
-
-            pillArtist = findViewById(R.id.pill_artist);
-            pillAlbums = findViewById(R.id.pill_albums);
-            pillSongs = findViewById(R.id.pill_songs);
-            pills = listOf(pillArtist, pillAlbums, pillSongs);
-
-            textMetadata = findViewById(R.id.text_metadata);
-
-            pillArtist.onClick.subscribe {
-                pills.forEach { it.setIsEnabled(false) };
-                pillArtist.setIsEnabled(true);
-                loadArtists();
-            }
-            pillAlbums.onClick.subscribe {
-                pills.forEach { it.setIsEnabled(false) };
-                pillAlbums.setIsEnabled(true);
-                loadAlbums();
-            }
-            pillSongs.onClick.subscribe {
-                pills.forEach { it.setIsEnabled(false) };
-                pillSongs.setIsEnabled(true);
-                loadSongs();
-            }
-
-            recycler = findViewById(R.id.recycler);
-            adapterArtists = recycler.asAny<Artist, LibraryArtistsFragment.ArtistViewHolder>(RecyclerView.VERTICAL, false, {
-                it.onClick.subscribe {
-                    if(it != null)
-                        fragment.navigate<LibraryArtistFragment>(it);
-                }
-            });
-            adapterAlbums = recycler.asAny<Album, LibraryAlbumsFragment.AlbumViewHolder>(RecyclerView.VERTICAL, false, {
-                it.onClick.subscribe {
-                    if(it != null)
-                        fragment.navigate<LibraryAlbumFragment>(it);
-                }
-            });
-            adapterSongs = recycler.asAny<IPlatformContent, TrackViewHolder>(RecyclerView.VERTICAL, false, {
-                it.onClick.subscribe {
-                    if(it != null && it is IPlatformVideo)
-                        fragment.navigate<VideoDetailFragment>(it);
-                }
-            });
-
-            fragment.topBar?.let {
-                if(it is SearchTopBarFragment) {
-                    it.onSearch.subscribe {
-                        search(it);
-                    }
-                }
-            }
-
-            pillArtist.setIsEnabled(true);
-            loadArtists();
-        }
-
-        fun loadArtists(){
-            recycler.adapter = adapterArtists.adapter.adapter;
-            fragment.topBar?.let {
-                if(it is SearchTopBarFragment)
-                    search(it.getSearchText());
-            }
-        }
-        fun loadAlbums() {
-            recycler.adapter = adapterAlbums.adapter.adapter;
-            fragment.topBar?.let {
-                if(it is SearchTopBarFragment)
-                    search(it.getSearchText());
-            }
-        }
-        fun loadSongs() {
-            recycler.adapter = adapterSongs.adapter.adapter;
-            fragment.topBar?.let {
-                if(it is SearchTopBarFragment)
-                    search(it.getSearchText());
-            }
-        }
-
-        fun search(str: String) {
-            if(recycler.adapter == adapterArtists.adapter.adapter) {
-                val data = if(!str.isNullOrBlank())
-                    StateLibrary.instance.searchArtists(str)
-                else listOf();
-                adapterArtists.setData(data);
-                textMetadata.text = "${data.size} artists";
-            }
-            else if(recycler.adapter == adapterAlbums.adapter.adapter) {
-                val data = if(!str.isNullOrBlank())
-                    StateLibrary.instance.searchAlbums(str)
-                else listOf();
-                adapterAlbums.setData(data);
-                textMetadata.text = "${data.size} albums";
-            }
-            else if(recycler.adapter == adapterSongs.adapter.adapter) {
-                val data = if(!str.isNullOrBlank())
-                    StateLibrary.instance.searchTracks(str)
-                else listOf();
-
-                adapterSongs.setData(data);
-                textMetadata.text = "${data.size} songs";
-            }
-        }
-
-
-        fun onShown() {
-            fragment.topBar?.let {
-                if(it is SearchTopBarFragment)
-                    it.focus();
-            }
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibraryVideosFragment.kt

@@ -1,170 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.LinearLayout.GONE
-import android.widget.LinearLayout.VISIBLE
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.core.view.allViews
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.R
-import com.futo.platformplayer.Settings
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.UISlideOverlays
-import com.futo.platformplayer.UISlideOverlays.Companion.showOrderOverlay
-import com.futo.platformplayer.api.media.models.PlatformAuthorLink
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
-import com.futo.platformplayer.api.media.models.video.IPlatformVideo
-import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.api.media.structures.AdhocPager
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.Album
-import com.futo.platformplayer.states.StateLibrary
-import com.futo.platformplayer.states.StatePlatform
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringArrayStorage
-import com.futo.platformplayer.stores.StringStorage
-import com.futo.platformplayer.views.FeedStyle
-import com.futo.platformplayer.views.ToggleBar
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
-import com.futo.platformplayer.views.adapters.SubscriptionAdapter
-import com.futo.platformplayer.views.adapters.viewholders.SelectablePlaylist
-import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.platform.PlatformIndicator
-
-class LibraryVideosFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var _toggleBuckets = StateLibrary.instance.getVideoBucketNames().map { it.name }.toMutableList();
-
-    var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = FragView(this, inflater);
-        this.view = view;
-        return view;
-    }
-
-    override fun onShown(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack)
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LibraryVideosFragment().apply {}
-    }
-
-    class FragView : ContentFeedView<LibraryVideosFragment> {
-        override val feedStyle: FeedStyle = FeedStyle.THUMBNAIL; //R.layout.list_creator;
-
-        private var _toggleBar: ToggleBar? = null;
-
-        constructor(fragment: LibraryVideosFragment, inflater: LayoutInflater) : super(fragment, inflater) {
-            initializeToolbarContent();
-            disableRefreshLayout();
-        }
-
-        fun onShown() {
-            val initialAlbums = StateLibrary.instance.getAlbums();
-            Logger.i(TAG, "Initial album count: " + initialAlbums.size);
-            val buckets = StateLibrary.instance.getVideoBucketNames();
-            setPager(StateLibrary.instance.getVideos(fragment._toggleBuckets));
-        }
-
-
-        private val _filterLock = Object();
-        fun initializeToolbarContent() {
-            if(_toolbarContentView.allViews.any { it is ToggleBar })
-                _toolbarContentView.removeView(_toolbarContentView.allViews.find { it is ToggleBar });
-            _toggleBar = ToggleBar(context).apply {
-                layoutParams =
-                    LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-            }
-
-            synchronized(_filterLock) {
-                var buttonsPlugins: List<ToggleBar.Toggle> = listOf()
-                buttonsPlugins =
-                    (StateLibrary.instance.getVideoBucketNames()
-                        .map { bucket ->
-                            ToggleBar.Toggle(bucket.name, null, fragment._toggleBuckets.contains(bucket.name), { view, active ->
-                                var dontSwap = false;
-                                if (!active) {
-                                    if (fragment._toggleBuckets.contains(bucket.name))
-                                        fragment._toggleBuckets.remove(bucket.name);
-                                } else {
-                                    if (!fragment._toggleBuckets.contains(bucket.name)) {
-                                        val enabledClients = StatePlatform.instance.getEnabledClients();
-                                        val availableAfterDisable = enabledClients.count { !fragment._toggleBuckets.contains(it.id) && it.id != bucket.name };
-                                        if(availableAfterDisable > 0)
-                                            fragment._toggleBuckets.add(bucket.name);
-                                        else {
-                                            UIDialogs.appToast("Select atleast 1 bucket");
-                                            dontSwap = true;
-                                        }
-                                    }
-                                }
-                                if(!dontSwap)
-                                    reloadForFilters();
-                                else {
-                                    view.setToggle(active);
-                                }
-                            }, { view, views, enabled ->
-                                val toDisable = views.filter { it != view && it.tag == "plugins" };
-                                if(!view.isActive)
-                                    view.handleClick();
-                                for(tag in toDisable) {
-                                    if(tag.isActive)
-                                        tag.handleClick();
-                                }
-                            }).withTag("plugins")
-                        })
-                val buttons = (buttonsPlugins)
-                    .sortedBy { it.name }.toTypedArray()
-
-                _toggleBar?.setToggles(*buttons);
-            }
-
-            _toolbarContentView.addView(_toggleBar, 0);
-        }
-
-        fun reloadForFilters() {
-            setPager(StateLibrary.instance.getVideos(fragment._toggleBuckets));
-        }
-
-        override fun updateSpanCount(){ }
-
-
-        companion object {
-            private const val TAG = "LibraryAlbumsFragmentsView";
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LoginFragment.kt

@@ -1,160 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.CookieManager
-import android.webkit.WebView
-import android.widget.ImageButton
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.lifecycle.lifecycleScope
-import com.futo.platformplayer.R
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.api.media.platforms.js.SourceAuth
-import com.futo.platformplayer.api.media.platforms.js.SourcePluginAuthConfig
-import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.others.LoginWebViewClient
-import com.futo.platformplayer.states.StateApp
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlin.text.matches
-
-
-class LoginFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val newView = FragView(this);
-        view = newView;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        view?.onShown(parameter ?: throw IllegalArgumentException("No parameter for login"));
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = LoginFragment().apply {}
-
-        private var _callback: ((SourceAuth?) -> Unit)? = null;
-        fun showLogin(config: SourcePluginConfig, callback: ((SourceAuth?) -> Unit)? = null) {
-            if(_callback != null) _callback?.invoke(null);
-            _callback = callback;
-            StateApp.instance.activity?.navigate<LoginFragment>(config, false);
-        }
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: LoginFragment;
-
-        private val _webView: WebView;
-        private val _textUrl: TextView;
-        private val _buttonClose: ImageButton;
-
-        constructor(fragment: LoginFragment) : super(fragment.requireContext()) {
-            inflate(context, R.layout.activity_login, this);
-            this.fragment = fragment;
-
-            _textUrl = findViewById(R.id.text_url);
-            _buttonClose = findViewById(R.id.button_close);
-            _buttonClose.setOnClickListener {
-                UIDialogs.toast("Login cancelled", false);
-                fragment.close(true);
-            }
-
-
-            _webView = findViewById(R.id.web_view);
-            _webView.settings.javaScriptEnabled = true;
-            CookieManager.getInstance().setAcceptCookie(true);
-        }
-
-        fun onShown(parameter: Any) {
-
-
-            val config = parameter as? SourcePluginConfig;
-
-            val authConfig = if(config != null)
-                config.authentication ?: throw IllegalStateException("Plugin has no authentication support");
-            else if(parameter is SourcePluginAuthConfig)
-                parameter
-            else throw IllegalStateException("No valid configuration?");
-            //TODO: Backwards compat removal?
-
-            _webView.settings.userAgentString = authConfig.userAgent ?: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36";
-            _webView.settings.useWideViewPort = true;
-            _webView.settings.loadWithOverviewMode = true;
-
-            val webViewClient = if(config != null) LoginWebViewClient(config) else LoginWebViewClient(authConfig);
-
-            webViewClient.onLogin.subscribe { auth ->
-                _callback?.let {
-                    _callback = null;
-                    it.invoke(auth);
-                }
-                fragment.lifecycleScope.launch(Dispatchers.Main) {
-                    try {
-                        fragment.close(true);
-                    }catch (ex: Throwable) {
-                        Logger.e(TAG, "Failed to close login", ex);
-                    }
-                }
-            };
-            var isFirstLoad = true;
-            val loginWarnings = authConfig.loginWarnings?.toMutableList() ?: mutableListOf<SourcePluginAuthConfig.Warning>();
-            val uiMods = authConfig.uiMods?.toMutableList() ?: mutableListOf<SourcePluginAuthConfig.UIMod>();
-            var currentScale = 100;
-            var currentDesktop = false;
-            webViewClient.onPageLoaded.subscribe { view, url ->
-                _textUrl.setText(url ?: "");
-
-                if(loginWarnings.size > 0 && url != null) {
-                    synchronized(loginWarnings) {
-                        val warning = loginWarnings.find { url.matches(it.getRegex()) };
-                        if(warning != null) {
-                            if(warning.once == true)
-                                loginWarnings.remove(warning);
-                            UIDialogs.showDialog(context, R.drawable.ic_warning_yellow, warning.text ?: "", warning.details ?: "", null, 0,
-                                UIDialogs.Action("Understood", {
-                                }, UIDialogs.ActionStyle.PRIMARY));
-                        }
-                    }
-                }
-
-                if(!isFirstLoad)
-                    return@subscribe;
-                isFirstLoad = false;
-
-                if(!authConfig.loginButton.isNullOrEmpty() && authConfig.loginButton.matches(REGEX_LOGIN_BUTTON)) {
-                    Logger.i(TAG, "Clicking login button [${authConfig.loginButton}]");
-                    //TODO: Find most reliable way to wait for page js to finish
-                    view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {});
-                }
-            }
-            _webView.settings.domStorageEnabled = true;
-
-            _webView.webViewClient = webViewClient;
-            _webView.loadUrl(authConfig.loginUrl);
-        }
-
-        companion object {
-            private val TAG = "LoginFragment";
-            private val REGEX_LOGIN_BUTTON = Regex("[a-zA-Z\\-\\.#:_ ]*");
-        }
-    }
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/RecyclerFragment.kt

@@ -1,52 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.content.Context
-import android.os.Bundle
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.platformplayer.R
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringStorage
-
-class RecyclerFragment : MainFragment(){
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: View? = null;
-
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): android.view.View {
-        val newView = RecyclerFragment.View(inflater.context);
-        view = newView;
-        return newView;
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = RecyclerFragment().apply {}
-    }
-
-
-    class View: ConstraintLayout {
-        constructor(context: Context, attrs : AttributeSet? = null) : super(context, attrs) {
-            inflate(context, R.layout.fragview_filter_recycler, this);
-        }
-
-
-
-    }
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SettingsFragment.kt

@@ -1,184 +0,0 @@
-package com.futo.platformplayer.fragment.mainactivity.main
-
-import android.app.NotificationManager
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.LinearLayout
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import com.futo.platformplayer.R
-import com.futo.platformplayer.Settings
-import com.futo.platformplayer.SettingsDev
-import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.assume
-import com.futo.platformplayer.constructs.Event0
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.views.LoaderView
-import com.futo.platformplayer.views.fields.FieldForm
-import com.futo.platformplayer.views.fields.ReadOnlyTextField
-import com.google.android.material.button.MaterialButton
-
-
-class SettingsFragment : MainFragment() {
-    override val isMainView : Boolean = true;
-    override val isTab: Boolean = true;
-    override val hasBottomBar: Boolean get() = true;
-
-    private var view: FragView? = null;
-
-    override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): android.view.View {
-        val newView = FragView(this);
-        view = newView;
-        return newView;
-    }
-
-    override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShownWithView(parameter, isBack);
-        _currentView = view;
-        view?.onShown(parameter);
-    }
-
-    override fun onHide() {
-        super.onHide();
-        onClosed.emit();
-    }
-
-    override fun onDestroyMainView() {
-        view = null;
-        _currentView = null;
-        super.onDestroyMainView();
-    }
-
-    companion object {
-        fun newInstance() = SettingsFragment().apply {}
-
-        val onClosed = Event0();
-
-        private var _currentView: FragView? = null;
-        val currentView: FragView?
-            get() = _currentView;
-
-    }
-
-
-    class FragView: ConstraintLayout {
-        val fragment: SettingsFragment;
-
-        private val _form: FieldForm;
-        private val _buttonBack: ImageButton;
-        private val _loaderView: LoaderView;
-
-        private val _devSets: LinearLayout;
-        private val _buttonDev: MaterialButton;
-
-        private var _isFinished = false;
-
-        lateinit var overlay: FrameLayout;
-
-        val notifPermission = "android.permission.POST_NOTIFICATIONS";
-
-        constructor(fragment: SettingsFragment) : super(fragment.requireContext()) {
-            inflate(context, R.layout.activity_settings, this);
-            this.fragment = fragment;
-
-            val activity = fragment.activity;
-
-            findViewById<LinearLayout>(R.id.container_topbar).isVisible = false;
-            _form = findViewById(R.id.settings_form);
-            _buttonBack = findViewById(R.id.button_back);
-            _buttonDev = findViewById(R.id.button_dev);
-            _devSets = findViewById(R.id.dev_settings);
-            _loaderView = findViewById(R.id.loader);
-            overlay = findViewById(R.id.overlay_container);
-
-            _form.onChanged.subscribe { field, _ ->
-                Logger.i("SettingsActivity", "Setting [${field.field?.name}] changed, saving");
-                _form.setObjectValues();
-                Settings.instance.save();
-
-                if(field.descriptor?.id == "app_language") {
-                    Logger.i("SettingsActivity", "App language change detected, propogating to shared preferences");
-                    StateApp.instance.setLocaleSetting(context, Settings.instance.language.getAppLanguageLocaleString());
-                }
-
-                if(field.descriptor?.id == "background_update" && activity is MainActivity) {
-                    Logger.i("SettingsActivity", "Detected change in background work ${field.value}");
-                    if(Settings.instance.subscriptions.subscriptionsBackgroundUpdateInterval > 0) {
-                        val notifManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
-                        if(!notifManager.areNotificationsEnabled()) {
-                            UIDialogs.toast(context, "Notifications aren't enabled");
-                            activity.requestNotificationPermissions("Notifications need to be enabled for background updating to function")
-                        }
-                    }
-                }
-            };
-            _buttonBack.setOnClickListener {
-                //finish();
-            }
-
-            _buttonDev.setOnClickListener {
-                //startActivity(Intent(this, DeveloperActivity::class.java));
-                fragment.navigate<DeveloperFragment>(null, true);
-            }
-
-            //_lastActivity = this;
-
-            reloadSettings();
-        }
-
-        var isFirstLoad = true;
-        fun reloadSettings() {
-            val firstLoad = isFirstLoad;
-            isFirstLoad = false;
-            _form.setSearchVisible(false);
-            _loaderView.start();
-            _form.fromObject(fragment.lifecycleScope, Settings.instance) {
-                _loaderView.stop();
-                _form.setSearchVisible(true);
-
-                var devCounter = 0;
-                _form.findField("code")?.assume<ReadOnlyTextField>()?.setOnClickListener {
-                    devCounter++;
-                    if(devCounter > 5) {
-                        devCounter = 0;
-                        SettingsDev.instance.developerMode = true;
-                        SettingsDev.instance.save();
-                        updateDevMode();
-                        UIDialogs.toast(context, fragment.getString(R.string.you_are_now_in_developer_mode));
-                    }
-                };
-
-                /*
-                if(firstLoad) {
-                    val query = intent.getStringExtra("query");
-                    if(!query.isNullOrEmpty()) {
-                        _form.setSearchQuery(query);
-                    }
-                }*/
-            };
-        }
-
-
-        fun onShown(str: Any? = null) {
-            updateDevMode();
-            if(str is String)
-                _form.setSearchQuery(str);
-        }
-
-        fun updateDevMode() {
-            if(SettingsDev.instance.developerMode)
-                _devSets.visibility = View.VISIBLE;
-            else
-                _devSets.visibility = View.GONE;
-        }
-
-    }
-}

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortView.kt

@@ -1,28 +1,46 @@
 package com.futo.platformplayer.fragment.mainactivity.main
 
+import android.app.Dialog
 import android.content.Context
+import android.content.DialogInterface
 import android.content.Intent
+import android.graphics.Bitmap
 import android.graphics.drawable.Animatable
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.text.Spanned
 import android.util.AttributeSet
+import android.util.TypedValue
 import android.view.LayoutInflater
-import android.view.WindowManager
+import android.view.SoundEffectConstants
+import android.view.View
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.OvershootInterpolator
+import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.graphics.drawable.toDrawable
+import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.C
 import androidx.media3.common.Format
 import androidx.media3.common.util.UnstableApi
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.transition.Transition
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.exceptions.ContentNotAvailableYetException
 import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
+import com.futo.platformplayer.api.media.models.PlatformAuthorMembershipLink
+import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
 import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
+import com.futo.platformplayer.api.media.models.ratings.RatingLikes
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
@@ -36,30 +54,40 @@ import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawAudioSource
+import com.futo.platformplayer.casting.CastConnectionState
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
+import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event3
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.downloads.VideoLocal
+import com.futo.platformplayer.dp
 import com.futo.platformplayer.engine.exceptions.ScriptAgeException
 import com.futo.platformplayer.engine.exceptions.ScriptException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.exceptions.ScriptLoginRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptUnavailableException
 import com.futo.platformplayer.exceptions.UnsupportedCastException
-import com.futo.platformplayer.fragment.mainactivity.special.CommentsModalBottomSheet
+import com.futo.platformplayer.fixHtmlLinks
+import com.futo.platformplayer.getNowDiffSeconds
 import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.toHumanBitrate
 import com.futo.platformplayer.toHumanBytesSize
-import com.futo.platformplayer.views.buttons.ShortsButton
+import com.futo.platformplayer.toHumanNowDiffString
+import com.futo.platformplayer.toHumanNumber
+import com.futo.platformplayer.views.MonetizationView
+import com.futo.platformplayer.views.comments.AddCommentView
 import com.futo.platformplayer.views.others.CreatorThumbnail
+import com.futo.platformplayer.views.overlays.DescriptionOverlay
+import com.futo.platformplayer.views.overlays.RepliesOverlay
+import com.futo.platformplayer.views.overlays.SupportOverlay
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuButtonList
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuGroup
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
@@ -67,17 +95,20 @@ import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuTitle
 import com.futo.platformplayer.views.pills.OnLikeDislikeUpdatedArgs
 import com.futo.platformplayer.views.platform.PlatformIndicator
+import com.futo.platformplayer.views.segments.CommentsList
 import com.futo.platformplayer.views.video.FutoShortPlayer
 import com.futo.platformplayer.views.video.FutoVideoPlayerBase
-import com.futo.platformplayer.views.video.FutoVideoPlayerBase.Companion.PREFERED_AUDIO_CONTAINERS
-import com.futo.platformplayer.views.video.FutoVideoPlayerBase.Companion.PREFERED_VIDEO_CONTAINERS
 import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.ContentType
 import com.futo.polycentric.core.Models
 import com.futo.polycentric.core.Opinion
+import com.futo.polycentric.core.PolycentricProfile
 import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
+import com.futo.polycentric.core.toURLInfoSystemLinkUrl
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.button.MaterialButton
-//import com.google.android.material.button.MaterialButton
 import com.google.protobuf.ByteString
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -85,29 +116,30 @@ import userpackage.Protocol
 
 @UnstableApi
 class ShortView : FrameLayout {
-    private lateinit var fragment: MainFragment
+    private lateinit var mainFragment: MainFragment
     private val player: FutoShortPlayer
 
     private val channelInfo: LinearLayout
     private val creatorThumbnail: CreatorThumbnail
     private val channelName: TextView
     private val videoTitle: TextView
-    private val videoSubtitle: TextView
     private val platformIndicator: PlatformIndicator
 
-    //TODO: Replace with non-material button
     private val backButton: MaterialButton
     private val backButtonContainer: ConstraintLayout
 
-    private val likeButton: ShortsButton
+    private val likeContainer: FrameLayout
-    //private val likeCount: TextView
+    private val dislikeContainer: FrameLayout
-    private val dislikeButton: ShortsButton
+    private val likeButton: MaterialButton
-    //private val dislikeCount: TextView
+    private val likeCount: TextView
+    private val dislikeButton: MaterialButton
+    private val dislikeCount: TextView
 
-    private val commentsButton: ShortsButton
+    private val commentsButton: MaterialButton
-    private val shareButton: ShortsButton
+    private val shareButton: MaterialButton
-    private val refreshButton: ShortsButton
+    private val refreshButton: MaterialButton
-    private val qualityButton: ShortsButton
+    private val refreshButtonContainer: View
+    private val qualityButton: MaterialButton
 
     private val playPauseOverlay: FrameLayout
     private val playPauseIcon: ImageView
@@ -141,21 +173,18 @@ class ShortView : FrameLayout {
     private val onLikeDislikeUpdated = Event1<OnLikeDislikeUpdatedArgs>()
     private val onVideoUpdated = Event1<IPlatformVideo?>()
 
-    //TODO: Replace with non-material UI? Only true dependency on Material left
     private val bottomSheet: CommentsModalBottomSheet = CommentsModalBottomSheet()
 
     var likes: Long = 0
         set(value) {
             field = value
-            likeButton.withPrimaryText(value.toString());
+            likeCount.text = value.toString()
-            //likeCount.text = value.toString()
         }
 
     var dislikes: Long = 0
         set(value) {
             field = value
-            dislikeButton.withPrimaryText(value.toString());
+            dislikeCount.text = value.toString()
-            //dislikeCount.text = value.toString()
         }
 
     constructor(inflater: LayoutInflater, fragment: MainFragment, overlayQualityContainer: FrameLayout) : this(inflater.context) {
@@ -165,7 +194,7 @@ class ShortView : FrameLayout {
             LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT
         )
 
-        this.fragment = fragment
+        this.mainFragment = fragment
         bottomSheet.mainFragment = fragment
     }
 
@@ -188,17 +217,19 @@ class ShortView : FrameLayout {
         creatorThumbnail = findViewById(R.id.creator_thumbnail)
         channelName = findViewById(R.id.channel_name)
         videoTitle = findViewById(R.id.video_title)
-        videoSubtitle = findViewById(R.id.video_subtitle)
         platformIndicator = findViewById(R.id.short_platform_indicator)
         backButton = findViewById(R.id.back_button)
         backButtonContainer = findViewById(R.id.back_button_container)
+        likeContainer = findViewById(R.id.like_container)
+        dislikeContainer = findViewById(R.id.dislike_container)
         likeButton = findViewById(R.id.like_button)
-        //likeCount = findViewById(R.id.like_count)
+        likeCount = findViewById(R.id.like_count)
         dislikeButton = findViewById(R.id.dislike_button)
-        //dislikeCount = findViewById(R.id.dislike_count)
+        dislikeCount = findViewById(R.id.dislike_count)
         commentsButton = findViewById(R.id.comments_button)
         shareButton = findViewById(R.id.share_button)
         refreshButton = findViewById(R.id.refresh_button)
+        refreshButtonContainer = findViewById(R.id.refresh_button_container)
         qualityButton = findViewById(R.id.quality_button)
         playPauseOverlay = findViewById(R.id.play_pause_overlay)
         playPauseIcon = findViewById(R.id.play_pause_icon)
@@ -215,16 +246,6 @@ class ShortView : FrameLayout {
             }
         }
 
-        player.onPlayChanged.subscribe {
-            if (it) {
-                Logger.i(TAG, "Keep screen on set because isPlaying")
-                fragment.activity?.window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-            } else {
-                Logger.i(TAG, "Keep screen on cleared because not isPlaying")
-                fragment.activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-            }
-        }
-
         onPlayingToggled.subscribe { playing ->
             if (playing) {
                 playPauseIcon.setImageResource(R.drawable.ic_play)
@@ -237,44 +258,48 @@ class ShortView : FrameLayout {
         }
 
         onVideoUpdated.subscribe {
-            Logger.i(TAG, "Shorts videoUpdated [${it?.name}] (isDetail: ${it is IPlatformVideoDetails}, thumbnail: ${it?.author?.thumbnail})");
             videoTitle.text = it?.name
-            videoSubtitle.text = if(it is IPlatformVideoDetails) it?.description; else "";
             platformIndicator.setPlatformFromClientID(it?.id?.pluginId)
             creatorThumbnail.setThumbnail(it?.author?.thumbnail, true)
             channelName.text = it?.author?.name
         }
 
         backButton.setOnClickListener {
-            fragment.closeSegment()
+            playSoundEffect(SoundEffectConstants.CLICK)
+            mainFragment.closeSegment()
         }
 
         channelInfo.setOnClickListener {
-            fragment.navigate<ChannelFragment>(video?.author)
+            playSoundEffect(SoundEffectConstants.CLICK)
+            mainFragment.navigate<ChannelFragment>(video?.author)
         }
 
         videoTitle.setOnClickListener {
+            playSoundEffect(SoundEffectConstants.CLICK)
             if (!bottomSheet.isAdded) {
-                bottomSheet.show(fragment.childFragmentManager, CommentsModalBottomSheet.TAG)
+                bottomSheet.show(mainFragment.childFragmentManager, CommentsModalBottomSheet.TAG)
             }
         }
 
-        commentsButton.onClick.subscribe {
+        commentsButton.setOnClickListener {
+            playSoundEffect(SoundEffectConstants.CLICK)
             if (!bottomSheet.isAdded) {
-                bottomSheet.show(fragment.childFragmentManager, CommentsModalBottomSheet.TAG)
+                bottomSheet.show(mainFragment.childFragmentManager, CommentsModalBottomSheet.TAG)
             }
         }
 
-        shareButton.onClick.subscribe {
+        shareButton.setOnClickListener {
+            playSoundEffect(SoundEffectConstants.CLICK)
             val url = video?.shareUrl ?: video?.url
-            fragment.startActivity(Intent.createChooser(Intent().apply {
+            mainFragment.startActivity(Intent.createChooser(Intent().apply {
                 action = Intent.ACTION_SEND
                 putExtra(Intent.EXTRA_TEXT, url)
                 type = "text/plain"
             }, null))
         }
 
-        refreshButton.onClick.subscribe {
+        refreshButton.setOnClickListener {
+            playSoundEffect(SoundEffectConstants.CLICK)
             onResetTriggered.emit()
         }
 
@@ -283,12 +308,14 @@ class ShortView : FrameLayout {
             false
         }
 
-        qualityButton.onClick.subscribe {
+        qualityButton.setOnClickListener {
+            playSoundEffect(SoundEffectConstants.CLICK)
             showVideoSettings()
         }
 
-        likeButton.onClick.subscribe {
+        likeButton.setOnClickListener {
-            val checked = likeButton.iconId == R.drawable.ic_thumb_up_s // !likeButton.isChecked
+            playSoundEffect(SoundEffectConstants.CLICK)
+            val checked = !likeButton.isChecked
             StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_like)) {
                 if (checked) {
                     likes++
@@ -296,27 +323,24 @@ class ShortView : FrameLayout {
                     likes--
                 }
 
-                if(checked)
+                likeButton.isChecked = checked
-                    likeButton.withIcon(R.drawable.ic_thumb_up_s_filled) //.isChecked = checked
-                else
-                    likeButton.withIcon(R.drawable.ic_thumb_up_s)
 
-                if (dislikeButton.iconId == R.drawable.ic_thumb_down_s_filled && checked) {
+                if (dislikeButton.isChecked && checked) {
-                    //dislikeButton.isChecked = false
+                    dislikeButton.isChecked = false
-                    dislikeButton.withIcon(R.drawable.ic_thumb_down_s)
                     dislikes--
                 }
 
                 onLikeDislikeUpdated.emit(
                     OnLikeDislikeUpdatedArgs(
-                        it, likes, checked, dislikes, !checked
+                        it, likes, likeButton.isChecked, dislikes, dislikeButton.isChecked
                     )
                 )
             }
         }
 
-        dislikeButton.onClick.subscribe {
+        dislikeButton.setOnClickListener {
-            val checked =  dislikeButton.iconId == R.drawable.ic_thumb_down_s //!dislikeButton.isChecked
+            playSoundEffect(SoundEffectConstants.CLICK)
+            val checked = !dislikeButton.isChecked
             StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_like)) {
                 if (checked) {
                     dislikes++
@@ -324,21 +348,16 @@ class ShortView : FrameLayout {
                     dislikes--
                 }
 
-                //dislikeButton.isChecked = checked
+                dislikeButton.isChecked = checked
-                if(checked)
-                    dislikeButton.withIcon(R.drawable.ic_thumb_down_s_filled) //.isChecked = checked
-                else
-                    dislikeButton.withIcon(R.drawable.ic_thumb_down_s)
 
-                if (likeButton.iconId == R.drawable.ic_thumb_up_s_filled && checked) {
+                if (likeButton.isChecked && checked) {
-                    //likeButton.isChecked = false
+                    likeButton.isChecked = false
-                    likeButton.withIcon(R.drawable.ic_thumb_up_s);
                     likes--
                 }
 
                 onLikeDislikeUpdated.emit(
                     OnLikeDislikeUpdatedArgs(
-                        it, likes, !checked, dislikes, checked
+                        it, likes, likeButton.isChecked, dislikes, dislikeButton.isChecked
                     )
                 )
             }
@@ -347,11 +366,11 @@ class ShortView : FrameLayout {
         onLikesLoaded.subscribe(tag) { rating, liked, disliked ->
             likes = rating.likes
             dislikes = rating.dislikes
-            //likeButton.isChecked = liked
+            likeButton.isChecked = liked
-            //dislikeButton.isChecked = disliked
+            dislikeButton.isChecked = disliked
 
-            dislikeButton.visibility = VISIBLE
+            dislikeContainer.visibility = VISIBLE
-            likeButton.visibility = VISIBLE
+            likeContainer.visibility = VISIBLE
         }
 
         player.onPlaybackStateChanged.subscribe {
@@ -546,7 +565,7 @@ class ShortView : FrameLayout {
         var toSet: ISubtitleSource? = subtitleSource
         if (_lastSubtitleSource == subtitleSource) toSet = null
 
-        fragment.lifecycleScope.launch(Dispatchers.Main) {
+        mainFragment.lifecycleScope.launch(Dispatchers.Main) {
             try {
                 player.swapSubtitles(toSet)
             } catch (e: Throwable) {
@@ -606,7 +625,7 @@ class ShortView : FrameLayout {
 
     @Suppress("unused")
     fun setMainFragment(fragment: MainFragment, overlayQualityContainer: FrameLayout) {
-        this.fragment = fragment
+        this.mainFragment = fragment
         this.bottomSheet.mainFragment = fragment
         this.overlayQualityContainer = overlayQualityContainer
     }
@@ -617,10 +636,10 @@ class ShortView : FrameLayout {
         }
         this.video = video
 
-        refreshButton.visibility = if (isChannelShortsMode) {
+        refreshButtonContainer.visibility = if (isChannelShortsMode) {
             GONE
         } else {
-            GONE //TODO: Revert?
+            VISIBLE
         }
         backButtonContainer.visibility = if (isChannelShortsMode) {
             VISIBLE
@@ -676,8 +695,8 @@ class ShortView : FrameLayout {
     }
 
     private fun loadLikes(video: IPlatformVideo) {
-        likeButton.visibility = GONE
+        likeContainer.visibility = GONE
-        dislikeButton.visibility = GONE
+        dislikeContainer.visibility = GONE
 
         loadLikesTask?.cancel()
         loadLikesTask =
@@ -716,13 +735,13 @@ class ShortView : FrameLayout {
                         args.processHandle.opinion(ref, Opinion.neutral)
                     }
 
-                    fragment.lifecycleScope.launch(Dispatchers.IO) {
+                    mainFragment.lifecycleScope.launch(Dispatchers.IO) {
                         try {
-                            Logger.i(TAG, "Started backfill")
+                            Logger.i(CommentsModalBottomSheet.TAG, "Started backfill")
                             args.processHandle.fullyBackfillServersAnnounceExceptions()
-                            Logger.i(TAG, "Finished backfill")
+                            Logger.i(CommentsModalBottomSheet.TAG, "Finished backfill")
                         } catch (e: Throwable) {
-                            Logger.e(TAG, "Failed to backfill servers", e)
+                            Logger.e(CommentsModalBottomSheet.TAG, "Failed to backfill servers", e)
                         }
                     }
 
@@ -744,41 +763,20 @@ class ShortView : FrameLayout {
 
         setLoading(true)
 
-        Logger.i(TAG, "Shorts loadVideo [${url}]");
-        val timeLoadVideoStart = System.currentTimeMillis();
         loadVideoTask = TaskHandler<String, IPlatformVideoDetails>(
             StateApp.instance.scopeGetter, {
                 val result = StatePlatform.instance.getContentDetails(it).await()
                 if (result !is IPlatformVideoDetails) throw IllegalStateException("Expected media content, found ${result.contentType}")
                 return@TaskHandler result
             }).success { result ->
-                val timeLoadVideo = System.currentTimeMillis() - timeLoadVideoStart;
+            videoDetails = result
-                Logger.i(TAG, "Shorts loadVideo [${url}] took ${timeLoadVideo}ms");
+            video = result
-                videoDetails = result
-                video = result
 
-                if(Settings.instance.playback.shortsPregenerate)
+            bottomSheet.video = result
-                    fragment.lifecycleScope.launch(Dispatchers.IO) {
-                        if(result != null) {
-                            val prefVid = VideoHelper.selectBestVideoSource(result.video, Settings.instance.playback.getCurrentPreferredQualityPixelCount(), PREFERED_VIDEO_CONTAINERS);
-                            val prefAud = VideoHelper.selectBestAudioSource(result.video, PREFERED_AUDIO_CONTAINERS, Settings.instance.playback.getPrimaryLanguage(context));
 
-                            if(prefVid != null && prefVid is JSDashManifestRawSource) {
+            setLoading(false)
-                                Logger.i(TAG, "Shorts pregenerating video (${result.name})");
-                                prefVid.pregenerateAsync(fragment.lifecycleScope);
-                            }
-                            if(prefAud != null && prefAud is JSDashManifestRawAudioSource) {
-                                Logger.i(TAG, "Shorts pregenerating audio (${result.name})");
-                                prefAud.pregenerateAsync(fragment.lifecycleScope);
-                            }
-                        }
-                    }
 
-                bottomSheet.video = result
+            if (playWhenReady) playVideo()
-
-                setLoading(false)
-
-                if (playWhenReady) playVideo()
         }.exception<NoPlatformClientException> {
             Logger.w(TAG, "exception<NoPlatformClientException>", it)
             UIDialogs.showDialog(
@@ -801,7 +799,7 @@ class ShortView : FrameLayout {
             UIDialogs.showSingleButtonDialog(context, R.drawable.ic_schedule, "Video is available in ${it.availableWhen}.", "Close") { }
         }.exception<ScriptImplementationException> {
             Logger.w(TAG, "exception<ScriptImplementationException>", it)
-            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptimplementationexception), it, { loadVideo(url) }, null, fragment)
+            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptimplementationexception), it, { loadVideo(url) }, null, mainFragment)
         }.exception<ScriptAgeException> {
             Logger.w(TAG, "exception<ScriptAgeException>", it)
             UIDialogs.showDialog(
@@ -814,10 +812,10 @@ class ShortView : FrameLayout {
             )
         }.exception<ScriptException> {
             Logger.w(TAG, "exception<ScriptException>", it)
-            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptexception), it, { loadVideo(url) }, null, fragment)
+            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptexception), it, { loadVideo(url) }, null, mainFragment)
         }.exception<Throwable> {
             Logger.w(ChannelFragment.TAG, "Failed to load video.", it)
-            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video), it, { loadVideo(url) }, null, fragment)
+            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video), it, { loadVideo(url) }, null, mainFragment)
         }
 
         loadVideoTask?.run(url)
@@ -851,7 +849,6 @@ class ShortView : FrameLayout {
             }
 
             val thumbnail = videoDetails.thumbnails.getHQThumbnail()
-            /*
             if (videoSource == null && !thumbnail.isNullOrBlank()) Glide.with(context).asBitmap()
                 .load(thumbnail).into(object : CustomTarget<Bitmap>() {
                     override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
@@ -863,9 +860,8 @@ class ShortView : FrameLayout {
                     }
                 })
             else player.setArtwork(null)
-            */
 
-            fragment.lifecycleScope.launch(Dispatchers.Main) {
+            mainFragment.lifecycleScope.launch(Dispatchers.Main) {
                 try {
                     player.setSource(videoSource, audioSource, play = true, keepSubtitles = false, resume = resumePositionMs > 0)
                     if (subtitleSource != null) player.swapSubtitles(subtitleSource)
@@ -891,4 +887,397 @@ class ShortView : FrameLayout {
         const val TAG = "VideoDetailView"
     }
 
+    class CommentsModalBottomSheet : BottomSheetDialogFragment() {
+        var mainFragment: MainFragment? = null
+
+        private lateinit var containerContent: FrameLayout
+        private lateinit var containerContentMain: LinearLayout
+        private lateinit var containerContentReplies: RepliesOverlay
+        private lateinit var containerContentDescription: DescriptionOverlay
+        private lateinit var containerContentSupport: SupportOverlay
+
+        private lateinit var title: TextView
+        private lateinit var subTitle: TextView
+        private lateinit var channelName: TextView
+        private lateinit var channelMeta: TextView
+        private lateinit var creatorThumbnail: CreatorThumbnail
+        private lateinit var channelButton: LinearLayout
+        private lateinit var monetization: MonetizationView
+        private lateinit var platform: PlatformIndicator
+        private lateinit var textLikes: TextView
+        private lateinit var textDislikes: TextView
+        private lateinit var layoutRating: LinearLayout
+        private lateinit var imageDislikeIcon: ImageView
+        private lateinit var imageLikeIcon: ImageView
+
+        private lateinit var description: TextView
+        private lateinit var descriptionContainer: LinearLayout
+        private lateinit var descriptionViewMore: TextView
+
+        private lateinit var commentsList: CommentsList
+        private lateinit var addCommentView: AddCommentView
+
+        private var polycentricProfile: PolycentricProfile? = null
+
+        private lateinit var buttonPolycentric: Button
+        private lateinit var buttonPlatform: Button
+
+        private var tabIndex: Int? = null
+
+        private var contentOverlayView: View? = null
+
+        lateinit var video: IPlatformVideoDetails
+
+        private lateinit var behavior: BottomSheetBehavior<FrameLayout>
+
+        private val _taskLoadPolycentricProfile =
+            TaskHandler<PlatformID, PolycentricProfile?>(StateApp.instance.scopeGetter, { ApiMethods.getPolycentricProfileByClaim(ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, it.claimFieldType.toLong(), it.claimType.toLong(), it.value!!) }).success { setPolycentricProfile(it, animate = true) }
+                .exception<Throwable> {
+                    Logger.w(TAG, "Failed to load claims.", it)
+                }
+
+        override fun onCreateDialog(
+            savedInstanceState: Bundle?,
+        ): Dialog {
+            val bottomSheetDialog =
+                BottomSheetDialog(requireContext(), R.style.Custom_BottomSheetDialog_Theme)
+            bottomSheetDialog.setContentView(R.layout.modal_comments)
+
+            behavior = bottomSheetDialog.behavior
+
+            // TODO figure out how to not need all of these non null assertions
+            containerContent = bottomSheetDialog.findViewById(R.id.content_container)!!
+            containerContentMain = bottomSheetDialog.findViewById(R.id.videodetail_container_main)!!
+            containerContentReplies =
+                bottomSheetDialog.findViewById(R.id.videodetail_container_replies)!!
+            containerContentDescription =
+                bottomSheetDialog.findViewById(R.id.videodetail_container_description)!!
+            containerContentSupport =
+                bottomSheetDialog.findViewById(R.id.videodetail_container_support)!!
+
+            title = bottomSheetDialog.findViewById(R.id.videodetail_title)!!
+            subTitle = bottomSheetDialog.findViewById(R.id.videodetail_meta)!!
+            channelName = bottomSheetDialog.findViewById(R.id.videodetail_channel_name)!!
+            channelMeta = bottomSheetDialog.findViewById(R.id.videodetail_channel_meta)!!
+            creatorThumbnail = bottomSheetDialog.findViewById(R.id.creator_thumbnail)!!
+            channelButton = bottomSheetDialog.findViewById(R.id.videodetail_channel_button)!!
+            monetization = bottomSheetDialog.findViewById(R.id.monetization)!!
+            platform = bottomSheetDialog.findViewById(R.id.videodetail_platform)!!
+            layoutRating = bottomSheetDialog.findViewById(R.id.layout_rating)!!
+            textDislikes = bottomSheetDialog.findViewById(R.id.text_dislikes)!!
+            textLikes = bottomSheetDialog.findViewById(R.id.text_likes)!!
+            imageLikeIcon = bottomSheetDialog.findViewById(R.id.image_like_icon)!!
+            imageDislikeIcon = bottomSheetDialog.findViewById(R.id.image_dislike_icon)!!
+
+            description = bottomSheetDialog.findViewById(R.id.videodetail_description)!!
+            descriptionContainer =
+                bottomSheetDialog.findViewById(R.id.videodetail_description_container)!!
+            descriptionViewMore =
+                bottomSheetDialog.findViewById(R.id.videodetail_description_view_more)!!
+
+            addCommentView = bottomSheetDialog.findViewById(R.id.add_comment_view)!!
+            commentsList = bottomSheetDialog.findViewById(R.id.comments_list)!!
+            buttonPolycentric = bottomSheetDialog.findViewById(R.id.button_polycentric)!!
+            buttonPlatform = bottomSheetDialog.findViewById(R.id.button_platform)!!
+
+            commentsList.onAuthorClick.subscribe { c ->
+                if (c !is PolycentricPlatformComment) {
+                    return@subscribe
+                }
+                val id = c.author.id.value
+
+                Logger.i(TAG, "onAuthorClick: $id")
+                if (id != null && id.startsWith("polycentric://")) {
+                    val navUrl = "https://harbor.social/" + id.substring("polycentric://".length)
+                    mainFragment!!.startActivity(Intent(Intent.ACTION_VIEW, navUrl.toUri()))
+                }
+            }
+            commentsList.onRepliesClick.subscribe { c ->
+                val replyCount = c.replyCount ?: 0
+                var metadata = ""
+                if (replyCount > 0) {
+                    metadata += "$replyCount " + requireContext().getString(R.string.replies)
+                }
+
+                if (c is PolycentricPlatformComment) {
+                    var parentComment: PolycentricPlatformComment = c
+                    containerContentReplies.load(tabIndex!! != 0, metadata, c.contextUrl, c.reference, c, { StatePolycentric.instance.getCommentPager(c.contextUrl, c.reference) }, {
+                        val newComment = parentComment.cloneWithUpdatedReplyCount(
+                            (parentComment.replyCount ?: 0) + 1
+                        )
+                        commentsList.replaceComment(parentComment, newComment)
+                        parentComment = newComment
+                    })
+                } else {
+                    containerContentReplies.load(tabIndex!! != 0, metadata, null, null, c, { StatePlatform.instance.getSubComments(c) })
+                }
+                animateOpenOverlayView(containerContentReplies)
+            }
+
+            if (StatePolycentric.instance.enabled) {
+                buttonPolycentric.setOnClickListener {
+                    setTabIndex(0)
+                    StateMeta.instance.setLastCommentSection(0)
+                }
+            } else {
+                buttonPolycentric.visibility = GONE
+            }
+
+            buttonPlatform.setOnClickListener {
+                setTabIndex(1)
+                StateMeta.instance.setLastCommentSection(1)
+            }
+
+            val ref = Models.referenceFromBuffer(video.url.toByteArray())
+            addCommentView.setContext(video.url, ref)
+
+            if (Settings.instance.comments.recommendationsDefault && !Settings.instance.comments.hideRecommendations) {
+                setTabIndex(2, true)
+            } else {
+                when (Settings.instance.comments.defaultCommentSection) {
+                    0 -> if (Settings.instance.other.polycentricEnabled) setTabIndex(0, true) else setTabIndex(1, true)
+                    1 -> setTabIndex(1, true)
+                    2 -> setTabIndex(StateMeta.instance.getLastCommentSection(), true)
+                }
+            }
+
+            containerContentDescription.onClose.subscribe { animateCloseOverlayView() }
+            containerContentReplies.onClose.subscribe { animateCloseOverlayView() }
+
+            descriptionViewMore.setOnClickListener {
+                animateOpenOverlayView(containerContentDescription)
+            }
+
+            updateDescriptionUI(video.description.fixHtmlLinks())
+
+            val dp5 =
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics)
+            val dp2 =
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2f, resources.displayMetrics)
+
+            //UI
+            title.text = video.name
+            channelName.text = video.author.name
+            if (video.author.subscribers != null) {
+                channelMeta.text = if ((video.author.subscribers
+                        ?: 0) > 0
+                ) video.author.subscribers!!.toHumanNumber() + " " + requireContext().getString(R.string.subscribers) else ""
+                (channelName.layoutParams as MarginLayoutParams).setMargins(
+                    0, (dp5 * -1).toInt(), 0, 0
+                )
+            } else {
+                channelMeta.text = ""
+                (channelName.layoutParams as MarginLayoutParams).setMargins(0, (dp2).toInt(), 0, 0)
+            }
+
+            video.author.let {
+                if (it is PlatformAuthorMembershipLink && !it.membershipUrl.isNullOrEmpty()) monetization.setPlatformMembership(video.id.pluginId, it.membershipUrl)
+                else monetization.setPlatformMembership(null, null)
+            }
+
+            val subTitleSegments: ArrayList<String> = ArrayList()
+            if (video.viewCount > 0) subTitleSegments.add("${video.viewCount.toHumanNumber()} ${if (video.isLive) requireContext().getString(R.string.watching_now) else requireContext().getString(R.string.views)}")
+            if (video.datetime != null) {
+                val diff = video.datetime?.getNowDiffSeconds() ?: 0
+                val ago = video.datetime?.toHumanNowDiffString(true)
+                if (diff >= 0) subTitleSegments.add("$ago ago")
+                else subTitleSegments.add("available in $ago")
+            }
+
+            platform.setPlatformFromClientID(video.id.pluginId)
+            subTitle.text = subTitleSegments.joinToString(" • ")
+            creatorThumbnail.setThumbnail(video.author.thumbnail, false)
+
+            setPolycentricProfile(null, animate = false)
+            _taskLoadPolycentricProfile.run(video.author.id)
+
+            when (video.rating) {
+                is RatingLikeDislikes -> {
+                    val r = video.rating as RatingLikeDislikes
+                    layoutRating.visibility = VISIBLE
+
+                    textLikes.visibility = VISIBLE
+                    imageLikeIcon.visibility = VISIBLE
+                    textLikes.text = r.likes.toHumanNumber()
+
+                    imageDislikeIcon.visibility = VISIBLE
+                    textDislikes.visibility = VISIBLE
+                    textDislikes.text = r.dislikes.toHumanNumber()
+                }
+
+                is RatingLikes -> {
+                    val r = video.rating as RatingLikes
+                    layoutRating.visibility = VISIBLE
+
+                    textLikes.visibility = VISIBLE
+                    imageLikeIcon.visibility = VISIBLE
+                    textLikes.text = r.likes.toHumanNumber()
+
+                    imageDislikeIcon.visibility = GONE
+                    textDislikes.visibility = GONE
+                }
+
+                else -> {
+                    layoutRating.visibility = GONE
+                }
+            }
+
+            monetization.onSupportTap.subscribe {
+                containerContentSupport.setPolycentricProfile(polycentricProfile)
+                animateOpenOverlayView(containerContentSupport)
+            }
+
+            monetization.onStoreTap.subscribe {
+                polycentricProfile?.systemState?.store?.let {
+                    try {
+                        val uri = it.toUri()
+                        val intent = Intent(Intent.ACTION_VIEW)
+                        intent.data = uri
+                        requireContext().startActivity(intent)
+                    } catch (e: Throwable) {
+                        Logger.e(TAG, "Failed to open URI: '${it}'.", e)
+                    }
+                }
+            }
+            monetization.onUrlTap.subscribe {
+                mainFragment!!.navigate<BrowserFragment>(it)
+            }
+
+            addCommentView.onCommentAdded.subscribe {
+                commentsList.addComment(it)
+            }
+
+            channelButton.setOnClickListener {
+                mainFragment!!.navigate<ChannelFragment>(video.author)
+            }
+
+            return bottomSheetDialog
+        }
+
+        override fun onDismiss(dialog: DialogInterface) {
+            super.onDismiss(dialog)
+            animateCloseOverlayView()
+        }
+
+        private fun setPolycentricProfile(profile: PolycentricProfile?, animate: Boolean) {
+            polycentricProfile = profile
+
+            val dp35 = 35.dp(requireContext().resources)
+            val avatar = profile?.systemState?.avatar?.selectBestImage(dp35 * dp35)
+                ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) }
+
+            if (avatar != null) {
+                creatorThumbnail.setThumbnail(avatar, animate)
+            } else {
+                creatorThumbnail.setThumbnail(video.author.thumbnail, animate)
+                creatorThumbnail.setHarborAvailable(profile != null, animate, profile?.system?.toProto())
+            }
+
+            val username = profile?.systemState?.username
+            if (username != null) {
+                channelName.text = username
+            }
+
+            monetization.setPolycentricProfile(profile)
+        }
+
+        private fun setTabIndex(index: Int?, forceReload: Boolean = false) {
+            Logger.i(TAG, "setTabIndex (index: ${index}, forceReload: ${forceReload})")
+            val changed = tabIndex != index || forceReload
+            if (!changed) {
+                return
+            }
+
+            tabIndex = index
+            buttonPlatform.setTextColor(resources.getColor(if (index == 1) R.color.white else R.color.gray_ac, null))
+            buttonPolycentric.setTextColor(resources.getColor(if (index == 0) R.color.white else R.color.gray_ac, null))
+
+            when (index) {
+                null -> {
+                    addCommentView.visibility = GONE
+                    commentsList.clear()
+                }
+
+                0 -> {
+                    addCommentView.visibility = VISIBLE
+                    fetchPolycentricComments()
+                }
+
+                1 -> {
+                    addCommentView.visibility = GONE
+                    fetchComments()
+                }
+            }
+        }
+
+        private fun fetchComments() {
+            Logger.i(TAG, "fetchComments")
+            video.let {
+                commentsList.load(true) { StatePlatform.instance.getComments(it) }
+            }
+        }
+
+        private fun fetchPolycentricComments() {
+            Logger.i(TAG, "fetchPolycentricComments")
+            val video = video
+            val idValue = video.id.value
+            if (video.url.isEmpty()) {
+                Logger.w(TAG, "Failed to fetch polycentric comments because url was null")
+                commentsList.clear()
+                return
+            }
+
+            val ref = Models.referenceFromBuffer(video.url.toByteArray())
+            val extraBytesRef = idValue?.let { if (it.isNotEmpty()) it.toByteArray() else null }
+            commentsList.load(false) { StatePolycentric.instance.getCommentPager(video.url, ref, listOfNotNull(extraBytesRef)); }
+        }
+
+        private fun updateDescriptionUI(text: Spanned) {
+            containerContentDescription.load(text)
+            description.text = text
+
+            if (description.text.isNotEmpty()) descriptionContainer.visibility = VISIBLE
+            else descriptionContainer.visibility = GONE
+        }
+
+        private fun animateOpenOverlayView(view: View) {
+            if (contentOverlayView != null) {
+                Logger.e(TAG, "Content overlay already open")
+                return
+            }
+
+            behavior.isDraggable = false
+            behavior.state = BottomSheetBehavior.STATE_EXPANDED
+
+            val animHeight = containerContentMain.height
+
+            view.translationY = animHeight.toFloat()
+            view.visibility = VISIBLE
+
+            view.animate().setDuration(300).translationY(0f).withEndAction {
+                contentOverlayView = view
+            }.start()
+        }
+
+        private fun animateCloseOverlayView() {
+            val curView = contentOverlayView
+            if (curView == null) {
+                Logger.e(TAG, "No content overlay open")
+                return
+            }
+
+            behavior.isDraggable = true
+
+            val animHeight = contentOverlayView!!.height
+
+            curView.animate().setDuration(300).translationY(animHeight.toFloat()).withEndAction {
+                curView.visibility = GONE
+                contentOverlayView = null
+            }.start()
+        }
+
+        companion object {
+            const val TAG = "ModalBottomSheet"
+        }
+    }
 }