Tiny bugfix with setting visual persistance

* Started work on dynamic forms

* dynamic form progress (switch doesn't work)

* dynamic forms work

* Gen. form improvements, source specific data (untested)

* Gen form bugfix

* Removed redundant generated modal code

* Added custom validators to gen. forms

* Progress on source options (incomplete), gen form bugfixes

* Tweaks, more

* More

* Progress

* Changed a default

* Additional options done!

lib/app_sources/fdroid.dart

@@ -0,0 +1,57 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class FDroid implements AppSource {
+  @override
+  late String host = 'f-droid.org';
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/packages/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw notValidURL(runtimeType.toString());
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData) async {
+    Response res = await get(Uri.parse(standardUrl));
+    if (res.statusCode == 200) {
+      var latestReleaseDiv =
+          parse(res.body).querySelector('#latest.package-version');
+      var apkUrl = latestReleaseDiv
+          ?.querySelector('.package-version-download a')
+          ?.attributes['href'];
+      if (apkUrl == null) {
+        throw noAPKFound;
+      }
+      var version = latestReleaseDiv
+          ?.querySelector('.package-version-header b')
+          ?.innerHtml
+          .split(' ')
+          .last;
+      if (version == null) {
+        throw couldNotFindLatestVersion;
+      }
+      return APKDetails(version, [apkUrl]);
+    } else {
+      throw couldNotFindReleases;
+    }
+  }
+
+  @override
+  AppNames getAppNames(String standardUrl) {
+    return AppNames('F-Droid', Uri.parse(standardUrl).pathSegments.last);
+  }
+
+  @override
+  List<List<GeneratedFormItem>> additionalDataFormItems = [];
+
+  @override
+  List<String> additionalDataDefaults = [];
+}

lib/app_sources/github.dart

@@ -0,0 +1,123 @@
+import 'dart:convert';
+import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class GitHub implements AppSource {
+  @override
+  late String host = 'github.com';
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw notValidURL(runtimeType.toString());
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData) async {
+    var includePrereleases =
+        additionalData.isNotEmpty && additionalData[0] == "true";
+    var fallbackToOlderReleases =
+        additionalData.length >= 2 && additionalData[1] == "true";
+    var regexFilter = additionalData.length >= 3 && additionalData[2].isNotEmpty
+        ? additionalData[2]
+        : null;
+    Response res = await get(Uri.parse(
+        'https://api.$host/repos${standardUrl.substring('https://$host'.length)}/releases'));
+    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['browser_download_url'] != null
+                    ? e['browser_download_url'] as String
+                    : '';
+              })
+              .where((element) => element.toLowerCase().endsWith('.apk'))
+              .toList() ??
+          [];
+
+      dynamic targetRelease;
+
+      for (int i = 0; i < releases.length; i++) {
+        if (!fallbackToOlderReleases && i > 0) break;
+        if (!includePrereleases && releases[i]['prerelease'] == true) {
+          continue;
+        }
+        if (regexFilter != null &&
+            !RegExp(regexFilter)
+                .hasMatch((releases[i]['name'] as String).trim())) {
+          continue;
+        }
+        var apkUrls = getReleaseAPKUrls(releases[i]);
+        if (apkUrls.isEmpty) {
+          continue;
+        }
+        targetRelease = releases[i];
+        targetRelease['apkUrls'] = apkUrls;
+        break;
+      }
+      if (targetRelease == null) {
+        throw couldNotFindReleases;
+      }
+      if ((targetRelease['apkUrls'] as List<String>).isEmpty) {
+        throw noAPKFound;
+      }
+      String? version = targetRelease['tag_name'];
+      if (version == null) {
+        throw couldNotFindLatestVersion;
+      }
+      return APKDetails(version, targetRelease['apkUrls']);
+    } else {
+      if (res.headers['x-ratelimit-remaining'] == '0') {
+        throw 'Rate limit reached - try again in ${(int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') / 60000000).toString()} minutes';
+      }
+
+      throw couldNotFindReleases;
+    }
+  }
+
+  @override
+  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
+  List<List<GeneratedFormItem>> additionalDataFormItems = [
+    [GeneratedFormItem(label: "Include prereleases", type: FormItemType.bool)],
+    [
+      GeneratedFormItem(
+          label: "Fallback to older releases", type: FormItemType.bool)
+    ],
+    [
+      GeneratedFormItem(
+          label: "Filter Release Titles by Regular Expression",
+          type: FormItemType.string,
+          required: false,
+          additionalValidators: [
+            (value) {
+              if (value == null || value.isEmpty) {
+                return null;
+              }
+              try {
+                RegExp(value);
+              } catch (e) {
+                return "Invalid regular expression";
+              }
+              return null;
+            }
+          ])
+    ]
+  ];
+
+  @override
+  List<String> additionalDataDefaults = ["true", "true", ""];
+}

lib/app_sources/gitlab.dart

@@ -0,0 +1,71 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/app_sources/github.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class GitLab implements AppSource {
+  @override
+  late String host = 'gitlab.com';
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw notValidURL(runtimeType.toString());
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData) async {
+    Response res = await get(Uri.parse('$standardUrl/-/tags?format=atom'));
+    if (res.statusCode == 200) {
+      var standardUri = Uri.parse(standardUrl);
+      var parsedHtml = parse(res.body);
+      var entry = parsedHtml.querySelector('entry');
+      var entryContent =
+          parse(parseFragment(entry?.querySelector('content')!.innerHtml).text);
+      var apkUrlList = [
+        ...getLinksFromParsedHTML(
+            entryContent,
+            RegExp(
+                '^${escapeRegEx(standardUri.path)}/uploads/[^/]+/[^/]+\\.apk\$',
+                caseSensitive: false),
+            standardUri.origin),
+        // GitLab releases may contain links to externally hosted APKs
+        ...getLinksFromParsedHTML(entryContent,
+                RegExp('/[^/]+\\.apk\$', caseSensitive: false), '')
+            .where((element) => Uri.parse(element).host != '')
+            .toList()
+      ];
+      if (apkUrlList.isEmpty) {
+        throw noAPKFound;
+      }
+
+      var entryId = entry?.querySelector('id')?.innerHtml;
+      var version =
+          entryId == null ? null : Uri.parse(entryId).pathSegments.last;
+      if (version == null) {
+        throw couldNotFindLatestVersion;
+      }
+      return APKDetails(version, apkUrlList);
+    } else {
+      throw couldNotFindReleases;
+    }
+  }
+
+  @override
+  AppNames getAppNames(String standardUrl) {
+    // Same as GitHub
+    return GitHub().getAppNames(standardUrl);
+  }
+
+  @override
+  List<List<GeneratedFormItem>> additionalDataFormItems = [];
+
+  @override
+  List<String> additionalDataDefaults = [];
+}

lib/app_sources/izzyondroid.dart

@@ -0,0 +1,65 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class IzzyOnDroid implements AppSource {
+  @override
+  late String host = 'android.izzysoft.de';
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw notValidURL(runtimeType.toString());
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData) async {
+    Response res = await get(Uri.parse(standardUrl));
+    if (res.statusCode == 200) {
+      var parsedHtml = parse(res.body);
+      var multipleVersionApkUrls = parsedHtml
+          .querySelectorAll('a')
+          .where((element) =>
+              element.attributes['href']?.toLowerCase().endsWith('.apk') ??
+              false)
+          .map((e) => 'https://$host${e.attributes['href'] ?? ''}')
+          .toList();
+      if (multipleVersionApkUrls.isEmpty) {
+        throw noAPKFound;
+      }
+      var version = parsedHtml
+          .querySelector('#keydata')
+          ?.querySelectorAll('b')
+          .where(
+              (element) => element.innerHtml.toLowerCase().contains('version'))
+          .toList()[0]
+          .parentNode
+          ?.parentNode
+          ?.children[1]
+          .innerHtml;
+      if (version == null) {
+        throw couldNotFindLatestVersion;
+      }
+      return APKDetails(version, [multipleVersionApkUrls[0]]);
+    } else {
+      throw couldNotFindReleases;
+    }
+  }
+
+  @override
+  AppNames getAppNames(String standardUrl) {
+    return AppNames('IzzyOnDroid', Uri.parse(standardUrl).pathSegments.last);
+  }
+
+  @override
+  List<List<GeneratedFormItem>> additionalDataFormItems = [];
+
+  @override
+  List<String> additionalDataDefaults = [];
+}

lib/app_sources/mullvad.dart

@@ -0,0 +1,51 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class Mullvad implements AppSource {
+  @override
+  late String host = 'mullvad.net';
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw notValidURL(runtimeType.toString());
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData) async {
+    Response res = await get(Uri.parse('$standardUrl/en/download/android'));
+    if (res.statusCode == 200) {
+      var version = parse(res.body)
+          .querySelector('p.subtitle.is-6')
+          ?.querySelector('a')
+          ?.attributes['href']
+          ?.split('/')
+          .last;
+      if (version == null) {
+        throw couldNotFindLatestVersion;
+      }
+      return APKDetails(
+          version, ['https://mullvad.net/download/app/apk/latest']);
+    } else {
+      throw couldNotFindReleases;
+    }
+  }
+
+  @override
+  AppNames getAppNames(String standardUrl) {
+    return AppNames('Mullvad-VPN', 'Mullvad-VPN');
+  }
+
+  @override
+  List<List<GeneratedFormItem>> additionalDataFormItems = [];
+
+  @override
+  List<String> additionalDataDefaults = [];
+}

lib/app_sources/signal.dart

@@ -0,0 +1,44 @@
+import 'dart:convert';
+import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class Signal implements AppSource {
+  @override
+  late String host = 'signal.org';
+
+  @override
+  String standardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData) async {
+    Response res =
+        await get(Uri.parse('https://updates.$host/android/latest.json'));
+    if (res.statusCode == 200) {
+      var json = jsonDecode(res.body);
+      String? apkUrl = json['url'];
+      if (apkUrl == null) {
+        throw noAPKFound;
+      }
+      String? version = json['versionName'];
+      if (version == null) {
+        throw couldNotFindLatestVersion;
+      }
+      return APKDetails(version, [apkUrl]);
+    } else {
+      throw couldNotFindReleases;
+    }
+  }
+
+  @override
+  AppNames getAppNames(String standardUrl) => AppNames('Signal', 'Signal');
+
+  @override
+  List<List<GeneratedFormItem>> additionalDataFormItems = [];
+
+  @override
+  List<String> additionalDataDefaults = [];
+}

