Merge branch 'main' into feature/bookmark

# Conflicts: # playlet-lib/src/components/Logger/Logger.xml
iBicha · Sep 30, 2023 · ab111c5 · ab111c5
2 parents d3774ea + cb877f9
commit ab111c5
Show file tree

Hide file tree

Showing 58 changed files with 27 additions and 135 deletions.
diff --git a/playlet-app/src/components/BootstrapScene/BootstrapScene.xml b/playlet-app/src/components/BootstrapScene/BootstrapScene.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="BootstrapScene" extends="Scene">
     <interface>
         <field id="exitChannel" type="bool" alwaysNotify="true" />

diff --git a/playlet-app/src/components/LoadingIndicator/LoadingIndicator.xml b/playlet-app/src/components/LoadingIndicator/LoadingIndicator.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="LoadingIndicator" extends="Group">
     <children>
         <Rectangle

diff --git a/playlet-lib/src/components/AppController/AppController.xml b/playlet-lib/src/components/AppController/AppController.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="AppController" extends="Group" includes="AutoBind">
     <interface>
         <field id="root" type="node" />

diff --git a/playlet-lib/src/components/AppController/AppRoot.xml b/playlet-lib/src/components/AppController/AppRoot.xml
@@ -1,4 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="AppRoot" extends="Group" includes="Focus">
 </component>
diff --git a/playlet-lib/src/components/Dialog/LoginDialog.xml b/playlet-lib/src/components/Dialog/LoginDialog.xml
@@ -26,11 +26,11 @@
                 <Font role="font" uri="font:SystemFontFile" size="24" />
             </Label>
             <Poster
-                id='QrCodePoster'
-                width='300'
-                height='300'
-                loadWidth='300'
-                loadHeight='300'
+                id="QrCodePoster"
+                width="300"
+                height="300"
+                loadWidth="300"
+                loadHeight="300"
                 translation="[50, 50]" />
             <Label
                 id="urlLabel"

diff --git a/playlet-lib/src/components/Dialog/SimpleDialog.xml b/playlet-lib/src/components/Dialog/SimpleDialog.xml
@@ -1,4 +1,2 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <component name="SimpleDialog" extends="StandardMessageDialog">
 </component>
diff --git a/playlet-lib/src/components/Logger/Logger.xml b/playlet-lib/src/components/Logger/Logger.xml
@@ -1,10 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<component name='Logger' extends='Task'>
+<component name="Logger" extends="Task">
     <interface>
-        <field id='logLevel' type='int' value='2' />
-        <field id='logLine' type='string' alwaysNotify='true' />
-        <field id='folder' type='string' value='cachefs:/logs' />
-        <field id='filename' type='string' value='app_logs.txt' />
-        <field id='filenamePrevious' type='string' value='app_logs_previous.txt' />
+        <field id="logLevel" type="int" value="2" />
+        <field id="logLine" type="string" />
+        <field id="folder" type="string" value="cachefs:/logs" />
+        <field id="filename" type="string" value="app_logs.txt" />
+        <field id="filenamePrevious" type="string" value="app_logs_previous.txt" />
     </interface>
 </component>
diff --git a/playlet-lib/src/components/MainScene.transpiled.xml b/playlet-lib/src/components/MainScene.transpiled.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <component name="MainScene" extends="Group">
     <interface>
         <field id="bindings" type="assocarray" onChange="OnBindingSetRegisterAutoBind" />

diff --git a/playlet-lib/src/components/MainScene.xml b/playlet-lib/src/components/MainScene.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="MainScene" extends="Group" includes="AutoBind">
     <children>
         <AppController id="AppController" root="bind:./AppRoot" stack="bind:./Stack">

diff --git a/playlet-lib/src/components/NavBar/IconButton.xml b/playlet-lib/src/components/NavBar/IconButton.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <component name="IconButton" extends="Group" includes="Focus">
   <children>
     <Poster id="buttonBackground" uri="pkg:/images/white.9.png" visible="false" />

