Merge pull request #945 from ImranR98/dev

Add export dir pick button + update packages

assets/translations/pl.json

@@ -34,10 +34,10 @@
     "githubStarredRepos": "Repozytoria GitHub oznaczone gwiazdką",
     "uname": "Nazwa użytkownika",
     "wrongArgNum": "Nieprawidłowa liczba podanych argumentów",
-    "xIsTrackOnly": "{} jest tylko obserwowana",
+    "xIsTrackOnly": "{} jest tylko obserwowane",
     "source": "Źródło",
     "app": "Aplikacja",
-    "appsFromSourceAreTrackOnly": "Aplikacje z tego źródła są „Obserwowane”.",
+    "appsFromSourceAreTrackOnly": "Aplikacje z tego źródła są „tylko obserwowane”.",
     "youPickedTrackOnly": "Wybrano opcję „Tylko obserwuj”.",
     "trackOnlyAppDescription": "Aplikacja będzie obserwowana pod kątem aktualizacji, ale Obtainium nie będzie w stanie jej pobrać ani zainstalować.",
     "cancelled": "Anulowano",
@@ -52,7 +52,7 @@
     "additionalOptsFor": "Dodatkowe opcje dla {}",
     "supportedSources": "Obsługiwane źródła",
     "trackOnlyInBrackets": "(tylko obserwowane)",
-    "searchableInBrackets": "(Wyszukiwalne)",
+    "searchableInBrackets": "(wyszukiwalne)",
     "appsString": "Aplikacje",
     "noApps": "Brak aplikacji",
     "noAppsForFilter": "Brak aplikacji dla filtra",
@@ -70,7 +70,7 @@
     "removeSelectedApps": "Usuń wybrane aplikacje",
     "updateX": "Zaktualizuj {}",
     "installX": "Zainstaluj {}",
-    "markXTrackOnlyAsUpdated": "Oznacz {}\n(Tylko obserwowana)\njako zaktualizowaną",
+    "markXTrackOnlyAsUpdated": "Oznacz {}\n(tylko obserwowana)\njako zaktualizowaną",
     "changeX": "Zmień {}",
     "installUpdateApps": "Instaluj/aktualizuj aplikacje",
     "installUpdateSelectedApps": "Zainstaluj/zaktualizuj wybrane aplikacje",
@@ -261,11 +261,11 @@
     "autoExportOnChanges": "Automatyczny eksport po wprowadzeniu zmian",
     "filterVersionsByRegEx": "Filtruj wersje według wyrażenia regularnego",
     "trySelectingSuggestedVersionCode": "Spróbuj wybierać sugerowany kod wersji 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",
+    "dontSortReleasesList": "Utrzymaj kolejność wydań z interfejsu API",
+    "reverseSort": "Odwrotne sortowanie",
+    "debugMenu": "Menu debugowania",
+    "bgTaskStarted": "Uruchomiono zadanie w tle - sprawdź logi.",
+    "runBgCheckNow": "Wymuś sprawdzenie aktualizacji w tle",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",

assets/translations/pt.json

@@ -128,7 +128,7 @@
     "pinUpdates": "Fixar atualizações no topo da visão de Apps",
     "updates": "Atualizações",
     "sourceSpecific": "Específico a fonte",
-    "appSource": "Fonte de Apps",
+    "appSource": "Fonte do App",
     "noLogs": "Sem Logs",
     "appLogs": "Logs do App",
     "close": "Fechar",
@@ -250,19 +250,19 @@
     "intermediateLinkNotFound": "Link intermediário não encontrado",
     "exemptFromBackgroundUpdates": "Isento de atualizações em segundo plano (se ativadas)",
     "bgUpdatesOnWiFiOnly": "Desative atualizações em segundo plano quando não estiver em 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",