lib/components/generated_form.dart

@@ -0,0 +1,175 @@
+import 'package:flutter/material.dart';
+
+enum FormItemType { string, bool }
+
+typedef OnValueChanges = void Function(List<String> values, bool valid);
+
+class GeneratedFormItem {
+  late String label;
+  late FormItemType type;
+  late bool required;
+  late int max;
+  late List<String? Function(String? value)> additionalValidators;
+
+  GeneratedFormItem(
+      {this.label = "Input",
+      this.type = FormItemType.string,
+      this.required = true,
+      this.max = 1,
+      this.additionalValidators = const []});
+}
+
+class GeneratedForm extends StatefulWidget {
+  const GeneratedForm(
+      {super.key,
+      required this.items,
+      required this.onValueChanges,
+      required this.defaultValues});
+
+  final List<List<GeneratedFormItem>> items;
+  final OnValueChanges onValueChanges;
+  final List<String> defaultValues;
+
+  @override
+  State<GeneratedForm> createState() => _GeneratedFormState();
+}
+
+class _GeneratedFormState extends State<GeneratedForm> {
+  final _formKey = GlobalKey<FormState>();
+  late List<List<String>> 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() {
+    List<String> returnValues = [];
+    var valid = true;
+    for (int r = 0; r < values.length; r++) {
+      for (int i = 0; i < values[r].length; i++) {
+        returnValues.add(values[r][i]);
+        if (formInputs[r][i] is TextFormField) {
+          valid = valid &&
+              ((formInputs[r][i].key as GlobalKey<FormFieldState>)
+                      .currentState
+                      ?.isValid ??
+                  false);
+        }
+      }
+    }
+    widget.onValueChanges(returnValues, valid);
+  }
+
+  @override
+  void initState() {
+    super.initState();
+
+    // Initialize form values as all empty
+    int j = 0;
+    values = widget.items
+        .map((row) => row.map((e) {
+              return j < widget.defaultValues.length
+                  ? widget.defaultValues[j++]
+                  : "";
+            }).toList())
+        .toList();
+
+    // Dynamically create form inputs
+    formInputs = widget.items.asMap().entries.map((row) {
+      return row.value.asMap().entries.map((e) {
+        if (e.value.type == FormItemType.string) {
+          final formFieldKey = GlobalKey<FormFieldState>();
+          return TextFormField(
+            key: formFieldKey,
+            initialValue: values[row.key][e.key],
+            autovalidateMode: AutovalidateMode.onUserInteraction,
+            onChanged: (value) {
+              setState(() {
+                values[row.key][e.key] = value;
+                someValueChanged();
+              });
+            },
+            decoration: InputDecoration(
+                helperText: e.value.label + (e.value.required ? " *" : "")),
+            minLines: e.value.max <= 1 ? null : e.value.max,
+            maxLines: e.value.max <= 1 ? 1 : e.value.max,
+            validator: (value) {
+              if (e.value.required && (value == null || value.trim().isEmpty)) {
+                return '${e.value.label} (required)';
+              }
+              for (var validator in e.value.additionalValidators) {
+                String? result = validator(value);
+                if (result != null) {
+                  return result;
+                }
+              }
+              return null;
+            },
+          );
+        } else {
+          return Container(); // Some input types added in build
+        }
+      }).toList();
+    }).toList();
+  }
+
+  @override
+  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) {
+          formInputs[r][e] = Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(widget.items[r][e].label),
+              Switch(
+                  value: values[r][e] == "true",
+                  onChanged: (value) {
+                    setState(() {
+                      values[r][e] = value ? "true" : "";
+                      someValueChanged();
+                    });
+                  })
+            ],
+          );
+        }
+      }
+    }
+
+    rows.clear();
+    formInputs.asMap().entries.forEach((rowInputs) {
+      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
+                ? 25
+                : 8,
+          )
+        ]);
+      }
+      List<Widget> rowItems = [];
+      rowInputs.value.asMap().entries.forEach((rowInput) {
+        if (rowInput.key > 0) {
+          rowItems.add(const SizedBox(
+            width: 20,
+          ));
+        }
+        rowItems.add(Expanded(child: rowInput.value));
+      });
+      rows.add(rowItems);
+    });
+
+    return Form(
+        key: _formKey,
+        child: Column(
+          children: [
+            ...rows.map((row) => Row(
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [...row.map((e) => e)],
+                ))
+          ],
+        ));
+  }
+}

lib/components/generated_form_modal.dart

@@ -1,61 +1,40 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-
-class GeneratedFormItem {
-  late String message;
-  late bool required;
-  late int lines;
-
-  GeneratedFormItem(this.message, this.required, this.lines);
-}
+import 'package:obtainium/components/generated_form.dart';
 
 class GeneratedFormModal extends StatefulWidget {
   const GeneratedFormModal(
-      {super.key, required this.title, required this.items});
+      {super.key,
+      required this.title,
+      required this.items,
+      required this.defaultValues});
 
   final String title;
-  final List<GeneratedFormItem> items;
+  final List<List<GeneratedFormItem>> items;
+  final List<String> defaultValues;
 
   @override
   State<GeneratedFormModal> createState() => _GeneratedFormModalState();
 }
 
 class _GeneratedFormModalState extends State<GeneratedFormModal> {
-  final _formKey = GlobalKey<FormState>();
-
-  final urlInputController = TextEditingController();
+  List<String> values = [];
+  bool valid = false;
 
   @override
   Widget build(BuildContext context) {
-    final formInputs = widget.items.map((e) {
-      final controller = TextEditingController();
-      return [
-        controller,
-        TextFormField(
-          decoration: InputDecoration(helperText: e.message),
-          controller: controller,
-          minLines: e.lines <= 1 ? null : e.lines,
-          maxLines: e.lines <= 1 ? 1 : e.lines,
-          validator: e.required
-              ? (value) {
-                  if (value == null || value.isEmpty) {
-                    return '${e.message} (required)';
-                  }
-                  return null;
-                }
-              : null,
-        )
-      ];
-    }).toList();
     return AlertDialog(
       scrollable: true,
       title: Text(widget.title),
-      content: Form(
-          key: _formKey,
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [...formInputs.map((e) => e[1] as Widget)],
-          )),
+      content: GeneratedForm(
+          items: widget.items,
+          onValueChanges: (values, valid) {
+            setState(() {
+              this.values = values;
+              this.valid = valid;
+            });
+          },
+          defaultValues: widget.defaultValues),
       actions: [
         TextButton(
             onPressed: () {
@@ -63,18 +42,16 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
             },
             child: const Text('Cancel')),
         TextButton(
-            onPressed: () {
-              if (_formKey.currentState?.validate() == true) {
-                HapticFeedback.selectionClick();
-                Navigator.of(context).pop(formInputs
-                    .map((e) => (e[0] as TextEditingController).value.text)
-                    .toList());
-              }
-            },
+            onPressed: !valid
+                ? null
+                : () {
+                    if (valid) {
+                      HapticFeedback.selectionClick();
+                      Navigator.of(context).pop(values);
+                    }
+                  },
             child: const Text('Continue'))
       ],
     );
   }
 }
-
-// TODO: Add support for larger textarea so this can be used for text/json imports

lib/main.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/pages/home.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/notifications_provider.dart';
@@ -12,7 +13,7 @@ import 'package:dynamic_color/dynamic_color.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 
 const String currentReleaseTag =
-    'v0.2.2-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
+    'v0.3.2-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
 @pragma('vm:entry-point')
 void bgTaskCallback() {
@@ -58,7 +59,7 @@ void main() async {
       ChangeNotifierProvider(
           create: (context) => AppsProvider(
               shouldLoadApps: true,
-              shouldCheckUpdatesAfterLoad: true,
+              shouldCheckUpdatesAfterLoad: false,
               shouldDeleteAPKs: true)),
       ChangeNotifierProvider(create: (context) => SettingsProvider()),
       Provider(create: (context) => NotificationsProvider())
@@ -102,7 +103,8 @@ class MyApp extends StatelessWidget {
             currentReleaseTag,
             currentReleaseTag,
             [],
-            0));
+            0,
+            ["true"]));
       }
     }
 

lib/mass_app_sources/githubstars.dart

@@ -0,0 +1,32 @@
+import 'dart:convert';
+
+import 'package:http/http.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class GitHubStars implements MassAppSource {
+  @override
+  late String name = 'GitHub Starred Repos';
+
+  @override
+  late List<String> requiredArgs = ['Username'];
+
+  @override
+  Future<List<String>> getUrls(List<String> args) async {
+    if (args.length != requiredArgs.length) {
+      throw 'Wrong number of arguments provided';
+    }
+    Response res =
+        await get(Uri.parse('https://api.github.com/users/${args[0]}/starred'));
+    if (res.statusCode == 200) {
+      return (jsonDecode(res.body) as List<dynamic>)
+          .map((e) => e['html_url'] as String)
+          .toList();
+    } else {
+      if (res.headers['x-ratelimit-remaining'] == '0') {
+        throw 'Rate limit reached - try again in ${(int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') / 60000000).toString()} minutes';
+      }
+
+      throw 'Unable to find user\'s starred repos';
+    }
+  }
+}

