Merge pull request #217 from ImranR98/dev

Bugfixes and UI Tweaks (#213, #215, #216)

README.md

@@ -1,4 +1,4 @@
-# ![Obtainium Icon](./android/app/src/main/res/drawable/ic_notification.png) Obtainium
+# ![Obtainium Icon](./assets/graphics/icon_small.png) Obtainium
 
 Get Android App Updates Directly From the Source.
 
@@ -15,7 +15,8 @@ Currently supported App sources:
 - [Signal](https://signal.org/)
 - [SourceForge](https://sourceforge.net/)
 - [APKMirror](https://apkmirror.com/) (Track-Only)
-- Third Party F-Droid Repos (URLs ending with `/fdroid/repo`)
+- Third Party F-Droid Repos
+  - Any URLs ending with `/fdroid/<word>`, where `<word>` can be anything - most often `repo`
 - [Steam](https://store.steampowered.com/mobile)
 
 ## Limitations

android/app/src/main/AndroidManifest.xml

@@ -51,4 +51,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"/>
 </manifest>

assets/translations/de.json

@@ -188,25 +188,29 @@
     "steam": "Steam",
     "steamMobile": "Steam Mobile",
     "steamChat": "Steam Chat",
-    "install": "Install",
-    "markInstalled": "Mark Installed",
-    "update": "Update",
-    "markUpdated": "Mark Updated",
-    "additionalOptions": "Additional Options",
-    "disableVersionDetection": "Disable Version Detection",
-    "noVersionDetectionExplanation": "This option should only be used for Apps where version detection does not work correctly.",
-    "downloadingX": "Downloading {}",
-    "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
-    "noAPKFound": "No APK found",
-    "noVersionDetection": "No version detection",
-    "categorize": "Categorize",
-    "categories": "Categories",
-    "category": "Category",
-    "noCategory": "No Category",
-    "deleteCategoryQuestion": "Delete Category?",
-    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
-    "addCategory": "Add Category",
-    "label": "Label",
+    "install": "Installieren",
+    "markInstalled": "Als Installiert markieren",
+    "update": "Aktualisieren",
+    "markUpdated": "Als Aktuell markieren",
+    "additionalOptions": "Zusätzliche Optionen",
+    "disableVersionDetection": "Versionsermittlung deaktivieren",
+    "noVersionDetectionExplanation": "Diese Option sollte nur für Apps verwendet werden, bei denen die Versionserkennung nicht korrekt funktioniert.",
+    "downloadingX": "Lade {} herunter",
+    "downloadNotifDescription": "Benachrichtigt den Nutzer über den Fortschritt beim Herunterladen einer App",
+    "noAPKFound": "Keine APK gefunden",
+    "noVersionDetection": "Keine Versionserkennung",
+    "categorize": "Kategorisieren",
+    "categories": "Kategorien",
+    "category": "Kategorie",
+    "noCategory": "Keine Kategorie",
+    "noCategories": "Keine Kategorien",
+    "deleteCategoriesQuestion": "Kategorien löschen?",
+    "categoryDeleteWarning": "Alle Apps in gelöschten Kategorien werden auf nicht kategorisiert gesetzt.",
+    "addCategory": "Kategorie hinzufügen",
+    "label": "Bezeichnung",
+    "language": "Sprache",
+    "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut",
         "other": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minuten erneut"

assets/translations/en.json

@@ -203,10 +203,14 @@
     "categories": "Categories",
     "category": "Category",
     "noCategory": "No Category",
-    "deleteCategoryQuestion": "Delete Category?",
-    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
+    "noCategories": "No Categories",
+    "deleteCategoriesQuestion": "Delete Categories?",
+    "categoryDeleteWarning": "All Apps in deleted categories will be set to uncategorized.",
     "addCategory": "Add Category",
     "label": "Label",
+    "language": "Language",
+    "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Too many requests (rate limited) - try again in {} minute",
         "other": "Too many requests (rate limited) - try again in {} minutes"

assets/translations/hu.json

@@ -13,10 +13,10 @@
     "and": "és",
     "startedBgUpdateTask": "Háttérfrissítés ellenőrzési feladat elindítva",
     "bgUpdateIgnoreAfterIs": "Háttérfrissítés ignoreAfter a következő: {}",
-    "startedActualBGUpdateCheck": "Elkezdődött a tényleges BG frissítés ellenőrzése",
+    "startedActualBGUpdateCheck": "Elkezdődött a tényleges háttérfrissítés ellenőrzése",
     "bgUpdateTaskFinished": "A háttérfrissítés ellenőrzési feladat befejeződött",
     "firstRun": "Ez az Obtainium első futása",
-    "settingUpdateCheckIntervalTo": "A frissítési intervallum beállítása a erre: {}",
+    "settingUpdateCheckIntervalTo": "A frissítési intervallum beállítása erre: {}",
     "githubPATLabel": "GitHub személyes hozzáférési token (megnöveli a díjkorlátot)",
     "githubPATHint": "A PAT-nak a következő formátumban kell lennie: felhasználónév:token",
     "githubPATFormat": "felhasználónév:token",
@@ -28,13 +28,13 @@
     "noDescription": "Nincs leírás",
     "cancel": "Mégse",
     "continue": "Tovább",
-    "requiredInBrackets": "(Kötlező)",
-    "dropdownNoOptsError": "HIBA: A LEDOBÁST LEGALÁBB EGY OPCIÓBAN KELL RENDELNI",
+    "requiredInBrackets": "(Kötelező)",
+    "dropdownNoOptsError": "HIBA: A LEDOBÁST LEGALÁBB EGY OPCIÓHOZ KELL RENDELNI",
     "colour": "Szín",
-    "githubStarredRepos": "GitHub Csillagozott Repo-k",
+    "githubStarredRepos": "GitHub Csillagos Repo-k",
     "uname": "Felh.név",
     "wrongArgNum": "Rossz számú argumentumot adott meg",
-    "xIsTrackOnly": "{} csak nyomon követhető",
+    "xIsTrackOnly": "A(z) {} csak nyomkövethető",
     "source": "Forrás",
     "app": "App",
     "appsFromSourceAreTrackOnly": "Az ebből a forrásból származó alkalmazások 'Csak nyomon követhetőek'.",
@@ -56,25 +56,25 @@
     "appsString": "Appok",
     "noApps": "Nincs App",
     "noAppsForFilter": "Nincsenek appok a szűrőhöz",
-    "byX": "By {}",
+    "byX": "{} által",
     "percentProgress": "Folyamat: {}%",
     "pleaseWait": "Kis türelmet",
-    "updateAvailable": "Frissítés elérhető",
+    "updateAvailable": "Frissítés érhető el",
     "estimateInBracketsShort": "(Becsült)",
     "notInstalled": "Nem telepített",
     "estimateInBrackets": "(Becslés)",
     "selectAll": "Mindet kiválaszt",
     "deselectN": "Törölje {} kijelölését",
-    "xWillBeRemovedButRemainInstalled": "{} el lesz távolítva az Obtainiumból, de továbbra is telepítve marad az eszközön.",
+    "xWillBeRemovedButRemainInstalled": "A(z) {} el lesz távolítva az Obtainiumból, de továbbra is telepítve marad az eszközön.",
     "removeSelectedAppsQuestion": "Eltávolítja a kiválasztott appokat?",
     "removeSelectedApps": "Távolítsa el a kiválasztott appokat",
     "updateX": "Frissítés: {}",
-    "installX": "Telepítés {}",
-    "markXTrackOnlyAsUpdated": "Jelölje meg: {}\n(Csak nyomon követhető)\nas Frissítve",
+    "installX": "Telepítés: {}",
+    "markXTrackOnlyAsUpdated": "Jelölje meg: {}\n(Csak nyomon követhető)\nmint Frissített",
     "changeX": "Változás {}",
     "installUpdateApps": "Appok telepítése/frissítése",
     "installUpdateSelectedApps": "Telepítse/frissítse a kiválasztott appokat",
-    "onlyWorksWithNonEVDApps": "Csak azoknál az alkalmazásoknál működik, amelyek telepítési állapota nem észlelhető automatikusan (nem gyakori).",
+    "onlyWorksWithNonEVDApps": "Csak azoknál az alkalmazásoknál működik, amelyek telepítési állapota nem észlelhető autom. (nem gyakori).",
     "markXSelectedAppsAsUpdated": "Megjelöl {} kiválasztott alkalmazást frissítettként?",
     "no": "Nem",
     "yes": "Igen",
@@ -86,8 +86,8 @@
     "shareSelectedAppURLs": "Ossza meg a kiválasztott app URL címeit",
     "resetInstallStatus": "Telepítési állapot visszaállítása",
     "more": "További",
-    "removeOutdatedFilter": "Távolítsa el az elavult alkalmazásszűrőt",
-    "showOutdatedOnly": "Csak az elavult alkalmazások megjelenítése",
+    "removeOutdatedFilter": "Távolítsa el az elavult app szűrőt",
+    "showOutdatedOnly": "Csak az elavult appok megjelenítése",
     "filter": "Szűrő",
     "filterActive": "Szűrő *",
     "filterApps": "Appok szűrése",
@@ -118,7 +118,7 @@
     "selectURLs": "Kiválasztott URL-ek",
     "pick": "Válasszon",
     "theme": "Téma",
-    "dark": "Söét",
+    "dark": "Sötét",
     "light": "Világos",
     "followSystem": "Rendszer szerint",
     "obtainium": "Obtainium",
@@ -126,11 +126,11 @@
     "appSortBy": "App rendezés...",
     "authorName": "Szerző/Név",
     "nameAuthor": "Név/Szerző",
-    "asAdded": "Mint hozzáadott",
+    "asAdded": "Mint Hozzáadott",
     "appSortOrder": "Appok rendezése",
     "ascending": "Emelkedő",
     "descending": "Csökkenő",
-    "bgUpdateCheckInterval": "Háttérfrissítés ellenőrzési időköz",
+    "bgUpdateCheckInterval": "Háttérfrissítés ellenőrzés időköze",
     "neverManualOnly": "Soha – csak manuális",
     "appearance": "Megjelenés",
     "showWebInAppView": "Forrás megjelenítése az Appok nézetben",
@@ -145,7 +145,7 @@
     "appNotFound": "App nem található",
     "obtainiumExportHyphenatedLowercase": "obtainium-export",
     "pickAnAPK": "Válasszon egy APK-t",
-    "appHasMoreThanOnePackage": "{} egynél több csomaggal rendelkezik:",
+    "appHasMoreThanOnePackage": "A(z) {} egynél több csomaggal rendelkezik:",
     "deviceSupportsXArch": "Eszköze támogatja a {} CPU architektúrát.",
     "deviceSupportsFollowingArchs": "Az eszköze a következő CPU architektúrákat támogatja:",
     "warning": "Figyelem",
@@ -153,16 +153,16 @@
     "updatesAvailable": "Frissítések érhetők el",
     "updatesAvailableNotifDescription": "Értesíti a felhasználót, hogy frissítések állnak rendelkezésre egy vagy több, az Obtainium által nyomon követett alkalmazáshoz",
     "noNewUpdates": "Nincsenek új frissítések.",
-    "xHasAnUpdate": "{} frissítést kapott.",
+    "xHasAnUpdate": "A(z) {} frissítést kapott.",
     "appsUpdated": "Alkalmazások frissítve",
-    "appsUpdatedNotifDescription": "Értesíti a felhasználót, hogy egy vagy több app frissítése történt a háttérben",
+    "appsUpdatedNotifDescription": "Értesíti a felhasználót, hogy egy/több app frissítése megtörtént a háttérben",
     "xWasUpdatedToY": "{} frissítve a következőre: {}.",
     "errorCheckingUpdates": "Hiba a frissítések keresésekor",
     "errorCheckingUpdatesNotifDescription": "Értesítés, amely akkor jelenik meg, ha a háttérbeli frissítések ellenőrzése sikertelen",
     "appsRemoved": "Alkalmazások eltávolítva",
     "appsRemovedNotifDescription": "Értesíti a felhasználót egy vagy több alkalmazás eltávolításáról a betöltésük során fellépő hibák miatt",
     "xWasRemovedDueToErrorY": "A(z) {} a következő hiba miatt lett eltávolítva: {}",
-    "completeAppInstallation": "Teljes alkalmazástelepítés",
+    "completeAppInstallation": "Teljes app telepítés",
     "obtainiumMustBeOpenToInstallApps": "Az Obtainiumnak megnyitva kell lennie az alkalmazások telepítéséhez",
     "completeAppInstallationNotifDescription": "Megkéri a felhasználót, hogy térjen vissza az Obtainiumhoz, hogy befejezze az alkalmazás telepítését",
     "checkingForUpdates": "Frissítések keresése",
@@ -184,29 +184,32 @@
     "appIdOrName": "App ID vagy név",
     "appWithIdOrNameNotFound": "Nem található app ezzel az azonosítóval vagy névvel",
     "reposHaveMultipleApps": "A repók több alkalmazást is tartalmazhatnak",
-    "fdroidThirdPartyRepo": "F-Droid Harmadik fél Repo",
+    "fdroidThirdPartyRepo": "F-Droid Harmadik-fél Repo",
     "steam": "Steam",
     "steamMobile": "Steam Mobile",
     "steamChat": "Steam Chat",
-    "install": "Install",
-    "markInstalled": "Mark Installed",
-    "update": "Update",
-    "markUpdated": "Mark Updated",
-    "additionalOptions": "Additional Options",
-    "disableVersionDetection": "Disable Version Detection",
-    "noVersionDetectionExplanation": "This option should only be used for Apps where version detection does not work correctly.",
-    "downloadingX": "Downloading {}",
-    "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
-    "noAPKFound": "No APK found",
-    "noVersionDetection": "No version detection",
-    "categorize": "Categorize",
-    "categories": "Categories",
-    "category": "Category",
-    "noCategory": "No Category",
-    "deleteCategoryQuestion": "Delete Category?",
-    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
-    "addCategory": "Add Category",
-    "label": "Label",
+    "install": "Telepít",
+    "markInstalled": "Telepítettnek jelöl",
+    "update": "Frissít",
+    "markUpdated": "Frissítettnek jelöl",
+    "additionalOptions": "További lehetőségek",
+    "disableVersionDetection": "Verzióérzékelés letiltása",
+    "noVersionDetectionExplanation": "Ezt a beállítást csak olyan alkalmazásoknál szabad használni, ahol a verzióérzékelés nem működik megfelelően.",
+    "downloadingX": "{} letöltés",
+    "downloadNotifDescription": "Értesíti a felhasználót az app letöltésének előrehaladásáról",
+    "noAPKFound": "Nem található APK",
+    "noVersionDetection": "Nincs verzió érzékelés",
+    "categorize": "Kategorizálás",
+    "categories": "Kategóriák",
+    "category": "Kategória",
+    "noCategory": "Nincs kategória",
+    "deleteCategoryQuestion": "Törli a kategóriát?",
+    "categoryDeleteWarning": "A(z) {} összes app kategorizálatlan állapotba kerül.",
+    "addCategory": "Új kategória",
+    "label": "Címke",
+    "language": "Language",
+    "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva",
         "other": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva"
@@ -251,4 +254,4 @@
         "one": "A(z) {} és 1 további alkalmazás frissítve.",
         "other": "{} és további {} alkalmazás frissítve."
     }
-}
+}

assets/translations/it.json

@@ -16,8 +16,8 @@
     "startedActualBGUpdateCheck": "Avviato il controllo effettivo degli aggiornamenti in background",
     "bgUpdateTaskFinished": "Terminata l'attività di controllo degli aggiornamenti in background",
     "firstRun": "Questo è il primo avvio di sempre di Obtainium",
-    "settingUpdateCheckIntervalTo": "Imposta l'intervallo di aggiornamento a {}",
-    "githubPATLabel": "GitHub Personal Access Token (aumenta il limite di traffico)",
+    "settingUpdateCheckIntervalTo": "Fissato intervallo di aggiornamento a {}",
+    "githubPATLabel": "GitHub Personal Access Token (diminuisce limite di traffico)",
     "githubPATHint": "PAT deve seguire questo formato: username:token",
     "githubPATFormat": "username:token",
     "githubPATLinkText": "Informazioni su GitHub PAT",
@@ -31,18 +31,18 @@
     "requiredInBrackets": "(richiesto)",
     "dropdownNoOptsError": "ERRORE: LA TENDINA DEVE AVERE ALMENO UN'OPZIONE",
     "colour": "Colore",
-    "githubStarredRepos": "i repository stellati da GitHub",
+    "githubStarredRepos": "repository stellati da GitHub",
     "uname": "Username",
     "wrongArgNum": "Numero di argomenti forniti errato",
-    "xIsTrackOnly": "{} è Solo-Monitoraggio",
+    "xIsTrackOnly": "{} è in modalità Solo-Monitoraggio",
     "source": "Fonte",
     "app": "App",
     "appsFromSourceAreTrackOnly": "Le App da questa fonte sono in modalità 'Solo-Monitoraggio'.",
-    "youPickedTrackOnly": "Hai selezionato l'opzione 'Solo-Monitoraggio'.",
+    "youPickedTrackOnly": "È stata selezionata l'opzione 'Solo-Monitoraggio'.",
     "trackOnlyAppDescription": "L'App sarà monitorata per gli aggiornamenti, ma Obtainium non sarà in grado di scaricarli o di installarli.",
     "cancelled": "Annullato",
     "appAlreadyAdded": "App già aggiunta",
-    "alreadyUpToDateQuestion": "App già aggiornata?",
+    "alreadyUpToDateQuestion": "L'App è già aggiornata?",
     "addApp": "Aggiungi App",
     "appSourceURL": "URL della fonte dell'App",
     "error": "Errore",
@@ -60,20 +60,20 @@
     "percentProgress": "Progresso: {}%",
     "pleaseWait": "Attendere prego",
     "updateAvailable": "Aggiornamento disponibile",
-    "estimateInBracketsShort": "(Prev.)",
+    "estimateInBracketsShort": "(prev.)",
     "notInstalled": "Non installato",
-    "estimateInBrackets": "(Previsto)",
+    "estimateInBrackets": "(previsto)",
     "selectAll": "Seleziona tutto",
     "deselectN": "Deseleziona {}",
-    "xWillBeRemovedButRemainInstalled": "{} sarà rimosso da Obtainium ma resterà installato sul dispositivo.",
+    "xWillBeRemovedButRemainInstalled": "Verà effettuata la rimozione di {}, ma non la disinstallazione.",
     "removeSelectedAppsQuestion": "Rimuovere le App selezionate?",
     "removeSelectedApps": "Rimuovi le App selezionate",
     "updateX": "Aggiorna {}",
     "installX": "Installa {}",
     "markXTrackOnlyAsUpdated": "Contrassegna {}\n(Solo-Monitoraggio)\ncome aggiornato",
-    "changeX": "modifica {}",
-    "installUpdateApps": "Installa/Aggiorna le App",
-    "installUpdateSelectedApps": "Installa/Aggiornale le App selezionate",
+    "changeX": "Modifica {}",
+    "installUpdateApps": "Installa/Aggiorna App",
+    "installUpdateSelectedApps": "Installa/Aggiorna le App selezionate",
     "onlyWorksWithNonEVDApps": "Funziona solo per le App il cui stato d'installazione non può essere rilevato automaticamente (inconsueto).",
     "markXSelectedAppsAsUpdated": "Contrassegnare le {} App selezionate come aggiornate?",
     "no": "No",
@@ -95,7 +95,7 @@
     "author": "Autore",
     "upToDateApps": "App aggiornate",
     "nonInstalledApps": "App non installate",
-    "importExport": "Importa/Esporta",
+    "importExport": "Importa - Esporta",
     "settings": "Impostazioni",
     "exportedTo": "Esportato in {}",
     "obtainiumExport": "Esporta da Obtainium",
@@ -134,7 +134,7 @@
     "neverManualOnly": "Mai - Solo manuale",
     "appearance": "Aspetto",
     "showWebInAppView": "Mostra pagina web dell'App se selezionata",
-    "pinUpdates": "Fissa in alto gli aggiornamenti disponibili",
+    "pinUpdates": "Fissa aggiornamenti disponibili in alto",
     "updates": "Aggiornamenti",
     "sourceSpecific": "Specifiche per la fonte",
     "appSource": "Sorgente dell'App",
@@ -146,21 +146,21 @@
     "obtainiumExportHyphenatedLowercase": "esportazione-obtainium",
     "pickAnAPK": "Seleziona un APK",
     "appHasMoreThanOnePackage": "{} offre più di un pacchetto:",
-    "deviceSupportsXArch": "Il tuo dispositivo supporta l'architettura {} della CPU.",
-    "deviceSupportsFollowingArchs": "Il tuo dispositivo supporta le seguenti architetture della CPU:",
+    "deviceSupportsXArch": "Il dispositivo in uso supporta l'architettura {} della CPU.",
+    "deviceSupportsFollowingArchs": "Il dispositivo in uso supporta le seguenti architetture della CPU:",
     "warning": "Attenzione",
     "sourceIsXButPackageFromYPrompt": "L'origine dell'App è '{}' ma il pacchetto della release proviene da '{}'. Continuare?",
     "updatesAvailable": "Aggiornamenti disponibili",
-    "updatesAvailableNotifDescription": "Avvisa l'utente che sono disponibili gli aggiornamenti di una o più App monitorate da Obtainium",
+    "updatesAvailableNotifDescription": "Notifica all'utente che sono disponibili gli aggiornamenti di una o più App monitorate da Obtainium",
     "noNewUpdates": "Nessun nuovo aggiornamento.",
-    "xHasAnUpdate": "{} è stato aggiornato.",
+    "xHasAnUpdate": "Aggiornamento disponibile per {}",
     "appsUpdated": "App aggiornate",
-    "appsUpdatedNotifDescription": "Avvisa l'utente che una o più App sono state aggiornate in background",
+    "appsUpdatedNotifDescription": "Notifica all'utente che una o più App sono state aggiornate in background",
     "xWasUpdatedToY": "{} è stato aggiornato a {}.",
     "errorCheckingUpdates": "Controllo degli errori per gli aggiornamenti",
     "errorCheckingUpdatesNotifDescription": "Una notifica che mostra quando il controllo degli aggiornamenti in background fallisce",
     "appsRemoved": "App rimosse",
-    "appsRemovedNotifDescription": "Avvisa l'utente che una o più App sono state rimosse a causa di errori durante il caricamento",
+    "appsRemovedNotifDescription": "Notifica all'utente che una o più App sono state rimosse a causa di errori durante il caricamento",
     "xWasRemovedDueToErrorY": "{} è stata rimosso a causa di questo errore: {}",
     "completeAppInstallation": "Completa l'installazione dell'App",
     "obtainiumMustBeOpenToInstallApps": "Obtainium deve essere aperto per poter installare le App",
@@ -178,7 +178,7 @@
     "installedVersionX": "Versione installata: {}",
     "lastUpdateCheckX": "Ultimo controllo degli aggiornamenti: {}",
     "remove": "Rimuovi",
-    "removeAppQuestion": "Rimuovere App?",
+    "removeAppQuestion": "Rimuovere l'App?",
     "yesMarkUpdated": "Sì, contrassegna come aggiornato",
     "fdroid": "F-Droid",
     "appIdOrName": "ID o nome dell'App",
@@ -188,36 +188,40 @@
     "steam": "Steam",
     "steamMobile": "Steam Mobile",
     "steamChat": "Steam Chat",
-    "install": "Install",
-    "markInstalled": "Mark Installed",
-    "update": "Update",
-    "markUpdated": "Mark Updated",
-    "additionalOptions": "Additional Options",
-    "disableVersionDetection": "Disable Version Detection",
-    "noVersionDetectionExplanation": "This option should only be used for Apps where version detection does not work correctly.",
-    "downloadingX": "Downloading {}",
-    "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
-    "noAPKFound": "No APK found",
-    "noVersionDetection": "No version detection",
-    "categorize": "Categorize",
-    "categories": "Categories",
-    "category": "Category",
-    "noCategory": "No Category",
-    "deleteCategoryQuestion": "Delete Category?",
-    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
-    "addCategory": "Add Category",
-    "label": "Label",
+    "install": "Installa",
+    "markInstalled": "Contrassegna come installato",
+    "update": "Aggiorna",
+    "markUpdated": "Contrassegna come aggiornato",
+    "additionalOptions": "Opzioni aggiuntive",
+    "disableVersionDetection": "Disattiva il rilevamento della versione",
+    "noVersionDetectionExplanation": "Questa opzione dovrebbe essere usata solo per le App la cui versione non viene rilevata correttamente.",
+    "downloadingX": "Scaricamento di {} in corso",
+    "downloadNotifDescription": "Notifica all'utente lo stato di avanzamento del download di un'App",
+    "noAPKFound": "Nessun APK trovato",
+    "noVersionDetection": "Disattiva rilevamento di versione",
+    "categorize": "Aggiungi a categoria",
+    "categories": "Categorie",
+    "category": "Categoria",
+    "noCategory": "Nessuna categoria",
+    "noCategories": "Nessuna categoria",
+    "deleteCategoriesQuestion": "Eliminare le categorie?",
+    "categoryDeleteWarning": "Tutte le App nelle categorie eliminate saranno impostate come non categorizzate.",
+    "addCategory": "Aggiungi categoria",
+    "label": "Etichetta",
+    "language": "Lingua",
+    "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Troppe richieste (traffico limitato) - riprova tra {} minuto",
         "other": "Troppe richieste (traffico limitato) - riprova tra {} minuti"
     },
     "bgUpdateGotErrorRetryInMinutes": {
-        "one": "Il controllo degli aggiornamenti in background ha incontrato un {}, ricontrollo tra {} minuto",
-        "other": "Il controllo degli aggiornamenti in background ha incontrato un {}, ricontrollo tra {} minuti"
+        "one": "Il controllo degli aggiornamenti in background ha incontrato un {}, nuovo tentativo tra {} minuto",
+        "other": "Il controllo degli aggiornamenti in background ha incontrato un {}, nuovo tentativo tra {} minuti"
     },
     "bgCheckFoundUpdatesWillNotifyIfNeeded": {
-        "one": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamento - avviserà l'utento se necessario",
-        "other": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamenti - avviserà l'utento se necessario"
+        "one": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamento - notificherà l'utente se necessario",
+        "other": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamenti - notificherà l'utente se necessario"
     },
     "apps": {
         "one": "{} App",
@@ -251,4 +255,4 @@
         "one": "{} e un'altra App sono state aggiornate.",
         "other": "{} e altre {} App sono state aggiornate."
     }
-}
+}

