Merge pull request #1137 from ImranR98/dev

- Add regex filter to all select dialogs (#1110) - Let users store a custom note per app (#1126) - Better GitLab error message (#1106)
Better GitLab error message (#1106 )
2025-11-04 07:13:28 +01:00 · 2023-12-07 20:57:48 -06:00 · 2023-12-07 21:55:35 -05:00 · 2023-12-07 21:47:56 -05:00 · 2023-12-07 21:38:16 -05:00 · 2023-12-07 21:00:51 -05:00
11 changed files with 130 additions and 64 deletions
--- a/assets/translations/de.json
+++ b/assets/translations/de.json
@@ -275,8 +275,8 @@
    "completeAppInstallationNotifChannel": "App Installation abschließen",
    "checkingForUpdatesNotifChannel": "Nach Aktualisierungen suchen",
    "onlyCheckInstalledOrTrackOnlyApps": "Überprüfe nur installierte und mit „nur Nachverfolgen“ markierte Apps auf Aktualisierungen",
-    "supportFixedAPKURL": "Support fixed APK URLs",
-    "selectX": "Select {}",
+    "supportFixedAPKURL": "neuere Version anhand der ersten dreißig Zahlen der Checksumme der APK URL erraten, wenn anderweitig nicht unterstützt",
+    "selectX": "Wähle {}",
    "removeAppQuestion": {
        "one": "App entfernen?",
        "other": "Apps entfernen?"
@@ -329,4 +329,4 @@
        "one": "{} und 1 weitere Anwendung wurden möglicherweise aktualisiert.",
        "other": "{} und {} weitere Anwendungen wurden möglicherweise aktualisiert."
    }
-}
+}
--- a/assets/translations/fa.json
+++ b/assets/translations/fa.json
@@ -239,44 +239,44 @@
    "sortByFileNamesNotLinks": "مرتب سازی بر اساس نام فایل به جای پیوندهای کامل",
    "filterReleaseNotesByRegEx": "یادداشت های انتشار را با بیان منظم فیلتر کنید",
    "customLinkFilterRegex": "فیلتر پیوند سفارشی بر اساس عبارت منظم (پیش‌فرض '.apk$')",
