Merge pull request #217 from ImranR98/dev

Bugfixes and UI Tweaks (#213, #215, #216)
Increment version + updated packages
2025-11-04 07:13:28 +01:00 · 2023-01-06 21:11:58 -05:00 · 2023-01-06 21:11:13 -05:00 · 2023-01-06 21:10:04 -05:00 · 2023-01-06 20:57:26 -05:00 · 2023-01-06 20:47:22 -05:00
34 changed files with 1703 additions and 916 deletions
--- a/README.md
+++ b/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
--- a/android/app/src/main/AndroidManifest.xml
+++ b/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>
--- a/android/app/src/main/res/drawable/ic_notification.png
+++ b/android/app/src/main/res/drawable/ic_notification.png
--- a/assets/graphics/icon_small.png
+++ b/assets/graphics/icon_small.png
--- a/assets/translations/de.json
+++ b/assets/translations/de.json
@@ -135,7 +135,7 @@
    "appearance": "Aussehen",
    "showWebInAppView": "Quellwebseite in der App-Ansicht anzeigen",
    "pinUpdates": "Apps mit Aktualisierungen oben anheften",
-    "updates": "Aktualisiert",
+    "updates": "Aktualisierungen",
    "sourceSpecific": "Quellenspezifisch",
    "appSource": "App-Quelle",
    "noLogs": "Keine Protokolle",
@@ -188,17 +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",
+    "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"
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -135,7 +135,7 @@
    "appearance": "Appearance",
    "showWebInAppView": "Show Source Webpage in App View",
    "pinUpdates": "Pin Updates to Top of Apps View",
-    "updates": "Updated",
+    "updates": "Updates",
    "sourceSpecific": "Source-Specific",
    "appSource": "App Source",
    "noLogs": "No Logs",
@@ -199,6 +199,18 @@
    "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",
+    "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"
--- a/assets/translations/hu.json
+++ b/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,16 +126,16 @@
    "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",
    "pinUpdates": "Frissítések kitűzése az App nézet tetejére",
-    "updates": "Frissítve",
+    "updates": "Frissítések",
    "sourceSpecific": "Forrás-specifikus",
    "appSource": "App forrás",
    "noLogs": "Nincsenek naplók",
@@ -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,21 +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",
+    "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"
--- a/assets/translations/it.json
+++ b/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,8 +134,8 @@
    "neverManualOnly": "Mai - Solo manuale",
    "appearance": "Aspetto",
    "showWebInAppView": "Mostra pagina web dell'App se selezionata",
-    "pinUpdates": "Fissa in alto gli aggiornamenti disponibili",
-    "updates": "Aggiornato",
+    "pinUpdates": "Fissa aggiornamenti disponibili in alto",
+    "updates": "Aggiornamenti",
    "sourceSpecific": "Specifiche per la fonte",
    "appSource": "Sorgente dell'App",
    "noLogs": "Nessun log",
@@ -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,28 +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",
+    "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",
--- a/assets/translations/ja.json
+++ b/assets/translations/ja.json
@@ -16,7 +16,7 @@
    "startedActualBGUpdateCheck": "実際のバックグラウンドのアップデート確認を開始",
    "bgUpdateTaskFinished": "バックグラウンドのアップデート確認タスクを終了",
    "firstRun": "これがObtainiumの最初の実行です",
-    "settingUpdateCheckIntervalTo": "更新間隔を{}に設定する",
+    "settingUpdateCheckIntervalTo": "確認間隔を{}に設定する",
    "githubPATLabel": "GitHub パーソナルアクセストークン (レート制限の引き上げ)",
    "githubPATHint": "PATは次の形式でなければなりません: ユーザー名:トークン",
    "githubPATFormat": "ユーザー名:トークン",
@@ -27,18 +27,18 @@
    "invalidRegEx": "無効な正規表現",
    "noDescription": "説明はありません",
    "cancel": "キャンセル",
-    "continue": "続ける",
+    "continue": "続行",
    "requiredInBrackets": "(必須)",
-    "dropdownNoOptsError": "エラー: ドロップダウンには、少なくとも1つのoptが必要です。",
+    "dropdownNoOptsError": "エラー: ドロップダウンには、少なくとも1つのオプションが必要です",
    "colour": "カラー",
    "githubStarredRepos": "Githubでスターしたリポジトリ",
    "uname": "ユーザー名",
    "wrongArgNum": "提供する引数の数が間違っています",
-    "xIsTrackOnly": "{} は'追跡のみ'です",
+    "xIsTrackOnly": "{} は「追跡のみ」です",
    "source": "ソース",
    "app": "アプリ",
-    "appsFromSourceAreTrackOnly": "このソースからのアプリは'追跡のみ'です'。",
-    "youPickedTrackOnly": "'追跡のみ'を選択しています",
+    "appsFromSourceAreTrackOnly": "このソースからのアプリは「追跡のみ」です。",
+    "youPickedTrackOnly": "「追跡のみ」を選択しています",
    "trackOnlyAppDescription": "アプリのアップデートは追跡されますが、Obtainiumはアプリのダウンロードやインストールをすることはできません。",
    "cancelled": "キャンセルしました",
    "appAlreadyAdded": "アプリはすでに追加されています",
@@ -64,7 +64,7 @@
    "notInstalled": "未インストール",
    "estimateInBrackets": "(推定)",
    "selectAll": "すべて選択",
-    "deselectN": "{}件を選択解除",
+    "deselectN": "{}件の選択を解除",
    "xWillBeRemovedButRemainInstalled": "{}はObtainiumから削除されますが、デバイスにはインストールされたままです。",
    "removeSelectedAppsQuestion": "選択したアプリを削除しますか？",
    "removeSelectedApps": "選択したアプリを削除する",
@@ -124,18 +124,18 @@
    "obtainium": "Obtainium",
    "materialYou": "Material You",
    "appSortBy": "アプリの並び方",
-    "authorName": "作者/アプリ名",
-    "nameAuthor": "アプリ名/作者",
+    "authorName": "作者名/アプリ名",
+    "nameAuthor": "アプリ名/作者名",
    "asAdded": "追加順",
    "appSortOrder": "並び順",
    "ascending": "昇順",
    "descending": "降順",
-    "bgUpdateCheckInterval": "バックグラウンド更新の確認間隔",
+    "bgUpdateCheckInterval": "バックグラウンドでのアップデート確認の間隔",
    "neverManualOnly": "手動",
    "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アーキテクチャをサポートしています:",
@@ -152,11 +152,11 @@
    "sourceIsXButPackageFromYPrompt": "アプリのソースは'{}'ですが、リリースパッケージは'{}'から来ています。続行しますか？",
    "updatesAvailable": "アップデートが利用可能",
    "updatesAvailableNotifDescription": "Obtainiumが追跡している1つまたは複数のアプリのアップデートが利用可能であることをユーザーに通知する",
-    "noNewUpdates": "新しいアップデートはありません。",
+    "noNewUpdates": "新しいアップデートはありません",
    "xHasAnUpdate": "{}のアップデートが利用可能です",
    "appsUpdated": "アプリをアップデートしました",
    "appsUpdatedNotifDescription": "1つまたは複数のAppのアップデートがバックグラウンドで適用されたことをユーザーに通知する",
-    "xWasUpdatedToY": "{}が{}にアップデートされました。",
+    "xWasUpdatedToY": "{}が{}にアップデートされました",
    "errorCheckingUpdates": "アップデート確認中のエラー",
    "errorCheckingUpdatesNotifDescription": "バックグラウンドでのアップデート確認に失敗した際に表示される通知",
    "appsRemoved": "削除されたアプリ",
@@ -173,7 +173,7 @@
    "versionCorrectionDisabled": "バージョン補正無効 (プラグインが動作していません)",
    "unknown": "不明",
    "none": "なし",
-    "never": "Never",
+    "never": "しない",
    "latestVersionX": "最新のバージョン: {}",
    "installedVersionX": "インストールされたバージョン: {}",
    "lastUpdateCheckX": "最終アップデート確認: {}",
@@ -181,35 +181,47 @@
    "removeAppQuestion": "アプリを削除しますか？",
    "yesMarkUpdated": "はい、アップデート済みとしてマークします",
    "fdroid": "F-Droid",
-    "appIdOrName": "アプリIDまたは名前",
+    "appIdOrName": "アプリのIDまたは名前",
    "appWithIdOrNameNotFound": "そのIDや名前を持つアプリは見つかりませんでした",
    "reposHaveMultipleApps": "リポジトリには複数のアプリが含まれることがあります",
    "fdroidThirdPartyRepo": "F-Droid Third-Party 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",
+    "install": "インストール",
+    "markInstalled": "インストール済みとしてマークする",
+    "update": "アップデート",
+    "markUpdated": "アップデート済みとしてマークする",
+    "additionalOptions": "追加のオプション",
+    "disableVersionDetection": "バージョン検出を無効にする",
+    "noVersionDetectionExplanation": "このオプションは、バージョン検出が正しく機能しないアプリにのみ使用する必要があります。",
+    "downloadingX": "{} をダウンロード中",
+    "downloadNotifDescription": "アプリのダウンロード状況を通知する",
+    "noAPKFound": "APKが見つかりません",
+    "noVersionDetection": "バージョン検出を行わない",
+    "categorize": "カテゴライズ",
+    "categories": "カテゴリ",
+    "category": "カテゴリ",
+    "noCategory": "カテゴリなし",
+    "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": "リクエストが多すぎます（レート制限）- {}分後に再試行してください"
    },
    "bgUpdateGotErrorRetryInMinutes": {
-        "one": "バックグラウンドのアップデート確認で {} の問題が発生, {} 分後に再試行します",
-        "other": "バックグラウンドのアップデート確認で {} の問題が発生, {} 分後に再試行します"
+        "one": "バックグラウンドでのアップデート確認で {} の問題が発生, {} 分後に再試行します",
+        "other": "バックグラウンドでのアップデート確認で {} の問題が発生, {} 分後に再試行します"
    },
    "bgCheckFoundUpdatesWillNotifyIfNeeded": {
-        "one": "バックグラウンドのアップデート確認で {} 個のアップデートを発見 - 必要に応じてユーザーに通知します",
-        "other": "バックグラウンドのアップデート確認で {} 個のアップデートを発見 - 必要に応じてユーザーに通知します"
+        "one": "バックグラウンドでのアップデート確認で {} 個のアップデートを発見 - 必要に応じてユーザーに通知します",
+        "other": "バックグラウンドでのアップデート確認で {} 個のアップデートを発見 - 必要に応じてユーザーに通知します"
    },
    "apps": {
        "one": "{}個のアプリ",
@@ -236,11 +248,11 @@
        "other": "{n}個のログをクリアしました (前 = {before}, 後 = {after})"
    },
    "xAndNMoreUpdatesAvailable": {
-        "one": "{}とさらに{}個のアプリのアップデートが利用可能です。",
-        "other": "{}とさらに{}個のアプリのアップデートが利用可能です。"
+        "one": "{}とさらに{}個のアプリのアップデートが利用可能です",
+        "other": "{}とさらに{}個のアプリのアップデートが利用可能です"
    },
    "xAndNMoreUpdatesInstalled": {
-        "one": "{}とさらに{}個のアプリがアップデートされました。",
-        "other": "{}とさらに{}個のアプリがアップデートされました。"
+        "one": "{}とさらに{}個のアプリがアップデートされました",
+        "other": "{}とさらに{}個のアプリがアップデートされました"
    }
 }
