Compare commits
No commits in common. "44130bdc09ec4aefcdca276a60192648e30d997d" and "ca3d0a81c66f9c5c262e55c69bf3f19a89d4c9ff" have entirely different histories.
44130bdc09
...
ca3d0a81c6
6 changed files with 35 additions and 42 deletions
|
@ -1,5 +1,3 @@
|
|||
# 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
|
||||
|
|
|
@ -226,27 +226,25 @@ class _AndroidJidelnicekState extends State<AndroidJidelnicek> {
|
|||
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 {
|
||||
|
@ -279,22 +277,21 @@ class _AndroidJidelnicekState extends State<AndroidJidelnicek> {
|
|||
.then((_) => nactiJidlo())
|
||||
.catchError((o) {
|
||||
showDialog(
|
||||
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);
|
||||
},
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
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);
|
||||
},
|
||||
)
|
||||
],
|
||||
));
|
||||
});
|
||||
}
|
||||
} else {
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
- Opravit chybu s přidáváním jídla na burzu
|
|
@ -1 +0,0 @@
|
|||
- Fix issue with adding food to the exchange
|
|
@ -28,7 +28,7 @@ packages:
|
|||
name: canteenlib
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.1.1"
|
||||
version: "1.1.0-alpha.1"
|
||||
characters:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
|
@ -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.1+26
|
||||
version: 1.6.0+25
|
||||
|
||||
environment:
|
||||
sdk: ">=2.16.1 <3.0.0"
|
||||
|
@ -16,7 +16,7 @@ dependencies:
|
|||
sdk: flutter
|
||||
flutter_localizations:
|
||||
sdk: flutter
|
||||
canteenlib: ^1.1.1
|
||||
canteenlib: ^1.1.0-alpha.1
|
||||
flutter_secure_storage: 5.0.2
|
||||
url_launcher: ^6.0.20
|
||||
path_provider: ^2.0.9
|
||||
|
|
Reference in a new issue