Merge pull request #2075 from ImranR98/dev

- Fix categories UI bug (#2064) - Fix how changelog quotes look in dark theme (#2065)
ImranR98 · Jan 14, 2025 · de2e881 · de2e881
2 parents 7d330cd + 9af3aaa
commit de2e881
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/.flutter b/.flutter
diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart
@@ -60,6 +60,9 @@ showChangeLogDialog(BuildContext context, App app, String? changesUrl,
                     width: MediaQuery.of(context).size.width,
                     height: MediaQuery.of(context).size.height - 350,
                     child: Markdown(
+                      styleSheet: MarkdownStyleSheet(
+                          blockquoteDecoration: BoxDecoration(
+                              color: Theme.of(context).cardColor)),
                       data: changeLog,
                       onTapLink: (text, href, title) {
                         if (href != null) {
@@ -524,12 +527,12 @@ class AppsPageState extends State<AppsPage> {
       var transparent =
           Theme.of(context).colorScheme.surface.withAlpha(0).value;
       List<double> stops = [
-        ...listedApps[index].app.categories.asMap().entries.map(
-            (e) => ((e.key / (listedApps[index].app.categories.length - 1)))),
+        ...listedApps[index].app.categories.asMap().entries.map((e) =>
+            ((e.key / (listedApps[index].app.categories.length - 1)) - 0.0001)),
         1
       ];
       if (stops.length == 2) {
-        stops[0] = 1;
+        stops[0] = 0.9999;
       }
       return Container(
           decoration: BoxDecoration(

diff --git a/pubspec.lock b/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: "direct main"
     description:
       name: android_intent_plus
-      sha256: "53136214d506d3128c9f4e5bfce3d026abe7e8038958629811a8d3223b1757c1"
+      sha256: "884b01361fe3756c4abbb56a382a00b16a2519079794a585afa7019a73cc0add"
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.1"
+    version: "5.2.2"
   android_package_installer:
     dependency: "direct main"
     description:
@@ -176,10 +176,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: e0817759ec6d2d8e57eb234e6e57d2173931367a865850c7acea40d4b4f9c27d
+      sha256: "8a68739d3ee113e51ad35583fdf9ab82c55d09d693d3c39da1aebab87c938412"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.1"
+    version: "6.1.2"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -232,10 +232,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431"
+      sha256: b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544
       url: "https://pub.dev"
     source: hosted
-    version: "11.2.0"
+    version: "11.2.1"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -596,10 +596,10 @@ packages:
     dependency: "direct main"
     description:
       name: markdown
-      sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051
+      sha256: "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1"
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.2"
+    version: "7.3.0"
   matcher:
     dependency: transitive
     description:
@@ -828,10 +828,10 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400"
+      sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.3"
+    version: "10.1.4"
   share_plus_platform_interface:
     dependency: transitive
     description:
@@ -1155,10 +1155,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "3d535126f7244871542b2f0b0fcf94629c9a14883250461f9abe1a6644c1c379"
+      sha256: d1ee28f44894cbabb1d94cc42f9980297f689ff844d067ec50ff88d86e27d63f
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "4.3.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -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.38+2295
+version: 1.1.39+2296
 
 environment:
   sdk: ^3.6.0
+1 −1		bin/internal/engine.version
+27 −1		dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart
+27 −1		dev/devicelab/bin/tasks/build_android_host_app_with_module_source.dart
+11 −2		dev/devicelab/lib/framework/utils.dart
+25 −31		examples/api/lib/material/dropdown_menu/dropdown_menu.0.dart
+6 −7		examples/api/lib/material/dropdown_menu/dropdown_menu.1.dart
+16 −10		examples/api/lib/material/dropdown_menu/dropdown_menu.2.dart
+14 −21		packages/flutter/lib/src/material/dropdown_menu.dart
+3 −1		packages/flutter/lib/src/widgets/single_child_scroll_view.dart
+0 −129		packages/flutter/test/material/dropdown_menu_test.dart
+0 −45		packages/flutter/test/widgets/single_child_scroll_view_test.dart
+4 −0		packages/flutter_tools/gradle/aar_init_script.gradle
+0 −17		packages/flutter_tools/templates/module/android/gradle/build.gradle.tmpl
+0 −6		packages/flutter_tools/templates/module/android/host_app_ephemeral/settings.gradle.copy.tmpl
+31 −0		packages/flutter_tools/templates/module/android/host_app_ephemeral/settings.gradle.tmpl
+5 −8		packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl
+4 −0		packages/flutter_tools/templates/module/android/library_new_embedding/include_flutter.groovy.copy.tmpl
+1 −1		packages/flutter_tools/templates/template_manifest.json