Updates

Update Russian translation

.dockerignore

@@ -0,0 +1,15 @@
+LICENSE.md
+README.md
+analysis_options.yaml
+android
+assets
+build
+build.sh
+data
+docker
+fastlane
+lib
+pubspec.lock
+pubspec.yaml
+sign.sh
+test

.github/workflows/fastlane.yml

@@ -0,0 +1,16 @@
+name: Validate Fastlane metadata
+
+on:
+  workflow_dispatch:
+  push:
+      branches: [ "main" ]
+  pull_request:
+      branches: [ "main" ]
+
+jobs:
+  go:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Validate Fastlane Supply Metadata
+        uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '21'
 
       - name: Flutter Doctor
         id: flutter_doctor
@@ -44,7 +44,7 @@ jobs:
 
       - name: Build APKs
         run: |
-          sed -i 's/signingConfig signingConfigs.release//g' android/app/build.gradle
+          sed -i 's/signingConfig = signingConfigs.getByName("release")//g' android/app/build.gradle.kts
           flutter build apk --flavor normal && flutter build apk --split-per-abi --flavor normal
           for file in build/app/outputs/flutter-apk/app-*normal*.apk*; do mv "$file" "${file//-normal/}"; done
           flutter build apk --flavor fdroid -t lib/main_fdroid.dart && flutter build apk --split-per-abi --flavor fdroid -t lib/main_fdroid.dart

.gitignore

@@ -48,4 +48,5 @@ app.*.map.json
 /android/app/.cxx
 
 # Custom
-TODO.txt
+TODO.txt
+data

README.md

@@ -1,6 +1,6 @@
-# ![Obtainium Icon](./assets/graphics/icon_small.png) Obtainium
+<div align="center"><a href="https://github.com/Safouene1/support-palestine-banner/blob/master/Markdown-pages/Support.md"><img src="https://raw.githubusercontent.com/Safouene1/support-palestine-banner/master/banner-support.svg" alt="Support Palestine" style="width: 100%;"></a></div>
 
-[![Ceasefire Now](https://badge.techforpalestine.org/default)](https://techforpalestine.org/learn-more)
+# ![Obtainium Icon](./assets/graphics/icon_small.png) Obtainium
 
 Get Android app updates straight from the source.
 
@@ -31,6 +31,7 @@ Currently supported App sources:
   - [Huawei AppGallery](https://appgallery.huawei.com/)
   - [Tencent App Store](https://sj.qq.com/)
   - [CoolApk](https://coolapk.com/)
+  - [vivo App Store (CN)](https://h5.appstore.vivo.com.cn/)
   - [RuStore](https://rustore.ru/)
   - Jenkins Jobs
   - [APKMirror](https://apkmirror.com/) (Track-Only)
@@ -62,7 +63,7 @@ Or, contribute some configurations to the website by creating a PR at [this repo
      
 Verification info:
 - Package ID: `dev.imranr.obtainium`
-- SHA-256 Hash of Signing Certificate: `B3:53:60:1F:6A:1D:5F:D6:60:3A:E2:F5:0B:E8:0C:F3:01:36:7B:86:B6:AB:8B:1F:66:24:3D:A9:6C:D5:73:62`
+- SHA-256 hash of signing certificate: `B3:53:60:1F:6A:1D:5F:D6:60:3A:E2:F5:0B:E8:0C:F3:01:36:7B:86:B6:AB:8B:1F:66:24:3D:A9:6C:D5:73:62`
   - Note: The above signature is also valid for the F-Droid flavour of Obtainium, thanks to [reproducible builds](https://f-droid.org/docs/Reproducible_Builds/).
 - [PGP Public Key](https://keyserver.ubuntu.com/pks/lookup?search=contact%40imranr.dev&fingerprint=on&op=index) (to verify APK hashes)
 

android/app/build.gradle

@@ -1,105 +0,0 @@
-plugins {
-    id "com.android.application"
-    id "kotlin-android"
-    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
-    id "dev.flutter.flutter-gradle-plugin"
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file('key.properties')
-if (keystorePropertiesFile.exists()) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
-
-android {
-    namespace = "dev.imranr.obtainium"
-    compileSdk = flutter.compileSdkVersion
-    ndkVersion = flutter.ndkVersion
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
-
-    defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "dev.imranr.obtainium"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = 24
-        targetSdk = flutter.targetSdkVersion
-        versionCode = flutter.versionCode
-        versionName = flutter.versionName
-    }
-
-    flavorDimensions "flavor"
-
-    productFlavors {
-        normal {
-            dimension "flavor"
-            applicationIdSuffix ""
-        }
-        fdroid {
-            dimension "flavor"
-            applicationIdSuffix ".fdroid"
-        }
-    }
-    
-    signingConfigs {
-        release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword keystoreProperties['storePassword']
-        }
-    }
-
-    buildTypes {
-        release {
-            signingConfig signingConfigs.release
-        }
-        debug {
-            applicationIdSuffix = ".debug"
-            versionNameSuffix = "-debug"
-        }
-    }
-}
-
-flutter {
-    source = "../.."
-}
-
-ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3]
-import com.android.build.OutputFile
-android.applicationVariants.all { variant ->
-    variant.outputs.each { output ->
-        def abiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
-        if (abiVersionCode != null) {
-            output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode
-        } else {
-            output.versionCodeOverride = variant.versionCode * 10
-        }
-    }
-}

android/app/build.gradle.kts

@@ -0,0 +1,107 @@
+import java.io.FileInputStream
+import java.util.Properties
+import com.android.build.api.variant.FilterConfiguration.FilterType.*
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+val localProperties = Properties()
+val localPropertiesFile = rootProject.file("local.properties")
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.reader(Charsets.UTF_8).use { reader ->
+        localProperties.load(reader)
+    }
+}
+
+var flutterVersionCode = localProperties.getProperty("flutter.versionCode") ?: "1"
+var flutterVersionName = localProperties.getProperty("flutter.versionName") ?: "1.0"
+
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
+android {
+    namespace = "dev.imranr.obtainium"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = "27.0.12077973" // 'flutter.ndkVersion' produces warnings (TODO can/should we switch back?)
+
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+
+    defaultConfig {
+        applicationId = "dev.imranr.obtainium"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = 24
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutterVersionCode.toInt()
+        versionName = flutterVersionName
+    }
+
+    flavorDimensions("flavor")
+
+    productFlavors {
+        create("normal") {
+            dimension = "flavor"
+            applicationIdSuffix = ""
+        }
+        create("fdroid") {
+            dimension = "flavor"
+            applicationIdSuffix = ".fdroid"
+        }
+    }
+
+    signingConfigs {
+        create("release") {
+            keyAlias = keystoreProperties["keyAlias"].toString()
+            keyPassword = keystoreProperties["keyPassword"].toString()
+            storeFile = keystoreProperties["storeFile"]?.let { file(it) }
+            storePassword = keystoreProperties["storePassword"].toString()
+        }
+    }
+
+    buildTypes {
+        getByName("release") {
+            signingConfig = signingConfigs.getByName("release")
+        }
+        getByName("debug") {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
+        }
+    }
+}
+
+val abiCodes = mapOf("x86_64" to 1, "armeabi-v7a" to 2, "arm64-v8a" to 3)
+
+androidComponents {
+    onVariants { variant ->
+        variant.outputs.forEach { output ->
+            val name = output.filters.find { it.filterType == ABI }?.identifier
+            val baseAbiCode = abiCodes[name] ?: 0
+            if (baseAbiCode != null) {
+                output.versionCode.set(baseAbiCode + ((output.versionCode.get() ?: 0) * 10))
+            }
+        }
+    }
+}
+
+dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+}
+
+flutter {
+    source = "../.."
+}

android/app/src/main/AndroidManifest.xml

@@ -61,6 +61,13 @@
             android:enabled="true"
             android:exported="true"
             android:permission="android.permission.INTERACT_ACROSS_USERS_FULL" />
+        <service 
+            android:name="com.pravera.flutter_foreground_task.service.ForegroundService"
+            android:foregroundServiceType="specialUse"
+            android:exported="false" />
+        <meta-data
+            android:name="dev.imranr.obtainium.service.NOTIFICATION_ICON"
+            android:resource="@drawable/ic_notification" />
     </application>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
@@ -69,10 +76,13 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP"/>
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
          https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.

android/app/src/main/kotlin/dev/imranr/obtainium/MainActivity.kt

@@ -2,4 +2,4 @@ package dev.imranr.obtainium
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterActivity()
+class MainActivity : FlutterActivity()

android/build.gradle

@@ -1,22 +0,0 @@
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven {
-            // [required] background_fetch
-            url "${project(':background_fetch').projectDir}/libs"
-        }
-    }
-}
-
-rootProject.buildDir = "../build"
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
-    project.evaluationDependsOn(":app")
-}
-
-tasks.register("clean", Delete) {
-    delete rootProject.buildDir
-}

android/build.gradle.kts

@@ -0,0 +1,25 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            // [required] background_fetch
+            url = uri("${project(":background_fetch").projectDir}/libs")
+        }
+    }
+}
+
+val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}

android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip

android/settings.gradle

@@ -1,25 +0,0 @@
-pluginManagement {
-    def flutterSdkPath = {
-        def properties = new Properties()
-        file("local.properties").withInputStream { properties.load(it) }
-        def flutterSdkPath = properties.getProperty("flutter.sdk")
-        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-        return flutterSdkPath
-    }()
-
-    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
-
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
-}
-
-include ":app"

android/settings.gradle.kts