assets/translations/ja.json

@@ -27,7 +27,7 @@
     "invalidRegEx": "無効な正規表現",
     "noDescription": "説明はありません",
     "cancel": "キャンセル",
-    "continue": "続ける",
+    "continue": "続行",
     "requiredInBrackets": "(必須)",
     "dropdownNoOptsError": "エラー: ドロップダウンには、少なくとも1つのオプションが必要です",
     "colour": "カラー",
@@ -64,7 +64,7 @@
     "notInstalled": "未インストール",
     "estimateInBrackets": "(推定)",
     "selectAll": "すべて選択",
-    "deselectN": "{}件を選択解除",
+    "deselectN": "{}件の選択を解除",
     "xWillBeRemovedButRemainInstalled": "{}はObtainiumから削除されますが、デバイスにはインストールされたままです。",
     "removeSelectedAppsQuestion": "選択したアプリを削除しますか？",
     "removeSelectedApps": "選択したアプリを削除する",
@@ -135,7 +135,7 @@
     "appearance": "外観",
     "showWebInAppView": "アプリビューにソースウェブページを表示する",
     "pinUpdates": "アップデートがあるアプリをトップに固定する",
-    "updates": "更新",
+    "updates": "アップデート",
     "sourceSpecific": "Github アクセストークン",
     "appSource": "アプリのソース",
     "noLogs": "ログはありません",