lib/pages/add_app.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/pages/app.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
@@ -16,132 +17,187 @@ class AddAppPage extends StatefulWidget {
 }
 
 class _AddAppPageState extends State<AddAppPage> {
-  final _formKey = GlobalKey<FormState>();
-  final urlInputController = TextEditingController();
   bool gettingAppInfo = false;
 
+  String userInput = "";
+  AppSource? pickedSource;
+  List<String> additionalData = [];
+  bool validAdditionalData = true;
+
   @override
   Widget build(BuildContext context) {
     SourceProvider sourceProvider = SourceProvider();
-    return CustomScrollView(slivers: <Widget>[
-      const CustomAppBar(title: 'Add App'),
-      SliverFillRemaining(
-          hasScrollBody: false,
-          child: Center(
-            child: Form(
-                key: _formKey,
+    return Scaffold(
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        body: CustomScrollView(slivers: <Widget>[
+          const CustomAppBar(title: 'Add App'),
+          SliverFillRemaining(
+            child: Padding(
+                padding: const EdgeInsets.all(16),
                 child: Column(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  children: [
-                    Container(),
-                    Padding(
-                      padding: const EdgeInsets.all(16),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.stretch,
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: [
+                      Row(
                         children: [
-                          TextFormField(
-                            decoration: const InputDecoration(
-                                hintText: 'https://github.com/Author/Project',
-                                helperText: 'Enter the App source URL'),
-                            controller: urlInputController,
-                            validator: (value) {
-                              if (value == null ||
-                                  value.isEmpty ||
-                                  Uri.tryParse(value) == null) {
-                                return 'Please enter a supported source URL';
-                              }
-                              return null;
-                            },
+                          Expanded(
+                              child: GeneratedForm(
+                                  items: [
+                                    [
+                                      GeneratedFormItem(
+                                          label: "App Source Url",
+                                          additionalValidators: [
+                                            (value) {
+                                              try {
+                                                sourceProvider
+                                                    .getSource(value ?? "")
+                                                    .standardizeURL(
+                                                        makeUrlHttps(
+                                                            value ?? ""));
+                                              } catch (e) {
+                                                return e is String
+                                                    ? e
+                                                    : "Error";
+                                              }
+                                              return null;
+                                            }
+                                          ])
+                                    ]
+                                  ],
+                                  onValueChanges: (values, valid) {
+                                    setState(() {
+                                      userInput = values[0];
+                                      var source = valid
+                                          ? sourceProvider.getSource(userInput)
+                                          : null;
+                                      if (pickedSource != source) {
+                                        pickedSource = source;
+                                        additionalData = source != null
+                                            ? source.additionalDataDefaults
+                                            : [];
+                                        validAdditionalData = source != null
+                                            ? sourceProvider
+                                                .doesSourceHaveRequiredAdditionalData(
+                                                    source)
+                                            : true;
+                                      }
+                                    });
+                                  },
+                                  defaultValues: const [])),
+                          const SizedBox(
+                            width: 16,
                           ),
-                          Padding(
-                            padding: const EdgeInsets.symmetric(vertical: 16.0),
-                            child: ElevatedButton(
-                              onPressed: gettingAppInfo
+                          ElevatedButton(
+                              onPressed: gettingAppInfo ||
+                                      pickedSource == null ||
+                                      (pickedSource!.additionalDataFormItems
+                                              .isNotEmpty &&
+                                          !validAdditionalData)
                                   ? null
                                   : () {
                                       HapticFeedback.selectionClick();
-                                      if (_formKey.currentState!.validate()) {
+                                      setState(() {
+                                        gettingAppInfo = true;
+                                      });
+                                      sourceProvider
+                                          .getApp(pickedSource!, userInput,
+                                              additionalData)
+                                          .then((app) {
+                                        var appsProvider =
+                                            context.read<AppsProvider>();
+                                        var settingsProvider =
+                                            context.read<SettingsProvider>();
+                                        if (appsProvider.apps
+                                            .containsKey(app.id)) {
+                                          throw 'App already added';
+                                        }
+                                        settingsProvider
+                                            .getInstallPermission()
+                                            .then((_) {
+                                          appsProvider.saveApp(app).then((_) {
+                                            Navigator.push(
+                                                context,
+                                                MaterialPageRoute(
+                                                    builder: (context) =>
+                                                        AppPage(
+                                                            appId: app.id)));
+                                          });
+                                        });
+                                      }).catchError((e) {
+                                        ScaffoldMessenger.of(context)
+                                            .showSnackBar(
+                                          SnackBar(content: Text(e.toString())),
+                                        );
+                                      }).whenComplete(() {
                                         setState(() {
-                                          gettingAppInfo = true;
+                                          gettingAppInfo = false;
                                         });
-                                        sourceProvider
-                                            .getApp(
-                                                urlInputController.value.text)
-                                            .then((app) {
-                                          var appsProvider =
-                                              context.read<AppsProvider>();
-                                          var settingsProvider =
-                                              context.read<SettingsProvider>();
-                                          if (appsProvider.apps
-                                              .containsKey(app.id)) {
-                                            throw 'App already added';
-                                          }
-                                          settingsProvider
-                                              .getInstallPermission()
-                                              .then((_) {
-                                            appsProvider.saveApp(app).then((_) {
-                                              urlInputController.clear();
-                                              Navigator.push(
-                                                  context,
-                                                  MaterialPageRoute(
-                                                      builder: (context) =>
-                                                          AppPage(
-                                                              appId: app.id)));
-                                            });
-                                          });
-                                        }).catchError((e) {
-                                          ScaffoldMessenger.of(context)
-                                              .showSnackBar(
-                                            SnackBar(
-                                                content: Text(e.toString())),
-                                          );
-                                        }).whenComplete(() {
-                                          setState(() {
-                                            gettingAppInfo = false;
-                                          });
-                                        });
-                                      }
+                                      });
                                     },
-                              child: const Text('Add'),
-                            ),
-                          ),
+                              child: const Text('Add'))
                         ],
                       ),
-                    ),
-                    Column(
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
-                          const Text(
-                            'Supported Sources:',
-                            // style: TextStyle(fontWeight: FontWeight.bold),
-                            // style: Theme.of(context).textTheme.bodySmall,
-                          ),
-                          const SizedBox(
-                            height: 8,
-                          ),
-                          ...sourceProvider
-                              .getSourceHosts()
-                              .map((e) => GestureDetector(
-                                  onTap: () {
-                                    launchUrlString('https://$e',
-                                        mode: LaunchMode.externalApplication);
-                                  },
-                                  child: Text(
-                                    e,
-                                    style: const TextStyle(
-                                        decoration: TextDecoration.underline,
-                                        fontStyle: FontStyle.italic),
-                                  )))
-                              .toList()
-                        ]),
-                    if (gettingAppInfo)
-                      const LinearProgressIndicator()
-                    else
-                      Container(),
-                  ],
-                )),
-          ))
-    ]);
+                      if (pickedSource != null &&
+                          (pickedSource!.additionalDataFormItems.isNotEmpty))
+                        Column(
+                          crossAxisAlignment: CrossAxisAlignment.stretch,
+                          children: [
+                            const Divider(
+                              height: 64,
+                            ),
+                            Text(
+                                'Additional Options for ${pickedSource?.runtimeType}',
+                                style: TextStyle(
+                                    color:
+                                        Theme.of(context).colorScheme.primary)),
+                            const SizedBox(
+                              height: 16,
+                            ),
+                            GeneratedForm(
+                                items: pickedSource!.additionalDataFormItems,
+                                onValueChanges: (values, valid) {
+                                  setState(() {
+                                    additionalData = values;
+                                    validAdditionalData = valid;
+                                  });
+                                },
+                                defaultValues:
+                                    pickedSource!.additionalDataDefaults)
+                          ],
+                        )
+                      else
+                        Expanded(
+                            child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.center,
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                              // const SizedBox(
+                              //   height: 48,
+                              // ),
+                              const Text(
+                                'Supported Sources:',
+                              ),
+                              const SizedBox(
+                                height: 8,
+                              ),
+                              ...sourceProvider
+                                  .getSourceHosts()
+                                  .map((e) => GestureDetector(
+                                      onTap: () {
+                                        launchUrlString('https://$e',
+                                            mode:
+                                                LaunchMode.externalApplication);
+                                      },
+                                      child: Text(
+                                        e,
+                                        style: const TextStyle(
+                                            decoration:
+                                                TextDecoration.underline,
+                                            fontStyle: FontStyle.italic),
+                                      )))
+                                  .toList()
+                            ])),
+                    ])),
+          )
+        ]));
   }
 }

lib/pages/app.dart

