Merge pull request #504 from ImranR98/dev

Less restrictive install permission requests (#495)
Add toggles to disable warnings (#495 
Fix a breaking bug on Add App page from the previous PR

README.md

@@ -17,7 +17,6 @@ Currently supported App sources:
 - [SourceForge](https://sourceforge.net/)
 - [APKMirror](https://apkmirror.com/) (Track-Only)
 - 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)
 - [Telegram App](https://telegram.org)
 - [VLC](https://www.videolan.org/vlc/download-android.html)

assets/translations/de.json

@@ -122,6 +122,7 @@
     "followSystem": "System folgen",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "App sortieren nach",
     "authorName": "Autor/Name",
     "nameAuthor": "Name/Autor",
@@ -178,7 +179,7 @@
     "lastUpdateCheckX": "Letzte Aktualisierungsprüfung: {}",
     "remove": "Entfernen",
     "yesMarkUpdated": "Ja, als aktualisiert markieren",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
     "appIdOrName": "App ID oder Name",
     "appWithIdOrNameNotFound": "Es wurde keine App mit dieser ID oder diesem Namen gefunden",
     "reposHaveMultipleApps": "Repos können mehrere Apps enthalten",
@@ -207,6 +208,7 @@
     "addCategory": "Kategorie hinzufügen",
     "label": "Bezeichnung",
     "language": "Sprache",
+    "copiedToClipboard": "Copied to Clipboard",
     "storagePermissionDenied": "Speicherberechtigung verweigert",
     "selectedCategorizeWarning": "Dadurch werden alle bestehenden Kategorieeinstellungen für die ausgewählten Apps ersetzt.",
     "filterAPKsByRegEx": "APKs nach regulärem Ausdruck filtern",
@@ -220,9 +222,15 @@
     "importFromURLsInFile": "Importieren von URLs aus Datei ( z.B. OPML)",
     "versionDetection": "Versionserkennung",
     "standardVersionDetection": "Standardversionserkennung",
+    "groupByCategory": "Nach Kategorie gruppieren",
+    "autoApkFilterByArch": "Nach Möglichkeit versuchen, APKs nach CPU-Architektur zu filtern",
+    "overrideSource": "Override Source",
+    "dontShowAgain": "Don't show this again",
+    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
+    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
     "removeAppQuestion": {
         "one": "App entfernen?",
-        "other": "App entfernen?"
+        "other": "Apps entfernen?"
     },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut",

assets/translations/en.json

@@ -122,6 +122,7 @@
     "followSystem": "Follow System",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "App Sort By",
     "authorName": "Author/Name",
     "nameAuthor": "Name/Author",
@@ -178,7 +179,7 @@
     "lastUpdateCheckX": "Last Update Check: {}",
     "remove": "Remove",
     "yesMarkUpdated": "Yes, Mark as Updated",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
     "appIdOrName": "App ID or Name",
     "appWithIdOrNameNotFound": "No App was found with that ID or Name",
     "reposHaveMultipleApps": "Repos may contain multiple Apps",
@@ -207,6 +208,7 @@
     "addCategory": "Add Category",
     "label": "Label",
     "language": "Language",
+    "copiedToClipboard": "Copied to Clipboard",
     "storagePermissionDenied": "Storage permission denied",
     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
     "filterAPKsByRegEx": "Filter APKs by Regular Expression",
@@ -220,6 +222,12 @@
     "importFromURLsInFile": "Import from URLs in File (like OPML)",
     "versionDetection": "Version Detection",
     "standardVersionDetection": "Standard version detection",
+    "groupByCategory": "Group by Category",
+    "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
+    "overrideSource": "Override Source",
+    "dontShowAgain": "Don't show this again",
+    "dontShowTrackOnlyWarnings": "Don't Show 'Track-Only' Warnings",
+    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/fa.json

@@ -122,6 +122,7 @@
     "followSystem": "هماهنگ با سیستم",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "مرتب سازی برنامه بر اساس",
     "authorName": "سازنده/اسم",
     "nameAuthor": "اسم/سازنده",
@@ -178,7 +179,7 @@
     "lastUpdateCheckX": "بررسی آخرین به‌روزرسانی: {}",
     "remove": "حذف",
     "yesMarkUpdated": "بله، علامت گذاری به عنوان به روز شده",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
     "appIdOrName": "شناسه یا نام برنامه",
     "appWithIdOrNameNotFound": "هیچ برنامه ای با آن شناسه یا نام یافت نشد",
     "reposHaveMultipleApps": "مخازن ممکن است شامل چندین برنامه باشد",
@@ -207,6 +208,7 @@
     "addCategory": "اضافه کردن دسته",
     "label": "برچسب",
     "language": "زبان",
+    "copiedToClipboard": "در کلیپ بورد کپی شد",
     "storagePermissionDenied": "مجوز ذخیره سازی رد شد",
     "selectedCategorizeWarning": "این جایگزین تنظیمات دسته بندی موجود برای برنامه های انتخابی می شود.",
     "filterAPKsByRegEx": "فایل‌های APK را با نظم فیلتر کنید",
@@ -220,6 +222,12 @@
     "importFromURLsInFile": "وارد کردن از آدرس های اینترنتی موجود در فایل (مانند OPML)",
     "versionDetection": "تشخیص نسخه",
     "standardVersionDetection": "تشخیص نسخه استاندارد",
+    "groupByCategory": "گروه بر اساس دسته",
+    "autoApkFilterByArch": "در صورت امکان سعی کنید APKها را بر اساس معماری CPU فیلتر کنید",
+    "overrideSource": "Override Source",
+    "dontShowAgain": "Don't show this again",
+    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
+    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -122,6 +122,7 @@
     "followSystem": "Suivre le système",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "Applications triées par",
     "authorName": "Auteur/Nom",
     "nameAuthor": "Nom/Auteur",
@@ -178,7 +179,7 @@
     "lastUpdateCheckX": "Vérification de la dernière mise à jour : {}",
     "remove": "Retirer",
     "yesMarkUpdated": "Oui, marquer comme mis à jour",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
     "appIdOrName": "ID ou nom de l'application",
     "appWithIdOrNameNotFound": "Aucune application n'a été trouvée avec cet identifiant ou ce nom",
     "reposHaveMultipleApps": "Les dépôts peuvent contenir plusieurs applications",
@@ -207,6 +208,7 @@
     "addCategory": "Ajouter une catégorie",
     "label": "Étiquette",
     "language": "Langue",
+    "copiedToClipboard": "Copied to Clipboard",
     "storagePermissionDenied": "Autorisation de stockage refusée",
     "selectedCategorizeWarning": "Cela remplacera tous les paramètres de catégorie existants pour les applications sélectionnées.",
     "filterAPKsByRegEx": "Filtrer les APK par expression régulière",
@@ -220,6 +222,12 @@
     "importFromURLsInFile": "Importer à partir d'URL dans un fichier (comme OPML)",
     "versionDetection": "Détection des versions",
     "standardVersionDetection": "Détection de version standard",
+    "groupByCategory": "Group by Category",
+    "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
+    "overrideSource": "Override Source",
+    "dontShowAgain": "Don't show this again",
+    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
+    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

assets/translations/hu.json

@@ -122,6 +122,7 @@
     "followSystem": "Rendszer szerint",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Használjon tiszta fekete sötét témát",
     "appSortBy": "App rendezés...",
     "authorName": "Szerző/Név",
     "nameAuthor": "Név/Szerző",
@@ -178,7 +179,7 @@
     "lastUpdateCheckX": "Frissítés ellenőrizve: {}",
     "remove": "Eltávolítás",
     "yesMarkUpdated": "Igen, megjelölés frissítettként",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
     "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",
@@ -206,6 +207,7 @@
     "addCategory": "Új kategória",
     "label": "Címke",
     "language": "Nyelv",
+    "copiedToClipboard": "Másolva a vágólapra",
     "storagePermissionDenied": "Tárhely engedély megtagadva",
     "selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
     "filterAPKsByRegEx": "Az APK-k szűrése reguláris kifejezéssel",
@@ -219,6 +221,12 @@
     "importFromURLsInFile": "Importálás fájlban található URL-ből (mint pl. OPML)",
     "versionDetection": "Verzió érzékelés",
     "standardVersionDetection": "Alapért. verzió érzékelés",
+    "groupByCategory": "Csoportosítás Kategória alapján",
+    "autoApkFilterByArch": "Ha lehetséges, próbálja CPU architektúra szerint szűrni az APK-kat",
+    "overrideSource": "Override Source",
+    "dontShowAgain": "Don't show this again",
+    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
+    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -122,6 +122,7 @@
     "followSystem": "Segui sistema",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "App ordinate per",
     "authorName": "Autore/Nome",
     "nameAuthor": "Nome/Autore",
@@ -178,7 +179,7 @@
     "lastUpdateCheckX": "Ultimo controllo degli aggiornamenti: {}",
     "remove": "Rimuovi",
     "yesMarkUpdated": "Sì, contrassegna come aggiornato",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
     "appIdOrName": "ID o nome dell'App",
     "appWithIdOrNameNotFound": "Non è stata trovata alcuna App con quell'ID o nome",
     "reposHaveMultipleApps": "I repository possono contenere più App",
@@ -207,6 +208,7 @@
     "addCategory": "Aggiungi categoria",
     "label": "Etichetta",
     "language": "Lingua",
+    "copiedToClipboard": "Copiato negli appunti",
     "storagePermissionDenied": "Accesso ai file non autorizzato",
     "selectedCategorizeWarning": "Ciò sostituirà le impostazioni di categoria esistenti per le App selezionate.",
     "filterAPKsByRegEx": "Filtra file APK con espressioni regolari",
@@ -220,6 +222,12 @@
     "importFromURLsInFile": "Importa da URL in file (come OPML)",
     "versionDetection": "Rilevamento di versione",
     "standardVersionDetection": "Rilevamento di versione standard",
+    "groupByCategory": "Raggruppa per categoria",
+    "autoApkFilterByArch": "Tenta di filtrare gli APK in base all'architettura della CPU, se possibile",
+    "overrideSource": "Override Source",
+    "dontShowAgain": "Don't show this again",
+    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
+    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
     "removeAppQuestion": {
         "one": "Rimuovere l'App?",
         "other": "Rimuovere le App?"

assets/translations/ja.json

@@ -122,6 +122,7 @@
     "followSystem": "システムに従う",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
     "appSortBy": "アプリの並び方",
     "authorName": "作者名/アプリ名",
     "nameAuthor": "アプリ名/作者名",
@@ -178,7 +179,7 @@
     "lastUpdateCheckX": "最終アップデート確認: {}",
     "remove": "削除",
     "yesMarkUpdated": "はい、アップデート済みとしてマークします",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
     "appIdOrName": "アプリのIDまたは名前",
     "appWithIdOrNameNotFound": "そのIDや名前を持つアプリは見つかりませんでした",
     "reposHaveMultipleApps": "リポジトリには複数のアプリが含まれることがあります",
@@ -207,6 +208,7 @@
     "addCategory": "カテゴリを追加",
     "label": "ラベル",
     "language": "言語",
+    "copiedToClipboard": "クリップボードにコピーしました",
     "storagePermissionDenied": "ストレージ権限が拒否されました",
     "selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
     "filterAPKsByRegEx": "正規表現でAPKを絞り込む",
@@ -220,6 +222,12 @@
     "importFromURLsInFile": "ファイル（OPMLなど）内のURLからインポート",
     "versionDetection": "バージョン検出",
     "standardVersionDetection": "標準のバージョン検出",
+    "groupByCategory": "カテゴリ別にグループ化する",
+    "autoApkFilterByArch": "可能であれば，CPUアーキテクチャによるAPKのフィルタリングを試みる",
+    "overrideSource": "Override Source",
+    "dontShowAgain": "Don't show this again",
+    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
+    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/zh.json

@@ -1,106 +1,105 @@
 {
-    "invalidURLForSource": "不是一个有效的 {} URL",
+    "invalidURLForSource": "无效的 {} URL",
-    "noReleaseFound": "找不到合适的更新",
+    "noReleaseFound": "找不到合适的发行版",
-    "noVersionFound": "无法确定更新版本",
+    "noVersionFound": "无法确定发行版本号",
-    "urlMatchesNoSource": "URL 与已知来源不符",
+    "urlMatchesNoSource": "URL 与已知的来源不符",
-    "cantInstallOlderVersion": "无法安装旧版应用程序",
+    "cantInstallOlderVersion": "无法安装旧版本的应用",
-    "appIdMismatch": "下载的软件包名与现有的应用程序包名不一致",
+    "appIdMismatch": "所下载 APK 的应用 ID 与现有应用不一致",
-    "functionNotImplemented": "该类没有实现此功能",
+    "functionNotImplemented": "该类未实现此功能",
     "placeholder": "占位符",
     "someErrors": "出现了一些错误",
     "unexpectedError": "意外错误",
     "ok": "好的",
     "and": "和",
-    "startedBgUpdateTask": "开始后台检查更新任务",
+    "startedBgUpdateTask": "后台更新检查任务已启动",
-    "bgUpdateIgnoreAfterIs": "下次后台更新检查  {}",
+    "bgUpdateIgnoreAfterIs": "后台更新检查间隔为 {}",
-    "startedActualBGUpdateCheck": "后台检查更新已开始",
+    "startedActualBGUpdateCheck": "开始后台更新检查",
-    "bgUpdateTaskFinished": "后台检查更新已完成",
+    "bgUpdateTaskFinished": "后台更新检查任务已完成",
-    "firstRun": "这是你第一次运行 Obtainium",
+    "firstRun": "这是 Obtainium 首次启动",
-    "settingUpdateCheckIntervalTo": "设置检查更新间隔为 {}",
+    "settingUpdateCheckIntervalTo": "更新检查间隔设置为 {}",
-    "githubPATLabel": "GitHub 个人访问令牌 (提高 API 限制)",
+    "githubPATLabel": "GitHub 个人访问令牌（提升 API 请求限额）",
-    "githubPATHint": "个人访问令牌必须为: username:token 形式",
+    "githubPATHint": "个人访问令牌必须为“username:token”的格式",
     "githubPATFormat": "username:token",
     "githubPATLinkText": "关于 GitHub 个人访问令牌",
-    "includePrereleases": "包含预发布版",
+    "includePrereleases": "包含预发行版",
-    "fallbackToOlderReleases": "回退到旧版",
+    "fallbackToOlderReleases": "将旧发行版作为备选",
-    "filterReleaseTitlesByRegEx": "使用正则以过滤发布标题",
+    "filterReleaseTitlesByRegEx": "使用正则表达式筛选发行标题",
-    "invalidRegEx": "表达式无效",
+    "invalidRegEx": "无效的正则表达式",
     "noDescription": "无描述",
     "cancel": "取消",
     "continue": "继续",
-    "requiredInBrackets": "(必须)",
+    "requiredInBrackets": "（必填）",
-    "dropdownNoOptsError": "错误：下拉菜单必须至少有一个选项",
+    "dropdownNoOptsError": "错误：下拉菜单必须包含至少一个选项",
-    "colour": "颜色",
+    "colour": "配色",
     "githubStarredRepos": "GitHub 已星标仓库",
     "uname": "用户名",
-    "wrongArgNum": "提供了错误的参数数量",
+    "wrongArgNum": "参数数量错误",
-    "xIsTrackOnly": "{} 仅追踪",
+    "xIsTrackOnly": "{} 为“仅追踪”模式",
-    "source": "源码",
+    "source": "源代码",
-    "app": "应用程序",
+    "app": "应用",
-    "appsFromSourceAreTrackOnly": "来自此来源的应用为仅追踪",
+    "appsFromSourceAreTrackOnly": "此来源的应用为“仅追踪”模式。",
-    "youPickedTrackOnly": "你已选择仅追踪选项",
+    "youPickedTrackOnly": "您选择了“仅追踪”。",
-    "trackOnlyAppDescription": "该应用程序将被跟踪更新，但 Obtainium 无法下载或安装它",
+    "trackOnlyAppDescription": "该应用的更新会被追踪，但 Obtainium 无法下载或安装它。",
     "cancelled": "已取消",
-    "appAlreadyAdded": "此应用程序已被添加",
+    "appAlreadyAdded": "此应用已经添加",
-    "alreadyUpToDateQuestion": "应用已是最新？",
+    "alreadyUpToDateQuestion": "应用是否已经为最新版本？",
     "addApp": "添加应用",
-    "appSourceURL": "应用来源 URL",
+    "appSourceURL": "来源 URL",
     "error": "错误",
     "add": "添加",
-    "searchSomeSourcesLabel": "搜索 (仅部分来源)",
+    "searchSomeSourcesLabel": "搜索（仅部分来源）",
     "search": "搜索",
     "additionalOptsFor": "{} 的更多选项",
-    "supportedSourcesBelow": "受支持的来源:",
+    "supportedSourcesBelow": "支持的来源：",
-    "trackOnlyInBrackets": "(仅追踪)",
+    "trackOnlyInBrackets": "（仅追踪）",
-    "searchableInBrackets": "(可被搜索)",
+    "searchableInBrackets": "（可搜索）",
-    "appsString": "应用程序",
+    "appsString": "应用列表",
-    "noApps": "无应用程序",
+    "noApps": "无应用",
-    "noAppsForFilter": "没有应用可被过滤",
+    "noAppsForFilter": "没有符合条件的应用",
-    "byX": "来自 {}",
+    "byX": "作者：{}",
-    "percentProgress": "进度: {}%",
+    "percentProgress": "进度：{}%",
-    "pleaseWait": "请等待...",
+    "pleaseWait": "请稍候",
     "updateAvailable": "更新可用",
-    "estimateInBracketsShort": "(预计.)",
+    "estimateInBracketsShort": "（预计）",
     "notInstalled": "未安装",
-    "estimateInBrackets": "(预计)",
+    "estimateInBrackets": "（预计）",
     "selectAll": "全选",
     "deselectN": "取消选择 {}",
-    "xWillBeRemovedButRemainInstalled": "{} 将被从 Obtainium 中删除，但仍安装在设备上。",
+    "xWillBeRemovedButRemainInstalled": "{} 将从 Obtainium 中删除，但仍安装在您的设备中。",
-    "removeSelectedAppsQuestion": "删除已选择的应用程序吗？",
+    "removeSelectedAppsQuestion": "是否删除选中的应用？",
-    "removeSelectedApps": "删除已选择的应用程序",
+    "removeSelectedApps": "删除选中的应用",
     "updateX": "更新 {}",
     "installX": "安装 {}",
-    "markXTrackOnlyAsUpdated": "将仅追踪编辑为已更新",
+    "markXTrackOnlyAsUpdated": "将 {}\n（仅追踪）\n标记为已更新",
     "changeX": "更改 {}",
-    "installUpdateApps": "安装/更新应用程序",
+    "installUpdateApps": "安装/更新应用",
-    "installUpdateSelectedApps": "安装/更新已选择的应用程序",
+    "installUpdateSelectedApps": "安装/更新选中的应用",
-    "onlyAppliesToInstalledAndOutdatedApps": "'只适用于已安装但已过时的应用程序",
+    "markXSelectedAppsAsUpdated": "是否将选中的 {} 个应用标记为已更新？",
-    "markXSelectedAppsAsUpdated": "将已选择的 {} 个应用程序标记为已更新？",
     "no": "不要",
     "yes": "好的",
-    "markSelectedAppsUpdated": "标记已选择的应用程序为已更新",
+    "markSelectedAppsUpdated": "将选中的应用标记为已更新",
     "pinToTop": "置顶",
     "unpinFromTop": "取消置顶",
-    "resetInstallStatusForSelectedAppsQuestion": "为已选择的应用程序重置安装状态吗？",
+    "resetInstallStatusForSelectedAppsQuestion": "是否重置选中应用的安装状态？",
-    "installStatusOfXWillBeResetExplanation": "当 Obtainium 中显示的应用程序版本由于更新失败或其他问题而不正确时，这将有助于重置任何选定应用程序的安装状态。",
+    "installStatusOfXWillBeResetExplanation": "选中应用的安装状态将会被重置。\n\n当更新安装失败或其他问题导致 Obtainium 中的应用版本显示错误时，可以尝试通过此方法解决。",
-    "shareSelectedAppURLs": "分享已选择的应用程序 URL",
+    "shareSelectedAppURLs": "分享选中应用的 URL",
     "resetInstallStatus": "重置安装状态",
     "more": "更多",
-    "removeOutdatedFilter": "删除过时的应用程序过滤器",
+    "removeOutdatedFilter": "删除失效的应用筛选",
-    "showOutdatedOnly": "只显示过时的应用程序",
+    "showOutdatedOnly": "只显示待更新应用",
-    "filter": "过滤器",
+    "filter": "筛选",
-    "filterActive": "过滤器 *",
+    "filterActive": "筛选 *",
-    "filterApps": "过滤应用",
+    "filterApps": "筛选应用",
     "appName": "应用名称",
     "author": "作者",
-    "upToDateApps": "已更新的应用程序",
+    "upToDateApps": "无需更新的应用",
-    "nonInstalledApps": "未安装的应用程序",
+    "nonInstalledApps": "未安装的应用",
     "importExport": "导入/导出",
     "settings": "设置",
-    "exportedTo": "导出到 {}",
+    "exportedTo": "已导出至 {}",
     "obtainiumExport": "Obtainium 导出",
-    "invalidInput": "无效输入",
+    "invalidInput": "无效的输入",
-    "importedX": "已导出到 {}",
+    "importedX": "已导入 {}",
     "obtainiumImport": "Obtainium 导入",
     "importFromURLList": "从 URL 列表导入",
     "searchQuery": "搜索查询",
@@ -109,13 +108,13 @@
     "searchX": "搜索 {}",
     "noResults": "无结果",
     "importX": "导入 {}",
-    "importedAppsIdDisclaimer": "导入的应用程序可能显示为未安装。要解决这个问题，请通过 Obtainium 重新安装它们。",
+    "importedAppsIdDisclaimer": "导入的应用可能错误地显示为“未安装”。\n请通过 Obtainium 重新安装这些应用来解决此问题。",
     "importErrors": "导入错误",
-    "importedXOfYApps": "{} 中的 {} 个应用已导入",
+    "importedXOfYApps": "已导入 {} 中的 {} 个应用。",
-    "followingURLsHadErrors": "以下 URL 有错误：",
+    "followingURLsHadErrors": "下列 URL 存在错误：",
     "okay": "好的",
-    "selectURL": "已选择的 URL",
+    "selectURL": "选择 URL",
-    "selectURLs": "已选择的 URL",
+    "selectURLs": "选择 URL",
     "pick": "选择",
     "theme": "主题",
     "dark": "深色",
@@ -123,67 +122,68 @@
     "followSystem": "跟随系统",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
-    "appSortBy": "排列方式",
+    "useBlackTheme": "使用纯黑深色主题",
-    "authorName": "作者 / 名字",
+    "appSortBy": "排序依据",
-    "nameAuthor": "名字 / 作者",
+    "authorName": "作者 / 应用名称",
-    "asAdded": "添加顺序",
+    "nameAuthor": "应用名称 / 作者",
-    "appSortOrder": "排列顺序",
+    "asAdded": "添加次序",
+    "appSortOrder": "顺序",
     "ascending": "升序",
     "descending": "降序",
     "bgUpdateCheckInterval": "后台更新检查间隔",
     "neverManualOnly": "手动",
     "appearance": "外观",
-    "showWebInAppView": "在应用来源页显示网页",
+    "showWebInAppView": "在应用详情页显示来源网页",
-    "pinUpdates": "需更新的应用置顶",
+    "pinUpdates": "将待更新应用置顶",
-    "updates": "检查间隔",
+    "updates": "更新",
-    "sourceSpecific": "Github 访问令牌",
+    "sourceSpecific": "来源相关",
     "appSource": "源代码",
     "noLogs": "无日志",
-    "appLogs": "应用日志",
+    "appLogs": "日志",
     "close": "关闭",
     "share": "分享",
     "appNotFound": "未找到应用",
     "obtainiumExportHyphenatedLowercase": "obtainium-导出",
-    "pickAnAPK": "选择一个安装包",
+    "pickAnAPK": "选择一个 APK 文件",
     "appHasMoreThanOnePackage": "{} 有多个架构可用：",
-    "deviceSupportsXArch": "你的设备支持 {} 架构",
+    "deviceSupportsXArch": "您的设备支持 {} 架构。",
-    "deviceSupportsFollowingArchs": "你的设备支持以下架构:",
+    "deviceSupportsFollowingArchs": "您的设备支持下列架构：",
     "warning": "警告",
-    "sourceIsXButPackageFromYPrompt": "此应用来源是 '{}' 但更新包来自 '{}'。 继续吗？",
+    "sourceIsXButPackageFromYPrompt": "此应用的来源是“{}”，但 APK 文件来自“{}”。是否继续？",
     "updatesAvailable": "更新可用",
-    "updatesAvailableNotifDescription": "通知 Obtainium 所跟踪应用程序的更新",
+    "updatesAvailableNotifDescription": "Obtainium 追踪的应用有更新时发出通知",
-    "noNewUpdates": "你的应用已是最新。",
+    "noNewUpdates": "全部应用已是最新。",
-    "xHasAnUpdate": "{} 有更新啦",
+    "xHasAnUpdate": "{} 可以更新了。",
     "appsUpdated": "应用已更新",
-    "appsUpdatedNotifDescription": "通知在后台安装应用程序的更新",
+    "appsUpdatedNotifDescription": "当应用在后台安装更新时发出通知",
-    "xWasUpdatedToY": "{} 已更新到 {}.",
+    "xWasUpdatedToY": "{} 已更新至 {}。",
     "errorCheckingUpdates": "检查更新出错",
-    "errorCheckingUpdatesNotifDescription": "当后台更新检查失败时显示的通知",
+    "errorCheckingUpdatesNotifDescription": "当后台检查更新失败时显示的通知",
     "appsRemoved": "应用已删除",
-    "appsRemovedNotifDescription": "通知由于加载应用程序时出错而被删除",
+    "appsRemovedNotifDescription": "当应用因加载出错而被删除时发出通知",
-    "xWasRemovedDueToErrorY": "{} 已因以下错误被删除： {}",
+    "xWasRemovedDueToErrorY": "{} 由于以下错误被删除：{}",
     "completeAppInstallation": "完成应用安装",
-    "obtainiumMustBeOpenToInstallApps": "Obtainium 需要被启动以安装更新",
+    "obtainiumMustBeOpenToInstallApps": "必须启动 Obtainium 才能安装应用",
-    "completeAppInstallationNotifDescription": "需要返回 Obtainium，以完成应用程序的安装。",
+    "completeAppInstallationNotifDescription": "提示返回 Obtainium 以完成应用的安装",
-    "checkingForUpdates": "检查更新中",
+    "checkingForUpdates": "正在检查更新",
-    "checkingForUpdatesNotifDescription": "检查更新时出现的瞬时通知",
+    "checkingForUpdatesNotifDescription": "检查更新时短暂显示的通知",
-    "pleaseAllowInstallPerm": "请允许 Obtainium 安装应用程序",
+    "pleaseAllowInstallPerm": "请授予 Obtainium 安装应用的权限",
     "trackOnly": "仅追踪",
     "errorWithHttpStatusCode": "错误 {}",
-    "versionCorrectionDisabled": "禁用版本更正（插件似乎未起作用）",
+    "versionCorrectionDisabled": "禁用版本号更正（插件似乎未起作用）",
     "unknown": "未知",
     "none": "无",
     "never": "从不",
-    "latestVersionX": "最新: {}",
+    "latestVersionX": "最新版本：{}",
-    "installedVersionX": "已安装: {}",
+    "installedVersionX": "当前版本：{}",
-    "lastUpdateCheckX": "最后检查: {}",
+    "lastUpdateCheckX": "上次更新检查：{}",
     "remove": "删除",
-    "yesMarkUpdated": "'是的，标为已更新",
+    "yesMarkUpdated": "是的，标记为已更新",
-    "fdroid": "F-Droid",
+    "fdroid": "F-Droid Official",
     "appIdOrName": "应用 ID 或名称",
-    "appWithIdOrNameNotFound": "没有发现具有此 ID 或名称的应用",
+    "appWithIdOrNameNotFound": "未找到符合此 ID 或名称的应用",
-    "reposHaveMultipleApps": "来源可能包含多个应用",
+    "reposHaveMultipleApps": "存储库中可能包含多个应用",
-    "fdroidThirdPartyRepo": "F-Droid 第三方源",
+    "fdroidThirdPartyRepo": "F-Droid 第三方存储库",
     "steam": "Steam",
     "steamMobile": "Steam Mobile",
     "steamChat": "Steam Chat",
@@ -192,49 +192,57 @@
     "update": "更新",
     "markUpdated": "标记为已更新",
     "additionalOptions": "附加选项",
-    "disableVersionDetection": "关闭版本检测",
+    "disableVersionDetection": "禁用版本检测",
-    "noVersionDetectionExplanation": "此选项应只用于版本检测不能工作的应用程序",
+    "noVersionDetectionExplanation": "此选项应该仅用于无法进行版本检测的应用。",
-    "downloadingX": "下载中 {}",
+    "downloadingX": "正在下载 {}",
-    "downloadNotifDescription": "通知用户下载进度",
+    "downloadNotifDescription": "提示应用的下载进度",
-    "noAPKFound": "未找到安装包",
+    "noAPKFound": "未找到 APK 文件",
-    "noVersionDetection": "无版本检测",
+    "noVersionDetection": "禁用版本检测",
-    "categorize": "归档",
+    "categorize": "分类",
-    "categories": "归档",
+    "categories": "类别",
     "category": "类别",
     "noCategory": "无类别",
     "noCategories": "无类别",
-    "deleteCategoriesQuestion": "删除所有类别？",
+    "deleteCategoriesQuestion": "是否删除选中的类别？",
-    "categoryDeleteWarning": "所有被删除类别的应用程序将被设置为无类别",
+    "categoryDeleteWarning": "被删除类别下的应用将恢复为未分类状态。",
     "addCategory": "添加类别",
     "label": "标签",
     "language": "语言",
-    "storagePermissionDenied": "存储权限已被拒绝",
+    "copiedToClipboard": "已复制至剪贴板",
-    "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
+    "storagePermissionDenied": "已拒绝授予存储权限",
-    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
+    "selectedCategorizeWarning": "这将覆盖选中应用当前的类别设置。",
-    "removeFromObtainium": "Remove from Obtainium",
+    "filterAPKsByRegEx": "使用正则表达式筛选 APK 文件",
-    "uninstallFromDevice": "Uninstall from Device",
+    "removeFromObtainium": "从 Obtainium 中删除",
-    "releaseDateAsVersion": "Use Release Date as Version",
+    "uninstallFromDevice": "从设备中卸载",
-    "releaseDateAsVersionExplanation": "This option should only be used for Apps where version detection does not work correctly, but a release date is available.",
+    "onlyWorksWithNonVersionDetectApps": "仅适用于禁用版本检测的应用。",
-    "changes": "Changes",
+    "releaseDateAsVersion": "将发行日期作为版本号",
-    "releaseDate": "Release Date",
+    "releaseDateAsVersionExplanation": "此选项应该仅用于无法进行版本检测但能够获取发行日期的应用。",
-    "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "changes": "更新日志",
-    "versionDetection": "Version Detection",
+    "releaseDate": "发行日期",
-    "standardVersionDetection": "Standard version detection",
+    "importFromURLsInFile": "从文件中的 URL 导入（如 OPML）",
+    "versionDetection": "版本检测",
+    "standardVersionDetection": "常规版本检测",
+    "groupByCategory": "按类别分组显示",
+    "autoApkFilterByArch": "如果可能，尝试按 CPU 架构筛选 APK 文件",
+    "overrideSource": "Override Source",
+    "dontShowAgain": "Don't show this again",
+    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
+    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
     "removeAppQuestion": {
-        "one": "删除应用？",
+        "one": "是否删除应用？",
-        "other": "删除应用？"
+        "other": "是否删除应用？"
     },
     "tooManyRequestsTryAgainInMinutes": {
-        "one": "请求过多 (API 限制) - 在 {} 分钟后重试",
+        "one": "API 请求过于频繁（速率限制）- 在 {} 分钟后重试",
-        "other": "请求过多 (API 限制) - 在 {} 分钟后重试"
+        "other": "API 请求过于频繁（速率限制）- 在 {} 分钟后重试"
     },
     "bgUpdateGotErrorRetryInMinutes": {
-        "one": "后台更新检查遇到了 {} 问题, 将在 {} 分钟后重试",
+        "one": "后台更新检查遇到了“{}”问题，预定于 {} 分钟后重试",
-        "other": "后台更新检查遇到了 {} 问题, 将在 {} 分钟后重试"
+        "other": "后台更新检查遇到了“{}”问题，预定于 {} 分钟后重试"
     },
     "bgCheckFoundUpdatesWillNotifyIfNeeded": {
-        "one": "后台更新检查找到了 {} 个更新 - 将通知用户",
+        "one": "后台检查发现 {} 个应用更新 - 如有需要将发出通知",
-        "other": "后台更新检查找到了 {} 个更新 - 将通知用户"
+        "other": "后台检查发现 {} 个应用更新 - 如有需要将发出通知"
     },
     "apps": {
         "one": "{} 个应用",
@@ -257,15 +265,15 @@
         "other": "{} 天"
     },
     "clearedNLogsBeforeXAfterY": {
-        "one": "清除了 {n} 个日志 (清除前 = {before}, 清除后 = {after})",
+        "one": "清除了 {n} 个日志（{before} 之前，{after} 之后）",
-        "other": "清除了 {n} 个日志 (清除前 = {before}, 清除后 = {after})"
+        "other": "清除了 {n} 个日志（{before} 之前，{after} 之后）"
     },
     "xAndNMoreUpdatesAvailable": {
-        "one": "{} 和 {} 更多应用已被更新",
+        "one": "{} 和另外 1 个应用可以更新了。",
-        "other": "{} 和 {} 更多应用已被更新"
+        "other": "{} 和另外 {} 个应用可以更新了。"
     },
     "xAndNMoreUpdatesInstalled": {
-        "one": "{} 和 {} 更多应用已被安装",
+        "one": "{} 和另外 1 个应用已更新。",
-        "other": "{} 和 {} 更多应用已被安装"
+        "other": "{} 和另外 {} 个应用已更新。"
     }
 }

lib/app_sources/apkmirror.dart

@@ -31,7 +31,7 @@ class APKMirror extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/apk/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {

lib/app_sources/codeberg.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -35,8 +36,10 @@ class Codeberg extends AppSource {
     canSearch = true;
   }
 
+  var gh = GitHub();
+
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
@@ -54,78 +57,10 @@ class Codeberg extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    bool includePrereleases = additionalSettings['includePrereleases'] == true;
+    return gh.getLatestAPKDetailsCommon(
-    bool fallbackToOlderReleases =
+        'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100',
-        additionalSettings['fallbackToOlderReleases'] == true;
+        standardUrl,
-    String? regexFilter =
+        additionalSettings);
-        (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'];
-      DateTime? releaseDate = targetRelease['published_at'] != null
-          ? DateTime.parse(targetRelease['published_at'])
-          : null;
-      if (version == null) {
-        throw NoVersionError();
-      }
-      var changeLog = targetRelease['body'].toString();
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
-          getAppNames(standardUrl),
-          releaseDate: releaseDate,
-          changeLog: changeLog.isEmpty ? null : changeLog);
-    } else {
-      throw getObtainiumHttpError(res);
-    }
   }
 
   AppNames getAppNames(String standardUrl) {
@@ -136,20 +71,9 @@ class Codeberg extends AppSource {
 
   @override
   Future<Map<String, String>> search(String query) async {
-    Response res = await get(Uri.parse(
+    return gh.searchCommon(
-        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100'));
+        query,
-    if (res.statusCode == 200) {
+        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100',
-      Map<String, String> urlsWithDescriptions = {};
+        'data');
-      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);
-    }
   }
 }

lib/app_sources/fdroid.dart

@@ -12,12 +12,13 @@ class FDroid extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegExB =
         RegExp('^https?://$host/+[^/]+/+packages/+[^/]+');
     RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
     if (match != null) {
-      url = 'https://$host/packages/${Uri.parse(url).pathSegments.last}';
+      url =
+          'https://${Uri.parse(url.substring(0, match.end)).host}/packages/${Uri.parse(url).pathSegments.last}';
     }
     RegExp standardUrlRegExA = RegExp('^https?://$host/+packages/+[^/]+');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
@@ -48,7 +49,7 @@ class FDroid extends AppSource {
           .where((element) => element['versionName'] == latestVersion)
           .map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
           .toList();
-      return APKDetails(latestVersion, apkUrls,
+      return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
           AppNames(name, Uri.parse(standardUrl).pathSegments.last));
     } else {
       throw getObtainiumHttpError(res);
@@ -61,9 +62,10 @@ class FDroid extends AppSource {
     Map<String, dynamic> additionalSettings,
   ) async {
     String? appId = tryInferringAppId(standardUrl);
+    String host = Uri.parse(standardUrl).host;
     return getAPKUrlsFromFDroidPackagesAPIResponse(
-        await get(Uri.parse('https://f-droid.org/api/v1/packages/$appId')),
+        await get(Uri.parse('https://$host/api/v1/packages/$appId')),
-        'https://f-droid.org/repo/$appId',
+        'https://$host/repo/$appId',
         standardUrl);
   }
 }

lib/app_sources/fdroidrepo.dart

@@ -19,17 +19,6 @@ class FDroidRepo extends AppSource {
     ];
   }
 
-  @override
-  String standardizeURL(String url) {
-    RegExp standardUrlRegExp =
-        RegExp('^https?://.+/fdroid/([^/]+(/|\\?)|[^/]+\$)');
-    RegExpMatch? match = standardUrlRegExp.firstMatch(url.toLowerCase());
-    if (match == null) {
-      throw InvalidURLError(name);
-    }
-    return url.substring(0, match.end);
-  }
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
@@ -80,7 +69,8 @@ class FDroidRepo extends AppSource {
               element.querySelector('apkname') != null)
           .map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}')
           .toList();
-      return APKDetails(latestVersion, apkUrls, AppNames(authorName, appName),
+      return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
+          AppNames(authorName, appName),
           releaseDate: releaseDate);
     } else {
       throw getObtainiumHttpError(res);

lib/app_sources/github.dart

@@ -75,7 +75,7 @@ class GitHub extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
@@ -96,11 +96,9 @@ class GitHub extends AppSource {
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/releases';
 
-  @override
+  Future<APKDetails> getLatestAPKDetailsCommon(String requestUrl,
-  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, Map<String, dynamic> additionalSettings,
-    String standardUrl,
+      {Function(Response)? onHttpErrorCode}) async {
-    Map<String, dynamic> additionalSettings,
-  ) async {
     bool includePrereleases = additionalSettings['includePrereleases'] == true;
     bool fallbackToOlderReleases =
         additionalSettings['fallbackToOlderReleases'] == true;
@@ -110,27 +108,50 @@ class GitHub extends AppSource {
                 true
             ? additionalSettings['filterReleaseTitlesByRegEx']
             : null;
-    Response res = await get(Uri.parse(
+    Response res = await get(Uri.parse(requestUrl));
-        '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>;
 
-      List<String> getReleaseAPKUrls(dynamic release) =>
+      List<MapEntry<String, String>> getReleaseAPKUrls(dynamic release) =>
           (release['assets'] as List<dynamic>?)
               ?.map((e) {
-                return e['browser_download_url'] != null
+                return e['name'] != null && e['browser_download_url'] != null
-                    ? e['browser_download_url'] as String
+                    ? MapEntry(e['name'] as String,
-                    : '';
+                        e['browser_download_url'] as String)
+                    : const MapEntry('', '');
               })
-              .where((element) => element.toLowerCase().endsWith('.apk'))
+              .where((element) => element.key.toLowerCase().endsWith('.apk'))
               .toList() ??
           [];
 
+      DateTime? getReleaseDateFromRelease(dynamic rel) =>
+          rel?['published_at'] != null
+              ? DateTime.parse(rel['published_at'])
+              : null;
+      releases.sort((a, b) {
+        // See #478
+        if (a == b) {
+          return 0;
+        } else if (a == null) {
+          return -1;
+        } else if (b == null) {
+          return 1;
+        } else {
+          return getReleaseDateFromRelease(a)!
+              .compareTo(getReleaseDateFromRelease(b)!);
+        }
+      });
+      releases = releases.reversed.toList();
       dynamic targetRelease;
-
+      var prerrelsSkipped = 0;
       for (int i = 0; i < releases.length; i++) {
-        if (!fallbackToOlderReleases && i > 0) break;
+        if (!fallbackToOlderReleases && i > prerrelsSkipped) break;
         if (!includePrereleases && releases[i]['prerelease'] == true) {
+          prerrelsSkipped++;
+          continue;
+        }
+        if (releases[i]['draft'] == true) {
+          // Draft releases not supported
           continue;
         }
         var nameToFilter = releases[i]['name'] as String?;
@@ -154,49 +175,78 @@ class GitHub extends AppSource {
         throw NoReleasesError();
       }
       String? version = targetRelease['tag_name'];
-      DateTime? releaseDate = targetRelease['published_at'] != null
+      DateTime? releaseDate = getReleaseDateFromRelease(targetRelease);
-          ? DateTime.parse(targetRelease['published_at'])
-          : null;
       if (version == null) {
         throw NoVersionError();
       }
       var changeLog = targetRelease['body'].toString();
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
+      return APKDetails(
+          version,
+          targetRelease['apkUrls'] as List<MapEntry<String, String>>,
           getAppNames(standardUrl),
           releaseDate: releaseDate,
           changeLog: changeLog.isEmpty ? null : changeLog);
     } else {
-      rateLimitErrorCheck(res);
+      if (onHttpErrorCode != null) {
+        onHttpErrorCode(res);
+      }
       throw getObtainiumHttpError(res);
     }
   }
 
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    return getLatestAPKDetailsCommon(
+        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100',
+        standardUrl,
+        additionalSettings, onHttpErrorCode: (Response res) {
+      rateLimitErrorCheck(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>> searchCommon(
-  Future<Map<String, String>> search(String query) async {
+      String query, String requestUrl, String rootProp,
-    Response res = await get(Uri.parse(
+      {Function(Response)? onHttpErrorCode}) async {
-        'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100'));
+    Response res = await get(Uri.parse(requestUrl));
     if (res.statusCode == 200) {
       Map<String, String> urlsWithDescriptions = {};
-      for (var e in (jsonDecode(res.body)['items'] as List<dynamic>)) {
+      for (var e in (jsonDecode(res.body)[rootProp] as List<dynamic>)) {
         urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
+          e['html_url'] as String:
+              ((e['archived'] == true ? '[ARCHIVED] ' : '') +
+                  (e['description'] != null
                       ? e['description'] as String
-              : tr('noDescription')
+                      : tr('noDescription')))
         });
       }
       return urlsWithDescriptions;
     } else {
-      rateLimitErrorCheck(res);
+      if (onHttpErrorCode != null) {
+        onHttpErrorCode(res);
+      }
       throw getObtainiumHttpError(res);
     }
   }
 
+  @override
+  Future<Map<String, String>> search(String query) async {
+    return searchCommon(
+        query,
+        'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100',
+        'items', onHttpErrorCode: (Response res) {
+      rateLimitErrorCheck(res);
+    });
+  }
+
   rateLimitErrorCheck(Response res) {
     if (res.headers['x-ratelimit-remaining'] == '0') {
       throw RateLimitError(

lib/app_sources/gitlab.dart

@@ -3,14 +3,23 @@ import 'package:http/http.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:easy_localization/easy_localization.dart';
 
 class GitLab extends AppSource {
   GitLab() {
     host = 'gitlab.com';
+
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ]
+    ];
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
@@ -28,13 +37,15 @@ class GitLab extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
+    bool fallbackToOlderReleases =
+        additionalSettings['fallbackToOlderReleases'] == true;
     Response res = await get(Uri.parse('$standardUrl/-/tags?format=atom'));
     if (res.statusCode == 200) {
       var standardUri = Uri.parse(standardUrl);
       var parsedHtml = parse(res.body);
-      var entry = parsedHtml.querySelector('entry');
+      var apkDetailsList = parsedHtml.querySelectorAll('entry').map((entry) {
-      var entryContent =
+        var entryContent = parse(
-          parse(parseFragment(entry?.querySelector('content')!.innerHtml).text);
+            parseFragment(entry.querySelector('content')!.innerHtml).text);
         var apkUrls = [
           ...getLinksFromParsedHTML(
               entryContent,
@@ -51,17 +62,33 @@ class GitLab extends AppSource {
               .toList()
         ];
 
-      var entryId = entry?.querySelector('id')?.innerHtml;
+        var entryId = entry.querySelector('id')?.innerHtml;
         var version =
             entryId == null ? null : Uri.parse(entryId).pathSegments.last;
-      var releaseDateString = entry?.querySelector('updated')?.innerHtml;
+        var releaseDateString = entry.querySelector('updated')?.innerHtml;
-      DateTime? releaseDate =
+        DateTime? releaseDate = releaseDateString != null
-          releaseDateString != null ? DateTime.parse(releaseDateString) : null;
+            ? DateTime.parse(releaseDateString)
+            : null;
         if (version == null) {
           throw NoVersionError();
         }
-      return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl),
+        return APKDetails(version, getApkUrlsFromUrls(apkUrls),
+            GitHub().getAppNames(standardUrl),
             releaseDate: releaseDate);
+      });
+      if (apkDetailsList.isEmpty) {
+        throw NoReleasesError();
+      }
+      if (fallbackToOlderReleases) {
+        if (additionalSettings['trackOnly'] != true) {
+          apkDetailsList =
+              apkDetailsList.where((e) => e.apkUrls.isNotEmpty).toList();
+        }
+        if (apkDetailsList.isEmpty) {
+          throw NoReleasesError();
+        }
+      }
+      return apkDetailsList.first;
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/html.dart

@@ -6,7 +6,7 @@ import 'package:obtainium/providers/source_provider.dart';
 
 class HTML extends AppSource {
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     return url;
   }
 
@@ -34,15 +34,27 @@ class HTML extends AppSource {
       var rel = links.last;
       var apkName = rel.split('/').last;
       var version = apkName.substring(0, apkName.length - 4);
-      List<String> apkUrls = [rel]
+      List<String> apkUrls = [rel].map((e) {
-          .map((e) => e.toLowerCase().startsWith('http://') ||
+        try {
-                  e.toLowerCase().startsWith('https://')
+          Uri.parse(e).origin;
-              ? e
+          return e;
-              : e.startsWith('/')
+        } catch (err) {
-                  ? '${uri.origin}/$e'
+          // is relative
-                  : '${uri.origin}/${uri.path}/$e')
+        }
+        var currPathSegments = uri.path
+            .split('/')
+            .where((element) => element.trim().isNotEmpty)
             .toList();
-      return APKDetails(version, apkUrls, AppNames(uri.host, tr('app')));
+        if (e.startsWith('/') || currPathSegments.isEmpty) {
+          return '${uri.origin}/$e';
+        } else if (e.split('/').length == 1) {
+          return '${uri.origin}/${currPathSegments.join('/')}/$e';
+        } else {
+          return '${uri.origin}/${currPathSegments.sublist(0, currPathSegments.length - 1).join('/')}/$e';
+        }
+      }).toList();
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames(uri.host, tr('app')));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/izzyondroid.dart

@@ -9,7 +9,7 @@ class IzzyOnDroid extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {

lib/app_sources/mullvad.dart

@@ -1,7 +1,6 @@
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/app_sources/github.dart';
-import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
@@ -11,7 +10,7 @@ class Mullvad extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
@@ -29,24 +28,41 @@ class Mullvad extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    var details = await HTML().getLatestAPKDetails(
+    Response res = await get(Uri.parse('$standardUrl/en/download/android'));
-        '$standardUrl/en/download/android', additionalSettings);
+    if (res.statusCode == 200) {
-    var fileName = details.apkUrls[0].split('/').last;
+      var versions = parse(res.body)
-    var versionMatch = RegExp('[0-9]+(\\.[0-9]+)+').firstMatch(fileName);
+          .querySelectorAll('p')
-    if (versionMatch == null) {
+          .map((e) => e.innerHtml)
+          .where((p) => p.contains('Latest version: '))
+          .map((e) {
+            var match = RegExp('[0-9]+(\\.[0-9]+)*').firstMatch(e);
+            if (match == null) {
+              return '';
+            } else {
+              return e.substring(match.start, match.end);
+            }
+          })
+          .where((element) => element.isNotEmpty)
+          .toList();
+      if (versions.isEmpty) {
         throw NoVersionError();
       }
-    details.version = fileName.substring(versionMatch.start, versionMatch.end);
+      String? changeLog;
-    details.names = AppNames(name, 'Mullvad-VPN');
       try {
-      details.changeLog = (await GitHub().getLatestAPKDetails(
+        changeLog = (await GitHub().getLatestAPKDetails(
                 'https://github.com/mullvad/mullvadvpn-app',
                 {'fallbackToOlderReleases': true}))
             .changeLog;
       } catch (e) {
-      print(e);
         // Ignore
       }
-    return details;
+      return APKDetails(
+          versions[0],
+          getApkUrlsFromUrls(['https://mullvad.net/download/app/apk/latest']),
+          AppNames(name, 'Mullvad-VPN'),
+          changeLog: changeLog);
+    } else {
+      throw getObtainiumHttpError(res);
+    }
   }
 }

lib/app_sources/neutroncode.dart

@@ -9,7 +9,7 @@ class NeutronCode extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/downloads/file/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
@@ -98,7 +98,7 @@ class NeutronCode extends AppSource {
           ? (customDateParse(dateStringOriginal))
           : null;
       var changeLogElements = http.querySelectorAll('.pd-fdesc p');
-      return APKDetails(version, [apkUrl],
+      return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
           AppNames(runtimeType.toString(), name ?? standardUrl.split('/').last),
           releaseDate: dateString != null ? DateTime.parse(dateString) : null,
           changeLog: changeLogElements.isNotEmpty

lib/app_sources/signal.dart

@@ -9,7 +9,7 @@ class Signal extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     return 'https://$host';
   }
 
@@ -28,7 +28,8 @@ class Signal extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
-      return APKDetails(version, apkUrls, AppNames(name, 'Signal'));
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames(name, 'Signal'));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/sourceforge.dart

@@ -9,7 +9,7 @@ class SourceForge extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     RegExp standardUrlRegEx = RegExp('^https?://$host/projects/[^/]+');
     RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
     if (match == null) {
@@ -31,7 +31,8 @@ class SourceForge extends AppSource {
       getVersion(String url) {
         try {
           var tokens = url.split('/');
-          return tokens[tokens.length - 3];
+          var fi = tokens.indexOf('files');
+          return tokens[tokens[fi + 2] == 'download' ? fi - 1 : fi + 1];
         } catch (e) {
           return null;
         }
@@ -50,7 +51,7 @@ class SourceForge extends AppSource {
               .toList();
       return APKDetails(
           version,
-          apkUrlList,
+          getApkUrlsFromUrls(apkUrlList),
           AppNames(
               name, standardUrl.substring(standardUrl.lastIndexOf('/') + 1)));
     } else {

lib/app_sources/steammobile.dart

@@ -20,7 +20,7 @@ class SteamMobile extends AppSource {
   final apks = {'steam': tr('steamMobile'), 'steam-chat-app': tr('steamChat')};
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     return 'https://$host';
   }
 
@@ -53,7 +53,8 @@ class SteamMobile extends AppSource {
       var version = links[0].substring(
           versionMatch.start + apkNamePrefix.length + 2, versionMatch.end - 4);
       var apkUrls = [links[0]];
-      return APKDetails(version, apkUrls, AppNames(name, apks[apkNamePrefix]!));
+      return APKDetails(version, getApkUrlsFromUrls(apkUrls),
+          AppNames(name, apks[apkNamePrefix]!));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/telegramapp.dart

@@ -11,7 +11,7 @@ class TelegramApp extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     return 'https://$host';
   }
 
@@ -32,7 +32,8 @@ class TelegramApp extends AppSource {
         throw NoVersionError();
       }
       String? apkUrl = 'https://telegram.org/dl/android/apk';
-      return APKDetails(version, [apkUrl], AppNames('Telegram', 'Telegram'));
+      return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
+          AppNames('Telegram', 'Telegram'));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/vlc.dart

@@ -10,7 +10,7 @@ class VLC extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     return 'https://$host';
   }
 
@@ -54,7 +54,8 @@ class VLC extends AppSource {
         throw getObtainiumHttpError(res2);
       }
 
-      return APKDetails(version, apkUrls, AppNames('VideoLAN', 'VLC'));
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames('VideoLAN', 'VLC'));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/whatsapp.dart

@@ -9,7 +9,7 @@ class WhatsApp extends AppSource {
   }
 
   @override
-  String standardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url) {
     return 'https://$host';
   }
 
@@ -64,9 +64,9 @@ class WhatsApp extends AppSource {
           vLines[0].substring(versionMatch.start, versionMatch.end);
       return APKDetails(
           version,
-          [
+          getApkUrlsFromUrls([
             'https://www.whatsapp.com/android?v=$version&=thisIsaPlaceholder&a=realURLPrefetchedAtDownloadTime'
-          ],
+          ]),
           AppNames('Meta', 'WhatsApp'));
     } else {
       throw getObtainiumHttpError(res);

lib/components/generated_form.dart

@@ -267,7 +267,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
           formInputs[r][e] = Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Text(widget.items[r][e].label),
+              Flexible(child: Text(widget.items[r][e].label)),
+              const SizedBox(
+                width: 8,
+              ),
               Switch(
                   value: values[widget.items[r][e].key],
                   onChanged: (value) {

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.11.16';
+const String currentVersion = '0.12.0';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -263,6 +263,14 @@ class _ObtainiumState extends State<Obtainium> {
         darkColorScheme = ColorScheme.fromSeed(
             seedColor: defaultThemeColour, brightness: Brightness.dark);
       }
+
+      // set the background and surface colors to pure black in the amoled theme
+      if (settingsProvider.useBlackTheme) {
+        darkColorScheme = darkColorScheme
+            .copyWith(background: Colors.black, surface: Colors.black)
+            .harmonized();
+      }
+
       return MaterialApp(
           title: 'Obtainium',
           localizationsDelegates: context.localizationDelegates,

lib/pages/add_app.dart

@@ -1,6 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
@@ -28,6 +29,7 @@ class _AddAppPageState extends State<AddAppPage> {
 
   String userInput = '';
   String searchQuery = '';
+  String? pickedSourceOverride;
   AppSource? pickedSource;
   Map<String, dynamic> additionalSettings = {};
   bool additionalSettingsValid = true;
@@ -49,8 +51,25 @@ class _AddAppPageState extends State<AddAppPage> {
           if (isSearch) {
             searchnum++;
           }
-          var source = valid ? sourceProvider.getSource(userInput) : null;
+          var prevHost = pickedSource?.host;
-          if (pickedSource.runtimeType != source.runtimeType) {
+          try {
+            var naturalSource =
+                valid ? sourceProvider.getSource(userInput) : null;
+            if (naturalSource != null &&
+                naturalSource.runtimeType.toString() !=
+                    HTML().runtimeType.toString()) {
+              // If input has changed to match a regular source, reset the override
+              pickedSourceOverride = null;
+            }
+          } catch (e) {
+            // ignore
+          }
+          var source = valid
+              ? sourceProvider.getSource(userInput,
+                  overrideSource: pickedSourceOverride)
+              : null;
+          if (pickedSource.runtimeType != source.runtimeType ||
+              (prevHost != null && prevHost != source?.host)) {
             pickedSource = source;
             additionalSettings = source != null
                 ? getDefaultValuesFromFormItems(
@@ -64,24 +83,35 @@ class _AddAppPageState extends State<AddAppPage> {
       }
     }
 
-    getTrackOnlyConfirmationIfNeeded(bool userPickedTrackOnly) async {
+    Future<bool> getTrackOnlyConfirmationIfNeeded(
-      return (!((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
+        bool userPickedTrackOnly, SettingsProvider settingsProvider,
+        {bool ignoreHideSetting = false}) async {
+      var useTrackOnly = userPickedTrackOnly || pickedSource!.enforceTrackOnly;
+      if (useTrackOnly &&
+          (!settingsProvider.hideTrackOnlyWarning || ignoreHideSetting)) {
         // ignore: use_build_context_synchronously
-          await showDialog(
+        var values = await showDialog(
             context: context,
             builder: (BuildContext ctx) {
               return GeneratedFormModal(
+                initValid: true,
                 title: tr('xIsTrackOnly', args: [
-                        pickedSource!.enforceTrackOnly
+                  pickedSource!.enforceTrackOnly ? tr('source') : tr('app')
-                            ? tr('source')
-                            : tr('app')
                 ]),
-                      items: const [],
+                items: [
+                  [GeneratedFormSwitch('hide', label: tr('dontShowAgain'))]
+                ],
                 message:
                     '${pickedSource!.enforceTrackOnly ? tr('appsFromSourceAreTrackOnly') : tr('youPickedTrackOnly')}\n\n${tr('trackOnlyAppDescription')}',
               );
-                  }) ==
+            });
-              null));
+        if (values != null) {
+          settingsProvider.hideTrackOnlyWarning = values['hide'] == true;
+        }
+        return useTrackOnly && values != null;
+      } else {
+        return true;
+      }
     }
 
     getReleaseDateAsVersionConfirmationIfNeeded(
@@ -109,16 +139,15 @@ class _AddAppPageState extends State<AddAppPage> {
         var settingsProvider = context.read<SettingsProvider>();
         var userPickedTrackOnly = additionalSettings['trackOnly'] == true;
         App? app;
-        if ((await getTrackOnlyConfirmationIfNeeded(userPickedTrackOnly)) &&
+        if ((await getTrackOnlyConfirmationIfNeeded(
+                userPickedTrackOnly, settingsProvider)) &&
             (await getReleaseDateAsVersionConfirmationIfNeeded(
                 userPickedTrackOnly))) {
           var trackOnly = pickedSource!.enforceTrackOnly || userPickedTrackOnly;
           app = await sourceProvider.getApp(
               pickedSource!, userInput, additionalSettings,
-              trackOnlyOverride: trackOnly);
+              trackOnlyOverride: trackOnly,
-          if (!trackOnly) {
+              overrideSource: pickedSourceOverride);
-            await settingsProvider.getInstallPermission();
-          }
           // Only download the APK here if you need to for the package ID
           if (sourceProvider.isTempId(app) &&
               app.additionalSettings['trackOnly'] != true) {
@@ -127,7 +156,8 @@ class _AddAppPageState extends State<AddAppPage> {
             if (apkUrl == null) {
               throw ObtainiumError(tr('cancelled'));
             }
-            app.preferredApkIndex = app.apkUrls.indexOf(apkUrl);
+            app.preferredApkIndex =
+                app.apkUrls.map((e) => e.value).toList().indexOf(apkUrl.value);
             // ignore: use_build_context_synchronously
             var downloadedApk = await appsProvider.downloadApp(
                 app, globalNavigatorKey.currentContext);
@@ -172,9 +202,9 @@ class _AddAppPageState extends State<AddAppPage> {
                               (value) {
                                 try {
                                   sourceProvider
-                                      .getSource(value ?? '')
+                                      .getSource(value ?? '',
-                                      .standardizeURL(
+                                          overrideSource: pickedSourceOverride)
-                                          preStandardizeUrl(value ?? ''));
+                                      .standardizeUrl(value ?? '');
                                 } catch (e) {
                                   return e is String
                                       ? e
@@ -259,6 +289,48 @@ class _AddAppPageState extends State<AddAppPage> {
       }
     }
 
+    Widget getHTMLSourceOverrideDropdown() => Column(children: [
+          Row(
+            children: [
+              Expanded(
+                  child: GeneratedForm(
+                items: [
+                  [
+                    GeneratedFormDropdown(
+                        'overrideSource',
+                        defaultValue: HTML().runtimeType.toString(),
+                        [
+                          ...sourceProvider.sources.map(
+                              (s) => MapEntry(s.runtimeType.toString(), s.name))
+                        ],
+                        label: tr('overrideSource'))
+                  ]
+                ],
+                onValueChanges: (values, valid, isBuilding) {
+                  fn() {
+                    pickedSourceOverride = (values['overrideSource'] == null ||
+                            values['overrideSource'] == '')
+                        ? null
+                        : values['overrideSource'];
+                  }
+
+                  if (!isBuilding) {
+                    setState(() {
+                      fn();
+                    });
+                  } else {
+                    fn();
+                  }
+                  changeUserInput(userInput, valid, isBuilding);
+                },
+              ))
+            ],
+          ),
+          const SizedBox(
+            height: 25,
+          ),
+        ]);
+
     bool shouldShowSearchBar() =>
         sourceProvider.sources.where((e) => e.canSearch).isNotEmpty &&
         pickedSource == null &&
@@ -308,6 +380,10 @@ class _AddAppPageState extends State<AddAppPage> {
             const SizedBox(
               height: 16,
             ),
+            if (pickedSourceOverride != null ||
+                pickedSource.runtimeType.toString() ==
+                    HTML().runtimeType.toString())
+              getHTMLSourceOverrideDropdown(),
             GeneratedForm(
                 key: Key(pickedSource.runtimeType.toString()),
                 items: pickedSource!.combinedAppSpecificSettingFormItems,
@@ -334,8 +410,7 @@ class _AddAppPageState extends State<AddAppPage> {
           ],
         );
 
-    Widget getSourcesListWidget() => Expanded(
+    Widget getSourcesListWidget() => Column(
-            child: Column(
             crossAxisAlignment: CrossAxisAlignment.center,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
@@ -365,19 +440,23 @@ class _AddAppPageState extends State<AddAppPage> {
                             fontStyle: FontStyle.italic),
                       )))
                   .toList()
-            ]));
+            ]);
 
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
-        body: CustomScrollView(slivers: <Widget>[
+        body: CustomScrollView(shrinkWrap: true, slivers: <Widget>[
           CustomAppBar(title: tr('addApp')),
-          SliverFillRemaining(
+          SliverToBoxAdapter(
             child: Padding(
                 padding: const EdgeInsets.all(16),
                 child: Column(
+                    mainAxisSize: MainAxisSize.min,
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
                       getUrlInputRow(),
+                      const SizedBox(
+                        height: 16,
+                      ),
                       if (shouldShowSearchBar())
                         const SizedBox(
                           height: 16,

lib/pages/app.dart

@@ -38,8 +38,11 @@ class _AppPageState extends State<AppPage> {
     bool areDownloadsRunning = appsProvider.areDownloadsRunning();
 
     var sourceProvider = SourceProvider();
-    AppInMemory? app = appsProvider.apps[widget.appId];
+    AppInMemory? app = appsProvider.apps[widget.appId]?.deepCopy();
-    var source = app != null ? sourceProvider.getSource(app.app.url) : null;
+    var source = app != null
+        ? sourceProvider.getSource(app.app.url,
+            overrideSource: app.app.overrideSource)
+        : null;
     if (!areDownloadsRunning && prevApp == null && app != null) {
       prevApp = app;
       getUpdate(app.app.id);
@@ -61,6 +64,12 @@ class _AppPageState extends State<AppPage> {
                         mode: LaunchMode.externalApplication);
                   }
                 },
+                onLongPress: () {
+                  Clipboard.setData(ClipboardData(text: app?.app.url ?? ''));
+                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                    content: Text(tr('copiedToClipboard')),
+                  ));
+                },
                 child: Text(
                   app?.app.url ?? '',
                   textAlign: TextAlign.center,
@@ -147,7 +156,7 @@ class _AppPageState extends State<AppPage> {
               height: 25,
             ),
             Text(
-              app?.installedInfo?.name ?? app?.app.name ?? tr('app'),
+              app?.name ?? tr('app'),
               textAlign: TextAlign.center,
               style: Theme.of(context).textTheme.displayLarge,
             ),
@@ -262,9 +271,7 @@ class _AppPageState extends State<AppPage> {
             }).toList();
 
             return GeneratedFormModal(
-              title: tr('additionalOptions'),
+                title: tr('additionalOptions'), items: items);
-              items: items,
-            );
           });
     }
 
@@ -301,6 +308,18 @@ class _AppPageState extends State<AppPage> {
       }
     }
 
+    getResetInstallStatusButton() => TextButton(
+        onPressed: app?.app == null
+            ? null
+            : () {
+                app!.app.installedVersion = null;
+                appsProvider.saveApps([app.app]);
+              },
+        child: Text(
+          tr('resetInstallStatus'),
+          textAlign: TextAlign.center,
+        ));
+
     getInstallOrUpdateButton() => TextButton(
         onPressed: (app?.app.installedVersion == null ||
                     app?.app.installedVersion != app?.app.latestVersion) &&
@@ -308,9 +327,6 @@ class _AppPageState extends State<AppPage> {
             ? () async {
                 try {
                   HapticFeedback.heavyImpact();
-                  if (app?.app.additionalSettings['trackOnly'] != true) {
-                    await settingsProvider.getInstallPermission();
-                  }
                   var res = await appsProvider.downloadAndInstallLatestApps(
                       [app!.app.id], globalNavigatorKey.currentContext);
                   if (res.isNotEmpty && mounted) {
@@ -380,7 +396,7 @@ class _AppPageState extends State<AppPage> {
                                       scrollable: true,
                                       content: getInfoColumn(),
                                       title: Text(
-                                          '${app.app.name} ${tr('byX', args: [
+                                          '${app.name} ${tr('byX', args: [
                                             app.app.author
                                           ])}'),
                                       actions: [
@@ -396,7 +412,13 @@ class _AppPageState extends State<AppPage> {
                             icon: const Icon(Icons.more_horiz),
                             tooltip: tr('more')),
                       const SizedBox(width: 16.0),
-                      Expanded(child: getInstallOrUpdateButton()),
+                      Expanded(
+                          child: (!isVersionDetectionStandard || trackOnly) &&
+                                  app?.app.installedVersion != null &&
+                                  app?.app.installedVersion ==
+                                      app?.app.latestVersion
+                              ? getResetInstallStatusButton()
+                              : getInstallOrUpdateButton()),
                       const SizedBox(width: 16.0),
                       Expanded(
                           child: TextButton(

lib/pages/apps.dart

@@ -29,13 +29,13 @@ class AppsPageState extends State<AppsPage> {
   final AppsFilter neutralFilter = AppsFilter();
   var updatesOnlyFilter =
       AppsFilter(includeUptodate: false, includeNonInstalled: false);
-  Set<App> selectedApps = {};
+  Set<String> selectedAppIds = {};
   DateTime? refreshingSince;
 
   clearSelected() {
-    if (selectedApps.isNotEmpty) {
+    if (selectedAppIds.isNotEmpty) {
       setState(() {
-        selectedApps.clear();
+        selectedAppIds.clear();
       });
       return true;
     }
@@ -43,10 +43,10 @@ class AppsPageState extends State<AppsPage> {
   }
 
   selectThese(List<App> apps) {
-    if (selectedApps.isEmpty) {
+    if (selectedAppIds.isEmpty) {
       setState(() {
         for (var a in apps) {
-          selectedApps.add(a);
+          selectedAppIds.add(a.id);
         }
       });
     }
@@ -56,20 +56,21 @@ class AppsPageState extends State<AppsPage> {
   Widget build(BuildContext context) {
     var appsProvider = context.watch<AppsProvider>();
     var settingsProvider = context.watch<SettingsProvider>();
-    var listedApps = appsProvider.apps.values.toList();
+    var sourceProvider = SourceProvider();
+    var listedApps = appsProvider.getAppValues().toList();
     var currentFilterIsUpdatesOnly =
         filter.isIdenticalTo(updatesOnlyFilter, settingsProvider);
 
-    selectedApps = selectedApps
+    selectedAppIds = selectedAppIds
-        .where((element) => listedApps.map((e) => e.app).contains(element))
+        .where((element) => listedApps.map((e) => e.app.id).contains(element))
         .toSet();
 
     toggleAppSelected(App app) {
       setState(() {
-        if (selectedApps.contains(app)) {
+        if (selectedAppIds.map((e) => e).contains(app.id)) {
-          selectedApps.remove(app);
+          selectedAppIds.removeWhere((a) => a == app.id);
         } else {
-          selectedApps.add(app);
+          selectedAppIds.add(app.id);
         }
       });
     }
@@ -93,8 +94,7 @@ class AppsPageState extends State<AppsPage> {
             .toList();
 
         for (var t in nameTokens) {
-          var name = app.installedInfo?.name ?? app.app.name;
+          if (!app.name.toLowerCase().contains(t.toLowerCase())) {
-          if (!name.toLowerCase().contains(t.toLowerCase())) {
             return false;
           }
         }
@@ -110,17 +110,26 @@ class AppsPageState extends State<AppsPage> {
               .isEmpty) {
         return false;
       }
+      if (filter.sourceFilter.isNotEmpty &&
+          sourceProvider
+                  .getSource(app.app.url,
+                      overrideSource: app.app.overrideSource)
+                  .runtimeType
+                  .toString() !=
+              filter.sourceFilter) {
+        return false;
+      }
       return true;
     }).toList();
 
     listedApps.sort((a, b) {
-      var nameA = a.installedInfo?.name ?? a.app.name;
-      var nameB = b.installedInfo?.name ?? b.app.name;
       int result = 0;
       if (settingsProvider.sortColumn == SortColumnSettings.authorName) {
-        result = (a.app.author + nameA).compareTo(b.app.author + nameB);
+        result = ((a.app.author + a.name).toLowerCase())
+            .compareTo((b.app.author + b.name).toLowerCase());
       } else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) {
-        result = (nameA + a.app.author).compareTo(nameB + b.app.author);
+        result = ((a.name + a.app.author).toLowerCase())
+            .compareTo((b.name + b.app.author).toLowerCase());
       } else if (settingsProvider.sortColumn ==
           SortColumnSettings.releaseDate) {
         result = (a.app.releaseDate)?.compareTo(
@@ -137,15 +146,15 @@ class AppsPageState extends State<AppsPage> {
     var existingUpdates = appsProvider.findExistingUpdates(installedOnly: true);
 
     var existingUpdateIdsAllOrSelected = existingUpdates
-        .where((element) => selectedApps.isEmpty
+        .where((element) => selectedAppIds.isEmpty
             ? listedApps.where((a) => a.app.id == element).isNotEmpty
-            : selectedApps.map((e) => e.id).contains(element))
+            : selectedAppIds.map((e) => e).contains(element))
         .toList();
     var newInstallIdsAllOrSelected = appsProvider
         .findExistingUpdates(nonInstalledOnly: true)
-        .where((element) => selectedApps.isEmpty
+        .where((element) => selectedAppIds.isEmpty
             ? listedApps.where((a) => a.app.id == element).isNotEmpty
-            : selectedApps.map((e) => e.id).contains(element))
+            : selectedAppIds.map((e) => e).contains(element))
         .toList();
 
     List<String> trackOnlyUpdateIdsAllOrSelected = [];
@@ -187,6 +196,30 @@ class AppsPageState extends State<AppsPage> {
     }
     listedApps = [...tempPinned, ...tempNotPinned];
 
+    List<String?> getListedCategories() {
+      var temp = listedApps
+          .map((e) => e.app.categories.isNotEmpty ? e.app.categories : [null]);
+      return temp.isNotEmpty
+          ? {
+              ...temp.reduce((v, e) => [...v, ...e])
+            }.toList()
+          : [];
+    }
+
+    var listedCategories = getListedCategories();
+    listedCategories.sort((a, b) {
+      return a != null && b != null
+          ? a.toLowerCase().compareTo(b.toLowerCase())
+          : a == null
+              ? 1
+              : -1;
+    });
+
+    Set<App> selectedApps = listedApps
+        .map((e) => e.app)
+        .where((a) => selectedAppIds.contains(a.id))
+        .toSet();
+
     showChangeLogDialog(
         String? changesUrl, AppSource appSource, String changeLog, int index) {
       showDialog(
@@ -195,6 +228,7 @@ class AppsPageState extends State<AppsPage> {
             return GeneratedFormModal(
               title: tr('changes'),
               items: const [],
+              message: listedApps[index].app.latestVersion,
               additionalWidgets: [
                 changesUrl != null
                     ? GestureDetector(
@@ -263,7 +297,8 @@ class AppsPageState extends State<AppsPage> {
         if (refreshingSince != null)
           SliverToBoxAdapter(
             child: LinearProgressIndicator(
-              value: appsProvider.apps.values
+              value: appsProvider
+                      .getAppValues()
                       .where((element) => !(element.app.lastUpdateCheck
                               ?.isBefore(refreshingSince!) ??
                           true))
@@ -275,8 +310,9 @@ class AppsPageState extends State<AppsPage> {
     }
 
     getChangeLogFn(int appIndex) {
-      AppSource appSource =
+      AppSource appSource = SourceProvider().getSource(
-          SourceProvider().getSource(listedApps[appIndex].app.url);
+          listedApps[appIndex].app.url,
+          overrideSource: listedApps[appIndex].app.overrideSource);
       String? changesUrl =
           appSource.changeLogPageFromStandardUrl(listedApps[appIndex].app.url);
       String? changeLog = listedApps[appIndex].app.changeLog;
@@ -333,7 +369,7 @@ class AppsPageState extends State<AppsPage> {
                         child: Image(
                           image: const AssetImage(
                               'assets/graphics/icon_small.png'),
-                          color: Colors.white.withOpacity(0.1),
+                          color: Colors.white.withOpacity(0.3),
                           colorBlendMode: BlendMode.modulate,
                           gaplessPlayback: true,
                         ),
@@ -375,7 +411,8 @@ class AppsPageState extends State<AppsPage> {
             children: [
               Row(mainAxisSize: MainAxisSize.min, children: [
                 Container(
-                    constraints: const BoxConstraints(maxWidth: 150),
+                    constraints: BoxConstraints(
+                        maxWidth: MediaQuery.of(context).size.width / 4),
                     child: Text(
                       getVersionText(index),
                       overflow: TextOverflow.ellipsis,
@@ -402,17 +439,38 @@ class AppsPageState extends State<AppsPage> {
         ],
       );
 
-      var transparent = const Color.fromARGB(0, 0, 0, 0).value;
+      var transparent =
+          Theme.of(context).colorScheme.background.withAlpha(0).value;
+      List<double> stops = [
+        ...listedApps[index]
+            .app
+            .categories
+            .asMap()
+            .entries
+            .map((e) =>
+                ((e.key / (listedApps[index].app.categories.length - 1))))
+            .toList(),
+        1
+      ];
+      if (stops.length == 2) {
+        stops[0] = 1;
+      }
       return Container(
           decoration: BoxDecoration(
-              border: Border.symmetric(
+              gradient: LinearGradient(
-                  vertical: BorderSide(
+                  stops: stops,
-                      width: 4,
+                  begin: const Alignment(-1, 0),
-                      color: Color(listedApps[index].app.categories.isNotEmpty
+                  end: const Alignment(-0.97, 0),
-                          ? settingsProvider.categories[
+                  colors: [
-                                  listedApps[index].app.categories.first] ??
+                ...listedApps[index]
-                              transparent
+                    .app
-                          : transparent)))),
+                    .categories
+                    .map((e) =>
+                        Color(settingsProvider.categories[e] ?? transparent)
+                            .withAlpha(255))
+                    .toList(),
+                Color(transparent)
+              ])),
           child: ListTile(
             tileColor: listedApps[index].app.pinned
                 ? Colors.grey.withOpacity(0.1)
@@ -421,15 +479,15 @@ class AppsPageState extends State<AppsPage> {
                 .colorScheme
                 .primary
                 .withOpacity(listedApps[index].app.pinned ? 0.2 : 0.1),
-            selected: selectedApps.contains(listedApps[index].app),
+            selected:
+                selectedAppIds.map((e) => e).contains(listedApps[index].app.id),
             onLongPress: () {
               toggleAppSelected(listedApps[index].app);
             },
             leading: getAppIcon(index),
             title: Text(
               maxLines: 1,
-              listedApps[index].installedInfo?.name ??
+              listedApps[index].name,
-                  listedApps[index].app.name,
               style: TextStyle(
                 overflow: TextOverflow.ellipsis,
                 fontWeight: listedApps[index].app.pinned
@@ -451,7 +509,7 @@ class AppsPageState extends State<AppsPage> {
                   ]))
                 : trailingRow,
             onTap: () {
-              if (selectedApps.isNotEmpty) {
+              if (selectedAppIds.isNotEmpty) {
                 toggleAppSelected(listedApps[index].app);
               } else {
                 Navigator.push(
@@ -465,8 +523,30 @@ class AppsPageState extends State<AppsPage> {
           ));
     }
 
+    getCategoryCollapsibleTile(int index) {
+      var tiles = listedApps
+          .asMap()
+          .entries
+          .where((e) =>
+              e.value.app.categories.contains(listedCategories[index]) ||
+              e.value.app.categories.isEmpty && listedCategories[index] == null)
+          .map((e) => getSingleAppHorizTile(e.key))
+          .toList();
+
+      capFirstChar(String str) => str[0].toUpperCase() + str.substring(1);
+      return ExpansionTile(
+          initiallyExpanded: true,
+          title: Text(
+            capFirstChar(listedCategories[index] ?? tr('noCategory')),
+            style: const TextStyle(fontWeight: FontWeight.bold),
+          ),
+          controlAffinity: ListTileControlAffinity.leading,
+          trailing: Text(tiles.length.toString()),
+          children: tiles);
+    }
+
     getSelectAllButton() {
-      return selectedApps.isEmpty
+      return selectedAppIds.isEmpty
           ? TextButton.icon(
               style: const ButtonStyle(visualDensity: VisualDensity.compact),
               onPressed: () {
@@ -480,17 +560,17 @@ class AppsPageState extends State<AppsPage> {
           : TextButton.icon(
               style: const ButtonStyle(visualDensity: VisualDensity.compact),
               onPressed: () {
-                selectedApps.isEmpty
+                selectedAppIds.isEmpty
                     ? selectThese(listedApps.map((e) => e.app).toList())
                     : clearSelected();
               },
               icon: Icon(
-                selectedApps.isEmpty
+                selectedAppIds.isEmpty
                     ? Icons.select_all_outlined
                     : Icons.deselect_outlined,
                 color: Theme.of(context).colorScheme.primary,
               ),
-              label: Text(selectedApps.length.toString()));
+              label: Text(selectedAppIds.length.toString()));
     }
 
     getMassObtainFunction() {
@@ -535,7 +615,7 @@ class AppsPageState extends State<AppsPage> {
                       items: formItems.map((e) => [e]).toList(),
                       initValid: true,
                     );
-                  }).then((values) {
+                  }).then((values) async {
                 if (values != null) {
                   if (values.isEmpty) {
                     values = getDefaultValuesFromFormItems([formItems]);
@@ -543,12 +623,6 @@ class AppsPageState extends State<AppsPage> {
                   bool shouldInstallUpdates = values['updates'] == true;
                   bool shouldInstallNew = values['installs'] == true;
                   bool shouldMarkTrackOnlies = values['trackonlies'] == true;
-                  (() async {
-                    if (shouldInstallNew || shouldInstallUpdates) {
-                      await settingsProvider.getInstallPermission();
-                    }
-                  })()
-                      .then((_) {
                   List<String> toInstall = [];
                   if (shouldInstallUpdates) {
                     toInstall.addAll(existingUpdateIdsAllOrSelected);
@@ -561,11 +635,11 @@ class AppsPageState extends State<AppsPage> {
                   }
                   appsProvider
                       .downloadAndInstallLatestApps(
-                            toInstall, globalNavigatorKey.currentContext)
+                          toInstall, globalNavigatorKey.currentContext,
+                          settingsProvider: settingsProvider)
                       .catchError((e) {
                     showError(e, context);
                   });
-                  });
                 }
               });
             };
@@ -638,7 +712,7 @@ class AppsPageState extends State<AppsPage> {
           builder: (BuildContext ctx) {
             return AlertDialog(
               title: Text(tr('markXSelectedAppsAsUpdated',
-                  args: [selectedApps.length.toString()])),
+                  args: [selectedAppIds.length.toString()])),
               content: Text(
                 tr('onlyWorksWithNonVersionDetectApps'),
                 style: const TextStyle(
@@ -673,18 +747,15 @@ class AppsPageState extends State<AppsPage> {
     }
 
     pinSelectedApps() {
-      () {
       var pinStatus = selectedApps.where((element) => element.pinned).isEmpty;
       appsProvider.saveApps(selectedApps.map((e) {
         e.pinned = pinStatus;
         return e;
       }).toList());
       Navigator.of(context).pop();
-      };
     }
 
-    resetSelectedAppsInstallStatuses() {
+    resetSelectedAppsInstallStatuses() async {
-      () async {
       try {
         var values = await showDialog(
             context: context,
@@ -694,7 +765,7 @@ class AppsPageState extends State<AppsPage> {
                 items: const [],
                 initValid: true,
                 message: tr('installStatusOfXWillBeResetExplanation',
-                      args: [plural('app', selectedApps.length)]),
+                    args: [plural('app', selectedAppIds.length)]),
               );
             });
         if (values != null) {
@@ -706,7 +777,6 @@ class AppsPageState extends State<AppsPage> {
       } finally {
         Navigator.of(context).pop();
       }
-      };
     }
 
     showMoreOptionsDialog() {
@@ -754,7 +824,7 @@ class AppsPageState extends State<AppsPage> {
                         icon: const Icon(Icons.share),
                       ),
                       IconButton(
-                        onPressed: resetSelectedAppsInstallStatuses(),
+                        onPressed: resetSelectedAppsInstallStatuses,
                         tooltip: tr('resetInstallStatus'),
                         icon: const Icon(Icons.restore_page_outlined),
                       ),
@@ -770,7 +840,7 @@ class AppsPageState extends State<AppsPage> {
         children: [
           IconButton(
             visualDensity: VisualDensity.compact,
-            onPressed: selectedApps.isEmpty
+            onPressed: selectedAppIds.isEmpty
                 ? null
                 : () {
                     appsProvider.removeAppsWithModal(
@@ -782,7 +852,7 @@ class AppsPageState extends State<AppsPage> {
           IconButton(
               visualDensity: VisualDensity.compact,
               onPressed: getMassObtainFunction(),
-              tooltip: selectedApps.isEmpty
+              tooltip: selectedAppIds.isEmpty
                   ? tr('installUpdateApps')
                   : tr('installUpdateSelectedApps'),
               icon: const Icon(
@@ -790,13 +860,13 @@ class AppsPageState extends State<AppsPage> {
               )),
           IconButton(
             visualDensity: VisualDensity.compact,
-            onPressed: selectedApps.isEmpty ? null : launchCategorizeDialog(),
+            onPressed: selectedAppIds.isEmpty ? null : launchCategorizeDialog(),
             tooltip: tr('categorize'),
             icon: const Icon(Icons.category_outlined),
           ),
           IconButton(
             visualDensity: VisualDensity.compact,
-            onPressed: selectedApps.isEmpty ? null : showMoreOptionsDialog,
+            onPressed: selectedAppIds.isEmpty ? null : showMoreOptionsDialog,
             tooltip: tr('more'),
             icon: const Icon(Icons.more_horiz),
           ),
@@ -832,6 +902,19 @@ class AppsPageState extends State<AppsPage> {
                   GeneratedFormSwitch('nonInstalledApps',
                       label: tr('nonInstalledApps'),
                       defaultValue: vals['nonInstalledApps'])
+                ],
+                [
+                  GeneratedFormDropdown(
+                      'sourceFilter',
+                      label: tr('appSource'),
+                      defaultValue: filter.sourceFilter,
+                      [
+                        MapEntry('', tr('none')),
+                        ...sourceProvider.sources
+                            .map((e) =>
+                                MapEntry(e.runtimeType.toString(), e.name))
+                            .toList()
+                      ])
                 ]
               ],
               additionalWidgets: [
@@ -903,6 +986,22 @@ class AppsPageState extends State<AppsPage> {
       );
     }
 
+    getDisplayedList() {
+      return settingsProvider.groupByCategory &&
+              !(listedCategories.isEmpty ||
+                  (listedCategories.length == 1 && listedCategories[0] == null))
+          ? SliverList(
+              delegate:
+                  SliverChildBuilderDelegate((BuildContext context, int index) {
+              return getCategoryCollapsibleTile(index);
+            }, childCount: listedCategories.length))
+          : SliverList(
+              delegate:
+                  SliverChildBuilderDelegate((BuildContext context, int index) {
+              return getSingleAppHorizTile(index);
+            }, childCount: listedApps.length));
+    }
+
     return Scaffold(
       backgroundColor: Theme.of(context).colorScheme.surface,
       body: RefreshIndicator(
@@ -922,11 +1021,7 @@ class AppsPageState extends State<AppsPage> {
           child: CustomScrollView(slivers: <Widget>[
             CustomAppBar(title: tr('appsString')),
             ...getLoadingWidgets(),
-            SliverList(
+            getDisplayedList()
-                delegate: SliverChildBuilderDelegate(
-                    (BuildContext context, int index) {
-              return getSingleAppHorizTile(index);
-            }, childCount: listedApps.length))
           ])),
       persistentFooterButtons: appsProvider.apps.isEmpty
           ? null
@@ -943,20 +1038,23 @@ class AppsFilter {
   late bool includeUptodate;
   late bool includeNonInstalled;
   late Set<String> categoryFilter;
+  late String sourceFilter;
 
   AppsFilter(
       {this.nameFilter = '',
       this.authorFilter = '',
       this.includeUptodate = true,
       this.includeNonInstalled = true,
-      this.categoryFilter = const {}});
+      this.categoryFilter = const {},
+      this.sourceFilter = ''});
 
   Map<String, dynamic> toFormValuesMap() {
     return {
       'appName': nameFilter,
       'author': authorFilter,
       'upToDateApps': includeUptodate,
-      'nonInstalledApps': includeNonInstalled
+      'nonInstalledApps': includeNonInstalled,
+      'sourceFilter': sourceFilter
     };
   }
 
@@ -965,6 +1063,7 @@ class AppsFilter {
     authorFilter = values['author']!;
     includeUptodate = values['upToDateApps'];
     includeNonInstalled = values['nonInstalledApps'];
+    sourceFilter = values['sourceFilter'];
   }
 
   bool isIdenticalTo(AppsFilter other, SettingsProvider settingsProvider) =>
@@ -972,5 +1071,6 @@ class AppsFilter {
       nameFilter.trim() == other.nameFilter.trim() &&
       includeUptodate == other.includeUptodate &&
       includeNonInstalled == other.includeNonInstalled &&
-      settingsProvider.setEqual(categoryFilter, other.categoryFilter);
+      settingsProvider.setEqual(categoryFilter, other.categoryFilter) &&
+      sourceFilter.trim() == other.sourceFilter.trim();
 }

lib/pages/import_export.dart

@@ -133,7 +133,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                 }
               }
             });
-            settingsProvider.categories = cats;
+            appsProvider.addMissingCategories(settingsProvider);
             showError(tr('importedX', args: [plural('apps', value)]), context);
           });
         } else {
@@ -506,7 +506,7 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
           widget.onlyOneSelectionAllowed ? tr('selectURL') : tr('selectURLs')),
       content: Column(children: [
         ...urlWithDescriptionSelections.keys.map((urlWithD) {
-          select(bool? value) {
+          selectThis(bool? value) {
             setState(() {
               value ??= false;
               if (value! && widget.onlyOneSelectionAllowed) {
@@ -517,11 +517,56 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
             });
           }
 
-          return Row(children: [
+          var urlLink = GestureDetector(
+              onTap: () {
+                launchUrlString(urlWithD.key,
+                    mode: LaunchMode.externalApplication);
+              },
+              child: Text(
+                Uri.parse(urlWithD.key).path.substring(1),
+                style: const TextStyle(decoration: TextDecoration.underline),
+                textAlign: TextAlign.start,
+              ));
+
+          var descriptionText = Text(
+            urlWithD.value.length > 128
+                ? '${urlWithD.value.substring(0, 128)}...'
+                : urlWithD.value,
+            style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
+          );
+
+          var selectedUrlsWithDs = urlWithDescriptionSelections.entries
+              .where((e) => e.value)
+              .toList();
+
+          var singleSelectTile = ListTile(
+            title: urlLink,
+            subtitle: GestureDetector(
+              onTap: () {
+                setState(() {
+                  selectOnlyOne(urlWithD.key);
+                });
+              },
+              child: descriptionText,
+            ),
+            leading: Radio<String>(
+              value: urlWithD.key,
+              groupValue: selectedUrlsWithDs.isEmpty
+                  ? null
+                  : selectedUrlsWithDs.first.key.key,
+              onChanged: (value) {
+                setState(() {
+                  selectOnlyOne(urlWithD.key);
+                });
+              },
+            ),
+          );
+
+          var multiSelectTile = Row(children: [
             Checkbox(
                 value: urlWithDescriptionSelections[urlWithD],
                 onChanged: (value) {
-                  select(value);
+                  selectThis(value);
                 }),
             const SizedBox(
               width: 8,
@@ -534,28 +579,13 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
                 const SizedBox(
                   height: 8,
                 ),
+                urlLink,
                 GestureDetector(
                   onTap: () {
-                      launchUrlString(urlWithD.key,
+                    selectThis(
-                          mode: LaunchMode.externalApplication);
+                        !(urlWithDescriptionSelections[urlWithD] ?? false));
                   },
-                    child: Text(
+                  child: descriptionText,
-                      Uri.parse(urlWithD.key).path.substring(1),
-                      style:
-                          const TextStyle(decoration: TextDecoration.underline),
-                      textAlign: TextAlign.start,
-                    )),
-                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,
@@ -563,6 +593,10 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
               ],
             ))
           ]);
+
+          return widget.onlyOneSelectionAllowed
+              ? singleSelectTile
+              : multiSelectTile;
         })
       ]),
       actions: [

lib/pages/settings.dart

@@ -6,6 +6,7 @@ import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
+import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -223,6 +224,17 @@ class _SettingsPageState extends State<SettingsPage> {
                             ),
                             themeDropdown,
                             height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(tr('useBlackTheme')),
+                                Switch(
+                                    value: settingsProvider.useBlackTheme,
+                                    onChanged: (value) {
+                                      settingsProvider.useBlackTheme = value;
+                                    })
+                              ],
+                            ),
                             colourDropdown,
                             height16,
                             Row(
@@ -262,6 +274,46 @@ class _SettingsPageState extends State<SettingsPage> {
                                     })
                               ],
                             ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(tr('groupByCategory')),
+                                Switch(
+                                    value: settingsProvider.groupByCategory,
+                                    onChanged: (value) {
+                                      settingsProvider.groupByCategory = value;
+                                    })
+                              ],
+                            ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(tr('dontShowTrackOnlyWarnings')),
+                                Switch(
+                                    value:
+                                        settingsProvider.hideTrackOnlyWarning,
+                                    onChanged: (value) {
+                                      settingsProvider.hideTrackOnlyWarning =
+                                          value;
+                                    })
+                              ],
+                            ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(tr('dontShowAPKOriginWarnings')),
+                                Switch(
+                                    value:
+                                        settingsProvider.hideAPKOriginWarning,
+                                    onChanged: (value) {
+                                      settingsProvider.hideAPKOriginWarning =
+                                          value;
+                                    })
+                              ],
+                            ),
                             const Divider(
                               height: 16,
                             ),
@@ -432,6 +484,7 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
   @override
   Widget build(BuildContext context) {
     var settingsProvider = context.watch<SettingsProvider>();
+    var appsProvider = context.watch<AppsProvider>();
     storedValues = settingsProvider.categories.map((key, value) => MapEntry(
         key,
         MapEntry(value,
@@ -455,8 +508,9 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
           if (!isBuilding) {
             storedValues =
                 values['categories'] as Map<String, MapEntry<int, bool>>;
-            settingsProvider.categories =
+            settingsProvider.setCategories(
-                storedValues.map((key, value) => MapEntry(key, value.key));
+                storedValues.map((key, value) => MapEntry(key, value.key)),
+                appsProvider: appsProvider);
             if (widget.onSelected != null) {
               widget.onSelected!(storedValues.keys
                   .where((k) => storedValues[k]!.value)

lib/providers/apps_provider.dart

@@ -34,6 +34,10 @@ class AppInMemory {
   AppInfo? installedInfo;
 
   AppInMemory(this.app, this.downloadProgress, this.installedInfo);
+  AppInMemory deepCopy() =>
+      AppInMemory(app.deepCopy(), downloadProgress, installedInfo);
+
+  String get name => app.overrideName ?? installedInfo?.name ?? app.finalName;
 }
 
 class DownloadedApk {
@@ -97,6 +101,8 @@ class AppsProvider with ChangeNotifier {
   late Stream<FGBGType>? foregroundStream;
   late StreamSubscription<FGBGType>? foregroundSubscription;
 
+  Iterable<AppInMemory> getAppValues() => apps.values.map((a) => a.deepCopy());
+
   AppsProvider() {
     // Subscribe to changes in the app foreground status
     foregroundStream = FGBGEvents.stream.asBroadcastStream();
@@ -159,18 +165,17 @@ class AppsProvider with ChangeNotifier {
   Future<DownloadedApk> downloadApp(App app, BuildContext? context) async {
     NotificationsProvider? notificationsProvider =
         context?.read<NotificationsProvider>();
-    var notifId = DownloadNotification(app.name, 0).id;
+    var notifId = DownloadNotification(app.finalName, 0).id;
     if (apps[app.id] != null) {
       apps[app.id]!.downloadProgress = 0;
       notifyListeners();
     }
     try {
-      var fileName =
-          '${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk';
       String downloadUrl = await SourceProvider()
-          .getSource(app.url)
+          .getSource(app.url, overrideSource: app.overrideSource)
-          .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex]);
+          .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex].value);
-      var notif = DownloadNotification(app.name, 100);
+      var fileName = '${app.id}-${downloadUrl.hashCode}.apk';
+      var notif = DownloadNotification(app.finalName, 100);
       notificationsProvider?.cancel(notif.id);
       int? prevProg;
       File downloadedFile =
@@ -180,7 +185,7 @@ class AppsProvider with ChangeNotifier {
           apps[app.id]!.downloadProgress = progress;
           notifyListeners();
         }
-        notif = DownloadNotification(app.name, prog ?? 100);
+        notif = DownloadNotification(app.finalName, prog ?? 100);
         if (prog != null && prevProg != prog) {
           notificationsProvider?.notify(notif);
         }
@@ -199,16 +204,17 @@ class AppsProvider with ChangeNotifier {
       // The former case should be handled (give the App its real ID), the latter is a security issue
       var newInfo = await PackageArchiveInfo.fromPath(downloadedFile.path);
       if (app.id != newInfo.packageName) {
-        if (apps[app.id] != null && !SourceProvider().isTempId(app)) {
+        var isTempId = SourceProvider().isTempId(app);
+        if (apps[app.id] != null && !isTempId) {
           throw IDChangedError();
         }
         var originalAppId = app.id;
         app.id = newInfo.packageName;
         downloadedFile = downloadedFile.renameSync(
-            '${downloadedFile.parent.path}/${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk');
+            '${downloadedFile.parent.path}/${app.id}-${downloadUrl.hashCode}.apk');
         if (apps[originalAppId] != null) {
           await removeApps([originalAppId]);
-          await saveApps([app]);
+          await saveApps([app], onlyIfExists: !isTempId);
         }
       }
       return DownloadedApk(app.id, downloadedFile);
@@ -296,9 +302,11 @@ class AppsProvider with ChangeNotifier {
     await intent.launch();
   }
 
-  Future<String?> confirmApkUrl(App app, BuildContext? context) async {
+  Future<MapEntry<String, 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];
+    MapEntry<String, String>? apkUrl =
+        app.apkUrls[app.preferredApkIndex >= 0 ? app.preferredApkIndex : 0];
     // get device supported architecture
     List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
 
@@ -321,14 +329,17 @@ class AppsProvider with ChangeNotifier {
 
     // If the picked APK comes from an origin different from the source, get user confirmation (if context provided)
     if (apkUrl != null &&
-        getHost(apkUrl) != getHost(app.url) &&
+        getHost(apkUrl.value) != getHost(app.url) &&
         context != null) {
       // ignore: use_build_context_synchronously
-      if (await showDialog(
+      var settingsProvider = context.read<SettingsProvider>();
+      if (!(settingsProvider.hideAPKOriginWarning) &&
+          // ignore: use_build_context_synchronously
+          await showDialog(
                   context: context,
                   builder: (BuildContext ctx) {
                     return APKOriginWarningDialog(
-                    sourceUrl: app.url, apkUrl: apkUrl!);
+                        sourceUrl: app.url, apkUrl: apkUrl!.value);
                   }) !=
               true) {
         apkUrl = null;
@@ -343,7 +354,8 @@ class AppsProvider with ChangeNotifier {
   // If user input is needed and the App is in the background, a notification is sent to get the user's attention
   // Returns an array of Ids for Apps that were successfully downloaded, regardless of installation result
   Future<List<String>> downloadAndInstallLatestApps(
-      List<String> appIds, BuildContext? context) async {
+      List<String> appIds, BuildContext? context,
+      {SettingsProvider? settingsProvider}) async {
     List<String> appsToInstall = [];
     List<String> trackOnlyAppsToUpdate = [];
     // For all specified Apps, filter out those for which:
@@ -353,14 +365,19 @@ class AppsProvider with ChangeNotifier {
       if (apps[id] == null) {
         throw ObtainiumError(tr('appNotFound'));
       }
-      String? apkUrl;
+      MapEntry<String, String>? apkUrl;
       var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == true;
       if (!trackOnly) {
         apkUrl = await confirmApkUrl(apps[id]!.app, context);
       }
       if (apkUrl != null) {
-        int urlInd = apps[id]!.app.apkUrls.indexOf(apkUrl);
+        int urlInd = apps[id]!
-        if (urlInd != apps[id]!.app.preferredApkIndex) {
+            .app
+            .apkUrls
+            .map((e) => e.value)
+            .toList()
+            .indexOf(apkUrl.value);
+        if (urlInd >= 0 && urlInd != apps[id]!.app.preferredApkIndex) {
           apps[id]!.app.preferredApkIndex = urlInd;
           await saveApps([apps[id]!.app]);
         }
@@ -427,6 +444,11 @@ class AppsProvider with ChangeNotifier {
     silentUpdates = moveObtainiumToStart(silentUpdates);
     regularInstalls = moveObtainiumToStart(regularInstalls);
 
+    if (!(await settingsProvider?.getInstallPermission(enforce: false) ??
+        true)) {
+      throw ObtainiumError(tr('cancelled'));
+    }
+
     // // Install silent updates (uncomment when it works - TODO)
     // for (var u in silentUpdates) {
     //   await installApk(u, silent: true); // Would need to add silent option
@@ -634,10 +656,10 @@ class AppsProvider with ChangeNotifier {
     for (int i = 0; i < newApps.length; i++) {
       var info = await getInstalledInfo(newApps[i].id);
       try {
-        sp.getSource(newApps[i].url);
+        sp.getSource(newApps[i].url, overrideSource: newApps[i].overrideSource);
         apps[newApps[i].id] = AppInMemory(newApps[i], null, info);
       } catch (e) {
-        errors.add([newApps[i].id, newApps[i].name, e.toString()]);
+        errors.add([newApps[i].id, newApps[i].finalName, e.toString()]);
       }
     }
     if (errors.isNotEmpty) {
@@ -667,7 +689,8 @@ class AppsProvider with ChangeNotifier {
       bool onlyIfExists = true}) async {
     attemptToCorrectInstallStatus =
         attemptToCorrectInstallStatus && (await doesInstalledAppsPluginWork());
-    for (var app in apps) {
+    for (var a in apps) {
+      var app = a.deepCopy();
       AppInfo? info = await getInstalledInfo(app.id);
       app.name = info?.name ?? app.name;
       if (attemptToCorrectInstallStatus) {
@@ -757,11 +780,24 @@ class AppsProvider with ChangeNotifier {
     await intent.launch();
   }
 
+  addMissingCategories(SettingsProvider settingsProvider) {
+    var cats = settingsProvider.categories;
+    apps.forEach((key, value) {
+      for (var c in value.app.categories) {
+        if (!cats.containsKey(c)) {
+          cats[c] = generateRandomLightColor().value;
+        }
+      }
+    });
+    settingsProvider.setCategories(cats, appsProvider: this);
+  }
+
   Future<App?> checkUpdate(String appId) async {
     App? currentApp = apps[appId]!.app;
     SourceProvider sourceProvider = SourceProvider();
     App newApp = await sourceProvider.getApp(
-        sourceProvider.getSource(currentApp.url),
+        sourceProvider.getSource(currentApp.url,
+            overrideSource: currentApp.overrideSource),
         currentApp.url,
         currentApp.additionalSettings,
         currentApp: currentApp);
@@ -836,12 +872,6 @@ class AppsProvider with ChangeNotifier {
   }
 
   Future<String> exportApps() async {
-    Directory? exportDir = Directory('/storage/emulated/0/Download');
-    String path = 'Downloads'; // TODO: See if hardcoding this can be avoided
-    if (!exportDir.existsSync()) {
-      exportDir = await getExternalStorageDirectory();
-      path = exportDir!.path;
-    }
     if ((await DeviceInfoPlugin().androidInfo).version.sdkInt <= 29) {
       if (await Permission.storage.isDenied) {
         await Permission.storage.request();
@@ -850,6 +880,18 @@ class AppsProvider with ChangeNotifier {
         throw ObtainiumError(tr('storagePermissionDenied'));
       }
     }
+    Directory? exportDir = Directory('/storage/emulated/0/Download');
+    String path = 'Downloads'; // TODO: See if hardcoding this can be avoided
+    var downloadsAccessible = false;
+    try {
+      downloadsAccessible = exportDir.existsSync();
+    } catch (e) {
+      logs.add('Error accessing Downloads (will use fallback): $e');
+    }
+    if (!downloadsAccessible) {
+      exportDir = await getExternalStorageDirectory();
+      path = exportDir!.path;
+    }
     File export = File(
         '${exportDir.path}/${tr('obtainiumExportHyphenatedLowercase')}-${DateTime.now().millisecondsSinceEpoch}.json');
     export.writeAsStringSync(
@@ -882,7 +924,7 @@ class AppsProvider with ChangeNotifier {
 
   Future<List<List<String>>> addAppsByURL(List<String> urls) async {
     List<dynamic> results = await SourceProvider().getAppsByURLNaive(urls,
-        ignoreUrls: apps.values.map((e) => e.app.url).toList());
+        alreadyAddedUrls: apps.values.map((e) => e.app.url).toList());
     List<App> pps = results[0];
     Map<String, dynamic> errorsMap = results[1];
     for (var app in pps) {
@@ -902,7 +944,7 @@ class APKPicker extends StatefulWidget {
   const APKPicker({super.key, required this.app, this.initVal, this.archs});
 
   final App app;
-  final String? initVal;
+  final MapEntry<String, String>? initVal;
   final List<String>? archs;
 
   @override
@@ -910,7 +952,7 @@ class APKPicker extends StatefulWidget {
 }
 
 class _APKPickerState extends State<APKPicker> {
-  String? apkUrl;
+  MapEntry<String, String>? apkUrl;
 
   @override
   Widget build(BuildContext context) {
@@ -919,19 +961,17 @@ class _APKPickerState extends State<APKPicker> {
       scrollable: true,
       title: Text(tr('pickAnAPK')),
       content: Column(children: [
-        Text(tr('appHasMoreThanOnePackage', args: [widget.app.name])),
+        Text(tr('appHasMoreThanOnePackage', args: [widget.app.finalName])),
         const SizedBox(height: 16),
         ...widget.app.apkUrls.map(
           (u) => RadioListTile<String>(
-              title: Text(Uri.parse(u)
+              title: Text(u.key),
-                  .pathSegments
+              value: u.value,
-                  .where((element) => element.isNotEmpty)
+              groupValue: apkUrl!.value,
-                  .last),
-              value: u,
-              groupValue: apkUrl,
               onChanged: (String? val) {
                 setState(() {
-                  apkUrl = val;
+                  apkUrl =
+                      widget.app.apkUrls.where((e) => e.value == val).first;
                 });
               }),
         ),

lib/providers/notifications_provider.dart

@@ -34,9 +34,9 @@ class UpdateNotification extends ObtainiumNotification {
     message = updates.isEmpty
         ? tr('noNewUpdates')
         : updates.length == 1
-            ? tr('xHasAnUpdate', args: [updates[0].name])
+            ? tr('xHasAnUpdate', args: [updates[0].finalName])
             : plural('xAndNMoreUpdatesAvailable', updates.length - 1,
-                args: [updates[0].name, (updates.length - 1).toString()]);
+                args: [updates[0].finalName, (updates.length - 1).toString()]);
   }
 }
 
@@ -46,9 +46,9 @@ class SilentUpdateNotification extends ObtainiumNotification {
             tr('appsUpdatedNotifDescription'), Importance.defaultImportance) {
     message = updates.length == 1
         ? tr('xWasUpdatedToY',
-            args: [updates[0].name, updates[0].latestVersion])
+            args: [updates[0].finalName, updates[0].latestVersion])
         : plural('xAndNMoreUpdatesInstalled', updates.length - 1,
-            args: [updates[0].name, (updates.length - 1).toString()]);
+            args: [updates[0].finalName, (updates.length - 1).toString()]);
   }
 }
 

lib/providers/settings_provider.dart

@@ -7,6 +7,8 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/main.dart';
+import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/source_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -62,6 +64,15 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  bool get useBlackTheme {
+    return prefs?.getBool('useBlackTheme') ?? false;
+  }
+
+  set useBlackTheme(bool useBlackTheme) {
+    prefs?.setBool('useBlackTheme', useBlackTheme);
+    notifyListeners();
+  }
+
   int get updateInterval {
     var min = prefs?.getInt('updateInterval') ?? 360;
     if (!updateIntervals.contains(min)) {
@@ -109,16 +120,20 @@ class SettingsProvider with ChangeNotifier {
     return result;
   }
 
-  Future<void> getInstallPermission() async {
+  Future<bool> getInstallPermission({bool enforce = false}) async {
     while (!(await Permission.requestInstallPackages.isGranted)) {
       // Explicit request as InstallPlugin request sometimes bugged
       Fluttertoast.showToast(
           msg: tr('pleaseAllowInstallPerm'), toastLength: Toast.LENGTH_LONG);
       if ((await Permission.requestInstallPackages.request()) ==
           PermissionStatus.granted) {
-        break;
+        return true;
+      }
+      if (!enforce) {
+        return false;
       }
     }
+    return true;
   }
 
   bool get showAppWebpage {
@@ -139,6 +154,33 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  bool get groupByCategory {
+    return prefs?.getBool('groupByCategory') ?? false;
+  }
+
+  set groupByCategory(bool show) {
+    prefs?.setBool('groupByCategory', show);
+    notifyListeners();
+  }
+
+  bool get hideTrackOnlyWarning {
+    return prefs?.getBool('hideTrackOnlyWarning') ?? false;
+  }
+
+  set hideTrackOnlyWarning(bool show) {
+    prefs?.setBool('hideTrackOnlyWarning', show);
+    notifyListeners();
+  }
+
+  bool get hideAPKOriginWarning {
+    return prefs?.getBool('hideAPKOriginWarning') ?? false;
+  }
+
+  set hideAPKOriginWarning(bool show) {
+    prefs?.setBool('hideAPKOriginWarning', show);
+    notifyListeners();
+  }
+
   String? getSettingString(String settingId) {
     return prefs?.getString(settingId);
   }
@@ -151,7 +193,23 @@ class SettingsProvider with ChangeNotifier {
   Map<String, int> get categories =>
       Map<String, int>.from(jsonDecode(prefs?.getString('categories') ?? '{}'));
 
-  set categories(Map<String, int> cats) {
+  void setCategories(Map<String, int> cats, {AppsProvider? appsProvider}) {
+    if (appsProvider != null) {
+      List<App> changedApps = appsProvider
+          .getAppValues()
+          .map((a) {
+            var n1 = a.app.categories.length;
+            a.app.categories.removeWhere((c) => !cats.keys.contains(c));
+            return n1 > a.app.categories.length ? a.app : null;
+          })
+          .where((element) => element != null)
+          .map((e) => e as App)
+          .toList();
+      if (changedApps.isNotEmpty) {
+        appsProvider.saveApps(changedApps,
+            attemptToCorrectInstallStatus: false);
+      }
+    }
     prefs?.setString('categories', jsonEncode(cats));
     notifyListeners();
   }

lib/providers/source_provider.dart

@@ -3,6 +3,7 @@
 
 import 'dart:convert';
 
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/dom.dart';
 import 'package:http/http.dart';
@@ -34,7 +35,7 @@ class AppNames {
 
 class APKDetails {
   late String version;
-  late List<String> apkUrls;
+  late List<MapEntry<String, String>> apkUrls;
   late AppNames names;
   late DateTime? releaseDate;
   late String? changeLog;
@@ -43,44 +44,17 @@ class APKDetails {
       {this.releaseDate, this.changeLog});
 }
 
-class App {
+stringMapListTo2DList(List<MapEntry<String, String>> mapList) =>
-  late String id;
+    mapList.map((e) => [e.key, e.value]).toList();
-  late String url;
-  late String author;
-  late String name;
-  String? installedVersion;
-  late String latestVersion;
-  List<String> apkUrls = [];
-  late int preferredApkIndex;
-  late Map<String, dynamic> additionalSettings;
-  late DateTime? lastUpdateCheck;
-  bool pinned = false;
-  List<String> categories;
-  late DateTime? releaseDate;
-  late String? changeLog;
-  App(
-      this.id,
-      this.url,
-      this.author,
-      this.name,
-      this.installedVersion,
-      this.latestVersion,
-      this.apkUrls,
-      this.preferredApkIndex,
-      this.additionalSettings,
-      this.lastUpdateCheck,
-      this.pinned,
-      {this.categories = const [],
-      this.releaseDate,
-      this.changeLog});
 
-  @override
+assumed2DlistToStringMapList(List<dynamic> arr) =>
-  String toString() {
+    arr.map((e) => MapEntry(e[0] as String, e[1] as String)).toList();
-    return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls PREFERREDAPK: $preferredApkIndex ADDITIONALSETTINGS: ${additionalSettings.toString()} LASTCHECK: ${lastUpdateCheck.toString()} PINNED $pinned';
-  }
 
-  factory App.fromJson(Map<String, dynamic> json) {
+// App JSON schema has changed multiple times over the many versions of Obtainium
-    var source = SourceProvider().getSource(json['url']);
+// This function takes an App JSON and modifies it if needed to conform to the latest (current) version
+appJSONCompatibilityModifiers(Map<String, dynamic> json) {
+  var source = SourceProvider()
+      .getSource(json['url'], overrideSource: json['overrideSource']);
   var formItems = source.combinedAppSpecificSettingFormItems
       .reduce((value, element) => [...value, ...element]);
   Map<String, dynamic> additionalSettings =
@@ -128,12 +102,114 @@ class App {
           item.ensureType(additionalSettings[item.key]);
     }
   }
-    int preferredApkIndex = json['preferredApkIndex'] == null
+  int preferredApkIndex =
-        ? 0
+      json['preferredApkIndex'] == null ? 0 : json['preferredApkIndex'] as int;
-        : json['preferredApkIndex'] as int;
   if (preferredApkIndex < 0) {
     preferredApkIndex = 0;
   }
+  json['preferredApkIndex'] = preferredApkIndex;
+  // apkUrls can either be old list or new named list apkUrls
+  List<MapEntry<String, String>> apkUrls = [];
+  if (json['apkUrls'] != null) {
+    var apkUrlJson = jsonDecode(json['apkUrls']);
+    try {
+      apkUrls = getApkUrlsFromUrls(List<String>.from(apkUrlJson));
+    } catch (e) {
+      apkUrls = assumed2DlistToStringMapList(List<dynamic>.from(apkUrlJson));
+      apkUrls = List<dynamic>.from(apkUrlJson)
+          .map((e) => MapEntry(e[0] as String, e[1] as String))
+          .toList();
+    }
+    json['apkUrls'] = jsonEncode(stringMapListTo2DList(apkUrls));
+  }
+  // Arch based APK filter option should be disabled if it previously did not exist
+  if (additionalSettings['autoApkFilterByArch'] == null) {
+    additionalSettings['autoApkFilterByArch'] = false;
+  }
+  json['additionalSettings'] = jsonEncode(additionalSettings);
+  // F-Droid no longer needs cloudflare exception since override can be used - migrate apps appropriately
+  // This allows us to reverse the changes made for issue #418 (support cloudflare.f-droid)
+  // While not causing problems for existing apps from that source that were added in a previous version
+  var overrideSourceWasUndefined = !json.keys.contains('overrideSource');
+  if ((json['url'] as String).startsWith('https://cloudflare.f-droid.org')) {
+    json['overrideSource'] = FDroid().runtimeType.toString();
+  } else if (overrideSourceWasUndefined) {
+    // Similar to above, but for third-party F-Droid repos
+    RegExpMatch? match = RegExp('^https?://.+/fdroid/([^/]+(/|\\?)|[^/]+\$)')
+        .firstMatch(json['url'] as String);
+    if (match != null) {
+      json['overrideSource'] = FDroidRepo().runtimeType.toString();
+    }
+  }
+  return json;
+}
+
+class App {
+  late String id;
+  late String url;
+  late String author;
+  late String name;
+  String? installedVersion;
+  late String latestVersion;
+  List<MapEntry<String, String>> apkUrls = [];
+  late int preferredApkIndex;
+  late Map<String, dynamic> additionalSettings;
+  late DateTime? lastUpdateCheck;
+  bool pinned = false;
+  List<String> categories;
+  late DateTime? releaseDate;
+  late String? changeLog;
+  late String? overrideSource;
+  App(
+      this.id,
+      this.url,
+      this.author,
+      this.name,
+      this.installedVersion,
+      this.latestVersion,
+      this.apkUrls,
+      this.preferredApkIndex,
+      this.additionalSettings,
+      this.lastUpdateCheck,
+      this.pinned,
+      {this.categories = const [],
+      this.releaseDate,
+      this.changeLog,
+      this.overrideSource});
+
+  @override
+  String toString() {
+    return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls PREFERREDAPK: $preferredApkIndex ADDITIONALSETTINGS: ${additionalSettings.toString()} LASTCHECK: ${lastUpdateCheck.toString()} PINNED $pinned';
+  }
+
+  String? get overrideName =>
+      additionalSettings['appName']?.toString().trim().isNotEmpty == true
+          ? additionalSettings['appName']
+          : null;
+
+  String get finalName {
+    return overrideName ?? name;
+  }
+
+  App deepCopy() => App(
+      id,
+      url,
+      author,
+      name,
+      installedVersion,
+      latestVersion,
+      apkUrls,
+      preferredApkIndex,
+      Map.from(additionalSettings),
+      lastUpdateCheck,
+      pinned,
+      categories: categories,
+      changeLog: changeLog,
+      releaseDate: releaseDate,
+      overrideSource: overrideSource);
+
+  factory App.fromJson(Map<String, dynamic> json) {
+    json = appJSONCompatibilityModifiers(json);
     return App(
         json['id'] as String,
         json['url'] as String,
@@ -143,11 +219,9 @@ class App {
             ? null
             : json['installedVersion'] as String,
         json['latestVersion'] as String,
-        json['apkUrls'] == null
+        assumed2DlistToStringMapList(jsonDecode(json['apkUrls'])),
-            ? []
+        json['preferredApkIndex'] as int,
-            : List<String>.from(jsonDecode(json['apkUrls'])),
+        jsonDecode(json['additionalSettings']) as Map<String, dynamic>,
-        preferredApkIndex,
-        additionalSettings,
         json['lastUpdateCheck'] == null
             ? null
             : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
@@ -163,7 +237,8 @@ class App {
             ? null
             : DateTime.fromMicrosecondsSinceEpoch(json['releaseDate']),
         changeLog:
-            json['changeLog'] == null ? null : json['changeLog'] as String);
+            json['changeLog'] == null ? null : json['changeLog'] as String,
+        overrideSource: json['overrideSource']);
   }
 
   Map<String, dynamic> toJson() => {
@@ -173,14 +248,15 @@ class App {
         'name': name,
         'installedVersion': installedVersion,
         'latestVersion': latestVersion,
-        'apkUrls': jsonEncode(apkUrls),
+        'apkUrls': jsonEncode(stringMapListTo2DList(apkUrls)),
         'preferredApkIndex': preferredApkIndex,
         'additionalSettings': jsonEncode(additionalSettings),
         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
         'pinned': pinned,
         'categories': categories,
         'releaseDate': releaseDate?.microsecondsSinceEpoch,
-        'changeLog': changeLog
+        'changeLog': changeLog,
+        'overrideSource': overrideSource
       };
 }
 
@@ -225,8 +301,16 @@ Map<String, dynamic> getDefaultValuesFromFormItems(
       .reduce((value, element) => [...value, ...element]));
 }
 
-class AppSource {
+List<MapEntry<String, String>> getApkUrlsFromUrls(List<String> urls) =>
+    urls.map((e) {
+      var segments = e.split('/').where((el) => el.trim().isNotEmpty);
+      var apkSegs = segments.where((s) => s.toLowerCase().endsWith('.apk'));
+      return MapEntry(apkSegs.isNotEmpty ? apkSegs.last : segments.last, e);
+    }).toList();
+
+abstract class AppSource {
   String? host;
+  bool hostChanged = false;
   late String name;
   bool enforceTrackOnly = false;
   bool changeLogIfAnyIsMarkDown = true;
@@ -235,7 +319,15 @@ class AppSource {
     name = runtimeType.toString();
   }
 
-  String standardizeURL(String url) {
+  String standardizeUrl(String url) {
+    url = preStandardizeUrl(url);
+    if (!hostChanged) {
+      url = sourceSpecificStandardizeURL(url);
+    }
+    return url;
+  }
+
+  String sourceSpecificStandardizeURL(String url) {
     throw NotImplementedError();
   }
 
@@ -278,7 +370,12 @@ class AppSource {
               return regExValidator(value);
             }
           ])
-    ]
+    ],
+    [
+      GeneratedFormSwitch('autoApkFilterByArch',
+          label: tr('autoApkFilterByArch'), defaultValue: true)
+    ],
+    [GeneratedFormTextField('appName', label: tr('appName'), required: false)]
   ];
 
   // Previous 2 variables combined into one at runtime for convenient usage
@@ -336,7 +433,7 @@ regExValidator(String? value) {
 
 class SourceProvider {
   // Add more source classes here so they are available via the service
-  List<AppSource> sources = [
+  List<AppSource> get sources => [
         GitHub(),
         GitLab(),
         Codeberg(),
@@ -358,11 +455,22 @@ class SourceProvider {
   // Add more mass url source classes here so they are available via the service
   List<MassAppUrlSource> massUrlSources = [GitHubStars()];
 
-  AppSource getSource(String url) {
+  AppSource getSource(String url, {String? overrideSource}) {
     url = preStandardizeUrl(url);
+    if (overrideSource != null) {
+      var srcs =
+          sources.where((e) => e.runtimeType.toString() == overrideSource);
+      if (srcs.isEmpty) {
+        throw UnsupportedURLError();
+      }
+      var res = srcs.first;
+      res.host = Uri.parse(url).host;
+      res.hostChanged = true;
+      return srcs.first;
+    }
     AppSource? source;
     for (var s in sources.where((element) => element.host != null)) {
-      if (url.contains('://${s.host}')) {
+      if (RegExp('://${s.host}(/|\\z)?').hasMatch(url)) {
         source = s;
         break;
       }
@@ -370,7 +478,7 @@ class SourceProvider {
     if (source == null) {
       for (var s in sources.where((element) => element.host == null)) {
         try {
-          s.standardizeURL(url);
+          s.sourceSpecificStandardizeURL(url);
           source = s;
           break;
         } catch (e) {
@@ -406,12 +514,14 @@ class SourceProvider {
 
   Future<App> getApp(
       AppSource source, String url, Map<String, dynamic> additionalSettings,
-      {App? currentApp, bool trackOnlyOverride = false}) async {
+      {App? currentApp,
+      bool trackOnlyOverride = false,
+      String? overrideSource}) async {
     if (trackOnlyOverride || source.enforceTrackOnly) {
       additionalSettings['trackOnly'] = true;
     }
     var trackOnly = additionalSettings['trackOnly'] == true;
-    String standardUrl = source.standardizeURL(preStandardizeUrl(url));
+    String standardUrl = source.standardizeUrl(url);
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalSettings);
     if (additionalSettings['versionDetection'] == 'releaseDateAsVersion' &&
@@ -421,14 +531,29 @@ class SourceProvider {
     if (additionalSettings['apkFilterRegEx'] != null) {
       var reg = RegExp(additionalSettings['apkFilterRegEx']);
       apk.apkUrls =
-          apk.apkUrls.where((element) => reg.hasMatch(element)).toList();
+          apk.apkUrls.where((element) => reg.hasMatch(element.key)).toList();
     }
     if (apk.apkUrls.isEmpty && !trackOnly) {
       throw NoAPKError();
     }
+    if (apk.apkUrls.length > 1 &&
+        additionalSettings['autoApkFilterByArch'] == true) {
+      var abis = (await DeviceInfoPlugin().androidInfo).supportedAbis;
+      for (var abi in abis) {
+        var urls2 = apk.apkUrls
+            .where((element) => RegExp('.*$abi.*').hasMatch(element.key))
+            .toList();
+        if (urls2.isNotEmpty && urls2.length < apk.apkUrls.length) {
+          apk.apkUrls = urls2;
+          break;
+        }
+      }
+    }
     String apkVersion = apk.version.replaceAll('/', '-');
-    var name = currentApp?.name.trim() ??
+    var name = currentApp != null ? currentApp.name.trim() : '';
-        apk.names.name[0].toUpperCase() + apk.names.name.substring(1);
+    name = name.isNotEmpty
+        ? name
+        : apk.names.name[0].toUpperCase() + apk.names.name.substring(1);
     return App(
         currentApp?.id ??
             source.tryInferringAppId(standardUrl,
@@ -436,9 +561,7 @@ class SourceProvider {
             generateTempID(standardUrl, additionalSettings),
         standardUrl,
         apk.names.author[0].toUpperCase() + apk.names.author.substring(1),
-        name.trim().isNotEmpty
+        name,
-            ? name
-            : apk.names.name[0].toUpperCase() + apk.names.name.substring(1),
         currentApp?.installedVersion,
         apkVersion,
         apk.apkUrls,
@@ -448,16 +571,20 @@ class SourceProvider {
         currentApp?.pinned ?? false,
         categories: currentApp?.categories ?? const [],
         releaseDate: apk.releaseDate,
-        changeLog: apk.changeLog);
+        changeLog: apk.changeLog,
+        overrideSource: overrideSource ?? currentApp?.overrideSource);
   }
 
   // Returns errors in [results, errors] instead of throwing them
   Future<List<dynamic>> getAppsByURLNaive(List<String> urls,
-      {List<String> ignoreUrls = const []}) async {
+      {List<String> alreadyAddedUrls = const []}) async {
     List<App> apps = [];
     Map<String, dynamic> errors = {};
-    for (var url in urls.where((element) => !ignoreUrls.contains(element))) {
+    for (var url in urls) {
       try {
+        if (alreadyAddedUrls.contains(url)) {
+          throw ObtainiumError(tr('appAlreadyAdded'));
+        }
         var source = getSource(url);
         apps.add(await getApp(
             source,

pubspec.lock

@@ -5,18 +5,18 @@ packages:
     dependency: "direct main"
     description:
       name: android_alarm_manager_plus
-      sha256: "8647cc5f9339f3955a2bd9ec40e0f10c3a80049f31f80b3ffdd87e07bb73fce2"
+      sha256: "88a8001851fdc9bd54fa4e30d0277bb900a50f3d86ff244da7f027400bf23ac0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
   android_intent_plus:
     dependency: "direct main"
     description:
       name: android_intent_plus
-      sha256: "54810cb33945c2c10742cd746ea994822c115e9dbe189919bc63cb436e45a6af"
+      sha256: "04cbc7c332a6f0bba88fed354de78813e9d24049c1800aaf10f449c7adc22603"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.6"
+    version: "3.1.9"
   animations:
     dependency: "direct main"
     description:
@@ -117,10 +117,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "1d6e5a61674ba3a68fb048a7c7b4ff4bebfed8d7379dbe8f2b718231be9a7c95"
+      sha256: f52ab3b76b36ede4d135aab80194df8925b553686f0fa12226b4e2d658e45903
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.2.2"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -133,10 +133,10 @@ packages:
     dependency: "direct main"
     description:
       name: dynamic_color
-      sha256: c4a508284b14ec4dda5adba2c28b2cdd34fbae1afead7e8c52cad87d51c5405b
+      sha256: bbebb1b7ebed819e0ec83d4abdc2a8482d934f6a85289ffc1c6acf7589fa2aad
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.3"
   easy_localization:
     dependency: "direct main"
     description:
@@ -181,10 +181,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: d8e9ca7e5d1983365c277f12c21b4362df6cf659c99af146ad4d04eb33033013
+      sha256: b85eb92b175767fdaa0c543bf3b0d1f610fe966412ea72845fe5ba7801e763ff
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.6"
+    version: "5.2.10"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -210,26 +210,26 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: "293995f94e120c8afce768981bd1fa9c5d6de67c547568e3b42ae2defdcbb4a0"
+      sha256: "2876372952b65ca7f684e698eba22bda1cf581fa071dd30ba2f01900f507d0d1"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.0.0+1"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: ccb08b93703aeedb58856e5637450bf3ffec899adb66dc325630b68994734b89
+      sha256: "909bb95de05a2e793503a2437146285a2f600cd0b3f826e26b870a334d8586d7"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0+1"
+    version: "4.0.0"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "5ec1feac5f7f7d9266759488bc5f76416152baba9aa1b26fe572246caa00d1ab"
+      sha256: "63235c42de5b6c99846969a27ad0209c401e6b77b0498939813725b5791c107c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.0"
+    version: "7.0.0"
   flutter_localizations:
     dependency: transitive
     description: flutter
@@ -247,10 +247,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
+      sha256: "8ffe990dac54a4a5492747added38571a5ab474c8e5d196809ea08849c69b1bb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.9"
+    version: "2.0.13"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -337,10 +337,10 @@ packages:
     dependency: transitive
     description:
       name: markdown
-      sha256: b3c60dee8c2af50ad0e6e90cceba98e47718a6ee0a7a6772c77846a0cc21f78b
+      sha256: d95a9d12954aafc97f984ca29baaa7690ed4d9ec4140a23ad40580bcdb6c87f5
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.1"
+    version: "7.0.2"
   matcher:
     dependency: transitive
     description:
@@ -417,18 +417,18 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7"
+      sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.24"
+    version: "2.0.27"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "818b2dc38b0f178e0ea3f7cf3b28146faab11375985d815942a68eee11c2d0f7"
+      sha256: ad4c4d011830462633f03eb34445a45345673dfd4faf1ab0b4735fbd93b19183
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   path_provider_linux:
     dependency: transitive
     description:
@@ -449,10 +449,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130
+      sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.6"
   permission_handler:
     dependency: "direct main"
     description:
@@ -537,50 +537,50 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "8c6892037b1824e2d7e8f59d54b3105932899008642e6372e5079c6939b4b625"
+      sha256: b1f15232d41e9701ab2f04181f21610c36c83a12ae426b79b4bd011c567934b1
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.4"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "82ddd4ab9260c295e6e39612d4ff00390b9a7a21f1bb1da771e2f232d80ab8a1"
+      sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "78528fd87d0d08ffd3e69551173c026e8eacc7b7079c82eb6a77413957b7e394"
+      sha256: "858aaa72d8f61637d64e776aca82e1c67e6d9ee07979123c5d17115031c1b13b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.20"
+    version: "2.1.0"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521
+      sha256: "6478c6bbbecfe9aced34c483171e90d7c078f5883558b30ec3163cf18402c749"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.17"
+    version: "2.1.4"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "1e755f8583229f185cfca61b1d80fb2344c9d660e1c69ede5450d8f478fa5310"
+      sha256: "0c1c16c56c9708aa9c361541a6f0e5cc6fc12a3232d866a687a7b7db30032b07"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.2.1"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: "3a59ed10890a8409ad0faad7bb2957dab4b92b8fbe553257b05d30ed8af2c707"
+      sha256: "9d387433ca65717bbf1be88f4d5bb18f10508917a8fa2fb02e0fd0d7479a9afa"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
@@ -593,18 +593,18 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "0dc2633f215a3d4aa3184c9b2c5766f4711e4e5a6b256e62aafee41f89f1bfb8"
+      sha256: "74083203a8eae241e0de4a0d597dbedab3b8fef5563f33cf3c12d7e93c655ca5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.6"
+    version: "2.1.0"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: "71bcd669bb9cdb6b39f22c4a7728b6d49e934f6cba73157ffa5a54f1eed67436"
+      sha256: "5e588e2efef56916a3b229c3bfe81e6a525665a454519ca51dbcc4236a274173"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -622,18 +622,18 @@ packages:
     dependency: "direct main"
     description:
       name: sqflite
-      sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758"
+      sha256: "8453780d1f703ead201a39673deb93decf85d543f359f750e2afc4908b55533f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.6"
+    version: "2.2.8"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684"
+      sha256: e77abf6ff961d69dfef41daccbb66b51e9983cdd5cb35bf30733598057401555
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.3"
+    version: "2.4.5"
   stack_trace:
     dependency: transitive
     description:
@@ -662,10 +662,10 @@ packages:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b"
+      sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
   term_glyph:
     dependency: transitive
     description:
@@ -686,10 +686,10 @@ packages:
     dependency: transitive
     description:
       name: timezone
-      sha256: "24c8fcdd49a805d95777a39064862133ff816ebfffe0ceff110fb5960e557964"
+      sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.1"
+    version: "0.9.2"
   typed_data:
     dependency: transitive
     description:
@@ -710,34 +710,34 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: dd729390aa936bf1bdf5cd1bc7468ff340263f80a2c4f569416507667de8e3c8
+      sha256: "22f8db4a72be26e9e3a4aa3f194b1f7afbc76d20ec141f84be1d787db2155cbd"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.26"
+    version: "6.0.31"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "3dedc66ca3c0bef9e6a93c0999aee102556a450afcc1b7bcfeace7a424927d92"
+      sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.3"
+    version: "6.1.4"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc"
+      sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a"
+      sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -758,10 +758,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd
+      sha256: "254708f17f7c20a9c8c471f67d86d76d4a3f9c1591aad1e15292008aceb82771"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
   uuid:
     dependency: transitive
     description:
@@ -782,50 +782,50 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: "47663d51a9061451aa3880a214ee9a65dcbb933b77bc44388e194279ab3ccaf6"
+      sha256: "1a37bdbaaf5fbe09ad8579ab09ecfd473284ce482f900b5aea27cf834386a567"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.7"
+    version: "4.2.0"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "34f83c2f0f64c75ad75c77a2ccfc8d2e531afbe8ad41af1fd787d6d33336aa90"
+      sha256: d6cf18cd6c809c5a9294cd99707a21986aac4e08c87e1916ce2590315fb55d3a
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.3"
+    version: "3.6.2"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "1939c39e2150fb4d30fd3cc59a891a49fed9935db53007df633ed83581b6117b"
+      sha256: "78715dc442b7849dbde74e92bb67de1cecf5addf95531c5fb474e72f5fe9a507"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.3.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: d601aba11ad8d4481e17a34a76fa1d30dee92dcbbe2c58b0df3120e9453099c7
+      sha256: c94d242d8cbe1012c06ba7ac790c46d6e6b68723b7d34f8c74ed19f68d166f49
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.3"
+    version: "3.4.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
+      sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.4"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86
+      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0+3"
+    version: "1.0.0"
   xml:
     dependency: transitive
     description:
@@ -835,5 +835,5 @@ packages:
     source: hosted
     version: "6.2.2"
 sdks:
-  dart: ">=2.18.2 <3.0.0"
+  dart: ">=2.19.0 <3.0.0"
   flutter: ">=3.4.0-17.0.pre"

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.11.16+138 # When changing this, update the tag in main() accordingly
+version: 0.12.0+160 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'
@@ -38,7 +38,7 @@ dependencies:
   cupertino_icons: ^1.0.5
   path_provider: ^2.0.11
   flutter_fgbg: ^0.2.0 # Try removing reliance on this
-  flutter_local_notifications: ^13.0.0
+  flutter_local_notifications: ^14.0.0+1
   provider: ^6.0.3
   http: ^0.13.5
   webview_flutter: ^4.0.0
@@ -49,7 +49,7 @@ dependencies:
   permission_handler: ^10.0.0
   fluttertoast: ^8.0.9
   device_info_plus: ^8.0.0
-  file_picker: ^5.1.0
+  file_picker: ^5.2.10
   animations: ^2.0.4
   install_plugin_v2: ^1.0.0
   share_plus: ^6.0.1