@@ -144,7 +144,7 @@
     "share": "共有",
     "appNotFound": "アプリが見つかりません",
     "obtainiumExportHyphenatedLowercase": "obtainium-エクスポート",
-    "pickAnAPK": "APKを選ぶ",
+    "pickAnAPK": "APKを選択",
     "appHasMoreThanOnePackage": "{}は複数のパッケージが存在します: ",
     "deviceSupportsXArch": "お使いのデバイスは{} CPUアーキテクチャに対応しています。",
     "deviceSupportsFollowingArchs": "お使いのデバイスは、以下のCPUアーキテクチャをサポートしています:",
@@ -203,10 +203,14 @@
     "categories": "カテゴリ",
     "category": "カテゴリ",
     "noCategory": "カテゴリなし",
-    "deleteCategoryQuestion": "カテゴリを削除しますか？",
-    "categoryDeleteWarning": "「{}」内のすべてのアプリは未分類に設定されます。",
+    "noCategories": "カテゴリなし",
+    "deleteCategoriesQuestion": "カテゴリを削除しますか？",
+    "categoryDeleteWarning": "削除されたカテゴリ内のアプリは未分類に設定されます。",
     "addCategory": "カテゴリを追加",
     "label": "ラベル",
+    "language": "言語",
+    "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "リクエストが多すぎます（レート制限）- {}分後に再試行してください",
         "other": "リクエストが多すぎます（レート制限）- {}分後に再試行してください"

assets/translations/zh.json

@@ -12,7 +12,7 @@
     "ok": "好的",
     "and": "和",
     "startedBgUpdateTask": "开始后台检查更新任务",
-    "bgUpdateIgnoreAfterIs": "Bg update ignoreAfter is  {}",
+    "bgUpdateIgnoreAfterIs": "下次后台更新检查  {}",
     "startedActualBGUpdateCheck": "后台检查更新已开始",
     "bgUpdateTaskFinished": "后台检查更新已完成",
     "firstRun": "这是你第一次运行 Obtainium",
@@ -199,14 +199,18 @@
     "downloadNotifDescription": "通知用户下载进度",
     "noAPKFound": "未找到安装包",
     "noVersionDetection": "无版本检测",
-    "categorize": "Categorize",
-    "categories": "Categories",
-    "category": "Category",
-    "noCategory": "No Category",
-    "deleteCategoryQuestion": "Delete Category?",
-    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
-    "addCategory": "Add Category",
-    "label": "Label",
+    "categorize": "归档",
+    "categories": "归档",
+    "category": "类别",
+    "noCategory": "无类别",
+    "noCategories": "无类别",
+    "deleteCategoriesQuestion": "删除所有类别？",
+    "categoryDeleteWarning": "所有被删除类别的应用程序将被设置为无类别",
+    "addCategory": "添加类别",
+    "label": "标签",
+    "language": "语言",
+    "storagePermissionDenied": "存储权限已被拒绝",
+    "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "请求过多 (API 限制) - 在 {} 分钟后重试",
         "other": "请求过多 (API 限制) - 在 {} 分钟后重试"

lib/app_sources/apkmirror.dart

@@ -26,7 +26,7 @@ class APKMirror extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     Response res = await get(Uri.parse('$standardUrl/feed'));
     if (res.statusCode == 200) {
@@ -46,7 +46,7 @@ class APKMirror extends AppSource {
       }
       return APKDetails(version, [], getAppNames(standardUrl));
     } else {
-      throw NoReleasesError();
+      throw getObtainiumHttpError(res);
     }
   }
 

lib/app_sources/fdroid.dart