diff --git a/playlet-lib/src/components/NavBar/NavBar.xml b/playlet-lib/src/components/NavBar/NavBar.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="NavBar" extends="Group" includes="AutoBind">
     <interface>
         <field id="appController" type="node" />

diff --git a/playlet-lib/src/components/NavBar/NavBarItem.xml b/playlet-lib/src/components/NavBar/NavBarItem.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="NavBarItem" extends="ContentNode">
     <interface>
         <field id="screen" type="string" />

diff --git a/playlet-lib/src/components/Navigation/tests/NavigationTestNode.xml b/playlet-lib/src/components/Navigation/tests/NavigationTestNode.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="NavigationTestNode" extends="Node">
     <interface>
         <function name="SetNavigation" />

diff --git a/playlet-lib/src/components/PlayQueue/PlayQueue.xml b/playlet-lib/src/components/PlayQueue/PlayQueue.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <component name="PlayQueue" extends="Node">
     <interface>
         <field id="queue" type="array" />

diff --git a/playlet-lib/src/components/Screens/AppInfoScreen/AppInfoScreen.xml b/playlet-lib/src/components/Screens/AppInfoScreen/AppInfoScreen.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="AppInfoScreen" extends="Group" includes="AutoBind">
     <interface>
         <field id="applicationInfo" type="node" bind="/ApplicationInfo" />

diff --git a/playlet-lib/src/components/Screens/BookmarksScreen/BookmarksScreen.xml b/playlet-lib/src/components/Screens/BookmarksScreen/BookmarksScreen.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="BookmarksScreen" extends="Group" includes="AutoBind">
     <interface>
         <field id="applicationInfo" type="node" bind="/ApplicationInfo" />

diff --git a/playlet-lib/src/components/Screens/HomeScreen/HomeScreen.xml b/playlet-lib/src/components/Screens/HomeScreen/HomeScreen.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="HomeScreen" extends="Group" includes="AutoBind,Focus">
     <interface>
         <field id="navBar" type="node" bind="/NavBar" />

diff --git a/playlet-lib/src/components/Screens/SearchScreen/SearchFilters/SearchFilters.xml b/playlet-lib/src/components/Screens/SearchScreen/SearchFilters/SearchFilters.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <component name="SearchFilters" extends="Group" includes="AutoBind,Focus">
     <interface>
         <field id="searchScreen" type="node" />

diff --git a/playlet-lib/src/components/Screens/SearchScreen/SearchScreen.xml b/playlet-lib/src/components/Screens/SearchScreen/SearchScreen.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="SearchScreen" extends="Group" includes="AutoBind,Focus">
     <interface>
         <field id="navBar" type="node" bind="/NavBar" />

diff --git a/playlet-lib/src/components/Screens/SettingsScreen/BooleanControl.xml b/playlet-lib/src/components/Screens/SettingsScreen/BooleanControl.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="BooleanControl" extends="LayoutGroup" includes="Focus">
     <interface>
         <field id="displayText" type="string" alias="Checkbox.title" />

diff --git a/playlet-lib/src/components/Screens/SettingsScreen/Checkbox.xml b/playlet-lib/src/components/Screens/SettingsScreen/Checkbox.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="Checkbox" extends="CheckList">
     <interface>
         <field id="title" type="string" alias="checkboxNode.title" />

diff --git a/playlet-lib/src/components/Screens/SettingsScreen/ClearSearchHistoryControl.xml b/playlet-lib/src/components/Screens/SettingsScreen/ClearSearchHistoryControl.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="ClearSearchHistoryControl" extends="LayoutGroup" includes="Focus">
     <interface>
         <field id="displayText" type="string" alias="Button.text" />

