Bug/a few fixes (#158)

* Change default instance * Fix cropped buttons * Lint fix * changelog --------- Co-authored-by: github-action linter <githubaction@githubaction.com>
iBicha · Oct 2, 2023 · 256fc22 · 256fc22
1 parent cb877f9
commit 256fc22
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Another bug where the app crashes if an error happens loading channel info
+- Issue with default instance (by changing default instance)
+- Cropped text in a couple of buttons
 
 ### Removed
 

diff --git a/playlet-lib/src/components/Screens/SearchScreen/SearchScreen.xml b/playlet-lib/src/components/Screens/SearchScreen/SearchScreen.xml
@@ -10,7 +10,7 @@
             <Button
                 id="filtersButton"
                 translation="[160,40]"
-                minWidth="0"
+                minWidth="180"
                 height="48"
                 showFocusFootprint="true"
                 iconUri="pkg:/images/icons/filters-white.png"

diff --git a/...-lib/src/components/Screens/SettingsScreen/InvidiousInstance/InvidiousInstanceSettings.bs b/...-lib/src/components/Screens/SettingsScreen/InvidiousInstance/InvidiousInstanceSettings.bs
@@ -1,4 +1,5 @@
 import "pkg:/components/Navigation/Navigation.bs"
+import "pkg:/components/Services/Invidious/InvidiousService.bs"
 import "pkg:/source/utils/Types.bs"
 
 function Init()
@@ -29,6 +30,7 @@ function Init()
     SetNavigation(m.testButton, "right", m.saveButton)
 
     m.currentNavigtionNode = m.editButton
+    m.textEditBox.hintText = `e.g. ${Invidious.DEFAULT_INSTANCE}`
 end function
 
 function OnFocusChange() as void
@@ -76,7 +78,7 @@ end function
 function OnEditButtonSelected()
     keyboardDialog = createObject("roSGNode", "StandardKeyboardDialog")
     keyboardDialog.title = "Edit Instance"
-    keyboardDialog.message = ["Enter the instance url (e.g. https://vid.puffyan.us)"]
+    keyboardDialog.message = [`Enter the instance url (e.g. ${Invidious.DEFAULT_INSTANCE})`]
     keyboardDialog.text = m.top.text
     keyboardDialog.buttons = ["OK", "Cancel"]
     keyboardDialog.observeField("buttonSelected", FuncName(OnKeyboardButton))

diff --git a/...lib/src/components/Screens/SettingsScreen/InvidiousInstance/InvidiousInstanceSettings.xml b/...lib/src/components/Screens/SettingsScreen/InvidiousInstance/InvidiousInstanceSettings.xml
@@ -21,7 +21,6 @@
                 translation="[326,13]" />
             <TextEditBox
                 id="textEditBox"
-                hintText="e.g. https://https://vid.puffyan.us"
                 width="480"
                 height="50"
                 translation="[200,50]" />

diff --git a/...ns/SettingsScreen/InvidiousInstance/InvidiousInstanceTesting/InvidiousInstanceTesting.xml b/...ns/SettingsScreen/InvidiousInstance/InvidiousInstanceTesting/InvidiousInstanceTesting.xml
@@ -35,9 +35,9 @@
             <Button
                 id="closeButton"
                 text="Close"
-                minWidth="0"
+                minWidth="160"
                 showFocusFootprint="true"
-                translation="[404,506]" />
+                translation="[400,506]" />
         </Rectangle>
     </children>
 </component>
diff --git a/playlet-lib/src/components/Services/Invidious/InvidiousService.bs b/playlet-lib/src/components/Services/Invidious/InvidiousService.bs
@@ -9,7 +9,7 @@ import "pkg:/source/utils/TimeUtils.bs"
 namespace Invidious
     const INSTANCES_API = "https://api.invidious.io/instances.json?sort_by=type,users"
 
-    const DEFAULT_INSTANCE = "https://vid.puffyan.us"
+    const DEFAULT_INSTANCE = "https://invidious.fdn.fr"
 
     const TOKEN_CALLBACK = "/invidious/token_callback"
 

diff --git a/playlet-lib/src/config/preferences.json5 b/playlet-lib/src/config/preferences.json5
@@ -38,14 +38,14 @@
       {
         displayText: "Instance",
         key: "invidious.instance",
-        description: 'Invidious instance to use. Example: https://vid.puffyan.us. Find more instances at <a class="link" href="https://api.invidious.io" target="_blank" rel="noopener noreferrer">https://api.invidious.io</a>',
+        description: 'Invidious instance to use. Example: https://example.com. Find more instances at <a class="link" href="https://api.invidious.io" target="_blank" rel="noopener noreferrer">https://api.invidious.io</a>',
         type: "string",
         visibility: "web",
       },
       {
         displayText: "Instance",
         key: "invidious.instance",
-        description: "Invidious instance to use. Example: https://vid.puffyan.us",
+        description: "Invidious instance to use. Example: https://example.com",
         visibility: "tv",
         rokuComponent: "InvidiousInstanceControl",
       },