Adjusted ColorScheme: replaced custom grey with standard blue.

lib/components/feedback_dialog.dart

@@ -15,7 +15,6 @@ class _FeedbackDialogState extends State<FeedbackDialog> {
   final TextEditingController _feedbackController = TextEditingController();
   final GlobalKey<FormState> _formKey = GlobalKey();
 
-  // get instance of firestore and auth
   final FirebaseFirestore _firestore = FirebaseFirestore.instance;
   final AuthService _authService = AuthService();
 
@@ -53,24 +52,14 @@ class _FeedbackDialogState extends State<FeedbackDialog> {
           child: const Text('Cancel'),
           onPressed: () => Navigator.pop(context),
         ),
-        TextButton(
+        ElevatedButton(
-          style: TextButton.styleFrom(
+          child: const Text('Send feedback'),
-            backgroundColor: Theme.of(context).colorScheme.secondary,
-          ),
-          child: const Text(
-            'Send feedback',
-            style: TextStyle(
-              color: Colors.blue,
-            ),
-          ),
           onPressed: () async {
-            // Only if the input form is valid (the user has entered text)
             if (_formKey.currentState!.validate()) {
               String message;
               bool error = false;
 
               try {
-                // Get a reference to the feedbacks collection
                 final collection =
                     _firestore.collection(Constants.dbCollectionFeedbacks);
 
@@ -90,10 +79,12 @@ class _FeedbackDialogState extends State<FeedbackDialog> {
 
               // Show a snackBar with the result
               if (context.mounted) {
-                ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                ScaffoldMessenger.of(context).showSnackBar(
-                  content: Text(message),
+                  SnackBar(
-                  backgroundColor: error ? Colors.red : Colors.green,
+                    content: Text(message),
-                ));
+                    backgroundColor: error ? Colors.red : Colors.green,
+                  ),
+                );
                 Navigator.pop(context);
               }
             }

lib/components/my_button.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'text_bold.dart';
 
 class MyButton extends StatelessWidget {
   final void Function()? onTap;
@@ -16,13 +17,13 @@ class MyButton extends StatelessWidget {
       onTap: onTap,
       child: Container(
         decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.secondary,
+          color: Theme.of(context).colorScheme.secondaryContainer,
           borderRadius: BorderRadius.circular(8),
         ),
         padding: const EdgeInsets.all(16),
         margin: const EdgeInsets.symmetric(horizontal: 25),
         child: Center(
-          child: Text(text, style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),),
+          child: TextBold(text: text),
         ),
       ),
     );

lib/components/my_textfield.dart

@@ -23,20 +23,17 @@ class MyTextField extends StatelessWidget {
         controller: controller,
         focusNode: focusNode,
         decoration: InputDecoration(
-            enabledBorder: OutlineInputBorder(
+          enabledBorder: OutlineInputBorder(
-              borderSide:
+            borderSide:
-                  BorderSide(color: Theme.of(context).colorScheme.tertiary),
+                BorderSide(color: Theme.of(context).colorScheme.tertiary),
-            ),
+          ),
-            focusedBorder: OutlineInputBorder(
+          focusedBorder: OutlineInputBorder(
-              borderSide:
+            borderSide:
-                  BorderSide(color: Theme.of(context).colorScheme.primary),
+                BorderSide(color: Theme.of(context).colorScheme.primary),
-            ),
+          ),
-            fillColor: Theme.of(context).colorScheme.secondary,
+          filled: true,
-            filled: true,
+          hintText: hintText,
-            hintText: hintText,
+        ),
-            hintStyle: TextStyle(
-              color: Theme.of(context).colorScheme.primary,
-            )),
       ),
     );
   }

lib/components/user_tile_chats.dart

