Merge branch 'master' into dont-use-progressDialog

Author: cewert

.github/workflows/build-prod.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Save old manifest version
         run: echo "oldManVersion=${{ env.oldMajor }}.${{ env.oldMinor }}.${{ env.oldBuild }}" >> $GITHUB_ENV
       - name: Save old Makefile version
-        run: awk 'BEGIN { FS=" = " } /^VERSION/ { print "oldMakeVersion="$2; }' Makefile >> $GITHUB_ENV
+        run: awk 'BEGIN { FS=" := " } /^VERSION/ { print "oldMakeVersion="$2; }' Makefile >> $GITHUB_ENV
       - name: Checkout PR branch
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - name: Save new package.json version
@@ -51,7 +51,7 @@ jobs:
         if: env.oldManVersion == env.newManVersion
         run: exit 1
       - name: Save new Makefile version
-        run: awk 'BEGIN { FS=" = " } /^VERSION/ { print "newMakeVersion="$2; }' Makefile >> $GITHUB_ENV
+        run: awk 'BEGIN { FS=" := " } /^VERSION/ { print "newMakeVersion="$2; }' Makefile >> $GITHUB_ENV
       - name: Makefile version must be updated
         if: env.oldMakeVersion == env.newMakeVersion
         run: exit 1

.github/workflows/deploy-api-docs.yml

@@ -32,12 +32,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - name: Setup Pages
-        uses: actions/configure-pages@f156874f8191504dae5b037505266ed5dda6c382 # v3
+        uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4
       - name: Upload artifact
         uses: actions/upload-pages-artifact@a753861a5debcf57bf8b404356158c8e1e33150c # v2
         with:
           # Only upload the api docs folder
           path: "docs/api"
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@9dbe3824824f8a1377b8e298bafde1a50ede43e5 # v2
+        uses: actions/deploy-pages@77d7344265e1f960dab5c00dbff52287a70b0d4f # v3

.github/workflows/roku-analysis.yml

@@ -27,7 +27,7 @@ jobs:
         if: env.BRANCH_NAME == 'master'
         run: npm run build-prod
       - name: Use Java 17
-        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
         with:
           distribution: "temurin"
           java-version: "17"

.vscode/settings.json

@@ -18,4 +18,4 @@
     "docs/api/**": true
   },
   "brightscriptcomment.addExtraAtStartAndEnd": false
-}
+}

Makefile

@@ -3,7 +3,7 @@
 # If you want to get_images, you'll also need convert from ImageMagick
 ##########################################################################
 
-VERSION := 1.6.6
+VERSION := 2.0.0
 
 ## usage
 

components/ItemGrid/ItemGrid.bs

@@ -569,8 +569,9 @@ end sub
 '
 'Load next set of items
 sub loadMoreData()
-    startLoadingSpinner(false)
     if m.Loading = true then return
+
+    startLoadingSpinner(false)
     m.Loading = true
     m.loadItemsTask.startIndex = m.loadedItems
     m.loadItemsTask.observeField("content", "ItemDataLoaded")

components/ItemGrid/MovieLibraryView.bs

@@ -687,8 +687,9 @@ end sub
 '
 'Load next set of items
 sub loadMoreData()
-    startLoadingSpinner(false)
     if m.Loading = true then return
+
+    startLoadingSpinner(false)
     m.Loading = true
     m.loadItemsTask.startIndex = m.loadedItems
     m.loadItemsTask.observeField("content", "ItemDataLoaded")

components/ItemGrid/MusicLibraryView.bs

@@ -108,7 +108,7 @@ end sub
 'Load initial set of Data
 sub loadInitialItems()
     m.loadItemsTask.control = "stop"
-    startLoadingSpinner()
+    startLoadingSpinner(false)
 
     if LCase(m.top.parentItem.json.Type) = "collectionfolder"
         m.top.HomeLibraryItem = m.top.parentItem.Id
@@ -550,8 +550,9 @@ end sub
 '
 'Load next set of items
 sub loadMoreData()
-    startLoadingSpinner(false)
     if m.Loading = true then return
+
+    startLoadingSpinner(false)
     m.Loading = true
     m.loadItemsTask.startIndex = m.loadedItems
     m.loadItemsTask.observeField("content", "ItemDataLoaded")

components/WhatsNewDialog.bs

@@ -5,7 +5,7 @@ sub init()
 
     m.top.id = "OKDialog"
     m.top.height = 900
