From 4068abdb9583a6148ecd4f70fa116d64702c99b3 Mon Sep 17 00:00:00 2001 From: kima Date: Thu, 22 Jun 2023 16:45:57 +0200 Subject: [PATCH] finished final summary style and fixed thingies --- .../screens/summary/pages/allsum_page.dart | 75 +++++++++++++------ .../lib/screens/summary/summary_screen.dart | 7 +- 2 files changed, 59 insertions(+), 23 deletions(-) diff --git a/filcnaplo_mobile_ui/lib/screens/summary/pages/allsum_page.dart b/filcnaplo_mobile_ui/lib/screens/summary/pages/allsum_page.dart index d265bba..c56a6e6 100644 --- a/filcnaplo_mobile_ui/lib/screens/summary/pages/allsum_page.dart +++ b/filcnaplo_mobile_ui/lib/screens/summary/pages/allsum_page.dart @@ -120,50 +120,81 @@ class _AllSumBodyState extends State { }); } + void getEverything() { + getGrades(); + getHomework(); + getSubjects(); + getAbsences(); + getDelays(); + } + void generateTiles() { for (var i in things.values) { - Widget w = Center( - child: Column( - children: [ - Text(i.values.toList()[1]), - Text(i.values.toList()[0]), - ], - ), + Widget w = Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + i.values.toList()[1].toString(), + style: const TextStyle( + fontWeight: FontWeight.w800, + fontSize: 36.0, + color: Colors.white, + ), + ), + Text( + i.values.toList()[0], + style: const TextStyle( + fontSize: 18.0, + color: Colors.white, + ), + ), + ], ); - if (i.values.toList()[0] == 'óra') { - return; // amig nincs megoldva az osszes ora szamanak lekerese - } + // TODO: az orakat es a hazikat szarul keri le, de majd meg lesz csinalva if (firstSixTiles.length < 6) { firstSixTiles.add(w); - } else { + } else if (lastSixTiles.length < 6) { lastSixTiles.add(w); + } else { + break; } } } @override Widget build(BuildContext context) { + getEverything(); generateTiles(); return Column( crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center, children: [ - GridView.count( - crossAxisCount: 3, - mainAxisSpacing: 10, - crossAxisSpacing: 10, - children: firstSixTiles, + const SizedBox( + height: 45, + ), + SizedBox( + height: 250, + child: GridView.count( + crossAxisCount: 3, + mainAxisSpacing: 0, + crossAxisSpacing: 5, + children: firstSixTiles, + ), ), const SizedBox( - height: 40, + height: 30, ), - GridView.count( - crossAxisCount: 3, - mainAxisSpacing: 10, - crossAxisSpacing: 10, - children: lastSixTiles, + SizedBox( + height: 250, + child: GridView.count( + crossAxisCount: 3, + mainAxisSpacing: 0, + crossAxisSpacing: 5, + children: lastSixTiles, + ), ), ], ); diff --git a/filcnaplo_mobile_ui/lib/screens/summary/summary_screen.dart b/filcnaplo_mobile_ui/lib/screens/summary/summary_screen.dart index c3cedc9..6f7a82f 100644 --- a/filcnaplo_mobile_ui/lib/screens/summary/summary_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/summary/summary_screen.dart @@ -105,6 +105,8 @@ class _SummaryScreenState extends State Text( 'Jó éved volt, $firstName!', textAlign: TextAlign.left, + maxLines: 2, + overflow: TextOverflow.fade, style: const TextStyle( fontWeight: FontWeight.w900, fontSize: 26.0, @@ -118,7 +120,10 @@ class _SummaryScreenState extends State ? 'Nézzük a jegyeidet... 📖' : widget.currentPage == 'lessons' ? 'A kedvenced órád 💓' - : '', + : widget.currentPage == 'personality' + ? 'A te személyiséged...' + : '', + overflow: TextOverflow.fade, style: const TextStyle( fontWeight: FontWeight.bold, fontSize: 22.0,