Merge pull request #530 from ImranR98/dev

Added F-Droid search (#526) + search UI improvements

README.md

@@ -17,6 +17,7 @@ Currently supported App sources:
 - [SourceForge](https://sourceforge.net/)
 - [APKMirror](https://apkmirror.com/) (Track-Only)
 - Third Party F-Droid Repos
+- Jenkins Jobs
 - [Steam](https://store.steampowered.com/mobile)
 - [Telegram App](https://telegram.org)
 - [VLC](https://www.videolan.org/vlc/download-android.html)

assets/translations/de.json

@@ -71,7 +71,7 @@
     "updateX": "Aktualisiere {}",
     "installX": "Installiere {}",
     "markXTrackOnlyAsUpdated": "Markiere {}\n(Nur Nachverfolgen)\nals aktualisiert",
-    "changeX": "Ändern {}",
+    "changeX": "Ändere {}",
     "installUpdateApps": "Apps installieren/aktualisieren",
     "installUpdateSelectedApps": "Ausgewählte Apps installieren/aktualisieren",
     "markXSelectedAppsAsUpdated": "Markiere {} ausgewählte Apps als aktuell?",
@@ -224,10 +224,10 @@
     "standardVersionDetection": "Standardversionserkennung",
     "groupByCategory": "Nach Kategorie gruppieren",
     "autoApkFilterByArch": "Nach Möglichkeit versuchen, APKs nach CPU-Architektur zu filtern",
-    "overrideSource": "Override Source",
-    "dontShowAgain": "Don't show this again",
-    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
-    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
+    "overrideSource": "Quelle überschreiben",
+    "dontShowAgain": "Nicht noch einmal zeigen",
+    "dontShowTrackOnlyWarnings": "Warnung für 'Nur Nachverfolgen' nicht anzeigen",
+    "dontShowAPKOriginWarnings": "Warnung für APK-Herkunft nicht anzeigen",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"

assets/translations/es.json

@@ -0,0 +1,279 @@
+{
+    "invalidURLForSource": "URL de la aplicación {} no válida",
+    "noReleaseFound": "No se ha podido encontrar una versión válida",
+    "noVersionFound": "No se ha podido determinar la versión de la publicación",
+    "urlMatchesNoSource": "La URL no coincide con ninguna fuente conocida",
+    "cantInstallOlderVersion": "No se puede instalar una versión previa de la aplicación",
+    "appIdMismatch": "La ID del paquete descargado no coincide con la ID de la aplicación instalada",
+    "functionNotImplemented": "Esta clase no ha implementado esta función",
+    "placeholder": "Espacio reservado",
+    "someErrors": "Han ocurrido algunos errores",
+    "unexpectedError": "Error Inesperado",
+    "ok": "Correcto",
+    "and": "y",
+    "startedBgUpdateTask": "Empezada la tarea de comprobación de actualizaciones en segundo plano",
+    "bgUpdateIgnoreAfterIs": "El parámetro ignoreAfter de la actualización en segundo plano es  {}",
+    "startedActualBGUpdateCheck": "Ha comenzado la comprobación de actualizaciones en segundo plano",
+    "bgUpdateTaskFinished": "Ha finalizado la comprobación de actualizaciones en segundo plano",
+    "firstRun": "Esta es la primera ejecución de Obtainium",
+    "settingUpdateCheckIntervalTo": "Cambiando intervalo de actualización a {}",
+    "githubPATLabel": "Token de Acceso Personal de GitHub (Reduce tiempos de espera)",
+    "githubPATHint": "El TAP debe tener este formato: nombre_de_usuario:token",
+    "githubPATFormat": "nombre_de_usuario:token",
+    "githubPATLinkText": "Sobre los TAP de GitHub",
+    "includePrereleases": "Incluir versiones preliminares",
+    "fallbackToOlderReleases": "Retorceder a versiones previas",
+    "filterReleaseTitlesByRegEx": "Filtra Títulos de Versiones mediantes Expresiones Regulares",
+    "invalidRegEx": "Expresión regular inválida",
+    "noDescription": "Sin descripción",
+    "cancel": "Cancelar",
+    "continue": "Continuar",
+    "requiredInBrackets": "(Requerido)",
+    "dropdownNoOptsError": "ERROR: EL DESPLEGABLE DEBE TENER AL MENOS UNA OPCIÓN",
+    "colour": "Color",
+    "githubStarredRepos": "Repositorios favoritos de GitHub",
+    "uname": "Nombre de usuario",
+    "wrongArgNum": "Número de argumentos provistos inválido",
+    "xIsTrackOnly": "{} es de 'Solo Seguimiento'",
+    "source": "Origen",
+    "app": "Aplicación",
+    "appsFromSourceAreTrackOnly": "Las aplicaciones de este origen son de 'Solo Seguimiento'.",
+    "youPickedTrackOnly": "Debes seleccionar la opción de 'Solo Seguimiento'.",
+    "trackOnlyAppDescription": "Se monitorizará la aplicación en busca de actualizaciones, pero Obtainium no será capaz de descargarla o acutalizarla.",
+    "cancelled": "Cancelado",
+    "appAlreadyAdded": "Aplicación ya añadida",
+    "alreadyUpToDateQuestion": "¿Aplicación ya actualizada?",
+    "addApp": "Añadir Aplicación",
+    "appSourceURL": "URL de Origen de la Aplicación",
+    "error": "Error",
+    "add": "Añadir",
+    "searchSomeSourcesLabel": "Buscar (Solo Algunas Fuentes)",
+    "search": "Buscar",
+    "additionalOptsFor": "Opciones Adicionales para {}",
+    "supportedSourcesBelow": "Fuentes Soportadas:",
+    "trackOnlyInBrackets": "(Solo Seguimiento)",
+    "searchableInBrackets": "(Soporta Búsquedas)",
+    "appsString": "Aplicaciones",
+    "noApps": "Sin Aplicaciones",
+    "noAppsForFilter": "Sin Aplicaciones para Filtrar",
+    "byX": "Por {}",
+    "percentProgress": "Progreso: {}%",
+    "pleaseWait": "Por favor, espere",
+    "updateAvailable": "Actualización Disponible",
+    "estimateInBracketsShort": "(Aprox.)",
+    "notInstalled": "No Instalado",
+    "estimateInBrackets": "(Aproximado)",
+    "selectAll": "Seleccionar Todo",
+    "deselectN": "Deseleccionar {}",
+    "xWillBeRemovedButRemainInstalled": "{} será borrada de Obtainium pero continuará instalada en el dispositivo.",
+    "removeSelectedAppsQuestion": "¿Borrar aplicaciones seleccionadas?",
+    "removeSelectedApps": "Borrar Aplicaciones Seleccionadas",
+    "updateX": "Actualizar {}",
+    "installX": "Instalar {}",
+    "markXTrackOnlyAsUpdated": "Marcar {}\n(Solo Seguimient)\ncomo Actualizada",
+    "changeX": "Cambiar {}",
+    "installUpdateApps": "Instalar/Actualizar Aplicaciones",
+    "installUpdateSelectedApps": "Instalar/Actualizar Aplicaciones Seleccionadas",
+    "markXSelectedAppsAsUpdated": "¿Marcar {} Aplicaciones Seleccionadas como Actualizadas?",
+    "no": "No",
+    "yes": "Sí",
+    "markSelectedAppsUpdated": "Marcar Aplicaciones Seleccionadas como Actualizadas",
+    "pinToTop": "Fijar arriba",
+    "unpinFromTop": "Desfijar de arriba",
+    "resetInstallStatusForSelectedAppsQuestion": "¿Restuarar Estado de Instalación para las Aplicaciones Seleccionadas?",
+    "installStatusOfXWillBeResetExplanation": "El estado de instalación de las aplicaciones seleccionadas será restaurado.\n\nEsto puede ser de utilidad cuando la versión de la aplicación mostrada en Obtainium es incorrecta por actualizaciones fallidas u otros motivos.",
+    "shareSelectedAppURLs": "Compartir URLs de las Aplicaciones Seleccionadas",
+    "resetInstallStatus": "Restaurar Estado de Instalación",
+    "more": "Más",
+    "removeOutdatedFilter": "Elimiar Filtro de Aplicaciones Desactualizado",
+    "showOutdatedOnly": "Mostrar solo Aplicaciones Desactualizadas",
+    "filter": "Filtrar",
+    "filterActive": "Filtrar *",
+    "filterApps": "Filtrar Actualizaciones",
+    "appName": "Nombre de la Aplicación",
+    "author": "Autor",
+    "upToDateApps": "Aplicaciones Actualizadas",
+    "nonInstalledApps": "Aplicaciones No Instaladas",
+    "importExport": "Importar/Exportar",
+    "settings": "Ajustes",
+    "exportedTo": "Exportado a {}",
+    "obtainiumExport": "Exportar Obtainium",
+    "invalidInput": "Input incorrecto",
+    "importedX": "Importado {}",
+    "obtainiumImport": "Importar Obtainium",
+    "importFromURLList": "Importar desde lista de URLs",
+    "searchQuery": "Consulta de Búsqueda",
+    "appURLList": "Lista de URLs de Aplicaciones",
+    "line": "Línea",
+    "searchX": "Buscar {}",
+    "noResults": "Resultados no encontrados",
+    "importX": "Importar {}",
+    "importedAppsIdDisclaimer": "Las Aplicaciones Importadas pueden mostrarse incorrectamente como \"No Instalada\".\nPara arreglar esto, reinstálalas a través de Obtainium.\nEsto no debería afectar a los datos de las aplicaciones.\n\nSolo afecta a las URLs y a los métodos de importación mediante terceros.",
+    "importErrors": "Import Errors",
+    "importedXOfYApps": "{} de {} Aplicaciones importadas.",
+    "followingURLsHadErrors": "Las siguientes URLs tuvieron problemas:",
+    "okay": "Correcto",
+    "selectURL": "Seleccionar URL",
+    "selectURLs": "Seleccionar URLs",
+    "pick": "Escoger",
+    "theme": "Tema",
+    "dark": "Oscuro",
+    "light": "Claro",
+    "followSystem": "Seguir al Sistema",
+    "obtainium": "Obtainium",
+    "materialYou": "Material You",
+    "useBlackTheme": "Usar tema oscuro con negros puros",
+    "appSortBy": "Ordenar Aplicaciones Por",
+    "authorName": "Autor/Nombre",
+    "nameAuthor": "Nombre/Autor",
+    "asAdded": "Según se Añadieron",
+    "appSortOrder": "Orden de Clasificación de Aplicaciones",
+    "ascending": "Ascendente",
+    "descending": "Descendente",
+    "bgUpdateCheckInterval": "Intervalo de Comprobación de Actualizaciones en Segundo Plano",
+    "neverManualOnly": "Nunca - Solo Manual",
+    "appearance": "Apariencia",
+    "showWebInAppView": "Mostrar Vista de la Web de Origen",
+    "pinUpdates": "Fijar Actualizaciones en la Parte Superior de la Vista de Aplicaciones",
+    "updates": "Actualizaciones",
+    "sourceSpecific": "Fuente Específica",
+    "appSource": "Fuente de la Aplicación",
+    "noLogs": "Sin Logs",
+    "appLogs": "Logs de la Aplicación",
+    "close": "Cerrar",
+    "share": "Compartir",
+    "appNotFound": "Aplicación no encontrada",
+    "obtainiumExportHyphenatedLowercase": "obtainium-export",
+    "pickAnAPK": "Elige una APK",
+    "appHasMoreThanOnePackage": "{} tiene más de un paquete:",
+    "deviceSupportsXArch": "Tu dispositivo soporta las siguientes arquitecturas de procesador: {}.",
+    "deviceSupportsFollowingArchs": "Tu dispositivo soporta las siguientes arquitecturas de procesador:",
+    "warning": "Aviso",
+    "sourceIsXButPackageFromYPrompt": "La fuente de la aplicación es '{}' pero el paquete de la actualización viene de '{}'. ¿Desea continuar?",
+    "updatesAvailable": "Actualizaciones Disponibles",
+    "updatesAvailableNotifDescription": "Notifica al usuario de que hay actualizaciones para una o más aplicaciones monitorizadas por Obtainium",
+    "noNewUpdates": "No hay nuevas actualizaciones.",
+    "xHasAnUpdate": "{} tiene una actualización.",
+    "appsUpdated": "Aplicaciones Actualizadas",
+    "appsUpdatedNotifDescription": "Notifica al usuario de que una o más aplicaciones han sido actualizadas en segundo plano",
+    "xWasUpdatedToY": "{} ha sido actualizada a {}.",
+    "errorCheckingUpdates": "Error Buscando Actualizaciones",
+    "errorCheckingUpdatesNotifDescription": "Una notificación que muestra cuándo la comprobación de actualizaciones en segundo plano falla",
+    "appsRemoved": "Aplicaciones Eliminadas",
+    "appsRemovedNotifDescription": "Notifica al usuario que una o más aplicaciones fueron eliminadas por problemas al cargarlas",
+    "xWasRemovedDueToErrorY": "{} ha sido eliminada por: {}",
+    "completeAppInstallation": "Instalación Completa de la Aplicación",
+    "obtainiumMustBeOpenToInstallApps": "Obtainium debe estar abierta para instalar aplicaciones",
+    "completeAppInstallationNotifDescription": "Pide al usuario volver a Obtainium para teminar de instalar una aplicación",
+    "checkingForUpdates": "Buscando Actualizaciones",
+    "checkingForUpdatesNotifDescription": "Notificación temporal que aparece al buscar actualizaciones",
+    "pleaseAllowInstallPerm": "Por favor, permite a Obtainium instalar aplicaciones",
+    "trackOnly": "Solo Seguimiento",
+    "errorWithHttpStatusCode": "Error {}",
+    "versionCorrectionDisabled": "Corrección de versiones desactivada (el plugin parece no funcionar)",
+    "unknown": "Desconocido",
+    "none": "Ninguno",
+    "never": "Nunca",
+    "latestVersionX": "Última Versión: {}",
+    "installedVersionX": "Versión Instalada: {}",
+    "lastUpdateCheckX": "Última Comprobación: {}",
+    "remove": "Eliminar",
+    "yesMarkUpdated": "Sí, Marcar como Actualizada",
+    "fdroid": "Repositorio oficial de F-Droid",
+    "appIdOrName": "ID o Nombre de la Aplicación",
+    "appWithIdOrNameNotFound": "No se han encontrado aplicaciones con esa ID o nombre",
+    "reposHaveMultipleApps": "Los repositorios pueden contener varias aplicaciones",
+    "fdroidThirdPartyRepo": "Rpositorios de terceros de F-Droid",
+    "steam": "Steam",
+    "steamMobile": "Steam Mobile",
+    "steamChat": "Steam Chat",
+    "install": "Instalar",
+    "markInstalled": "Marcar como Instalda",
+    "update": "Actualizar",
+    "markUpdated": "Marcar como Actualizada",
+    "additionalOptions": "Opciones Adicionales",
+    "disableVersionDetection": "Descativar Detección de Versiones",
+    "noVersionDetectionExplanation": "Esta opción solo se debe usar en aplicaciones en las que la deteción de versiones pueda no funcionar correctamente.",
+    "downloadingX": "Descargando {}",
+    "downloadNotifDescription": "Notifica al usuario de progreso de descarga de una aplicación",
+    "noAPKFound": "APK no encontrada",
+    "noVersionDetection": "Sin detección de versiones",
+    "categorize": "Catogorizar",
+    "categories": "Categorías",
+    "category": "Categoría",
+    "noCategory": "Sin Categoría",
+    "noCategories": "Sin Categorías",
+    "deleteCategoriesQuestion": "¿Borrar Categorías?",
+    "categoryDeleteWarning": "Todas las aplicaciones en las categorías borradas serán margadas como 'Sin Categoría'.",
+    "addCategory": "Añadir Categoría",
+    "label": "Nombre",
+    "language": "Idioma",
+    "copiedToClipboard": "Copiado al Portapapeles",
+    "storagePermissionDenied": "Permiso de Almacenamiento rechazado",
+    "selectedCategorizeWarning": "Esto reemplazará cualquier ajuste de categoría para las aplicaicones seleccionadas.",
+    "filterAPKsByRegEx": "Filtrar APKs mediante Expresiones Regulares",
+    "removeFromObtainium": "Eliminar de Obtainium",
+    "uninstallFromDevice": "Desinstalar del Dispositivo",
+    "onlyWorksWithNonVersionDetectApps": "Solo funciona para aplicaciones con la detección de versiones desactivada.",
+    "releaseDateAsVersion": "Usar Fecha de Publicación como Versión",
+    "releaseDateAsVersionExplanation": "Esta opción solo se debería usar con aplicaciones en las que la detección de versiones no funciona pero hay disponible una fecha de publicación.",
+    "changes": "Cambios",
+    "releaseDate": "Fecha de Publicación",
+    "importFromURLsInFile": "Importar de URls en un Archivo (como OPML)",
+    "versionDetection": "Detección de Versiones",
+    "standardVersionDetection": "Detección de versiones estándar",
+    "groupByCategory": "Agrupar por Categoría",
+    "autoApkFilterByArch": "Tratar de filtrar las APKs mediante arquitecturas de procesador si es posible",
+    "overrideSource": "Sobrescribir Fuente",
+    "dontShowAgain": "No mostrar de nuevo",
+    "dontShowTrackOnlyWarnings": "No mostrar avisos de 'Solo Seguimiento'",
+    "dontShowAPKOriginWarnings": "No mostrar avisos de las fuentes de las APks",
+    "removeAppQuestion": {
+        "one": "¿Eliminar Aplicación?",
+        "other": "¿Eliminar Aplicaciones?"
+    },
+    "tooManyRequestsTryAgainInMinutes": {
+        "one": "Muchas peticiones (limitado) - prueba de nuevo en {} minuto",
+        "other": "Muchas peticiones (limitado) - prueba de nuevo en {} minutos"
+    },
+    "bgUpdateGotErrorRetryInMinutes": {
+        "one": "La comprobación de actualizaciones en segundo plano se ha encontrado un {}, se volverá a probar en {} minuto",
+        "other": "La comprobación de actualizaciones en segundo plano se ha encontrado un {}, se volverá a probar en {} minutos"
+    },
+    "bgCheckFoundUpdatesWillNotifyIfNeeded": {
+        "one": "La comprobación de actualizaciones en segundo plano ha encontrado {} actualización - se notificará al usuario si es necesario",
+        "other": "La comprobación de actualizaciones en segundo plano ha encontrado {} actualizaciones - se notificará al usuario si es necesario"
+    },
+    "apps": {
+        "one": "{} Aplicación",
+        "other": "{} Aplicaciones"
+    },
+    "url": {
+        "one": "{} URL",
+        "other": "{} URLs"
+    },
+    "minute": {
+        "one": "{} Minuto",
+        "other": "{} Minutos"
+    },
+    "hour": {
+        "one": "{} Hora",
+        "other": "{} Horas"
+    },
+    "day": {
+        "one": "{} Día",
+        "other": "{} Días"
+    },
+    "clearedNLogsBeforeXAfterY": {
+        "one": "Borrado {n} log (previo a = {before}, posterior a = {after})",
+        "other": "Borrados {n} logs (previos a = {before}, posteriores a = {after})"
+    },
+    "xAndNMoreUpdatesAvailable": {
+        "one": "{} y 1 aplicación más tiene actualizaciones.",
+        "other": "{} y {} aplicaciones más tiene actualizaciones."
+    },
+    "xAndNMoreUpdatesInstalled": {
+        "one": "{} y 1 aplicación más han sido actualizadas.",
+        "other": "{} y {} aplicaciones más han sido actualizadas."
+    }
+}

assets/translations/fa.json

@@ -122,7 +122,7 @@
     "followSystem": "هماهنگ با سیستم",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
-    "useBlackTheme": "Use pure black dark theme",
+    "useBlackTheme": "استفاده از تم تیره سیاه خالص",
     "appSortBy": "مرتب سازی برنامه بر اساس",
     "authorName": "سازنده/اسم",
     "nameAuthor": "اسم/سازنده",
@@ -224,10 +224,10 @@
     "standardVersionDetection": "تشخیص نسخه استاندارد",
     "groupByCategory": "گروه بر اساس دسته",
     "autoApkFilterByArch": "در صورت امکان سعی کنید APKها را بر اساس معماری CPU فیلتر کنید",
-    "overrideSource": "Override Source",
-    "dontShowAgain": "Don't show this again",
-    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
-    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
+    "overrideSource": "نادیده گرفتن منبع",
+    "dontShowAgain": "دوباره این را نشان نده",
+    "dontShowTrackOnlyWarnings": "هشدار 'فقط ردیابی' را نشان ندهید",
+    "dontShowAPKOriginWarnings": "هشدارهای منبع APK را نشان ندهید",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/hu.json

@@ -223,10 +223,10 @@
     "standardVersionDetection": "Alapért. verzió érzékelés",
     "groupByCategory": "Csoportosítás Kategória alapján",
     "autoApkFilterByArch": "Ha lehetséges, próbálja CPU architektúra szerint szűrni az APK-kat",
-    "overrideSource": "Override Source",
-    "dontShowAgain": "Don't show this again",
-    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
-    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
+    "overrideSource": "Forrás felülbírálása",
+    "dontShowAgain": "Ne mutassa ezt újra",
+    "dontShowTrackOnlyWarnings": "Ne jelenítsen meg 'Csak nyomon követés' figyelmeztetést",
+    "dontShowAPKOriginWarnings": "Ne jelenítsen meg az APK eredetére vonatkozó figyelmeztetéseket",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/ja.json

@@ -122,7 +122,7 @@
     "followSystem": "システムに従う",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
-    "useBlackTheme": "Use pure black dark theme",
+    "useBlackTheme": "ピュアブラックダークテーマを使用する",
     "appSortBy": "アプリの並び方",
     "authorName": "作者名/アプリ名",
     "nameAuthor": "アプリ名/作者名",
@@ -224,10 +224,10 @@
     "standardVersionDetection": "標準のバージョン検出",
     "groupByCategory": "カテゴリ別にグループ化する",
     "autoApkFilterByArch": "可能であれば，CPUアーキテクチャによるAPKのフィルタリングを試みる",
-    "overrideSource": "Override Source",
-    "dontShowAgain": "Don't show this again",
-    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
-    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
+    "overrideSource": "ソースの上書き",
+    "dontShowAgain": "二度と表示しない",
+    "dontShowTrackOnlyWarnings": "「追跡のみ」の警告を表示しない",
+    "dontShowAPKOriginWarnings": "APK Originの警告を表示しない",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

lib/app_sources/codeberg.dart

@@ -70,7 +70,7 @@ class Codeberg extends AppSource {
   }
 
   @override
-  Future<Map<String, String>> search(String query) async {
+  Future<Map<String, List<String>>> search(String query) async {
     return gh.searchCommon(
         query,
         'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100',

lib/app_sources/fdroid.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -9,6 +10,7 @@ class FDroid extends AppSource {
   FDroid() {
     host = 'f-droid.org';
     name = tr('fdroid');
+    canSearch = true;
   }
 
   @override
@@ -68,4 +70,32 @@ class FDroid extends AppSource {
         'https://$host/repo/$appId',
         standardUrl);
   }
+
+  @override
+  Future<Map<String, List<String>>> search(String query) async {
+    Response res = await get(Uri.parse('https://search.$host/?q=$query'));
+    if (res.statusCode == 200) {
+      Map<String, List<String>> urlsWithDescriptions = {};
+      parse(res.body).querySelectorAll('.package-header').forEach((e) {
+        String? url = e.attributes['href'];
+        if (url != null) {
+          try {
+            standardizeUrl(url);
+          } catch (e) {
+            url = null;
+          }
+        }
+        if (url != null) {
+          urlsWithDescriptions[url] = [
+            e.querySelector('.package-name')?.text.trim() ?? '',
+            e.querySelector('.package-summary')?.text.trim() ??
+                tr('noDescription')
+          ];
+        }
+      });
+      return urlsWithDescriptions;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
 }

lib/app_sources/github.dart

@@ -213,19 +213,21 @@ class GitHub extends AppSource {
     return AppNames(names[0], names[1]);
   }
 
-  Future<Map<String, String>> searchCommon(
+  Future<Map<String, List<String>>> searchCommon(
       String query, String requestUrl, String rootProp,
       {Function(Response)? onHttpErrorCode}) async {
     Response res = await get(Uri.parse(requestUrl));
     if (res.statusCode == 200) {
-      Map<String, String> urlsWithDescriptions = {};
+      Map<String, List<String>> urlsWithDescriptions = {};
       for (var e in (jsonDecode(res.body)[rootProp] as List<dynamic>)) {
         urlsWithDescriptions.addAll({
-          e['html_url'] as String:
-              ((e['archived'] == true ? '[ARCHIVED] ' : '') +
-                  (e['description'] != null
-                      ? e['description'] as String
-                      : tr('noDescription')))
+          e['html_url'] as String: [
+            e['full_name'] as String,
+            ((e['archived'] == true ? '[ARCHIVED] ' : '') +
+                (e['description'] != null
+                    ? e['description'] as String
+                    : tr('noDescription')))
+          ]
         });
       }
       return urlsWithDescriptions;
@@ -238,7 +240,7 @@ class GitHub extends AppSource {
   }
 
   @override
-  Future<Map<String, String>> search(String query) async {
+  Future<Map<String, List<String>>> search(String query) async {
     return searchCommon(
         query,
         'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100',

lib/app_sources/html.dart

@@ -10,6 +10,66 @@ class HTML extends AppSource {
     return url;
   }
 
+  int compareAlphaNumeric(String a, String b) {
+    List<String> aParts = _splitAlphaNumeric(a);
+    List<String> bParts = _splitAlphaNumeric(b);
+
+    for (int i = 0; i < aParts.length && i < bParts.length; i++) {
+      String aPart = aParts[i];
+      String bPart = bParts[i];
+
+      bool aIsNumber = _isNumeric(aPart);
+      bool bIsNumber = _isNumeric(bPart);
+
+      if (aIsNumber && bIsNumber) {
+        int aNumber = int.parse(aPart);
+        int bNumber = int.parse(bPart);
+        int cmp = aNumber.compareTo(bNumber);
+        if (cmp != 0) {
+          return cmp;
+        }
+      } else if (!aIsNumber && !bIsNumber) {
+        int cmp = aPart.compareTo(bPart);
+        if (cmp != 0) {
+          return cmp;
+        }
+      } else {
+        // Alphanumeric strings come before numeric strings
+        return aIsNumber ? 1 : -1;
+      }
+    }
+
+    return aParts.length.compareTo(bParts.length);
+  }
+
+  List<String> _splitAlphaNumeric(String s) {
+    List<String> parts = [];
+    StringBuffer sb = StringBuffer();
+
+    bool isNumeric = _isNumeric(s[0]);
+    sb.write(s[0]);
+
+    for (int i = 1; i < s.length; i++) {
+      bool currentIsNumeric = _isNumeric(s[i]);
+      if (currentIsNumeric == isNumeric) {
+        sb.write(s[i]);
+      } else {
+        parts.add(sb.toString());
+        sb.clear();
+        sb.write(s[i]);
+        isNumeric = currentIsNumeric;
+      }
+    }
+
+    parts.add(sb.toString());
+
+    return parts;
+  }
+
+  bool _isNumeric(String s) {
+    return s.codeUnitAt(0) >= 48 && s.codeUnitAt(0) <= 57;
+  }
+
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
@@ -23,7 +83,8 @@ class HTML extends AppSource {
           .map((element) => element.attributes['href'] ?? '')
           .where((element) => element.toLowerCase().endsWith('.apk'))
           .toList();
-      links.sort((a, b) => a.split('/').last.compareTo(b.split('/').last));
+      links.sort(
+          (a, b) => compareAlphaNumeric(a.split('/').last, b.split('/').last));
       if (additionalSettings['apkFilterRegEx'] != null) {
         var reg = RegExp(additionalSettings['apkFilterRegEx']);
         links = links.where((element) => reg.hasMatch(element)).toList();

lib/app_sources/jenkins.dart

@@ -0,0 +1,70 @@
+import 'dart:convert';
+
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class Jenkins extends AppSource {
+  Jenkins() {
+    overrideVersionDetectionFormDefault('releaseDateAsVersion', true);
+  }
+
+  @override
+  String trimJobUrl(String url) {
+    RegExp standardUrlRegEx = RegExp('.*/job/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url);
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) =>
+      '$standardUrl/-/releases';
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    standardUrl = trimJobUrl(standardUrl);
+    Response res =
+        await get(Uri.parse('$standardUrl/lastSuccessfulBuild/api/json'));
+    if (res.statusCode == 200) {
+      var json = jsonDecode(res.body);
+      var releaseDate = json['timestamp'] == null
+          ? null
+          : DateTime.fromMillisecondsSinceEpoch(json['timestamp'] as int);
+      var version =
+          json['number'] == null ? null : (json['number'] as int).toString();
+      if (version == null) {
+        throw NoVersionError();
+      }
+      var apkUrls = (json['artifacts'] as List<dynamic>)
+          .map((e) {
+            var path = (e['relativePath'] as String?);
+            if (path != null && path.isNotEmpty) {
+              path = '$standardUrl/lastSuccessfulBuild/artifact/$path';
+            }
+            return path == null
+                ? const MapEntry<String, String>('', '')
+                : MapEntry<String, String>(
+                    (e['fileName'] ?? e['relativePath']) as String, path);
+          })
+          .where((url) =>
+              url.value.isNotEmpty && url.key.toLowerCase().endsWith('.apk'))
+          .toList();
+      if (apkUrls.isEmpty) {
+        throw NoAPKError();
+      }
+      return APKDetails(
+          version,
+          apkUrls,
+          releaseDate: releaseDate,
+          AppNames(Uri.parse(standardUrl).host, standardUrl.split('/').last));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/sourceforge.dart

@@ -10,8 +10,14 @@ class SourceForge extends AppSource {
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegEx = RegExp('^https?://$host/projects/[^/]+');
-    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    RegExp standardUrlRegExB = RegExp('^https?://$host/p/[^/]+');
+    RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
+    if (match != null) {
+      url =
+          'https://${Uri.parse(url.substring(0, match.end)).host}/projects/${url.substring(Uri.parse(url.substring(0, match.end)).host.length + '/projects/'.length + 1)}';
+    }
+    RegExp standardUrlRegExA = RegExp('^https?://$host/projects/[^/]+');
+    match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);
     }

lib/main.dart

@@ -21,21 +21,22 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.12.1';
+const String currentVersion = '0.12.3';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
 const int bgUpdateCheckAlarmId = 666;
 
-const supportedLocales = [
-  Locale('en'),
-  Locale('zh'),
-  Locale('it'),
-  Locale('ja'),
-  Locale('hu'),
-  Locale('de'),
-  Locale('fa'),
-  Locale('fr')
+List<MapEntry<Locale, String>> supportedLocales = const [
+  MapEntry(Locale('en'), 'English'),
+  MapEntry(Locale('zh'), '汉语'),
+  MapEntry(Locale('it'), 'Italiano'),
+  MapEntry(Locale('ja'), '日本語'),
+  MapEntry(Locale('hu'), 'Magyar'),
+  MapEntry(Locale('de'), 'Deutsch'),
+  MapEntry(Locale('fa'), 'فارسی'),
+  MapEntry(Locale('fr'), 'Français'),
+  MapEntry(Locale('es'), 'Español'),
 ];
 const fallbackLocale = Locale('en');
 const localeDir = 'assets/translations';
@@ -52,7 +53,7 @@ Future<void> loadTranslations() async {
     saveLocale: true,
     forceLocale: forceLocale != null ? Locale(forceLocale) : null,
     fallbackLocale: fallbackLocale,
-    supportedLocales: supportedLocales,
+    supportedLocales: supportedLocales.map((e) => e.key).toList(),
     assetLoader: const RootBundleAssetLoader(),
     useOnlyLangCode: true,
     useFallbackTranslations: true,
@@ -171,7 +172,7 @@ void main() async {
       Provider(create: (context) => LogsProvider())
     ],
     child: EasyLocalization(
-        supportedLocales: supportedLocales,
+        supportedLocales: supportedLocales.map((e) => e.key).toList(),
         path: localeDir,
         fallbackLocale: fallbackLocale,
         useOnlyLangCode: true,
@@ -221,7 +222,7 @@ class _ObtainiumState extends State<Obtainium> {
         ], onlyIfExists: false);
       }
       if (!supportedLocales
-              .map((e) => e.languageCode)
+              .map((e) => e.key.languageCode)
               .contains(context.locale.languageCode) ||
           settingsProvider.forcedLocale == null &&
               context.deviceLocale.languageCode !=

lib/mass_app_sources/githubstars.dart

@@ -13,17 +13,20 @@ class GitHubStars implements MassAppUrlSource {
   @override
   late List<String> requiredArgs = [tr('uname')];
 
-  Future<Map<String, String>> getOnePageOfUserStarredUrlsWithDescriptions(
+  Future<Map<String, List<String>>> getOnePageOfUserStarredUrlsWithDescriptions(
       String username, int page) async {
     Response res = await get(Uri.parse(
         'https://${await GitHub().getCredentialPrefixIfAny()}api.github.com/users/$username/starred?per_page=100&page=$page'));
     if (res.statusCode == 200) {
-      Map<String, String> urlsWithDescriptions = {};
+      Map<String, List<String>> urlsWithDescriptions = {};
       for (var e in (jsonDecode(res.body) as List<dynamic>)) {
         urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
-              ? e['description'] as String
-              : tr('noDescription')
+          e['html_url'] as String: [
+            e['full_name'] as String,
+            e['description'] != null
+                ? e['description'] as String
+                : tr('noDescription')
+          ]
         });
       }
       return urlsWithDescriptions;
@@ -35,11 +38,12 @@ class GitHubStars implements MassAppUrlSource {
   }
 
   @override
-  Future<Map<String, String>> getUrlsWithDescriptions(List<String> args) async {
+  Future<Map<String, List<String>>> getUrlsWithDescriptions(
+      List<String> args) async {
     if (args.length != requiredArgs.length) {
       throw ObtainiumError(tr('wrongArgNum'));
     }
-    Map<String, String> urlsWithDescriptions = {};
+    Map<String, List<String>> urlsWithDescriptions = {};
     var page = 1;
     while (true) {
       var pageUrls =

lib/pages/add_app.dart

@@ -166,7 +166,9 @@ class _AddAppPageState extends State<AddAppPage> {
           if (appsProvider.apps.containsKey(app.id)) {
             throw ObtainiumError(tr('appAlreadyAdded'));
           }
-          if (app.additionalSettings['trackOnly'] == true) {
+          if (app.additionalSettings['trackOnly'] == true ||
+              app.additionalSettings['versionDetection'] !=
+                  'standardVersionDetection') {
             app.installedVersion = app.latestVersion;
           }
           app.categories = pickedCategories;
@@ -252,7 +254,7 @@ class _AddAppPageState extends State<AddAppPage> {
 
         // .then((results) async {
         // Interleave results instead of simple reduce
-        Map<String, String> res = {};
+        Map<String, List<String>> res = {};
         var si = 0;
         var done = false;
         while (!done) {

lib/pages/home.dart

@@ -6,6 +6,8 @@ import 'package:obtainium/pages/add_app.dart';
 import 'package:obtainium/pages/apps.dart';
 import 'package:obtainium/pages/import_export.dart';
 import 'package:obtainium/pages/settings.dart';
+import 'package:obtainium/providers/apps_provider.dart';
+import 'package:provider/provider.dart';
 
 class HomePage extends StatefulWidget {
   const HomePage({super.key});
@@ -24,6 +26,7 @@ class NavigationPageItem {
 
 class _HomePageState extends State<HomePage> {
   List<int> selectedIndexHistory = [];
+  int prevAppCount = -1;
 
   List<NavigationPageItem> pages = [
     NavigationPageItem(tr('appsString'), Icons.apps,
@@ -36,6 +39,39 @@ class _HomePageState extends State<HomePage> {
 
   @override
   Widget build(BuildContext context) {
+    AppsProvider appsProvider = context.watch<AppsProvider>();
+
+    switchToPage(int index) async {
+      if (index == 0) {
+        while ((pages[0].widget.key as GlobalKey<AppsPageState>).currentState !=
+            null) {
+          // Avoid duplicate GlobalKey error
+          await Future.delayed(const Duration(microseconds: 1));
+        }
+        setState(() {
+          selectedIndexHistory.clear();
+        });
+      } else if (selectedIndexHistory.isEmpty ||
+          (selectedIndexHistory.isNotEmpty &&
+              selectedIndexHistory.last != index)) {
+        setState(() {
+          int existingInd = selectedIndexHistory.indexOf(index);
+          if (existingInd >= 0) {
+            selectedIndexHistory.removeAt(existingInd);
+          }
+          selectedIndexHistory.add(index);
+        });
+      }
+    }
+
+    if (prevAppCount >= 0 &&
+        appsProvider.apps.length > prevAppCount &&
+        selectedIndexHistory.isNotEmpty &&
+        selectedIndexHistory.last == 1) {
+      switchToPage(0);
+    }
+    prevAppCount = appsProvider.apps.length;
+
     return WillPopScope(
         child: Scaffold(
           backgroundColor: Theme.of(context).colorScheme.surface,
@@ -65,27 +101,7 @@ class _HomePageState extends State<HomePage> {
                 .toList(),
             onDestinationSelected: (int index) async {
               HapticFeedback.selectionClick();
-              if (index == 0) {
-                while ((pages[0].widget.key as GlobalKey<AppsPageState>)
-                        .currentState !=
-                    null) {
-                  // Avoid duplicate GlobalKey error
-                  await Future.delayed(const Duration(microseconds: 1));
-                }
-                setState(() {
-                  selectedIndexHistory.clear();
-                });
-              } else if (selectedIndexHistory.isEmpty ||
-                  (selectedIndexHistory.isNotEmpty &&
-                      selectedIndexHistory.last != index)) {
-                setState(() {
-                  int existingInd = selectedIndexHistory.indexOf(index);
-                  if (existingInd >= 0) {
-                    selectedIndexHistory.removeAt(existingInd);
-                  }
-                  selectedIndexHistory.add(index);
-                });
-              }
+              await switchToPage(index);
             },
             selectedIndex:
                 selectedIndexHistory.isEmpty ? 0 : selectedIndexHistory.last,

lib/pages/import_export.dart

@@ -470,7 +470,7 @@ class UrlSelectionModal extends StatefulWidget {
       this.selectedByDefault = true,
       this.onlyOneSelectionAllowed = false});
 
-  Map<String, String> urlsWithDescriptions;
+  Map<String, List<String>> urlsWithDescriptions;
   bool selectedByDefault;
   bool onlyOneSelectionAllowed;
 
@@ -479,7 +479,7 @@ class UrlSelectionModal extends StatefulWidget {
 }
 
 class _UrlSelectionModalState extends State<UrlSelectionModal> {
-  Map<MapEntry<String, String>, bool> urlWithDescriptionSelections = {};
+  Map<MapEntry<String, List<String>>, bool> urlWithDescriptionSelections = {};
   @override
   void initState() {
     super.initState();
@@ -522,16 +522,28 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
                 launchUrlString(urlWithD.key,
                     mode: LaunchMode.externalApplication);
               },
-              child: Text(
-                Uri.parse(urlWithD.key).path.substring(1),
-                style: const TextStyle(decoration: TextDecoration.underline),
-                textAlign: TextAlign.start,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    urlWithD.value[0],
+                    style: const TextStyle(
+                        decoration: TextDecoration.underline,
+                        fontWeight: FontWeight.bold),
+                    textAlign: TextAlign.start,
+                  ),
+                  Text(
+                    Uri.parse(urlWithD.key).host,
+                    style: const TextStyle(
+                        decoration: TextDecoration.underline, fontSize: 12),
+                  )
+                ],
               ));
 
           var descriptionText = Text(
-            urlWithD.value.length > 128
-                ? '${urlWithD.value.substring(0, 128)}...'
-                : urlWithD.value,
+            urlWithD.value[1].length > 128
+                ? '${urlWithD.value[1].substring(0, 128)}...'
+                : urlWithD.value[1],
             style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
           );
 

lib/pages/settings.dart

@@ -144,8 +144,8 @@ class _SettingsPageState extends State<SettingsPage> {
             child: Text(tr('followSystem')),
           ),
           ...supportedLocales.map((e) => DropdownMenuItem(
-                value: e.toLanguageTag(),
-                child: Text(e.toLanguageTag().toUpperCase()),
+                value: e.key.toLanguageTag(),
+                child: Text(e.value),
               ))
         ],
         onChanged: (value) {

lib/providers/apps_provider.dart

@@ -212,7 +212,7 @@ class AppsProvider with ChangeNotifier {
         var fn = file.path.split('/').last;
         if (fn.startsWith('${app.id}-') &&
             fn.endsWith('.apk') &&
-            fn != fileName) {
+            fn != downloadedFile.path.split('/').last) {
           file.delete();
         }
       }

lib/providers/settings_provider.dart

@@ -216,7 +216,7 @@ class SettingsProvider with ChangeNotifier {
   String? get forcedLocale {
     var fl = prefs?.getString('forcedLocale');
     return supportedLocales
-            .where((element) => element.toLanguageTag() == fl)
+            .where((element) => element.key.toLanguageTag() == fl)
             .isNotEmpty
         ? fl
         : null;
@@ -226,7 +226,7 @@ class SettingsProvider with ChangeNotifier {
     if (fl == null) {
       prefs?.remove('forcedLocale');
     } else if (supportedLocales
-        .where((element) => element.toLanguageTag() == fl)
+        .where((element) => element.key.toLanguageTag() == fl)
         .isNotEmpty) {
       prefs?.setString('forcedLocale', fl);
     }

lib/providers/source_provider.dart

@@ -15,6 +15,7 @@ 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/html.dart';
+import 'package:obtainium/app_sources/jenkins.dart';
 import 'package:obtainium/app_sources/mullvad.dart';
 import 'package:obtainium/app_sources/neutroncode.dart';
 import 'package:obtainium/app_sources/signal.dart';
@@ -319,6 +320,22 @@ abstract class AppSource {
     name = runtimeType.toString();
   }
 
+  overrideVersionDetectionFormDefault(String vd, bool disableStandard) {
+    additionalAppSpecificSourceAgnosticSettingFormItems =
+        additionalAppSpecificSourceAgnosticSettingFormItems.map((e) {
+      return e.map((e2) {
+        if (e2.key == 'versionDetection') {
+          var item = e2 as GeneratedFormDropdown;
+          item.defaultValue = vd;
+          if (disableStandard) {
+            item.disabledOptKeys = ['standardVersionDetection'];
+          }
+        }
+        return e2;
+      }).toList();
+    }).toList();
+  }
+
   String standardizeUrl(String url) {
     url = preStandardizeUrl(url);
     if (!hostChanged) {
@@ -341,7 +358,7 @@ abstract class AppSource {
       [];
 
   // Some additional data may be needed for Apps regardless of Source
-  final List<List<GeneratedFormItem>>
+  List<List<GeneratedFormItem>>
       additionalAppSpecificSourceAgnosticSettingFormItems = [
     [
       GeneratedFormSwitch(
@@ -398,7 +415,7 @@ abstract class AppSource {
   }
 
   bool canSearch = false;
-  Future<Map<String, String>> search(String query) {
+  Future<Map<String, List<String>>> search(String query) {
     throw NotImplementedError();
   }
 
@@ -416,7 +433,7 @@ ObtainiumError getObtainiumHttpError(Response res) {
 abstract class MassAppUrlSource {
   late String name;
   late List<String> requiredArgs;
-  Future<Map<String, String>> getUrlsWithDescriptions(List<String> args);
+  Future<Map<String, List<String>>> getUrlsWithDescriptions(List<String> args);
 }
 
 regExValidator(String? value) {
@@ -440,6 +457,7 @@ class SourceProvider {
         FDroid(),
         IzzyOnDroid(),
         FDroidRepo(),
+        Jenkins(),
         SourceForge(),
         APKMirror(),
         Mullvad(),

pubspec.lock

@@ -38,10 +38,10 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
+      sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   async:
     dependency: transitive
     description:
@@ -282,18 +282,18 @@ packages:
     dependency: "direct main"
     description:
       name: html
-      sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb"
+      sha256: "58e3491f7bf0b6a4ea5110c0c688877460d1a6366731155c4a4580e7ded773e8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.2"
+    version: "0.15.3"
   http:
     dependency: "direct main"
     description:
       name: http
-      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
+      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.5"
+    version: "0.13.6"
   http_parser:
     dependency: transitive
     description:
@@ -338,10 +338,10 @@ packages:
     dependency: transitive
     description:
       name: markdown
-      sha256: d95a9d12954aafc97f984ca29baaa7690ed4d9ec4140a23ad40580bcdb6c87f5
+      sha256: "8e332924094383133cee218b676871f42db2514f1f6ac617b6cf6152a7faab8e"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.2"
+    version: "7.1.0"
   matcher:
     dependency: transitive
     description:
@@ -791,10 +791,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: d6cf18cd6c809c5a9294cd99707a21986aac4e08c87e1916ce2590315fb55d3a
+      sha256: "1acea8def62592123e2fbbca164ed8681a98a890bdcbb88f916d5b4a22687759"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.2"
+    version: "3.7.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -807,10 +807,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: c94d242d8cbe1012c06ba7ac790c46d6e6b68723b7d34f8c74ed19f68d166f49
+      sha256: "61f33512810bf1ee9ac89761a4b02663ff64e8227b7dc80654642acd660fd49d"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.0"
+    version: "3.4.2"
   win32:
     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.12.1+161 # When changing this, update the tag in main() accordingly
+version: 0.12.3+163 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'