Merge pull request #182 from ImranR98/dev

Broke `GeneratedFormItem` into sub-types + bugfix

assets/translations/de.json

@@ -135,7 +135,7 @@
     "appearance": "Aussehen",
     "showWebInAppView": "Quellwebseite in der App-Ansicht anzeigen",
     "pinUpdates": "Apps mit Aktualisierungen oben anheften",
-    "updates": "Aktualisiert",
+    "updates": "Aktualisierungen",
     "sourceSpecific": "Quellenspezifisch",
     "appSource": "App-Quelle",
     "noLogs": "Keine Protokolle",
@@ -199,6 +199,14 @@
     "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
     "noAPKFound": "No APK found",
     "noVersionDetection": "No version detection",
+    "categorize": "Categorize",
+    "categories": "Categories",
+    "category": "Category",
+    "noCategory": "No Category",
+    "deleteCategoryQuestion": "Delete Category?",
+    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
+    "addCategory": "Add Category",
+    "label": "Label",
     "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

@@ -135,7 +135,7 @@
     "appearance": "Appearance",
     "showWebInAppView": "Show Source Webpage in App View",
     "pinUpdates": "Pin Updates to Top of Apps View",
-    "updates": "Updated",
+    "updates": "Updates",
     "sourceSpecific": "Source-Specific",
     "appSource": "App Source",
     "noLogs": "No Logs",
@@ -199,6 +199,14 @@
     "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
     "noAPKFound": "No APK found",
     "noVersionDetection": "No version detection",
+    "categorize": "Categorize",
+    "categories": "Categories",
+    "category": "Category",
+    "noCategory": "No Category",
+    "deleteCategoryQuestion": "Delete Category?",
+    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
+    "addCategory": "Add Category",
+    "label": "Label",
     "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

@@ -135,7 +135,7 @@
     "appearance": "Megjelenés",
     "showWebInAppView": "Forrás megjelenítése az Appok nézetben",
     "pinUpdates": "Frissítések kitűzése az App nézet tetejére",
-    "updates": "Frissítve",
+    "updates": "Frissítések",
     "sourceSpecific": "Forrás-specifikus",
     "appSource": "App forrás",
     "noLogs": "Nincsenek naplók",
@@ -199,6 +199,14 @@
     "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
     "noAPKFound": "No APK found",
     "noVersionDetection": "No version detection",
+    "categorize": "Categorize",
+    "categories": "Categories",
+    "category": "Category",
+    "noCategory": "No Category",
+    "deleteCategoryQuestion": "Delete Category?",
+    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
+    "addCategory": "Add Category",
+    "label": "Label",
     "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

@@ -135,7 +135,7 @@
     "appearance": "Aspetto",
     "showWebInAppView": "Mostra pagina web dell'App se selezionata",
     "pinUpdates": "Fissa in alto gli aggiornamenti disponibili",
-    "updates": "Aggiornato",
+    "updates": "Aggiornamenti",
     "sourceSpecific": "Specifiche per la fonte",
     "appSource": "Sorgente dell'App",
     "noLogs": "Nessun log",
@@ -199,6 +199,14 @@
     "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
     "noAPKFound": "No APK found",
     "noVersionDetection": "No version detection",
+    "categorize": "Categorize",
+    "categories": "Categories",
+    "category": "Category",
+    "noCategory": "No Category",
+    "deleteCategoryQuestion": "Delete Category?",
+    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
+    "addCategory": "Add Category",
+    "label": "Label",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Troppe richieste (traffico limitato) - riprova tra {} minuto",
         "other": "Troppe richieste (traffico limitato) - riprova tra {} minuti"

assets/translations/ja.json

@@ -16,7 +16,7 @@
     "startedActualBGUpdateCheck": "実際のバックグラウンドのアップデート確認を開始",
     "bgUpdateTaskFinished": "バックグラウンドのアップデート確認タスクを終了",
     "firstRun": "これがObtainiumの最初の実行です",
-    "settingUpdateCheckIntervalTo": "更新間隔を{}に設定する",
+    "settingUpdateCheckIntervalTo": "確認間隔を{}に設定する",
     "githubPATLabel": "GitHub パーソナルアクセストークン (レート制限の引き上げ)",
     "githubPATHint": "PATは次の形式でなければなりません: ユーザー名:トークン",
     "githubPATFormat": "ユーザー名:トークン",
@@ -29,16 +29,16 @@
     "cancel": "キャンセル",
     "continue": "続ける",
     "requiredInBrackets": "(必須)",
-    "dropdownNoOptsError": "エラー: ドロップダウンには、少なくとも1つのoptが必要です。",
+    "dropdownNoOptsError": "エラー: ドロップダウンには、少なくとも1つのオプションが必要です",
     "colour": "カラー",
     "githubStarredRepos": "Githubでスターしたリポジトリ",
     "uname": "ユーザー名",
     "wrongArgNum": "提供する引数の数が間違っています",
-    "xIsTrackOnly": "{} は'追跡のみ'です",
+    "xIsTrackOnly": "{} は「追跡のみ」です",
     "source": "ソース",
     "app": "アプリ",
-    "appsFromSourceAreTrackOnly": "このソースからのアプリは'追跡のみ'です'。",
-    "youPickedTrackOnly": "'追跡のみ'を選択しています",
+    "appsFromSourceAreTrackOnly": "このソースからのアプリは「追跡のみ」です。",
+    "youPickedTrackOnly": "「追跡のみ」を選択しています",
     "trackOnlyAppDescription": "アプリのアップデートは追跡されますが、Obtainiumはアプリのダウンロードやインストールをすることはできません。",
     "cancelled": "キャンセルしました",
     "appAlreadyAdded": "アプリはすでに追加されています",
@@ -124,13 +124,13 @@
     "obtainium": "Obtainium",
     "materialYou": "Material You",
     "appSortBy": "アプリの並び方",
-    "authorName": "作者/アプリ名",
-    "nameAuthor": "アプリ名/作者",
+    "authorName": "作者名/アプリ名",
+    "nameAuthor": "アプリ名/作者名",
     "asAdded": "追加順",
     "appSortOrder": "並び順",
     "ascending": "昇順",
     "descending": "降順",
-    "bgUpdateCheckInterval": "バックグラウンド更新の確認間隔",
+    "bgUpdateCheckInterval": "バックグラウンドでのアップデート確認の間隔",
     "neverManualOnly": "手動",
     "appearance": "外観",
     "showWebInAppView": "アプリビューにソースウェブページを表示する",
@@ -152,11 +152,11 @@
     "sourceIsXButPackageFromYPrompt": "アプリのソースは'{}'ですが、リリースパッケージは'{}'から来ています。続行しますか？",
     "updatesAvailable": "アップデートが利用可能",
     "updatesAvailableNotifDescription": "Obtainiumが追跡している1つまたは複数のアプリのアップデートが利用可能であることをユーザーに通知する",
-    "noNewUpdates": "新しいアップデートはありません。",
+    "noNewUpdates": "新しいアップデートはありません",
     "xHasAnUpdate": "{}のアップデートが利用可能です",
     "appsUpdated": "アプリをアップデートしました",
     "appsUpdatedNotifDescription": "1つまたは複数のAppのアップデートがバックグラウンドで適用されたことをユーザーに通知する",
-    "xWasUpdatedToY": "{}が{}にアップデートされました。",
+    "xWasUpdatedToY": "{}が{}にアップデートされました",
     "errorCheckingUpdates": "アップデート確認中のエラー",
     "errorCheckingUpdatesNotifDescription": "バックグラウンドでのアップデート確認に失敗した際に表示される通知",
     "appsRemoved": "削除されたアプリ",
@@ -173,7 +173,7 @@
     "versionCorrectionDisabled": "バージョン補正無効 (プラグインが動作していません)",
     "unknown": "不明",
     "none": "なし",
-    "never": "Never",
+    "never": "しない",
     "latestVersionX": "最新のバージョン: {}",
     "installedVersionX": "インストールされたバージョン: {}",
     "lastUpdateCheckX": "最終アップデート確認: {}",
@@ -181,35 +181,43 @@
     "removeAppQuestion": "アプリを削除しますか？",
     "yesMarkUpdated": "はい、アップデート済みとしてマークします",
     "fdroid": "F-Droid",
