Merge pull request #256 from ImranR98/dev

Bugfixes (#254, #252), App Uninstall and Settings Feature (#257)

README.md

@@ -1,4 +1,4 @@
-# ![Obtainium Icon](./android/app/src/main/res/drawable/ic_notification.png) Obtainium
+# ![Obtainium Icon](./assets/graphics/icon_small.png) Obtainium
 
 Get Android App Updates Directly From the Source.
 
@@ -9,6 +9,7 @@ Motivation: [Side Of Burritos - You should use this instead of F-Droid | How to
 Currently supported App sources:
 - [GitHub](https://github.com/)
 - [GitLab](https://gitlab.com/)
+- [Codeberg](https://codeberg.org/)
 - [F-Droid](https://f-droid.org/)
 - [IzzyOnDroid](https://android.izzysoft.de/)
 - [Mullvad](https://mullvad.net/en/)
@@ -18,6 +19,8 @@ Currently supported App sources:
 - Third Party F-Droid Repos
   - Any URLs ending with `/fdroid/<word>`, where `<word>` can be anything - most often `repo`
 - [Steam](https://store.steampowered.com/mobile)
+- "HTML" (Fallback)
+  - Any other URL that returns an HTML page with links to APK files (if multiple, the last file alphabetically is picked)
 
 ## Limitations
 - App installs happen asynchronously and the success/failure of an install cannot be determined directly. This results in install statuses and versions sometimes being out of sync with the OS until the next launch or until the problem is manually corrected.
@@ -28,4 +31,4 @@ Currently supported App sources:
 
 | <img src="./assets/screenshots/1.apps.png" alt="Apps Page" /> | <img src="./assets/screenshots/2.dark_theme.png" alt="Dark Theme" />           | <img src="./assets/screenshots/3.material_you.png" alt="Material You" />    |
 | ------------------------------------------------------ | ----------------------------------------------------------------------- | -------------------------------------------------------------------- |
-| <img src="./assets/screenshots/4.app.png" alt="App Page" />   | <img src="./assets/screenshots/5.apk_picker.png" alt="Multiple APK Support" /> | <img src="./assets/screenshots/6.apk_install.png" alt="App Installation" /> |
+| <img src="./assets/screenshots/4.app.png" alt="App Page" />   | <img src="./assets/screenshots/5.app_opts.png" alt="App Options" /> | <img src="./assets/screenshots/6.app_webview.png" alt="App Web View" /> |

android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,8 @@
     <application
         android:label="Obtainium"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:requestLegacyExternalStorage="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -51,7 +52,8 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28"/>
+        android:maxSdkVersion="29"/>
 </manifest>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

assets/translations/de.json

@@ -74,7 +74,6 @@
     "changeX": "Ändern {}",
     "installUpdateApps": "Apps installieren/aktualisieren",
     "installUpdateSelectedApps": "Ausgewählte Apps installieren/aktualisieren",
-    "onlyWorksWithNonEVDApps": "Funktioniert nur bei Apps, deren Installationsstatus nicht automatisch erkannt werden kann (ungewöhnlich).",
     "markXSelectedAppsAsUpdated": "Markiere {} ausgewählte Apps als aktuell?",
     "no": "Nein",
     "yes": "Ja",
@@ -178,7 +177,6 @@
     "installedVersionX": "Installierte Version: {}",
     "lastUpdateCheckX": "Letzte Aktualisierungsprüfung: {}",
     "remove": "Entfernen",
-    "removeAppQuestion": "App entfernen?",
     "yesMarkUpdated": "Ja, als aktualisiert markieren",
     "fdroid": "F-Droid",
     "appIdOrName": "App ID oder Name",
@@ -210,6 +208,15 @@
     "label": "Bezeichnung",
     "language": "Sprache",
     "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "removeAppQuestion": {
+        "one": "App entfernen?",
+        "other": "App entfernen?"
+    },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut",
         "other": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minuten erneut"

assets/translations/en.json

@@ -74,7 +74,6 @@
     "changeX": "Change {}",
     "installUpdateApps": "Install/Update Apps",
     "installUpdateSelectedApps": "Install/Update Selected Apps",
-    "onlyWorksWithNonEVDApps": "Only works for Apps whose install status cannot be automatically detected (uncommon).",
     "markXSelectedAppsAsUpdated": "Mark {} Selected Apps as Updated?",
     "no": "No",
     "yes": "Yes",
@@ -178,7 +177,6 @@
     "installedVersionX": "Installed Version: {}",
     "lastUpdateCheckX": "Last Update Check: {}",
     "remove": "Remove",
-    "removeAppQuestion": "Remove App?",
     "yesMarkUpdated": "Yes, Mark as Updated",
     "fdroid": "F-Droid",
     "appIdOrName": "App ID or Name",
@@ -210,6 +208,15 @@
     "label": "Label",
     "language": "Language",
     "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "removeAppQuestion": {
+        "one": "Remove App?",
+        "other": "Remove Apps?"
+    },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Too many requests (rate limited) - try again in {} minute",
         "other": "Too many requests (rate limited) - try again in {} minutes"

assets/translations/hu.json

@@ -74,7 +74,6 @@
     "changeX": "Változás {}",
     "installUpdateApps": "Appok telepítése/frissítése",
     "installUpdateSelectedApps": "Telepítse/frissítse a kiválasztott appokat",
-    "onlyWorksWithNonEVDApps": "Csak azoknál az alkalmazásoknál működik, amelyek telepítési állapota nem észlelhető autom. (nem gyakori).",
     "markXSelectedAppsAsUpdated": "Megjelöl {} kiválasztott alkalmazást frissítettként?",
     "no": "Nem",
     "yes": "Igen",
@@ -178,7 +177,6 @@
     "installedVersionX": "Telepített verzió: {}",
     "lastUpdateCheckX": "Frissítés ellenőrizve: {}",
     "remove": "Eltávolítás",
-    "removeAppQuestion": "Eltávolítja az alkalmazást?",
     "yesMarkUpdated": "Igen, megjelölés frissítettként",
     "fdroid": "F-Droid",
     "appIdOrName": "App ID vagy név",
@@ -207,8 +205,17 @@
     "categoryDeleteWarning": "A(z) {} összes app kategorizálatlan állapotba kerül.",
     "addCategory": "Új kategória",
     "label": "Címke",
-    "language": "Language",
+    "language": "Nyelv",
-    "storagePermissionDenied": "Storage permission denied",
+    "storagePermissionDenied": "Tárhely engedély megtagadva",
+    "selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "removeAppQuestion": {
+        "one": "Eltávolítja az alkalmazást?",
+        "other": "Eltávolítja az alkalmazást?"
+    },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva",
         "other": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva"

assets/translations/it.json

@@ -74,7 +74,6 @@
     "changeX": "Modifica {}",
     "installUpdateApps": "Installa/Aggiorna App",
     "installUpdateSelectedApps": "Installa/Aggiorna le App selezionate",
-    "onlyWorksWithNonEVDApps": "Funziona solo per le App il cui stato d'installazione non può essere rilevato automaticamente (inconsueto).",
     "markXSelectedAppsAsUpdated": "Contrassegnare le {} App selezionate come aggiornate?",
     "no": "No",
     "yes": "Sì",
@@ -178,7 +177,6 @@
     "installedVersionX": "Versione installata: {}",
     "lastUpdateCheckX": "Ultimo controllo degli aggiornamenti: {}",
     "remove": "Rimuovi",
-    "removeAppQuestion": "Rimuovere l'App?",
     "yesMarkUpdated": "Sì, contrassegna come aggiornato",
     "fdroid": "F-Droid",
     "appIdOrName": "ID o nome dell'App",
@@ -210,6 +208,15 @@
     "label": "Etichetta",
     "language": "Lingua",
     "storagePermissionDenied": "Storage permission denied",
+    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "removeAppQuestion": {
+        "one": "Rimuovere l'App?",
+        "other": "Rimuovere l'App?"
+    },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Troppe richieste (traffico limitato) - riprova tra {} minuto",
         "other": "Troppe richieste (traffico limitato) - riprova tra {} minuti"

assets/translations/ja.json

@@ -7,12 +7,12 @@
     "appIdMismatch": "ダウンロードしたパッケージのIDが既存のApp IDと一致しません",
     "functionNotImplemented": "このクラスはこの機能を実装していません",
     "placeholder": "プレースホルダー",
-    "someErrors": "いくつかのエラーが発生しました",
+    "someErrors": "何らかのエラーが発生しました",
     "unexpectedError": "予期せぬエラーが発生しました",
     "ok": "OK",
     "and": "と",
     "startedBgUpdateTask": "バックグラウンドのアップデート確認タスクを開始",
-    "bgUpdateIgnoreAfterIs": "Bg update ignoreAfter is  {}",
+    "bgUpdateIgnoreAfterIs": "Bg update ignoreAfter is {}",
     "startedActualBGUpdateCheck": "実際のバックグラウンドのアップデート確認を開始",
     "bgUpdateTaskFinished": "バックグラウンドのアップデート確認タスクを終了",
     "firstRun": "これがObtainiumの最初の実行です",
@@ -65,16 +65,15 @@
     "estimateInBrackets": "(推定)",
     "selectAll": "すべて選択",
     "deselectN": "{}件の選択を解除",
-    "xWillBeRemovedButRemainInstalled": "{}はObtainiumから削除されますが、デバイスにはインストールされたままです。",
+    "xWillBeRemovedButRemainInstalled": "{} はObtainiumから削除されますが、デバイスにはインストールされたままです。",
     "removeSelectedAppsQuestion": "選択したアプリを削除しますか？",
     "removeSelectedApps": "選択したアプリを削除する",
-    "updateX": "{}をアップデートする",
+    "updateX": "{} をアップデートする",
-    "installX": "{}をインストールする",
+    "installX": "{} をインストールする",
     "markXTrackOnlyAsUpdated": "{}\n(追跡のみ)\nをアップデート済みとしてマークする",
-    "changeX": "{}を変更する",
+    "changeX": "{} を変更する",
     "installUpdateApps": "アプリのインストール/アップデート",
     "installUpdateSelectedApps": "選択したアプリのインストール/アップデート",
-    "onlyWorksWithNonEVDApps": "インストール状況を自動検出できないアプリ（一般的でないもの）のみ動作します。",
     "markXSelectedAppsAsUpdated": "{}個の選択したアプリをアップデート済みとしてマークしますか？",
     "no": "いいえ",
     "yes": "はい",
@@ -82,7 +81,7 @@
     "pinToTop": "トップに固定",
     "unpinFromTop": "トップから固定解除",
     "resetInstallStatusForSelectedAppsQuestion": "選択したアプリのインストール状態をリセットしますか？",
-    "installStatusOfXWillBeResetExplanation": "選択したアプリのインストール状態がリセットされます。\n\nアップデートに失敗するなどして、Obtainiumに表示されるアプリのバージョンが正しくない場合に役立ちます。",
+    "installStatusOfXWillBeResetExplanation": "選択したアプリのインストール状態がリセットされます。\n\nアップデートに失敗した場合など、Obtainiumに表示されるアプリのバージョンが正しくない場合に有効です。",
     "shareSelectedAppURLs": "選択したアプリのURLを共有する",
     "resetInstallStatus": "インストール状態をリセットする",
     "more": "もっと見る",
@@ -109,7 +108,7 @@
     "searchX": "{}で検索",
     "noResults": "結果は見つかりませんでした",
     "importX": "{}をインポートする",
-    "importedAppsIdDisclaimer": "インポートしたアプリが「未インストール」と表示されることがあります。\nこれを解決するには、Obtainiumから再インストールしてください。\nアプリのデータには影響しません。\n\nURLとサードパーティーのインポートメソッドにのみ影響します。",
+    "importedAppsIdDisclaimer": "インポートしたアプリが「未インストール」と表示されることがあります。\nこれを解決するには、Obtainiumから再インストールしてください。\nアプリのデータには影響しません。\n\nURLとサードパーティのインポートメソッドにのみ影響します。",
     "importErrors": "インポートエラー",
     "importedXOfYApps": "{} / {} アプリをインポートしました",
     "followingURLsHadErrors": "以下のURLでエラーが発生しました:",
@@ -133,7 +132,7 @@
     "bgUpdateCheckInterval": "バックグラウンドでのアップデート確認の間隔",
     "neverManualOnly": "手動",
     "appearance": "外観",
-    "showWebInAppView": "アプリビューにソースウェブページを表示する",
+    "showWebInAppView": "アプリページにソースのWebページを表示する",
     "pinUpdates": "アップデートがあるアプリをトップに固定する",
     "updates": "アップデート",
     "sourceSpecific": "Github アクセストークン",
@@ -145,23 +144,23 @@
     "appNotFound": "アプリが見つかりません",
     "obtainiumExportHyphenatedLowercase": "obtainium-エクスポート",
     "pickAnAPK": "APKを選択",
-    "appHasMoreThanOnePackage": "{}は複数のパッケージが存在します: ",
+    "appHasMoreThanOnePackage": "{} は複数のパッケージが存在します: ",
-    "deviceSupportsXArch": "お使いのデバイスは{} CPUアーキテクチャに対応しています。",
+    "deviceSupportsXArch": "お使いのデバイスは {} CPUアーキテクチャに対応しています。",
     "deviceSupportsFollowingArchs": "お使いのデバイスは、以下のCPUアーキテクチャをサポートしています:",
     "warning": "警告",
     "sourceIsXButPackageFromYPrompt": "アプリのソースは'{}'ですが、リリースパッケージは'{}'から来ています。続行しますか？",
     "updatesAvailable": "アップデートが利用可能",
     "updatesAvailableNotifDescription": "Obtainiumが追跡している1つまたは複数のアプリのアップデートが利用可能であることをユーザーに通知する",
     "noNewUpdates": "新しいアップデートはありません",
-    "xHasAnUpdate": "{}のアップデートが利用可能です",
+    "xHasAnUpdate": "{} のアップデートが利用可能です",
     "appsUpdated": "アプリをアップデートしました",
     "appsUpdatedNotifDescription": "1つまたは複数のAppのアップデートがバックグラウンドで適用されたことをユーザーに通知する",
-    "xWasUpdatedToY": "{}が{}にアップデートされました",
+    "xWasUpdatedToY": "{} が {} にアップデートされました",
     "errorCheckingUpdates": "アップデート確認中のエラー",
     "errorCheckingUpdatesNotifDescription": "バックグラウンドでのアップデート確認に失敗した際に表示される通知",
     "appsRemoved": "削除されたアプリ",
     "appsRemovedNotifDescription": "アプリの読み込み中にエラーが発生したため、1つまたは複数のアプリが削除されたことをユーザーに通知する",
-    "xWasRemovedDueToErrorY": "このエラーのため、{}は削除されました: {}",
+    "xWasRemovedDueToErrorY": "このエラーのため、{} は削除されました: {}",
     "completeAppInstallation": "アプリのインストールを完了する",
     "obtainiumMustBeOpenToInstallApps": "アプリをインストールするにはObtainiumを開いている必要があります。",
     "completeAppInstallationNotifDescription": "アプリのインストールを完了するために、Obtainiumに戻る必要があります。",
@@ -178,13 +177,12 @@
     "installedVersionX": "インストールされたバージョン: {}",
     "lastUpdateCheckX": "最終アップデート確認: {}",
     "remove": "削除",
-    "removeAppQuestion": "アプリを削除しますか？",
     "yesMarkUpdated": "はい、アップデート済みとしてマークします",
     "fdroid": "F-Droid",
     "appIdOrName": "アプリのIDまたは名前",
     "appWithIdOrNameNotFound": "そのIDや名前を持つアプリは見つかりませんでした",
     "reposHaveMultipleApps": "リポジトリには複数のアプリが含まれることがあります",
-    "fdroidThirdPartyRepo": "F-Droid Third-Party Repo",
+    "fdroidThirdPartyRepo": "F-Droid サードパーティリポジトリ",
     "steam": "Steam",
     "steamMobile": "Steam Mobile",
     "steamChat": "Steam Chat",
@@ -209,7 +207,16 @@
     "addCategory": "カテゴリを追加",
     "label": "ラベル",
     "language": "言語",
-    "storagePermissionDenied": "Storage permission denied",
+    "storagePermissionDenied": "ストレージ権限が拒否されました",
+    "selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
+    "filterAPKsByRegEx": "正規表現でAPKを絞り込む",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "removeAppQuestion": {
+        "one": "アプリを削除しますか？",
+        "other": "アプリを削除しますか？"
+    },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "リクエストが多すぎます（レート制限）- {}分後に再試行してください",
         "other": "リクエストが多すぎます（レート制限）- {}分後に再試行してください"
@@ -247,11 +254,11 @@
         "other": "{n}個のログをクリアしました (前 = {before}, 後 = {after})"
     },
     "xAndNMoreUpdatesAvailable": {
-        "one": "{}とさらに{}個のアプリのアップデートが利用可能です",
+        "one": "{} とさらに {} 個のアプリのアップデートが利用可能です",
-        "other": "{}とさらに{}個のアプリのアップデートが利用可能です"
+        "other": "{} とさらに {} 個のアプリのアップデートが利用可能です"
     },
     "xAndNMoreUpdatesInstalled": {
-        "one": "{}とさらに{}個のアプリがアップデートされました",
+        "one": "{} とさらに {} 個のアプリがアップデートされました",
-        "other": "{}とさらに{}個のアプリがアップデートされました"
+        "other": "{} とさらに {} 個のアプリがアップデートされました"
     }
 }

assets/translations/zh.json

@@ -12,7 +12,7 @@
     "ok": "好的",
     "and": "和",
     "startedBgUpdateTask": "开始后台检查更新任务",
-    "bgUpdateIgnoreAfterIs": "Bg update ignoreAfter is  {}",
+    "bgUpdateIgnoreAfterIs": "下次后台更新检查  {}",
     "startedActualBGUpdateCheck": "后台检查更新已开始",
     "bgUpdateTaskFinished": "后台检查更新已完成",
     "firstRun": "这是你第一次运行 Obtainium",
@@ -178,7 +178,6 @@
     "installedVersionX": "已安装: {}",
     "lastUpdateCheckX": "最后检查: {}",
     "remove": "删除",
-    "removeAppQuestion": "删除应用？",
     "yesMarkUpdated": "'是的，标为已更新",
     "fdroid": "F-Droid",
     "appIdOrName": "应用 ID 或名称",
@@ -199,17 +198,25 @@
     "downloadNotifDescription": "通知用户下载进度",
     "noAPKFound": "未找到安装包",
     "noVersionDetection": "无版本检测",
-    "categorize": "Categorize",
+    "categorize": "归档",
-    "categories": "Categories",
+    "categories": "归档",
-    "category": "Category",
+    "category": "类别",
-    "noCategory": "No Category",
+    "noCategory": "无类别",
-    "noCategories": "No Categories",
+    "noCategories": "无类别",
-    "deleteCategoriesQuestion": "Delete Categories?",
+    "deleteCategoriesQuestion": "删除所有类别？",
-    "categoryDeleteWarning": "All Apps in deleted categories will be set to uncategorized.",
+    "categoryDeleteWarning": "所有被删除类别的应用程序将被设置为无类别",
-    "addCategory": "Add Category",
+    "addCategory": "添加类别",
-    "label": "Label",
+    "label": "标签",
-    "language": "Language",
+    "language": "语言",
-    "storagePermissionDenied": "Storage permission denied",
+    "storagePermissionDenied": "存储权限已被拒绝",
+    "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
+    "removeFromObtainium": "Remove from Obtainium",
+    "uninstallFromDevice": "Uninstall from Device",
+    "removeAppQuestion": {
+        "one": "删除应用？",
+        "other": "删除应用？"
+    },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "请求过多 (API 限制) - 在 {} 分钟后重试",
         "other": "请求过多 (API 限制) - 在 {} 分钟后重试"

lib/app_sources/codeberg.dart

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

lib/app_sources/github.dart

@@ -15,6 +15,7 @@ class GitHub extends AppSource {
     additionalSourceSpecificSettingFormItems = [
       GeneratedFormTextField('github-creds',
           label: tr('githubPATLabel'),
+          password: true,
           required: false,
           additionalValidators: [
             (value) {
@@ -64,15 +65,7 @@ class GitHub extends AppSource {
             required: false,
             additionalValidators: [
               (value) {
-                if (value == null || value.isEmpty) {
+                return regExValidator(value);
-                  return null;
-                }
-                try {
-                  RegExp(value);
-                } catch (e) {
-                  return tr('invalidRegEx');
-                }
-                return null;
               }
             ])
       ]
@@ -118,7 +111,7 @@ class GitHub extends AppSource {
             ? additionalSettings['filterReleaseTitlesByRegEx']
             : null;
     Response res = await get(Uri.parse(
-        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases'));
+        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
     if (res.statusCode == 200) {
       var releases = jsonDecode(res.body) as List<dynamic>;
 
@@ -140,10 +133,13 @@ class GitHub extends AppSource {
         if (!includePrereleases && releases[i]['prerelease'] == true) {
           continue;
         }
-
+        var nameToFilter = releases[i]['name'] as String?;
+        if (nameToFilter == null || nameToFilter.trim().isEmpty) {
+          // Some leave titles empty so tag is used
+          nameToFilter = releases[i]['tag_name'] as String;
+        }
         if (regexFilter != null &&
-            !RegExp(regexFilter)
+            !RegExp(regexFilter).hasMatch(nameToFilter.trim())) {
-                .hasMatch((releases[i]['name'] as String).trim())) {
           continue;
         }
         var apkUrls = getReleaseAPKUrls(releases[i]);

lib/app_sources/html.dart

@@ -0,0 +1,47 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class HTML extends AppSource {
+  @override
+  String standardizeURL(String url) {
+    return url;
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => null;
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    var uri = Uri.parse(standardUrl);
+    Response res = await get(uri);
+    if (res.statusCode == 200) {
+      List<String> links = parse(res.body)
+          .querySelectorAll('a')
+          .map((element) => element.attributes['href'] ?? '')
+          .where((element) => element.toLowerCase().endsWith('.apk'))
+          .toList();
+      links.sort((a, b) => a.split('/').last.compareTo(b.split('/').last));
+      if (links.isEmpty) {
+        throw NoReleasesError();
+      }
+      var rel = links.last;
+      var apkName = rel.split('/').last;
+      var version = apkName.substring(0, apkName.length - 4);
+      List<String> apkUrls = [rel]
+          .map((e) => e.toLowerCase().startsWith('http://') ||
+                  e.toLowerCase().startsWith('https://')
+              ? e
+              : '${uri.origin}/$e')
+          .toList();
+      return APKDetails(version, apkUrls, AppNames(uri.host, tr('app')));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/components/generated_form.dart

@@ -3,7 +3,6 @@ import 'dart:math';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
-import 'package:obtainium/providers/settings_provider.dart';
 
 abstract class GeneratedFormItem {
   late String key;
@@ -24,6 +23,7 @@ class GeneratedFormTextField extends GeneratedFormItem {
   late bool required;
   late int max;
   late String? hint;
+  late bool password;
 
   GeneratedFormTextField(String key,
       {String label = 'Input',
@@ -32,7 +32,8 @@ class GeneratedFormTextField extends GeneratedFormItem {
       List<String? Function(String? value)> additionalValidators = const [],
       this.required = true,
       this.max = 1,
-      this.hint})
+      this.hint,
+      this.password = false})
       : super(key,
             label: label,
             belowWidgets: belowWidgets,
@@ -129,11 +130,27 @@ class GeneratedForm extends StatefulWidget {
   State<GeneratedForm> createState() => _GeneratedFormState();
 }
 
+// Generates a random light color
+// Courtesy of ChatGPT 😭 (with a bugfix 🥳)
+Color generateRandomLightColor() {
+  // Create a random number generator
+  final Random random = Random();
+
+  // Generate random hue, saturation, and value values
+  final double hue = random.nextDouble() * 360;
+  final double saturation = 0.5 + random.nextDouble() * 0.5;
+  final double value = 0.9 + random.nextDouble() * 0.1;
+
+  // Create a HSV color with the random values
+  return HSVColor.fromAHSV(1.0, hue, saturation, value).toColor();
+}
+
 class _GeneratedFormState extends State<GeneratedForm> {
   final _formKey = GlobalKey<FormState>();
   Map<String, dynamic> values = {};
   late List<List<Widget>> formInputs;
   List<List<Widget>> rows = [];
+  String? initKey;
 
   // If any value changes, call this to update the parent with value and validity
   void someValueChanged({bool isBuilding = false}) {
@@ -153,28 +170,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
     widget.onValueChanges(returnValues, valid, isBuilding);
   }
 
-  // Generates a random light color
+  initForm() {
-  // Courtesy of ChatGPT 😭 (with a bugfix 🥳)
+    initKey = widget.key.toString();
-  Color generateRandomLightColor() {
-    // Create a random number generator
-    final Random random = Random();
-
-    // Generate random hue, saturation, and value values
-    final double hue = random.nextDouble() * 360;
-    final double saturation = 0.5 + random.nextDouble() * 0.5;
-    final double value = 0.9 + random.nextDouble() * 0.1;
-
-    // Create a HSV color with the random values
-    return HSVColor.fromAHSV(1.0, hue, saturation, value).toColor();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-
     // Initialize form values as all empty
     values.clear();
-    int j = 0;
     for (var row in widget.items) {
       for (var e in row) {
         values[e.key] = e.defaultValue;
@@ -188,6 +187,9 @@ class _GeneratedFormState extends State<GeneratedForm> {
         if (formItem is GeneratedFormTextField) {
           final formFieldKey = GlobalKey<FormFieldState>();
           return TextFormField(
+            obscureText: formItem.password,
+            autocorrect: !formItem.password,
+            enableSuggestions: !formItem.password,
             key: formFieldKey,
             initialValue: values[formItem.key],
             autovalidateMode: AutovalidateMode.onUserInteraction,
@@ -241,8 +243,17 @@ class _GeneratedFormState extends State<GeneratedForm> {
     someValueChanged(isBuilding: true);
   }
 
+  @override
+  void initState() {
+    super.initState();
+    initForm();
+  }
+
   @override
   Widget build(BuildContext context) {
+    if (widget.key.toString() != initKey) {
+      initForm();
+    }
     for (var r = 0; r < formInputs.length; r++) {
       for (var e = 0; e < formInputs[r].length; e++) {
         if (widget.items[r][e] is GeneratedFormSwitch) {

lib/components/generated_form_modal.dart

@@ -10,13 +10,15 @@ class GeneratedFormModal extends StatefulWidget {
       required this.items,
       this.initValid = false,
       this.message = '',
-      this.additionalWidgets = const []});
+      this.additionalWidgets = const [],
+      this.singleNullReturnButton});
 
   final String title;
   final String message;
   final List<List<GeneratedFormItem>> items;
   final bool initValid;
   final List<Widget> additionalWidgets;
+  final String? singleNullReturnButton;
 
   @override
   State<GeneratedFormModal> createState() => _GeneratedFormModalState();
@@ -64,17 +66,21 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
             onPressed: () {
               Navigator.of(context).pop(null);
             },
-            child: Text(tr('cancel'))),
+            child: Text(widget.singleNullReturnButton == null
-        TextButton(
+                ? tr('cancel')
-            onPressed: !valid
+                : widget.singleNullReturnButton!)),
-                ? null
+        widget.singleNullReturnButton == null
-                : () {
+            ? TextButton(
-                    if (valid) {
+                onPressed: !valid
-                      HapticFeedback.selectionClick();
+                    ? null
-                      Navigator.of(context).pop(values);
+                    : () {
-                    }
+                        if (valid) {
-                  },
+                          HapticFeedback.selectionClick();
-            child: Text(tr('continue')))
+                          Navigator.of(context).pop(values);
+                        }
+                      },
+                child: Text(tr('continue')))
+            : const SizedBox.shrink()
       ],
     );
   }

lib/custom_errors.dart

@@ -13,13 +13,10 @@ class ObtainiumError {
   }
 }
 
-class RateLimitError {
+class RateLimitError extends ObtainiumError {
   late int remainingMinutes;
-  RateLimitError(this.remainingMinutes);
+  RateLimitError(this.remainingMinutes)
-
+      : super(plural('tooManyRequestsTryAgainInMinutes', remainingMinutes));
-  @override
-  String toString() =>
-      plural('tooManyRequestsTryAgainInMinutes', remainingMinutes);
 }
 
 class InvalidURLError extends ObtainiumError {
@@ -32,7 +29,7 @@ class NoReleasesError extends ObtainiumError {
 }
 
 class NoAPKError extends ObtainiumError {
-  NoAPKError() : super(tr('noReleaseFound'));
+  NoAPKError() : super(tr('noAPKFound'));
 }
 
 class NoVersionError extends ObtainiumError {

lib/main.dart

@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.9.10';
+const String currentVersion = '0.10.7';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/add_app.dart

@@ -24,23 +24,31 @@ class AddAppPage extends StatefulWidget {
 
 class _AddAppPageState extends State<AddAppPage> {
   bool gettingAppInfo = false;
+  bool searching = false;
 
   String userInput = '';
   String searchQuery = '';
   AppSource? pickedSource;
   Map<String, dynamic> additionalSettings = {};
   bool additionalSettingsValid = true;
-  String? category;
+  List<String> pickedCategories = [];
+  int searchnum = 0;
 
   @override
   Widget build(BuildContext context) {
     SourceProvider sourceProvider = SourceProvider();
     AppsProvider appsProvider = context.read<AppsProvider>();
 
-    changeUserInput(String input, bool valid, bool isBuilding) {
+    bool doingSomething = gettingAppInfo || searching;
+
+    changeUserInput(String input, bool valid, bool isBuilding,
+        {bool isSearch = false}) {
       userInput = input;
       if (!isBuilding) {
         setState(() {
+          if (isSearch) {
+            searchnum++;
+          }
           var source = valid ? sourceProvider.getSource(userInput) : null;
           if (pickedSource.runtimeType != source.runtimeType) {
             pickedSource = source;
@@ -67,6 +75,7 @@ class _AddAppPageState extends State<AddAppPage> {
             additionalSettings['noVersionDetection'] == true;
         var cont = true;
         if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
+            // ignore: use_build_context_synchronously
             await showDialog(
                     context: context,
                     builder: (BuildContext ctx) {
@@ -85,6 +94,7 @@ class _AddAppPageState extends State<AddAppPage> {
           cont = false;
         }
         if (userPickedNoVersionDetection &&
+            // ignore: use_build_context_synchronously
             await showDialog(
                     context: context,
                     builder: (BuildContext ctx) {
@@ -127,9 +137,7 @@ class _AddAppPageState extends State<AddAppPage> {
           if (app.additionalSettings['trackOnly'] == true) {
             app.installedVersion = app.latestVersion;
           }
-          if (category != null) {
+          app.categories = pickedCategories;
-            app.category = category;
-          }
           await appsProvider.saveApps([app]);
 
           return app;
@@ -166,30 +174,32 @@ class _AddAppPageState extends State<AddAppPage> {
                         children: [
                           Expanded(
                               child: GeneratedForm(
+                                  key: Key(searchnum.toString()),
                                   items: [
-                                [
+                                    [
-                                  GeneratedFormTextField('appSourceURL',
+                                      GeneratedFormTextField('appSourceURL',
-                                      label: tr('appSourceURL'),
+                                          label: tr('appSourceURL'),
-                                      additionalValidators: [
+                                          defaultValue: userInput,
-                                        (value) {
+                                          additionalValidators: [
-                                          try {
+                                            (value) {
-                                            sourceProvider
+                                              try {
-                                                .getSource(value ?? '')
+                                                sourceProvider
-                                                .standardizeURL(
+                                                    .getSource(value ?? '')
-                                                    preStandardizeUrl(
+                                                    .standardizeURL(
-                                                        value ?? ''));
+                                                        preStandardizeUrl(
-                                          } catch (e) {
+                                                            value ?? ''));
-                                            return e is String
+                                              } catch (e) {
-                                                ? e
+                                                return e is String
-                                                : e is ObtainiumError
+                                                    ? e
-                                                    ? e.toString()
+                                                    : e is ObtainiumError
-                                                    : tr('error');
+                                                        ? e.toString()
-                                          }
+                                                        : tr('error');
-                                          return null;
+                                              }
-                                        }
+                                              return null;
-                                      ])
+                                            }
-                                ]
+                                          ])
-                              ],
+                                    ]
+                                  ],
                                   onValueChanges: (values, valid, isBuilding) {
                                     changeUserInput(values['appSourceURL']!,
                                         valid, isBuilding);
@@ -200,7 +210,7 @@ class _AddAppPageState extends State<AddAppPage> {
                           gettingAppInfo
                               ? const CircularProgressIndicator()
                               : ElevatedButton(
-                                  onPressed: gettingAppInfo ||
+                                  onPressed: doingSomething ||
                                           pickedSource == null ||
                                           (pickedSource!
                                                   .combinedAppSpecificSettingFormItems
@@ -251,9 +261,12 @@ class _AddAppPageState extends State<AddAppPage> {
                               width: 16,
                             ),
                             ElevatedButton(
-                                onPressed: searchQuery.isEmpty || gettingAppInfo
+                                onPressed: searchQuery.isEmpty || doingSomething
                                     ? null
                                     : () {
+                                        setState(() {
+                                          searching = true;
+                                        });
                                         Future.wait(sourceProvider.sources
                                                 .where((e) => e.canSearch)
                                                 .map((e) =>
@@ -290,11 +303,15 @@ class _AddAppPageState extends State<AddAppPage> {
                                           if (selectedUrls != null &&
                                               selectedUrls.isNotEmpty) {
                                             changeUserInput(
-                                                selectedUrls[0], true, true);
+                                                selectedUrls[0], true, false,
-                                            addApp(resetUserInputAfter: true);
+                                                isSearch: true);
                                           }
                                         }).catchError((e) {
                                           showError(e, context);
+                                        }).whenComplete(() {
+                                          setState(() {
+                                            searching = false;
+                                          });
                                         });
                                       },
                                 child: Text(tr('search')))
@@ -317,6 +334,7 @@ class _AddAppPageState extends State<AddAppPage> {
                               height: 16,
                             ),
                             GeneratedForm(
+                                key: Key(pickedSource.runtimeType.toString()),
                                 items: pickedSource!
                                     .combinedAppSpecificSettingFormItems,
                                 onValueChanges: (values, valid, isBuilding) {
@@ -334,11 +352,8 @@ class _AddAppPageState extends State<AddAppPage> {
                                 ),
                                 CategoryEditorSelector(
                                     alignment: WrapAlignment.start,
-                                    singleSelect: true,
                                     onSelected: (categories) {
-                                      category = categories.isEmpty
+                                      pickedCategories = categories;
-                                          ? null
-                                          : categories.first;
                                     }),
                               ],
                             ),

lib/pages/app.dart

@@ -42,6 +42,108 @@ class _AppPageState extends State<AppPage> {
       getUpdate(app.app.id);
     }
     var trackOnly = app?.app.additionalSettings['trackOnly'] == true;
+    var noVersionDetection =
+        app?.app.additionalSettings['noVersionDetection'] == true;
+
+    var infoColumn = Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        GestureDetector(
+            onTap: () {
+              if (app?.app.url != null) {
+                launchUrlString(app?.app.url ?? '',
+                    mode: LaunchMode.externalApplication);
+              }
+            },
+            child: Text(
+              app?.app.url ?? '',
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                  decoration: TextDecoration.underline,
+                  fontStyle: FontStyle.italic,
+                  fontSize: 12),
+            )),
+        const SizedBox(
+          height: 32,
+        ),
+        Text(
+          tr('latestVersionX', args: [app?.app.latestVersion ?? tr('unknown')]),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.bodyLarge,
+        ),
+        Text(
+          '${tr('installedVersionX', args: [
+                app?.app.installedVersion ?? tr('none')
+              ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
+                  tr('app')
+                ])}' : ''}',
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.bodyLarge,
+        ),
+        const SizedBox(
+          height: 32,
+        ),
+        Text(
+          tr('lastUpdateCheckX', args: [
+            app?.app.lastUpdateCheck == null
+                ? tr('never')
+                : '\n${app?.app.lastUpdateCheck?.toLocal()}'
+          ]),
+          textAlign: TextAlign.center,
+          style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
+        ),
+        const SizedBox(
+          height: 48,
+        ),
+        CategoryEditorSelector(
+            alignment: WrapAlignment.center,
+            preselected:
+                app?.app.categories != null ? app!.app.categories.toSet() : {},
+            onSelected: (categories) {
+              if (app != null) {
+                app.app.categories = categories;
+                appsProvider.saveApps([app.app]);
+              }
+            }),
+      ],
+    );
+
+    var fullInfoColumn = Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        const SizedBox(height: 150),
+        app?.installedInfo != null
+            ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+                Image.memory(
+                  app!.installedInfo!.icon!,
+                  height: 150,
+                  gaplessPlayback: true,
+                )
+              ])
+            : Container(),
+        const SizedBox(
+          height: 25,
+        ),
+        Text(
+          app?.installedInfo?.name ?? app?.app.name ?? tr('app'),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.displayLarge,
+        ),
+        Text(
+          tr('byX', args: [app?.app.author ?? tr('unknown')]),
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.headlineMedium,
+        ),
+        const SizedBox(
+          height: 32,
+        ),
+        infoColumn,
+        const SizedBox(height: 150)
+      ],
+    );
+
     return Scaffold(
       appBar: settingsProvider.showAppWebpage ? AppBar() : null,
       backgroundColor: Theme.of(context).colorScheme.surface,
@@ -71,106 +173,7 @@ class _AppPageState extends State<AppPage> {
               : CustomScrollView(
                   slivers: [
                     SliverToBoxAdapter(
-                        child: Column(
+                        child: Column(children: [fullInfoColumn])),
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.stretch,
-                      children: [
-                        const SizedBox(height: 150),
-                        app?.installedInfo != null
-                            ? Row(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                    Image.memory(
-                                      app!.installedInfo!.icon!,
-                                      height: 150,
-                                      gaplessPlayback: true,
-                                    )
-                                  ])
-                            : Container(),
-                        const SizedBox(
-                          height: 25,
-                        ),
-                        Text(
-                          app?.installedInfo?.name ??
-                              app?.app.name ??
-                              tr('app'),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.displayLarge,
-                        ),
-                        Text(
-                          tr('byX', args: [app?.app.author ?? tr('unknown')]),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.headlineMedium,
-                        ),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        GestureDetector(
-                            onTap: () {
-                              if (app?.app.url != null) {
-                                launchUrlString(app?.app.url ?? '',
-                                    mode: LaunchMode.externalApplication);
-                              }
-                            },
-                            child: Text(
-                              app?.app.url ?? '',
-                              textAlign: TextAlign.center,
-                              style: const TextStyle(
-                                  decoration: TextDecoration.underline,
-                                  fontStyle: FontStyle.italic,
-                                  fontSize: 12),
-                            )),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        Text(
-                          tr('latestVersionX',
-                              args: [app?.app.latestVersion ?? tr('unknown')]),
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyLarge,
-                        ),
-                        Text(
-                          '${tr('installedVersionX', args: [
-                                app?.app.installedVersion ?? tr('none')
-                              ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
-                                  tr('app')
-                                ])}' : ''}',
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyLarge,
-                        ),
-                        const SizedBox(
-                          height: 32,
-                        ),
-                        Text(
-                          tr('lastUpdateCheckX', args: [
-                            app?.app.lastUpdateCheck == null
-                                ? tr('never')
-                                : '\n${app?.app.lastUpdateCheck?.toLocal()}'
-                          ]),
-                          textAlign: TextAlign.center,
-                          style: const TextStyle(
-                              fontStyle: FontStyle.italic, fontSize: 12),
-                        ),
-                        const SizedBox(
-                          height: 48,
-                        ),
-                        CategoryEditorSelector(
-                            alignment: WrapAlignment.center,
-                            singleSelect: true,
-                            preselected: app?.app.category != null
-                                ? {app!.app.category!}
-                                : {},
-                            onSelected: (categories) {
-                              if (app != null) {
-                                app.app.category = categories.isNotEmpty
-                                    ? categories[0]
-                                    : null;
-                                appsProvider.saveApps([app.app]);
-                              }
-                            }),
-                        const SizedBox(height: 150)
-                      ],
-                    )),
                   ],
                 ),
           onRefresh: () async {
@@ -189,8 +192,9 @@ class _AppPageState extends State<AppPage> {
                   child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: [
-                        if (app?.app.installedVersion != null &&
+                        if (noVersionDetection &&
                             !trackOnly &&
+                            app?.app.installedVersion != null &&
                             app?.app.installedVersion != app?.app.latestVersion)
                           IconButton(
                               onPressed: app?.downloadProgress != null
@@ -202,13 +206,6 @@ class _AppPageState extends State<AppPage> {
                                             return AlertDialog(
                                               title: Text(tr(
                                                   'alreadyUpToDateQuestion')),
-                                              content: Text(
-                                                  tr('onlyWorksWithNonEVDApps'),
-                                                  style: const TextStyle(
-                                                      fontWeight:
-                                                          FontWeight.bold,
-                                                      fontStyle:
-                                                          FontStyle.italic)),
                                               actions: [
                                                 TextButton(
                                                     onPressed: () {
@@ -266,8 +263,9 @@ class _AppPageState extends State<AppPage> {
                                               return row;
                                             }).toList();
                                             return GeneratedFormModal(
-                                                title: tr('additionalOptions'),
+                                              title: tr('additionalOptions'),
-                                                items: items);
+                                              items: items,
+                                            );
                                           }).then((values) {
                                         if (app != null && values != null) {
                                           var changedApp = app.app;
@@ -288,10 +286,43 @@ class _AppPageState extends State<AppPage> {
                                       });
                                     },
                               tooltip: tr('additionalOptions'),
-                              icon: const Icon(Icons.settings)),
+                              icon: const Icon(Icons.edit)),
+                        if (app != null && app.installedInfo != null)
+                          IconButton(
+                            onPressed: () {
+                              appsProvider.openAppSettings(app.app.id);
+                            },
+                            icon: const Icon(Icons.settings),
+                            tooltip: tr('settings'),
+                          ),
+                        if (app != null && settingsProvider.showAppWebpage)
+                          IconButton(
+                              onPressed: () {
+                                showDialog(
+                                    context: context,
+                                    builder: (BuildContext ctx) {
+                                      return AlertDialog(
+                                        scrollable: true,
+                                        content: infoColumn,
+                                        title: Text(
+                                            '${app.app.name} ${tr('byX', args: [
+                                              app.app.author
+                                            ])}'),
+                                        actions: [
+                                          TextButton(
+                                              onPressed: () {
+                                                Navigator.of(context).pop();
+                                              },
+                                              child: Text(tr('continue')))
+                                        ],
+                                      );
+                                    });
+                              },
+                              icon: const Icon(Icons.more_horiz),
+                              tooltip: tr('more')),
                         const SizedBox(width: 16.0),
                         Expanded(
-                            child: ElevatedButton(
+                            child: TextButton(
                                 onPressed: (app?.app.installedVersion == null ||
                                             app?.app.installedVersion !=
                                                 app?.app.latestVersion) &&
@@ -330,44 +361,17 @@ class _AppPageState extends State<AppPage> {
                                         ? tr('update')
                                         : tr('markUpdated')))),
                         const SizedBox(width: 16.0),
-                        ElevatedButton(
+                        Expanded(
+                            child: TextButton(
                           onPressed: app?.downloadProgress != null
                               ? null
                               : () {
-                                  showDialog(
+                                  appsProvider.removeAppsWithModal(
-                                      context: context,
+                                      context, [app!.app]).then((value) {
-                                      builder: (BuildContext ctx) {
+                                    if (value == true) {
-                                        return AlertDialog(
+                                      Navigator.of(context).pop();
-                                          title: Text(tr('removeAppQuestion')),
+                                    }
-                                          content: Text(tr(
+                                  });
-                                              'xWillBeRemovedButRemainInstalled',
-                                              args: [
-                                                app?.installedInfo?.name ??
-                                                    app?.app.name ??
-                                                    tr('app')
-                                              ])),
-                                          actions: [
-                                            TextButton(
-                                                onPressed: () {
-                                                  HapticFeedback
-                                                      .selectionClick();
-                                                  appsProvider.removeApps(
-                                                      [app!.app.id]).then((_) {
-                                                    int count = 0;
-                                                    Navigator.of(context)
-                                                        .popUntil((_) =>
-                                                            count++ >= 2);
-                                                  });
-                                                },
-                                                child: Text(tr('remove'))),
-                                            TextButton(
-                                                onPressed: () {
-                                                  Navigator.of(context).pop();
-                                                },
-                                                child: Text(tr('cancel')))
-                                          ],
-                                        );
-                                      });
                                 },
                           style: TextButton.styleFrom(
                               foregroundColor:
@@ -375,7 +379,7 @@ class _AppPageState extends State<AppPage> {
                               surfaceTintColor:
                                   Theme.of(context).colorScheme.error),
                           child: Text(tr('remove')),
-                        ),
+                        )),
                       ])),
               if (app?.downloadProgress != null)
                 Padding(
@@ -387,3 +391,18 @@ class _AppPageState extends State<AppPage> {
     );
   }
 }
+
+class RemoveAppsModal extends StatefulWidget {
+  const RemoveAppsModal({super.key, this.apps = const []});
+  final List<App> apps;
+
+  @override
+  State<RemoveAppsModal> createState() => _RemoveAppsModalState();
+}
+
+class _RemoveAppsModalState extends State<RemoveAppsModal> {
+  @override
+  Widget build(BuildContext context) {
+    return const Placeholder();
+  }
+}

lib/pages/home.dart

@@ -63,21 +63,29 @@ class _HomePageState extends State<HomePage> {
                 .map((e) =>
                     NavigationDestination(icon: Icon(e.icon), label: e.title))
                 .toList(),
-            onDestinationSelected: (int index) {
+            onDestinationSelected: (int index) async {
               HapticFeedback.selectionClick();
-              setState(() {
+              if (index == 0) {
-                if (index == 0) {
+                while ((pages[0].widget.key as GlobalKey<AppsPageState>)
+                        .currentState !=
+                    null) {
+                  // Avoid duplicate GlobalKey error
+                  await Future.delayed(const Duration(microseconds: 1));
+                }
+                setState(() {
                   selectedIndexHistory.clear();
-                } else if (selectedIndexHistory.isEmpty ||
+                });
-                    (selectedIndexHistory.isNotEmpty &&
+              } else if (selectedIndexHistory.isEmpty ||
-                        selectedIndexHistory.last != index)) {
+                  (selectedIndexHistory.isNotEmpty &&
+                      selectedIndexHistory.last != index)) {
+                setState(() {
                   int existingInd = selectedIndexHistory.indexOf(index);
                   if (existingInd >= 0) {
                     selectedIndexHistory.removeAt(existingInd);
                   }
                   selectedIndexHistory.add(index);
-                }
+                });
-              });
+              }
             },
             selectedIndex:
                 selectedIndexHistory.isEmpty ? 0 : selectedIndexHistory.last,

lib/pages/import_export.dart

@@ -9,6 +9,7 @@ import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/apps_provider.dart';
+import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:file_picker/file_picker.dart';
@@ -28,6 +29,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
   Widget build(BuildContext context) {
     SourceProvider sourceProvider = SourceProvider();
     var appsProvider = context.read<AppsProvider>();
+    var settingsProvider = context.read<SettingsProvider>();
     var outlineButtonStyle = ButtonStyle(
       shape: MaterialStateProperty.all(
         StadiumBorder(
@@ -100,6 +102,21 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                               appsProvider
                                                   .importApps(data)
                                                   .then((value) {
+                                                var cats =
+                                                    settingsProvider.categories;
+                                                appsProvider.apps
+                                                    .forEach((key, value) {
+                                                  for (var c
+                                                      in value.app.categories) {
+                                                    if (!cats.containsKey(c)) {
+                                                      cats[c] =
+                                                          generateRandomLightColor()
+                                                              .value;
+                                                    }
+                                                  }
+                                                });
+                                                settingsProvider.categories =
+                                                    cats;
                                                 showError(
                                                     tr('importedX', args: [
                                                       plural('apps', value)
@@ -547,18 +564,22 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
           widget.onlyOneSelectionAllowed ? tr('selectURL') : tr('selectURLs')),
       content: Column(children: [
         ...urlWithDescriptionSelections.keys.map((urlWithD) {
+          select(bool? value) {
+            setState(() {
+              value ??= false;
+              if (value! && widget.onlyOneSelectionAllowed) {
+                selectOnlyOne(urlWithD.key);
+              } else {
+                urlWithDescriptionSelections[urlWithD] = value!;
+              }
+            });
+          }
+
           return Row(children: [
             Checkbox(
                 value: urlWithDescriptionSelections[urlWithD],
                 onChanged: (value) {
-                  setState(() {
+                  select(value);
-                    value ??= false;
-                    if (value! && widget.onlyOneSelectionAllowed) {
-                      selectOnlyOne(urlWithD.key);
-                    } else {
-                      urlWithDescriptionSelections[urlWithD] = value!;
-                    }
-                  });
                 }),
             const SizedBox(
               width: 8,
@@ -582,12 +603,17 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
                           const TextStyle(decoration: TextDecoration.underline),
                       textAlign: TextAlign.start,
                     )),
-                Text(
+                GestureDetector(
-                  urlWithD.value.length > 128
+                  onTap: () {
-                      ? '${urlWithD.value.substring(0, 128)}...'
+                    select(!(urlWithDescriptionSelections[urlWithD] ?? false));
-                      : urlWithD.value,
+                  },
-                  style: const TextStyle(
+                  child: Text(
-                      fontStyle: FontStyle.italic, fontSize: 12),
+                    urlWithD.value.length > 128
+                        ? '${urlWithD.value.substring(0, 128)}...'
+                        : urlWithD.value,
+                    style: const TextStyle(
+                        fontStyle: FontStyle.italic, fontSize: 12),
+                  ),
                 ),
                 const SizedBox(
                   height: 8,

lib/pages/settings.dart

@@ -4,10 +4,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
-import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/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';
@@ -436,7 +434,7 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
         items: [
           [
             GeneratedFormTagInput('categories',
-                label: tr('category'),
+                label: tr('categories'),
                 emptyMessage: tr('noCategories'),
                 defaultValue: storedValues,
                 alignment: widget.alignment,

lib/providers/apps_provider.dart

@@ -5,6 +5,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:android_intent_plus/flag.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -12,6 +13,8 @@ import 'package:flutter/services.dart';
 import 'package:install_plugin_v2/install_plugin_v2.dart';
 import 'package:installed_apps/app_info.dart';
 import 'package:installed_apps/installed_apps.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
@@ -23,6 +26,7 @@ import 'package:path_provider/path_provider.dart';
 import 'package:flutter_fgbg/flutter_fgbg.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:http/http.dart';
+import 'package:android_intent_plus/android_intent.dart';
 
 class AppInMemory {
   late App app;
@@ -247,9 +251,10 @@ class AppsProvider with ChangeNotifier {
         !(await canDowngradeApps())) {
       throw DowngradeError();
     }
-    if (appInfo == null ||
+    await InstallPlugin.installApk(file.file.path, obtainiumId);
-        int.parse(newInfo.buildNumber) > appInfo.versionCode!) {
+    if (file.appId == obtainiumId) {
-      await InstallPlugin.installApk(file.file.path, 'dev.imranr.obtainium');
+      // Obtainium prompt should be lowest
+      await Future.delayed(const Duration(milliseconds: 500));
     }
     apps[file.appId]!.app.installedVersion =
         apps[file.appId]!.app.latestVersion;
@@ -258,6 +263,15 @@ class AppsProvider with ChangeNotifier {
         attemptToCorrectInstallStatus: false);
   }
 
+  void uninstallApp(String appId) async {
+    var intent = AndroidIntent(
+        action: 'android.intent.action.DELETE',
+        data: 'package:$appId',
+        flags: <int>[Flag.FLAG_ACTIVITY_NEW_TASK],
+        package: 'vnd.android.package-archive');
+    await intent.launch();
+  }
+
   Future<String?> confirmApkUrl(App app, BuildContext? context) async {
     // If the App has more than one APK, the user should pick one (if context provided)
     String? apkUrl = app.apkUrls[app.preferredApkIndex];
@@ -265,6 +279,7 @@ class AppsProvider with ChangeNotifier {
     List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
 
     if (app.apkUrls.length > 1 && context != null) {
+      // ignore: use_build_context_synchronously
       apkUrl = await showDialog(
           context: context,
           builder: (BuildContext ctx) {
@@ -284,6 +299,7 @@ class AppsProvider with ChangeNotifier {
     if (apkUrl != null &&
         getHost(apkUrl) != getHost(app.url) &&
         context != null) {
+      // ignore: use_build_context_synchronously
       if (await showDialog(
               context: context,
               builder: (BuildContext ctx) {
@@ -441,9 +457,6 @@ class AppsProvider with ChangeNotifier {
     } catch (e) {
       //
     }
-    if (!res) {
-      logs.add(tr('versionCorrectionDisabled'));
-    }
     return res;
   }
 
@@ -622,6 +635,57 @@ class AppsProvider with ChangeNotifier {
     }
   }
 
+  Future<bool> removeAppsWithModal(BuildContext context, List<App> apps) async {
+    var showUninstallOption =
+        apps.where((a) => a.installedVersion != null).isNotEmpty;
+    var values = await showDialog(
+        context: context,
+        builder: (BuildContext ctx) {
+          return GeneratedFormModal(
+            title: plural('removeAppQuestion', apps.length),
+            items: !showUninstallOption
+                ? []
+                : [
+                    [
+                      GeneratedFormSwitch('rmAppEntry',
+                          label: tr('removeFromObtainium'), defaultValue: true)
+                    ],
+                    [
+                      GeneratedFormSwitch('uninstallApp',
+                          label: tr('uninstallFromDevice'))
+                    ]
+                  ],
+            initValid: true,
+          );
+        });
+    if (values != null) {
+      bool uninstall = values['uninstallApp'] == true && showUninstallOption;
+      bool remove = values['rmAppEntry'] == true || !showUninstallOption;
+      if (uninstall) {
+        for (var i = 0; i < apps.length; i++) {
+          if (apps[i].installedVersion != null) {
+            uninstallApp(apps[i].id);
+            apps[i].installedVersion = null;
+          }
+        }
+        await saveApps(apps, attemptToCorrectInstallStatus: false);
+      }
+      if (remove) {
+        await removeApps(apps.map((e) => e.id).toList());
+      }
+      return uninstall || remove;
+    }
+    return false;
+  }
+
+  Future<void> openAppSettings(String appId) async {
+    final AndroidIntent intent = AndroidIntent(
+      action: 'action_application_details_settings',
+      data: 'package:$appId',
+    );
+    await intent.launch();
+  }
+
   Future<App?> checkUpdate(String appId) async {
     App? currentApp = apps[appId]!.app;
     SourceProvider sourceProvider = SourceProvider();
@@ -707,7 +771,7 @@ class AppsProvider with ChangeNotifier {
       exportDir = await getExternalStorageDirectory();
       path = exportDir!.path;
     }
-    if ((await DeviceInfoPlugin().androidInfo).version.sdkInt <= 28) {
+    if ((await DeviceInfoPlugin().androidInfo).version.sdkInt <= 29) {
       if (await Permission.storage.isDenied) {
         await Permission.storage.request();
       }

lib/providers/settings_provider.dart

@@ -157,15 +157,6 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  getCategoryFormItem({String initCategory = ''}) => GeneratedFormDropdown(
-      'category',
-      label: tr('category'),
-      [
-        MapEntry('', tr('noCategory')),
-        ...categories.entries.map((e) => MapEntry(e.key, e.key)).toList()
-      ],
-      defaultValue: initCategory);
-
   String? get forcedLocale {
     var fl = prefs?.getString('forcedLocale');
     return supportedLocales
@@ -185,4 +176,7 @@ class SettingsProvider with ChangeNotifier {
     }
     notifyListeners();
   }
+
+  bool setEqual(Set<String> a, Set<String> b) =>
+      a.length == b.length && a.union(b).length == a.length;
 }

lib/providers/source_provider.dart

@@ -7,11 +7,13 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:html/dom.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/app_sources/apkmirror.dart';
+import 'package:obtainium/app_sources/codeberg.dart';
 import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/app_sources/fdroidrepo.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/app_sources/gitlab.dart';
 import 'package:obtainium/app_sources/izzyondroid.dart';
+import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/app_sources/mullvad.dart';
 import 'package:obtainium/app_sources/signal.dart';
 import 'package:obtainium/app_sources/sourceforge.dart';
@@ -19,7 +21,6 @@ import 'package:obtainium/app_sources/steammobile.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
-import 'package:obtainium/providers/settings_provider.dart';
 
 class AppNames {
   late String author;
@@ -48,7 +49,7 @@ class App {
   late Map<String, dynamic> additionalSettings;
   late DateTime? lastUpdateCheck;
   bool pinned = false;
-  String? category;
+  List<String> categories;
   App(
       this.id,
       this.url,
@@ -61,7 +62,7 @@ class App {
       this.additionalSettings,
       this.lastUpdateCheck,
       this.pinned,
-      {this.category});
+      {this.categories = const []});
 
   @override
   String toString() {
@@ -103,6 +104,12 @@ class App {
             item.ensureType(additionalSettings[item.key]);
       }
     }
+    int preferredApkIndex = json['preferredApkIndex'] == null
+        ? 0
+        : json['preferredApkIndex'] as int;
+    if (preferredApkIndex < 0) {
+      preferredApkIndex = 0;
+    }
     return App(
         json['id'] as String,
         json['url'] as String,
@@ -115,15 +122,19 @@ class App {
         json['apkUrls'] == null
             ? []
             : List<String>.from(jsonDecode(json['apkUrls'])),
-        json['preferredApkIndex'] == null
+        preferredApkIndex,
-            ? 0
-            : json['preferredApkIndex'] as int,
         additionalSettings,
         json['lastUpdateCheck'] == null
             ? null
             : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
         json['pinned'] ?? false,
-        category: json['category']);
+        categories: json['categories'] != null
+            ? (json['categories'] as List<dynamic>)
+                .map((e) => e.toString())
+                .toList()
+            : json['category'] != null
+                ? [json['category'] as String]
+                : []);
   }
 
   Map<String, dynamic> toJson() => {
@@ -138,12 +149,16 @@ class App {
         'additionalSettings': jsonEncode(additionalSettings),
         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
         'pinned': pinned,
-        'category': category
+        'categories': categories
       };
 }
 
 // Ensure the input is starts with HTTPS and has no WWW
 preStandardizeUrl(String url) {
+  var firstDotIndex = url.indexOf('.');
+  if (!(firstDotIndex >= 0 && firstDotIndex != url.length - 1)) {
+    throw UnsupportedURLError();
+  }
   if (url.toLowerCase().indexOf('http://') != 0 &&
       url.toLowerCase().indexOf('https://') != 0) {
     url = 'https://$url';
@@ -210,7 +225,19 @@ class AppSource {
         label: tr('trackOnly'),
       )
     ],
-    [GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))]
+    [
+      GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))
+    ],
+    [
+      GeneratedFormTextField('apkFilterRegEx',
+          label: tr('filterAPKsByRegEx'),
+          required: false,
+          additionalValidators: [
+            (value) {
+              return regExValidator(value);
+            }
+          ])
+    ]
   ];
 
   // Previous 2 variables combined into one at runtime for convenient usage
@@ -254,11 +281,24 @@ abstract class MassAppUrlSource {
   Future<Map<String, String>> getUrlsWithDescriptions(List<String> args);
 }
 
+regExValidator(String? value) {
+  if (value == null || value.isEmpty) {
+    return null;
+  }
+  try {
+    RegExp(value);
+  } catch (e) {
+    return tr('invalidRegEx');
+  }
+  return null;
+}
+
 class SourceProvider {
   // Add more source classes here so they are available via the service
   List<AppSource> sources = [
     GitHub(),
     GitLab(),
+    Codeberg(),
     FDroid(),
     IzzyOnDroid(),
     Mullvad(),
@@ -266,7 +306,8 @@ class SourceProvider {
     SourceForge(),
     APKMirror(),
     FDroidRepo(),
-    SteamMobile()
+    SteamMobile(),
+    HTML() // This should ALWAYS be the last option as they are tried in order
   ];
 
   // Add more mass url source classes here so they are available via the service
@@ -327,10 +368,13 @@ class SourceProvider {
   }
 
   Future<App> getApp(
-      AppSource source, String url, Map<String, dynamic> additionalSettings,
+    AppSource source,
-      {App? currentApp,
+    String url,
-      bool trackOnlyOverride = false,
+    Map<String, dynamic> additionalSettings, {
-      noVersionDetectionOverride = false}) async {
+    App? currentApp,
+    bool trackOnlyOverride = false,
+    noVersionDetectionOverride = false,
+  }) async {
     if (trackOnlyOverride || source.enforceTrackOnly) {
       additionalSettings['trackOnly'] = true;
     }
@@ -341,6 +385,11 @@ class SourceProvider {
     String standardUrl = source.standardizeURL(preStandardizeUrl(url));
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalSettings);
+    if (additionalSettings['apkFilterRegEx'] != null) {
+      var reg = RegExp(additionalSettings['apkFilterRegEx']);
+      apk.apkUrls =
+          apk.apkUrls.where((element) => reg.hasMatch(element)).toList();
+    }
     if (apk.apkUrls.isEmpty && !trackOnly) {
       throw NoAPKError();
     }
@@ -360,11 +409,11 @@ class SourceProvider {
         currentApp?.installedVersion,
         apkVersion,
         apk.apkUrls,
-        apk.apkUrls.length - 1,
+        apk.apkUrls.length - 1 >= 0 ? apk.apkUrls.length - 1 : 0,
         additionalSettings,
         DateTime.now(),
         currentApp?.pinned ?? false,
-        category: currentApp?.category);
+        categories: currentApp?.categories ?? const []);
   }
 
   // Returns errors in [results, errors] instead of throwing them

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.9.10+98 # When changing this, update the tag in main() accordingly
+version: 0.10.7+113 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'
@@ -58,6 +58,7 @@ dependencies:
   android_alarm_manager_plus: ^2.1.0
   sqflite: ^2.2.0+3
   easy_localization: ^3.0.1
+  android_intent_plus: ^3.1.5
 
 
 dev_dependencies: