Merge pull request #2207 from ImranR98/dev

- Fix "Forbidden" error for APKMirror (#1973)
- Switch from title case to sentence case + minor wording change (#2195, #2197)

Author: ImranR98

assets/translations/bs.json

@@ -315,7 +315,7 @@
     "appVerifierInstructionToast": "Dijeli sa AppVerifier-om, zatim se vratite kada ste spremni.",
     "wiki": "Pomoć/Wiki",
     "crowdsourcedConfigsLabel": "Konfiguracije aplikacije obezbeđene pomoću velikog broja ljudi (crowdsourcing) (koristite na svoju odgovornost)",
-    "crowdsourcedConfigsShort": "Crowdsourced App Configs",
+    "crowdsourcedConfigsShort": "Crowdsourced App Configurations",
     "allowInsecure": "Allow insecure HTTP requests",
     "stayOneVersionBehind": "Stay one version behind latest",
     "refreshBeforeDownload": "Refresh app details before download",

assets/translations/en-EO.json

@@ -315,7 +315,7 @@
     "appVerifierInstructionToast": "Diskonigu kun AppVerifier, poste revenu ĉi tie kiam preta.",
     "wiki": "Helpo/Vikio",
     "crowdsourcedConfigsLabel": "Komunumaj apo-agordoj (uzu kun singardo)",
-    "crowdsourcedConfigsShort": "Crowdsourced App Configs",
+    "crowdsourcedConfigsShort": "Crowdsourced App Configurations",
     "allowInsecure": "Allow insecure HTTP requests",
     "stayOneVersionBehind": "Stay one version behind latest",
     "refreshBeforeDownload": "Refresh app details before download",

assets/translations/en.json

@@ -315,7 +315,7 @@
     "appVerifierInstructionToast": "Ossza meg az AppVerifierrel, majd térjen vissza ide, ha kész.",
     "wiki": "Súgó/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsource-ből származó alkalmazások beállítása (saját felelősségére használja)",
-    "crowdsourcedConfigsShort": "Crowdsourced App Configs",
+    "crowdsourcedConfigsShort": "Crowdsourced App Configurations",
     "allowInsecure": "Nem biztonságos HTTP-kérések engedélyezése",
     "stayOneVersionBehind": "Maradjon egy verzióval a legújabb mögött",
     "refreshBeforeDownload": "Az alkalmazás adatainak frissítése a letöltés előtt",

assets/translations/hu.json

@@ -315,7 +315,7 @@
     "appVerifierInstructionToast": "Chia sẻ lên AppVerifier, sau đó quay lại đây khi sẵn sàng.",
     "wiki": "Trợ giúp/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (use at your own risk)",
-    "crowdsourcedConfigsShort": "Crowdsourced App Configs",
+    "crowdsourcedConfigsShort": "Crowdsourced App Configurations",
     "allowInsecure": "Allow insecure HTTP requests",
     "stayOneVersionBehind": "Stay one version behind latest",
     "refreshBeforeDownload": "Refresh app details before download",

assets/translations/vi.json

@@ -72,7 +72,8 @@ class APKMirror extends AppSource {
                 true
             ? additionalSettings['filterReleaseTitlesByRegEx']
             : null;
-    Response res = await sourceRequest('$standardUrl/feed', additionalSettings);
+    Response res =
+        await sourceRequest('$standardUrl/feed/', additionalSettings);
     if (res.statusCode == 200) {
       var items = parse(res.body).querySelectorAll('item');
       dynamic targetRelease;

lib/app_sources/apkmirror.dart

@@ -65,7 +65,7 @@ class Tencent extends AppSource {
       var releaseDate =
           json['app_detail_records'][appId]['app_info']['update_time'];
       var apkName = Uri.parse(apkUrl).queryParameters['fsname'] ??
-          '${appId}_${version}.apk';
+          '${appId}_$version.apk';
 
       return APKDetails(
           version, [MapEntry(apkName, apkUrl)], AppNames(author, appName),

lib/app_sources/tencent.dart

@@ -490,8 +490,9 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                       searchSource[0]);
                                                 }
                                               },
-                                        child: Text(tr('searchX',
-                                            args: [tr('source')])))),
+                                        child: Text(tr('searchX', args: [
+                                          tr('source').toLowerCase()
+                                        ])))),
                               ],
                             ),
                             const SizedBox(height: 8),