@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:obtainium/components/custom_app_bar.dart';
+import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
+import 'package:obtainium/providers/source_provider.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 import 'package:provider/provider.dart';
@@ -21,69 +22,67 @@ class _AppPageState extends State<AppPage> {
   Widget build(BuildContext context) {
     var appsProvider = context.watch<AppsProvider>();
     var settingsProvider = context.watch<SettingsProvider>();
+    var sourceProvider = SourceProvider();
     AppInMemory? app = appsProvider.apps[widget.appId];
+    var source = app != null ? sourceProvider.getSource(app.app.url) : null;
     if (app?.app.installedVersion != null) {
       appsProvider.getUpdate(app!.app.id);
     }
     return Scaffold(
+      appBar: settingsProvider.showAppWebpage ? AppBar() : null,
       backgroundColor: Theme.of(context).colorScheme.surface,
-      body: CustomScrollView(slivers: <Widget>[
-        CustomAppBar(title: '${app?.app.name}'),
-        SliverFillRemaining(
-          child: settingsProvider.showAppWebpage
-              ? WebView(
-                  initialUrl: app?.app.url,
-                  javascriptMode: JavascriptMode.unrestricted,
-                )
-              : Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  children: [
-                    Text(
-                      app?.app.name ?? 'App',
-                      textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.displayLarge,
-                    ),
-                    Text(
-                      'By ${app?.app.author ?? '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(
-                      'Latest Version: ${app?.app.latestVersion ?? 'Unknown'}',
-                      textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.bodyLarge,
-                    ),
-                    Text(
-                      'Installed Version: ${app?.app.installedVersion ?? 'None'}',
-                      textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.bodyLarge,
-                    ),
-                  ],
+      body: settingsProvider.showAppWebpage
+          ? WebView(
+              initialUrl: app?.app.url,
+              javascriptMode: JavascriptMode.unrestricted,
+            )
+          : Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                Text(
+                  app?.app.name ?? 'App',
+                  textAlign: TextAlign.center,
+                  style: Theme.of(context).textTheme.displayLarge,
                 ),
-        ),
-      ]),
+                Text(
+                  'By ${app?.app.author ?? '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(
+                  'Latest Version: ${app?.app.latestVersion ?? 'Unknown'}',
+                  textAlign: TextAlign.center,
+                  style: Theme.of(context).textTheme.bodyLarge,
+                ),
+                Text(
+                  'Installed Version: ${app?.app.installedVersion ?? 'None'}',
+                  textAlign: TextAlign.center,
+                  style: Theme.of(context).textTheme.bodyLarge,
+                ),
+              ],
+            ),
       bottomSheet: Padding(
           padding: EdgeInsets.fromLTRB(
               0, 0, 0, MediaQuery.of(context).padding.bottom),
@@ -164,6 +163,38 @@ class _AppPageState extends State<AppPage> {
                               },
                               tooltip: 'Mark as Not Installed',
                               icon: const Icon(Icons.no_cell_outlined)),
+                        if (source != null &&
+                            source.additionalDataFormItems.isNotEmpty)
+                          IconButton(
+                              onPressed: () {
+                                showDialog(
+                                    context: context,
+                                    builder: (BuildContext ctx) {
+                                      return GeneratedFormModal(
+                                          title: 'Additional Options',
+                                          items: source.additionalDataFormItems,
+                                          defaultValues: app != null
+                                              ? app.app.additionalData
+                                              : source.additionalDataDefaults);
+                                    }).then((values) {
+                                  if (app != null && values != null) {
+                                    var changedApp = app.app;
+                                    changedApp.additionalData = values;
+                                    sourceProvider
+                                        .getApp(source, changedApp.url,
+                                            changedApp.additionalData)
+                                        .then((finalChangedApp) {
+                                      appsProvider.saveApp(finalChangedApp);
+                                    }).catchError((e) {
+                                      ScaffoldMessenger.of(context)
+                                          .showSnackBar(
+                                        SnackBar(content: Text(e.toString())),
+                                      );
+                                    });
+                                  }
+                                });
+                              },
+                              icon: const Icon(Icons.settings)),
                         const SizedBox(width: 16.0),
                         Expanded(
                             child: ElevatedButton(

lib/pages/apps.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.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/pages/app.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
@@ -14,12 +16,47 @@ class AppsPage extends StatefulWidget {
 }
 
 class _AppsPageState extends State<AppsPage> {
+  AppsFilter? filter;
+
   @override
   Widget build(BuildContext context) {
     var appsProvider = context.watch<AppsProvider>();
     var settingsProvider = context.watch<SettingsProvider>();
     var existingUpdateAppIds = appsProvider.getExistingUpdates();
     var sortedApps = appsProvider.apps.values.toList();
+
+    if (filter != null) {
+      sortedApps = sortedApps.where((app) {
+        if (app.app.installedVersion == app.app.latestVersion &&
+            filter!.onlyNonLatest) {
+          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();
+
+        for (var t in nameTokens) {
+          if (!app.app.name.toLowerCase().contains(t.toLowerCase())) {
+            return false;
+          }
+        }
+        for (var t in authorTokens) {
+          if (!app.app.author.toLowerCase().contains(t.toLowerCase())) {
+            return false;
+          }
+        }
+        return true;
+      }).toList();
+    }
+
     sortedApps.sort((a, b) {
       int result = 0;
       if (settingsProvider.sortColumn == SortColumnSettings.authorName) {
@@ -31,40 +68,103 @@ class _AppsPageState extends State<AppsPage> {
       }
       return result;
     });
+
     if (settingsProvider.sortOrder == SortOrderSettings.ascending) {
       sortedApps = sortedApps.reversed.toList();
     }
 
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
-        floatingActionButton: existingUpdateAppIds.isEmpty
-            ? null
-            : ElevatedButton.icon(
-                onPressed: appsProvider.areDownloadsRunning()
-                    ? null
-                    : () {
-                        HapticFeedback.heavyImpact();
-                        settingsProvider.getInstallPermission().then((_) {
-                          appsProvider.downloadAndInstallLatestApp(
-                              existingUpdateAppIds, context);
+        floatingActionButton:
+            Row(mainAxisAlignment: MainAxisAlignment.end, children: [
+          existingUpdateAppIds.isEmpty || filter != null
+              ? const SizedBox()
+              : ElevatedButton.icon(
+                  onPressed: appsProvider.areDownloadsRunning()
+                      ? null
+                      : () {
+                          HapticFeedback.heavyImpact();
+                          settingsProvider.getInstallPermission().then((_) {
+                            appsProvider.downloadAndInstallLatestApp(
+                                existingUpdateAppIds, context);
+                          });
+                        },
+                  icon: const Icon(Icons.install_mobile_outlined),
+                  label: const Text('Install All')),
+          const SizedBox(
+            width: 16,
+          ),
+          appsProvider.apps.isEmpty
+              ? const SizedBox()
+              : ElevatedButton.icon(
+                  onPressed: () {
+                    showDialog<List<String>?>(
+                        context: context,
+                        builder: (BuildContext ctx) {
+                          return GeneratedFormModal(
+                              title: 'Filter Apps',
+                              items: [
+                                [
+                                  GeneratedFormItem(
+                                      label: "App Name", required: false),
+                                  GeneratedFormItem(
+                                      label: "Author", required: false)
+                                ],
+                                [
+                                  GeneratedFormItem(
+                                      label: "Ignore Up-to-Date Apps",
+                                      type: FormItemType.bool)
+                                ]
+                              ],
+                              defaultValues: filter == null
+                                  ? []
+                                  : [
+                                      filter!.nameFilter,
+                                      filter!.authorFilter,
+                                      filter!.onlyNonLatest ? 'true' : ''
+                                    ]);
+                        }).then((values) {
+                      if (values != null &&
+                          values
+                              .where((element) => element.isNotEmpty)
+                              .isNotEmpty) {
+                        setState(() {
+                          filter = AppsFilter(
+                              nameFilter: values[0],
+                              authorFilter: values[1],
+                              onlyNonLatest: values[2] == "true");
                         });
-                      },
-                icon: const Icon(Icons.install_mobile_outlined),
-                label: const Text('Install All')),
+                      } else {
+                        setState(() {
+                          filter = null;
+                        });
+                      }
+                    });
+                  },
+                  label: Text(filter == null ? 'Search' : 'Modify Search'),
+                  icon: Icon(
+                      filter == null ? Icons.search : Icons.manage_search)),
+        ]),
         body: RefreshIndicator(
             onRefresh: () {
               HapticFeedback.lightImpact();
-              return appsProvider.checkUpdates();
+              return appsProvider.checkUpdates().catchError((e) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(content: Text(e.toString())),
+                );
+              });
             },
             child: CustomScrollView(slivers: <Widget>[
               const CustomAppBar(title: 'Apps'),
-              if (appsProvider.loadingApps || appsProvider.apps.isEmpty)
+              if (appsProvider.loadingApps || sortedApps.isEmpty)
                 SliverFillRemaining(
                     child: Center(
                         child: appsProvider.loadingApps
                             ? const CircularProgressIndicator()
                             : Text(
-                                'No Apps',
+                                appsProvider.apps.isEmpty
+                                    ? 'No Apps'
+                                    : 'No Search Results',
                                 style:
                                     Theme.of(context).textTheme.headlineMedium,
                               ))),
@@ -72,10 +172,8 @@ class _AppsPageState extends State<AppsPage> {
                   delegate: SliverChildBuilderDelegate(
                       (BuildContext context, int index) {
                 return ListTile(
-                  title: Text(
-                      '${sortedApps[index].app.author}/${sortedApps[index].app.name}'),
-                  subtitle: Text(sortedApps[index].app.installedVersion ??
-                      'Not Installed'),
+                  title: Text(sortedApps[index].app.name),
+                  subtitle: Text('By ${sortedApps[index].app.author}'),
                   trailing: sortedApps[index].downloadProgress != null
                       ? Text(
                           'Downloading - ${sortedApps[index].downloadProgress?.toInt()}%')
@@ -83,7 +181,8 @@ class _AppsPageState extends State<AppsPage> {
                               sortedApps[index].app.installedVersion !=
                                   sortedApps[index].app.latestVersion
                           ? const Text('Update Available')
-                          : null),
+                          : Text(sortedApps[index].app.installedVersion ??
+                              'Not Installed')),
                   onTap: () {
                     Navigator.push(
                       context,
@@ -97,3 +196,14 @@ class _AppsPageState extends State<AppsPage> {
             ])));
   }
 }
+
+class AppsFilter {
+  late String nameFilter;
+  late String authorFilter;
+  late bool onlyNonLatest;
+
+  AppsFilter(
+      {this.nameFilter = "",
+      this.authorFilter = "",
+      this.onlyNonLatest = false});
+}

lib/pages/import_export.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.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/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
@@ -54,74 +55,172 @@ class _ImportExportPageState extends State<ImportExportPage> {
       return errors;
     }
 
-    return CustomScrollView(slivers: <Widget>[
-      const CustomAppBar(title: 'Import/Export'),
-      SliverFillRemaining(
-          hasScrollBody: false,
-          child: Padding(
-              padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  Row(
+    return Scaffold(
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        body: CustomScrollView(slivers: <Widget>[
+          const CustomAppBar(title: 'Import/Export'),
+          SliverFillRemaining(
+              hasScrollBody: false,
+              child: Padding(
+                  padding:
+                      const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      Expanded(
-                          child: TextButton(
-                              style: outlineButtonStyle,
-                              onPressed: appsProvider.apps.isEmpty ||
-                                      importInProgress
-                                  ? null
-                                  : () {
-                                      HapticFeedback.selectionClick();
-                                      appsProvider
-                                          .exportApps()
-                                          .then((String path) {
-                                        ScaffoldMessenger.of(context)
-                                            .showSnackBar(
-                                          SnackBar(
-                                              content:
-                                                  Text('Exported to $path')),
-                                        );
-                                      });
-                                    },
-                              child: const Text('Obtainium Export'))),
-                      const SizedBox(
-                        width: 16,
-                      ),
-                      Expanded(
-                          child: TextButton(
-                              style: outlineButtonStyle,
-                              onPressed: importInProgress
-                                  ? null
-                                  : () {
-                                      HapticFeedback.selectionClick();
-                                      FilePicker.platform
-                                          .pickFiles()
-                                          .then((result) {
-                                        setState(() {
-                                          importInProgress = true;
-                                        });
-                                        if (result != null) {
-                                          String data =
-                                              File(result.files.single.path!)
-                                                  .readAsStringSync();
-                                          try {
-                                            jsonDecode(data);
-                                          } catch (e) {
-                                            throw 'Invalid input';
-                                          }
+                      Row(
+                        children: [
+                          Expanded(
+                              child: TextButton(
+                                  style: outlineButtonStyle,
+                                  onPressed: appsProvider.apps.isEmpty ||
+                                          importInProgress
+                                      ? null
+                                      : () {
+                                          HapticFeedback.selectionClick();
                                           appsProvider
-                                              .importApps(data)
-                                              .then((value) {
+                                              .exportApps()
+                                              .then((String path) {
                                             ScaffoldMessenger.of(context)
                                                 .showSnackBar(
                                               SnackBar(
                                                   content: Text(
-                                                      '$value App${value == 1 ? '' : 's'} Imported')),
+                                                      'Exported to $path')),
                                             );
                                           });
+                                        },
+                                  child: const Text('Obtainium Export'))),
+                          const SizedBox(
+                            width: 16,
+                          ),
+                          Expanded(
+                              child: TextButton(
+                                  style: outlineButtonStyle,
+                                  onPressed: importInProgress
+                                      ? null
+                                      : () {
+                                          HapticFeedback.selectionClick();
+                                          FilePicker.platform
+                                              .pickFiles()
+                                              .then((result) {
+                                            setState(() {
+                                              importInProgress = true;
+                                            });
+                                            if (result != null) {
+                                              String data = File(
+                                                      result.files.single.path!)
+                                                  .readAsStringSync();
+                                              try {
+                                                jsonDecode(data);
+                                              } catch (e) {
+                                                throw 'Invalid input';
+                                              }
+                                              appsProvider
+                                                  .importApps(data)
+                                                  .then((value) {
+                                                ScaffoldMessenger.of(context)
+                                                    .showSnackBar(
+                                                  SnackBar(
+                                                      content: Text(
+                                                          '$value App${value == 1 ? '' : 's'} Imported')),
+                                                );
+                                              });
+                                            } else {
+                                              // User canceled the picker
+                                            }
+                                          }).catchError((e) {
+                                            ScaffoldMessenger.of(context)
+                                                .showSnackBar(
+                                              SnackBar(
+                                                  content: Text(e.toString())),
+                                            );
+                                          }).whenComplete(() {
+                                            setState(() {
+                                              importInProgress = false;
+                                            });
+                                          });
+                                        },
+                                  child: const Text('Obtainium Import')))
+                        ],
+                      ),
+                      if (importInProgress)
+                        Column(
+                          children: const [
+                            SizedBox(
+                              height: 14,
+                            ),
+                            LinearProgressIndicator(),
+                            SizedBox(
+                              height: 14,
+                            ),
+                          ],
+                        )
+                      else
+                        const Divider(
+                          height: 32,
+                        ),
+                      TextButton(
+                          onPressed: importInProgress
+                              ? null
+                              : () {
+                                  showDialog(
+                                      context: context,
+                                      builder: (BuildContext ctx) {
+                                        return GeneratedFormModal(
+                                          title: 'Import from URL List',
+                                          items: [
+                                            [
+                                              GeneratedFormItem(
+                                                  label: 'App URL List',
+                                                  max: 7,
+                                                  additionalValidators: [
+                                                    (String? value) {
+                                                      if (value != null &&
+                                                          value.isNotEmpty) {
+                                                        var lines = value
+                                                            .trim()
+                                                            .split('\n');
+                                                        for (int i = 0;
+                                                            i < lines.length;
+                                                            i++) {
+                                                          try {
+                                                            sourceProvider
+                                                                .getSource(
+                                                                    lines[i]);
+                                                          } catch (e) {
+                                                            return 'Line ${i + 1}: $e';
+                                                          }
+                                                        }
+                                                      }
+                                                      return null;
+                                                    }
+                                                  ])
+                                            ]
+                                          ],
+                                          defaultValues: const [],
+                                        );
+                                      }).then((values) {
+                                    if (values != null) {
+                                      var urls =
+                                          (values[0] as String).split('\n');
+                                      setState(() {
+                                        importInProgress = true;
+                                      });
+                                      addApps(urls).then((errors) {
+                                        if (errors.isEmpty) {
+                                          ScaffoldMessenger.of(context)
+                                              .showSnackBar(
+                                            SnackBar(
+                                                content: Text(
+                                                    'Imported ${urls.length} Apps')),
+                                          );
                                         } else {
-                                          // User canceled the picker
+                                          showDialog(
+                                              context: context,
+                                              builder: (BuildContext ctx) {
+                                                return ImportErrorDialog(
+                                                    urlsLength: urls.length,
+                                                    errors: errors);
+                                              });
                                         }
                                       }).catchError((e) {
                                         ScaffoldMessenger.of(context)
@@ -133,148 +232,93 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                           importInProgress = false;
                                         });
                                       });
-                                    },
-                              child: const Text('Obtainium Import')))
-                    ],
-                  ),
-                  if (importInProgress)
-                    Column(
-                      children: const [
-                        SizedBox(
-                          height: 14,
-                        ),
-                        LinearProgressIndicator(),
-                        SizedBox(
-                          height: 14,
-                        ),
-                      ],
-                    )
-                  else
-                    const Divider(
-                      height: 32,
-                    ),
-                  TextButton(
-                      onPressed: importInProgress
-                          ? null
-                          : () {
-                              showDialog(
-                                  context: context,
-                                  builder: (BuildContext ctx) {
-                                    return GeneratedFormModal(
-                                      title: 'Import from URL List',
-                                      items: [
-                                        GeneratedFormItem(
-                                            'App URL List', true, 7)
-                                      ],
-                                    );
-                                  }).then((values) {
-                                if (values != null) {
-                                  var urls = (values[0] as String).split('\n');
-                                  setState(() {
-                                    importInProgress = true;
-                                  });
-                                  addApps(urls).then((errors) {
-                                    if (errors.isEmpty) {
-                                      ScaffoldMessenger.of(context)
-                                          .showSnackBar(
-                                        SnackBar(
-                                            content: Text(
-                                                'Imported ${urls.length} Apps')),
-                                      );
-                                    } else {
-                                      showDialog(
-                                          context: context,
-                                          builder: (BuildContext ctx) {
-                                            return ImportErrorDialog(
-                                                urlsLength: urls.length,
-                                                errors: errors);
-                                          });
                                     }
-                                  }).catchError((e) {
-                                    ScaffoldMessenger.of(context).showSnackBar(
-                                      SnackBar(content: Text(e.toString())),
-                                    );
-                                  }).whenComplete(() {
-                                    setState(() {
-                                      importInProgress = false;
-                                    });
                                   });
-                                }
-                              });
-                            },
-                      child: const Text(
-                        'Import from URL List',
-                      )),
-                  ...sourceProvider.massSources
-                      .map((source) => Column(
-                              crossAxisAlignment: CrossAxisAlignment.stretch,
-                              children: [
-                                const SizedBox(height: 8),
-                                TextButton(
-                                    onPressed: importInProgress
-                                        ? null
-                                        : () {
-                                            showDialog(
-                                                context: context,
-                                                builder: (BuildContext ctx) {
-                                                  return GeneratedFormModal(
-                                                      title:
-                                                          'Import ${source.name}',
-                                                      items: source.requiredArgs
-                                                          .map((e) =>
-                                                              GeneratedFormItem(
-                                                                  e, true, 1))
-                                                          .toList());
-                                                }).then((values) {
-                                              if (values != null) {
-                                                source
-                                                    .getUrls(values)
-                                                    .then((urls) {
-                                                  setState(() {
-                                                    importInProgress = true;
-                                                  });
-                                                  addApps(urls).then((errors) {
-                                                    if (errors.isEmpty) {
+                                },
+                          child: const Text(
+                            'Import from URL List',
+                          )),
+                      ...sourceProvider.massSources
+                          .map((source) => Column(
+                                  crossAxisAlignment:
+                                      CrossAxisAlignment.stretch,
+                                  children: [
+                                    const SizedBox(height: 8),
+                                    TextButton(
+                                        onPressed: importInProgress
+                                            ? null
+                                            : () {
+                                                showDialog(
+                                                    context: context,
+                                                    builder:
+                                                        (BuildContext ctx) {
+                                                      return GeneratedFormModal(
+                                                        title:
+                                                            'Import ${source.name}',
+                                                        items: source
+                                                            .requiredArgs
+                                                            .map((e) => [
+                                                                  GeneratedFormItem(
+                                                                      label: e)
+                                                                ])
+                                                            .toList(),
+                                                        defaultValues: const [],
+                                                      );
+                                                    }).then((values) {
+                                                  if (values != null) {
+                                                    source
+                                                        .getUrls(values)
+                                                        .then((urls) {
+                                                      setState(() {
+                                                        importInProgress = true;
+                                                      });
+                                                      addApps(urls)
+                                                          .then((errors) {
+                                                        if (errors.isEmpty) {
+                                                          ScaffoldMessenger.of(
+                                                                  context)
+                                                              .showSnackBar(
+                                                            SnackBar(
+                                                                content: Text(
+                                                                    'Imported ${urls.length} Apps')),
+                                                          );
+                                                        } else {
+                                                          showDialog(
+                                                              context: context,
+                                                              builder:
+                                                                  (BuildContext
+                                                                      ctx) {
+                                                                return ImportErrorDialog(
+                                                                    urlsLength: urls
+                                                                        .length,
+                                                                    errors:
+                                                                        errors);
+                                                              });
+                                                        }
+                                                      }).whenComplete(() {
+                                                        setState(() {
+                                                          importInProgress =
+                                                              false;
+                                                        });
+                                                      });
+                                                    }).catchError((e) {
                                                       ScaffoldMessenger.of(
                                                               context)
                                                           .showSnackBar(
                                                         SnackBar(
                                                             content: Text(
-                                                                'Imported ${urls.length} Apps')),
+                                                                e.toString())),
                                                       );
-                                                    } else {
-                                                      showDialog(
-                                                          context: context,
-                                                          builder: (BuildContext
-                                                              ctx) {
-                                                            return ImportErrorDialog(
-                                                                urlsLength:
-                                                                    urls.length,
-                                                                errors: errors);
-                                                          });
-                                                    }
-                                                  }).whenComplete(() {
-                                                    setState(() {
-                                                      importInProgress = false;
                                                     });
-                                                  });
-                                                }).catchError((e) {
-                                                  ScaffoldMessenger.of(context)
-                                                      .showSnackBar(
-                                                    SnackBar(
-                                                        content:
-                                                            Text(e.toString())),
-                                                  );
+                                                  }
                                                 });
-                                              }
-                                            });
-                                          },
-                                    child: Text('Import ${source.name}'))
-                              ]))
-                      .toList()
-                ],
-              )))
-    ]);
+                                              },
+                                        child: Text('Import ${source.name}'))
+                                  ]))
+                          .toList()
+                    ],
+                  )))
+        ]));
   }
 }
 

lib/pages/settings.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:provider/provider.dart';
@@ -19,214 +18,219 @@ class _SettingsPageState extends State<SettingsPage> {
     if (settingsProvider.prefs == null) {
       settingsProvider.initializeSettings();
     }
-    return CustomScrollView(slivers: <Widget>[
-      const CustomAppBar(title: 'Add App'),
-      SliverFillRemaining(
-          hasScrollBody: true,
-          child: Padding(
-              padding: const EdgeInsets.all(16),
-              child: settingsProvider.prefs == null
-                  ? Container()
-                  : Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          'Appearance',
-                          style: TextStyle(
-                              color: Theme.of(context).colorScheme.primary),
-                        ),
-                        DropdownButtonFormField(
-                            decoration:
-                                const InputDecoration(labelText: 'Theme'),
-                            value: settingsProvider.theme,
-                            items: const [
-                              DropdownMenuItem(
-                                value: ThemeSettings.dark,
-                                child: Text('Dark'),
-                              ),
-                              DropdownMenuItem(
-                                value: ThemeSettings.light,
-                                child: Text('Light'),
-                              ),
-                              DropdownMenuItem(
-                                value: ThemeSettings.system,
-                                child: Text('Follow System'),
-                              )
-                            ],
-                            onChanged: (value) {
-                              if (value != null) {
-                                settingsProvider.theme = value;
-                              }
-                            }),
-                        const SizedBox(
-                          height: 16,
-                        ),
-                        DropdownButtonFormField(
-                            decoration:
-                                const InputDecoration(labelText: 'Colour'),
-                            value: settingsProvider.colour,
-                            items: const [
-                              DropdownMenuItem(
-                                value: ColourSettings.basic,
-                                child: Text('Obtainium'),
-                              ),
-                              DropdownMenuItem(
-                                value: ColourSettings.materialYou,
-                                child: Text('Material You'),
-                              )
-                            ],
-                            onChanged: (value) {
-                              if (value != null) {
-                                settingsProvider.colour = value;
-                              }
-                            }),
-                        const SizedBox(
-                          height: 16,
-                        ),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.start,
+    return Scaffold(
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        body: CustomScrollView(slivers: <Widget>[
+          const CustomAppBar(title: 'Settings'),
+          SliverFillRemaining(
+              hasScrollBody: true,
+              child: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: settingsProvider.prefs == null
+                      ? const SizedBox()
+                      : Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                            Expanded(
-                                child: DropdownButtonFormField(
-                                    decoration: const InputDecoration(
-                                        labelText: 'App Sort By'),
-                                    value: settingsProvider.sortColumn,
-                                    items: const [
-                                      DropdownMenuItem(
-                                        value: SortColumnSettings.authorName,
-                                        child: Text('Author/Name'),
-                                      ),
-                                      DropdownMenuItem(
-                                        value: SortColumnSettings.nameAuthor,
-                                        child: Text('Name/Author'),
-                                      ),
-                                      DropdownMenuItem(
-                                        value: SortColumnSettings.added,
-                                        child: Text('As Added'),
-                                      )
-                                    ],
-                                    onChanged: (value) {
-                                      if (value != null) {
-                                        settingsProvider.sortColumn = value;
-                                      }
-                                    })),
-                            const SizedBox(
-                              width: 16,
+                            Text(
+                              'Appearance',
+                              style: TextStyle(
+                                  color: Theme.of(context).colorScheme.primary),
                             ),
-                            Expanded(
-                                child: DropdownButtonFormField(
-                                    decoration: const InputDecoration(
-                                        labelText: 'App Sort Order'),
-                                    value: settingsProvider.sortOrder,
-                                    items: const [
-                                      DropdownMenuItem(
-                                        value: SortOrderSettings.ascending,
-                                        child: Text('Ascending'),
-                                      ),
-                                      DropdownMenuItem(
-                                        value: SortOrderSettings.descending,
-                                        child: Text('Descending'),
-                                      ),
-                                    ],
-                                    onChanged: (value) {
-                                      if (value != null) {
-                                        settingsProvider.sortOrder = value;
-                                      }
-                                    })),
-                          ],
-                        ),
-                        const SizedBox(
-                          height: 16,
-                        ),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: [
-                            const Text('Show Source Webpage in App View'),
-                            Switch(
-                                value: settingsProvider.showAppWebpage,
+                            DropdownButtonFormField(
+                                decoration:
+                                    const InputDecoration(labelText: 'Theme'),
+                                value: settingsProvider.theme,
+                                items: const [
+                                  DropdownMenuItem(
+                                    value: ThemeSettings.dark,
+                                    child: Text('Dark'),
+                                  ),
+                                  DropdownMenuItem(
+                                    value: ThemeSettings.light,
+                                    child: Text('Light'),
+                                  ),
+                                  DropdownMenuItem(
+                                    value: ThemeSettings.system,
+                                    child: Text('Follow System'),
+                                  )
+                                ],
                                 onChanged: (value) {
-                                  settingsProvider.showAppWebpage = value;
-                                })
-                          ],
-                        ),
-                        const Divider(
-                          height: 16,
-                        ),
-                        const SizedBox(
-                          height: 16,
-                        ),
-                        Text(
-                          'More',
-                          style: TextStyle(
-                              color: Theme.of(context).colorScheme.primary),
-                        ),
-                        DropdownButtonFormField(
-                            decoration: const InputDecoration(
-                                labelText:
-                                    'Background Update Checking Interval'),
-                            value: settingsProvider.updateInterval,
-                            items: const [
-                              DropdownMenuItem(
-                                value: 15,
-                                child: Text('15 Minutes'),
-                              ),
-                              DropdownMenuItem(
-                                value: 30,
-                                child: Text('30 Minutes'),
-                              ),
-                              DropdownMenuItem(
-                                value: 60,
-                                child: Text('1 Hour'),
-                              ),
-                              DropdownMenuItem(
-                                value: 360,
-                                child: Text('6 Hours'),
-                              ),
-                              DropdownMenuItem(
-                                value: 720,
-                                child: Text('12 Hours'),
-                              ),
-                              DropdownMenuItem(
-                                value: 1440,
-                                child: Text('1 Day'),
-                              ),
-                              DropdownMenuItem(
-                                value: 0,
-                                child: Text('Never - Manual Only'),
-                              ),
-                            ],
-                            onChanged: (value) {
-                              if (value != null) {
-                                settingsProvider.updateInterval = value;
-                              }
-                            }),
-                        const Spacer(),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            TextButton.icon(
-                              style: ButtonStyle(
-                                foregroundColor:
-                                    MaterialStateProperty.resolveWith<Color>(
-                                        (Set<MaterialState> states) {
-                                  return Colors.grey;
+                                  if (value != null) {
+                                    settingsProvider.theme = value;
+                                  }
                                 }),
-                              ),
-                              onPressed: () {
-                                launchUrlString(settingsProvider.sourceUrl,
-                                    mode: LaunchMode.externalApplication);
-                              },
-                              icon: const Icon(Icons.code),
-                              label: Text(
-                                'Source',
-                                style: Theme.of(context).textTheme.bodySmall,
-                              ),
-                            )
+                            const SizedBox(
+                              height: 16,
+                            ),
+                            DropdownButtonFormField(
+                                decoration:
+                                    const InputDecoration(labelText: 'Colour'),
+                                value: settingsProvider.colour,
+                                items: const [
+                                  DropdownMenuItem(
+                                    value: ColourSettings.basic,
+                                    child: Text('Obtainium'),
+                                  ),
+                                  DropdownMenuItem(
+                                    value: ColourSettings.materialYou,
+                                    child: Text('Material You'),
+                                  )
+                                ],
+                                onChanged: (value) {
+                                  if (value != null) {
+                                    settingsProvider.colour = value;
+                                  }
+                                }),
+                            const SizedBox(
+                              height: 16,
+                            ),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.start,
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Expanded(
+                                    child: DropdownButtonFormField(
+                                        decoration: const InputDecoration(
+                                            labelText: 'App Sort By'),
+                                        value: settingsProvider.sortColumn,
+                                        items: const [
+                                          DropdownMenuItem(
+                                            value:
+                                                SortColumnSettings.authorName,
+                                            child: Text('Author/Name'),
+                                          ),
+                                          DropdownMenuItem(
+                                            value:
+                                                SortColumnSettings.nameAuthor,
+                                            child: Text('Name/Author'),
+                                          ),
+                                          DropdownMenuItem(
+                                            value: SortColumnSettings.added,
+                                            child: Text('As Added'),
+                                          )
+                                        ],
+                                        onChanged: (value) {
+                                          if (value != null) {
+                                            settingsProvider.sortColumn = value;
+                                          }
+                                        })),
+                                const SizedBox(
+                                  width: 16,
+                                ),
+                                Expanded(
+                                    child: DropdownButtonFormField(
+                                        decoration: const InputDecoration(
+                                            labelText: 'App Sort Order'),
+                                        value: settingsProvider.sortOrder,
+                                        items: const [
+                                          DropdownMenuItem(
+                                            value: SortOrderSettings.ascending,
+                                            child: Text('Ascending'),
+                                          ),
+                                          DropdownMenuItem(
+                                            value: SortOrderSettings.descending,
+                                            child: Text('Descending'),
+                                          ),
+                                        ],
+                                        onChanged: (value) {
+                                          if (value != null) {
+                                            settingsProvider.sortOrder = value;
+                                          }
+                                        })),
+                              ],
+                            ),
+                            const SizedBox(
+                              height: 16,
+                            ),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                const Text('Show Source Webpage in App View'),
+                                Switch(
+                                    value: settingsProvider.showAppWebpage,
+                                    onChanged: (value) {
+                                      settingsProvider.showAppWebpage = value;
+                                    })
+                              ],
+                            ),
+                            const Divider(
+                              height: 16,
+                            ),
+                            const SizedBox(
+                              height: 16,
+                            ),
+                            Text(
+                              'More',
+                              style: TextStyle(
+                                  color: Theme.of(context).colorScheme.primary),
+                            ),
+                            DropdownButtonFormField(
+                                decoration: const InputDecoration(
+                                    labelText:
+                                        'Background Update Checking Interval'),
+                                value: settingsProvider.updateInterval,
+                                items: const [
+                                  DropdownMenuItem(
+                                    value: 15,
+                                    child: Text('15 Minutes'),
+                                  ),
+                                  DropdownMenuItem(
+                                    value: 30,
+                                    child: Text('30 Minutes'),
+                                  ),
+                                  DropdownMenuItem(
+                                    value: 60,
+                                    child: Text('1 Hour'),
+                                  ),
+                                  DropdownMenuItem(
+                                    value: 360,
+                                    child: Text('6 Hours'),
+                                  ),
+                                  DropdownMenuItem(
+                                    value: 720,
+                                    child: Text('12 Hours'),
+                                  ),
+                                  DropdownMenuItem(
+                                    value: 1440,
+                                    child: Text('1 Day'),
+                                  ),
+                                  DropdownMenuItem(
+                                    value: 0,
+                                    child: Text('Never - Manual Only'),
+                                  ),
+                                ],
+                                onChanged: (value) {
+                                  if (value != null) {
+                                    settingsProvider.updateInterval = value;
+                                  }
+                                }),
+                            const Spacer(),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                TextButton.icon(
+                                  style: ButtonStyle(
+                                    foregroundColor:
+                                        MaterialStateProperty.resolveWith<
+                                            Color>((Set<MaterialState> states) {
+                                      return Colors.grey;
+                                    }),
+                                  ),
+                                  onPressed: () {
+                                    launchUrlString(settingsProvider.sourceUrl,
+                                        mode: LaunchMode.externalApplication);
+                                  },
+                                  icon: const Icon(Icons.code),
+                                  label: Text(
+                                    'Source',
+                                    style:
+                                        Theme.of(context).textTheme.bodySmall,
+                                  ),
+                                )
+                              ],
+                            ),
                           ],
-                        ),
-                      ],
-                    )))
-    ]);
+                        )))
+        ]));
   }
 }

