From 4a6deb3b44441a2eee7f8a0f34ed1b0d68c965b6 Mon Sep 17 00:00:00 2001
From: Nick Bisby <nbisby@gmail.com>
Date: Sat, 24 Oct 2020 17:50:07 -0500
Subject: [PATCH 1/3] Add a favorites filter to movies

---
 components/ItemGrid2/ItemGrid2.brs       | 18 +++++++++++-
 components/ItemGrid2/ItemGridOptions.brs | 35 +++++++++++++++++++++++-
 components/ItemGrid2/ItemGridOptions.xml |  8 ++----
 components/ItemGrid2/LoadItemsTask2.brs  |  9 +++++-
 components/ItemGrid2/LoadItemsTask2.xml  |  3 +-
 source/ShowScenes.brs                    |  2 +-
 6 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/components/ItemGrid2/ItemGrid2.brs b/components/ItemGrid2/ItemGrid2.brs
index 0a8a3f9c..e32eb54d 100644
--- a/components/ItemGrid2/ItemGrid2.brs
+++ b/components/ItemGrid2/ItemGrid2.brs
@@ -29,6 +29,8 @@ sub init()
   m.sortField = "SortName"
   m.sortAscending = true
 
+  m.filter = "All"
+
   m.loadItemsTask = createObject("roSGNode", "LoadItemsTask2")
   m.loadItemsTask.observeField("content", "ItemDataLoaded")
 
@@ -45,6 +47,7 @@ sub loadInitialItems()
   m.loadItemsTask.itemId = m.top.parentItem.Id
   m.loadItemsTask.sortField = m.sortField
   m.loadItemsTask.sortAscending = m.sortAscending
+  m.loadItemsTask.filter = m.filter
   m.loadItemsTask.startIndex = 0
 
   if m.top.parentItem.collectionType = "movies" then
@@ -70,7 +73,9 @@ sub SetUpOptions()
 
   'Movies
   if m.top.parentItem.collectionType = "movies" then
-    options.views = [{ "Title": tr("Movies"), "Name": "movies" }]
+    options.views = [
+      { "Title": tr("Movies"), "Name": "movies" },
+    ]
     options.sort = [
       { "Title": tr("TITLE"), "Name": "SortName" },
       { "Title": tr("IMDB_RATING"), "Name": "CommunityRating" },
@@ -82,6 +87,10 @@ sub SetUpOptions()
       { "Title": tr("RELEASE_DATE"), "Name": "PremiereDate" },
       { "Title": tr("RUNTIME"), "Name": "Runtime" }
     ]
+    options.filter = [
+      { "Title": tr("All"), "Name": "All", "selected": true },
+      { "Title": tr("Favorites"), "Name": "Favorites" }
+    ]
   'TV Shows
   else if m.top.parentItem.collectionType = "tvshows" then
     options.views = [{ "Title": tr("Shows"), "Name": "shows" }]
@@ -237,6 +246,13 @@ sub optionsClosed()
     m.data = CreateObject("roSGNode", "ContentNode")
     m.itemGrid.content = m.data
     loadInitialItems()
+  else if m.options.filter <> m.filter then
+    m.filter = m.options.filter
+    m.loadedRows = 0
+    m.loadedItems = 0
+    m.data = CreateObject("roSGNode", "ContentNode")
+    m.itemGrid.content = m.data
+    loadInitialItems()
   end if
   m.itemGrid.setFocus(true)
 end sub
diff --git a/components/ItemGrid2/ItemGridOptions.brs b/components/ItemGrid2/ItemGridOptions.brs
index cc54a1ff..edffb75a 100644
--- a/components/ItemGrid2/ItemGridOptions.brs
+++ b/components/ItemGrid2/ItemGridOptions.brs
@@ -14,6 +14,7 @@ sub init()
 
   m.viewNames = []
   m.sortNames = []
+  m.filterNames = []
 
   ' Animation
   m.fadeAnim = m.top.findNode("fadeAnim")
@@ -78,6 +79,33 @@ sub optionsSet()
     end if
   end if
 
