fix

ThomasDevApps · Jun 25, 2024 · 11c6f59 · 11c6f59
1 parent f268dfd
commit 11c6f59
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/example/assets/preview.png b/example/assets/preview.png
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -24,15 +24,13 @@ class MyApp extends StatelessWidget {
       theme: ThemeData.dark(
         useMaterial3: true,
       ).copyWith(
-        cardColor: Colors.grey.shade900,
         cardTheme: CardTheme(
           shape: RoundedRectangleBorder(
             borderRadius: BorderRadius.circular(24),
           ),
         ),
       ),
       home: LotteryScreen(
-        cardColor: Colors.grey.shade900,
         numberOutputs: LotteryOutputs(
           outputs: Lottery().numbers,
           title: 'Numbers',

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -103,26 +103,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -137,7 +137,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.0.17"
+    version: "0.0.18"
   matcher:
     dependency: transitive
     description:
@@ -158,10 +158,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   path:
     dependency: transitive
     description:
@@ -219,10 +219,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   vector_math:
     dependency: transitive
     description:
@@ -235,10 +235,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
 sdks:
   dart: ">=3.3.3 <4.0.0"
-  flutter: ">=1.17.0"
+  flutter: ">=3.18.0-18.0.pre.54"
diff --git a/lib/src/view/widgets/lottery_output.dart b/lib/src/view/widgets/lottery_output.dart
@@ -54,7 +54,7 @@ class LotteryOutputs extends StatelessWidget {
       constraints: decoration.constraints,
       width: decoration.width ?? double.infinity,
       child: Card(
-        color: Theme.of(context).cardTheme.color ?? Theme.of(context).cardColor,
+        color: Theme.of(context).cardTheme.color,
         shape: Theme.of(context).cardTheme.shape ??
             RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(24.0),
@@ -78,7 +78,7 @@ class LotteryOutputs extends StatelessWidget {
                     controller: scrollController,
                     thumbColor: Theme.of(context)
                         .colorScheme
-                        .onBackground
+                        .onSurface
                         .withOpacity(0.5),
                     radius: const Radius.circular(20),
                     child: Padding(
@@ -163,7 +163,7 @@ class _OutputsWrap extends StatelessWidget {
                               '(${value}x)',
                               style: TextStyle(
                                 color: (numberDecoration.foregroundColor ??
-                                    Theme.of(context).colorScheme.onBackground),
+                                    Theme.of(context).colorScheme.onSurface),
                                 fontSize: 13,
                               ),
                             ),

diff --git a/lib/src/view/widgets/lottery_statistics.dart b/lib/src/view/widgets/lottery_statistics.dart
@@ -60,6 +60,7 @@ class _StatisticItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Card(
+      color: cardColor ?? Theme.of(context).scaffoldBackgroundColor,
       margin: const EdgeInsets.symmetric(horizontal: 16),
       child: Padding(
         padding: const EdgeInsets.symmetric(