-    "appsPossiblyUpdated": "App Updates Attempted",
-    "appsPossiblyUpdatedNotifDescription": "Notifies the user that updates to one or more Apps were potentially applied in the background",
-    "xWasPossiblyUpdatedToY": "{} may have been updated to {}.",
-    "enableBackgroundUpdates": "Enable background updates",
-    "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
-    "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
-    "verifyLatestTag": "Verify the 'latest' tag",
-    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit First",
-    "intermediateLinkNotFound": "Intermediate link not found",
-    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
-    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
-    "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
-    "versionExtractionRegEx": "Version Extraction RegEx",
-    "matchGroupToUse": "Match Group to Use",
-    "highlightTouchTargets": "Highlight less obvious touch targets",
-    "pickExportDir": "Pick Export Directory",
-    "autoExportOnChanges": "Auto-export on changes",
-    "filterVersionsByRegEx": "Filter Versions by Regular Expression",
-    "trySelectingSuggestedVersionCode": "Try selecting suggested versionCode APK",
-    "dontSortReleasesList": "Retain release order from API",
-    "reverseSort": "Reverse sorting",
-    "debugMenu": "Debug Menu",
-    "bgTaskStarted": "Background task started - check logs.",
-    "runBgCheckNow": "Run Background Update Check Now",
-    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
-    "installing": "Installing",
-    "skipUpdateNotifications": "Skip update notifications",
+    "appsPossiblyUpdated": "به‌روزرسانی برنامه انجام شد",
+    "appsPossiblyUpdatedNotifDescription": "به کاربر اطلاع می‌دهد که به‌روزرسانی‌های یک یا چند برنامه به طور بالقوه در پس‌زمینه اعمال شده است",
+    "xWasPossiblyUpdatedToY": "ممکن است {} به {} به روز شده باشد.",
+    "enableBackgroundUpdates": "به روز رسانی پس زمینه را فعال کنید",
+    "backgroundUpdateReqsExplanation": "به روز رسانی پس زمینه ممکن است برای همه برنامه ها امکان پذیر نباشد.",
+    "backgroundUpdateLimitsExplanation": "موفقیت نصب پس‌زمینه تنها زمانی مشخص می‌شود که Obtainium باز شود.",
+    "verifyLatestTag": "برچسب "آخرین" را تأیید کنید",
+    "intermediateLinkRegex": "برای اولین بار بازدید از لینک "متوسط" را فیلتر کنید",
+    "intermediateLinkNotFound": "لینک میانی پیدا نشد",
+    "exemptFromBackgroundUpdates": "معاف از به‌روزرسانی‌های پس‌زمینه (در صورت فعال بودن)",
+    "bgUpdatesOnWiFiOnly": "به‌روزرسانی‌های پس‌زمینه را در صورت عدم اتصال به WiFi غیرفعال کنید",
+    "autoSelectHighestVersionCode": "انتخاب خودکار بالاترین نسخه کد APK",
+    "versionExtractionRegEx": "نسخه استخراج RegEx",
+    "matchGroupToUse": "گروه مورد استفاده را مطابقت دهید",
+    "highlightTouchTargets": "اهداف لمسی کمتر واضح را برجسته کنید",
+    "pickExportDir": "فهرست صادرات را انتخاب کنید",
+    "autoExportOnChanges": "صادرات خودکار تغییرات",
+    "filterVersionsByRegEx": "فیلتر کردن نسخه ها با RegEx",
+    "trySelectingSuggestedVersionCode": "نسخه پیشنهادی APK نسخه کد را انتخاب کنید",
+    "dontSortReleasesList": "حفظ سفارش انتشار از API",
+    "reverseSort": "مرتب سازی معکوس",
+    "debugMenu": "منوی اشکال زدایی",
+    "bgTaskStarted": "کار پس زمینه شروع شد - لاگ های مربوط را بررسی کنید.",
+    "runBgCheckNow": "اکنون به‌روزرسانی پس‌زمینه را بررسی کنید",
+    "versionExtractWholePage": "نسخه Extraction Regex را در کل صفحه اعمال کنید",
+    "installing": "در حال نصب",
+    "skipUpdateNotifications": "رد شدن از اعلان های به روز رسانی",
    "updatesAvailableNotifChannel": "بروزرسانی در دسترس ",
    "appsUpdatedNotifChannel": "برنامه ها به روز شدند",
-    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "appsPossiblyUpdatedNotifChannel": "به‌روزرسانی برنامه انجام شد",
    "errorCheckingUpdatesNotifChannel": "خطا در بررسی به‌روزرسانی‌ها",
    "appsRemovedNotifChannel": "برنامه ها حذف شدند",
    "downloadingXNotifChannel": "در حال دانلود {}",
    "completeAppInstallationNotifChannel": "نصب کامل برنامه",
    "checkingForUpdatesNotifChannel": "بررسی به‌روزرسانی‌ها",
-    "onlyCheckInstalledOrTrackOnlyApps": "Only check installed and Track-Only apps for updates",
-    "supportFixedAPKURL": "Support fixed APK URLs",
-    "selectX": "Select {}",
+    "onlyCheckInstalledOrTrackOnlyApps": "فقط برنامه های نصب شده و فقط ردیابی را برای به روز رسانی بررسی کنید",
+    "supportFixedAPKURL": "پشتیبانی از URL های APK ثابت",
+    "selectX": "انتخاب کنید {}",
    "removeAppQuestion": {
        "one": "برنامه حذف شود؟",
        "other": "برنامه ها حذف شوند؟"
@@ -326,7 +326,7 @@
        "other": "{} و {} برنامه دیگر به روز شدند."
    },
    "xAndNMoreUpdatesPossiblyInstalled": {
-        "one": "{} and 1 more app may have been updated.",
-        "other": "{} and {} more apps may have been updated."
+        "one": "{} و 1 برنامه دیگر ممکن است به روز شده باشند.",
+        "other": "ممکن است {} و {} برنامه های دیگر به روز شده باشند."
    }
