Merge pull request #1524 from ImranR98/dev

 Add release asset download button (#1493) + Minor UI change

assets/translations/bs.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Onemogući detekciju verzije",
     "noVersionDetectionExplanation": "Ova opcija bi se trebala koristiti samo za aplikacije gdje detekcija verzije ne radi ispravno.",
     "downloadingX": "Preuzimanje {}",
+    "downloadX": "Download {}",
+    "downloadedX": "Downloaded {}",
+    "releaseAsset": "Release Asset",
     "downloadNotifDescription": "Obavještava korisnika o napretku u preuzimanju aplikacije",
     "noAPKFound": "APK nije pronađen",
     "noVersionDetection": "Nema detekcije verzije",

assets/translations/cs.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Deaktivovat detekci verze",
     "noVersionDetectionExplanation": "Tato možnost by měla být použita pouze u aplikace, kde detekce verzí nefunguje správně.",
     "downloadingX": "Stáhnout {}",
+    "downloadX": "Stáhnout {}",
+    "downloadedX": "Staženo {}",
+    "releaseAsset": "Vydání aktiva",
     "downloadNotifDescription": "Informuje uživatele o průběhu stahování aplikace",
     "noAPKFound": "Žádná APK nebyla nalezena",
     "noVersionDetection": "Žádná detekce verze",

assets/translations/de.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Versionsermittlung deaktivieren",
     "noVersionDetectionExplanation": "Diese Option sollte nur für Apps verwendet werden, bei denen die Versionserkennung nicht korrekt funktioniert.",
     "downloadingX": "Lade {} herunter",
+    "downloadX": "Herunterladen {}",
+    "downloadedX": "Heruntergeladen {}",
+    "releaseAsset": "Asset freigeben",
     "downloadNotifDescription": "Benachrichtigt den Nutzer über den Fortschritt beim Herunterladen einer App",
     "noAPKFound": "Keine APK gefunden",
     "noVersionDetection": "Keine Versionserkennung",

assets/translations/en.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Disable Version Detection",
     "noVersionDetectionExplanation": "This option should only be used for Apps where version detection does not work correctly.",
     "downloadingX": "Downloading {}",
+    "downloadX": "Download {}",
+    "downloadedX": "Downloaded {}",
+    "releaseAsset": "Release Asset",
     "downloadNotifDescription": "Notifies the user of the progress in downloading an App",
     "noAPKFound": "No APK found",
     "noVersionDetection": "No version detection",

assets/translations/es.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Desactivar la detección de versiones",
     "noVersionDetectionExplanation": "Esta opción solo se debe usar en aplicaciones en las que la deteción de versiones pueda que no funcionar correctamente.",
     "downloadingX": "Descargando {}",
+    "downloadX": "Descargar {}",
+    "downloadedX": "Descargado {}",
+    "releaseAsset": "Liberar activos",
     "downloadNotifDescription": "Notifica al usuario del progreso de descarga de una aplicación",
     "noAPKFound": "No se encontró el paquete de instalación APK",
     "noVersionDetection": "Sin detección de versiones",

assets/translations/fa.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "غیرفعال کردن تشخیص نسخه",
     "noVersionDetectionExplanation": "این گزینه فقط باید برای برنامه هایی استفاده شود که تشخیص نسخه به درستی کار نمی کند.",
     "downloadingX": "در حال دانلود {}",
+    "downloadX": "Download {}",
+    "downloadedX": "Downloaded {}",
+    "releaseAsset": "Release Asset",
     "downloadNotifDescription": "کاربر را از پیشرفت دانلود یک برنامه مطلع می کند",
     "noAPKFound": "APK پیدا نشد فایل",
     "noVersionDetection": "بدون تشخیص نسخه",

assets/translations/fr.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Désactiver la détection de version",
     "noVersionDetectionExplanation": "Cette option ne doit être utilisée que pour les applications où la détection de version ne fonctionne pas correctement.",
     "downloadingX": "Téléchargement {}",
+    "downloadX": "Télécharger {}",
+    "downloadedX": "Téléchargé {}",
+    "releaseAsset": "Actif libéré",
     "downloadNotifDescription": "Avertit l'utilisateur de la progression du téléchargement d'une application",
     "noAPKFound": "Aucun APK trouvé",
     "noVersionDetection": "Pas de détection de version",

assets/translations/hu.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Verzió érzékelés letiltása",
     "noVersionDetectionExplanation": "Ezt a beállítást csak olyan alkalmazásoknál szabad használni, ahol a verzióérzékelés nem működik megfelelően.",
     "downloadingX": "{} letöltés",
+    "downloadX": "Letöltés {}",
+    "downloadedX": "Letöltés {}",
+    "releaseAsset": "Release Asset",
     "downloadNotifDescription": "Értesíti a felhasználót az app letöltésének előrehaladásáról",
     "noAPKFound": "Nem található APK",
     "noVersionDetection": "Nincs verzió érzékelés",

assets/translations/it.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Disattiva il rilevamento della versione",
     "noVersionDetectionExplanation": "Questa opzione dovrebbe essere usata solo per le app la cui versione non viene rilevata correttamente.",
     "downloadingX": "Scaricamento di {} in corso",
+    "downloadX": "Scarica {}",
+    "downloadedX": "Scaricato {}",
+    "releaseAsset": "Rilascio Asset",
     "downloadNotifDescription": "Notifica all'utente lo stato di avanzamento del download di un'app",
     "noAPKFound": "Nessun APK trovato",
     "noVersionDetection": "Disattiva rilevamento di versione",

assets/translations/ja.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "バージョン検出を無効にする",
     "noVersionDetectionExplanation": "このオプションは、バージョン検出が正しく機能しないアプリにのみ使用する必要があります。",
     "downloadingX": "{} をダウンロード中",
+    "downloadX": "ダウンロード",
+    "downloadedX": "ダウンロード",
+    "releaseAsset": "リリース資産",
     "downloadNotifDescription": "アプリのダウンロード状況を通知する",
     "noAPKFound": "APKが見つかりません",
     "noVersionDetection": "バージョン検出を行わない",

assets/translations/nl.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Versieherkenning uitschakelen",
     "noVersionDetectionExplanation": "Deze optie moet alleen worden gebruikt voor apps waar versieherkenning niet correct werkt.",
     "downloadingX": "Downloaden {}",
+    "downloadX": "Downloaden",
+    "downloadedX": "Gedownload {}",
+    "releaseAsset": "Release Activa",
     "downloadNotifDescription": "Stelt de gebruiker op de hoogte van de voortgang bij het downloaden van een app",
     "noAPKFound": "Geen APK gevonden",
     "noVersionDetection": "Geen versieherkenning",

assets/translations/pl.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Wyłącz wykrywanie wersji",
     "noVersionDetectionExplanation": "Opcja ta powinna być używana tylko w przypadku aplikacji, w których wykrywanie wersji nie działa poprawnie.",
     "downloadingX": "Pobieranie {}",
+    "downloadX": "Pobierz {}",
+    "downloadedX": "Pobrano {}",
+    "releaseAsset": "Release Asset",
     "downloadNotifDescription": "Informuje o postępach w pobieraniu aplikacji",
     "noAPKFound": "Nie znaleziono pakietu APK",
     "noVersionDetection": "Bez wykrywania wersji",

assets/translations/pt.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Desativar detecção de versão",
     "noVersionDetectionExplanation": "Essa opção deve apenas ser usada por aplicativos onde a detecção de versão não funciona corretamente.",
     "downloadingX": "Baixando {}",
+    "downloadX": "Descarregar {}",
+    "downloadedX": "Descarregado {}",
+    "releaseAsset": "Libertação de activos",
     "downloadNotifDescription": "Notifica o usuário o progresso do download de um aplicativo",
     "noAPKFound": "APK não encontrado",
     "noVersionDetection": "Sem detecção de versão",

assets/translations/ru.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Отключить обнаружение версии",
     "noVersionDetectionExplanation": "Эта настройка должна использоваться только для приложений, где обнаружение версии не работает корректно",
     "downloadingX": "Загрузка {}",
+    "downloadX": "Скачать {}",
+    "downloadedX": "Загружено {}",
+    "releaseAsset": "Освобождение актива",
     "downloadNotifDescription": "Уведомляет пользователя о прогрессе загрузки приложения",
     "noAPKFound": "APK не найден",
     "noVersionDetection": "Обнаружение версий отключено",

assets/translations/sv.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Inaktivera versionsdetektering",
     "noVersionDetectionExplanation": "Det här alternativet bör endast användas för appar där versionsidentifiering inte fungerar korrekt.",
     "downloadingX": "Laddar ner {}",
+    "downloadX": "Ladda ner {}",
+    "downloadedX": "Nedladdad {}",
+    "releaseAsset": "Frigör tillgång",
     "downloadNotifDescription": "Meddelar användaren om framstegen med att ladda ner en app",
     "noAPKFound": "Ingen APK funnen",
     "noVersionDetection": "Ingen versiondetektering",

assets/translations/tr.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Sürüm Algılama Devre Dışı",
     "noVersionDetectionExplanation": "Bu seçenek, sürüm algılamanın doğru çalışmadığı uygulamalar için kullanılmalıdır.",
     "downloadingX": "{} İndiriliyor",
+    "downloadX": "İndir {}",
+    "downloadedX": "İndirildi {}",
+    "releaseAsset": "Varlık Serbest Bırakma",
     "downloadNotifDescription": "Bir uygulamanın indirme sürecinde ilerlemeyi bildiren bir bildirim",
     "noAPKFound": "APK bulunamadı",
     "noVersionDetection": "Sürüm Algılanamıyor",

assets/translations/uk.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Вимкнути визначення версії",
     "noVersionDetectionExplanation": "Цю опцію слід використовувати лише для застосунків, де визначення версії працює неправильно.",
     "downloadingX": "Завантаження {}",
+    "downloadX": "Завантажити {}",
+    "downloadedX": "Завантажено {}",
+    "releaseAsset": "Звільнити актив",
     "downloadNotifDescription": "Повідомляє користувача про прогрес завантаження застосунку",
     "noAPKFound": "APK не знайдено",
     "noVersionDetection": "Визначення версії відключено",

assets/translations/vi.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "Tắt tính năng phát hiện phiên bản",
     "noVersionDetectionExplanation": "Chỉ nên sử dụng tùy chọn này cho Ứng dụng mà tính năng phát hiện phiên bản không hoạt động chính xác.",
     "downloadingX": "Đang tải xuống {}",
+    "downloadX": "Download {}",
+    "downloadedX": "Downloaded {}",
+    "releaseAsset": "Release Asset",
     "downloadNotifDescription": "Thông báo cho người dùng về tiến trình tải xuống Ứng dụng",
     "noAPKFound": "Không tìm thấy APK",
     "noVersionDetection": "Không phát hiện phiên bản",

assets/translations/zh.json

@@ -183,6 +183,9 @@
     "disableVersionDetection": "禁用版本检测",
     "noVersionDetectionExplanation": "此选项应该仅用于无法进行版本检测的应用。",
     "downloadingX": "正在下载“{}”",
+    "downloadX": "下载 {}",
+    "downloadedX": "下载 {}",
+    "releaseAsset": "释放资产",
     "downloadNotifDescription": "提示应用的下载进度",
     "noAPKFound": "未找到 APK 文件",
     "noVersionDetection": "禁用版本检测",

lib/app_sources/github.dart

@@ -271,17 +271,14 @@ class GitHub extends AppSource {
         }
       }
 