diff --git a/...-lib/src/components/Screens/SettingsScreen/InvidiousInstance/InvidiousInstanceControl.xml b/...-lib/src/components/Screens/SettingsScreen/InvidiousInstance/InvidiousInstanceControl.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <component name="InvidiousInstanceControl" extends="LayoutGroup" includes="AutoBind,Focus">
     <interface>
         <field id="displayText" type="string" alias="DisplayTextLabel.text" />

diff --git a/...lib/src/components/Screens/SettingsScreen/InvidiousInstance/InvidiousInstanceSettings.xml b/...lib/src/components/Screens/SettingsScreen/InvidiousInstance/InvidiousInstanceSettings.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <component name="InvidiousInstanceSettings" extends="Group" includes="AutoBind,Focus">
     <interface>
         <field id="text" type="string" alias="textEditBox.text" />

diff --git a/...ns/SettingsScreen/InvidiousInstance/InvidiousInstanceTesting/InvidiousInstanceTesting.xml b/...ns/SettingsScreen/InvidiousInstance/InvidiousInstanceTesting/InvidiousInstanceTesting.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <component name="InvidiousInstanceTesting" extends="Group" includes="AutoBind,Focus">
     <interface>
         <field id="instance" type="string" />

diff --git a/...ettingsScreen/InvidiousInstance/InvidiousInstanceTesting/InvidiousInstanceTestingItem.xml b/...ettingsScreen/InvidiousInstance/InvidiousInstanceTesting/InvidiousInstanceTestingItem.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <component name="InvidiousInstanceTestingItem" extends="Group">
     <interface>
         <field id="itemContent" type="node" onChange="OnContentSet" />

diff --git a/...ns/SettingsScreen/InvidiousInstance/InvidiousPublicInstances/InvidiousPublicInstances.xml b/...ns/SettingsScreen/InvidiousInstance/InvidiousPublicInstances/InvidiousPublicInstances.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <component name="InvidiousPublicInstances" extends="Group" includes="Focus">
     <interface>
         <field id="instance" type="string" />

diff --git a/...ngsScreen/InvidiousInstance/InvidiousPublicInstances/InvidiousPublicInstancesListItem.xml b/...ngsScreen/InvidiousInstance/InvidiousPublicInstances/InvidiousPublicInstancesListItem.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <component name="InvidiousPublicInstancesListItem" extends="Group">
     <interface>
         <field id="itemContent" type="node" onChange="OnContentSet" />

diff --git a/...en/InvidiousInstance/InvidiousPublicInstances/InvidiousPublicInstancesListItemContent.xml b/...en/InvidiousInstance/InvidiousPublicInstances/InvidiousPublicInstancesListItemContent.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <component name="InvidiousPublicInstancesListItemContent" extends="ContentNode">
     <interface>
         <field id="name" type="string" />

diff --git a/playlet-lib/src/components/Screens/SettingsScreen/RadioControl.xml b/playlet-lib/src/components/Screens/SettingsScreen/RadioControl.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="RadioControl" extends="LayoutGroup" includes="Focus">
     <interface>
         <field id="displayText" type="string" alias="DisplayTextLabel.text" />

diff --git a/playlet-lib/src/components/Screens/SettingsScreen/SettingCategory.xml b/playlet-lib/src/components/Screens/SettingsScreen/SettingCategory.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="SettingCategory" extends="Button">
     <interface>
         <field id="padding" type="integer" value="10" onChange="Resize" />

diff --git a/playlet-lib/src/components/Screens/SettingsScreen/SettingsScreen.xml b/playlet-lib/src/components/Screens/SettingsScreen/SettingsScreen.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="SettingsScreen" extends="Group" includes="AutoBind,Focus">
     <interface>
         <field id="navBar" type="node" bind="/NavBar" />

diff --git a/playlet-lib/src/components/Screens/SettingsScreen/StringControl.xml b/playlet-lib/src/components/Screens/SettingsScreen/StringControl.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="StringControl" extends="LayoutGroup" includes="Focus">
     <interface>
         <field id="displayText" type="string" alias="DisplayTextLabel.text" />