+  ' Filter Tab
+  if m.top.options.filter <> invalid then
+    filterContent = CreateObject("roSGNode", "ContentNode")
+    index = 0
+    m.selectedFilterIndex = 0
+
+    for each filterItem in m.top.options.filter
+      entry = filterContent.CreateChild("ContentNode")
+      entry.title = filterItem.Title
+      m.filterNames.push(filterItem.Name)
+      if filterItem.selected <> invalid and filterItem.selected = true then
+        m.selectedFilterIndex = index
+      end if
+      index = index + 1
+    end for
+    m.menus[2].content = filterContent
+    m.menus[2].checkedItem = m.selectedFilterIndex
+  else
+    filterContent = CreateObject("roSGNode", "ContentNode")
+    entry = filterContent.CreateChild("ContentNode")
+    entry.title = "All"
+    m.filterNames.push("All")
+    m.menus[2].content = filterContent
+    m.menus[2].checkedItem = 0
+  end if
+
+
 end sub
 
 ' Switch menu shown when button focus changes
@@ -106,8 +134,8 @@ function onKeyEvent(key as string, press as boolean) as boolean
 
     return true
   else if key = "OK"
-    ' Handle Sort screen
     if(m.menus[m.selectedItem].isInFocusChain()) then
+      ' Handle Sort screen
       if(m.selectedItem = 1) then
         if m.menus[1].itemSelected <> m.selectedSortIndex then
           m.menus[1].focusedCheckedIconUri = m.global.constants.icons.ascending_black
@@ -129,6 +157,11 @@ function onKeyEvent(key as string, press as boolean) as boolean
           end if
         end if
       end if
+      ' Handle Filter screen
+      if(m.selectedItem = 2) then
+        m.selectedFilterIndex = m.menus[2].itemSelected
+        m.top.filter = m.filterNames[m.selectedFilterIndex]
+      end if
     end if
     return true
   else if key = "back" or key = "up"
diff --git a/components/ItemGrid2/ItemGridOptions.xml b/components/ItemGrid2/ItemGridOptions.xml
index 8fbbab9e..28907179 100644
--- a/components/ItemGrid2/ItemGridOptions.xml
+++ b/components/ItemGrid2/ItemGridOptions.xml
@@ -11,11 +11,8 @@
           </RadiobuttonList>
           <RadiobuttonList id="sortMenu" itemspacing="[0,10]" vertFocusAnimationStyle="floatingFocus" opacity="1" numRows="8" drawFocusFeedback="false">
           </RadiobuttonList>
-          <LabelList id = "filterMenu" itemspacing="[0,10]" vertFocusAnimationStyle="floatingFocus" opacity="0" drawFocusFeedback="false">
-            <ContentNode id = "filterMenuContent" role = "content">
-              <ContentNode title = "Coming Soon..." />
-            </ContentNode>
-          </LabelList>
+          <RadiobuttonList id="filterMenu" itemspacing="[0,10]" vertFocusAnimationStyle="floatingFocus" opacity="0" drawFocusFeedback="false">
+          </RadiobuttonList>
         </Group>
       </LayoutGroup>
     </Group>
@@ -33,6 +30,7 @@
     <field id="view" type="string" />
     <field id="sortField" type="string" value="SortName" />
     <field id="sortAscending" type="boolean" value="false" />
+    <field id="filter" type="string" value="All" />
 
   </interface>
   <script type="text/brightscript" uri="ItemGridOptions.brs" />
diff --git a/components/ItemGrid2/LoadItemsTask2.brs b/components/ItemGrid2/LoadItemsTask2.brs
index 743f1444..74b884d8 100644
--- a/components/ItemGrid2/LoadItemsTask2.brs
+++ b/components/ItemGrid2/LoadItemsTask2.brs
@@ -14,6 +14,7 @@ sub loadItems()
     sort_order = "Descending"
   end if
 
+
   params = {
     limit: m.top.limit,
     StartIndex: m.top.startIndex,
@@ -24,6 +25,13 @@ sub loadItems()
     Fields: "Overview"
   }
 
+  filter = m.top.filter
+  if filter = "All" or filter = "all" then
+    ' do nothing
+  else if filter = "Favorites" then
+    params.append({ Filters: "IsFavorite"})
+  end if
+
   if m.top.ItemType <> "" then
     params.append({ IncludeItemTypes: m.top.ItemType})
   end if
