Merge pull request #256 from ImranR98/dev

Bugfixes (#254, #252), App Uninstall and Settings Feature (#257)
Update packages, increment version
2025-07-13 13:26:43 +02:00 · 2023-02-04 19:46:24 -05:00 · 2023-02-04 19:44:18 -05:00 · 2023-02-04 19:30:41 -05:00 · 2023-02-04 19:11:28 -05:00 · 2023-02-04 18:58:14 -05:00
45 changed files with 2152 additions and 1172 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.

@ -9,14 +9,18 @@ Motivation: [Side Of Burritos - You should use this instead of F-Droid | How to
 Currently supported App sources:
 - [GitHub](https://github.com/)
 - [GitLab](https://gitlab.com/)
+- [Codeberg](https://codeberg.org/)
 - [F-Droid](https://f-droid.org/)
 - [IzzyOnDroid](https://android.izzysoft.de/)
 - [Mullvad](https://mullvad.net/en/)
 - [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)
+- "HTML" (Fallback)
+  - Any other URL that returns an HTML page with links to APK files (if multiple, the last file alphabetically is picked)

 ## Limitations
 - App installs happen asynchronously and the success/failure of an install cannot be determined directly. This results in install statuses and versions sometimes being out of sync with the OS until the next launch or until the problem is manually corrected.
@ -27,4 +31,4 @@ Currently supported App sources:

 | <img src="./assets/screenshots/1.apps.png" alt="Apps Page" /> | <img src="./assets/screenshots/2.dark_theme.png" alt="Dark Theme" />           | <img src="./assets/screenshots/3.material_you.png" alt="Material You" />    |
 | ------------------------------------------------------ | ----------------------------------------------------------------------- | -------------------------------------------------------------------- |
-| <img src="./assets/screenshots/4.app.png" alt="App Page" />   | <img src="./assets/screenshots/5.apk_picker.png" alt="Multiple APK Support" /> | <img src="./assets/screenshots/6.apk_install.png" alt="App Installation" /> |
+| <img src="./assets/screenshots/4.app.png" alt="App Page" />   | <img src="./assets/screenshots/5.app_opts.png" alt="App Options" /> | <img src="./assets/screenshots/6.app_webview.png" alt="App Web View" /> |
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -3,7 +3,8 @@
    <application
        android:label="Obtainium"
        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:requestLegacyExternalStorage="true">
        <activity
            android:name=".MainActivity"
            android:exported="true"
@ -51,4 +52,8 @@
    <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.REQUEST_DELETE_PACKAGES" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29"/>
 </manifest>
--- a/android/app/src/main/res/drawable/ic_notification.png
+++ b/android/app/src/main/res/drawable/ic_notification.png
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
  <background android:drawable="@color/ic_launcher_background"/>
  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
--- a/assets/graphics/icon_small.png
+++ b/assets/graphics/icon_small.png
--- a/assets/screenshots/1.apps.png
+++ b/assets/screenshots/1.apps.png
--- a/assets/screenshots/2.dark_theme.png
+++ b/assets/screenshots/2.dark_theme.png
--- a/assets/screenshots/3.material_you.png
+++ b/assets/screenshots/3.material_you.png
--- a/assets/screenshots/4.app.png
+++ b/assets/screenshots/4.app.png
--- a/assets/screenshots/5.apk_picker.png
+++ b/assets/screenshots/5.apk_picker.png
--- a/assets/screenshots/5.app_opts.png
+++ b/assets/screenshots/5.app_opts.png
--- a/assets/screenshots/6.apk_install.png
+++ b/assets/screenshots/6.apk_install.png
--- a/assets/screenshots/6.app_webview.png
+++ b/assets/screenshots/6.app_webview.png
--- a/assets/translations/de.json
+++ b/assets/translations/de.json
@ -74,7 +74,6 @@
    "changeX": "Ändern {}",
    "installUpdateApps": "Apps installieren/aktualisieren",
    "installUpdateSelectedApps": "Ausgewählte Apps installieren/aktualisieren",
-    "onlyWorksWithNonEVDApps": "Funktioniert nur bei Apps, deren Installationsstatus nicht automatisch erkannt werden kann (ungewöhnlich).",
    "markXSelectedAppsAsUpdated": "Markiere {} ausgewählte Apps als aktuell?",
    "no": "Nein",
    "yes": "Ja",
@ -178,7 +177,6 @@
    "installedVersionX": "Installierte Version: {}",
    "lastUpdateCheckX": "Letzte Aktualisierungsprüfung: {}",
    "remove": "Entfernen",
-    "removeAppQuestion": "App entfernen?",
    "yesMarkUpdated": "Ja, als aktualisiert markieren",
    "fdroid": "F-Droid",
    "appIdOrName": "App ID oder Name",
@ -188,25 +186,37 @@
    "steam": "Steam",
    "steamMobile": "Steam Mobile",
    "steamChat": "Steam Chat",
-    "install": "Install",
-    "markInstalled": "Mark Installed",
-    "update": "Update",
-    "markUpdated": "Mark Updated",
-    "additionalOptions": "Additional Options",
-    "disableVersionDetection": "Disable Version Detection",
-    "noVersionDetectionExplanation": "This option should only be used for Apps where version detection does not work correctly.",
-    "downloadingX": "Downloading {}",
-    "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
-    "noAPKFound": "No APK found",
-    "noVersionDetection": "No version detection",
-    "categorize": "Categorize",
-    "categories": "Categories",
-    "category": "Category",
-    "noCategory": "No Category",
-    "deleteCategoryQuestion": "Delete Category?",
-    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
-    "addCategory": "Add Category",
-    "label": "Label",
+    "install": "Installieren",
+    "markInstalled": "Als Installiert markieren",
+    "update": "Aktualisieren",
+    "markUpdated": "Als Aktuell markieren",
+    "additionalOptions": "Zusätzliche Optionen",
+    "disableVersionDetection": "Versionsermittlung deaktivieren",
+    "noVersionDetectionExplanation": "Diese Option sollte nur für Apps verwendet werden, bei denen die Versionserkennung nicht korrekt funktioniert.",
+    "downloadingX": "Lade {} herunter",
+    "downloadNotifDescription": "Benachrichtigt den Nutzer über den Fortschritt beim Herunterladen einer App",
+    "noAPKFound": "Keine APK gefunden",
+    "noVersionDetection": "Keine Versionserkennung",
+    "categorize": "Kategorisieren",
+    "categories": "Kategorien",
+    "category": "Kategorie",
+    "noCategory": "Keine Kategorie",
+    "noCategories": "Keine Kategorien",
+    "deleteCategoriesQuestion": "Kategorien löschen?",
+    "categoryDeleteWarning": "Alle Apps in gelöschten Kategorien werden auf nicht kategorisiert gesetzt.",
+    "addCategory": "Kategorie hinzufügen",
+    "label": "Bezeichnung",
+    "language": "Sprache",
+    "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "removeAppQuestion": {
+        "one": "App entfernen?",
+        "other": "App entfernen?"
+    },
    "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
@ -74,7 +74,6 @@
    "changeX": "Change {}",
    "installUpdateApps": "Install/Update Apps",
    "installUpdateSelectedApps": "Install/Update Selected Apps",
-    "onlyWorksWithNonEVDApps": "Only works for Apps whose install status cannot be automatically detected (uncommon).",
    "markXSelectedAppsAsUpdated": "Mark {} Selected Apps as Updated?",
    "no": "No",
    "yes": "Yes",
@ -178,7 +177,6 @@
    "installedVersionX": "Installed Version: {}",
    "lastUpdateCheckX": "Last Update Check: {}",
    "remove": "Remove",
-    "removeAppQuestion": "Remove App?",
    "yesMarkUpdated": "Yes, Mark as Updated",
    "fdroid": "F-Droid",
    "appIdOrName": "App ID or Name",
@ -203,10 +201,22 @@
    "categories": "Categories",
    "category": "Category",
    "noCategory": "No Category",
-    "deleteCategoryQuestion": "Delete Category?",
-    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
+    "noCategories": "No Categories",
+    "deleteCategoriesQuestion": "Delete Categories?",
+    "categoryDeleteWarning": "All Apps in deleted categories will be set to uncategorized.",
    "addCategory": "Add Category",
    "label": "Label",
+    "language": "Language",
+    "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "removeAppQuestion": {
+        "one": "Remove App?",
+        "other": "Remove 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,24 @@
    "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).",
    "markXSelectedAppsAsUpdated": "Megjelöl {} kiválasztott alkalmazást frissítettként?",
    "no": "Nem",
    "yes": "Igen",
@ -86,8 +85,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 +117,7 @@
    "selectURLs": "Kiválasztott URL-ek",
    "pick": "Válasszon",
    "theme": "Téma",
-    "dark": "Söét",
+    "dark": "Sötét",
    "light": "Világos",
    "followSystem": "Rendszer szerint",
    "obtainium": "Obtainium",
@ -126,11 +125,11 @@
    "appSortBy": "App rendezés...",
    "authorName": "Szerző/Név",
    "nameAuthor": "Név/Szerző",
-    "asAdded": "Mint hozzáadott",
+    "asAdded": "Mint Hozzáadott",
    "appSortOrder": "Appok rendezése",
    "ascending": "Emelkedő",
    "descending": "Csökkenő",
-    "bgUpdateCheckInterval": "Háttérfrissítés ellenőrzési időköz",
+    "bgUpdateCheckInterval": "Háttérfrissítés ellenőrzés időköze",
    "neverManualOnly": "Soha – csak manuális",
    "appearance": "Megjelenés",
    "showWebInAppView": "Forrás megjelenítése az Appok nézetben",
@ -145,7 +144,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 +152,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",
@ -178,35 +177,45 @@
    "installedVersionX": "Telepített verzió: {}",
    "lastUpdateCheckX": "Frissítés ellenőrizve: {}",
    "remove": "Eltávolítás",
-    "removeAppQuestion": "Eltávolítja az alkalmazást?",
    "yesMarkUpdated": "Igen, megjelölés frissítettként",
    "fdroid": "F-Droid",
    "appIdOrName": "App ID vagy név",
    "appWithIdOrNameNotFound": "Nem található app ezzel az azonosítóval vagy névvel",
    "reposHaveMultipleApps": "A repók több alkalmazást is tartalmazhatnak",
-    "fdroidThirdPartyRepo": "F-Droid Harmadik fél Repo",
+    "fdroidThirdPartyRepo": "F-Droid Harmadik-fél Repo",
    "steam": "Steam",
    "steamMobile": "Steam Mobile",
    "steamChat": "Steam Chat",
-    "install": "Install",
-    "markInstalled": "Mark Installed",
-    "update": "Update",
-    "markUpdated": "Mark Updated",
-    "additionalOptions": "Additional Options",
-    "disableVersionDetection": "Disable Version Detection",
-    "noVersionDetectionExplanation": "This option should only be used for Apps where version detection does not work correctly.",
-    "downloadingX": "Downloading {}",
-    "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
-    "noAPKFound": "No APK found",
-    "noVersionDetection": "No version detection",
-    "categorize": "Categorize",
-    "categories": "Categories",
-    "category": "Category",
-    "noCategory": "No Category",
-    "deleteCategoryQuestion": "Delete Category?",
-    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
-    "addCategory": "Add Category",
-    "label": "Label",
+    "install": "Telepít",
+    "markInstalled": "Telepítettnek jelöl",
+    "update": "Frissít",
+    "markUpdated": "Frissítettnek jelöl",
+    "additionalOptions": "További lehetőségek",
+    "disableVersionDetection": "Verzióérzékelés letiltása",
+    "noVersionDetectionExplanation": "Ezt a beállítást csak olyan alkalmazásoknál szabad használni, ahol a verzióérzékelés nem működik megfelelően.",
+    "downloadingX": "{} letöltés",
+    "downloadNotifDescription": "Értesíti a felhasználót az app letöltésének előrehaladásáról",
+    "noAPKFound": "Nem található APK",
+    "noVersionDetection": "Nincs verzió érzékelés",
+    "categorize": "Kategorizálás",
+    "categories": "Kategóriák",
+    "category": "Kategória",
+    "noCategory": "Nincs kategória",
+    "deleteCategoryQuestion": "Törli a kategóriát?",
+    "categoryDeleteWarning": "A(z) {} összes app kategorizálatlan állapotba kerül.",
+    "addCategory": "Új kategória",
+    "label": "Címke",
+    "language": "Nyelv",
+    "storagePermissionDenied": "Tárhely engedély megtagadva",
+    "selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "removeAppQuestion": {
+        "one": "Eltávolítja az alkalmazást?",
+        "other": "Eltávolítja az alkalmazást?"
+    },
    "tooManyRequestsTryAgainInMinutes": {
        "one": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva",
        "other": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva"
@ -251,4 +260,4 @@
        "one": "A(z) {} és 1 további alkalmazás frissítve.",
        "other": "{} és további {} alkalmazás frissítve."
    }
-}
+}
--- 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,21 +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",
-    "onlyWorksWithNonEVDApps": "Funziona solo per le App il cui stato d'installazione non può essere rilevato automaticamente (inconsueto).",
+    "changeX": "Modifica {}",
+    "installUpdateApps": "Installa/Aggiorna App",
+    "installUpdateSelectedApps": "Installa/Aggiorna le App selezionate",
    "markXSelectedAppsAsUpdated": "Contrassegnare le {} App selezionate come aggiornate?",
    "no": "No",
    "yes": "Sì",
@ -95,7 +94,7 @@
    "author": "Autore",
    "upToDateApps": "App aggiornate",
    "nonInstalledApps": "App non installate",
-    "importExport": "Importa/Esporta",
+    "importExport": "Importa - Esporta",
    "settings": "Impostazioni",
    "exportedTo": "Esportato in {}",
    "obtainiumExport": "Esporta da Obtainium",
@ -134,7 +133,7 @@
    "neverManualOnly": "Mai - Solo manuale",
    "appearance": "Aspetto",
    "showWebInAppView": "Mostra pagina web dell'App se selezionata",
-    "pinUpdates": "Fissa in alto gli aggiornamenti disponibili",
+    "pinUpdates": "Fissa aggiornamenti disponibili in alto",
    "updates": "Aggiornamenti",
    "sourceSpecific": "Specifiche per la fonte",
    "appSource": "Sorgente dell'App",
@ -146,21 +145,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 +177,6 @@
    "installedVersionX": "Versione installata: {}",
    "lastUpdateCheckX": "Ultimo controllo degli aggiornamenti: {}",
    "remove": "Rimuovi",
-    "removeAppQuestion": "Rimuovere App?",
    "yesMarkUpdated": "Sì, contrassegna come aggiornato",
    "fdroid": "F-Droid",
    "appIdOrName": "ID o nome dell'App",
@ -188,36 +186,48 @@
    "steam": "Steam",
    "steamMobile": "Steam Mobile",
    "steamChat": "Steam Chat",
-    "install": "Install",
-    "markInstalled": "Mark Installed",
-    "update": "Update",
-    "markUpdated": "Mark Updated",
-    "additionalOptions": "Additional Options",
-    "disableVersionDetection": "Disable Version Detection",
-    "noVersionDetectionExplanation": "This option should only be used for Apps where version detection does not work correctly.",
-    "downloadingX": "Downloading {}",
-    "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
-    "noAPKFound": "No APK found",
-    "noVersionDetection": "No version detection",
-    "categorize": "Categorize",
-    "categories": "Categories",
-    "category": "Category",
-    "noCategory": "No Category",
-    "deleteCategoryQuestion": "Delete Category?",
-    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
-    "addCategory": "Add Category",
-    "label": "Label",
+    "install": "Installa",
+    "markInstalled": "Contrassegna come installato",
+    "update": "Aggiorna",
+    "markUpdated": "Contrassegna come aggiornato",
+    "additionalOptions": "Opzioni aggiuntive",
+    "disableVersionDetection": "Disattiva il rilevamento della versione",
+    "noVersionDetectionExplanation": "Questa opzione dovrebbe essere usata solo per le App la cui versione non viene rilevata correttamente.",
+    "downloadingX": "Scaricamento di {} in corso",
+    "downloadNotifDescription": "Notifica all'utente lo stato di avanzamento del download di un'App",
+    "noAPKFound": "Nessun APK trovato",
+    "noVersionDetection": "Disattiva rilevamento di versione",
+    "categorize": "Aggiungi a categoria",
+    "categories": "Categorie",
+    "category": "Categoria",
+    "noCategory": "Nessuna categoria",
+    "noCategories": "Nessuna categoria",
+    "deleteCategoriesQuestion": "Eliminare le categorie?",
+    "categoryDeleteWarning": "Tutte le App nelle categorie eliminate saranno impostate come non categorizzate.",
+    "addCategory": "Aggiungi categoria",
+    "label": "Etichetta",
+    "language": "Lingua",
+    "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "removeAppQuestion": {
+        "one": "Rimuovere l'App?",
+        "other": "Rimuovere l'App?"
+    },
    "tooManyRequestsTryAgainInMinutes": {
        "one": "Troppe richieste (traffico limitato) - riprova tra {} minuto",
        "other": "Troppe richieste (traffico limitato) - riprova tra {} minuti"
    },
    "bgUpdateGotErrorRetryInMinutes": {
-        "one": "Il controllo degli aggiornamenti in background ha incontrato un {}, ricontrollo tra {} minuto",
-        "other": "Il controllo degli aggiornamenti in background ha incontrato un {}, ricontrollo tra {} minuti"
+        "one": "Il controllo degli aggiornamenti in background ha incontrato un {}, nuovo tentativo tra {} minuto",
+        "other": "Il controllo degli aggiornamenti in background ha incontrato un {}, nuovo tentativo tra {} minuti"
    },
    "bgCheckFoundUpdatesWillNotifyIfNeeded": {
-        "one": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamento - avviserà l'utento se necessario",
-        "other": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamenti - avviserà l'utento se necessario"
+        "one": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamento - notificherà l'utente se necessario",
+        "other": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamenti - notificherà l'utente se necessario"
    },
    "apps": {
        "one": "{} App",
@ -251,4 +261,4 @@
        "one": "{} e un'altra App sono state aggiornate.",
        "other": "{} e altre {} App sono state aggiornate."
    }
-}
+}
--- a/assets/translations/ja.json
+++ b/assets/translations/ja.json
@ -7,12 +7,12 @@
    "appIdMismatch": "ダウンロードしたパッケージのIDが既存のApp IDと一致しません",
    "functionNotImplemented": "このクラスはこの機能を実装していません",
    "placeholder": "プレースホルダー",
-    "someErrors": "いくつかのエラーが発生しました",
+    "someErrors": "何らかのエラーが発生しました",
    "unexpectedError": "予期せぬエラーが発生しました",
    "ok": "OK",
    "and": "と",
    "startedBgUpdateTask": "バックグラウンドのアップデート確認タスクを開始",
-    "bgUpdateIgnoreAfterIs": "Bg update ignoreAfter is  {}",
+    "bgUpdateIgnoreAfterIs": "Bg update ignoreAfter is {}",
    "startedActualBGUpdateCheck": "実際のバックグラウンドのアップデート確認を開始",
    "bgUpdateTaskFinished": "バックグラウンドのアップデート確認タスクを終了",
    "firstRun": "これがObtainiumの最初の実行です",
@ -27,7 +27,7 @@
    "invalidRegEx": "無効な正規表現",
    "noDescription": "説明はありません",
    "cancel": "キャンセル",
-    "continue": "続ける",
+    "continue": "続行",
    "requiredInBrackets": "(必須)",
    "dropdownNoOptsError": "エラー: ドロップダウンには、少なくとも1つのオプションが必要です",
    "colour": "カラー",
@ -64,17 +64,16 @@
    "notInstalled": "未インストール",
    "estimateInBrackets": "(推定)",
    "selectAll": "すべて選択",
-    "deselectN": "{}件を選択解除",
-    "xWillBeRemovedButRemainInstalled": "{}はObtainiumから削除されますが、デバイスにはインストールされたままです。",
+    "deselectN": "{}件の選択を解除",
+    "xWillBeRemovedButRemainInstalled": "{} はObtainiumから削除されますが、デバイスにはインストールされたままです。",
    "removeSelectedAppsQuestion": "選択したアプリを削除しますか？",
    "removeSelectedApps": "選択したアプリを削除する",
-    "updateX": "{}をアップデートする",
-    "installX": "{}をインストールする",
+    "updateX": "{} をアップデートする",
+    "installX": "{} をインストールする",
    "markXTrackOnlyAsUpdated": "{}\n(追跡のみ)\nをアップデート済みとしてマークする",
-    "changeX": "{}を変更する",
+    "changeX": "{} を変更する",
    "installUpdateApps": "アプリのインストール/アップデート",
    "installUpdateSelectedApps": "選択したアプリのインストール/アップデート",
-    "onlyWorksWithNonEVDApps": "インストール状況を自動検出できないアプリ（一般的でないもの）のみ動作します。",
    "markXSelectedAppsAsUpdated": "{}個の選択したアプリをアップデート済みとしてマークしますか？",
    "no": "いいえ",
    "yes": "はい",
@ -82,7 +81,7 @@
    "pinToTop": "トップに固定",
    "unpinFromTop": "トップから固定解除",
    "resetInstallStatusForSelectedAppsQuestion": "選択したアプリのインストール状態をリセットしますか？",
-    "installStatusOfXWillBeResetExplanation": "選択したアプリのインストール状態がリセットされます。\n\nアップデートに失敗するなどして、Obtainiumに表示されるアプリのバージョンが正しくない場合に役立ちます。",
+    "installStatusOfXWillBeResetExplanation": "選択したアプリのインストール状態がリセットされます。\n\nアップデートに失敗した場合など、Obtainiumに表示されるアプリのバージョンが正しくない場合に有効です。",
    "shareSelectedAppURLs": "選択したアプリのURLを共有する",
    "resetInstallStatus": "インストール状態をリセットする",
    "more": "もっと見る",
@ -109,7 +108,7 @@
    "searchX": "{}で検索",
    "noResults": "結果は見つかりませんでした",
    "importX": "{}をインポートする",
-    "importedAppsIdDisclaimer": "インポートしたアプリが「未インストール」と表示されることがあります。\nこれを解決するには、Obtainiumから再インストールしてください。\nアプリのデータには影響しません。\n\nURLとサードパーティーのインポートメソッドにのみ影響します。",
+    "importedAppsIdDisclaimer": "インポートしたアプリが「未インストール」と表示されることがあります。\nこれを解決するには、Obtainiumから再インストールしてください。\nアプリのデータには影響しません。\n\nURLとサードパーティのインポートメソッドにのみ影響します。",
    "importErrors": "インポートエラー",
    "importedXOfYApps": "{} / {} アプリをインポートしました",
    "followingURLsHadErrors": "以下のURLでエラーが発生しました:",
@ -133,9 +132,9 @@
    "bgUpdateCheckInterval": "バックグラウンドでのアップデート確認の間隔",
    "neverManualOnly": "手動",
    "appearance": "外観",
-    "showWebInAppView": "アプリビューにソースウェブページを表示する",
+    "showWebInAppView": "アプリページにソースのWebページを表示する",
    "pinUpdates": "アップデートがあるアプリをトップに固定する",
-    "updates": "更新",
+    "updates": "アップデート",
    "sourceSpecific": "Github アクセストークン",
    "appSource": "アプリのソース",
    "noLogs": "ログはありません",
@ -144,24 +143,24 @@
    "share": "共有",
    "appNotFound": "アプリが見つかりません",
    "obtainiumExportHyphenatedLowercase": "obtainium-エクスポート",
-    "pickAnAPK": "APKを選ぶ",
-    "appHasMoreThanOnePackage": "{}は複数のパッケージが存在します: ",
-    "deviceSupportsXArch": "お使いのデバイスは{} CPUアーキテクチャに対応しています。",
+    "pickAnAPK": "APKを選択",
+    "appHasMoreThanOnePackage": "{} は複数のパッケージが存在します: ",
+    "deviceSupportsXArch": "お使いのデバイスは {} CPUアーキテクチャに対応しています。",
    "deviceSupportsFollowingArchs": "お使いのデバイスは、以下のCPUアーキテクチャをサポートしています:",
    "warning": "警告",
    "sourceIsXButPackageFromYPrompt": "アプリのソースは'{}'ですが、リリースパッケージは'{}'から来ています。続行しますか？",
    "updatesAvailable": "アップデートが利用可能",
    "updatesAvailableNotifDescription": "Obtainiumが追跡している1つまたは複数のアプリのアップデートが利用可能であることをユーザーに通知する",
    "noNewUpdates": "新しいアップデートはありません",
-    "xHasAnUpdate": "{}のアップデートが利用可能です",
+    "xHasAnUpdate": "{} のアップデートが利用可能です",
    "appsUpdated": "アプリをアップデートしました",
    "appsUpdatedNotifDescription": "1つまたは複数のAppのアップデートがバックグラウンドで適用されたことをユーザーに通知する",
-    "xWasUpdatedToY": "{}が{}にアップデートされました",
+    "xWasUpdatedToY": "{} が {} にアップデートされました",
    "errorCheckingUpdates": "アップデート確認中のエラー",
    "errorCheckingUpdatesNotifDescription": "バックグラウンドでのアップデート確認に失敗した際に表示される通知",
    "appsRemoved": "削除されたアプリ",
    "appsRemovedNotifDescription": "アプリの読み込み中にエラーが発生したため、1つまたは複数のアプリが削除されたことをユーザーに通知する",
-    "xWasRemovedDueToErrorY": "このエラーのため、{}は削除されました: {}",
+    "xWasRemovedDueToErrorY": "このエラーのため、{} は削除されました: {}",
    "completeAppInstallation": "アプリのインストールを完了する",
    "obtainiumMustBeOpenToInstallApps": "アプリをインストールするにはObtainiumを開いている必要があります。",
    "completeAppInstallationNotifDescription": "アプリのインストールを完了するために、Obtainiumに戻る必要があります。",
@ -178,13 +177,12 @@
    "installedVersionX": "インストールされたバージョン: {}",
    "lastUpdateCheckX": "最終アップデート確認: {}",
    "remove": "削除",
-    "removeAppQuestion": "アプリを削除しますか？",
    "yesMarkUpdated": "はい、アップデート済みとしてマークします",
    "fdroid": "F-Droid",
    "appIdOrName": "アプリのIDまたは名前",
    "appWithIdOrNameNotFound": "そのIDや名前を持つアプリは見つかりませんでした",
    "reposHaveMultipleApps": "リポジトリには複数のアプリが含まれることがあります",
-    "fdroidThirdPartyRepo": "F-Droid Third-Party Repo",
+    "fdroidThirdPartyRepo": "F-Droid サードパーティリポジトリ",
    "steam": "Steam",
    "steamMobile": "Steam Mobile",
    "steamChat": "Steam Chat",
@ -203,10 +201,22 @@
    "categories": "カテゴリ",
    "category": "カテゴリ",
    "noCategory": "カテゴリなし",
-    "deleteCategoryQuestion": "カテゴリを削除しますか？",
-    "categoryDeleteWarning": "「{}」内のすべてのアプリは未分類に設定されます。",
+    "noCategories": "カテゴリなし",
+    "deleteCategoriesQuestion": "カテゴリを削除しますか？",
+    "categoryDeleteWarning": "削除されたカテゴリ内のアプリは未分類に設定されます。",
    "addCategory": "カテゴリを追加",
    "label": "ラベル",
+    "language": "言語",
+    "storagePermissionDenied": "ストレージ権限が拒否されました",
+    "selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
+    "filterAPKsByRegEx": "正規表現でAPKを絞り込む",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "removeAppQuestion": {
+        "one": "アプリを削除しますか？",
+        "other": "アプリを削除しますか？"
+    },
    "tooManyRequestsTryAgainInMinutes": {
        "one": "リクエストが多すぎます（レート制限）- {}分後に再試行してください",
        "other": "リクエストが多すぎます（レート制限）- {}分後に再試行してください"
@ -244,11 +254,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",
@ -178,7 +178,6 @@
    "installedVersionX": "已安装: {}",
    "lastUpdateCheckX": "最后检查: {}",
    "remove": "删除",
-    "removeAppQuestion": "删除应用？",
    "yesMarkUpdated": "'是的，标为已更新",
    "fdroid": "F-Droid",
    "appIdOrName": "应用 ID 或名称",
@ -199,14 +198,25 @@
    "downloadNotifDescription": "通知用户下载进度",
    "noAPKFound": "未找到安装包",
    "noVersionDetection": "无版本检测",
-    "categorize": "Categorize",
-    "categories": "Categories",
-    "category": "Category",
-    "noCategory": "No Category",
-    "deleteCategoryQuestion": "Delete Category?",
-    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
-    "addCategory": "Add Category",
-    "label": "Label",
+    "categorize": "归档",
+    "categories": "归档",
+    "category": "类别",
+    "noCategory": "无类别",
+    "noCategories": "无类别",
+    "deleteCategoriesQuestion": "删除所有类别？",
+    "categoryDeleteWarning": "所有被删除类别的应用程序将被设置为无类别",
+    "addCategory": "添加类别",
+    "label": "标签",
+    "language": "语言",
+    "storagePermissionDenied": "存储权限已被拒绝",
+    "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "removeAppQuestion": {
+        "one": "删除应用？",
+        "other": "删除应用？"
+    },
    "tooManyRequestsTryAgainInMinutes": {
        "one": "请求过多 (API 限制) - 在 {} 分钟后重试",
        "other": "请求过多 (API 限制) - 在 {} 分钟后重试"
--- a/lib/app_sources/apkmirror.dart
+++ b/lib/app_sources/apkmirror.dart
@ -46,7 +46,7 @@ class APKMirror extends AppSource {
      }
      return APKDetails(version, [], getAppNames(standardUrl));
    } else {
-      throw NoReleasesError();
+      throw getObtainiumHttpError(res);
    }
  }

