From 450d2bb3fa32d669d5bed99863dd40a235d200e9 Mon Sep 17 00:00:00 2001 From: Kima Date: Tue, 2 Jan 2024 23:20:54 +0100 Subject: [PATCH] finally fixed empty absences page --- .../lib/pages/absences/absences_page.dart | 12 ++++---- .../lib/pages/grades/grades_page.dart | 28 +++++++++++++++++++ 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/filcnaplo_mobile_ui/lib/pages/absences/absences_page.dart b/filcnaplo_mobile_ui/lib/pages/absences/absences_page.dart index 7d3120a..a6404f5 100755 --- a/filcnaplo_mobile_ui/lib/pages/absences/absences_page.dart +++ b/filcnaplo_mobile_ui/lib/pages/absences/absences_page.dart @@ -258,6 +258,11 @@ class AbsencesPageState extends State Widget filterViewBuilder(context, int activeData) { List filterWidgets = []; + var absWidgets = getFilterWidgets(AbsenceFilter.values[activeData]) + .map((e) => e.widget) + .cast() + .toList(); + if (activeData > 0) { filterWidgets = sortDateWidgets( context, @@ -265,7 +270,7 @@ class AbsencesPageState extends State padding: EdgeInsets.zero, hasShadow: true, ); - } else { + } else if (absWidgets.isNotEmpty) { filterWidgets = [ Padding( padding: const EdgeInsets.only(bottom: 24.0), @@ -317,10 +322,7 @@ class AbsencesPageState extends State ); }, child: Column( - children: getFilterWidgets(AbsenceFilter.values[activeData]) - .map((e) => e.widget) - .cast() - .toList(), + children: absWidgets, ), ), ), diff --git a/filcnaplo_mobile_ui/lib/pages/grades/grades_page.dart b/filcnaplo_mobile_ui/lib/pages/grades/grades_page.dart index 512b22a..ef872a1 100755 --- a/filcnaplo_mobile_ui/lib/pages/grades/grades_page.dart +++ b/filcnaplo_mobile_ui/lib/pages/grades/grades_page.dart @@ -5,6 +5,7 @@ import 'dart:math'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:collection/collection.dart'; import 'package:filcnaplo/api/providers/update_provider.dart'; +import 'package:filcnaplo/models/settings.dart'; import 'package:filcnaplo/ui/widgets/grade/grade_tile.dart'; import 'package:filcnaplo_kreta_api/models/exam.dart'; import 'package:filcnaplo_kreta_api/providers/exam_provider.dart'; @@ -140,6 +141,15 @@ class GradesPageState extends State { children: [ Container( decoration: BoxDecoration( + boxShadow: [ + if (Provider.of(context, listen: false) + .shadowEffect) + BoxShadow( + offset: const Offset(0, 21), + blurRadius: 23.0, + color: Theme.of(context).shadowColor, + ) + ], borderRadius: BorderRadius.only( topLeft: const Radius.circular(16.0), topRight: const Radius.circular(16.0), @@ -174,6 +184,15 @@ class GradesPageState extends State { if (hasHomework) Container( decoration: BoxDecoration( + boxShadow: [ + if (Provider.of(context, listen: false) + .shadowEffect) + BoxShadow( + offset: const Offset(0, 21), + blurRadius: 23.0, + color: Theme.of(context).shadowColor, + ) + ], borderRadius: BorderRadius.only( topLeft: const Radius.circular(8.0), topRight: const Radius.circular(8.0), @@ -213,6 +232,15 @@ class GradesPageState extends State { if (nearestExam != null) Container( decoration: BoxDecoration( + boxShadow: [ + if (Provider.of(context, listen: false) + .shadowEffect) + BoxShadow( + offset: const Offset(0, 21), + blurRadius: 23.0, + color: Theme.of(context).shadowColor, + ) + ], borderRadius: const BorderRadius.only( topLeft: Radius.circular(8.0), topRight: Radius.circular(8.0),