Merge pull request 'fix: opravit problém s burzou' (#35) from fix-burza into main

Reviewed-on: #35

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

lib/okna/android/jidelnicek.dart

@@ -226,25 +226,27 @@ class _AndroidJidelnicekState extends State<AndroidJidelnicek> {
                         widget.canteen.objednat(j).then((_) {
                           Navigator.of(context, rootNavigator: true).pop();
                           nactiJidlo();
-                        }).catchError((o) {
+                        }).catchError(
-                          Navigator.of(context, rootNavigator: true).pop();
+                          (o) {
-                          showDialog(
+                            Navigator.of(context, rootNavigator: true).pop();
+                            showDialog(
                               context: context,
                               builder: (bc) => AlertDialog(
-                                    title: Text(
+                                title:
-                                        Languages.of(context)!.errorOrdering),
+                                    Text(Languages.of(context)!.errorOrdering),
-                                    content: Text(o.toString()),
+                                content: Text(o.toString()),
-                                    actions: [
+                                actions: [
-                                      TextButton(
+                                  TextButton(
-                                        child:
+                                    child: Text(Languages.of(context)!.close),
-                                            Text(Languages.of(context)!.close),
+                                    onPressed: () {
-                                        onPressed: () {
+                                      Navigator.pop(bc);
-                                          Navigator.pop(bc);
+                                    },
-                                        },
+                                  )
-                                      )
+                                ],
-                                    ],
+                              ),
-                                  ));
+                            );
-                        });
+                          },
+                        );
                       }
                     },
                     onLongPress: () async {
@@ -277,21 +279,22 @@ class _AndroidJidelnicekState extends State<AndroidJidelnicek> {
                               .then((_) => nactiJidlo())
                               .catchError((o) {
                             showDialog(
-                                context: context,
+                              context: context,
-                                builder: (bc) => AlertDialog(
+                              builder: (bc) => AlertDialog(
-                                      title: Text(
+                                title:
-                                          Languages.of(context)!.exchangeError),
+                                    Text(Languages.of(context)!.exchangeError),
-                                      content: Text(o.toString()),
+                                content: SingleChildScrollView(
-                                      actions: [
+                                    child: Text(o.toString())),
-                                        TextButton(
+                                actions: [
-                                          child: Text(
+                                  TextButton(
-                                              Languages.of(context)!.close),
+                                    child: Text(Languages.of(context)!.close),
-                                          onPressed: () {
+                                    onPressed: () {
-                                            Navigator.pop(bc);
+                                      Navigator.pop(bc);
-                                          },
+                                    },
-                                        )
+                                  )
-                                      ],
+                                ],
-                                    ));
+                              ),
+                            );
                           });
                         }
                       } else {

metadata/cs-CZ/changelogs/26.txt

@@ -0,0 +1 @@
+- Opravit chybu s přidáváním jídla na burzu

metadata/en-US/changelogs/26.txt

@@ -0,0 +1 @@
+- Fix issue with adding food to the exchange

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:

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