From 3a35c67be457b40fe1ebd3a1d783ed5a2d79d994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Thu, 19 May 2022 18:44:56 +0200 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20okno=20u=20j=C3=ADdel,=20kter=C3=A9?= =?UTF-8?q?=20nejde=20objednat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/lang/lang_cz.dart | 2 +- lib/lang/lang_en.dart | 2 +- lib/okna/jidelnicek.dart | 189 ++++++++++++++++++++++++--------------- 3 files changed, 118 insertions(+), 75 deletions(-) diff --git a/lib/lang/lang_cz.dart b/lib/lang/lang_cz.dart index 60cbf47..f230e57 100644 --- a/lib/lang/lang_cz.dart +++ b/lib/lang/lang_cz.dart @@ -14,7 +14,7 @@ class LanguageCz extends Languages { String get balance => "Kredit: "; @override - String get cannotOrder => "Nelze objednat"; + String get cannotOrder => "Toto jídlo není možné objednat."; @override String get close => "Zavřít"; diff --git a/lib/lang/lang_en.dart b/lib/lang/lang_en.dart index adc8691..bcc868f 100644 --- a/lib/lang/lang_en.dart +++ b/lib/lang/lang_en.dart @@ -14,7 +14,7 @@ class LanguageEn extends Languages { String get balance => "Balance: "; @override - String get cannotOrder => "Cannot order"; + String get cannotOrder => "This food cannot be ordered."; @override String get close => "Close"; diff --git a/lib/okna/jidelnicek.dart b/lib/okna/jidelnicek.dart index 45b65e5..a6c0c57 100644 --- a/lib/okna/jidelnicek.dart +++ b/lib/okna/jidelnicek.dart @@ -86,89 +86,132 @@ class _JidelnicekPageState extends State { ? MaterialStateProperty.all(Colors.blue) : MaterialStateProperty.all(Colors.grey), onChanged: (v) async { - if (!j.lzeObjednat) return; - showDialog( - context: context, - barrierDismissible: false, - builder: (_) => Dialog( - child: SizedBox( - height: 100, - child: Row(children: [ - const Padding( - padding: EdgeInsets.all(10), - child: - CircularProgressIndicator(), - ), - Text( - Languages.of(context)!.ordering) - ]), - ), - )); - widget.canteen.objednat(j).then((_) { - Navigator.of(context, rootNavigator: true) - .pop(); - nactiJidlo(); - }).catchError((o) { - Navigator.of(context, rootNavigator: true) - .pop(); + if (!j.lzeObjednat) { showDialog( context: context, - builder: (bc) => AlertDialog( - title: Text(Languages.of(context)! - .errorOrdering), - content: Text(o.toString()), - actions: [ - TextButton( - child: Text( - Languages.of(context)!.close), - onPressed: () { - Navigator.pop(bc); - }, - ) - ], + builder: (context) { + return AlertDialog( + title: Text(Languages.of(context)! + .errorOrdering), + content: Text( + Languages.of(context)!.cannotOrder), + actions: [ + TextButton( + child: + Text(Languages.of(context)!.ok), + onPressed: () { + Navigator.of(context).pop(); + }, + ) + ], + ); + }); + } else { + showDialog( + context: context, + barrierDismissible: false, + builder: (_) => Dialog( + child: SizedBox( + height: 100, + child: Row(children: [ + const Padding( + padding: EdgeInsets.all(10), + child: + CircularProgressIndicator(), + ), + Text(Languages.of(context)! + .ordering) + ]), + ), )); - }); + widget.canteen.objednat(j).then((_) { + Navigator.of(context, rootNavigator: true) + .pop(); + nactiJidlo(); + }).catchError((o) { + Navigator.of(context, rootNavigator: true) + .pop(); + showDialog( + context: context, + builder: (bc) => AlertDialog( + title: Text(Languages.of(context)! + .errorOrdering), + content: Text(o.toString()), + actions: [ + TextButton( + child: Text( + Languages.of(context)! + .close), + onPressed: () { + Navigator.pop(bc); + }, + ) + ], + )); + }); + } }) ], ), onTap: () async { - if (!j.lzeObjednat) return; - showDialog( - context: context, - barrierDismissible: false, - builder: (_) => Dialog( - child: SizedBox( - height: 100, - child: Row(children: [ - const Padding( - padding: EdgeInsets.all(10), - child: CircularProgressIndicator(), - ), - Text(Languages.of(context)!.ordering) - ]), - ), - )); - widget.canteen.objednat(j).then((_) { - Navigator.of(context, rootNavigator: true).pop(); - nactiJidlo(); - }).catchError((o) { - Navigator.of(context, rootNavigator: true).pop(); + if (!j.lzeObjednat) { showDialog( context: context, - builder: (bc) => AlertDialog( - title: Text( - Languages.of(context)!.errorOrdering), - content: Text(o.toString()), - actions: [ - TextButton( - child: Text(Languages.of(context)!.close), - onPressed: () { - Navigator.pop(bc); - }, - ) - ], + builder: (context) { + return AlertDialog( + title: + Text(Languages.of(context)!.errorOrdering), + content: + Text(Languages.of(context)!.cannotOrder), + actions: [ + TextButton( + child: Text(Languages.of(context)!.ok), + onPressed: () { + Navigator.of(context).pop(); + }, + ) + ], + ); + }); + } else { + showDialog( + context: context, + barrierDismissible: false, + builder: (_) => Dialog( + child: SizedBox( + height: 100, + child: Row(children: [ + const Padding( + padding: EdgeInsets.all(10), + child: CircularProgressIndicator(), + ), + Text(Languages.of(context)!.ordering) + ]), + ), )); - }); + widget.canteen.objednat(j).then((_) { + Navigator.of(context, rootNavigator: true).pop(); + nactiJidlo(); + }).catchError((o) { + Navigator.of(context, rootNavigator: true).pop(); + showDialog( + context: context, + builder: (bc) => AlertDialog( + title: Text( + Languages.of(context)!.errorOrdering), + content: Text(o.toString()), + actions: [ + TextButton( + child: + Text(Languages.of(context)!.close), + onPressed: () { + Navigator.pop(bc); + }, + ) + ], + )); + }); + } }, onLongPress: () async { if (!j.objednano || j.burzaUrl == null) return; From 9a2f079322e60716cec9b2a9333392ab23347349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Thu, 19 May 2022 18:46:19 +0200 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20zobrazovat=20uv=C3=ADt=C3=A1n=C3=AD?= =?UTF-8?q?=20i=20u=20zapamatovan=C3=BDch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ lib/main.dart | 23 ++++++++++++++++------- pubspec.yaml | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf8b0fb..492dfc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.1.1 +- Přidat informaci o neobjednatelném obědě (specialitka pro apple) +- Zobrazovat uvítací obrazovku při nedokončení i když je uživatel zapamatován # 1.1.0 - Přidat uvítací obrazovku při prvním spuštění - Mírné vyčištění kódu diff --git a/lib/main.dart b/lib/main.dart index c388d1f..28b70eb 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -120,13 +120,22 @@ class _LoginPageState extends State { ); return; } - Navigator.pushReplacement( - context, - MaterialPageRoute( - builder: (context) => JidelnicekPage( - canteen: canteen, - )), - ); + const storage = FlutterSecureStorage(); + var odsouhlasil = await storage.read(key: "oc_souhlas"); + if (odsouhlasil == null || odsouhlasil != "ano") { + Navigator.pushReplacement( + context, + MaterialPageRoute( + builder: (c) => WelcomeScreen(canteen: canteen))); + } else { + Navigator.pushReplacement( + context, + MaterialPageRoute( + builder: (context) => JidelnicekPage( + canteen: canteen, + )), + ); + } } catch (_) { ScaffoldMessenger.of(context).hideCurrentSnackBar(); ScaffoldMessenger.of(context).showSnackBar( diff --git a/pubspec.yaml b/pubspec.yaml index d0ed551..ed5d01a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: 'none' # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 # followed by an optional build number separated by a +. -version: 1.1.0+4 +version: 1.1.1+5 environment: sdk: ">=2.16.1 <3.0.0" From 7dd3985ab748472be355411371ddf8f27700bc39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Thu, 19 May 2022 19:07:16 +0200 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20spr=C3=A1vn=C3=BD=20jazyk=20kalend?= =?UTF-8?q?=C3=A1=C5=99e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + lib/okna/jidelnicek.dart | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 492dfc7..b351e2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 1.1.1 - Přidat informaci o neobjednatelném obědě (specialitka pro apple) - Zobrazovat uvítací obrazovku při nedokončení i když je uživatel zapamatován +- Kalendář se zobrazuje ve správném jazyce # 1.1.0 - Přidat uvítací obrazovku při prvním spuštění - Mírné vyčištění kódu diff --git a/lib/okna/jidelnicek.dart b/lib/okna/jidelnicek.dart index a6c0c57..e044e27 100644 --- a/lib/okna/jidelnicek.dart +++ b/lib/okna/jidelnicek.dart @@ -393,7 +393,7 @@ class _JidelnicekPageState extends State { currentDate: den, firstDate: DateTime(2019, 1, 1), lastDate: DateTime(den.year + 1, 12, 31), - locale: const Locale("cs")); + locale: Localizations.localeOf(context)); if (datePicked == null) return; setState(() { den = datePicked;