Text edit

- Added ping pong to FCast.
- Removal of DataInputStream and just using raw InputStream.
- Fix slider position crash.

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "dep/polycentricandroid"]
 	path = dep/polycentricandroid
 	url = ../polycentricandroid.git
-[submodule "app/src/playstore/assets/sources/peertube"]
-	path = app/src/playstore/assets/sources/peertube
-	url = ../plugins/peertube.git
 [submodule "app/src/stable/assets/sources/kick"]
 	path = app/src/stable/assets/sources/kick
 	url = ../plugins/kick.git

app/build.gradle

@@ -151,7 +151,7 @@ dependencies {
     //Core
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     //Images
@@ -169,18 +169,18 @@ dependencies {
     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-android:2.2.1")
+    implementation("com.caoccao.javet:javet-android:3.0.2")
 
     //Exoplayer
-    implementation 'androidx.media3:media3-exoplayer:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer:1.2.1'
-    implementation 'androidx.media3:media3-exoplayer-dash:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.2.1'
-    implementation 'androidx.media3:media3-ui:1.2.0'
+    implementation 'androidx.media3:media3-ui:1.2.1'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.2.1'
-    implementation 'androidx.media3:media3-exoplayer-rtsp:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-rtsp:1.2.1'
-    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.2.1'
-    implementation 'androidx.media3:media3-transformer:1.2.0'
+    implementation 'androidx.media3:media3-transformer:1.2.1'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.5'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.7.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'
     implementation 'androidx.media:media:1.7.0'
 
     //Other

app/src/main/AndroidManifest.xml

@@ -24,7 +24,8 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.FutoVideo"
         android:usesCleartextTraffic="true"
-        tools:targetApi="31">
+        tools:targetApi="31"
+        android:largeHeap="true">
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="@string/authority"

app/src/main/assets/devportal/plugin.d.ts

@@ -1,13 +1,37 @@
 
 declare class ScriptException extends Error {
+    //If only one parameter is provided, acts as msg
     constructor(type: string, msg: string);
 }
-declare class TimeoutException extends ScriptException {
+
+declare class LoginRequiredException extends ScriptException {
     constructor(msg: string);
 }
+//Alias
+declare class ScriptLoginRequiredException extends ScriptException {
+    constructor(msg: string);
+}
+
+declare class CaptchaRequiredException extends ScriptException {
+    constructor(url: string, body: string);
+}
+
+declare class CriticalException extends ScriptException {
+    constructor(msg: string);
+}
+
 declare class UnavailableException extends ScriptException {
     constructor(msg: string);
 }
+
+declare class AgeException extends ScriptException {
+    constructor(msg: string);
+}
+
+declare class TimeoutException extends ScriptException {
+    constructor(msg: string);
+}
+
 declare class ScriptImplementationException extends ScriptException {
     constructor(msg: string);
 }
@@ -38,16 +62,23 @@ declare class FilterCapability {
 
 
 declare class PlatformAuthorLink {
-    constructor(id: PlatformID, name: string, url: string, thumbnail: string, subscribers: integer?);
+    constructor(id: PlatformID, name: string, url: string, thumbnail: string, subscribers: integer?, membershipUrl: string?);
+}
+
+declare class PlatformAuthorMembershipLink {
+    constructor(id: PlatformID, name: string, url: string, thumbnail: string, subscribers: integer?, membershipUrl: string?);
 }
 
 declare interface PlatformContentDef {
     id: PlatformID,
     name: string,
+    thumbnails: Thumbnails,
     author: PlatformAuthorLink,
     datetime: integer,
     url: string
 }
+declare interface PlatformContent {}
+
 declare interface PlatformNestedMediaContentDef extends PlatformContentDef {
     contentUrl: string,
     contentName: string?,
@@ -59,16 +90,26 @@ declare class PlatformNestedMediaContent {
     constructor(obj: PlatformNestedMediaContentDef);
 }
 
+declare interface PlatformLockedContentDef extends PlatformContentDef {
+    contentName: string?,
+    contentThumbnails: Thumbnails?,
+    unlockUrl: string,
+    lockDescription: string?,
+}
+declare class PlatformLockedContent {
+    constructor(obj: PlatformLockedContentDef);
+}
+
+
 declare interface PlatformVideoDef extends PlatformContentDef {
     thumbnails: Thumbnails,
     author: PlatformAuthorLink,
 
     duration: int,
     viewCount: long,
-    isLive: boolean
+    isLive: boolean,
+    shareUrl: string?
 }
-declare interface PlatformContent {}
-
 declare class PlatformVideo implements PlatformContent {
     constructor(obj: PlatformVideoDef);
 }
@@ -77,14 +118,15 @@ declare class PlatformVideo implements PlatformContent {
 declare interface PlatformVideoDetailsDef extends PlatformVideoDef {
     description: string,
     video: VideoSourceDescriptor,
-    live: SubtitleSource[],
+    live: IVideoSource,
-    rating: IRating
+    rating: IRating,
+    subtitles: SubtitleSource[]
 }
 declare class PlatformVideoDetails extends PlatformVideo {
     constructor(obj: PlatformVideoDetailsDef);
 }
 
-declare class PlatformPostDef extends PlatformContentDef {
+declare interface PlatformPostDef extends PlatformContentDef {
     thumbnails: string[],
     images: string[],
     description: string
@@ -93,7 +135,7 @@ declare class PlatformPost extends PlatformContent {
     constructor(obj: PlatformPostDef)
 }
 
-declare class PlatformPostDetailsDef extends PlatformPostDef {
+declare interface PlatformPostDetailsDef extends PlatformPostDef {
     rating: IRating,
     textType: int,
     content: String
@@ -110,8 +152,8 @@ declare interface MuxVideoSourceDescriptorDef {
     isUnMuxed: boolean,
     videoSources: VideoSource[]
 }
-declare class MuxVideoSourceDescriptor implements IVideoSourceDescriptor {
+declare class VideoSourceDescriptor implements IVideoSourceDescriptor {
-    constructor(obj: VideoSourceDescriptorDef);
+    constructor(videoSourcesOrObj: VideoSource[]);
 }
 
 declare interface UnMuxVideoSourceDescriptorDef {
@@ -129,7 +171,7 @@ declare interface IVideoSource {
 declare interface IAudioSource {
 
 }
-interface VideoUrlSourceDef implements IVideoSource {
+declare interface VideoUrlSourceDef implements IVideoSource {
     width: integer,
     height: integer,
     container: string,
@@ -139,22 +181,22 @@ interface VideoUrlSourceDef implements IVideoSource {
     duration: integer,
     url: string
 }
-class VideoUrlSource {
+declare class VideoUrlSource {
     constructor(obj: VideoUrlSourceDef);
 
     getRequestModifier(): RequestModifier?;
 }
-interface VideoUrlRangeSourceDef extends VideoUrlSource {
+declare interface VideoUrlRangeSourceDef extends VideoUrlSource {
     itagId: integer,
     initStart: integer,
     initEnd: integer,
     indexStart: integer,
     indexEnd: integer,
 }
-class VideoUrlRangeSource extends VideoUrlSource {
+declare class VideoUrlRangeSource extends VideoUrlSource {
     constructor(obj: YTVideoSourceDef);
 }
-interface AudioUrlSourceDef {
+declare interface AudioUrlSourceDef {
     name: string,
     bitrate: integer,
     container: string,
@@ -163,24 +205,12 @@ interface AudioUrlSourceDef {
     url: string,
     language: string
 }
-class AudioUrlSource implements IAudioSource {
+declare class AudioUrlSource implements IAudioSource {
     constructor(obj: AudioUrlSourceDef);
 
     getRequestModifier(): RequestModifier?;
 }
-interface IRequest {
+declare interface AudioUrlRangeSourceDef extends AudioUrlSource {
-    url: string,
-    headers: Map<string, string>
-}
-interface IRequestModifierDef {
-    allowByteSkip: boolean
-}
-class RequestModifier {
-    constructor(obj: IRequestModifierDef) { }
-
-    modifyRequest(url: string, headers: Map<string, string>): IRequest;
-}
-interface AudioUrlRangeSourceDef extends AudioUrlSource {
     itagId: integer,
     initStart: integer,
     initEnd: integer,
@@ -188,28 +218,44 @@ interface AudioUrlRangeSourceDef extends AudioUrlSource {
     indexEnd: integer,
     audioChannels: integer
 }
-class AudioUrlRangeSource extends AudioUrlSource {
+declare class AudioUrlRangeSource extends AudioUrlSource {
     constructor(obj: AudioUrlRangeSourceDef);
 }
-interface HLSSourceDef {
+declare interface HLSSourceDef {
     name: string,
     duration: integer,
-    url: string
+    url: string,
+    priority: boolean?,
+    language: string?
 }
-class HLSSource implements IVideoSource {
+declare class HLSSource implements IVideoSource {
     constructor(obj: HLSSourceDef);
 }
-interface DashSourceDef {
+declare interface DashSourceDef {
     name: string,
     duration: integer,
-    url: string
+    url: string,
+    language: string?
 }
-class DashSource implements IVideoSource {
+declare class DashSource implements IVideoSource {
     constructor(obj: DashSourceDef)
 }
 
+declare interface IRequest {
+    url: string,
+    headers: Map<string, string>
+}
+declare interface IRequestModifierDef {
+    allowByteSkip: boolean
+}
+declare class RequestModifier {
+    constructor(obj: IRequestModifierDef) { }
+
+    modifyRequest(url: string, headers: Map<string, string>): IRequest;
+}
+
 //Channel
-interface PlatformChannelDef {
+declare interface PlatformChannelDef {
     id: PlatformID,
     name: string,
     thumbnail: string,
@@ -217,12 +263,29 @@ interface PlatformChannelDef {
     subscribers: integer,
     description: string,
     url: string,
+    urlAlternatives: string[],
     links: Map<string>?
 }
-class PlatformChannel {
+declare class PlatformChannel {
     constructor(obj: PlatformChannelDef);
 }
 
+//Playlist
+declare interface PlatformPlaylistDef implements PlatformContent {
+    videoCount: integer,
+    thumbnail: string
+}
+declare class PlatformPlaylist extends PlatformContent {
+    constructor(obj: PlatformPlaylistDef);
+}
+declare interface PlatformPlaylistDetailsDef implements PlatformPlaylistDef {
+    contents: ContentPager
+}
+declare class PlatformPlaylistDetails extends PlatformContent {
+    constructor(obj: PlatformPlaylistDetailsDef);
+}
+
+
 //Ratings
 interface IRating {
     type: integer
@@ -250,7 +313,11 @@ declare class PlatformComment {
     constructor(obj: CommentDef);
 }
 
+declare class PlaybackTracker {
+    constructor(interval: integer);
 
+    setProgress(seconds: integer);
+}
 
 declare class LiveEventPager {
     nextRequest = 4000;
@@ -261,8 +328,8 @@ declare class LiveEventPager {
     nextPage(): LiveEventPager; //Could be self
 }
 
-class LiveEvent {
+declare class LiveEvent {
-    type: String
+    constructor(type: integer);
 }
 declare class LiveEventComment extends LiveEvent {
     constructor(name: string, message: string, thumbnail: string?, colorName: string?, badges: string[]);
@@ -287,25 +354,31 @@ declare class ContentPager {
     constructor(results: PlatformContent[], hasMore: boolean);
 
     hasMorePagers(): boolean
-    nextPage(): VideoPager; //Could be self
+    nextPage(): ContentPager?; //Could be self
 }
 declare class VideoPager {
     constructor(results: PlatformVideo[], hasMore: boolean);
 
     hasMorePagers(): boolean
-    nextPage(): VideoPager; //Could be self
+    nextPage(): VideoPager?; //Could be self
 }
 declare class ChannelPager {
     constructor(results: PlatformChannel[], hasMore: boolean);
 
     hasMorePagers(): boolean;
-    nextPage(): ChannelPager; //Could be self
+    nextPage(): ChannelPager?; //Could be self
+}
+declare class PlaylistPager {
+    constructor(results: PlatformPlaylist[], hasMore: boolean);
+
+    hasMorePagers(): boolean;
+    nextPage(): PlaylistPager?;
 }
 declare class CommentPager {
     constructor(results: PlatformComment[], hasMore: boolean);
 
     hasMorePagers(): boolean
-    nextPage(): CommentPager; //Could be self
+    nextPage(): CommentPager?; //Could be self
 }
 
 interface Map<T> {
@@ -341,8 +414,9 @@ interface Source {
     getChannelCapabilities(): ResultCapabilities;
 
     isContentDetailsUrl(url: string): boolean;
-    getContentDetails(url: string): PlatformVideoDetails;
+    getContentDetails(url: string): PlatformContentDetails;
 
+    //Optional
     getLiveEvents(url: string): LiveEventPager;
 
     //Optional

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

@@ -78,6 +78,11 @@ class ScriptLoginRequiredException extends ScriptException {
         super("ScriptLoginRequiredException", msg);
     }
 }
+class LoginRequiredException extends ScriptException {
+    constructor(msg) {
+        super("ScriptLoginRequiredException", msg);
+    }
+}
 class CaptchaRequiredException extends Error {
     constructor(url, body) {
         super(JSON.stringify({ 'plugin_type': 'CaptchaRequiredException', url, body }));
@@ -249,8 +254,8 @@ class PlatformVideoDetails extends PlatformVideo {
 
         this.description = obj.description ?? "";//String
         this.video = obj.video ?? {}; //VideoSourceDescriptor
-        this.dash = obj.dash ?? null; //DashSource
+        this.dash = obj.dash ?? null; //DashSource, deprecated
-        this.hls = obj.hls ?? null; //HLSSource
+        this.hls = obj.hls ?? null; //HLSSource, deprecated
         this.live = obj.live ?? null; //VideoSource
 
         this.rating = obj.rating ?? null; //IRating
@@ -321,6 +326,8 @@ class VideoUrlSource {
         this.bitrate = obj.bitrate ?? 0;
         this.duration = obj.duration ?? 0;
         this.url = obj.url;
+        if(obj.requestModifier)
+            this.requestModifier = obj.requestModifier;
     }
 }
 class VideoUrlRangeSource extends VideoUrlSource {
@@ -346,6 +353,8 @@ class AudioUrlSource {
         this.duration = obj.duration ?? 0;
         this.url = obj.url;
         this.language = obj.language ?? Language.UNKNOWN;
+        if(obj.requestModifier)
+            this.requestModifier = obj.requestModifier;
     }
 }
 class AudioUrlRangeSource extends AudioUrlSource {
@@ -371,6 +380,8 @@ class HLSSource {
         this.priority = obj.priority ?? false;
         if(obj.language)
             this.language = obj.language;
+        if(obj.requestModifier)
+            this.requestModifier = obj.requestModifier;
     }
 }
 class DashSource {
@@ -382,13 +393,15 @@ class DashSource {
         this.url = obj.url;
         if(obj.language)
             this.language = obj.language;
+        if(obj.requestModifier)
+            this.requestModifier = obj.requestModifier;
     }
 }
 
 class RequestModifier {
     constructor(obj) {
         obj = obj ?? {};
-        this.allowByteSkip = obj.allowByteSkip;
+        this.allowByteSkip = obj.allowByteSkip; //Kinda deprecated.. wip
     }
 }
 

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

@@ -1,5 +1,6 @@
 package com.futo.platformplayer
 
+import android.util.Log
 import com.google.common.base.CharMatcher
 import java.io.ByteArrayOutputStream
 import java.io.IOException
@@ -9,7 +10,6 @@ import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Socket
 import java.nio.ByteBuffer
-import java.nio.charset.Charset
 
 
 private const val IPV4_PART_COUNT = 4;
@@ -216,15 +216,20 @@ private fun ByteArray.toInetAddress(): InetAddress {
 }
 
 fun getConnectedSocket(addresses: List<InetAddress>, port: Int): Socket? {
+    val timeout = 2000
+
     if (addresses.isEmpty()) {
         return null;
     }
 
     if (addresses.size == 1) {
+        val socket = Socket()
+
         try {
-            return Socket(addresses[0], port);
+            return socket.apply { this.connect(InetSocketAddress(addresses[0], port), timeout) }
         } catch (e: Throwable) {
-            //Ignored.
+            Log.i("getConnectedSocket", "Failed to connect to: ${addresses[0]}", e)
+            socket.close()
         }
 
         return null;
@@ -249,7 +254,7 @@ fun getConnectedSocket(addresses: List<InetAddress>, port: Int): Socket? {
                     }
                 }
 
-                socket.connect(InetSocketAddress(address, port));
+                socket.connect(InetSocketAddress(address, port), timeout);
 
                 synchronized(syncObject) {
                     if (connectedSocket == null) {
@@ -263,7 +268,7 @@ fun getConnectedSocket(addresses: List<InetAddress>, port: Int): Socket? {
                     }
                 }
             } catch (e: Throwable) {
-                //Ignore
+                Log.i("getConnectedSocket", "Failed to connect to: $address", e)
             }
         };
 

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

@@ -685,7 +685,9 @@ class Settings : FragmentedStorageFileJson() {
         fun manualCheck() {
             if (!BuildConfig.IS_PLAYSTORE_BUILD) {
                 SettingsActivity.getActivity()?.let {
-                    StateUpdate.instance.checkForUpdates(it, true);
+                    StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                        StateUpdate.instance.checkForUpdates(it, true)
+                    }
                 }
             } else {
                 SettingsActivity.getActivity()?.let {
@@ -807,7 +809,36 @@ class Settings : FragmentedStorageFileJson() {
         var polycentricEnabled: Boolean = true;
     }
 
-    @FormField(R.string.info, FieldForm.GROUP, -1, 19)
+    @FormField(R.string.gesture_controls, FieldForm.GROUP, -1, 19)
+    var gestureControls = GestureControls();
+    @Serializable
+    class GestureControls {
+        @FormField(R.string.volume_slider, FieldForm.TOGGLE, R.string.volume_slider_descr, 1)
+        var volumeSlider: Boolean = true;
+
+        @FormField(R.string.brightness_slider, FieldForm.TOGGLE, R.string.brightness_slider_descr, 2)
+        var brightnessSlider: Boolean = true;
+
+        @FormField(R.string.toggle_full_screen, FieldForm.TOGGLE, R.string.toggle_full_screen_descr, 3)
+        var toggleFullscreen: Boolean = true;
+
+        @FormField(R.string.system_brightness, FieldForm.TOGGLE, R.string.system_brightness_descr, 4)
+        var useSystemBrightness: Boolean = true;
+
+        @FormField(R.string.system_volume, FieldForm.TOGGLE, R.string.system_volume_descr, 5)
+        var useSystemVolume: Boolean = true;
+
+        @FormField(R.string.restore_system_brightness, FieldForm.TOGGLE, R.string.restore_system_brightness_descr, 6)
+        var restoreSystemBrightness: Boolean = true;
+
+        @FormField(R.string.zoom_option, FieldForm.TOGGLE, R.string.zoom_option_descr, 7)
+        var zoom: Boolean = true;
+
+        @FormField(R.string.pan_option, FieldForm.TOGGLE, R.string.pan_option_descr, 8)
+        var pan: Boolean = true;
+    }
+
+    @FormField(R.string.info, FieldForm.GROUP, -1, 20)
     var info = Info();
     @Serializable
     class Info {

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

@@ -37,6 +37,7 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateBackup
 import com.futo.platformplayer.stores.v2.ManagedStore
+import com.futo.platformplayer.views.ToastView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -398,13 +399,28 @@ class UIDialogs {
             StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
                 try {
                     StateApp.withContext {
-                        Toast.makeText(it, text, if (long) Toast.LENGTH_LONG else Toast.LENGTH_SHORT).show();
+                        toast(it, text, long);
                     }
                 } catch (e: Throwable) {
                     Logger.e(TAG, "Failed to show toast.", e);
                 }
             }
         }
+        fun appToast(text: String, long: Boolean = false) {
+            appToast(ToastView.Toast(text, long))
+        }
+        fun appToastError(text: String, long: Boolean) {
+            StateApp.withContext {
+                appToast(ToastView.Toast(text, long, it.getColor(R.color.pastel_red)));
+            };
+        }
+        fun appToast(toast: ToastView.Toast) {
+            StateApp.withContext {
+                if(it is MainActivity) {
+                    it.showAppToast(toast);
+                }
+            }
+        }
 
         fun showClickableToast(context: Context, text: String, onClick: () -> Unit, isLongDuration: Boolean = false) {
             //TODO: Is not actually clickable...

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

@@ -1,6 +1,5 @@
 package com.futo.platformplayer
 
-import android.app.Activity
 import android.app.NotificationManager
 import android.content.ContentResolver
 import android.content.Context
@@ -68,7 +67,7 @@ class UISlideOverlays {
             return menu;
         }
 
-        fun showSubscriptionOptionsOverlay(subscription: Subscription, container: ViewGroup) {
+        fun showSubscriptionOptionsOverlay(subscription: Subscription, container: ViewGroup): SlideUpMenuOverlay {
             val items = arrayListOf<View>();
 
             val originalNotif = subscription.doNotifications;
@@ -77,15 +76,13 @@ class UISlideOverlays {
             val originalVideo = subscription.doFetchVideos;
             val originalPosts = subscription.doFetchPosts;
 
+            val menu = SlideUpMenuOverlay(container.context, container, "Subscription Settings", null, true, listOf());
+
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO){
                 val plugin = StatePlatform.instance.getChannelClient(subscription.channel.url);
                 val capabilities = plugin.getChannelCapabilities();
 
                 withContext(Dispatchers.Main) {
-
-                    var menu: SlideUpMenuOverlay? = null;
-
-
                     items.addAll(listOf(
                         SlideUpMenuItem(container.context, R.drawable.ic_notifications, "Notifications", "", "notifications", {
                             subscription.doNotifications = menu?.selectOption(null, "notifications", true, true) ?: subscription.doNotifications;
@@ -119,7 +116,7 @@ class UISlideOverlays {
                         }, false)*/
                         ).filterNotNull());
 
-                    menu = SlideUpMenuOverlay(container.context, container, "Subscription Settings", null, true, items);
+                    menu.setItems(items);
 
                     if(subscription.doNotifications)
                         menu.selectOption(null, "notifications", true, true);
@@ -174,6 +171,8 @@ class UISlideOverlays {
                     menu.show();
                 }
             }
+
+            return menu;
         }
 
         fun showAddToGroupOverlay(channel: IPlatformVideo, container: ViewGroup) {
@@ -343,7 +342,7 @@ class UISlideOverlays {
                     videoSources.filter { it is IVideoUrlSource && it.isDownloadable() }.asIterable(),
                     Settings.instance.downloads.getDefaultVideoQualityPixels(),
                     FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS
-                ) as IVideoUrlSource;
+                ) as IVideoUrlSource?;
             }
 
             if (audioSources != null) {
@@ -687,7 +686,7 @@ class UISlideOverlays {
         }
 
 
-        fun showAddToOverlay(video: IPlatformVideo, container: ViewGroup): SlideUpMenuOverlay {
+        fun showAddToOverlay(video: IPlatformVideo, container: ViewGroup, slideUpMenuOverlayUpdated: (SlideUpMenuOverlay) -> Unit): SlideUpMenuOverlay {
 
             val items = arrayListOf<View>();
 
@@ -718,6 +717,13 @@ class UISlideOverlays {
             );
 
             val playlistItems = arrayListOf<SlideUpMenuItem>();
+            playlistItems.add(SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, container.context.getString(R.string.new_playlist), container.context.getString(R.string.add_to_new_playlist), "add_to_new_playlist", {
+                slideUpMenuOverlayUpdated(showCreatePlaylistOverlay(container) {
+                    val playlist = Playlist(it, arrayListOf(SerializedPlatformVideo.fromVideo(video)));
+                    StatePlaylists.instance.createOrUpdatePlaylist(playlist);
+                });
+            }, false))
+
             for (playlist in allPlaylists) {
                 playlistItems.add(SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, playlist.name, "${playlist.videos.size} " + container.context.getString(R.string.videos), "",
                     {

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

@@ -12,6 +12,7 @@ import android.widget.ScrollView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
@@ -37,8 +38,10 @@ class AddSourceActivity : AppCompatActivity() {
 
     private lateinit var _sourceHeader: SourceHeaderView;
 
+
     private lateinit var _sourcePermissions: LinearLayout;
     private lateinit var _sourceWarnings: LinearLayout;
+    private lateinit var _sourceWarningsContainer: LinearLayout;
 
     private lateinit var _container: ScrollView;
     private lateinit var _loader: ImageView;
@@ -79,6 +82,7 @@ class AddSourceActivity : AppCompatActivity() {
 
         _sourcePermissions = findViewById(R.id.source_permissions);
         _sourceWarnings = findViewById(R.id.source_warnings);
+        _sourceWarningsContainer = findViewById(R.id.container_source_warnings);
 
         _container = findViewById(R.id.configContainer);
         _loader = findViewById(R.id.loader);
@@ -203,21 +207,30 @@ class AddSourceActivity : AppCompatActivity() {
 
         val pastelRed = ContextCompat.getColor(this, R.color.pastel_red);
 
-        for(warning in config.getWarnings(script))
+        val warnings = config.getWarnings(script);
+        for(warning in warnings)
             _sourceWarnings.addView(
                 SourceInfoView(this,
                 R.drawable.ic_security_pred,
                 warning.first,
                 warning.second)
                 .withDescriptionColor(pastelRed));
+        _sourceWarningsContainer.isVisible = warnings.isNotEmpty();
 
         setLoading(false);
     }
 
     fun install(config: SourcePluginConfig, script: String) {
+        val isNew = !StatePlatform.instance.getAvailableClients().any { it.id == config.id };
         StatePlugins.instance.installPlugin(this, lifecycleScope, config, script) {
-            if(it)
+            if(it) {
+                StatePlatform.instance.clearUpdateAvailable(config)
+                if(isNew)
+                    lifecycleScope.launch {
+                        StatePlatform.instance.enableClient(listOf(config.id));
+                    }
                 backToSources();
+            }
         }
     }
 

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

@@ -16,6 +16,7 @@ class AddSourceOptionsActivity : AppCompatActivity() {
     lateinit var _buttonBack: ImageButton;
 
     lateinit var _buttonQR: BigButton;
+    lateinit var _buttonBrowse: BigButton;
     lateinit var _buttonURL: BigButton;
     lateinit var _buttonPlugins: BigButton;
 
@@ -56,6 +57,7 @@ class AddSourceOptionsActivity : AppCompatActivity() {
         _buttonBack = findViewById(R.id.button_back);
 
         _buttonQR = findViewById(R.id.option_qr);
+        _buttonBrowse = findViewById(R.id.option_browse);
         _buttonURL = findViewById(R.id.option_url);
         _buttonPlugins = findViewById(R.id.option_plugins);
 
@@ -74,6 +76,9 @@ class AddSourceOptionsActivity : AppCompatActivity() {
             integrator.setCaptureActivity(QRCaptureActivity::class.java);
             _qrCodeResultLauncher.launch(integrator.createScanIntent())
         }
+        _buttonBrowse.onClick.subscribe {
+            startActivity(MainActivity.getTabIntent(this, "BROWSE_PLUGINS"));
+        }
 
         _buttonURL.onClick.subscribe {
             UIDialogs.toast(this, getString(R.string.not_implemented_yet));

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

@@ -9,9 +9,11 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
-import com.futo.platformplayer.*
+import com.futo.platformplayer.BuildConfig
+import com.futo.platformplayer.R
 import com.futo.platformplayer.logging.LogLevel
 import com.futo.platformplayer.logging.Logging
+import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

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

@@ -10,6 +10,7 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 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
@@ -39,6 +40,7 @@ class LoginActivity : AppCompatActivity() {
         _textUrl = findViewById(R.id.text_url);
         _buttonClose = findViewById(R.id.button_close);
         _buttonClose.setOnClickListener {
+            UIDialogs.toast("Login cancelled", false);
             finish();
         }
 

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

@@ -1,7 +1,6 @@
 package com.futo.platformplayer.activities
 
 import android.annotation.SuppressLint
-import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
@@ -24,6 +23,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentContainerView
 import androidx.lifecycle.Lifecycle
@@ -45,6 +45,7 @@ import com.futo.platformplayer.states.*
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.SubscriptionStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
+import com.futo.platformplayer.views.ToastView
 import com.google.gson.JsonParser
 import com.google.zxing.integration.android.IntentIntegrator
 import kotlinx.coroutines.*
@@ -54,6 +55,7 @@ import java.io.PrintWriter
 import java.io.StringWriter
 import java.lang.reflect.InvocationTargetException
 import java.util.*
+import java.util.concurrent.ConcurrentLinkedQueue
 
 class MainActivity : AppCompatActivity, IWithResultLauncher {
 
@@ -65,6 +67,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     lateinit var rootView : MotionLayout;
 
     private lateinit var _overlayContainer: FrameLayout;
+    private lateinit var _toastView: ToastView;
 
     //Segment Containers
     private lateinit var _fragContainerTopBar: FragmentContainerView;
@@ -207,7 +210,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragContainerVideoDetail = findViewById(R.id.fragment_overlay);
         _fragContainerOverlay = findViewById(R.id.fragment_overlay_container);
         _overlayContainer = findViewById(R.id.overlay_container);
-        //_overlayContainer.visibility = View.GONE;
+        _toastView = findViewById(R.id.toast_view);
 
         //Initialize fragments
 
@@ -478,21 +481,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
 
         _isVisible = true;
-        val videoToOpen = StateSaved.instance.videoToOpen;
-
-        if (_wasStopped) {
-            _wasStopped = false;
-
-            if (videoToOpen != null && _fragVideoDetail.state == VideoDetailFragment.State.CLOSED) {
-                Logger.i(TAG, "onResume videoToOpen=$videoToOpen");
-                if (StatePlatform.instance.hasEnabledVideoClient(videoToOpen.url)) {
-                    navigate(_fragVideoDetail, UrlVideoWithTime(videoToOpen.url, videoToOpen.timeSeconds, false));
-                    _fragVideoDetail.maximizeVideoDetail(true);
-                }
-
-                StateSaved.instance.setVideoToOpenNonBlocking(null);
-            }
-        }
     }
 
     override fun onPause() {
@@ -547,6 +535,17 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                             navigate(_fragMainSources);
                         }
                     };
+                    "BROWSE_PLUGINS" -> {
+                        navigate(_fragBrowser, BrowserFragment.NavigateOptions("https://plugins.grayjay.app/phone.html", mapOf(
+                            Pair("grayjay") { req ->
+                                StateApp.instance.contextOrNull?.let {
+                                    if(it is MainActivity) {
+                                        it.handleUrlAll(req.url.toString());
+                                    }
+                                };
+                            }
+                        )));
+                    }
                 }
             }
         }
@@ -661,6 +660,14 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             };
             return true;
         }
+        else if(StatePlatform.instance.hasEnabledPlaylistClient(url)) {
+            navigate(_fragMainPlaylist, url);
+            lifecycleScope.launch {
+                delay(100);
+                _fragVideoDetail.minimizeVideoDetail();
+            };
+            return true;
+        }
         return false;
     }
     fun handleContent(file: String, mime: String? = null): Boolean {
@@ -814,11 +821,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         if(_fragBotBarMenu.onBackPressed())
             return;
 
-        if(_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED &&
+        if(_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED && _fragVideoDetail.onBackPressed())
-            _fragVideoDetail.onBackPressed())
             return;
 
-
         if(!fragCurrent.onBackPressed())
             closeSegment();
     }
@@ -864,7 +869,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _orientationManager.disable();
 
         StateApp.instance.mainAppDestroyed(this);
-        StateSaved.instance.setVideoToOpenBlocking(null);
     }
 
     inline fun <reified T> isFragmentActive(): Boolean {
@@ -1052,6 +1056,43 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
+    private val _toastQueue = ConcurrentLinkedQueue<ToastView.Toast>();
+    private var _toastJob: Job? = null;
+    fun showAppToast(toast: ToastView.Toast) {
+        synchronized(_toastQueue) {
+            _toastQueue.add(toast);
+            if(_toastJob?.isActive != true)
+                _toastJob = lifecycleScope.launch(Dispatchers.Default) {
+                    launchAppToastJob();
+                };
+        }
+    }
+    private suspend fun launchAppToastJob() {
+        Logger.i(TAG, "Starting appToast loop");
+        while(!_toastQueue.isEmpty()) {
+            val toast = _toastQueue.poll() ?: continue;
+            Logger.i(TAG, "Showing next toast (${toast.msg})");
+
+            lifecycleScope.launch(Dispatchers.Main) {
+                if (!_toastView.isVisible) {
+                    Logger.i(TAG, "First showing toast");
+                    _toastView.setToast(toast);
+                    _toastView.show(true);
+                } else {
+                    _toastView.setToastAnimated(toast);
+                }
+            }
+            if(toast.long)
+                delay(5000);
+            else
+                delay(3000);
+        }
+        Logger.i(TAG, "Ending appToast loop");
+        lifecycleScope.launch(Dispatchers.Main) {
+            _toastView.hide(true) {
+            };
+        }
+    }
 
 
     //TODO: Only calls last handler due to missing request codes on ActivityResultLaunchers.

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

@@ -17,9 +17,7 @@ import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.polycentric.core.ProcessHandle
 import com.futo.polycentric.core.Store
-import com.futo.polycentric.core.Synchronization
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
@@ -71,6 +69,7 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
                     try {
                         processHandle = ProcessHandle.create();
                         Store.instance.addProcessSecret(processHandle.processSecret);
+
                         processHandle.addServer("https://srv1-stg.polycentric.io");
                         processHandle.setUsername(username);
                         StatePolycentric.instance.setProcessHandle(processHandle);

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

@@ -19,8 +19,9 @@ class PolycentricPlatformComment : IPlatformComment {
 
     val eventPointer: Pointer;
     val reference: Reference;
+    val parentReference: Reference?;
 
-    constructor(contextUrl: String, author: PlatformAuthorLink, msg: String, rating: IRating, date: OffsetDateTime, eventPointer: Pointer, replyCount: Int? = null) {
+    constructor(contextUrl: String, author: PlatformAuthorLink, msg: String, rating: IRating, date: OffsetDateTime, eventPointer: Pointer, parentReference: Reference?, replyCount: Int? = null) {
         this.contextUrl = contextUrl;
         this.author = author;
         this.message = msg;
@@ -29,6 +30,7 @@ class PolycentricPlatformComment : IPlatformComment {
         this.replyCount = replyCount;
         this.eventPointer = eventPointer;
         this.reference = eventPointer.toReference();
+        this.parentReference = parentReference;
     }
 
     override fun getReplies(client: IPlatformClient): IPager<IPlatformComment> {
@@ -36,10 +38,11 @@ class PolycentricPlatformComment : IPlatformComment {
     }
 
     fun cloneWithUpdatedReplyCount(replyCount: Int?): PolycentricPlatformComment {
-        return PolycentricPlatformComment(contextUrl, author, message, rating, date, eventPointer, replyCount);
+        return PolycentricPlatformComment(contextUrl, author, message, rating, date, eventPointer, parentReference, replyCount);
     }
 
     companion object {
+        private const val TAG = "PolycentricPlatformComment"
         val MAX_COMMENT_SIZE = 2000
     }
 }

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

@@ -3,4 +3,5 @@ package com.futo.platformplayer.api.media.models.modifier
 interface IModifierOptions {
     val applyAuthClient: String?;
     val applyCookieClient: String?;
+    val applyOtherHeaders: Boolean;
 }

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

@@ -11,4 +11,5 @@ class SourcePluginAuthConfig(
     val userAgent: String? = null,
     val loginButton: String? = null,
     val domainHeadersToFind: Map<String, List<String>>? = null,
+    val loginWarning: String? = null
 ) { }

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

@@ -2,6 +2,9 @@ package com.futo.platformplayer.api.media.platforms.js
 
 import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event0
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.AnnouncementType
+import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.views.fields.DropdownFieldOptions
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.FormField
@@ -55,7 +58,16 @@ class SourcePluginDescriptor {
         onCaptchaChanged.emit();
     }
     fun getCaptchaData(): SourceCaptchaData? {
-        return SourceCaptchaData.fromEncrypted(captchaEncrypted);
+        try {
+            return SourceCaptchaData.fromEncrypted(captchaEncrypted);
+        }
+        catch(ex: Throwable) {
+            Logger.e("SourcePluginDescriptor", "Captcha decode failed, disabling auth.", ex);
+            StateAnnouncement.instance.registerAnnouncement("CAP_BROKEN_" + config.id,
+                "Captcha corrupted for plugin [${config.name}]",
+                "Something went wrong in the stored captcha, you'll have to login again", AnnouncementType.SESSION);
+            return null;
+        }
     }
 
     fun updateAuth(str: SourceAuth?) {
@@ -63,12 +75,24 @@ class SourcePluginDescriptor {
         onAuthChanged.emit();
     }
     fun getAuth(): SourceAuth? {
-        return SourceAuth.fromEncrypted(authEncrypted);
+        try {
+            return SourceAuth.fromEncrypted(authEncrypted);
+        }
+        catch(ex: Throwable) {
+            Logger.e("SourcePluginDescriptor", "Authentication decode failed, disabling auth.", ex);
+            StateAnnouncement.instance.registerAnnouncement("AUTH_BROKEN_" + config.id,
+                "Authentication corrupted for plugin [${config.name}]",
+                "Something went wrong in the stored authentication, you'll have to login again", AnnouncementType.SESSION);
+            return null;
+        }
     }
 
     @Serializable
     class AppPluginSettings {
 
+        @FormField(R.string.check_for_updates_setting, FieldForm.TOGGLE, R.string.check_for_updates_setting_description, 1)
+        var checkForUpdates: Boolean = true;
+
         @FormField(R.string.visibility, "group", R.string.enable_where_this_plugins_content_are_visible, 2)
         var tabEnabled = TabEnabled();
         @Serializable

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

@@ -23,21 +23,31 @@ class JSRequest : IRequest {
         _v8Options = options;
         initialize(plugin, originalUrl, originalHeaders);
     }
-    constructor(plugin: JSClient, obj: V8ValueObject, originalUrl: String?, originalHeaders: Map<String, String>?) {
+    constructor(plugin: JSClient, obj: V8ValueObject, originalUrl: String?, originalHeaders: Map<String, String>?, applyOtherHeadersByDefault: Boolean = false) {
         val contextName = "ModifyRequestResponse";
         val config = plugin.config;
         _v8Url = obj.getOrDefault<String>(config, "url", contextName, null);
         _v8Headers = obj.getOrDefault<Map<String, String>>(config, "headers", contextName, null);
         _v8Options = obj.getOrDefault<V8ValueObject>(config, "options", "JSRequestModifier.options", null)?.let {
-            Options(config, it);
+            Options(config, it, applyOtherHeadersByDefault);
-        }
+        } ?: Options(null, null, applyOtherHeadersByDefault);
         initialize(plugin, originalUrl, originalHeaders);
     }
 
     private fun initialize(plugin: JSClient, originalUrl: String?, originalHeaders: Map<String, String>?) {
         val config = plugin.config;
         url = _v8Url ?: originalUrl;
-        headers = _v8Headers ?: originalHeaders ?: mapOf();
+
+        if(_v8Options?.applyOtherHeaders ?: false) {
+            val headersToSet = _v8Headers?.toMutableMap() ?: mutableMapOf();
+            if (originalHeaders != null)
+                for (head in originalHeaders)
+                    if (!headersToSet.containsKey(head.key))
+                        headersToSet[head.key] = head.value;
+            headers = headersToSet;
+        }
+        else
+            headers = _v8Headers ?: originalHeaders ?: mapOf();
 
         if(_v8Options != null) {
             if(_v8Options.applyCookieClient != null && url != null) {
@@ -68,10 +78,18 @@ class JSRequest : IRequest {
     class Options: IModifierOptions {
         override val applyAuthClient: String?;
         override val applyCookieClient: String?;
+        override val applyOtherHeaders: Boolean;
 
-        constructor(config: IV8PluginConfig, obj: V8ValueObject) {
+
+        constructor(config: IV8PluginConfig, obj: V8ValueObject, applyOtherHeadersByDefault: Boolean = false) {
             applyAuthClient = obj.getOrDefault(config, "applyAuthClient", "JSRequestModifier.options.applyAuthClient", null);
             applyCookieClient = obj.getOrDefault(config, "applyCookieClient", "JSRequestModifier.options.applyCookieClient", null);
+            applyOtherHeaders = obj.getOrDefault(config, "applyOtherHeaders", "JSRequestModifier.options.applyOtherHeaders", applyOtherHeadersByDefault) ?: applyOtherHeadersByDefault;
+        }
+        constructor(applyAuthClient: String? = null, applyCookieClient: String? = null, applyOtherHeaders: Boolean = false) {
+            this.applyAuthClient = applyAuthClient;
+            this.applyCookieClient = applyCookieClient;
+            this.applyOtherHeaders = applyOtherHeaders;
         }
     }
 

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

@@ -40,6 +40,7 @@ class JSRequestModifier: IRequestModifier {
         } as V8ValueObject;
 
         val req = JSRequest(_plugin, result, url, headers);
+        result.close();
         return req;
     }
 

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

@@ -33,7 +33,7 @@ abstract class JSSource {
         this.type = type;
 
         _requestModifier = obj.getOrDefault<V8ValueObject>(_config, "requestModifier", "JSSource.requestModifier", null)?.let {
-            JSRequest(plugin, it, null, null);
+            JSRequest(plugin, it, null, null, true);
         }
         hasRequestModifier = _requestModifier != null || obj.has("getRequestModifier");
     }

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

@@ -138,7 +138,7 @@ class AirPlayCastingDevice : CastingDevice {
                     try {
                         val connectedSocket = getConnectedSocket(adrs.toList(), port);
                         if (connectedSocket == null) {
-                            delay(3000);
+                            delay(1000);
                             continue;
                         }
 

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

@@ -17,6 +17,8 @@ import org.json.JSONObject
 import java.io.DataInputStream
 import java.io.DataOutputStream
 import java.net.InetAddress
+import java.net.InetSocketAddress
+import java.net.Socket
 import java.security.cert.X509Certificate
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLSocket
@@ -303,17 +305,18 @@ class ChromecastCastingDevice : CastingDevice {
             _thread = Thread {
                 connectionState = CastConnectionState.CONNECTING;
 
+                var connectedSocket: Socket? = null
                 while (_scopeIO?.isActive == true) {
                     try {
-                        val connectedSocket = getConnectedSocket(adrs.toList(), port);
+                        val resultSocket = getConnectedSocket(adrs.toList(), port);
-                        if (connectedSocket == null) {
+                        if (resultSocket == null) {
-                            Thread.sleep(3000);
+                            Thread.sleep(1000);
                             continue;
                         }
 
+                        connectedSocket = resultSocket
                         usedRemoteAddress = connectedSocket.inetAddress;
                         localAddress = connectedSocket.localAddress;
-                        connectedSocket.close();
                         break;
                     } catch (e: Throwable) {
                         Logger.w(TAG, "Failed to get setup initial connection to ChromeCast device.", e)
@@ -325,6 +328,8 @@ class ChromecastCastingDevice : CastingDevice {
 
                 val factory = sslContext.socketFactory;
 
+                val address = InetSocketAddress(usedRemoteAddress, port)
+
                 //Connection loop
                 while (_scopeIO?.isActive == true) {
                     Logger.i(TAG, "Connecting to Chromecast.");
@@ -332,7 +337,16 @@ class ChromecastCastingDevice : CastingDevice {
 
                     try {
                         _socket?.close()
-                        _socket = factory.createSocket(usedRemoteAddress, port) as SSLSocket;
+                        if (connectedSocket != null) {
+                            Logger.i(TAG, "Using connected socket.")
+                            _socket = factory.createSocket(connectedSocket, connectedSocket.inetAddress.hostAddress, connectedSocket.port, true) as SSLSocket
+                            connectedSocket = null
+                        } else {
+                            Logger.i(TAG, "Using new socket.")
+                            val s = Socket().apply { this.connect(address, 2000) }
+                            _socket = factory.createSocket(s, s.inetAddress.hostAddress, s.port, true) as SSLSocket
+                        }
+
                         _socket?.startHandshake();
                         Logger.i(TAG, "Successfully connected to Chromecast at $usedRemoteAddress:$port");
 
@@ -347,7 +361,7 @@ class ChromecastCastingDevice : CastingDevice {
                         Logger.i(TAG, "Failed to connect to Chromecast.", e);
 
                         connectionState = CastConnectionState.CONNECTING;
-                        Thread.sleep(3000);
+                        Thread.sleep(1000);
                         continue;
                     }
 
@@ -363,7 +377,7 @@ class ChromecastCastingDevice : CastingDevice {
                         _socket?.close();
 
                         connectionState = CastConnectionState.CONNECTING;
-                        Thread.sleep(3000);
+                        Thread.sleep(1000);
                         continue;
                     }
 
@@ -415,7 +429,7 @@ class ChromecastCastingDevice : CastingDevice {
                     Logger.i(TAG, "Socket disconnected.");
 
                     connectionState = CastConnectionState.CONNECTING;
-                    Thread.sleep(3000);
+                    Thread.sleep(1000);
                 }
 
                 Logger.i(TAG, "Stopped connection loop.");
@@ -432,10 +446,11 @@ class ChromecastCastingDevice : CastingDevice {
                 while (_scopeIO?.isActive == true) {
                     try {
                         sendChannelMessage("sender-0", "receiver-0", "urn:x-cast:com.google.cast.tp.heartbeat", pingObject.toString());
-                        Thread.sleep(5000);
                     } catch (e: Throwable) {
                         Log.w(TAG, "Failed to send ping.");
                     }
+
+                    Thread.sleep(5000);
                 }
 
                 Logger.i(TAG, "Stopped ping loop.");

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

@@ -15,6 +15,7 @@ import com.futo.platformplayer.casting.models.FCastSetSpeedMessage
 import com.futo.platformplayer.casting.models.FCastSetVolumeMessage
 import com.futo.platformplayer.casting.models.FCastVersionMessage
 import com.futo.platformplayer.casting.models.FCastVolumeUpdateMessage
+import com.futo.platformplayer.ensureNotMainThread
 import com.futo.platformplayer.getConnectedSocket
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.CastingDeviceInfo
@@ -27,11 +28,12 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import java.io.DataInputStream
-import java.io.DataOutputStream
 import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
 import java.math.BigInteger
 import java.net.InetAddress
+import java.net.InetSocketAddress
 import java.net.Socket
 import java.security.KeyFactory
 import java.security.KeyPair
@@ -81,12 +83,15 @@ class FCastCastingDevice : CastingDevice {
     var port: Int = 0;
 
     private var _socket: Socket? = null;
-    private var _outputStream: DataOutputStream? = null;
+    private var _outputStream: OutputStream? = null;
-    private var _inputStream: DataInputStream? = null;
+    private var _inputStream: InputStream? = null;
     private var _scopeIO: CoroutineScope? = null;
     private var _started: Boolean = false;
     private var _version: Long = 1;
     private var _thread: Thread? = null
+    private var _pingThread: Thread? = null
+    private var _lastPongTime = -1L
+    private var _outputStreamLock = Object()
 
     constructor(name: String, addresses: Array<InetAddress>, port: Int) : super() {
         this.name = name;
@@ -206,7 +211,13 @@ class FCastCastingDevice : CastingDevice {
 
     private fun invokeInIOScopeIfRequired(action: () -> Unit): Boolean {
         if(Looper.getMainLooper().thread == Thread.currentThread()) {
-            _scopeIO?.launch { action(); }
+            _scopeIO?.launch {
+                try {
+                    action();
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to invoke in IO scope.", e)
+                }
+            }
             return true;
         }
 
@@ -240,77 +251,113 @@ class FCastCastingDevice : CastingDevice {
         val adrs = addresses ?: return;
 
         val thread = _thread
-        if (thread == null || !thread.isAlive) {
+        val pingThread = _pingThread
-            Log.i(TAG, "Restarting thread because the thread has died")
+        if (_started && (thread == null || !thread.isAlive || pingThread == null || !pingThread.isAlive)) {
+            Log.i(TAG, "(Re)starting thread because the thread has died")
+
+            _scopeIO?.let {
+                it.cancel()
+                Logger.i(TAG, "Cancelled previous scopeIO because a new one is starting.")
+            }
 
-            _scopeIO?.cancel();
-            Logger.i(TAG, "Cancelled previous scopeIO because a new one is starting.")
             _scopeIO = CoroutineScope(Dispatchers.IO);
 
             _thread = Thread {
                 connectionState = CastConnectionState.CONNECTING;
+                Log.i(TAG, "Connection thread started.")
 
+                var connectedSocket: Socket? = null
                 while (_scopeIO?.isActive == true) {
                     try {
-                        val connectedSocket = getConnectedSocket(adrs.toList(), port);
+                        Log.i(TAG, "getConnectedSocket (adrs = [ ${adrs.joinToString(", ")} ], port = ${port}).")
-                        if (connectedSocket == null) {
+
-                            Thread.sleep(3000);
+                        val resultSocket = getConnectedSocket(adrs.toList(), port);
+
+                        if (resultSocket == null) {
+                            Log.i(TAG, "Connection failed, waiting 1 seconds.")
+                            Thread.sleep(1000);
                             continue;
                         }
 
-                        usedRemoteAddress = connectedSocket.inetAddress;
+                        Log.i(TAG, "Connection succeeded.")
-                        localAddress = connectedSocket.localAddress;
+
-                        connectedSocket.close();
+                        connectedSocket = resultSocket
+                        usedRemoteAddress = connectedSocket.inetAddress
+                        localAddress = connectedSocket.localAddress
                         break;
                     } catch (e: Throwable) {
-                        Logger.w(ChromecastCastingDevice.TAG, "Failed to get setup initial connection to FastCast device.", e)
+                        Logger.w(TAG, "Failed to get setup initial connection to FastCast device.", e)
                     }
                 }
 
+                val address = InetSocketAddress(usedRemoteAddress, port)
+
                 //Connection loop
                 while (_scopeIO?.isActive == true) {
                     Logger.i(TAG, "Connecting to FastCast.");
                     connectionState = CastConnectionState.CONNECTING;
 
                     try {
-                        _socket = Socket(usedRemoteAddress, port);
+                        _socket?.close()
+                        _inputStream?.close()
+                        _outputStream?.close()
+                        if (connectedSocket != null) {
+                            Logger.i(TAG, "Using connected socket.");
+                            _socket = connectedSocket
+                            connectedSocket = null
+                        } else {
+                            Logger.i(TAG, "Using new socket.");
+                            _socket = Socket().apply { this.connect(address, 2000) };
+                        }
                         Logger.i(TAG, "Successfully connected to FastCast at $usedRemoteAddress:$port");
 
-                        _outputStream = DataOutputStream(_socket?.outputStream);
+                        _outputStream = _socket?.outputStream;
-                        _inputStream = DataInputStream(_socket?.inputStream);
+                        _inputStream = _socket?.inputStream;
                     } catch (e: IOException) {
-                        _socket?.close();
+                        _socket?.close()
+                        _inputStream?.close()
+                        _outputStream?.close()
                         Logger.i(TAG, "Failed to connect to FastCast.", e);
 
                         connectionState = CastConnectionState.CONNECTING;
-                        Thread.sleep(3000);
+                        Thread.sleep(1000);
                         continue;
                     }
 
                     localAddress = _socket?.localAddress;
                     connectionState = CastConnectionState.CONNECTED;
+                    _lastPongTime = -1L
 
                     val buffer = ByteArray(4096);
 
                     Logger.i(TAG, "Started receiving.");
-                    var exceptionOccurred = false;
+                    while (_scopeIO?.isActive == true) {
-                    while (_scopeIO?.isActive == true && !exceptionOccurred) {
                         try {
                             val inputStream = _inputStream ?: break;
                             Log.d(TAG, "Receiving next packet...");
-                            val b1 = inputStream.readUnsignedByte();
+
-                            val b2 = inputStream.readUnsignedByte();
+                            var headerBytesRead = 0
-                            val b3 = inputStream.readUnsignedByte();
+                            while (headerBytesRead < 4) {
-                            val b4 = inputStream.readUnsignedByte();
+                                val read = inputStream.read(buffer, headerBytesRead, 4 - headerBytesRead)
-                            val size = ((b4.toLong() shl 24) or (b3.toLong() shl 16) or (b2.toLong() shl 8) or b1.toLong()).toInt();
+                                if (read == -1)
+                                    throw Exception("Stream closed")
+                                headerBytesRead += read
+                            }
+
+                            val size = ((buffer[3].toLong() shl 24) or (buffer[2].toLong() shl 16) or (buffer[1].toLong() shl 8) or buffer[0].toLong()).toInt();
                             if (size > buffer.size) {
-                                Logger.w(TAG, "Skipping packet that is too large $size bytes.")
+                                Logger.w(TAG, "Packets larger than $size bytes are not supported.")
-                                inputStream.skip(size.toLong());
+                                break
-                                continue;
                             }
 
                             Log.d(TAG, "Received header indicating $size bytes. Waiting for message.");
-                            inputStream.read(buffer, 0, size);
+                            var bytesRead = 0
+                            while (bytesRead < size) {
+                                val read = inputStream.read(buffer, bytesRead, size - bytesRead)
+                                if (read == -1)
+                                    throw Exception("Stream closed")
+                                bytesRead += read
+                            }
 
                             val messageBytes = buffer.sliceArray(IntRange(0, size));
                             Log.d(TAG, "Received $size bytes: ${messageBytes.toHexString()}.");
@@ -324,31 +371,68 @@ class FCastCastingDevice : CastingDevice {
                             try {
                                 handleMessage(Opcode.find(opcode), json);
                             } catch (e: Throwable) {
-                                Logger.w(TAG, "Failed to handle message.", e);
+                                Logger.w(TAG, "Failed to handle message.", e)
+                                break
                             }
                         } catch (e: java.net.SocketException) {
                             Logger.e(TAG, "Socket exception while receiving.", e);
-                            exceptionOccurred = true;
+                            break
                         } catch (e: Throwable) {
                             Logger.e(TAG, "Exception while receiving.", e);
-                            exceptionOccurred = true;
+                            break
                         }
                     }
 
                     try {
-                        _socket?.close();
+                        _socket?.close()
+                        _inputStream?.close()
+                        _outputStream?.close()
                         Logger.i(TAG, "Socket disconnected.");
                     } catch (e: Throwable) {
                         Logger.e(TAG, "Failed to close socket.", e)
                     }
 
                     connectionState = CastConnectionState.CONNECTING;
-                    Thread.sleep(3000);
+                    Thread.sleep(1000);
                 }
 
                 Logger.i(TAG, "Stopped connection loop.");
                 connectionState = CastConnectionState.DISCONNECTED;
-            }.apply { start() };
+            }.apply { start() }
+
+            _pingThread = Thread {
+                Logger.i(TAG, "Started ping loop.")
+
+                while (_scopeIO?.isActive == true) {
+                    try {
+                        send(Opcode.Ping)
+                    } catch (e: Throwable) {
+                        Log.w(TAG, "Failed to send ping.")
+
+                        try {
+                            _socket?.close()
+                            _inputStream?.close()
+                            _outputStream?.close()
+                        } catch (e: Throwable) {
+                            Log.w(TAG, "Failed to close socket.", e)
+                        }
+                    }
+
+                    /*if (_lastPongTime != -1L && System.currentTimeMillis() - _lastPongTime > 6000) {
+                        Logger.w(TAG, "Closing socket due to last pong time being larger than 6 seconds.")
+
+                        try {
+                            _socket?.close()
+                        } catch (e: Throwable) {
+                            Log.w(TAG, "Failed to close socket.", e)
+                        }
+                    }*/
+
+                    Thread.sleep(2000)
+                }
+
+                Logger.i(TAG, "Stopped ping loop.");
+            }.apply { start() }
         } else {
             Log.i(TAG, "Thread was still alive, not restarted")
         }
@@ -401,39 +485,44 @@ class FCastCastingDevice : CastingDevice {
                 Logger.i(TAG, "Remote version received: $version")
             }
             Opcode.Ping -> send(Opcode.Pong)
+            Opcode.Pong -> _lastPongTime = System.currentTimeMillis()
             else -> { }
         }
     }
 
     private fun send(opcode: Opcode, message: String? = null) {
-        try {
+        ensureNotMainThread()
-            val data: ByteArray = message?.encodeToByteArray() ?: ByteArray(0)
+
-            val size = 1 + data.size
+        synchronized (_outputStreamLock) {
-            val outputStream = _outputStream
+            try {
-            if (outputStream == null) {
+                val data: ByteArray = message?.encodeToByteArray() ?: ByteArray(0)
-                Log.w(TAG, "Failed to send $size bytes, output stream is null.")
+                val size = 1 + data.size
-                return
+                val outputStream = _outputStream
+                if (outputStream == null) {
+                    Log.w(TAG, "Failed to send $size bytes, output stream is null.")
+                    return
+                }
+
+                val serializedSizeLE = ByteArray(4)
+                serializedSizeLE[0] = (size and 0xff).toByte()
+                serializedSizeLE[1] = (size shr 8 and 0xff).toByte()
+                serializedSizeLE[2] = (size shr 16 and 0xff).toByte()
+                serializedSizeLE[3] = (size shr 24 and 0xff).toByte()
+                outputStream.write(serializedSizeLE)
+
+                val opcodeBytes = ByteArray(1)
+                opcodeBytes[0] = opcode.value
+                outputStream.write(opcodeBytes)
+
+                if (data.isNotEmpty()) {
+                    outputStream.write(data)
+                }
+
+                Log.d(TAG, "Sent $size bytes: (opcode: $opcode, body: $message).")
+            } catch (e: Throwable) {
+                Log.i(TAG, "Failed to send message.", e)
+                throw e
             }
-
-            val serializedSizeLE = ByteArray(4)
-            serializedSizeLE[0] = (size and 0xff).toByte()
-            serializedSizeLE[1] = (size shr 8 and 0xff).toByte()
-            serializedSizeLE[2] = (size shr 16 and 0xff).toByte()
-            serializedSizeLE[3] = (size shr 24 and 0xff).toByte()
-            outputStream.write(serializedSizeLE)
-
-            val opcodeBytes = ByteArray(1)
-            opcodeBytes[0] = opcode.value
-            outputStream.write(opcodeBytes)
-
-            if (data.isNotEmpty()) {
-                outputStream.write(data)
-            }
-
-            Log.d(TAG, "Sent $size bytes: (opcode: $opcode, body: $message).")
-        } catch (e: Throwable) {
-            Log.i(TAG, "Failed to send message.", e)
-            throw e
         }
     }
 
@@ -453,6 +542,7 @@ class FCastCastingDevice : CastingDevice {
         _started = false;
         //TODO: Kill and/or join thread?
         _thread = null;
+        _pingThread = null;
 
         val socket = _socket;
         val scopeIO = _scopeIO;
@@ -462,6 +552,8 @@ class FCastCastingDevice : CastingDevice {
 
             scopeIO.launch {
                 socket.close();
+                _inputStream?.close()
+                _outputStream?.close()
                 connectionState = CastConnectionState.DISCONNECTED;
                 scopeIO.cancel();
                 Logger.i(TAG, "Cancelled scopeIO with open socket.")

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

@@ -123,7 +123,8 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
                 msg = comment,
                 rating = RatingLikeDislikes(0, 0),
                 date = OffsetDateTime.now(),
-                eventPointer = eventPointer
+                eventPointer = eventPointer,
+                parentReference = ref
             ));
 
             dismiss();

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.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -26,8 +27,8 @@ import kotlinx.coroutines.launch
 class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
     private lateinit var _imageLoader: ImageView;
     private lateinit var _buttonClose: Button;
-    private lateinit var _buttonAdd: Button;
+    private lateinit var _buttonAdd: ImageButton;
-    private lateinit var _buttonScanQR: Button;
+    private lateinit var _buttonScanQR: ImageButton;
     private lateinit var _textNoDevicesFound: TextView;
     private lateinit var _textNoDevicesRemembered: TextView;
     private lateinit var _recyclerDevices: RecyclerView;

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

@@ -143,7 +143,9 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
 
         StateCasting.instance.onActiveDeviceDurationChanged.remove(this);
         StateCasting.instance.onActiveDeviceDurationChanged.subscribe {
-            _sliderPosition.valueTo = it.toFloat().coerceAtLeast(1.0f);
+            val dur = it.toFloat().coerceAtLeast(1.0f)
+            _sliderPosition.value = _sliderPosition.value.coerceAtLeast(0.0f).coerceAtMost(dur);
+            _sliderPosition.valueTo = dur
         };
 
         _device = StateCasting.instance.activeDevice;
@@ -185,8 +187,10 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
         _sliderPosition.valueFrom = 0.0f;
         _sliderVolume.valueFrom = 0.0f;
         _sliderVolume.value = d.volume.toFloat().coerceAtLeast(0.0f).coerceAtMost(_sliderVolume.valueTo);
-        _sliderPosition.valueTo = d.duration.toFloat().coerceAtLeast(1.0f);
+
-        _sliderPosition.value = d.time.toFloat().coerceAtLeast(0.0f).coerceAtMost(_sliderVolume.valueTo);
+        val dur = d.duration.toFloat().coerceAtLeast(1.0f)
+        _sliderPosition.value = d.time.toFloat().coerceAtLeast(0.0f).coerceAtMost(dur)
+        _sliderPosition.valueTo = dur
 
         if (d.canSetVolume) {
             _layoutVolumeAdjustable.visibility = View.VISIBLE;

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

@@ -337,8 +337,10 @@ class VideoDownload {
             });
         }
 
+        var wasSuccesful = false;
         try {
             awaitAll(*sourcesToDownload.toTypedArray());
+            wasSuccesful = true;
         }
         catch(runtimeEx: RuntimeException) {
             if(runtimeEx.cause != null)
@@ -349,6 +351,29 @@ class VideoDownload {
         catch(ex: Throwable) {
             throw ex;
         }
+        finally {
+            if(!wasSuccesful) {
+                try {
+                    if(videoFilePath != null) {
+                        val remainingVideo = File(videoFilePath!!);
+                        if (remainingVideo.exists()) {
+                            Logger.i(TAG, "Deleting remaining video file");
+                            remainingVideo.delete();
+                        }
+                    }
+                    if(audioFilePath != null) {
+                        val remainingAudio = File(audioFilePath!!);
+                        if (remainingAudio.exists()) {
+                            Logger.i(TAG, "Deleting remaining audio file");
+                            remainingAudio.delete();
+                        }
+                    }
+                }
+                catch(iex: Throwable) {
+                    Logger.e(TAG, "Failed to delete files after failure:\n${iex.message}", iex);
+                }
+            }
+        }
     }
 
     private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {

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

@@ -5,8 +5,11 @@ import com.caoccao.javet.annotations.V8Function
 import com.caoccao.javet.annotations.V8Property
 import com.caoccao.javet.enums.V8ConversionMode
 import com.caoccao.javet.enums.V8ProxyMode
+import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.internal.V8BindObject
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Element
 
@@ -65,7 +68,7 @@ class PackageDOMParser : V8Package {
             return result;
         }
         @V8Property
-        fun attributes(): Map<String, String> = _element.attributes().dataset();
+        fun attributes(): Map<String, String> = _element.attributes().associate { Pair(it.key, it.value) }
         @V8Property
         fun innerHTML(): String = _element.html();
         @V8Property
@@ -138,10 +141,32 @@ class PackageDOMParser : V8Package {
             super.dispose();
         }
 
+        @V8Function
+        fun toNodeTree(): SerializedNode {
+            return SerializedNode(
+                childNodes().map { it.toNodeTree() },
+                _element.tagName(),
+                _element.text(),
+                attributes()
+            );
+        }
+        @V8Function
+        fun toNodeTreeJson(): String {
+            return Json.encodeToString(SerializedNode.serializer(), toNodeTree());
+        }
+
         companion object {
             fun parse(parser: PackageDOMParser, str: String): DOMNode {
                 return DOMNode(parser, Jsoup.parse(str));
             }
         }
+
+        @Serializable
+        class SerializedNode(
+            val children: List<SerializedNode>,
+            val name: String,
+            val value: String,
+            val attributes: Map<String, String>
+        );
     }
 }

app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelContentsFragment.kt

@@ -27,6 +27,7 @@ import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
+import com.futo.platformplayer.exceptions.ChannelException
 import com.futo.platformplayer.fragment.mainactivity.main.FeedView
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.logging.Logger
@@ -336,8 +337,11 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
                 context?.let {
                     lifecycleScope.launch(Dispatchers.Main) {
                         try {
+                            val channel = if(kv.value is ChannelException) (kv.value as ChannelException).channelNameOrUrl else null;
                             if(jsVideoPager != null)
-                                UIDialogs.toast(it, "Plugin ${jsVideoPager.getPluginConfig().name} failed:\n${kv.value.message}", false);
+                                UIDialogs.toast(it, "Plugin ${jsVideoPager.getPluginConfig().name} failed:\n" +
+                                        (if(!channel.isNullOrEmpty()) "(${channel}) " else "") +
+                                        "${kv.value.message}", false);
                             else
                                 UIDialogs.toast(it, kv.value.message ?: "", false);
                         } catch (e: Throwable) {

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

@@ -297,9 +297,9 @@ class MenuBottomBarFragment : MainActivityFragment() {
             }
 
             if (!StatePayment.instance.hasPaid) {
-                newCurrentButtonDefinitions.add(ButtonDefinition(98, R.drawable.ic_paid, R.drawable.ic_paid, R.string.buy, canToggle = false, { it.currentMain is BuyFragment }, { it.navigate<BuyFragment>() }))
+                newCurrentButtonDefinitions.add(ButtonDefinition(98, R.drawable.ic_paid, R.drawable.ic_paid_filled, R.string.buy, canToggle = false, { it.currentMain is BuyFragment }, { it.navigate<BuyFragment>() }))
             }
-            newCurrentButtonDefinitions.add(ButtonDefinition(97, R.drawable.ic_quiz, R.drawable.ic_quiz, R.string.faq, canToggle = false, { false }, {
+            newCurrentButtonDefinitions.add(ButtonDefinition(97, R.drawable.ic_quiz, R.drawable.ic_quiz_fill, R.string.faq, canToggle = false, { false }, {
                 it.navigate<BrowserFragment>(Settings.URL_FAQ);
             }))
 
@@ -356,8 +356,8 @@ class MenuBottomBarFragment : MainActivityFragment() {
             ButtonDefinition(6, R.drawable.ic_download, R.drawable.ic_download, R.string.downloads, canToggle = false, { it.currentMain is DownloadsFragment }, { it.navigate<DownloadsFragment>() }),
             ButtonDefinition(8, R.drawable.ic_chat, R.drawable.ic_chat_filled, R.string.comments, canToggle = true, { it.currentMain is CommentsFragment }, { it.navigate<CommentsFragment>() }),
             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>() }),
-            ButtonDefinition(10, R.drawable.ic_quiz, R.drawable.ic_quiz, R.string.tutorials, canToggle = true, { it.currentMain is TutorialFragment }, { it.navigate<TutorialFragment>() }),
+            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>() }),
-            ButtonDefinition(7, R.drawable.ic_settings, R.drawable.ic_settings, R.string.settings, canToggle = false, { false }, {
+            ButtonDefinition(7, R.drawable.ic_settings, R.drawable.ic_settings_filled, R.string.settings, canToggle = false, { false }, {
                 val c = it.context ?: return@ButtonDefinition;
                 Logger.i(TAG, "settings preventPictureInPicture()");
                 it.requireFragment<VideoDetailFragment>().preventPictureInPicture();

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

@@ -22,15 +22,17 @@ class BrowserFragment : MainFragment() {
     override val hasBottomBar: Boolean get() = true;
 
     private var _webview: WebView? = null;
+    private val _webviewWithoutHandling = object: WebViewClient() {
+        override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
+            return false;
+        }
+    };
+
 
     override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val view = inflater.inflate(R.layout.fragment_browser, container, false);
         _webview = view.findViewById<WebView?>(R.id.webview).apply {
-            this.webViewClient = object: WebViewClient() {
+            this.webViewClient = _webviewWithoutHandling;
-                override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
-                    return false;
-                }
-            };
             this.settings.javaScriptEnabled = true;
             CookieManager.getInstance().setAcceptCookie(true);
             this.settings.domStorageEnabled = true;
@@ -41,8 +43,26 @@ class BrowserFragment : MainFragment() {
     override fun onShownWithView(parameter: Any?, isBack: Boolean) {
         super.onShownWithView(parameter, isBack)
 
-        if(parameter is String)
+        if(parameter is String) {
+            _webview?.webViewClient = _webviewWithoutHandling;
             _webview?.loadUrl(parameter);
+        }
+        else if(parameter is NavigateOptions) {
+            if(parameter.urlHandlers != null && parameter.urlHandlers.isNotEmpty())
+                _webview?.webViewClient = object: WebViewClient() {
+                    override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
+                        val schema = request?.url?.scheme;
+                        if(schema != null && parameter.urlHandlers.containsKey(schema)) {
+                            parameter.urlHandlers[schema]?.invoke(request);
+                            return true;
+                        }
+                        return false;
+                    }
+                };
+            else
+                _webview?.webViewClient = _webviewWithoutHandling;
+            _webview?.loadUrl(parameter.url);
+        }
         else
             _webview?.loadUrl("about:blank");
     }
@@ -59,4 +79,9 @@ class BrowserFragment : MainFragment() {
     companion object {
         fun newInstance() = BrowserFragment().apply {}
     }
+
+    class NavigateOptions(
+        val url: String,
+        val urlHandlers: Map<String, (WebResourceRequest)->Unit>? = null
+    )
 }

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

@@ -418,6 +418,7 @@ class ChannelFragment : MainFragment() {
 
             _buttonSubscribe.setSubscribeChannel(channel);
             _buttonSubscriptionSettings.visibility = if(_buttonSubscribe.isSubscribed) View.VISIBLE else View.GONE;
+            _textChannel.text = channel.name;
             _textChannelSub.text = if(channel.subscribers > 0) "${channel.subscribers.toHumanNumber()} " + context.getString(R.string.subscribers).lowercase() else "";
 
             //TODO: Find a better way to access the adapter fragments..

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

@@ -117,6 +117,7 @@ class CommentsFragment : MainFragment() {
                     val holder = CommentWithReferenceViewHolder(viewGroup, _cache);
                     holder.onDelete.subscribe(::onDelete);
                     holder.onRepliesClick.subscribe(::onRepliesClick);
+                    holder.onClick.subscribe(::onClick);
                     return@InsertedViewAdapterWithLoader holder;
                 }
             );
@@ -200,6 +201,17 @@ class CommentsFragment : MainFragment() {
             return false
         }
 
+        private fun onClick(c: IPlatformComment) {
+            if (c !is PolycentricPlatformComment) {
+                return
+            }
+
+            val parentRef = c.parentReference
+            if (parentRef != null && _repliesOverlay.handleParentClick(c.contextUrl, parentRef)) {
+                setRepliesOverlayVisible(true, true)
+            }
+        }
+
         private fun onRepliesClick(c: IPlatformComment) {
             val replyCount = c.replyCount ?: 0;
             var metadata = "";

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

@@ -154,8 +154,14 @@ class ContentSearchResultsFragment : MainFragment() {
                     };
 
                     onSearch.subscribe(this) {
-                        if(it.isHttpUrl())
+                        if(it.isHttpUrl()) {
-                            navigate<VideoDetailFragment>(it);
+                            if(StatePlatform.instance.hasEnabledPlaylistClient(it))
+                                navigate<PlaylistFragment>(it);
+                            else if(StatePlatform.instance.hasEnabledChannelClient(it))
+                                navigate<ChannelFragment>(it);
+                            else
+                                navigate<VideoDetailFragment>(it);
+                        }
                         else
                             setQuery(it, true);
                     };

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

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.futo.platformplayer.*
+import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.structures.EmptyPager
@@ -17,15 +18,20 @@ import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptExecutionException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.models.SearchType
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.views.FeedStyle
+import com.futo.platformplayer.views.NoResultsView
 import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.InsertedViewHolder
 import com.futo.platformplayer.views.announcements.AnnouncementView
+import com.futo.platformplayer.views.buttons.BigButton
 import java.time.OffsetDateTime
 import java.util.UUID
 
@@ -147,6 +153,40 @@ class HomeFragment : MainFragment() {
             finishRefreshLayoutLoader();
         }
 
+        override fun getEmptyPagerView(): View? {
+            val dp10 = 10.dp(resources);
+            val dp30 = 30.dp(resources);
+
+            val pluginsExist = StatePlatform.instance.getAvailableClients().isNotEmpty();
+            if(StatePlatform.instance.getEnabledClients().isEmpty())
+                //Initial setup
+                return NoResultsView(context, "No enabled sources", if(pluginsExist)
+                        "Enable or install some sources"
+                    else "This Grayjay version comes without any sources, install sources externally or using the button below.", R.drawable.ic_sources,
+                    listOf(BigButton(context, "Browse Online Sources", "View official sources online", R.drawable.ic_explore) {
+                        fragment.navigate<BrowserFragment>(BrowserFragment.NavigateOptions("https://plugins.grayjay.app/phone.html", mapOf(
+                            Pair("grayjay") { req ->
+                                StateApp.instance.contextOrNull?.let {
+                                    if(it is MainActivity) {
+                                        it.handleUrlAll(req.url.toString());
+                                    }
+                                };
+                            }
+                        )));
+                    }.withMargin(dp10, dp30),
+                    if(pluginsExist) BigButton(context, "Sources", "Go to the sources tab", R.drawable.ic_creators) {
+                        fragment.navigate<SourcesFragment>();
+                    }.withMargin(dp10, dp30) else null).filterNotNull()
+                );
+            else
+                return NoResultsView(context, "Nothing to see here", "The enabled sources do not have any results.", R.drawable.ic_help,
+                    listOf(BigButton(context, "Sources", "Go to the sources tab", R.drawable.ic_creators) {
+                        fragment.navigate<SourcesFragment>();
+                    }.withMargin(dp10, dp30))
+                );
+            return null;
+        }
+
         override fun reload() {
             loadResults();
         }
@@ -161,13 +201,15 @@ class HomeFragment : MainFragment() {
         }
         private fun loadedResult(pager : IPager<IPlatformContent>) {
             if (pager is EmptyPager<IPlatformContent>) {
-                StateAnnouncement.instance.registerAnnouncement(UUID.randomUUID().toString(), context.getString(R.string.no_home_available), context.getString(R.string.no_home_page_is_available_please_check_if_you_are_connected_to_the_internet_and_refresh), AnnouncementType.SESSION);
+                //StateAnnouncement.instance.registerAnnouncement(UUID.randomUUID().toString(), context.getString(R.string.no_home_available), context.getString(R.string.no_home_page_is_available_please_check_if_you_are_connected_to_the_internet_and_refresh), AnnouncementType.SESSION);
             }
 
             Logger.i(TAG, "Got new home pager ${pager}");
             finishRefreshLayoutLoader();
             setLoading(false);
             setPager(pager);
+            if(pager.getResults().isEmpty() && !pager.hasMorePages())
+                setEmptyPager(true);
         }
     }
 

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

@@ -315,7 +315,7 @@ class PostDetailFragment : MainFragment {
             _rating.visibility = View.GONE;
 
             val ref = Models.referenceFromBuffer((_post?.url ?: _postOverview?.url)?.toByteArray() ?: return)
-            val extraBytesRef = (_post?.id?.value ?: _postOverview?.id?.value)?.toByteArray()
+            val extraBytesRef = (_post?.id?.value ?: _postOverview?.id?.value)?.let { if (it.isNotEmpty()) it.toByteArray() else null }
             val version = _version;
 
             _rating.onLikeDislikeUpdated.remove(this);
@@ -663,7 +663,7 @@ class PostDetailFragment : MainFragment {
             Logger.i(TAG, "fetchPolycentricComments")
             val post = _post;
             val ref = (_post?.url ?: _postOverview?.url)?.toByteArray()?.let { Models.referenceFromBuffer(it) }
-            val extraBytesRef = (_post?.id?.value ?: _postOverview?.id?.value)?.toByteArray()
+            val extraBytesRef = (_post?.id?.value ?: _postOverview?.id?.value)?.let { if (it.isNotEmpty()) it.toByteArray() else null }
 
             if (ref == null) {
                 Logger.w(TAG, "Failed to fetch polycentric comments because url was not set null")

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

@@ -295,17 +295,24 @@ class SourceDetailFragment : MainFragment() {
                 }
             }
 
+            val isEmbedded = StatePlugins.instance.getEmbeddedSources(context).any { it.key == config.id };
+
             val clientIfExists = if(config.id != StateDeveloper.DEV_ID)
                 StatePlugins.instance.getPlugin(config.id);
             else null;
             groups.add(
                 BigButtonGroup(c, context.getString(R.string.management),
-                    BigButton(c, context.getString(R.string.uninstall), context.getString(R.string.removes_the_plugin_from_the_app), R.drawable.ic_block) {
+                    if(!isEmbedded) BigButton(c, context.getString(R.string.uninstall), context.getString(R.string.removes_the_plugin_from_the_app), R.drawable.ic_block) {
                         uninstallSource();
                     }.withBackground(R.drawable.background_big_button_red).apply {
                         this.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
                             setMargins(0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics).toInt(), 0, 0);
                         };
+                    } else BigButton(c, context.getString(R.string.uninstall), "Cannot uninstall embedded plugins", R.drawable.ic_block, {}).apply {
+                        this.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                            setMargins(0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics).toInt(), 0, 0);
+                        };
+                        this.alpha = 0.5f
                     },
                     if(clientIfExists?.captchaEncrypted != null)
                         BigButton(c, context.getString(R.string.delete_captcha), context.getString(R.string.deletes_stored_captcha_answer_for_this_plugin), R.drawable.ic_block) {
@@ -325,7 +332,6 @@ class SourceDetailFragment : MainFragment() {
                 _sourceButtons.addView(group);
             }
 
-            val isEmbedded = StatePlugins.instance.getEmbeddedSources(context).any { it.key == config.id };
             val advancedButtons = BigButtonGroup(c, "Advanced",
                 BigButton(c, "Edit Code", "Modify the source of this plugin", R.drawable.ic_code) {
 
@@ -333,9 +339,15 @@ class SourceDetailFragment : MainFragment() {
                     this.alpha = 0.5f;
                 },
                 if(isEmbedded) BigButton(c, "Reinstall", "Modify the source of this plugin", R.drawable.ic_refresh) {
-                    StatePlugins.instance.updateEmbeddedPlugins(context, listOf(config.id), true);
+                    val embeddedConfig = StatePlugins.instance.getEmbeddedPluginConfigFromID(context, config.id);
-                    reloadSource(config.id);
+
-                    UIDialogs.toast(context, "Embedded plugin reinstalled, may require refresh");
+                    UIDialogs.showDialog(context, R.drawable.ic_warning_yellow, "Are you sure you want to downgrade (${config.version}=>${embeddedConfig?.version})?",
+                        "This will revert the plugin back to the originally embedded version.\nVersion change: ${config.version}=>${embeddedConfig?.version}", null,
+                        0, UIDialogs.Action("Cancel", {}), UIDialogs.Action("Reinstall", {
+                            StatePlugins.instance.updateEmbeddedPlugins(context, listOf(config.id), true);
+                            reloadSource(config.id);
+                            UIDialogs.toast(context, "Embedded plugin reinstalled, may require refresh");
+                        }, UIDialogs.ActionStyle.DANGEROUS));
                 }.apply {
                     this.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
                         setMargins(0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics).toInt(), 0, 0);
@@ -354,11 +366,22 @@ class SourceDetailFragment : MainFragment() {
             if(config.authentication == null)
                 return;
 
-            LoginActivity.showLogin(StateApp.instance.context, config) {
+            if(config.authentication.loginWarning != null) {
-                StatePlugins.instance.setPluginAuth(config.id, it);
+                UIDialogs.showDialog(context, R.drawable.ic_warning_yellow, "Login Warning",
-
+                    config.authentication.loginWarning, null, 0,
-                reloadSource(config.id);
+                    UIDialogs.Action("Cancel", {}, UIDialogs.ActionStyle.NONE),
-            };
+                    UIDialogs.Action("Login", {
+                        LoginActivity.showLogin(StateApp.instance.context, config) {
+                            StatePlugins.instance.setPluginAuth(config.id, it);
+                            reloadSource(config.id);
+                        };
+                    }, UIDialogs.ActionStyle.PRIMARY))
+            }
+            else
+                LoginActivity.showLogin(StateApp.instance.context, config) {
+                    StatePlugins.instance.setPluginAuth(config.id, it);
+                    reloadSource(config.id);
+                };
         }
         private fun logoutSource(clear: Boolean = true) {
             val config = _config ?: return;
@@ -454,6 +477,7 @@ class SourceDetailFragment : MainFragment() {
                 }
             });
         }
+
         private fun checkForUpdatesSource() {
             val c = _config ?: return;
             val sourceUrl = c.sourceUrl ?: return;

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

@@ -8,6 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -25,6 +26,7 @@ import com.futo.platformplayer.views.adapters.DisabledSourceView
 import com.futo.platformplayer.views.adapters.EnabledSourceAdapter
 import com.futo.platformplayer.views.adapters.EnabledSourceViewHolder
 import com.futo.platformplayer.views.adapters.ItemMoveCallback
+import com.futo.platformplayer.views.buttons.BigButton
 import com.futo.platformplayer.views.sources.SourceUnderConstructionView
 import kotlinx.coroutines.runBlocking
 import java.util.Collections
@@ -86,6 +88,14 @@ class SourcesFragment : MainFragment() {
             _containerDisabledViews = findViewById(R.id.container_disabled_views);
             _containerConstruction = findViewById(R.id.container_construction);
 
+            if(StatePlatform.instance.getAvailableClients().isEmpty()) {
+                findViewById<LinearLayout>(R.id.no_sources).isVisible = true;
+                findViewById<LinearLayout>(R.id.plugin_disclaimer).isVisible = false;
+            }
+            findViewById<BigButton>(R.id.button_add_sources).onClick.subscribe {
+                fragment.startActivity(Intent(context, AddSourceOptionsActivity::class.java));
+            };
+
             for(inConstructSource in StatePlugins.instance.getSourcesUnderConstruction(context))
                 _containerConstruction.addView(SourceUnderConstructionView(context, inConstructSource.key, inConstructSource.value));
 
@@ -111,8 +121,6 @@ class SourcesFragment : MainFragment() {
 
                 adapterSourcesEnabled.notifyItemMoved(fromPosition, toPosition);
                 onEnabledChanged(enabledSources);
-                if(toPosition == 0)
-                    onPrimaryChanged(enabledSources.first());
 
                 StatePlatform.instance.setPlatformOrder(enabledSources.map { it.name });
             };
@@ -133,8 +141,6 @@ class SourcesFragment : MainFragment() {
 
                     updateContainerVisibility();
                     onEnabledChanged(enabledSources);
-                    if(index == 0)
-                        onPrimaryChanged(enabledSources.first());
 
                     if(enabledSources.size <= 1)
                         setCanRemove(false);
@@ -221,9 +227,6 @@ class SourcesFragment : MainFragment() {
             _adapterSourcesEnabled.canRemove = canRemove;
         }
 
-        private fun onPrimaryChanged(client: IPlatformClient) {
-            StatePlatform.instance.selectPrimaryClient(client.id);
-        }
         private fun onEnabledChanged(clients: List<IPlatformClient>) {
             runBlocking {
                 StatePlatform.instance.selectClients(*clients.map { it.id }.toTypedArray());

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

@@ -4,19 +4,15 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
-import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
-import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.getSystemService
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -25,14 +21,13 @@ import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.UISlideOverlays
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.dp
-import com.futo.platformplayer.models.Subscription
+import com.futo.platformplayer.models.ImageVariable
 import com.futo.platformplayer.models.SubscriptionGroup
 import com.futo.platformplayer.states.StateSubscriptionGroups
 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.SearchView
-import com.futo.platformplayer.views.adapters.AnyAdapter
 import com.futo.platformplayer.views.adapters.viewholders.CreatorBarViewHolder
 import com.futo.platformplayer.views.overlays.CreatorSelectOverlay
 import com.futo.platformplayer.views.overlays.ImageVariableOverlay
@@ -64,6 +59,11 @@ class SubscriptionGroupFragment : MainFragment() {
         return view;
     }
 
+    override fun onHide() {
+        super.onHide();
+        _view?.onHide();
+    }
+
     companion object {
         private const val TAG = "SourcesFragment";
         fun newInstance() = SubscriptionGroupFragment().apply {}
@@ -86,7 +86,7 @@ class SubscriptionGroupFragment : MainFragment() {
         private val _buttonSettings: ImageButton;
         private val _buttonDelete: ImageButton;
 
-        private val _buttonAddCreator: Button;
+        private val _buttonAddCreator: FrameLayout;
 
         private val _enabledCreators: ArrayList<IPlatformChannel> = arrayListOf();
         private val _enabledCreatorsFiltered: ArrayList<IPlatformChannel> = arrayListOf();
@@ -97,6 +97,8 @@ class SubscriptionGroupFragment : MainFragment() {
 
         private var _group: SubscriptionGroup? = null;
 
+        private var _didDelete: Boolean = false;
+
         constructor(context: Context, fragment: SubscriptionGroupFragment): super(context) {
             inflate(context, R.layout.fragment_subscriptions_group, this);
             _fragment = fragment;
@@ -137,6 +139,7 @@ class SubscriptionGroupFragment : MainFragment() {
                         UIDialogs.Action("Delete", {
                             _group?.let {
                                 it.urls.remove(channel.url);
+                                save();
                                 reloadCreators(it);
                             }
                         }, UIDialogs.ActionStyle.DANGEROUS))
@@ -178,6 +181,7 @@ class SubscriptionGroupFragment : MainFragment() {
                         UIDialogs.Action("Cancel", {}),
                         UIDialogs.Action("Delete", {
                             StateSubscriptionGroups.instance.deleteSubscriptionGroup(g.id);
+                            _didDelete = true;
                             fragment.close(true);
                         }, UIDialogs.ActionStyle.DANGEROUS))
                 };
@@ -246,6 +250,18 @@ class SubscriptionGroupFragment : MainFragment() {
             _overlay.animate().alpha(1f).setDuration(300).start();
             overlay.onSelected.subscribe {
                 _group?.let { g ->
+                    if(g.urls.isEmpty() && g.image == null) {
+                        //Obtain image
+                        for(sub in it) {
+                            val sub = StateSubscriptions.instance.getSubscription(sub);
+                            if(sub != null && sub.channel.thumbnail != null) {
+                                g.image = ImageVariable.fromUrl(sub.channel.thumbnail!!);
+                                g.image?.setImageView(_imageGroup);
+                                g.image?.setImageView(_imageGroupBackground);
+                                break;
+                            }
+                        }
+                    }
                     for(url in it) {
                         if(!g.urls.contains(url))
                             g.urls.add(url);
@@ -262,6 +278,7 @@ class SubscriptionGroupFragment : MainFragment() {
 
 
         fun setGroup(group: SubscriptionGroup?) {
+            _didDelete = false;
             _group = group;
             _textGroupTitle.text = group?.name;
 
@@ -278,6 +295,12 @@ class SubscriptionGroupFragment : MainFragment() {
             reloadCreators(group);
         }
 
+        fun onHide() {
+            if(!_didDelete && _group != null && StateSubscriptionGroups.instance.getSubscriptionGroup(_group!!.id) === null) {
+                UIDialogs.toast(context, "Group creation cancelled");
+            }
+        }
+
         @SuppressLint("NotifyDataSetChanged")
         private fun reloadCreators(group: SubscriptionGroup?) {
             _enabledCreators.clear();

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

@@ -10,6 +10,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.futo.platformplayer.*
 import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.api.media.IPlatformClient
 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.video.IPlatformVideo
@@ -17,7 +18,6 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.PluginException
-import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.exceptions.ChannelException
 import com.futo.platformplayer.exceptions.RateLimitException
 import com.futo.platformplayer.logging.Logger
@@ -31,6 +31,7 @@ import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.FragmentedStorageFileJson
 import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.NoResultsView
+import com.futo.platformplayer.views.ToastView
 import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.InsertedViewHolder
@@ -44,6 +45,7 @@ import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import java.nio.channels.Channel
 import java.time.OffsetDateTime
 import kotlin.system.measureTimeMillis
 
@@ -53,6 +55,7 @@ class SubscriptionsFeedFragment : MainFragment() {
     override val hasBottomBar: Boolean get() = true;
 
     private var _view: SubscriptionsFeedView? = null;
+    private var _group: SubscriptionGroup? = null;
     private var _cachedRecyclerData: FeedView.RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>? = null;
 
     override fun onShownWithView(parameter: Any?, isBack: Boolean) {
@@ -73,6 +76,8 @@ class SubscriptionsFeedFragment : MainFragment() {
     override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val view = SubscriptionsFeedView(this, inflater, _cachedRecyclerData);
         _view = view;
+        if(_group != null)
+            view.selectSubgroup(_group);
         return view;
     }
 
@@ -81,6 +86,7 @@ class SubscriptionsFeedFragment : MainFragment() {
         val view = _view;
         if (view != null) {
             _cachedRecyclerData = view.recyclerData;
+            _group = view.subGroup;
             view.cleanup();
             _view = null;
         }
@@ -101,20 +107,10 @@ class SubscriptionsFeedFragment : MainFragment() {
     class SubscriptionsFeedView : ContentFeedView<SubscriptionsFeedFragment> {
         override val shouldShowTimeBar: Boolean get() = Settings.instance.subscriptions.progressBar
 
-        private var _subGroup: SubscriptionGroup? = null;
+        var subGroup: SubscriptionGroup? = null;
 
         constructor(fragment: SubscriptionsFeedFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>? = null) : super(fragment, inflater, cachedRecyclerData) {
             Logger.i(TAG, "SubscriptionsFeedFragment constructor()");
-            StateSubscriptions.instance.onFeedProgress.subscribe(this) { id, progress, total ->
-                if(_subGroup?.id == id)
-                    fragment.lifecycleScope.launch(Dispatchers.Main) {
-                        try {
-                            setProgress(progress, total);
-                        } catch (e: Throwable) {
-                            Logger.e(TAG, "Failed to set progress", e);
-                        }
-                    }
-            }
             StateSubscriptions.instance.global.onUpdateProgress.subscribe(this) { progress, total ->
             };
 
@@ -141,8 +137,9 @@ class SubscriptionsFeedFragment : MainFragment() {
                 recyclerData.lastLoad.getNowDiffSeconds() > 60 ) {
                 recyclerData.lastLoad = OffsetDateTime.now();
 
-                if(StateSubscriptions.instance.getOldestUpdateTime().getNowDiffMinutes() > 5 && Settings.instance.subscriptions.fetchOnTabOpen)
+                if(StateSubscriptions.instance.getOldestUpdateTime().getNowDiffMinutes() > 5 && Settings.instance.subscriptions.fetchOnTabOpen) {
                     loadResults(false);
+                }
                 else if(recyclerData.results.size == 0) {
                     loadCache();
                     setLoading(false);
@@ -169,12 +166,24 @@ class SubscriptionsFeedFragment : MainFragment() {
             if (!StateSubscriptions.instance.global.isGlobalUpdating) {
                 finishRefreshLayoutLoader();
             }
+
+            StateSubscriptions.instance.onFeedProgress.subscribe(this) { id, progress, total ->
+                if(subGroup?.id == id)
+                    fragment.lifecycleScope.launch(Dispatchers.Main) {
+                        try {
+                            setProgress(progress, total);
+                        } catch (e: Throwable) {
+                            Logger.e(TAG, "Failed to set progress", e);
+                        }
+                    }
+            }
         }
 
         override fun cleanup() {
             super.cleanup()
             StateSubscriptions.instance.global.onUpdateProgress.remove(this);
             StateSubscriptions.instance.onSubscriptionsChanged.remove(this);
+            StateSubscriptions.instance.onFeedProgress.remove(this);
         }
 
         override val feedStyle: FeedStyle get() = Settings.instance.subscriptions.getSubscriptionsFeedStyle();
@@ -198,7 +207,7 @@ class SubscriptionsFeedFragment : MainFragment() {
         private var _bypassRateLimit = false;
         private val _lastExceptions: List<Throwable>? = null;
         private val _taskGetPager = TaskHandler<Boolean, IPager<IPlatformContent>>({StateApp.instance.scope}, { withRefresh ->
-            val group = _subGroup;
+            val group = subGroup;
             if(!_bypassRateLimit) {
                 val subRequestCounts = StateSubscriptions.instance.getSubscriptionRequestCount(group);
                 val reqCountStr = subRequestCounts.map { "    ${it.key.config.name}: ${it.value}/${it.key.getSubscriptionRateLimit()}" }.joinToString("\n");
@@ -258,6 +267,11 @@ class SubscriptionsFeedFragment : MainFragment() {
                 }
             };
 
+        fun selectSubgroup(g: SubscriptionGroup?) {
+            if(g != null)
+                _subscriptionBar?.selectGroup(g);
+        }
+
         private fun initializeToolbarContent() {
             _subscriptionBar = SubscriptionBar(context).apply {
                 layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
@@ -267,11 +281,17 @@ class SubscriptionsFeedFragment : MainFragment() {
                 if(g is SubscriptionGroup.Add)
                     UISlideOverlays.showCreateSubscriptionGroup(_overlayContainer);
                 else {
-                    _subGroup = g;
+                    subGroup = g;
                     setProgress(0, 0);
-                    if(Settings.instance.subscriptions.fetchOnTabOpen)
+                    if(Settings.instance.subscriptions.fetchOnTabOpen) {
+                        loadCache();
                         loadResults(false);
-                    else loadCache();
+                    }
+                    else if(g != null && StateSubscriptions.instance.getFeed(g.id) != null) {
+                        loadResults(false);
+                    }
+                    else
+                        loadCache();
                 }
             };
             _subscriptionBar?.onHoldGroup?.subscribe { g ->
@@ -312,7 +332,7 @@ class SubscriptionsFeedFragment : MainFragment() {
 
         override fun filterResults(results: List<IPlatformContent>): List<IPlatformContent> {
             val nowSoon = OffsetDateTime.now().plusMinutes(5);
-            val filterGroup = _subGroup;
+            val filterGroup = subGroup;
             return results.filter {
                 val allowedContentType = _filterSettings.allowContentTypes.contains(if(it.contentType == ContentType.NESTED_VIDEO || it.contentType == ContentType.LOCKED) ContentType.MEDIA else it.contentType);
 
@@ -412,7 +432,7 @@ class SubscriptionsFeedFragment : MainFragment() {
             context?.let {
                 fragment.lifecycleScope.launch(Dispatchers.Main) {
                     try {
-                        if (exs.size <= 8) {
+                        if (exs.size <= 3) {
                             for (ex in exs) {
                                 var toShow = ex;
                                 var channel: String? = null;
@@ -422,15 +442,17 @@ class SubscriptionsFeedFragment : MainFragment() {
                                 }
                                 Logger.e(TAG, "Channel [${channel}] failed", ex);
                                 if (toShow is PluginException)
-                                    UIDialogs.toast(
+                                    UIDialogs.appToast(ToastView.Toast(
-                                        it,
+                                                toShow.message +
-                                        context.getString(R.string.plugin_pluginname_failed_message).replace("{pluginName}", toShow.config.name).replace("{message}", toShow.message ?: "")
+                                                (if(channel != null) "\nChannel: " + channel else ""), false, null,
+                                        "Plugin ${toShow.config.name} failed")
                                     );
                                 else
-                                    UIDialogs.toast(it, ex.message ?: "");
+                                    UIDialogs.appToast(ex.message ?: "");
                             }
                         }
                         else {
+                            val failedChannels = exs.filterIsInstance<ChannelException>().map { it.channelNameOrUrl }.distinct().toList();
                             val failedPlugins = exs.filter { it is PluginException || (it is ChannelException && it.cause is PluginException) }
                                 .map { if(it is ChannelException) (it.cause as PluginException) else if(it is PluginException) it else null  }
                                 .filter { it != null }
@@ -438,7 +460,10 @@ class SubscriptionsFeedFragment : MainFragment() {
                                 .map { it!! }
                                 .toList();
                             for(distinctPluginFail in failedPlugins)
-                                UIDialogs.toast(it, context.getString(R.string.plugin_pluginname_failed_message).replace("{pluginName}", distinctPluginFail.config.name).replace("{message}", distinctPluginFail.message ?: ""));
+                                UIDialogs.appToast(context.getString(R.string.plugin_pluginname_failed_message).replace("{pluginName}", distinctPluginFail.config.name).replace("{message}", distinctPluginFail.message ?: ""));
+                            if(failedChannels.isNotEmpty())
+                                UIDialogs.appToast(ToastView.Toast(failedChannels.take(3).map { "- ${it}" }.joinToString("\n") +
+                                        (if(failedChannels.size >= 3) "\nAnd ${failedChannels.size - 3} more" else ""), false, null, "Failed Channels"));
                         }
                     } catch (e: Throwable) {
                         Logger.e(TAG, "Failed to handle exceptions", e)

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

@@ -67,7 +67,7 @@ class TutorialFragment : MainFragment() {
 
             addView(createHeader("Initial setup"))
             initialSetupVideos.forEach {
-                addView(createTutorialPill(R.drawable.ic_movie, it.name).apply {
+                addView(createTutorialPill(R.drawable.ic_movie, it.name, it.description).apply {
                     onClick.subscribe {
                         fragment.navigate<VideoDetailFragment>(it)
                     }
@@ -76,7 +76,7 @@ class TutorialFragment : MainFragment() {
 
             addView(createHeader("Features"))
             featuresVideos.forEach {
-                addView(createTutorialPill(R.drawable.ic_movie, it.name).apply {
+                addView(createTutorialPill(R.drawable.ic_movie, it.name, it.description).apply {
                     onClick.subscribe {
                         fragment.navigate<VideoDetailFragment>(it)
                     }
@@ -95,10 +95,11 @@ class TutorialFragment : MainFragment() {
             }
         }
 
-        private fun createTutorialPill(iconPrefix: Int, t: String): WidePillButton {
+        private fun createTutorialPill(iconPrefix: Int, t: String, d: String): WidePillButton {
             return WidePillButton(context).apply {
                 setIconPrefix(iconPrefix)
                 setText(t)
+                setDescription(d)
                 setIconSuffix(R.drawable.ic_play_notif)
                 layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).apply {
                     setMargins(15.dp(resources), 0, 15.dp(resources), 12.dp(resources))
@@ -107,9 +108,9 @@ class TutorialFragment : MainFragment() {
         }
     }
 
-    class TutorialVideoSourceDescriptor(url: String, duration: Long) : VideoUnMuxedSourceDescriptor() {
+    class TutorialVideoSourceDescriptor(url: String, duration: Long, width: Int, height: Int) : VideoUnMuxedSourceDescriptor() {
         override val videoSources: Array<IVideoSource> = arrayOf(
-            VideoUrlSource("1080p", url, 1920, 1080, duration, "video/mp4")
+            VideoUrlSource("Original", url, width, height, duration, "video/mp4")
         )
         override val audioSources: Array<IAudioSource> = arrayOf()
     }
@@ -120,7 +121,9 @@ class TutorialFragment : MainFragment() {
         override val description: String,
         thumbnailUrl: String,
         videoUrl: String,
-        override val duration: Long
+        override val duration: Long,
+        width: Int = 1920,
+        height: Int = 1080
     ) : IPlatformVideoDetails {
         override val id: PlatformID = PlatformID("tutorial", uuid)
         override val contentType: ContentType = ContentType.MEDIA
@@ -137,7 +140,7 @@ class TutorialFragment : MainFragment() {
         override val isLive: Boolean = false
         override val rating: IRating = RatingLikes(-1)
         override val viewCount: Long = -1
-        override val video: IVideoSourceDescriptor = TutorialVideoSourceDescriptor(videoUrl, duration)
+        override val video: IVideoSourceDescriptor = TutorialVideoSourceDescriptor(videoUrl, duration, width, height)
         override fun getComments(client: IPlatformClient): IPager<IPlatformComment> {
             return EmptyPager()
         }
@@ -163,7 +166,7 @@ class TutorialFragment : MainFragment() {
             TutorialVideo(
                 uuid = "3b99ebfe-2640-4643-bfe0-a0cf04261fc5",
                 name = "Getting started",
-                description = "Learn how to get started with Grayjay.",
+                description = "Learn how to get started with Grayjay. How do you install plugins?",
                 thumbnailUrl = "https://releases.grayjay.app/tutorials/getting-started.jpg",
                 videoUrl = "https://releases.grayjay.app/tutorials/getting-started.mp4",
                 duration = 50
@@ -171,7 +174,7 @@ class TutorialFragment : MainFragment() {
             TutorialVideo(
                 uuid = "793aa009-516c-4581-b82f-a8efdfef4c27",
                 name = "Is Grayjay free?",
-                description = "Learn how Grayjay is monetized.",
+                description = "Learn how Grayjay is monetized. How do we make money?",
                 thumbnailUrl = "https://releases.grayjay.app/tutorials/pay.jpg",
                 videoUrl = "https://releases.grayjay.app/tutorials/pay.mp4",
                 duration = 52
@@ -182,7 +185,7 @@ class TutorialFragment : MainFragment() {
             TutorialVideo(
                 uuid = "d2238d88-4252-4a91-a12d-b90c049bb7cf",
                 name = "Searching",
-                description = "Learn about searching in Grayjay.",
+                description = "Learn about searching in Grayjay. How can I find channels, videos or playlists?",
                 thumbnailUrl = "https://releases.grayjay.app/tutorials/search.jpg",
                 videoUrl = "https://releases.grayjay.app/tutorials/search.mp4",
                 duration = 39
@@ -198,10 +201,20 @@ class TutorialFragment : MainFragment() {
             TutorialVideo(
                 uuid = "94d36959-e3fc-4c24-a988-89147067a179",
                 name = "Casting",
-                description = "Learn about casting in Grayjay.",
+                description = "Learn about casting in Grayjay. How do I show video on my TV?",
                 thumbnailUrl = "https://releases.grayjay.app/tutorials/how-to-cast.jpg",
                 videoUrl = "https://releases.grayjay.app/tutorials/how-to-cast.mp4",
                 duration = 79
+            ),
+            TutorialVideo(
+                uuid = "5128c2e3-852b-4281-869b-efea2ec82a0e",
+                name = "Monetization",
+                description = "How can I monetize as a creator?",
+                thumbnailUrl = "https://releases.grayjay.app/tutorials/monetization.jpg",
+                videoUrl = "https://releases.grayjay.app/tutorials/monetization.mp4",
+                duration = 47,
+                1080,
+                1920
             )
         )
     }

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

@@ -25,8 +25,6 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.PlatformVideoWithTime
 import com.futo.platformplayer.models.UrlVideoWithTime
 import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.states.StateSaved
-import com.futo.platformplayer.states.VideoToOpen
 import com.futo.platformplayer.views.containers.SingleViewTouchableMotionLayout
 
 class VideoDetailFragment : MainFragment {
@@ -171,14 +169,14 @@ class VideoDetailFragment : MainFragment {
             _view!!.transitionToStart();
     }
     fun maximizeVideoDetail(instant: Boolean = false) {
-        if(_maximizeProgress > 0.9f && state != State.MAXIMIZED) {
+        if((_maximizeProgress > 0.9f || instant) && state != State.MAXIMIZED) {
             state = State.MAXIMIZED;
             onMaximized.emit();
         }
         _view?.let {
-            if(!instant)
+            if(!instant) {
                 it.transitionToEnd();
-            else {
+            } else {
                 it.progress = 1f;
                 onTransitioning.emit(true);
             }
@@ -372,11 +370,6 @@ class VideoDetailFragment : MainFragment {
 
         Logger.v(TAG, "shouldStop: $shouldStop");
         if(shouldStop) {
-            _viewDetail?.let {
-                val v = it.video ?: return@let;
-                StateSaved.instance.setVideoToOpenBlocking(VideoToOpen(v.url, (it.lastPositionMilliseconds / 1000.0f).toLong()));
-            }
-
             _viewDetail?.onStop();
             StateCasting.instance.onStop();
             Logger.v(TAG, "called onStop() shouldStop: $shouldStop");
@@ -431,6 +424,7 @@ class VideoDetailFragment : MainFragment {
                 changeOrientation(OrientationManager.Orientation.PORTRAIT);
         }
         isFullscreen = fullscreen;
+        _view?.allowMotion = !fullscreen;
     }
     private fun changeOrientation(orientation: OrientationManager.Orientation) {
         Logger.i(TAG, "Orientation Change:" + orientation.name);

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

@@ -145,10 +145,11 @@ import com.futo.polycentric.core.Opinion
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.google.protobuf.ByteString
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import userpackage.Protocol
 import java.time.OffsetDateTime
@@ -372,7 +373,7 @@ class VideoDetailView : ConstraintLayout {
 
 
         _buttonSubscribe.onSubscribed.subscribe {
-            UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer);
+            _slideUpOverlay = UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer);
         };
 
         _container_content_liveChat.onRaidNow.subscribe {
@@ -447,6 +448,10 @@ class VideoDetailView : ConstraintLayout {
         updateMoreButtons();
 
         _channelButton.setOnClickListener {
+            if (video is TutorialFragment.TutorialVideo) {
+                return@setOnClickListener
+            }
+
             (video?.author ?: _searchVideo?.author)?.let {
                 fragment.navigate<ChannelFragment>(it);
                 fragment.lifecycleScope.launch {
@@ -756,7 +761,9 @@ class VideoDetailView : ConstraintLayout {
     fun updateMoreButtons() {
         val buttons = listOf(RoundButton(context, R.drawable.ic_add, context.getString(R.string.add), TAG_ADD) {
             (video ?: _searchVideo)?.let {
-                _slideUpOverlay = UISlideOverlays.showAddToOverlay(it, _overlayContainer);
+                _slideUpOverlay = UISlideOverlays.showAddToOverlay(it, _overlayContainer) {
+                    _slideUpOverlay = it
+                };
             }
         },
             if(video?.isLive ?: false)
@@ -849,14 +856,19 @@ class VideoDetailView : ConstraintLayout {
             }
         }
     }
+
+
+    private val _historyIndexLock = Mutex(false);
     suspend fun getHistoryIndex(video: IPlatformVideo): DBHistory.Index = withContext(Dispatchers.IO){
-        val current = _historyIndex;
+        _historyIndexLock.withLock {
-        if(current == null || current.url != video.url) {
+            val current = _historyIndex;
-            val index = StateHistory.instance.getHistoryByVideo(video, true)!!;
+            if(current == null || current.url != video.url) {
-            _historyIndex = index;
+                val index = StateHistory.instance.getHistoryByVideo(video, true)!!;
-            return@withContext index;
+                _historyIndex = index;
+                return@withContext index;
+            }
+            return@withContext current;
         }
-        return@withContext current;
     }
 
 
@@ -993,6 +1005,9 @@ class VideoDetailView : ConstraintLayout {
     fun setVideo(url: String, resumeSeconds: Long = 0, playWhenReady: Boolean = true) {
         Logger.i(TAG, "setVideo url=$url resumeSeconds=$resumeSeconds playWhenReady=$playWhenReady")
 
+        if(this.video?.url == url)
+            return;
+
         _searchVideo = null;
         video = null;
         _playbackTracker = null;
@@ -1023,6 +1038,9 @@ class VideoDetailView : ConstraintLayout {
     fun setVideoOverview(video: IPlatformVideo, fetch: Boolean = true, resumeSeconds: Long = 0) {
         Logger.i(TAG, "setVideoOverview")
 
+        if(this.video?.url == video.url)
+            return;
+
         val cachedVideo = StateDownloads.instance.getCachedVideo(video.id);
         if(cachedVideo != null) {
             setVideoDetails(cachedVideo, true);
@@ -1117,10 +1135,13 @@ class VideoDetailView : ConstraintLayout {
 
         switchContentView(_container_content_main);
     }
-    @OptIn(ExperimentalCoroutinesApi::class)
+    //@OptIn(ExperimentalCoroutinesApi::class)
     fun setVideoDetails(videoDetail: IPlatformVideoDetails, newVideo: Boolean = false) {
         Logger.i(TAG, "setVideoDetails (${videoDetail.name})")
 
+        if(newVideo && this.video?.url == videoDetail.url)
+            return;
+
         if (newVideo) {
             _lastVideoSource = null;
             _lastAudioSource = null;
@@ -1140,6 +1161,7 @@ class VideoDetailView : ConstraintLayout {
        if(videoDetail is VideoLocal) {
             videoLocal = videoDetail;
             video = videoDetail;
+            this.video = video;
             val videoTask = StatePlatform.instance.getContentDetails(videoDetail.url);
             videoTask.invokeOnCompletion { ex ->
                 if(ex != null) {
@@ -1208,11 +1230,11 @@ class VideoDetailView : ConstraintLayout {
         }
 
         val ref = Models.referenceFromBuffer(video.url.toByteArray())
-        val extraBytesRef = video.id.value?.toByteArray()
+        val extraBytesRef = video.id.value?.let { if (it.isNotEmpty()) it.toByteArray() else null }
         _addCommentView.setContext(video.url, ref)
         _player.setMetadata(video.name, video.author.name);
 
-        if (video !is TutorialFragment.TutorialVideo) {
+        if (video is TutorialFragment.TutorialVideo) {
             _toggleCommentType.setValue(false, false);
         } else {
             _toggleCommentType.setValue(!Settings.instance.other.polycentricEnabled || Settings.instance.comments.defaultCommentSection == 1, false);
@@ -1360,7 +1382,9 @@ class VideoDetailView : ConstraintLayout {
         val toResume = _videoResumePositionMilliseconds;
         _videoResumePositionMilliseconds = 0;
         loadCurrentVideo(toResume);
-        _player.setGestureSoundFactor(1.0f);
+        if (!Settings.instance.gestureControls.useSystemVolume) {
+            _player.setGestureSoundFactor(1.0f);
+        }
 
         updateQueueState();
 
@@ -1479,12 +1503,12 @@ class VideoDetailView : ConstraintLayout {
     private fun loadCurrentVideo(resumePositionMs: Long = 0) {
         _didStop = false;
 
-        val video = video ?: return;
+        val video = (videoLocal ?: video) ?: return;
 
         try {
             val videoSource = _lastVideoSource ?: _player.getPreferredVideoSource(video, Settings.instance.playback.getCurrentPreferredQualityPixelCount());
             val audioSource = _lastAudioSource ?: _player.getPreferredAudioSource(video, Settings.instance.playback.getPrimaryLanguage(context));
-            val subtitleSource = _lastSubtitleSource;
+            val subtitleSource = _lastSubtitleSource ?: (if(video is VideoLocal) video.subtitlesSources.firstOrNull() else null);
             Logger.i(TAG, "loadCurrentVideo(videoSource=$videoSource, audioSource=$audioSource, subtitleSource=$subtitleSource, resumePositionMs=$resumePositionMs)")
 
             if(videoSource == null && audioSource == null) {
@@ -1512,6 +1536,8 @@ class VideoDetailView : ConstraintLayout {
                     _player.setArtwork(null);
 
                 _player.setSource(videoSource, audioSource, _playWhenReady, false);
+                if(subtitleSource != null)
+                    _player.swapSubtitles(fragment.lifecycleScope, subtitleSource);
                 _player.seekTo(resumePositionMs);
             }
             else
@@ -1519,6 +1545,7 @@ class VideoDetailView : ConstraintLayout {
 
             _lastVideoSource = videoSource;
             _lastAudioSource = audioSource;
+            _lastSubtitleSource = subtitleSource;
         }
         catch(ex: UnsupportedCastException) {
             Logger.e(TAG, "Failed to load cast media", ex);
@@ -1953,14 +1980,14 @@ class VideoDetailView : ConstraintLayout {
         Logger.i(TAG, "fetchPolycentricComments")
         val video = video;
         val idValue = video?.id?.value
-        if (idValue == null) {
+        if (video?.url?.isEmpty() != false) {
-            Logger.w(TAG, "Failed to fetch polycentric comments because id was null")
+            Logger.w(TAG, "Failed to fetch polycentric comments because url was null")
             _commentsList.clear()
             return
         }
 
         val ref = Models.referenceFromBuffer(video.url.toByteArray())
-        val extraBytesRef = video.id.value?.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 fetchVideo() {
@@ -2334,7 +2361,7 @@ class VideoDetailView : ConstraintLayout {
         }
         else if(isOverlayed) {
             _playerProgress.layoutParams = _playerProgress.layoutParams.apply {
-                (this as MarginLayoutParams).bottomMargin = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, -6f, resources.displayMetrics).toInt();
+                (this as MarginLayoutParams).bottomMargin = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, -2f, resources.displayMetrics).toInt();
             };
             _playerProgress.elevation = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics);
         }
@@ -2535,7 +2562,7 @@ class VideoDetailView : ConstraintLayout {
                 }
                 else
                     withContext(Dispatchers.Main) {
-                        setVideoDetails(videoDetail);
+                        setVideoDetails(videoDetail, true);
                         _liveTryJob = null;
                     }
             }

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

@@ -13,17 +13,17 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.TextView
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.R
-import com.futo.platformplayer.stores.SearchHistoryStorage
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.fragment.mainactivity.main.*
+import com.futo.platformplayer.fragment.mainactivity.main.SuggestionsFragment
+import com.futo.platformplayer.fragment.mainactivity.main.SuggestionsFragmentData
+import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.SearchType
+import com.futo.platformplayer.stores.FragmentedStorage
+import com.futo.platformplayer.stores.SearchHistoryStorage
 
 class SearchTopBarFragment : TopFragment() {
     private val TAG = "SearchTopBarFragment"
@@ -54,11 +54,12 @@ class SearchTopBarFragment : TopFragment() {
 
     private val _searchDoneListener = object : TextView.OnEditorActionListener {
         override fun onEditorAction(v: TextView?, actionId: Int, event: KeyEvent?): Boolean {
-            if (actionId != EditorInfo.IME_ACTION_DONE)
+            val isEnterPress = event?.keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_DOWN
+            if (actionId != EditorInfo.IME_ACTION_DONE && !isEnterPress)
                 return false
 
-            onDone();
+            onDone()
-            return true;
+            return true
         }
     };
 

app/src/main/java/com/futo/platformplayer/services/MediaPlaybackService.kt

@@ -143,7 +143,7 @@ class MediaPlaybackService : Service() {
     override fun onDestroy() {
         Logger.v(TAG, "onDestroy");
         _instance = null;
-        MediaControlReceiver.onCloseReceived.emit();
+        MediaControlReceiver.onPauseReceived.emit();
         super.onDestroy();
     }
 
@@ -153,7 +153,7 @@ class MediaPlaybackService : Service() {
 
     fun closeMediaSession() {
         Logger.v(TAG, "closeMediaSession");
-        stopForeground(STOP_FOREGROUND_DETACH);
+        stopForeground(STOP_FOREGROUND_REMOVE);
 
         val focusRequest = _focusRequest;
         if (focusRequest != null) {
@@ -162,7 +162,9 @@ class MediaPlaybackService : Service() {
         }
         _hasFocus = false;
 
-        _notificationManager?.cancel(MEDIA_NOTIF_ID);
+        val notifManager = _notificationManager;
+        Logger.i(TAG, "Cancelling playback notification (notifManager: ${notifManager != null})");
+        notifManager?.cancel(MEDIA_NOTIF_ID);
         _notif_last_video = null;
         _notif_last_bitmap = null;
         _mediaSession = null;

app/src/main/java/com/futo/platformplayer/states/StateAnnouncement.kt

@@ -12,7 +12,6 @@ import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import java.time.OffsetDateTime
-import java.util.Random
 import java.util.UUID
 
 class StateAnnouncement {
@@ -252,41 +251,6 @@ class StateAnnouncement {
 
     }
 
-    fun registerDidYouKnow() {
-        val random = Random();
-        val message: String? = when (random.nextInt(4 * 18 + 1)) {
-            0 -> "You can login to different platforms and unify your content experience. Check it out in the source settings!"
-            1 -> "Importing your playlists and subscriptions from other platforms to Grayjay is quick and easy. Check it out in the source settings!"
-            2 -> "Want to cast to a big screen? Try out FCast (https://fcast.org/)."
-            3 -> "Explore Grayjay's gesture controls. When in full-screen swipe on the left to change brightness, swipe on the right to change volume."
-            4 -> "Explore Grayjay's gesture controls. Swipe up in the center of a video to toggle full-screen."
-            5 -> "Grayjay's multi-platform search lets you find content from various sources."
-            6 -> "Grayjay's multi-platform search filters will unify filters across platforms. If your expected filters are not there, try toggling some platforms off in the search filters."
-            7 -> "You can share playlists with friends on the playlist page and make full-backups in the settings page."
-            8 -> "Discover Grayjay's offline playback feature. Save content for when you're on the go!"
-            9 -> "Paid content from your favorite creators gets seamlessly integrated into your Grayjay feed. Login to a platform to seamlessly see content you paid for."
-            10 -> "Explore Grayjay's plugin features! Login, import playlists, and tweak plugin settings for a tailored experience."
-            11 -> "Directly engage with content by liking, disliking, or leaving comments on the Polycentric network."
-            12 -> "With Grayjay's rotation lock, you can watch videos in your preferred orientation regardless of device settings. Check it out during playback!"
-            13 -> "Grayjay supports background play. Listen to your favorite content even while multitasking!"
-            14 -> "Use Grayjay's quality selection to adjust video resolution. Save data or watch in high definition – it's up to you."
-            15 -> "Customize your Grayjay experience by changing playback speed. Watch content at your own pace."
-            16 -> "Save time by adding videos to your 'Watch Later' list. Perfect for catching up on content during your free time."
-            17 -> "On Grayjay, your playlists, subscriptions, and settings are stored offline for privacy and quick access."
-            18 -> "Explore and engage with live content using Grayjay's live stream feature."
-            else -> null
-        };
-
-        if (message != null) {
-            registerAnnouncement(
-                "did-you-know?",
-                "Did you know?",
-                message,
-                AnnouncementType.SESSION_RECURRING
-            );
-        }
-    }
-
     fun registerDefaultHandlerAnnouncement() {
         registerAnnouncement(
             "default-url-handler",

app/src/main/java/com/futo/platformplayer/states/StateApp.kt

@@ -38,9 +38,9 @@ import com.futo.platformplayer.receivers.AudioNoisyReceiver
 import com.futo.platformplayer.services.DownloadService
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
+import com.futo.platformplayer.views.ToastView
 import kotlinx.coroutines.*
 import java.io.File
-import java.time.OffsetDateTime
 import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.system.measureTimeMillis
@@ -380,13 +380,15 @@ class StateApp {
 
         Logger.i(TAG, "MainApp Starting: Initializing [Polycentric]");
         StatePolycentric.instance.load(context);
-        Logger.i(TAG, "MainApp Starting: Initializing [Saved]");
-        StateSaved.instance.load();
 
         Logger.i(TAG, "MainApp Starting: Initializing [Connectivity]");
         displayMetrics = context.resources.displayMetrics;
         ensureConnectivityManager(context);
 
+        Logger.i(TAG, "MainApp Starting: Cleaning up unused downloads");
+        StateDownloads.instance.cleanupDownloads();
+
+
         Logger.i(TAG, "MainApp Starting: Initializing [Telemetry]");
         if (!BuildConfig.DEBUG) {
             StateTelemetry.instance.initialize();
@@ -423,8 +425,6 @@ class StateApp {
             }
         }
 
-        StateAnnouncement.instance.registerAnnouncement("fa4647d3-36fa-4c8c-832d-85b00fc72dca", "Disclaimer", "This is an early alpha build of the application, expect bugs and unfinished features.", AnnouncementType.DELETABLE, OffsetDateTime.now())
-
         if(SettingsDev.instance.developerMode && SettingsDev.instance.devServerSettings.devServerOnBoot)
             StateDeveloper.instance.runServer();
 
@@ -460,7 +460,9 @@ class StateApp {
 
             //Foreground download
             autoUpdateEnabled -> {
-                StateUpdate.instance.checkForUpdates(context, false);
+                scopeOrNull?.launch(Dispatchers.IO) {
+                    StateUpdate.instance.checkForUpdates(context, false)
+                }
             }
 
             else -> {
@@ -551,13 +553,31 @@ class StateApp {
         }
 
         StateAnnouncement.instance.registerDefaultHandlerAnnouncement();
-        StateAnnouncement.instance.registerDidYouKnow();
         Logger.i(TAG, "MainApp Started: Finished");
 
         StatePlaylists.instance.toMigrateCheck();
 
         if(StateHistory.instance.shouldMigrateLegacyHistory())
             StateHistory.instance.migrateLegacyHistory();
+
+        StateAnnouncement.instance.deleteAnnouncement("plugin-update")
+
+        scopeOrNull?.launch(Dispatchers.IO) {
+            val updateAvailable = StatePlatform.instance.checkForUpdates()
+
+            withContext(Dispatchers.Main) {
+                if (updateAvailable.isNotEmpty()) {
+                    UIDialogs.appToast(
+                        ToastView.Toast(updateAvailable
+                            .map { " - " + it.name }
+                            .joinToString("\n"),
+                            true,
+                            null,
+                            "Plugin updates available"
+                        ));
+                }
+            }
+        }
     }
 
     fun mainAppStartedWithExternalFiles(context: Context) {

app/src/main/java/com/futo/platformplayer/states/StateDownloads.kt

@@ -352,7 +352,10 @@ class StateDownloads {
 
     fun cleanupDownloads(): Pair<Int, Long> {
         val expected = getDownloadedVideos();
-        val validFiles = HashSet(expected.flatMap { e -> e.videoSource.map { it.filePath } + e.audioSource.map { it.filePath } });
+        val validFiles = HashSet(expected.flatMap { e ->
+            e.videoSource.map { it.filePath } +
+            e.audioSource.map { it.filePath } +
+            e.subtitlesSources.map { it.filePath }});
 
         var totalDeleted: Long = 0;
         var totalDeletedCount = 0;

app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt

@@ -5,6 +5,7 @@ import androidx.collection.LruCache
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.IPluginSourced
 import com.futo.platformplayer.api.media.PlatformMultiClientPool
@@ -78,6 +79,7 @@ class StatePlatform {
     private val _clientsLock = Object();
     private val _availableClients : ArrayList<IPlatformClient> = ArrayList();
     private val _enabledClients : ArrayList<IPlatformClient> = ArrayList();
+    private var _updatesAvailableMap: HashSet<String> = hashSetOf();
 
     //ClientPools are used to isolate plugin usage of certain components from others
     //This prevents for example a background task like subscriptions from blocking a user from opening a video
@@ -92,11 +94,6 @@ class StatePlatform {
     private val _liveEventClientPool = PlatformMultiClientPool("LiveEvents", 1); //Used exclusively for live events
 
 
-    private val _primaryClientPersistent = FragmentedStorage.get<StringStorage>("primaryClient");
-    private var _primaryClientObj : IPlatformClient? = null;
-    val primaryClient : IPlatformClient get() = _primaryClientObj ?: throw IllegalStateException("PlatformState not yet initialized");
-
-
     private val _icons : HashMap<String, ImageVariable> = HashMap();
 
     val hasClients: Boolean get() = _availableClients.size > 0;
@@ -205,20 +202,6 @@ class StatePlatform {
                         .filter { id -> _availableClients.any { it.id == id } }
                         .toTypedArray();
                 }
-
-
-                val primary = _primaryClientPersistent.value;
-                if(primary.isEmpty() || primary == StateDeveloper.DEV_ID) {
-                    selectPrimaryClient(enabled.firstOrNull() ?: _availableClients.first().id);
-                } else if(!_availableClients.any { it.id == primary }) {
-                    selectPrimaryClient(_availableClients.firstOrNull()?.id!!);
-                } else {
-                    selectPrimaryClient(primary);
-                }
-
-                if(!enabled.any { it == primaryClient.id }) {
-                    enabled = enabled.concat(primaryClient.id);
-                }
             }
             selectClients(*enabled);
         };
@@ -321,8 +304,6 @@ class StatePlatform {
                     newClient.initialize();
                     _enabledClients.add(newClient);
                 }
-                if (_primaryClientObj == client)
-                    _primaryClientObj = newClient;
 
                 _availableClients.removeIf { it.id == id };
                 _availableClients.add(newClient);
@@ -331,6 +312,11 @@ class StatePlatform {
         };
     }
 
+
+    suspend fun enableClient(ids: List<String>) {
+        val currentClients = getEnabledClients().map { it.id };
+        selectClients(*(currentClients + ids).distinct().toTypedArray());
+    }
     /**
      * Selects the enabled clients, meaning all clients that data is actively requested from.
      * If a client is disabled, NO requests are made to said client
@@ -363,17 +349,6 @@ class StatePlatform {
         };
     }
 
-    /**
-     * Selects the primary client, meaning the first target for requests.
-     * At the moment, since multi-client requests are not yet implemented, this is the goto client.
-     */
-    fun selectPrimaryClient(id: String) {
-        synchronized(_clientsLock) {
-            _primaryClientObj = getClient(id);
-            _primaryClientPersistent.setAndSave(id);
-        }
-    }
-
     fun getHome(): IPager<IPlatformContent> {
         Logger.i(TAG, "Platform - getHome");
         var clientIdsOngoing = mutableListOf<String>();
@@ -446,14 +421,12 @@ class StatePlatform {
             toAwait.map { PlaceholderPager(5, { PlatformContentPlaceholder(it.first.id) }) });
     }
 
-    fun getHomePrimary(): IPager<IPlatformContent> {
-        return primaryClient.getHome();
-    }
 
     //Search
     fun searchSuggestions(query: String): Array<String> {
         Logger.i(TAG, "Platform - searchSuggestions");
-        return primaryClient.searchSuggestions(query);
+        //TODO: hasSearchSuggestions
+        return getEnabledClients().firstOrNull()?.searchSuggestions(query) ?: arrayOf();
     }
 
     fun search(query: String, type: String? = null, sort: String? = null, filters: Map<String, List<String>> = mapOf(), clientIds: List<String>? = null): IPager<IPlatformContent> {
@@ -839,6 +812,7 @@ class StatePlatform {
         return urls;
     }
 
+    fun hasEnabledPlaylistClient(url: String) : Boolean = getEnabledClients().any { it.isPlaylistUrl(url) };
     fun getPlaylistClientOrNull(url: String): IPlatformClient? = getEnabledClients().find { it.isPlaylistUrl(url) }
     fun getPlaylistClient(url: String): IPlatformClient = getEnabledClients().find { it.isPlaylistUrl(url) }
         ?: throw NoPlatformClientException("No client enabled that supports this playlist url (${url})");
@@ -884,7 +858,6 @@ class StatePlatform {
         synchronized(_clientsLock) {
             val enabledExisting = _enabledClients.filter { it is DevJSClient };
             val isEnabled = !enabledExisting.isEmpty()
-            val isPrimary = _primaryClientObj is DevJSClient;
 
             for (enabled in enabledExisting) {
                 enabled.disable();
@@ -899,11 +872,7 @@ class StatePlatform {
             devId = newClient.devID;
             try {
                 StateDeveloper.instance.initializeDev(devId!!);
-                if (isPrimary) {
+                if (isEnabled) {
-                    _primaryClientObj = newClient;
-                    _enabledClients.add(0, newClient);
-                    newClient.initialize();
-                } else if (isEnabled) {
                     _enabledClients.add(newClient);
                     newClient.initialize();
                 }
@@ -932,6 +901,67 @@ class StatePlatform {
         }
     }
 
+    fun hasUpdateAvailable(c: SourcePluginConfig): Boolean {
+        val updatesAvailableMap = _updatesAvailableMap
+        synchronized(updatesAvailableMap) {
+            return updatesAvailableMap.contains(c.id)
+        }
+    }
+
+    suspend fun checkForUpdates(): List<SourcePluginConfig> = withContext(Dispatchers.IO) {
+        var configs = mutableListOf<SourcePluginConfig>()
+        val updatesAvailableFor = hashSetOf<String>()
+        for (availableClient in getAvailableClients().filter { it is JSClient && it.descriptor.appSettings.checkForUpdates }) {
+            if (availableClient !is JSClient) {
+                continue
+            }
+
+            if (checkForUpdates(availableClient.config)) {
+                configs.add(availableClient.config);
+                updatesAvailableFor.add(availableClient.config.id)
+            }
+        }
+
+        _updatesAvailableMap = updatesAvailableFor
+        return@withContext configs;
+    }
+
+    fun clearUpdateAvailable(c: SourcePluginConfig) {
+        val updatesAvailableMap = _updatesAvailableMap
+        synchronized(updatesAvailableMap) {
+            updatesAvailableMap.remove(c.id)
+        }
+    }
+
+    private suspend fun checkForUpdates(c: SourcePluginConfig): Boolean = withContext(Dispatchers.IO) {
+        val sourceUrl = c.sourceUrl ?: return@withContext false;
+
+        Logger.i(TAG, "Check for source updates '${c.name}'.");
+        try {
+            val client = ManagedHttpClient();
+            val response = client.get(sourceUrl);
+            Logger.i(TAG, "Downloading source config '$sourceUrl'.");
+
+            if (!response.isOk || response.body == null) {
+                return@withContext false;
+            }
+
+            val configJson = response.body.string();
+            Logger.i(TAG, "Downloaded source config ($sourceUrl):\n${configJson}");
+
+            val config = SourcePluginConfig.fromJson(configJson);
+            if (config.version <= c.version) {
+                return@withContext false;
+            }
+
+            Logger.i(TAG, "Update is available (config.version=${config.version}, source.config.version=${c.version}).");
+            return@withContext true;
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to check for updates.", e);
+            return@withContext false;
+        }
+    }
+
     companion object {
         private var _instance : StatePlatform? = null;
         val instance : StatePlatform

app/src/main/java/com/futo/platformplayer/states/StatePlayer.kt

@@ -361,6 +361,12 @@ class StatePlayer {
             if (queueShuffle)  {
                 removeFromShuffledQueue(video);
             }
+            if(currentVideo != null) {
+                val newPos = _queue.indexOfFirst { it.url == currentVideo?.url };
+                if(newPos >= 0)
+                    _queuePosition = newPos;
+            }
+
         }
 
         onQueueChanged.emit(shouldSwapCurrentItem);
@@ -407,6 +413,12 @@ class StatePlayer {
             if(_queue.size == 1) {
                 return null;
             }
+            if(_queue.size <= _queuePosition && currentVideo != null) {
+                //Out of sync position
+                val newPos = _queue.indexOfFirst { it.url == currentVideo?.url }
+                if(newPos != -1)
+                    _queuePosition = newPos;
+            }
 
             val shuffledQueue = _queueShuffled;
             val queue = if (queueShuffle && shuffledQueue != null) {
@@ -421,6 +433,8 @@ class StatePlayer {
             }
             //Standard Behavior
             if(_queuePosition - 1 >= 0) {
+                if(queue.size <= _queuePosition)
+                    return null;
                 return queue[_queuePosition - 1];
             }
             //Repeat Behavior (End of queue)

app/src/main/java/com/futo/platformplayer/states/StatePlaylists.kt

@@ -16,6 +16,7 @@ import com.futo.platformplayer.exceptions.ReconstructionException
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.stores.FragmentedStorage
+import com.futo.platformplayer.stores.StringArrayStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
 import com.futo.platformplayer.stores.v2.ReconstructStore
 import kotlinx.serialization.encodeToString
@@ -35,6 +36,8 @@ class StatePlaylists {
                 = SerializedPlatformVideo.fromVideo(StatePlatform.instance.getContentDetails(backup).await() as IPlatformVideoDetails);
         })
         .load();
+    private val _watchlistOrderStore = FragmentedStorage.get<StringArrayStorage>("watchListOrder"); //Temporary workaround to add order..
+
     val playlistStore = FragmentedStorage.storeJson<Playlist>("playlists")
         .withRestore(PlaylistBackup())
         .load();
@@ -48,26 +51,32 @@ class StatePlaylists {
     }
     fun getWatchLater() : List<SerializedPlatformVideo> {
         synchronized(_watchlistStore) {
-            return _watchlistStore.getItems();
+            val order = _watchlistOrderStore.getAllValues();
+            return _watchlistStore.getItems().sortedBy { order.indexOf(it.url) };
         }
     }
     fun updateWatchLater(updated: List<SerializedPlatformVideo>) {
         synchronized(_watchlistStore) {
             _watchlistStore.deleteAll();
             _watchlistStore.saveAllAsync(updated);
+            _watchlistOrderStore.set(*updated.map { it.url }.toTypedArray());
+            _watchlistOrderStore.save();
         }
         onWatchLaterChanged.emit();
     }
     fun removeFromWatchLater(video: SerializedPlatformVideo) {
         synchronized(_watchlistStore) {
             _watchlistStore.delete(video);
+            _watchlistOrderStore.set(*_watchlistOrderStore.values.filter { it != video.url }.toTypedArray());
+            _watchlistOrderStore.save();
         }
-
         onWatchLaterChanged.emit();
     }
     fun addToWatchLater(video: SerializedPlatformVideo) {
         synchronized(_watchlistStore) {
             _watchlistStore.saveAsync(video);
+            _watchlistOrderStore.set(*(listOf(video.url) + _watchlistOrderStore.values) .toTypedArray());
+            _watchlistOrderStore.save();
         }
         onWatchLaterChanged.emit();
     }

app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt

@@ -10,7 +10,6 @@ import com.futo.platformplayer.api.media.platforms.js.SourceAuth
 import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginDescriptor
-import com.futo.platformplayer.developer.DeveloperEndpoints
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.ImageVariable
 import com.futo.platformplayer.stores.FragmentedStorage
@@ -161,6 +160,13 @@ class StatePlugins {
         val configJson = StateAssets.readAsset(context, assetConfigPath) ?: return null;
         return SourcePluginConfig.fromJson(configJson, "");
     }
+    fun getEmbeddedPluginConfigFromID(context: Context, pluginId: String): SourcePluginConfig? {
+        val embedded = getEmbeddedSources(context);
+        if(!embedded.containsKey(pluginId))
+            return null;
+        return getEmbeddedPluginConfig(context, embedded[pluginId]!!);
+    }
+
     fun installEmbeddedPlugin(context: Context, assetConfigPath: String, id: String? = null): Boolean {
         try {
             val configJson = StateAssets.readAsset(context, assetConfigPath) ?:
@@ -467,7 +473,6 @@ class StatePlugins {
         _plugins.save(descriptor);
     }
 
-
     @Serializable
     private data class PluginConfig(
         val SOURCES_EMBEDDED: Map<String, String>,

app/src/main/java/com/futo/platformplayer/states/StatePolycentric.kt

@@ -48,6 +48,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
 import userpackage.Protocol
+import userpackage.Protocol.Reference
 import java.time.Instant
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
@@ -287,7 +288,8 @@ class StatePolycentric {
                 rating = RatingLikeDislikes(0, 0),
                 date = if (ev.unixMilliseconds != null) Instant.ofEpochMilli(ev.unixMilliseconds!!).atOffset(ZoneOffset.UTC) else OffsetDateTime.MIN,
                 replyCount = 0,
-                eventPointer = se.toPointer()
+                eventPointer = se.toPointer(),
+                parentReference = se.event.references.getOrNull(0)
             ))
         }
 
@@ -328,6 +330,77 @@ class StatePolycentric {
         return LikesDislikesReplies(likes, dislikes, replyCount)
     }
 
+    suspend fun getComment(contextUrl: String, reference: Reference): PolycentricPlatformComment {
+        ensureEnabled()
+
+        if (reference.referenceType != 2L) {
+            throw Exception("Not a pointer")
+        }
+
+        val pointer = Protocol.Pointer.parseFrom(reference.reference)
+        val events = ApiMethods.getEvents(PolycentricCache.SERVER, pointer.system, Protocol.RangesForSystem.newBuilder()
+            .addRangesForProcesses(Protocol.RangesForProcess.newBuilder()
+                .setProcess(pointer.process)
+                .addRanges(Protocol.Range.newBuilder()
+                    .setLow(pointer.logicalClock)
+                    .setHigh(pointer.logicalClock)
+                    .build())
+                .build())
+            .build())
+
+        val sev = SignedEvent.fromProto(events.getEvents(0))
+        val ev = sev.event
+
+        if (ev.contentType != ContentType.POST.value) {
+            throw Exception("This is not a comment")
+        }
+
+        val post = Protocol.Post.parseFrom(ev.content);
+        val systemLinkUrl = ev.system.systemToURLInfoSystemLinkUrl(listOf(PolycentricCache.SERVER));
+        val dp_25 = 25.dp(StateApp.instance.context.resources)
+
+        val profileEvents = ApiMethods.getQueryLatest(
+            PolycentricCache.SERVER,
+            ev.system.toProto(),
+            listOf(
+                ContentType.AVATAR.value,
+                ContentType.USERNAME.value
+            )
+        ).eventsList.map { e -> SignedEvent.fromProto(e) }.groupBy { e -> e.event.contentType }
+            .map { (_, events) -> events.maxBy { x -> x.event.unixMilliseconds ?: 0 } };
+
+        val nameEvent = profileEvents.firstOrNull { e -> e.event.contentType == ContentType.USERNAME.value };
+        val avatarEvent = profileEvents.firstOrNull { e -> e.event.contentType == ContentType.AVATAR.value };
+        val imageBundle = if (avatarEvent != null) {
+            val lwwElementValue = avatarEvent.event.lwwElement?.value;
+            if (lwwElementValue != null) {
+                Protocol.ImageBundle.parseFrom(lwwElementValue)
+            } else {
+                null
+            }
+        } else {
+            null
+        }
+
+        val ldr = getLikesDislikesReplies(reference)
+        return PolycentricPlatformComment(
+            contextUrl = contextUrl,
+            author = PlatformAuthorLink(
+                id = PlatformID("polycentric", systemLinkUrl, null, ClaimType.POLYCENTRIC.value.toInt()),
+                name = nameEvent?.event?.lwwElement?.value?.decodeToString() ?: "Unknown",
+                url = systemLinkUrl,
+                thumbnail =  imageBundle?.selectBestImage(dp_25 * dp_25)?.let { img -> img.toURLInfoSystemLinkUrl(ev.system.toProto(), img.process, listOf(PolycentricCache.SERVER)) },
+                subscribers = null
+            ),
+            msg = if (post.content.count() > PolycentricPlatformComment.MAX_COMMENT_SIZE) post.content.substring(0, PolycentricPlatformComment.MAX_COMMENT_SIZE) else post.content,
+            rating = RatingLikeDislikes(ldr.likes, ldr.dislikes),
+            date = if (ev.unixMilliseconds != null) Instant.ofEpochMilli(ev.unixMilliseconds!!).atOffset(ZoneOffset.UTC) else OffsetDateTime.MIN,
+            replyCount = ldr.replyCount.toInt(),
+            eventPointer = sev.toPointer(),
+            parentReference = sev.event.references.getOrNull(0)
+        )
+    }
+
     suspend fun getCommentPager(contextUrl: String, reference: Protocol.Reference, extraByteReferences: List<ByteArray>? = null): IPager<IPlatformComment> {
         if (!enabled) {
             return EmptyPager()
@@ -453,7 +526,8 @@ class StatePolycentric {
                     rating = RatingLikeDislikes(likes, dislikes),
                     date = if (unixMilliseconds != null) Instant.ofEpochMilli(unixMilliseconds).atOffset(ZoneOffset.UTC) else OffsetDateTime.MIN,
                     replyCount = replies.toInt(),
-                    eventPointer = sev.toPointer()
+                    eventPointer = sev.toPointer(),
+                    parentReference = sev.event.references.getOrNull(0)
                 );
             } catch (e: Throwable) {
                 return@mapNotNull null;

app/src/main/java/com/futo/platformplayer/states/StateSaved.kt

@@ -1,52 +0,0 @@
-package com.futo.platformplayer.states
-
-import com.futo.platformplayer.api.media.Serializer
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringStorage
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-
-@kotlinx.serialization.Serializable
-data class VideoToOpen(val url: String, val timeSeconds: Long);
-
-class StateSaved {
-    var videoToOpen: VideoToOpen? = null;
-
-    private val _videoToOpen = FragmentedStorage.get<StringStorage>("videoToOpen")
-
-    fun load() {
-        val videoToOpenString = _videoToOpen.value;
-        if (videoToOpenString.isNotEmpty()) {
-            try {
-                val v = Serializer.json.decodeFromString<VideoToOpen>(videoToOpenString);
-                videoToOpen = v;
-            } catch (e: Throwable) {
-                Logger.w(TAG, "Failed to load video to open", e)
-            }
-        }
-
-        Logger.i(TAG, "loaded videoToOpen=$videoToOpen");
-    }
-
-    fun setVideoToOpenNonBlocking(v: VideoToOpen? = null) {
-        Logger.i(TAG, "set videoToOpen=$v");
-
-        videoToOpen = v;
-        _videoToOpen.setAndSave(if (v != null) Serializer.json.encodeToString(v) else "");
-    }
-
-
-    fun setVideoToOpenBlocking(v: VideoToOpen? = null) {
-        Logger.i(TAG, "set videoToOpen=$v");
-
-        videoToOpen = v;
-        _videoToOpen.setAndSaveBlocking(if (v != null) Serializer.json.encodeToString(v) else "");
-    }
-
-    companion object {
-        const val TAG = "StateSaved"
-
-        val instance: StateSaved = StateSaved()
-    }
-}

app/src/main/java/com/futo/platformplayer/states/StateSubscriptions.kt

@@ -51,10 +51,16 @@ class StateSubscriptions {
 
     val global: CentralizedFeed = CentralizedFeed();
     val feeds: HashMap<String, CentralizedFeed> = hashMapOf();
-    val onFeedProgress = Event3<String, Int, Int>();
+    val onFeedProgress = Event3<String?, Int, Int>();
 
     val onSubscriptionsChanged = Event2<List<Subscription>, Boolean>();
 
+    init {
+        global.onUpdateProgress.subscribe { progress, total ->
+            onFeedProgress.emit(null, progress, total);
+        }
+    }
+
     fun getOldestUpdateTime(): OffsetDateTime {
         val subs = getSubscriptions();
         if(subs.size == 0)

app/src/main/java/com/futo/platformplayer/states/StateUpdate.kt

@@ -2,15 +2,15 @@ package com.futo.platformplayer.states
 
 import android.content.Context
 import android.os.Build
-import android.os.Environment
+import com.futo.platformplayer.BuildConfig
-import com.futo.platformplayer.*
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.copyToOutputStream
 import com.futo.platformplayer.logging.Logger
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
-import java.io.FileNotFoundException
 import java.io.InputStream
 import java.io.OutputStream
 
@@ -155,47 +155,45 @@ class StateUpdate {
         }
     }
 
-    fun checkForUpdates(context: Context, showUpToDateToast: Boolean) {
+    suspend fun checkForUpdates(context: Context, showUpToDateToast: Boolean) = withContext(Dispatchers.IO) {
-        StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+        try {
-            try {
+            val client = ManagedHttpClient();
-                val client = ManagedHttpClient();
+            val latestVersion = downloadVersionCode(client);
-                val latestVersion = downloadVersionCode(client);
 
-                if (latestVersion != null) {
+            if (latestVersion != null) {
-                    val currentVersion = BuildConfig.VERSION_CODE;
+                val currentVersion = BuildConfig.VERSION_CODE;
-                    Logger.i(TAG, "Current version ${currentVersion} latest version ${latestVersion}.");
+                Logger.i(TAG, "Current version ${currentVersion} latest version ${latestVersion}.");
 
-                    if (latestVersion > currentVersion) {
+                if (latestVersion > currentVersion) {
-                        withContext(Dispatchers.Main) {
+                    withContext(Dispatchers.Main) {
-                            try {
+                        try {
-                                UIDialogs.showUpdateAvailableDialog(context, latestVersion);
+                            UIDialogs.showUpdateAvailableDialog(context, latestVersion);
-                            } catch (e: Throwable) {
+                        } catch (e: Throwable) {
-                                UIDialogs.toast(context, "Failed to show update dialog");
+                            UIDialogs.toast(context, "Failed to show update dialog");
-                                Logger.w(TAG, "Error occurred in update dialog.");
+                            Logger.w(TAG, "Error occurred in update dialog.");
-                            }
-                        }
-                    } else {
-                        if (showUpToDateToast) {
-                            withContext(Dispatchers.Main) {
-                                UIDialogs.toast(context, "Already on latest version");
-                            }
                         }
                     }
                 } else {
-                    Logger.w(TAG, "Failed to retrieve version from version URL.");
+                    if (showUpToDateToast) {
-
+                        withContext(Dispatchers.Main) {
-                    withContext(Dispatchers.Main) {
+                            UIDialogs.toast(context, "Already on latest version");
-                        UIDialogs.toast(context, "Failed to retrieve version");
+                        }
                     }
                 }
-            } catch (e: Throwable) {
+            } else {
-                Logger.w(TAG, "Failed to check for updates.", e);
+                Logger.w(TAG, "Failed to retrieve version from version URL.");
 
                 withContext(Dispatchers.Main) {
-                    UIDialogs.toast(context, "Failed to check for updates");
+                    UIDialogs.toast(context, "Failed to retrieve version");
                 }
             }
-        };
+        } catch (e: Throwable) {
+            Logger.w(TAG, "Failed to check for updates.", e);
+
+            withContext(Dispatchers.Main) {
+                UIDialogs.toast(context, "Failed to check for updates");
+            }
+        }
     }
 
     private fun downloadApkToFile(client: ManagedHttpClient, destinationFile: File, isCancelled: (() -> Boolean)? = null) {

app/src/main/java/com/futo/platformplayer/subscription/SubscriptionsTaskFetchAlgorithm.kt

@@ -13,6 +13,7 @@ import com.futo.platformplayer.api.media.structures.MultiChronoContentPager
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptCriticalException
+import com.futo.platformplayer.engine.exceptions.ScriptException
 import com.futo.platformplayer.exceptions.ChannelException
 import com.futo.platformplayer.findNonRuntimeException
 import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionsFeedFragment
@@ -55,7 +56,7 @@ abstract class SubscriptionsTaskFetchAlgorithm(
                 val clientCacheCount = clientTasks.value.size - clientTaskCount;
                 val limit = clientTasks.key.getSubscriptionRateLimit();
                 if(clientCacheCount > 0 && clientTaskCount > 0 && limit != null && clientTaskCount >= limit && StateApp.instance.contextOrNull?.let { it is MainActivity && it.isFragmentActive<SubscriptionsFeedFragment>() } == true) {
-                    UIDialogs.toast("[${clientTasks.key.name}] only updating ${clientTaskCount} most urgent channels (rqs). (${clientCacheCount} cached)");
+                    UIDialogs.appToast("[${clientTasks.key.name}] only updating ${clientTaskCount} most urgent channels (rqs). (${clientCacheCount} cached)");
                 }
             }
 
@@ -69,7 +70,6 @@ abstract class SubscriptionsTaskFetchAlgorithm(
         val cachedChannels = mutableListOf<String>()
         val forkTasks = executeSubscriptionTasks(tasks, failedPlugins, cachedChannels);
 
-
         val taskResults = arrayListOf<SubscriptionTaskResult>();
         val timeTotal = measureTimeMillis {
             for(task in forkTasks) {
@@ -126,7 +126,7 @@ abstract class SubscriptionsTaskFetchAlgorithm(
         val pager = MultiChronoContentPager(groupedPagers, allowFailure, 15);
         pager.initialize();
 
-        return Result(DedupContentPager(pager), exs);
+        return Result(DedupContentPager(pager, StatePlatform.instance.getEnabledClients().map { it.id }), exs);
     }
 
     fun executeSubscriptionTasks(tasks: List<SubscriptionTask>, failedPlugins: MutableList<String>, cachedChannels: MutableList<String>): List<ForkJoinTask<SubscriptionTaskResult>> {
@@ -200,7 +200,7 @@ abstract class SubscriptionsTaskFetchAlgorithm(
                     else {
                         Logger.i(StateSubscriptions.TAG, "Channel ${task.sub.channel.name} failed, substituting with cache");
                         pager = StateCache.instance.getChannelCachePager(task.sub.channel.url);
-                        taskEx = ex;
+                        taskEx = channelEx;
                         return@submit SubscriptionTaskResult(task, pager, taskEx);
                     }
                 }

app/src/main/java/com/futo/platformplayer/views/ToastView.kt

@@ -0,0 +1,91 @@
+package com.futo.platformplayer.views
+
+import android.content.Context
+import android.graphics.Color
+import android.util.AttributeSet
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
+import com.futo.platformplayer.R
+import com.futo.platformplayer.dp
+import com.futo.platformplayer.logging.Logger
+
+class ToastView : LinearLayout {
+    private val root: LinearLayout;
+    private val title: TextView;
+    private val text: TextView;
+    init {
+        inflate(context, R.layout.toast, this);
+        root = findViewById(R.id.root);
+        title = findViewById(R.id.title);
+        text = findViewById(R.id.text);
+    }
+
+    constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
+        setToast(ToastView.Toast("", false))
+        root.visibility = GONE;
+    }
+
+    fun hide(animate: Boolean, onFinished: (()->Unit)? = null) {
+        Logger.i("MainActivity", "Hiding toast");
+        if(!animate) {
+            root.visibility = GONE;
+            alpha = 0f;
+            onFinished?.invoke();
+        }
+        else {
+            animate()
+                .alpha(0f)
+                .setDuration(700)
+                .translationY(20.dp(context.resources).toFloat())
+                .withEndAction { root.visibility = GONE; onFinished?.invoke(); }
+                .start();
+        }
+    }
+    fun show(animate: Boolean) {
+        Logger.i("MainActivity", "Showing toast");
+        if(!animate) {
+            root.visibility = VISIBLE;
+            alpha = 1f;
+        }
+        else {
+            alpha = 0f;
+            root.visibility = VISIBLE;
+            translationY = 20.dp(context.resources).toFloat();
+            animate()
+                .alpha(1f)
+                .setDuration(700)
+                .translationY(0f)
+                .start();
+        }
+    }
+
+
+    fun setToast(toast: Toast) {
+        if(toast.title.isNullOrEmpty())
+            title.isVisible = false;
+        else {
+            title.text = toast.title;
+            title.isVisible = true;
+        }
+        text.text = toast.msg;
+        if(toast.color != null)
+            text.setTextColor(toast.color);
+        else
+            text.setTextColor(Color.WHITE);
+    }
+    fun setToastAnimated(toast: Toast) {
+        hide(true) {
+            setToast(toast);
+            show(true);
+        };
+    }
+
+    class Toast(
+        val msg: String,
+        val long: Boolean,
+        val color: Int? = null,
+        val title: String? = null
+    );
+}

app/src/main/java/com/futo/platformplayer/views/adapters/CommentWithReferenceViewHolder.kt

@@ -55,6 +55,7 @@ class CommentWithReferenceViewHolder : ViewHolder {
 
     var onRepliesClick = Event1<IPlatformComment>();
     var onDelete = Event1<IPlatformComment>();
+    var onClick = Event1<IPlatformComment>();
     var comment: IPlatformComment? = null
         private set;
 
@@ -108,6 +109,11 @@ class CommentWithReferenceViewHolder : ViewHolder {
             onDelete.emit(c);
         }
 
+        _layoutComment.setOnClickListener {
+            val c = comment ?: return@setOnClickListener;
+            onClick.emit(c);
+        }
+
         _textBody.setPlatformPlayerLinkMovementMethod(viewGroup.context);
     }
 

app/src/main/java/com/futo/platformplayer/views/adapters/DisabledSourceAdapter.kt

@@ -1,42 +0,0 @@
-package com.futo.platformplayer.views.adapters
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.futo.platformplayer.R
-import com.futo.platformplayer.api.media.IPlatformClient
-import com.futo.platformplayer.constructs.Event1
-
-class DisabledSourceAdapter : RecyclerView.Adapter<DisabledSourceViewHolder> {
-    private val _sources: MutableList<IPlatformClient>;
-
-    var onClick = Event1<IPlatformClient>();
-    var onAdd = Event1<IPlatformClient>();
-
-    constructor(sources: MutableList<IPlatformClient>) : super() {
-        _sources = sources;
-    }
-
-    override fun getItemCount() = _sources.size
-
-    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): DisabledSourceViewHolder {
-        val holder = DisabledSourceViewHolder(viewGroup);
-        holder.onAdd.subscribe {
-            val source = holder.source;
-            if (source != null) {
-                onAdd.emit(source);
-            }
-        }
-        holder.onClick.subscribe {
-            val source = holder.source;
-            if (source != null) {
-                onClick.emit(source);
-            }
-        };
-        return holder;
-    }
-
-    override fun onBindViewHolder(viewHolder: DisabledSourceViewHolder, position: Int) {
-        viewHolder.bind(_sources[position])
-    }
-}

app/src/main/java/com/futo/platformplayer/views/adapters/DisabledSourceView.kt

@@ -1,17 +1,15 @@
 package com.futo.platformplayer.views.adapters
 
 import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.states.StatePlatform
 
 class DisabledSourceView : LinearLayout {
     private val _root: LinearLayout;
@@ -38,7 +36,16 @@ class DisabledSourceView : LinearLayout {
         client.icon?.setImageView(_imageSource);
 
         _textSource.text = client.name;
-        _textSourceSubtitle.text = context.getString(R.string.tap_to_open);
+
+        if (client is JSClient && StatePlatform.instance.hasUpdateAvailable(client.config)) {
+            _textSourceSubtitle.text = context.getString(R.string.update_available_exclamation)
+            _textSourceSubtitle.setTextColor(context.getColor(R.color.light_blue_400))
+            _textSourceSubtitle.typeface = resources.getFont(R.font.inter_regular)
+        } else {
+            _textSourceSubtitle.text = context.getString(R.string.tap_to_open)
+            _textSourceSubtitle.setTextColor(context.getColor(R.color.gray_ac))
+            _textSourceSubtitle.typeface = resources.getFont(R.font.inter_extra_light)
+        }
 
         _buttonAdd.setOnClickListener { onAdd.emit(source) }
         _root.setOnClickListener { onClick.emit(); };

app/src/main/java/com/futo/platformplayer/views/adapters/DisabledSourceViewHolder.kt

@@ -1,44 +0,0 @@
-package com.futo.platformplayer.views.adapters
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import com.futo.platformplayer.R
-import com.futo.platformplayer.api.media.IPlatformClient
-import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.constructs.Event0
-
-class DisabledSourceViewHolder : ViewHolder {
-    private val _imageSource: ImageView;
-    private val _textSource: TextView;
-    private val _textSourceSubtitle: TextView;
-
-    private val _buttonAdd: LinearLayout;
-
-    var onClick = Event0();
-    var onAdd = Event0();
-    var source: IPlatformClient? = null
-        private set
-
-    constructor(viewGroup: ViewGroup) : super(LayoutInflater.from(viewGroup.context).inflate(R.layout.list_source_disabled, viewGroup, false)) {
-        _imageSource = itemView.findViewById(R.id.image_source);
-        _textSource = itemView.findViewById(R.id.text_source);
-        _textSourceSubtitle = itemView.findViewById(R.id.text_source_subtitle);
-        _buttonAdd = itemView.findViewById(R.id.button_add);
-
-        val root = itemView.findViewById<LinearLayout>(R.id.root);
-        _buttonAdd.setOnClickListener { onAdd.emit() }
-        root.setOnClickListener { onClick.emit(); };
-    }
-
-    fun bind(client: IPlatformClient) {
-        client.icon?.setImageView(_imageSource);
-
-        _textSource.text = client.name;
-        _textSourceSubtitle.text = itemView.context.getString(R.string.tap_to_open);
-        source = client;
-    }
-}

app/src/main/java/com/futo/platformplayer/views/adapters/EnabledSourceViewHolder.kt

@@ -10,7 +10,9 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.IPlatformClient
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.states.StatePlatform
 
 class EnabledSourceViewHolder : ViewHolder {
     private val _imageSource: ImageView;
@@ -57,8 +59,18 @@ class EnabledSourceViewHolder : ViewHolder {
     fun bind(client: IPlatformClient) {
         client.icon?.setImageView(_imageSource);
 
-        _textSource.text = client.name;
+        _textSource.text = client.name
-        _textSourceSubtitle.text = itemView.context.getString(R.string.tap_to_open);
+
+        if (client is JSClient && StatePlatform.instance.hasUpdateAvailable(client.config)) {
+            _textSourceSubtitle.text = itemView.context.getString(R.string.update_available_exclamation)
+            _textSourceSubtitle.setTextColor(itemView.context.getColor(R.color.light_blue_400))
+            _textSourceSubtitle.typeface = itemView.resources.getFont(R.font.inter_regular)
+        } else {
+            _textSourceSubtitle.text = itemView.context.getString(R.string.tap_to_open)
+            _textSourceSubtitle.setTextColor(itemView.context.getColor(R.color.gray_ac))
+            _textSourceSubtitle.typeface = itemView.resources.getFont(R.font.inter_extra_light)
+        }
+
         source = client
     }
 }

app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewContentListAdapter.kt

@@ -15,6 +15,7 @@ import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.debug.Stopwatch
+import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.video.PlayerManager
@@ -46,7 +47,7 @@ class PreviewContentListAdapter : InsertedViewAdapterWithLoader<ContentPreviewVi
         val contentDetails = StatePlatform.instance.getContentDetails(video.url).await();
         stopwatch.logAndNext(TAG, "Retrieving video detail (IO thread)")
         return@TaskHandler Pair(viewHolder, contentDetails)
-    }).success { previewContentDetails(it.first, it.second) }
+    }).exception<Throwable> { Logger.e(TAG, "Failed to retrieve preview content.", it) }.success { previewContentDetails(it.first, it.second) }
 
     constructor(context: Context, feedStyle : FeedStyle, dataSet: ArrayList<IPlatformContent>, exoPlayer: PlayerManager? = null,
                 initialPlay: Boolean = false, viewsToPrepend: ArrayList<View> = arrayListOf(),

app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupBarViewHolder.kt

@@ -3,45 +3,31 @@ package com.futo.platformplayer.views.adapters.viewholders
 import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.LinearLayout
+import android.widget.FrameLayout
 import android.widget.TextView
 import com.futo.platformplayer.R
-import com.futo.platformplayer.api.media.PlatformID
-import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.constructs.TaskHandler
-import com.futo.platformplayer.dp
-import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.SubscriptionGroup
-import com.futo.platformplayer.polycentric.PolycentricCache
-import com.futo.platformplayer.selectBestImage
-import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.google.android.material.imageview.ShapeableImageView
-import com.google.android.material.shape.CornerFamily
-import com.google.android.material.shape.ShapeAppearanceModel
 
 class SubscriptionGroupBarViewHolder(private val _viewGroup: ViewGroup) : AnyAdapter.AnyViewHolder<SubscriptionGroup>(
     LayoutInflater.from(_viewGroup.context).inflate(R.layout.view_subscription_group_bar, _viewGroup, false)) {
     private var _group: SubscriptionGroup? = null;
 
+    private val _root: FrameLayout;
     private val _image: ShapeableImageView;
     private val _textSubGroup: TextView;
 
+
     val onClick = Event1<SubscriptionGroup>();
     val onClickLong = Event1<SubscriptionGroup>();
 
     init {
+        _root = _view.findViewById(R.id.root);
         _image = _view.findViewById(R.id.image);
         _textSubGroup = _view.findViewById(R.id.text_sub_group);
 
-        val dp6 = 6.dp(_view.resources);
-        _image.shapeAppearanceModel = ShapeAppearanceModel.builder()
-            .setAllCorners(CornerFamily.ROUNDED, dp6.toFloat())
-            .build()
-
         _view.setOnClickListener {
             _group?.let {
                 onClick.emit(it);
@@ -58,9 +44,9 @@ class SubscriptionGroupBarViewHolder(private val _viewGroup: ViewGroup) : AnyAda
     override fun bind(value: SubscriptionGroup) {
         _group = value;
         val img = value.image;
-        if(img != null)
+        if(img != null) {
             img.setImageView(_image)
-        else {
+        } else {
             _image.setImageResource(0);
 
             if(value is SubscriptionGroup.Add)
@@ -68,10 +54,11 @@ class SubscriptionGroupBarViewHolder(private val _viewGroup: ViewGroup) : AnyAda
         }
         _textSubGroup.text = value.name;
 
-        if(value is SubscriptionGroup.Selectable && value.selected)
+        if (value is SubscriptionGroup.Selectable && value.selected) {
-            _view.setBackgroundColor(_view.context.resources.getColor(R.color.colorPrimary, null));
+            _root.setBackgroundResource(R.drawable.background_primary_round_6dp)
-        else
+        } else {
-            _view.setBackgroundColor(_view.context.resources.getColor(R.color.transparent, null));
+            _root.background = null
+        }
     }
 
     companion object {

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

@@ -3,12 +3,16 @@ package com.futo.platformplayer.views.behavior
 import android.animation.Animator
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
+import android.app.Activity
 import android.content.Context
+import android.graphics.Matrix
 import android.graphics.drawable.Animatable
+import android.media.AudioManager
 import android.util.AttributeSet
 import android.view.GestureDetector
 import android.view.LayoutInflater
 import android.view.MotionEvent
+import android.view.ScaleGestureDetector
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
@@ -19,8 +23,10 @@ import androidx.core.animation.doOnEnd
 import androidx.core.animation.doOnStart
 import androidx.core.view.GestureDetectorCompat
 import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.views.others.CircularProgressBar
 import kotlinx.coroutines.CancellationException
@@ -33,6 +39,7 @@ import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 
+
 class GestureControlView : LinearLayout {
     private val _scope = CoroutineScope(Dispatchers.Main);
     private val _imageFastForward: ImageView;
@@ -59,6 +66,7 @@ class GestureControlView : LinearLayout {
     private val _progressSound: CircularProgressBar;
     private var _animatorSound: ObjectAnimator? = null;
     private var _brightnessFactor = 1.0f;
+    private var _originalBrightnessFactor = 1.0f;
     private var _adjustingBrightness: Boolean = false;
     private val _layoutControlsBrightness: FrameLayout;
     private val _progressBrightness: CircularProgressBar;
@@ -70,10 +78,27 @@ class GestureControlView : LinearLayout {
     private var _fullScreenFactorUp = 1.0f;
     private var _fullScreenFactorDown = 1.0f;
 
+    private var _scaleGestureDetector: ScaleGestureDetector
+    private var _scaleFactor = 1.0f
+    private var _translationX = 0.0f
+    private var _translationY = 0.0f
+    private val _layoutControlsZoom: FrameLayout
+    private val _textZoom: TextView
+    private var _isZooming = false
+    private var _isPanning = false
+    private var _isZoomPanEnabled = false
+    private var _surfaceView: View? = null
+    private var _layoutIndicatorFill: FrameLayout;
+    private var _layoutIndicatorFit: FrameLayout;
+
     private val _gestureController: GestureDetectorCompat;
 
+    val isUserGesturing get() = _rewinding || _skipping || _adjustingBrightness || _adjustingSound || _adjustingFullscreenUp || _adjustingFullscreenDown || _isPanning || _isZooming;
+
     val onSeek = Event1<Long>();
     val onBrightnessAdjusted = Event1<Float>();
+    val onPan = Event2<Float, Float>();
+    val onZoom = Event1<Float>();
     val onSoundAdjusted = Event1<Float>();
     val onToggleFullscreen = Event0();
 
@@ -91,8 +116,48 @@ class GestureControlView : LinearLayout {
         _layoutControlsSound = findViewById(R.id.layout_controls_sound);
         _progressSound = findViewById(R.id.progress_sound);
         _layoutControlsBrightness = findViewById(R.id.layout_controls_brightness);
+        _layoutControlsZoom = findViewById(R.id.layout_controls_zoom)
+        _textZoom = findViewById(R.id.text_zoom)
         _progressBrightness = findViewById(R.id.progress_brightness);
         _layoutControlsFullscreen = findViewById(R.id.layout_controls_fullscreen);
+        _layoutIndicatorFill = findViewById(R.id.layout_indicator_fill);
+        _layoutIndicatorFit = findViewById(R.id.layout_indicator_fit);
+
+        _scaleGestureDetector = ScaleGestureDetector(context, object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
+            override fun onScale(detector: ScaleGestureDetector): Boolean {
+                if (!_isZoomPanEnabled || !_isFullScreen || !Settings.instance.gestureControls.zoom) {
+                    return false
+                }
+
+                val newScaleFactor = (_scaleFactor * detector.scaleFactor).coerceAtLeast(1.0f).coerceAtMost(10.0f)
+                val scaleFactorChange = newScaleFactor / _scaleFactor
+                _scaleFactor = newScaleFactor
+                onZoom.emit(_scaleFactor)
+
+                val sx = detector.focusX
+                val sy = detector.focusY
+
+                val tx = _translationX + width / 2.0f
+                val ty = _translationY + height / 2.0f
+
+                val matrix = Matrix()
+                matrix.postTranslate(-sx, -sy)
+                matrix.postScale(scaleFactorChange, scaleFactorChange)
+                matrix.postTranslate(sx, sy)
+
+                val point = floatArrayOf(tx, ty)
+                matrix.mapPoints(point)
+                pan(point[0] - width / 2.0f, point[1] - height / 2.0f)
+
+                _layoutControlsZoom.visibility = View.VISIBLE
+                _textZoom.text = "${String.format("%.1f", _scaleFactor)}x"
+                _isZooming = true
+
+                updateSnappingVisibility()
+
+                return true
+            }
+        })
 
         _gestureController = GestureDetectorCompat(context, object : GestureDetector.OnGestureListener {
             override fun onDown(p0: MotionEvent): Boolean { return false; }
@@ -103,41 +168,50 @@ class GestureControlView : LinearLayout {
                 if(p0 == null)
                     return false;
 
-                val minDistance = Math.min(width, height)
+                Logger.i(TAG, "p0.pointerCount: " + p0.pointerCount)
-                if (_isFullScreen && _adjustingBrightness) {
+
-                    val adjustAmount = (distanceY * 2) / minDistance;
+                if (!_isPanning && p1.pointerCount == 1) {
-                    _brightnessFactor = (_brightnessFactor + adjustAmount).coerceAtLeast(0.0f).coerceAtMost(1.0f);
+                    val minDistance = Math.min(width, height)
-                    _progressBrightness.progress = _brightnessFactor;
+                    if (_isFullScreen && _adjustingBrightness) {
-                    onBrightnessAdjusted.emit(_brightnessFactor);
+                        val adjustAmount = (distanceY * 2) / minDistance;
-                } else if (_isFullScreen && _adjustingSound) {
+                        _brightnessFactor = (_brightnessFactor + adjustAmount).coerceAtLeast(0.0f).coerceAtMost(1.0f);
-                    val adjustAmount = (distanceY * 2) / minDistance;
+                        _progressBrightness.progress = _brightnessFactor;
-                    _soundFactor = (_soundFactor + adjustAmount).coerceAtLeast(0.0f).coerceAtMost(1.0f);
+                        onBrightnessAdjusted.emit(_brightnessFactor);
-                    _progressSound.progress = _soundFactor;
+                    } else if (_isFullScreen && _adjustingSound) {
-                    onSoundAdjusted.emit(_soundFactor);
+                        val adjustAmount = (distanceY * 2) / minDistance;
-                } else if (_adjustingFullscreenUp) {
+                        _soundFactor = (_soundFactor + adjustAmount).coerceAtLeast(0.0f).coerceAtMost(1.0f);
-                    val adjustAmount = (distanceY * 2) / minDistance;
+                        _progressSound.progress = _soundFactor;
-                    _fullScreenFactorUp = (_fullScreenFactorUp + adjustAmount).coerceAtLeast(0.0f).coerceAtMost(1.0f);
+                        onSoundAdjusted.emit(_soundFactor);
-                    _layoutControlsFullscreen.alpha = _fullScreenFactorUp;
+                    } else if (_adjustingFullscreenUp) {
-                } else if (_adjustingFullscreenDown) {
+                        val adjustAmount = (distanceY * 2) / minDistance;
-                    val adjustAmount = (-distanceY * 2) / minDistance;
+                        _fullScreenFactorUp = (_fullScreenFactorUp + adjustAmount).coerceAtLeast(0.0f).coerceAtMost(1.0f);
-                    _fullScreenFactorDown = (_fullScreenFactorDown + adjustAmount).coerceAtLeast(0.0f).coerceAtMost(1.0f);
+                        _layoutControlsFullscreen.alpha = _fullScreenFactorUp;
-                    _layoutControlsFullscreen.alpha = _fullScreenFactorDown;
+                    } else if (_adjustingFullscreenDown) {
-                } else {
+                        val adjustAmount = (-distanceY * 2) / minDistance;
-                    val rx = (p0.x + p1.x) / (2 * width);
+                        _fullScreenFactorDown = (_fullScreenFactorDown + adjustAmount).coerceAtLeast(0.0f).coerceAtMost(1.0f);
-                    val ry = (p0.y + p1.y) / (2 * height);
+                        _layoutControlsFullscreen.alpha = _fullScreenFactorDown;
-                    if (ry > 0.1 && ry < 0.9) {
+                    } else if (p0.pointerCount == 1) {
-                        if (_isFullScreen && rx < 0.2) {
+                        val rx = (p0.x + p1.x) / (2 * width);
-                            startAdjustingBrightness();
+                        val ry = (p0.y + p1.y) / (2 * height);
-                        } else if (_isFullScreen && rx > 0.8) {
+                        if (ry > 0.1 && ry < 0.9) {
-                            startAdjustingSound();
+                            if (Settings.instance.gestureControls.brightnessSlider && _isFullScreen && rx < 0.2) {
-                        } else if (fullScreenGestureEnabled && rx in 0.3..0.7) {
+                                startAdjustingBrightness();
-                            if (_isFullScreen) {
+                            } else if (Settings.instance.gestureControls.volumeSlider && _isFullScreen && rx > 0.8) {
-                                startAdjustingFullscreenDown();
+                                startAdjustingSound();
-                            } else {
+                            } else if (Settings.instance.gestureControls.toggleFullscreen && fullScreenGestureEnabled && rx in 0.3..0.7) {
-                                startAdjustingFullscreenUp();
+                                if (_isFullScreen) {
+                                    startAdjustingFullscreenDown();
+                                } else {
+                                    startAdjustingFullscreenUp();
+                                }
                             }
                         }
                     }
+                } else if (_isZoomPanEnabled && _isFullScreen && !_isZooming && Settings.instance.gestureControls.pan) {
+                    _isPanning = true
+                    stopAllGestures()
+                    updateSnappingVisibility()
+                    pan(_translationX - distanceX, _translationY - distanceY)
                 }
 
                 return true;
@@ -178,6 +252,55 @@ class GestureControlView : LinearLayout {
         isClickable = true
     }
 
+    fun updateSnappingVisibility() {
+        if (willSnapFill()) {
+            _layoutIndicatorFill.visibility = View.VISIBLE
+            _layoutIndicatorFit.visibility = View.GONE
+        } else if (willSnapFit()) {
+            _layoutIndicatorFill.visibility = View.GONE
+            _layoutIndicatorFit.visibility = View.VISIBLE
+
+            _surfaceView?.let {
+                val lp = _layoutIndicatorFit.layoutParams
+                lp.width = it.width
+                lp.height = it.height
+                _layoutIndicatorFit.layoutParams = lp
+            }
+        } else {
+            _layoutIndicatorFill.visibility = View.GONE
+            _layoutIndicatorFit.visibility = View.GONE
+        }
+    }
+
+    fun setZoomPanEnabled(view: View) {
+        _isZoomPanEnabled = true
+        _surfaceView = view
+    }
+
+    fun resetZoomPan() {
+        _scaleFactor = 1.0f
+        onZoom.emit(_scaleFactor)
+        _translationX = 0f
+        _translationY = 0f
+        onPan.emit(_translationX, _translationY)
+    }
+
+    private fun pan(translationX: Float, translationY: Float) {
+        val xc = width / 2.0f
+        val yc = height / 2.0f
+
+        val xmin = xc - width / 2.0f * _scaleFactor
+        val xmax = xc + width / 2.0f * _scaleFactor - width
+
+        val ymin = yc - height / 2.0f * _scaleFactor
+        val ymax = yc + height / 2.0f * _scaleFactor - height
+
+        _translationX = translationX.coerceAtLeast(xmin).coerceAtMost(xmax)
+        _translationY = translationY.coerceAtLeast(ymin).coerceAtMost(ymax)
+
+        onPan.emit(_translationX, _translationY)
+    }
+
     fun setupTouchArea(layoutControls: ViewGroup? = null, background: View? = null) {
         _layoutControls = layoutControls;
         _background = background;
@@ -223,12 +346,67 @@ class GestureControlView : LinearLayout {
             stopAdjustingFullscreenDown();
         }
 
+        if ((_isPanning || _isZooming) && ev.action == MotionEvent.ACTION_UP) {
+            val surfaceView = _surfaceView
+            if (surfaceView != null && willSnapFill()) {
+                _scaleFactor = calculateZoomScaleFactor()
+                onZoom.emit(_scaleFactor)
+
+                _translationX = 0f
+                _translationY = 0f
+                onPan.emit(_translationX, _translationY)
+            } else if (willSnapFit()) {
+                _scaleFactor = 1f
+                onZoom.emit(_scaleFactor)
+
+                _translationX = 0f
+                _translationY = 0f
+                onPan.emit(_translationX, _translationY)
+            }
+
+            _layoutControlsZoom.visibility = View.GONE
+            _layoutIndicatorFill.visibility = View.GONE
+            _layoutIndicatorFit.visibility = View.GONE
+            _isZooming = false
+            _isPanning = false
+        }
+
         startHideJobIfNecessary();
 
         _gestureController.onTouchEvent(ev)
+        _scaleGestureDetector.onTouchEvent(ev)
         return true;
     }
 
+    private fun calculateZoomScaleFactor(): Float {
+        val w = _surfaceView?.width?.toFloat() ?: return 1.0f;
+        val h = _surfaceView?.height?.toFloat() ?: return 1.0f;
+        if (w == 0.0f || h == 0.0f) {
+            return 1.0f;
+        }
+
+        return Math.max(width / w, height / h)
+    }
+
+    private val _snapTranslationTolerance = 0.1f;
+    private val _snapZoomTolerance = 0.1f;
+
+    private fun willSnapFill(): Boolean {
+        val surfaceView = _surfaceView
+        if (surfaceView != null) {
+            val zoomScaleFactor = calculateZoomScaleFactor()
+            if (Math.abs(_scaleFactor - zoomScaleFactor) < _snapZoomTolerance && Math.abs(_translationX) / width < _snapTranslationTolerance && Math.abs(_translationY) / height < _snapTranslationTolerance) {
+                return true
+            }
+        }
+
+        return false
+    }
+
+    private fun willSnapFit(): Boolean {
+        return Math.abs(_scaleFactor - 1.0f) < _snapZoomTolerance && Math.abs(_translationX) / width < _snapTranslationTolerance && Math.abs(_translationY) / height < _snapTranslationTolerance
+    }
+
     fun cancelHideJob() {
         _jobHideControls?.cancel();
         _jobHideControls = null;
@@ -558,11 +736,39 @@ class GestureControlView : LinearLayout {
     }
 
     fun setFullscreen(isFullScreen: Boolean) {
+        resetZoomPan()
+
         if (isFullScreen) {
+            val c = context
+            if (c is Activity && Settings.instance.gestureControls.useSystemBrightness) {
+                _brightnessFactor = c.window.attributes.screenBrightness
+                if (_brightnessFactor == -1.0f) {
+                    _brightnessFactor = android.provider.Settings.System.getInt(
+                        context.contentResolver,
+                        android.provider.Settings.System.SCREEN_BRIGHTNESS
+                    ) / 255.0f;
+                }
+                _originalBrightnessFactor = _brightnessFactor
+            }
+
+            if (Settings.instance.gestureControls.useSystemVolume) {
+                val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+                val currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+                val maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+                _soundFactor = currentVolume.toFloat() / maxVolume.toFloat()
+            }
+
             onBrightnessAdjusted.emit(_brightnessFactor);
             onSoundAdjusted.emit(_soundFactor);
         } else {
-            onBrightnessAdjusted.emit(1.0f);
+            val c = context
+            if (c is Activity && Settings.instance.gestureControls.useSystemBrightness) {
+                if (Settings.instance.gestureControls.restoreSystemBrightness) {
+                    onBrightnessAdjusted.emit(_originalBrightnessFactor);
+                }
+            } else {
+                onBrightnessAdjusted.emit(1.0f);
+            }
             //onSoundAdjusted.emit(1.0f);
             stopAdjustingBrightness();
             stopAdjustingSound();

app/src/main/java/com/futo/platformplayer/views/casting/CastView.kt

@@ -24,8 +24,8 @@ import com.futo.platformplayer.casting.AirPlayCastingDevice
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event2
+import com.futo.platformplayer.formatDuration
 import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.toHumanTime
 import com.futo.platformplayer.views.behavior.GestureControlView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -252,8 +252,8 @@ class CastView : ConstraintLayout {
             .load(video.thumbnails.getHQThumbnail())
             .placeholder(R.drawable.placeholder_video_thumbnail)
             .into(_thumbnail);
-        _textPosition.text = position.toHumanTime(false);
+        _textPosition.text = (position * 1000).formatDuration();
-        _textDuration.text = video.duration.toHumanTime(false);
+        _textDuration.text = (video.duration * 1000).formatDuration();
         _timeBar.setPosition(position);
         _timeBar.setDuration(video.duration);
     }
@@ -261,7 +261,7 @@ class CastView : ConstraintLayout {
     @OptIn(UnstableApi::class)
     fun setTime(ms: Long) {
         updateCurrentChapter(ms);
-        _textPosition.text = ms.toHumanTime(true);
+        _textPosition.text = ms.formatDuration();
         _timeBar.setPosition(ms / 1000);
         StatePlayer.instance.updateMediaSessionPlaybackState(getPlaybackStateCompat(), ms);
     }

app/src/main/java/com/futo/platformplayer/views/overlays/CreatorSelectOverlay.kt

@@ -1,52 +1,25 @@
 package com.futo.platformplayer.views.overlays
 
-import android.app.Activity
 import android.content.Context
-import android.content.Intent
-import android.graphics.Color
-import android.graphics.drawable.shapes.Shape
 import android.util.AttributeSet
-import android.view.View
+import android.widget.FrameLayout
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.ImageView
-import android.widget.LinearLayout
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.net.toFile
-import androidx.core.net.toUri
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.futo.platformplayer.PresetImages
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.activities.IWithResultLauncher
-import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.dp
-import com.futo.platformplayer.models.ImageVariable
-import com.futo.platformplayer.states.StateApp
 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.SearchView
-import com.futo.platformplayer.views.adapters.AnyAdapter
-import com.futo.platformplayer.views.adapters.viewholders.CreatorBarViewHolder
 import com.futo.platformplayer.views.adapters.viewholders.SelectableCreatorBarViewHolder
-import com.futo.platformplayer.views.buttons.BigButton
-import com.github.dhaval2404.imagepicker.ImagePicker
-import com.google.android.flexbox.FlexboxLayout
-import com.google.android.material.imageview.ShapeableImageView
-import com.google.android.material.shape.CornerFamily
-import com.google.android.material.shape.ShapeAppearanceModel
-import java.io.File
 
 class CreatorSelectOverlay: ConstraintLayout {
-    private val _buttonSelect: Button;
+    private val _buttonSelect: FrameLayout;
     private val _topbar: OverlayTopbar;
 
     private val _searchBar: SearchView;
@@ -97,7 +70,7 @@ class CreatorSelectOverlay: ConstraintLayout {
             this.orientation = LinearLayoutManager.VERTICAL;
         };
         _buttonSelect.setOnClickListener {
-            _selected?.let {
+            if (_selected.isNotEmpty()) {
                 select();
             }
         };
@@ -112,8 +85,18 @@ class CreatorSelectOverlay: ConstraintLayout {
     }
 
     fun updateSelected() {
-        _creators.forEach { p -> p.active = _selected.contains(p.channel.url) };
+        val changed = arrayListOf<SelectableCreatorBarViewHolder.Selectable>()
-        _recyclerCreators.notifyContentChanged();
+        for(creator in _creators) {
+            val act = _selected.contains(creator.channel.url);
+            if(creator.active != act) {
+                creator.active = act;
+                changed.add(creator);
+            }
+        }
+        for(change in changed) {
+            val index = _creatorsFiltered.indexOf(change);
+            _recyclerCreators.notifyContentChanged(index);
+        }
 
         if(_selected.isNotEmpty())
             _buttonSelect.alpha = 1f;
@@ -124,7 +107,7 @@ class CreatorSelectOverlay: ConstraintLayout {
 
     private fun filterCreators(withUpdate: Boolean = true) {
         val query = _searchBar.textSearch.text.toString().lowercase();
-        val filteredEnabled = _creators.filter { query.isNullOrEmpty() || it.channel.name.lowercase().contains(query) };
+        val filteredEnabled = _creators.filter { query.isEmpty() || it.channel.name.lowercase().contains(query) };
 
         //Optimize
         _creatorsFiltered.clear();

app/src/main/java/com/futo/platformplayer/views/overlays/ImageVariableOverlay.kt

@@ -11,6 +11,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.net.toFile
@@ -48,7 +49,7 @@ class ImageVariableOverlay: ConstraintLayout {
     private val _buttonGallery: BigButton;
     private val _imageGallerySelected: ImageView;
     private val _imageGallerySelectedContainer: LinearLayout;
-    private val _buttonSelect: Button;
+    private val _buttonSelect: TextView;
     private val _topbar: OverlayTopbar;
     private val _recyclerPresets: AnyAdapterView<PresetImage, PresetViewHolder>;
     private val _recyclerCreators: AnyAdapterView<SelectableCreatorBarViewHolder.Selectable, SelectableCreatorBarViewHolder>;

app/src/main/java/com/futo/platformplayer/views/overlays/RepliesOverlay.kt

@@ -1,6 +1,7 @@
 package com.futo.platformplayer.views.overlays
 
 import android.content.Context
+import android.net.Uri
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
@@ -8,11 +9,15 @@ import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
 import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.fixHtmlLinks
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.toHumanNowDiffString
@@ -20,6 +25,13 @@ import com.futo.platformplayer.views.behavior.NonScrollingTextView
 import com.futo.platformplayer.views.comments.AddCommentView
 import com.futo.platformplayer.views.others.CreatorThumbnail
 import com.futo.platformplayer.views.segments.CommentsList
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
 import userpackage.Protocol
 
 class RepliesOverlay : LinearLayout {
@@ -34,7 +46,11 @@ class RepliesOverlay : LinearLayout {
     private val _creatorThumbnail: CreatorThumbnail;
     private val _layoutParentComment: ConstraintLayout;
     private var _readonly = false;
+    private var _loading = true;
+    private var _parentComment: IPlatformComment? = null;
     private var _onCommentAdded: ((comment: IPlatformComment) -> Unit)? = null;
+    private val _loaderOverlay: LoaderOverlay
+    private val _client = ManagedHttpClient()
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
         inflate(context, R.layout.overlay_replies, this)
@@ -46,6 +62,8 @@ class RepliesOverlay : LinearLayout {
         _textAuthor = findViewById(R.id.text_author)
         _creatorThumbnail = findViewById(R.id.image_thumbnail)
         _layoutParentComment = findViewById(R.id.layout_parent_comment)
+        _loaderOverlay = findViewById(R.id.loader_overlay)
+        setLoading(false);
 
         _addCommentView.onCommentAdded.subscribe {
             _commentsList.addComment(it);
@@ -72,11 +90,21 @@ class RepliesOverlay : LinearLayout {
             }
         };
 
+        _layoutParentComment.setOnClickListener {
+            val p = _parentComment
+            if (p !is PolycentricPlatformComment) {
+                return@setOnClickListener
+            }
+
+            val ref = p.parentReference ?: return@setOnClickListener
+            handleParentClick(p.contextUrl, ref)
+        }
+
         _topbar.onClose.subscribe(this, onClose::emit);
         _topbar.setInfo(context.getString(R.string.Replies), "");
     }
 
-    fun load(readonly: Boolean, metadata: String, contextUrl: String?, ref: Protocol.Reference?, parentComment: IPlatformComment? = null, loader: suspend () -> IPager<IPlatformComment>, onCommentAdded: ((comment: IPlatformComment) -> Unit)? = null) {
+    fun load(readonly: Boolean, metadata: String, contextUrl: String?, ref: Protocol.Reference?, parentComment: IPlatformComment? = null, loader: suspend () -> IPager<IPlatformComment>, onCommentAdded: ((comment: IPlatformComment) -> Unit)? = null, onParentClick: ((comment: IPlatformComment) -> Unit)? = null) {
         _readonly = readonly;
         if (readonly) {
             _addCommentView.visibility = View.GONE;
@@ -109,6 +137,136 @@ class RepliesOverlay : LinearLayout {
         _topbar.setInfo(context.getString(R.string.Replies), metadata);
         _commentsList.load(readonly, loader);
         _onCommentAdded = onCommentAdded;
+        _parentComment = parentComment;
+    }
+
+    fun handleParentClick(contextUrl: String, ref: Protocol.Reference): Boolean {
+        val ctx = context
+        if (ctx !is MainActivity) {
+            return false
+        }
+
+        return when (ref.referenceType) {
+            2L -> {
+                setLoading(true)
+
+                StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                    try {
+                        val parentComment = StatePolycentric.instance.getComment(contextUrl, ref)
+                        val replyCount = parentComment.replyCount ?: 0;
+                        var metadata = "";
+                        if (replyCount > 0) {
+                            metadata += "$replyCount " + context.getString(R.string.replies);
+                        }
+
+                        withContext(Dispatchers.Main) {
+                            setLoading(false)
+
+                            load(false, metadata, parentComment.contextUrl, parentComment.reference, parentComment,
+                                { StatePolycentric.instance.getCommentPager(contextUrl, ref) })
+                        }
+                    } catch (e: Throwable) {
+                        withContext(Dispatchers.Main) {
+                            setLoading(false)
+                        }
+
+                        Logger.e(TAG, "Failed to load parent comment.", e)
+                        UIDialogs.toast("Failed to load comment")
+                    }
+                }
+
+                true
+            }
+            3L -> {
+                StateApp.instance.scopeOrNull?.launch {
+                    try {
+                        val url = referenceToUrl(_client, ref) ?: return@launch
+                        withContext(Dispatchers.Main) {
+                            ctx.handleUrl(url)
+                            onClose.emit()
+                        }
+                    } catch (e: Throwable) {
+                        Logger.i(TAG, "Failed to open ref.", e)
+                    }
+                }
+
+                false
+            }
+            else -> false
+        }
+    }
+
+    private fun referenceToUrl(client: ManagedHttpClient, parentRef: Protocol.Reference): String? {
+        val refBytes = parentRef.reference?.toByteArray() ?: return null
+        val ref = refBytes.decodeToString()
+
+        try {
+            Uri.parse(ref)
+            return ref
+        } catch (e: Throwable) {
+            try {
+                return oldReferenceToUrl(client, ref)
+            } catch (f: Throwable) {
+                Logger.i(TAG, "Failed to handle URL.", f)
+            }
+        }
+
+        return null
+    }
+
+    private fun oldReferenceToUrl(client: ManagedHttpClient, reference: String): String? {
+        return when {
+            reference.startsWith("video_episode:") -> {
+                val response = client.get("https://content.api.nebula.app/video_episodes/$reference")
+                if (!response.isOk) {
+                    throw Exception("Failed to resolve nebula video (${response.code}).")
+                }
+
+                val respString = response.body?.string()
+                val jsonElement = respString?.let { Json.parseToJsonElement(it) }
+                return jsonElement?.jsonObject?.get("share_url")?.jsonPrimitive?.content
+            }
+
+            reference.length == 11 -> "https://www.youtube.com/watch?v=$reference"
+
+            reference.length == 40 -> {
+                val response = client.post("https://api.na-backend.odysee.com/api/v1/proxy?m=claim_search", hashMapOf(
+                    "Content-Type" to "application/json"
+                ))
+
+                if (!response.isOk) {
+                    throw Exception("Failed to resolve claim (${response.code}).")
+                }
+
+                val jsonElement = response.body?.string()?.let { Json.parseToJsonElement(it) }
+                val canonicalUrl = jsonElement?.jsonObject?.get("result")
+                    ?.jsonObject?.get("items")
+                    ?.jsonArray?.get(0)
+                    ?.jsonObject?.get("canonical_url")
+                    ?.jsonPrimitive?.content
+
+                canonicalUrl ?: throw Exception("Failed to get canonical URL.")
+            }
+
+            reference.startsWith("v") && (reference.length == 7 || reference.length == 6) -> "https://rumble.com/$reference"
+
+            Regex("^\\d+\$").matches(reference) -> "https://www.twitch.tv/videos/$reference"
+
+            else -> null
+        }
+    }
+
+    private fun setLoading(loading: Boolean) {
+        if (_loading == loading) {
+            return;
+        }
+
+        _loading = loading;
+        if (!loading) {
+            _loaderOverlay.hide()
+        } else {
+            _loaderOverlay.show()
+        }
     }
 
     fun cleanup() {
@@ -116,4 +274,8 @@ class RepliesOverlay : LinearLayout {
         _onCommentAdded = null;
         _commentsList.cancel();
     }
+
+    companion object {
+        private const val TAG = "RepliesOverlay"
+    }
 }

app/src/main/java/com/futo/platformplayer/views/pills/WidePillButton.kt

@@ -14,6 +14,7 @@ class WidePillButton : LinearLayout {
     private val _iconPrefix: ImageView
     private val _iconSuffix: ImageView
     private val _text: TextView
+    private val _textDescription: TextView
     val onClick = Event0()
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
@@ -21,11 +22,13 @@ class WidePillButton : LinearLayout {
         _iconPrefix = findViewById(R.id.image_prefix)
         _iconSuffix = findViewById(R.id.image_suffix)
         _text = findViewById(R.id.text)
+        _textDescription = findViewById(R.id.text_description)
 
         val attrArr = context.obtainStyledAttributes(attrs, R.styleable.WidePillButton, 0, 0)
         setIconPrefix(attrArr.getResourceId(R.styleable.WidePillButton_widePillIconPrefix, -1))
         setIconSuffix(attrArr.getResourceId(R.styleable.WidePillButton_widePillIconSuffix, -1))
-        setText(attrArr.getText(R.styleable.PillButton_pillText) ?: "")
+        setText(attrArr.getText(R.styleable.WidePillButton_widePillText) ?: "")
+        setDescription(attrArr.getText(R.styleable.WidePillButton_widePillDescription))
         attrArr.recycle()
 
         findViewById<LinearLayout>(R.id.root).setOnClickListener {
@@ -54,4 +57,13 @@ class WidePillButton : LinearLayout {
     fun setText(t: CharSequence) {
         _text.text = t
     }
+
+    fun setDescription(t: CharSequence?) {
+        if (!t.isNullOrEmpty()) {
+            _textDescription.visibility = View.VISIBLE
+            _textDescription.text = t
+        } else {
+            _textDescription.visibility= View.GONE
+        }
+    }
 }

app/src/main/java/com/futo/platformplayer/views/segments/CommentsList.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.graphics.Color
 import android.util.AttributeSet
 import android.view.Gravity
-import android.view.KeyCharacterMap.UnavailableException
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
@@ -12,10 +11,8 @@ import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.R
-import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
 import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
@@ -25,6 +22,8 @@ import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.ScriptUnavailableException
 import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.adapters.CommentViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
@@ -87,8 +86,6 @@ class CommentsList : ConstraintLayout {
     var onRepliesClick = Event1<IPlatformComment>();
     var onCommentsLoaded = Event1<Int>();
 
-
-
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
         LayoutInflater.from(context).inflate(R.layout.view_comments_list, this, true);
 

app/src/main/java/com/futo/platformplayer/views/sources/SourceHeaderView.kt

@@ -25,6 +25,7 @@ class SourceHeaderView : LinearLayout {
     private val _sourcePlatformUrl: TextView;
     private val _sourceRepositoryUrl: TextView;
     private val _sourceScriptUrl: TextView;
+    private val _sourceScriptConfig: TextView;
     private val _sourceSignature: TextView;
 
     private val _sourcePlatformUrlContainer: LinearLayout;
@@ -45,6 +46,7 @@ class SourceHeaderView : LinearLayout {
         _sourcePlatformUrl = findViewById(R.id.source_platform);
         _sourcePlatformUrlContainer = findViewById(R.id.source_platform_container);
         _sourceScriptUrl = findViewById(R.id.source_script);
+        _sourceScriptConfig = findViewById(R.id.source_config);
         _sourceSignature = findViewById(R.id.source_signature);
 
         _sourceBy.setOnClickListener {
@@ -59,6 +61,10 @@ class SourceHeaderView : LinearLayout {
             if(!_config?.absoluteScriptUrl.isNullOrEmpty())
                 context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(_config?.absoluteScriptUrl)));
         };
+        _sourceScriptConfig.setOnClickListener {
+            if(!_config?.sourceUrl.isNullOrEmpty())
+                context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(_config?.sourceUrl)));
+        }
         _sourcePlatformUrl.setOnClickListener {
             if(!_config?.platformUrl.isNullOrEmpty())
                 context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(_config?.platformUrl)));
@@ -82,6 +88,7 @@ class SourceHeaderView : LinearLayout {
         _sourceVersion.text = config.version.toString();
         _sourceScriptUrl.text = config.absoluteScriptUrl;
         _sourceRepositoryUrl.text = config.repositoryUrl;
+        _sourceScriptConfig.text = config.sourceUrl
         _sourceAuthorID.text = "";
 
         _sourcePlatformUrl.text = config.platformUrl ?: "";

app/src/main/java/com/futo/platformplayer/views/subscriptions/SubscriptionBar.kt

@@ -88,6 +88,13 @@ class SubscriptionBar : LinearLayout {
         updateExplore();
     }
 
+    fun selectGroup(group: SubscriptionGroup) {
+        val relevantGroup = _groups.find { it.id == group.id };
+        if(relevantGroup != null && _group != relevantGroup) {
+            groupClicked(relevantGroup);
+        }
+    }
+
     private fun groupClicked(g: SubscriptionGroup) {
         if(g is SubscriptionGroup.Add) {
             onToggleGroup.emit(g);

app/src/main/java/com/futo/platformplayer/views/video/FutoThumbnailPlayer.kt

@@ -1,6 +1,9 @@
 package com.futo.platformplayer.views.video
 
 import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
@@ -11,6 +14,9 @@ import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.PlayerControlView
 import androidx.media3.ui.PlayerView
+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.api.media.models.streams.sources.IAudioSource
@@ -39,6 +45,14 @@ class FutoThumbnailPlayer : FutoVideoPlayerBase {
 
     //Events
     private val _evMuteChanged = mutableListOf<(FutoThumbnailPlayer, Boolean)->Unit>();
+    private val _loadArtwork = object: CustomTarget<Bitmap>() {
+        override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
+            setArtwork(BitmapDrawable(resources, resource));
+        }
+        override fun onLoadCleared(placeholder: Drawable?) {
+            setArtwork(null);
+        }
+    }
 
 
     @OptIn(UnstableApi::class)
@@ -113,11 +127,38 @@ class FutoThumbnailPlayer : FutoVideoPlayerBase {
     }
 
     fun setPreview(video: IPlatformVideoDetails) {
-        val videoSource = VideoHelper.selectBestVideoSource(video.video, Settings.instance.playback.getPreferredPreviewQualityPixelCount(), PREFERED_VIDEO_CONTAINERS);
+        if (video.live != null) {
-        val audioSource = VideoHelper.selectBestAudioSource(video.video, PREFERED_AUDIO_CONTAINERS, Settings.instance.playback.getPrimaryLanguage(context));
+            setSource(video.live, null,true, false);
-        setSource(videoSource, audioSource,true, false);
+        } else {
+            val videoSource = VideoHelper.selectBestVideoSource(video.video, Settings.instance.playback.getPreferredPreviewQualityPixelCount(), PREFERED_VIDEO_CONTAINERS);
+            val audioSource = VideoHelper.selectBestAudioSource(video.video, PREFERED_AUDIO_CONTAINERS, Settings.instance.playback.getPrimaryLanguage(context));
+            if (videoSource == null && audioSource != null) {
+                val thumbnail = video.thumbnails.getHQThumbnail();
+                if (!thumbnail.isNullOrBlank()) {
+                    Glide.with(videoView).asBitmap().load(thumbnail).into(_loadArtwork);
+                } else {
+                    Glide.with(videoView).clear(_loadArtwork);
+                    setArtwork(null);
+                }
+            } else {
+                Glide.with(videoView).clear(_loadArtwork);
+            }
+
+            setSource(videoSource, audioSource,true, false);
+        }
     }
     override fun onSourceChanged(videoSource: IVideoSource?, audioSource: IAudioSource?, resume: Boolean) {
 
     }
+
+    @OptIn(UnstableApi::class)
+    fun setArtwork(drawable: Drawable?) {
+        if (drawable != null) {
+            videoView.defaultArtwork = drawable;
+            videoView.artworkDisplayMode = PlayerView.ARTWORK_DISPLAY_MODE_FILL;
+        } else {
+            videoView.defaultArtwork = null;
+            videoView.artworkDisplayMode = PlayerView.ARTWORK_DISPLAY_MODE_OFF;
+        }
+    }
 }

app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt

@@ -1,15 +1,18 @@
 package com.futo.platformplayer.views.video
 
+import android.app.Activity
 import android.content.Context
 import android.content.res.Resources
 import android.graphics.Color
 import android.graphics.drawable.Drawable
+import android.media.AudioManager
 import android.util.AttributeSet
 import android.util.Log
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.WindowManager
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.TextView
@@ -235,16 +238,41 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
 
         gestureControl.setupTouchArea(_layoutControls, background);
         gestureControl.onSeek.subscribe { seekFromCurrent(it); };
-        gestureControl.onSoundAdjusted.subscribe { setVolume(it) };
+        gestureControl.onSoundAdjusted.subscribe {
-        gestureControl.onToggleFullscreen.subscribe { setFullScreen(!isFullScreen) };
+            if (Settings.instance.gestureControls.useSystemVolume) {
-        gestureControl.onBrightnessAdjusted.subscribe {
+                val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-            if (it == 1.0f) {
+                val maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-                _overlay_brightness.visibility = View.GONE;
+                audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, (it * maxVolume).toInt(), 0)
             } else {
-                _overlay_brightness.visibility = View.VISIBLE;
+                setVolume(it)
-                _overlay_brightness.setBackgroundColor(Color.valueOf(0.0f, 0.0f, 0.0f, (1.0f - it)).toArgb());
             }
         };
+        gestureControl.onToggleFullscreen.subscribe { setFullScreen(!isFullScreen) };
+        gestureControl.onBrightnessAdjusted.subscribe {
+            if (context is Activity && Settings.instance.gestureControls.useSystemBrightness) {
+                val window = context.window
+                val layout: WindowManager.LayoutParams = window.attributes
+                layout.screenBrightness = it
+                window.attributes = layout
+            } else {
+                if (it == 1.0f) {
+                    _overlay_brightness.visibility = View.GONE;
+                } else {
+                    _overlay_brightness.visibility = View.VISIBLE;
+                    _overlay_brightness.setBackgroundColor(Color.valueOf(0.0f, 0.0f, 0.0f, (1.0f - it)).toArgb());
+                }
+            }
+        };
+        gestureControl.onPan.subscribe { x, y ->
+            _videoView.translationX = x
+            _videoView.translationY = y
+        }
+        gestureControl.onZoom.subscribe {
+            _videoView.scaleX = it
+            _videoView.scaleY = it
+        }
+
+        gestureControl.setZoomPanEnabled(_videoView.videoSurfaceView!!)
 
         if(!isInEditMode) {
             _videoView.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
@@ -531,7 +559,7 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
             _videoView.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT;
 
             _videoControls_fullscreen.show();
-            videoControls.hide();
+            videoControls.hideImmediately();
         }
         else {
             val lp = background.layoutParams as ConstraintLayout.LayoutParams;
@@ -543,7 +571,7 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
             _videoView.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
 
             videoControls.show();
-            _videoControls_fullscreen.hide();
+            _videoControls_fullscreen.hideImmediately();
         }
 
         fitOrFill(fullScreen);
@@ -574,6 +602,7 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
     }
 
     override fun onVideoSizeChanged(videoSize: VideoSize) {
+        gestureControl.resetZoomPan()
         _lastSourceFit = null;
         if(isFullScreen)
             fillHeight();
@@ -603,6 +632,10 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
         }
     }
 
+    override fun onIsPlayingChanged(playing: Boolean) {
+        super.onIsPlayingChanged(playing)
+        updatePlayPause();
+    }
     override fun onPlaybackStateChanged(playbackState: Int) {
         Logger.v(TAG, "onPlaybackStateChanged $playbackState");
         updatePlayPause()
@@ -658,7 +691,7 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
 
             val viewWidth = Math.min(metrics.widthPixels, metrics.heightPixels); //TODO: Get parent width. was this.width
             val deviceHeight = Math.max(metrics.widthPixels, metrics.heightPixels);
-            val maxHeight = deviceHeight * 0.6;
+            val maxHeight = deviceHeight * 0.4;
 
             val determinedHeight = if(w > h)
                 ((h * (viewWidth.toDouble() / w)).toInt())
@@ -730,8 +763,11 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
         }
     }
 
-
     fun setGestureSoundFactor(soundFactor: Float) {
         gestureControl.setSoundFactor(soundFactor);
     }
+
+    override fun onSurfaceSizeChanged(width: Int, height: Int) {
+        gestureControl.resetZoomPan()
+    }
 }

app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt

@@ -100,6 +100,21 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
     private var _toResume = false;
 
     private val _playerEventListener = object: Player.Listener {
+        override fun onPlaybackSuppressionReasonChanged(playbackSuppressionReason: Int) {
+            super.onPlaybackSuppressionReasonChanged(playbackSuppressionReason)
+        }
+
+        override fun onSurfaceSizeChanged(width: Int, height: Int) {
+            super.onSurfaceSizeChanged(width, height)
+            this@FutoVideoPlayerBase.onSurfaceSizeChanged(width, height);
+        }
+
+        override fun onIsPlayingChanged(isPlaying: Boolean) {
+            super.onIsPlayingChanged(isPlaying);
+            this@FutoVideoPlayerBase.onIsPlayingChanged(isPlaying);
+            updatePlaying();
+        }
+
         //TODO: Figure out why this is deprecated, and what the alternative is.
         override fun onPlaybackStateChanged(playbackState: Int) {
             super.onPlaybackStateChanged(playbackState)
@@ -582,6 +597,10 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
         exoPlayer?.setVolume(volume);
     }
 
+    protected open fun onSurfaceSizeChanged(width: Int, height: Int) {
+
+    }
+
     @Suppress("DEPRECATION")
     protected open fun onPlayerError(error: PlaybackException) {
         Logger.i(TAG, "onPlayerError error=$error error.errorCode=${error.errorCode} connectivityLoss");
@@ -616,6 +635,9 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
     }
     protected open fun onSourceChanged(videoSource: IVideoSource?, audioSource: IAudioSource? = null, resume: Boolean = true) { }
 
+    protected open fun onIsPlayingChanged(playing: Boolean) {
+
+    }
     protected open fun onPlaybackStateChanged(playbackState: Int) {
         if (_shouldPlaybackRestartOnConnectivity && playbackState == ExoPlayer.STATE_READY) {
             Logger.i(TAG, "_shouldPlaybackRestartOnConnectivity=false");

app/src/main/res/drawable/background_dark_round_6dp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#99000000" />
+    <corners android:radius="6dp" />
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>

app/src/main/res/drawable/background_pill_description.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#2A2A2A" />
+    <corners android:radius="25dp" />
+    <size android:height="20dp" />
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>

app/src/main/res/drawable/background_primary_border.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:color="#992D63ED" android:width="5dp" />
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>

app/src/main/res/drawable/background_primary_round_6dp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#2D63ED" />
+    <corners android:radius="6dp" />
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>

app/src/main/res/drawable/background_toast.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#EE202020" />
+    <corners android:radius="10dp" />
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>

app/src/main/res/drawable/ic_help_square.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M481.54,685.39Q494.85,685.39 503.96,676.27Q513.08,667.15 513.08,653.85Q513.08,640.54 503.96,631.42Q494.85,622.31 481.54,622.31Q468.23,622.31 459.11,631.42Q450,640.54 450,653.85Q450,667.15 459.11,676.27Q468.23,685.39 481.54,685.39ZM460.92,552.92L499.54,552.92Q501.08,526.15 509.46,510.31Q517.85,494.46 541.54,470.77Q570.39,441.92 583.35,420.73Q596.31,399.54 596.31,372.61Q596.31,325.77 564.15,297.11Q532,268.46 485.61,268.46Q442.92,268.46 412.11,291.23Q381.31,314 367.08,345.85L403.85,361.08Q413.92,337.15 432.61,321.42Q451.31,305.69 483.15,305.69Q520.92,305.69 539.31,326.35Q557.69,347 557.69,373.31Q557.69,393.39 546.69,410.08Q535.69,426.77 515.85,445.15Q483.61,474.92 472.27,498.73Q460.92,522.54 460.92,552.92ZM224.62,800Q197,800 178.5,781.5Q160,763 160,735.39L160,224.61Q160,197 178.5,178.5Q197,160 224.62,160L735.39,160Q763,160 781.5,178.5Q800,197 800,224.61L800,735.39Q800,763 781.5,781.5Q763,800 735.39,800L224.62,800ZM224.62,760L735.39,760Q744.61,760 752.31,752.31Q760,744.61 760,735.39L760,224.61Q760,215.39 752.31,207.69Q744.61,200 735.39,200L224.62,200Q215.38,200 207.69,207.69Q200,215.39 200,224.61L200,735.39Q200,744.61 207.69,752.31Q215.38,760 224.62,760ZM200,200L200,200Q200,200 200,206.92Q200,213.85 200,224.61L200,735.39Q200,746.15 200,753.08Q200,760 200,760L200,760Q200,760 200,753.08Q200,746.15 200,735.39L200,224.61Q200,213.85 200,206.92Q200,200 200,200Z"/>
+</vector>

app/src/main/res/drawable/ic_help_square_fill.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M481.54,685.39Q494.85,685.39 503.96,676.27Q513.08,667.15 513.08,653.85Q513.08,640.54 503.96,631.42Q494.85,622.31 481.54,622.31Q468.23,622.31 459.11,631.42Q450,640.54 450,653.85Q450,667.15 459.11,676.27Q468.23,685.39 481.54,685.39ZM460.92,552.92L499.54,552.92Q501.08,526.15 509.46,510.31Q517.85,494.46 541.54,470.77Q570.39,441.92 583.35,420.73Q596.31,399.54 596.31,372.61Q596.31,325.77 564.15,297.11Q532,268.46 485.61,268.46Q442.92,268.46 412.11,291.23Q381.31,314 367.08,345.85L403.85,361.08Q413.92,337.15 432.61,321.42Q451.31,305.69 483.15,305.69Q520.92,305.69 539.31,326.35Q557.69,347 557.69,373.31Q557.69,393.39 546.69,410.08Q535.69,426.77 515.85,445.15Q483.61,474.92 472.27,498.73Q460.92,522.54 460.92,552.92ZM224.62,800Q197,800 178.5,781.5Q160,763 160,735.39L160,224.61Q160,197 178.5,178.5Q197,160 224.62,160L735.39,160Q763,160 781.5,178.5Q800,197 800,224.61L800,735.39Q800,763 781.5,781.5Q763,800 735.39,800L224.62,800Z"/>
+</vector>

app/src/main/res/drawable/ic_paid_filled.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M459.39,744.61L498.61,744.61L498.61,697.69Q541.69,694.08 581.15,666.77Q620.61,639.46 620.61,582Q620.61,540 595.08,510.39Q569.54,480.77 497.54,454.77Q431.39,431.69 413,415.15Q394.61,398.61 394.61,368Q394.61,337.39 418.5,317Q442.39,296.61 482,296.61Q512.46,296.61 532.77,310.58Q553.08,324.54 565.69,346L600.46,332.31Q586.39,303.46 559.19,284Q532,264.54 500.61,262.31L500.61,215.39L461.39,215.39L461.39,262.31Q409.08,271 382.23,301.31Q355.39,331.61 355.39,368Q355.39,411.15 382.5,437.08Q409.61,463 474,486.31Q538.54,510.08 560.73,529.23Q582.92,548.39 582.92,582Q582.92,624.23 552.11,642.81Q521.31,661.39 486,661.39Q451.46,661.39 423.65,641.27Q395.85,621.15 379.23,584L344,599.23Q361.08,640.31 389.81,663.27Q418.54,686.23 459.39,695.69L459.39,744.61ZM480,840Q405.46,840 339.77,811.58Q274.08,783.15 225.46,734.54Q176.85,685.92 148.42,620.23Q120,554.54 120,480Q120,405.46 148.42,339.77Q176.85,274.08 225.46,225.46Q274.08,176.85 339.77,148.42Q405.46,120 480,120Q554.54,120 620.23,148.42Q685.92,176.85 734.54,225.46Q783.15,274.08 811.58,339.77Q840,405.46 840,480Q840,554.54 811.58,620.23Q783.15,685.92 734.54,734.54Q685.92,783.15 620.23,811.58Q554.54,840 480,840Z"/>
+</vector>

app/src/main/res/drawable/ic_queue.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M120,640L120,560L440,560L440,640L120,640ZM120,480L120,400L600,400L600,480L120,480ZM120,320L120,240L600,240L600,320L120,320ZM640,840L640,520L880,680L640,840Z"/>
+</vector>

app/src/main/res/drawable/ic_quiz_fill.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M540,581.54Q552.39,581.54 561.81,572.11Q571.23,562.69 571.23,550.31Q571.23,537.92 561.81,528.5Q552.39,519.08 540,519.08Q527.61,519.08 518.19,528.5Q508.77,537.92 508.77,550.31Q508.77,562.69 518.19,572.11Q527.61,581.54 540,581.54ZM522.31,468.92L557.69,468.92Q559.23,443.77 565.62,431.04Q572,418.31 596.31,395.54Q621.69,372.46 631.69,354.35Q641.69,336.23 641.69,312.77Q641.69,272.39 612.89,245.42Q584.08,218.46 540,218.46Q506.69,218.46 480.81,236.46Q454.92,254.46 441.39,285.54L473.85,299.85Q485.15,276.39 501.42,264.65Q517.69,252.92 540,252.92Q568.61,252.92 587.46,269.89Q606.31,286.85 606.31,313.69Q606.31,330 597.15,344.04Q588,358.08 565.69,377.85Q540.39,399.92 531.35,418.35Q522.31,436.77 522.31,468.92ZM324.61,680Q297,680 278.5,661.5Q260,643 260,615.39L260,184.61Q260,157 278.5,138.5Q297,120 324.61,120L755.39,120Q783,120 801.5,138.5Q820,157 820,184.61L820,615.39Q820,643 801.5,661.5Q783,680 755.39,680L324.61,680ZM204.62,800Q177,800 158.5,781.5Q140,763 140,735.39L140,264.61L180,264.61L180,735.39Q180,744.62 187.69,752.31Q195.38,760 204.62,760L675.39,760L675.39,800L204.62,800Z"/>
+</vector>

app/src/main/res/drawable/ic_settings_filled.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M405.38,840L390.92,724.31Q371.77,718.54 349.5,706.15Q327.23,693.77 311.61,679.62L204.92,725L130.31,595L222.54,525.46Q220.77,514.61 219.62,503.11Q218.46,491.61 218.46,480.77Q218.46,470.69 219.62,459.58Q220.77,448.46 222.54,434.54L130.31,365L204.92,236.54L310.85,281.15Q328.77,266.23 349.61,254.23Q370.46,242.23 390.15,235.69L405.38,120L554.62,120L569.08,236.46Q592.08,244.54 609.73,255Q627.39,265.46 646.08,281.15L755.08,236.54L829.69,365L734.39,436.85Q737.69,449.23 738.08,459.58Q738.46,469.92 738.46,480Q738.46,489.31 737.69,499.65Q736.92,510 734.15,524.69L827.92,595L753.31,725L646.08,678.85Q627.39,694.54 608.46,705.77Q589.54,717 569.08,723.54L554.62,840L405.38,840ZM478.92,580Q520.77,580 549.85,550.92Q578.92,521.85 578.92,480Q578.92,438.15 549.85,409.08Q520.77,380 478.92,380Q436.85,380 407.88,409.08Q378.92,438.15 378.92,480Q378.92,521.85 407.88,550.92Q436.85,580 478.92,580Z"/>
+</vector>

app/src/main/res/layout/activity_add_source.xml

@@ -110,6 +110,7 @@
 
             <!--Security Warnings-->
             <LinearLayout
+                android:id="@+id/container_source_warnings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">

app/src/main/res/layout/activity_add_source_options.xml

@@ -55,6 +55,15 @@
         app:buttonText="@string/install_by_qr"
         app:buttonSubText="@string/install_a_plugin_by_scanning_a_qr_code"
         app:buttonIcon="@drawable/ic_qr" />
+    <com.futo.platformplayer.views.buttons.BigButton
+        android:id="@+id/option_browse"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        app:buttonText="Browse Online Sources"
+        app:buttonSubText="Install a plugin by browsing official plugins"
+        app:buttonIcon="@drawable/ic_explore" />
     <com.futo.platformplayer.views.buttons.BigButton
         android:id="@+id/option_url"
         android:layout_width="match_parent"

app/src/main/res/layout/activity_main.xml

@@ -70,4 +70,13 @@
         android:visibility="gone"
         android:elevation="15dp">
     </FrameLayout>
+    <com.futo.platformplayer.views.ToastView
+        android:id="@+id/toast_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="50dp"
+        android:elevation="30dp"
+        app:layout_constraintLeft_toLeftOf="@id/fragment_main"
+        app:layout_constraintRight_toRightOf="@id/fragment_main"
+        app:layout_constraintBottom_toBottomOf="@id/fragment_main" />
 </androidx.constraintlayout.motion.widget.MotionLayout>

app/src/main/res/layout/dialog_casting_connect.xml

@@ -81,43 +81,38 @@
 
         <TextView
             android:id="@+id/text_remembered_devices"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight="3"
             android:layout_height="wrap_content"
             android:text="@string/remembered_devices"
             android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
             android:textSize="14dp"
+            android:ellipsize="end"
             android:textColor="@color/white"
+            android:maxLines="1"
             android:fontFamily="@font/inter_regular" />
 
-        <Button
+        <ImageButton
             android:id="@+id/button_scan_qr"
-            android:layout_width="0dp"
+            android:layout_width="40dp"
-            android:layout_weight="1.7"
+            android:layout_height="40dp"
-            android:layout_height="wrap_content"
+            android:scaleType="centerCrop"
-            android:text="@string/scan_qr"
+            app:srcCompat="@drawable/ic_qr"
-            android:textSize="14dp"
+            app:tint="@color/primary" />
-            android:textAlignment="center"
-            android:layout_marginEnd="2dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:fontFamily="@font/inter_regular"
-            android:textColor="@color/colorPrimary"
-            android:background="@color/transparent" />
 
-        <Button
+        <Space android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <ImageButton
             android:id="@+id/button_add"
-            android:layout_width="0dp"
+            android:layout_width="40dp"
-            android:layout_weight="1"
+            android:layout_height="40dp"
-            android:layout_height="wrap_content"
+            android:scaleType="centerCrop"
-            android:text="@string/add"
+            app:srcCompat="@drawable/ic_add"
-            android:textSize="14dp"
+            app:tint="@color/primary"
-            android:textAlignment="textEnd"
+            android:layout_marginEnd="20dp"/>
-            android:layout_marginEnd="2dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:fontFamily="@font/inter_regular"
-            android:textColor="@color/colorPrimary"
-            android:background="@color/transparent" />
     </LinearLayout>
 
     <LinearLayout

app/src/main/res/layout/dialog_multi_button.xml

@@ -38,12 +38,12 @@
             android:id="@+id/dialog_text_details"
             android:layout_width="match_parent"
             android:textColor="#AAAAAA"
-            android:fontFamily="@font/inter_regular"
+            android:fontFamily="@font/inter_light"
             android:text=""
             android:textAlignment="center"
             android:layout_marginStart="30dp"
             android:layout_marginEnd="30dp"
-            android:textSize="11dp"
+            android:textSize="13dp"
             android:layout_height="wrap_content" />
         <TextView
             android:id="@+id/dialog_text_code"

app/src/main/res/layout/fragment_comments.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:id="@+id/layout_header"
@@ -65,7 +65,8 @@
         android:id="@+id/replies_overlay"
         android:visibility="gone"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:clickable="true" />
 
     <LinearLayout android:id="@+id/layout_not_logged_in"
         android:layout_width="match_parent"

app/src/main/res/layout/fragment_downloads.xml

@@ -128,13 +128,17 @@
                     tools:text="(7 playlists, 85 videos)"
                     />
             </LinearLayout>
-            <LinearLayout
+            <HorizontalScrollView
-                android:orientation="horizontal"
-                android:id="@+id/downloads_playlist_list"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                <!--Fill Programmatically-->
+                <LinearLayout
-            </LinearLayout>
+                    android:orientation="horizontal"
+                    android:id="@+id/downloads_playlist_list"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                    <!--Fill Programmatically-->
+                </LinearLayout>
+            </HorizontalScrollView>
         </LinearLayout>
 
         <!--Videos-->

app/src/main/res/layout/fragment_sources.xml

@@ -17,6 +17,40 @@
             android:orientation="vertical"
             android:paddingStart="20dp"
             android:paddingEnd="20dp">
+
+            <LinearLayout
+                android:id="@+id/no_sources"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:srcCompat="@drawable/ic_error"
+                        app:tint="#FFF" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textColor="#FFF"
+                        android:textSize="12dp"
+                        android:fontFamily="@font/inter_light"
+                        android:text="@string/no_sources_installed"
+                        android:layout_gravity="center"
+                        android:layout_marginStart="8dp"/>
+
+                </LinearLayout>
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/container_enabled"
                 android:layout_width="match_parent"
@@ -91,6 +125,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:id="@+id/plugin_disclaimer"
                 android:orientation="horizontal"
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp">
@@ -113,6 +148,15 @@
 
             </LinearLayout>
 
+            <com.futo.platformplayer.views.buttons.BigButton
+                android:id="@+id/button_add_sources"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:buttonIcon="@drawable/ic_explore"
+                app:buttonText="Add Sources"
+                app:buttonSubText="Install new sources to see more content."
+                />
+
         </LinearLayout>
     </ScrollView>
 

app/src/main/res/layout/fragment_subscriptions_group.xml

@@ -180,20 +180,28 @@
         android:layout_height="0dp"
         app:layout_constraintTop_toBottomOf="@id/container_top"
         app:layout_constraintBottom_toTopOf="@id/button_creator_add"
-        android:layout_marginTop="10dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:paddingTop="10dp"
         android:paddingBottom="10dp" />
 
-    <Button
+    <FrameLayout
         android:id="@+id/button_creator_add"
         android:layout_width="match_parent"
         android:background="@drawable/background_button_primary"
         android:layout_height="50dp"
-        android:layout_margin="10dp"
+        android:layout_marginStart="5dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginEnd="5dp"
-        android:text="Add Creator" />
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="10dp"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fontFamily="@font/inter_regular"
+            android:text="@string/add_creator"
+            android:textSize="16dp"
+            android:layout_gravity="center"
+            android:gravity="center" />
+    </FrameLayout>
 
     <FrameLayout
         android:id="@+id/overlay"

app/src/main/res/layout/list_video_preview.xml

@@ -128,7 +128,7 @@
                 android:layout_marginTop="2dp"
                 android:gravity="top"
                 android:orientation="horizontal"
-                android:paddingBottom="5dp">
+                android:paddingBottom="0dp">
 
                 <com.futo.platformplayer.views.others.CreatorThumbnail
                     android:id="@+id/creator_thumbnail"
@@ -179,6 +179,7 @@
                         android:gravity="center_vertical"
                         android:maxLines="1"
                         android:textColor="@color/gray_e0"
+                        android:layout_marginBottom="5dp"
                         android:textSize="12dp"
                         tools:text="57K views • 1 day ago" />
                 </LinearLayout>