diff --git a/playlet-lib/src/components/Screens/WebAppScreen/WebAppScreen.xml b/playlet-lib/src/components/Screens/WebAppScreen/WebAppScreen.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="WebAppScreen" extends="Group" includes="AutoBind">
     <interface>
         <field id="webServer" type="node" bind="/WebServer" />
@@ -9,36 +7,36 @@
     <children>
         <Group id="noInternet" visible="false">
             <Label
-                height='720'
-                width='1280'
-                font='font:MediumBoldSystemFont'
+                height="720"
+                width="1280"
+                font="font:MediumBoldSystemFont"
                 horizAlign="center"
                 vertAlign="center"
                 text="Could not get IP address: are we connected to the internet?"
             />
         </Group>
         <Group id="yesInternet" visible="false">
             <Label
-                height='60'
-                width='1280'
-                font='font:MediumBoldSystemFont'
+                height="60"
+                width="1280"
+                font="font:MediumBoldSystemFont"
                 horizAlign="center"
                 translation="[0,92]"
                 text="Scan the QR code with your phone camera, or open the URL in a web browser:"
             />
             <Poster
-                id='QrCodePoster'
-                height='400'
-                width='400'
-                loadHeight='400'
-                loadWidth='400'
-                translation='[440, 160]' />
+                id="QrCodePoster"
+                height="400"
+                width="400"
+                loadHeight="400"
+                loadWidth="400"
+                translation="[440, 160]" />
 
             <Label
-                id='UrlLabel'
-                height='50'
-                width='1280'
-                font='font:MediumBoldSystemFont'
+                id="UrlLabel"
+                height="50"
+                width="1280"
+                font="font:MediumBoldSystemFont"
                 horizAlign="center"
                 translation="[0,600]"
             />

diff --git a/playlet-lib/src/components/Services/ApplicationInfo/ApplicationInfo.xml b/playlet-lib/src/components/Services/ApplicationInfo/ApplicationInfo.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="ApplicationInfo" extends="Node">
     <interface>
         <field id="lib_version_latest" type="string" />

diff --git a/playlet-lib/src/components/Services/Bookmarks/Bookmarks.xml b/playlet-lib/src/components/Services/Bookmarks/Bookmarks.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="Bookmarks" extends="Node">
     <interface>
         <field id="__version" type="integer" value="1" />

diff --git a/playlet-lib/src/components/Services/Invidious/Invidious.xml b/playlet-lib/src/components/Services/Invidious/Invidious.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="Invidious" extends="Node">
     <interface>
         <field id="applicationInfo" type="node" />

diff --git a/playlet-lib/src/components/Services/Preferences/Preferences.xml b/playlet-lib/src/components/Services/Preferences/Preferences.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="Preferences" extends="Node">
     <interface>
         <field id="__version" type="integer" value="1" />

diff --git a/playlet-lib/src/components/Services/SponsorBlock/Notifications/SponsorBlockNotification.xml b/playlet-lib/src/components/Services/SponsorBlock/Notifications/SponsorBlockNotification.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="SponsorBlockNotification" extends="Group">
     <interface>
         <field id="segment" type="assocarray" onChange="OnSegmentSet" />

diff --git a/playlet-lib/src/components/VideoFeed/VideoRowCell/ActionRowCell.xml b/playlet-lib/src/components/VideoFeed/VideoRowCell/ActionRowCell.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="ActionRowCell" extends="Group">
     <interface>
         <field id="itemContent" type="node" onChange="OnContentSet" />

diff --git a/playlet-lib/src/components/VideoFeed/VideoRowCell/ChannelRowCell.xml b/playlet-lib/src/components/VideoFeed/VideoRowCell/ChannelRowCell.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="ChannelRowCell" extends="Group">
     <interface>
         <field id="itemContent" type="node" onChange="OnContentSet" />

