Add source chooser

Add package lock back in

Author: null-dev

.gitignore

@@ -5,5 +5,4 @@ build
 *.iml
 /test
 /.gradle/buildOutputCleanup
-package-lock.json
 /libs

TODO.md

@@ -1,5 +1,9 @@
 # TODO List
 - Add the ability to load extension sources
 - Dialog polyfill may not be loaded on all pages where it is required. Breaks app on firefox.
-- Filter sidebar does not render correctly in Firefox
-- Filter sidebar expansion button disappears randomly
+
+- Library updates page is missing
+- Recently read page is missing
+- Latest updates page is missing
+- Source chooser is incomplete
+

TachiServer/src/main/java/xyz/nulldev/ts/api/http/catalogue/ListSourcesRoute.kt

@@ -24,6 +24,7 @@ import spark.Request
 import spark.Response
 import xyz.nulldev.ts.api.http.TachiWebRoute
 import xyz.nulldev.ts.ext.kInstanceLazy
+import java.util.*
 
 /**
  * List the available sources.
@@ -40,6 +41,11 @@ class ListSourcesRoute : TachiWebRoute() {
             val sourceObj = JSONObject()
             sourceObj.put(KEY_ID, source.id)
             sourceObj.put(KEY_NAME, source.name)
+            val langObj = JSONObject()
+            langObj.put(KEY_LANG_NAME, source.lang)
+            langObj.put(KEY_LANG_DISPLAY_NAME, Locale(source.lang).displayName)
+            sourceObj.put(KEY_LANG, langObj)
+            sourceObj.put(KEY_SUPPORTS_LATEST, source.supportsLatest)
             if (source is LoginSource) {
                 sourceObj.put(KEY_LOGGED_IN, source.isLogged())
             }
@@ -53,6 +59,10 @@ class ListSourcesRoute : TachiWebRoute() {
         val KEY_CONTENT = "content"
         val KEY_NAME = "name"
         val KEY_ID = "id"
+        val KEY_LANG = "lang"
+        val KEY_LANG_NAME = "name"
+        val KEY_LANG_DISPLAY_NAME = "display_name"
+        val KEY_SUPPORTS_LATEST = "supports_latest"
         val KEY_LOGGED_IN = "logged_in"
     }
 }

tachiwebui/src/main/resources/tachiweb-ui/css/options.css

@@ -16,4 +16,39 @@
 
 .mdl-radio {
     display: block;
-}
+}
+
+/** Sources styles **/
+.sources-wrapper {
+    user-select: none;
+}
+
+.sources-group {
+    border-bottom: 1px solid #bdbdbd;
+}
+
+.sources-item {
+    position: relative;
+    height: 40px;
+    padding: 0 16px;
+}
+
+.sources-item-wrapper {
+    font-weight: bold;
+}
+
+.sources-item-label {
+    height: 40px;
+    line-height: 40px;
+}
+
+.sources-source-label {
+    padding-left: 8px;
+}
+
+.sources-item-switch {
+    position: absolute;
+    top: 50%;
+    right: 16px;
+    transform: translateY(-50%);
+}

tachiwebui/src/main/resources/tachiweb-ui/js/options.js

@@ -7,6 +7,9 @@
     <!-- Material Lite -->
     <link href="css/material.min.css" rel="stylesheet">
     <script src="bower_components/material-design-lite/material.min.js"></script>
+    <!-- MDC Web -->
+    <link href="node_modules/material-components-web/dist/material-components-web.min.css" rel="stylesheet">
+    <script src="node_modules/material-components-web/dist/material-components-web.min.js"></script>
     <!-- Material Fonts -->
     <link href="bower_components/material-design-icons/iconfont/material-icons.css" rel="stylesheet">
     <!-- Dialog Polyfill -->

tachiwebui/src/main/resources/tachiweb-ui/options.html

@@ -17,6 +17,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "css-prefix": "0.0.2",
-    "material-components-web": "^0.10.0"
+    "material-components-web": "^0.20.0"
   }
 }

tachiwebui/src/main/resources/tachiweb-ui/package-lock.json

@@ -69,7 +69,24 @@
   {
     "label": "Sources",
     "type": "nested",
-    "prefs": []
+    "prefs": [
+      {
+        "key": [
+          "source_languages",
+          "hidden_catalogues"
+        ],
+        "type": "sources",
+        "pref_types": {
+          "source_languages": "string_set",
+          "hidden_catalogues": "string_set"
+        },
+        "error_message": "Unable to fetch source list!",
+        "default": {
+          "source_languages": ["en"],
+          "hidden_catalogues": []
+        }
+      }
+    ]
   },
   {
     "label": "Sync",