From 62d38953736f6c7e9a5c2c0694689bc6f23150e4 Mon Sep 17 00:00:00 2001 From: kima Date: Sat, 17 Jun 2023 20:41:30 +0200 Subject: [PATCH] added next page button to summary --- .../lib/pages/home/live_card/live_card.dart | 12 ++-- .../screens/summary/pages/grades_page.dart | 60 ++++++++++++++----- 2 files changed, 51 insertions(+), 21 deletions(-) diff --git a/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart b/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart index bb8afff..fc8e6de 100755 --- a/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart +++ b/filcnaplo_mobile_ui/lib/pages/home/live_card/live_card.dart @@ -72,19 +72,21 @@ class _LiveCardState extends State { context, useRootNavigator: true, builder: (context) => SlidingSheetDialog( - color: Theme.of(context).scaffoldBackgroundColor, + color: Colors.black.withOpacity(0.99), duration: const Duration(milliseconds: 400), scrollSpec: const ScrollSpec.bouncingScroll(), snapSpec: const SnapSpec( snap: true, snappings: [1.0], - positioning: SnapPositioning.relativeToSheetHeight, + initialSnap: 1.0, + positioning: SnapPositioning.relativeToAvailableSpace, ), + minHeight: MediaQuery.of(context).size.height, cornerRadius: 16, cornerRadiusOnFullscreen: 0, - builder: (context, state) => Material( - color: Theme.of(context).scaffoldBackgroundColor, - child: const SummaryScreen( + builder: (context, state) => const Material( + color: Colors.black, + child: SummaryScreen( currentPage: 'grades', ), ), diff --git a/filcnaplo_mobile_ui/lib/screens/summary/pages/grades_page.dart b/filcnaplo_mobile_ui/lib/screens/summary/pages/grades_page.dart index 110bf11..c4e7a2b 100644 --- a/filcnaplo_mobile_ui/lib/screens/summary/pages/grades_page.dart +++ b/filcnaplo_mobile_ui/lib/screens/summary/pages/grades_page.dart @@ -8,8 +8,10 @@ import 'package:filcnaplo/utils/format.dart'; import 'package:filcnaplo_kreta_api/models/grade.dart'; import 'package:filcnaplo_kreta_api/models/subject.dart'; import 'package:filcnaplo_kreta_api/providers/grade_provider.dart'; +import 'package:filcnaplo_mobile_ui/screens/summary/summary_screen.dart'; import 'package:filcnaplo_mobile_ui/screens/summary/summary_screen.i18n.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:provider/provider.dart'; import 'package:auto_size_text/auto_size_text.dart'; @@ -181,22 +183,48 @@ class _GradesBodyState extends State { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - 'Jó éved volt, $firstName!', - textAlign: TextAlign.left, - style: const TextStyle( - fontWeight: FontWeight.w900, - fontSize: 26.0, - color: Colors.white, - ), - ), - const Text( - 'Nézzük a jegyeidet... 📖', - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 22.0, - color: Colors.white, - ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Jó éved volt, $firstName!', + textAlign: TextAlign.left, + style: const TextStyle( + fontWeight: FontWeight.w900, + fontSize: 26.0, + color: Colors.white, + ), + ), + const Text( + 'Nézzük a jegyeidet... 📖', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 22.0, + color: Colors.white, + ), + ), + ], + ), + IconButton( + onPressed: () { + Navigator.of(context).maybePop(); + Navigator.of(context).push( + MaterialPageRoute( + builder: (context) => + const SummaryScreen(currentPage: 'lessons'), + ), + ); + }, + icon: const Icon( + FeatherIcons.arrowRight, + color: Colors.white, + ), + ) + ], ), const SizedBox(height: 12.0), SizedBox(