-}
+}
--- a/assets/translations/pl.json
+++ b/assets/translations/pl.json
@@ -275,8 +275,8 @@
    "completeAppInstallationNotifChannel": "Ukończenie instalacji aplikacji",
    "checkingForUpdatesNotifChannel": "Sprawdzanie dostępności aktualizacji",
    "onlyCheckInstalledOrTrackOnlyApps": "Sprawdzaj tylko zainstalowane i obserwowane aplikacje pod kątem aktualizacji",
-    "supportFixedAPKURL": "Support fixed APK URLs",
-    "selectX": "Select {}",
+    "supportFixedAPKURL": "Obsługuj stałe adresy URL APK",
+    "selectX": "Wybierz {}",
    "removeAppQuestion": {
        "one": "Usunąć aplikację?",
        "few": "Usunąć aplikacje?",
--- a/lib/app_sources/gitlab.dart
+++ b/lib/app_sources/gitlab.dart
@@ -203,7 +203,7 @@ class GitLab extends AppSource {
      });
    }
    if (apkDetailsList.isEmpty) {
-      throw NoReleasesError();
+      throw NoReleasesError(note: tr('gitlabSourceNote'));
    }
    if (fallbackToOlderReleases) {
      if (additionalSettings['trackOnly'] != true) {
@@ -211,7 +211,7 @@ class GitLab extends AppSource {
            apkDetailsList.where((e) => e.apkUrls.isNotEmpty).toList();
      }
      if (apkDetailsList.isEmpty) {
-        throw NoReleasesError();
+        throw NoReleasesError(note: tr('gitlabSourceNote'));
      }
    }
    return apkDetailsList.first;
--- a/lib/custom_errors.dart
+++ b/lib/custom_errors.dart
@@ -34,7 +34,9 @@ class CredsNeededError extends ObtainiumError {
 }

 class NoReleasesError extends ObtainiumError {
-  NoReleasesError() : super(tr('noReleaseFound'));
+  NoReleasesError({String? note})
+      : super(
+            '${tr('noReleaseFound')}${note?.isNotEmpty == true ? '\n\n$note' : ''}');
 }

 class NoAPKError extends ObtainiumError {
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -19,7 +19,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';

-const String currentVersion = '0.14.35';
+const String currentVersion = '0.14.36';
 const String currentReleaseTag =
    'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

--- a/lib/pages/app.dart
+++ b/lib/pages/app.dart
@@ -145,6 +145,29 @@ class _AppPageState extends State<AppPage> {
                    appsProvider.saveApps([app.app]);
                  }
                }),
+            if (app?.app.additionalSettings['about'] is String &&
+                app?.app.additionalSettings['about'].isNotEmpty)
+              Column(
+                children: [
+                  const SizedBox(
+                    height: 48,
+                  ),
+                  GestureDetector(
+                    onLongPress: () {
+                      Clipboard.setData(ClipboardData(
+                          text: app?.app.additionalSettings['about'] ?? ''));
+                      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                        content: Text(tr('copiedToClipboard')),
+                      ));
+                    },
+                    child: Text(
+                      app?.app.additionalSettings['about'],
+                      textAlign: TextAlign.center,
+                      style: const TextStyle(fontStyle: FontStyle.italic),
+                    ),
+                  )
+                ],
+              ),
          ],
        );