--- a/assets/translations/zh.json
+++ b/assets/translations/zh.json
@@ -12,7 +12,7 @@
    "ok": "好的",
    "and": "和",
    "startedBgUpdateTask": "开始后台检查更新任务",
-    "bgUpdateIgnoreAfterIs": "Bg update ignoreAfter is  {}",
+    "bgUpdateIgnoreAfterIs": "下次后台更新检查  {}",
    "startedActualBGUpdateCheck": "后台检查更新已开始",
    "bgUpdateTaskFinished": "后台检查更新已完成",
    "firstRun": "这是你第一次运行 Obtainium",
@@ -22,9 +22,9 @@
    "githubPATFormat": "username:token",
    "githubPATLinkText": "关于 GitHub 个人访问令牌",
    "includePrereleases": "包含预发布版",
-    "fallbackToOlderReleases": "回落到旧版",
-    "filterReleaseTitlesByRegEx": "通过正则表达式过滤发布标题",
-    "invalidRegEx": "无效的正则表达式",
+    "fallbackToOlderReleases": "回退到旧版",
+    "filterReleaseTitlesByRegEx": "使用正则以过滤发布标题",
+    "invalidRegEx": "表达式无效",
    "noDescription": "无描述",
    "cancel": "取消",
    "continue": "继续",
@@ -109,7 +109,7 @@
    "searchX": "搜索 {}",
    "noResults": "无结果",
    "importX": "导入 {}",
-    "importedAppsIdDisclaimer": "导入的应用程序可能不正确地显示为未安装。要解决这个问题，请通过 Obtainium 重新安装它们。",
+    "importedAppsIdDisclaimer": "导入的应用程序可能显示为未安装。要解决这个问题，请通过 Obtainium 重新安装它们。",
    "importErrors": "导入错误",
    "importedXOfYApps": "{} 中的 {} 个应用已导入",
    "followingURLsHadErrors": "以下 URL 有错误：",
@@ -134,7 +134,7 @@
    "neverManualOnly": "手动",
    "appearance": "外观",
    "showWebInAppView": "在应用来源页显示网页",
-    "pinUpdates": "将需要更新的应用固定到顶部",
+    "pinUpdates": "需更新的应用置顶",
    "updates": "检查间隔",
    "sourceSpecific": "Github 访问令牌",
    "appSource": "源代码",
@@ -145,9 +145,9 @@
    "appNotFound": "未找到应用",
    "obtainiumExportHyphenatedLowercase": "obtainium-导出",
    "pickAnAPK": "选择一个安装包",
-    "appHasMoreThanOnePackage": "{} 有多于一个安装包：",
-    "deviceSupportsXArch": "你的设备支持 {} CPU 架构",
-    "deviceSupportsFollowingArchs": "你的设备支持以下 CPU 架构:",
+    "appHasMoreThanOnePackage": "{} 有多个架构可用：",
+    "deviceSupportsXArch": "你的设备支持 {} 架构",
+    "deviceSupportsFollowingArchs": "你的设备支持以下架构:",
    "warning": "警告",
    "sourceIsXButPackageFromYPrompt": "此应用来源是 '{}' 但更新包来自 '{}'。 继续吗？",
    "updatesAvailable": "更新可用",
@@ -188,17 +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",
+    "install": "安装",
+    "markInstalled": "标记为已安装",
+    "update": "更新",
+    "markUpdated": "标记为已更新",
+    "additionalOptions": "附加选项",
+    "disableVersionDetection": "关闭版本检测",
+    "noVersionDetectionExplanation": "此选项应只用于版本检测不能工作的应用程序",
+    "downloadingX": "下载中 {}",
+    "downloadNotifDescription": "通知用户下载进度",
+    "noAPKFound": "未找到安装包",
+    "noVersionDetection": "无版本检测",
+    "categorize": "归档",
+    "categories": "归档",
+    "category": "类别",
+    "noCategory": "无类别",
+    "noCategories": "无类别",
+    "deleteCategoriesQuestion": "删除所有类别？",
+    "categoryDeleteWarning": "所有被删除类别的应用程序将被设置为无类别",
+    "addCategory": "添加类别",
+    "label": "标签",
+    "language": "语言",
+    "storagePermissionDenied": "存储权限已被拒绝",
+    "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
    "tooManyRequestsTryAgainInMinutes": {
        "one": "请求过多 (API 限制) - 在 {} 分钟后重试",
        "other": "请求过多 (API 限制) - 在 {} 分钟后重试"
--- a/lib/app_sources/apkmirror.dart
+++ b/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);
    }
  }

