Finish Dark theme

aguilaair · Dec 7, 2021 · 3f071da · 3f071da
1 parent 5ffd9e0
commit 3f071da
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -49,6 +49,9 @@ class MyApp extends StatelessWidget {
       ),
       darkTheme: ThemeData.dark().copyWith(
         backgroundColor: const Color(0xff080B27),
+        cardColor: const Color(0xff050612),
+        primaryColor: const Color(0xFF262DC9),
+        primaryColorDark: const Color(0xFF262DC9),
       ),
       home: const MyHomePage(title: 'CovCheck Main Page'),
     );

diff --git a/lib/widgets/cert_detailed_view.dart b/lib/widgets/cert_detailed_view.dart
@@ -198,9 +198,13 @@ class CertDetailedView extends StatelessWidget {
     ];
 
     return Container(
-      decoration: const BoxDecoration(
-          borderRadius: BorderRadius.only(
-              topLeft: Radius.circular(15), topRight: Radius.circular(15))),
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.only(
+          topLeft: Radius.circular(15),
+          topRight: Radius.circular(15),
+        ),
+        color: Theme.of(context).cardColor,
+      ),
       padding: const EdgeInsets.all(8.0),
       child: Theme(
         data: Theme.of(context).copyWith(dividerColor: Colors.transparent),

diff --git a/lib/widgets/cert_spimplified_info.dart b/lib/widgets/cert_spimplified_info.dart
@@ -91,8 +91,13 @@ class CertInfoViewer extends StatelessWidget {
                 onPressed: () {
                   showModalBottomSheet(
                     shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(15)),
+                      borderRadius: BorderRadius.circular(15),
+                    ),
                     context: context,
+                    barrierColor:
+                        Theme.of(context).brightness == Brightness.light
+                            ? null
+                            : Colors.white30,
                     builder: (context) {
                       return CertDetailedView(coseResult: coseResult!);
                     },

diff --git a/lib/widgets/result_card.dart b/lib/widgets/result_card.dart
@@ -73,13 +73,15 @@ class ResultCard extends StatelessWidget {
         ),
         margin: const EdgeInsets.only(top: 20),
         decoration: BoxDecoration(
-          borderRadius: BorderRadius.only(
+          borderRadius: const BorderRadius.only(
             topLeft: Radius.circular(15),
             topRight: Radius.circular(15),
           ),
           boxShadow: [
             BoxShadow(
-              color: Colors.grey,
+              color: Theme.of(context).brightness == Brightness.light
+                  ? Colors.grey
+                  : const Color(0xff27226A),
               blurRadius: 15,
               spreadRadius: -3,
             )