+    "autoSelectHighestVersionCode": "Auto-selecionar o maior codigo de versão",
+    "versionExtractionRegEx": "RegEx para Extração de Versão",
+    "matchGroupToUse": "Grupo de Seleção para Usar",
+    "highlightTouchTargets": "Destaque areas de toque menos óbvias",
+    "pickExportDir": "Escolher Diretorio de Exportação",
+    "autoExportOnChanges": "Auto-exportar em mudanças",
+    "filterVersionsByRegEx": "Filtrar Versões por Expressão Regular",
+    "trySelectingSuggestedVersionCode": "Tente selecionar a versão sugerida",
+    "dontSortReleasesList": "Reter a ordem de lançamento da API",
+    "reverseSort": "Ordenação reversa",
+    "debugMenu": "Menu Debug",
+    "bgTaskStarted": "Tarefa em segundo plano iniciada - verifique os logs.",
+    "runBgCheckNow": "Execute a verificação de atualização em segundo plano agora",
     "removeAppQuestion": {
         "one": "Remover App?",
         "other": "Remover Apps?"

assets/translations/ru.json

@@ -236,30 +236,33 @@
     "addInfoInSettings": "Добавьте эту информацию в Настройки.",
     "githubSourceNote": "Лимит запросов GitHub можно обойти, используя ключ API.",
     "gitlabSourceNote": "Извлечение APK из GitLab может не работать без ключа API.",
-    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
-    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
-    "customLinkFilterRegex": "Custom APK Link Filter by Regular Expression (Default '.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 {}.",
-    "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",
-    "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",
+    "sortByFileNamesNotLinks": "Сортировать по именам файлов, а не по полным ссылкам",
+    "filterReleaseNotesByRegEx": "Фильтровать примечания к выпуску по регулярному выражению",
+    "customLinkFilterRegex": "Пользовательский фильтр ссылок APK по регулярному выражению (по умолчанию '.apk$')",
+    "appsPossiblyUpdated": "Попытки обновления приложений",
+    "appsPossiblyUpdatedNotifDescription": "Уведомляет пользователя о возможных обновлениях одного или нескольких приложений в фоновом режиме",
+    "xWasPossiblyUpdatedToY": "{} возможно был обновлен до {}.",
+    "enableBackgroundUpdates": "Включить обновления в фоне",
+    "backgroundUpdateReqsExplanation": "Фоновые обновления могут быть невозможны для всех приложений.",
+    "backgroundUpdateLimitsExplanation": "Успех фоновой установки можно определить только после открытия Obtainium.",
+    "verifyLatestTag": "Проверьте тег 'последний'",
+    "intermediateLinkRegex": "Фильтр ссылок 'промежуточного' типа для приоритетного посещения",
+    "intermediateLinkNotFound": "Промежуточная ссылка не найдена",
+    "exemptFromBackgroundUpdates": "Исключить из фоновых обновлений (если включено)",
+    "bgUpdatesOnWiFiOnly": "Отключить фоновые обновления, если нет соединения с Wi-Fi",
+    "autoSelectHighestVersionCode": "Автоматически выбирать APK с наивысшим кодом версии",
+    "versionExtractionRegEx": "Регулярное выражение для извлечения версии",
+    "matchGroupToUse": "Выберите группу для использования",
+    "highlightTouchTargets": "Выделить менее очевидные элементы управления касанием",
+    "pickExportDir": "Выбрать каталог для экспорта",
+    "autoExportOnChanges": "Автоэкспорт при изменениях",
+    "filterVersionsByRegEx": "Фильтровать версии по регулярному выражению",
+    "trySelectingSuggestedVersionCode": "Попробуйте выбрать предложенный код версии APK",
+    "dontSortReleasesList": "Сохранить порядок выпусков от API",
+    "reverseSort": "Обратная сортировка",
+    "debugMenu": "Меню Отладки",
+    "bgTaskStarted": "Фоновая задача начата - проверьте журналы.",
+    "runBgCheckNow": "Запустить проверку фонового обновления сейчас",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"
@@ -305,11 +308,11 @@
         "other": "У {} и ещё {} приложений есть обновления."
     },
     "xAndNMoreUpdatesInstalled": {
-        "one": "{} и еще 1 приложение были обновлены.",
-        "other": "{} и еще {} приложений были обновлены."
+        "one": "{} и ещё 1 приложение были обновлены.",
+        "other": "{} и ещё {} приложений были обновлены."
     },
     "xAndNMoreUpdatesPossiblyInstalled": {
-        "one": "{} and 1 more app may have been updated.",
-        "other": "{} and {} more apps may have been updated."
+        "one": "{} и ещё 1 приложение могли быть обновлены.",
+        "other": "{} и ещё {} приложений могли быть обновлены."
     }
 }