@@ -53,7 +61,6 @@ sub loadItems()
       tmp = CreateObject("roSGNode", "ChannelData")
     else
       print "Unknown Type: " item.Type
-
     end if
 
     if tmp <> invalid then
diff --git a/components/ItemGrid2/LoadItemsTask2.xml b/components/ItemGrid2/LoadItemsTask2.xml
index 7dc630b0..15970b87 100644
--- a/components/ItemGrid2/LoadItemsTask2.xml
+++ b/components/ItemGrid2/LoadItemsTask2.xml
@@ -9,7 +9,8 @@
     <field id="metadata" type="associativearray" />
     <field id="sortField" type="string" value="SortName" />
     <field id="sortAscending" type="boolean" value="true" />
-    
+    <field id="filter" type="string" value="All" />
+
     <!-- Total records available from server-->
     <field id="totalRecordCount" type="int" value="-1" />
     <field id="content" type="array" />
diff --git a/source/ShowScenes.brs b/source/ShowScenes.brs
index f89b7575..1eb4d6d9 100644
--- a/source/ShowScenes.brs
+++ b/source/ShowScenes.brs
@@ -235,7 +235,7 @@ function CreateMovieListGroup(libraryItem)
   sidepanel.options = new_options
   sidepanel.observeField("closeSidePanel", m.port)
 
-    return group
+  return group
 end function
 
 function CreateMovieDetailsGroup(movie)

From 836a80d8573d3496bb293910cd6b1c571aa40fad Mon Sep 17 00:00:00 2001
From: Nick Bisby <nbisby@gmail.com>
Date: Sat, 24 Oct 2020 17:59:41 -0500
Subject: [PATCH 2/3] Re-select proper filter

---
 components/ItemGrid2/ItemGrid2.brs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/ItemGrid2/ItemGrid2.brs b/components/ItemGrid2/ItemGrid2.brs
index e32eb54d..a30757f5 100644
--- a/components/ItemGrid2/ItemGrid2.brs
+++ b/components/ItemGrid2/ItemGrid2.brs
@@ -88,7 +88,7 @@ sub SetUpOptions()
       { "Title": tr("RUNTIME"), "Name": "Runtime" }
     ]
     options.filter = [
-      { "Title": tr("All"), "Name": "All", "selected": true },
+      { "Title": tr("All"), "Name": "All" },
       { "Title": tr("Favorites"), "Name": "Favorites" }
     ]
   'TV Shows
@@ -118,6 +118,12 @@ sub SetUpOptions()
     end if
   end for
 
+  for each o in options.filter
+    if o.Name = m.filter then
+      o.Selected = true
+    end if
+  end for
+
   m.options.options = options
 
 end sub

From 42ea79529d45f566e6491d14cc5683684cbc023c Mon Sep 17 00:00:00 2001
From: Nick Bisby <nbisby@gmail.com>
Date: Mon, 26 Oct 2020 13:27:53 -0500
Subject: [PATCH 3/3] Do both reloads in a single go

---
 components/ItemGrid2/ItemGrid2.brs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/components/ItemGrid2/ItemGrid2.brs b/components/ItemGrid2/ItemGrid2.brs
index a30757f5..0a7e9442 100644
--- a/components/ItemGrid2/ItemGrid2.brs
+++ b/components/ItemGrid2/ItemGrid2.brs
@@ -244,16 +244,17 @@ end sub
 '
 'Check if options updated and any reloading required
 sub optionsClosed()
+  reload = false
   if m.options.sortField <> m.sortField or m.options.sortAscending <> m.sortAscending then
     m.sortField = m.options.sortField
     m.sortAscending = m.options.sortAscending
-    m.loadedRows = 0
-    m.loadedItems = 0
-    m.data = CreateObject("roSGNode", "ContentNode")
-    m.itemGrid.content = m.data
-    loadInitialItems()
-  else if m.options.filter <> m.filter then
+    reload = true
+  end if
+  if m.options.filter <> m.filter then
     m.filter = m.options.filter
+    reload = true
+  end if
+  if reload
     m.loadedRows = 0
     m.loadedItems = 0
     m.data = CreateObject("roSGNode", "ContentNode")