-    "appIdOrName": "アプリIDまたは名前",
+    "appIdOrName": "アプリのIDまたは名前",
     "appWithIdOrNameNotFound": "そのIDや名前を持つアプリは見つかりませんでした",
     "reposHaveMultipleApps": "リポジトリには複数のアプリが含まれることがあります",
     "fdroidThirdPartyRepo": "F-Droid Third-Party Repo",
     "steam": "Steam",
     "steamMobile": "Steam Mobile",
     "steamChat": "Steam Chat",
-    "install": "Install",
-    "markInstalled": "Mark Installed",
-    "update": "Update",
-    "markUpdated": "Mark Updated",
-    "additionalOptions": "Additional Options",
-    "disableVersionDetection": "Disable Version Detection",
-    "noVersionDetectionExplanation": "This option should only be used for Apps where version detection does not work correctly.",
-    "downloadingX": "Downloading {}",
-    "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
-    "noAPKFound": "No APK found",
-    "noVersionDetection": "No version detection",
+    "install": "インストール",
+    "markInstalled": "インストール済みとしてマークする",
+    "update": "アップデート",
+    "markUpdated": "アップデート済みとしてマークする",
+    "additionalOptions": "追加のオプション",
+    "disableVersionDetection": "バージョン検出を無効にする",
+    "noVersionDetectionExplanation": "このオプションは、バージョン検出が正しく機能しないアプリにのみ使用する必要があります。",
+    "downloadingX": "{} をダウンロード中",
+    "downloadNotifDescription": "アプリのダウンロード状況を通知する",
+    "noAPKFound": "APKが見つかりません",
+    "noVersionDetection": "バージョン検出を行わない",
+    "categorize": "カテゴライズ",
+    "categories": "カテゴリ",
+    "category": "カテゴリ",
+    "noCategory": "カテゴリなし",
+    "deleteCategoryQuestion": "カテゴリを削除しますか？",
+    "categoryDeleteWarning": "「{}」内のすべてのアプリは未分類に設定されます。",
+    "addCategory": "カテゴリを追加",
+    "label": "ラベル",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "リクエストが多すぎます（レート制限）- {}分後に再試行してください",
         "other": "リクエストが多すぎます（レート制限）- {}分後に再試行してください"
     },
     "bgUpdateGotErrorRetryInMinutes": {
-        "one": "バックグラウンドのアップデート確認で {} の問題が発生, {} 分後に再試行します",
-        "other": "バックグラウンドのアップデート確認で {} の問題が発生, {} 分後に再試行します"
+        "one": "バックグラウンドでのアップデート確認で {} の問題が発生, {} 分後に再試行します",
+        "other": "バックグラウンドでのアップデート確認で {} の問題が発生, {} 分後に再試行します"
     },
     "bgCheckFoundUpdatesWillNotifyIfNeeded": {
-        "one": "バックグラウンドのアップデート確認で {} 個のアップデートを発見 - 必要に応じてユーザーに通知します",
-        "other": "バックグラウンドのアップデート確認で {} 個のアップデートを発見 - 必要に応じてユーザーに通知します"
+        "one": "バックグラウンドでのアップデート確認で {} 個のアップデートを発見 - 必要に応じてユーザーに通知します",
+        "other": "バックグラウンドでのアップデート確認で {} 個のアップデートを発見 - 必要に応じてユーザーに通知します"
     },
     "apps": {
         "one": "{}個のアプリ",
@@ -236,11 +244,11 @@
         "other": "{n}個のログをクリアしました (前 = {before}, 後 = {after})"
     },
     "xAndNMoreUpdatesAvailable": {
-        "one": "{}とさらに{}個のアプリのアップデートが利用可能です。",
-        "other": "{}とさらに{}個のアプリのアップデートが利用可能です。"
+        "one": "{}とさらに{}個のアプリのアップデートが利用可能です",
+        "other": "{}とさらに{}個のアプリのアップデートが利用可能です"
     },
     "xAndNMoreUpdatesInstalled": {
-        "one": "{}とさらに{}個のアプリがアップデートされました。",
-        "other": "{}とさらに{}個のアプリがアップデートされました。"
+        "one": "{}とさらに{}個のアプリがアップデートされました",
+        "other": "{}とさらに{}個のアプリがアップデートされました"
     }
 }

assets/translations/zh.json

@@ -22,9 +22,9 @@
     "githubPATFormat": "username:token",
     "githubPATLinkText": "关于 GitHub 个人访问令牌",
     "includePrereleases": "包含预发布版",
-    "fallbackToOlderReleases": "回落到旧版",
-    "filterReleaseTitlesByRegEx": "通过正则表达式过滤发布标题",
-    "invalidRegEx": "无效的正则表达式",
+    "fallbackToOlderReleases": "回退到旧版",
+    "filterReleaseTitlesByRegEx": "使用正则以过滤发布标题",
+    "invalidRegEx": "表达式无效",
     "noDescription": "无描述",
     "cancel": "取消",
     "continue": "继续",
@@ -109,7 +109,7 @@
     "searchX": "搜索 {}",
     "noResults": "无结果",
     "importX": "导入 {}",
-    "importedAppsIdDisclaimer": "导入的应用程序可能不正确地显示为未安装。要解决这个问题，请通过 Obtainium 重新安装它们。",
+    "importedAppsIdDisclaimer": "导入的应用程序可能显示为未安装。要解决这个问题，请通过 Obtainium 重新安装它们。",
     "importErrors": "导入错误",
     "importedXOfYApps": "{} 中的 {} 个应用已导入",
     "followingURLsHadErrors": "以下 URL 有错误：",
@@ -134,7 +134,7 @@
     "neverManualOnly": "手动",
     "appearance": "外观",
     "showWebInAppView": "在应用来源页显示网页",
-    "pinUpdates": "将需要更新的应用固定到顶部",
+    "pinUpdates": "需更新的应用置顶",
     "updates": "检查间隔",
     "sourceSpecific": "Github 访问令牌",
     "appSource": "源代码",
@@ -145,9 +145,9 @@
     "appNotFound": "未找到应用",
     "obtainiumExportHyphenatedLowercase": "obtainium-导出",
     "pickAnAPK": "选择一个安装包",
-    "appHasMoreThanOnePackage": "{} 有多于一个安装包：",
-    "deviceSupportsXArch": "你的设备支持 {} CPU 架构",
-    "deviceSupportsFollowingArchs": "你的设备支持以下 CPU 架构:",
+    "appHasMoreThanOnePackage": "{} 有多个架构可用：",
+    "deviceSupportsXArch": "你的设备支持 {} 架构",
+    "deviceSupportsFollowingArchs": "你的设备支持以下架构:",
     "warning": "警告",
     "sourceIsXButPackageFromYPrompt": "此应用来源是 '{}' 但更新包来自 '{}'。 继续吗？",
     "updatesAvailable": "更新可用",
@@ -188,17 +188,25 @@
     "steam": "Steam",
     "steamMobile": "Steam Mobile",
     "steamChat": "Steam Chat",
-    "install": "Install",
-    "markInstalled": "Mark Installed",
-    "update": "Update",
-    "markUpdated": "Mark Updated",
-    "additionalOptions": "Additional Options",
-    "disableVersionDetection": "Disable Version Detection",
-    "noVersionDetectionExplanation": "This option should only be used for Apps where version detection does not work correctly.",
-    "downloadingX": "Downloading {}",
-    "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
-    "noAPKFound": "No APK found",
-    "noVersionDetection": "No version detection",
+    "install": "安装",
+    "markInstalled": "标记为已安装",
+    "update": "更新",
+    "markUpdated": "标记为已更新",
+    "additionalOptions": "附加选项",
+    "disableVersionDetection": "关闭版本检测",
+    "noVersionDetectionExplanation": "此选项应只用于版本检测不能工作的应用程序",
+    "downloadingX": "下载中 {}",
+    "downloadNotifDescription": "通知用户下载进度",
+    "noAPKFound": "未找到安装包",
+    "noVersionDetection": "无版本检测",
+    "categorize": "Categorize",
+    "categories": "Categories",
+    "category": "Category",
+    "noCategory": "No Category",
+    "deleteCategoryQuestion": "Delete Category?",
+    "categoryDeleteWarning": "All Apps in {} will be set to uncategorized.",
+    "addCategory": "Add Category",
+    "label": "Label",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "请求过多 (API 限制) - 在 {} 分钟后重试",
         "other": "请求过多 (API 限制) - 在 {} 分钟后重试"

lib/app_sources/apkmirror.dart