-    m.top.title = "What's New?"
+    m.top.title = m.global.app.version + " - " + tr("What's New?")
     m.top.buttons = [tr("OK")]
 
     dialogStyles = {
@@ -21,7 +21,7 @@ sub init()
         }
     }
 
-    whatsNewList = ParseJSON(ReadAsciiFile("pkg:/source/static/whatsNew.json"))
+    whatsNewList = ParseJSON(ReadAsciiFile("pkg:/source/static/whatsNew/" + m.global.app.version.ToStr().trim() + ".json"))
 
     for each item in whatsNewList
         textLine = m.content.CreateChild("StdDlgMultiStyleTextItem")

components/data/SceneManager.bs

@@ -1,4 +1,5 @@
 import "pkg:/source/roku_modules/log/LogMixin.brs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.log = log.Logger("SceneManager")
@@ -120,7 +121,7 @@ sub popScene()
         ' Exit app if the stack is empty after removing group
         m.scene.exit = true
     end if
-
+    stopLoadingSpinner()
 end sub
 
 

components/home/Home.bs

@@ -9,18 +9,25 @@ sub init()
     m.top.optionsAvailable = true
     m.postTask = createObject("roSGNode", "PostTask")
 
+    m.homeRows = m.top.findNode("homeRows")
+
+    m.fadeInFocusBitmap = m.top.findNode("fadeInFocusBitmap")
+
     if m.global.session.user.settings["ui.home.splashBackground"] = true
         m.backdrop = m.top.findNode("backdrop")
         m.backdrop.uri = buildURL("/Branding/Splashscreen?format=jpg&foregroundLayer=0.15&fillWidth=1280&width=1280&fillHeight=720&height=720&tag=splash")
     end if
 end sub
 
 sub refresh()
-    m.top.findNode("homeRows").callFunc("updateHomeRows")
+    m.homeRows.focusBitmapBlendColor = "0xFFFFFFFF"
+    m.homeRows.callFunc("updateHomeRows")
 end sub
 
 sub loadLibraries()
-    m.top.findNode("homeRows").callFunc("loadLibraries")
+    m.homeRows.focusBitmapBlendColor = "0xFFFFFF00"
+    m.homeRows.callFunc("loadLibraries")
+    m.fadeInFocusBitmap.control = "start"
 end sub
 
 ' JFScreen hook that gets ran as needed.

components/home/Home.xml

@@ -2,8 +2,12 @@
 <component name="Home" extends="JFScreen">
   <children>
     <Poster id="backdrop" loadDisplayMode="scaleToZoom" width="1920" height="1200" />
-    <HomeRows id="homeRows" />
+    <HomeRows id="homeRows" focusBitmapBlendColor="0xFFFFFF00" />
     <OptionsSlider id="options" />
+
+    <Animation id="fadeInFocusBitmap" delay="1" duration=".2" repeat="false" easeFunction="inQuad">
+      <ColorFieldInterpolator id="fadeInFocusBitmapInterpolator" key="[0.0, 1.0]" keyValue="[0xFFFFFF00, 0xFFFFFFFF]" fieldToInterp="homeRows.focusBitmapBlendColor" />
+    </Animation>
   </children>
   <interface>
     <field id="selectedItem" alias="homeRows.selectedItem" />

components/home/HomeItem.bs

@@ -28,6 +28,7 @@ end sub
 
 
 sub itemContentChanged()
+    m.unplayedCount.visible = false
     itemData = m.top.itemContent
     if itemData = invalid then return
 
@@ -65,6 +66,10 @@ sub itemContentChanged()
 
     ' Format the Data based on the type of Home Data
     if itemData.type = "CollectionFolder" or itemData.type = "UserView" or itemData.type = "Channel"
+        m.itemText.font.size = 35
+        m.itemText.height = 64
+        m.itemText.horizAlign = "center"
+        m.itemText.vertAlign = "bottom"
         m.itemText.text = itemData.name
         m.itemPoster.uri = itemData.widePosterURL
         return

components/home/HomeRow.xml

@@ -2,6 +2,7 @@
 <component name="HomeRow" extends="ContentNode">
   <interface>
     <field id="imageWidth" type="integer" value="464" />
+    <field id="cursorSize" type="array" value="[464, 331]" />
     <field id="usePoster" type="bool" value="false" />
   </interface>
 </component>