--- a/lib/pages/import_export.dart
+++ b/lib/pages/import_export.dart
@@ -598,6 +598,7 @@ class SelectionModal extends StatefulWidget {

 class _SelectionModalState extends State<SelectionModal> {
  Map<MapEntry<String, List<String>>, bool> entrySelections = {};
+  String filterRegex = '';
  @override
  void initState() {
    super.initState();
@@ -618,11 +619,50 @@ class _SelectionModalState extends State<SelectionModal> {

  @override
  Widget build(BuildContext context) {
+    Map<MapEntry<String, List<String>>, bool> filteredEntrySelections = {};
+    entrySelections.forEach((key, value) {
+      var searchableText = key.value.isEmpty ? key.key : key.value[0];
+      if (filterRegex.isEmpty || RegExp(filterRegex).hasMatch(searchableText)) {
+        filteredEntrySelections.putIfAbsent(key, () => value);
+      }
+    });
+    if (filterRegex.isNotEmpty && filteredEntrySelections.isEmpty) {
+      entrySelections.forEach((key, value) {
+        var searchableText = key.value.isEmpty ? key.key : key.value[0];
+        if (filterRegex.isEmpty ||
+            RegExp(filterRegex, caseSensitive: false)
+                .hasMatch(searchableText)) {
+          filteredEntrySelections.putIfAbsent(key, () => value);
+        }
+      });
+    }
    return AlertDialog(
      scrollable: true,
      title: Text(widget.title ?? tr('pick')),
      content: Column(children: [
-        ...entrySelections.keys.map((entry) {
+        GeneratedForm(
+            items: [
+              [
+                GeneratedFormTextField('filter',
+                    label: tr('filter'),
+                    required: false,
+                    additionalValidators: [
+                      (value) {
+                        return regExValidator(value);
+                      }
+                    ])
+              ]
+            ],
+            onValueChanges: (value, valid, isBuilding) {
+              if (valid && !isBuilding) {
+                if (value['filter'] != null) {
+                  setState(() {
+                    filterRegex = value['filter'];
+                  });
+                }
+              }
+            }),
+        ...filteredEntrySelections.keys.map((entry) {
          selectThis(bool? value) {
            setState(() {
              value ??= false;
--- a/lib/providers/source_provider.dart
+++ b/lib/providers/source_provider.dart
@@ -454,7 +454,8 @@ abstract class AppSource {
    [
      GeneratedFormSwitch('skipUpdateNotifications',
          label: tr('skipUpdateNotifications'))
-    ]
+    ],
+    [GeneratedFormTextField('about', label: tr('about'), required: false)]
  ];

  // Previous 2 variables combined into one at runtime for convenient usage
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,10 +5,10 @@ packages:
    dependency: "direct main"
    description:
      name: android_alarm_manager_plus
-      sha256: "82fb28c867c4b3dd7e9157728e46426b8916362f977dbba46b949210f00099f4"
+      sha256: "84720c8ad2758aabfbeafd24a8c355d8c8dd3aa52b01eaf3bb827c7210f61a91"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.3"
+    version: "3.0.4"
  android_intent_plus:
    dependency: "direct main"
    description:
@@ -38,10 +38,10 @@ packages:
    dependency: "direct main"
    description:
      name: animations
-      sha256: ef57563eed3620bd5d75ad96189846aca1e033c0c45fc9a7d26e80ab02b88a70
+      sha256: "708e4b68c23228c264b038fe7003a2f5d01ce85fc64d8cae090e86b27fcea6c5"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.8"
+    version: "2.0.10"
  archive:
    dependency: transitive
    description:
@@ -142,10 +142,10 @@ packages:
    dependency: transitive
    description:
      name: cross_file
-      sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5"
+      sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.3+7"
+    version: "0.3.3+8"
  crypto:
    dependency: "direct main"
    description:
@@ -370,10 +370,10 @@ packages:
    dependency: "direct main"
    description:
      name: http
-      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
+      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.0"
+    version: "1.1.2"
  http_parser:
    dependency: transitive
    description:
@@ -562,10 +562,10 @@ packages:
    dependency: transitive
    description:
      name: permission_handler_html
-      sha256: d96ff56a757b7f04fa825c469d296c5aebc55f743e87bd639fef91a466a24da8
+      sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df"
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.0+1"
+    version: "0.1.0+2"
  permission_handler_platform_interface:
    dependency: transitive
    description:
@@ -586,10 +586,10 @@ packages:
    dependency: transitive
    description:
      name: petitparser
-      sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6
+      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.1"
+    version: "6.0.2"
  platform:
    dependency: transitive
    description:
@@ -911,10 +911,10 @@ packages:
    dependency: transitive
    description:
      name: webview_flutter_platform_interface
-      sha256: adb8c03c2be231bea5a8ed0e9039e9d18dbb049603376beaefa15393ede468a5
+      sha256: "68e86162aa8fc646ae859e1585995c096c95fc2476881fa0c4a8d10f56013a5a"
      url: "https://pub.dev"
    source: hosted
-    version: "2.7.0"
+    version: "2.8.0"
  webview_flutter_wkwebview:
    dependency: transitive
    description:
@@ -927,10 +927,10 @@ packages:
    dependency: transitive
    description:
      name: win32
-      sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f"
+      sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574
      url: "https://pub.dev"
    source: hosted
-    version: "5.1.0"
+    version: "5.1.1"
  win32_registry:
    dependency: transitive
    description:
@@ -951,10 +951,10 @@ packages:
    dependency: transitive
    description:
      name: xml
-      sha256: af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556
+      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
      url: "https://pub.dev"
    source: hosted
-    version: "6.4.2"
+    version: "6.5.0"
  yaml:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/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.14.35+229 # When changing this, update the tag in main() accordingly
+version: 0.14.36+230 # When changing this, update the tag in main() accordingly

 environment:
  sdk: '>=3.0.0 <4.0.0'
Author	SHA1	Message	Date
Imran Remtulla	3eca704f4a	Merge pull request #1137 from ImranR98/dev - Add regex filter to all select dialogs (#1110) - Let users store a custom note per app (#1126) - Better GitLab error message (#1106)	2023-12-07 20:57:48 -06:00
Imran Remtulla	9c95129311	Better GitLab error message (#1106 )	2023-12-07 21:55:35 -05:00
Imran Remtulla	bf34c1bcdb	Let users store a custom note per app (#1126 )	2023-12-07 21:47:56 -05:00
Imran Remtulla	284c687d77	Add regex filter to all select dialogs (#1110 )	2023-12-07 21:38:16 -05:00
Imran Remtulla	09afb5a3f5	Upgrade packages, increment version	2023-12-07 21:00:51 -05:00
Imran Remtulla	0138721451	Merge pull request #1118 from DwainZwerg/patch-9 Update de.json	2023-12-07 19:56:13 -06:00
Imran Remtulla	2d5f610941	Merge branch 'main' into patch-9	2023-12-07 19:56:07 -06:00
Imran Remtulla	864fa7762b	Merge pull request #1119 from iDazai/patch-2 Update de.json	2023-12-07 19:55:16 -06:00
Imran Remtulla	4fde38ee6a	Merge pull request #1125 from Daviteusz/weblate-obtainium-translate Update Polish translation	2023-12-07 19:55:05 -06:00
Imran Remtulla	6cdf0f10d4	Merge pull request #1136 from mehdeej/main Update (Persian) fa.json	2023-12-07 19:54:56 -06:00
Mehdee	b66592c25f	Update (Persian) fa.json	2023-12-07 20:58:26 +03:30
Daviteusz	62f1dc17a0	Update Polish translations	2023-11-28 18:08:57 +01:00
iDazai	0e9a8a937a	Update de.json translated newly added strings	2023-11-25 14:06:50 +01:00
DwainZwerg	9a86b245ce	Update de.json	2023-11-25 12:52:32 +00:00