@@ -26,7 +26,7 @@ class UserTileChats extends StatelessWidget {
       onTap: onTap,
       child: Container(
         decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.secondary,
+          color: Theme.of(context).colorScheme.secondaryContainer,
           borderRadius: BorderRadius.circular(12),
         ),
         margin: const EdgeInsets.symmetric(vertical: 5, horizontal: 25),

lib/components/user_tile_likes.dart

@@ -64,6 +64,7 @@ class _UserTileLikesState extends State<UserTileLikes> {
         : null);
 
     return Card(
+      color: Theme.of(context).colorScheme.onInverseSurface,
       margin: const EdgeInsets.all(8.0),
       child: ListTile(
         leading: Column(

lib/forms/matched_screen.dart

@@ -36,21 +36,24 @@ class MatchedScreen extends StatelessWidget {
             Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                // imageUrl cant be null or empty with NetworkImage
                 CircleAvatar(
-                  backgroundColor: Colors.blueGrey[300],
                   backgroundImage: (currentUserImageUrl.isEmpty)
                       ? null
                       : NetworkImage(currentUserImageUrl),
                   radius: 50,
+                  child: (currentUserImageUrl.isEmpty)
+                      ? const Icon(Icons.person, size: 50)
+                      : null,
                 ),
                 const SizedBox(width: 24),
                 CircleAvatar(
-                  backgroundColor: Colors.blueGrey[300],
                   backgroundImage: (otherUserImageUrl.isEmpty)
                       ? null
                       : NetworkImage(otherUserImageUrl),
                   radius: 50,
+                  child: (otherUserImageUrl.isEmpty)
+                      ? const Icon(Icons.person, size: 50)
+                      : null,
                 ),
               ],
             ),

lib/forms/profile_category_form.dart

@@ -106,11 +106,18 @@ class ProfileCategoryFormState<T> extends State<ProfileCategoryForm<T>> {
       ScaffoldMessenger.of(context)
           .showSnackBar(
             SnackBar(
-              content: Text(message),
+              content: Text(
-              backgroundColor: Colors.red,
+                message,
+                style: TextStyle(
+                  fontSize: 16,
+                  color: Theme.of(context).colorScheme.onErrorContainer,
+                ),
+              ),
+              backgroundColor: Theme.of(context).colorScheme.errorContainer,
               //duration: Duration(seconds: 2),
               action: SnackBarAction(
                 label: 'Dismiss',
+                textColor: Theme.of(context).colorScheme.primary,
                 onPressed: () {
                   ScaffoldMessenger.of(context).hideCurrentSnackBar();
                   _isSnackBarVisible = false;

lib/pages/edit_profile_page.dart

@@ -250,8 +250,9 @@ class EditProfilePageState extends State<EditProfilePage> {
             right: 0,
             child: IconButton(
               icon: Ink(
+                padding: const EdgeInsets.all(4),
                 decoration: ShapeDecoration(
-                  color: Theme.of(context).colorScheme.primary,
+                  color: Theme.of(context).colorScheme.surfaceContainer,
                   shape: const CircleBorder(),
                 ),
                 child: const Icon(Icons.camera_alt),

lib/pages/home_page.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-
 import '../components/my_drawer.dart';
 
 class HomePage extends StatelessWidget {
@@ -87,12 +86,15 @@ class HomePage extends StatelessWidget {
             Icon(
               icon,
               size: 50,
-              color: Colors.white,
+              color: Theme.of(context).colorScheme.surface,
             ),
             const SizedBox(height: 10),
             Text(
               title,
-              style: const TextStyle(color: Colors.white, fontSize: 20),
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.surface,
+                fontSize: 20,
+              ),
             ),
           ],
         ),

lib/pages/settings_page.dart

@@ -15,7 +15,7 @@ class SettingsPage extends StatelessWidget {
       ),
       body: Container(
         decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.secondary,
+          color: Theme.of(context).colorScheme.secondaryContainer,
           borderRadius: BorderRadius.circular(12),
         ),
         margin: const EdgeInsets.all(25),

lib/themes/dark_mode.dart

@@ -1,11 +1,8 @@
 import 'package:flutter/material.dart';
 
 ThemeData darkMode = ThemeData(
-  colorScheme: ColorScheme.dark(
+  colorScheme: ColorScheme.fromSeed(
-    surface: Colors.grey.shade900,
+    brightness: Brightness.dark,
-    primary: Colors.grey.shade600,
+    seedColor: Colors.blue,
-    secondary: Colors.grey.shade700,
-    tertiary: Colors.grey.shade800,
-    inversePrimary: Colors.grey.shade300,
   ),
-);
+);

lib/themes/light_mode.dart

@@ -1,11 +1,8 @@
 import 'package:flutter/material.dart';
 
 ThemeData lightMode = ThemeData(
-  colorScheme: ColorScheme.light(
+  colorScheme: ColorScheme.fromSeed(
-    surface: Colors.grey.shade300,
+    brightness: Brightness.light,
-    primary: Colors.grey.shade500,
+    seedColor: Colors.blue,
-    secondary: Colors.grey.shade200,
-    tertiary: Colors.white,
-    inversePrimary: Colors.grey.shade900,
   ),
-);
+);

lib/utils/helper_dialogs.dart

@@ -19,14 +19,21 @@ void showMsg(BuildContext context, String title, String content) {
   );
 }
 
-/// Show a red colored SnackBar with a [Dismiss] Button
+/// Show an error colored SnackBar with a [Dismiss] Button
 void showErrorSnackBar(BuildContext context, String message) {
   ScaffoldMessenger.of(context).showSnackBar(
     SnackBar(
-      content: Text(message),
+      content: Text(
-      backgroundColor: Colors.red,
+        message,
+        style: TextStyle(
+          fontSize: 16,
+          color: Theme.of(context).colorScheme.onErrorContainer,
+        ),
+      ),
+      backgroundColor: Theme.of(context).colorScheme.errorContainer,
       action: SnackBarAction(
         label: 'Dismiss',
+        textColor: Theme.of(context).colorScheme.primary,
         onPressed: () {
           ScaffoldMessenger.of(context).hideCurrentSnackBar();
         },