From 33ff600bbe1251edbf954874d641598601b69543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Wed, 14 Dec 2022 19:44:32 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20opravit=20probl=C3=A9m=20s=20burzou?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 + lib/okna/android/jidelnicek.dart | 67 +++++++++++++++++--------------- metadata/cs-CZ/changelogs/26.txt | 1 + metadata/en-US/changelogs/26.txt | 1 + pubspec.lock | 2 +- pubspec.yaml | 4 +- 6 files changed, 42 insertions(+), 35 deletions(-) create mode 100644 metadata/cs-CZ/changelogs/26.txt create mode 100644 metadata/en-US/changelogs/26.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 3345f31..488ca73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +# 1.6.1 +- opravit chybu s přidáváním do burzy aktualizací knihovny # 1.6.0 - rozdělit iOS a Android UI zvlášť pro možnost využití Cupertino knihovny - opravit chybu s FlutterLocalNotifications na iOS diff --git a/lib/okna/android/jidelnicek.dart b/lib/okna/android/jidelnicek.dart index 24749d1..91a1197 100644 --- a/lib/okna/android/jidelnicek.dart +++ b/lib/okna/android/jidelnicek.dart @@ -226,25 +226,27 @@ class _AndroidJidelnicekState extends State { widget.canteen.objednat(j).then((_) { Navigator.of(context, rootNavigator: true).pop(); nactiJidlo(); - }).catchError((o) { - Navigator.of(context, rootNavigator: true).pop(); - showDialog( + }).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); - }, - ) - ], - )); - }); + title: + Text(Languages.of(context)!.errorOrdering), + content: Text(o.toString()), + actions: [ + TextButton( + child: Text(Languages.of(context)!.close), + onPressed: () { + Navigator.pop(bc); + }, + ) + ], + ), + ); + }, + ); } }, onLongPress: () async { @@ -277,21 +279,22 @@ class _AndroidJidelnicekState extends State { .then((_) => nactiJidlo()) .catchError((o) { showDialog( - context: context, - builder: (bc) => AlertDialog( - title: Text( - Languages.of(context)!.exchangeError), - content: Text(o.toString()), - actions: [ - TextButton( - child: Text( - Languages.of(context)!.close), - onPressed: () { - Navigator.pop(bc); - }, - ) - ], - )); + context: context, + builder: (bc) => AlertDialog( + title: + Text(Languages.of(context)!.exchangeError), + content: SingleChildScrollView( + child: Text(o.toString())), + actions: [ + TextButton( + child: Text(Languages.of(context)!.close), + onPressed: () { + Navigator.pop(bc); + }, + ) + ], + ), + ); }); } } else { diff --git a/metadata/cs-CZ/changelogs/26.txt b/metadata/cs-CZ/changelogs/26.txt new file mode 100644 index 0000000..64b40ab --- /dev/null +++ b/metadata/cs-CZ/changelogs/26.txt @@ -0,0 +1 @@ +- Opravit chybu s přidáváním jídla na burzu \ No newline at end of file diff --git a/metadata/en-US/changelogs/26.txt b/metadata/en-US/changelogs/26.txt new file mode 100644 index 0000000..4bd4076 --- /dev/null +++ b/metadata/en-US/changelogs/26.txt @@ -0,0 +1 @@ +- Fix issue with adding food to the exchange \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 556b2c2..7fd0d7b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -28,7 +28,7 @@ packages: name: canteenlib url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-alpha.1" + version: "1.1.1" characters: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index d2938c4..85bb144 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.6.0+25 +version: 1.6.1+26 environment: sdk: ">=2.16.1 <3.0.0" @@ -16,7 +16,7 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - canteenlib: ^1.1.0-alpha.1 + canteenlib: ^1.1.1 flutter_secure_storage: 5.0.2 url_launcher: ^6.0.20 path_provider: ^2.0.9