-      List<MapEntry<String, String>> getReleaseAPKUrls(dynamic release) =>
-          (release['assets'] as List<dynamic>?)
-              ?.map((e) {
-                return (e['name'] != null) &&
-                        ((e['url'] ?? e['browser_download_url']) != null)
-                    ? MapEntry(e['name'] as String,
-                        (e['url'] ?? e['browser_download_url']) as String)
-                    : const MapEntry('', '');
-              })
-              .where((element) => element.key.toLowerCase().endsWith('.apk'))
-              .toList() ??
+      List<MapEntry<String, String>> getReleaseAssetUrls(dynamic release) =>
+          (release['assets'] as List<dynamic>?)?.map((e) {
+            return (e['name'] != null) &&
+                    ((e['url'] ?? e['browser_download_url']) != null)
+                ? MapEntry(e['name'] as String,
+                    (e['url'] ?? e['browser_download_url']) as String)
+                : const MapEntry('', '');
+          }).toList() ??
           [];
 
       DateTime? getPublishDateFromRelease(dynamic rel) =>
@@ -383,20 +380,37 @@ class GitHub extends AppSource {
                 .hasMatch(((releases[i]['body'] as String?) ?? '').trim())) {
           continue;
         }
-        var apkUrls = getReleaseAPKUrls(releases[i]);
+        var allAssetUrls = getReleaseAssetUrls(releases[i]);
+        List<MapEntry<String, String>> apkUrls = allAssetUrls
+            .where((element) => element.key.toLowerCase().endsWith('.apk'))
+            .toList();
+
         apkUrls = filterApks(apkUrls, additionalSettings['apkFilterRegEx'],
             additionalSettings['invertAPKFilter']);
         if (apkUrls.isEmpty && additionalSettings['trackOnly'] != true) {
           continue;
         }
         targetRelease = releases[i];
         targetRelease['apkUrls'] = apkUrls;
