Merge pull request #197 from atharva-khewle/main

improv ui
TSEC-MAD-Club · Jul 13, 2024 · 9455ba5 · 9455ba5
2 parents aabde0c + 2fe089c
commit 9455ba5
Show file tree

Hide file tree

Showing 5 changed files with 112 additions and 152 deletions.
diff --git a/lib/new_ui/screens/notes_screen/widgets/download_button.dart b/lib/new_ui/screens/notes_screen/widgets/download_button.dart
@@ -58,10 +58,10 @@ class _DownloadButtonState extends ConsumerState<DownloadButton> {
       height: 30,
       padding: const EdgeInsets.symmetric(horizontal: 3.0),
       decoration: BoxDecoration(
-        color: darkTextFieldBgColor,
-        borderRadius: BorderRadius.circular(15),
+        color: commonbgLightblack,
+        borderRadius: BorderRadius.circular(7),
         border: Border.all(
-          color: Colors.blue,
+          color: commonbgLLightblack,
           width: 1,
         ),
       ),

diff --git a/lib/new_ui/screens/notes_screen/widgets/note_list.dart b/lib/new_ui/screens/notes_screen/widgets/note_list.dart
@@ -151,7 +151,8 @@ class _NoteListState extends ConsumerState<NoteList> {
                               // margin: EdgeInsets.all(8),
                               decoration: BoxDecoration(
                                 borderRadius: BorderRadius.circular(20),
-                                color: Color(0xff383838),
+                                border: Border.all(color: timePickerBorder, width: 1.0), // Change the color and width as needed
+                                color: timePickerBg,
                               ),
                               child: Padding(
                                 padding: const EdgeInsets.all(20,),

diff --git a/lib/new_ui/screens/notes_screen/widgets/notes_filter.dart b/lib/new_ui/screens/notes_screen/widgets/notes_filter.dart
@@ -49,7 +49,7 @@ class _NotesFilterBarState extends ConsumerState<NotesFilterBar>
           style: Theme.of(context)
               .textTheme
               .labelMedium!
-              .copyWith(color: activeButton ? Colors.white : Colors.black),
+              .copyWith(color: activeButton ? Colors.white : Colors.white),
         ),
         style: ButtonStyle(
           // shape: MaterialStateProperty.all<RoundedRectangleBorder>(
@@ -65,11 +65,9 @@ class _NotesFilterBarState extends ConsumerState<NotesFilterBar>
             (Set<MaterialState> states) {
               // Change color based on the selection
               if (activeButton) {
-                return Theme.of(context)
-                    .colorScheme
-                    .primaryContainer; // Selected color
+                return cardcolorblue; // Selected color
               }
-              return Colors.white; // Default color
+              return timePickerBorder; // Default color
             },
           ),
         ),
@@ -196,7 +194,7 @@ class _NotesFilterBarState extends ConsumerState<NotesFilterBar>
 
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(18),
-                color: timePickerBorder,
+                color: timePickerBg,
                 border: Border.all(color: timePickerBorder, width: 1.0), // Change the color and width as needed
                 // boxShadow: isItDarkMode
                 //     ? shadowLightModeTextFields
@@ -238,7 +236,7 @@ class _NotesFilterBarState extends ConsumerState<NotesFilterBar>
                     ),
                     const Divider(
                       thickness: 1,
-                      color: Colors.grey,
+                      color: timePickerBorder,
                     ),
                     user.isStudent && allSubjects.isNotEmpty
                         ? Column(

diff --git a/lib/new_ui/screens/notes_screen/widgets/notes_modal.dart b/lib/new_ui/screens/notes_screen/widgets/notes_modal.dart
@@ -420,7 +420,8 @@ class _NotesModalState extends ConsumerState<NotesModal> {
                           Container(
                             height: 300,
                             decoration: BoxDecoration(
-                              color: commonbgLightblack,
+                              color: commonbgblack,
+                              border: Border.all(color: timePickerBorder, width: 1.0), // Change the color and width as needed
                               borderRadius: BorderRadius.circular(10), // Circular border radius
                             ),
                             child: attachments.isEmpty