Merge pull request #246 from ImranR98/dev

Bugfixes for #242 and #245 + Various UI Improvements

README.md

@@ -31,4 +31,4 @@ Currently supported App sources:
 
 | <img src="./assets/screenshots/1.apps.png" alt="Apps Page" /> | <img src="./assets/screenshots/2.dark_theme.png" alt="Dark Theme" />           | <img src="./assets/screenshots/3.material_you.png" alt="Material You" />    |
 | ------------------------------------------------------ | ----------------------------------------------------------------------- | -------------------------------------------------------------------- |
-| <img src="./assets/screenshots/4.app.png" alt="App Page" />   | <img src="./assets/screenshots/5.apk_picker.png" alt="Multiple APK Support" /> | <img src="./assets/screenshots/6.apk_install.png" alt="App Installation" /> |
+| <img src="./assets/screenshots/4.app.png" alt="App Page" />   | <img src="./assets/screenshots/5.app_opts.png" alt="App Options" /> | <img src="./assets/screenshots/6.app_webview.png" alt="App Web View" /> |

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

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

assets/translations/de.json

@@ -211,6 +211,7 @@
     "language": "Sprache",
     "storagePermissionDenied": "Storage permission denied",
     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut",
         "other": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minuten erneut"

assets/translations/en.json

@@ -211,6 +211,7 @@
     "language": "Language",
     "storagePermissionDenied": "Storage permission denied",
     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Too many requests (rate limited) - try again in {} minute",
         "other": "Too many requests (rate limited) - try again in {} minutes"

assets/translations/hu.json

@@ -210,6 +210,7 @@
     "language": "Nyelv",
     "storagePermissionDenied": "Tárhely engedély megtagadva",
     "selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva",
         "other": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva"

assets/translations/it.json

@@ -211,6 +211,7 @@
     "language": "Lingua",
     "storagePermissionDenied": "Storage permission denied",
     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Troppe richieste (traffico limitato) - riprova tra {} minuto",
         "other": "Troppe richieste (traffico limitato) - riprova tra {} minuti"

assets/translations/ja.json

@@ -7,7 +7,7 @@
     "appIdMismatch": "ダウンロードしたパッケージのIDが既存のApp IDと一致しません",
     "functionNotImplemented": "このクラスはこの機能を実装していません",
     "placeholder": "プレースホルダー",
-    "someErrors": "いくつかのエラーが発生しました",
+    "someErrors": "何らかのエラーが発生しました",
     "unexpectedError": "予期せぬエラーが発生しました",
     "ok": "OK",
     "and": "と",
@@ -82,7 +82,7 @@
     "pinToTop": "トップに固定",
     "unpinFromTop": "トップから固定解除",
     "resetInstallStatusForSelectedAppsQuestion": "選択したアプリのインストール状態をリセットしますか？",
-    "installStatusOfXWillBeResetExplanation": "選択したアプリのインストール状態がリセットされます。\n\nアップデートに失敗するなどして、Obtainiumに表示されるアプリのバージョンが正しくない場合に役立ちます。",
+    "installStatusOfXWillBeResetExplanation": "選択したアプリのインストール状態がリセットされます。\n\nアップデートに失敗した場合など、Obtainiumに表示されるアプリのバージョンが正しくない場合に有効です。",
     "shareSelectedAppURLs": "選択したアプリのURLを共有する",
     "resetInstallStatus": "インストール状態をリセットする",
     "more": "もっと見る",
@@ -109,7 +109,7 @@
     "searchX": "{}で検索",
     "noResults": "結果は見つかりませんでした",
     "importX": "{}をインポートする",
-    "importedAppsIdDisclaimer": "インポートしたアプリが「未インストール」と表示されることがあります。\nこれを解決するには、Obtainiumから再インストールしてください。\nアプリのデータには影響しません。\n\nURLとサードパーティーのインポートメソッドにのみ影響します。",
+    "importedAppsIdDisclaimer": "インポートしたアプリが「未インストール」と表示されることがあります。\nこれを解決するには、Obtainiumから再インストールしてください。\nアプリのデータには影響しません。\n\nURLとサードパーティのインポートメソッドにのみ影響します。",
     "importErrors": "インポートエラー",
     "importedXOfYApps": "{} / {} アプリをインポートしました",
     "followingURLsHadErrors": "以下のURLでエラーが発生しました:",
