Merge pull request #826 from candry7731/Voice-Filter-on-Live-TV-Fix

Fix Filter reload Issues with Live TV

components/ItemGrid/LoadItemsTask2.brs

@@ -62,14 +62,17 @@ sub loadItems()
         end if
     end if
 
-    if m.top.searchTerm <> ""
+    'reset data
+    if LCase(m.top.searchTerm) = LCase(tr("all"))
+        params.searchTerm = " "
+    else if m.top.searchTerm <> ""
         params.searchTerm = m.top.searchTerm
     end if
 
-    filter = m.top.filter
-    if filter = "All" or filter = "all"
+    filter = LCase(m.top.filter)
+    if filter = "all"
         ' do nothing
-    else if filter = "Favorites"
+    else if filter = "favorites"
         params.append({ Filters: "IsFavorite" })
         params.append({ isFavorite: true })
     end if

components/liveTv/schedule.brs

@@ -44,7 +44,14 @@ end sub
 'Voice Search set
 sub channelsearchTermSet()
     m.scheduleGrid.jumpToChannel = 0
-    if m.top.searchTerm <> invalid and m.LoadChannelsTask.searchTerm <> m.top.searchTerm
+    'Reset filter if user says all
+    if LCase(m.top.searchTerm) = LCase(tr("all")) or m.LoadChannelsTask.searchTerm = LCase(tr("all"))
+        m.top.searchTerm = " "
+        m.LoadChannelsTask.searchTerm = " "
+        m.spinner.visible = true
+        m.LoadChannelsTask.control = "RUN"
+        'filter if the searterm is not invalid
+    else if m.top.searchTerm <> invalid and LCase(m.LoadChannelsTask.searchTerm) <> LCase(m.top.searchTerm)
         if m.LoadChannelsTask.state = "run" then m.LoadChannelsTask.control = "stop"
 
         m.LoadChannelsTask.searchTerm = m.top.searchTerm
@@ -279,6 +286,7 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
     if not press then return false
+
     detailsGrp = m.top.findNode("detailsPane")
     gridGrp = m.top.findNode("scheduleGrid")
 

locale/en_US/translations.ts

@@ -855,6 +855,11 @@
             <translation>Unable to find any albums or songs belonging to this artist</translation>
             <extracomment>Popup message when we find no audio data for an artist</extracomment>
         </message>
+        <message>
+            <source>all</source>
+            <translation>all</translation>
+            <extracomment>all will reset the searchTerm so all data will be availible</extracomment>
+        </message>
         <message>
             <source>Aired</source>
             <translation>Aired</translation>