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

added new style widgets and total grade counter

Browse Source
This commit is contained in:
Kima
2023-12-30 22:27:42 +01:00
parent 5476397af6
commit e010242469
7 changed files with 186 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
filcnaplo/lib/ui/filter/sort.dart
View File

@@ -132,6 +132,7 @@ List<Widget> sortDateWidgets(
items.add(DateWidget(
date: date,
widget: Panel(
isTransparent: true,
key: ValueKey(date),
padding: padding ?? const EdgeInsets.symmetric(vertical: 6.0),
title: cst ? Text(date.format(context, forceToday: true)) : null,
@@ -141,8 +142,13 @@ List<Widget> sortDateWidgets(
spawnIsolate: false,
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
itemBuilder: (context, animation, item, index) =>
filterItemBuilder(context, animation, item.widget, index),
itemBuilder: (context, animation, item, index) => filterItemBuilder(
context,
animation,
item.widget,
index,
len: elements.length,
),
items: elements,
),
),

39
filcnaplo/lib/ui/filter/widgets.dart
View File

@@ -25,6 +25,7 @@ import 'package:filcnaplo_kreta_api/providers/homework_provider.dart';
import 'package:filcnaplo_kreta_api/providers/message_provider.dart';
import 'package:filcnaplo_kreta_api/providers/note_provider.dart';
import 'package:filcnaplo_kreta_api/providers/timetable_provider.dart';
import 'package:filcnaplo_mobile_ui/common/widgets/note/note_viewable.dart';
import 'package:filcnaplo_premium/providers/premium_provider.dart';
import 'package:filcnaplo_premium/ui/mobile/premium/premium_inline.dart';
import 'package:filcnaplo_mobile_ui/common/panel/panel.dart';
@@ -135,7 +136,7 @@ Future<List<DateWidget>> getFilterWidgets(FilterType activeData,
// Homework
case FilterType.homework:
items = homework_filter.getWidgets(homeworkProvider.homework);
items = homework_filter.getWidgets(homeworkProvider.homework, context);
break;
// Exams
@@ -183,7 +184,12 @@ Future<List<DateWidget>> getFilterWidgets(FilterType activeData,
}
Widget filterItemBuilder(
BuildContext context, Animation<double> animation, Widget item, int index) {
BuildContext context,
Animation<double> animation,
Widget item,
int index, {
int len = 0,
}) {
if (item.key == const Key("\$premium")) {
return Provider.of<PremiumProvider>(context, listen: false).hasPremium ||
DateTime.now().weekday <= 5
@@ -236,5 +242,32 @@ Widget filterItemBuilder(
),
);
})
: wrappedItem;
: (len > 0
? Padding(
padding: EdgeInsets.only(top: index == 0 ? 0.0 : 6.0),
child: Container(
padding: item is NoteViewable
? const EdgeInsets.symmetric(vertical: 8.0)
: const EdgeInsets.symmetric(vertical: 4.0),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.background,
borderRadius: BorderRadius.only(
topLeft: index == 0
? const Radius.circular(16.0)
: const Radius.circular(8.0),
topRight: index == 0
? const Radius.circular(16.0)
: const Radius.circular(8.0),
bottomLeft: index + 1 == len
? const Radius.circular(16.0)
: const Radius.circular(8.0),
bottomRight: index + 1 == len
? const Radius.circular(16.0)
: const Radius.circular(8.0),
),
),
child: wrappedItem,
),
)
: wrappedItem);
}

12
filcnaplo/lib/ui/filter/widgets/homework.dart
View File

@@ -1,14 +1,20 @@
import 'package:filcnaplo/ui/date_widget.dart';
import 'package:filcnaplo_kreta_api/models/homework.dart';
import 'package:filcnaplo_mobile_ui/common/widgets/homework/homework_viewable.dart' as mobile;
import 'package:filcnaplo_mobile_ui/common/widgets/homework/homework_viewable.dart'
as mobile;
import 'package:flutter/material.dart';
List<DateWidget> getWidgets(List<Homework> providerHomework) {
List<DateWidget> getWidgets(
List<Homework> providerHomework, BuildContext context) {
List<DateWidget> items = [];
for (var homework in providerHomework) {
items.add(DateWidget(
key: homework.id,
date: homework.deadline.year != 0 ? homework.deadline : homework.date,
widget: mobile.HomeworkViewable(homework),
widget: mobile.HomeworkViewable(
homework,
),
));
}
return items;