Merge pull request #495 from ImranR98/dev

HTML Source Bugfix (#288) + Better Placeholder Icon Visibility (#490)
Increment version, update packages
2025-07-24 18:09:42 +02:00 · 2023-04-28 22:25:30 -04:00 · 2023-04-28 22:24:41 -04:00 · 2023-04-28 22:23:26 -04:00 · 2023-04-28 22:22:55 -04:00 · 2023-04-28 22:18:58 -04:00
7 changed files with 51 additions and 45 deletions
--- a/assets/translations/hu.json
+++ b/assets/translations/hu.json
@@ -122,7 +122,7 @@
    "followSystem": "Rendszer szerint",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
-    "useBlackTheme": "Use pure black dark theme",
+    "useBlackTheme": "Használjon tiszta fekete sötét témát",
    "appSortBy": "App rendezés...",
    "authorName": "Szerző/Név",
    "nameAuthor": "Név/Szerző",
@@ -207,7 +207,7 @@
    "addCategory": "Új kategória",
    "label": "Címke",
    "language": "Nyelv",
-    "copiedToClipboard": "Copied to Clipboard",
+    "copiedToClipboard": "Másolva a vágólapra",
    "storagePermissionDenied": "Tárhely engedély megtagadva",
    "selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
    "filterAPKsByRegEx": "Az APK-k szűrése reguláris kifejezéssel",
--- a/lib/app_sources/html.dart
+++ b/lib/app_sources/html.dart
@@ -41,9 +41,14 @@ class HTML extends AppSource {
        } catch (err) {
          // is relative
        }
-        var currPathSegments = uri.path.split('/');
+        var currPathSegments = uri.path
+            .split('/')
+            .where((element) => element.trim().isNotEmpty)
+            .toList();
        if (e.startsWith('/') || currPathSegments.isEmpty) {
          return '${uri.origin}/$e';
+        } else if (e.split('/').length == 1) {
+          return '${uri.origin}/${currPathSegments.join('/')}/$e';
        } else {
          return '${uri.origin}/${currPathSegments.sublist(0, currPathSegments.length - 1).join('/')}/$e';
        }
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';

-const String currentVersion = '0.11.33';
+const String currentVersion = '0.11.35';
 const String currentReleaseTag =
    'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

--- a/lib/pages/apps.dart
+++ b/lib/pages/apps.dart
@@ -364,7 +364,7 @@ class AppsPageState extends State<AppsPage> {
                        child: Image(
                          image: const AssetImage(
                              'assets/graphics/icon_small.png'),
-                          color: Colors.white.withOpacity(0.1),
+                          color: Colors.white.withOpacity(0.3),
                          colorBlendMode: BlendMode.modulate,
                          gaplessPlayback: true,
                        ),
--- a/lib/providers/apps_provider.dart
+++ b/lib/providers/apps_provider.dart
@@ -204,7 +204,8 @@ class AppsProvider with ChangeNotifier {
      // The former case should be handled (give the App its real ID), the latter is a security issue
      var newInfo = await PackageArchiveInfo.fromPath(downloadedFile.path);
      if (app.id != newInfo.packageName) {
-        if (apps[app.id] != null && !SourceProvider().isTempId(app)) {
+        var isTempId = SourceProvider().isTempId(app);
+        if (apps[app.id] != null && !isTempId) {
          throw IDChangedError();
        }
        var originalAppId = app.id;
@@ -213,7 +214,7 @@ class AppsProvider with ChangeNotifier {
            '${downloadedFile.parent.path}/${app.id}-${downloadUrl.hashCode}.apk');
        if (apps[originalAppId] != null) {
          await removeApps([originalAppId]);
-          await saveApps([app]);
+          await saveApps([app], onlyIfExists: !isTempId);
        }
      }
      return DownloadedApk(app.id, downloadedFile);
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,18 +5,18 @@ packages:
    dependency: "direct main"
    description:
      name: android_alarm_manager_plus
-      sha256: f6d0347734fa2ea716349a5a3e16ffdc1800ca64e5640112896d128c6815c178
+      sha256: "88a8001851fdc9bd54fa4e30d0277bb900a50f3d86ff244da7f027400bf23ac0"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
  android_intent_plus:
    dependency: "direct main"
    description:
      name: android_intent_plus
-      sha256: "6bcdcd20461ac7a0c785f6298cdda96ad275d5bcbc1ecf28829cbe03ec6690be"
+      sha256: "04cbc7c332a6f0bba88fed354de78813e9d24049c1800aaf10f449c7adc22603"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.7"
+    version: "3.1.9"
  animations:
    dependency: "direct main"
    description:
@@ -117,10 +117,10 @@ packages:
    dependency: "direct main"
    description:
      name: device_info_plus
-      sha256: "435383ca05f212760b0a70426b5a90354fe6bd65992b3a5e27ab6ede74c02f5c"
+      sha256: f52ab3b76b36ede4d135aab80194df8925b553686f0fa12226b4e2d658e45903
      url: "https://pub.dev"
    source: hosted
-    version: "8.2.0"
+    version: "8.2.2"
  device_info_plus_platform_interface:
    dependency: transitive
    description:
@@ -210,26 +210,26 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_local_notifications
-      sha256: "293995f94e120c8afce768981bd1fa9c5d6de67c547568e3b42ae2defdcbb4a0"
+      sha256: "2876372952b65ca7f684e698eba22bda1cf581fa071dd30ba2f01900f507d0d1"
      url: "https://pub.dev"
    source: hosted
-    version: "13.0.0"
+    version: "14.0.0+1"
  flutter_local_notifications_linux:
    dependency: transitive
    description:
      name: flutter_local_notifications_linux
-      sha256: ccb08b93703aeedb58856e5637450bf3ffec899adb66dc325630b68994734b89
+      sha256: "909bb95de05a2e793503a2437146285a2f600cd0b3f826e26b870a334d8586d7"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.0+1"
+    version: "4.0.0"
  flutter_local_notifications_platform_interface:
    dependency: transitive
    description:
      name: flutter_local_notifications_platform_interface
-      sha256: "5ec1feac5f7f7d9266759488bc5f76416152baba9aa1b26fe572246caa00d1ab"
+      sha256: "63235c42de5b6c99846969a27ad0209c401e6b77b0498939813725b5791c107c"
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.0"
+    version: "7.0.0"
  flutter_localizations:
    dependency: transitive
    description: flutter
@@ -247,10 +247,10 @@ packages:
    dependency: transitive
    description:
      name: flutter_plugin_android_lifecycle
-      sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
+      sha256: "8ffe990dac54a4a5492747added38571a5ab474c8e5d196809ea08849c69b1bb"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.9"
+    version: "2.0.13"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@@ -417,10 +417,10 @@ packages:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: da97262be945a72270513700a92b39dd2f4a54dad55d061687e2e37a6390366a
+      sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.25"
+    version: "2.0.27"
  path_provider_foundation:
    dependency: transitive
    description:
@@ -449,10 +449,10 @@ packages:
    dependency: transitive
    description:
      name: path_provider_windows
-      sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130
+      sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.5"
+    version: "2.1.6"
  permission_handler:
    dependency: "direct main"
    description:
@@ -537,10 +537,10 @@ packages:
    dependency: "direct main"
    description:
      name: share_plus
-      sha256: "692261968a494e47323dcc8bc66d8d52e81bc27cb4b808e4e8d7e8079d4cc01a"
+      sha256: b1f15232d41e9701ab2f04181f21610c36c83a12ae426b79b4bd011c567934b1
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.2"
+    version: "6.3.4"
  share_plus_platform_interface:
    dependency: transitive
    description:
@@ -561,10 +561,10 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: "7fa90471a6875d26ad78c7e4a675874b2043874586891128dc5899662c97db46"
+      sha256: "6478c6bbbecfe9aced34c483171e90d7c078f5883558b30ec3163cf18402c749"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
  shared_preferences_foundation:
    dependency: transitive
    description:
@@ -622,18 +622,18 @@ packages:
    dependency: "direct main"
    description:
      name: sqflite
-      sha256: e7dfb6482d5d02b661d0b2399efa72b98909e5aa7b8336e1fb37e226264ade00
+      sha256: "8453780d1f703ead201a39673deb93decf85d543f359f750e2afc4908b55533f"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.7"
+    version: "2.2.8"
  sqflite_common:
    dependency: transitive
    description:
      name: sqflite_common
-      sha256: "220831bf0bd5333ff2445eee35ec131553b804e6b5d47a4a37ca6f5eb66e282c"
+      sha256: e77abf6ff961d69dfef41daccbb66b51e9983cdd5cb35bf30733598057401555
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.4"
+    version: "2.4.5"
  stack_trace:
    dependency: transitive
    description:
@@ -710,10 +710,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_android
-      sha256: a52628068d282d01a07cd86e6ba99e497aa45ce8c91159015b2416907d78e411
+      sha256: "22f8db4a72be26e9e3a4aa3f194b1f7afbc76d20ec141f84be1d787db2155cbd"
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.27"
+    version: "6.0.31"
  url_launcher_ios:
    dependency: transitive
    description:
@@ -726,10 +726,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_linux
-      sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc"
+      sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
  url_launcher_macos:
    dependency: transitive
    description:
@@ -758,10 +758,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_windows
-      sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd
+      sha256: "254708f17f7c20a9c8c471f67d86d76d4a3f9c1591aad1e15292008aceb82771"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
  uuid:
    dependency: transitive
    description:
@@ -790,10 +790,10 @@ packages:
    dependency: transitive
    description:
      name: webview_flutter_android
-      sha256: "134ed5d36127b6f5865e86a82174886eae0b983dacd8df14b0448371debde755"
+      sha256: d6cf18cd6c809c5a9294cd99707a21986aac4e08c87e1916ce2590315fb55d3a
      url: "https://pub.dev"
    source: hosted
-    version: "3.6.0"
+    version: "3.6.2"
  webview_flutter_platform_interface:
    dependency: transitive
    description:
@@ -822,10 +822,10 @@ packages:
    dependency: transitive
    description:
      name: xdg_directories
-      sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86
+      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.0+3"
+    version: "1.0.0"
  xml:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.11.33+155 # When changing this, update the tag in main() accordingly
+version: 0.11.35+157 # When changing this, update the tag in main() accordingly

 environment:
  sdk: '>=2.18.2 <3.0.0'
@@ -38,7 +38,7 @@ dependencies:
  cupertino_icons: ^1.0.5
  path_provider: ^2.0.11
  flutter_fgbg: ^0.2.0 # Try removing reliance on this
-  flutter_local_notifications: ^13.0.0
+  flutter_local_notifications: ^14.0.0+1
  provider: ^6.0.3
  http: ^0.13.5
  webview_flutter: ^4.0.0
Author	SHA1	Message	Date
Imran Remtulla	ce44e200a5	Merge pull request #495 from ImranR98/dev HTML Source Bugfix (#288) + Better Placeholder Icon Visibility (#490)	2023-04-28 22:25:30 -04:00
Imran Remtulla	e8ebf53626	Increment version, update packages	2023-04-28 22:24:41 -04:00
Imran Remtulla	cdd6a4124c	Merge pull request #492 from gidano/main Update hu.json	2023-04-28 22:23:26 -04:00
Imran Remtulla	09c71e4e9f	Increase icon placeholder opacity (#490 )	2023-04-28 22:22:55 -04:00
Imran Remtulla	28a996441c	HTML Source Bugfix #288	2023-04-28 22:18:58 -04:00
gidano	396bf012c9	Update hu.json	2023-04-25 15:55:30 +02:00
Imran Remtulla	02da24aa75	Merge pull request #487 from ImranR98/dev Fixed null error for imported Apps (#476)	2023-04-23 03:23:38 -04:00
Imran Remtulla	3c6e66ce12	Fixed null error for imported Apps (#476 )	2023-04-23 03:22:56 -04:00