--- a/lib/app_sources/codeberg.dart
+++ b/lib/app_sources/codeberg.dart
@ -0,0 +1,149 @@
+import 'dart:convert';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class Codeberg extends AppSource {
+  Codeberg() {
+    host = 'codeberg.org';
+
+    additionalSourceSpecificSettingFormItems = [];
+
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('includePrereleases',
+            label: tr('includePrereleases'), defaultValue: false)
+      ],
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ],
+      [
+        GeneratedFormTextField('filterReleaseTitlesByRegEx',
+            label: tr('filterReleaseTitlesByRegEx'),
+            required: false,
+            additionalValidators: [
+              (value) {
+                return regExValidator(value);
+              }
+            ])
+      ]
+    ];
+
+    canSearch = true;
+  }
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) =>
+      '$standardUrl/releases';
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    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(
+        'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
+    if (res.statusCode == 200) {
+      var releases = jsonDecode(res.body) as List<dynamic>;
+
+      List<String> getReleaseAPKUrls(dynamic release) =>
+          (release['assets'] as List<dynamic>?)
+              ?.map((e) {
+                return e['name'] != null && e['browser_download_url'] != null
+                    ? MapEntry(e['name'] as String,
+                        e['browser_download_url'] as String)
+                    : const MapEntry('', '');
+              })
+              .where((element) => element.key.toLowerCase().endsWith('.apk'))
+              .map((e) => e.value)
+              .toList() ??
+          [];
+
+      dynamic targetRelease;
+
+      for (int i = 0; i < releases.length; i++) {
+        if (!fallbackToOlderReleases && i > 0) break;
+        if (!includePrereleases && releases[i]['prerelease'] == true) {
+          continue;
+        }
+        if (releases[i]['draft'] == true) {
+          // Draft releases not supported
+        }
+        var nameToFilter = releases[i]['name'] as String?;
+        if (nameToFilter == null || nameToFilter.trim().isEmpty) {
+          // Some leave titles empty so tag is used
+          nameToFilter = releases[i]['tag_name'] as String;
+        }
+        if (regexFilter != null &&
+            !RegExp(regexFilter).hasMatch(nameToFilter.trim())) {
+          continue;
+        }
+        var apkUrls = getReleaseAPKUrls(releases[i]);
+        if (apkUrls.isEmpty && additionalSettings['trackOnly'] != true) {
+          continue;
+        }
+        targetRelease = releases[i];
+        targetRelease['apkUrls'] = apkUrls;
+        break;
+      }
+      if (targetRelease == null) {
+        throw NoReleasesError();
+      }
+      String? version = targetRelease['tag_name'];
+      if (version == null) {
+        throw NoVersionError();
+      }
+      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
+          getAppNames(standardUrl));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+
+  AppNames getAppNames(String standardUrl) {
+    String temp = standardUrl.substring(standardUrl.indexOf('://') + 3);
+    List<String> names = temp.substring(temp.indexOf('/') + 1).split('/');
+    return AppNames(names[0], names[1]);
+  }
+
+  @override
+  Future<Map<String, String>> search(String query) async {
+    Response res = await get(Uri.parse(
+        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100'));
+    if (res.statusCode == 200) {
+      Map<String, String> urlsWithDescriptions = {};
+      for (var e in (jsonDecode(res.body)['data'] as List<dynamic>)) {
+        urlsWithDescriptions.addAll({
+          e['html_url'] as String: e['description'] != null
+              ? e['description'] as String
+              : tr('noDescription')
+        });
+      }
+      return urlsWithDescriptions;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}
--- a/lib/app_sources/fdroid.dart
+++ b/lib/app_sources/fdroid.dart
@ -54,7 +54,7 @@ class FDroid extends AppSource {
      return APKDetails(latestVersion, apkUrls,
          AppNames(name, Uri.parse(standardUrl).pathSegments.last));
    } else {
-      throw NoReleasesError();
+      throw getObtainiumHttpError(res);
    }
  }

--- a/lib/app_sources/fdroidrepo.dart
+++ b/lib/app_sources/fdroidrepo.dart
@ -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);
@ -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
@ -15,6 +15,7 @@ class GitHub extends AppSource {
    additionalSourceSpecificSettingFormItems = [
      GeneratedFormTextField('github-creds',
          label: tr('githubPATLabel'),
+          password: true,
          required: false,
          additionalValidators: [
            (value) {
@ -64,15 +65,7 @@ class GitHub extends AppSource {
            required: false,
            additionalValidators: [
              (value) {
-                if (value == null || value.isEmpty) {
-                  return null;
-                }
-                try {
-                  RegExp(value);
-                } catch (e) {
-                  return tr('invalidRegEx');
-                }
-                return null;
+                return regExValidator(value);
              }
            ])
      ]
@ -118,7 +111,7 @@ class GitHub extends AppSource {
            ? additionalSettings['filterReleaseTitlesByRegEx']
            : null;
    Response res = await get(Uri.parse(
-        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases'));
+        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
    if (res.statusCode == 200) {
      var releases = jsonDecode(res.body) as List<dynamic>;

@ -140,10 +133,13 @@ class GitHub extends AppSource {
        if (!includePrereleases && releases[i]['prerelease'] == true) {
          continue;
        }
-
+        var nameToFilter = releases[i]['name'] as String?;
+        if (nameToFilter == null || nameToFilter.trim().isEmpty) {
+          // Some leave titles empty so tag is used
+          nameToFilter = releases[i]['tag_name'] as String;
+        }
        if (regexFilter != null &&
-            !RegExp(regexFilter)
-                .hasMatch((releases[i]['name'] as String).trim())) {
+            !RegExp(regexFilter).hasMatch(nameToFilter.trim())) {
          continue;
        }
        var apkUrls = getReleaseAPKUrls(releases[i]);
--- a/lib/app_sources/gitlab.dart
+++ b/lib/app_sources/gitlab.dart
@ -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/html.dart
+++ b/lib/app_sources/html.dart
@ -0,0 +1,47 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class HTML extends AppSource {
+  @override
+  String standardizeURL(String url) {
+    return url;
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => null;
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    var uri = Uri.parse(standardUrl);
+    Response res = await get(uri);
+    if (res.statusCode == 200) {
+      List<String> links = parse(res.body)
+          .querySelectorAll('a')
+          .map((element) => element.attributes['href'] ?? '')
+          .where((element) => element.toLowerCase().endsWith('.apk'))
+          .toList();
+      links.sort((a, b) => a.split('/').last.compareTo(b.split('/').last));
+      if (links.isEmpty) {
+        throw NoReleasesError();
+      }
+      var rel = links.last;
+      var apkName = rel.split('/').last;
+      var version = apkName.substring(0, apkName.length - 4);
+      List<String> apkUrls = [rel]
+          .map((e) => e.toLowerCase().startsWith('http://') ||
+                  e.toLowerCase().startsWith('https://')
+              ? e
+              : '${uri.origin}/$e')
+          .toList();
+      return APKDetails(version, apkUrls, AppNames(uri.host, tr('app')));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}
--- a/lib/app_sources/mullvad.dart
+++ b/lib/app_sources/mullvad.dart
@ -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
@ -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
@ -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
@ -54,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,5 +1,8 @@
+import 'dart:math';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:obtainium/components/generated_form_modal.dart';

 abstract class GeneratedFormItem {
  late String key;
@ -20,6 +23,7 @@ class GeneratedFormTextField extends GeneratedFormItem {
  late bool required;
  late int max;
  late String? hint;
+  late bool password;

  GeneratedFormTextField(String key,
      {String label = 'Input',
@ -28,7 +32,8 @@ class GeneratedFormTextField extends GeneratedFormItem {
      List<String? Function(String? value)> additionalValidators = const [],
      this.required = true,
      this.max = 1,
-      this.hint})
+      this.hint,
+      this.password = false})
      : super(key,
            label: label,
            belowWidgets: belowWidgets,
@ -82,6 +87,35 @@ class GeneratedFormSwitch extends GeneratedFormItem {
  }
 }

+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);

@ -96,11 +130,27 @@ 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, dynamic> values = {};
  late List<List<Widget>> formInputs;
  List<List<Widget>> rows = [];
+  String? initKey;

  // If any value changes, call this to update the parent with value and validity
  void someValueChanged({bool isBuilding = false}) {
@ -109,24 +159,21 @@ class _GeneratedFormState extends State<GeneratedForm> {
    for (int r = 0; r < widget.items.length; r++) {
      for (int i = 0; i < widget.items[r].length; i++) {
        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;
+          }
        }
      }
    }
    widget.onValueChanges(returnValues, valid, isBuilding);
  }

-  @override
-  void initState() {
-    super.initState();
-
+  initForm() {
+    initKey = widget.key.toString();
    // Initialize form values as all empty
    values.clear();
-    int j = 0;
    for (var row in widget.items) {
      for (var e in row) {
        values[e.key] = e.defaultValue;
@ -140,6 +187,9 @@ class _GeneratedFormState extends State<GeneratedForm> {
        if (formItem is GeneratedFormTextField) {
          final formFieldKey = GlobalKey<FormFieldState>();
          return TextFormField(
+            obscureText: formItem.password,
+            autocorrect: !formItem.password,
+            enableSuggestions: !formItem.password,
            key: formFieldKey,
            initialValue: values[formItem.key],
            autovalidateMode: AutovalidateMode.onUserInteraction,
@ -193,8 +243,17 @@ class _GeneratedFormState extends State<GeneratedForm> {
    someValueChanged(isBuilding: true);
  }

+  @override
+  void initState() {
+    super.initState();
+    initForm();
+  }
+
  @override
  Widget build(BuildContext context) {
+    if (widget.key.toString() != initKey) {
+      initForm();
+    }
    for (var r = 0; r < formInputs.length; r++) {
      for (var e = 0; e < formInputs[r].length; e++) {
        if (widget.items[r][e] is GeneratedFormSwitch) {
@ -212,6 +271,186 @@ class _GeneratedFormState extends State<GeneratedForm> {
                  })
            ],
          );
+        } 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'),
+                    )),
+              ],
+            )
+          ]);
        }
      }
    }
--- a/lib/components/generated_form_modal.dart
+++ b/lib/components/generated_form_modal.dart
@ -9,12 +9,16 @@ 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();
@ -54,24 +58,29 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
                  this.valid = valid;
                });
              }
-            })
+            }),
+        if (widget.additionalWidgets.isNotEmpty) ...widget.additionalWidgets
      ]),
      actions: [
        TextButton(
            onPressed: () {
              Navigator.of(context).pop(null);
            },
-            child: Text(tr('cancel'))),
-        TextButton(
-            onPressed: !valid
-                ? null
-                : () {
-                    if (valid) {
-                      HapticFeedback.selectionClick();
-                      Navigator.of(context).pop(values);
-                    }
-                  },
-            child: Text(tr('continue')))
+            child: Text(widget.singleNullReturnButton == null
+                ? tr('cancel')
+                : widget.singleNullReturnButton!)),
+        widget.singleNullReturnButton == null
+            ? TextButton(
+                onPressed: !valid
+                    ? null
+                    : () {
+                        if (valid) {
+                          HapticFeedback.selectionClick();
+                          Navigator.of(context).pop(values);
+                        }
+                      },
+                child: Text(tr('continue')))
+            : const SizedBox.shrink()
      ],
    );
  }
