Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improv ui #197

Merged
merged 4 commits into from
Jul 13, 2024
Merged

improv ui #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dc3974
notes card ui improv
atharva-khewle Jul 13, 2024
9f3a2c5
notes full page ui improv
atharva-khewle Jul 13, 2024
e879ff5
ui of appbar in notes screen (Second Child) improved+++
atharva-khewle Jul 13, 2024
2fe089c
Merge branch 'TSEC-MAD-Club:main' into main
atharva-khewle Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/new_ui/screens/notes_screen/widgets/download_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
),
Expand Down
3 changes: 2 additions & 1 deletion lib/new_ui/screens/notes_screen/widgets/note_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,),
Expand Down
12 changes: 5 additions & 7 deletions lib/new_ui/screens/notes_screen/widgets/notes_filter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>(
Expand All @@ -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
},
),
),
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -238,7 +236,7 @@ class _NotesFilterBarState extends ConsumerState<NotesFilterBar>
),
const Divider(
thickness: 1,
color: Colors.grey,
color: timePickerBorder,
),
user.isStudent && allSubjects.isNotEmpty
? Column(
Expand Down
3 changes: 2 additions & 1 deletion lib/new_ui/screens/notes_screen/widgets/notes_modal.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading