devbeni/student-legacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

notes page finished, messing with theme and navbar things

Browse Source
This commit is contained in:
Kima
2024-03-04 22:58:34 +01:00
parent e6fc1fd656
commit 7363fc81cb
8 changed files with 425 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
refilc_mobile_ui/lib/screens/navigation/navbar_item.dart
View File

@@ -38,24 +38,25 @@ class NavbarItem extends StatelessWidget {
: null,
borderRadius: BorderRadius.circular(14.0),
),
child: Stack(
children: [
IconTheme(
data: IconThemeData(
color: Theme.of(context).colorScheme.secondary,
),
child: icon,
),
IconTheme(
data: IconThemeData(
color: Theme.of(context).brightness == Brightness.light
? Colors.black.withOpacity(.5)
: Colors.white.withOpacity(.3),
),
child: icon,
),
],
),
child: icon,
// child: Stack(
// children: [
// IconTheme(
// data: IconThemeData(
// color: Theme.of(context).colorScheme.secondary,
// ),
// child: icon,
// ),
// IconTheme(
// data: IconThemeData(
// color: Theme.of(context).brightness == Brightness.light
// ? Colors.black.withOpacity(.5)
// : Colors.white.withOpacity(.3),
// ),
// child: icon,
// ),
// ],
// ),
),
),
),

2
refilc_mobile_ui/lib/screens/navigation/navigation_route.dart
View File

@@ -7,7 +7,7 @@ class NavigationRoute {
"grades",
"timetable",
"notes",
"inbox",
"absences",
// "messages",
// "absences",
];

8
refilc_mobile_ui/lib/screens/navigation/navigation_route_handler.dart
View File

@@ -1,7 +1,9 @@
// import 'package:refilc_mobile_ui/pages/absences/absences_page.dart';
import 'package:refilc_mobile_ui/pages/absences/absences_page.dart';
import 'package:refilc_mobile_ui/pages/grades/grades_page.dart';
import 'package:refilc_mobile_ui/pages/home/home_page.dart';
import 'package:refilc_mobile_ui/pages/messages/messages_page.dart';
import 'package:refilc_mobile_ui/pages/notes/notes_page.dart';
// import 'package:refilc_mobile_ui/pages/messages/messages_page.dart';
import 'package:refilc_mobile_ui/pages/timetable/timetable_page.dart';
import 'package:flutter/material.dart';
import 'package:animations/animations.dart';
@@ -15,8 +17,8 @@ Route navigationRouteHandler(RouteSettings settings) {
case "timetable":
return navigationPageRoute((context) => const TimetablePage());
case "notes":
return navigationPageRoute((context) => const MessagesPage());
case "inbox":
return navigationPageRoute((context) => const NotesPage());
case "absences":
return navigationPageRoute((context) => const AbsencesPage());
// case "messages":
// return navigationPageRoute((context) => const MessagesPage());

32
refilc_mobile_ui/lib/screens/navigation/navigation_screen.dart
View File

@@ -1,6 +1,8 @@
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:flutter_svg/svg.dart';
import 'package:refilc/api/providers/update_provider.dart';
import 'package:refilc/helpers/quick_actions.dart';
import 'package:refilc/icons/filc_icons.dart';
import 'package:refilc/models/settings.dart';
import 'package:refilc/theme/observer.dart';
import 'package:refilc_kreta_api/client/client.dart';
@@ -324,7 +326,7 @@ class NavigationScreenState extends State<NavigationScreen>
'assets/svg/menu_icons/today.svg',
color:
Theme.of(context).colorScheme.secondary,
height: 26,
height: 24,
),
Transform.translate(
offset: const Offset(0, 1.6),
@@ -347,7 +349,7 @@ class NavigationScreenState extends State<NavigationScreen>
'assets/svg/menu_icons/today_selected.svg',
color:
Theme.of(context).colorScheme.secondary,
height: 26,
height: 24,
),
Transform.translate(
offset: const Offset(0, 1.8),
@@ -369,12 +371,12 @@ class NavigationScreenState extends State<NavigationScreen>
icon: SvgPicture.asset(
'assets/svg/menu_icons/grades.svg',
color: Theme.of(context).colorScheme.secondary,
height: 24,
height: 22,
),
activeIcon: SvgPicture.asset(
'assets/svg/menu_icons/grades_selected.svg',
color: Theme.of(context).colorScheme.secondary,
height: 24,
height: 22,
),
),
NavItem(
@@ -382,12 +384,12 @@ class NavigationScreenState extends State<NavigationScreen>
icon: SvgPicture.asset(
'assets/svg/menu_icons/timetable.svg',
color: Theme.of(context).colorScheme.secondary,
height: 24,
height: 22,
),
activeIcon: SvgPicture.asset(
'assets/svg/menu_icons/timetable_selected.svg',
color: Theme.of(context).colorScheme.secondary,
height: 24,
height: 22,
),
),
NavItem(
@@ -395,25 +397,25 @@ class NavigationScreenState extends State<NavigationScreen>
icon: SvgPicture.asset(
'assets/svg/menu_icons/notes.svg',
color: Theme.of(context).colorScheme.secondary,
height: 24,
height: 22,
),
activeIcon: SvgPicture.asset(
'assets/svg/menu_icons/notes_selected.svg',
color: Theme.of(context).colorScheme.secondary,
height: 24,
height: 22,
),
),
NavItem(
title: "inbox".i18n,
icon: SvgPicture.asset(
'assets/svg/menu_icons/inbox.svg',
title: "absences".i18n,
icon: Icon(
FeatherIcons.clock,
color: Theme.of(context).colorScheme.secondary,
height: 24,
size: 24.0,
),
activeIcon: SvgPicture.asset(
'assets/svg/menu_icons/inbox_selected.svg',
activeIcon: Icon(
FilcIcons.absencesfill,
color: Theme.of(context).colorScheme.secondary,
height: 24,
size: 24.0,
),
),
// NavItem(