lib/app_sources/apkpure.dart

@@ -26,12 +26,14 @@ class APKPure extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegExB = RegExp('^https?://m.$host/+[^/]+/+[^/]+');
+    RegExp standardUrlRegExB =
+        RegExp('^https?://m.$host/+[^/]+/+[^/]+(/+[^/]+)?');
     RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
     if (match != null) {
       url = 'https://$host${Uri.parse(url).path}';
     }
-    RegExp standardUrlRegExA = RegExp('^https?://$host/+[^/]+/+[^/]+');
+    RegExp standardUrlRegExA =
+        RegExp('^https?://$host/+[^/]+/+[^/]+(/+[^/]+)?');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

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.19';
+const String currentVersion = '0.14.21';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/import_export.dart

@@ -102,11 +102,12 @@ class _ImportExportPageState extends State<ImportExportPage> {
       });
     }
 
-    runObtainiumExport() async {
+    runObtainiumExport({bool pickOnly = false}) async {
       HapticFeedback.selectionClick();
       appsProvider
           .exportApps(
-              pickOnly: (await settingsProvider.getExportDir()) == null,
+              pickOnly:
+                  pickOnly || (await settingsProvider.getExportDir()) == null,
               sp: settingsProvider)
           .then((String? result) {
         if (result != null) {
@@ -320,21 +321,38 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                     onPressed: appsProvider.apps.isEmpty ||
                                             importInProgress
                                         ? null
-                                        : runObtainiumExport,
-                                    child: Text(tr(snapshot.data != null
-                                        ? 'obtainiumExport'
-                                        : 'pickExportDir')),
+                                        : () {
+                                            runObtainiumExport(pickOnly: true);
+                                          },
+                                    child: Text(tr('pickExportDir')),
                                   )),
                                   const SizedBox(
                                     width: 16,
                                   ),
+                                  Expanded(
+                                      child: TextButton(
+                                    style: outlineButtonStyle,
+                                    onPressed: appsProvider.apps.isEmpty ||
+                                            importInProgress ||
+                                            snapshot.data == null
+                                        ? null
+                                        : runObtainiumExport,
+                                    child: Text(tr('obtainiumExport')),
+                                  )),
+                                ],
+                              ),
+                              const SizedBox(
+                                height: 8,
+                              ),
+                              Row(
+                                children: [
                                   Expanded(
                                       child: TextButton(
                                           style: outlineButtonStyle,
                                           onPressed: importInProgress
                                               ? null
                                               : runObtainiumImport,
-                                          child: Text(tr('obtainiumImport'))))
+                                          child: Text(tr('obtainiumImport')))),
                                 ],
                               ),
                               if (snapshot.data != null)

pubspec.lock

@@ -46,10 +46,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "20071638cbe4e5964a427cfa0e86dce55d060bc7d82d56f3554095d7239a8765"
+      sha256: d4dc11707abb32ef756ab95678c0d6df54003d98277f7c9aeda14c48e7a38c2f
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.2"
+    version: "3.4.3"
   args:
     dependency: transitive
     description:
@@ -386,10 +386,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "6e703d5e2f8c63fb31a77753915c1ec8baebde8088844e0d29f71b8f0b108888"
+      sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.1.3"
   intl:
     dependency: transitive
     description:
@@ -546,10 +546,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: f2543a236584a5e8be79076f858022f100ce690e31530e6fa4c32ac94f276d3a
+      sha256: ace7d15a3d1a4a0b91c041d01e5405df221edb9de9116525efc773c74e6fc790
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.3"
+    version: "11.0.5"
   permission_handler_apple:
     dependency: transitive
     description:
@@ -911,10 +911,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: c97defd418eef4ec88c0d1652cdce84b9f7b63dd7198e266d06ac1710d527067
+      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.8"
+    version: "5.0.9"
   win32_registry:
     dependency: transitive
     description:

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.19+211 # When changing this, update the tag in main() accordingly
+version: 0.14.21+213 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=3.0.0 <4.0.0'