--- a/lib/app_sources/fdroid.dart
+++ b/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(
--- a/lib/app_sources/fdroidrepo.dart
+++ b/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);
    }
  }
 }
--- a/lib/app_sources/github.dart
+++ b/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];
--- a/lib/app_sources/gitlab.dart
+++ b/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);
    }
  }
 }
--- a/lib/app_sources/izzyondroid.dart
+++ b/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(
--- a/lib/app_sources/mullvad.dart
+++ b/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);
    }
  }
 }
--- a/lib/app_sources/signal.dart
+++ b/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);
    }
  }
 }
--- a/lib/app_sources/sourceforge.dart
+++ b/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);
    }
  }
 }
--- a/lib/app_sources/steammobile.dart
+++ b/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);
    }
  }
 }
--- a/lib/components/generated_form.dart
+++ b/lib/components/generated_form.dart
@@ -1,38 +1,123 @@
+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(
@@ -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,
          )
--- a/lib/components/generated_form_modal.dart
+++ b/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,15 +58,19 @@ 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(
+            child: Text(widget.singleNullReturnButton == null
+                ? tr('cancel')
+                : widget.singleNullReturnButton!)),
+        widget.singleNullReturnButton == null
+            ? TextButton(
                onPressed: !valid
                    ? null
                    : () {
@@ -72,6 +80,7 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
                        }
                      },
                child: Text(tr('continue')))
+            : const SizedBox.shrink()
      ],
    );
  }
--- a/lib/custom_errors.dart
+++ b/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 {
--- a/lib/main.dart
+++ b/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.8.22';
+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)
        ]);
