Skip to content

Commit ebe7e0f

Browse files
fix school list unwanted rebuilds, fix userInfo.imageUrl
1 parent c943c42 commit ebe7e0f

11 files changed

Lines changed: 403 additions & 7602 deletions

File tree

school_data_hub_flutter/lib/common/widgets/bottom_nav_bar/bottom_nav_bar_layouts.dart

Lines changed: 35 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,29 @@ class BottomNavBarLayout extends StatelessWidget {
99

1010
@override
1111
Widget build(BuildContext context) {
12-
return
13-
// Platform.isWindows
14-
// ?
15-
Theme(
16-
data: ThemeData(canvasColor: AppColors.backgroundColor),
17-
child: Padding(
18-
padding: Platform.isWindows
19-
? const EdgeInsets.only(left: 5, right: 5, bottom: 20)
20-
: const EdgeInsets.only(left: 5, right: 5, bottom: 15),
21-
child: SizedBox(
22-
height: Platform.isWindows
23-
? kBottomNavigationBarHeight + 6
24-
: kBottomNavigationBarHeight + 6,
25-
child: Align(
26-
alignment: Alignment.bottomCenter,
27-
child: ConstrainedBox(
28-
constraints: const BoxConstraints(maxWidth: 800),
29-
child: ClipRRect(
30-
borderRadius: const BorderRadius.all(Radius.circular(10)),
12+
return Padding(
13+
padding: Platform.isWindows
14+
? const EdgeInsets.only(left: 5, right: 5, bottom: 20)
15+
: const EdgeInsets.only(left: 5, right: 5, bottom: 15),
16+
child: SizedBox(
17+
height: Platform.isWindows
18+
? kBottomNavigationBarHeight + 6
19+
: kBottomNavigationBarHeight + 6,
20+
child: Align(
21+
alignment: Alignment.bottomCenter,
22+
child: ConstrainedBox(
23+
constraints: const BoxConstraints(maxWidth: 800),
24+
child: ClipRRect(
25+
borderRadius: const BorderRadius.all(Radius.circular(10)),
26+
child: Theme(
27+
data: ThemeData(canvasColor: AppColors.backgroundColor),
3128
child: bottomNavBar,
3229
),
3330
),
3431
),
3532
),
3633
),
3734
);
38-
39-
// : Theme(
40-
// data: ThemeData(canvasColor: AppColors.backgroundColor),
41-
// child: bottomNavBar);
4235
}
4336
}
4437

@@ -48,32 +41,31 @@ class BottomNavBarProfileLayout extends StatelessWidget {
4841

4942
@override
5043
Widget build(BuildContext context) {
51-
return Theme(
52-
data: ThemeData(canvasColor: AppColors.backgroundColor),
53-
child: Padding(
54-
padding: Platform.isWindows
55-
? const EdgeInsets.only(left: 0, right: 0, bottom: 10)
56-
: const EdgeInsets.only(left: 0, right: 0),
57-
child: SizedBox(
58-
height: Platform.isWindows
59-
? kBottomNavigationBarHeight + 20
60-
: kBottomNavigationBarHeight + 30,
61-
child: Align(
62-
alignment: Alignment.bottomCenter,
63-
child: ConstrainedBox(
64-
constraints: const BoxConstraints(maxWidth: 800),
65-
child: ClipRRect(
66-
borderRadius: const BorderRadius.only(
67-
bottomLeft: Radius.circular(10),
68-
bottomRight: Radius.circular(10),
69-
),
44+
return Padding(
45+
padding: Platform.isWindows
46+
? const EdgeInsets.only(left: 0, right: 0, bottom: 10)
47+
: const EdgeInsets.only(left: 0, right: 0),
48+
child: SizedBox(
49+
height: Platform.isWindows
50+
? kBottomNavigationBarHeight + 20
51+
: kBottomNavigationBarHeight + 30,
52+
child: Align(
53+
alignment: Alignment.bottomCenter,
54+
child: ConstrainedBox(
55+
constraints: const BoxConstraints(maxWidth: 800),
56+
child: ClipRRect(
57+
borderRadius: const BorderRadius.only(
58+
bottomLeft: Radius.circular(10),
59+
bottomRight: Radius.circular(10),
60+
),
61+
child: Theme(
62+
data: ThemeData(canvasColor: AppColors.backgroundColor),
7063
child: bottomNavBar,
7164
),
7265
),
7366
),
7467
),
7568
),
7669
);
77-
// : bottomNavBar;
7870
}
7971
}

school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/attendance_list_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
1717
import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
1818
import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_helper.dart';
1919
import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_manager.dart';
20-
import 'package:school_data_hub_flutter/features/_attendance/presentation/attendance_page/widgets/atendance_list_card.dart';
20+
import 'package:school_data_hub_flutter/features/_attendance/presentation/attendance_page/widgets/attendance_list_card.dart';
2121
import 'package:school_data_hub_flutter/features/_attendance/presentation/attendance_page/widgets/attendance_filters.dart';
2222
import 'package:school_data_hub_flutter/features/_attendance/presentation/attendance_page/widgets/attendance_search_bar_stats.dart';
2323
import 'package:school_data_hub_flutter/features/_attendance/presentation/widgets/missed_classes_badges_info_dialog.dart';

school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/atendance_list_card.dart renamed to school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/attendance_list_card.dart

File renamed without changes.

school_data_hub_flutter/lib/features/_pupil/presentation/widgets/avatar.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class AvatarImage extends WatchingWidget {
3232
@override
3333
Widget build(BuildContext context) {
3434
watchPropertyValue((m) => m.avatarId, target: pupil);
35+
watchPropertyValue((m) => m.avatarAuth, target: pupil);
3536
final avatar = pupil.avatar;
3637

3738
final bool avatarAuth = (pupil.avatarAuth != null);

0 commit comments

Comments
 (0)