lib/pages/test_page.dart

@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:obtainium/components/generated_form.dart';
+
+class TestPage extends StatefulWidget {
+  const TestPage({super.key});
+
+  @override
+  State<TestPage> createState() => _TestPageState();
+}
+
+class _TestPageState extends State<TestPage> {
+  List<String?>? sourceSpecificData;
+  bool valid = false;
+
+  List<List<GeneratedFormItem>> sourceSpecificInputs = [
+    [GeneratedFormItem(label: 'Test Item 1')],
+    [
+      GeneratedFormItem(label: 'Test Item 2', required: false),
+      GeneratedFormItem(label: 'Test Item 3')
+    ],
+    [GeneratedFormItem(label: 'Test Item 4', type: FormItemType.bool)]
+  ];
+
+  List<String> defaultInputValues = ["ABC"];
+
+  void onSourceSpecificDataChanges(
+      List<String?> valuesFromForm, bool formValid) {
+    setState(() {
+      sourceSpecificData = valuesFromForm;
+      valid = formValid;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        appBar: AppBar(title: const Text('Test Page')),
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        body: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16),
+            child: Column(children: [
+              GeneratedForm(
+                items: sourceSpecificInputs,
+                onValueChanges: onSourceSpecificDataChanges,
+                defaultValues: defaultInputValues,
+              ),
+              ...(sourceSpecificData != null
+                  ? (sourceSpecificData as List<String?>)
+                      .map((e) => Text(e ?? ""))
+                  : [Container()])
+            ])));
+  }
+}

