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

added trip plan to school when clicking livecard in the morning

Browse Source
This commit is contained in:
Kima 2024-02-11 20:06:48 +01:00
parent 35dc47fd62
commit d647776d6c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart
View File

@ -12,6 +12,7 @@ import 'package:filcnaplo_mobile_ui/pages/home/live_card/live_card_widget.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:i18n_extension/i18n_widget.dart'; import 'package:i18n_extension/i18n_widget.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:maps_launcher/maps_launcher.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'live_card.i18n.dart'; import 'live_card.i18n.dart';
@ -52,6 +53,8 @@ class LiveCardStateA extends State<LiveCard> {
Widget child; Widget child;
Duration bellDelay = liveCard.delay; Duration bellDelay = liveCard.delay;
liveCard.currentState = LiveCardState.morning;
switch (liveCard.currentState) { switch (liveCard.currentState) {
case LiveCardState.summary: case LiveCardState.summary:
child = LiveCardWidget( child = LiveCardWidget(
@ -102,6 +105,8 @@ class LiveCardStateA extends State<LiveCard> {
.format(DateTime.now()) .format(DateTime.now())
.capital(), .capital(),
icon: FeatherIcons.sun, icon: FeatherIcons.sun,
onTap: () => MapsLauncher.launchQuery(
'${_userProvider.student?.school.city ?? ''} ${_userProvider.student?.school.name ?? ''}'),
description: liveCard.nextLesson != null description: liveCard.nextLesson != null
? Text.rich( ? Text.rich(
TextSpan( TextSpan(
@ -173,8 +178,8 @@ class LiveCardStateA extends State<LiveCard> {
title: liveCard.currentLesson!.subject.renamedTo ?? title: liveCard.currentLesson!.subject.renamedTo ??
liveCard.currentLesson!.subject.name.capital(), liveCard.currentLesson!.subject.name.capital(),
titleItalic: liveCard.currentLesson!.subject.isRenamed && titleItalic: liveCard.currentLesson!.subject.isRenamed &&
settingsProvider.renamedSubjectsEnabled && settingsProvider.renamedSubjectsEnabled &&
settingsProvider.renamedSubjectsItalics, settingsProvider.renamedSubjectsItalics,
subtitle: liveCard.currentLesson!.room, subtitle: liveCard.currentLesson!.room,
icon: SubjectIcon.resolveVariant( icon: SubjectIcon.resolveVariant(
subject: liveCard.currentLesson!.subject, context: context), subject: liveCard.currentLesson!.subject, context: context),
@ -184,7 +189,7 @@ class LiveCardStateA extends State<LiveCard> {
nextSubject: liveCard.nextLesson?.subject.renamedTo ?? nextSubject: liveCard.nextLesson?.subject.renamedTo ??
liveCard.nextLesson?.subject.name.capital(), liveCard.nextLesson?.subject.name.capital(),
nextSubjectItalic: liveCard.nextLesson?.subject.isRenamed == true && nextSubjectItalic: liveCard.nextLesson?.subject.isRenamed == true &&
settingsProvider.renamedSubjectsEnabled && settingsProvider.renamedSubjectsEnabled &&
settingsProvider.renamedSubjectsItalics, settingsProvider.renamedSubjectsItalics,
nextRoom: liveCard.nextLesson?.room, nextRoom: liveCard.nextLesson?.room,
progressMax: showMinutes ? maxTime / 60 : maxTime, progressMax: showMinutes ? maxTime / 60 : maxTime,

1
filcnaplo_mobile_ui/pubspec.yaml
View File

@ -62,6 +62,7 @@ dependencies:
git: git:
url: https://github.com/kimaah/image_crop.git url: https://github.com/kimaah/image_crop.git
uuid: ^4.2.2 uuid: ^4.2.2
maps_launcher: ^2.2.0
dev_dependencies: dev_dependencies:
flutter_lints: ^3.0.1 flutter_lints: ^3.0.1