lib/pages/import_export.dart

@@ -800,7 +800,9 @@ class AppsProvider with ChangeNotifier {
     if (newInfo == null) {
       try {
         file.file.deleteSync(recursive: true);
-        additionalAPKs.forEach((a) => a.file.deleteSync(recursive: true));
+        for (var a in additionalAPKs) {
+          a.file.deleteSync(recursive: true);
+        }
       } catch (e) {
         //
       } finally {

lib/providers/apps_provider.dart

@@ -363,7 +363,7 @@ class App {
       otherAssetUrls: otherAssetUrls);
 
   factory App.fromJson(Map<String, dynamic> json) {
-    Map<String, dynamic> originalJSON = new Map.from(json);
+    Map<String, dynamic> originalJSON = Map.from(json);
     try {
       json = appJSONCompatibilityModifiers(json);
     } catch (e) {

lib/providers/source_provider.dart

@@ -80,10 +80,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "0c64e928dcbefddecd234205422bcfc2b5e6d31be0b86fef0d0dd48d7b4c9742"
+      sha256: "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.4"
+    version: "4.0.5"
   args:
     dependency: transitive
     description:
@@ -104,10 +104,10 @@ packages:
     dependency: "direct main"
     description:
       name: background_fetch
-      sha256: e9f26ae54d88310b7ac2a68f2f9fcee0081a4d5f11100f233a70702021e7ac4f
+      sha256: "442e82f508708be89fd0cc7e1dc3b27bc7c6c8c39a47967ccb7ed1c57b9108b5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.7"
+    version: "1.3.8"
   battery_plus:
     dependency: "direct main"
     description:
@@ -304,10 +304,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: ee11ce89f8937c39181bc88d57a455972f7545b86150d8f287d0d9cf95bcdf0a
+      sha256: "09b474c0c8117484b80cbebc043801ff91e05cfbd2874d512825c899e1754694"
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.0"
+    version: "9.2.3"
   fixnum:
     dependency: transitive
     description:
@@ -580,10 +580,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3"
+      sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.3"
+    version: "4.5.4"
   intl:
     dependency: transitive
     description:
@@ -860,10 +860,10 @@ packages:
     dependency: "direct main"
     description:
       name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
+      sha256: "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.4"
   share_plus:
     dependency: "direct main"
     description:
@@ -884,10 +884,10 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a"
+      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.2"
+    version: "2.5.3"
   shared_preferences_android:
     dependency: transitive
     description:
@@ -950,8 +950,8 @@ packages:
     description:
       path: "."
       ref: master
-      resolved-ref: "25acc02612c2e0fcae40d312e047ac48106f8f6b"
-      url: "https://github.com/re7gog/shizuku_apk_installer"
+      resolved-ref: c4349ceb03ae7293987cc0290ef06761e62c082e
+      url: "https://github.com/wilver06w/shizuku_apk_installer"
     source: git
     version: "0.0.1"
   sky_engine:
@@ -1195,10 +1195,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "631093a7fbd93e9690ac61d8c8f3e857efbc189fc33f712b9ad6c01a623517ef"
+      sha256: e09150b28a07933839adef0e4a088bb43e8c8d9e6b93025b01882d4067a58ab0
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.3"
+    version: "4.3.4"
   webview_flutter_platform_interface:
     dependency: transitive
     description:

pubspec.lock

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.1.47+2304
+version: 1.1.48+2305
 
 environment:
   sdk: ^3.6.0
@@ -80,7 +80,7 @@ dependencies:
       ref: master
   shizuku_apk_installer:
     git:
-      url: https://github.com/re7gog/shizuku_apk_installer
+      url: https://github.com/wilver06w/shizuku_apk_installer
       ref: master
 
   markdown: any