@@ -0,0 +1,25 @@
+pluginManagement {
+    val flutterSdkPath = run {
+        val properties = java.util.Properties()
+        file("local.properties").inputStream().use { properties.load(it) }
+        val flutterSdkPath = properties.getProperty("flutter.sdk")
+        require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+        flutterSdkPath
+    }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.7.3" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+}
+
+include(":app")

assets/translations/ar.json

@@ -0,0 +1,393 @@
+{
+    "invalidURLForSource": "رابط تطبيق {} غير صالح",
+    "noReleaseFound": "تعذر العثور على إصدار مناسب",
+    "noVersionFound": "تعذر تحديد إصدار التطبيق",
+    "urlMatchesNoSource": "الرابط لا يتطابق مع مصدر معروف",
+    "cantInstallOlderVersion": "لا يمكن تثبيت إصدار أقدم من التطبيق",
+    "appIdMismatch": "معرّف الحزمة المحملة لا يتطابق مع معرّف التطبيق الحالي",
+    "functionNotImplemented": "هذه الوظيفة غير مطبقة في هذا الصنف",
+    "placeholder": "عنصر نائب",
+    "someErrors": "حدثت بعض الأخطاء",
+    "unexpectedError": "خطأ غير متوقع",
+    "ok": "موافق",
+    "and": "و",
+    "githubPATLabel": "رمز الوصول الشخصي لـ GitHub (يزيد من الحد المسموح)",
+    "includePrereleases": "تضمين الإصدارات الأولية",
+    "fallbackToOlderReleases": "الرجوع إلى الإصدارات الأقدم",
+    "filterReleaseTitlesByRegEx": "تصفية عناوين الإصدارات باستخدام تعبير نمطي",
+    "invalidRegEx": "تعبير نمطي غير صالح",
+    "noDescription": "لا يوجد وصف",
+    "cancel": "إلغاء",
+    "continue": "متابعة",
+    "requiredInBrackets": "(مطلوب)",
+    "dropdownNoOptsError": "خطأ: يجب أن يحتوي القائمة المنسدلة على خيار واحد على الأقل",
+    "colour": "لون",
+    "standard": "قياسي",
+    "custom": "مخصص",
+    "useMaterialYou": "استخدم Material You",
+    "githubStarredRepos": "مستودعات GitHub المفضلة",
+    "uname": "اسم المستخدم",
+    "wrongArgNum": "عدد وسائط غير صحيح",
+    "xIsTrackOnly": "{} للتعقب فقط",
+    "source": "المصدر",
+    "app": "التطبيق",
+    "appsFromSourceAreTrackOnly": "تطبيقات هذا المصدر للتعقب فقط.",
+    "youPickedTrackOnly": "لقد اخترت خيار 'التعقب فقط'.",
+    "trackOnlyAppDescription": "سيتم تعقب التطبيق للتحديثات، لكن Obtainium لن يتمكن من تنزيله أو تثبيته.",
+    "cancelled": "تم الإلغاء",
+    "appAlreadyAdded": "التطبيق مضاف بالفعل",
+    "alreadyUpToDateQuestion": "التطبيق محدث بالفعل؟",
+    "addApp": "إضافة تطبيق",
+    "appSourceURL": "رابط مصدر التطبيق",
+    "error": "خطأ",
+    "add": "إضافة",
+    "searchSomeSourcesLabel": "بحث (بعض المصادر فقط)",
+    "search": "بحث",
+    "additionalOptsFor": "خيارات إضافية لـ {}",
+    "supportedSources": "المصادر المدعومة",
+    "trackOnlyInBrackets": "(للتعقب فقط)",
+    "searchableInBrackets": "(قابل للبحث)",
+    "appsString": "التطبيقات",
+    "noApps": "لا توجد تطبيقات",
+    "noAppsForFilter": "لا توجد تطبيقات تطابق الفلتر",
+    "byX": "بواسطة {}",
+    "percentProgress": "التقدم: {}%",
+    "pleaseWait": "يرجى الانتظار",
+    "updateAvailable": "تحديث متاح",
+    "notInstalled": "غير مثبت",
+    "pseudoVersion": "إصدار وهمي",
+    "selectAll": "تحديد الكل",
+    "deselectX": "إلغاء تحديد {}",
+    "xWillBeRemovedButRemainInstalled": "سيتم إزالة {} من Obtainium لكنه سيظل مثبتًا على الجهاز.",
+    "removeSelectedAppsQuestion": "إزالة التطبيقات المحددة؟",
+    "removeSelectedApps": "إزالة التطبيقات المحددة",
+    "updateX": "تحديث {}",
+    "installX": "تثبيت {}",
+    "markXTrackOnlyAsUpdated": "تعليم {}\n(للتعقب فقط)\nكمحدث",
+    "changeX": "تغيير {}",
+    "installUpdateApps": "تثبيت/تحديث التطبيقات",
+    "installUpdateSelectedApps": "تثبيت/تحديث التطبيقات المحددة",
+    "markXSelectedAppsAsUpdated": "تعليم {} تطبيقات محددة كمحدثة؟",
+    "no": "لا",
+    "yes": "نعم",
+    "markSelectedAppsUpdated": "تعليم التطبيقات المحددة كمحدثة",
+    "pinToTop": "تثبيت في الأعلى",
+    "unpinFromTop": "إلغاء التثبيت من الأعلى",
+    "resetInstallStatusForSelectedAppsQuestion": "إعادة تعيين حالة التثبيت للتطبيقات المحددة؟",
+    "installStatusOfXWillBeResetExplanation": "سيتم إعادة تعيين حالة التثبيت لأي تطبيقات محددة.\n\nقد يساعد هذا عندما يكون إصدار التطبيق المعروض في Obtainium غير صحيح بسبب فشل التحديثات أو مشاكل أخرى.",
+    "customLinkMessage": "هذه الروابط تعمل على الأجهزة التي بها Obtainium مثبتًا",
+    "shareAppConfigLinks": "مشاركة تكوين التطبيق كرابط HTML",
+    "shareSelectedAppURLs": "مشاركة روابط التطبيقات المحددة",
+    "resetInstallStatus": "إعادة تعيين حالة التثبيت",
+    "more": "المزيد",
+    "removeOutdatedFilter": "إزالة فلتر التطبيقات غير المحدثة",
+    "showOutdatedOnly": "عرض التطبيقات غير المحدثة فقط",
+    "filter": "تصفية",
+    "filterApps": "تصفية التطبيقات",
+    "appName": "اسم التطبيق",
+    "author": "المؤلف",
+    "upToDateApps": "تطبيقات محدثة",
+    "nonInstalledApps": "تطبيقات غير مثبتة",
+    "importExport": "استيراد/تصدير",
+    "settings": "الإعدادات",
+    "exportedTo": "تم التصدير إلى {}",
+    "obtainiumExport": "تصدير Obtainium",
+    "invalidInput": "إدخال غير صالح",
+    "importedX": "تم استيراد {}",
+    "obtainiumImport": "استيراد Obtainium",
+    "importFromURLList": "استيراد من قائمة الروابط",
+    "searchQuery": "استعلام البحث",
+    "appURLList": "قائمة روابط التطبيقات",
+    "line": "سطر",
+    "searchX": "بحث {}",
+    "noResults": "لا توجد نتائج",
+    "importX": "استيراد {}",
+    "importedAppsIdDisclaimer": "قد تظهر التطبيقات المستوردة بشكل غير صحيح كـ \"غير مثبتة\".\nلإصلاح هذا، قم بإعادة تثبيتها عبر Obtainium.\nهذا لا يؤثر على بيانات التطبيق.\n\nينطبق فقط على طرق الاستيراد عبر الروابط أو الطرف الثالث.",
+    "importErrors": "أخطاء الاستيراد",
+    "importedXOfYApps": "تم استيراد {} من {} تطبيقات.",
+    "followingURLsHadErrors": "حدثت أخطاء في الروابط التالية:",
+    "selectURL": "اختر رابطًا",
+    "selectURLs": "اختر روابط",
+    "pick": "اختر",
+    "theme": "المظهر",
+    "dark": "مظلم",
+    "light": "فاتح",
+    "followSystem": "اتباع النظام",
+    "followSystemThemeExplanation": "اتباع مظهر النظام ممكن فقط باستخدام تطبيقات طرف ثالث",
+    "useBlackTheme": "استخدام المظهر الأسود الداكن بالكامل",
+    "appSortBy": "ترتيب التطبيقات حسب",
+    "authorName": "المؤلف/الاسم",
+    "nameAuthor": "الاسم/المؤلف",
+    "asAdded": "كما تمت إضافتها",
+    "appSortOrder": "ترتيب التطبيقات",
+    "ascending": "تصاعدي",
+    "descending": "تنازلي",
+    "bgUpdateCheckInterval": "فترة التحقق من التحديثات في الخلفية",
+    "neverManualOnly": "أبدًا - يدوي فقط",
+    "appearance": "المظهر",
+    "showWebInAppView": "عرض صفحة الويب المصدر في عرض التطبيق",
+    "pinUpdates": "تثبيت التحديثات في أعلى قائمة التطبيقات",
+    "updates": "التحديثات",
+    "sourceSpecific": "خاص بالمصدر",
+    "appSource": "مصدر التطبيق",
+    "noLogs": "لا توجد سجلات",
+    "appLogs": "سجلات التطبيق",
+    "close": "إغلاق",
+    "share": "مشاركة",
+    "appNotFound": "التطبيق غير موجود",
+    "obtainiumExportHyphenatedLowercase": "تصدير-obtainium",
+    "pickAnAPK": "اختر ملف APK",
+    "appHasMoreThanOnePackage": "{} يحتوي على أكثر من حزمة:",
+    "deviceSupportsXArch": "جهازك يدعم بنية المعالج {}.",
+    "deviceSupportsFollowingArchs": "جهازك يدعم بنى المعالج التالية:",
+    "warning": "تحذير",
+    "sourceIsXButPackageFromYPrompt": "مصدر التطبيق هو '{}' لكن الحزمة تأتي من '{}'. هل تتابع؟",
+    "updatesAvailable": "تحديثات متاحة",
+    "updatesAvailableNotifDescription": "يخطر المستخدم بوجود تحديثات لواحد أو أكثر من التطبيقات التي يتعقبها Obtainium",
+    "noNewUpdates": "لا توجد تحديثات جديدة.",
+    "xHasAnUpdate": "{} لديه تحديث.",
+    "appsUpdated": "تم تحديث التطبيقات",
+    "appsNotUpdated": "فشل تحديث التطبيقات",
+    "appsUpdatedNotifDescription": "يخطر المستخدم بأن تحديثات لواحد أو أكثر من التطبيقات تم تطبيقها في الخلفية",
+    "xWasUpdatedToY": "تم تحديث {} إلى {}.",
+    "xWasNotUpdatedToY": "فشل تحديث {} إلى {}.",
+    "errorCheckingUpdates": "خطأ في التحقق من التحديثات",
+    "errorCheckingUpdatesNotifDescription": "إشعار يظهر عند فشل التحقق من التحديثات في الخلفية",
+    "appsRemoved": "تمت إزالة التطبيقات",
+    "appsRemovedNotifDescription": "يخطر المستخدم بأنه تمت إزالة واحد أو أكثر من التطبيقات بسبب أخطاء أثناء تحميلها",
+    "xWasRemovedDueToErrorY": "تمت إزالة {} بسبب هذا الخطأ: {}",
+    "completeAppInstallation": "إكمال تثبيت التطبيق",
+    "obtainiumMustBeOpenToInstallApps": "يجب فتح Obtainium لتثبيت التطبيقات",
+    "completeAppInstallationNotifDescription": "يطلب من المستخدم العودة إلى Obtainium لإكمال تثبيت التطبيق",
+    "checkingForUpdates": "جاري التحقق من التحديثات",
+    "checkingForUpdatesNotifDescription": "إشعار مؤقت يظهر عند التحقق من التحديثات",
+    "pleaseAllowInstallPerm": "يرجى السماح لـ Obtainium بتثبيت التطبيقات",
+    "trackOnly": "للتعقب فقط",
+    "errorWithHttpStatusCode": "خطأ {}",
+    "versionCorrectionDisabled": "تعطيل تصحيح الإصدار (يبدو أن الملحق لا يعمل)",
+    "unknown": "غير معروف",
+    "none": "لا شيء",
+    "never": "أبدًا",
+    "latestVersionX": "الأحدث: {}",
+    "installedVersionX": "المثبت: {}",
+    "lastUpdateCheckX": "آخر تحقق من التحديثات: {}",
+    "remove": "إزالة",
+    "yesMarkUpdated": "نعم، تعليم كمحدث",
+    "fdroid": "F-Droid الرسمي",
+    "appIdOrName": "معرّف التطبيق أو الاسم",
+    "appId": "معرّف التطبيق",
+    "appWithIdOrNameNotFound": "لم يتم العثور على تطبيق بهذا المعرّف أو الاسم",
+    "reposHaveMultipleApps": "قد تحتوي المستودعات على عدة تطبيقات",
+    "fdroidThirdPartyRepo": "مستودع F-Droid طرف ثالث",
+    "install": "تثبيت",
+    "markInstalled": "تعليم كمثبت",
+    "update": "تحديث",
+    "markUpdated": "تعليم كمحدث",
+    "additionalOptions": "خيارات إضافية",
+    "disableVersionDetection": "تعطيل اكتشاف الإصدار",
+    "noVersionDetectionExplanation": "يجب استخدام هذا الخيار فقط للتطبيقات التي لا يعمل فيها اكتشاف الإصدار بشكل صحيح.",
+    "downloadingX": "جاري تنزيل {}",
+    "downloadX": "تنزيل {}",
+    "downloadedX": "تم تنزيل {}",
+    "releaseAsset": "ملف الإصدار",
+    "downloadNotifDescription": "يخطر المستخدم بالتقدم في تنزيل التطبيق",
+    "noAPKFound": "لم يتم العثور على ملف APK",
+    "noVersionDetection": "لا يوجد اكتشاف للإصدار",
+    "categorize": "تصنيف",
+    "categories": "التصنيفات",
+    "category": "تصنيف",
+    "noCategory": "بدون تصنيف",
+    "noCategories": "لا توجد تصنيفات",
+    "deleteCategoriesQuestion": "حذف التصنيفات؟",
+    "categoryDeleteWarning": "سيتم تعيين جميع التطبيقات في التصنيفات المحذوفة كغير مصنفة.",
+    "addCategory": "إضافة تصنيف",
+    "label": "تسمية",
+    "language": "اللغة",
+    "copiedToClipboard": "تم النسخ إلى الحافظة",
+    "storagePermissionDenied": "تم رفض إذن التخزين",
+    "selectedCategorizeWarning": "سيؤدي هذا إلى استبدال أي إعدادات تصنيف موجودة للتطبيقات المحددة.",
+    "filterAPKsByRegEx": "تصفية ملفات APK باستخدام تعبير نمطي",
+    "removeFromObtainium": "إزالة من Obtainium",
+    "uninstallFromDevice": "إلغاء التثبيت من الجهاز",
+    "onlyWorksWithNonVersionDetectApps": "يعمل فقط مع التطبيقات التي تم تعطيل اكتشاف الإصدار لها.",
+    "releaseDateAsVersion": "استخدام تاريخ الإصدار كسلسلة إصدار",
+    "releaseTitleAsVersion": "استخدام عنوان الإصدار كسلسلة إصدار",
+    "releaseDateAsVersionExplanation": "يجب استخدام هذا الخيار فقط للتطبيقات التي لا يعمل فيها اكتشاف الإصدار بشكل صحيح، ولكن تاريخ الإصدار متاح.",
+    "changes": "التغييرات",
+    "releaseDate": "تاريخ الإصدار",
+    "importFromURLsInFile": "استيراد من روابط في ملف (مثل OPML)",
+    "versionDetectionExplanation": "تنسيق سلسلة الإصدار مع الإصدار المكتشف من النظام",
+    "versionDetection": "اكتشاف الإصدار",
+    "standardVersionDetection": "اكتشاف الإصدار القياسي",
+    "groupByCategory": "التجميع حسب التصنيف",
+    "autoApkFilterByArch": "محاولة تصفية ملفات APK حسب بنية المعالج إذا أمكن",
+    "autoLinkFilterByArch": "محاولة تصفية الروابط حسب بنية المعالج إذا أمكن",
+    "overrideSource": "تجاوز المصدر",
+    "dontShowAgain": "عدم إظهار هذا مرة أخرى",
+    "dontShowTrackOnlyWarnings": "عدم إظهار تحذيرات 'للتعقب فقط'",
+    "dontShowAPKOriginWarnings": "عدم إظهار تحذيرات مصدر APK",
+    "moveNonInstalledAppsToBottom": "نقل التطبيقات غير المثبتة إلى أسفل قائمة التطبيقات",
+    "gitlabPATLabel": "رمز الوصول الشخصي لـ GitLab",
+    "about": "حول",
+    "requiresCredentialsInSettings": "{} يحتاج إلى بيانات اعتماد إضافية (في الإعدادات)",
+    "checkOnStart": "التحقق من التحديثات عند البدء",
+    "tryInferAppIdFromCode": "محاولة استنتاج معرّف التطبيق من الكود المصدري",
+    "removeOnExternalUninstall": "إزالة التطبيقات المثبتة خارجيًا تلقائيًا",
+    "pickHighestVersionCode": "تحديد أعلى إصدار تلقائيًا",
+    "checkUpdateOnDetailPage": "التحقق من التحديثات عند فتح صفحة التفاصيل",
+    "disablePageTransitions": "تعطيل انتقالات الصفحات",
+    "reversePageTransitions": "عكس انتقالات الصفحات",
+    "minStarCount": "الحد الأدنى لعدد النجوم",
+    "addInfoBelow": "أضف هذه المعلومات أدناه.",
+    "addInfoInSettings": "أضف هذه المعلومات في الإعدادات.",
+    "githubSourceNote": "يمكن تجنب الحد المسموح لـ GitHub باستخدام مفتاح API.",
+    "sortByLastLinkSegment": "الفرز حسب الجزء الأخير من الرابط فقط",
+    "filterReleaseNotesByRegEx": "تصفية ملاحظات الإصدار باستخدام تعبير نمطي",
+    "customLinkFilterRegex": "تصفية روابط APK المخصصة باستخدام تعبير نمطي (افتراضيًا '.apk$')",
+    "appsPossiblyUpdated": "تمت محاولة تحديث التطبيقات",
+    "appsPossiblyUpdatedNotifDescription": "يخطر المستخدم بأن تحديثات لواحد أو أكثر من التطبيقات قد تم تطبيقها في الخلفية",
+    "xWasPossiblyUpdatedToY": "{} قد تم تحديثه إلى {}.",
+    "enableBackgroundUpdates": "تمكين التحديثات في الخلفية",
+    "backgroundUpdateReqsExplanation": "قد لا تكون التحديثات في الخلفية ممكنة لجميع التطبيقات.",
+    "backgroundUpdateLimitsExplanation": "يمكن تحديد نجاح التثبيت في الخلفية فقط عند فتح Obtainium.",
+    "verifyLatestTag": "التحقق من علامة 'الأحدث'",
+    "intermediateLinkRegex": "تصفية للوصول إلى رابط 'وسيط'",
+    "filterByLinkText": "تصفية الروابط حسب نص الرابط",
+    "intermediateLinkNotFound": "لم يتم العثور على رابط وسيط",
+    "intermediateLink": "رابط وسيط",
+    "exemptFromBackgroundUpdates": "إعفاء من التحديثات في الخلفية (إذا تم تمكينها)",
+    "bgUpdatesOnWiFiOnly": "تعطيل التحديثات في الخلفية عند عدم الاتصال بشبكة Wi-Fi",
+    "bgUpdatesWhileChargingOnly": "تعطيل التحديثات في الخلفية عند عدم الشحن",
+    "autoSelectHighestVersionCode": "تحديد أعلى إصدار تلقائيًا",
+    "versionExtractionRegEx": "تعبير نمطي لاستخراج الإصدار",
+    "trimVersionString": "قص سلسلة الإصدار باستخدام تعبير نمطي",
+    "matchGroupToUseForX": "مجموعة المطابقة لاستخدامها لـ \"{}\"",
+    "matchGroupToUse": "مجموعة المطابقة لاستخدامها في تعبير استخراج الإصدار",
+    "highlightTouchTargets": "تمييز أهداف اللمس الأقل وضوحًا",
+    "pickExportDir": "اختر دليل التصدير",
+    "autoExportOnChanges": "تصدير تلقائي عند التغييرات",
+    "includeSettings": "تضمين الإعدادات",
+    "filterVersionsByRegEx": "تصفية الإصدارات باستخدام تعبير نمطي",
+    "trySelectingSuggestedVersionCode": "محاولة تحديد الإصدار المقترح تلقائيًا",
+    "dontSortReleasesList": "الحفاظ على ترتيب الإصدارات من API",
+    "reverseSort": "فرز عكسي",
+    "takeFirstLink": "أخذ أول رابط",
+    "skipSort": "تخطي الفرز",
+    "debugMenu": "قائمة التصحيح",
+    "bgTaskStarted": "بدأت المهمة في الخلفية - تحقق من السجلات.",
+    "runBgCheckNow": "تشغيل التحقق من التحديثات في الخلفية الآن",
+    "versionExtractWholePage": "تطبيق تعبير استخراج الإصدار على الصفحة بأكملها",
+    "installing": "جاري التثبيت",
+    "skipUpdateNotifications": "تخطي إشعارات التحديث",
+    "updatesAvailableNotifChannel": "تحديثات متاحة",
+    "appsUpdatedNotifChannel": "تم تحديث التطبيقات",
+    "appsPossiblyUpdatedNotifChannel": "تمت محاولة تحديث التطبيقات",
+    "errorCheckingUpdatesNotifChannel": "خطأ في التحقق من التحديثات",
+    "appsRemovedNotifChannel": "تمت إزالة التطبيقات",
+    "downloadingXNotifChannel": "جاري تنزيل {}",
+    "completeAppInstallationNotifChannel": "إكمال تثبيت التطبيق",
+    "checkingForUpdatesNotifChannel": "جاري التحقق من التحديثات",
+    "onlyCheckInstalledOrTrackOnlyApps": "التحقق فقط من التطبيقات المثبتة أو للتعقب فقط",
+    "supportFixedAPKURL": "دعم روابط APK الثابتة",
+    "selectX": "اختر {}",
+    "parallelDownloads": "السماح بالتنزيل المتوازي",
+    "useShizuku": "استخدم Shizuku أو Sui للتثبيت",
+    "shizukuBinderNotFound": "خدمة Shizuku غير قيد التشغيل",
+    "shizukuOld": "إصدار قديم من Shizuku (<11) - قم بتحديثه",
+    "shizukuOldAndroidWithADB": "Shizuku يعمل على إصدار أندرويد < 8.1 مع ADB - قم بتحديث أندرويد أو استخدم Sui بدلاً من ذلك",
+    "shizukuPretendToBeGooglePlay": "تعيين Google Play كمصدر التثبيت (إذا تم استخدام Shizuku)",
+    "useSystemFont": "استخدم خط النظام",
+    "useVersionCodeAsOSVersion": "استخدم versionCode كإصدار مكتشف من النظام",
+    "requestHeader": "رأس الطلب",
+    "useLatestAssetDateAsReleaseDate": "استخدام أحدث تاريخ تحميل كتاريخ إصدار",
+    "defaultPseudoVersioningMethod": "طريقة الإصدار الوهمي الافتراضية",
+    "partialAPKHash": "جزء من تجزئة APK",
+    "APKLinkHash": "تجزئة رابط APK",
+    "directAPKLink": "رابط APK مباشر",
+    "pseudoVersionInUse": "يتم استخدام إصدار وهمي",
+    "installed": "مثبت",
+    "latest": "الأحدث",
+    "invertRegEx": "عكس التعبير النمطي",
+    "note": "ملاحظة",
+    "selfHostedNote": "يمكن استخدام القائمة المنسدلة \"{}\" للوصول إلى نسخ مخصصة/مستضافة ذاتيًا لأي مصدر.",
+    "badDownload": "تعذر تحليل ملف APK (تنزيل غير متوافق أو غير مكتمل)",
+    "beforeNewInstallsShareToAppVerifier": "مشاركة التطبيقات الجديدة مع AppVerifier (إذا كان متاحًا)",
+    "appVerifierInstructionToast": "شارك مع AppVerifier، ثم عد هنا عندما تكون جاهزًا.",
+    "wiki": "المساعدة/ويكي",
+    "crowdsourcedConfigsLabel": "تكوينات التطبيقات المقدمة من الجمهور (استخدم على مسؤوليتك)",
+    "crowdsourcedConfigsShort": "تكوينات التطبيقات المقدمة من الجمهور",
+    "allowInsecure": "السماح بطلبات HTTP غير الآمنة",
+    "stayOneVersionBehind": "البقاء بإصدار واحد خلف الأحدث",
+    "useFirstApkOfVersion": "التحديد التلقائي الأول من بين عدة ملفات APK",
+    "refreshBeforeDownload": "تحديث تفاصيل التطبيق قبل التنزيل",
+    "tencentAppStore": "متجر Tencent للتطبيقات",
+    "coolApk": "CoolApk",
+    "vivoAppStore": "متجر vivo للتطبيقات (CN)",
+    "name": "الاسم",
+    "smartname": "الاسم (ذكي)",
+    "sortMethod": "طريقة الفرز",
+    "welcome": "مرحبًا",
+    "documentationLinksNote": "تحتوي صفحة Obtainium على GitHub المرتبطة أدناه على روابط لمقاطع فيديو، مقالات، مناقشات وموارد أخرى ستساعدك على فهم كيفية استخدام التطبيق.",
+    "batteryOptimizationNote": "لاحظ أن التنزيلات في الخلفية قد تعمل بشكل أكثر موثوقية إذا قمت بتعطيل تحسينات بطارية النظام لـ Obtainium.",
+    "fileDeletionError": "فشل حذف الملف (حاول حذفه يدويًا ثم حاول مرة أخرى): \"{}\"",
+    "removeAppQuestion": {
+        "one": "إزالة التطبيق؟",
+        "other": "إزالة التطبيقات؟"
+    },
+    "tooManyRequestsTryAgainInMinutes": {
+        "one": "طلبات كثيرة جدًا (تم تحديد المعدل) - حاول مرة أخرى بعد {} دقيقة",
+        "other": "طلبات كثيرة جدًا (تم تحديد المعدل) - حاول مرة أخرى بعد {} دقائق"
+    },
+    "bgUpdateGotErrorRetryInMinutes": {
+        "one": "واجه التحقق من التحديثات في الخلفية {}، سيتم جدولة محاولة أخرى بعد {} دقيقة",
+        "other": "واجه التحقق من التحديثات في الخلفية {}، سيتم جدولة محاولة أخرى بعد {} دقائق"
+    },
+    "bgCheckFoundUpdatesWillNotifyIfNeeded": {
+        "one": "وجد التحقق من التحديثات في الخلفية {} تحديث - سيتم إخطار المستخدم إذا لزم الأمر",
+        "other": "وجد التحقق من التحديثات في الخلفية {} تحديثات - سيتم إخطار المستخدم إذا لزم الأمر"
+    },
+    "apps": {
+        "one": "{} تطبيق",
+        "other": "{} تطبيقات"
+    },
+    "url": {
+        "one": "{} رابط",
+        "other": "{} روابط"
+    },
+    "minute": {
+        "one": "{} دقيقة",
+        "other": "{} دقائق"
+    },
+    "hour": {
+        "one": "{} ساعة",
+        "other": "{} ساعات"
+    },
+    "day": {
+        "one": "{} يوم",
+        "other": "{} أيام"
+    },
+    "clearedNLogsBeforeXAfterY": {
+        "one": "تم مسح {n} سجل (قبل = {before}, بعد = {after})",
+        "other": "تم مسح {n} سجلات (قبل = {before}, بعد = {after})"
+    },
+    "xAndNMoreUpdatesAvailable": {
+        "one": "{} وتطبيق واحد آخر لديه تحديثات.",
+        "other": "{} و{} تطبيقات أخرى لديها تحديثات."
+    },
+    "xAndNMoreUpdatesInstalled": {
+        "one": "{} وتطبيق واحد آخر تم تحديثه.",
+        "other": "{} و{} تطبيقات أخرى تم تحديثها."
+    },
+    "xAndNMoreUpdatesFailed": {
+        "one": "فشل تحديث {} وتطبيق واحد آخر.",
+        "other": "فشل تحديث {} و{} تطبيقات أخرى."
+    },
+    "xAndNMoreUpdatesPossiblyInstalled": {
+        "one": "{} وتطبيق واحد آخر قد تم تحديثه.",
+        "other": "{} و{} تطبيقات أخرى قد تم تحديثها."
+    },
+    "apk": {
+        "one": "{} APK",
+        "other": "{} APKs"
+    }
+}

assets/translations/bs.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Crowdsourced App Configurations",
     "allowInsecure": "Allow insecure HTTP requests",
     "stayOneVersionBehind": "Stay one version behind latest",
+    "useFirstApkOfVersion": "Auto-select first of multiple APKs",
     "refreshBeforeDownload": "Refresh app details before download",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Name",
     "smartname": "Name (Smart)",
     "sortMethod": "Sort Method",
     "welcome": "Welcome",
     "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
+    "fileDeletionError": "Failed to delete file (try deleting it manually then try again): \"{}\"",
     "removeAppQuestion": {
         "one": "Želite li ukloniti aplikaciju?",
         "other": "Želite li ukloniti aplikacije?"

assets/translations/ca.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Configuració de les aplicacions crowdsourcing",
     "allowInsecure": "Permet les sol·licituds HTTP insegures",
     "stayOneVersionBehind": "Roman a la versió anterior a l'última",
+    "useFirstApkOfVersion": "Auto-select first of multiple APKs",
     "refreshBeforeDownload": "Actualitza les dades de l'aplicació abans de descarregar-la",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Nom",
     "smartname": "Nom (smart)",
     "sortMethod": "Mètode d'ordenació",
     "welcome": "Benvinguda",
     "documentationLinksNote": "La pàgina GitHub d'Obtainium enllaçada a sota conté enllaços a vídeos, articles, debats i altres recursos que t'ajudaran a entendre com usar l'aplicació.",
+    "batteryOptimizationNote": "Tingues present que les descàrregues en segon pla funcionaran millor si inhabilites l'optimització de bateria per a Obtainium.",
+    "fileDeletionError": "No s'ha pogut suprimir el fitxer (intenta suprimir-lo manualment i torna-ho a provar): \"{}\"",
     "removeAppQuestion": {
         "one": "¿Suprimeixo l'aplicació?",
         "other": "¿Suprimeixo les aplicacions?"

assets/translations/cs.json

@@ -36,7 +36,7 @@
     "trackOnlyAppDescription": "Aplikace je sledována kvůli aktualizacím, ale Obtainium ji nebude stahovat ani instalovat.",
     "cancelled": "Zrušeno",
     "appAlreadyAdded": "Aplikace již přidána",
-    "alreadyUpToDateQuestion": "App already up to date?",
+    "alreadyUpToDateQuestion": "Aplikace je již aktualizovaná?",
     "addApp": "Přidat aplikaci",
     "appSourceURL": "Zdrojová adresa URL aplikace",
     "error": "Chyba",
@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Konfigurace aplikací s využitím crowdsourcingu",
     "allowInsecure": "Povolení nezabezpečených požadavků HTTP",
     "stayOneVersionBehind": "Zůstaňte o jednu verzi pozadu za nejnovější",
+    "useFirstApkOfVersion": "Automatický výběr prvního z více souborů APK",
     "refreshBeforeDownload": "Obnovení údajů o aplikaci před stažením",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Název",
     "smartname": "Název (Smart)",
     "sortMethod": "Metoda třídění",
     "welcome": "Vítejte na",
     "documentationLinksNote": "Níže odkazovaná stránka Obtainium GitHub obsahuje odkazy na videa, články, diskuse a další zdroje, které vám pomohou pochopit, jak aplikaci používat.",
+    "batteryOptimizationNote": "Všimněte si, že stahování na pozadí může fungovat spolehlivěji, pokud vypnete optimalizaci baterie operačního systému pro Obtainium.",
+    "fileDeletionError": "Soubor se nepodařilo odstranit (zkuste jej odstranit ručně a pak to zkuste znovu): \"{}\"",
     "removeAppQuestion": {
         "one": "Odstranit Apku?",
         "other": "Odstranit Apky?"

assets/translations/da.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Crowdsourcede app-konfigurationer",
     "allowInsecure": "Tillad usikre HTTP-anmodninger",
     "stayOneVersionBehind": "Forbliv én version bagud den seneste",
+    "useFirstApkOfVersion": "Vælg automatisk den første af flere APK'er",
     "refreshBeforeDownload": "Opdater app-detaljer før download",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Navn",
     "smartname": "Navn (Smart)",
     "sortMethod": "Sorteringsmetode",
     "welcome": "Velkommen",
     "documentationLinksNote": "Obtainiums GitHub-side, som der linkes til nedenfor, indeholder links til videoer, artikler, diskussioner og andre ressourcer, som kan hjælpe dig med at forstå, hvordan du bruger appen.",
+    "batteryOptimizationNote": "Bemærk, at baggrundsdownloads kan fungere mere pålideligt, hvis du deaktiverer OS-batterioptimering for Obtainium.",
+    "fileDeletionError": "Kunne ikke slette filen (prøv at slette den manuelt og prøv igen): \"{}\"",
     "removeAppQuestion": {
         "one": "Fjern app?",
         "other": "Fjern apps?"

assets/translations/de.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Crowdsourced App-Konfigurationen",
     "allowInsecure": "Unsichere HTTP-Anfragen zulassen",
     "stayOneVersionBehind": "Eine Version hinter der neuesten Version bleiben",
+    "useFirstApkOfVersion": "Automatische Auswahl der ersten von mehreren APKs",
     "refreshBeforeDownload": "App-Details vor dem Download aktualisieren",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Name",
     "smartname": "Name (Smart)",
     "sortMethod": "Sortierverfahren",
     "welcome": "Willkommen",
     "documentationLinksNote": "Die unten verlinkte GitHub-Seite von Obtainium enthält Links zu Videos, Artikeln, Diskussionen und anderen Ressourcen, die Ihnen helfen werden, die Verwendung der App zu verstehen.",
+    "batteryOptimizationNote": "Beachten Sie, dass Downloads im Hintergrund möglicherweise zuverlässiger funktionieren, wenn Sie die Batterieoptimierung des Betriebssystems für Obtainium deaktivieren.",
+    "fileDeletionError": "Die Datei konnte nicht gelöscht werden (versuchen Sie, sie manuell zu löschen und versuchen Sie es dann erneut): \"{}\"",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"

assets/translations/en-EO.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Crowdsourced App Configurations",
     "allowInsecure": "Allow insecure HTTP requests",
     "stayOneVersionBehind": "Stay one version behind latest",
+    "useFirstApkOfVersion": "Auto-select first of multiple APKs",
     "refreshBeforeDownload": "Refresh app details before download",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Name",
     "smartname": "Name (Smart)",
     "sortMethod": "Sort Method",
     "welcome": "Welcome",
     "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
+    "fileDeletionError": "Failed to delete file (try deleting it manually then try again): \"{}\"",
     "removeAppQuestion": {
         "one": "Forigi la aplikaĵon?",
         "other": "Forigi la aplikaĵojn?"

assets/translations/en.json

@@ -318,17 +318,23 @@
     "crowdsourcedConfigsShort": "Crowdsourced app configurations",
     "allowInsecure": "Allow insecure HTTP requests",
     "stayOneVersionBehind": "Stay one version behind latest",
+    "useFirstApkOfVersion": "Auto-select first of multiple APKs",
     "refreshBeforeDownload": "Refresh app details before download",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Name",
     "smartname": "Name (smart)",
     "sortMethod": "Sort method",
     "welcome": "Welcome",
     "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
+    "fileDeletionError": "Failed to delete file (try deleting it manually then try again): \"{}\"",
+    "foregroundService": "Obtainium foreground service",
+    "fgServiceNotice": "This notification is required for background update checking (it can be hidden in the OS settings)",
     "removeAppQuestion": {
-        "one": "Remove App?",
-        "other": "Remove Apps?"
+        "one": "Remove app?",
+        "other": "Remove apps?"
     },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Too many requests (rate limited) - try again in {} minute",

assets/translations/es.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Configuración de aplicaciones por crowdsourcing",
     "allowInsecure": "Permitir peticiones HTTP inseguras",
     "stayOneVersionBehind": "Mantenerse una versión por detrás de la última",
+    "useFirstApkOfVersion": "Auto-selección del primero de múltiples APKs",
     "refreshBeforeDownload": "Actualiza los datos de la aplicación antes de descargarla",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Nombre",
     "smartname": "Nombre (Smart)",
     "sortMethod": "Método de clasificación",
     "welcome": "Bienvenido",
     "documentationLinksNote": "La página GitHub de Obtainium enlazada a continuación contiene enlaces a vídeos, artículos, debates y otros recursos que te ayudarán a entender cómo utilizar la aplicación.",
+    "batteryOptimizationNote": "Ten en cuenta que las descargas en segundo plano pueden funcionar de forma más fiable si desactivas las optimizaciones de batería del sistema operativo para Obtainium.",
+    "fileDeletionError": "No se ha podido eliminar el archivo (intente eliminarlo manualmente y vuelva a intentarlo): \"{}\"",
     "removeAppQuestion": {
         "one": "¿Eliminar aplicación?",
         "other": "¿Eliminar aplicaciones?"

assets/translations/fa.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "تنظیمات برنامه های مشارکت جمعی",
     "allowInsecure": "درخواست های HTTP ناامن را مجاز کنید",
     "stayOneVersionBehind": "یک نسخه از آخرین نسخه پشت سر بگذارید",
+    "useFirstApkOfVersion": "Auto-select first of multiple APKs",
     "refreshBeforeDownload": "قبل از دانلود، جزئیات برنامه را بازخوانی کنید",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Name",
     "smartname": "Name (Smart)",
     "sortMethod": "Sort Method",
     "welcome": "Welcome",
     "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
+    "fileDeletionError": "Failed to delete file (try deleting it manually then try again): \"{}\"",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Applications communautaires",
     "allowInsecure": "Autoriser les requêtes HTTP non sécurisées",
     "stayOneVersionBehind": "Rester une version en arrière de la dernière",
+    "useFirstApkOfVersion": "Sélection automatique du premier APK parmi plusieurs",
     "refreshBeforeDownload": "Actualiser les détails de l'application avant de la télécharger",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Nom",
     "smartname": "Nom (Smart)",
     "sortMethod": "Méthode de tri",
     "welcome": "Bienvenue",
     "documentationLinksNote": "La page GitHub d'Obtainium, dont le lien figure ci-dessous, contient des liens vers des vidéos, des articles, des discussions et d'autres ressources qui vous aideront à comprendre comment utiliser l'application.",
+    "batteryOptimizationNote": "Notez que les téléchargements en arrière-plan peuvent fonctionner de manière plus fiable si vous désactivez les optimisations de la batterie du système d'exploitation pour Obtainium.",
+    "fileDeletionError": "Échec de la suppression du fichier (essayez de le supprimer manuellement puis réessayez) : \"{}\"",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

assets/translations/hu.json

@@ -28,11 +28,11 @@
     "githubStarredRepos": "Csillagozott GitHub tárolók",
     "uname": "Felhasználónév",
     "wrongArgNum": "A megadott argumentumok száma nem megfelelő",
-    "xIsTrackOnly": "A(z) {} csak nyomon-követhető",
+    "xIsTrackOnly": "A(z) {} csak nyomon követhető",
     "source": "Forrás",
     "app": "Alkalmazás",
-    "appsFromSourceAreTrackOnly": "Az ebből a forrásból származó alkalmazások „csak nyomon-követhetők”.",
-    "youPickedTrackOnly": "„Csak nyomon-követés” opciót választotta.",
+    "appsFromSourceAreTrackOnly": "Az ebből a forrásból származó alkalmazások „csak nyomon követhetők”.",
+    "youPickedTrackOnly": "„Csak nyomon követés” opciót választotta.",
     "trackOnlyAppDescription": "Az alkalmazás frissítéseit nyomon követi, de az Obtainium nem tudja letölteni vagy telepíteni.",
     "cancelled": "Visszavonva",
     "appAlreadyAdded": "Az alkalmazás már hozzá van adva",
@@ -45,7 +45,7 @@
     "search": "Keresés",
     "additionalOptsFor": "További lehetőségek a következőhöz: {}",
     "supportedSources": "Támogatott források",
-    "trackOnlyInBrackets": "(Csak nyomon-követés)",
+    "trackOnlyInBrackets": "(Csak nyomon követés)",
     "searchableInBrackets": "(Kereshető)",
     "appsString": "Alkalmazások",
     "noApps": "Nincsenek alkalmazások",
@@ -63,7 +63,7 @@
     "removeSelectedApps": "A kiválasztott alkalmazások eltávolítása",
     "updateX": "{} frissítése",
     "installX": "{} telepítése",
-    "markXTrackOnlyAsUpdated": "Megjelölés: {}\n(Csak nyomon-követés)\nFrissítettként",
+    "markXTrackOnlyAsUpdated": "Megjelölés: {}\n(Csak nyomon követés)\nFrissítettként",
     "changeX": "{}-változás",
     "installUpdateApps": "Alkalmazások telepítése/frissítése",
     "installUpdateSelectedApps": "A kiválasztott alkalmazások telepítése/frissítése",
@@ -143,7 +143,7 @@
     "warning": "Figyelem",
     "sourceIsXButPackageFromYPrompt": "Az alkalmazás forrása a(z) „{}” tároló, de a kiadási csomag innen származik: „{}”. Folytatja?",
     "updatesAvailable": "Frissítések érhetők el",
-    "updatesAvailableNotifDescription": "Értesíti a felhasználót, hogy egy vagy több, az Obtainium által nyomon-követett alkalmazáshoz frissítések állnak rendelkezésre",
+    "updatesAvailableNotifDescription": "Értesíti a felhasználót, hogy egy vagy több, az Obtainium által nyomon követett alkalmazáshoz frissítések állnak rendelkezésre",
     "noNewUpdates": "Nincsenek új frissítések.",
     "xHasAnUpdate": "A(z) {} frissítést kapott.",
     "appsUpdated": "Alkalmazások frissítve",
@@ -162,7 +162,7 @@
     "checkingForUpdates": "Frissítések ellenőrzése",
     "checkingForUpdatesNotifDescription": "Átmeneti értesítés, amely a frissítések ellenőrzésekor jelenik meg",
     "pleaseAllowInstallPerm": "Engedélyezze az Obtainiumnak az alkalmazások telepítését",
-    "trackOnly": "Csak nyomon-követés",
+    "trackOnly": "Csak nyomon követés",
     "errorWithHttpStatusCode": "Hiba {}",
     "versionCorrectionDisabled": "Verzió-korrekció letiltva (úgy tűnik, hogy a bővítmény nem működik)",
     "unknown": "Ismeretlen",
@@ -224,7 +224,7 @@
     "autoLinkFilterByArch": "Ha lehetséges, próbálja meg a hivatkozásokat CPU-architektúra szerint szűrni",
     "overrideSource": "Forrás felülírása",
     "dontShowAgain": "Ne jelenítse meg ezt többé",
-    "dontShowTrackOnlyWarnings": "Ne jelenítse meg a „Csak nyomon-követés” figyelmeztetést",
+    "dontShowTrackOnlyWarnings": "Ne jelenítse meg a „Csak nyomon követés” figyelmeztetést",
     "dontShowAPKOriginWarnings": "Ne jelenítse meg az APK eredetére vonatkozó figyelmeztetéseket",
     "moveNonInstalledAppsToBottom": "Helyezze át a nem telepített alkalmazásokat az alkalmazásnézet aljára",
     "gitlabPATLabel": "GitLab személyes hozzáférési token",
@@ -287,7 +287,7 @@
     "downloadingXNotifChannel": "A(z) {} letöltése",
     "completeAppInstallationNotifChannel": "Teljes alkalmazás telepítés",
     "checkingForUpdatesNotifChannel": "Frissítések ellenőrzése",
-    "onlyCheckInstalledOrTrackOnlyApps": "Csak a telepített és a csak nyomon-követhető alkalmazások frissítéseinek ellenőrzése",
+    "onlyCheckInstalledOrTrackOnlyApps": "Csak a telepített és a csak nyomon követhető alkalmazások frissítéseinek ellenőrzése",
     "supportFixedAPKURL": "Támogatja a rögzített APK webcímeket",
     "selectX": "{} kiválasztása",
     "parallelDownloads": "Párhuzamos letöltések engedélyezése",
@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Alkalmazáslista",
     "allowInsecure": "Nem biztonságos HTTP-kérések engedélyezése",
     "stayOneVersionBehind": "Maradjon egy verzióval a legújabb mögött",
+    "useFirstApkOfVersion": "A legelső APK automatikus kiválasztása, ha több APK is található",
     "refreshBeforeDownload": "Az alkalmazás adatainak frissítése a letöltés előtt",
     "tencentAppStore": "Tencent Appstore",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Név",
     "smartname": "Név (Okos)",
     "sortMethod": "Rendezési eljárás",
     "welcome": "Üdvözöljük!",
     "documentationLinksNote": "Az alábbi hivatkozás az Obtainium GitHub oldalára vezet, amely további videók, cikkek, beszélgetések és egyéb források hivatkozásait tartalmazza, amelyek segítenek megérteni az alkalmazás használatát.",
+    "batteryOptimizationNote": "Megjegyzés: A háttérfrissítések megbízhatóbban működhetnek, ha kikapcsolja a rendszer akkumulátor-optimalizálását az Obtainium számára.",
+    "fileDeletionError": "Nem sikerült törölni a fájlt (próbálja meg kézzel törölni, majd próbálja meg újra): \"{}\"",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazásokat?"

assets/translations/id.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Konfigurasi Aplikasi Crowdsourced",
     "allowInsecure": "Izinkan permintaan HTTP yang tidak aman",
     "stayOneVersionBehind": "Tetap satu versi di belakang versi terbaru",
+    "useFirstApkOfVersion": "Pilih otomatis yang pertama dari beberapa APK",
     "refreshBeforeDownload": "Segarkan detail aplikasi sebelum mengunduh",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Nama",
     "smartname": "Nama (Cerdas)",
     "sortMethod": "Metode Penyortiran",
     "welcome": "Selamat datang.",
     "documentationLinksNote": "Halaman GitHub Obtainium yang ditautkan di bawah ini berisi tautan ke video, artikel, diskusi, dan sumber daya lain yang akan membantu Anda memahami cara menggunakan aplikasi.",
+    "batteryOptimizationNote": "Perhatikan bahwa unduhan latar belakang dapat bekerja lebih andal jika Anda menonaktifkan optimasi baterai OS untuk Obtainium.",
+    "fileDeletionError": "Gagal menghapus file (coba hapus secara manual, lalu coba lagi): \"{}\"",
     "removeAppQuestion": {
         "one": "Hapus aplikasi?",
         "other": "Hapus aplikasi?"

assets/translations/it.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Configurazioni di app in crowdsourcing",
     "allowInsecure": "Consentire le richieste HTTP non sicure",
     "stayOneVersionBehind": "Rimanere una versione indietro rispetto alla più recente",
+    "useFirstApkOfVersion": "Selezione automatica del primo di più APK",
     "refreshBeforeDownload": "Aggiornare i dettagli dell'app prima del download",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Nome",
     "smartname": "Nome (intelligente)",
     "sortMethod": "Metodo di ordinamento",
     "welcome": "Benvenuti",
     "documentationLinksNote": "La pagina GitHub di Obtainium collegata qui sotto contiene collegamenti a video, articoli, discussioni e altre risorse che vi aiuteranno a capire come utilizzare l'applicazione.",
+    "batteryOptimizationNote": "Si noti che i download in background potrebbero funzionare in modo più affidabile se si disabilita l'ottimizzazione della batteria del sistema operativo per Obtainium.",
+    "fileDeletionError": "Errore nell'eliminazione del file (provare a cancellarlo manualmente e poi riprovare): \"{}\"",
     "removeAppQuestion": {
         "one": "Rimuovere l'app?",
         "other": "Rimuovere le app?"

assets/translations/ja.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "クラウドソーシングによるアプリの設定",
     "allowInsecure": "安全でないHTTPリクエストを許可する",
     "stayOneVersionBehind": "最新のバージョンから1つ前のものを使用する",
+    "useFirstApkOfVersion": "複数のAPKから最初のAPKを自動選択する",
     "refreshBeforeDownload": "ダウンロード前にアプリの詳細を更新する",
     "tencentAppStore": "Tencent App Store",
-    "coolApk": "CoolApk",
+    "coolApk": "クールApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "名称",
     "smartname": "名前（スマート）",
     "sortMethod": "ソート方法",
     "welcome": "ようこそ",
     "documentationLinksNote": "以下のリンクにあるObtainium GitHubページには、ビデオ、記事、ディスカッション、その他のリソースへのリンクがあり、アプリの使い方を理解するのに役立ちます。",
+    "batteryOptimizationNote": "ObtainiumのOSバッテリー最適化を無効にすると、バックグラウンドダウンロードがより確実に動作するようになります。",
+    "fileDeletionError": "ファイルの削除に失敗しました（手動で削除してから再試行してください）：\"{}\"",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/ko.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "크라우드소싱 앱 구성",
     "allowInsecure": "안전하지 않은 HTTP 요청 허용",
     "stayOneVersionBehind": "최신 버전보다 한 버전 뒤에 머무르기",
+    "useFirstApkOfVersion": "여러 앱 중 첫 번째 앱 자동 선택",
     "refreshBeforeDownload": "다운로드 전에 앱 세부 정보 새로 고침",
     "tencentAppStore": "텐센트 앱 스토어",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "이름",
     "smartname": "이름(스마트)",
     "sortMethod": "정렬 방법",
     "welcome": "환영",
     "documentationLinksNote": "아래에 링크된 Obtainium 깃허브 페이지에는 앱 사용 방법을 이해하는 데 도움이 되는 동영상, 기사, 토론 및 기타 리소스에 대한 링크가 포함되어 있습니다.",
+    "batteryOptimizationNote": "Obtainium의 OS 배터리 최적화를 비활성화하면 백그라운드 다운로드가 더 안정적으로 작동할 수 있습니다.",
+    "fileDeletionError": "파일을 삭제하지 못했습니다(수동으로 삭제한 후 다시 시도하세요): \"{}\"",
     "removeAppQuestion": {
         "one": "앱을 제거하시겠습니까?",
         "other": "앱을 제거하시겠습니까?"

assets/translations/nl.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "App-configuraties door menigte",
     "allowInsecure": "Onveilige HTTP-verzoeken toestaan",
     "stayOneVersionBehind": "Blijf een versie achter op de nieuwste",
+    "useFirstApkOfVersion": "Automatisch de eerste van meerdere APK's selecteren",
     "refreshBeforeDownload": "Vernieuw app details voor download",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Naam",
     "smartname": "Naam (Slim)",
     "sortMethod": "Sorteermethode",
     "welcome": "Welkom",
     "documentationLinksNote": "De GitHub pagina van Obtainium waarnaar hieronder wordt gelinkt bevat links naar video's, artikelen, discussies en andere bronnen die je zullen helpen begrijpen hoe je de app kunt gebruiken.",
+    "batteryOptimizationNote": "Merk op dat downloads op de achtergrond mogelijk betrouwbaarder werken als je de batterijoptimalisatie van het besturingssysteem voor Obtainium uitschakelt.",
+    "fileDeletionError": "Bestand is niet verwijderd (probeer het handmatig te verwijderen en probeer het opnieuw): \"{}\"",
     "removeAppQuestion": {
         "one": "App verwijderen?",
         "other": "Apps verwijderen?"

assets/translations/pl.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Baza konfiguracji",
     "allowInsecure": "Zezwalaj na niezabezpieczone żądania HTTP",
     "stayOneVersionBehind": "Pozostań jedną wersję w tyle za najnowszą",
+    "useFirstApkOfVersion": "Automatyczny wybór pierwszego z wielu plików APK",
     "refreshBeforeDownload": "Odśwież szczegóły aplikacji przed pobraniem",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Nazwa",
     "smartname": "Nazwa (Smart)",
     "sortMethod": "Metoda sortowania",
     "welcome": "Witamy",
     "documentationLinksNote": "Strona Obtainium GitHub, do której link znajduje się poniżej, zawiera linki do filmów, artykułów, dyskusji i innych zasobów, które pomogą ci zrozumieć, jak korzystać z aplikacji.",
+    "batteryOptimizationNote": "Należy pamiętać, że pobieranie w tle może działać bardziej niezawodnie po wyłączeniu optymalizacji baterii systemu operacyjnego dla Obtainium.",
+    "fileDeletionError": "Nie udało się usunąć pliku (spróbuj usunąć go ręcznie, a następnie spróbuj ponownie): \"{}\"",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",

assets/translations/pt-BR.json

@@ -30,7 +30,7 @@
     "wrongArgNum": "Número errado de argumentos fornecidos",
     "xIsTrackOnly": "{} é somente de rastreio",
     "source": "Fonte",
-    "app": "App",
+    "app": "Aplicativo",
     "appsFromSourceAreTrackOnly": "Apps desta fonte são somente para rastreamento.",
     "youPickedTrackOnly": "Você selecionou a opção de somente rastreamento.",
     "trackOnlyAppDescription": "As atualizações do app serão rastreadas, mas o Obtainium não baixará ou instalará elas.",
@@ -47,7 +47,7 @@
     "supportedSources": "Fontes suportadas",
     "trackOnlyInBrackets": "(somente rastreamento)",
     "searchableInBrackets": "(pesquisável)",
-    "appsString": "Apps",
+    "appsString": "Aplicativos",
     "noApps": "Nenhum app",
     "noAppsForFilter": "Nenhum app pro filtro",
     "byX": "Por {}",
@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Configurações de app da comunidade",
     "allowInsecure": "Permitir solicitações de HTTP inseguras",
     "stayOneVersionBehind": "Ficar uma versão antes da mais recente",
+    "useFirstApkOfVersion": "Seleção automática do primeiro de vários APKs",
     "refreshBeforeDownload": "Atualizar detalhes do app antes de baixar",
     "tencentAppStore": "Loja de Apps da Tencent",
     "coolApk": "CoolApk",
+    "vivoAppStore": "Vivo App Store (CN)",
     "name": "Nome",
     "smartname": "Nome (inteligente)",
     "sortMethod": "Método de ordenação",
     "welcome": "Boas vindas",
     "documentationLinksNote": "A página do Obtainium no GitHub visível abaixo contém links de vídeos, artigos, discussões, e outros recursos que podem te ajudar ao usar o app.",
+    "batteryOptimizationNote": "Observe que os downloads em segundo plano podem funcionar de forma mais confiável se você desativar as otimizações de bateria do sistema operacional para o Obtainium.",
+    "fileDeletionError": "Falha ao excluir o arquivo (tente excluí-lo manualmente e tente novamente): \"{}\"",
     "removeAppQuestion": {
         "one": "Remover app?",
         "other": "Remover apps?"
@@ -339,8 +343,8 @@
         "other": "A busca de atualizações em segundo plano encontrou um {}, será agendado uma nova tentativa em {} minutos"
     },
     "bgCheckFoundUpdatesWillNotifyIfNeeded": {
-        "one": "BG update checking found {} update - will notify user if needed",
-        "other": "BG update checking found {} updates - will notify user if needed"
+        "one": "Verificação da atualização do BG encontrada {} atualização - notificará o usuário se necessário",
+        "other": "Verificação de atualização do BG encontrou atualizações {} - notificará o usuário se necessário"
     },
     "apps": {
         "one": "{} app",
@@ -363,8 +367,8 @@
         "other": "{} dias"
     },
     "clearedNLogsBeforeXAfterY": {
-        "one": "Cleared {n} log (before = {before}, after = {after})",
-        "other": "Cleared {n} logs (before = {before}, after = {after})"
+        "one": "Limpou {n} registros (before = {before}, after = {after})",
+        "other": "Limpou {n} registros (antes = {before}, depois = {after})"
     },
     "xAndNMoreUpdatesAvailable": {
         "one": "{} e mais 1 app têm atualizações.",

assets/translations/pt.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Configurações de aplicações com base em crowdsourcing",
     "allowInsecure": "Permitir pedidos HTTP inseguros",
     "stayOneVersionBehind": "Manter-se uma versão atrás da mais recente",
+    "useFirstApkOfVersion": "Seleção automática do primeiro de vários APKs",
     "refreshBeforeDownload": "Atualizar os detalhes da aplicação antes da transferência",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Nome",
     "smartname": "Nome (Smart)",
     "sortMethod": "Método de ordenação",
     "welcome": "Bem-vindo",
     "documentationLinksNote": "A página do Obtainium no GitHub com a ligação abaixo contém ligações para vídeos, artigos, discussões e outros recursos que o ajudarão a compreender como utilizar a aplicação.",
+    "batteryOptimizationNote": "Note que os downloads em segundo plano podem funcionar de forma mais fiável se desativar as optimizações da bateria do SO para o Obtainium.",
+    "fileDeletionError": "Falha ao eliminar o ficheiro (tente eliminá-lo manualmente e depois tente novamente): \"{}\"",
     "removeAppQuestion": {
         "one": "Remover aplicativo?",
         "other": "Remover aplicativos?"

assets/translations/ru.json

@@ -1,7 +1,7 @@
 {
     "invalidURLForSource": "Неверный URL-адрес приложения: {}",
-    "noReleaseFound": "Не удалось найти подходящий релиз",
-    "noVersionFound": "Не удалось определить версию релиза",
+    "noReleaseFound": "Не удалось найти подходящий выпуск",
+    "noVersionFound": "Не удалось определить версию выпуска",
     "urlMatchesNoSource": "URL-адрес не соответствует известному источнику",
     "cantInstallOlderVersion": "Невозможно установить более старую версию приложения",
     "appIdMismatch": "ID загруженного пакета не совпадает с существующим ID приложения",
@@ -9,12 +9,12 @@
     "placeholder": "Заполнитель",
     "someErrors": "Возникли некоторые ошибки",
     "unexpectedError": "Неожиданная ошибка",
-    "ok": "Ок",
+    "ok": "OK",
     "and": "и",
     "githubPATLabel": "Персональный токен доступа GitHub\n(увеличивает лимит запросов)",
-    "includePrereleases": "Включить предварительные релизы",
+    "includePrereleases": "Включать предварительные выпуски",
     "fallbackToOlderReleases": "Откатываться к предыдущей версии",
-    "filterReleaseTitlesByRegEx": "Фильтровать заголовки релизов\n(регулярное выражение)",
+    "filterReleaseTitlesByRegEx": "Фильтровать заголовки выпусков\n(регулярное выражение)",
     "invalidRegEx": "Неверное регулярное выражение",
     "noDescription": "Нет описания",
     "cancel": "Отмена",
@@ -32,13 +32,13 @@
     "source": "Источник",
     "app": "Приложение",
     "appsFromSourceAreTrackOnly": "Приложения из этого источника настроены только для отслеживания",
-    "youPickedTrackOnly": "Вы выбрали опцию 'Только для отслеживания'",
+    "youPickedTrackOnly": "Выбрана настройка «только для отслеживания»",
     "trackOnlyAppDescription": "Приложение будет отслеживаться на предмет обновлений, но Obtainium не сможет загрузить или установить его",
     "cancelled": "Отменено",
     "appAlreadyAdded": "Приложение уже добавлено",
     "alreadyUpToDateQuestion": "Приложение уже обновлено?",
     "addApp": "Добавить",
-    "appSourceURL": "URL-источник приложения",
+    "appSourceURL": "URL-адрес источника приложения",
     "error": "Ошибка",
     "add": "Добавить",
     "searchSomeSourcesLabel": "Поиск (в некоторых источниках)",
@@ -63,10 +63,10 @@
     "removeSelectedApps": "Удалить выбранные приложения",
     "updateX": "Обновить {}",
     "installX": "Установить {}",
-    "markXTrackOnlyAsUpdated": "Отметить {}\n(Только для отслеживания)\nкак обновленное",
+    "markXTrackOnlyAsUpdated": "Отметить {}\n(только для отслеживания)\nкак обновлённое",
     "changeX": "Изменить {}",
-    "installUpdateApps": "Установить/Обновить приложения",
-    "installUpdateSelectedApps": "Установить/Обновить выбранные приложения",
+    "installUpdateApps": "Установить/обновить приложения",
+    "installUpdateSelectedApps": "Установить/обновить выбранные приложения",
     "markXSelectedAppsAsUpdated": "Выбрано приложений: {}. Отметить как обновлённые?",
     "no": "Нет",
     "yes": "Да",
@@ -74,10 +74,10 @@
     "pinToTop": "Закрепить сверху",
     "unpinFromTop": "Открепить",
     "resetInstallStatusForSelectedAppsQuestion": "Сбросить статус установки для выбранных приложений?",
-    "installStatusOfXWillBeResetExplanation": "Статус установки для выбранных приложений будет сброшен.\n\nЭто может помочь, если версия приложения, отображаемая в Obtainium, некорректная — из-за неудачных обновлений или других проблем",
+    "installStatusOfXWillBeResetExplanation": "Статус установки для выбранных приложений будет сброшен.\n\nЭто может помочь, если версия приложения, отображаемая в Obtainium, некорректная (из-за неудачных обновлений или других проблем).",
     "customLinkMessage": "Эти ссылки работают на устройствах с установленным Obtainium",
     "shareAppConfigLinks": "Поделиться конфигурацией приложения в виде HTML-ссылки",
-    "shareSelectedAppURLs": "Поделиться выбранными URL-адресами приложений",
+    "shareSelectedAppURLs": "Поделиться URL-адресами выбранных приложений",
     "resetInstallStatus": "Сбросить статус установки",
     "more": "Ещё",
     "removeOutdatedFilter": "Удалить фильтр для устаревших приложений",
@@ -86,7 +86,7 @@
     "filterApps": "Фильтровать приложения",
     "appName": "Название приложения",
     "author": "Автор",
-    "upToDateApps": "Приложения со свежими обновлениями",
+    "upToDateApps": "Приложения с обновлениями",
     "nonInstalledApps": "Неустановленные приложения",
     "importExport": "Данные",
     "settings": "Настройки",
@@ -97,12 +97,12 @@
     "obtainiumImport": "Импорт в Obtainium",
     "importFromURLList": "Импорт из списка URL-адресов",
     "searchQuery": "Поисковый запрос",
-    "appURLList": "Список URL приложений",
+    "appURLList": "Список URL-адресов приложений",
     "line": "Строка",
     "searchX": "Поиск {}",
-    "noResults": "Результатов не найдено",
+    "noResults": "Ничего не найдено",
     "importX": "Импорт {}",
-    "importedAppsIdDisclaimer": "Импортированные приложения могут неверно отображаться как неустановленные.\nДля исправления этой проблемы повторно установите их через Obtainium.\nЭто не должно повлиять на данные приложения.\n\nПроблемы возникают только при импорте из URL-адреса и сторонних источников",
+    "importedAppsIdDisclaimer": "Импортированные приложения могут неверно отображаться как неустановленные.\nДля исправления этой проблемы повторно установите их через Obtainium.\nЭто не должно повлиять на данные приложения.\n\nПроблемы возникают только при импорте из URL-адреса и сторонних источников.",
     "importErrors": "Ошибка импорта",
     "importedXOfYApps": "Импортировано приложений: {} из {}",
     "followingURLsHadErrors": "При импорте следующие URL-адреса содержали ошибки:",
@@ -112,12 +112,12 @@
     "theme": "Тема",
     "dark": "Тёмная",
     "light": "Светлая",
-    "followSystem": "Системная",
+    "followSystem": "Как в системе",
     "followSystemThemeExplanation": "Следование системной теме возможно только при использовании сторонних приложений",
     "useBlackTheme": "Использовать чёрную тему",
     "appSortBy": "Сортировка приложений",
-    "authorName": "Автор/Название",
-    "nameAuthor": "Название/Автор",
+    "authorName": "Автор/название",
+    "nameAuthor": "Название/автор",
     "asAdded": "В порядке добавления",
     "appSortOrder": "Порядок",
     "ascending": "По возрастанию",
@@ -126,12 +126,12 @@
     "neverManualOnly": "Никогда — только вручную",
     "appearance": "Внешний вид",
     "showWebInAppView": "Показывать исходную веб-страницу на странице приложения",
-    "pinUpdates": "Отображать обновления приложений сверху списка",
+    "pinUpdates": "Показывать обновления приложений сверху списка",
     "updates": "Обновления",
     "sourceSpecific": "Настройки источников",
     "appSource": "Источник",
     "noLogs": "Нет журналов",
-    "appLogs": "Логи",
+    "appLogs": "Журналы",
     "close": "Закрыть",
     "share": "Поделиться",
     "appNotFound": "Приложение не найдено",
@@ -141,21 +141,21 @@
     "deviceSupportsXArch": "Ваше устройство поддерживает архитектуру процессора {}",
     "deviceSupportsFollowingArchs": "Ваше устройство поддерживает следующие архитектуры процессора:",
     "warning": "Предупреждение",
-    "sourceIsXButPackageFromYPrompt": "Источник приложения — '{}', но пакет для установки получен из '{}'. Продолжить?",
+    "sourceIsXButPackageFromYPrompt": "Источник приложения — «{}», но пакет для установки получен из «{}». Продолжить?",
     "updatesAvailable": "Доступны обновления",
     "updatesAvailableNotifDescription": "Уведомляет о наличии обновлений для одного или нескольких приложений в Obtainium",
-    "noNewUpdates": "Нет новых обновлений",
-    "xHasAnUpdate": "{} есть обновление",
+    "noNewUpdates": "Нет обновлений",
+    "xHasAnUpdate": "Для {} есть обновление",
     "appsUpdated": "Приложения обновлены",
     "appsNotUpdated": "Не удалось обновить приложения",
     "appsUpdatedNotifDescription": "Уведомляет об обновлении одного или нескольких приложений в фоновом режиме",
-    "xWasUpdatedToY": "{} была обновлена до версии {}",
+    "xWasUpdatedToY": "{} обновлено до версии {}",
     "xWasNotUpdatedToY": "Не удалось обновить {} до версии {}",
     "errorCheckingUpdates": "Ошибка при проверке обновлений",
     "errorCheckingUpdatesNotifDescription": "Уведомление о завершении проверки обновлений в фоновом режиме с ошибкой",
     "appsRemoved": "Приложение удалено",
     "appsRemovedNotifDescription": "Уведомление об удалении одного или несколько приложений из-за ошибок при их загрузке",
-    "xWasRemovedDueToErrorY": "{} был удален из-за ошибки: {}",
+    "xWasRemovedDueToErrorY": "{} удалено из-за ошибки: {}",
     "completeAppInstallation": "Завершение установки приложения",
     "obtainiumMustBeOpenToInstallApps": "Obtainium должен быть открыт для установки приложений",
     "completeAppInstallationNotifDescription": "Уведомление о необходимости открыть Obtainium для завершения установки приложения",
@@ -172,7 +172,7 @@
     "installedVersionX": "Установленная версия: {}",
     "lastUpdateCheckX": "Последняя проверка: {}",
     "remove": "Удалить",
-    "yesMarkUpdated": "Да, отметить как обновленное",
+    "yesMarkUpdated": "Да, отметить как обновлённое",
     "fdroid": "Официальные репозитории F-Droid",
     "appIdOrName": "ID или название приложения",
     "appId": "ID приложения",
@@ -180,39 +180,39 @@
     "reposHaveMultipleApps": "В хранилище несколько приложений",
     "fdroidThirdPartyRepo": "Сторонние репозитории F-Droid",
     "install": "Установить",
-    "markInstalled": "Пометить как установленное",
+    "markInstalled": "Отметить установленным",
     "update": "Обновить",
     "markUpdated": "Отметить обновлённым",
     "additionalOptions": "Дополнительные настройки",
-    "disableVersionDetection": "Отключить обнаружение версии",
-    "noVersionDetectionExplanation": "Эта настройка должна использоваться только для приложений, где обнаружение версии не работает корректно",
+    "disableVersionDetection": "Отключить определение версии",
+    "noVersionDetectionExplanation": "Эта настройка должна использоваться только для приложений, где определение версии не работает корректно",
     "downloadingX": "Загрузка {}",
-    "downloadX": "Скачать {}",
+    "downloadX": "Загрузить {}",
     "downloadedX": "Загружено {}",
-    "releaseAsset": "Релизный объект",
+    "releaseAsset": "Объект выпуска",
     "downloadNotifDescription": "Уведомляет пользователя о прогрессе загрузки приложения",
-    "noAPKFound": "APK не найден",
-    "noVersionDetection": "Обнаружение версий отключено",
+    "noAPKFound": "APK-файл не найден",
+    "noVersionDetection": "Определение версий отключено",
     "categorize": "Категоризировать",
     "categories": "Категории",
     "category": "Категория",
     "noCategory": "Без категории",
     "noCategories": "Без категорий",
     "deleteCategoriesQuestion": "Удалить категории?",
-    "categoryDeleteWarning": "Все приложения в удаленных категориях будут помечены как без категории",
+    "categoryDeleteWarning": "Все приложения в удалённых категориях будут помечены как «без категории»",
     "addCategory": "Добавить категорию",
     "label": "Метка",
     "language": "Язык",
     "copiedToClipboard": "Скопировано в буфер обмена",
     "storagePermissionDenied": "Отказано в доступе к хранилищу",
     "selectedCategorizeWarning": "Это заменит все текущие настройки категорий для выбранных приложений",
-    "filterAPKsByRegEx": "Отфильтровать APK-файлы\n(регулярное выражение)",
+    "filterAPKsByRegEx": "Фильтровать APK-файлы\n(регулярное выражение)",
     "removeFromObtainium": "Удалить из Obtainium",
     "uninstallFromDevice": "Удалить с устройства",
-    "onlyWorksWithNonVersionDetectApps": "Работает только для приложений с отключенным определением версии",
-    "releaseDateAsVersion": "Дата выпуска вместо версии",
-    "releaseTitleAsVersion": "Используйте название релиза в качестве строки версии",
-    "releaseDateAsVersionExplanation": "Этот параметр следует использовать только для приложений, в которых определение версии не работает правильно, но имеется дата выпуска",
+    "onlyWorksWithNonVersionDetectApps": "Работает только для приложений с отключённым определением версии",
+    "releaseDateAsVersion": "Использовать дату выпуска в качестве версии",
+    "releaseTitleAsVersion": "Использовать название выпуска в качестве версии",
+    "releaseDateAsVersionExplanation": "Эта настройка должна использоваться только для приложений, в которых определение версии не работает правильно, но имеется дата выпуска",
     "changes": "Изменения",
     "releaseDate": "Дата выпуска",
     "importFromURLsInFile": "Импорт из файла URL-адресов (например: OPML)",
@@ -220,56 +220,56 @@
     "versionDetection": "Определение версии",
     "standardVersionDetection": "Стандартное",
     "groupByCategory": "Группировать по категориям",
-    "autoApkFilterByArch": "Попытаться отфильтровать APK-файлы по архитектуре процессора",
-    "autoLinkFilterByArch": "Попытайтесь отфильтровать ссылки по архитектуре процессора, если это возможно",
+    "autoApkFilterByArch": "Пытаться фильтровать APK по архитектуре процессора",
+    "autoLinkFilterByArch": "Пытаться фильтровать ссылки по архитектуре процессора, если это возможно",
     "overrideSource": "Переопределить источник",
     "dontShowAgain": "Не показывать снова",
     "dontShowTrackOnlyWarnings": "Не показывать предупреждения о только отслеживаемых приложениях",
     "dontShowAPKOriginWarnings": "Не показывать предупреждения об отличающемся источнике APK-файлов",
-    "moveNonInstalledAppsToBottom": "Отображать неустановленные приложения внизу списка",
+    "moveNonInstalledAppsToBottom": "Показывать неустановленные приложения внизу списка",
     "gitlabPATLabel": "Персональный токен доступа GitLab",
     "about": "Описание",
-    "requiresCredentialsInSettings": "{}: Для этого требуются дополнительные учетные данные (в настройках)",
+    "requiresCredentialsInSettings": "{}: для этого требуются дополнительные учётные данные (в настройках)",
     "checkOnStart": "Проверять наличие обновлений при запуске",
-    "tryInferAppIdFromCode": "Попытаться определить ID приложения из исходного кода",
-    "removeOnExternalUninstall": "Автоматически убирать из списка удаленные извне приложения",
+    "tryInferAppIdFromCode": "Пытаться определить ID приложения из исходного кода",
+    "removeOnExternalUninstall": "Автоматически убирать из списка удалённые извне приложения",
     "pickHighestVersionCode": "Автовыбор актуальной версии кода APK",
     "checkUpdateOnDetailPage": "Проверять наличие обновлений при открытии страницы приложения",
     "disablePageTransitions": "Отключить анимацию перехода между страницами",
     "reversePageTransitions": "Реверс анимации перехода между страницами",
     "minStarCount": "Минимальное количество звёзд",
     "addInfoBelow": "Добавьте эту информацию ниже",
-    "addInfoInSettings": "Добавьте эту информацию в Настройки",
-    "githubSourceNote": "Используя ключ API можно обойти лимит запросов GitHub",
+    "addInfoInSettings": "Добавьте эту информацию в «Настройки»",
+    "githubSourceNote": "Используя ключ API, можно обойти ограничение запросов GitHub",
     "sortByLastLinkSegment": "Сортировать только по последнему сегменту ссылки",
     "filterReleaseNotesByRegEx": "Фильтровать примечания к выпуску\n(регулярное выражение)",
-    "customLinkFilterRegex": "Пользовательский фильтр ссылок APK\n(регулярное выражение, по умолчанию: '.apk$')",
+    "customLinkFilterRegex": "Пользовательский фильтр ссылок APK\n(регулярное выражение, по умолчанию: «.apk$»)",
     "appsPossiblyUpdated": "Попытки обновления приложений",
     "appsPossiblyUpdatedNotifDescription": "Уведомление о возможных обновлениях одного или нескольких приложений в фоновом режиме",
-    "xWasPossiblyUpdatedToY": "{} возможно был обновлен до {}",
+    "xWasPossiblyUpdatedToY": "{} возможно был обновлён до {}",
     "enableBackgroundUpdates": "Включить обновления в фоне",
     "backgroundUpdateReqsExplanation": "Фоновые обновления могут быть возможны не для всех приложений",
     "backgroundUpdateLimitsExplanation": "Успешность фоновой установки можно определить только после открытия Obtainium",
-    "verifyLatestTag": "Проверять тег 'latest'",
-    "intermediateLinkRegex": "Фильтр для \"промежуточной\" ссылки для посещения",
+    "verifyLatestTag": "Проверять метку «latest»",
+    "intermediateLinkRegex": "Фильтр для «промежуточной» ссылки для посещения",
     "filterByLinkText": "Фильтрация ссылок по тексту ссылки",
     "intermediateLinkNotFound": "Промежуточная ссылка не найдена",
     "intermediateLink": "Промежуточная ссылка",
     "exemptFromBackgroundUpdates": "Исключить из фоновых обновлений (если включено)",
-    "bgUpdatesOnWiFiOnly": "Отключить фоновые обновления, если нет соединения с Wi-Fi",
-    "bgUpdatesWhileChargingOnly": "Отключение фоновых обновлений при отсутствии зарядки",
-    "autoSelectHighestVersionCode": "Автоматически выбирать APK с актуальной версией кода",
-    "versionExtractionRegEx": "Регулярное выражение для извлечения версии",
-    "trimVersionString": "Обрезка строки версии с помощью RegEx",
-    "matchGroupToUseForX": "Группа соответствия, которую следует использовать для \"{}\"",
-    "matchGroupToUse": "Выберите группу для использования",
-    "highlightTouchTargets": "Выделить менее очевидные элементы управления касанием",
+    "bgUpdatesOnWiFiOnly": "Отключить фоновые обновления, если нет подключения к Wi-Fi",
+    "bgUpdatesWhileChargingOnly": "Отключить фоновые обновления, если не идёт зарядка",
+    "autoSelectHighestVersionCode": "Автовыбор APK с актуальной версией кода",
+    "versionExtractionRegEx": "Извлечение версии\n(регулярное выражение)",
+    "trimVersionString": "Обрезка строки версии\n(регулярное выражение)",
+    "matchGroupToUseForX": "Группа соответствия для «{}»",
+    "matchGroupToUse": "Выбрать группу соответствия",
+    "highlightTouchTargets": "Выделять менее очевидные элементы управления касанием",
     "pickExportDir": "Выбрать каталог для экспорта",
     "autoExportOnChanges": "Автоэкспорт при изменениях",
     "includeSettings": "Включить настройки",
     "filterVersionsByRegEx": "Фильтровать версии по регулярному выражению",
-    "trySelectingSuggestedVersionCode": "Попробуйте выбрать предложенный код версии APK",
-    "dontSortReleasesList": "Сохранить порядок релизов от API",
+    "trySelectingSuggestedVersionCode": "Пробовать выбрать предложенный код версии APK",
+    "dontSortReleasesList": "Сохранить порядок выпусков от API",
     "reverseSort": "Обратная сортировка",
     "takeFirstLink": "Взять первую ссылку",
     "skipSort": "Пропустить сортировку",
@@ -290,18 +290,18 @@
     "onlyCheckInstalledOrTrackOnlyApps": "Проверять обновления только у установленных или отслеживаемых приложений",
     "supportFixedAPKURL": "Поддержка фиксированных URL-адресов APK",
     "selectX": "Выбрать {}",
-    "parallelDownloads": "Разрешить параллельные загрузки",
+    "parallelDownloads": "Использовать параллельные загрузки",
     "useShizuku": "Использовать Shizuku или Sui для установки",
     "shizukuBinderNotFound": "Совместимый сервис Shizuku не найден, возможно он не запущен",
     "shizukuOld": "Устаревшая версия Shizuku (<11), обновите",
     "shizukuOldAndroidWithADB": "Shizuku работает на Android < 8.1 с ADB, обновите Android или используйте Sui",
-    "shizukuPretendToBeGooglePlay": "Указать Google Play как источник установки (если используется Shizuku)",
+    "shizukuPretendToBeGooglePlay": "Указывать Google Play как источник установки (если используется Shizuku)",
     "useSystemFont": "Использовать системный шрифт",
     "useVersionCodeAsOSVersion": "Использовать код версии приложения как версию, обнаруженную ОС",
     "requestHeader": "Заголовок запроса",
-    "useLatestAssetDateAsReleaseDate": "Использовать последнюю загрузку ресурса в качестве даты выпуска",
+    "useLatestAssetDateAsReleaseDate": "Использовать последнюю загрузку объекта в качестве даты выпуска",
     "defaultPseudoVersioningMethod": "Метод псевдоверсионирования по умолчанию",
-    "partialAPKHash": "Частичный хэш APK",
+    "partialAPKHash": "Частичный хеш APK",
     "APKLinkHash": "Хеш ссылки APK",
     "directAPKLink": "Прямая ссылка на APK",
     "pseudoVersionInUse": "Используется псевдоверсия",
@@ -309,81 +309,98 @@
     "latest": "Последний",
     "invertRegEx": "Инвертировать регулярное выражение",
     "note": "Примечание",
-    "selfHostedNote": "Выпадающий список \"{}\" можно использовать для доступа к самостоятельно размещенным/настроенным экземплярам любого источника.",
-    "badDownload": "APK не удалось разобрать (несовместимая или неполная загрузка)",
-    "beforeNewInstallsShareToAppVerifier": "Поделитесь новыми приложениями с AppVerifier (если доступно)",
+    "selfHostedNote": "Выпадающий список «{}» можно использовать для доступа к самостоятельно размещённым/настроенным экземплярам любого источника.",
+    "badDownload": "Не удалось разобрать APK (несовместимая или неполная загрузка)",
+    "beforeNewInstallsShareToAppVerifier": "Делиться новыми приложениями с AppVerifier (если доступно)",
     "appVerifierInstructionToast": "Поделитесь с AppVerifier, а затем вернитесь сюда, когда будете готовы.",
     "wiki": "Помощь/Вики",
     "crowdsourcedConfigsLabel": "Конфигурации приложений на основе краудсорсинга (используйте на свой страх и риск)",
-    "crowdsourcedConfigsShort": "Конфиги приложений с помощью краудсорсинга",
+    "crowdsourcedConfigsShort": "Краудсорсинг конфигураций приложений",
     "allowInsecure": "Разрешить небезопасные HTTP-запросы",
-    "stayOneVersionBehind": "Не отставайте от последней версии",
-    "refreshBeforeDownload": "Обновляйте информацию о приложении перед загрузкой",
+    "stayOneVersionBehind": "Оставаться на одну версию ниже последней",
+    "useFirstApkOfVersion": "Автовыбор первого из нескольких APK",
+    "refreshBeforeDownload": "Обновлять информацию о приложении перед загрузкой",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Имя",
     "smartname": "Имя (умное)",
     "sortMethod": "Метод сортировки",
     "welcome": "Добро пожаловать",
-    "documentationLinksNote": "На странице Obtainium GitHub, ссылка на которую приведена ниже, содержатся ссылки на видео, статьи, обсуждения и другие ресурсы, которые помогут вам понять, как пользоваться приложением.",
+    "documentationLinksNote": "На странице Obtainium в GitHub, ссылка на которую приведена ниже, содержатся ссылки на видео, статьи, обсуждения и другие ресурсы, которые помогут вам понять, как пользоваться приложением.",
+    "batteryOptimizationNote": "Обратите внимание, что фоновая загрузка может работать более надёжно, если отключить оптимизацию батареи ОС для Obtainium.",
+    "fileDeletionError": "Не удалось удалить файл (попробуйте удалить его вручную, а затем повторите попытку): «{}»",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"
     },
     "tooManyRequestsTryAgainInMinutes": {
         "one": "Слишком много запросов (ограничение скорости) — попробуйте снова через {} минуту",
-        "other": "Слишком много запросов (ограничение скорости) — попробуйте снова через {} минуты"
+        "few": "Слишком много запросов (ограничение скорости) — попробуйте снова через {} минуты",
+        "other": "Слишком много запросов (ограничение скорости) — попробуйте снова через {} минут"
     },
     "bgUpdateGotErrorRetryInMinutes": {
-        "one": "При проверке обновлений в фоновом режиме возникла ошибка {}, повторная проверка будет запланирована через {} минуту",
-        "other": "При проверке обновлений в фоновом режиме возникла ошибка {}, повторная проверка будет запланирована через {} минуты"
+        "one": "При проверке обновлений в фоновом режиме возникла ошибка {}, повторная проверка будет через {} минуту",
+        "few": "При проверке обновлений в фоновом режиме возникла ошибка {}, повторная проверка будет через {} минуты",
+        "other": "При проверке обновлений в фоновом режиме возникла ошибка {}, повторная проверка будет через {} минут"
     },
     "bgCheckFoundUpdatesWillNotifyIfNeeded": {
-        "one": "В ходе проверки обновления в фоновом режиме было обнаружено {} обновление — Пользователю будет отправлено уведомление, если это необходимо",
-        "other": "В ходе проверки обновления в фоновом режиме было обнаружено {} обновлений — Пользователю будет отправлено уведомление, если это необходимо"
+        "one": "При проверке в фоновом режиме было обнаружено {} обновление — пользователь будет уведомлен по необходимости",
+        "one": "При проверке в фоновом режиме было обнаружено {} обновления — пользователь будет уведомлен по необходимости",
+        "other": "При проверке в фоновом режиме было обнаружено {} обновлений — пользователь будет уведомлен по необходимости"
     },
     "apps": {
         "one": "{} приложение",
+        "few": "{} приложения",
         "other": "{} приложений"
     },
     "url": {
         "one": "{} URL-адрес",
-        "other": "{} URL-адреса"
+        "few": "{} URL-адреса",
+        "other": "{} URL-адресов"
     },
     "minute": {
         "one": "{} минута",
-        "other": "{} минуты"
+        "few": "{} минуты",
+        "other": "{} минут"
     },
     "hour": {
         "one": "{} час",
+        "few": "{} часа",
         "other": "{} часов"
     },
     "day": {
         "one": "{} день",
+        "few": "{} дня",
         "other": "{} дней"
     },
     "clearedNLogsBeforeXAfterY": {
         "one": "Очищен {n} журнал (до = {before}, после = {after})",
+        "few": "Очищены {n} журнала (до = {before}, после = {after})",
         "other": "Очищено {n} журналов (до = {before}, после = {after})"
     },
     "xAndNMoreUpdatesAvailable": {
-        "one": "У {} и еще 1 приложения есть обновление",
+        "one": "У {} и ещё 1 приложения есть обновление",
         "other": "У {} и ещё {} приложений есть обновления"
     },
     "xAndNMoreUpdatesInstalled": {
         "one": "{} и ещё 1 приложение были обновлены",
+        "few": "{} и ещё {} приложения были обновлены",
         "other": "{} и ещё {} приложений были обновлены"
     },
     "xAndNMoreUpdatesFailed": {
         "one": "Не удалось обновить {} и ещё 1 приложение",
+        "few": "Не удалось обновить {} и ещё {} приложения",
         "other": "Не удалось обновить {} и ещё {} приложений"
     },
     "xAndNMoreUpdatesPossiblyInstalled": {
         "one": "{} и ещё 1 приложение могли быть обновлены",
+        "few": "{} и ещё {} приложения могли быть обновлены",
         "other": "{} и ещё {} приложений могли быть обновлены"
     },
     "apk": {
-        "one": "{} APK",
-        "other": "{} APKи"
+        "one": "{} APK-файл",
+        "few": "{} APK-файла",
+        "other": "{} APK-файлов"
     }
 }

assets/translations/standardize.js

@@ -16,6 +16,10 @@ const neverAutoTranslate = {
     placeholder: ['pl'],
     importExport: ['fr'],
     url: ['fr'],
+    vivoAppStore: ['cs', 'ja', 'ko'],
+    coolapk: ['ja'],
+    obtainiumImport: ['nl'],
+    appLogs: ['nl'],
     tencentAppStore: ['*']
 }
 

assets/translations/sv.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Appkonfigurationer med hjälp av crowdsourcing",
     "allowInsecure": "Tillåt osäkra HTTP-förfrågningar",
     "stayOneVersionBehind": "Håll dig en version bakom den senaste",
+    "useFirstApkOfVersion": "Välj automatiskt den första av flera APK:er",
     "refreshBeforeDownload": "Uppdatera appdetaljerna före nedladdning",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Namn",
     "smartname": "Namn (Smart)",
     "sortMethod": "Sorteringsmetod",
     "welcome": "Välkommen",
     "documentationLinksNote": "Obtainium GitHub-sidan som länkas nedan innehåller länkar till videor, artiklar, diskussioner och andra resurser som hjälper dig att förstå hur du använder appen.",
+    "batteryOptimizationNote": "Observera att nedladdningar i bakgrunden kan fungera mer tillförlitligt om du inaktiverar OS-batterioptimeringar för Obtainium.",
+    "fileDeletionError": "Misslyckades med att radera filen (försök radera den manuellt och försök sedan igen): \"{}\"",
     "removeAppQuestion": {
         "one": "Ta Bort App?",
         "other": "Ta Bort Appar?"

assets/translations/tr.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Kitle Kaynaklı Uygulama Yapılandırmaları",
     "allowInsecure": "Güvensiz HTTP isteklerine izin ver",
     "stayOneVersionBehind": "En son sürümün bir sürüm gerisinde kalın",
+    "useFirstApkOfVersion": "Birden fazla APK arasından ilkini otomatik seçme",
     "refreshBeforeDownload": "İndirmeden önce uygulama ayrıntılarını yenileyin",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "İsim",
     "smartname": "İsim (Akıllı)",
     "sortMethod": "Sıralama Yöntemi",
     "welcome": "Hoş geldiniz",
     "documentationLinksNote": "Aşağıda bağlantısı verilen Obtainium GitHub sayfası, uygulamayı nasıl kullanacağınızı anlamanıza yardımcı olacak videolara, makalelere, tartışmalara ve diğer kaynaklara bağlantılar içerir.",
+    "batteryOptimizationNote": "Obtainium için işletim sistemi pil optimizasyonlarını devre dışı bırakırsanız arka planda indirmelerin daha güvenilir şekilde çalışabileceğini unutmayın.",
+    "fileDeletionError": "Dosya silinemedi (elle silmeyi deneyin ve sonra tekrar deneyin): \"{}\"",
     "removeAppQuestion": {
         "one": "Uygulamayı Kaldır?",
         "other": "Uygulamaları Kaldır?"

assets/translations/uk.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Налаштування краудсорсингових додатків",
     "allowInsecure": "Дозволити незахищені HTTP-запити",
     "stayOneVersionBehind": "Залишайтеся на одну версію актуальнішою",
+    "useFirstApkOfVersion": "Автоматичний вибір першого з декількох APK",
     "refreshBeforeDownload": "Оновіть інформацію про програму перед завантаженням",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Ім'я",
     "smartname": "Ім'я (Smart)",
     "sortMethod": "Метод сортування",
     "welcome": "Ласкаво просимо.",
     "documentationLinksNote": "Сторінка Obtainium на GitHub, посилання на яку наведено нижче, містить посилання на відео, статті, дискусії та інші ресурси, які допоможуть вам зрозуміти, як користуватися додатком.",
+    "batteryOptimizationNote": "Зауважте, що фонові завантаження можуть працювати надійніше, якщо ви вимкнете оптимізацію батареї ОС для Obtainium.",
+    "fileDeletionError": "Не вдалося видалити файл (спробуйте видалити його вручну, а потім спробуйте ще раз): \"{}\"",
     "removeAppQuestion": {
         "one": "Видалити застосунок?",
         "other": "Видалити застосунки?"

assets/translations/vi.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "Crowdsourced App Configurations",
     "allowInsecure": "Allow insecure HTTP requests",
     "stayOneVersionBehind": "Stay one version behind latest",
+    "useFirstApkOfVersion": "Auto-select first of multiple APKs",
     "refreshBeforeDownload": "Refresh app details before download",
     "tencentAppStore": "Tencent App Store",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "Name",
     "smartname": "Name (Smart)",
     "sortMethod": "Sort Method",
     "welcome": "Welcome",
     "documentationLinksNote": "The Obtainium GitHub page linked below contains links to videos, articles, discussions and other resources that will help you understand how to use the app.",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
+    "fileDeletionError": "Failed to delete file (try deleting it manually then try again): \"{}\"",
     "removeAppQuestion": {
         "one": "Gỡ ứng dụng?",
         "other": "Gỡ ứng dụng?"

assets/translations/zh-Hant-TW.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "群眾外包的應用程式設定",
     "allowInsecure": "允許不安全的 HTTP 請求",
     "stayOneVersionBehind": "保持比最新版本落後一個版本",
+    "useFirstApkOfVersion": "Auto-select first of multiple APKs",
     "refreshBeforeDownload": "下載前刷新應用程式詳細資訊",
     "tencentAppStore": "騰訊應用寶",
     "coolApk": "CoolApk",
+    "vivoAppStore": "vivo App Store (CN)",
     "name": "名稱",
     "smartname": "名稱（智慧）",
     "sortMethod": "排序方式",
     "welcome": "歡迎",
     "documentationLinksNote": "下方連結的 Obtainium GitHub 頁面包含影片、文章、討論及其他資源，能幫助你瞭解如何使用這款應用程式。",
+    "batteryOptimizationNote": "Note that background downloads may work more reliably if you disable OS battery optimizations for Obtainium.",
+    "fileDeletionError": "Failed to delete file (try deleting it manually then try again): \"{}\"",
     "removeAppQuestion": {
         "one": "移除應用程式？",
         "other": "移除應用程式？"

assets/translations/zh.json

@@ -318,14 +318,18 @@
     "crowdsourcedConfigsShort": "众包应用程序配置",
     "allowInsecure": "允许不安全的 HTTP 请求",
     "stayOneVersionBehind": "比最新版本晚一个版本",
+    "useFirstApkOfVersion": "从多个 APK 中自动选择第一个",
     "refreshBeforeDownload": "下载前刷新应用程序详细信息",
     "tencentAppStore": "腾讯应用宝",
     "coolApk": "酷安",
+    "vivoAppStore": "vivo 应用商店（中国）",
     "name": "名称",
     "smartname": "姓名（智能）",
     "sortMethod": "排序方法",
     "welcome": "欢迎光临",
     "documentationLinksNote": "下面链接的 Obtainium GitHub 页面包含视频、文章、讨论和其他资源的链接，可帮助您了解如何使用该应用程序。",
+    "batteryOptimizationNote": "请注意，如果为 Obtainium 禁用操作系统电池优化功能，后台下载可能会更稳定。",
+    "fileDeletionError": "删除文件失败（尝试手动删除，然后再试一次）：\"{}\"",
     "removeAppQuestion": {
         "one": "是否删除应用？",
         "other": "是否删除应用？"

build.sh

@@ -2,15 +2,35 @@
 # Convenience script
 
 CURR_DIR="$(pwd)"
-trap "cd "$CURR_DIR"" EXIT
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+trap "cd \"$CURR_DIR\"" EXIT
+cd "$SCRIPT_DIR"
 
 if [ -z "$1" ]; then
     git fetch && git merge origin/main && git push # Typically run after a PR to main, so bring dev up to date
 fi
+
+# Update local Flutter
+git submodule update --remote
 cd .flutter
 git fetch
-git checkout "$(flutter --version | head -2 | tail -1 | awk '{print $4}')" # Ensure included Flutter submodule version equals my environment
+git checkout stable
+git pull
+FLUTTER_GIT_URL="https://github.com/flutter/flutter/" ./bin/flutter upgrade
 cd ..
+
+# Keep global Flutter, if any, in sync
+if [ -f ~/flutter/bin/flutter ]; then
+    cd ~/flutter
+    ./bin/flutter channel stable
+    ./bin/flutter upgrade
+    cd "$SCRIPT_DIR"
+fi
+
+if [ -z "$(which flutter)" ]; then
+    export PATH="$PATH:$SCRIPT_DIR/.flutter/bin"
+fi
+
 rm ./build/app/outputs/flutter-apk/* 2>/dev/null                                       # Get rid of older builds if any
 flutter build apk --flavor normal && flutter build apk --split-per-abi --flavor normal # Build (both split and combined APKs)
 for file in ./build/app/outputs/flutter-apk/app-*normal*.apk*; do mv "$file" "${file//-normal/}"; done

docker/Dockerfile

@@ -0,0 +1,86 @@
+FROM ubuntu:22.04
+
+ENV DEBIAN_FRONTEND noninteractive
+ENV ANDROID_SDK_ROOT /opt/android-sdk-linux
+ENV PATH "${PATH}:/opt/flutter/bin:/root/.pub-cache/bin:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:/opt/android-sdk-linux/platform-tools"
+
+ENV HOME=/root
+
+# Prereqs
+RUN \
+    apt-get update &&\
+    apt-get install -y --no-install-recommends \
+        bash \
+        curl \
+        file \
+        git 2.x \
+        unzip \
+        xz-utils \
+        zip \
+        libglu1-mesa \
+        libxi-dev \
+        libxmu-dev \
+        libglu1-mesa-dev \
+        git-lfs \
+        openssl \
+        wget
+
+# Build prereqs
+RUN \
+    apt-get install -y \
+        cmake curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback lib32stdc++6 python3 sed \
+        cmake ninja-build build-essential libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev clang pkg-config libgtk-3-dev \
+        liblzma-dev libmount-dev libblkid-dev libgcrypt20-dev libgpg-error-dev libssl-dev libpng-dev libjpeg-dev \
+        libtiff-dev libgif-dev libgtk-3-dev
+
+# Android SDK prequisites
+# https://developer.android.com/studio#command-tools
+RUN \
+    apt-get install -y --no-install-recommends \
+        git \
+        git-lfs \
+        openssl \
+        wget \
+        unzip
+
+# Android SDK
+RUN \
+    wget --quiet  https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip -O /tmp/tools.zip && \
+    mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools && \
+    unzip -q /tmp/tools.zip -d ${ANDROID_SDK_ROOT}/cmdline-tools && \
+    mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest && \
+    rm -v /tmp/tools.zip && \
+    mkdir -p /root/.android/ && touch /root/.android/repositories.cfg &&\
+    apt-get install -y --no-install-recommends openjdk-21-jdk openjdk-21-jre &&\
+    yes | sdkmanager --licenses &&\
+    sdkmanager --update
+
+    # Platform tools
+# Get latest with sdkmanager --list
+RUN sdkmanager --install "build-tools;33.0.1"
+RUN sdkmanager --install "ndk;26.3.11579264"
+RUN sdkmanager --install "cmake;4.0.2"
+RUN sdkmanager --install platform-tools
+RUN sdkmanager --install emulator
+RUN sdkmanager --install tools
+RUN sdkmanager --install "platforms;android-28"
+RUN sdkmanager --install "platforms;android-31"
+RUN sdkmanager --install "platforms;android-32"
+RUN sdkmanager --install "platforms;android-33"
+RUN sdkmanager --install "platforms;android-34"
+RUN sdkmanager --install "platforms;android-35"
+
+# Flutter
+ARG DEV_UID=0
+RUN \
+    wget --quiet https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.29.3-stable.tar.xz -O /tmp/flutter.tar.xz &&\
+    mkdir -p /opt &&\
+    cd /opt &&\
+    tar xf /tmp/flutter.tar.xz &&\
+    rm /tmp/flutter.tar.xz &&\
+    git config --global --add safe.directory /opt/flutter &&\
+    dart pub global activate cider &&\
+    chown -R ${DEV_UID} /opt/flutter
+RUN flutter --disable-analytics
+RUN flutter upgrade
+RUN chmod a+w /opt/flutter/packages -R

docker/builder.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+cd ${SCRIPT_DIR}/..
+mkdir -p ./data/home
+docker run \
+    --rm \
+    -ti \
+    --net host \
+    -v "${PWD}/../:${PWD}/../":z \
+    -w "${PWD}" \
+    --name flutter-dev-obtainium \
+    --user $(id -u) \
+    -v ./data/home:/home/${USER}:z \
+    -e USER=${USER} \
+    -e HOME=/home/${USER} \
+    -e ANDROID_USER_HOME=${HOME}/.android \
+    -e GRADLE_USER_HOME=${HOME}/.gradle \
+    -e PS1="${debian_chroot:+($debian_chroot)}${USER}@\h:\w\$ " \
+    flutter-builder-obtainium

docker/mkbuilder.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+D=$(date +'%Y%m%d.%H%M%S%3N')
+
+set -e
+
+cd "${SCRIPT_DIR}/.."
+# Create the builder image
+docker build \
+    -t flutter-builder-obtainium \
+    -f ./docker/Dockerfile \
+    --build-arg="DEV_UID=$(id -u)" \
+    .

fastlane/metadata/android/en-US/full_description.txt

@@ -26,6 +26,7 @@
 			<li>Huawei AppGallery</li>
 			<li>Tencent App Store</li>
 			<li>CoolApk</li>
+			<li>vivo App Store (CN)</li>
 			<li>Jenkins Jobs</li>
 			<li>RuStore</li>
 		</ul>

fastlane/metadata/android/en-US/images/featureGraphic.png

@@ -0,0 +1 @@
+../../../../../assets/graphics/banner.png

fastlane/metadata/android/en-US/images/icon.png

@@ -0,0 +1 @@
+../../../../../assets/graphics/icon-512x512.png

fastlane/metadata/android/en-US/images/phoneScreenshots/1.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/1.apps.png

fastlane/metadata/android/en-US/images/phoneScreenshots/2.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/2.dark_theme.png

fastlane/metadata/android/en-US/images/phoneScreenshots/3.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/3.material_you.png

fastlane/metadata/android/en-US/images/phoneScreenshots/4.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/4.app.png

fastlane/metadata/android/en-US/images/phoneScreenshots/5.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/5.app_opts.png

fastlane/metadata/android/en-US/images/phoneScreenshots/6.png

@@ -0,0 +1 @@
+../../../../../../assets/screenshots/6.app_webview.png

fastlane/metadata/android/ru/full_description.txt

@@ -26,6 +26,7 @@
 			<li>Huawei AppGallery</li>
 			<li>Tencent App Store</li>
 			<li>CoolApk</li>
+			<li>vivo App Store (CN)</li>
 			<li>Jenkins Jobs</li>
 			<li>RuStore</li>
 		</ul>

fastlane/metadata/android/ru/title.txt

@@ -0,0 +1 @@
+Obtainium

lib/app_sources/apkcombo.dart

@@ -12,8 +12,9 @@ class APKCombo extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}/+[^/]+/+[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}/+[^/]+/+[^/]+',
+      caseSensitive: false,
+    );
     var match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -22,25 +23,30 @@ class APKCombo extends AppSource {
   }
 
   @override
-  Future<String?> tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) async {
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
   @override
   Future<Map<String, String>?> getRequestHeaders(
-      Map<String, dynamic> additionalSettings,
-      {bool forAPKDownload = false}) async {
+    Map<String, dynamic> additionalSettings, {
+    bool forAPKDownload = false,
+  }) async {
     return {
       "User-Agent": "curl/8.0.1",
       "Accept": "*/*",
       "Connection": "keep-alive",
-      "Host": hosts[0]
+      "Host": hosts[0],
     };
   }
 
   Future<List<MapEntry<String, String>>> getApkUrls(
-      String standardUrl, Map<String, dynamic> additionalSettings) async {
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
     var res = await sourceRequest('$standardUrl/download/apk', {});
     if (res.statusCode != 200) {
       throw getObtainiumHttpError(res);
@@ -65,7 +71,9 @@ class APKCombo extends AppSource {
             String verCode =
                 e.querySelector('.info .header .vercode')?.text.trim() ?? '';
             return MapEntry<String, String>(
-                arch != null ? '$arch-$verCode.apk' : '', url ?? '');
+              arch != null ? '$arch-$verCode.apk' : '',
+              url ?? '',
+            );
           }).toList();
         })
         .reduce((value, element) => [...value, ...element])
@@ -74,8 +82,11 @@ class APKCombo extends AppSource {
   }
 
   @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl, String standardUrl,
-      Map<String, dynamic> additionalSettings) async {
+  Future<String> apkUrlPrefetchModifier(
+    String apkUrl,
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
     var freshURLs = await getApkUrls(standardUrl, additionalSettings);
     var path2Match = Uri.parse(apkUrl).path;
     for (var url in freshURLs) {
@@ -116,9 +127,10 @@ class APKCombo extends AppSource {
       }
     }
     return APKDetails(
-        version,
-        await getApkUrls(standardUrl, additionalSettings),
-        AppNames(author, appName),
-        releaseDate: releaseDate);
+      version,
+      await getApkUrls(standardUrl, additionalSettings),
+      AppNames(author, appName),
+      releaseDate: releaseDate,
+    );
   }
 }

lib/app_sources/apkmirror.dart

@@ -17,37 +17,44 @@ class APKMirror extends AppSource {
 
     additionalSourceAppSpecificSettingFormItems = [
       [
-        GeneratedFormSwitch('fallbackToOlderReleases',
-            label: tr('fallbackToOlderReleases'), defaultValue: true)
+        GeneratedFormSwitch(
+          'fallbackToOlderReleases',
+          label: tr('fallbackToOlderReleases'),
+          defaultValue: true,
+        ),
       ],
       [
-        GeneratedFormTextField('filterReleaseTitlesByRegEx',
-            label: tr('filterReleaseTitlesByRegEx'),
-            required: false,
-            additionalValidators: [
-              (value) {
-                return regExValidator(value);
-              }
-            ])
-      ]
+        GeneratedFormTextField(
+          'filterReleaseTitlesByRegEx',
+          label: tr('filterReleaseTitlesByRegEx'),
+          required: false,
+          additionalValidators: [
+            (value) {
+              return regExValidator(value);
+            },
+          ],
+        ),
+      ],
     ];
   }
 
   @override
   Future<Map<String, String>?> getRequestHeaders(
-      Map<String, dynamic> additionalSettings,
-      {bool forAPKDownload = false}) async {
+    Map<String, dynamic> additionalSettings, {
+    bool forAPKDownload = false,
+  }) async {
     return {
       "User-Agent":
-          "Obtainium/${(await getInstalledInfo(obtainiumId))?.versionName ?? '1.0.0'}"
+          "Obtainium/${(await getInstalledInfo(obtainiumId))?.versionName ?? '1.0.0'}",
     };
   }
 
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}/apk/[^/]+/[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}/apk/[^/]+/[^/]+',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -68,12 +75,14 @@ class APKMirror extends AppSource {
         additionalSettings['fallbackToOlderReleases'] == true;
     String? regexFilter =
         (additionalSettings['filterReleaseTitlesByRegEx'] as String?)
-                    ?.isNotEmpty ==
-                true
-            ? additionalSettings['filterReleaseTitlesByRegEx']
-            : null;
-    Response res =
-        await sourceRequest('$standardUrl/feed/', additionalSettings);
+                ?.isNotEmpty ==
+            true
+        ? additionalSettings['filterReleaseTitlesByRegEx']
+        : null;
+    Response res = await sourceRequest(
+      '$standardUrl/feed/',
+      additionalSettings,
+    );
     if (res.statusCode == 200) {
       var items = parse(res.body).querySelectorAll('item');
       dynamic targetRelease;
@@ -95,11 +104,14 @@ class APKMirror extends AppSource {
           .split(' ')
           .sublist(0, 5)
           .join(' ');
-      DateTime? releaseDate =
-          dateString != null ? HttpDate.parse('$dateString GMT') : null;
+      DateTime? releaseDate = dateString != null
+          ? HttpDate.parse('$dateString GMT')
+          : null;
       String? version = titleString
-          ?.substring(RegExp('[0-9]').firstMatch(titleString)?.start ?? 0,
-              RegExp(' by ').allMatches(titleString).last.start)
+          ?.substring(
+            RegExp('[0-9]').firstMatch(titleString)?.start ?? 0,
+            RegExp(' by ').allMatches(titleString).last.start,
+          )
           .trim();
       if (version == null || version.isEmpty) {
         version = titleString;
@@ -107,8 +119,12 @@ class APKMirror extends AppSource {
       if (version == null || version.isEmpty) {
         throw NoVersionError();
       }
-      return APKDetails(version, [], getAppNames(standardUrl),
-          releaseDate: releaseDate);
+      return APKDetails(
+        version,
+        [],
+        getAppNames(standardUrl),
+        releaseDate: releaseDate,
+      );
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/apkpure.dart

@@ -1,24 +1,18 @@
+import 'dart:convert';
+
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:html/parser.dart';
-import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
-parseDateTimeMMMddCommayyyy(String? dateString) {
-  DateTime? releaseDate;
-  try {
-    releaseDate = dateString != null
-        ? DateFormat('MMM dd, yyyy').parse(dateString)
-        : null;
-    releaseDate = dateString != null && releaseDate == null
-        ? DateFormat('MMMM dd, yyyy').parse(dateString)
-        : releaseDate;
-  } catch (err) {
-    // ignore
+extension Unique<E, Id> on List<E> {
+  List<E> unique([Id Function(E element)? id, bool inplace = true]) {
+    final ids = <dynamic>{};
+    var list = inplace ? this : List<E>.from(this);
+    list.retainWhere((x) => ids.add(id != null ? id(x) : x as Id));
+    return list;
   }
-  return releaseDate;
 }
 
 class APKPure extends AppSource {
@@ -29,29 +23,44 @@ class APKPure extends AppSource {
     showReleaseDateAsVersionToggle = true;
     additionalSourceAppSpecificSettingFormItems = [
       [
-        GeneratedFormSwitch('fallbackToOlderReleases',
-            label: tr('fallbackToOlderReleases'), defaultValue: true)
+        GeneratedFormSwitch(
+          'fallbackToOlderReleases',
+          label: tr('fallbackToOlderReleases'),
+          defaultValue: true,
+        ),
       ],
       [
-        GeneratedFormSwitch('stayOneVersionBehind',
-            label: tr('stayOneVersionBehind'), defaultValue: false)
-      ]
+        GeneratedFormSwitch(
+          'stayOneVersionBehind',
+          label: tr('stayOneVersionBehind'),
+          defaultValue: false,
+        ),
+      ],
+      [
+        GeneratedFormSwitch(
+          'useFirstApkOfVersion',
+          label: tr('useFirstApkOfVersion'),
+          defaultValue: true,
+        ),
+      ],
     ];
   }
 
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegExB = RegExp(
-        '^https?://m.${getSourceRegex(hosts)}(/+[^/]{2})?/+[^/]+/+[^/]+',
-        caseSensitive: false);
+      '^https?://m.${getSourceRegex(hosts)}(/+[^/]{2})?/+[^/]+/+[^/]+',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegExB.firstMatch(url);
     if (match != null) {
       var uri = Uri.parse(url);
       url = 'https://${uri.host.substring(2)}${uri.path}';
     }
     RegExp standardUrlRegExA = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}(/+[^/]{2})?/+[^/]+/+[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}(/+[^/]{2})?/+[^/]+/+[^/]+',
+      caseSensitive: false,
+    );
     match = standardUrlRegExA.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -60,100 +69,88 @@ class APKPure extends AppSource {
   }
 
   @override
-  Future<String?> tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) async {
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
-  getDetailsForVersionLink(
-      String standardUrl,
-      String appId,
-      String host,
-      List<String> supportedArchs,
-      String link,
-      Map<String, dynamic> additionalSettings) async {
-    var res = await sourceRequest(link, additionalSettings);
-    if (res.statusCode == 200) {
-      var html = parse(res.body);
-      var apksDiv =
-          html.querySelector('#version-list div div.show-more-content');
-      DateTime? topReleaseDate;
-      var apkUrls = apksDiv
-              ?.querySelectorAll('div.group-title')
-              .map((e) {
-                String architectureString = e.text.trim();
-                if (architectureString.toLowerCase() == 'unlimited' ||
-                    architectureString.toLowerCase() == 'universal') {
-                  architectureString = '';
-                }
-                List<String> architectures = architectureString
-                    .split(',')
-                    .map((e) => e.trim())
-                    .where((e) => e.isNotEmpty)
-                    .toList();
-                // Only take the first APK for each architecture, ignore others for now, for simplicity
-                // Unclear why there can even be multiple APKs for the same version and arch
-                var apkInfo = e.nextElementSibling?.querySelector('div.info');
-                String? versionCode = RegExp('[0-9]+')
-                    .firstMatch(
-                        apkInfo?.querySelector('div.info-top .code')?.text ??
-                            '')
-                    ?.group(0)
-                    ?.trim();
-                var types = apkInfo
-                        ?.querySelectorAll('div.info-top span.tag')
-                        .map((e) => e.text.trim())
-                        .map((t) => t == 'APKs' ? 'APK' : t) ??
-                    [];
-                String type = types.isEmpty ? 'APK' : types.first;
-                String? dateString = apkInfo
-                    ?.querySelector('div.info-bottom span.time')
-                    ?.text
-                    .trim();
-                DateTime? releaseDate = parseDateTimeMMMddCommayyyy(dateString);
-                if (additionalSettings['autoApkFilterByArch'] == true &&
-                    architectures.isNotEmpty &&
-                    architectures
-                        .where((a) => supportedArchs.contains(a))
-                        .isEmpty) {
-                  return const MapEntry('', '');
-                }
-                topReleaseDate ??=
-                    releaseDate; // Just use the release date of the first APK in the list as the release date for this version
-                return MapEntry(
-                    '$appId-$versionCode-$architectureString.${type.toLowerCase()}',
-                    'https://d.${hosts.contains(host) ? 'cdnpure.com' : host}/b/$type/$appId?versionCode=$versionCode');
-              })
-              .where((e) => e.key.isNotEmpty)
-              .toList() ??
-          [];
-      if (apkUrls.isEmpty) {
-        throw NoAPKError();
-      }
-      String version = Uri.parse(link).pathSegments.last;
-      String? author;
-      try {
-        author = html
-                .querySelector('span.info-sdk')
-                ?.text
-                .trim()
-                .substring(version.length + 4) ??
-            Uri.parse(standardUrl).pathSegments.reversed.last;
-      } catch (e) {
-        author = html.querySelector('span.info-sdk')?.text.trim() ??
-            Uri.parse(standardUrl).pathSegments.reversed.last;
-      }
-      String appName =
-          html.querySelector('h1.info-title')?.text.trim() ?? appId;
-      String? changeLog = html
-          .querySelector('div.module.change-log')
-          ?.innerHtml
-          .trim()
-          .replaceAll("<br>", "  \n");
-      return APKDetails(version, apkUrls, AppNames(author, appName),
-          releaseDate: topReleaseDate, changeLog: changeLog);
+  Future<APKDetails> getDetailsForVersion(
+    List<Map<String, dynamic>> versionVariants,
+    List<String> supportedArchs,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    var apkUrls = versionVariants
+        .map((e) {
+          String appId = e['package_name'];
+          String versionCode = e['version_code'];
+
+          List<String> architectures = e['native_code']?.cast<String>();
+          String architectureString = architectures.join(',');
+          if (architectures.contains("universal") ||
+              architectures.contains("unlimited")) {
+            architectures = [];
+          }
+          if (additionalSettings['autoApkFilterByArch'] == true &&
+              architectures.isNotEmpty &&
+              architectures.where((a) => supportedArchs.contains(a)).isEmpty) {
+            return null;
+          }
+
+          String type = e['asset']['type'];
+          String downloadUri = e['asset']['url'];
+
+          return MapEntry(
+            '$appId-$versionCode-$architectureString.${type.toLowerCase()}',
+            downloadUri,
+          );
+        })
+        .nonNulls
+        .toList()
+        .unique((e) => e.key);
+
+    if (apkUrls.isEmpty) {
+      throw NoAPKError();
+    }
+
+    // get version details from first variant
+    var v = versionVariants.first;
+    String version = v['version_name'];
+    String author = v['developer'];
+    String appName = v['title'];
+    DateTime releaseDate = DateTime.parse(v['update_date']);
+    String? changeLog = v['whatsnew'];
+    if (changeLog != null && changeLog.isEmpty) {
+      changeLog = null;
+    }
+
+    if (additionalSettings['useFirstApkOfVersion'] == true) {
+      apkUrls = [apkUrls.first];
+    }
+
+    return APKDetails(
+      version,
+      apkUrls,
+      AppNames(author, appName),
+      releaseDate: releaseDate,
+      changeLog: changeLog,
+    );
+  }
+
+  @override
+  Future<Map<String, String>?> getRequestHeaders(
+    Map<String, dynamic> additionalSettings, {
+    bool forAPKDownload = false,
+  }) async {
+    if (forAPKDownload) {
+      return null;
     } else {
-      throw getObtainiumHttpError(res);
+      return {
+        "Ual-Access-Businessid": "projecta",
+        "Ual-Access-ProjectA":
+            '{"device_info":{"os_ver":"${((await DeviceInfoPlugin().androidInfo).version.sdkInt)}"}}',
+      };
     }
   }
 
@@ -163,41 +160,56 @@ class APKPure extends AppSource {
     Map<String, dynamic> additionalSettings,
   ) async {
     String appId = (await tryInferringAppId(standardUrl))!;
-    String host = Uri.parse(standardUrl).host;
 
-    var res0 = await sourceRequest('$standardUrl/versions', additionalSettings);
-    var decodedStandardUrl = standardUrl;
-    try {
-      decodedStandardUrl = Uri.decodeFull(decodedStandardUrl);
-    } catch (e) {
-      //
+    List<String> supportedArchs =
+        (await DeviceInfoPlugin().androidInfo).supportedAbis;
+
+    // request versions from API
+    var res = await sourceRequest(
+      "https://tapi.pureapk.com/v3/get_app_his_version?package_name=$appId&hl=en",
+      additionalSettings,
+    );
+    if (res.statusCode != 200) {
+      throw getObtainiumHttpError(res);
     }
-    var versionLinks = await grabLinksCommon(res0, {
-      'skipSort': true,
-      'customLinkFilterRegex': '$decodedStandardUrl/download/[^/]+\$'
-    });
+    List<Map<String, dynamic>> apks = jsonDecode(
+      res.body,
+    )['version_list'].cast<Map<String, dynamic>>();
 
-    var supportedArchs = (await DeviceInfoPlugin().androidInfo).supportedAbis;
+    // group by version
+    List<List<Map<String, dynamic>>> versions = apks
+        .fold<Map<String, List<Map<String, dynamic>>>>({}, (
+          Map<String, List<Map<String, dynamic>>> val,
+          Map<String, dynamic> element,
+        ) {
+          String v = element['version_name'];
+          if (!val.containsKey(v)) {
+            val[v] = [];
+          }
+          val[v]?.add(element);
+          return val;
+        })
+        .values
+        .toList();
 
-    if (additionalSettings['autoApkFilterByArch'] != true) {
-      // No need to request multiple versions when we're not going to filter them (always pick the top one)
-      versionLinks = versionLinks.sublist(0, 1);
-    }
-    if (versionLinks.isEmpty) {
+    if (versions.isEmpty) {
       throw NoReleasesError();
     }
 
-    for (var i = 0; i < versionLinks.length; i++) {
-      var link = versionLinks[i];
+    for (var i = 0; i < versions.length; i++) {
+      var v = versions[i];
       try {
         if (i == 0 && additionalSettings['stayOneVersionBehind'] == true) {
           throw NoReleasesError();
         }
-        return await getDetailsForVersionLink(standardUrl, appId, host,
-            supportedArchs, link.key, additionalSettings);
+        return await getDetailsForVersion(
+          v,
+          supportedArchs,
+          additionalSettings,
+        );
       } catch (e) {
         if (additionalSettings['fallbackToOlderReleases'] != true ||
-            i == versionLinks.length - 1) {
+            i == versions.length - 1) {
           rethrow;
         }
       }

lib/app_sources/aptoide.dart

@@ -16,8 +16,9 @@ class Aptoide extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://([^\\.]+\\.){2,}${getSourceRegex(hosts)}',
-        caseSensitive: false);
+      '^https?://([^\\.]+\\.){2,}${getSourceRegex(hosts)}',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -26,14 +27,20 @@ class Aptoide extends AppSource {
   }
 
   @override
-  Future<String?> tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) async {
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
     return (await getAppDetailsJSON(
-        standardUrl, additionalSettings))['package'];
+      standardUrl,
+      additionalSettings,
+    ))['package'];
   }
 
   Future<Map<String, dynamic>> getAppDetailsJSON(
-      String standardUrl, Map<String, dynamic> additionalSettings) async {
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
     var res = await sourceRequest(standardUrl, additionalSettings);
     if (res.statusCode != 200) {
       throw getObtainiumHttpError(res);
@@ -46,7 +53,9 @@ class Aptoide extends AppSource {
       throw NoReleasesError();
     }
     var res2 = await sourceRequest(
-        'https://ws2.aptoide.com/api/7/getApp/app_id/$id', additionalSettings);
+      'https://ws2.aptoide.com/api/7/getApp/app_id/$id',
+      additionalSettings,
+    );
     if (res2.statusCode != 200) {
       throw getObtainiumHttpError(res);
     }
@@ -76,7 +85,10 @@ class Aptoide extends AppSource {
     }
 
     return APKDetails(
-        version, getApkUrlsFromUrls([apkUrl]), AppNames(author, appName),
-        releaseDate: relDate);
+      version,
+      getApkUrlsFromUrls([apkUrl]),
+      AppNames(author, appName),
+      releaseDate: relDate,
+    );
   }
 }

lib/app_sources/codeberg.dart

@@ -18,8 +18,9 @@ class Codeberg extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -36,8 +37,9 @@ class Codeberg extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    return await gh.getLatestAPKDetailsCommon2(standardUrl, additionalSettings,
-        (bool useTagUrl) async {
+    return await gh.getLatestAPKDetailsCommon2(standardUrl, additionalSettings, (
+      bool useTagUrl,
+    ) async {
       return 'https://${hosts[0]}/api/v1/repos${standardUrl.substring('https://${hosts[0]}'.length)}/${useTagUrl ? 'tags' : 'releases'}?per_page=100';
     }, null);
   }
@@ -49,12 +51,15 @@ class Codeberg extends AppSource {
   }
 
   @override
-  Future<Map<String, List<String>>> search(String query,
-      {Map<String, dynamic> querySettings = const {}}) async {
+  Future<Map<String, List<String>>> search(
+    String query, {
+    Map<String, dynamic> querySettings = const {},
+  }) async {
     return gh.searchCommon(
-        query,
-        'https://${hosts[0]}/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100',
-        'data',
-        querySettings: querySettings);
+      query,
+      'https://${hosts[0]}/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100',
+      'data',
+      querySettings: querySettings,
+    );
   }
 }

lib/app_sources/coolapk.dart

@@ -13,13 +13,15 @@ class CoolApk extends AppSource {
     hosts = ['www.coolapk.com', 'api2.coolapk.com'];
     allowSubDomains = true;
     naiveStandardVersionDetection = true;
+    allowOverride = false;
   }
 
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        r'^https?://(www\.)?coolapk\.com/apk/[^/]+',
-        caseSensitive: false);
+      r'^https?://(www\.)?coolapk\.com/apk/[^/]+',
+      caseSensitive: false,
+    );
     var match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -29,17 +31,19 @@ class CoolApk extends AppSource {
   }
 
   @override
-  Future<String?> tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) async {
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
     String appId = Uri.parse(standardUrl).pathSegments.last;
     return appId;
   }
 
   @override
   Future<APKDetails> getLatestAPKDetails(
-      String standardUrl,
-      Map<String, dynamic> additionalSettings,
-      ) async {
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
     String appId = (await tryInferringAppId(standardUrl))!;
     String apiUrl = 'https://api2.coolapk.com';
 
@@ -64,13 +68,19 @@ class CoolApk extends AppSource {
     String changelog = detail['changelog']?.toString() ?? '';
     int? releaseDate = detail['lastupdate'] != null
         ? (detail['lastupdate'] is int
-        ? detail['lastupdate'] * 1000
-        : int.parse(detail['lastupdate'].toString()) * 1000)
+              ? detail['lastupdate'] * 1000
+              : int.parse(detail['lastupdate'].toString()) * 1000)
         : null;
     String aid = detail['id'].toString();
 
     // get apk url
-    String apkUrl = await _getLatestApkUrl(apiUrl, appId, aid, version, headers);
+    String apkUrl = await _getLatestApkUrl(
+      apiUrl,
+      appId,
+      aid,
+      version,
+      headers,
+    );
     if (apkUrl.isEmpty) {
       throw NoAPKError();
     }
@@ -88,8 +98,13 @@ class CoolApk extends AppSource {
     );
   }
 
-  Future<String> _getLatestApkUrl(String apiUrl, String appId, String aid,
-      String version, Map<String, String>? headers) async {
+  Future<String> _getLatestApkUrl(
+    String apiUrl,
+    String appId,
+    String aid,
+    String version,
+    Map<String, String>? headers,
+  ) async {
     String url = '$apiUrl/v6/apk/download?pn=$appId&aid=$aid';
     var res = await sourceRequest(url, {}, followRedirects: false);
     if (res.statusCode >= 300 && res.statusCode < 400) {
@@ -101,13 +116,14 @@ class CoolApk extends AppSource {
 
   @override
   Future<Map<String, String>?> getRequestHeaders(
-      Map<String, dynamic> additionalSettings,
-      {bool forAPKDownload = false}) async {
+    Map<String, dynamic> additionalSettings, {
+    bool forAPKDownload = false,
+  }) async {
     var tokenPair = _getToken();
     // CoolAPK header
     return {
       'User-Agent':
-      'Dalvik/2.1.0 (Linux; U; Android 9; MI 8 SE MIUI/9.5.9) (#Build; Xiaomi; MI 8 SE; PKQ1.181121.001; 9) +CoolMarket/12.4.2-2208241-universal',
+          'Dalvik/2.1.0 (Linux; U; Android 9; MI 8 SE MIUI/9.5.9) (#Build; Xiaomi; MI 8 SE; PKQ1.181121.001; 9) +CoolMarket/12.4.2-2208241-universal',
       'X-App-Id': 'com.coolapk.market',
       'X-Requested-With': 'XMLHttpRequest',
       'X-Sdk-Int': '30',
@@ -127,14 +143,15 @@ class CoolApk extends AppSource {
   Map<String, String> _getToken() {
     final rand = Random();
 
-    String randHexString(int n) =>
-        List.generate(n, (_) => rand.nextInt(256).toRadixString(16).padLeft(2, '0'))
-            .join()
-            .toUpperCase();
+    String randHexString(int n) => List.generate(
+      n,
+      (_) => rand.nextInt(256).toRadixString(16).padLeft(2, '0'),
+    ).join().toUpperCase();
 
-    String randMacAddress() =>
-        List.generate(6, (_) => rand.nextInt(256).toRadixString(16).padLeft(2, '0'))
-            .join(':');
+    String randMacAddress() => List.generate(
+      6,
+      (_) => rand.nextInt(256).toRadixString(16).padLeft(2, '0'),
+    ).join(':');
 
     // 加密算法来自 https://github.com/XiaoMengXinX/FuckCoolapkTokenV2、https://github.com/Coolapk-UWP/Coolapk-UWP
     // device
@@ -146,11 +163,13 @@ class CoolApk extends AppSource {
     const buildNumber = 'SQ1D.220105.007';
 
     // generate deviceCode
-    String deviceCode =
-    base64.encode('$aid; ; ; $mac; $manufactor; $brand; $model; $buildNumber'.codeUnits);
+    String deviceCode = base64.encode(
+      '$aid; ; ; $mac; $manufactor; $brand; $model; $buildNumber'.codeUnits,
+    );
 
     // generate timestamp
-    String timeStamp = (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString();
+    String timeStamp = (DateTime.now().millisecondsSinceEpoch ~/ 1000)
+        .toString();
     String base64TimeStamp = base64.encode(timeStamp.codeUnits);
     String md5TimeStamp = md5.convert(timeStamp.codeUnits).toString();
     String md5DeviceCode = md5.convert(deviceCode.codeUnits).toString();
@@ -163,11 +182,12 @@ class CoolApk extends AppSource {
     String md5Token = md5.convert(token.codeUnits).toString();
 
     // generate salt and hash
-    String bcryptSalt = '\$2a\$10\$${base64TimeStamp.substring(0, 14)}/${md5Token.substring(0, 6)}u';
+    String bcryptSalt =
+        '\$2a\$10\$${base64TimeStamp.substring(0, 14)}/${md5Token.substring(0, 6)}u';
     String bcryptResult = BCrypt.hashpw(md5Base64Token, bcryptSalt);
     String reBcryptResult = bcryptResult.replaceRange(0, 3, '\$2y');
     String finalToken = 'v2${base64.encode(reBcryptResult.codeUnits)}';
 
     return {'deviceCode': deviceCode, 'token': finalToken};
   }
-}
+}

lib/app_sources/directAPKLink.dart

@@ -11,20 +11,23 @@ class DirectAPKLink extends AppSource {
     name = tr('directAPKLink');
     additionalSourceAppSpecificSettingFormItems = [
       ...html.additionalSourceAppSpecificSettingFormItems
-          .where((element) => element
-              .where((element) => element.key == 'requestHeader')
-              .isNotEmpty)
-          .toList(),
+          .where(
+            (element) => element
+                .where((element) => element.key == 'requestHeader')
+                .isNotEmpty,
+          )
+          ,
       [
         GeneratedFormDropdown(
-            'defaultPseudoVersioningMethod',
-            [
-              MapEntry('partialAPKHash', tr('partialAPKHash')),
-              MapEntry('ETag', 'ETag')
-            ],
-            label: tr('defaultPseudoVersioningMethod'),
-            defaultValue: 'partialAPKHash')
-      ]
+          'defaultPseudoVersioningMethod',
+          [
+            MapEntry('partialAPKHash', tr('partialAPKHash')),
+            MapEntry('ETag', 'ETag'),
+          ],
+          label: tr('defaultPseudoVersioningMethod'),
+          defaultValue: 'partialAPKHash',
+        ),
+      ],
     ];
     excludeCommonSettingKeys = [
       'versionExtractionRegEx',
@@ -32,7 +35,7 @@ class DirectAPKLink extends AppSource {
       'versionDetection',
       'useVersionCodeAsOSVersion',
       'apkFilterRegEx',
-      'autoApkFilterByArch'
+      'autoApkFilterByArch',
     ];
   }
 
@@ -51,10 +54,13 @@ class DirectAPKLink extends AppSource {
 
   @override
   Future<Map<String, String>?> getRequestHeaders(
-      Map<String, dynamic> additionalSettings,
-      {bool forAPKDownload = false}) {
-    return html.getRequestHeaders(additionalSettings,
-        forAPKDownload: forAPKDownload);
+    Map<String, dynamic> additionalSettings, {
+    bool forAPKDownload = false,
+  }) {
+    return html.getRequestHeaders(
+      additionalSettings,
+      forAPKDownload: forAPKDownload,
+    );
   }
 
   @override
@@ -62,8 +68,9 @@ class DirectAPKLink extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    var additionalSettingsNew =
-        getDefaultValuesFromFormItems(html.combinedAppSpecificSettingFormItems);
+    var additionalSettingsNew = getDefaultValuesFromFormItems(
+      html.combinedAppSpecificSettingFormItems,
+    );
     for (var s in additionalSettings.keys) {
       if (additionalSettingsNew.containsKey(s)) {
         additionalSettingsNew[s] = additionalSettings[s];

lib/app_sources/fdroid.dart

@@ -17,22 +17,28 @@ class FDroid extends AppSource {
     canSearch = true;
     additionalSourceAppSpecificSettingFormItems = [
       [
-        GeneratedFormTextField('filterVersionsByRegEx',
-            label: tr('filterVersionsByRegEx'),
-            required: false,
-            additionalValidators: [
-              (value) {
-                return regExValidator(value);
-              }
-            ])
+        GeneratedFormTextField(
+          'filterVersionsByRegEx',
+          label: tr('filterVersionsByRegEx'),
+          required: false,
+          additionalValidators: [
+            (value) {
+              return regExValidator(value);
+            },
+          ],
+        ),
       ],
       [
-        GeneratedFormSwitch('trySelectingSuggestedVersionCode',
-            label: tr('trySelectingSuggestedVersionCode'))
+        GeneratedFormSwitch(
+          'trySelectingSuggestedVersionCode',
+          label: tr('trySelectingSuggestedVersionCode'),
+        ),
       ],
       [
-        GeneratedFormSwitch('autoSelectHighestVersionCode',
-            label: tr('autoSelectHighestVersionCode'))
+        GeneratedFormSwitch(
+          'autoSelectHighestVersionCode',
+          label: tr('autoSelectHighestVersionCode'),
+        ),
       ],
     ];
   }
@@ -40,16 +46,18 @@ class FDroid extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegExB = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}/+[^/]+/+packages/+[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}/+[^/]+/+packages/+[^/]+',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegExB.firstMatch(url);
     if (match != null) {
       url =
           'https://${Uri.parse(match.group(0)!).host}/packages/${Uri.parse(url).pathSegments.where((s) => s.trim().isNotEmpty).last}';
     }
     RegExp standardUrlRegExA = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}/+packages/+[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}/+packages/+[^/]+',
+      caseSensitive: false,
+    );
     match = standardUrlRegExA.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -58,8 +66,10 @@ class FDroid extends AppSource {
   }
 
   @override
-  Future<String?> tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) async {
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
@@ -71,22 +81,28 @@ class FDroid extends AppSource {
     String? appId = await tryInferringAppId(standardUrl);
     String host = Uri.parse(standardUrl).host;
     var details = getAPKUrlsFromFDroidPackagesAPIResponse(
-        await sourceRequest(
-            'https://$host/api/v1/packages/$appId', additionalSettings),
-        'https://$host/repo/$appId',
-        standardUrl,
-        name,
-        additionalSettings: additionalSettings);
+      await sourceRequest(
+        'https://$host/api/v1/packages/$appId',
+        additionalSettings,
+      ),
+      'https://$host/repo/$appId',
+      standardUrl,
+      name,
+      additionalSettings: additionalSettings,
+    );
     if (!hostChanged) {
       try {
         var res = await sourceRequest(
-            'https://gitlab.com/fdroid/fdroiddata/-/raw/master/metadata/$appId.yml',
-            additionalSettings);
+          'https://gitlab.com/fdroid/fdroiddata/-/raw/master/metadata/$appId.yml',
+          additionalSettings,
+        );
         var lines = res.body.split('\n');
         var authorLines = lines.where((l) => l.startsWith('AuthorName: '));
         if (authorLines.isNotEmpty) {
-          details.names.author =
-              authorLines.first.split(': ').sublist(1).join(': ');
+          details.names.author = authorLines.first
+              .split(': ')
+              .sublist(1)
+              .join(': ');
         }
         var changelogUrls = lines
             .where((l) => l.startsWith('Changelog: '))
@@ -110,9 +126,9 @@ class FDroid extends AppSource {
           if ((isGitHub || isGitLab) &&
               (details.changeLog?.indexOf('/blob/') ?? -1) >= 0) {
             details.changeLog = (await sourceRequest(
-                    details.changeLog!.replaceFirst('/blob/', '/raw/'),
-                    additionalSettings))
-                .body;
+              details.changeLog!.replaceFirst('/blob/', '/raw/'),
+              additionalSettings,
+            )).body;
           }
         }
       } catch (e) {
@@ -126,10 +142,14 @@ class FDroid extends AppSource {
   }
 
   @override
-  Future<Map<String, List<String>>> search(String query,
-      {Map<String, dynamic> querySettings = const {}}) async {
+  Future<Map<String, List<String>>> search(
+    String query, {
+    Map<String, dynamic> querySettings = const {},
+  }) async {
     Response res = await sourceRequest(
-        'https://search.${hosts[0]}/?q=${Uri.encodeQueryComponent(query)}', {});
+      'https://search.${hosts[0]}/?q=${Uri.encodeQueryComponent(query)}',
+      {},
+    );
     if (res.statusCode == 200) {
       Map<String, List<String>> urlsWithDescriptions = {};
       parse(res.body).querySelectorAll('.package-header').forEach((e) {
@@ -145,7 +165,7 @@ class FDroid extends AppSource {
           urlsWithDescriptions[url] = [
             e.querySelector('.package-name')?.text.trim() ?? '',
             e.querySelector('.package-summary')?.text.trim() ??
-                tr('noDescription')
+                tr('noDescription'),
           ];
         }
       });
@@ -156,29 +176,36 @@ class FDroid extends AppSource {
   }
 
   APKDetails getAPKUrlsFromFDroidPackagesAPIResponse(
-      Response res, String apkUrlPrefix, String standardUrl, String sourceName,
-      {Map<String, dynamic> additionalSettings = const {}}) {
+    Response res,
+    String apkUrlPrefix,
+    String standardUrl,
+    String sourceName, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) {
     var autoSelectHighestVersionCode =
         additionalSettings['autoSelectHighestVersionCode'] == true;
     var trySelectingSuggestedVersionCode =
         additionalSettings['trySelectingSuggestedVersionCode'] == true;
     var filterVersionsByRegEx =
         (additionalSettings['filterVersionsByRegEx'] as String?)?.isNotEmpty ==
-                true
-            ? additionalSettings['filterVersionsByRegEx']
-            : null;
+            true
+        ? additionalSettings['filterVersionsByRegEx']
+        : null;
     var apkFilterRegEx =
         (additionalSettings['apkFilterRegEx'] as String?)?.isNotEmpty == true
-            ? additionalSettings['apkFilterRegEx']
-            : null;
+        ? additionalSettings['apkFilterRegEx']
+        : null;
     if (res.statusCode == 200) {
       var response = jsonDecode(res.body);
       List<dynamic> releases = response['packages'] ?? [];
       if (apkFilterRegEx != null) {
         releases = releases.where((rel) {
           String apk = '${apkUrlPrefix}_${rel['versionCode']}.apk';
-          return filterApks([MapEntry(apk, apk)], apkFilterRegEx, false)
-              .isNotEmpty;
+          return filterApks(
+            [MapEntry(apk, apk)],
+            apkFilterRegEx,
+            false,
+          ).isNotEmpty;
         }).toList();
       }
       if (releases.isEmpty) {
@@ -191,8 +218,10 @@ class FDroid extends AppSource {
       if (trySelectingSuggestedVersionCode &&
           response['suggestedVersionCode'] != null &&
           filterVersionsByRegEx == null) {
-        var suggestedReleases = releases.where((element) =>
-            element['versionCode'] == response['suggestedVersionCode']);
+        var suggestedReleases = releases.where(
+          (element) =>
+              element['versionCode'] == response['suggestedVersionCode'],
+        );
         if (suggestedReleases.isNotEmpty) {
           releaseChoices = suggestedReleases;
           version = suggestedReleases.first['versionName'];
@@ -203,8 +232,9 @@ class FDroid extends AppSource {
         version = null;
         releaseChoices = [];
         for (var i = 0; i < releases.length; i++) {
-          if (RegExp(filterVersionsByRegEx!)
-              .hasMatch(releases[i]['versionName'])) {
+          if (RegExp(
+            filterVersionsByRegEx!,
+          ).hasMatch(releases[i]['versionName'])) {
             version = releases[i]['versionName'];
           }
         }
@@ -219,8 +249,9 @@ class FDroid extends AppSource {
       }
       // If a suggested release was not already picked, pick all those with the selected version
       if (releaseChoices.isEmpty) {
-        releaseChoices =
-            releases.where((element) => element['versionName'] == version);
+        releaseChoices = releases.where(
+          (element) => element['versionName'] == version,
+        );
       }
       // For the remaining releases, use the toggles to auto-select one if possible
       if (releaseChoices.length > 1) {
@@ -228,8 +259,10 @@ class FDroid extends AppSource {
           releaseChoices = [releaseChoices.first];
         } else if (trySelectingSuggestedVersionCode &&
             response['suggestedVersionCode'] != null) {
-          var suggestedReleases = releaseChoices.where((element) =>
-              element['versionCode'] == response['suggestedVersionCode']);
+          var suggestedReleases = releaseChoices.where(
+            (element) =>
+                element['versionCode'] == response['suggestedVersionCode'],
+          );
           if (suggestedReleases.isNotEmpty) {
             releaseChoices = suggestedReleases;
           }
@@ -241,8 +274,11 @@ class FDroid extends AppSource {
       List<String> apkUrls = releaseChoices
           .map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
           .toList();
-      return APKDetails(version, getApkUrlsFromUrls(apkUrls.toSet().toList()),
-          AppNames(sourceName, Uri.parse(standardUrl).pathSegments.last));
+      return APKDetails(
+        version,
+        getApkUrlsFromUrls(apkUrls.toSet().toList()),
+        AppNames(sourceName, Uri.parse(standardUrl).pathSegments.last),
+      );
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/fdroidrepo.dart

@@ -15,15 +15,20 @@ class FDroidRepo extends AppSource {
 
     additionalSourceAppSpecificSettingFormItems = [
       [
-        GeneratedFormTextField('appIdOrName',
-            label: tr('appIdOrName'),
-            hint: tr('reposHaveMultipleApps'),
-            required: true)
+        GeneratedFormTextField(
+          'appIdOrName',
+          label: tr('appIdOrName'),
+          hint: tr('reposHaveMultipleApps'),
+          required: true,
+        ),
       ],
       [
-        GeneratedFormSwitch('pickHighestVersionCode',
-            label: tr('pickHighestVersionCode'), defaultValue: false)
-      ]
+        GeneratedFormSwitch(
+          'pickHighestVersionCode',
+          label: tr('pickHighestVersionCode'),
+          defaultValue: false,
+        ),
+      ],
     ];
   }
 
@@ -54,8 +59,10 @@ class FDroidRepo extends AppSource {
   }
 
   @override
-  Future<Map<String, List<String>>> search(String query,
-      {Map<String, dynamic> querySettings = const {}}) async {
+  Future<Map<String, List<String>>> search(
+    String query, {
+    Map<String, dynamic> querySettings = const {},
+  }) async {
     String? url = querySettings['url'];
     if (url == null) {
       throw NoReleasesError();
@@ -73,11 +80,8 @@ class FDroidRepo extends AppSource {
             appId.contains(query) ||
             appName.contains(query) ||
             appDesc.contains(query)) {
-          results[
-              '${res.request!.url.toString().split('/').reversed.toList().sublist(1).reversed.join('/')}?appId=$appId'] = [
-            appName,
-            appDesc
-          ];
+          results['${res.request!.url.toString().split('/').reversed.toList().sublist(1).reversed.join('/')}?appId=$appId'] =
+              [appName, appDesc];
         }
       });
       return results;
@@ -90,21 +94,21 @@ class FDroidRepo extends AppSource {
   void runOnAddAppInputChange(String userInput) {
     additionalSourceAppSpecificSettingFormItems =
         additionalSourceAppSpecificSettingFormItems.map((row) {
-      row = row.map((item) {
-        if (item.key == 'appIdOrName') {
-          try {
-            var appId = Uri.parse(userInput).queryParameters['appId'];
-            if (appId != null && item is GeneratedFormTextField) {
-              item.required = false;
+          row = row.map((item) {
+            if (item.key == 'appIdOrName') {
+              try {
+                var appId = Uri.parse(userInput).queryParameters['appId'];
+                if (appId != null && item is GeneratedFormTextField) {
+                  item.required = false;
+                }
+              } catch (e) {
+                //
+              }
             }
-          } catch (e) {
-            //
-          }
-        }
-        return item;
-      }).toList();
-      return row;
-    }).toList();
+            return item;
+          }).toList();
+          return row;
+        }).toList();
   }
 
   @override
@@ -119,8 +123,11 @@ class FDroidRepo extends AppSource {
     if (appId != null) {
       app.url = uri
           .replace(
-              queryParameters: Map.fromEntries(
-                  [...uri.queryParameters.entries, MapEntry('appId', appId)]))
+            queryParameters: Map.fromEntries([
+              ...uri.queryParameters.entries,
+              MapEntry('appId', appId),
+            ]),
+          )
           .toString();
       app.additionalSettings['appIdOrName'] = appId;
       app.id = appId;
@@ -133,8 +140,9 @@ class FDroidRepo extends AppSource {
     Map<String, dynamic> additionalSettings,
   ) async {
     var res = await sourceRequest(
-        '$url${url.endsWith('/index.xml') ? '' : '/index.xml'}',
-        additionalSettings);
+      '$url${url.endsWith('/index.xml') ? '' : '/index.xml'}',
+      additionalSettings,
+    );
     if (res.statusCode != 200) {
       var base = url.endsWith('/index.xml')
           ? url.split('/').reversed.toList().sublist(1).reversed.join('/')
@@ -142,7 +150,9 @@ class FDroidRepo extends AppSource {
       res = await sourceRequest('$base/repo/index.xml', additionalSettings);
       if (res.statusCode != 200) {
         res = await sourceRequest(
-            '$base/fdroid/repo/index.xml', additionalSettings);
+          '$base/fdroid/repo/index.xml',
+          additionalSettings,
+        );
       }
     }
     return res;
@@ -164,8 +174,10 @@ class FDroidRepo extends AppSource {
       throw NoReleasesError();
     }
     additionalSettings['appIdOrName'] = appIdOrName;
-    var res =
-        await sourceRequestWithURLVariants(standardUrl, additionalSettings);
+    var res = await sourceRequestWithURLVariants(
+      standardUrl,
+      additionalSettings,
+    );
     if (res.statusCode == 200) {
       var body = parse(res.body);
       var foundApps = body.querySelectorAll('application').where((element) {
@@ -202,24 +214,32 @@ class FDroidRepo extends AppSource {
         throw NoVersionError();
       }
       var latestVersionReleases = releases
-          .where((element) =>
-              element.querySelector('version')?.innerHtml == latestVersion &&
-              element.querySelector('apkname') != null)
+          .where(
+            (element) =>
+                element.querySelector('version')?.innerHtml == latestVersion &&
+                element.querySelector('apkname') != null,
+          )
           .toList();
       if (latestVersionReleases.length > 1 && pickHighestVersionCode) {
         latestVersionReleases.sort((e1, e2) {
-          return int.parse(e2.querySelector('versioncode')!.innerHtml)
-              .compareTo(int.parse(e1.querySelector('versioncode')!.innerHtml));
+          return int.parse(
+            e2.querySelector('versioncode')!.innerHtml,
+          ).compareTo(int.parse(e1.querySelector('versioncode')!.innerHtml));
         });
         latestVersionReleases = [latestVersionReleases[0]];
       }
       List<String> apkUrls = latestVersionReleases
-          .map((e) =>
-              '${res.request!.url.toString().split('/').reversed.toList().sublist(1).reversed.join('/')}/${e.querySelector('apkname')!.innerHtml}')
+          .map(
+            (e) =>
+                '${res.request!.url.toString().split('/').reversed.toList().sublist(1).reversed.join('/')}/${e.querySelector('apkname')!.innerHtml}',
+          )
           .toList();
-      return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
-          AppNames(authorName, appName),
-          releaseDate: releaseDate);
+      return APKDetails(
+        latestVersion,
+        getApkUrlsFromUrls(apkUrls),
+        AppNames(authorName, appName),
+        releaseDate: releaseDate,
+      );
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/github.dart

@@ -19,145 +19,185 @@ class GitHub extends AppSource {
     showReleaseDateAsVersionToggle = true;
 
     sourceConfigSettingFormItems = [
-      GeneratedFormTextField('github-creds',
-          label: tr('githubPATLabel'),
-          password: true,
-          required: false,
-          belowWidgets: [
-            const SizedBox(
-              height: 4,
+      GeneratedFormTextField(
+        'github-creds',
+        label: tr('githubPATLabel'),
+        password: true,
+        required: false,
+        belowWidgets: [
+          const SizedBox(height: 4),
+          GestureDetector(
+            onTap: () {
+              launchUrlString(
+                'https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token',
+                mode: LaunchMode.externalApplication,
+              );
+            },
+            child: Text(
+              tr('about'),
+              style: const TextStyle(
+                decoration: TextDecoration.underline,
+                fontSize: 12,
+              ),
             ),
-            GestureDetector(
-                onTap: () {
-                  launchUrlString(
-                      'https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token',
-                      mode: LaunchMode.externalApplication);
-                },
-                child: Text(
-                  tr('about'),
-                  style: const TextStyle(
-                      decoration: TextDecoration.underline, fontSize: 12),
-                )),
-            const SizedBox(
-              height: 4,
-            ),
-          ])
+          ),
+          const SizedBox(height: 4),
+        ],
+      ),
     ];
 
     additionalSourceAppSpecificSettingFormItems = [
       [
-        GeneratedFormSwitch('includePrereleases',
-            label: tr('includePrereleases'), defaultValue: false)
+        GeneratedFormSwitch(
+          'includePrereleases',
+          label: tr('includePrereleases'),
+          defaultValue: false,
+        ),
       ],
       [
-        GeneratedFormSwitch('fallbackToOlderReleases',
-            label: tr('fallbackToOlderReleases'), defaultValue: true)
+        GeneratedFormSwitch(
+          'fallbackToOlderReleases',
+          label: tr('fallbackToOlderReleases'),
+          defaultValue: true,
+        ),
       ],
       [
-        GeneratedFormTextField('filterReleaseTitlesByRegEx',
-            label: tr('filterReleaseTitlesByRegEx'),
-            required: false,
-            additionalValidators: [
-              (value) {
-                return regExValidator(value);
-              }
-            ])
+        GeneratedFormTextField(
+          'filterReleaseTitlesByRegEx',
+          label: tr('filterReleaseTitlesByRegEx'),
+          required: false,
+          additionalValidators: [
+            (value) {
+              return regExValidator(value);
+            },
+          ],
+        ),
       ],
       [
-        GeneratedFormTextField('filterReleaseNotesByRegEx',
-            label: tr('filterReleaseNotesByRegEx'),
-            required: false,
-            additionalValidators: [
-              (value) {
-                return regExValidator(value);
-              }
-            ])
+        GeneratedFormTextField(
+          'filterReleaseNotesByRegEx',
+          label: tr('filterReleaseNotesByRegEx'),
+          required: false,
+          additionalValidators: [
+            (value) {
+              return regExValidator(value);
+            },
+          ],
+        ),
       ],
       [GeneratedFormSwitch('verifyLatestTag', label: tr('verifyLatestTag'))],
       [
         GeneratedFormDropdown(
-            'sortMethodChoice',
-            [
-              MapEntry('date', tr('releaseDate')),
-              MapEntry('smartname', tr('smartname')),
-              MapEntry('none', tr('none')),
-              MapEntry('smartname-datefallback',
-                  '${tr('smartname')} x ${tr('releaseDate')}'),
-              MapEntry('name', tr('name')),
-            ],
-            label: tr('sortMethod'),
-            defaultValue: 'date')
+          'sortMethodChoice',
+          [
+            MapEntry('date', tr('releaseDate')),
+            MapEntry('smartname', tr('smartname')),
+            MapEntry('none', tr('none')),
+            MapEntry(
+              'smartname-datefallback',
+              '${tr('smartname')} x ${tr('releaseDate')}',
+            ),
+            MapEntry('name', tr('name')),
+          ],
+          label: tr('sortMethod'),
+          defaultValue: 'date',
+        ),
       ],
       [
-        GeneratedFormSwitch('useLatestAssetDateAsReleaseDate',
-            label: tr('useLatestAssetDateAsReleaseDate'), defaultValue: false)
+        GeneratedFormSwitch(
+          'useLatestAssetDateAsReleaseDate',
+          label: tr('useLatestAssetDateAsReleaseDate'),
+          defaultValue: false,
+        ),
       ],
       [
-        GeneratedFormSwitch('releaseTitleAsVersion',
-            label: tr('releaseTitleAsVersion'), defaultValue: false)
-      ]
+        GeneratedFormSwitch(
+          'releaseTitleAsVersion',
+          label: tr('releaseTitleAsVersion'),
+          defaultValue: false,
+        ),
+      ],
     ];
 
     canSearch = true;
     searchQuerySettingFormItems = [
-      GeneratedFormTextField('minStarCount',
-          label: tr('minStarCount'),
-          defaultValue: '0',
-          additionalValidators: [
-            (value) {
-              try {
-                int.parse(value ?? '0');
-              } catch (e) {
-                return tr('invalidInput');
-              }
-              return null;
+      GeneratedFormTextField(
+        'minStarCount',
+        label: tr('minStarCount'),
+        defaultValue: '0',
+        additionalValidators: [
+          (value) {
+            try {
+              int.parse(value ?? '0');
+            } catch (e) {
+              return tr('invalidInput');
             }
-          ])
+            return null;
+          },
+        ],
+      ),
     ];
   }
 
   @override
-  Future<String?> tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) async {
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
     const possibleBuildGradleLocations = [
       '/app/build.gradle',
       'android/app/build.gradle',
-      'src/app/build.gradle'
+      'src/app/build.gradle',
     ];
     for (var path in possibleBuildGradleLocations) {
       try {
         var res = await sourceRequest(
-            '${await convertStandardUrlToAPIUrl(standardUrl, additionalSettings)}/contents/$path',
-            additionalSettings);
+          '${await convertStandardUrlToAPIUrl(standardUrl, additionalSettings)}/contents/$path',
+          additionalSettings,
+        );
         if (res.statusCode == 200) {
           try {
             var body = jsonDecode(res.body);
             var trimmedLines = utf8
-                .decode(base64
-                    .decode(body['content'].toString().split('\n').join('')))
+                .decode(
+                  base64.decode(
+                    body['content'].toString().split('\n').join(''),
+                  ),
+                )
                 .split('\n')
                 .map((e) => e.trim());
-            var appIds = trimmedLines.where((l) =>
-                l.startsWith('applicationId "') ||
-                l.startsWith('applicationId \''));
-            appIds = appIds.map((appId) => appId
-                .split(appId.startsWith('applicationId "') ? '"' : '\'')[1]);
-            appIds = appIds.map((appId) {
-              if (appId.startsWith('\${') && appId.endsWith('}')) {
-                appId = trimmedLines
-                    .where((l) => l.startsWith(
-                        'def ${appId.substring(2, appId.length - 1)}'))
-                    .first;
-                appId = appId.split(appId.contains('"') ? '"' : '\'')[1];
-              }
-              return appId;
-            }).where((appId) => appId.isNotEmpty);
+            var appIds = trimmedLines.where(
+              (l) =>
+                  l.startsWith('applicationId "') ||
+                  l.startsWith('applicationId \''),
+            );
+            appIds = appIds.map(
+              (appId) => appId.split(
+                appId.startsWith('applicationId "') ? '"' : '\'',
+              )[1],
+            );
+            appIds = appIds
+                .map((appId) {
+                  if (appId.startsWith('\${') && appId.endsWith('}')) {
+                    appId = trimmedLines
+                        .where(
+                          (l) => l.startsWith(
+                            'def ${appId.substring(2, appId.length - 1)}',
+                          ),
+                        )
+                        .first;
+                    appId = appId.split(appId.contains('"') ? '"' : '\'')[1];
+                  }
+                  return appId;
+                })
+                .where((appId) => appId.isNotEmpty);
             if (appIds.length == 1) {
               return appIds.first;
             }
           } catch (err) {
             LogsProvider().add(
-                'Error parsing build.gradle from ${res.request!.url.toString()}: ${err.toString()}');
+              'Error parsing build.gradle from ${res.request!.url.toString()}: ${err.toString()}',
+            );
           }
         }
       } catch (err) {
@@ -170,8 +210,9 @@ class GitHub extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -181,8 +222,9 @@ class GitHub extends AppSource {
 
   @override
   Future<Map<String, String>?> getRequestHeaders(
-      Map<String, dynamic> additionalSettings,
-      {bool forAPKDownload = false}) async {
+    Map<String, dynamic> additionalSettings, {
+    bool forAPKDownload = false,
+  }) async {
     var token = await getTokenIfAny(additionalSettings);
     var headers = <String, String>{};
     if (token != null && token.isNotEmpty) {
@@ -201,14 +243,17 @@ class GitHub extends AppSource {
   Future<String?> getTokenIfAny(Map<String, dynamic> additionalSettings) async {
     SettingsProvider settingsProvider = SettingsProvider();
     await settingsProvider.initializeSettings();
-    var sourceConfig =
-        await getSourceConfigValues(additionalSettings, settingsProvider);
+    var sourceConfig = await getSourceConfigValues(
+      additionalSettings,
+      settingsProvider,
+    );
     String? creds = sourceConfig['github-creds'];
     if (creds != null) {
       var userNameEndIndex = creds.indexOf(':');
       if (userNameEndIndex > 0) {
         creds = creds.substring(
-            userNameEndIndex + 1); // For old username-included token inputs
+          userNameEndIndex + 1,
+        ); // For old username-included token inputs
       }
       return creds;
     } else {
@@ -228,31 +273,36 @@ class GitHub extends AppSource {
       'https://api.${hosts[0]}';
 
   Future<String> convertStandardUrlToAPIUrl(
-          String standardUrl, Map<String, dynamic> additionalSettings) async =>
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async =>
       '${await getAPIHost(additionalSettings)}/repos${standardUrl.substring('https://${hosts[0]}'.length)}';
 
   @override
   String? changeLogPageFromStandardUrl(String standardUrl) =>
       '$standardUrl/releases';
 
-  Future<APKDetails> getLatestAPKDetailsCommon(String requestUrl,
-      String standardUrl, Map<String, dynamic> additionalSettings,
-      {Function(Response)? onHttpErrorCode}) async {
+  Future<APKDetails> getLatestAPKDetailsCommon(
+    String requestUrl,
+    String standardUrl,
+    Map<String, dynamic> additionalSettings, {
+    Function(Response)? onHttpErrorCode,
+  }) async {
     bool includePrereleases = additionalSettings['includePrereleases'] == true;
     bool fallbackToOlderReleases =
         additionalSettings['fallbackToOlderReleases'] == true;
     String? regexFilter =
         (additionalSettings['filterReleaseTitlesByRegEx'] as String?)
-                    ?.isNotEmpty ==
-                true
-            ? additionalSettings['filterReleaseTitlesByRegEx']
-            : null;
+                ?.isNotEmpty ==
+            true
+        ? additionalSettings['filterReleaseTitlesByRegEx']
+        : null;
     String? regexNotesFilter =
         (additionalSettings['filterReleaseNotesByRegEx'] as String?)
-                    ?.isNotEmpty ==
-                true
-            ? additionalSettings['filterReleaseNotesByRegEx']
-            : null;
+                ?.isNotEmpty ==
+            true
+        ? additionalSettings['filterReleaseNotesByRegEx']
+        : null;
     bool verifyLatestTag = additionalSettings['verifyLatestTag'] == true;
     bool useLatestAssetDateAsReleaseDate =
         additionalSettings['useLatestAssetDateAsReleaseDate'] == true;
@@ -262,8 +312,9 @@ class GitHub extends AppSource {
     if (verifyLatestTag) {
       var temp = requestUrl.split('?');
       Response res = await sourceRequest(
-          '${temp[0]}/latest${temp.length > 1 ? '?${temp.sublist(1).join('?')}' : ''}',
-          additionalSettings);
+        '${temp[0]}/latest${temp.length > 1 ? '?${temp.sublist(1).join('?')}' : ''}',
+        additionalSettings,
+      );
       if (res.statusCode != 200) {
         if (onHttpErrorCode != null) {
           onHttpErrorCode(res);
@@ -278,8 +329,10 @@ class GitHub extends AppSource {
       if (latestRelease != null) {
         var latestTag = latestRelease['tag_name'] ?? latestRelease['name'];
         if (releases
-            .where((element) =>
-                (element['tag_name'] ?? element['name']) == latestTag)
+            .where(
+              (element) =>
+                  (element['tag_name'] ?? element['name']) == latestTag,
+            )
             .isEmpty) {
           releases = [latestRelease, ...releases];
         }
@@ -299,10 +352,10 @@ class GitHub extends AppSource {
 
       DateTime? getPublishDateFromRelease(dynamic rel) =>
           rel?['published_at'] != null
-              ? DateTime.parse(rel['published_at'])
-              : rel?['commit']?['created'] != null
-                  ? DateTime.parse(rel['commit']['created'])
-                  : null;
+          ? DateTime.parse(rel['published_at'])
+          : rel?['commit']?['created'] != null
+          ? DateTime.parse(rel['commit']['created'])
+          : null;
       DateTime? getNewestAssetDateFromRelease(dynamic rel) {
         var allAssets = rel['assets'] as List<dynamic>?;
         var filteredAssets = rel['filteredAssets'] as List<dynamic>?;
@@ -323,8 +376,8 @@ class GitHub extends AppSource {
 
       DateTime? getReleaseDateFromRelease(dynamic rel, bool useAssetDate) =>
           !useAssetDate
-              ? getPublishDateFromRelease(rel)
-              : getNewestAssetDateFromRelease(rel);
+          ? getPublishDateFromRelease(rel)
+          : getNewestAssetDateFromRelease(rel);
 
       if (sortMethod == 'none') {
         releases = releases.reversed.toList();
@@ -340,29 +393,40 @@ class GitHub extends AppSource {
           } else {
             var nameA = a['tag_name'] ?? a['name'];
             var nameB = b['tag_name'] ?? b['name'];
-            var stdFormats = findStandardFormatsForVersion(nameA, false)
-                .intersection(findStandardFormatsForVersion(nameB, false));
+            var stdFormats = findStandardFormatsForVersion(
+              nameA,
+              false,
+            ).intersection(findStandardFormatsForVersion(nameB, false));
             if (sortMethod == 'date' ||
                 (sortMethod == 'smartname-datefallback' &&
                     stdFormats.isEmpty)) {
               return (getReleaseDateFromRelease(
-                          a, useLatestAssetDateAsReleaseDate) ??
+                        a,
+                        useLatestAssetDateAsReleaseDate,
+                      ) ??
                       DateTime(1))
-                  .compareTo(getReleaseDateFromRelease(
-                          b, useLatestAssetDateAsReleaseDate) ??
-                      DateTime(0));
+                  .compareTo(
+                    getReleaseDateFromRelease(
+                          b,
+                          useLatestAssetDateAsReleaseDate,
+                        ) ??
+                        DateTime(0),
+                  );
             } else {
               if (sortMethod != 'name' && stdFormats.isNotEmpty) {
                 var reg = RegExp(stdFormats.last);
                 var matchA = reg.firstMatch(nameA);
                 var matchB = reg.firstMatch(nameB);
                 return compareAlphaNumeric(
-                    (nameA as String).substring(matchA!.start, matchA.end),
-                    (nameB as String).substring(matchB!.start, matchB.end));
+                  (nameA as String).substring(matchA!.start, matchA.end),
+                  (nameB as String).substring(matchB!.start, matchB.end),
+                );
               } else {
                 // 'name'
                 return compareAlphaNumeric(
-                    (nameA as String), (nameB as String));
+                  (nameA as String),
+                  (nameB as String),
+                );
               }
             }
           }
@@ -374,9 +438,11 @@ class GitHub extends AppSource {
           latestRelease !=
               (releases[releases.length - 1]['tag_name'] ??
                   releases[0]['name'])) {
-        var ind = releases.indexWhere((element) =>
-            (latestRelease['tag_name'] ?? latestRelease['name']) ==
-            (element['tag_name'] ?? element['name']));
+        var ind = releases.indexWhere(
+          (element) =>
+              (latestRelease['tag_name'] ?? latestRelease['name']) ==
+              (element['tag_name'] ?? element['name']),
+        );
         if (ind >= 0) {
           releases.add(releases.removeAt(ind));
         }
@@ -404,8 +470,9 @@ class GitHub extends AppSource {
           continue;
         }
         if (regexNotesFilter != null &&
-            !RegExp(regexNotesFilter)
-                .hasMatch(((releases[i]['body'] as String?) ?? '').trim())) {
+            !RegExp(
+              regexNotesFilter,
+            ).hasMatch(((releases[i]['body'] as String?) ?? '').trim())) {
           continue;
         }
         var allAssetsWithUrls = findReleaseAssetUrls(releases[i]);
@@ -413,24 +480,31 @@ class GitHub extends AppSource {
             .map((e) => e['final_url'] as MapEntry<String, String>)
             .toList();
         var apkAssetsWithUrls = allAssetsWithUrls
-            .where((element) =>
-                (element['final_url'] as MapEntry<String, String>)
-                    .key
-                    .toLowerCase()
-                    .endsWith('.apk'))
+            .where(
+              (element) => (element['final_url'] as MapEntry<String, String>)
+                  .key
+                  .toLowerCase()
+                  .endsWith('.apk'),
+            )
             .toList();
 
         var filteredApkUrls = filterApks(
-            apkAssetsWithUrls
-                .map((e) => e['final_url'] as MapEntry<String, String>)
-                .toList(),
-            additionalSettings['apkFilterRegEx'],
-            additionalSettings['invertAPKFilter']);
+          apkAssetsWithUrls
+              .map((e) => e['final_url'] as MapEntry<String, String>)
+              .toList(),
+          additionalSettings['apkFilterRegEx'],
+          additionalSettings['invertAPKFilter'],
+        );
         var filteredApks = apkAssetsWithUrls
-            .where((e) => filteredApkUrls
-                .where((e2) =>
-                    e2.key == (e['final_url'] as MapEntry<String, String>).key)
-                .isNotEmpty)
+            .where(
+              (e) => filteredApkUrls
+                  .where(
+                    (e2) =>
+                        e2.key ==
+                        (e['final_url'] as MapEntry<String, String>).key,
+                  )
+                  .isNotEmpty,
+            )
             .toList();
 
         if (filteredApks.isEmpty && additionalSettings['trackOnly'] != true) {
@@ -441,17 +515,23 @@ class GitHub extends AppSource {
         targetRelease['filteredAssets'] = filteredApks;
         targetRelease['version'] =
             additionalSettings['releaseTitleAsVersion'] == true
-                ? nameToFilter
-                : targetRelease['tag_name'] ?? targetRelease['name'];
+            ? nameToFilter
+            : targetRelease['tag_name'] ?? targetRelease['name'];
         if (targetRelease['tarball_url'] != null) {
-          allAssetUrls.add(MapEntry(
+          allAssetUrls.add(
+            MapEntry(
               (targetRelease['version'] ?? 'source') + '.tar.gz',
-              targetRelease['tarball_url']));
+              targetRelease['tarball_url'],
+            ),
+          );
         }
         if (targetRelease['zipball_url'] != null) {
-          allAssetUrls.add(MapEntry(
+          allAssetUrls.add(
+            MapEntry(
               (targetRelease['version'] ?? 'source') + '.zip',
-              targetRelease['zipball_url']));
+              targetRelease['zipball_url'],
+            ),
+          );
         }
         targetRelease['allAssetUrls'] = allAssetUrls;
         break;
@@ -462,19 +542,22 @@ class GitHub extends AppSource {
       String? version = targetRelease['version'];
 
       DateTime? releaseDate = getReleaseDateFromRelease(
-          targetRelease, useLatestAssetDateAsReleaseDate);
+        targetRelease,
+        useLatestAssetDateAsReleaseDate,
+      );
       if (version == null) {
         throw NoVersionError();
       }
       var changeLog = (targetRelease['body'] ?? '').toString();
       return APKDetails(
-          version,
-          targetRelease['apkUrls'] as List<MapEntry<String, String>>,
-          getAppNames(standardUrl),
-          releaseDate: releaseDate,
-          changeLog: changeLog.isEmpty ? null : changeLog,
-          allAssetUrls:
-              targetRelease['allAssetUrls'] as List<MapEntry<String, String>>);
+        version,
+        targetRelease['apkUrls'] as List<MapEntry<String, String>>,
+        getAppNames(standardUrl),
+        releaseDate: releaseDate,
+        changeLog: changeLog.isEmpty ? null : changeLog,
+        allAssetUrls:
+            targetRelease['allAssetUrls'] as List<MapEntry<String, String>>,
+      );
     } else {
       if (onHttpErrorCode != null) {
         onHttpErrorCode(res);
@@ -483,20 +566,27 @@ class GitHub extends AppSource {
     }
   }
 
-  getLatestAPKDetailsCommon2(
-      String standardUrl,
-      Map<String, dynamic> additionalSettings,
-      Future<String> Function(bool) reqUrlGenerator,
-      dynamic Function(Response)? onHttpErrorCode) async {
+  Future<APKDetails> getLatestAPKDetailsCommon2(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+    Future<String> Function(bool) reqUrlGenerator,
+    dynamic Function(Response)? onHttpErrorCode,
+  ) async {
     try {
       return await getLatestAPKDetailsCommon(
-          await reqUrlGenerator(false), standardUrl, additionalSettings,
-          onHttpErrorCode: onHttpErrorCode);
+        await reqUrlGenerator(false),
+        standardUrl,
+        additionalSettings,
+        onHttpErrorCode: onHttpErrorCode,
+      );
     } catch (err) {
       if (err is NoReleasesError && additionalSettings['trackOnly'] == true) {
         return await getLatestAPKDetailsCommon(
-            await reqUrlGenerator(true), standardUrl, additionalSettings,
-            onHttpErrorCode: onHttpErrorCode);
+          await reqUrlGenerator(true),
+          standardUrl,
+          additionalSettings,
+          onHttpErrorCode: onHttpErrorCode,
+        );
       } else {
         rethrow;
       }
@@ -508,12 +598,16 @@ class GitHub extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    return await getLatestAPKDetailsCommon2(standardUrl, additionalSettings,
-        (bool useTagUrl) async {
-      return '${await convertStandardUrlToAPIUrl(standardUrl, additionalSettings)}/${useTagUrl ? 'tags' : 'releases'}?per_page=100';
-    }, (Response res) {
-      rateLimitErrorCheck(res);
-    });
+    return await getLatestAPKDetailsCommon2(
+      standardUrl,
+      additionalSettings,
+      (bool useTagUrl) async {
+        return '${await convertStandardUrlToAPIUrl(standardUrl, additionalSettings)}/${useTagUrl ? 'tags' : 'releases'}?per_page=100';
+      },
+      (Response res) {
+        rateLimitErrorCheck(res);
+      },
+    );
   }
 
   AppNames getAppNames(String standardUrl) {
@@ -523,9 +617,12 @@ class GitHub extends AppSource {
   }
 
   Future<Map<String, List<String>>> searchCommon(
-      String query, String requestUrl, String rootProp,
-      {Function(Response)? onHttpErrorCode,
-      Map<String, dynamic> querySettings = const {}}) async {
+    String query,
+    String requestUrl,
+    String rootProp, {
+    Function(Response)? onHttpErrorCode,
+    Map<String, dynamic> querySettings = const {},
+  }) async {
     Response res = await sourceRequest(requestUrl, {});
     if (res.statusCode == 200) {
       int minStarCount = querySettings['minStarCount'] != null
@@ -540,8 +637,8 @@ class GitHub extends AppSource {
               ((e['archived'] == true ? '[ARCHIVED] ' : '') +
                   (e['description'] != null
                       ? e['description'] as String
-                      : tr('noDescription')))
-            ]
+                      : tr('noDescription'))),
+            ],
           });
         }
       }
@@ -555,22 +652,27 @@ class GitHub extends AppSource {
   }
 
   @override
-  Future<Map<String, List<String>>> search(String query,
-      {Map<String, dynamic> querySettings = const {}}) async {
+  Future<Map<String, List<String>>> search(
+    String query, {
+    Map<String, dynamic> querySettings = const {},
+  }) async {
     return searchCommon(
-        query,
-        '${await getAPIHost({})}/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100',
-        'items', onHttpErrorCode: (Response res) {
-      rateLimitErrorCheck(res);
-    }, querySettings: querySettings);
+      query,
+      '${await getAPIHost({})}/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100',
+      'items',
+      onHttpErrorCode: (Response res) {
+        rateLimitErrorCheck(res);
+      },
+      querySettings: querySettings,
+    );
   }
 
-  rateLimitErrorCheck(Response res) {
+  void rateLimitErrorCheck(Response res) {
     if (res.headers['x-ratelimit-remaining'] == '0') {
       throw RateLimitError(
-          (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') /
-                  60000000)
-              .round());
+        (int.parse(res.headers['x-ratelimit-reset'] ?? '1800000000') / 60000000)
+            .round(),
+      );
     }
   }
 }

lib/app_sources/gitlab.dart

@@ -18,36 +18,41 @@ class GitLab extends AppSource {
     showReleaseDateAsVersionToggle = true;
 
     sourceConfigSettingFormItems = [
-      GeneratedFormTextField('gitlab-creds',
-          label: tr('gitlabPATLabel'),
-          password: true,
-          required: false,
-          belowWidgets: [
-            const SizedBox(
-              height: 4,
+      GeneratedFormTextField(
+        'gitlab-creds',
+        label: tr('gitlabPATLabel'),
+        password: true,
+        required: false,
+        belowWidgets: [
+          const SizedBox(height: 4),
+          GestureDetector(
+            onTap: () {
+              launchUrlString(
+                'https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#create-a-personal-access-token',
+                mode: LaunchMode.externalApplication,
+              );
+            },
+            child: Text(
+              tr('about'),
+              style: const TextStyle(
+                decoration: TextDecoration.underline,
+                fontSize: 12,
+              ),
             ),
-            GestureDetector(
-                onTap: () {
-                  launchUrlString(
-                      'https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#create-a-personal-access-token',
-                      mode: LaunchMode.externalApplication);
-                },
-                child: Text(
-                  tr('about'),
-                  style: const TextStyle(
-                      decoration: TextDecoration.underline, fontSize: 12),
-                )),
-            const SizedBox(
-              height: 4,
-            )
-          ])
+          ),
+          const SizedBox(height: 4),
+        ],
+      ),
     ];
 
     additionalSourceAppSpecificSettingFormItems = [
       [
-        GeneratedFormSwitch('fallbackToOlderReleases',
-            label: tr('fallbackToOlderReleases'), defaultValue: true)
-      ]
+        GeneratedFormSwitch(
+          'fallbackToOlderReleases',
+          label: tr('fallbackToOlderReleases'),
+          defaultValue: true,
+        ),
+      ],
     ];
   }
 
@@ -55,11 +60,13 @@ class GitLab extends AppSource {
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     var urlSegments = url.split('/');
     var cutOffIndex = urlSegments.indexWhere((s) => s == '-');
-    url =
-        urlSegments.sublist(0, cutOffIndex <= 0 ? null : cutOffIndex).join('/');
+    url = urlSegments
+        .sublist(0, cutOffIndex <= 0 ? null : cutOffIndex)
+        .join('/');
     RegExp standardUrlRegEx = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+(/[^((\b/\b)|(\b/-/\b))]+){1,20}',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+(/[^((\b/\b)|(\b/-/\b))]+){1,20}',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -70,15 +77,19 @@ class GitLab extends AppSource {
   Future<String?> getPATIfAny(Map<String, dynamic> additionalSettings) async {
     SettingsProvider settingsProvider = SettingsProvider();
     await settingsProvider.initializeSettings();
-    var sourceConfig =
-        await getSourceConfigValues(additionalSettings, settingsProvider);
+    var sourceConfig = await getSourceConfigValues(
+      additionalSettings,
+      settingsProvider,
+    );
     String? creds = sourceConfig['gitlab-creds'];
     return creds != null && creds.isNotEmpty ? creds : null;
   }
 
   @override
-  Future<Map<String, List<String>>> search(String query,
-      {Map<String, dynamic> querySettings = const {}}) async {
+  Future<Map<String, List<String>>> search(
+    String query, {
+    Map<String, dynamic> querySettings = const {},
+  }) async {
     var url =
         'https://${hosts[0]}/api/v4/projects?search=${Uri.encodeQueryComponent(query)}';
     var res = await sourceRequest(url, {});
@@ -90,7 +101,7 @@ class GitLab extends AppSource {
     for (var element in json) {
       results['https://${hosts[0]}/${element['path_with_namespace']}'] = [
         element['name_with_namespace'],
-        element['description'] ?? tr('noDescription')
+        element['description'] ?? tr('noDescription'),
       ];
     }
     return results;
@@ -102,8 +113,9 @@ class GitLab extends AppSource {
 
   @override
   Future<Map<String, String>?> getRequestHeaders(
-      Map<String, dynamic> additionalSettings,
-      {bool forAPKDownload = false}) async {
+    Map<String, dynamic> additionalSettings, {
+    bool forAPKDownload = false,
+  }) async {
     // Change headers to pacify, e.g. cloudflare protection
     // Related to: (#1397, #1389, #1384, #1382, #1381, #1380, #1359, #854, #785, #697)
     var headers = <String, String>{};
@@ -116,8 +128,11 @@ class GitLab extends AppSource {
   }
 
   @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl, String standardUrl,
-      Map<String, dynamic> additionalSettings) async {
+  Future<String> apkUrlPrefetchModifier(
+    String apkUrl,
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
     String? PAT = await getPATIfAny(hostChanged ? additionalSettings : {});
     String optionalAuth = (PAT != null) ? 'private_token=$PAT' : '';
     return '$apkUrl${(Uri.parse(apkUrl).query.isEmpty ? '?' : '&')}$optionalAuth';
@@ -139,8 +154,9 @@ class GitLab extends AppSource {
 
     // Get project ID
     Response res0 = await sourceRequest(
-        'https://${hosts[0]}/api/v4/projects/$projectUriComponent?$optionalAuth',
-        additionalSettings);
+      'https://${hosts[0]}/api/v4/projects/$projectUriComponent?$optionalAuth',
+      additionalSettings,
+    );
     if (res0.statusCode != 200) {
       throw getObtainiumHttpError(res0);
     }
@@ -151,8 +167,9 @@ class GitLab extends AppSource {
 
     // Request data from REST API
     Response res = await sourceRequest(
-        'https://${hosts[0]}/api/v4/projects/$projectUriComponent/${trackOnly ? 'repository/tags' : 'releases'}?$optionalAuth',
-        additionalSettings);
+      'https://${hosts[0]}/api/v4/projects/$projectUriComponent/${trackOnly ? 'repository/tags' : 'releases'}?$optionalAuth',
+      additionalSettings,
+    );
     if (res.statusCode != 200) {
       throw getObtainiumHttpError(res);
     }
@@ -166,11 +183,13 @@ class GitLab extends AppSource {
             var url = (e['direct_asset_url'] ?? e['url'] ?? '') as String;
             var parsedUrl = url.isNotEmpty ? Uri.parse(url) : null;
             return MapEntry(
-                (e['name'] ??
-                    (parsedUrl != null && parsedUrl.pathSegments.isNotEmpty
-                        ? parsedUrl.pathSegments.last
-                        : 'unknown')) as String,
-                (e['direct_asset_url'] ?? e['url'] ?? '') as String);
+              (e['name'] ??
+                      (parsedUrl != null && parsedUrl.pathSegments.isNotEmpty
+                          ? parsedUrl.pathSegments.last
+                          : 'unknown'))
+                  as String,
+              (e['direct_asset_url'] ?? e['url'] ?? '') as String,
+            );
           })
           .where((s) => s.key.isNotEmpty)
           .toList();
@@ -193,11 +212,15 @@ class GitLab extends AppSource {
       }
       var releaseDateString =
           e['released_at'] ?? e['created_at'] ?? e['commit']?['created_at'];
-      DateTime? releaseDate =
-          releaseDateString != null ? DateTime.parse(releaseDateString) : null;
-      return APKDetails(e['tag_name'] ?? e['name'], apkUrls.entries.toList(),
-          AppNames(names.author, names.name.split('/').last),
-          releaseDate: releaseDate);
+      DateTime? releaseDate = releaseDateString != null
+          ? DateTime.parse(releaseDateString)
+          : null;
+      return APKDetails(
+        e['tag_name'] ?? e['name'],
+        apkUrls.entries.toList(),
+        AppNames(names.author, names.name.split('/').last),
+        releaseDate: releaseDate,
+      );
     });
     if (apkDetailsList.isEmpty) {
       throw NoReleasesError();
@@ -208,8 +231,9 @@ class GitLab extends AppSource {
     bool fallbackToOlderReleases =
         additionalSettings['fallbackToOlderReleases'] == true;
     if (finalResult.apkUrls.isEmpty && fallbackToOlderReleases && !trackOnly) {
-      apkDetailsList =
-          apkDetailsList.where((e) => e.apkUrls.isNotEmpty).toList();
+      apkDetailsList = apkDetailsList
+          .where((e) => e.apkUrls.isNotEmpty)
+          .toList();
       finalResult = apkDetailsList.first;
     }
 
@@ -218,10 +242,13 @@ class GitLab extends AppSource {
     }
 
     finalResult.apkUrls = finalResult.apkUrls.map((apkUrl) {
-      if (RegExp('^$standardUrl/-/jobs/[0-9]+/artifacts/file/[^/]+')
-          .hasMatch(apkUrl.value)) {
+      if (RegExp(
+        '^$standardUrl/-/jobs/[0-9]+/artifacts/file/[^/]+',
+      ).hasMatch(apkUrl.value)) {
         return MapEntry(
-            apkUrl.key, apkUrl.value.replaceFirst('/file/', '/raw/'));
+          apkUrl.key,
+          apkUrl.value.replaceFirst('/file/', '/raw/'),
+        );
       } else {
         return apkUrl;
       }

lib/app_sources/html.dart

@@ -9,32 +9,14 @@ import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
 String ensureAbsoluteUrl(String ambiguousUrl, Uri referenceAbsoluteUrl) {
-  if (ambiguousUrl.startsWith('//')) {
-    ambiguousUrl = '${referenceAbsoluteUrl.scheme}:$ambiguousUrl';
-  }
   try {
-    Uri.parse(ambiguousUrl).origin;
-    return ambiguousUrl;
-  } catch (err) {
-    // is relative
+    if (Uri.parse(ambiguousUrl).isAbsolute) {
+      return ambiguousUrl; // #2315
+    }
+  } catch (e) {
+    //
   }
-  var currPathSegments = referenceAbsoluteUrl.path
-      .split('/')
-      .where((element) => element.trim().isNotEmpty)
-      .toList();
-  String absoluteUrl;
-  if (ambiguousUrl.startsWith('/')) {
-    absoluteUrl = '${referenceAbsoluteUrl.origin}$ambiguousUrl';
-  } else if (currPathSegments.isEmpty) {
-    absoluteUrl = '${referenceAbsoluteUrl.origin}/$ambiguousUrl';
-  } else if (ambiguousUrl.split('/').where((e) => e.isNotEmpty).length == 1) {
-    absoluteUrl =
-        '${referenceAbsoluteUrl.origin}/${currPathSegments.join('/')}/$ambiguousUrl';
-  } else {
-    absoluteUrl =
-        '${referenceAbsoluteUrl.origin}/${currPathSegments.sublist(0, currPathSegments.length - (currPathSegments.last.contains('.') ? 1 : 0)).join('/')}/$ambiguousUrl';
-  }
-  return Uri.parse(absoluteUrl).toString();
+  return referenceAbsoluteUrl.resolve(ambiguousUrl).toString();
 }
 
 int compareAlphaNumeric(String a, String b) {
@@ -118,28 +100,37 @@ bool _isNumeric(String s) {
   return s.codeUnitAt(0) >= 48 && s.codeUnitAt(0) <= 57;
 }
 
-List<MapEntry<String, String>> getLinksInLines(String lines) => RegExp(
-        r'(http|ftp|https)://([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?')
-    .allMatches(lines)
-    .map((match) =>
-        MapEntry(match.group(0)!, match.group(0)?.split('/').last ?? ''))
-    .toList();
+List<MapEntry<String, String>> getLinksInLines(String lines) =>
+    RegExp(
+          r'(http|ftp|https)://([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?',
+        )
+        .allMatches(lines)
+        .map(
+          (match) =>
+              MapEntry(match.group(0)!, match.group(0)?.split('/').last ?? ''),
+        )
+        .toList();
 
 // Given an HTTP response, grab some links according to the common additional settings
 // (those that apply to intermediate and final steps)
 Future<List<MapEntry<String, String>>> grabLinksCommon(
-    Response res, Map<String, dynamic> additionalSettings) async {
+  Response res,
+  Map<String, dynamic> additionalSettings,
+) async {
   if (res.statusCode != 200) {
     throw getObtainiumHttpError(res);
   }
   var html = parse(res.body);
   List<MapEntry<String, String>> allLinks = html
       .querySelectorAll('a')
-      .map((element) => MapEntry(
+      .map(
+        (element) => MapEntry(
           element.attributes['href'] ?? '',
           element.text.isNotEmpty
               ? element.text
-              : (element.attributes['href'] ?? '').split('/').last))
+              : (element.attributes['href'] ?? '').split('/').last,
+        ),
+      )
       .where((element) => element.key.isNotEmpty)
       .map((e) => MapEntry(ensureAbsoluteUrl(e.key, res.request!.url), e.value))
       .toList();
@@ -152,9 +143,13 @@ Future<List<MapEntry<String, String>>> grabLinksCommon(
       var jsonStrings = collectAllStringsFromJSONObject(jsonDecode(res.body));
       allLinks = getLinksInLines(jsonStrings.join('\n'));
       if (allLinks.isEmpty) {
-        allLinks = getLinksInLines(jsonStrings.map((l) {
-          return ensureAbsoluteUrl(l, res.request!.url);
-        }).join('\n'));
+        allLinks = getLinksInLines(
+          jsonStrings
+              .map((l) {
+                return ensureAbsoluteUrl(l, res.request!.url);
+              })
+              .join('\n'),
+        );
       }
     } catch (e) {
       //
@@ -183,17 +178,20 @@ Future<List<MapEntry<String, String>>> grabLinksCommon(
       } catch (e) {
         // Some links may not have valid encoding
       }
-      return Uri.parse(filterLinkByText ? element.value : link)
-          .path
-          .toLowerCase()
-          .endsWith('.apk');
+      return Uri.parse(
+        filterLinkByText ? element.value : link,
+      ).path.toLowerCase().endsWith('.apk');
     }).toList();
   }
   if (!skipSort) {
-    links.sort((a, b) => additionalSettings['sortByLastLinkSegment'] == true
-        ? compareAlphaNumeric(a.key.split('/').where((e) => e.isNotEmpty).last,
-            b.key.split('/').where((e) => e.isNotEmpty).last)
-        : compareAlphaNumeric(a.key, b.key));
+    links.sort(
+      (a, b) => additionalSettings['sortByLastLinkSegment'] == true
+          ? compareAlphaNumeric(
+              a.key.split('/').where((e) => e.isNotEmpty).last,
+              b.key.split('/').where((e) => e.isNotEmpty).last,
+            )
+          : compareAlphaNumeric(a.key, b.key),
+    );
   }
   if (additionalSettings['reverseSort'] == true) {
     links = links.reversed.toList();
@@ -219,102 +217,119 @@ class HTML extends AppSource {
 
   var finalStepFormitems = [
     [
-      GeneratedFormTextField('customLinkFilterRegex',
-          label: tr('customLinkFilterRegex'),
-          hint: 'download/(.*/)?(android|apk|mobile)',
-          required: false,
-          additionalValidators: [
-            (value) {
-              return regExValidator(value);
-            }
-          ])
+      GeneratedFormTextField(
+        'customLinkFilterRegex',
+        label: tr('customLinkFilterRegex'),
+        hint: 'download/(.*/)?(android|apk|mobile)',
+        required: false,
+        additionalValidators: [
+          (value) {
+            return regExValidator(value);
+          },
+        ],
+      ),
     ],
     [
-      GeneratedFormSwitch('versionExtractWholePage',
-          label: tr('versionExtractWholePage'))
-    ]
+      GeneratedFormSwitch(
+        'versionExtractWholePage',
+        label: tr('versionExtractWholePage'),
+      ),
+    ],
   ];
   var commonFormItems = [
     [GeneratedFormSwitch('filterByLinkText', label: tr('filterByLinkText'))],
     [GeneratedFormSwitch('skipSort', label: tr('skipSort'))],
     [GeneratedFormSwitch('reverseSort', label: tr('takeFirstLink'))],
     [
-      GeneratedFormSwitch('sortByLastLinkSegment',
-          label: tr('sortByLastLinkSegment'))
+      GeneratedFormSwitch(
+        'sortByLastLinkSegment',
+        label: tr('sortByLastLinkSegment'),
+      ),
     ],
   ];
   var intermediateFormItems = [
     [
-      GeneratedFormTextField('customLinkFilterRegex',
-          label: tr('intermediateLinkRegex'),
-          hint: '([0-9]+.)*[0-9]+/\$',
-          required: true,
-          additionalValidators: [(value) => regExValidator(value)])
+      GeneratedFormTextField(
+        'customLinkFilterRegex',
+        label: tr('intermediateLinkRegex'),
+        hint: '([0-9]+.)*[0-9]+/\$',
+        required: true,
+        additionalValidators: [(value) => regExValidator(value)],
+      ),
     ],
     [
-      GeneratedFormSwitch('autoLinkFilterByArch',
-          label: tr('autoLinkFilterByArch'), defaultValue: false)
+      GeneratedFormSwitch(
+        'autoLinkFilterByArch',
+        label: tr('autoLinkFilterByArch'),
+        defaultValue: false,
+      ),
     ],
   ];
   HTML() {
     additionalSourceAppSpecificSettingFormItems = [
       [
-        GeneratedFormSubForm(
-            'intermediateLink', [...intermediateFormItems, ...commonFormItems],
-            label: tr('intermediateLink'))
+        GeneratedFormSubForm('intermediateLink', [
+          ...intermediateFormItems,
+          ...commonFormItems,
+        ], label: tr('intermediateLink')),
       ],
       finalStepFormitems[0],
       ...commonFormItems,
       ...finalStepFormitems.sublist(1),
       [
         GeneratedFormSubForm(
-            'requestHeader',
+          'requestHeader',
+          [
             [
-              [
-                GeneratedFormTextField('requestHeader',
-                    label: tr('requestHeader'),
-                    required: false,
-                    additionalValidators: [
-                      (value) {
-                        if ((value ?? 'empty:valid')
-                                .split(':')
-                                .map((e) => e.trim())
-                                .where((e) => e.isNotEmpty)
-                                .length <
-                            2) {
-                          return tr('invalidInput');
-                        }
-                        return null;
-                      }
-                    ])
-              ]
+              GeneratedFormTextField(
+                'requestHeader',
+                label: tr('requestHeader'),
+                required: false,
+                additionalValidators: [
+                  (value) {
+                    if ((value ?? 'empty:valid')
+                            .split(':')
+                            .map((e) => e.trim())
+                            .where((e) => e.isNotEmpty)
+                            .length <
+                        2) {
+                      return tr('invalidInput');
+                    }
+                    return null;
+                  },
+                ],
+              ),
             ],
-            label: tr('requestHeader'),
-            defaultValue: [
-              {
-                'requestHeader':
-                    'User-Agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36'
-              }
-            ])
+          ],
+          label: tr('requestHeader'),
+          defaultValue: [
+            {
+              'requestHeader':
+                  'User-Agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36',
+            },
+          ],
+        ),
       ],
       [
         GeneratedFormDropdown(
-            'defaultPseudoVersioningMethod',
-            [
-              MapEntry('partialAPKHash', tr('partialAPKHash')),
-              MapEntry('APKLinkHash', tr('APKLinkHash')),
-              MapEntry('ETag', 'ETag')
-            ],
-            label: tr('defaultPseudoVersioningMethod'),
-            defaultValue: 'partialAPKHash')
-      ]
+          'defaultPseudoVersioningMethod',
+          [
+            MapEntry('partialAPKHash', tr('partialAPKHash')),
+            MapEntry('APKLinkHash', tr('APKLinkHash')),
+            MapEntry('ETag', 'ETag'),
+          ],
+          label: tr('defaultPseudoVersioningMethod'),
+          defaultValue: 'partialAPKHash',
+        ),
+      ],
     ];
   }
 
   @override
   Future<Map<String, String>?> getRequestHeaders(
-      Map<String, dynamic> additionalSettings,
-      {bool forAPKDownload = false}) async {
+    Map<String, dynamic> additionalSettings, {
+    bool forAPKDownload = false,
+  }) async {
     if (additionalSettings.isNotEmpty) {
       if (additionalSettings['requestHeader']?.isNotEmpty != true) {
         additionalSettings['requestHeader'] = [];
@@ -354,8 +369,9 @@ class HTML extends AppSource {
             .toList();
     for (int i = 0; i < (additionalSettings['intermediateLink'].length); i++) {
       var intLinks = await grabLinksCommon(
-          await sourceRequest(currentUrl, additionalSettings),
-          additionalSettings['intermediateLink'][i]);
+        await sourceRequest(currentUrl, additionalSettings),
+        additionalSettings['intermediateLink'][i],
+      );
       if (intLinks.isEmpty) {
         throw NoReleasesError(note: currentUrl);
       } else {
@@ -371,11 +387,17 @@ class HTML extends AppSource {
     String versionExtractionWholePageString = currentUrl;
     if (additionalSettings['directAPKLink'] != true) {
       Response res = await sourceRequest(currentUrl, additionalSettings);
-      versionExtractionWholePageString =
-          res.body.split('\r\n').join('\n').split('\n').join('\\n');
+      versionExtractionWholePageString = res.body
+          .split('\r\n')
+          .join('\n')
+          .split('\n')
+          .join('\\n');
       links = await grabLinksCommon(res, additionalSettings);
-      links = filterApks(links, additionalSettings['apkFilterRegEx'],
-          additionalSettings['invertAPKFilter']);
+      links = filterApks(
+        links,
+        additionalSettings['apkFilterRegEx'],
+        additionalSettings['invertAPKFilter'],
+      );
       if (links.isEmpty) {
         throw NoReleasesError(note: currentUrl);
       }
@@ -391,37 +413,45 @@ class HTML extends AppSource {
     }
     String? version;
     version = extractVersion(
-        additionalSettings['versionExtractionRegEx'] as String?,
-        additionalSettings['matchGroupToUse'] as String?,
-        additionalSettings['versionExtractWholePage'] == true
-            ? versionExtractionWholePageString
-            : relDecoded);
-    var apkReqHeaders =
-        await getRequestHeaders(additionalSettings, forAPKDownload: true);
+      additionalSettings['versionExtractionRegEx'] as String?,
+      additionalSettings['matchGroupToUse'] as String?,
+      additionalSettings['versionExtractWholePage'] == true
+          ? versionExtractionWholePageString
+          : relDecoded,
+    );
+    var apkReqHeaders = await getRequestHeaders(
+      additionalSettings,
+      forAPKDownload: true,
+    );
     if (version == null &&
         additionalSettings['defaultPseudoVersioningMethod'] == 'ETag') {
-      version = await checkETagHeader(rel,
-          headers: apkReqHeaders,
-          allowInsecure: additionalSettings['allowInsecure'] == true);
+      version = await checkETagHeader(
+        rel,
+        headers: apkReqHeaders,
+        allowInsecure: additionalSettings['allowInsecure'] == true,
+      );
       if (version == null) {
         throw NoVersionError();
       }
     }
     version ??=
         additionalSettings['defaultPseudoVersioningMethod'] == 'APKLinkHash'
-            ? rel.hashCode.toString()
-            : (await checkPartialDownloadHashDynamic(rel,
-                    headers: apkReqHeaders,
-                    allowInsecure: additionalSettings['allowInsecure'] == true))
-                .toString();
+        ? rel.hashCode.toString()
+        : (await checkPartialDownloadHashDynamic(
+            rel,
+            headers: apkReqHeaders,
+            allowInsecure: additionalSettings['allowInsecure'] == true,
+          )).toString();
     return APKDetails(
-        version,
-        [rel].map((e) {
-          var uri = Uri.parse(e);
-          var fileName =
-              uri.pathSegments.isNotEmpty ? uri.pathSegments.last : uri.origin;
-          return MapEntry('${e.hashCode}-$fileName', e);
-        }).toList(),
-        AppNames(uri.host, tr('app')));
+      version,
+      [rel].map((e) {
+        var uri = Uri.parse(e);
+        var fileName = uri.pathSegments.isNotEmpty
+            ? uri.pathSegments.last
+            : uri.origin;
+        return MapEntry('${e.hashCode}-$fileName', e);
+      }).toList(),
+      AppNames(uri.host, tr('app')),
+    );
   }
 }

lib/app_sources/huaweiappgallery.dart

@@ -14,8 +14,9 @@ class HuaweiAppGallery extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}(/#)?/(app|appdl)/[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}(/#)?/(app|appdl)/[^/]+',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -23,13 +24,18 @@ class HuaweiAppGallery extends AppSource {
     return match.group(0)!;
   }
 
-  getDlUrl(String standardUrl) =>
+  String getDlUrl(String standardUrl) =>
       'https://${hosts[0].replaceAll('appgallery.huawei', 'appgallery.cloud.huawei')}/appdl/${standardUrl.split('/').last}';
 
-  requestAppdlRedirect(
-      String dlUrl, Map<String, dynamic> additionalSettings) async {
-    Response res =
-        await sourceRequest(dlUrl, additionalSettings, followRedirects: false);
+  Future<Response> requestAppdlRedirect(
+    String dlUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Response res = await sourceRequest(
+      dlUrl,
+      additionalSettings,
+      followRedirects: false,
+    );
     if (res.statusCode == 200 ||
         res.statusCode == 302 ||
         res.statusCode == 304) {
@@ -39,7 +45,7 @@ class HuaweiAppGallery extends AppSource {
     }
   }
 
-  appIdFromRedirectDlUrl(String redirectDlUrl) {
+  String appIdFromRedirectDlUrl(String redirectDlUrl) {
     var parts = redirectDlUrl
         .split('?')[0]
         .split('/')
@@ -53,8 +59,10 @@ class HuaweiAppGallery extends AppSource {
   }
 
   @override
-  Future<String?> tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) async {
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
     String dlUrl = getDlUrl(standardUrl);
     Response res = await requestAppdlRedirect(dlUrl, additionalSettings);
     return res.headers['location'] != null
@@ -76,8 +84,11 @@ class HuaweiAppGallery extends AppSource {
     if (appId.isEmpty) {
       throw NoReleasesError();
     }
-    var relDateStr =
-        res.headers['location']?.split('?')[0].split('.').reversed.toList()[1];
+    var relDateStr = res.headers['location']
+        ?.split('?')[0]
+        .split('.')
+        .reversed
+        .toList()[1];
     if (relDateStr == null || relDateStr.length != 10) {
       throw NoVersionError();
     }
@@ -88,10 +99,15 @@ class HuaweiAppGallery extends AppSource {
       relDateStrAdj.insert((i + i ~/ 2 - 1), '-');
       i += 2;
     }
-    var relDate =
-        DateFormat('yy-MM-dd-HH-mm', 'en_US').parse(relDateStrAdj.join(''));
+    var relDate = DateFormat(
+      'yy-MM-dd-HH-mm',
+      'en_US',
+    ).parse(relDateStrAdj.join(''));
     return APKDetails(
-        relDateStr, [MapEntry('$appId.apk', dlUrl)], AppNames(name, appId),
-        releaseDate: relDate);
+      relDateStr,
+      [MapEntry('$appId.apk', dlUrl)],
+      AppNames(name, appId),
+      releaseDate: relDate,
+    );
   }
 }

lib/app_sources/izzyondroid.dart

@@ -16,13 +16,15 @@ class IzzyOnDroid extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegExA = RegExp(
-        '^https?://android.${getSourceRegex(hosts)}/repo/apk/[^/]+',
-        caseSensitive: false);
+      '^https?://android.${getSourceRegex(hosts)}/repo/apk/[^/]+',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegExA.firstMatch(url);
     if (match == null) {
       RegExp standardUrlRegExB = RegExp(
-          '^https?://apt.${getSourceRegex(hosts)}/fdroid/index/apk/[^/]+',
-          caseSensitive: false);
+        '^https?://apt.${getSourceRegex(hosts)}/fdroid/index/apk/[^/]+',
+        caseSensitive: false,
+      );
       match = standardUrlRegExB.firstMatch(url);
     }
     if (match == null) {
@@ -32,8 +34,10 @@ class IzzyOnDroid extends AppSource {
   }
 
   @override
-  Future<String?> tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) async {
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
     return fd.tryInferringAppId(standardUrl);
   }
 
@@ -44,12 +48,14 @@ class IzzyOnDroid extends AppSource {
   ) async {
     String? appId = await tryInferringAppId(standardUrl);
     return fd.getAPKUrlsFromFDroidPackagesAPIResponse(
-        await sourceRequest(
-            'https://apt.izzysoft.de/fdroid/api/v1/packages/$appId',
-            additionalSettings),
-        'https://android.izzysoft.de/frepo/$appId',
-        standardUrl,
-        name,
-        additionalSettings: additionalSettings);
+      await sourceRequest(
+        'https://apt.izzysoft.de/fdroid/api/v1/packages/$appId',
+        additionalSettings,
+      ),
+      'https://android.izzysoft.de/frepo/$appId',
+      standardUrl,
+      name,
+      additionalSettings: additionalSettings,
+    );
   }
 }

lib/app_sources/jenkins.dart

@@ -31,14 +31,17 @@ class Jenkins extends AppSource {
   ) async {
     standardUrl = trimJobUrl(standardUrl);
     Response res = await sourceRequest(
-        '$standardUrl/lastSuccessfulBuild/api/json', additionalSettings);
+      '$standardUrl/lastSuccessfulBuild/api/json',
+      additionalSettings,
+    );
     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();
+      var version = json['number'] == null
+          ? null
+          : (json['number'] as int).toString();
       if (version == null) {
         throw NoVersionError();
       }
@@ -51,16 +54,21 @@ class Jenkins extends AppSource {
             return path == null
                 ? const MapEntry<String, String>('', '')
                 : MapEntry<String, String>(
-                    (e['fileName'] ?? e['relativePath']) as String, path);
+                    (e['fileName'] ?? e['relativePath']) as String,
+                    path,
+                  );
           })
-          .where((url) =>
-              url.value.isNotEmpty && url.key.toLowerCase().endsWith('.apk'))
+          .where(
+            (url) =>
+                url.value.isNotEmpty && url.key.toLowerCase().endsWith('.apk'),
+          )
           .toList();
       return APKDetails(
-          version,
-          apkUrls,
-          releaseDate: releaseDate,
-          AppNames(Uri.parse(standardUrl).host, standardUrl.split('/').last));
+        version,
+        apkUrls,
+        releaseDate: releaseDate,
+        AppNames(Uri.parse(standardUrl).host, standardUrl.split('/').last),
+      );
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/mullvad.dart

@@ -12,8 +12,9 @@ class Mullvad extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -31,7 +32,9 @@ class Mullvad extends AppSource {
     Map<String, dynamic> additionalSettings,
   ) async {
     Response res = await sourceRequest(
-        '$standardUrl/en/download/android', additionalSettings);
+      '$standardUrl/en/download/android',
+      additionalSettings,
+    );
     if (res.statusCode == 200) {
       var versions = parse(res.body)
           .querySelectorAll('p')
@@ -53,17 +56,18 @@ class Mullvad extends AppSource {
       String? changeLog;
       try {
         changeLog = (await GitHub().getLatestAPKDetails(
-                'https://github.com/mullvad/mullvadvpn-app',
-                {'fallbackToOlderReleases': true}))
-            .changeLog;
+          'https://github.com/mullvad/mullvadvpn-app',
+          {'fallbackToOlderReleases': true},
+        )).changeLog;
       } catch (e) {
         // Ignore
       }
       return APKDetails(
-          versions[0],
-          getApkUrlsFromUrls(['https://mullvad.net/download/app/apk/latest']),
-          AppNames(name, 'Mullvad-VPN'),
-          changeLog: changeLog);
+        versions[0],
+        getApkUrlsFromUrls(['https://mullvad.net/download/app/apk/latest']),
+        AppNames(name, 'Mullvad-VPN'),
+        changeLog: changeLog,
+      );
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/neutroncode.dart

@@ -12,8 +12,9 @@ class NeutronCode extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}/downloads/file/[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}/downloads/file/[^/]+',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -55,7 +56,7 @@ class NeutronCode extends AppSource {
     }
   }
 
-  customDateParse(String dateString) {
+  String? customDateParse(String dateString) {
     List<String> parts = dateString.split(' ');
     if (parts.length != 3) {
       return null;
@@ -89,24 +90,31 @@ class NeutronCode extends AppSource {
       if (filename == null) {
         throw NoReleasesError();
       }
-      var version =
-          http.querySelector('.pd-version-txt')?.nextElementSibling?.innerHtml;
+      var version = http
+          .querySelector('.pd-version-txt')
+          ?.nextElementSibling
+          ?.innerHtml;
       if (version == null) {
         throw NoVersionError();
       }
       String? apkUrl = 'https://${hosts[0]}/download/$filename';
-      var dateStringOriginal =
-          http.querySelector('.pd-date-txt')?.nextElementSibling?.innerHtml;
+      var dateStringOriginal = http
+          .querySelector('.pd-date-txt')
+          ?.nextElementSibling
+          ?.innerHtml;
       var dateString = dateStringOriginal != null
           ? (customDateParse(dateStringOriginal))
           : null;
       var changeLogElements = http.querySelectorAll('.pd-fdesc p');
-      return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
-          AppNames(runtimeType.toString(), name ?? standardUrl.split('/').last),
-          releaseDate: dateString != null ? DateTime.parse(dateString) : null,
-          changeLog: changeLogElements.isNotEmpty
-              ? changeLogElements.last.innerHtml
-              : null);
+      return APKDetails(
+        version,
+        getApkUrlsFromUrls([apkUrl]),
+        AppNames(runtimeType.toString(), name ?? standardUrl.split('/').last),
+        releaseDate: dateString != null ? DateTime.parse(dateString) : null,
+        changeLog: changeLogElements.isNotEmpty
+            ? changeLogElements.last.innerHtml
+            : null,
+      );
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/rustore.dart

@@ -18,8 +18,9 @@ class RuStore extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}/catalog/app/+[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}/catalog/app/+[^/]+',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -28,11 +29,23 @@ class RuStore extends AppSource {
   }
 
   @override
-  Future<String?> tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) async {
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
+  Future<String> decodeString(String str) async {
+    try {
+      return (await CharsetDetector.autoDecode(
+        Uint8List.fromList(str.codeUnits),
+      )).string;
+    } catch (e) {
+      return str;
+    }
+  }
+
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
@@ -40,8 +53,9 @@ class RuStore extends AppSource {
   ) async {
     String? appId = await tryInferringAppId(standardUrl);
     Response res0 = await sourceRequest(
-        'https://backapi.rustore.ru/applicationData/overallInfo/$appId',
-        additionalSettings);
+      'https://backapi.rustore.ru/applicationData/overallInfo/$appId',
+      additionalSettings,
+    );
     if (res0.statusCode != 200) {
       throw getObtainiumHttpError(res0);
     }
@@ -64,35 +78,31 @@ class RuStore extends AppSource {
     }
 
     Response res1 = await sourceRequest(
-        'https://backapi.rustore.ru/applicationData/download-link',
-        additionalSettings,
-        followRedirects: false,
-        postBody: {"appId": appDetails['appId'], "firstInstall": true});
+      'https://backapi.rustore.ru/applicationData/download-link',
+      additionalSettings,
+      followRedirects: false,
+      postBody: {"appId": appDetails['appId'], "firstInstall": true},
+    );
     var downloadDetails = jsonDecode(res1.body)['body'];
     if (res1.statusCode != 200 || downloadDetails['apkUrl'] == null) {
       throw NoAPKError();
     }
 
-    appName = (await CharsetDetector.autoDecode(
-            Uint8List.fromList(appName.codeUnits)))
-        .string;
-    author =
-        (await CharsetDetector.autoDecode(Uint8List.fromList(author.codeUnits)))
-            .string;
-    changeLog = changeLog != null
-        ? (await CharsetDetector.autoDecode(
-                Uint8List.fromList(changeLog.codeUnits)))
-            .string
-        : null;
+    appName = await decodeString(appName);
+    author = await decodeString(author);
+    changeLog = changeLog != null ? await decodeString(changeLog) : null;
 
     return APKDetails(
-        version,
-        getApkUrlsFromUrls([
-          (downloadDetails['apkUrl'] as String)
-              .replaceAll(RegExp('\\.zip\$'), '.apk')
-        ]),
-        AppNames(author, appName),
-        releaseDate: relDate,
-        changeLog: changeLog);
+      version,
+      getApkUrlsFromUrls([
+        (downloadDetails['apkUrl'] as String).replaceAll(
+          RegExp('\\.zip\$'),
+          '.apk',
+        ),
+      ]),
+      AppNames(author, appName),
+      releaseDate: relDate,
+      changeLog: changeLog,
+    );
   }
 }

lib/app_sources/sourceforge.dart

@@ -11,23 +11,27 @@ class SourceForge extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     var sourceRegex = getSourceRegex(hosts);
-    RegExp standardUrlRegExC =
-        RegExp('^https?://(www\\.)?$sourceRegex/p/.+', caseSensitive: false);
+    RegExp standardUrlRegExC = RegExp(
+      '^https?://(www\\.)?$sourceRegex/p/.+',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegExC.firstMatch(url);
     if (match != null) {
       url =
           'https://${Uri.parse(match.group(0)!).host}/projects/${url.substring(Uri.parse(match.group(0)!).host.length + '/projects/'.length + 1)}';
     }
     RegExp standardUrlRegExB = RegExp(
-        '^https?://(www\\.)?$sourceRegex/projects/[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?$sourceRegex/projects/[^/]+',
+      caseSensitive: false,
+    );
     match = standardUrlRegExB.firstMatch(url);
     if (match != null && match.group(0) == url) {
       url = '$url/files';
     }
     RegExp standardUrlRegExA = RegExp(
-        '^https?://(www\\.)?$sourceRegex/projects/[^/]+/files(/.+)?',
-        caseSensitive: false);
+      '^https?://(www\\.)?$sourceRegex/projects/[^/]+/files(/.+)?',
+      caseSensitive: false,
+    );
     match = standardUrlRegExA.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -46,8 +50,9 @@ class SourceForge extends AppSource {
       standardUri = Uri.parse(standardUrl);
     }
     Response res = await sourceRequest(
-        '${standardUri.origin}/${standardUri.pathSegments.sublist(0, 2).join('/')}/rss?path=/',
-        additionalSettings);
+      '${standardUri.origin}/${standardUri.pathSegments.sublist(0, 2).join('/')}/rss?path=/',
+      additionalSettings,
+    );
     if (res.statusCode == 200) {
       var parsedHtml = parse(res.body);
       var allDownloadLinks = parsedHtml
@@ -74,9 +79,10 @@ class SourceForge extends AppSource {
           if (version != null) {
             try {
               var extractedVersion = extractVersion(
-                  additionalSettings['versionExtractionRegEx'] as String?,
-                  additionalSettings['matchGroupToUse'] as String?,
-                  version);
+                additionalSettings['versionExtractionRegEx'] as String?,
+                additionalSettings['matchGroupToUse'] as String?,
+                version,
+              );
               if (extractedVersion != null) {
                 version = extractedVersion;
               }
@@ -111,8 +117,11 @@ class SourceForge extends AppSource {
               .where((element) => getVersion(element) == version)
               .toList();
       var segments = standardUrl.split('/');
-      return APKDetails(version, getApkUrlsFromUrls(apkUrlList),
-          AppNames(name, segments[segments.indexOf('files') - 1]));
+      return APKDetails(
+        version,
+        getApkUrlsFromUrls(apkUrlList),
+        AppNames(name, segments[segments.indexOf('files') - 1]),
+      );
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/sourcehut.dart

@@ -13,17 +13,21 @@ class SourceHut extends AppSource {
 
     additionalSourceAppSpecificSettingFormItems = [
       [
-        GeneratedFormSwitch('fallbackToOlderReleases',
-            label: tr('fallbackToOlderReleases'), defaultValue: true)
-      ]
+        GeneratedFormSwitch(
+          'fallbackToOlderReleases',
+          label: tr('fallbackToOlderReleases'),
+          defaultValue: true,
+        ),
+      ],
     ];
   }
 
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+',
-        caseSensitive: false);
+      '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -52,8 +56,10 @@ class SourceHut extends AppSource {
     String appName = standardUri.pathSegments.last;
     bool fallbackToOlderReleases =
         additionalSettings['fallbackToOlderReleases'] == true;
-    Response res =
-        await sourceRequest('$standardUrl/refs/rss.xml', additionalSettings);
+    Response res = await sourceRequest(
+      '$standardUrl/refs/rss.xml',
+      additionalSettings,
+    );
     if (res.statusCode == 200) {
       var parsedHtml = parse(res.body);
       List<APKDetails> apkDetailsList = [];
@@ -63,10 +69,10 @@ class SourceHut extends AppSource {
         ind++;
         String releasePage = // querySelector('link') fails for some reason
             entry
-                    .querySelector('guid') // Luckily guid is identical
-                    ?.innerHtml
-                    .trim() ??
-                '';
+                .querySelector('guid') // Luckily guid is identical
+                ?.innerHtml
+                .trim() ??
+            '';
         if (!releasePage.startsWith('$standardUrl/refs')) {
           continue;
         }
@@ -84,8 +90,9 @@ class SourceHut extends AppSource {
               ? DateFormat('E, dd MMM yyyy HH:mm:ss Z').parse(releaseDateString)
               : null;
           releaseDate = releaseDateString != null
-              ? DateFormat('EEE, dd MMM yyyy HH:mm:ss Z')
-                  .parse(releaseDateString)
+              ? DateFormat(
+                  'EEE, dd MMM yyyy HH:mm:ss Z',
+                ).parse(releaseDateString)
               : null;
         } catch (e) {
           // ignore
@@ -93,27 +100,35 @@ class SourceHut extends AppSource {
         var res2 = await sourceRequest(releasePage, additionalSettings);
         List<MapEntry<String, String>> apkUrls = [];
         if (res2.statusCode == 200) {
-          apkUrls = getApkUrlsFromUrls(parse(res2.body)
-              .querySelectorAll('a')
-              .map((e) => e.attributes['href'] ?? '')
-              .where((e) => e.toLowerCase().endsWith('.apk'))
-              .map((e) => ensureAbsoluteUrl(e, standardUri))
-              .toList());
+          apkUrls = getApkUrlsFromUrls(
+            parse(res2.body)
+                .querySelectorAll('a')
+                .map((e) => e.attributes['href'] ?? '')
+                .where((e) => e.toLowerCase().endsWith('.apk'))
+                .map((e) => ensureAbsoluteUrl(e, standardUri))
+                .toList(),
+          );
         }
-        apkDetailsList.add(APKDetails(
+        apkDetailsList.add(
+          APKDetails(
             version,
             apkUrls,
-            AppNames(entry.querySelector('author')?.innerHtml.trim() ?? appName,
-                appName),
-            releaseDate: releaseDate));
+            AppNames(
+              entry.querySelector('author')?.innerHtml.trim() ?? appName,
+              appName,
+            ),
+            releaseDate: releaseDate,
+          ),
+        );
       }
       if (apkDetailsList.isEmpty) {
         throw NoReleasesError();
       }
       if (fallbackToOlderReleases) {
         if (additionalSettings['trackOnly'] != true) {
-          apkDetailsList =
-              apkDetailsList.where((e) => e.apkUrls.isNotEmpty).toList();
+          apkDetailsList = apkDetailsList
+              .where((e) => e.apkUrls.isNotEmpty)
+              .toList();
         }
         if (apkDetailsList.isEmpty) {
           throw NoReleasesError();

lib/app_sources/telegramapp.dart

@@ -20,12 +20,15 @@ class TelegramApp extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    Response res =
-        await sourceRequest('https://t.me/s/TAndroidAPK', additionalSettings);
+    Response res = await sourceRequest(
+      'https://t.me/s/TAndroidAPK',
+      additionalSettings,
+    );
     if (res.statusCode == 200) {
       var http = parse(res.body);
-      var messages =
-          http.querySelectorAll('.tgme_widget_message_text.js-message_text');
+      var messages = http.querySelectorAll(
+        '.tgme_widget_message_text.js-message_text',
+      );
       var version = messages.isNotEmpty
           ? messages.last.innerHtml.split('\n').first.trim().split(' ').first
           : null;
@@ -33,10 +36,9 @@ class TelegramApp extends AppSource {
         throw NoVersionError();
       }
       String? apkUrl = 'https://telegram.org/dl/android/apk';
-      return APKDetails(
-          version,
-          [MapEntry<String, String>('telegram-$version.apk', apkUrl)],
-          AppNames('Telegram', 'Telegram'));
+      return APKDetails(version, [
+        MapEntry<String, String>('telegram-$version.apk', apkUrl),
+      ], AppNames('Telegram', 'Telegram'));
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/tencent.dart

@@ -15,8 +15,9 @@ class Tencent extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://${getSourceRegex(hosts)}/appdetail/[^/]+',
-        caseSensitive: false);
+      '^https?://${getSourceRegex(hosts)}/appdetail/[^/]+',
+      caseSensitive: false,
+    );
     var match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -25,8 +26,10 @@ class Tencent extends AppSource {
   }
 
   @override
-  Future<String?> tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) async {
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
     return Uri.parse(standardUrl).pathSegments.last;
   }
 
@@ -36,18 +39,16 @@ class Tencent extends AppSource {
     Map<String, dynamic> additionalSettings,
   ) async {
     String appId = (await tryInferringAppId(standardUrl))!;
-    String baseHost = Uri.parse(standardUrl)
-        .host
-        .split('.')
-        .reversed
-        .toList()
-        .sublist(0, 2)
-        .reversed
-        .join('.');
+    String baseHost = Uri.parse(
+      standardUrl,
+    ).host.split('.').reversed.toList().sublist(0, 2).reversed.join('.');
 
     var res = await sourceRequest(
-        'https://upage.html5.$baseHost/wechat-apkinfo', additionalSettings,
-        followRedirects: false, postBody: {"packagename": appId});
+      'https://upage.html5.$baseHost/wechat-apkinfo',
+      additionalSettings,
+      followRedirects: false,
+      postBody: {"packagename": appId},
+    );
 
     if (res.statusCode == 200) {
       var json = jsonDecode(res.body);
@@ -64,14 +65,18 @@ class Tencent extends AppSource {
       var author = json['app_detail_records'][appId]['app_info']['author'];
       var releaseDate =
           json['app_detail_records'][appId]['app_info']['update_time'];
-      var apkName = Uri.parse(apkUrl).queryParameters['fsname'] ??
+      var apkName =
+          Uri.parse(apkUrl).queryParameters['fsname'] ??
           '${appId}_$version.apk';
 
       return APKDetails(
-          version, [MapEntry(apkName, apkUrl)], AppNames(author, appName),
-          releaseDate: releaseDate != null
-              ? DateTime.fromMillisecondsSinceEpoch(releaseDate * 1000)
-              : null);
+        version,
+        [MapEntry(apkName, apkUrl)],
+        AppNames(author, appName),
+        releaseDate: releaseDate != null
+            ? DateTime.fromMillisecondsSinceEpoch(releaseDate * 1000)
+            : null,
+      );
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/uptodown.dart

@@ -1,9 +1,23 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/parser.dart';
-import 'package:obtainium/app_sources/apkpure.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
+DateTime? parseDateTimeMMMddCommayyyy(String? dateString) {
+  DateTime? releaseDate;
+  try {
+    releaseDate = dateString != null
+        ? DateFormat('MMM dd, yyyy').parse(dateString)
+        : null;
+    releaseDate = dateString != null && releaseDate == null
+        ? DateFormat('MMMM dd, yyyy').parse(dateString)
+        : releaseDate;
+  } catch (err) {
+    // ignore
+  }
+  return releaseDate;
+}
+
 class Uptodown extends AppSource {
   Uptodown() {
     hosts = ['uptodown.com'];
@@ -16,8 +30,9 @@ class Uptodown extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://([^\\.]+\\.){2,}${getSourceRegex(hosts)}',
-        caseSensitive: false);
+      '^https?://([^\\.]+\\.){2,}${getSourceRegex(hosts)}',
+      caseSensitive: false,
+    );
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
       throw InvalidURLError(name);
@@ -26,14 +41,20 @@ class Uptodown extends AppSource {
   }
 
   @override
-  Future<String?> tryInferringAppId(String standardUrl,
-      {Map<String, dynamic> additionalSettings = const {}}) async {
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
     return (await getAppDetailsFromPage(
-        standardUrl, additionalSettings))['appId'];
+      standardUrl,
+      additionalSettings,
+    ))['appId'];
   }
 
   Future<Map<String, String?>> getAppDetailsFromPage(
-      String standardUrl, Map<String, dynamic> additionalSettings) async {
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
     var res = await sourceRequest(standardUrl, additionalSettings);
     if (res.statusCode != 200) {
       throw getObtainiumHttpError(res);
@@ -49,8 +70,9 @@ class Uptodown extends AppSource {
         .toList();
     String? appId = detailElements.elementAtOrNull(0);
     String? dateStr = detailElements.elementAtOrNull(6);
-    String? fileId =
-        html.querySelector('#detail-app-name')?.attributes['data-file-id'];
+    String? fileId = html
+        .querySelector('#detail-app-name')
+        ?.attributes['data-file-id'];
     String? extension = detailElements.elementAtOrNull(7)?.toLowerCase();
     return Map.fromEntries([
       MapEntry('version', version),
@@ -59,7 +81,7 @@ class Uptodown extends AppSource {
       MapEntry('author', author),
       MapEntry('dateStr', dateStr),
       MapEntry('fileId', fileId),
-      MapEntry('extension', extension)
+      MapEntry('extension', extension),
     ]);
   }
 
@@ -68,8 +90,10 @@ class Uptodown extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    var appDetails =
-        await getAppDetailsFromPage(standardUrl, additionalSettings);
+    var appDetails = await getAppDetailsFromPage(
+      standardUrl,
+      additionalSettings,
+    );
     var version = appDetails['version'];
     var appId = appDetails['appId'];
     var fileId = appDetails['fileId'];
@@ -91,21 +115,28 @@ class Uptodown extends AppSource {
     if (dateStr != null) {
       relDate = parseDateTimeMMMddCommayyyy(dateStr);
     }
-    return APKDetails(version, [MapEntry('$appId.$extension', apkUrl)],
-        AppNames(author, appName),
-        releaseDate: relDate);
+    return APKDetails(
+      version,
+      [MapEntry('$appId.$extension', apkUrl)],
+      AppNames(author, appName),
+      releaseDate: relDate,
+    );
   }
 
   @override
-  Future<String> apkUrlPrefetchModifier(String apkUrl, String standardUrl,
-      Map<String, dynamic> additionalSettings) async {
+  Future<String> apkUrlPrefetchModifier(
+    String apkUrl,
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
     var res = await sourceRequest(apkUrl, additionalSettings);
     if (res.statusCode != 200) {
       throw getObtainiumHttpError(res);
     }
     var html = parse(res.body);
-    var finalUrlKey =
-        html.querySelector('#detail-download-button')?.attributes['data-url'];
+    var finalUrlKey = html
+        .querySelector('#detail-download-button')
+        ?.attributes['data-url'];
     if (finalUrlKey == null) {
       throw NoAPKError();
     }

lib/app_sources/vivoappstore.dart

@@ -0,0 +1,109 @@
+import 'dart:convert';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class VivoAppStore extends AppSource {
+  static const appDetailUrl =
+      'https://h5coml.vivo.com.cn/h5coml/appdetail_h5/browser_v2/index.html?appId=';
+
+  VivoAppStore() {
+    name = tr('vivoAppStore');
+    hosts = ['h5.appstore.vivo.com.cn', 'h5coml.vivo.com.cn'];
+    naiveStandardVersionDetection = true;
+    canSearch = true;
+    allowOverride = false;
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
+    var vivoAppId = parseVivoAppId(url);
+    return '$appDetailUrl$vivoAppId';
+  }
+
+  @override
+  Future<String?> tryInferringAppId(
+    String standardUrl, {
+    Map<String, dynamic> additionalSettings = const {},
+  }) async {
+    var json = await getDetailJson(standardUrl, additionalSettings);
+    return json['package_name'];
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    var json = await getDetailJson(standardUrl, additionalSettings);
+    var appName = json['title_zh'].toString();
+    var packageName = json['package_name'].toString();
+    var versionName = json['version_name'].toString();
+    var versionCode = json['version_code'].toString();
+    var developer = json['developer'].toString();
+    var uploadTime = json['upload_time'].toString();
+    var apkUrl = json['download_url'].toString();
+    var apkName = '${packageName}_$versionCode.apk';
+    return APKDetails(
+      versionName,
+      [MapEntry(apkName, apkUrl)],
+      AppNames(developer, appName),
+      releaseDate: DateTime.parse(uploadTime),
+    );
+  }
+
+  @override
+  Future<Map<String, List<String>>> search(
+    String query, {
+    Map<String, dynamic> querySettings = const {},
+  }) async {
+    var apiBaseUrl =
+        'https://h5-api.appstore.vivo.com.cn/h5appstore/search/result-list?app_version=2100&page_index=1&apps_per_page=20&target=local&cfrom=2&key=';
+    var searchUrl = '$apiBaseUrl${Uri.encodeQueryComponent(query)}';
+    var response = await sourceRequest(searchUrl, {});
+    if (response.statusCode != 200) {
+      throw getObtainiumHttpError(response);
+    }
+    var json = jsonDecode(response.body);
+    if (json['code'] != 0 || !json['data']['appSearchResponse']['result']) {
+      throw NoReleasesError();
+    }
+    Map<String, List<String>> results = {};
+    var resultsJson = json['data']['appSearchResponse']['value'];
+    for (var item in (resultsJson as List<dynamic>)) {
+      results['$appDetailUrl${item['id']}'] = [
+        item['title_zh'].toString(),
+        item['developer'].toString(),
+      ];
+    }
+    return results;
+  }
+
+  Future<Map<String, dynamic>> getDetailJson(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    var vivoAppId = parseVivoAppId(standardUrl);
+    var apiBaseUrl = 'https://h5-api.appstore.vivo.com.cn/detail/';
+    var params = '?frompage=messageh5&app_version=2100';
+    var detailUrl = '$apiBaseUrl$vivoAppId$params';
+    var response = await sourceRequest(detailUrl, additionalSettings);
+    if (response.statusCode != 200) {
+      throw getObtainiumHttpError(response);
+    }
+    var json = jsonDecode(response.body);
+    if (json['id'] == null) {
+      throw NoReleasesError();
+    }
+    return json;
+  }
+
+  String parseVivoAppId(String url) {
+    var appId = Uri.parse(url.replaceAll('/#', '')).queryParameters['appId'];
+    if (appId == null || appId.isEmpty) {
+      throw InvalidURLError(name);
+    }
+    return appId;
+  }
+}

lib/components/custom_app_bar.dart

@@ -20,8 +20,9 @@ class _CustomAppBarState extends State<CustomAppBar> {
         titlePadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
         title: Text(
           widget.title,
-          style:
-              TextStyle(color: Theme.of(context).textTheme.bodyMedium!.color),
+          style: TextStyle(
+            color: Theme.of(context).textTheme.bodyMedium!.color,
+          ),
         ),
       ),
     );

lib/components/generated_form.dart

@@ -16,11 +16,13 @@ abstract class GeneratedFormItem {
   dynamic ensureType(dynamic val);
   GeneratedFormItem clone();
 
-  GeneratedFormItem(this.key,
-      {this.label = 'Input',
-      this.belowWidgets = const [],
-      this.defaultValue,
-      this.additionalValidators = const []});
+  GeneratedFormItem(
+    this.key, {
+    this.label = 'Input',
+    this.belowWidgets = const [],
+    this.defaultValue,
+    this.additionalValidators = const [],
+  });
 }
 
 class GeneratedFormTextField extends GeneratedFormItem {
@@ -31,18 +33,19 @@ class GeneratedFormTextField extends GeneratedFormItem {
   late TextInputType? textInputType;
   late List<String>? autoCompleteOptions;
 
-  GeneratedFormTextField(super.key,
-      {super.label,
-      super.belowWidgets,
-      String super.defaultValue = '',
-      List<String? Function(String? value)> super.additionalValidators =
-          const [],
-      this.required = true,
-      this.max = 1,
-      this.hint,
-      this.password = false,
-      this.textInputType,
-      this.autoCompleteOptions});
+  GeneratedFormTextField(
+    super.key, {
+    super.label,
+    super.belowWidgets,
+    String super.defaultValue = '',
+    List<String? Function(String? value)> super.additionalValidators = const [],
+    this.required = true,
+    this.max = 1,
+    this.hint,
+    this.password = false,
+    this.textInputType,
+    this.autoCompleteOptions,
+  });
 
   @override
   String ensureType(val) {
@@ -51,16 +54,18 @@ class GeneratedFormTextField extends GeneratedFormItem {
 
   @override
   GeneratedFormTextField clone() {
-    return GeneratedFormTextField(key,
-        label: label,
-        belowWidgets: belowWidgets,
-        defaultValue: defaultValue,
-        additionalValidators: List.from(additionalValidators),
-        required: required,
-        max: max,
-        hint: hint,
-        password: password,
-        textInputType: textInputType);
+    return GeneratedFormTextField(
+      key,
+      label: label,
+      belowWidgets: belowWidgets,
+      defaultValue: defaultValue,
+      additionalValidators: List.from(additionalValidators),
+      required: required,
+      max: max,
+      hint: hint,
+      password: password,
+      textInputType: textInputType,
+    );
   }
 }
 
@@ -91,8 +96,9 @@ class GeneratedFormDropdown extends GeneratedFormItem {
       label: label,
       belowWidgets: belowWidgets,
       defaultValue: defaultValue,
-      disabledOptKeys:
-          disabledOptKeys != null ? List.from(disabledOptKeys!) : null,
+      disabledOptKeys: disabledOptKeys != null
+          ? List.from(disabledOptKeys!)
+          : null,
       additionalValidators: List.from(additionalValidators),
     );
   }
@@ -117,12 +123,14 @@ class GeneratedFormSwitch extends GeneratedFormItem {
 
   @override
   GeneratedFormSwitch clone() {
-    return GeneratedFormSwitch(key,
-        label: label,
-        belowWidgets: belowWidgets,
-        defaultValue: defaultValue,
-        disabled: false,
-        additionalValidators: List.from(additionalValidators));
+    return GeneratedFormSwitch(
+      key,
+      label: label,
+      belowWidgets: belowWidgets,
+      defaultValue: defaultValue,
+      disabled: false,
+      additionalValidators: List.from(additionalValidators),
+    );
   }
 }
 
@@ -132,17 +140,20 @@ class GeneratedFormTagInput extends GeneratedFormItem {
   late WrapAlignment alignment;
   late String emptyMessage;
   late bool showLabelWhenNotEmpty;
-  GeneratedFormTagInput(super.key,
-      {super.label,
-      super.belowWidgets,
-      Map<String, MapEntry<int, bool>> super.defaultValue = const {},
-      List<String? Function(Map<String, MapEntry<int, bool>> value)>
-          super.additionalValidators = const [],
-      this.deleteConfirmationMessage,
-      this.singleSelect = false,
-      this.alignment = WrapAlignment.start,
-      this.emptyMessage = 'Input',
-      this.showLabelWhenNotEmpty = true});
+  GeneratedFormTagInput(
+    super.key, {
+    super.label,
+    super.belowWidgets,
+    Map<String, MapEntry<int, bool>> super.defaultValue = const {},
+    List<String? Function(Map<String, MapEntry<int, bool>> value)>
+        super.additionalValidators =
+        const [],
+    this.deleteConfirmationMessage,
+    this.singleSelect = false,
+    this.alignment = WrapAlignment.start,
+    this.emptyMessage = 'Input',
+    this.showLabelWhenNotEmpty = true,
+  });
 
   @override
   Map<String, MapEntry<int, bool>> ensureType(val) {
@@ -151,25 +162,30 @@ class GeneratedFormTagInput extends GeneratedFormItem {
 
   @override
   GeneratedFormTagInput clone() {
-    return GeneratedFormTagInput(key,
-        label: label,
-        belowWidgets: belowWidgets,
-        defaultValue: defaultValue,
-        additionalValidators: List.from(additionalValidators),
-        deleteConfirmationMessage: deleteConfirmationMessage,
-        singleSelect: singleSelect,
-        alignment: alignment,
-        emptyMessage: emptyMessage,
-        showLabelWhenNotEmpty: showLabelWhenNotEmpty);
+    return GeneratedFormTagInput(
+      key,
+      label: label,
+      belowWidgets: belowWidgets,
+      defaultValue: defaultValue,
+      additionalValidators: List.from(additionalValidators),
+      deleteConfirmationMessage: deleteConfirmationMessage,
+      singleSelect: singleSelect,
+      alignment: alignment,
+      emptyMessage: emptyMessage,
+      showLabelWhenNotEmpty: showLabelWhenNotEmpty,
+    );
   }
 }
 
-typedef OnValueChanges = void Function(
-    Map<String, dynamic> values, bool valid, bool isBuilding);
+typedef OnValueChanges =
+    void Function(Map<String, dynamic> values, bool valid, bool isBuilding);
 
 class GeneratedForm extends StatefulWidget {
-  const GeneratedForm(
-      {super.key, required this.items, required this.onValueChanges});
+  const GeneratedForm({
+    super.key,
+    required this.items,
+    required this.onValueChanges,
+  });
 
   final List<List<GeneratedFormItem>> items;
   final OnValueChanges onValueChanges;
@@ -179,7 +195,8 @@ class GeneratedForm extends StatefulWidget {
 }
 
 List<List<GeneratedFormItem>> cloneFormItems(
-    List<List<GeneratedFormItem>> items) {
+  List<List<GeneratedFormItem>> items,
+) {
   List<List<GeneratedFormItem>> clonedItems = [];
   for (var row in items) {
     List<GeneratedFormItem> clonedRow = [];
@@ -194,8 +211,13 @@ List<List<GeneratedFormItem>> cloneFormItems(
 class GeneratedFormSubForm extends GeneratedFormItem {
   final List<List<GeneratedFormItem>> items;
 
-  GeneratedFormSubForm(super.key, this.items,
-      {super.label, super.belowWidgets, super.defaultValue = const []});
+  GeneratedFormSubForm(
+    super.key,
+    this.items, {
+    super.label,
+    super.belowWidgets,
+    super.defaultValue = const [],
+  });
 
   @override
   ensureType(val) {
@@ -204,8 +226,13 @@ class GeneratedFormSubForm extends GeneratedFormItem {
 
   @override
   GeneratedFormSubForm clone() {
-    return GeneratedFormSubForm(key, cloneFormItems(items),
-        label: label, belowWidgets: belowWidgets, defaultValue: defaultValue);
+    return GeneratedFormSubForm(
+      key,
+      cloneFormItems(items),
+      label: label,
+      belowWidgets: belowWidgets,
+      defaultValue: defaultValue,
+    );
   }
 }
 
@@ -220,13 +247,18 @@ Color generateRandomLightColor() {
   // Map from HPLuv color space to RGB, use constant saturation=100, lightness=70
   final List<double> rgbValuesDbl = Hsluv.hpluvToRgb([hue, 100, 70]);
   // Map RBG values from 0-1 to 0-255:
-  final List<int> rgbValues =
-      rgbValuesDbl.map((rgb) => (rgb * 255).toInt()).toList();
+  final List<int> rgbValues = rgbValuesDbl
+      .map((rgb) => (rgb * 255).toInt())
+      .toList();
   return Color.fromARGB(255, rgbValues[0], rgbValues[1], rgbValues[2]);
 }
 
-int generateRandomNumber(int seed1,
-    {int seed2 = 0, int seed3 = 0, max = 10000}) {
+int generateRandomNumber(
+  int seed1, {
+  int seed2 = 0,
+  int seed3 = 0,
+  max = 10000,
+}) {
   int combinedSeed = seed1.hashCode ^ seed2.hashCode ^ seed3.hashCode;
   Random random = Random(combinedSeed);
   int randomNumber = random.nextInt(max);
@@ -261,7 +293,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
     widget.onValueChanges(returnValues, valid, isBuilding);
   }
 
-  initForm() {
+  void initForm() {
     initKey = widget.key.toString();
     // Initialize form values as all empty
     values.clear();
@@ -297,9 +329,9 @@ class _GeneratedFormState extends State<GeneratedForm> {
                   });
                 },
                 decoration: InputDecoration(
-                    helperText:
-                        formItem.label + (formItem.required ? ' *' : ''),
-                    hintText: formItem.hint),
+                  helperText: formItem.label + (formItem.required ? ' *' : ''),
+                  hintText: formItem.hint,
+                ),
                 minLines: formItem.max <= 1 ? null : formItem.max,
                 maxLines: formItem.max <= 1 ? 1 : formItem.max,
                 validator: (value) {
@@ -339,23 +371,26 @@ class _GeneratedFormState extends State<GeneratedForm> {
             return Text(tr('dropdownNoOptsError'));
           }
           return DropdownButtonFormField(
-              decoration: InputDecoration(labelText: formItem.label),
-              value: values[formItem.key],
-              items: formItem.opts!.map((e2) {
-                var enabled =
-                    formItem.disabledOptKeys?.contains(e2.key) != true;
-                return DropdownMenuItem(
-                    value: e2.key,
-                    enabled: enabled,
-                    child: Opacity(
-                        opacity: enabled ? 1 : 0.5, child: Text(e2.value)));
-              }).toList(),
-              onChanged: (value) {
-                setState(() {
-                  values[formItem.key] = value ?? formItem.opts!.first.key;
-                  someValueChanged();
-                });
+            decoration: InputDecoration(labelText: formItem.label),
+            value: values[formItem.key],
+            items: formItem.opts!.map((e2) {
+              var enabled = formItem.disabledOptKeys?.contains(e2.key) != true;
+              return DropdownMenuItem(
+                value: e2.key,
+                enabled: enabled,
+                child: Opacity(
+                  opacity: enabled ? 1 : 0.5,
+                  child: Text(e2.value),
+                ),
+              );
+            }).toList(),
+            onChanged: (value) {
+              setState(() {
+                values[formItem.key] = value ?? formItem.opts!.first.key;
+                someValueChanged();
               });
+            },
+          );
         } else if (formItem is GeneratedFormSubForm) {
           values[formItem.key] = [];
           for (Map<String, dynamic> v
@@ -394,33 +429,33 @@ class _GeneratedFormState extends State<GeneratedForm> {
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               Flexible(child: Text(widget.items[r][e].label)),
-              const SizedBox(
-                width: 8,
-              ),
+              const SizedBox(width: 8),
               Switch(
-                  value: values[fieldKey],
-                  onChanged:
-                      (widget.items[r][e] as GeneratedFormSwitch).disabled
-                          ? null
-                          : (value) {
-                              setState(() {
-                                values[fieldKey] = value;
-                                someValueChanged();
-                              });
-                            })
+                value: values[fieldKey],
+                onChanged: (widget.items[r][e] as GeneratedFormSwitch).disabled
+                    ? null
+                    : (value) {
+                        setState(() {
+                          values[fieldKey] = value;
+                          someValueChanged();
+                        });
+                      },
+              ),
             ],
           );
         } else if (widget.items[r][e] is GeneratedFormTagInput) {
           onAddPressed() {
             showDialog<Map<String, dynamic>?>(
-                context: context,
-                builder: (BuildContext ctx) {
-                  return GeneratedFormModal(
-                      title: widget.items[r][e].label,
-                      items: [
-                        [GeneratedFormTextField('label', label: tr('label'))]
-                      ]);
-                }).then((value) {
+              context: context,
+              builder: (BuildContext ctx) {
+                return GeneratedFormModal(
+                  title: widget.items[r][e].label,
+                  items: [
+                    [GeneratedFormTextField('label', label: tr('label'))],
+                  ],
+                );
+              },
+            ).then((value) {
               String? label = value?['label'];
               if (label != null) {
                 setState(() {
@@ -434,8 +469,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
                     var someSelected = temp.entries
                         .where((element) => element.value.value)
                         .isNotEmpty;
-                    temp[label] = MapEntry(generateRandomLightColor().value,
-                        !(someSelected && singleSelect));
+                    temp[label] = MapEntry(
+                      generateRandomLightColor().value,
+                      !(someSelected && singleSelect),
+                    );
                     values[fieldKey] = temp;
                     someValueChanged();
                   }
@@ -444,236 +481,274 @@ class _GeneratedFormState extends State<GeneratedForm> {
             });
           }
 
-          formInputs[r][e] =
-              Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
-            if ((values[fieldKey] as Map<String, MapEntry<int, bool>>?)
-                        ?.isNotEmpty ==
-                    true &&
-                (widget.items[r][e] as GeneratedFormTagInput)
-                    .showLabelWhenNotEmpty)
-              Column(
-                crossAxisAlignment:
-                    (widget.items[r][e] as GeneratedFormTagInput).alignment ==
-                            WrapAlignment.center
-                        ? CrossAxisAlignment.center
-                        : CrossAxisAlignment.stretch,
+          formInputs[r][e] = Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              if ((values[fieldKey] as Map<String, MapEntry<int, bool>>?)
+                          ?.isNotEmpty ==
+                      true &&
+                  (widget.items[r][e] as GeneratedFormTagInput)
+                      .showLabelWhenNotEmpty)
+                Column(
+                  crossAxisAlignment:
+                      (widget.items[r][e] as GeneratedFormTagInput).alignment ==
+                          WrapAlignment.center
+                      ? CrossAxisAlignment.center
+                      : CrossAxisAlignment.stretch,
+                  children: [
+                    Text(widget.items[r][e].label),
+                    const SizedBox(height: 8),
+                  ],
+                ),
+              Wrap(
+                alignment:
+                    (widget.items[r][e] as GeneratedFormTagInput).alignment,
+                crossAxisAlignment: WrapCrossAlignment.center,
                 children: [
-                  Text(widget.items[r][e].label),
-                  const SizedBox(
-                    height: 8,
-                  ),
-                ],
-              ),
-            Wrap(
-              alignment:
-                  (widget.items[r][e] as GeneratedFormTagInput).alignment,
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: [
-                // (values[fieldKey] as Map<String, MapEntry<int, bool>>?)
-                //             ?.isEmpty ==
-                //         true
-                //     ? Text(
-                //         (widget.items[r][e] as GeneratedFormTagInput)
-                //             .emptyMessage,
-                //       )
-                //     : const SizedBox.shrink(),
-                ...(values[fieldKey] as Map<String, MapEntry<int, bool>>?)
-                        ?.entries
-                        .map((e2) {
-                      return Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 4),
-                          child: ChoiceChip(
-                            label: Text(e2.key),
-                            backgroundColor: Color(e2.value.key).withAlpha(50),
-                            selectedColor: Color(e2.value.key),
-                            visualDensity: VisualDensity.compact,
-                            selected: e2.value.value,
-                            onSelected: (value) {
-                              setState(() {
-                                (values[fieldKey] as Map<String,
-                                        MapEntry<int, bool>>)[e2.key] =
-                                    MapEntry(
-                                        (values[fieldKey] as Map<String,
-                                                MapEntry<int, bool>>)[e2.key]!
-                                            .key,
-                                        value);
-                                if ((widget.items[r][e]
-                                            as GeneratedFormTagInput)
-                                        .singleSelect &&
-                                    value == true) {
-                                  for (var key in (values[fieldKey]
-                                          as Map<String, MapEntry<int, bool>>)
-                                      .keys) {
-                                    if (key != e2.key) {
-                                      (values[fieldKey] as Map<
-                                          String,
-                                          MapEntry<int,
-                                              bool>>)[key] = MapEntry(
-                                          (values[fieldKey] as Map<String,
-                                                  MapEntry<int, bool>>)[key]!
-                                              .key,
-                                          false);
+                  // (values[fieldKey] as Map<String, MapEntry<int, bool>>?)
+                  //             ?.isEmpty ==
+                  //         true
+                  //     ? Text(
+                  //         (widget.items[r][e] as GeneratedFormTagInput)
+                  //             .emptyMessage,
+                  //       )
+                  //     : const SizedBox.shrink(),
+                  ...(values[fieldKey] as Map<String, MapEntry<int, bool>>?)
+                          ?.entries
+                          .map((e2) {
+                            return Padding(
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 4,
+                              ),
+                              child: ChoiceChip(
+                                label: Text(e2.key),
+                                backgroundColor: Color(
+                                  e2.value.key,
+                                ).withAlpha(50),
+                                selectedColor: Color(e2.value.key),
+                                visualDensity: VisualDensity.compact,
+                                selected: e2.value.value,
+                                onSelected: (value) {
+                                  setState(() {
+                                    (values[fieldKey]
+                                        as Map<String, MapEntry<int, bool>>)[e2
+                                        .key] = MapEntry(
+                                      (values[fieldKey]
+                                              as Map<
+                                                String,
+                                                MapEntry<int, bool>
+                                              >)[e2.key]!
+                                          .key,
+                                      value,
+                                    );
+                                    if ((widget.items[r][e]
+                                                as GeneratedFormTagInput)
+                                            .singleSelect &&
+                                        value == true) {
+                                      for (var key
+                                          in (values[fieldKey]
+                                                  as Map<
+                                                    String,
+                                                    MapEntry<int, bool>
+                                                  >)
+                                              .keys) {
+                                        if (key != e2.key) {
+                                          (values[fieldKey]
+                                              as Map<
+                                                String,
+                                                MapEntry<int, bool>
+                                              >)[key] = MapEntry(
+                                            (values[fieldKey]
+                                                    as Map<
+                                                      String,
+                                                      MapEntry<int, bool>
+                                                    >)[key]!
+                                                .key,
+                                            false,
+                                          );
+                                        }
+                                      }
                                     }
-                                  }
-                                }
-                                someValueChanged();
-                              });
-                            },
-                          ));
-                    }) ??
-                    [const SizedBox.shrink()],
-                (values[fieldKey] as Map<String, MapEntry<int, bool>>?)
-                            ?.values
-                            .where((e) => e.value)
-                            .length ==
-                        1
-                    ? Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 4),
-                        child: IconButton(
-                          onPressed: () {
-                            setState(() {
-                              var temp = values[fieldKey]
-                                  as Map<String, MapEntry<int, bool>>;
-                              // get selected category str where bool is true
-                              final oldEntry = temp.entries
-                                  .firstWhere((entry) => entry.value.value);
-                              // generate new color, ensure it is not the same
-                              int newColor = oldEntry.value.key;
-                              while (oldEntry.value.key == newColor) {
-                                newColor = generateRandomLightColor().value;
-                              }
-                              // Update entry with new color, remain selected
-                              temp.update(oldEntry.key,
-                                  (old) => MapEntry(newColor, old.value));
-                              values[fieldKey] = temp;
-                              someValueChanged();
-                            });
-                          },
-                          icon: const Icon(Icons.format_color_fill_rounded),
-                          visualDensity: VisualDensity.compact,
-                          tooltip: tr('colour'),
-                        ))
-                    : const SizedBox.shrink(),
-                (values[fieldKey] as Map<String, MapEntry<int, bool>>?)
-                            ?.values
-                            .where((e) => e.value)
-                            .isNotEmpty ==
-                        true
-                    ? Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 4),
-                        child: IconButton(
-                          onPressed: () {
-                            fn() {
+                                    someValueChanged();
+                                  });
+                                },
+                              ),
+                            );
+                          }) ??
+                      [const SizedBox.shrink()],
+                  (values[fieldKey] as Map<String, MapEntry<int, bool>>?)
+                              ?.values
+                              .where((e) => e.value)
+                              .length ==
+                          1
+                      ? Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 4),
+                          child: IconButton(
+                            onPressed: () {
                               setState(() {
-                                var temp = values[fieldKey]
-                                    as Map<String, MapEntry<int, bool>>;
-                                temp.removeWhere((key, value) => value.value);
+                                var temp =
+                                    values[fieldKey]
+                                        as Map<String, MapEntry<int, bool>>;
+                                // get selected category str where bool is true
+                                final oldEntry = temp.entries.firstWhere(
+                                  (entry) => entry.value.value,
+                                );
+                                // generate new color, ensure it is not the same
+                                int newColor = oldEntry.value.key;
+                                while (oldEntry.value.key == newColor) {
+                                  newColor = generateRandomLightColor().value;
+                                }
+                                // Update entry with new color, remain selected
+                                temp.update(
+                                  oldEntry.key,
+                                  (old) => MapEntry(newColor, old.value),
+                                );
                                 values[fieldKey] = temp;
                                 someValueChanged();
                               });
-                            }
+                            },
+                            icon: const Icon(Icons.format_color_fill_rounded),
+                            visualDensity: VisualDensity.compact,
+                            tooltip: tr('colour'),
+                          ),
+                        )
+                      : const SizedBox.shrink(),
+                  (values[fieldKey] as Map<String, MapEntry<int, bool>>?)
+                              ?.values
+                              .where((e) => e.value)
+                              .isNotEmpty ==
+                          true
+                      ? Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 4),
+                          child: IconButton(
+                            onPressed: () {
+                              fn() {
+                                setState(() {
+                                  var temp =
+                                      values[fieldKey]
+                                          as Map<String, MapEntry<int, bool>>;
+                                  temp.removeWhere((key, value) => value.value);
+                                  values[fieldKey] = temp;
+                                  someValueChanged();
+                                });
+                              }
 
-                            if ((widget.items[r][e] as GeneratedFormTagInput)
-                                    .deleteConfirmationMessage !=
-                                null) {
-                              var message =
-                                  (widget.items[r][e] as GeneratedFormTagInput)
-                                      .deleteConfirmationMessage!;
-                              showDialog<Map<String, dynamic>?>(
+                              if ((widget.items[r][e] as GeneratedFormTagInput)
+                                      .deleteConfirmationMessage !=
+                                  null) {
+                                var message =
+                                    (widget.items[r][e]
+                                            as GeneratedFormTagInput)
+                                        .deleteConfirmationMessage!;
+                                showDialog<Map<String, dynamic>?>(
                                   context: context,
                                   builder: (BuildContext ctx) {
                                     return GeneratedFormModal(
-                                        title: message.key,
-                                        message: message.value,
-                                        items: const []);
-                                  }).then((value) {
-                                if (value != null) {
-                                  fn();
-                                }
-                              });
-                            } else {
-                              fn();
-                            }
-                          },
-                          icon: const Icon(Icons.remove),
-                          visualDensity: VisualDensity.compact,
-                          tooltip: tr('remove'),
-                        ))
-                    : const SizedBox.shrink(),
-                (values[fieldKey] as Map<String, MapEntry<int, bool>>?)
-                            ?.isEmpty ==
-                        true
-                    ? Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 4),
-                        child: TextButton.icon(
-                          onPressed: onAddPressed,
-                          icon: const Icon(Icons.add),
-                          label: Text(
+                                      title: message.key,
+                                      message: message.value,
+                                      items: const [],
+                                    );
+                                  },
+                                ).then((value) {
+                                  if (value != null) {
+                                    fn();
+                                  }
+                                });
+                              } else {
+                                fn();
+                              }
+                            },
+                            icon: const Icon(Icons.remove),
+                            visualDensity: VisualDensity.compact,
+                            tooltip: tr('remove'),
+                          ),
+                        )
+                      : const SizedBox.shrink(),
+                  (values[fieldKey] as Map<String, MapEntry<int, bool>>?)
+                              ?.isEmpty ==
+                          true
+                      ? Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 4),
+                          child: TextButton.icon(
+                            onPressed: onAddPressed,
+                            icon: const Icon(Icons.add),
+                            label: Text(
                               (widget.items[r][e] as GeneratedFormTagInput)
-                                  .label),
-                        ))
-                    : Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 4),
-                        child: IconButton(
-                          onPressed: onAddPressed,
-                          icon: const Icon(Icons.add),
-                          visualDensity: VisualDensity.compact,
-                          tooltip: tr('add'),
-                        )),
-              ],
-            )
-          ]);
+                                  .label,
+                            ),
+                          ),
+                        )
+                      : Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 4),
+                          child: IconButton(
+                            onPressed: onAddPressed,
+                            icon: const Icon(Icons.add),
+                            visualDensity: VisualDensity.compact,
+                            tooltip: tr('add'),
+                          ),
+                        ),
+                ],
+              ),
+            ],
+          );
         } else if (widget.items[r][e] is GeneratedFormSubForm) {
           List<Widget> subformColumn = [];
-          var compact = (widget.items[r][e] as GeneratedFormSubForm)
-                      .items
-                      .length ==
-                  1 &&
+          var compact =
+              (widget.items[r][e] as GeneratedFormSubForm).items.length == 1 &&
               (widget.items[r][e] as GeneratedFormSubForm).items[0].length == 1;
           for (int i = 0; i < values[fieldKey].length; i++) {
-            var internalFormKey = ValueKey(generateRandomNumber(
+            var internalFormKey = ValueKey(
+              generateRandomNumber(
                 values[fieldKey].length,
                 seed2: i,
-                seed3: forceUpdateKeyCount));
-            subformColumn.add(Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                if (!compact)
-                  const SizedBox(
-                    height: 16,
+                seed3: forceUpdateKeyCount,
+              ),
+            );
+            subformColumn.add(
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  if (!compact) const SizedBox(height: 16),
+                  if (!compact)
+                    Text(
+                      '${(widget.items[r][e] as GeneratedFormSubForm).label} (${i + 1})',
+                      style: const TextStyle(fontWeight: FontWeight.bold),
+                    ),
+                  GeneratedForm(
+                    key: internalFormKey,
+                    items:
+                        cloneFormItems(
+                              (widget.items[r][e] as GeneratedFormSubForm)
+                                  .items,
+                            )
+                            .map(
+                              (x) => x.map((y) {
+                                y.defaultValue = values[fieldKey]?[i]?[y.key];
+                                y.key = '${y.key.toString()},$internalFormKey';
+                                return y;
+                              }).toList(),
+                            )
+                            .toList(),
+                    onValueChanges: (values, valid, isBuilding) {
+                      values = values.map(
+                        (key, value) => MapEntry(key.split(',')[0], value),
+                      );
+                      if (valid) {
+                        this.values[fieldKey]?[i] = values;
+                      }
+                      someValueChanged(
+                        isBuilding: isBuilding,
+                        forceInvalid: !valid,
+                      );
+                    },
                   ),
-                if (!compact)
-                  Text(
-                    '${(widget.items[r][e] as GeneratedFormSubForm).label} (${i + 1})',
-                    style: const TextStyle(fontWeight: FontWeight.bold),
-                  ),
-                GeneratedForm(
-                  key: internalFormKey,
-                  items: cloneFormItems(
-                          (widget.items[r][e] as GeneratedFormSubForm).items)
-                      .map((x) => x.map((y) {
-                            y.defaultValue = values[fieldKey]?[i]?[y.key];
-                            y.key = '${y.key.toString()},$internalFormKey';
-                            return y;
-                          }).toList())
-                      .toList(),
-                  onValueChanges: (values, valid, isBuilding) {
-                    values = values.map(
-                        (key, value) => MapEntry(key.split(',')[0], value));
-                    if (valid) {
-                      this.values[fieldKey]?[i] = values;
-                    }
-                    someValueChanged(
-                        isBuilding: isBuilding, forceInvalid: !valid);
-                  },
-                ),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.end,
-                  children: [
-                    TextButton.icon(
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.end,
+                    children: [
+                      TextButton.icon(
                         style: TextButton.styleFrom(
-                            foregroundColor:
-                                Theme.of(context).colorScheme.error),
+                          foregroundColor: Theme.of(context).colorScheme.error,
+                        ),
                         onPressed: (values[fieldKey].length > 0)
                             ? () {
                                 var temp = List.from(values[fieldKey]);
@@ -686,33 +761,40 @@ class _GeneratedFormState extends State<GeneratedForm> {
                         label: Text(
                           '${(widget.items[r][e] as GeneratedFormSubForm).label} (${i + 1})',
                         ),
-                        icon: const Icon(
-                          Icons.delete_outline_rounded,
-                        ))
-                  ],
-                )
-              ],
-            ));
+                        icon: const Icon(Icons.delete_outline_rounded),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            );
           }
-          subformColumn.add(Padding(
-            padding: const EdgeInsets.only(bottom: 0, top: 8),
-            child: Row(
-              children: [
-                Expanded(
+          subformColumn.add(
+            Padding(
+              padding: const EdgeInsets.only(bottom: 0, top: 8),
+              child: Row(
+                children: [
+                  Expanded(
                     child: ElevatedButton.icon(
-                        onPressed: () {
-                          values[fieldKey].add(getDefaultValuesFromFormItems(
-                              (widget.items[r][e] as GeneratedFormSubForm)
-                                  .items));
-                          forceUpdateKeyCount++;
-                          someValueChanged();
-                        },
-                        icon: const Icon(Icons.add),
-                        label: Text((widget.items[r][e] as GeneratedFormSubForm)
-                            .label))),
-              ],
+                      onPressed: () {
+                        values[fieldKey].add(
+                          getDefaultValuesFromFormItems(
+                            (widget.items[r][e] as GeneratedFormSubForm).items,
+                          ),
+                        );
+                        forceUpdateKeyCount++;
+                        someValueChanged();
+                      },
+                      icon: const Icon(Icons.add),
+                      label: Text(
+                        (widget.items[r][e] as GeneratedFormSubForm).label,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
             ),
-          ));
+          );
           formInputs[r][e] = Column(children: subformColumn);
         }
       }
@@ -726,38 +808,43 @@ class _GeneratedFormState extends State<GeneratedForm> {
             height: widget.items[rowInputs.key - 1][0] is GeneratedFormSwitch
                 ? 8
                 : 25,
-          )
+          ),
         ]);
       }
       List<Widget> rowItems = [];
       rowInputs.value.asMap().entries.forEach((rowInput) {
         if (rowInput.key > 0) {
-          rowItems.add(const SizedBox(
-            width: 20,
-          ));
+          rowItems.add(const SizedBox(width: 20));
         }
-        rowItems.add(Expanded(
+        rowItems.add(
+          Expanded(
             child: Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                mainAxisSize: MainAxisSize.min,
-                children: [
-              rowInput.value,
-              ...widget.items[rowInputs.key][rowInput.key].belowWidgets
-            ])));
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                rowInput.value,
+                ...widget.items[rowInputs.key][rowInput.key].belowWidgets,
+              ],
+            ),
+          ),
+        );
       });
       rows.add(rowItems);
     });
 
     return Form(
-        key: _formKey,
-        child: Column(
-          children: [
-            ...rows.map((row) => Row(
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [...row.map((e) => e)],
-                ))
-          ],
-        ));
+      key: _formKey,
+      child: Column(
+        children: [
+          ...rows.map(
+            (row) => Row(
+              mainAxisAlignment: MainAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [...row.map((e) => e)],
+            ),
+          ),
+        ],
+      ),
+    );
   }
 }

lib/components/generated_form_modal.dart

@@ -4,15 +4,16 @@ import 'package:flutter/services.dart';
 import 'package:obtainium/components/generated_form.dart';
 
 class GeneratedFormModal extends StatefulWidget {
-  const GeneratedFormModal(
-      {super.key,
-      required this.title,
-      required this.items,
-      this.initValid = false,
-      this.message = '',
-      this.additionalWidgets = const [],
-      this.singleNullReturnButton,
-      this.primaryActionColour});
+  const GeneratedFormModal({
+    super.key,
+    required this.title,
+    required this.items,
+    this.initValid = false,
+    this.message = '',
+    this.additionalWidgets = const [],
+    this.singleNullReturnButton,
+    this.primaryActionColour,
+  });
 
   final String title;
   final String message;
@@ -41,14 +42,12 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
     return AlertDialog(
       scrollable: true,
       title: Text(widget.title),
-      content:
-          Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
-        if (widget.message.isNotEmpty) Text(widget.message),
-        if (widget.message.isNotEmpty)
-          const SizedBox(
-            height: 16,
-          ),
-        GeneratedForm(
+      content: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          if (widget.message.isNotEmpty) Text(widget.message),
+          if (widget.message.isNotEmpty) const SizedBox(height: 16),
+          GeneratedForm(
             items: widget.items,
             onValueChanges: (values, valid, isBuilding) {
               if (isBuilding) {
@@ -60,23 +59,29 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
                   this.valid = valid;
                 });
               }
-            }),
-        if (widget.additionalWidgets.isNotEmpty) ...widget.additionalWidgets
-      ]),
+            },
+          ),
+          if (widget.additionalWidgets.isNotEmpty) ...widget.additionalWidgets,
+        ],
+      ),
       actions: [
         TextButton(
-            onPressed: () {
-              Navigator.of(context).pop(null);
-            },
-            child: Text(widget.singleNullReturnButton == null
+          onPressed: () {
+            Navigator.of(context).pop(null);
+          },
+          child: Text(
+            widget.singleNullReturnButton == null
                 ? tr('cancel')
-                : widget.singleNullReturnButton!)),
+                : widget.singleNullReturnButton!,
+          ),
+        ),
         widget.singleNullReturnButton == null
             ? TextButton(
                 style: widget.primaryActionColour == null
                     ? null
                     : TextButton.styleFrom(
-                        foregroundColor: widget.primaryActionColour),
+                        foregroundColor: widget.primaryActionColour,
+                      ),
                 onPressed: !valid
                     ? null
                     : () {
@@ -85,8 +90,9 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
                           Navigator.of(context).pop(values);
                         }
                       },
-                child: Text(tr('continue')))
-            : const SizedBox.shrink()
+                child: Text(tr('continue')),
+              )
+            : const SizedBox.shrink(),
       ],
     );
   }