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
|
# 1.6.0
|
||||||
- rozdělit iOS a Android UI zvlášť pro možnost využití Cupertino knihovny
|
- rozdělit iOS a Android UI zvlášť pro možnost využití Cupertino knihovny
|
||||||
- opravit chybu s FlutterLocalNotifications na iOS
|
- opravit chybu s FlutterLocalNotifications na iOS
|
||||||
|
|
|
@ -226,27 +226,25 @@ class _AndroidJidelnicekState extends State<AndroidJidelnicek> {
|
||||||
widget.canteen.objednat(j).then((_) {
|
widget.canteen.objednat(j).then((_) {
|
||||||
Navigator.of(context, rootNavigator: true).pop();
|
Navigator.of(context, rootNavigator: true).pop();
|
||||||
nactiJidlo();
|
nactiJidlo();
|
||||||
}).catchError(
|
}).catchError((o) {
|
||||||
(o) {
|
Navigator.of(context, rootNavigator: true).pop();
|
||||||
Navigator.of(context, rootNavigator: true).pop();
|
showDialog(
|
||||||
showDialog(
|
|
||||||
context: context,
|
context: context,
|
||||||
builder: (bc) => AlertDialog(
|
builder: (bc) => AlertDialog(
|
||||||
title:
|
title: Text(
|
||||||
Text(Languages.of(context)!.errorOrdering),
|
Languages.of(context)!.errorOrdering),
|
||||||
content: Text(o.toString()),
|
content: Text(o.toString()),
|
||||||
actions: [
|
actions: [
|
||||||
TextButton(
|
TextButton(
|
||||||
child: Text(Languages.of(context)!.close),
|
child:
|
||||||
onPressed: () {
|
Text(Languages.of(context)!.close),
|
||||||
Navigator.pop(bc);
|
onPressed: () {
|
||||||
},
|
Navigator.pop(bc);
|
||||||
)
|
},
|
||||||
],
|
)
|
||||||
),
|
],
|
||||||
);
|
));
|
||||||
},
|
});
|
||||||
);
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLongPress: () async {
|
onLongPress: () async {
|
||||||
|
@ -279,22 +277,21 @@ class _AndroidJidelnicekState extends State<AndroidJidelnicek> {
|
||||||
.then((_) => nactiJidlo())
|
.then((_) => nactiJidlo())
|
||||||
.catchError((o) {
|
.catchError((o) {
|
||||||
showDialog(
|
showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (bc) => AlertDialog(
|
builder: (bc) => AlertDialog(
|
||||||
title:
|
title: Text(
|
||||||
Text(Languages.of(context)!.exchangeError),
|
Languages.of(context)!.exchangeError),
|
||||||
content: SingleChildScrollView(
|
content: Text(o.toString()),
|
||||||
child: Text(o.toString())),
|
actions: [
|
||||||
actions: [
|
TextButton(
|
||||||
TextButton(
|
child: Text(
|
||||||
child: Text(Languages.of(context)!.close),
|
Languages.of(context)!.close),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Navigator.pop(bc);
|
Navigator.pop(bc);
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
));
|
||||||
);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} 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
|
name: canteenlib
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.1.1"
|
version: "1.1.0-alpha.1"
|
||||||
characters:
|
characters:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
@ -6,7 +6,7 @@ publish_to: 'none'
|
||||||
# The following defines the version and build number for your application.
|
# The following defines the version and build number for your application.
|
||||||
# A version number is three numbers separated by dots, like 1.2.43
|
# A version number is three numbers separated by dots, like 1.2.43
|
||||||
# followed by an optional build number separated by a +.
|
# followed by an optional build number separated by a +.
|
||||||
version: 1.6.1+26
|
version: 1.6.0+25
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ">=2.16.1 <3.0.0"
|
sdk: ">=2.16.1 <3.0.0"
|
||||||
|
@ -16,7 +16,7 @@ dependencies:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
flutter_localizations:
|
flutter_localizations:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
canteenlib: ^1.1.1
|
canteenlib: ^1.1.0-alpha.1
|
||||||
flutter_secure_storage: 5.0.2
|
flutter_secure_storage: 5.0.2
|
||||||
url_launcher: ^6.0.20
|
url_launcher: ^6.0.20
|
||||||
path_provider: ^2.0.9
|
path_provider: ^2.0.9
|
||||||
|
|
Reference in a new issue