@@ -32,7 +32,7 @@ class FDroid extends AppSource {
 
   @override
   String? tryInferringAppId(String standardUrl,
-      {Map<String, String> additionalSettings = const {}}) {
+      {Map<String, dynamic> additionalSettings = const {}}) {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
@@ -54,14 +54,14 @@ class FDroid extends AppSource {
       return APKDetails(latestVersion, apkUrls,
           AppNames(name, Uri.parse(standardUrl).pathSegments.last));
     } else {
-      throw NoReleasesError();
+      throw getObtainiumHttpError(res);
     }
   }
 
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     String? appId = tryInferringAppId(standardUrl);
     return getAPKUrlsFromFDroidPackagesAPIResponse(

lib/app_sources/fdroidrepo.dart

@@ -11,7 +11,7 @@ class FDroidRepo extends AppSource {
 
     additionalSourceAppSpecificSettingFormItems = [
       [
-        GeneratedFormItem('appIdOrName',
+        GeneratedFormTextField('appIdOrName',
             label: tr('appIdOrName'),
             hint: tr('reposHaveMultipleApps'),
             required: true)
@@ -22,7 +22,7 @@ class FDroidRepo extends AppSource {
   @override
   String standardizeURL(String url) {
     RegExp standardUrlRegExp =
-        RegExp('^https?://.+/fdroid/(repo(/|\\?)|repo\$)');
+        RegExp('^https?://.+/fdroid/([^/]+(/|\\?)|[^/]+\$)');
     RegExpMatch? match = standardUrlRegExp.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
@@ -33,7 +33,7 @@ class FDroidRepo extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     String? appIdOrName = additionalSettings['appIdOrName'];
     if (appIdOrName == null) {
@@ -80,7 +80,7 @@ class FDroidRepo extends AppSource {
           .toList();
       return APKDetails(latestVersion, apkUrls, AppNames(authorName, appName));
     } else {
-      throw NoReleasesError();
+      throw getObtainiumHttpError(res);
     }
   }
 }

lib/app_sources/github.dart

@@ -13,8 +13,9 @@ class GitHub extends AppSource {
     host = 'github.com';
 
     additionalSourceSpecificSettingFormItems = [
-      GeneratedFormItem('github-creds',
+      GeneratedFormTextField('github-creds',
           label: tr('githubPATLabel'),
+          password: true,
           required: false,
           additionalValidators: [
             (value) {
@@ -51,21 +52,16 @@ class GitHub extends AppSource {
 
     additionalSourceAppSpecificSettingFormItems = [
       [
-        GeneratedFormItem('includePrereleases',
-            label: tr('includePrereleases'),
-            type: FormItemType.bool,
-            defaultValue: '')
+        GeneratedFormSwitch('includePrereleases',
+            label: tr('includePrereleases'), defaultValue: false)
       ],
       [
-        GeneratedFormItem('fallbackToOlderReleases',
-            label: tr('fallbackToOlderReleases'),
-            type: FormItemType.bool,
-            defaultValue: 'true')
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
       ],
       [
-        GeneratedFormItem('filterReleaseTitlesByRegEx',
+        GeneratedFormTextField('filterReleaseTitlesByRegEx',
             label: tr('filterReleaseTitlesByRegEx'),
-            type: FormItemType.string,
             required: false,
             additionalValidators: [
               (value) {
@@ -111,13 +107,15 @@ class GitHub extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
-    var includePrereleases = additionalSettings['includePrereleases'] == 'true';
-    var fallbackToOlderReleases =
-        additionalSettings['fallbackToOlderReleases'] == 'true';
-    var regexFilter =
-        additionalSettings['filterReleaseTitlesByRegEx']?.isNotEmpty == true
+    bool includePrereleases = additionalSettings['includePrereleases'];
+    bool fallbackToOlderReleases =
+        additionalSettings['fallbackToOlderReleases'];
+    String? regexFilter =
+        (additionalSettings['filterReleaseTitlesByRegEx'] as String?)
+                    ?.isNotEmpty ==
+                true
             ? additionalSettings['filterReleaseTitlesByRegEx']
             : null;
     Response res = await get(Uri.parse(
@@ -150,7 +148,7 @@ class GitHub extends AppSource {
           continue;
         }
         var apkUrls = getReleaseAPKUrls(releases[i]);
-        if (apkUrls.isEmpty && additionalSettings['trackOnly'] != 'true') {
+        if (apkUrls.isEmpty && additionalSettings['trackOnly'] != true) {
           continue;
         }
         targetRelease = releases[i];

lib/app_sources/gitlab.dart

@@ -26,7 +26,7 @@ class GitLab extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     Response res = await get(Uri.parse('$standardUrl/-/tags?format=atom'));
     if (res.statusCode == 200) {
@@ -59,7 +59,7 @@ class GitLab extends AppSource {
       }
       return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl));
     } else {
-      throw NoReleasesError();
+      throw getObtainiumHttpError(res);
     }
   }
 }

lib/app_sources/izzyondroid.dart

@@ -23,14 +23,14 @@ class IzzyOnDroid extends AppSource {
 
   @override
   String? tryInferringAppId(String standardUrl,
-      {Map<String, String> additionalSettings = const {}}) {
+      {Map<String, dynamic> additionalSettings = const {}}) {
     return FDroid().tryInferringAppId(standardUrl);
   }
 
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     String? appId = tryInferringAppId(standardUrl);
     return FDroid().getAPKUrlsFromFDroidPackagesAPIResponse(

lib/app_sources/mullvad.dart

@@ -25,7 +25,7 @@ class Mullvad extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     Response res = await get(Uri.parse('$standardUrl/en/download/android'));
     if (res.statusCode == 200) {
@@ -43,7 +43,7 @@ class Mullvad extends AppSource {
           ['https://mullvad.net/download/app/apk/latest'],
           AppNames(name, 'Mullvad-VPN'));
     } else {
-      throw NoReleasesError();
+      throw getObtainiumHttpError(res);
     }
   }
 }

lib/app_sources/signal.dart

@@ -19,7 +19,7 @@ class Signal extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     Response res =
         await get(Uri.parse('https://updates.$host/android/latest.json'));
@@ -33,7 +33,7 @@ class Signal extends AppSource {
       }
       return APKDetails(version, apkUrls, AppNames(name, 'Signal'));
     } else {
-      throw NoReleasesError();
+      throw getObtainiumHttpError(res);
     }
   }
 }

lib/app_sources/sourceforge.dart

@@ -24,7 +24,7 @@ class SourceForge extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     Response res = await get(Uri.parse('$standardUrl/rss?path=/'));
     if (res.statusCode == 200) {
@@ -57,7 +57,7 @@ class SourceForge extends AppSource {
           AppNames(
               name, standardUrl.substring(standardUrl.lastIndexOf('/') + 1)));
     } else {
-      throw NoReleasesError();
+      throw getObtainiumHttpError(res);
     }
   }
 }

lib/app_sources/steammobile.dart

@@ -10,10 +10,7 @@ class SteamMobile extends AppSource {
     host = 'store.steampowered.com';
     name = tr('steam');
     additionalSourceAppSpecificSettingFormItems = [
-      [
-        GeneratedFormItem('app',
-            label: tr('app'), required: true, opts: apks.entries.toList())
-      ]
+      [GeneratedFormDropdown('app', apks.entries.toList(), label: tr('app'))]
     ];
   }
 
@@ -30,11 +27,11 @@ class SteamMobile extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     Response res = await get(Uri.parse('https://$host/mobile'));
     if (res.statusCode == 200) {
-      var apkNamePrefix = additionalSettings['app'];
+      var apkNamePrefix = additionalSettings['app'] as String?;
       if (apkNamePrefix == null) {
         throw NoReleasesError();
       }
@@ -57,7 +54,7 @@ class SteamMobile extends AppSource {
       var apkUrls = [links[0]];
       return APKDetails(version, apkUrls, AppNames(name, apks[apkNamePrefix]!));
     } else {
-      throw NoReleasesError();
+      throw getObtainiumHttpError(res);
     }
   }
 }

lib/components/generated_form.dart

@@ -1,39 +1,124 @@
+import 'dart:math';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:obtainium/components/generated_form_modal.dart';
 
-enum FormItemType { string, bool }
-
-typedef OnValueChanges = void Function(
-    Map<String, String> values, bool valid, bool isBuilding);
-
-class GeneratedFormItem {
+abstract class GeneratedFormItem {
   late String key;
   late String label;
-  late FormItemType type;
-  late bool required;
-  late int max;
-  late List<String? Function(String? value)> additionalValidators;
   late List<Widget> belowWidgets;
-  late String? hint;
-  late List<MapEntry<String, String>>? opts;
-  late String? defaultValue;
+  late dynamic defaultValue;
+  List<dynamic> additionalValidators;
+  dynamic ensureType(dynamic val);
 
   GeneratedFormItem(this.key,
       {this.label = 'Input',
-      this.type = FormItemType.string,
+      this.belowWidgets = const [],
+      this.defaultValue,
+      this.additionalValidators = const []});
+}
+
+class GeneratedFormTextField extends GeneratedFormItem {
+  late bool required;
+  late int max;
+  late String? hint;
+  late bool password;
+
+  GeneratedFormTextField(String key,
+      {String label = 'Input',
+      List<Widget> belowWidgets = const [],
+      String defaultValue = '',
+      List<String? Function(String? value)> additionalValidators = const [],
       this.required = true,
       this.max = 1,
-      this.additionalValidators = const [],
-      this.belowWidgets = const [],
       this.hint,
-      this.opts,
-      this.defaultValue}) {
-    if (type != FormItemType.string) {
-      required = false;
-    }
+      this.password = false})
+      : super(key,
+            label: label,
+            belowWidgets: belowWidgets,
+            defaultValue: defaultValue,
+            additionalValidators: additionalValidators);
+
+  @override
+  String ensureType(val) {
+    return val.toString();
   }
 }
 
+class GeneratedFormDropdown extends GeneratedFormItem {
+  late List<MapEntry<String, String>>? opts;
+
+  GeneratedFormDropdown(
+    String key,
+    this.opts, {
+    String label = 'Input',
+    List<Widget> belowWidgets = const [],
+    String defaultValue = '',
+    List<String? Function(String? value)> additionalValidators = const [],
+  }) : super(key,
+            label: label,
+            belowWidgets: belowWidgets,
+            defaultValue: defaultValue,
+            additionalValidators: additionalValidators);
+
+  @override
+  String ensureType(val) {
+    return val.toString();
+  }
+}
+
+class GeneratedFormSwitch extends GeneratedFormItem {
+  GeneratedFormSwitch(
+    String key, {
+    String label = 'Input',
+    List<Widget> belowWidgets = const [],
+    bool defaultValue = false,
+    List<String? Function(bool value)> additionalValidators = const [],
+  }) : super(key,
+            label: label,
+            belowWidgets: belowWidgets,
+            defaultValue: defaultValue,
+            additionalValidators: additionalValidators);
+
+  @override
+  bool ensureType(val) {
+    return val == true || val == 'true';
+  }
+}
+
+class GeneratedFormTagInput extends GeneratedFormItem {
+  late MapEntry<String, String>? deleteConfirmationMessage;
+  late bool singleSelect;
+  late WrapAlignment alignment;
+  late String emptyMessage;
+  late bool showLabelWhenNotEmpty;
+  GeneratedFormTagInput(String key,
+      {String label = 'Input',
+      List<Widget> belowWidgets = const [],
+      Map<String, MapEntry<int, bool>> defaultValue = const {},
+      List<String? Function(Map<String, MapEntry<int, bool>> value)>
+          additionalValidators = const [],
+      this.deleteConfirmationMessage,
+      this.singleSelect = false,
+      this.alignment = WrapAlignment.start,
+      this.emptyMessage = 'Input',
+      this.showLabelWhenNotEmpty = true})
+      : super(key,
+            label: label,
+            belowWidgets: belowWidgets,
+            defaultValue: defaultValue,
+            additionalValidators: additionalValidators);
+
+  @override
+  Map<String, MapEntry<int, bool>> ensureType(val) {
+    return val is Map<String, MapEntry<int, bool>> ? val : {};
+  }
+}
+
+typedef OnValueChanges = void Function(
+    Map<String, dynamic> values, bool valid, bool isBuilding);
+
 class GeneratedForm extends StatefulWidget {
   const GeneratedForm(
       {super.key, required this.items, required this.onValueChanges});
@@ -45,26 +130,39 @@ class GeneratedForm extends StatefulWidget {
   State<GeneratedForm> createState() => _GeneratedFormState();
 }
 
+// Generates a random light color
+// Courtesy of ChatGPT 😭 (with a bugfix 🥳)
+Color generateRandomLightColor() {
+  // Create a random number generator
+  final Random random = Random();
+
+  // Generate random hue, saturation, and value values
+  final double hue = random.nextDouble() * 360;
+  final double saturation = 0.5 + random.nextDouble() * 0.5;
+  final double value = 0.9 + random.nextDouble() * 0.1;
+
+  // Create a HSV color with the random values
+  return HSVColor.fromAHSV(1.0, hue, saturation, value).toColor();
+}
+
 class _GeneratedFormState extends State<GeneratedForm> {
   final _formKey = GlobalKey<FormState>();
-  Map<String, String> values = {};
+  Map<String, dynamic> values = {};
   late List<List<Widget>> formInputs;
   List<List<Widget>> rows = [];
 
   // If any value changes, call this to update the parent with value and validity
   void someValueChanged({bool isBuilding = false}) {
-    Map<String, String> returnValues = {};
+    Map<String, dynamic> returnValues = values;
     var valid = true;
     for (int r = 0; r < widget.items.length; r++) {
       for (int i = 0; i < widget.items[r].length; i++) {
-        returnValues[widget.items[r][i].key] =
-            values[widget.items[r][i].key] ?? '';
         if (formInputs[r][i] is TextFormField) {
-          valid = valid &&
-              ((formInputs[r][i].key as GlobalKey<FormFieldState>)
-                      .currentState
-                      ?.isValid ??
-                  false);
+          var fieldState =
+              (formInputs[r][i].key as GlobalKey<FormFieldState>).currentState;
+          if (fieldState != null) {
+            valid = valid && fieldState.isValid;
+          }
         }
       }
     }
@@ -80,35 +178,40 @@ class _GeneratedFormState extends State<GeneratedForm> {
     int j = 0;
     for (var row in widget.items) {
       for (var e in row) {
-        values[e.key] = e.defaultValue ?? e.opts?.first.key ?? '';
+        values[e.key] = e.defaultValue;
       }
     }
 
     // Dynamically create form inputs
     formInputs = widget.items.asMap().entries.map((row) {
       return row.value.asMap().entries.map((e) {
-        if (e.value.type == FormItemType.string && e.value.opts == null) {
+        var formItem = e.value;
+        if (formItem is GeneratedFormTextField) {
           final formFieldKey = GlobalKey<FormFieldState>();
           return TextFormField(
+            obscureText: formItem.password,
+            autocorrect: !formItem.password,
+            enableSuggestions: !formItem.password,
             key: formFieldKey,
-            initialValue: values[e.value.key],
+            initialValue: values[formItem.key],
             autovalidateMode: AutovalidateMode.onUserInteraction,
             onChanged: (value) {
               setState(() {
-                values[e.value.key] = value;
+                values[formItem.key] = value;
                 someValueChanged();
               });
             },
             decoration: InputDecoration(
-                helperText: e.value.label + (e.value.required ? ' *' : ''),
-                hintText: e.value.hint),
-            minLines: e.value.max <= 1 ? null : e.value.max,
-            maxLines: e.value.max <= 1 ? 1 : e.value.max,
+                helperText: formItem.label + (formItem.required ? ' *' : ''),
+                hintText: formItem.hint),
+            minLines: formItem.max <= 1 ? null : formItem.max,
+            maxLines: formItem.max <= 1 ? 1 : formItem.max,
             validator: (value) {
-              if (e.value.required && (value == null || value.trim().isEmpty)) {
-                return '${e.value.label} ${tr('requiredInBrackets')}';
+              if (formItem.required &&
+                  (value == null || value.trim().isEmpty)) {
+                return '${formItem.label} ${tr('requiredInBrackets')}';
               }
-              for (var validator in e.value.additionalValidators) {
+              for (var validator in formItem.additionalValidators) {
                 String? result = validator(value);
                 if (result != null) {
                   return result;
@@ -117,21 +220,20 @@ class _GeneratedFormState extends State<GeneratedForm> {
               return null;
             },
           );
-        } else if (e.value.type == FormItemType.string &&
-            e.value.opts != null) {
-          if (e.value.opts!.isEmpty) {
+        } else if (formItem is GeneratedFormDropdown) {
+          if (formItem.opts!.isEmpty) {
             return Text(tr('dropdownNoOptsError'));
           }
           return DropdownButtonFormField(
-              decoration: InputDecoration(labelText: e.value.label),
-              value: values[e.value.key],
-              items: e.value.opts!
-                  .map((e) =>
-                      DropdownMenuItem(value: e.key, child: Text(e.value)))
+              decoration: InputDecoration(labelText: formItem.label),
+              value: values[formItem.key],
+              items: formItem.opts!
+                  .map((e2) =>
+                      DropdownMenuItem(value: e2.key, child: Text(e2.value)))
                   .toList(),
               onChanged: (value) {
                 setState(() {
-                  values[e.value.key] = value ?? e.value.opts!.first.key;
+                  values[formItem.key] = value ?? formItem.opts!.first.key;
                   someValueChanged();
                 });
               });
@@ -147,21 +249,201 @@ class _GeneratedFormState extends State<GeneratedForm> {
   Widget build(BuildContext context) {
     for (var r = 0; r < formInputs.length; r++) {
       for (var e = 0; e < formInputs[r].length; e++) {
-        if (widget.items[r][e].type == FormItemType.bool) {
+        if (widget.items[r][e] is GeneratedFormSwitch) {
           formInputs[r][e] = Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               Text(widget.items[r][e].label),
               Switch(
-                  value: values[widget.items[r][e].key] == 'true',
+                  value: values[widget.items[r][e].key],
                   onChanged: (value) {
                     setState(() {
-                      values[widget.items[r][e].key] = value ? 'true' : '';
+                      values[widget.items[r][e].key] = value;
                       someValueChanged();
                     });
                   })
             ],
           );
+        } else if (widget.items[r][e] is GeneratedFormTagInput) {
+          formInputs[r][e] =
+              Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
+            if ((values[widget.items[r][e].key]
+                            as Map<String, MapEntry<int, bool>>?)
+                        ?.isNotEmpty ==
+                    true &&
+                (widget.items[r][e] as GeneratedFormTagInput)
+                    .showLabelWhenNotEmpty)
+              Column(
+                crossAxisAlignment:
+                    (widget.items[r][e] as GeneratedFormTagInput).alignment ==
+                            WrapAlignment.center
+                        ? CrossAxisAlignment.center
+                        : CrossAxisAlignment.stretch,
+                children: [
+                  Text(widget.items[r][e].label),
+                  const SizedBox(
+                    height: 8,
+                  ),
+                ],
+              ),
+            Wrap(
+              alignment:
+                  (widget.items[r][e] as GeneratedFormTagInput).alignment,
+              crossAxisAlignment: WrapCrossAlignment.center,
+              children: [
+                (values[widget.items[r][e].key]
+                                as Map<String, MapEntry<int, bool>>?)
+                            ?.isEmpty ==
+                        true
+                    ? Text(
+                        (widget.items[r][e] as GeneratedFormTagInput)
+                            .emptyMessage,
+                      )
+                    : const SizedBox.shrink(),
+                ...(values[widget.items[r][e].key]
+                            as Map<String, MapEntry<int, bool>>?)
+                        ?.entries
+                        .map((e2) {
+                      return Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 4),
+                          child: ChoiceChip(
+                            label: Text(e2.key),
+                            backgroundColor: Color(e2.value.key).withAlpha(50),
+                            selectedColor: Color(e2.value.key),
+                            visualDensity: VisualDensity.compact,
+                            selected: e2.value.value,
+                            onSelected: (value) {
+                              setState(() {
+                                (values[widget.items[r][e].key] as Map<String,
+                                        MapEntry<int, bool>>)[e2.key] =
+                                    MapEntry(
+                                        (values[widget.items[r][e].key] as Map<
+                                                String,
+                                                MapEntry<int, bool>>)[e2.key]!
+                                            .key,
+                                        value);
+                                if ((widget.items[r][e]
+                                            as GeneratedFormTagInput)
+                                        .singleSelect &&
+                                    value == true) {
+                                  for (var key in (values[
+                                              widget.items[r][e].key]
+                                          as Map<String, MapEntry<int, bool>>)
+                                      .keys) {
+                                    if (key != e2.key) {
+                                      (values[widget.items[r][e].key] as Map<
+                                              String,
+                                              MapEntry<int, bool>>)[key] =
+                                          MapEntry(
+                                              (values[widget.items[r][e].key]
+                                                      as Map<
+                                                          String,
+                                                          MapEntry<int,
+                                                              bool>>)[key]!
+                                                  .key,
+                                              false);
+                                    }
+                                  }
+                                }
+                                someValueChanged();
+                              });
+                            },
+                          ));
+                    }) ??
+                    [const SizedBox.shrink()],
+                (values[widget.items[r][e].key]
+                                as Map<String, MapEntry<int, bool>>?)
+                            ?.values
+                            .where((e) => e.value)
+                            .isNotEmpty ==
+                        true
+                    ? Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 4),
+                        child: IconButton(
+                          onPressed: () {
+                            fn() {
+                              setState(() {
+                                var temp = values[widget.items[r][e].key]
+                                    as Map<String, MapEntry<int, bool>>;
+                                temp.removeWhere((key, value) => value.value);
+                                values[widget.items[r][e].key] = temp;
+                                someValueChanged();
+                              });
+                            }
+
+                            if ((widget.items[r][e] as GeneratedFormTagInput)
+                                    .deleteConfirmationMessage !=
+                                null) {
+                              var message =
+                                  (widget.items[r][e] as GeneratedFormTagInput)
+                                      .deleteConfirmationMessage!;
+                              showDialog<Map<String, dynamic>?>(
+                                  context: context,
+                                  builder: (BuildContext ctx) {
+                                    return GeneratedFormModal(
+                                        title: message.key,
+                                        message: message.value,
+                                        items: const []);
+                                  }).then((value) {
+                                if (value != null) {
+                                  fn();
+                                }
+                              });
+                            } else {
+                              fn();
+                            }
+                          },
+                          icon: const Icon(Icons.remove),
+                          visualDensity: VisualDensity.compact,
+                          tooltip: tr('remove'),
+                        ))
+                    : const SizedBox.shrink(),
+                Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 4),
+                    child: IconButton(
+                      onPressed: () {
+                        showDialog<Map<String, dynamic>?>(
+                            context: context,
+                            builder: (BuildContext ctx) {
+                              return GeneratedFormModal(
+                                  title: widget.items[r][e].label,
+                                  items: [
+                                    [
+                                      GeneratedFormTextField('label',
+                                          label: tr('label'))
+                                    ]
+                                  ]);
+                            }).then((value) {
+                          String? label = value?['label'];
+                          if (label != null) {
+                            setState(() {
+                              var temp = values[widget.items[r][e].key]
+                                  as Map<String, MapEntry<int, bool>>?;
+                              temp ??= {};
+                              if (temp[label] == null) {
+                                var singleSelect = (widget.items[r][e]
+                                        as GeneratedFormTagInput)
+                                    .singleSelect;
+                                var someSelected = temp.entries
+                                    .where((element) => element.value.value)
+                                    .isNotEmpty;
+                                temp[label] = MapEntry(
+                                    generateRandomLightColor().value,
+                                    !(someSelected && singleSelect));
+                                values[widget.items[r][e].key] = temp;
+                                someValueChanged();
+                              }
+                            });
+                          }
+                        });
+                      },
+                      icon: const Icon(Icons.add),
+                      visualDensity: VisualDensity.compact,
+                      tooltip: tr('add'),
+                    )),
+              ],
+            )
+          ]);
         }
       }
     }
@@ -171,9 +453,8 @@ class _GeneratedFormState extends State<GeneratedForm> {
       if (rowInputs.key > 0) {
         rows.add([
           SizedBox(
-            height: widget.items[rowInputs.key][0].type == FormItemType.bool &&
-                    widget.items[rowInputs.key - 1][0].type ==
-                        FormItemType.string
+            height: widget.items[rowInputs.key][0] is GeneratedFormSwitch &&
+                    widget.items[rowInputs.key - 1][0] is! GeneratedFormSwitch
                 ? 25
                 : 8,
           )

lib/components/generated_form_modal.dart

@@ -9,19 +9,23 @@ class GeneratedFormModal extends StatefulWidget {
       required this.title,
       required this.items,
       this.initValid = false,
-      this.message = ''});
+      this.message = '',
+      this.additionalWidgets = const [],
+      this.singleNullReturnButton});
 
   final String title;
   final String message;
   final List<List<GeneratedFormItem>> items;
   final bool initValid;
+  final List<Widget> additionalWidgets;
+  final String? singleNullReturnButton;
 
   @override
   State<GeneratedFormModal> createState() => _GeneratedFormModalState();
 }
 
 class _GeneratedFormModalState extends State<GeneratedFormModal> {
-  Map<String, String> values = {};
+  Map<String, dynamic> values = {};
   bool valid = false;
 
   @override
@@ -54,24 +58,29 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
                   this.valid = valid;
                 });
               }
-            })
+            }),
+        if (widget.additionalWidgets.isNotEmpty) ...widget.additionalWidgets
       ]),
       actions: [
         TextButton(
             onPressed: () {
               Navigator.of(context).pop(null);
             },
-            child: Text(tr('cancel'))),
-        TextButton(
-            onPressed: !valid
-                ? null
-                : () {
-                    if (valid) {
-                      HapticFeedback.selectionClick();
-                      Navigator.of(context).pop(values);
-                    }
-                  },
-            child: Text(tr('continue')))
+            child: Text(widget.singleNullReturnButton == null
+                ? tr('cancel')
+                : widget.singleNullReturnButton!)),
+        widget.singleNullReturnButton == null
+            ? TextButton(
+                onPressed: !valid
+                    ? null
+                    : () {
+                        if (valid) {
+                          HapticFeedback.selectionClick();
+                          Navigator.of(context).pop(values);
+                        }
+                      },
+                child: Text(tr('continue')))
+            : const SizedBox.shrink()
       ],
     );
   }

lib/custom_errors.dart

@@ -13,13 +13,10 @@ class ObtainiumError {
   }
 }
 
-class RateLimitError {
+class RateLimitError extends ObtainiumError {
   late int remainingMinutes;
-  RateLimitError(this.remainingMinutes);
-
-  @override
-  String toString() =>
-      plural('tooManyRequestsTryAgainInMinutes', remainingMinutes);
+  RateLimitError(this.remainingMinutes)
+      : super(plural('tooManyRequestsTryAgainInMinutes', remainingMinutes));
 }
 
 class InvalidURLError extends ObtainiumError {

lib/main.dart

@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.9.1';
+const String currentVersion = '0.9.14';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -43,12 +43,16 @@ final globalNavigatorKey = GlobalKey<NavigatorState>();
 Future<void> loadTranslations() async {
   // See easy_localization/issues/210
   await EasyLocalizationController.initEasyLocation();
+  var s = SettingsProvider();
+  await s.initializeSettings();
+  var forceLocale = s.forcedLocale;
   final controller = EasyLocalizationController(
     saveLocale: true,
+    forceLocale: forceLocale != null ? Locale(forceLocale) : null,
     fallbackLocale: fallbackLocale,
     supportedLocales: supportedLocales,
     assetLoader: const RootBundleAssetLoader(),
-    useOnlyLangCode: false,
+    useOnlyLangCode: true,
     useFallbackTranslations: true,
     path: localeDir,
     onLoadError: (FlutterError e) {
@@ -160,6 +164,7 @@ void main() async {
         supportedLocales: supportedLocales,
         path: localeDir,
         fallbackLocale: fallbackLocale,
+        useOnlyLangCode: true,
         child: const Obtainium()),
   ));
 }
@@ -200,7 +205,7 @@ class _ObtainiumState extends State<Obtainium> {
               currentReleaseTag,
               [],
               0,
-              {'includePrereleases': 'true'},
+              {'includePrereleases': true},
               null,
               false)
         ]);

lib/pages/add_app.dart

@@ -8,6 +8,7 @@ import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
 import 'package:obtainium/pages/app.dart';
 import 'package:obtainium/pages/import_export.dart';
+import 'package:obtainium/pages/settings.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -27,8 +28,9 @@ class _AddAppPageState extends State<AddAppPage> {
   String userInput = '';
   String searchQuery = '';
   AppSource? pickedSource;
-  Map<String, String> additionalSettings = {};
+  Map<String, dynamic> additionalSettings = {};
   bool additionalSettingsValid = true;
+  List<String> pickedCategories = [];
 
   @override
   Widget build(BuildContext context) {
@@ -37,25 +39,19 @@ class _AddAppPageState extends State<AddAppPage> {
 
     changeUserInput(String input, bool valid, bool isBuilding) {
       userInput = input;
-      fn() {
-        var source = valid ? sourceProvider.getSource(userInput) : null;
-        if (pickedSource.runtimeType != source.runtimeType) {
-          pickedSource = source;
-          additionalSettings = source != null
-              ? getDefaultValuesFromFormItems(
-                  source.combinedAppSpecificSettingFormItems)
-              : {};
-          additionalSettingsValid = source != null
-              ? !sourceProvider.ifRequiredAppSpecificSettingsExist(source)
-              : true;
-        }
-      }
-
-      if (isBuilding) {
-        fn();
-      } else {
+      if (!isBuilding) {
         setState(() {
-          fn();
+          var source = valid ? sourceProvider.getSource(userInput) : null;
+          if (pickedSource.runtimeType != source.runtimeType) {
+            pickedSource = source;
+            additionalSettings = source != null
+                ? getDefaultValuesFromFormItems(
+                    source.combinedAppSpecificSettingFormItems)
+                : {};
+            additionalSettingsValid = source != null
+                ? !sourceProvider.ifRequiredAppSpecificSettingsExist(source)
+                : true;
+          }
         });
       }
     }
@@ -66,9 +62,9 @@ class _AddAppPageState extends State<AddAppPage> {
       });
       var settingsProvider = context.read<SettingsProvider>();
       () async {
-        var userPickedTrackOnly = additionalSettings['trackOnly'] == 'true';
+        var userPickedTrackOnly = additionalSettings['trackOnly'] == true;
         var userPickedNoVersionDetection =
-            additionalSettings['noVersionDetection'] == 'true';
+            additionalSettings['noVersionDetection'] == true;
         var cont = true;
         if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
             await showDialog(
@@ -113,7 +109,7 @@ class _AddAppPageState extends State<AddAppPage> {
           }
           // Only download the APK here if you need to for the package ID
           if (sourceProvider.isTempId(app.id) &&
-              app.additionalSettings['trackOnly'] != 'true') {
+              app.additionalSettings['trackOnly'] != true) {
             // ignore: use_build_context_synchronously
             var apkUrl = await appsProvider.confirmApkUrl(app, context);
             if (apkUrl == null) {
@@ -128,9 +124,10 @@ class _AddAppPageState extends State<AddAppPage> {
           if (appsProvider.apps.containsKey(app.id)) {
             throw ObtainiumError(tr('appAlreadyAdded'));
           }
-          if (app.additionalSettings['trackOnly'] == 'true') {
+          if (app.additionalSettings['trackOnly'] == true) {
             app.installedVersion = app.latestVersion;
           }
+          app.categories = pickedCategories;
           await appsProvider.saveApps([app]);
 
           return app;
@@ -169,7 +166,7 @@ class _AddAppPageState extends State<AddAppPage> {
                               child: GeneratedForm(
                                   items: [
                                 [
-                                  GeneratedFormItem('appSourceURL',
+                                  GeneratedFormTextField('appSourceURL',
                                       label: tr('appSourceURL'),
                                       additionalValidators: [
                                         (value) {
@@ -231,13 +228,16 @@ class _AddAppPageState extends State<AddAppPage> {
                               child: GeneratedForm(
                                   items: [
                                     [
-                                      GeneratedFormItem('searchSomeSources',
+                                      GeneratedFormTextField(
+                                          'searchSomeSources',
                                           label: tr('searchSomeSourcesLabel'),
                                           required: false),
                                     ]
                                   ],
                                   onValueChanges: (values, valid, isBuilding) {
-                                    if (values.isNotEmpty && valid) {
+                                    if (values.isNotEmpty &&
+                                        valid &&
+                                        !isBuilding) {
                                       setState(() {
                                         searchQuery =
                                             values['searchSomeSources']!.trim();
@@ -288,7 +288,7 @@ class _AddAppPageState extends State<AddAppPage> {
                                           if (selectedUrls != null &&
                                               selectedUrls.isNotEmpty) {
                                             changeUserInput(
-                                                selectedUrls[0], true, true);
+                                                selectedUrls[0], true, false);
                                             addApp(resetUserInputAfter: true);
                                           }
                                         }).catchError((e) {
@@ -298,9 +298,7 @@ class _AddAppPageState extends State<AddAppPage> {
                                 child: Text(tr('search')))
                           ],
                         ),
-                      if (pickedSource != null &&
-                          (pickedSource!
-                              .combinedAppSpecificSettingFormItems.isNotEmpty))
+                      if (pickedSource != null)
                         Column(
                           crossAxisAlignment: CrossAxisAlignment.stretch,
                           children: [
@@ -327,6 +325,18 @@ class _AddAppPageState extends State<AddAppPage> {
                                     });
                                   }
                                 }),
+                            Column(
+                              children: [
+                                const SizedBox(
+                                  height: 16,
+                                ),
+                                CategoryEditorSelector(
+                                    alignment: WrapAlignment.start,
+                                    onSelected: (categories) {
+                                      pickedCategories = categories;
+                                    }),
+                              ],
+                            ),
                           ],
                         )
                       else

lib/pages/app.dart

@@ -1,10 +1,10 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
+import 'package:obtainium/pages/settings.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -34,7 +34,6 @@ class _AppPageState extends State<AppPage> {
       });
     }
 
-    var categories = settingsProvider.categories;
     var sourceProvider = SourceProvider();
     AppInMemory? app = appsProvider.apps[widget.appId];
     var source = app != null ? sourceProvider.getSource(app.app.url) : null;
@@ -42,7 +41,107 @@ class _AppPageState extends State<AppPage> {
       prevApp = app;
       getUpdate(app.app.id);
     }
-    var trackOnly = app?.app.additionalSettings['trackOnly'] == 'true';
+    var trackOnly = app?.app.additionalSettings['trackOnly'] == true;
+
+    var infoColumn = Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        GestureDetector(
+            onTap: () {
+              if (app?.app.url != null) {
+                launchUrlString(app?.app.url ?? '',
+                    mode: LaunchMode.externalApplication);
+              }
+            },
+            child: Text(
+              app?.app.url ?? '',
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                  decoration: TextDecoration.underline,
+                  fontStyle: FontStyle.italic,
+                  fontSize: 12),
+            )),
+        const SizedBox(
+          height: 32,
+        ),
+        Text(
+          tr('latestVersionX', args: [app?.app.latestVersion ?? tr('unknown')]),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.bodyLarge,
+        ),
+        Text(
+          '${tr('installedVersionX', args: [
+                app?.app.installedVersion ?? tr('none')
+              ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
+                  tr('app')
+                ])}' : ''}',
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.bodyLarge,
+        ),
+        const SizedBox(
+          height: 32,
+        ),
+        Text(
+          tr('lastUpdateCheckX', args: [
+            app?.app.lastUpdateCheck == null
+                ? tr('never')
+                : '\n${app?.app.lastUpdateCheck?.toLocal()}'
+          ]),
+          textAlign: TextAlign.center,
+          style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
+        ),
+        const SizedBox(
+          height: 48,
+        ),
+        CategoryEditorSelector(
+            alignment: WrapAlignment.center,
+            preselected:
+                app?.app.categories != null ? app!.app.categories.toSet() : {},
+            onSelected: (categories) {
+              if (app != null) {
+                app.app.categories = categories;
+                appsProvider.saveApps([app.app]);
+              }
+            }),
+      ],
+    );
+
+    var fullInfoColumn = Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        const SizedBox(height: 150),
+        app?.installedInfo != null
+            ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+                Image.memory(
+                  app!.installedInfo!.icon!,
+                  height: 150,
+                  gaplessPlayback: true,
+                )
+              ])
+            : Container(),
+        const SizedBox(
+          height: 25,
+        ),
+        Text(
+          app?.installedInfo?.name ?? app?.app.name ?? tr('app'),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.displayLarge,
+        ),
+        Text(
+          tr('byX', args: [app?.app.author ?? tr('unknown')]),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.headlineMedium,
+        ),
+        const SizedBox(
+          height: 32,
+        ),
+        infoColumn,
+        const SizedBox(height: 150)
+      ],
+    );
+
     return Scaffold(
       appBar: settingsProvider.showAppWebpage ? AppBar() : null,
       backgroundColor: Theme.of(context).colorScheme.surface,
@@ -71,132 +170,8 @@ class _AppPageState extends State<AppPage> {
                   : Container()
               : CustomScrollView(
                   slivers: [
-                    SliverFillRemaining(
-                        child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.stretch,
-                      children: [
-                        app?.installedInfo != null
-                            ? Row(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                    Image.memory(
-                                      app!.installedInfo!.icon!,
-                                      height: 150,
-                                      gaplessPlayback: true,
-                                    )
-                                  ])
-                            : Container(),
-                        const SizedBox(
-                          height: 25,
-                        ),
-                        Text(
-                          app?.installedInfo?.name ??
-                              app?.app.name ??
-                              tr('app'),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.displayLarge,
-                        ),
-                        Text(
-                          tr('byX', args: [app?.app.author ?? tr('unknown')]),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.headlineMedium,
-                        ),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        GestureDetector(
-                            onTap: () {
-                              if (app?.app.url != null) {
-                                launchUrlString(app?.app.url ?? '',
-                                    mode: LaunchMode.externalApplication);
-                              }
-                            },
-                            child: Text(
-                              app?.app.url ?? '',
-                              textAlign: TextAlign.center,
-                              style: const TextStyle(
-                                  decoration: TextDecoration.underline,
-                                  fontStyle: FontStyle.italic,
-                                  fontSize: 12),
-                            )),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        Text(
-                          tr('latestVersionX',
-                              args: [app?.app.latestVersion ?? tr('unknown')]),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyLarge,
-                        ),
-                        Text(
-                          '${tr('installedVersionX', args: [
-                                app?.app.installedVersion ?? tr('none')
-                              ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
-                                  tr('app')
-                                ])}' : ''}',
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyLarge,
-                        ),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        Text(
-                          tr('lastUpdateCheckX', args: [
-                            app?.app.lastUpdateCheck == null
-                                ? tr('never')
-                                : '\n${app?.app.lastUpdateCheck?.toLocal()}'
-                          ]),
-                          textAlign: TextAlign.center,
-                          style: const TextStyle(
-                              fontStyle: FontStyle.italic, fontSize: 12),
-                        ),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        app?.app.category != null
-                            ? Chip(
-                                label: Text(app!.app.category!),
-                                backgroundColor:
-                                    Color(categories[app.app.category!] ?? 0x0),
-                                onDeleted: () {
-                                  app.app.category = null;
-                                  appsProvider.saveApps([app.app]);
-                                },
-                                visualDensity: VisualDensity.compact,
-                              )
-                            : Row(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                    TextButton(
-                                        onPressed: () {
-                                          showDialog<Map<String, String>?>(
-                                              context: context,
-                                              builder: (BuildContext ctx) {
-                                                return GeneratedFormModal(
-                                                    title: 'Pick a Category',
-                                                    items: [
-                                                      [
-                                                        settingsProvider
-                                                            .getCategoryFormItem()
-                                                      ]
-                                                    ]);
-                                              }).then((value) {
-                                            if (value != null && app != null) {
-                                              String? cat = (value['category']
-                                                          ?.isNotEmpty ??
-                                                      false)
-                                                  ? value['category']
-                                                  : null;
-                                              app.app.category = cat;
-                                              appsProvider.saveApps([app.app]);
-                                            }
-                                          });
-                                        },
-                                        child: Text(tr('categorize')))
-                                  ])
-                      ],
-                    )),
+                    SliverToBoxAdapter(
+                        child: Column(children: [fullInfoColumn])),
                   ],
                 ),
           onRefresh: () async {
@@ -273,7 +248,7 @@ class _AppPageState extends State<AppPage> {
                               onPressed: app?.downloadProgress != null
                                   ? null
                                   : () {
-                                      showDialog<Map<String, String>>(
+                                      showDialog<Map<String, dynamic>?>(
                                           context: context,
                                           builder: (BuildContext ctx) {
                                             var items = source
@@ -301,7 +276,7 @@ class _AppPageState extends State<AppPage> {
                                               values;
                                           if (source.enforceTrackOnly) {
                                             changedApp.additionalSettings[
-                                                'trackOnly'] = 'true';
+                                                'trackOnly'] = true;
                                             showError(
                                                 tr('appsFromSourceAreTrackOnly'),
                                                 context);
@@ -315,6 +290,31 @@ class _AppPageState extends State<AppPage> {
                                     },
                               tooltip: tr('additionalOptions'),
                               icon: const Icon(Icons.settings)),
+                        if (app != null && settingsProvider.showAppWebpage)
+                          IconButton(
+                              onPressed: () {
+                                showDialog(
+                                    context: context,
+                                    builder: (BuildContext ctx) {
+                                      return AlertDialog(
+                                        scrollable: true,
+                                        content: infoColumn,
+                                        title: Text(
+                                            '${app.app.name} ${tr('byX', args: [
+                                              app.app.author
+                                            ])}'),
+                                        actions: [
+                                          TextButton(
+                                              onPressed: () {
+                                                Navigator.of(context).pop();
+                                              },
+                                              child: Text(tr('continue')))
+                                        ],
+                                      );
+                                    });
+                              },
+                              icon: const Icon(Icons.more_horiz),
+                              tooltip: tr('more')),
                         const SizedBox(width: 16.0),
                         Expanded(
                             child: ElevatedButton(
@@ -327,7 +327,7 @@ class _AppPageState extends State<AppPage> {
                                         () async {
                                           if (app?.app.additionalSettings[
                                                   'trackOnly'] !=
-                                              'true') {
+                                              true) {
                                             await settingsProvider
                                                 .getInstallPermission();
                                           }

lib/pages/import_export.dart

@@ -9,6 +9,7 @@ import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:file_picker/file_picker.dart';
@@ -28,6 +29,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
   Widget build(BuildContext context) {
     SourceProvider sourceProvider = SourceProvider();
     var appsProvider = context.read<AppsProvider>();
+    var settingsProvider = context.read<SettingsProvider>();
     var outlineButtonStyle = ButtonStyle(
       shape: MaterialStateProperty.all(
         StadiumBorder(
@@ -66,6 +68,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                             showError(
                                                 tr('exportedTo', args: [path]),
                                                 context);
+                                          }).catchError((e) {
+                                            showError(e, context);
                                           });
                                         },
                                   child: Text(tr('obtainiumExport')))),
@@ -98,6 +102,21 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                               appsProvider
                                                   .importApps(data)
                                                   .then((value) {
+                                                var cats =
+                                                    settingsProvider.categories;
+                                                appsProvider.apps
+                                                    .forEach((key, value) {
+                                                  for (var c
+                                                      in value.app.categories) {
+                                                    if (!cats.containsKey(c)) {
+                                                      cats[c] =
+                                                          generateRandomLightColor()
+                                                              .value;
+                                                    }
+                                                  }
+                                                });
+                                                settingsProvider.categories =
+                                                    cats;
                                                 showError(
                                                     tr('importedX', args: [
                                                       plural('apps', value)
@@ -138,18 +157,19 @@ class _ImportExportPageState extends State<ImportExportPage> {
                           onPressed: importInProgress
                               ? null
                               : () {
-                                  showDialog(
+                                  showDialog<Map<String, dynamic>?>(
                                       context: context,
                                       builder: (BuildContext ctx) {
                                         return GeneratedFormModal(
                                           title: tr('importFromURLList'),
                                           items: [
                                             [
-                                              GeneratedFormItem('appURLList',
+                                              GeneratedFormTextField(
+                                                  'appURLList',
                                                   label: tr('appURLList'),
                                                   max: 7,
                                                   additionalValidators: [
-                                                    (String? value) {
+                                                    (dynamic value) {
                                                       if (value != null &&
                                                           value.isNotEmpty) {
                                                         var lines = value
@@ -176,7 +196,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                       }).then((values) {
                                     if (values != null) {
                                       var urls =
-                                          (values[0] as String).split('\n');
+                                          (values['appURLList'] as String)
+                                              .split('\n');
                                       setState(() {
                                         importInProgress = true;
                                       });
@@ -224,7 +245,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                             : () {
                                                 () async {
                                                   var values = await showDialog<
-                                                          List<String>>(
+                                                          Map<String,
+                                                              dynamic>?>(
                                                       context: context,
                                                       builder:
                                                           (BuildContext ctx) {
@@ -235,7 +257,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                               ]),
                                                           items: [
                                                             [
-                                                              GeneratedFormItem(
+                                                              GeneratedFormTextField(
                                                                   'searchQuery',
                                                                   label: tr(
                                                                       'searchQuery'))
@@ -244,13 +266,17 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                         );
                                                       });
                                                   if (values != null &&
-                                                      values[0].isNotEmpty) {
+                                                      (values['searchQuery']
+                                                                  as String?)
+                                                              ?.isNotEmpty ==
+                                                          true) {
                                                     setState(() {
                                                       importInProgress = true;
                                                     });
                                                     var urlsWithDescriptions =
-                                                        await source
-                                                            .search(values[0]);
+                                                        await source.search(
+                                                            values['searchQuery']
+                                                                as String);
                                                     if (urlsWithDescriptions
                                                         .isNotEmpty) {
                                                       var selectedUrls =
@@ -331,7 +357,9 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                             ? null
                                             : () {
                                                 () async {
-                                                  var values = await showDialog(
+                                                  var values = await showDialog<
+                                                          Map<String,
+                                                              dynamic>?>(
                                                       context: context,
                                                       builder:
                                                           (BuildContext ctx) {
@@ -345,7 +373,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                                   .requiredArgs
                                                                   .map(
                                                                       (e) => [
-                                                                            GeneratedFormItem(e,
+                                                                            GeneratedFormTextField(e,
                                                                                 label: e)
                                                                           ])
                                                                   .toList(),
@@ -358,7 +386,10 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                     var urlsWithDescriptions =
                                                         await source
                                                             .getUrlsWithDescriptions(
-                                                                values);
+                                                                values.values
+                                                                    .map((e) =>
+                                                                        e.toString())
+                                                                    .toList());
                                                     var selectedUrls =
                                                         await showDialog<
                                                                 List<String>?>(

lib/pages/settings.dart

@@ -6,6 +6,7 @@ import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/main.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
@@ -41,7 +42,6 @@ class _SettingsPageState extends State<SettingsPage> {
   Widget build(BuildContext context) {
     SettingsProvider settingsProvider = context.watch<SettingsProvider>();
     SourceProvider sourceProvider = SourceProvider();
-    AppsProvider appsProvider = context.read<AppsProvider>();
     if (settingsProvider.prefs == null) {
       settingsProvider.initializeSettings();
     }
@@ -130,6 +130,28 @@ class _SettingsPageState extends State<SettingsPage> {
           }
         });
 
+    var localeDropdown = DropdownButtonFormField(
+        decoration: InputDecoration(labelText: tr('language')),
+        value: settingsProvider.forcedLocale,
+        items: [
+          DropdownMenuItem(
+            value: null,
+            child: Text(tr('followSystem')),
+          ),
+          ...supportedLocales.map((e) => DropdownMenuItem(
+                value: e.toLanguageTag(),
+                child: Text(e.toLanguageTag().toUpperCase()),
+              ))
+        ],
+        onChanged: (value) {
+          settingsProvider.forcedLocale = value;
+          if (value != null) {
+            context.setLocale(Locale(value));
+          } else {
+            context.resetLocale();
+          }
+        });
+
     var intervalDropdown = DropdownButtonFormField(
         decoration: InputDecoration(labelText: tr('bgUpdateCheckInterval')),
         value: settingsProvider.updateInterval,
@@ -158,11 +180,12 @@ class _SettingsPageState extends State<SettingsPage> {
     var sourceSpecificFields = sourceProvider.sources.map((e) {
       if (e.additionalSourceSpecificSettingFormItems.isNotEmpty) {
         return GeneratedForm(
-            items: e.additionalSourceSpecificSettingFormItems
-                .map((e) => [e])
-                .toList(),
+            items: e.additionalSourceSpecificSettingFormItems.map((e) {
+              e.defaultValue = settingsProvider.getSettingString(e.key);
+              return [e];
+            }).toList(),
             onValueChanges: (values, valid, isBuilding) {
-              if (valid) {
+              if (valid && !isBuilding) {
                 values.forEach((key, value) {
                   settingsProvider.setSettingString(key, value);
                 });
@@ -177,8 +200,6 @@ class _SettingsPageState extends State<SettingsPage> {
       height: 16,
     );
 
-    var categories = settingsProvider.categories;
-
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
         body: CustomScrollView(slivers: <Widget>[
@@ -212,6 +233,8 @@ class _SettingsPageState extends State<SettingsPage> {
                               ],
                             ),
                             height16,
+                            localeDropdown,
+                            height16,
                             Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
@@ -263,83 +286,8 @@ class _SettingsPageState extends State<SettingsPage> {
                                   color: Theme.of(context).colorScheme.primary),
                             ),
                             height16,
-                            Wrap(
-                              children: [
-                                ...categories.entries.toList().map((e) {
-                                  return Padding(
-                                      padding: const EdgeInsets.symmetric(
-                                          horizontal: 4),
-                                      child: Chip(
-                                        label: Text(e.key),
-                                        backgroundColor: Color(e.value),
-                                        visualDensity: VisualDensity.compact,
-                                        onDeleted: () {
-                                          showDialog<Map<String, String>?>(
-                                              context: context,
-                                              builder: (BuildContext ctx) {
-                                                return GeneratedFormModal(
-                                                    title: tr(
-                                                        'deleteCategoryQuestion'),
-                                                    message: tr(
-                                                        'categoryDeleteWarning',
-                                                        args: [e.key]),
-                                                    items: []);
-                                              }).then((value) {
-                                            if (value != null) {
-                                              setState(() {
-                                                categories.remove(e.key);
-                                                settingsProvider.categories =
-                                                    categories;
-                                              });
-                                              appsProvider.saveApps(appsProvider
-                                                  .apps.values
-                                                  .where((element) =>
-                                                      element.app.category ==
-                                                      e.key)
-                                                  .map((e) {
-                                                var a = e.app;
-                                                a.category = null;
-                                                return a;
-                                              }).toList());
-                                            }
-                                          });
-                                        },
-                                      ));
-                                }),
-                                Padding(
-                                    padding: const EdgeInsets.symmetric(
-                                        horizontal: 4),
-                                    child: IconButton(
-                                      onPressed: () {
-                                        showDialog<Map<String, String>?>(
-                                            context: context,
-                                            builder: (BuildContext ctx) {
-                                              return GeneratedFormModal(
-                                                  title: tr('addCategory'),
-                                                  items: [
-                                                    [
-                                                      GeneratedFormItem('label',
-                                                          label: tr('label'))
-                                                    ]
-                                                  ]);
-                                            }).then((value) {
-                                          String? label = value?['label'];
-                                          if (label != null) {
-                                            setState(() {
-                                              categories[label] =
-                                                  generateRandomLightColor()
-                                                      .value;
-                                              settingsProvider.categories =
-                                                  categories;
-                                            });
-                                          }
-                                        });
-                                      },
-                                      icon: const Icon(Icons.add),
-                                      visualDensity: VisualDensity.compact,
-                                      tooltip: tr('add'),
-                                    ))
-                              ],
+                            const CategoryEditorSelector(
+                              showLabelWhenNotEmpty: false,
                             )
                           ],
                         ))),
@@ -455,3 +403,62 @@ class _LogsDialogState extends State<LogsDialog> {
     );
   }
 }
+
+class CategoryEditorSelector extends StatefulWidget {
+  final void Function(List<String> categories)? onSelected;
+  final bool singleSelect;
+  final Set<String> preselected;
+  final WrapAlignment alignment;
+  final bool showLabelWhenNotEmpty;
+  const CategoryEditorSelector(
+      {super.key,
+      this.onSelected,
+      this.singleSelect = false,
+      this.preselected = const {},
+      this.alignment = WrapAlignment.start,
+      this.showLabelWhenNotEmpty = true});
+
+  @override
+  State<CategoryEditorSelector> createState() => _CategoryEditorSelectorState();
+}
+
+class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
+  Map<String, MapEntry<int, bool>> storedValues = {};
+
+  @override
+  Widget build(BuildContext context) {
+    var settingsProvider = context.watch<SettingsProvider>();
+    storedValues = settingsProvider.categories.map((key, value) => MapEntry(
+        key,
+        MapEntry(value,
+            storedValues[key]?.value ?? widget.preselected.contains(key))));
+    return GeneratedForm(
+        items: [
+          [
+            GeneratedFormTagInput('categories',
+                label: tr('categories'),
+                emptyMessage: tr('noCategories'),
+                defaultValue: storedValues,
+                alignment: widget.alignment,
+                deleteConfirmationMessage: MapEntry(
+                    tr('deleteCategoriesQuestion'),
+                    tr('categoryDeleteWarning')),
+                singleSelect: widget.singleSelect,
+                showLabelWhenNotEmpty: widget.showLabelWhenNotEmpty)
+          ]
+        ],
+        onValueChanges: ((values, valid, isBuilding) {
+          if (!isBuilding) {
+            storedValues =
+                values['categories'] as Map<String, MapEntry<int, bool>>;
+            settingsProvider.categories =
+                storedValues.map((key, value) => MapEntry(key, value.key));
+            if (widget.onSelected != null) {
+              widget.onSelected!(storedValues.keys
+                  .where((k) => storedValues[k]!.value)
+                  .toList());
+            }
+          }
+        }));
+  }
+}

lib/providers/apps_provider.dart

@@ -17,6 +17,7 @@ import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:package_archive_info/package_archive_info.dart';
+import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:flutter_fgbg/flutter_fgbg.dart';
@@ -313,7 +314,7 @@ class AppsProvider with ChangeNotifier {
         throw ObtainiumError(tr('appNotFound'));
       }
       String? apkUrl;
-      var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == 'true';
+      var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == true;
       if (!trackOnly) {
         apkUrl = await confirmApkUrl(apps[id]!.app, context);
       }
@@ -452,9 +453,9 @@ class AppsProvider with ChangeNotifier {
   // Don't save changes, just return the object if changes were made (else null)
   App? getCorrectedInstallStatusAppIfPossible(App app, AppInfo? installedInfo) {
     var modded = false;
-    var trackOnly = app.additionalSettings['trackOnly'] == 'true';
+    var trackOnly = app.additionalSettings['trackOnly'] == true;
     var noVersionDetection =
-        app.additionalSettings['noVersionDetection'] == 'true';
+        app.additionalSettings['noVersionDetection'] == true;
     if (installedInfo == null && app.installedVersion != null && !trackOnly) {
       app.installedVersion = null;
       modded = true;
@@ -706,6 +707,14 @@ class AppsProvider with ChangeNotifier {
       exportDir = await getExternalStorageDirectory();
       path = exportDir!.path;
     }
+    if ((await DeviceInfoPlugin().androidInfo).version.sdkInt <= 28) {
+      if (await Permission.storage.isDenied) {
+        await Permission.storage.request();
+      }
+      if (await Permission.storage.isDenied) {
+        throw ObtainiumError(tr('storagePermissionDenied'));
+      }
+    }
     File export = File(
         '${exportDir.path}/${tr('obtainiumExportHyphenatedLowercase')}-${DateTime.now().millisecondsSinceEpoch}.json');
     export.writeAsStringSync(

lib/providers/settings_provider.dart

@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/main.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -153,14 +154,29 @@ class SettingsProvider with ChangeNotifier {
 
   set categories(Map<String, int> cats) {
     prefs?.setString('categories', jsonEncode(cats));
+    notifyListeners();
   }
 
-  getCategoryFormItem({String initCategory = ''}) =>
-      GeneratedFormItem('category',
-          label: tr('category'),
-          opts: [
-            MapEntry('', tr('noCategory')),
-            ...categories.entries.map((e) => MapEntry(e.key, e.key)).toList()
-          ],
-          defaultValue: initCategory);
+  String? get forcedLocale {
+    var fl = prefs?.getString('forcedLocale');
+    return supportedLocales
+            .where((element) => element.toLanguageTag() == fl)
+            .isNotEmpty
+        ? fl
+        : null;
+  }
+
+  set forcedLocale(String? fl) {
+    if (fl == null) {
+      prefs?.remove('forcedLocale');
+    } else if (supportedLocales
+        .where((element) => element.toLanguageTag() == fl)
+        .isNotEmpty) {
+      prefs?.setString('forcedLocale', fl);
+    }
+    notifyListeners();
+  }
+
+  bool setEqual(Set<String> a, Set<String> b) =>
+      a.length == b.length && a.union(b).length == a.length;
 }

lib/providers/source_provider.dart

@@ -45,10 +45,10 @@ class App {
   late String latestVersion;
   List<String> apkUrls = [];
   late int preferredApkIndex;
-  late Map<String, String> additionalSettings;
+  late Map<String, dynamic> additionalSettings;
   late DateTime? lastUpdateCheck;
   bool pinned = false;
-  String? category;
+  List<String> categories;
   App(
       this.id,
       this.url,
@@ -61,7 +61,7 @@ class App {
       this.additionalSettings,
       this.lastUpdateCheck,
       this.pinned,
-      {this.category});
+      {this.categories = const []});
 
   @override
   String toString() {
@@ -72,24 +72,42 @@ class App {
     var source = SourceProvider().getSource(json['url']);
     var formItems = source.combinedAppSpecificSettingFormItems
         .reduce((value, element) => [...value, ...element]);
-    Map<String, String> additionalSettings =
+    Map<String, dynamic> additionalSettings =
         getDefaultValuesFromFormItems([formItems]);
     if (json['additionalSettings'] != null) {
       additionalSettings.addEntries(
-          Map<String, String>.from(jsonDecode(json['additionalSettings']))
+          Map<String, dynamic>.from(jsonDecode(json['additionalSettings']))
               .entries);
     }
-    // If needed, migrate old-style additionalData to new-style additionalSettings
+    // If needed, migrate old-style additionalData to newer-style additionalSettings (V1)
     if (json['additionalData'] != null) {
       List<String> temp = List<String>.from(jsonDecode(json['additionalData']));
       temp.asMap().forEach((i, value) {
         if (i < formItems.length) {
-          additionalSettings[formItems[i].key] = value;
+          if (formItems[i] is GeneratedFormSwitch) {
+            additionalSettings[formItems[i].key] = value == 'true';
+          } else {
+            additionalSettings[formItems[i].key] = value;
+          }
         }
       });
-      additionalSettings['trackOnly'] = (json['trackOnly'] ?? false).toString();
+      additionalSettings['trackOnly'] =
+          json['trackOnly'] == 'true' || json['trackOnly'] == true;
       additionalSettings['noVersionDetection'] =
-          (json['noVersionDetection'] ?? false).toString();
+          json['noVersionDetection'] == 'true' || json['trackOnly'] == true;
+    }
+    // Ensure additionalSettings are correctly typed
+    for (var item in formItems) {
+      if (additionalSettings[item.key] != null) {
+        additionalSettings[item.key] =
+            item.ensureType(additionalSettings[item.key]);
+      }
+    }
+    int preferredApkIndex = json['preferredApkIndex'] == null
+        ? 0
+        : json['preferredApkIndex'] as int;
+    if (preferredApkIndex < 0) {
+      preferredApkIndex = 0;
     }
     return App(
         json['id'] as String,
@@ -103,15 +121,19 @@ class App {
         json['apkUrls'] == null
             ? []
             : List<String>.from(jsonDecode(json['apkUrls'])),
-        json['preferredApkIndex'] == null
-            ? 0
-            : json['preferredApkIndex'] as int,
+        preferredApkIndex,
         additionalSettings,
         json['lastUpdateCheck'] == null
             ? null
             : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
         json['pinned'] ?? false,
-        category: json['category']);
+        categories: json['categories'] != null
+            ? (json['categories'] as List<dynamic>)
+                .map((e) => e.toString())
+                .toList()
+            : json['category'] != null
+                ? [json['category'] as String]
+                : []);
   }
 
   Map<String, dynamic> toJson() => {
@@ -126,7 +148,7 @@ class App {
         'additionalSettings': jsonEncode(additionalSettings),
         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
         'pinned': pinned,
-        'category': category
+        'categories': categories
       };
 }
 
@@ -160,7 +182,7 @@ List<String> getLinksFromParsedHTML(
         .map((e) => '$prependToLinks${e.attributes['href']!}')
         .toList();
 
-Map<String, String> getDefaultValuesFromFormItems(
+Map<String, dynamic> getDefaultValuesFromFormItems(
     List<List<GeneratedFormItem>> items) {
   return Map.fromEntries(items
       .map((row) => row.map((el) => MapEntry(el.key, el.defaultValue ?? '')))
@@ -181,7 +203,7 @@ class AppSource {
   }
 
   Future<APKDetails> getLatestAPKDetails(
-      String standardUrl, Map<String, String> additionalSettings) {
+      String standardUrl, Map<String, dynamic> additionalSettings) {
     throw NotImplementedError();
   }
 
@@ -193,16 +215,12 @@ class AppSource {
   final List<List<GeneratedFormItem>>
       additionalAppSpecificSourceAgnosticSettingFormItems = [
     [
-      GeneratedFormItem(
+      GeneratedFormSwitch(
         'trackOnly',
         label: tr('trackOnly'),
-        type: FormItemType.bool,
       )
     ],
-    [
-      GeneratedFormItem('noVersionDetection',
-          label: tr('noVersionDetection'), type: FormItemType.bool)
-    ]
+    [GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))]
   ];
 
   // Previous 2 variables combined into one at runtime for convenient usage
@@ -230,7 +248,7 @@ class AppSource {
   }
 
   String? tryInferringAppId(String standardUrl,
-      {Map<String, String> additionalSettings = const {}}) {
+      {Map<String, dynamic> additionalSettings = const {}}) {
     return null;
   }
 }
@@ -293,7 +311,7 @@ class SourceProvider {
   bool ifRequiredAppSpecificSettingsExist(AppSource source) {
     for (var row in source.combinedAppSpecificSettingFormItems) {
       for (var element in row) {
-        if (element.required && element.opts == null) {
+        if (element is GeneratedFormTextField && element.required) {
           return true;
         }
       }
@@ -319,17 +337,17 @@ class SourceProvider {
   }
 
   Future<App> getApp(
-      AppSource source, String url, Map<String, String> additionalSettings,
+      AppSource source, String url, Map<String, dynamic> additionalSettings,
       {App? currentApp,
       bool trackOnlyOverride = false,
       noVersionDetectionOverride = false}) async {
-    if (trackOnlyOverride) {
-      additionalSettings['trackOnly'] = 'true';
+    if (trackOnlyOverride || source.enforceTrackOnly) {
+      additionalSettings['trackOnly'] = true;
     }
     if (noVersionDetectionOverride) {
-      additionalSettings['noVersionDetection'] = 'true';
+      additionalSettings['noVersionDetection'] = true;
     }
-    var trackOnly = currentApp?.additionalSettings['trackOnly'] == 'true';
+    var trackOnly = additionalSettings['trackOnly'] == true;
     String standardUrl = source.standardizeURL(preStandardizeUrl(url));
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalSettings);
@@ -352,11 +370,11 @@ class SourceProvider {
         currentApp?.installedVersion,
         apkVersion,
         apk.apkUrls,
-        apk.apkUrls.length - 1,
+        apk.apkUrls.length - 1 >= 0 ? apk.apkUrls.length - 1 : 0,
         additionalSettings,
         DateTime.now(),
         currentApp?.pinned ?? false,
-        category: currentApp?.category);
+        categories: currentApp?.categories ?? const []);
   }
 
   // Returns errors in [results, errors] instead of throwing them

pubspec.lock

@@ -56,7 +56,7 @@ packages:
       name: checked_yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   cli_util:
     dependency: transitive
     description:
@@ -286,7 +286,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.2"
+    version: "3.3.0"
   install_plugin_v2:
     dependency: "direct main"
     description:
@@ -559,7 +559,7 @@ packages:
       name: shared_preferences_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
@@ -655,7 +655,7 @@ packages:
       name: timezone
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.0"
+    version: "0.9.1"
   typed_data:
     dependency: transitive
     description:
@@ -739,14 +739,14 @@ packages:
       name: webview_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.1"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.1"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -760,7 +760,7 @@ packages:
       name: webview_flutter_wkwebview
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.9.1+89 # When changing this, update the tag in main() accordingly
+version: 0.9.14+104 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'