+        targetRelease['version'] =
+            targetRelease['tag_name'] ?? targetRelease['name'];
+        if (targetRelease['tarball_url'] != null) {
+          allAssetUrls.add(MapEntry(
+              (targetRelease['version'] ?? 'source') + '.tar.gz',
+              targetRelease['tarball_url']));
+        }
+        if (targetRelease['zipball_url'] != null) {
+          allAssetUrls.add(MapEntry(
+              (targetRelease['version'] ?? 'source') + '.zip',
+              targetRelease['zipball_url']));
+        }
+        targetRelease['allAssetUrls'] = allAssetUrls;
         break;
       }
       if (targetRelease == null) {
         throw NoReleasesError();
       }
-      String? version = targetRelease['tag_name'] ?? targetRelease['name'];
+      String? version = targetRelease['version'];
       DateTime? releaseDate = getReleaseDateFromRelease(
           targetRelease, useLatestAssetDateAsReleaseDate);
       if (version == null) {
@@ -408,7 +422,9 @@ class GitHub extends AppSource {
           targetRelease['apkUrls'] as List<MapEntry<String, String>>,
           getAppNames(standardUrl),
           releaseDate: releaseDate,
-          changeLog: changeLog.isEmpty ? null : changeLog);
+          changeLog: changeLog.isEmpty ? null : changeLog,
+          allAssetUrls:
+              targetRelease['allAssetUrls'] as List<MapEntry<String, String>>);
     } else {
       if (onHttpErrorCode != null) {
         onHttpErrorCode(res);

lib/pages/add_app.dart

@@ -155,7 +155,8 @@ class AddAppPageState extends State<AddAppPage> {
           // Only download the APK here if you need to for the package ID
           if (isTempId(app) && app.additionalSettings['trackOnly'] != true) {
             // ignore: use_build_context_synchronously
-            var apkUrl = await appsProvider.confirmApkUrl(app, context);
+            var apkUrl =
+                await appsProvider.confirmAppFileUrl(app, context, false);
             if (apkUrl == null) {
               throw ObtainiumError(tr('cancelled'));
             }

lib/pages/app.dart

@@ -158,6 +158,29 @@ class _AppPageState extends State<AppPage> {
             textAlign: TextAlign.center,
             style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
           ),
+          if (app?.app.apkUrls.isNotEmpty == true ||
+              app?.app.otherAssetUrls.isNotEmpty == true)
+            GestureDetector(
+              onTap: app?.app == null || updating
+                  ? null
+                  : () async {
+                      try {
+                        await appsProvider
+                            .downloadAppAssets([app!.app.id], context);
+                      } catch (e) {
+                        showError(e, context);
+                      }
+                    },
+              child: Text(
+                tr('downloadX', args: [tr('releaseAsset').toLowerCase()]),
+                textAlign: TextAlign.center,
+                style: Theme.of(context).textTheme.labelSmall!.copyWith(
+                      decoration:
+                          changeLogFn != null ? TextDecoration.underline : null,
+                      fontStyle: changeLogFn != null ? FontStyle.italic : null,
+                    ),
+              ),
+            ),
           const SizedBox(
             height: 48,
           ),