@@ -26,7 +26,7 @@ class APKMirror extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     Response res = await get(Uri.parse('$standardUrl/feed'));
     if (res.statusCode == 200) {

lib/app_sources/fdroid.dart

@@ -32,7 +32,7 @@ class FDroid extends AppSource {
 
   @override
   String? tryInferringAppId(String standardUrl,
-      {Map<String, String> additionalSettings = const {}}) {
+      {Map<String, dynamic> additionalSettings = const {}}) {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
@@ -61,7 +61,7 @@ class FDroid extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     String? appId = tryInferringAppId(standardUrl);
     return getAPKUrlsFromFDroidPackagesAPIResponse(

lib/app_sources/fdroidrepo.dart

@@ -11,7 +11,7 @@ class FDroidRepo extends AppSource {
 
     additionalSourceAppSpecificSettingFormItems = [
       [
-        GeneratedFormItem('appIdOrName',
+        GeneratedFormTextField('appIdOrName',
             label: tr('appIdOrName'),
             hint: tr('reposHaveMultipleApps'),
             required: true)
@@ -33,7 +33,7 @@ class FDroidRepo extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     String? appIdOrName = additionalSettings['appIdOrName'];
     if (appIdOrName == null) {

lib/app_sources/github.dart

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

lib/app_sources/gitlab.dart

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

lib/app_sources/izzyondroid.dart

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

lib/app_sources/mullvad.dart

@@ -25,7 +25,7 @@ class Mullvad extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     Response res = await get(Uri.parse('$standardUrl/en/download/android'));
     if (res.statusCode == 200) {

lib/app_sources/signal.dart

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

lib/app_sources/sourceforge.dart

@@ -24,7 +24,7 @@ class SourceForge extends AppSource {
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
-    Map<String, String> additionalSettings,
+    Map<String, dynamic> additionalSettings,
   ) async {
     Response res = await get(Uri.parse('$standardUrl/rss?path=/'));
     if (res.statusCode == 200) {

lib/app_sources/steammobile.dart

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

lib/components/generated_form.dart

@@ -1,39 +1,90 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
-enum FormItemType { string, bool }
-
-typedef OnValueChanges = void Function(
-    Map<String, String> values, bool valid, bool isBuilding);
-
-class GeneratedFormItem {
+abstract class GeneratedFormItem {
   late String key;
   late String label;
-  late FormItemType type;
-  late bool required;
-  late int max;
-  late List<String? Function(String? value)> additionalValidators;
   late List<Widget> belowWidgets;
-  late String? hint;
-  late List<MapEntry<String, String>>? opts;
-  late String? defaultValue;
+  late dynamic defaultValue;
+  List<dynamic> additionalValidators;
+  dynamic ensureType(dynamic val);
 
   GeneratedFormItem(this.key,
       {this.label = 'Input',
-      this.type = FormItemType.string,
+      this.belowWidgets = const [],
+      this.defaultValue,
+      this.additionalValidators = const []});
+}
+
+class GeneratedFormTextField extends GeneratedFormItem {
+  late bool required;
+  late int max;
+  late String? hint;
+
+  GeneratedFormTextField(String key,
+      {String label = 'Input',
+      List<Widget> belowWidgets = const [],
+      String defaultValue = '',
+      List<String? Function(String? value)> additionalValidators = const [],
       this.required = true,
       this.max = 1,
-      this.additionalValidators = const [],
-      this.belowWidgets = const [],
-      this.hint,
-      this.opts,
-      this.defaultValue}) {
-    if (type != FormItemType.string) {
-      required = false;
-    }
+      this.hint})
+      : super(key,
+            label: label,
+            belowWidgets: belowWidgets,
+            defaultValue: defaultValue,
+            additionalValidators: additionalValidators);
+
+  @override
+  String ensureType(val) {
+    return val.toString();
   }
 }
 
+class GeneratedFormDropdown extends GeneratedFormItem {
+  late List<MapEntry<String, String>>? opts;
+
+  GeneratedFormDropdown(
+    String key,
+    this.opts, {
+    String label = 'Input',
+    List<Widget> belowWidgets = const [],
+    String defaultValue = '',
+    List<String? Function(String? value)> additionalValidators = const [],
+  }) : super(key,
+            label: label,
+            belowWidgets: belowWidgets,
+            defaultValue: defaultValue,
+            additionalValidators: additionalValidators);
+
+  @override
+  String ensureType(val) {
+    return val.toString();
+  }
+}
+
+class GeneratedFormSwitch extends GeneratedFormItem {
+  GeneratedFormSwitch(
+    String key, {
+    String label = 'Input',
+    List<Widget> belowWidgets = const [],
+    bool defaultValue = false,
+    List<String? Function(bool value)> additionalValidators = const [],
+  }) : super(key,
+            label: label,
+            belowWidgets: belowWidgets,
+            defaultValue: defaultValue,
+            additionalValidators: additionalValidators);
+
+  @override
+  bool ensureType(val) {
+    return val == true || val == 'true';
+  }
+}
+
+typedef OnValueChanges = void Function(
+    Map<String, dynamic> values, bool valid, bool isBuilding);
+
 class GeneratedForm extends StatefulWidget {
   const GeneratedForm(
       {super.key, required this.items, required this.onValueChanges});
@@ -47,18 +98,16 @@ class GeneratedForm extends StatefulWidget {
 
 class _GeneratedFormState extends State<GeneratedForm> {
   final _formKey = GlobalKey<FormState>();
-  Map<String, String> values = {};
+  Map<String, dynamic> values = {};
   late List<List<Widget>> formInputs;
   List<List<Widget>> rows = [];
 
   // If any value changes, call this to update the parent with value and validity
   void someValueChanged({bool isBuilding = false}) {
-    Map<String, String> returnValues = {};
+    Map<String, dynamic> returnValues = values;
     var valid = true;
     for (int r = 0; r < widget.items.length; r++) {
       for (int i = 0; i < widget.items[r].length; i++) {
-        returnValues[widget.items[r][i].key] =
-            values[widget.items[r][i].key] ?? '';
         if (formInputs[r][i] is TextFormField) {
           valid = valid &&
               ((formInputs[r][i].key as GlobalKey<FormFieldState>)
@@ -80,35 +129,37 @@ class _GeneratedFormState extends State<GeneratedForm> {
     int j = 0;
     for (var row in widget.items) {
       for (var e in row) {
-        values[e.key] = e.defaultValue ?? e.opts?.first.key ?? '';
+        values[e.key] = e.defaultValue;
       }
     }
 
     // Dynamically create form inputs
     formInputs = widget.items.asMap().entries.map((row) {
       return row.value.asMap().entries.map((e) {
-        if (e.value.type == FormItemType.string && e.value.opts == null) {
+        var formItem = e.value;
+        if (formItem is GeneratedFormTextField) {
           final formFieldKey = GlobalKey<FormFieldState>();
           return TextFormField(
             key: formFieldKey,
-            initialValue: values[e.value.key],
+            initialValue: values[formItem.key],
             autovalidateMode: AutovalidateMode.onUserInteraction,
             onChanged: (value) {
               setState(() {
-                values[e.value.key] = value;
+                values[formItem.key] = value;
                 someValueChanged();
               });
             },
             decoration: InputDecoration(
-                helperText: e.value.label + (e.value.required ? ' *' : ''),
-                hintText: e.value.hint),
-            minLines: e.value.max <= 1 ? null : e.value.max,
-            maxLines: e.value.max <= 1 ? 1 : e.value.max,
+                helperText: formItem.label + (formItem.required ? ' *' : ''),
+                hintText: formItem.hint),
+            minLines: formItem.max <= 1 ? null : formItem.max,
+            maxLines: formItem.max <= 1 ? 1 : formItem.max,
             validator: (value) {
-              if (e.value.required && (value == null || value.trim().isEmpty)) {
-                return '${e.value.label} ${tr('requiredInBrackets')}';
+              if (formItem.required &&
+                  (value == null || value.trim().isEmpty)) {
+                return '${formItem.label} ${tr('requiredInBrackets')}';
               }
-              for (var validator in e.value.additionalValidators) {
+              for (var validator in formItem.additionalValidators) {
                 String? result = validator(value);
                 if (result != null) {
                   return result;
@@ -117,21 +168,20 @@ class _GeneratedFormState extends State<GeneratedForm> {
               return null;
             },
           );
-        } else if (e.value.type == FormItemType.string &&
-            e.value.opts != null) {
-          if (e.value.opts!.isEmpty) {
+        } else if (formItem is GeneratedFormDropdown) {
+          if (formItem.opts!.isEmpty) {
             return Text(tr('dropdownNoOptsError'));
           }
           return DropdownButtonFormField(
-              decoration: InputDecoration(labelText: e.value.label),
-              value: values[e.value.key],
-              items: e.value.opts!
-                  .map((e) =>
-                      DropdownMenuItem(value: e.key, child: Text(e.value)))
+              decoration: InputDecoration(labelText: formItem.label),
+              value: values[formItem.key],
+              items: formItem.opts!
+                  .map((e2) =>
+                      DropdownMenuItem(value: e2.key, child: Text(e2.value)))
                   .toList(),
               onChanged: (value) {
                 setState(() {
-                  values[e.value.key] = value ?? e.value.opts!.first.key;
+                  values[formItem.key] = value ?? formItem.opts!.first.key;
                   someValueChanged();
                 });
               });
@@ -147,16 +197,16 @@ class _GeneratedFormState extends State<GeneratedForm> {
   Widget build(BuildContext context) {
     for (var r = 0; r < formInputs.length; r++) {
       for (var e = 0; e < formInputs[r].length; e++) {
-        if (widget.items[r][e].type == FormItemType.bool) {
+        if (widget.items[r][e] is GeneratedFormSwitch) {
           formInputs[r][e] = Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               Text(widget.items[r][e].label),
               Switch(
-                  value: values[widget.items[r][e].key] == 'true',
+                  value: values[widget.items[r][e].key],
                   onChanged: (value) {
                     setState(() {
-                      values[widget.items[r][e].key] = value ? 'true' : '';
+                      values[widget.items[r][e].key] = value;
                       someValueChanged();
                     });
                   })
@@ -171,9 +221,8 @@ class _GeneratedFormState extends State<GeneratedForm> {
       if (rowInputs.key > 0) {
         rows.add([
           SizedBox(
-            height: widget.items[rowInputs.key][0].type == FormItemType.bool &&
-                    widget.items[rowInputs.key - 1][0].type ==
-                        FormItemType.string
+            height: widget.items[rowInputs.key][0] is GeneratedFormSwitch &&
+                    widget.items[rowInputs.key - 1][0] is! GeneratedFormSwitch
                 ? 25
                 : 8,
           )

lib/components/generated_form_modal.dart

@@ -21,7 +21,7 @@ class GeneratedFormModal extends StatefulWidget {
 }
 
 class _GeneratedFormModalState extends State<GeneratedFormModal> {
-  Map<String, String> values = {};
+  Map<String, dynamic> values = {};
   bool valid = false;
 
   @override

lib/main.dart

@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.8.22';
+const String currentVersion = '0.9.2';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -200,7 +200,7 @@ class _ObtainiumState extends State<Obtainium> {
               currentReleaseTag,
               [],
               0,
-              {'includePrereleases': 'true'},
+              {'includePrereleases': true},
               null,
               false)
         ]);

lib/pages/add_app.dart

@@ -27,7 +27,7 @@ class _AddAppPageState extends State<AddAppPage> {
   String userInput = '';
   String searchQuery = '';
   AppSource? pickedSource;
-  Map<String, String> additionalSettings = {};
+  Map<String, dynamic> additionalSettings = {};
   bool additionalSettingsValid = true;
 
   @override
@@ -66,9 +66,9 @@ class _AddAppPageState extends State<AddAppPage> {
       });
       var settingsProvider = context.read<SettingsProvider>();
       () async {
-        var userPickedTrackOnly = additionalSettings['trackOnly'] == 'true';
+        var userPickedTrackOnly = additionalSettings['trackOnly'] == true;
         var userPickedNoVersionDetection =
-            additionalSettings['noVersionDetection'] == 'true';
+            additionalSettings['noVersionDetection'] == true;
         var cont = true;
         if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
             await showDialog(
@@ -113,7 +113,7 @@ class _AddAppPageState extends State<AddAppPage> {
           }
           // Only download the APK here if you need to for the package ID
           if (sourceProvider.isTempId(app.id) &&
-              app.additionalSettings['trackOnly'] != 'true') {
+              app.additionalSettings['trackOnly'] != true) {
             // ignore: use_build_context_synchronously
             var apkUrl = await appsProvider.confirmApkUrl(app, context);
             if (apkUrl == null) {
@@ -128,7 +128,7 @@ class _AddAppPageState extends State<AddAppPage> {
           if (appsProvider.apps.containsKey(app.id)) {
             throw ObtainiumError(tr('appAlreadyAdded'));
           }
-          if (app.additionalSettings['trackOnly'] == 'true') {
+          if (app.additionalSettings['trackOnly'] == true) {
             app.installedVersion = app.latestVersion;
           }
           await appsProvider.saveApps([app]);
@@ -169,7 +169,7 @@ class _AddAppPageState extends State<AddAppPage> {
                               child: GeneratedForm(
                                   items: [
                                 [
-                                  GeneratedFormItem('appSourceURL',
+                                  GeneratedFormTextField('appSourceURL',
                                       label: tr('appSourceURL'),
                                       additionalValidators: [
                                         (value) {
@@ -231,7 +231,8 @@ class _AddAppPageState extends State<AddAppPage> {
                               child: GeneratedForm(
                                   items: [
                                     [
-                                      GeneratedFormItem('searchSomeSources',
+                                      GeneratedFormTextField(
+                                          'searchSomeSources',
                                           label: tr('searchSomeSourcesLabel'),
                                           required: false),
                                     ]

lib/pages/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/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
@@ -33,6 +34,7 @@ class _AppPageState extends State<AppPage> {
       });
     }
 
+    var categories = settingsProvider.categories;
     var sourceProvider = SourceProvider();
     AppInMemory? app = appsProvider.apps[widget.appId];
     var source = app != null ? sourceProvider.getSource(app.app.url) : null;
@@ -40,7 +42,7 @@ class _AppPageState extends State<AppPage> {
       prevApp = app;
       getUpdate(app.app.id);
     }
-    var trackOnly = app?.app.additionalSettings['trackOnly'] == 'true';
+    var trackOnly = app?.app.additionalSettings['trackOnly'] == true;
     return Scaffold(
       appBar: settingsProvider.showAppWebpage ? AppBar() : null,
       backgroundColor: Theme.of(context).colorScheme.surface,
@@ -148,7 +150,51 @@ class _AppPageState extends State<AppPage> {
                           textAlign: TextAlign.center,
                           style: const TextStyle(
                               fontStyle: FontStyle.italic, fontSize: 12),
-                        )
+                        ),
+                        const SizedBox(
+                          height: 32,
+                        ),
+                        app?.app.category != null
+                            ? Chip(
+                                label: Text(app!.app.category!),
+                                backgroundColor:
+                                    Color(categories[app.app.category!] ?? 0x0),
+                                onDeleted: () {
+                                  app.app.category = null;
+                                  appsProvider.saveApps([app.app]);
+                                },
+                                visualDensity: VisualDensity.compact,
+                              )
+                            : Row(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                    TextButton(
+                                        onPressed: () {
+                                          showDialog<Map<String, dynamic>?>(
+                                              context: context,
+                                              builder: (BuildContext ctx) {
+                                                return GeneratedFormModal(
+                                                    title: 'Pick a Category',
+                                                    items: [
+                                                      [
+                                                        settingsProvider
+                                                            .getCategoryFormItem()
+                                                      ]
+                                                    ]);
+                                              }).then((value) {
+                                            if (value != null && app != null) {
+                                              String? cat = (value['category']
+                                                          ?.isNotEmpty ??
+                                                      false)
+                                                  ? value['category']
+                                                  : null;
+                                              app.app.category = cat;
+                                              appsProvider.saveApps([app.app]);
+                                            }
+                                          });
+                                        },
+                                        child: Text(tr('categorize')))
+                                  ])
                       ],
                     )),
                   ],
@@ -227,7 +273,7 @@ class _AppPageState extends State<AppPage> {
                               onPressed: app?.downloadProgress != null
                                   ? null
                                   : () {
-                                      showDialog<Map<String, String>>(
+                                      showDialog<Map<String, dynamic>?>(
                                           context: context,
                                           builder: (BuildContext ctx) {
                                             var items = source
@@ -255,7 +301,7 @@ class _AppPageState extends State<AppPage> {
                                               values;
                                           if (source.enforceTrackOnly) {
                                             changedApp.additionalSettings[
-                                                'trackOnly'] = 'true';
+                                                'trackOnly'] = true;
                                             showError(
                                                 tr('appsFromSourceAreTrackOnly'),
                                                 context);
@@ -281,7 +327,7 @@ class _AppPageState extends State<AppPage> {
                                         () async {
                                           if (app?.app.additionalSettings[
                                                   'trackOnly'] !=
-                                              'true') {
+                                              true) {
                                             await settingsProvider
                                                 .getInstallPermission();
                                           }

lib/pages/apps.dart

@@ -80,28 +80,31 @@ class AppsPageState extends State<AppsPage> {
             !(filter!.includeNonInstalled)) {
           return false;
         }
-        if (filter!.nameFilter.isEmpty && filter!.authorFilter.isEmpty) {
-          return true;
-        }
-        List<String> nameTokens = filter!.nameFilter
-            .split(' ')
-            .where((element) => element.trim().isNotEmpty)
-            .toList();
-        List<String> authorTokens = filter!.authorFilter
-            .split(' ')
-            .where((element) => element.trim().isNotEmpty)
-            .toList();
+        if (filter!.nameFilter.isNotEmpty || filter!.authorFilter.isNotEmpty) {
+          List<String> nameTokens = filter!.nameFilter
+              .split(' ')
+              .where((element) => element.trim().isNotEmpty)
+              .toList();
+          List<String> authorTokens = filter!.authorFilter
+              .split(' ')
+              .where((element) => element.trim().isNotEmpty)
+              .toList();
 
-        for (var t in nameTokens) {
-          var name = app.installedInfo?.name ?? app.app.name;
-          if (!name.toLowerCase().contains(t.toLowerCase())) {
-            return false;
+          for (var t in nameTokens) {
+            var name = app.installedInfo?.name ?? app.app.name;
+            if (!name.toLowerCase().contains(t.toLowerCase())) {
+              return false;
+            }
+          }
+          for (var t in authorTokens) {
+            if (!app.app.author.toLowerCase().contains(t.toLowerCase())) {
+              return false;
+            }
           }
         }
-        for (var t in authorTokens) {
-          if (!app.app.author.toLowerCase().contains(t.toLowerCase())) {
-            return false;
-          }
+        if (filter!.categoryFilter.isNotEmpty &&
+            filter!.categoryFilter != app.app.category) {
+          return false;
         }
         return true;
       }).toList();
@@ -139,16 +142,14 @@ class AppsPageState extends State<AppsPage> {
 
     List<String> trackOnlyUpdateIdsAllOrSelected = [];
     existingUpdateIdsAllOrSelected = existingUpdateIdsAllOrSelected.where((id) {
-      if (appsProvider.apps[id]!.app.additionalSettings['trackOnly'] ==
-          'true') {
+      if (appsProvider.apps[id]!.app.additionalSettings['trackOnly'] == true) {
         trackOnlyUpdateIdsAllOrSelected.add(id);
         return false;
       }
       return true;
     }).toList();
     newInstallIdsAllOrSelected = newInstallIdsAllOrSelected.where((id) {
-      if (appsProvider.apps[id]!.app.additionalSettings['trackOnly'] ==
-          'true') {
+      if (appsProvider.apps[id]!.app.additionalSettings['trackOnly'] == true) {
         trackOnlyUpdateIdsAllOrSelected.add(id);
         return false;
       }
@@ -225,96 +226,114 @@ class AppsPageState extends State<AppsPage> {
               String? changesUrl = SourceProvider()
                   .getSource(sortedApps[index].app.url)
                   .changeLogPageFromStandardUrl(sortedApps[index].app.url);
-              return ListTile(
-                tileColor: sortedApps[index].app.pinned
-                    ? Colors.grey.withOpacity(0.1)
-                    : Colors.transparent,
-                selectedTileColor: Theme.of(context)
-                    .colorScheme
-                    .primary
-                    .withOpacity(sortedApps[index].app.pinned ? 0.2 : 0.1),
-                selected: selectedApps.contains(sortedApps[index].app),
-                onLongPress: () {
-                  toggleAppSelected(sortedApps[index].app);
-                },
-                leading: sortedApps[index].installedInfo != null
-                    ? Image.memory(
-                        sortedApps[index].installedInfo!.icon!,
-                        gaplessPlayback: true,
-                      )
-                    : null,
-                title: Text(
-                  sortedApps[index].installedInfo?.name ??
-                      sortedApps[index].app.name,
-                  style: TextStyle(
-                      fontWeight: sortedApps[index].app.pinned
-                          ? FontWeight.bold
-                          : FontWeight.normal),
-                ),
-                subtitle: Text(tr('byX', args: [sortedApps[index].app.author]),
-                    style: TextStyle(
+              return Container(
+                  decoration: BoxDecoration(
+                      border: Border.symmetric(
+                          vertical: BorderSide(
+                              width: 3,
+                              color: Color(settingsProvider.categories[
+                                      sortedApps[index].app.category] ??
+                                  const Color.fromARGB(0, 0, 0, 0).value)))),
+                  child: ListTile(
+                    tileColor: sortedApps[index].app.pinned
+                        ? Colors.grey.withOpacity(0.1)
+                        : Colors.transparent,
+                    selectedTileColor: Theme.of(context)
+                        .colorScheme
+                        .primary
+                        .withOpacity(sortedApps[index].app.pinned ? 0.2 : 0.1),
+                    selected: selectedApps.contains(sortedApps[index].app),
+                    onLongPress: () {
+                      toggleAppSelected(sortedApps[index].app);
+                    },
+                    leading: sortedApps[index].installedInfo != null
+                        ? Image.memory(
+                            sortedApps[index].installedInfo!.icon!,
+                            gaplessPlayback: true,
+                          )
+                        : null,
+                    title: Text(
+                      sortedApps[index].installedInfo?.name ??
+                          sortedApps[index].app.name,
+                      style: TextStyle(
                         fontWeight: sortedApps[index].app.pinned
                             ? FontWeight.bold
-                            : FontWeight.normal)),
-                trailing: SingleChildScrollView(
-                    reverse: true,
-                    child: sortedApps[index].downloadProgress != null
-                        ? Text(tr('percentProgress', args: [
-                            sortedApps[index]
-                                    .downloadProgress
-                                    ?.toInt()
-                                    .toString() ??
-                                '100'
-                          ]))
-                        : (Column(
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            crossAxisAlignment: CrossAxisAlignment.end,
-                            children: [
-                              SizedBox(
-                                  width: 100,
-                                  child: Text(
-                                    '${sortedApps[index].app.installedVersion ?? tr('notInstalled')}${sortedApps[index].app.additionalSettings['trackOnly'] == 'true' ? ' ${tr('estimateInBrackets')}' : ''}',
-                                    overflow: TextOverflow.fade,
-                                    textAlign: TextAlign.end,
-                                  )),
-                              sortedApps[index].app.installedVersion != null &&
-                                      sortedApps[index].app.installedVersion !=
-                                          sortedApps[index].app.latestVersion
-                                  ? GestureDetector(
-                                      onTap: changesUrl == null
-                                          ? null
-                                          : () {
-                                              launchUrlString(changesUrl,
-                                                  mode: LaunchMode
-                                                      .externalApplication);
-                                            },
-                                      child: appsProvider.areDownloadsRunning()
-                                          ? Text(tr('pleaseWait'))
-                                          : Text(
-                                              '${tr('updateAvailable')}${sortedApps[index].app.additionalSettings['trackOnly'] == 'true' ? ' ${tr('estimateInBracketsShort')}' : ''}',
-                                              style: TextStyle(
-                                                  fontStyle: FontStyle.italic,
-                                                  decoration: changesUrl == null
-                                                      ? TextDecoration.none
-                                                      : TextDecoration
-                                                          .underline),
-                                            ))
-                                  : const SizedBox(),
-                            ],
-                          ))),
-                onTap: () {
-                  if (selectedApps.isNotEmpty) {
-                    toggleAppSelected(sortedApps[index].app);
-                  } else {
-                    Navigator.push(
-                      context,
-                      MaterialPageRoute(
-                          builder: (context) =>
-                              AppPage(appId: sortedApps[index].app.id)),
-                    );
-                  }
-                },
-              );
+                            : FontWeight.normal,
+                      ),
+                    ),
+                    subtitle: Text(
+                        tr('byX', args: [sortedApps[index].app.author]),
+                        style: TextStyle(
+                            fontWeight: sortedApps[index].app.pinned
+                                ? FontWeight.bold
+                                : FontWeight.normal)),
+                    trailing: SingleChildScrollView(
+                        reverse: true,
+                        child: sortedApps[index].downloadProgress != null
+                            ? Text(tr('percentProgress', args: [
+                                sortedApps[index]
+                                        .downloadProgress
+                                        ?.toInt()
+                                        .toString() ??
+                                    '100'
+                              ]))
+                            : (Column(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                crossAxisAlignment: CrossAxisAlignment.end,
+                                children: [
+                                  SizedBox(
+                                      width: 100,
+                                      child: Text(
+                                        '${sortedApps[index].app.installedVersion ?? tr('notInstalled')}${sortedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBrackets')}' : ''}',
+                                        overflow: TextOverflow.fade,
+                                        textAlign: TextAlign.end,
+                                      )),
+                                  sortedApps[index].app.installedVersion !=
+                                              null &&
+                                          sortedApps[index]
+                                                  .app
+                                                  .installedVersion !=
+                                              sortedApps[index]
+                                                  .app
+                                                  .latestVersion
+                                      ? GestureDetector(
+                                          onTap: changesUrl == null
+                                              ? null
+                                              : () {
+                                                  launchUrlString(changesUrl,
+                                                      mode: LaunchMode
+                                                          .externalApplication);
+                                                },
+                                          child: appsProvider
+                                                  .areDownloadsRunning()
+                                              ? Text(tr('pleaseWait'))
+                                              : Text(
+                                                  '${tr('updateAvailable')}${sortedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBracketsShort')}' : ''}',
+                                                  style: TextStyle(
+                                                      fontStyle:
+                                                          FontStyle.italic,
+                                                      decoration: changesUrl ==
+                                                              null
+                                                          ? TextDecoration.none
+                                                          : TextDecoration
+                                                              .underline),
+                                                ))
+                                      : const SizedBox(),
+                                ],
+                              ))),
+                    onTap: () {
+                      if (selectedApps.isNotEmpty) {
+                        toggleAppSelected(sortedApps[index].app);
+                      } else {
+                        Navigator.push(
+                          context,
+                          MaterialPageRoute(
+                              builder: (context) =>
+                                  AppPage(appId: sortedApps[index].app.id)),
+                        );
+                      }
+                    },
+                  ));
             }, childCount: sortedApps.length))
           ])),
       persistentFooterButtons: [
@@ -345,7 +364,7 @@ class AppsPageState extends State<AppsPage> {
                     : IconButton(
                         visualDensity: VisualDensity.compact,
                         onPressed: () {
-                          showDialog<Map<String, String>?>(
+                          showDialog<Map<String, dynamic>?>(
                               context: context,
                               builder: (BuildContext ctx) {
                                 return GeneratedFormModal(
@@ -379,40 +398,33 @@ class AppsPageState extends State<AppsPage> {
                             HapticFeedback.heavyImpact();
                             List<GeneratedFormItem> formItems = [];
                             if (existingUpdateIdsAllOrSelected.isNotEmpty) {
-                              formItems.add(GeneratedFormItem('updates',
+                              formItems.add(GeneratedFormSwitch('updates',
                                   label: tr('updateX', args: [
                                     plural('apps',
                                         existingUpdateIdsAllOrSelected.length)
                                   ]),
-                                  type: FormItemType.bool,
-                                  defaultValue: 'true'));
+                                  defaultValue: true));
                             }
                             if (newInstallIdsAllOrSelected.isNotEmpty) {
-                              formItems.add(GeneratedFormItem('installs',
+                              formItems.add(GeneratedFormSwitch('installs',
                                   label: tr('installX', args: [
                                     plural('apps',
                                         newInstallIdsAllOrSelected.length)
                                   ]),
-                                  type: FormItemType.bool,
-                                  defaultValue:
-                                      existingUpdateIdsAllOrSelected.isNotEmpty
-                                          ? 'true'
-                                          : ''));
+                                  defaultValue: existingUpdateIdsAllOrSelected
+                                      .isNotEmpty));
                             }
                             if (trackOnlyUpdateIdsAllOrSelected.isNotEmpty) {
-                              formItems.add(GeneratedFormItem('trackonlies',
+                              formItems.add(GeneratedFormSwitch('trackonlies',
                                   label: tr('markXTrackOnlyAsUpdated', args: [
                                     plural('apps',
                                         trackOnlyUpdateIdsAllOrSelected.length)
                                   ]),
-                                  type: FormItemType.bool,
                                   defaultValue: existingUpdateIdsAllOrSelected
-                                              .isNotEmpty ||
-                                          newInstallIdsAllOrSelected.isNotEmpty
-                                      ? 'true'
-                                      : ''));
+                                          .isNotEmpty ||
+                                      newInstallIdsAllOrSelected.isNotEmpty));
                             }
-                            showDialog<Map<String, String>?>(
+                            showDialog<Map<String, dynamic>?>(
                                 context: context,
                                 builder: (BuildContext ctx) {
                                   var totalApps = existingUpdateIdsAllOrSelected
@@ -432,11 +444,11 @@ class AppsPageState extends State<AppsPage> {
                                       [formItems]);
                                 }
                                 bool shouldInstallUpdates =
-                                    values['updates'] == 'true';
+                                    values['updates'] == true;
                                 bool shouldInstallNew =
-                                    values['installs'] == 'true';
+                                    values['installs'] == true;
                                 bool shouldMarkTrackOnlies =
-                                    values['trackonlies'] == 'true';
+                                    values['trackonlies'] == true;
                                 (() async {
                                   if (shouldInstallNew ||
                                       shouldInstallUpdates) {
@@ -678,7 +690,7 @@ class AppsPageState extends State<AppsPage> {
                               : FontWeight.bold),
                     ),
                     onPressed: () {
-                      showDialog<Map<String, String>?>(
+                      showDialog<Map<String, dynamic>?>(
                           context: context,
                           builder: (BuildContext ctx) {
                             var vals = filter == null
@@ -688,26 +700,28 @@ class AppsPageState extends State<AppsPage> {
                                 title: tr('filterApps'),
                                 items: [
                                   [
-                                    GeneratedFormItem('appName',
+                                    GeneratedFormTextField('appName',
                                         label: tr('appName'),
                                         required: false,
                                         defaultValue: vals['appName']),
-                                    GeneratedFormItem('author',
+                                    GeneratedFormTextField('author',
                                         label: tr('author'),
                                         required: false,
                                         defaultValue: vals['author'])
                                   ],
                                   [
-                                    GeneratedFormItem('upToDateApps',
+                                    GeneratedFormSwitch('upToDateApps',
                                         label: tr('upToDateApps'),
-                                        type: FormItemType.bool,
                                         defaultValue: vals['upToDateApps'])
                                   ],
                                   [
-                                    GeneratedFormItem('nonInstalledApps',
+                                    GeneratedFormSwitch('nonInstalledApps',
                                         label: tr('nonInstalledApps'),
-                                        type: FormItemType.bool,
                                         defaultValue: vals['nonInstalledApps'])
+                                  ],
+                                  [
+                                    settingsProvider.getCategoryFormItem(
+                                        initCategory: vals['category'] ?? '')
                                   ]
                                 ]);
                           }).then((values) {
@@ -734,32 +748,37 @@ class AppsFilter {
   late String authorFilter;
   late bool includeUptodate;
   late bool includeNonInstalled;
+  late String categoryFilter;
 
   AppsFilter(
       {this.nameFilter = '',
       this.authorFilter = '',
       this.includeUptodate = true,
-      this.includeNonInstalled = true});
+      this.includeNonInstalled = true,
+      this.categoryFilter = ''});
 
-  Map<String, String> toValuesMap() {
+  Map<String, dynamic> toValuesMap() {
     return {
       'appName': nameFilter,
       'author': authorFilter,
-      'upToDateApps': includeUptodate ? 'true' : '',
-      'nonInstalledApps': includeNonInstalled ? 'true' : ''
+      'upToDateApps': includeUptodate,
+      'nonInstalledApps': includeNonInstalled,
+      'category': categoryFilter
     };
   }
 
-  AppsFilter.fromValuesMap(Map<String, String> values) {
+  AppsFilter.fromValuesMap(Map<String, dynamic> values) {
     nameFilter = values['appName']!;
     authorFilter = values['author']!;
-    includeUptodate = values['upToDateApps'] == 'true';
-    includeNonInstalled = values['nonInstalledApps'] == 'true';
+    includeUptodate = values['upToDateApps'];
+    includeNonInstalled = values['nonInstalledApps'];
+    categoryFilter = values['category']!;
   }
 
   bool isIdenticalTo(AppsFilter other) =>
       authorFilter.trim() == other.authorFilter.trim() &&
       nameFilter.trim() == other.nameFilter.trim() &&
       includeUptodate == other.includeUptodate &&
-      includeNonInstalled == other.includeNonInstalled;
+      includeNonInstalled == other.includeNonInstalled &&
+      categoryFilter.trim() == other.categoryFilter.trim();
 }

lib/pages/import_export.dart

@@ -138,18 +138,19 @@ class _ImportExportPageState extends State<ImportExportPage> {
                           onPressed: importInProgress
                               ? null
                               : () {
-                                  showDialog(
+                                  showDialog<Map<String, dynamic>?>(
                                       context: context,
                                       builder: (BuildContext ctx) {
                                         return GeneratedFormModal(
                                           title: tr('importFromURLList'),
                                           items: [
                                             [
-                                              GeneratedFormItem('appURLList',
+                                              GeneratedFormTextField(
+                                                  'appURLList',
                                                   label: tr('appURLList'),
                                                   max: 7,
                                                   additionalValidators: [
-                                                    (String? value) {
+                                                    (dynamic value) {
                                                       if (value != null &&
                                                           value.isNotEmpty) {
                                                         var lines = value
@@ -176,7 +177,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                       }).then((values) {
                                     if (values != null) {
                                       var urls =
-                                          (values[0] as String).split('\n');
+                                          (values['appURLList'] as String)
+                                              .split('\n');
                                       setState(() {
                                         importInProgress = true;
                                       });
@@ -224,7 +226,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                             : () {
                                                 () async {
                                                   var values = await showDialog<
-                                                          List<String>>(
+                                                          Map<String,
+                                                              dynamic>?>(
                                                       context: context,
                                                       builder:
                                                           (BuildContext ctx) {
@@ -235,7 +238,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                               ]),
                                                           items: [
                                                             [
-                                                              GeneratedFormItem(
+                                                              GeneratedFormTextField(
                                                                   'searchQuery',
                                                                   label: tr(
                                                                       'searchQuery'))
@@ -244,13 +247,17 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                         );
                                                       });
                                                   if (values != null &&
-                                                      values[0].isNotEmpty) {
+                                                      (values['searchQuery']
+                                                                  as String?)
+                                                              ?.isNotEmpty ==
+                                                          true) {
                                                     setState(() {
                                                       importInProgress = true;
                                                     });
                                                     var urlsWithDescriptions =
-                                                        await source
-                                                            .search(values[0]);
+                                                        await source.search(
+                                                            values['searchQuery']
+                                                                as String);
                                                     if (urlsWithDescriptions
                                                         .isNotEmpty) {
                                                       var selectedUrls =
@@ -345,7 +352,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                                   .requiredArgs
                                                                   .map(
                                                                       (e) => [
-                                                                            GeneratedFormItem(e,
+                                                                            GeneratedFormTextField(e,
                                                                                 label: e)
                                                                           ])
                                                                   .toList(),

lib/pages/settings.dart

@@ -1,8 +1,12 @@
+import 'dart:math';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -17,11 +21,27 @@ class SettingsPage extends StatefulWidget {
   State<SettingsPage> createState() => _SettingsPageState();
 }
 
+// Generates a random light color
+// Courtesy of ChatGPT 😭 (with a bugfix 🥳)
+Color generateRandomLightColor() {
+  // Create a random number generator
+  final Random random = Random();
+
+  // Generate random hue, saturation, and value values
+  final double hue = random.nextDouble() * 360;
+  final double saturation = 0.5 + random.nextDouble() * 0.5;
+  final double value = 0.9 + random.nextDouble() * 0.1;
+
+  // Create a HSV color with the random values
+  return HSVColor.fromAHSV(1.0, hue, saturation, value).toColor();
+}
+
 class _SettingsPageState extends State<SettingsPage> {
   @override
   Widget build(BuildContext context) {
     SettingsProvider settingsProvider = context.watch<SettingsProvider>();
     SourceProvider sourceProvider = SourceProvider();
+    AppsProvider appsProvider = context.read<AppsProvider>();
     if (settingsProvider.prefs == null) {
       settingsProvider.initializeSettings();
     }
@@ -138,9 +158,10 @@ class _SettingsPageState extends State<SettingsPage> {
     var sourceSpecificFields = sourceProvider.sources.map((e) {
       if (e.additionalSourceSpecificSettingFormItems.isNotEmpty) {
         return GeneratedForm(
-            items: e.additionalSourceSpecificSettingFormItems
-                .map((e) => [e])
-                .toList(),
+            items: e.additionalSourceSpecificSettingFormItems.map((e) {
+              e.defaultValue = settingsProvider.getSettingString(e.key);
+              return [e];
+            }).toList(),
             onValueChanges: (values, valid, isBuilding) {
               if (valid) {
                 values.forEach((key, value) {
@@ -157,6 +178,8 @@ class _SettingsPageState extends State<SettingsPage> {
       height: 16,
     );
 
+    var categories = settingsProvider.categories;
+
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
         body: CustomScrollView(slivers: <Widget>[
@@ -232,6 +255,94 @@ class _SettingsPageState extends State<SettingsPage> {
                                   color: Theme.of(context).colorScheme.primary),
                             ),
                             ...sourceSpecificFields,
+                            const Divider(
+                              height: 48,
+                            ),
+                            Text(
+                              tr('categories'),
+                              style: TextStyle(
+                                  color: Theme.of(context).colorScheme.primary),
+                            ),
+                            height16,
+                            Wrap(
+                              children: [
+                                ...categories.entries.toList().map((e) {
+                                  return Padding(
+                                      padding: const EdgeInsets.symmetric(
+                                          horizontal: 4),
+                                      child: Chip(
+                                        label: Text(e.key),
+                                        backgroundColor: Color(e.value),
+                                        visualDensity: VisualDensity.compact,
+                                        onDeleted: () {
+                                          showDialog<Map<String, dynamic>?>(
+                                              context: context,
+                                              builder: (BuildContext ctx) {
+                                                return GeneratedFormModal(
+                                                    title: tr(
+                                                        'deleteCategoryQuestion'),
+                                                    message: tr(
+                                                        'categoryDeleteWarning',
+                                                        args: [e.key]),
+                                                    items: []);
+                                              }).then((value) {
+                                            if (value != null) {
+                                              setState(() {
+                                                categories.remove(e.key);
+                                                settingsProvider.categories =
+                                                    categories;
+                                              });
+                                              appsProvider.saveApps(appsProvider
+                                                  .apps.values
+                                                  .where((element) =>
+                                                      element.app.category ==
+                                                      e.key)
+                                                  .map((e) {
+                                                var a = e.app;
+                                                a.category = null;
+                                                return a;
+                                              }).toList());
+                                            }
+                                          });
+                                        },
+                                      ));
+                                }),
+                                Padding(
+                                    padding: const EdgeInsets.symmetric(
+                                        horizontal: 4),
+                                    child: IconButton(
+                                      onPressed: () {
+                                        showDialog<Map<String, dynamic>?>(
+                                            context: context,
+                                            builder: (BuildContext ctx) {
+                                              return GeneratedFormModal(
+                                                  title: tr('addCategory'),
+                                                  items: [
+                                                    [
+                                                      GeneratedFormTextField(
+                                                          'label',
+                                                          label: tr('label'))
+                                                    ]
+                                                  ]);
+                                            }).then((value) {
+                                          String? label = value?['label'];
+                                          if (label != null) {
+                                            setState(() {
+                                              categories[label] =
+                                                  generateRandomLightColor()
+                                                      .value;
+                                              settingsProvider.categories =
+                                                  categories;
+                                            });
+                                          }
+                                        });
+                                      },
+                                      icon: const Icon(Icons.add),
+                                      visualDensity: VisualDensity.compact,
+                                      tooltip: tr('add'),
+                                    ))
+                              ],
+                            )
                           ],
                         ))),
           SliverToBoxAdapter(

lib/providers/apps_provider.dart

@@ -313,7 +313,7 @@ class AppsProvider with ChangeNotifier {
         throw ObtainiumError(tr('appNotFound'));
       }
       String? apkUrl;
-      var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == 'true';
+      var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == true;
       if (!trackOnly) {
         apkUrl = await confirmApkUrl(apps[id]!.app, context);
       }
@@ -452,9 +452,9 @@ class AppsProvider with ChangeNotifier {
   // Don't save changes, just return the object if changes were made (else null)
   App? getCorrectedInstallStatusAppIfPossible(App app, AppInfo? installedInfo) {
     var modded = false;
-    var trackOnly = app.additionalSettings['trackOnly'] == 'true';
+    var trackOnly = app.additionalSettings['trackOnly'] == true;
     var noVersionDetection =
-        app.additionalSettings['noVersionDetection'] == 'true';
+        app.additionalSettings['noVersionDetection'] == true;
     if (installedInfo == null && app.installedVersion != null && !trackOnly) {
       app.installedVersion = null;
       modded = true;

lib/providers/settings_provider.dart

@@ -1,9 +1,12 @@
 // Exposes functions used to save/load app settings
 
+import 'dart:convert';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:obtainium/app_sources/github.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -144,4 +147,20 @@ class SettingsProvider with ChangeNotifier {
     prefs?.setString(settingId, value);
     notifyListeners();
   }
+
+  Map<String, int> get categories =>
+      Map<String, int>.from(jsonDecode(prefs?.getString('categories') ?? '{}'));
+
+  set categories(Map<String, int> cats) {
+    prefs?.setString('categories', jsonEncode(cats));
+  }
+
+  getCategoryFormItem({String initCategory = ''}) => GeneratedFormDropdown(
+      'category',
+      label: tr('category'),
+      [
+        MapEntry('', tr('noCategory')),
+        ...categories.entries.map((e) => MapEntry(e.key, e.key)).toList()
+      ],
+      defaultValue: initCategory);
 }

lib/providers/source_provider.dart

@@ -19,6 +19,7 @@ import 'package:obtainium/app_sources/steammobile.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
+import 'package:obtainium/providers/settings_provider.dart';
 
 class AppNames {
   late String author;
@@ -44,9 +45,10 @@ class App {
   late String latestVersion;
   List<String> apkUrls = [];
   late int preferredApkIndex;
-  late Map<String, String> additionalSettings;
+  late Map<String, dynamic> additionalSettings;
   late DateTime? lastUpdateCheck;
   bool pinned = false;
+  String? category;
   App(
       this.id,
       this.url,
@@ -58,7 +60,8 @@ class App {
       this.preferredApkIndex,
       this.additionalSettings,
       this.lastUpdateCheck,
-      this.pinned);
+      this.pinned,
+      {this.category});
 
   @override
   String toString() {
@@ -69,24 +72,36 @@ class App {
     var source = SourceProvider().getSource(json['url']);
     var formItems = source.combinedAppSpecificSettingFormItems
         .reduce((value, element) => [...value, ...element]);
-    Map<String, String> additionalSettings =
+    Map<String, dynamic> additionalSettings =
         getDefaultValuesFromFormItems([formItems]);
     if (json['additionalSettings'] != null) {
       additionalSettings.addEntries(
-          Map<String, String>.from(jsonDecode(json['additionalSettings']))
+          Map<String, dynamic>.from(jsonDecode(json['additionalSettings']))
               .entries);
     }
-    // If needed, migrate old-style additionalData to new-style additionalSettings
+    // If needed, migrate old-style additionalData to newer-style additionalSettings (V1)
     if (json['additionalData'] != null) {
       List<String> temp = List<String>.from(jsonDecode(json['additionalData']));
       temp.asMap().forEach((i, value) {
         if (i < formItems.length) {
-          additionalSettings[formItems[i].key] = value;
+          if (formItems[i] is GeneratedFormSwitch) {
+            additionalSettings[formItems[i].key] = value == 'true';
+          } else {
+            additionalSettings[formItems[i].key] = value;
+          }
         }
       });
-      additionalSettings['trackOnly'] = (json['trackOnly'] ?? false).toString();
+      additionalSettings['trackOnly'] =
+          json['trackOnly'] == 'true' || json['trackOnly'] == true;
       additionalSettings['noVersionDetection'] =
-          (json['noVersionDetection'] ?? false).toString();
+          json['noVersionDetection'] == 'true' || json['trackOnly'] == true;
+    }
+    // Ensure additionalSettings are correctly typed
+    for (var item in formItems) {
+      if (additionalSettings[item.key] != null) {
+        additionalSettings[item.key] =
+            item.ensureType(additionalSettings[item.key]);
+      }
     }
     return App(
         json['id'] as String,
@@ -107,7 +122,8 @@ class App {
         json['lastUpdateCheck'] == null
             ? null
             : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
-        json['pinned'] ?? false);
+        json['pinned'] ?? false,
+        category: json['category']);
   }
 
   Map<String, dynamic> toJson() => {
@@ -121,7 +137,8 @@ class App {
         'preferredApkIndex': preferredApkIndex,
         'additionalSettings': jsonEncode(additionalSettings),
         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
-        'pinned': pinned
+        'pinned': pinned,
+        'category': category
       };
 }
 
@@ -155,7 +172,7 @@ List<String> getLinksFromParsedHTML(
         .map((e) => '$prependToLinks${e.attributes['href']!}')
         .toList();
 
-Map<String, String> getDefaultValuesFromFormItems(
+Map<String, dynamic> getDefaultValuesFromFormItems(
     List<List<GeneratedFormItem>> items) {
   return Map.fromEntries(items
       .map((row) => row.map((el) => MapEntry(el.key, el.defaultValue ?? '')))
@@ -176,7 +193,7 @@ class AppSource {
   }
 
   Future<APKDetails> getLatestAPKDetails(
-      String standardUrl, Map<String, String> additionalSettings) {
+      String standardUrl, Map<String, dynamic> additionalSettings) {
     throw NotImplementedError();
   }
 
@@ -188,16 +205,12 @@ class AppSource {
   final List<List<GeneratedFormItem>>
       additionalAppSpecificSourceAgnosticSettingFormItems = [
     [
-      GeneratedFormItem(
+      GeneratedFormSwitch(
         'trackOnly',
         label: tr('trackOnly'),
-        type: FormItemType.bool,
       )
     ],
-    [
-      GeneratedFormItem('noVersionDetection',
-          label: tr('noVersionDetection'), type: FormItemType.bool)
-    ]
+    [GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))]
   ];
 
   // Previous 2 variables combined into one at runtime for convenient usage
@@ -225,7 +238,7 @@ class AppSource {
   }
 
   String? tryInferringAppId(String standardUrl,
-      {Map<String, String> additionalSettings = const {}}) {
+      {Map<String, dynamic> additionalSettings = const {}}) {
     return null;
   }
 }
@@ -288,7 +301,7 @@ class SourceProvider {
   bool ifRequiredAppSpecificSettingsExist(AppSource source) {
     for (var row in source.combinedAppSpecificSettingFormItems) {
       for (var element in row) {
-        if (element.required && element.opts == null) {
+        if (element is GeneratedFormTextField && element.required) {
           return true;
         }
       }
@@ -314,17 +327,17 @@ class SourceProvider {
   }
 
   Future<App> getApp(
-      AppSource source, String url, Map<String, String> additionalSettings,
+      AppSource source, String url, Map<String, dynamic> additionalSettings,
       {App? currentApp,
       bool trackOnlyOverride = false,
       noVersionDetectionOverride = false}) async {
     if (trackOnlyOverride) {
-      additionalSettings['trackOnly'] = 'true';
+      additionalSettings['trackOnly'] = true;
     }
     if (noVersionDetectionOverride) {
-      additionalSettings['noVersionDetection'] = 'true';
+      additionalSettings['noVersionDetection'] = true;
     }
-    var trackOnly = currentApp?.additionalSettings['trackOnly'] == 'true';
+    var trackOnly = currentApp?.additionalSettings['trackOnly'] == true;
     String standardUrl = source.standardizeURL(preStandardizeUrl(url));
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalSettings);
@@ -350,7 +363,8 @@ class SourceProvider {
         apk.apkUrls.length - 1,
         additionalSettings,
         DateTime.now(),
-        currentApp?.pinned ?? false);
+        currentApp?.pinned ?? false,
+        category: currentApp?.category);
   }
 
   // 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.8.22+86 # When changing this, update the tag in main() accordingly
+version: 0.9.2+90 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'