--- 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 {
@ -32,7 +29,7 @@ class NoReleasesError extends ObtainiumError {
 }

 class NoAPKError extends ObtainiumError {
-  NoAPKError() : super(tr('noReleaseFound'));
+  NoAPKError() : super(tr('noAPKFound'));
 }

 class NoVersionError 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.9.2';
+const String currentVersion = '0.10.7';
 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()),
  ));
 }
--- 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';
@ -23,39 +24,42 @@ class AddAppPage extends StatefulWidget {

 class _AddAppPageState extends State<AddAppPage> {
  bool gettingAppInfo = false;
+  bool searching = false;

  String userInput = '';
  String searchQuery = '';
  AppSource? pickedSource;
  Map<String, dynamic> additionalSettings = {};
  bool additionalSettingsValid = true;
+  List<String> pickedCategories = [];
+  int searchnum = 0;

  @override
  Widget build(BuildContext context) {
    SourceProvider sourceProvider = SourceProvider();
    AppsProvider appsProvider = context.read<AppsProvider>();

-    changeUserInput(String input, bool valid, bool isBuilding) {
-      userInput = input;
-      fn() {
-        var source = valid ? sourceProvider.getSource(userInput) : null;
-        if (pickedSource.runtimeType != source.runtimeType) {
-          pickedSource = source;
-          additionalSettings = source != null
-              ? getDefaultValuesFromFormItems(
-                  source.combinedAppSpecificSettingFormItems)
-              : {};
-          additionalSettingsValid = source != null
-              ? !sourceProvider.ifRequiredAppSpecificSettingsExist(source)
-              : true;
-        }
-      }
+    bool doingSomething = gettingAppInfo || searching;

-      if (isBuilding) {
-        fn();
-      } else {
+    changeUserInput(String input, bool valid, bool isBuilding,
+        {bool isSearch = false}) {
+      userInput = input;
+      if (!isBuilding) {
        setState(() {
-          fn();
+          if (isSearch) {
+            searchnum++;
+          }
+          var source = valid ? sourceProvider.getSource(userInput) : null;
+          if (pickedSource.runtimeType != source.runtimeType) {
+            pickedSource = source;
+            additionalSettings = source != null
+                ? getDefaultValuesFromFormItems(
+                    source.combinedAppSpecificSettingFormItems)
+                : {};
+            additionalSettingsValid = source != null
+                ? !sourceProvider.ifRequiredAppSpecificSettingsExist(source)
+                : true;
+          }
        });
      }
    }
@ -71,6 +75,7 @@ class _AddAppPageState extends State<AddAppPage> {
            additionalSettings['noVersionDetection'] == true;
        var cont = true;
        if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
+            // ignore: use_build_context_synchronously
            await showDialog(
                    context: context,
                    builder: (BuildContext ctx) {
@ -89,6 +94,7 @@ class _AddAppPageState extends State<AddAppPage> {
          cont = false;
        }
        if (userPickedNoVersionDetection &&
+            // ignore: use_build_context_synchronously
            await showDialog(
                    context: context,
                    builder: (BuildContext ctx) {
@ -131,6 +137,7 @@ class _AddAppPageState extends State<AddAppPage> {
          if (app.additionalSettings['trackOnly'] == true) {
            app.installedVersion = app.latestVersion;
          }
+          app.categories = pickedCategories;
          await appsProvider.saveApps([app]);

          return app;
@ -167,30 +174,32 @@ class _AddAppPageState extends State<AddAppPage> {
                        children: [
                          Expanded(
                              child: GeneratedForm(
+                                  key: Key(searchnum.toString()),
                                  items: [
-                                [
-                                  GeneratedFormTextField('appSourceURL',
-                                      label: tr('appSourceURL'),
-                                      additionalValidators: [
-                                        (value) {
-                                          try {
-                                            sourceProvider
-                                                .getSource(value ?? '')
-                                                .standardizeURL(
-                                                    preStandardizeUrl(
-                                                        value ?? ''));
-                                          } catch (e) {
-                                            return e is String
-                                                ? e
-                                                : e is ObtainiumError
-                                                    ? e.toString()
-                                                    : tr('error');
-                                          }
-                                          return null;
-                                        }
-                                      ])
-                                ]
-                              ],
+                                    [
+                                      GeneratedFormTextField('appSourceURL',
+                                          label: tr('appSourceURL'),
+                                          defaultValue: userInput,
+                                          additionalValidators: [
+                                            (value) {
+                                              try {
+                                                sourceProvider
+                                                    .getSource(value ?? '')
+                                                    .standardizeURL(
+                                                        preStandardizeUrl(
+                                                            value ?? ''));
+                                              } catch (e) {
+                                                return e is String
+                                                    ? e
+                                                    : e is ObtainiumError
+                                                        ? e.toString()
+                                                        : tr('error');
+                                              }
+                                              return null;
+                                            }
+                                          ])
+                                    ]
+                                  ],
                                  onValueChanges: (values, valid, isBuilding) {
                                    changeUserInput(values['appSourceURL']!,
                                        valid, isBuilding);
@ -201,7 +210,7 @@ class _AddAppPageState extends State<AddAppPage> {
                          gettingAppInfo
                              ? const CircularProgressIndicator()
                              : ElevatedButton(
-                                  onPressed: gettingAppInfo ||
+                                  onPressed: doingSomething ||
                                          pickedSource == null ||
                                          (pickedSource!
                                                  .combinedAppSpecificSettingFormItems
@ -238,7 +247,9 @@ class _AddAppPageState extends State<AddAppPage> {
                                    ]
                                  ],
                                  onValueChanges: (values, valid, isBuilding) {
-                                    if (values.isNotEmpty && valid) {
+                                    if (values.isNotEmpty &&
+                                        valid &&
+                                        !isBuilding) {
                                      setState(() {
                                        searchQuery =
                                            values['searchSomeSources']!.trim();
@ -250,9 +261,12 @@ class _AddAppPageState extends State<AddAppPage> {
                              width: 16,
                            ),
                            ElevatedButton(
-                                onPressed: searchQuery.isEmpty || gettingAppInfo
+                                onPressed: searchQuery.isEmpty || doingSomething
                                    ? null
                                    : () {
+                                        setState(() {
+                                          searching = true;
+                                        });
                                        Future.wait(sourceProvider.sources
                                                .where((e) => e.canSearch)
                                                .map((e) =>
@ -289,19 +303,21 @@ class _AddAppPageState extends State<AddAppPage> {
                                          if (selectedUrls != null &&
                                              selectedUrls.isNotEmpty) {
                                            changeUserInput(
-                                                selectedUrls[0], true, true);
-                                            addApp(resetUserInputAfter: true);
+                                                selectedUrls[0], true, false,
+                                                isSearch: true);
                                          }
                                        }).catchError((e) {
                                          showError(e, context);
+                                        }).whenComplete(() {
+                                          setState(() {
+                                            searching = false;
+                                          });
                                        });
                                      },
                                child: Text(tr('search')))
                          ],
                        ),
-                      if (pickedSource != null &&
-                          (pickedSource!
-                              .combinedAppSpecificSettingFormItems.isNotEmpty))
+                      if (pickedSource != null)
                        Column(
                          crossAxisAlignment: CrossAxisAlignment.stretch,
                          children: [
@ -318,6 +334,7 @@ class _AddAppPageState extends State<AddAppPage> {
                              height: 16,
                            ),
                            GeneratedForm(
+                                key: Key(pickedSource.runtimeType.toString()),
                                items: pickedSource!
                                    .combinedAppSpecificSettingFormItems,
                                onValueChanges: (values, valid, isBuilding) {
@ -328,6 +345,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
@ -1,10 +1,10 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
+import 'package:obtainium/pages/settings.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
@ -34,7 +34,6 @@ class _AppPageState extends State<AppPage> {
      });
    }

-    var categories = settingsProvider.categories;
    var sourceProvider = SourceProvider();
    AppInMemory? app = appsProvider.apps[widget.appId];
    var source = app != null ? sourceProvider.getSource(app.app.url) : null;
@ -43,6 +42,108 @@ class _AppPageState extends State<AppPage> {
      getUpdate(app.app.id);
    }
    var trackOnly = app?.app.additionalSettings['trackOnly'] == true;
+    var noVersionDetection =
+        app?.app.additionalSettings['noVersionDetection'] == true;
+
+    var infoColumn = Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        GestureDetector(
+            onTap: () {
+              if (app?.app.url != null) {
+                launchUrlString(app?.app.url ?? '',
+                    mode: LaunchMode.externalApplication);
+              }
+            },
+            child: Text(
+              app?.app.url ?? '',
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                  decoration: TextDecoration.underline,
+                  fontStyle: FontStyle.italic,
+                  fontSize: 12),
+            )),
+        const SizedBox(
+          height: 32,
+        ),
+        Text(
+          tr('latestVersionX', args: [app?.app.latestVersion ?? tr('unknown')]),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.bodyLarge,
+        ),
+        Text(
+          '${tr('installedVersionX', args: [
+                app?.app.installedVersion ?? tr('none')
+              ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
+                  tr('app')
+                ])}' : ''}',
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.bodyLarge,
+        ),
+        const SizedBox(
+          height: 32,
+        ),
+        Text(
+          tr('lastUpdateCheckX', args: [
+            app?.app.lastUpdateCheck == null
+                ? tr('never')
+                : '\n${app?.app.lastUpdateCheck?.toLocal()}'
+          ]),
+          textAlign: TextAlign.center,
+          style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
+        ),
+        const SizedBox(
+          height: 48,
+        ),
+        CategoryEditorSelector(
+            alignment: WrapAlignment.center,
+            preselected:
+                app?.app.categories != null ? app!.app.categories.toSet() : {},
+            onSelected: (categories) {
+              if (app != null) {
+                app.app.categories = categories;
+                appsProvider.saveApps([app.app]);
+              }
+            }),
+      ],
+    );
+
+    var fullInfoColumn = Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        const SizedBox(height: 150),
+        app?.installedInfo != null
+            ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+                Image.memory(
+                  app!.installedInfo!.icon!,
+                  height: 150,
+                  gaplessPlayback: true,
+                )
+              ])
+            : Container(),
+        const SizedBox(
+          height: 25,
+        ),
+        Text(
+          app?.installedInfo?.name ?? app?.app.name ?? tr('app'),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.displayLarge,
+        ),
+        Text(
+          tr('byX', args: [app?.app.author ?? tr('unknown')]),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.headlineMedium,
+        ),
+        const SizedBox(
+          height: 32,
+        ),
+        infoColumn,
+        const SizedBox(height: 150)
+      ],
+    );
+
    return Scaffold(
      appBar: settingsProvider.showAppWebpage ? AppBar() : null,
      backgroundColor: Theme.of(context).colorScheme.surface,
@ -71,132 +172,8 @@ class _AppPageState extends State<AppPage> {
                  : Container()
              : CustomScrollView(
                  slivers: [
-                    SliverFillRemaining(
-                        child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.stretch,
-                      children: [
-                        app?.installedInfo != null
-                            ? Row(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                    Image.memory(
-                                      app!.installedInfo!.icon!,
-                                      height: 150,
-                                      gaplessPlayback: true,
-                                    )
-                                  ])
-                            : Container(),
-                        const SizedBox(
-                          height: 25,
-                        ),
-                        Text(
-                          app?.installedInfo?.name ??
-                              app?.app.name ??
-                              tr('app'),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.displayLarge,
-                        ),
-                        Text(
-                          tr('byX', args: [app?.app.author ?? tr('unknown')]),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.headlineMedium,
-                        ),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        GestureDetector(
-                            onTap: () {
-                              if (app?.app.url != null) {
-                                launchUrlString(app?.app.url ?? '',
-                                    mode: LaunchMode.externalApplication);
-                              }
-                            },
-                            child: Text(
-                              app?.app.url ?? '',
-                              textAlign: TextAlign.center,
-                              style: const TextStyle(
-                                  decoration: TextDecoration.underline,
-                                  fontStyle: FontStyle.italic,
-                                  fontSize: 12),
-                            )),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        Text(
-                          tr('latestVersionX',
-                              args: [app?.app.latestVersion ?? tr('unknown')]),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyLarge,
-                        ),
-                        Text(
-                          '${tr('installedVersionX', args: [
-                                app?.app.installedVersion ?? tr('none')
-                              ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
-                                  tr('app')
-                                ])}' : ''}',
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyLarge,
-                        ),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        Text(
-                          tr('lastUpdateCheckX', args: [
-                            app?.app.lastUpdateCheck == null
-                                ? tr('never')
-                                : '\n${app?.app.lastUpdateCheck?.toLocal()}'
-                          ]),
-                          textAlign: TextAlign.center,
-                          style: const TextStyle(
-                              fontStyle: FontStyle.italic, fontSize: 12),
-                        ),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        app?.app.category != null
-                            ? Chip(
-                                label: Text(app!.app.category!),
-                                backgroundColor:
-                                    Color(categories[app.app.category!] ?? 0x0),
-                                onDeleted: () {
-                                  app.app.category = null;
-                                  appsProvider.saveApps([app.app]);
-                                },
-                                visualDensity: VisualDensity.compact,
-                              )
-                            : Row(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                    TextButton(
-                                        onPressed: () {
-                                          showDialog<Map<String, dynamic>?>(
-                                              context: context,
-                                              builder: (BuildContext ctx) {
-                                                return GeneratedFormModal(
-                                                    title: 'Pick a Category',
-                                                    items: [
-                                                      [
-                                                        settingsProvider
-                                                            .getCategoryFormItem()
-                                                      ]
-                                                    ]);
-                                              }).then((value) {
-                                            if (value != null && app != null) {
-                                              String? cat = (value['category']
-                                                          ?.isNotEmpty ??
-                                                      false)
-                                                  ? value['category']
-                                                  : null;
-                                              app.app.category = cat;
-                                              appsProvider.saveApps([app.app]);
-                                            }
-                                          });
-                                        },
-                                        child: Text(tr('categorize')))
-                                  ])
-                      ],
-                    )),
+                    SliverToBoxAdapter(
+                        child: Column(children: [fullInfoColumn])),
                  ],
                ),
          onRefresh: () async {
@ -215,8 +192,9 @@ class _AppPageState extends State<AppPage> {
                  child: Row(
                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                      children: [
-                        if (app?.app.installedVersion != null &&
+                        if (noVersionDetection &&
                            !trackOnly &&
+                            app?.app.installedVersion != null &&
                            app?.app.installedVersion != app?.app.latestVersion)
                          IconButton(
                              onPressed: app?.downloadProgress != null
@ -228,13 +206,6 @@ class _AppPageState extends State<AppPage> {
                                            return AlertDialog(
                                              title: Text(tr(
                                                  'alreadyUpToDateQuestion')),
-                                              content: Text(
-                                                  tr('onlyWorksWithNonEVDApps'),
-                                                  style: const TextStyle(
-                                                      fontWeight:
-                                                          FontWeight.bold,
-                                                      fontStyle:
-                                                          FontStyle.italic)),
                                              actions: [
                                                TextButton(
                                                    onPressed: () {
@ -292,8 +263,9 @@ class _AppPageState extends State<AppPage> {
                                              return row;
                                            }).toList();
                                            return GeneratedFormModal(
-                                                title: tr('additionalOptions'),
-                                                items: items);
+                                              title: tr('additionalOptions'),
+                                              items: items,
+                                            );
                                          }).then((values) {
                                        if (app != null && values != null) {
                                          var changedApp = app.app;
@ -314,10 +286,43 @@ class _AppPageState extends State<AppPage> {
                                      });
                                    },
                              tooltip: tr('additionalOptions'),
-                              icon: const Icon(Icons.settings)),
+                              icon: const Icon(Icons.edit)),
+                        if (app != null && app.installedInfo != null)
+                          IconButton(
+                            onPressed: () {
+                              appsProvider.openAppSettings(app.app.id);
+                            },
+                            icon: const Icon(Icons.settings),
+                            tooltip: tr('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(
+                            child: TextButton(
                                onPressed: (app?.app.installedVersion == null ||
                                            app?.app.installedVersion !=
                                                app?.app.latestVersion) &&
@ -356,44 +361,17 @@ class _AppPageState extends State<AppPage> {
                                        ? tr('update')
                                        : tr('markUpdated')))),
                        const SizedBox(width: 16.0),
-                        ElevatedButton(
+                        Expanded(
+                            child: TextButton(
                          onPressed: app?.downloadProgress != null
                              ? null
                              : () {
-                                  showDialog(
-                                      context: context,
-                                      builder: (BuildContext ctx) {
-                                        return AlertDialog(
-                                          title: Text(tr('removeAppQuestion')),
-                                          content: Text(tr(
-                                              'xWillBeRemovedButRemainInstalled',
-                                              args: [
-                                                app?.installedInfo?.name ??
-                                                    app?.app.name ??
-                                                    tr('app')
-                                              ])),
-                                          actions: [
-                                            TextButton(
-                                                onPressed: () {
-                                                  HapticFeedback
-                                                      .selectionClick();
-                                                  appsProvider.removeApps(
-                                                      [app!.app.id]).then((_) {
-                                                    int count = 0;
-                                                    Navigator.of(context)
-                                                        .popUntil((_) =>
-                                                            count++ >= 2);
-                                                  });
-                                                },
-                                                child: Text(tr('remove'))),
-                                            TextButton(
-                                                onPressed: () {
-                                                  Navigator.of(context).pop();
-                                                },
-                                                child: Text(tr('cancel')))
-                                          ],
-                                        );
-                                      });
+                                  appsProvider.removeAppsWithModal(
+                                      context, [app!.app]).then((value) {
+                                    if (value == true) {
+                                      Navigator.of(context).pop();
+                                    }
+                                  });
                                },
                          style: TextButton.styleFrom(
                              foregroundColor:
@ -401,7 +379,7 @@ class _AppPageState extends State<AppPage> {
                              surfaceTintColor:
                                  Theme.of(context).colorScheme.error),
                          child: Text(tr('remove')),
-                        ),
+                        )),
                      ])),
              if (app?.downloadProgress != null)
                Padding(
@ -413,3 +391,18 @@ class _AppPageState extends State<AppPage> {
    );
  }
 }
+
+class RemoveAppsModal extends StatefulWidget {
+  const RemoveAppsModal({super.key, this.apps = const []});
+  final List<App> apps;
+
+  @override
+  State<RemoveAppsModal> createState() => _RemoveAppsModalState();
+}
+
+class _RemoveAppsModalState extends State<RemoveAppsModal> {
+  @override
+  Widget build(BuildContext context) {
+    return const Placeholder();
+  }
+}
--- a/lib/pages/apps.dart
+++ b/lib/pages/apps.dart
--- a/lib/pages/home.dart
+++ b/lib/pages/home.dart
@ -63,21 +63,29 @@ class _HomePageState extends State<HomePage> {
                .map((e) =>
                    NavigationDestination(icon: Icon(e.icon), label: e.title))
                .toList(),
-            onDestinationSelected: (int index) {
+            onDestinationSelected: (int index) async {
              HapticFeedback.selectionClick();
-              setState(() {
-                if (index == 0) {
+              if (index == 0) {
+                while ((pages[0].widget.key as GlobalKey<AppsPageState>)
+                        .currentState !=
+                    null) {
+                  // Avoid duplicate GlobalKey error
+                  await Future.delayed(const Duration(microseconds: 1));
+                }
+                setState(() {
                  selectedIndexHistory.clear();
-                } else if (selectedIndexHistory.isEmpty ||
-                    (selectedIndexHistory.isNotEmpty &&
-                        selectedIndexHistory.last != index)) {
+                });
+              } else if (selectedIndexHistory.isEmpty ||
+                  (selectedIndexHistory.isNotEmpty &&
+                      selectedIndexHistory.last != index)) {
+                setState(() {
                  int existingInd = selectedIndexHistory.indexOf(index);
                  if (existingInd >= 0) {
                    selectedIndexHistory.removeAt(existingInd);
                  }
                  selectedIndexHistory.add(index);
-                }
-              });
+                });
+              }
            },
            selectedIndex:
                selectedIndexHistory.isEmpty ? 0 : selectedIndexHistory.last,
--- 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)
@ -338,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) {
@ -365,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>?>(
@ -540,18 +564,22 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
          widget.onlyOneSelectionAllowed ? tr('selectURL') : tr('selectURLs')),
      content: Column(children: [
        ...urlWithDescriptionSelections.keys.map((urlWithD) {
+          select(bool? value) {
+            setState(() {
+              value ??= false;
+              if (value! && widget.onlyOneSelectionAllowed) {
+                selectOnlyOne(urlWithD.key);
+              } else {
+                urlWithDescriptionSelections[urlWithD] = value!;
+              }
+            });
+          }
+
          return Row(children: [
            Checkbox(
                value: urlWithDescriptionSelections[urlWithD],
                onChanged: (value) {
-                  setState(() {
-                    value ??= false;
-                    if (value! && widget.onlyOneSelectionAllowed) {
-                      selectOnlyOne(urlWithD.key);
-                    } else {
-                      urlWithDescriptionSelections[urlWithD] = value!;
-                    }
-                  });
+                  select(value);
                }),
            const SizedBox(
              width: 8,
@ -575,12 +603,17 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
                          const TextStyle(decoration: TextDecoration.underline),
                      textAlign: TextAlign.start,
                    )),
-                Text(
-                  urlWithD.value.length > 128
-                      ? '${urlWithD.value.substring(0, 128)}...'
-                      : urlWithD.value,
-                  style: const TextStyle(
-                      fontStyle: FontStyle.italic, fontSize: 12),
+                GestureDetector(
+                  onTap: () {
+                    select(!(urlWithDescriptionSelections[urlWithD] ?? false));
+                  },
+                  child: Text(
+                    urlWithD.value.length > 128
+                        ? '${urlWithD.value.substring(0, 128)}...'
+                        : urlWithD.value,
+                    style: const TextStyle(
+                        fontStyle: FontStyle.italic, fontSize: 12),
+                  ),
                ),
                const SizedBox(
                  height: 8,
--- a/lib/pages/settings.dart
+++ b/lib/pages/settings.dart
@ -4,9 +4,8 @@ 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/providers/apps_provider.dart';
+import 'package:obtainium/main.dart';
 import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
@ -41,7 +40,6 @@ class _SettingsPageState extends State<SettingsPage> {
  Widget build(BuildContext context) {
    SettingsProvider settingsProvider = context.watch<SettingsProvider>();
    SourceProvider sourceProvider = SourceProvider();
-    AppsProvider appsProvider = context.read<AppsProvider>();
    if (settingsProvider.prefs == null) {
      settingsProvider.initializeSettings();
    }
@ -130,6 +128,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,
@ -163,7 +183,7 @@ class _SettingsPageState extends State<SettingsPage> {
              return [e];
            }).toList(),
            onValueChanges: (values, valid, isBuilding) {
-              if (valid) {
+              if (valid && !isBuilding) {
                values.forEach((key, value) {
                  settingsProvider.setSettingString(key, value);
                });
@ -178,8 +198,6 @@ class _SettingsPageState extends State<SettingsPage> {
      height: 16,
    );

-    var categories = settingsProvider.categories;
-
    return Scaffold(
        backgroundColor: Theme.of(context).colorScheme.surface,
        body: CustomScrollView(slivers: <Widget>[
@ -213,6 +231,8 @@ class _SettingsPageState extends State<SettingsPage> {
                              ],
                            ),
                            height16,
+                            localeDropdown,
+                            height16,
                            Row(
                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
                              children: [
@ -264,84 +284,8 @@ class _SettingsPageState extends State<SettingsPage> {
                                  color: Theme.of(context).colorScheme.primary),
                            ),
                            height16,
-                            Wrap(
-                              children: [
-                                ...categories.entries.toList().map((e) {
-                                  return Padding(
-                                      padding: const EdgeInsets.symmetric(
-                                          horizontal: 4),
-                                      child: Chip(
-                                        label: Text(e.key),
-                                        backgroundColor: Color(e.value),
-                                        visualDensity: VisualDensity.compact,
-                                        onDeleted: () {
-                                          showDialog<Map<String, dynamic>?>(
-                                              context: context,
-                                              builder: (BuildContext ctx) {
-                                                return GeneratedFormModal(
-                                                    title: tr(
-                                                        'deleteCategoryQuestion'),
-                                                    message: tr(
-                                                        'categoryDeleteWarning',
-                                                        args: [e.key]),
-                                                    items: []);
-                                              }).then((value) {
-                                            if (value != null) {
-                                              setState(() {
-                                                categories.remove(e.key);
-                                                settingsProvider.categories =
-                                                    categories;
-                                              });
-                                              appsProvider.saveApps(appsProvider
-                                                  .apps.values
-                                                  .where((element) =>
-                                                      element.app.category ==
-                                                      e.key)
-                                                  .map((e) {
-                                                var a = e.app;
-                                                a.category = null;
-                                                return a;
-                                              }).toList());
-                                            }
-                                          });
-                                        },
-                                      ));
-                                }),
-                                Padding(
-                                    padding: const EdgeInsets.symmetric(
-                                        horizontal: 4),
-                                    child: IconButton(
-                                      onPressed: () {
-                                        showDialog<Map<String, dynamic>?>(
-                                            context: context,
-                                            builder: (BuildContext ctx) {
-                                              return GeneratedFormModal(
-                                                  title: tr('addCategory'),
-                                                  items: [
-                                                    [
-                                                      GeneratedFormTextField(
-                                                          'label',
-                                                          label: tr('label'))
-                                                    ]
-                                                  ]);
-                                            }).then((value) {
-                                          String? label = value?['label'];
-                                          if (label != null) {
-                                            setState(() {
-                                              categories[label] =
-                                                  generateRandomLightColor()
-                                                      .value;
-                                              settingsProvider.categories =
-                                                  categories;
-                                            });
-                                          }
-                                        });
-                                      },
-                                      icon: const Icon(Icons.add),
-                                      visualDensity: VisualDensity.compact,
-                                      tooltip: tr('add'),
-                                    ))
-                              ],
+                            const CategoryEditorSelector(
+                              showLabelWhenNotEmpty: false,
                            )
                          ],
                        ))),
@ -457,3 +401,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
@ -5,6 +5,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';

+import 'package:android_intent_plus/flag.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@ -12,16 +13,20 @@ import 'package:flutter/services.dart';
 import 'package:install_plugin_v2/install_plugin_v2.dart';
 import 'package:installed_apps/app_info.dart';
 import 'package:installed_apps/installed_apps.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/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';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:http/http.dart';
+import 'package:android_intent_plus/android_intent.dart';

 class AppInMemory {
  late App app;
@ -246,9 +251,10 @@ class AppsProvider with ChangeNotifier {
        !(await canDowngradeApps())) {
      throw DowngradeError();
    }
-    if (appInfo == null ||
-        int.parse(newInfo.buildNumber) > appInfo.versionCode!) {
-      await InstallPlugin.installApk(file.file.path, 'dev.imranr.obtainium');
+    await InstallPlugin.installApk(file.file.path, obtainiumId);
+    if (file.appId == obtainiumId) {
+      // Obtainium prompt should be lowest
+      await Future.delayed(const Duration(milliseconds: 500));
    }
    apps[file.appId]!.app.installedVersion =
        apps[file.appId]!.app.latestVersion;
@ -257,6 +263,15 @@ class AppsProvider with ChangeNotifier {
        attemptToCorrectInstallStatus: false);
  }

+  void uninstallApp(String appId) async {
+    var intent = AndroidIntent(
+        action: 'android.intent.action.DELETE',
+        data: 'package:$appId',
+        flags: <int>[Flag.FLAG_ACTIVITY_NEW_TASK],
+        package: 'vnd.android.package-archive');
+    await intent.launch();
+  }
+
  Future<String?> confirmApkUrl(App app, BuildContext? context) async {
    // If the App has more than one APK, the user should pick one (if context provided)
    String? apkUrl = app.apkUrls[app.preferredApkIndex];
@ -264,6 +279,7 @@ class AppsProvider with ChangeNotifier {
    List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;

    if (app.apkUrls.length > 1 && context != null) {
+      // ignore: use_build_context_synchronously
      apkUrl = await showDialog(
          context: context,
          builder: (BuildContext ctx) {
@ -283,6 +299,7 @@ class AppsProvider with ChangeNotifier {
    if (apkUrl != null &&
        getHost(apkUrl) != getHost(app.url) &&
        context != null) {
+      // ignore: use_build_context_synchronously
      if (await showDialog(
              context: context,
              builder: (BuildContext ctx) {
@ -440,9 +457,6 @@ class AppsProvider with ChangeNotifier {
    } catch (e) {
      //
    }
-    if (!res) {
-      logs.add(tr('versionCorrectionDisabled'));
-    }
    return res;
  }

@ -621,6 +635,57 @@ class AppsProvider with ChangeNotifier {
    }
  }

+  Future<bool> removeAppsWithModal(BuildContext context, List<App> apps) async {
+    var showUninstallOption =
+        apps.where((a) => a.installedVersion != null).isNotEmpty;
+    var values = await showDialog(
+        context: context,
+        builder: (BuildContext ctx) {
+          return GeneratedFormModal(
+            title: plural('removeAppQuestion', apps.length),
+            items: !showUninstallOption
+                ? []
+                : [
+                    [
+                      GeneratedFormSwitch('rmAppEntry',
+                          label: tr('removeFromObtainium'), defaultValue: true)
+                    ],
+                    [
+                      GeneratedFormSwitch('uninstallApp',
+                          label: tr('uninstallFromDevice'))
+                    ]
+                  ],
+            initValid: true,
+          );
+        });
+    if (values != null) {
+      bool uninstall = values['uninstallApp'] == true && showUninstallOption;
+      bool remove = values['rmAppEntry'] == true || !showUninstallOption;
+      if (uninstall) {
+        for (var i = 0; i < apps.length; i++) {
+          if (apps[i].installedVersion != null) {
+            uninstallApp(apps[i].id);
+            apps[i].installedVersion = null;
+          }
+        }
+        await saveApps(apps, attemptToCorrectInstallStatus: false);
+      }
+      if (remove) {
+        await removeApps(apps.map((e) => e.id).toList());
+      }
+      return uninstall || remove;
+    }
+    return false;
+  }
+
+  Future<void> openAppSettings(String appId) async {
+    final AndroidIntent intent = AndroidIntent(
+      action: 'action_application_details_settings',
+      data: 'package:$appId',
+    );
+    await intent.launch();
+  }
+
  Future<App?> checkUpdate(String appId) async {
    App? currentApp = apps[appId]!.app;
    SourceProvider sourceProvider = SourceProvider();
@ -706,6 +771,14 @@ class AppsProvider with ChangeNotifier {
      exportDir = await getExternalStorageDirectory();
      path = exportDir!.path;
    }
+    if ((await DeviceInfoPlugin().androidInfo).version.sdkInt <= 29) {
+      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
@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/main.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';

@ -153,14 +154,29 @@ class SettingsProvider with ChangeNotifier {

  set categories(Map<String, int> cats) {
    prefs?.setString('categories', jsonEncode(cats));
+    notifyListeners();
  }

-  getCategoryFormItem({String initCategory = ''}) => GeneratedFormDropdown(
-      'category',
-      label: tr('category'),
-      [
-        MapEntry('', tr('noCategory')),
-        ...categories.entries.map((e) => MapEntry(e.key, e.key)).toList()
-      ],
-      defaultValue: initCategory);
+  String? get forcedLocale {
+    var fl = prefs?.getString('forcedLocale');
+    return supportedLocales
+            .where((element) => element.toLanguageTag() == fl)
+            .isNotEmpty
+        ? fl
+        : null;
+  }
+
+  set forcedLocale(String? fl) {
+    if (fl == null) {
+      prefs?.remove('forcedLocale');
+    } else if (supportedLocales
+        .where((element) => element.toLanguageTag() == fl)
+        .isNotEmpty) {
+      prefs?.setString('forcedLocale', fl);
+    }
+    notifyListeners();
+  }
+
+  bool setEqual(Set<String> a, Set<String> b) =>
+      a.length == b.length && a.union(b).length == a.length;
 }
--- a/lib/providers/source_provider.dart
+++ b/lib/providers/source_provider.dart
@ -7,11 +7,13 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:html/dom.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/app_sources/apkmirror.dart';
+import 'package:obtainium/app_sources/codeberg.dart';
 import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/app_sources/fdroidrepo.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/app_sources/gitlab.dart';
 import 'package:obtainium/app_sources/izzyondroid.dart';
+import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/app_sources/mullvad.dart';
 import 'package:obtainium/app_sources/signal.dart';
 import 'package:obtainium/app_sources/sourceforge.dart';
@ -19,7 +21,6 @@ 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;
@ -48,7 +49,7 @@ class App {
  late Map<String, dynamic> additionalSettings;
  late DateTime? lastUpdateCheck;
  bool pinned = false;
-  String? category;
+  List<String> categories;
  App(
      this.id,
      this.url,
@ -61,7 +62,7 @@ class App {
      this.additionalSettings,
      this.lastUpdateCheck,
      this.pinned,
-      {this.category});
+      {this.categories = const []});

  @override
  String toString() {
@ -103,6 +104,12 @@ class App {
            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,
        json['url'] as String,
@ -115,15 +122,19 @@ class App {
        json['apkUrls'] == null
            ? []
            : List<String>.from(jsonDecode(json['apkUrls'])),
-        json['preferredApkIndex'] == null
-            ? 0
-            : json['preferredApkIndex'] as int,
+        preferredApkIndex,
        additionalSettings,
        json['lastUpdateCheck'] == null
            ? null
            : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
        json['pinned'] ?? false,
-        category: json['category']);
+        categories: json['categories'] != null
+            ? (json['categories'] as List<dynamic>)
+                .map((e) => e.toString())
+                .toList()
+            : json['category'] != null
+                ? [json['category'] as String]
+                : []);
  }

  Map<String, dynamic> toJson() => {
@ -138,12 +149,16 @@ class App {
        'additionalSettings': jsonEncode(additionalSettings),
        'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
        'pinned': pinned,
-        'category': category
+        'categories': categories
      };
 }

 // Ensure the input is starts with HTTPS and has no WWW
 preStandardizeUrl(String url) {
+  var firstDotIndex = url.indexOf('.');
+  if (!(firstDotIndex >= 0 && firstDotIndex != url.length - 1)) {
+    throw UnsupportedURLError();
+  }
  if (url.toLowerCase().indexOf('http://') != 0 &&
      url.toLowerCase().indexOf('https://') != 0) {
    url = 'https://$url';
@ -210,7 +225,19 @@ class AppSource {
        label: tr('trackOnly'),
      )
    ],
-    [GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))]
+    [
+      GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))
+    ],
+    [
+      GeneratedFormTextField('apkFilterRegEx',
+          label: tr('filterAPKsByRegEx'),
+          required: false,
+          additionalValidators: [
+            (value) {
+              return regExValidator(value);
+            }
+          ])
+    ]
  ];

  // Previous 2 variables combined into one at runtime for convenient usage
@ -254,11 +281,24 @@ abstract class MassAppUrlSource {
  Future<Map<String, String>> getUrlsWithDescriptions(List<String> args);
 }

+regExValidator(String? value) {
+  if (value == null || value.isEmpty) {
+    return null;
+  }
+  try {
+    RegExp(value);
+  } catch (e) {
+    return tr('invalidRegEx');
+  }
+  return null;
+}
+
 class SourceProvider {
  // Add more source classes here so they are available via the service
  List<AppSource> sources = [
    GitHub(),
    GitLab(),
+    Codeberg(),
    FDroid(),
    IzzyOnDroid(),
    Mullvad(),
@ -266,7 +306,8 @@ class SourceProvider {
    SourceForge(),
    APKMirror(),
    FDroidRepo(),
-    SteamMobile()
+    SteamMobile(),
+    HTML() // This should ALWAYS be the last option as they are tried in order
  ];

  // Add more mass url source classes here so they are available via the service
@ -327,20 +368,28 @@ class SourceProvider {
  }

  Future<App> getApp(
-      AppSource source, String url, Map<String, dynamic> additionalSettings,
-      {App? currentApp,
-      bool trackOnlyOverride = false,
-      noVersionDetectionOverride = false}) async {
-    if (trackOnlyOverride) {
+    AppSource source,
+    String url,
+    Map<String, dynamic> additionalSettings, {
+    App? currentApp,
+    bool trackOnlyOverride = false,
+    noVersionDetectionOverride = false,
+  }) async {
+    if (trackOnlyOverride || source.enforceTrackOnly) {
      additionalSettings['trackOnly'] = true;
    }
    if (noVersionDetectionOverride) {
      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);
+    if (additionalSettings['apkFilterRegEx'] != null) {
+      var reg = RegExp(additionalSettings['apkFilterRegEx']);
+      apk.apkUrls =
+          apk.apkUrls.where((element) => reg.hasMatch(element)).toList();
+    }
    if (apk.apkUrls.isEmpty && !trackOnly) {
      throw NoAPKError();
    }
@ -360,11 +409,11 @@ class SourceProvider {
        currentApp?.installedVersion,
        apkVersion,
        apk.apkUrls,
-        apk.apkUrls.length - 1,
+        apk.apkUrls.length - 1 >= 0 ? apk.apkUrls.length - 1 : 0,
        additionalSettings,
        DateTime.now(),
        currentApp?.pinned ?? false,
-        category: currentApp?.category);
+        categories: currentApp?.categories ?? const []);
  }

  // Returns errors in [results, errors] instead of throwing them
--- a/pubspec.lock
+++ b/pubspec.lock
--- 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.9.2+90 # When changing this, update the tag in main() accordingly
+version: 0.10.7+113 # When changing this, update the tag in main() accordingly

 environment:
  sdk: '>=2.18.2 <3.0.0'
@ -58,6 +58,7 @@ dependencies:
  android_alarm_manager_plus: ^2.1.0
  sqflite: ^2.2.0+3
  easy_localization: ^3.0.1
+  android_intent_plus: ^3.1.5


 dev_dependencies:
Author	SHA1	Message	Date
Imran Remtulla	bbaa42fb01	Merge pull request #256 from ImranR98/dev Bugfixes (#254, #252), App Uninstall and Settings Feature (#257)	2023-02-04 19:46:24 -05:00
Imran Remtulla	4fe311bc03	Update packages, increment version	2023-02-04 19:44:18 -05:00
Imran Remtulla	ea68b97ff7	Mark updated feature more clear	2023-02-04 19:30:41 -05:00
Imran Remtulla	6e0f6b528e	Added App settings button	2023-02-04 19:11:28 -05:00
Imran Remtulla	a2c227931e	Added uninstall option	2023-02-04 18:58:14 -05:00
Imran Remtulla	15ad3bb439	Removed unnecessary repetitive log	2023-02-04 17:21:39 -05:00
Imran Remtulla	b03d7fba1a	Fix permission error on Android 10 #252	2023-02-04 17:07:59 -05:00
Imran Remtulla	31c491d7c5	Fix prev. commit.	2023-02-04 16:50:33 -05:00
Imran Remtulla	71c80f11f5	'Fix' for GlobalKey error #254	2023-02-04 12:30:34 -05:00
Imran Remtulla	eef4d33431	Merge pull request #246 from ImranR98/dev Bugfixes for #242 and #245 + Various UI Improvements	2023-01-29 17:35:18 -05:00
Imran Remtulla	d56342e907	Merge pull request #243 from bluefly000/japanese-translation Update Japanese translation	2023-01-29 17:32:09 -05:00
Imran Remtulla	c72c0fdb57	Increment version	2023-01-29 17:31:19 -05:00
Imran Remtulla	ffe29009ed	URL select modal now works when tapping text	2023-01-29 17:29:41 -05:00
Imran Remtulla	60e3b68ebd	Search allows option changes (no direct add)	2023-01-29 17:23:35 -05:00
Imran Remtulla	ee4d0f259f	Generated form bugfix (initState not running) - #245	2023-01-29 17:07:11 -05:00
bluefly000	0ecfbef0a0	Update Japanese translation	2023-01-29 17:28:54 +09:00
Imran Remtulla	1b60e75ca7	Added delay after Obtainium install prompt	2023-01-28 20:59:17 -05:00
Imran Remtulla	abcfa389e8	Merge pull request #241 from ImranR98/dev Updated screenshots	2023-01-28 00:47:26 -05:00
Imran Remtulla	a64bd67ef1	Updated screenshots	2023-01-28 00:46:54 -05:00
Imran Remtulla	4252c2711b	Merge pull request #240 from ImranR98/dev APK RegEx Filter, Increased GitHub/Codeberg Release Range, UI Tweaks Addresses #237, #238.	2023-01-28 00:17:10 -05:00
Imran Remtulla	52913b0450	Slight UI tweak	2023-01-28 00:15:52 -05:00
Imran Remtulla	427b0ed8d2	Changed a string	2023-01-28 00:13:03 -05:00
Imran Remtulla	a85d6d4f08	Increment version, remove comment	2023-01-28 00:11:40 -05:00
Imran Remtulla	05f712603c	GitHub & Codeberg - get first 100 releases (not 30)	2023-01-28 00:08:17 -05:00
Imran Remtulla	fa2a80e34c	APK RegEx Filter + Updated Packages	2023-01-28 00:04:57 -05:00
Imran Remtulla	f43e5a2ff1	Merge pull request #235 from ImranR98/dev Increment version, update packages	2023-01-22 19:55:35 -05:00
Imran Remtulla	b72aa8273e	Increment version, update packages	2023-01-22 19:55:14 -05:00
Imran Remtulla	520f186e4a	Merge pull request #234 from p1gp1g/themed-icon Add themed icon for Android 13	2023-01-22 19:53:43 -05:00
sim	e1e97672cf	Add themed icon for Android 13	2023-01-23 01:09:14 +01:00
Imran Remtulla	1494bcd013	Merge pull request #232 from ImranR98/dev GitHub (and Codeberg) bugfix (#231)	2023-01-20 12:49:35 -05:00
Imran Remtulla	3457a0a12f	GitHub (and Codeberg) bugfix (#231 )	2023-01-20 12:48:55 -05:00
Imran Remtulla	b165400a6e	Merge pull request #229 from ImranR98/dev Increment version	2023-01-15 11:45:05 -05:00
Imran Remtulla	c47bf937f1	Increment version	2023-01-15 11:44:45 -05:00
Imran Remtulla	2e19a8c04c	Merge pull request #228 from gidano/main Update hu.json	2023-01-15 11:42:28 -05:00
gidano	05d4da86ec	Update hu.json	2023-01-15 17:39:57 +01:00
Imran Remtulla	e9d1b04d54	Merge pull request #227 from ImranR98/dev Increment version, upgrade packages	2023-01-15 11:20:45 -05:00
Imran Remtulla	cff5334c25	Increment version, upgrade packages	2023-01-15 11:20:30 -05:00
Imran Remtulla	a55346fc22	Merge pull request #226 from bluefly000/japanese-translation Update Japanese translation	2023-01-15 11:19:01 -05:00
bluefly000	885df678e5	Update Japanese translation	2023-01-13 13:34:57 +09:00
Imran Remtulla	bf7b0c5702	Merge pull request #225 from ImranR98/dev 2 New Sources: Codeberg and HTML Fallback	2023-01-12 22:33:50 -05:00
Imran Remtulla	2972da4609	Upgraded packages	2023-01-12 22:28:47 -05:00
Imran Remtulla	b8567af98e	Increment version	2023-01-12 22:24:52 -05:00
Imran Remtulla	ea62c68b40	Added the HTML fallback Source	2023-01-12 22:23:53 -05:00
Imran Remtulla	08a5af0449	Added Codeberg as a Source + search UI bugfix	2023-01-12 20:57:53 -05:00
Imran Remtulla	36f327c16e	Merge pull request #220 from ImranR98/dev - Obtainium would skip installing APKs that had the same [`versionCode`](https://developer.android.com/studio/publish/versioning#versioningsettings) since this number should be different for each new build of an App. - However, there are enough Apps that don't do this (#149, #219) so Obtainium now installs updates even if the `versionCode` has not changed. - The GitHub release title filter has also been improved so that it filters by `tag_name` instead of `title` for releases with empty titles (as it seems like GitHub automatically displays the tag as the title in such cases).	2023-01-07 16:58:58 -05:00
Imran Remtulla	768213cb34	Increment version	2023-01-07 16:50:01 -05:00
Imran Remtulla	e888fb7120	Don't skip installing same-versionCode updates	2023-01-07 16:49:38 -05:00
Imran Remtulla	1fb68dd674	GitHub release filter bugfix	2023-01-07 16:18:26 -05:00
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