--- a/lib/pages/add_app.dart
+++ b/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,7 +39,8 @@ class _AddAppPageState extends State<AddAppPage> {

    changeUserInput(String input, bool valid, bool isBuilding) {
      userInput = input;
-      fn() {
+      if (!isBuilding) {
+        setState(() {
          var source = valid ? sourceProvider.getSource(userInput) : null;
          if (pickedSource.runtimeType != source.runtimeType) {
            pickedSource = source;
@@ -49,13 +52,6 @@ class _AddAppPageState extends State<AddAppPage> {
                ? !sourceProvider.ifRequiredAppSpecificSettingsExist(source)
                : true;
          }
-      }
-
-      if (isBuilding) {
-        fn();
-      } else {
-        setState(() {
-          fn();
        });
      }
    }
@@ -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
--- a/lib/pages/app.dart
+++ b/lib/pages/app.dart
@@ -4,6 +4,7 @@ import 'package:flutter/services.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';
@@ -40,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,
@@ -69,88 +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),
-                        )
-                      ],
-                    )),
+                    SliverToBoxAdapter(
+                        child: Column(children: [fullInfoColumn])),
                  ],
                ),
          onRefresh: () async {
@@ -227,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
@@ -255,7 +276,7 @@ class _AppPageState extends State<AppPage> {
                                              values;
                                          if (source.enforceTrackOnly) {
                                            changedApp.additionalSettings[
-                                                'trackOnly'] = 'true';
+                                                'trackOnly'] = true;
                                            showError(
                                                tr('appsFromSourceAreTrackOnly'),
                                                context);
@@ -269,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(
@@ -281,7 +327,7 @@ class _AppPageState extends State<AppPage> {
                                        () async {
                                          if (app?.app.additionalSettings[
                                                  'trackOnly'] !=
-                                              'true') {
+                                              true) {
                                            await settingsProvider
                                                .getInstallPermission();
                                          }
--- a/lib/pages/apps.dart
+++ b/lib/pages/apps.dart
@@ -7,6 +7,7 @@ import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
 import 'package:obtainium/pages/app.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';
@@ -22,7 +23,8 @@ class AppsPage extends StatefulWidget {
 }

 class AppsPageState extends State<AppsPage> {
-  AppsFilter? filter;
+  AppsFilter filter = AppsFilter();
+  final AppsFilter neutralFilter = AppsFilter();
  var updatesOnlyFilter =
      AppsFilter(includeUptodate: false, includeNonInstalled: false);
  Set<App> selectedApps = {};
@@ -54,7 +56,7 @@ class AppsPageState extends State<AppsPage> {
    var settingsProvider = context.watch<SettingsProvider>();
    var sortedApps = appsProvider.apps.values.toList();
    var currentFilterIsUpdatesOnly =
-        filter?.isIdenticalTo(updatesOnlyFilter) ?? false;
+        filter.isIdenticalTo(updatesOnlyFilter, settingsProvider);

    selectedApps = selectedApps
        .where((element) => sortedApps.map((e) => e.app).contains(element))
@@ -70,24 +72,20 @@ class AppsPageState extends State<AppsPage> {
      });
    }

-    if (filter != null) {
    sortedApps = sortedApps.where((app) {
      if (app.app.installedVersion == app.app.latestVersion &&
-            !(filter!.includeUptodate)) {
+          !(filter.includeUptodate)) {
        return false;
      }
-        if (app.app.installedVersion == null &&
-            !(filter!.includeNonInstalled)) {
+      if (app.app.installedVersion == null && !(filter.includeNonInstalled)) {
        return false;
      }
-        if (filter!.nameFilter.isEmpty && filter!.authorFilter.isEmpty) {
-          return true;
-        }
-        List<String> nameTokens = filter!.nameFilter
+      if (filter.nameFilter.isNotEmpty || filter.authorFilter.isNotEmpty) {
+        List<String> nameTokens = filter.nameFilter
            .split(' ')
            .where((element) => element.trim().isNotEmpty)
            .toList();
-        List<String> authorTokens = filter!.authorFilter
+        List<String> authorTokens = filter.authorFilter
            .split(' ')
            .where((element) => element.trim().isNotEmpty)
            .toList();
@@ -103,9 +101,15 @@ class AppsPageState extends State<AppsPage> {
            return false;
          }
        }
+      }
+      if (filter.categoryFilter.isNotEmpty &&
+          filter.categoryFilter
+              .intersection(app.app.categories.toSet())
+              .isEmpty) {
+        return false;
+      }
      return true;
    }).toList();
-    }

    sortedApps.sort((a, b) {
      var nameA = a.installedInfo?.name ?? a.app.name;
@@ -139,16 +143,14 @@ class AppsPageState extends State<AppsPage> {

    List<String> trackOnlyUpdateIdsAllOrSelected = [];
    existingUpdateIdsAllOrSelected = existingUpdateIdsAllOrSelected.where((id) {
-      if (appsProvider.apps[id]!.app.additionalSettings['trackOnly'] ==
-          'true') {
+      if (appsProvider.apps[id]!.app.additionalSettings['trackOnly'] == true) {
        trackOnlyUpdateIdsAllOrSelected.add(id);
        return false;
      }
      return true;
    }).toList();
    newInstallIdsAllOrSelected = newInstallIdsAllOrSelected.where((id) {
-      if (appsProvider.apps[id]!.app.additionalSettings['trackOnly'] ==
-          'true') {
+      if (appsProvider.apps[id]!.app.additionalSettings['trackOnly'] == true) {
        trackOnlyUpdateIdsAllOrSelected.add(id);
        return false;
      }
@@ -225,7 +227,22 @@ class AppsPageState extends State<AppsPage> {
              String? changesUrl = SourceProvider()
                  .getSource(sortedApps[index].app.url)
                  .changeLogPageFromStandardUrl(sortedApps[index].app.url);
-              return ListTile(
+              var transparent = const Color.fromARGB(0, 0, 0, 0).value;
+              return Container(
+                  decoration: BoxDecoration(
+                      border: Border.symmetric(
+                          vertical: BorderSide(
+                              width: 4,
+                              color: Color(
+                                  sortedApps[index].app.categories.isNotEmpty
+                                      ? settingsProvider.categories[
+                                              sortedApps[index]
+                                                  .app
+                                                  .categories
+                                                  .first] ??
+                                          transparent
+                                      : transparent)))),
+                  child: ListTile(
                    tileColor: sortedApps[index].app.pinned
                        ? Colors.grey.withOpacity(0.1)
                        : Colors.transparent,
@@ -249,9 +266,11 @@ class AppsPageState extends State<AppsPage> {
                      style: TextStyle(
                        fontWeight: sortedApps[index].app.pinned
                            ? FontWeight.bold
-                          : FontWeight.normal),
+                            : FontWeight.normal,
                      ),
-                subtitle: Text(tr('byX', args: [sortedApps[index].app.author]),
+                    ),
+                    subtitle: Text(
+                        tr('byX', args: [sortedApps[index].app.author]),
                        style: TextStyle(
                            fontWeight: sortedApps[index].app.pinned
                                ? FontWeight.bold
@@ -273,13 +292,18 @@ class AppsPageState extends State<AppsPage> {
                                  SizedBox(
                                      width: 100,
                                      child: Text(
-                                    '${sortedApps[index].app.installedVersion ?? tr('notInstalled')}${sortedApps[index].app.additionalSettings['trackOnly'] == 'true' ? ' ${tr('estimateInBrackets')}' : ''}',
+                                        '${sortedApps[index].app.installedVersion ?? tr('notInstalled')}${sortedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBrackets')}' : ''}',
                                        overflow: TextOverflow.fade,
                                        textAlign: TextAlign.end,
                                      )),
-                              sortedApps[index].app.installedVersion != null &&
                                  sortedApps[index].app.installedVersion !=
-                                          sortedApps[index].app.latestVersion
+                                              null &&
+                                          sortedApps[index]
+                                                  .app
+                                                  .installedVersion !=
+                                              sortedApps[index]
+                                                  .app
+                                                  .latestVersion
                                      ? GestureDetector(
                                          onTap: changesUrl == null
                                              ? null
@@ -288,13 +312,16 @@ class AppsPageState extends State<AppsPage> {
                                                      mode: LaunchMode
                                                          .externalApplication);
                                                },
-                                      child: appsProvider.areDownloadsRunning()
+                                          child: appsProvider
+                                                  .areDownloadsRunning()
                                              ? Text(tr('pleaseWait'))
                                              : Text(
-                                              '${tr('updateAvailable')}${sortedApps[index].app.additionalSettings['trackOnly'] == 'true' ? ' ${tr('estimateInBracketsShort')}' : ''}',
+                                                  '${tr('updateAvailable')}${sortedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBracketsShort')}' : ''}',
                                                  style: TextStyle(
-                                                  fontStyle: FontStyle.italic,
-                                                  decoration: changesUrl == null
+                                                      fontStyle:
+                                                          FontStyle.italic,
+                                                      decoration: changesUrl ==
+                                                              null
                                                          ? TextDecoration.none
                                                          : TextDecoration
                                                              .underline),
@@ -314,13 +341,27 @@ class AppsPageState extends State<AppsPage> {
                        );
                      }
                    },
-              );
+                  ));
            }, childCount: sortedApps.length))
          ])),
      persistentFooterButtons: [
        Row(
          children: [
-            IconButton(
+            selectedApps.isEmpty
+                ? TextButton.icon(
+                    style:
+                        const ButtonStyle(visualDensity: VisualDensity.compact),
+                    onPressed: () {
+                      selectThese(sortedApps.map((e) => e.app).toList());
+                    },
+                    icon: Icon(
+                      Icons.select_all_outlined,
+                      color: Theme.of(context).colorScheme.primary,
+                    ),
+                    label: Text(sortedApps.length.toString()))
+                : TextButton.icon(
+                    style:
+                        const ButtonStyle(visualDensity: VisualDensity.compact),
                    onPressed: () {
                      selectedApps.isEmpty
                          ? selectThese(sortedApps.map((e) => e.app).toList())
@@ -332,36 +373,39 @@ class AppsPageState extends State<AppsPage> {
                          : Icons.deselect_outlined,
                      color: Theme.of(context).colorScheme.primary,
                    ),
-                tooltip: selectedApps.isEmpty
-                    ? tr('selectAll')
-                    : tr('deselectN', args: [selectedApps.length.toString()])),
+                    label: Text(selectedApps.length.toString())),
            const VerticalDivider(),
            Expanded(
+                child: SingleChildScrollView(
+                    scrollDirection: Axis.horizontal,
                    child: Row(
                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                      children: [
-                selectedApps.isEmpty
-                    ? const SizedBox()
-                    : IconButton(
+                        IconButton(
                          visualDensity: VisualDensity.compact,
-                        onPressed: () {
-                          showDialog<Map<String, String>?>(
+                          onPressed: selectedApps.isEmpty
+                              ? null
+                              : () {
+                                  showDialog<Map<String, dynamic>?>(
                                      context: context,
                                      builder: (BuildContext ctx) {
                                        return GeneratedFormModal(
-                                  title: tr('removeSelectedAppsQuestion'),
+                                          title:
+                                              tr('removeSelectedAppsQuestion'),
                                          items: const [],
                                          initValid: true,
                                          message: tr(
                                              'xWillBeRemovedButRemainInstalled',
                                              args: [
-                                        plural('apps', selectedApps.length)
+                                                plural(
+                                                    'apps', selectedApps.length)
                                              ]),
                                        );
                                      }).then((values) {
                                    if (values != null) {
-                              appsProvider.removeApps(
-                                  selectedApps.map((e) => e.id).toList());
+                                      appsProvider.removeApps(selectedApps
+                                          .map((e) => e.id)
+                                          .toList());
                                    }
                                  });
                                },
@@ -378,65 +422,79 @@ class AppsPageState extends State<AppsPage> {
                                : () {
                                    HapticFeedback.heavyImpact();
                                    List<GeneratedFormItem> formItems = [];
-                            if (existingUpdateIdsAllOrSelected.isNotEmpty) {
-                              formItems.add(GeneratedFormItem('updates',
+                                    if (existingUpdateIdsAllOrSelected
+                                        .isNotEmpty) {
+                                      formItems.add(GeneratedFormSwitch(
+                                          'updates',
                                          label: tr('updateX', args: [
-                                    plural('apps',
-                                        existingUpdateIdsAllOrSelected.length)
+                                            plural(
+                                                'apps',
+                                                existingUpdateIdsAllOrSelected
+                                                    .length)
                                          ]),
-                                  type: FormItemType.bool,
-                                  defaultValue: 'true'));
+                                          defaultValue: true));
                                    }
                                    if (newInstallIdsAllOrSelected.isNotEmpty) {
-                              formItems.add(GeneratedFormItem('installs',
+                                      formItems.add(GeneratedFormSwitch(
+                                          'installs',
                                          label: tr('installX', args: [
-                                    plural('apps',
-                                        newInstallIdsAllOrSelected.length)
+                                            plural(
+                                                'apps',
+                                                newInstallIdsAllOrSelected
+                                                    .length)
                                          ]),
-                                  type: FormItemType.bool,
                                          defaultValue:
-                                      existingUpdateIdsAllOrSelected.isNotEmpty
-                                          ? 'true'
-                                          : ''));
+                                              existingUpdateIdsAllOrSelected
+                                                  .isNotEmpty));
                                    }
-                            if (trackOnlyUpdateIdsAllOrSelected.isNotEmpty) {
-                              formItems.add(GeneratedFormItem('trackonlies',
-                                  label: tr('markXTrackOnlyAsUpdated', args: [
-                                    plural('apps',
-                                        trackOnlyUpdateIdsAllOrSelected.length)
+                                    if (trackOnlyUpdateIdsAllOrSelected
+                                        .isNotEmpty) {
+                                      formItems.add(GeneratedFormSwitch(
+                                          'trackonlies',
+                                          label: tr('markXTrackOnlyAsUpdated',
+                                              args: [
+                                                plural(
+                                                    'apps',
+                                                    trackOnlyUpdateIdsAllOrSelected
+                                                        .length)
                                              ]),
-                                  type: FormItemType.bool,
-                                  defaultValue: existingUpdateIdsAllOrSelected
+                                          defaultValue:
+                                              existingUpdateIdsAllOrSelected
                                                      .isNotEmpty ||
-                                          newInstallIdsAllOrSelected.isNotEmpty
-                                      ? 'true'
-                                      : ''));
+                                                  newInstallIdsAllOrSelected
+                                                      .isNotEmpty));
                                    }
-                            showDialog<Map<String, String>?>(
+                                    showDialog<Map<String, dynamic>?>(
                                        context: context,
                                        builder: (BuildContext ctx) {
-                                  var totalApps = existingUpdateIdsAllOrSelected
+                                          var totalApps =
+                                              existingUpdateIdsAllOrSelected.length +
+                                                  newInstallIdsAllOrSelected
                                                      .length +
-                                      newInstallIdsAllOrSelected.length +
-                                      trackOnlyUpdateIdsAllOrSelected.length;
+                                                  trackOnlyUpdateIdsAllOrSelected
+                                                      .length;
                                          return GeneratedFormModal(
-                                    title: tr('changeX',
-                                        args: [plural('apps', totalApps)]),
-                                    items: formItems.map((e) => [e]).toList(),
+                                            title: tr('changeX', args: [
+                                              plural('apps', totalApps)
+                                            ]),
+                                            items: formItems
+                                                .map((e) => [e])
+                                                .toList(),
                                            initValid: true,
                                          );
                                        }).then((values) {
                                      if (values != null) {
                                        if (values.isEmpty) {
-                                  values = getDefaultValuesFromFormItems(
+                                          values =
+                                              getDefaultValuesFromFormItems(
                                                  [formItems]);
                                        }
                                        bool shouldInstallUpdates =
-                                    values['updates'] == 'true';
+                                            values['updates'] == true;
                                        bool shouldInstallNew =
-                                    values['installs'] == 'true';
+                                            values['installs'] == true;
                                        bool shouldMarkTrackOnlies =
-                                    values['trackonlies'] == 'true';
+                                            values['trackonlies'] == true;
                                        (() async {
                                          if (shouldInstallNew ||
                                              shouldInstallUpdates) {
@@ -447,20 +505,22 @@ class AppsPageState extends State<AppsPage> {
                                            .then((_) {
                                          List<String> toInstall = [];
                                          if (shouldInstallUpdates) {
-                                    toInstall
-                                        .addAll(existingUpdateIdsAllOrSelected);
+                                            toInstall.addAll(
+                                                existingUpdateIdsAllOrSelected);
                                          }
                                          if (shouldInstallNew) {
-                                    toInstall
-                                        .addAll(newInstallIdsAllOrSelected);
+                                            toInstall.addAll(
+                                                newInstallIdsAllOrSelected);
                                          }
                                          if (shouldMarkTrackOnlies) {
                                            toInstall.addAll(
                                                trackOnlyUpdateIdsAllOrSelected);
                                          }
                                          appsProvider
-                                      .downloadAndInstallLatestApps(toInstall,
-                                          globalNavigatorKey.currentContext)
+                                              .downloadAndInstallLatestApps(
+                                                  toInstall,
+                                                  globalNavigatorKey
+                                                      .currentContext)
                                              .catchError((e) {
                                            showError(e, context);
                                          });
@@ -474,30 +534,104 @@ class AppsPageState extends State<AppsPage> {
                            icon: const Icon(
                              Icons.file_download_outlined,
                            )),
-                selectedApps.isEmpty
-                    ? const SizedBox()
-                    : IconButton(
+                        IconButton(
                          visualDensity: VisualDensity.compact,
-                        onPressed: () {
+                          onPressed: selectedApps.isEmpty
+                              ? null
+                              : () async {
+                                  try {
+                                    Set<String>? preselected;
+                                    var showPrompt = false;
+                                    for (var element in selectedApps) {
+                                      var currentCats =
+                                          element.categories.toSet();
+                                      if (preselected == null) {
+                                        preselected = currentCats;
+                                      } else {
+                                        if (!settingsProvider.setEqual(
+                                            currentCats, preselected)) {
+                                          showPrompt = true;
+                                          break;
+                                        }
+                                      }
+                                    }
+                                    var cont = true;
+                                    if (showPrompt) {
+                                      cont = await showDialog<
+                                                  Map<String, dynamic>?>(
+                                              context: context,
+                                              builder: (BuildContext ctx) {
+                                                return GeneratedFormModal(
+                                                  title: tr('categorize'),
+                                                  items: const [],
+                                                  initValid: true,
+                                                  message: tr(
+                                                      'selectedCategorizeWarning'),
+                                                );
+                                              }) !=
+                                          null;
+                                    }
+                                    if (cont) {
+                                      await showDialog<Map<String, dynamic>?>(
+                                          context: context,
+                                          builder: (BuildContext ctx) {
+                                            return GeneratedFormModal(
+                                              title: tr('categorize'),
+                                              items: const [],
+                                              initValid: true,
+                                              singleNullReturnButton:
+                                                  tr('continue'),
+                                              additionalWidgets: [
+                                                CategoryEditorSelector(
+                                                  preselected: !showPrompt
+                                                      ? preselected ?? {}
+                                                      : {},
+                                                  showLabelWhenNotEmpty: false,
+                                                  onSelected: (categories) {
+                                                    appsProvider.saveApps(
+                                                        selectedApps.map((e) {
+                                                      e.categories = categories;
+                                                      return e;
+                                                    }).toList());
+                                                  },
+                                                )
+                                              ],
+                                            );
+                                          });
+                                    }
+                                  } catch (err) {
+                                    showError(err, context);
+                                  }
+                                },
+                          tooltip: tr('categorize'),
+                          icon: const Icon(Icons.category_outlined),
+                        ),
+                        IconButton(
+                          visualDensity: VisualDensity.compact,
+                          onPressed: selectedApps.isEmpty
+                              ? null
+                              : () {
                                  showDialog(
                                      context: context,
                                      builder: (BuildContext ctx) {
                                        return AlertDialog(
                                          scrollable: true,
                                          content: Padding(
-                                    padding: const EdgeInsets.only(top: 6),
+                                            padding:
+                                                const EdgeInsets.only(top: 6),
                                            child: Row(
                                                mainAxisAlignment:
-                                            MainAxisAlignment.spaceAround,
+                                                    MainAxisAlignment
+                                                        .spaceAround,
                                                children: [
                                                  IconButton(
-                                              onPressed:
-                                                  appsProvider
+                                                      onPressed: appsProvider
                                                              .areDownloadsRunning()
                                                          ? null
                                                          : () {
                                                              showDialog(
-                                                              context: context,
+                                                                  context:
+                                                                      context,
                                                                  builder:
                                                                      (BuildContext
                                                                          ctx) {
@@ -505,47 +639,39 @@ class AppsPageState extends State<AppsPage> {
                                                                      title: Text(tr(
                                                                          'markXSelectedAppsAsUpdated',
                                                                          args: [
-                                                                        selectedApps
-                                                                            .length
-                                                                            .toString()
+                                                                            selectedApps.length.toString()
                                                                          ])),
-                                                                  content: Text(
+                                                                      content:
+                                                                          Text(
                                                                        tr('onlyWorksWithNonEVDApps'),
                                                                        style: const TextStyle(
                                                                            fontWeight:
-                                                                            FontWeight
-                                                                                .bold,
-                                                                        fontStyle:
-                                                                            FontStyle.italic),
+                                                                                FontWeight.bold,
+                                                                            fontStyle: FontStyle.italic),
                                                                      ),
                                                                      actions: [
                                                                        TextButton(
                                                                            onPressed:
                                                                                () {
-                                                                          Navigator.of(context)
-                                                                              .pop();
+                                                                              Navigator.of(context).pop();
                                                                            },
-                                                                        child: Text(
-                                                                            tr('no'))),
+                                                                            child:
+                                                                                Text(tr('no'))),
                                                                        TextButton(
                                                                            onPressed:
                                                                                () {
-                                                                          HapticFeedback
-                                                                              .selectionClick();
-                                                                          appsProvider
-                                                                              .saveApps(selectedApps.map((a) {
-                                                                            if (a.installedVersion !=
-                                                                                null) {
+                                                                              HapticFeedback.selectionClick();
+                                                                              appsProvider.saveApps(selectedApps.map((a) {
+                                                                                if (a.installedVersion != null) {
                                                                                  a.installedVersion = a.latestVersion;
                                                                                }
                                                                                return a;
                                                                              }).toList());

-                                                                          Navigator.of(context)
-                                                                              .pop();
+                                                                              Navigator.of(context).pop();
                                                                            },
-                                                                        child: Text(
-                                                                            tr('yes')))
+                                                                            child:
+                                                                                Text(tr('yes')))
                                                                      ],
                                                                    );
                                                                  }).whenComplete(() {
@@ -554,21 +680,25 @@ class AppsPageState extends State<AppsPage> {
                                                                    .pop();
                                                              });
                                                            },
-                                              tooltip:
-                                                  tr('markSelectedAppsUpdated'),
-                                              icon: const Icon(Icons.done)),
+                                                      tooltip: tr(
+                                                          'markSelectedAppsUpdated'),
+                                                      icon: const Icon(
+                                                          Icons.done)),
                                                  IconButton(
                                                    onPressed: () {
-                                              var pinStatus = selectedApps
+                                                      var pinStatus =
+                                                          selectedApps
                                                              .where((element) =>
-                                                      element.pinned)
+                                                                  element
+                                                                      .pinned)
                                                              .isEmpty;
                                                      appsProvider.saveApps(
                                                          selectedApps.map((e) {
                                                        e.pinned = pinStatus;
                                                        return e;
                                                      }).toList());
-                                              Navigator.of(context).pop();
+                                                      Navigator.of(context)
+                                                          .pop();
                                                    },
                                                    tooltip: selectedApps
                                                            .where((element) =>
@@ -580,14 +710,16 @@ class AppsPageState extends State<AppsPage> {
                                                            .where((element) =>
                                                                element.pinned)
                                                            .isEmpty
-                                                ? Icons.bookmark_outline_rounded
+                                                        ? Icons
+                                                            .bookmark_outline_rounded
                                                        : Icons
                                                            .bookmark_remove_outlined),
                                                  ),
                                                  IconButton(
                                                    onPressed: () {
                                                      String urls = '';
-                                              for (var a in selectedApps) {
+                                                      for (var a
+                                                          in selectedApps) {
                                                        urls += '${a.url}\n';
                                                      }
                                                      urls = urls.substring(
@@ -595,16 +727,20 @@ class AppsPageState extends State<AppsPage> {
                                                      Share.share(urls,
                                                          subject: tr(
                                                              'selectedAppURLsFromObtainium'));
-                                              Navigator.of(context).pop();
+                                                      Navigator.of(context)
+                                                          .pop();
                                                    },
-                                            tooltip: tr('shareSelectedAppURLs'),
-                                            icon: const Icon(Icons.share),
+                                                    tooltip: tr(
+                                                        'shareSelectedAppURLs'),
+                                                    icon:
+                                                        const Icon(Icons.share),
                                                  ),
                                                  IconButton(
                                                    onPressed: () {
                                                      showDialog(
                                                          context: context,
-                                                  builder: (BuildContext ctx) {
+                                                          builder: (BuildContext
+                                                              ctx) {
                                                            return GeneratedFormModal(
                                                              title: tr(
                                                                  'resetInstallStatusForSelectedAppsQuestion'),
@@ -622,18 +758,22 @@ class AppsPageState extends State<AppsPage> {
                                                          }).then((values) {
                                                        if (values != null) {
                                                          appsProvider.saveApps(
-                                                      selectedApps.map((e) {
-                                                    e.installedVersion = null;
+                                                              selectedApps
+                                                                  .map((e) {
+                                                            e.installedVersion =
+                                                                null;
                                                            return e;
                                                          }).toList());
                                                        }
                                                      }).whenComplete(() {
-                                                Navigator.of(context).pop();
+                                                        Navigator.of(context)
+                                                            .pop();
                                                      });
                                                    },
-                                            tooltip: tr('resetInstallStatus'),
-                                            icon: const Icon(
-                                                Icons.restore_page_outlined),
+                                                    tooltip: tr(
+                                                        'resetInstallStatus'),
+                                                    icon: const Icon(Icons
+                                                        .restore_page_outlined),
                                                  ),
                                                ]),
                                          ),
@@ -644,14 +784,14 @@ class AppsPageState extends State<AppsPage> {
                          icon: const Icon(Icons.more_horiz),
                        ),
                      ],
-            )),
+                    ))),
            const VerticalDivider(),
            IconButton(
              visualDensity: VisualDensity.compact,
              onPressed: () {
                setState(() {
                  if (currentFilterIsUpdatesOnly) {
-                    filter = null;
+                    filter = AppsFilter();
                  } else {
                    filter = updatesOnlyFilter;
                  }
@@ -670,53 +810,64 @@ class AppsPageState extends State<AppsPage> {
            appsProvider.apps.isEmpty
                ? const SizedBox()
                : TextButton.icon(
+                    style:
+                        const ButtonStyle(visualDensity: VisualDensity.compact),
                    label: Text(
-                      filter == null ? tr('filter') : tr('filterActive'),
+                      filter.isIdenticalTo(neutralFilter, settingsProvider)
+                          ? tr('filter')
+                          : tr('filterActive'),
                      style: TextStyle(
-                          fontWeight: filter == null
+                          fontWeight: filter.isIdenticalTo(
+                                  neutralFilter, settingsProvider)
                              ? FontWeight.normal
                              : FontWeight.bold),
                    ),
                    onPressed: () {
-                      showDialog<Map<String, String>?>(
+                      showDialog<Map<String, dynamic>?>(
                          context: context,
                          builder: (BuildContext ctx) {
-                            var vals = filter == null
-                                ? AppsFilter().toValuesMap()
-                                : filter!.toValuesMap();
+                            var vals = filter.toFormValuesMap();
                            return GeneratedFormModal(
+                              initValid: true,
                              title: tr('filterApps'),
                              items: [
                                [
-                                    GeneratedFormItem('appName',
+                                  GeneratedFormTextField('appName',
                                      label: tr('appName'),
                                      required: false,
                                      defaultValue: vals['appName']),
-                                    GeneratedFormItem('author',
+                                  GeneratedFormTextField('author',
                                      label: tr('author'),
                                      required: false,
                                      defaultValue: vals['author'])
                                ],
                                [
-                                    GeneratedFormItem('upToDateApps',
+                                  GeneratedFormSwitch('upToDateApps',
                                      label: tr('upToDateApps'),
-                                        type: FormItemType.bool,
                                      defaultValue: vals['upToDateApps'])
                                ],
                                [
-                                    GeneratedFormItem('nonInstalledApps',
+                                  GeneratedFormSwitch('nonInstalledApps',
                                      label: tr('nonInstalledApps'),
-                                        type: FormItemType.bool,
                                      defaultValue: vals['nonInstalledApps'])
                                ]
-                                ]);
+                              ],
+                              additionalWidgets: [
+                                const SizedBox(
+                                  height: 16,
+                                ),
+                                CategoryEditorSelector(
+                                  preselected: filter.categoryFilter,
+                                  onSelected: (categories) {
+                                    filter.categoryFilter = categories.toSet();
+                                  },
+                                )
+                              ],
+                            );
                          }).then((values) {
                        if (values != null) {
                          setState(() {
-                            filter = AppsFilter.fromValuesMap(values);
-                            if (AppsFilter().isIdenticalTo(filter!)) {
-                              filter = null;
-                            }
+                            filter.setFormValuesFromMap(values);
                          });
                        }
                      });
@@ -734,32 +885,35 @@ class AppsFilter {
  late String authorFilter;
  late bool includeUptodate;
  late bool includeNonInstalled;
+  late Set<String> categoryFilter;

  AppsFilter(
      {this.nameFilter = '',
      this.authorFilter = '',
      this.includeUptodate = true,
-      this.includeNonInstalled = true});
+      this.includeNonInstalled = true,
+      this.categoryFilter = const {}});

-  Map<String, String> toValuesMap() {
+  Map<String, dynamic> toFormValuesMap() {
    return {
      'appName': nameFilter,
      'author': authorFilter,
-      'upToDateApps': includeUptodate ? 'true' : '',
-      'nonInstalledApps': includeNonInstalled ? 'true' : ''
+      'upToDateApps': includeUptodate,
+      'nonInstalledApps': includeNonInstalled
    };
  }

-  AppsFilter.fromValuesMap(Map<String, String> values) {
+  setFormValuesFromMap(Map<String, dynamic> values) {
    nameFilter = values['appName']!;
    authorFilter = values['author']!;
-    includeUptodate = values['upToDateApps'] == 'true';
-    includeNonInstalled = values['nonInstalledApps'] == 'true';
+    includeUptodate = values['upToDateApps'];
+    includeNonInstalled = values['nonInstalledApps'];
  }

-  bool isIdenticalTo(AppsFilter other) =>
+  bool isIdenticalTo(AppsFilter other, SettingsProvider settingsProvider) =>
      authorFilter.trim() == other.authorFilter.trim() &&
      nameFilter.trim() == other.nameFilter.trim() &&
      includeUptodate == other.includeUptodate &&
-      includeNonInstalled == other.includeNonInstalled;
+      includeNonInstalled == other.includeNonInstalled &&
+      settingsProvider.setEqual(categoryFilter, other.categoryFilter);
 }
--- a/lib/pages/import_export.dart
+++ b/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>?>(
--- a/lib/pages/settings.dart
+++ b/lib/pages/settings.dart
@@ -1,8 +1,13 @@
+import 'dart:math';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 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';
 import 'package:obtainium/providers/source_provider.dart';
@@ -17,6 +22,21 @@ class SettingsPage extends StatefulWidget {
  State<SettingsPage> createState() => _SettingsPageState();
 }

+// 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 _SettingsPageState extends State<SettingsPage> {
  @override
  Widget build(BuildContext context) {
@@ -110,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,
@@ -138,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);
                });
@@ -190,6 +233,8 @@ class _SettingsPageState extends State<SettingsPage> {
                              ],
                            ),
                            height16,
+                            localeDropdown,
+                            height16,
                            Row(
                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
                              children: [
@@ -232,6 +277,18 @@ class _SettingsPageState extends State<SettingsPage> {
                                  color: Theme.of(context).colorScheme.primary),
                            ),
                            ...sourceSpecificFields,
+                            const Divider(
+                              height: 48,
+                            ),
+                            Text(
+                              tr('categories'),
+                              style: TextStyle(
+                                  color: Theme.of(context).colorScheme.primary),
+                            ),
+                            height16,
+                            const CategoryEditorSelector(
+                              showLabelWhenNotEmpty: false,
+                            )
                          ],
                        ))),
          SliverToBoxAdapter(
@@ -346,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());
+            }
+          }
+        }));
+  }
+}
--- a/lib/providers/apps_provider.dart
+++ b/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(
--- a/lib/providers/settings_provider.dart
+++ b/lib/providers/settings_provider.dart
@@ -1,9 +1,13 @@
 // Exposes functions used to save/load app settings

+import 'dart:convert';
+
 import 'package:easy_localization/easy_localization.dart';
 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';

@@ -144,4 +148,35 @@ class SettingsProvider with ChangeNotifier {
    prefs?.setString(settingId, value);
    notifyListeners();
  }
+
+  Map<String, int> get categories =>
+      Map<String, int>.from(jsonDecode(prefs?.getString('categories') ?? '{}'));
+
+  set categories(Map<String, int> cats) {
+    prefs?.setString('categories', jsonEncode(cats));
+    notifyListeners();
+  }
+
+  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;
 }
--- a/lib/providers/source_provider.dart
+++ b/lib/providers/source_provider.dart
@@ -19,6 +19,7 @@ import 'package:obtainium/app_sources/steammobile.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
+import 'package:obtainium/providers/settings_provider.dart';

 class AppNames {
  late String author;
@@ -44,9 +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;
+  List<String> categories;
  App(
      this.id,
      this.url,
@@ -58,7 +60,8 @@ class App {
      this.preferredApkIndex,
      this.additionalSettings,
      this.lastUpdateCheck,
-      this.pinned);
+      this.pinned,
+      {this.categories = const []});

  @override
  String toString() {
@@ -69,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) {
+          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,
@@ -100,14 +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);
+        json['pinned'] ?? false,
+        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() => {
@@ -121,7 +147,8 @@ class App {
        'preferredApkIndex': preferredApkIndex,
        'additionalSettings': jsonEncode(additionalSettings),
        'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
-        'pinned': pinned
+        'pinned': pinned,
+        'categories': categories
      };
 }

@@ -155,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 ?? '')))
@@ -176,7 +203,7 @@ class AppSource {
  }

  Future<APKDetails> getLatestAPKDetails(
-      String standardUrl, Map<String, String> additionalSettings) {
+      String standardUrl, Map<String, dynamic> additionalSettings) {
    throw NotImplementedError();
  }

@@ -188,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
@@ -225,7 +248,7 @@ class AppSource {
  }

  String? tryInferringAppId(String standardUrl,
-      {Map<String, String> additionalSettings = const {}}) {
+      {Map<String, dynamic> additionalSettings = const {}}) {
    return null;
  }
 }
@@ -288,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;
        }
      }
@@ -314,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);
@@ -347,10 +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);
+        currentApp?.pinned ?? false,
+        categories: currentApp?.categories ?? const []);
  }

  // Returns errors in [results, errors] instead of throwing them
--- a/pubspec.lock
+++ b/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:
--- a/pubspec.yaml
+++ b/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.8.22+86 # 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'
Author	SHA1	Message	Date
Imran Remtulla	5c4bb8f84c	Merge pull request #217 from ImranR98/dev Bugfixes and UI Tweaks (#213, #215, #216)	2023-01-06 21:11:58 -05:00
Imran Remtulla	1c8e759494	Increment version + updated packages	2023-01-06 21:11:13 -05:00
Imran Remtulla	081c2a07d2	Categories re-added on import (#213 )	2023-01-06 21:10:04 -05:00
Imran Remtulla	02751fe8fa	Made GitHub PATs hidden (password field) (#215 )	2023-01-06 20:57:26 -05:00
Imran Remtulla	95f3362a84	Apps bottom bar tweaks (#216 )	2023-01-06 20:47:22 -05:00
Imran Remtulla	b68cf5a1be	Increment version	2023-01-02 02:05:35 -05:00
Imran Remtulla	4eb7499591	Merge pull request #211 from RanTranslations/main assets: Update Simplified Chinese	2023-01-02 02:04:34 -05:00
JohnsonRan	98fafe2aa4	assets: Update Simplified Chinese	2023-01-02 11:18:27 +08:00
Imran Remtulla	9bac74aadd	Icon fixed in readme	2022-12-28 06:42:42 -05:00
Imran Remtulla	0a93117bf0	Merge pull request #208 from ImranR98/dev Tiny bugfix + increment version	2022-12-28 06:31:42 -05:00
Imran Remtulla	451cc41c45	Tiny bugfix + increment version	2022-12-28 06:30:58 -05:00
Imran Remtulla	3b449d0982	Merge pull request #207 from ImranR98/dev Categorization Improvements	2022-12-27 22:39:17 -05:00
Imran Remtulla	1863f55372	Increment build num	2022-12-27 22:38:07 -05:00
Imran Remtulla	0c4b8ac79d	Made notif icon white for consistency on some OS skins	2022-12-27 22:37:49 -05:00
Imran Remtulla	e287087753	Increment build number	2022-12-27 21:15:06 -05:00
Imran Remtulla	82bcc46d42	Fixed search error on Add App page (#202 )	2022-12-27 21:14:11 -05:00
Imran Remtulla	1f26188ec6	Potential fix for rangeError for no URL Apps (#201 )	2022-12-27 21:00:46 -05:00
Imran Remtulla	794c3e1a81	Increment version	2022-12-27 20:42:21 -05:00
Imran Remtulla	16369b4adf	App page with Webview now on par with no webview + ratelimit error bugfix	2022-12-27 20:41:44 -05:00
Imran Remtulla	8f16f745be	Added categorize in multi select menu	2022-12-27 20:15:56 -05:00
Imran Remtulla	8ddeb3d776	Apps now support multiple categories	2022-12-27 19:37:13 -05:00
Imran Remtulla	21cf9c98d9	Merge pull request #200 from ImranR98/dev Fixed export error on Android SDK <= 28	2022-12-25 22:30:47 -05:00
Imran Remtulla	358f910d19	Increment version	2022-12-25 22:30:01 -05:00
Imran Remtulla	7a3d74bd05	Fixed export error on Android SDK <= 28	2022-12-25 22:29:39 -05:00
Imran Remtulla	6f27f64699	Merge pull request #199 from ImranR98/dev UI improvements	2022-12-25 21:56:36 -05:00
Imran Remtulla	3341fecb68	Increment version	2022-12-25 21:53:26 -05:00
Imran Remtulla	d3bce63ca4	Updated plugins	2022-12-25 21:53:06 -05:00
Imran Remtulla	8aa8b6b698	Added selection count on Apps page	2022-12-25 21:52:21 -05:00
Imran Remtulla	3d6c9bbf98	Added category multi-select to Apps filter + UI tweaks and bugfixes	2022-12-25 21:41:51 -05:00
Imran Remtulla	7af0a8628c	Slightly thicker category color indicator on apps page	2022-12-25 20:31:20 -05:00
Imran Remtulla	4573ce6bcf	Added category select to add app page	2022-12-25 20:30:36 -05:00
Imran Remtulla	e29d38fa32	Adding an existing category no longer overwrites it	2022-12-25 20:04:47 -05:00
Imran Remtulla	dc82431235	App page now scrollable when categories overflow	2022-12-25 19:58:58 -05:00
Imran Remtulla	424b0028bf	Merge pull request #198 from gidano/main Update hu.json	2022-12-25 15:36:26 -05:00
gidano	46fba9e0a4	Update hu.json	2022-12-25 11:14:15 +01:00
Imran Remtulla	b40be7569b	Bugfix (#197 )	2022-12-24 23:17:03 -05:00
Imran Remtulla	a173be11eb	Merge pull request #193 from ImranR98/dev Track-only source bugfix + better http errors	2022-12-23 23:53:08 -05:00
Imran Remtulla	0c97b25d99	Track-only source bugfix + better http errors + increment version	2022-12-23 23:52:32 -05:00
Imran Remtulla	f836fd20d8	Increment version	2022-12-22 17:43:08 -05:00
Imran Remtulla	2f6917592d	Merge pull request #190 from atilluF/Ita-TL Update it.json	2022-12-22 17:39:47 -05:00
atilluF	b864fef3ad	Update it.json New strings + fixes	2022-12-22 22:48:53 +01:00
Imran Remtulla	8e487592b3	Increment version	2022-12-22 11:58:00 -05:00
Imran Remtulla	e9a44746a5	Merge pull request #184 from gidano/main Updated hu.json	2022-12-22 11:57:16 -05:00
gidano	9123737bf3	Merge branch 'main' into main	2022-12-22 14:58:25 +01:00
Imran Remtulla	12f70951c2	Merge pull request #186 from bluefly000/japanese-translation Update Japanese translation	2022-12-22 08:03:03 -05:00
Imran Remtulla	c1d56f89f0	Merge pull request #187 from markus-gitdev/main Update DE translation	2022-12-22 08:02:57 -05:00
Imran Remtulla	4dfd29f5de	Merge pull request #189 from ImranR98/dev Bugfixes	2022-12-22 08:02:21 -05:00
Imran Remtulla	226cfa25e0	Increment version	2022-12-22 08:01:52 -05:00
Imran Remtulla	4e0c655538	F-Droid repo URL matching made more general (#188 )	2022-12-22 08:01:26 -05:00
Imran Remtulla	45a23e9025	Language fix for #185	2022-12-22 07:57:21 -05:00
Markus	1e5aa0999a	Update DE translation Update german translation to match newly added localized strings	2022-12-22 10:21:04 +01:00
bluefly000	beeec356e5	Update Japanese translation	2022-12-22 18:03:20 +09:00
gidano	01fa9a2e96	Updated hu.json	2022-12-22 09:18:32 +01:00
Imran Remtulla	0da7a36f1a	Merge pull request #183 from ImranR98/dev Better Category UI + Language Setting	2022-12-22 03:14:43 -05:00
Imran Remtulla	ed2a4e674f	Added language setting (mostly working) - #165	2022-12-22 03:13:55 -05:00
Imran Remtulla	0f6a683faa	Increment version	2022-12-22 02:26:13 -05:00
Imran Remtulla	fa4d46b622	Bugfix es+ new category picker on App page	2022-12-22 02:13:21 -05:00
Imran Remtulla	a3f9947f28	Finished new category editor (needs to be used)	2022-12-22 01:24:35 -05:00
Imran Remtulla	6977858b99	Started work on new unified category selector/editor	2022-12-21 23:54:36 -05:00
Imran Remtulla	2ff6acb701	Merge pull request #182 from ImranR98/dev Broke `GeneratedFormItem` into sub-types + bugfix	2022-12-21 18:26:15 -05:00
Imran Remtulla	0c2d6ce84d	Increment version	2022-12-21 18:23:55 -05:00
Imran Remtulla	9072862862	Broke GeneratedFormItem into sub-types Prep for "chips" input type	2022-12-21 18:23:25 -05:00
Imran Remtulla	3cbaac2f5d	Increment version	2022-12-21 15:08:18 -05:00
Imran Remtulla	0f8871efcb	Merge pull request #179 from bluefly000/japanese-translation Update Japanese translation	2022-12-21 15:07:33 -05:00
Imran Remtulla	ee216cbbba	Merge pull request #181 from ImranR98/dev Bugfix (#178) + translation typos	2022-12-21 15:07:26 -05:00
Imran Remtulla	ebe5b79dc5	Bugfix (#178 ) + translation typos	2022-12-21 15:06:54 -05:00
bluefly000	60014c864c	Update Japanese translation	2022-12-21 21:48:32 +09:00
Imran Remtulla	070b6033bd	Merge pull request #177 from ImranR98/dev Added very basic categorization support	2022-12-21 04:25:45 -05:00
Imran Remtulla	626bebbe5a	Localized new strings	2022-12-21 04:24:17 -05:00
Imran Remtulla	118460ccb9	Added category filter	2022-12-21 04:15:39 -05:00
Imran Remtulla	26f953dbb0	Category displayed on App/Apps pages + category save bugfix	2022-12-21 03:57:08 -05:00
Imran Remtulla	99d7595f2d	Added category add/remove (no recolour/rename for now)	2022-12-21 03:08:56 -05:00
Imran Remtulla	e2f99c5e71	Increment version	2022-12-20 21:12:50 -05:00
Imran Remtulla	1f582d239b	Merge pull request #175 from RanTranslations/main assests: Update Simplified Chinese	2022-12-20 21:10:48 -05:00
Imran Remtulla	5e6b00718e	Merge pull request #176 from bluefly000/main Update Japanese translation	2022-12-20 21:10:26 -05:00
bluefly000	56594e6b19	Update Japanese translation	2022-12-21 10:44:18 +09:00
JohnsonRan	bbcc3ff9b3	assests: Update Simplified Chinese	2022-12-21 09:07:31 +08:00