@@ -133,7 +133,7 @@
     "bgUpdateCheckInterval": "バックグラウンドでのアップデート確認の間隔",
     "neverManualOnly": "手動",
     "appearance": "外観",
-    "showWebInAppView": "アプリビューにソースウェブページを表示する",
+    "showWebInAppView": "アプリページにソースのWebページを表示する",
     "pinUpdates": "アップデートがあるアプリをトップに固定する",
     "updates": "アップデート",
     "sourceSpecific": "Github アクセストークン",
@@ -184,7 +184,7 @@
     "appIdOrName": "アプリのIDまたは名前",
     "appWithIdOrNameNotFound": "そのIDや名前を持つアプリは見つかりませんでした",
     "reposHaveMultipleApps": "リポジトリには複数のアプリが含まれることがあります",
-    "fdroidThirdPartyRepo": "F-Droid Third-Party Repo",
+    "fdroidThirdPartyRepo": "F-Droid サードパーティリポジトリ",
     "steam": "Steam",
     "steamMobile": "Steam Mobile",
     "steamChat": "Steam Chat",
@@ -211,6 +211,7 @@
     "language": "言語",
     "storagePermissionDenied": "ストレージ権限が拒否されました",
     "selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
+    "filterAPKsByRegEx": "正規表現でAPKを絞り込む",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "リクエストが多すぎます（レート制限）- {}分後に再試行してください",
         "other": "リクエストが多すぎます（レート制限）- {}分後に再試行してください"

assets/translations/zh.json

@@ -211,6 +211,7 @@
     "language": "语言",
     "storagePermissionDenied": "存储权限已被拒绝",
     "selectedCategorizeWarning": "这将取代所选应用程序的任何现有类别",
+    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "tooManyRequestsTryAgainInMinutes": {
         "one": "请求过多 (API 限制) - 在 {} 分钟后重试",
         "other": "请求过多 (API 限制) - 在 {} 分钟后重试"

lib/app_sources/codeberg.dart

@@ -26,15 +26,7 @@ class Codeberg extends AppSource {
             required: false,
             additionalValidators: [
               (value) {
-                if (value == null || value.isEmpty) {
+                return regExValidator(value);
-                  return null;
-                }
-                try {
-                  RegExp(value);
-                } catch (e) {
-                  return tr('invalidRegEx');
-                }
-                return null;
               }
             ])
       ]
