Continue watching

playlet-lib/src/components/ContentNode/FeedContentNode.bs

@@ -0,0 +1,21 @@
+import "pkg:/components/VideoFeed/VideoRowCell/FeedContentNodeUtils.bs"
+import "pkg:/source/utils/Types.bs"
+
+function OnReactivity()
+    if m.reactivity <> invalid
+        for each item in m.reactivity
+            item.node.unobserveFieldScoped(item.field)
+        end for
+    end if
+
+    m.reactivity = m.top.reactivity
+    if m.reactivity <> invalid
+        for each item in m.reactivity
+            item.node.observeFieldScoped(item.field, FuncName(ResetNode))
+        end for
+    end if
+end function
+
+function ResetNode()
+    FeedContentNodeUtils.ResetSelf(m.top)
+end function

playlet-lib/src/components/ContentNode/FeedContentNode.xml

@@ -3,5 +3,6 @@
         <field id="feedSources" type="array" />
         <field id="feedSourcesIndex" type="integer" />
         <field id="loadState" type="string" />
+        <field id="reactivity" type="array" onChange="OnReactivity" />
     </interface>
 </component>

playlet-lib/src/components/ContentNode/VideoContentNode.xml

@@ -5,6 +5,7 @@
         <field id="index" type="integer" value="-1" />
         <!-- index in a feed -->
         <field id="feedSourcesIndex" type="integer" value="-1" />
+        <field id="progressNode" type="node" />
 
         <field id="author" type="string" />
         <field id="authorId" type="string" />

playlet-lib/src/components/ContentNode/VideoProgressContentNode.xml

@@ -0,0 +1,11 @@
+<component name="VideoProgressContentNode" extends="ContentNode">
+    <interface>
+        <field id="videoId" type="string" />
+        <!-- The date of watching the video as a unix timestamp -->
+        <field id="date" type="integer" />
+        <!-- The progress in seconds -->
+        <field id="timestamp" type="integer" />
+        <!-- The duration in seconds -->
+        <field id="duration" type="integer" />
+    </interface>
+</component>

playlet-lib/src/components/MainScene.transpiled.xml

@@ -44,6 +44,7 @@
             <Preferences id="Preferences" />
             <Bookmarks id="Bookmarks" />
             <SearchHistory id="SearchHistory" />
+            <ContinueWatching id="ContinueWatching" />
             <Invidious id="Invidious" />
             <PlayletWebServer id="WebServer" port="8888" />
         </AppController>

playlet-lib/src/components/MainScene.xml

@@ -52,12 +52,15 @@
             <PlayQueue id="PlayQueue"
                 invidious="bind:../Invidious"
                 notifications="bind:../Notifications"
-                preferences="bind:../Preferences" />
+                preferences="bind:../Preferences"
+                continueWatching="bind:../ContinueWatching" />
             <ApplicationInfo id="ApplicationInfo" />
             <Preferences id="Preferences" />
             <Bookmarks id="Bookmarks" />
             <SearchHistory id="SearchHistory"
                 preferences="bind:../Preferences" />
+            <ContinueWatching id="ContinueWatching"
+                preferences="bind:../Preferences" />
 
             <Invidious id="Invidious"
                 webServer="bind:../WebServer"
@@ -72,7 +75,8 @@
                 invidious="bind:../Invidious"
                 preferences="bind:../Preferences"
                 playQueue="bind:../PlayQueue"
-                bookmarks="bind:../Bookmarks" />
+                bookmarks="bind:../Bookmarks"
+                continueWatching="bind:../ContinueWatching" />
         </AppController>
     </children>
 </component>

playlet-lib/src/components/MainScene_bindings.transpiled.brs

@@ -16,11 +16,15 @@ function InitializeBindings()
             "PlayQueue": {
                 "invidious": "../Invidious", 
                 "notifications": "../Notifications", 
-                "preferences": "../Preferences"
+                "preferences": "../Preferences", 
+                "continueWatching": "../ContinueWatching"
             }, 
             "SearchHistory": {
                 "preferences": "../Preferences"
             }, 
