Merge pull request #1932 from matthiasn/fix/theming_issue

fix: theming issue
matthiasn · Feb 11, 2025 · e873fda · e873fda
2 parents b78decc + 1103db4
commit e873fda
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 26 deletions.
diff --git a/lib/features/dashboards/ui/widgets/charts/dashboard_measurables_chart_info.dart b/lib/features/dashboards/ui/widgets/charts/dashboard_measurables_chart_info.dart
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:lotti/classes/entity_definitions.dart';
 import 'package:lotti/pages/create/create_measurement_dialog.dart';
 import 'package:lotti/themes/theme.dart';
+import 'package:lotti/utils/modals.dart';
 
 class MeasurablesChartInfoWidget extends StatelessWidget {
   const MeasurablesChartInfoWidget(
@@ -24,13 +25,15 @@ class MeasurablesChartInfoWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     Future<void> captureData() async {
-      await showDialog<void>(
+      await ModalUtils.showSinglePageModal<void>(
         context: context,
-        builder: (context) {
+        builder: (_) {
           return MeasurementDialog(
             measurableId: measurableDataType.id,
           );
         },
+        padding: EdgeInsets.zero,
+        navBarHeight: 5,
       );
     }
 

diff --git a/lib/pages/create/create_measurement_dialog.dart b/lib/pages/create/create_measurement_dialog.dart
@@ -101,13 +101,7 @@ class _MeasurementDialogState extends State<MeasurementDialog> {
         top: 20,
         right: 10,
       ),
-      shape: RoundedRectangleBorder(
-        borderRadius: const BorderRadius.all(Radius.circular(20)),
-        side: BorderSide(
-          color: (context.textTheme.titleLarge?.color ?? Colors.black)
-              .withAlpha(127),
-        ),
-      ),
+      backgroundColor: Colors.transparent,
       actionsAlignment: MainAxisAlignment.end,
       actionsPadding: const EdgeInsets.only(
         left: 30,

diff --git a/pubspec.lock b/pubspec.lock
@@ -170,26 +170,26 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948"
+      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.3"
+    version: "4.0.4"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e"
+      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.3"
+    version: "2.4.4"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573"
+      sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.14"
+    version: "2.4.15"
   build_runner_core:
     dependency: transitive
     description:
@@ -595,10 +595,10 @@ packages:
     dependency: "direct dev"
     description:
       name: drift_dev
-      sha256: "9aaf4e4c406afb93e907b5e21e0120a2618abb436bec5809fa9190232f3eed47"
+      sha256: "6c559daf45dd9588eb88d8de7038b9826d404c2163850c6ebad008ba0ec1b9f7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.25.0"
+    version: "2.25.1"
   easy_debounce:
     dependency: "direct main"
     description:
@@ -1003,10 +1003,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: b3ff1ef5fb3924ee02b4d38b974ffae3969d50603e68787684ee9dd45f6f144a
+      sha256: e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.6+1"
+    version: "0.7.6+2"
   flutter_math_fork:
     dependency: transitive
     description:
@@ -1298,10 +1298,10 @@ packages:
     dependency: "direct main"
     description:
       name: gpt_markdown
-      sha256: "812a4a8f020dfe244ad02dd12c8e63fec6897ba25f96f86bbeb8e4377d69f9b3"
+      sha256: d584be500d93cd4e2ba0db9c50414c1b32f917451cd2d4f6ed95cc955b5eea66
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.7"
+    version: "1.0.8"
   graphic:
     dependency: "direct main"
     description:
@@ -2593,18 +2593,18 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences
-      sha256: "688ee90fbfb6989c980254a56cb26ebe9bb30a3a2dff439a78894211f73de67a"
+      sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.1"
+    version: "2.5.2"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "650584dcc0a39856f369782874e562efd002a9c94aec032412c9eb81419cce1f"
+      sha256: ea86be7b7114f9e94fddfbb52649e59a03d6627ccd2387ebddcd6624719e9f16
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.4.5"
   shared_preferences_foundation:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: lotti
 description: Achieve your goals and keep your data private with Lotti.
 publish_to: 'none'
-version: 0.9.567+2882
+version: 0.9.568+2884
 
 msix_config:
   display_name: LottiApp