diff --git a/playlet-lib/src/components/VideoFeed/VideoRowCell/LoadingRowCell.xml b/playlet-lib/src/components/VideoFeed/VideoRowCell/LoadingRowCell.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="LoadingRowCell" extends="Group">
     <interface>
         <field id="itemContent" type="node" onChange="OnContentSet" />

diff --git a/playlet-lib/src/components/VideoFeed/VideoRowCell/PlaylistRowCell.xml b/playlet-lib/src/components/VideoFeed/VideoRowCell/PlaylistRowCell.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="PlaylistRowCell" extends="Group">
     <interface>
         <field id="itemContent" type="node" onChange="OnContentSet" />

diff --git a/playlet-lib/src/components/VideoFeed/VideoRowCell/RowCell.xml b/playlet-lib/src/components/VideoFeed/VideoRowCell/RowCell.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="RowCell" extends="Group">
     <interface>
         <field id="type" type="string" />

diff --git a/playlet-lib/src/components/VideoFeed/VideoRowCell/VideoRowCell.xml b/playlet-lib/src/components/VideoFeed/VideoRowCell/VideoRowCell.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="VideoRowCell" extends="Group">
     <interface>
         <field id="itemContent" type="node" onChange="OnContentSet" />

diff --git a/playlet-lib/src/components/VideoFeed/VideoRowList.xml b/playlet-lib/src/components/VideoFeed/VideoRowList.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="VideoRowList" extends="RowList" includes="AutoBind">
     <interface>
         <field id="appController" type="node" bind="/AppController" />

diff --git a/playlet-lib/src/components/VideoPlayer/VideoContainer.xml b/playlet-lib/src/components/VideoPlayer/VideoContainer.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="VideoContainer" extends="Group">
     <interface>
         <field id="fullscreen" type="boolean" value="true" />

diff --git a/playlet-lib/src/components/VideoPlayer/VideoPlayer.xml b/playlet-lib/src/components/VideoPlayer/VideoPlayer.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="VideoPlayer" extends="Video" includes="AutoBind">
     <interface>
         <field id="appController" type="node" bind="/AppController" />

diff --git a/playlet-lib/src/components/Web/PlayletWebServer/PlayletWebServer.xml b/playlet-lib/src/components/Web/PlayletWebServer/PlayletWebServer.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="PlayletWebServer" extends="WebServer" includes="AutoBind">
     <interface>
         <field id="preferences" type="node" />

diff --git a/playlet-lib/src/components/Web/WebServer/WebServer.xml b/playlet-lib/src/components/Web/WebServer/WebServer.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="WebServer" extends="Task">
     <interface>
         <field id="maxConnections" type="integer" value="10" />

diff --git a/playlet-lib/src/components/parts/AutoBind/AutoBind.part.xml b/playlet-lib/src/components/parts/AutoBind/AutoBind.part.xml
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <component name="AutoBind" extends="Group">
     <interface>
         <field id="bindings" type="assocarray" onChange="OnBindingSetRegisterAutoBind" />

diff --git a/playlet-lib/src/components/parts/AutoBind/tests.transpiled/AutoBindNode1.xml b/playlet-lib/src/components/parts/AutoBind/tests.transpiled/AutoBindNode1.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <component name="AutoBindNode1" extends="Group">
     <interface>
         <field id="reference1" type="node" />

diff --git a/playlet-lib/src/components/parts/AutoBind/tests.transpiled/AutoBindNode1Container.xml b/playlet-lib/src/components/parts/AutoBind/tests.transpiled/AutoBindNode1Container.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <component name="AutoBindNode1Container" extends="Group">
     <interface>
         <field id="bindings" type="assocarray" onChange="OnBindingSetRegisterAutoBind" />

diff --git a/playlet-lib/src/components/parts/AutoBind/tests.transpiled/AutoBindNode2.xml b/playlet-lib/src/components/parts/AutoBind/tests.transpiled/AutoBindNode2.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <component name="AutoBindNode2" extends="Group">
     <interface>
         <field id="parent" type="node" />