lib/providers/apps_provider.dart

@@ -228,7 +228,11 @@ class AppsProvider with ChangeNotifier {
 
   Future<App?> getUpdate(String appId) async {
     App? currentApp = apps[appId]!.app;
-    App newApp = await SourceProvider().getApp(currentApp.url);
+    SourceProvider sourceProvider = SourceProvider();
+    App newApp = await sourceProvider.getApp(
+        sourceProvider.getSource(currentApp.url),
+        currentApp.url,
+        currentApp.additionalData);
     if (newApp.latestVersion != currentApp.latestVersion) {
       newApp.installedVersion = currentApp.installedVersion;
       if (currentApp.preferredApkIndex < newApp.apkUrls.length) {

lib/providers/source_provider.dart

@@ -4,8 +4,14 @@
 import 'dart:convert';
 
 import 'package:html/dom.dart';
-import 'package:http/http.dart';
-import 'package:html/parser.dart';
+import 'package:obtainium/app_sources/fdroid.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/mullvad.dart';
+import 'package:obtainium/app_sources/signal.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:obtainium/mass_app_sources/githubstars.dart';
 
 class AppNames {
   late String author;
@@ -30,8 +36,17 @@ class App {
   late String latestVersion;
   List<String> apkUrls = [];
   late int preferredApkIndex;
-  App(this.id, this.url, this.author, this.name, this.installedVersion,
-      this.latestVersion, this.apkUrls, this.preferredApkIndex);
+  late List<String> additionalData;
+  App(
+      this.id,
+      this.url,
+      this.author,
+      this.name,
+      this.installedVersion,
+      this.latestVersion,
+      this.apkUrls,
+      this.preferredApkIndex,
+      this.additionalData);
 
   @override
   String toString() {
@@ -39,19 +54,21 @@ class App {
   }
 
   factory App.fromJson(Map<String, dynamic> json) => App(
-        json['id'] as String,
-        json['url'] as String,
-        json['author'] as String,
-        json['name'] as String,
-        json['installedVersion'] == null
-            ? null
-            : json['installedVersion'] as String,
-        json['latestVersion'] as String,
-        List<String>.from(jsonDecode(json['apkUrls'])),
-        json['preferredApkIndex'] == null
-            ? 0
-            : json['preferredApkIndex'] as int,
-      );
+      json['id'] as String,
+      json['url'] as String,
+      json['author'] as String,
+      json['name'] as String,
+      json['installedVersion'] == null
+          ? null
+          : json['installedVersion'] as String,
+      json['latestVersion'] as String,
+      json['apkUrls'] == null
+          ? []
+          : List<String>.from(jsonDecode(json['apkUrls'])),
+      json['preferredApkIndex'] == null ? 0 : json['preferredApkIndex'] as int,
+      json['additionalData'] == null
+          ? SourceProvider().getSource(json['url']).additionalDataDefaults
+          : List<String>.from(jsonDecode(json['additionalData'])));
 
   Map<String, dynamic> toJson() => {
         'id': id,
@@ -61,7 +78,8 @@ class App {
         'installedVersion': installedVersion,
         'latestVersion': latestVersion,
         'apkUrls': jsonEncode(apkUrls),
-        'preferredApkIndex': preferredApkIndex
+        'preferredApkIndex': preferredApkIndex,
+        'additionalData': jsonEncode(additionalData)
       };
 }
 
@@ -71,10 +89,24 @@ escapeRegEx(String s) {
   });
 }
 
-const String couldNotFindReleases = 'Unable to fetch release info';
+makeUrlHttps(String url) {
+  if (url.toLowerCase().indexOf('http://') != 0 &&
+      url.toLowerCase().indexOf('https://') != 0) {
+    url = 'https://$url';
+  }
+  if (url.toLowerCase().indexOf('https://www.') == 0) {
+    url = 'https://${url.substring(12)}';
+  }
+  return url;
+}
+
+const String couldNotFindReleases = 'Could not find a suitable release';
 const String couldNotFindLatestVersion =
     'Could not determine latest release version';
-const String notValidURL = 'Not a valid URL';
+String notValidURL(String sourceName) {
+  return 'Not a valid $sourceName App URL';
+}
+
 const String noAPKFound = 'No APK found';
 
 List<String> getLinksFromParsedHTML(
@@ -91,310 +123,21 @@ List<String> getLinksFromParsedHTML(
 abstract class AppSource {
   late String host;
   String standardizeURL(String url);
-  Future<APKDetails> getLatestAPKDetails(String standardUrl);
+  Future<APKDetails> getLatestAPKDetails(
+      String standardUrl, List<String> additionalData);
   AppNames getAppNames(String standardUrl);
+  late List<List<GeneratedFormItem>> additionalDataFormItems;
+  late List<String> additionalDataDefaults;
 }
 
-class GitHub implements AppSource {
-  @override
-  late String host = 'github.com';
-
-  @override
-  String standardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
-    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
-    if (match == null) {
-      throw notValidURL;
-    }
-    return url.substring(0, match.end);
-  }
-
-  @override
-  Future<APKDetails> getLatestAPKDetails(String standardUrl) async {
-    Response res = await get(Uri.parse(
-        'https://api.$host/repos${standardUrl.substring('https://$host'.length)}/releases'));
-    if (res.statusCode == 200) {
-      var releases = jsonDecode(res.body) as List<dynamic>;
-      // Right now, the latest non-prerelease version is picked
-      // If none exists, the latest prerelease version is picked
-      // In the future, the user could be given a choice
-      var nonPrereleaseReleases =
-          releases.where((element) => element['prerelease'] != true).toList();
-      var latestRelease = nonPrereleaseReleases.isNotEmpty
-          ? nonPrereleaseReleases[0]
-          : releases.isNotEmpty
-              ? releases[0]
-              : null;
-      if (latestRelease == null) {
-        throw couldNotFindReleases;
-      }
-      List<dynamic>? assets = latestRelease['assets'];
-      List<String>? apkUrlList = assets
-          ?.map((e) {
-            return e['browser_download_url'] != null
-                ? e['browser_download_url'] as String
-                : '';
-          })
-          .where((element) => element.toLowerCase().endsWith('.apk'))
-          .toList();
-      if (apkUrlList == null || apkUrlList.isEmpty) {
-        throw noAPKFound;
-      }
-      String? version = latestRelease['tag_name'];
-      if (version == null) {
-        throw couldNotFindLatestVersion;
-      }
-      return APKDetails(version, apkUrlList);
-    } else {
-      if (res.headers['x-ratelimit-remaining'] == '0') {
-        throw 'Rate limit reached - try again in ${(int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') / 60000000).toString()} minutes';
-      }
-
-      throw couldNotFindReleases;
-    }
-  }
-
-  @override
-  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]);
-  }
-}
-
-class GitLab implements AppSource {
-  @override
-  late String host = 'gitlab.com';
-
-  @override
-  String standardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
-    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
-    if (match == null) {
-      throw notValidURL;
-    }
-    return url.substring(0, match.end);
-  }
-
-  @override
-  Future<APKDetails> getLatestAPKDetails(String standardUrl) async {
-    Response res = await get(Uri.parse('$standardUrl/-/tags?format=atom'));
-    if (res.statusCode == 200) {
-      var standardUri = Uri.parse(standardUrl);
-      var parsedHtml = parse(res.body);
-      var entry = parsedHtml.querySelector('entry');
-      var entryContent =
-          parse(parseFragment(entry?.querySelector('content')!.innerHtml).text);
-      var apkUrlList = [
-        ...getLinksFromParsedHTML(
-            entryContent,
-            RegExp(
-                '^${escapeRegEx(standardUri.path)}/uploads/[^/]+/[^/]+\\.apk\$',
-                caseSensitive: false),
-            standardUri.origin),
-        // GitLab releases may contain links to externally hosted APKs
-        ...getLinksFromParsedHTML(entryContent,
-                RegExp('/[^/]+\\.apk\$', caseSensitive: false), '')
-            .where((element) => Uri.parse(element).host != '')
-            .toList()
-      ];
-      if (apkUrlList.isEmpty) {
-        throw noAPKFound;
-      }
-
-      var entryId = entry?.querySelector('id')?.innerHtml;
-      var version =
-          entryId == null ? null : Uri.parse(entryId).pathSegments.last;
-      if (version == null) {
-        throw couldNotFindLatestVersion;
-      }
-      return APKDetails(version, apkUrlList);
-    } else {
-      throw couldNotFindReleases;
-    }
-  }
-
-  @override
-  AppNames getAppNames(String standardUrl) {
-    // Same as GitHub
-    return GitHub().getAppNames(standardUrl);
-  }
-}
-
-class Signal implements AppSource {
-  @override
-  late String host = 'signal.org';
-
-  @override
-  String standardizeURL(String url) {
-    return 'https://$host';
-  }
-
-  @override
-  Future<APKDetails> getLatestAPKDetails(String standardUrl) async {
-    Response res =
-        await get(Uri.parse('https://updates.$host/android/latest.json'));
-    if (res.statusCode == 200) {
-      var json = jsonDecode(res.body);
-      String? apkUrl = json['url'];
-      if (apkUrl == null) {
-        throw noAPKFound;
-      }
-      String? version = json['versionName'];
-      if (version == null) {
-        throw couldNotFindLatestVersion;
-      }
-      return APKDetails(version, [apkUrl]);
-    } else {
-      throw couldNotFindReleases;
-    }
-  }
-
-  @override
-  AppNames getAppNames(String standardUrl) => AppNames('Signal', 'Signal');
-}
-
-class FDroid implements AppSource {
-  @override
-  late String host = 'f-droid.org';
-
-  @override
-  String standardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/packages/[^/]+');
-    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
-    if (match == null) {
-      throw notValidURL;
-    }
-    return url.substring(0, match.end);
-  }
-
-  @override
-  Future<APKDetails> getLatestAPKDetails(String standardUrl) async {
-    Response res = await get(Uri.parse(standardUrl));
-    if (res.statusCode == 200) {
-      var latestReleaseDiv =
-          parse(res.body).querySelector('#latest.package-version');
-      var apkUrl = latestReleaseDiv
-          ?.querySelector('.package-version-download a')
-          ?.attributes['href'];
-      if (apkUrl == null) {
-        throw noAPKFound;
-      }
-      var version = latestReleaseDiv
-          ?.querySelector('.package-version-header b')
-          ?.innerHtml
-          .split(' ')
-          .last;
-      if (version == null) {
-        throw couldNotFindLatestVersion;
-      }
-      return APKDetails(version, [apkUrl]);
-    } else {
-      throw couldNotFindReleases;
-    }
-  }
-
-  @override
-  AppNames getAppNames(String standardUrl) {
-    return AppNames('F-Droid', Uri.parse(standardUrl).pathSegments.last);
-  }
-}
-
-class Mullvad implements AppSource {
-  @override
-  late String host = 'mullvad.net';
-
-  @override
-  String standardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host');
-    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
-    if (match == null) {
-      throw notValidURL;
-    }
-    return url.substring(0, match.end);
-  }
-
-  @override
-  Future<APKDetails> getLatestAPKDetails(String standardUrl) async {
-    Response res = await get(Uri.parse('$standardUrl/en/download/android'));
-    if (res.statusCode == 200) {
-      var version = parse(res.body)
-          .querySelector('p.subtitle.is-6')
-          ?.querySelector('a')
-          ?.attributes['href']
-          ?.split('/')
-          .last;
-      if (version == null) {
-        throw couldNotFindLatestVersion;
-      }
-      return APKDetails(
-          version, ['https://mullvad.net/download/app/apk/latest']);
-    } else {
-      throw couldNotFindReleases;
-    }
-  }
-
-  @override
-  AppNames getAppNames(String standardUrl) {
-    return AppNames('Mullvad-VPN', 'Mullvad-VPN');
-  }
-}
-
-class IzzyOnDroid implements AppSource {
-  @override
-  late String host = 'android.izzysoft.de';
-
-  @override
-  String standardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/repo/apk/[^/]+');
-    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
-    if (match == null) {
-      throw notValidURL;
-    }
-    return url.substring(0, match.end);
-  }
-
-  @override
-  Future<APKDetails> getLatestAPKDetails(String standardUrl) async {
-    Response res = await get(Uri.parse(standardUrl));
-    if (res.statusCode == 200) {
-      var parsedHtml = parse(res.body);
-      var multipleVersionApkUrls = parsedHtml
-          .querySelectorAll('a')
-          .where((element) =>
-              element.attributes['href']?.toLowerCase().endsWith('.apk') ??
-              false)
-          .map((e) => 'https://$host${e.attributes['href'] ?? ''}')
-          .toList();
-      if (multipleVersionApkUrls.isEmpty) {
-        throw noAPKFound;
-      }
-      var version = parsedHtml
-          .querySelector('#keydata')
-          ?.querySelectorAll('b')
-          .where(
-              (element) => element.innerHtml.toLowerCase().contains('version'))
-          .toList()[0]
-          .parentNode
-          ?.parentNode
-          ?.children[1]
-          .innerHtml;
-      if (version == null) {
-        throw couldNotFindLatestVersion;
-      }
-      return APKDetails(version, [multipleVersionApkUrls[0]]);
-    } else {
-      throw couldNotFindReleases;
-    }
-  }
-
-  @override
-  AppNames getAppNames(String standardUrl) {
-    return AppNames('IzzyOnDroid', Uri.parse(standardUrl).pathSegments.last);
-  }
+abstract class MassAppSource {
+  late String name;
+  late List<String> requiredArgs;
+  Future<List<String>> getUrls(List<String> args);
 }
 
 class SourceProvider {
+  // Add more source classes here so they are available via the service
   List<AppSource> sources = [
     GitHub(),
     GitLab(),
@@ -404,10 +147,11 @@ class SourceProvider {
     Signal()
   ];
 
+  // Add more mass source classes here so they are available via the service
   List<MassAppSource> massSources = [GitHubStars()];
 
-  // Add more source classes here so they are available via the service
   AppSource getSource(String url) {
+    url = makeUrlHttps(url);
     AppSource? source;
     for (var s in sources) {
       if (url.toLowerCase().contains('://${s.host}')) {
@@ -421,18 +165,23 @@ class SourceProvider {
     return source;
   }
 
-  Future<App> getApp(String url) async {
-    if (url.toLowerCase().indexOf('http://') != 0 &&
-        url.toLowerCase().indexOf('https://') != 0) {
-      url = 'https://$url';
+  bool doesSourceHaveRequiredAdditionalData(AppSource source) {
+    for (var row in source.additionalDataFormItems) {
+      for (var element in row) {
+        if (element.required) {
+          return true;
+        }
+      }
     }
-    if (url.toLowerCase().indexOf('https://www.') == 0) {
-      url = 'https://${url.substring(12)}';
-    }
-    AppSource source = getSource(url);
-    String standardUrl = source.standardizeURL(url);
+    return false;
+  }
+
+  Future<App> getApp(
+      AppSource source, String url, List<String> additionalData) async {
+    String standardUrl = source.standardizeURL(makeUrlHttps(url));
     AppNames names = source.getAppNames(standardUrl);
-    APKDetails apk = await source.getLatestAPKDetails(standardUrl);
+    APKDetails apk =
+        await source.getLatestAPKDetails(standardUrl, additionalData);
     return App(
         '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}',
         standardUrl,
@@ -441,7 +190,8 @@ class SourceProvider {
         null,
         apk.version,
         apk.apkUrls,
-        apk.apkUrls.length - 1);
+        apk.apkUrls.length - 1,
+        additionalData);
   }
 
   /// Returns a length 2 list, where the first element is a list of Apps and
@@ -451,7 +201,8 @@ class SourceProvider {
     Map<String, dynamic> errors = {};
     for (var url in urls) {
       try {
-        apps.add(await getApp(url));
+        var source = getSource(url);
+        apps.add(await getApp(source, url, source.additionalDataDefaults));
       } catch (e) {
         errors.addAll(<String, dynamic>{url: e});
       }
@@ -461,37 +212,3 @@ class SourceProvider {
 
   List<String> getSourceHosts() => sources.map((e) => e.host).toList();
 }
-
-abstract class MassAppSource {
-  late String name;
-  late List<String> requiredArgs;
-  Future<List<String>> getUrls(List<String> args);
-}
-
-class GitHubStars implements MassAppSource {
-  @override
-  late String name = 'GitHub Starred Repos';
-
-  @override
-  late List<String> requiredArgs = ['Username'];
-
-  @override
-  Future<List<String>> getUrls(List<String> args) async {
-    if (args.length != requiredArgs.length) {
-      throw 'Wrong number of arguments provided';
-    }
-    Response res =
-        await get(Uri.parse('https://api.github.com/users/${args[0]}/starred'));
-    if (res.statusCode == 200) {
-      return (jsonDecode(res.body) as List<dynamic>)
-          .map((e) => e['html_url'] as String)
-          .toList();
-    } else {
-      if (res.headers['x-ratelimit-remaining'] == '0') {
-        throw 'Rate limit reached - try again in ${(int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') / 60000000).toString()} minutes';
-      }
-
-      throw 'Unable to find user\'s starred repos';
-    }
-  }
-}

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.2.2+13 # When changing this, update the tag in main() accordingly
+version: 0.3.2+18 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.19.0-79.0.dev <3.0.0'