@@ -72,7 +64,7 @@ class Codeberg extends AppSource {
             ? additionalSettings['filterReleaseTitlesByRegEx']
             : null;
     Response res = await get(Uri.parse(
-        'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/releases'));
+        'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
     if (res.statusCode == 200) {
       var releases = jsonDecode(res.body) as List<dynamic>;
 

lib/app_sources/github.dart

@@ -65,15 +65,7 @@ class GitHub extends AppSource {
             required: false,
             additionalValidators: [
               (value) {
-                if (value == null || value.isEmpty) {
+                return regExValidator(value);
-                  return null;
-                }
-                try {
-                  RegExp(value);
-                } catch (e) {
-                  return tr('invalidRegEx');
-                }
-                return null;
               }
             ])
       ]
@@ -119,7 +111,7 @@ class GitHub extends AppSource {
             ? additionalSettings['filterReleaseTitlesByRegEx']
             : null;
     Response res = await get(Uri.parse(
-        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases'));
+        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
     if (res.statusCode == 200) {
       var releases = jsonDecode(res.body) as List<dynamic>;
 

lib/components/generated_form.dart

@@ -150,6 +150,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
   Map<String, dynamic> values = {};
   late List<List<Widget>> formInputs;
   List<List<Widget>> rows = [];
+  String? initKey;
 
   // If any value changes, call this to update the parent with value and validity
   void someValueChanged({bool isBuilding = false}) {
@@ -169,13 +170,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
     widget.onValueChanges(returnValues, valid, isBuilding);
   }
 
-  @override
+  initForm() {
-  void initState() {
+    initKey = widget.key.toString();
-    super.initState();
-
     // Initialize form values as all empty
     values.clear();
-    int j = 0;
     for (var row in widget.items) {
       for (var e in row) {
         values[e.key] = e.defaultValue;
@@ -245,8 +243,17 @@ class _GeneratedFormState extends State<GeneratedForm> {
     someValueChanged(isBuilding: true);
   }
 
+  @override
+  void initState() {
+    super.initState();
+    initForm();
+  }
+
   @override
   Widget build(BuildContext context) {
+    if (widget.key.toString() != initKey) {
+      initForm();
+    }
     for (var r = 0; r < formInputs.length; r++) {
       for (var e = 0; e < formInputs[r].length; e++) {
         if (widget.items[r][e] is GeneratedFormSwitch) {

lib/custom_errors.dart

@@ -29,7 +29,7 @@ class NoReleasesError extends ObtainiumError {
 }
 
 class NoAPKError extends ObtainiumError {
-  NoAPKError() : super(tr('noReleaseFound'));
+  NoAPKError() : super(tr('noAPKFound'));
 }
 
 class NoVersionError extends ObtainiumError {

lib/main.dart

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

lib/pages/add_app.dart

@@ -32,6 +32,7 @@ class _AddAppPageState extends State<AddAppPage> {
   Map<String, dynamic> additionalSettings = {};
   bool additionalSettingsValid = true;
   List<String> pickedCategories = [];
+  int searchnum = 0;
 
   @override
   Widget build(BuildContext context) {
@@ -40,10 +41,14 @@ class _AddAppPageState extends State<AddAppPage> {
 
     bool doingSomething = gettingAppInfo || searching;
 
-    changeUserInput(String input, bool valid, bool isBuilding) {
+    changeUserInput(String input, bool valid, bool isBuilding,
+        {bool isSearch = false}) {
       userInput = input;
       if (!isBuilding) {
         setState(() {
+          if (isSearch) {
+            searchnum++;
+          }
           var source = valid ? sourceProvider.getSource(userInput) : null;
           if (pickedSource.runtimeType != source.runtimeType) {
             pickedSource = source;
@@ -70,6 +75,7 @@ class _AddAppPageState extends State<AddAppPage> {
             additionalSettings['noVersionDetection'] == true;
         var cont = true;
         if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
+            // ignore: use_build_context_synchronously
             await showDialog(
                     context: context,
                     builder: (BuildContext ctx) {
@@ -88,6 +94,7 @@ class _AddAppPageState extends State<AddAppPage> {
           cont = false;
         }
         if (userPickedNoVersionDetection &&
+            // ignore: use_build_context_synchronously
             await showDialog(
                     context: context,
                     builder: (BuildContext ctx) {
@@ -167,30 +174,32 @@ class _AddAppPageState extends State<AddAppPage> {
                         children: [
                           Expanded(
                               child: GeneratedForm(
+                                  key: Key(searchnum.toString()),
                                   items: [
-                                [
+                                    [
-                                  GeneratedFormTextField('appSourceURL',
+                                      GeneratedFormTextField('appSourceURL',
-                                      label: tr('appSourceURL'),
+                                          label: tr('appSourceURL'),
-                                      additionalValidators: [
+                                          defaultValue: userInput,
-                                        (value) {
+                                          additionalValidators: [
-                                          try {
+                                            (value) {
-                                            sourceProvider
+                                              try {
-                                                .getSource(value ?? '')
+                                                sourceProvider
-                                                .standardizeURL(
+                                                    .getSource(value ?? '')
-                                                    preStandardizeUrl(
+                                                    .standardizeURL(
-                                                        value ?? ''));
+                                                        preStandardizeUrl(
-                                          } catch (e) {
+                                                            value ?? ''));
-                                            return e is String
+                                              } catch (e) {
-                                                ? e
+                                                return e is String
-                                                : e is ObtainiumError
+                                                    ? e
-                                                    ? e.toString()
+                                                    : e is ObtainiumError
-                                                    : tr('error');
+                                                        ? e.toString()
-                                          }
+                                                        : tr('error');
-                                          return null;
+                                              }
-                                        }
+                                              return null;
-                                      ])
+                                            }
-                                ]
+                                          ])
-                              ],
+                                    ]
+                                  ],
                                   onValueChanges: (values, valid, isBuilding) {
                                     changeUserInput(values['appSourceURL']!,
                                         valid, isBuilding);
@@ -294,8 +303,8 @@ class _AddAppPageState extends State<AddAppPage> {
                                           if (selectedUrls != null &&
                                               selectedUrls.isNotEmpty) {
                                             changeUserInput(
-                                                selectedUrls[0], true, false);
+                                                selectedUrls[0], true, false,
-                                            addApp(resetUserInputAfter: true);
+                                                isSearch: true);
                                           }
                                         }).catchError((e) {
                                           showError(e, context);
@@ -325,6 +334,7 @@ class _AddAppPageState extends State<AddAppPage> {
                               height: 16,
                             ),
                             GeneratedForm(
+                                key: Key(pickedSource.runtimeType.toString()),
                                 items: pickedSource!
                                     .combinedAppSpecificSettingFormItems,
                                 onValueChanges: (values, valid, isBuilding) {

lib/pages/app.dart

@@ -317,7 +317,7 @@ class _AppPageState extends State<AppPage> {
                               tooltip: tr('more')),
                         const SizedBox(width: 16.0),
                         Expanded(
-                            child: ElevatedButton(
+                            child: TextButton(
                                 onPressed: (app?.app.installedVersion == null ||
                                             app?.app.installedVersion !=
                                                 app?.app.latestVersion) &&
@@ -356,7 +356,8 @@ class _AppPageState extends State<AppPage> {
                                         ? tr('update')
                                         : tr('markUpdated')))),
                         const SizedBox(width: 16.0),
-                        ElevatedButton(
+                        Expanded(
+                            child: TextButton(
                           onPressed: app?.downloadProgress != null
                               ? null
                               : () {
@@ -401,7 +402,7 @@ class _AppPageState extends State<AppPage> {
                               surfaceTintColor:
                                   Theme.of(context).colorScheme.error),
                           child: Text(tr('remove')),
-                        ),
+                        )),
                       ])),
               if (app?.downloadProgress != null)
                 Padding(

lib/pages/import_export.dart

@@ -564,18 +564,22 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
           widget.onlyOneSelectionAllowed ? tr('selectURL') : tr('selectURLs')),
       content: Column(children: [
         ...urlWithDescriptionSelections.keys.map((urlWithD) {
+          select(bool? value) {
+            setState(() {
+              value ??= false;
+              if (value! && widget.onlyOneSelectionAllowed) {
+                selectOnlyOne(urlWithD.key);
+              } else {
+                urlWithDescriptionSelections[urlWithD] = value!;
+              }
+            });
+          }
+
           return Row(children: [
             Checkbox(
                 value: urlWithDescriptionSelections[urlWithD],
                 onChanged: (value) {
-                  setState(() {
+                  select(value);
-                    value ??= false;
-                    if (value! && widget.onlyOneSelectionAllowed) {
-                      selectOnlyOne(urlWithD.key);
-                    } else {
-                      urlWithDescriptionSelections[urlWithD] = value!;
-                    }
-                  });
                 }),
             const SizedBox(
               width: 8,
@@ -599,12 +603,17 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
                           const TextStyle(decoration: TextDecoration.underline),
                       textAlign: TextAlign.start,
                     )),
-                Text(
+                GestureDetector(
-                  urlWithD.value.length > 128
+                  onTap: () {
-                      ? '${urlWithD.value.substring(0, 128)}...'
+                    select(!(urlWithDescriptionSelections[urlWithD] ?? false));
-                      : urlWithD.value,
+                  },
-                  style: const TextStyle(
+                  child: Text(
-                      fontStyle: FontStyle.italic, fontSize: 12),
+                    urlWithD.value.length > 128
+                        ? '${urlWithD.value.substring(0, 128)}...'
+                        : urlWithD.value,
+                    style: const TextStyle(
+                        fontStyle: FontStyle.italic, fontSize: 12),
+                  ),
                 ),
                 const SizedBox(
                   height: 8,

lib/pages/settings.dart

@@ -4,10 +4,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/custom_app_bar.dart';
 import 'package:obtainium/components/generated_form.dart';
-import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
-import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/logs_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';

lib/providers/apps_provider.dart

@@ -247,7 +247,11 @@ class AppsProvider with ChangeNotifier {
         !(await canDowngradeApps())) {
       throw DowngradeError();
     }
-    await InstallPlugin.installApk(file.file.path, 'dev.imranr.obtainium');
+    await InstallPlugin.installApk(file.file.path, obtainiumId);
+    if (file.appId == obtainiumId) {
+      // Obtainium prompt should be lowest
+      await Future.delayed(const Duration(milliseconds: 500));
+    }
     apps[file.appId]!.app.installedVersion =
         apps[file.appId]!.app.latestVersion;
     // Don't correct install status as installation may not be done yet
@@ -262,6 +266,7 @@ class AppsProvider with ChangeNotifier {
     List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
 
     if (app.apkUrls.length > 1 && context != null) {
+      // ignore: use_build_context_synchronously
       apkUrl = await showDialog(
           context: context,
           builder: (BuildContext ctx) {
@@ -281,6 +286,7 @@ class AppsProvider with ChangeNotifier {
     if (apkUrl != null &&
         getHost(apkUrl) != getHost(app.url) &&
         context != null) {
+      // ignore: use_build_context_synchronously
       if (await showDialog(
               context: context,
               builder: (BuildContext ctx) {

lib/providers/source_provider.dart

@@ -225,7 +225,19 @@ class AppSource {
         label: tr('trackOnly'),
       )
     ],
-    [GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))]
+    [
+      GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))
+    ],
+    [
+      GeneratedFormTextField('apkFilterRegEx',
+          label: tr('filterAPKsByRegEx'),
+          required: false,
+          additionalValidators: [
+            (value) {
+              return regExValidator(value);
+            }
+          ])
+    ]
   ];
 
   // Previous 2 variables combined into one at runtime for convenient usage
@@ -269,6 +281,18 @@ abstract class MassAppUrlSource {
   Future<Map<String, String>> getUrlsWithDescriptions(List<String> args);
 }
 
+regExValidator(String? value) {
+  if (value == null || value.isEmpty) {
+    return null;
+  }
+  try {
+    RegExp(value);
+  } catch (e) {
+    return tr('invalidRegEx');
+  }
+  return null;
+}
+
 class SourceProvider {
   // Add more source classes here so they are available via the service
   List<AppSource> sources = [
@@ -344,10 +368,13 @@ class SourceProvider {
   }
 
   Future<App> getApp(
-      AppSource source, String url, Map<String, dynamic> additionalSettings,
+    AppSource source,
-      {App? currentApp,
+    String url,
-      bool trackOnlyOverride = false,
+    Map<String, dynamic> additionalSettings, {
-      noVersionDetectionOverride = false}) async {
+    App? currentApp,
+    bool trackOnlyOverride = false,
+    noVersionDetectionOverride = false,
+  }) async {
     if (trackOnlyOverride || source.enforceTrackOnly) {
       additionalSettings['trackOnly'] = true;
     }
@@ -358,6 +385,11 @@ class SourceProvider {
     String standardUrl = source.standardizeURL(preStandardizeUrl(url));
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalSettings);
+    if (additionalSettings['apkFilterRegEx'] != null) {
+      var reg = RegExp(additionalSettings['apkFilterRegEx']);
+      apk.apkUrls =
+          apk.apkUrls.where((element) => reg.hasMatch(element)).toList();
+    }
     if (apk.apkUrls.isEmpty && !trackOnly) {
       throw NoAPKError();
     }

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.10.3+109 # When changing this, update the tag in main() accordingly
+version: 0.10.6+112 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'