+            "ContinueWatching": {
+                "preferences": "../Preferences"
+            }, 
             "Invidious": {
                 "webServer": "../WebServer", 
                 "applicationInfo": "../ApplicationInfo", 
@@ -32,7 +36,8 @@ function InitializeBindings()
                 "invidious": "../Invidious", 
                 "preferences": "../Preferences", 
                 "playQueue": "../PlayQueue", 
-                "bookmarks": "../Bookmarks"
+                "bookmarks": "../Bookmarks", 
+                "continueWatching": "../ContinueWatching"
             }
         }
     }

playlet-lib/src/components/PlayQueue/PlayQueue.bs

@@ -192,6 +192,7 @@ function LoadPlaylist(playlist as object) as void
     task = AsyncTask.Start(Tasks.PlaylistContentTask, {
         content: playlist
         invidious: m.top.invidious
+        continueWatchingContent: m.top.continueWatching.content
     }, OnPlaylistContentTaskResult)
     m.pendingLoadTasks[task.id] = task
 end function

playlet-lib/src/components/PlayQueue/PlayQueue.xml

@@ -4,6 +4,7 @@
         <field id="index" type="integer" value="-1" onChange="OnIndexChange" />
         <field id="playlistIndex" type="integer" value="-1" />
         <field id="invidious" type="node" />
+        <field id="continueWatching" type="node" />
         <field id="notifications" type="node" />
         <field id="preferences" type="node" />
         <function name="Play" />

playlet-lib/src/components/PlaylistView/PlaylistContentTask.bs

@@ -6,6 +6,7 @@ import "pkg:/components/Services/Invidious/InvidiousToContentNode.bs"
 function PlaylistContentTask(input as object) as object
     contentNode = input.content
     invidiousNode = input.invidious
+    continueWatchingContent = input.continueWatchingContent
 
     if m.top.cancel
         contentNode.loadState = FeedLoadState.None
@@ -33,7 +34,7 @@ function PlaylistContentTask(input as object) as object
     end if
 
     instance = service.GetInstance()
-    InvidiousContent.ToPlaylistContentNode(contentNode, metadata, instance)
+    InvidiousContent.ToPlaylistContentNode(contentNode, metadata, instance, continueWatchingContent)
 
     childCount = contentNode.getChildCount()
     if metadata.videos.Count() > 0 or childCount < metadata.videoCount

playlet-lib/src/components/PlaylistView/PlaylistView.bs

@@ -226,6 +226,7 @@ function LoadPlaylist() as void
     m.playlistLoadTask = AsyncTask.Start(Tasks.PlaylistContentTask, {
         content: m.top.content
         invidious: m.top.invidious
+        continueWatchingContent: m.top.continueWatching.content
     }, OnPlaylistContentTaskResult)
 end function
 

playlet-lib/src/components/PlaylistView/PlaylistView.xml

@@ -5,6 +5,7 @@
         <field id="invidious" type="node" bind="/Invidious" />
         <field id="playQueue" type="node" bind="/PlayQueue" />
         <field id="bookmarks" type="node" bind="/Bookmarks" />
+        <field id="continueWatching" type="node" bind="/ContinueWatching" />
         <function name="OpenPlaylistChannel" />
     </interface>
     <children>

playlet-lib/src/components/PlaylistView/PlaylistViewCell.bs

@@ -4,6 +4,7 @@ import "pkg:/source/utils/Types.bs"
 function Init()
     m.durationRect = m.top.FindNode("durationRect")
     m.durationLabel = m.top.FindNode("durationLabel")
+    m.progressRect = m.top.FindNode("progressRect")
 end function
 
 function OnContentSet() as void
@@ -23,6 +24,8 @@ function OnContentSet() as void
     else
         m.top.durationRectVisible = false
     end if
+
+    SetupProgress(content)
 end function
 
 function SetDurationText(text as string) as void
@@ -41,3 +44,31 @@ function SetDurationText(text as string) as void
     rect.width = size.width + 16
     rect.translation = [rectParent.width - rect.width, rect.translation[1]]
 end function
