balint14/student-legacy
balint14/student-legacy
1
Fork 0
forked from firka/student-legacy
Code Pull Requests Activity

fixed renamed subjects italic font

Browse Source
This commit is contained in:
Kima 2023-12-22 22:04:11 +01:00
parent fc40793534
commit 6def864b1f
3 changed files with 150 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
filcnaplo_desktop_ui/lib/pages/grades/grade_subject_view.dart
View File

@ -1,6 +1,7 @@
import 'dart:math'; import 'dart:math';
import 'package:animations/animations.dart'; import 'package:animations/animations.dart';
import 'package:filcnaplo/models/settings.dart';
import 'package:filcnaplo/utils/format.dart'; import 'package:filcnaplo/utils/format.dart';
import 'package:filcnaplo_kreta_api/providers/grade_provider.dart'; import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
import 'package:filcnaplo/helpers/average_helper.dart'; import 'package:filcnaplo/helpers/average_helper.dart';
@ -56,6 +57,7 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
// Providers // Providers
late GradeProvider gradeProvider; late GradeProvider gradeProvider;
late GradeCalculatorProvider calculatorProvider; late GradeCalculatorProvider calculatorProvider;
late SettingsProvider settingsProvider;
late double average; late double average;
late Widget gradeGraph; late Widget gradeGraph;
@ -142,6 +144,7 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
gradeProvider = Provider.of<GradeProvider>(context); gradeProvider = Provider.of<GradeProvider>(context);
calculatorProvider = Provider.of<GradeCalculatorProvider>(context); calculatorProvider = Provider.of<GradeCalculatorProvider>(context);
settingsProvider = Provider.of<SettingsProvider>(context);
List<Grade> subjectGrades = getSubjectGrades(widget.subject).toList(); List<Grade> subjectGrades = getSubjectGrades(widget.subject).toList();
average = AverageHelper.averageEvals(subjectGrades); average = AverageHelper.averageEvals(subjectGrades);
@ -244,7 +247,8 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
subject: widget.subject, context: context), subject: widget.subject, context: context),
scrollController: _scrollController, scrollController: _scrollController,
title: widget.subject.renamedTo ?? widget.subject.name.capital(), title: widget.subject.renamedTo ?? widget.subject.name.capital(),
italic: widget.subject.isRenamed, italic: widget.subject.isRenamed &&
settingsProvider.renamedSubjectsItalics,
child: SubjectGradesContainer( child: SubjectGradesContainer(
child: CupertinoScrollbar( child: CupertinoScrollbar(
child: ListView.builder( child: ListView.builder(

177
filcnaplo_mobile_ui/lib/common/widgets/grade/surprise_grade.dart
View File

@ -3,11 +3,13 @@ import 'dart:ui';
import 'package:animated_background/animated_background.dart' as bg; import 'package:animated_background/animated_background.dart' as bg;
import 'package:filcnaplo/helpers/subject.dart'; import 'package:filcnaplo/helpers/subject.dart';
import 'package:filcnaplo/models/settings.dart';
import 'package:filcnaplo/ui/widgets/grade/grade_tile.dart'; import 'package:filcnaplo/ui/widgets/grade/grade_tile.dart';
import 'package:filcnaplo_kreta_api/models/grade.dart'; import 'package:filcnaplo_kreta_api/models/grade.dart';
import 'package:filcnaplo_mobile_ui/pages/home/particle.dart'; import 'package:filcnaplo_mobile_ui/pages/home/particle.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:filcnaplo/utils/format.dart'; import 'package:filcnaplo/utils/format.dart';
import 'package:provider/provider.dart';
import 'package:rive/rive.dart' as rive; import 'package:rive/rive.dart' as rive;
import 'new_grades.i18n.dart'; import 'new_grades.i18n.dart';
@ -21,20 +23,27 @@ class SurpriseGrade extends StatefulWidget {
State<SurpriseGrade> createState() => _SurpriseGradeState(); State<SurpriseGrade> createState() => _SurpriseGradeState();
} }
class _SurpriseGradeState extends State<SurpriseGrade> with TickerProviderStateMixin { class _SurpriseGradeState extends State<SurpriseGrade>
with TickerProviderStateMixin {
late AnimationController _revealAnimFade; late AnimationController _revealAnimFade;
late AnimationController _revealAnimScale; late AnimationController _revealAnimScale;
late AnimationController _revealAnimGrade; late AnimationController _revealAnimGrade;
late AnimationController _revealAnimParticle; late AnimationController _revealAnimParticle;
late rive.RiveAnimationController _controller; late rive.RiveAnimationController _controller;
late SettingsProvider settingsProvider;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_revealAnimFade = AnimationController(vsync: this, duration: const Duration(milliseconds: 500)); _revealAnimFade = AnimationController(
_revealAnimScale = AnimationController(vsync: this, duration: const Duration(milliseconds: 300)); vsync: this, duration: const Duration(milliseconds: 500));
_revealAnimGrade = AnimationController(vsync: this, duration: const Duration(seconds: 1)); _revealAnimScale = AnimationController(
_revealAnimParticle = AnimationController(vsync: this, duration: const Duration(seconds: 2)); vsync: this, duration: const Duration(milliseconds: 300));
_revealAnimGrade =
AnimationController(vsync: this, duration: const Duration(seconds: 1));
_revealAnimParticle =
AnimationController(vsync: this, duration: const Duration(seconds: 2));
_revealAnimScale.animateTo(0.7, duration: Duration.zero); _revealAnimScale.animateTo(0.7, duration: Duration.zero);
_controller = rive.SimpleAnimation('Timeline 1', autoplay: false); _controller = rive.SimpleAnimation('Timeline 1', autoplay: false);
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
@ -65,7 +74,9 @@ class _SurpriseGradeState extends State<SurpriseGrade> with TickerProviderStateM
void reveal() async { void reveal() async {
if (!subtitle) { if (!subtitle) {
_revealAnimParticle.animateBack(0.0, curve: Curves.fastLinearToSlowEaseIn, duration: const Duration(milliseconds: 300)); _revealAnimParticle.animateBack(0.0,
curve: Curves.fastLinearToSlowEaseIn,
duration: const Duration(milliseconds: 300));
await Future.delayed(const Duration(milliseconds: 50)); await Future.delayed(const Duration(milliseconds: 50));
_revealAnimGrade.animateBack(0.0, curve: Curves.fastLinearToSlowEaseIn); _revealAnimGrade.animateBack(0.0, curve: Curves.fastLinearToSlowEaseIn);
await Future.delayed(const Duration(milliseconds: 50)); await Future.delayed(const Duration(milliseconds: 50));
@ -78,13 +89,20 @@ class _SurpriseGradeState extends State<SurpriseGrade> with TickerProviderStateM
setState(() => hold = false); setState(() => hold = false);
_controller.isActive = true; _controller.isActive = true;
await Future.delayed(const Duration(seconds: 2)); await Future.delayed(const Duration(seconds: 2));
if (mounted) _revealAnimGrade.animateTo(1.0, curve: Curves.fastLinearToSlowEaseIn); if (mounted) {
_revealAnimGrade.animateTo(1.0, curve: Curves.fastLinearToSlowEaseIn);
}
await Future.delayed(const Duration(milliseconds: 700)); await Future.delayed(const Duration(milliseconds: 700));
if (mounted) await _revealAnimParticle.animateTo(1.0, curve: Curves.fastLinearToSlowEaseIn); if (mounted) {
await _revealAnimParticle.animateTo(1.0,
curve: Curves.fastLinearToSlowEaseIn);
}
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
settingsProvider = Provider.of<SettingsProvider>(context);
return AnimatedBuilder( return AnimatedBuilder(
animation: _revealAnimFade, animation: _revealAnimFade,
builder: (context, child) { builder: (context, child) {
@ -136,7 +154,8 @@ class _SurpriseGradeState extends State<SurpriseGrade> with TickerProviderStateM
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
SlideTransition( SlideTransition(
position: _revealAnimGrade.drive(Tween(begin: Offset.zero, end: const Offset(0, 0.7))), position: _revealAnimGrade.drive(
Tween(begin: Offset.zero, end: const Offset(0, 0.7))),
child: AnimatedScale( child: AnimatedScale(
scale: hold ? 1.1 : 1.0, scale: hold ? 1.1 : 1.0,
curve: Curves.easeOutBack, curve: Curves.easeOutBack,
@ -146,7 +165,10 @@ class _SurpriseGradeState extends State<SurpriseGrade> with TickerProviderStateM
onLongPressEnd: (_) => reveal(), onLongPressEnd: (_) => reveal(),
onLongPressCancel: reveal, onLongPressCancel: reveal,
child: ScaleTransition( child: ScaleTransition(
scale: CurvedAnimation(curve: Curves.easeInOut, parent: _revealAnimGrade.drive(Tween(begin: 1.0, end: 0.8))), scale: CurvedAnimation(
curve: Curves.easeInOut,
parent: _revealAnimGrade
.drive(Tween(begin: 1.0, end: 0.8))),
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
@ -161,66 +183,101 @@ class _SurpriseGradeState extends State<SurpriseGrade> with TickerProviderStateM
), ),
), ),
SlideTransition( SlideTransition(
position: _revealAnimParticle.drive(Tween(begin: const Offset(0, 0.3), end: const Offset(0, 0.8))), position: _revealAnimParticle.drive(Tween(
begin: const Offset(0, 0.3),
end: const Offset(0, 0.8))),
child: FadeTransition( child: FadeTransition(
opacity: _revealAnimParticle, opacity: _revealAnimParticle,
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(24.0), borderRadius: BorderRadius.circular(24.0),
child: BackdropFilter( child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 32.0, sigmaY: 32.0), filter: ImageFilter.blur(
sigmaX: 32.0, sigmaY: 32.0),
child: Container( child: Container(
width: double.infinity, width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 32.0, vertical: 20.0), padding: const EdgeInsets.symmetric(
horizontal: 32.0, vertical: 20.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white.withOpacity(.3), color: Colors.white.withOpacity(.3),
borderRadius: BorderRadius.circular(24.0), borderRadius:
border: Border.all(color: Colors.black.withOpacity(.3), width: 1.0), BorderRadius.circular(24.0),
border: Border.all(
color: Colors.black
.withOpacity(.3),
width: 1.0),
), ),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
mainAxisSize: MainAxisSize.min, CrossAxisAlignment.start,
mainAxisSize:
MainAxisSize.min,
children: [ children: [
if (widget.grade.description != "") if (widget.grade
.description !=
"")
Text( Text(
widget.grade.description, widget
.grade.description,
style: const TextStyle( style: const TextStyle(
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.bold, fontWeight:
FontWeight.bold,
fontSize: 26.0, fontSize: 26.0,
), ),
maxLines: 2, maxLines: 2,
overflow: TextOverflow.ellipsis, overflow: TextOverflow
.ellipsis,
), ),
Text( Text(
widget.grade.subject.renamedTo ?? widget.grade.subject.name.capital(), widget.grade.subject
.renamedTo ??
widget.grade.subject
.name
.capital(),
style: TextStyle( style: TextStyle(
color: Colors.white.withOpacity(.8), color: Colors.white
fontWeight: FontWeight.bold, .withOpacity(.8),
fontWeight:
FontWeight.bold,
fontSize: 24.0, fontSize: 24.0,
fontStyle: widget.grade.subject.isRenamed ? FontStyle.italic : null), fontStyle: widget
.grade
.subject
.isRenamed &&
settingsProvider
.renamedSubjectsItalics
? FontStyle.italic
: null),
maxLines: 2, maxLines: 2,
overflow: TextOverflow.ellipsis, overflow:
TextOverflow.ellipsis,
), ),
const SizedBox(height: 2), const SizedBox(height: 2),
Text( Text(
"${widget.grade.value.weight}%", "${widget.grade.value.weight}%",
style: TextStyle( style: TextStyle(
color: Colors.white.withOpacity(.7), color: Colors.white
fontWeight: FontWeight.w600, .withOpacity(.7),
fontWeight:
FontWeight.w600,
fontSize: 20.0, fontSize: 20.0,
), ),
maxLines: 2, maxLines: 2,
overflow: TextOverflow.ellipsis, overflow:
TextOverflow.ellipsis,
), ),
], ],
), ),
), ),
const SizedBox(width: 20.0), const SizedBox(width: 20.0),
Icon( Icon(
SubjectIcon.resolveVariant(subject: widget.grade.subject, context: context), SubjectIcon.resolveVariant(
subject:
widget.grade.subject,
context: context),
color: Colors.white, color: Colors.white,
size: 82.0, size: 82.0,
), ),
@ -257,7 +314,10 @@ class _SurpriseGradeState extends State<SurpriseGrade> with TickerProviderStateM
animation: _revealAnimParticle, animation: _revealAnimParticle,
builder: (context, child) { builder: (context, child) {
bool shouldPaint = false; bool shouldPaint = false;
if (_revealAnimParticle.status == AnimationStatus.forward || _revealAnimParticle.status == AnimationStatus.reverse) { if (_revealAnimParticle.status ==
AnimationStatus.forward ||
_revealAnimParticle.status ==
AnimationStatus.reverse) {
shouldPaint = true; shouldPaint = true;
} }
return ScaleTransition( return ScaleTransition(
@ -265,25 +325,46 @@ class _SurpriseGradeState extends State<SurpriseGrade> with TickerProviderStateM
child: FadeTransition( child: FadeTransition(
opacity: _revealAnimGrade, opacity: _revealAnimGrade,
child: SlideTransition( child: SlideTransition(
position: _revealAnimGrade.drive(Tween(begin: Offset.zero, end: const Offset(0, -0.6))), position: _revealAnimGrade.drive(Tween(
begin: Offset.zero,
end: const Offset(0, -0.6))),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
SlideTransition( SlideTransition(
position: _revealAnimGrade.drive(Tween(begin: Offset.zero, end: const Offset(0, -0.9))), position: _revealAnimGrade.drive(Tween(
begin: Offset.zero,
end: const Offset(0, -0.9))),
child: Text( child: Text(
["legendary", "epic", "rare", "uncommon", "common"][5 - widget.grade.value.value].i18n, [
"legendary",
"epic",
"rare",
"uncommon",
"common"
][5 - widget.grade.value.value]
.i18n,
style: TextStyle( style: TextStyle(
fontSize: 46.0, fontSize: 46.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: gradeColor(context: context, value: widget.grade.value.value), color: gradeColor(
context: context,
value: widget.grade.value.value),
shadows: [ shadows: [
Shadow( Shadow(
color: gradeColor(context: context, value: widget.grade.value.value).withOpacity(.5), color: gradeColor(
context: context,
value:
widget.grade.value.value)
.withOpacity(.5),
blurRadius: 24.0, blurRadius: 24.0,
), ),
Shadow( Shadow(
color: gradeColor(context: context, value: widget.grade.value.value).withOpacity(.3), color: gradeColor(
context: context,
value:
widget.grade.value.value)
.withOpacity(.3),
offset: const Offset(-3, -3), offset: const Offset(-3, -3),
), ),
], ],
@ -292,7 +373,10 @@ class _SurpriseGradeState extends State<SurpriseGrade> with TickerProviderStateM
), ),
const SizedBox(height: 32.0), const SizedBox(height: 32.0),
ScaleTransition( ScaleTransition(
scale: CurvedAnimation(curve: Curves.easeInOutBack, parent: _revealAnimParticle.drive(Tween(begin: 0.6, end: 1.0))), scale: CurvedAnimation(
curve: Curves.easeInOutBack,
parent: _revealAnimParticle
.drive(Tween(begin: 0.6, end: 1.0))),
child: CustomPaint( child: CustomPaint(
painter: PimpPainter( painter: PimpPainter(
particle: Sprinkles(), particle: Sprinkles(),
@ -308,8 +392,11 @@ class _SurpriseGradeState extends State<SurpriseGrade> with TickerProviderStateM
shouldPaint: shouldPaint, shouldPaint: shouldPaint,
), ),
child: RotationTransition( child: RotationTransition(
turns: turns: CurvedAnimation(
CurvedAnimation(curve: Curves.easeInBack, parent: _revealAnimGrade).drive(Tween(begin: 0.95, end: 1.0)), curve: Curves.easeInBack,
parent: _revealAnimGrade)
.drive(
Tween(begin: 0.95, end: 1.0)),
child: GradeValueWidget( child: GradeValueWidget(
widget.grade.value, widget.grade.value,
fill: true, fill: true,
@ -337,7 +424,12 @@ class _SurpriseGradeState extends State<SurpriseGrade> with TickerProviderStateM
} }
class PimpPainter extends CustomPainter { class PimpPainter extends CustomPainter {
PimpPainter({required this.particle, required this.seed, required this.controller, required this.shouldPaint}) : super(repaint: controller); PimpPainter(
{required this.particle,
required this.seed,
required this.controller,
required this.shouldPaint})
: super(repaint: controller);
final Particle particle; final Particle particle;
final int seed; final int seed;
@ -380,7 +472,8 @@ class Sprinkles extends Particle {
return AnimatedPositionedParticle( return AnimatedPositionedParticle(
begin: const Offset(0.0, -10.0), begin: const Offset(0.0, -10.0),
end: const Offset(0.0, -60.0), end: const Offset(0.0, -60.0),
child: FadingRect(width: 5.0, height: 15.0, color: randomColor(n)), child:
FadingRect(width: 5.0, height: 15.0, color: randomColor(n)),
); );
}, },
initialDistance: -pi / randomMirrorOffset), initialDistance: -pi / randomMirrorOffset),

12
filcnaplo_mobile_ui/lib/common/widgets/lesson/changed_lesson_tile.dart
View File

@ -1,8 +1,10 @@
import 'package:filcnaplo/models/settings.dart';
import 'package:filcnaplo/theme/colors/colors.dart'; import 'package:filcnaplo/theme/colors/colors.dart';
import 'package:filcnaplo_kreta_api/models/lesson.dart'; import 'package:filcnaplo_kreta_api/models/lesson.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:filcnaplo/utils/format.dart'; import 'package:filcnaplo/utils/format.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:provider/provider.dart';
import 'changed_lesson_tile.i18n.dart'; import 'changed_lesson_tile.i18n.dart';
class ChangedLessonTile extends StatelessWidget { class ChangedLessonTile extends StatelessWidget {
@ -14,6 +16,8 @@ class ChangedLessonTile extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
SettingsProvider settingsProvider = Provider.of<SettingsProvider>(context);
String lessonIndexTrailing = ""; String lessonIndexTrailing = "";
// Only put a trailing . if its a digit // Only put a trailing . if its a digit
@ -56,7 +60,8 @@ class ChangedLessonTile extends StatelessWidget {
), ),
), ),
title: Text( title: Text(
lesson.status?.name == "Elmaradt" && lesson.substituteTeacher?.name != "" lesson.status?.name == "Elmaradt" &&
lesson.substituteTeacher?.name != ""
? "cancelled".i18n ? "cancelled".i18n
: "substituted".i18n, : "substituted".i18n,
maxLines: 2, maxLines: 2,
@ -69,7 +74,10 @@ class ChangedLessonTile extends StatelessWidget {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontStyle: lesson.subject.isRenamed ? FontStyle.italic : null), fontStyle: lesson.subject.isRenamed &&
settingsProvider.renamedSubjectsItalics
? FontStyle.italic
: null),
), ),
trailing: const Icon(FeatherIcons.arrowRight), trailing: const Icon(FeatherIcons.arrowRight),
minLeadingWidth: 0, minLeadingWidth: 0,