+
+function SetupProgress(content as object)
+    if m.progressNode <> invalid
+        m.progressNode.unobserveFieldScoped("timestamp")
+        m.progressNode = invalid
+    end if
+
+    m.progressNode = content.progressNode
+    if m.progressNode <> invalid
+        m.progressNode.observeFieldScoped("timestamp", FuncName(SetProgress))
+    end if
+    SetProgress()
+end function
+
+function SetProgress() as void
+    if m.progressNode = invalid
+        m.progressRect.scale = [0, 1]
+        return
+    end if
+
+    duration = m.progressNode.duration
+    timestamp = m.progressNode.timestamp
+    progress = 0
+    if duration > 0
+        progress = timestamp / duration
+    end if
+    m.progressRect.scale = [progress, 1]
+end function

playlet-lib/src/components/PlaylistView/PlaylistViewCell.xml

@@ -29,7 +29,13 @@
                     font="font:SmallestSystemFont"
                     translation="[8, 0]" />
             </Rectangle>
-
+            <Rectangle
+                id="progressRect"
+                width="190"
+                height="5"
+                color="0xFF0000"
+                translation="[0, 102]"
+                scale="[0.0, 1.0]" />
         </Poster>
 
         <LayoutGroup

playlet-lib/src/components/Screens/SettingsScreen/ClearContinueWatchingControl.bs

@@ -0,0 +1,28 @@
+import "pkg:/components/Dialog/DialogUtils.bs"
+import "pkg:/components/Services/ContinueWatching/ContinueWatchingUtils.bs"
+import "pkg:/source/utils/FocusManagement.bs"
+import "pkg:/source/utils/Types.bs"
+
+function Init()
+    m.top.focusable = true
+    m.top.itemSpacings = [8]
+    m.button = m.top.findNode("Button")
+    m.button.observeField("buttonSelected", FuncName(OnButtonSelected))
+end function
+
+function OnFocusChange() as void
+    if not m.top.focus
+        return
+    end if
+    NodeSetFocus(m.button, true)
+end function
+
+function BindPreference(preferences as object, key as string)
+    ' Do nothing
+end function
+
+function OnButtonSelected()
+    continueWatchingNode = m.top.getScene().findNode("ContinueWatching")
+    ContinueWatchingUtils.Clear(continueWatchingNode)
+    DialogUtils.ShowDialog("Continue watching cleared.", "Success")
+end function

playlet-lib/src/components/Screens/SettingsScreen/ClearContinueWatchingControl.xml

@@ -0,0 +1,19 @@
+<component name="ClearContinueWatchingControl" extends="LayoutGroup" includes="Focus">
+    <interface>
+        <field id="displayText" type="string" alias="Button.text" />
+        <field id="description" type="string" alias="DescriptionLabel.text" />
+        <function name="BindPreference" />
+    </interface>
+    <children>
+        <Button
+            id="Button"
+            minWidth="380"
+            showFocusFootprint="true" />
+        <Label id="DescriptionLabel"
+            width="450"
+            color="0xb4b4b4ff"
+            wrap="true">
+            <Font role="font" uri="font:SystemFontFile" size="18" />
+        </Label>
+    </children>
+</component>

playlet-lib/src/components/Screens/SettingsScreen/HomeScreenEditor/HomeScreenEditor.xml

@@ -19,7 +19,7 @@
             <CheckList
                 id="checkList"
                 vertFocusAnimationStyle="floatingFocus"
-                translation="[164,70]">
+                translation="[165,40]">
 
                 <ContentNode role="content" />
             </CheckList>

playlet-lib/src/components/Screens/SettingsScreen/InvidiousInstance/InvidiousInstanceTesting/InvidiousInstanceTestingTask.bs

@@ -280,7 +280,8 @@ function CanFetchVideoThumbails(instance as string, testNode as object) as void
             return
         end if
 
-        contentNode = InvidiousContent.ToVideoContentNode(invalid, json, instance)
+        continueWatchingContentMock = CreateObject("roSGNode", "ContentNode")
+        contentNode = InvidiousContent.ToVideoContentNode(invalid, json, instance, continueWatchingContentMock)
         thumbnail = contentNode.thumbnail
         if StringUtils.IsNullOrEmpty(thumbnail)
             testNode.state = "failed"