hernik/opencanteen
1
0
Fork 0
Code Issues 7 Pull requests 2 Projects Releases 7 Wiki Activity

fix: synchronizovat opravy z dev větve

Browse source
This commit is contained in:
Matyáš Caras 2022-05-19 20:01:47 +02:00 committed by GitHub
parent 2756d8db08 7dd3985ab7
commit ce0c2d2858
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 140 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +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 # 1.1.0
- Přidat uvítací obrazovku při prvním spuštění - Přidat uvítací obrazovku při prvním spuštění
- Mírné vyčištění kódu - Mírné vyčištění kódu

2
lib/lang/lang_cz.dart
View file

@ -14,7 +14,7 @@ class LanguageCz extends Languages {
String get balance => "Kredit: "; String get balance => "Kredit: ";
@override @override
String get cannotOrder => "Nelze objednat"; String get cannotOrder => "Toto jídlo není možné objednat.";
@override @override
String get close => "Zavřít"; String get close => "Zavřít";

2
lib/lang/lang_en.dart
View file

@ -14,7 +14,7 @@ class LanguageEn extends Languages {
String get balance => "Balance: "; String get balance => "Balance: ";
@override @override
String get cannotOrder => "Cannot order"; String get cannotOrder => "This food cannot be ordered.";
@override @override
String get close => "Close"; String get close => "Close";

23
lib/main.dart
View file

@ -120,13 +120,22 @@ class _LoginPageState extends State<LoginPage> {
); );
return; return;
} }
Navigator.pushReplacement( const storage = FlutterSecureStorage();
context, var odsouhlasil = await storage.read(key: "oc_souhlas");
MaterialPageRoute( if (odsouhlasil == null || odsouhlasil != "ano") {
builder: (context) => JidelnicekPage( Navigator.pushReplacement(
canteen: canteen, context,
)), MaterialPageRoute(
); builder: (c) => WelcomeScreen(canteen: canteen)));
} else {
Navigator.pushReplacement(
context,
MaterialPageRoute(
builder: (context) => JidelnicekPage(
canteen: canteen,
)),
);
}
} catch (_) { } catch (_) {
ScaffoldMessenger.of(context).hideCurrentSnackBar(); ScaffoldMessenger.of(context).hideCurrentSnackBar();
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(

191
lib/okna/jidelnicek.dart
View file

@ -86,89 +86,132 @@ class _JidelnicekPageState extends State<JidelnicekPage> {
? MaterialStateProperty.all(Colors.blue) ? MaterialStateProperty.all(Colors.blue)
: MaterialStateProperty.all(Colors.grey), : MaterialStateProperty.all(Colors.grey),
onChanged: (v) async { onChanged: (v) async {
if (!j.lzeObjednat) return; if (!j.lzeObjednat) {
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( showDialog(
context: context, context: context,
builder: (bc) => AlertDialog( builder: (context) {
title: Text(Languages.of(context)! return AlertDialog(
.errorOrdering), title: Text(Languages.of(context)!
content: Text(o.toString()), .errorOrdering),
actions: [ content: Text(
TextButton( Languages.of(context)!.cannotOrder),
child: Text( actions: [
Languages.of(context)!.close), TextButton(
onPressed: () { child:
Navigator.pop(bc); 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 { onTap: () async {
if (!j.lzeObjednat) return; if (!j.lzeObjednat) {
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( showDialog(
context: context, context: context,
builder: (bc) => AlertDialog( builder: (context) {
title: Text( return AlertDialog(
Languages.of(context)!.errorOrdering), title:
content: Text(o.toString()), Text(Languages.of(context)!.errorOrdering),
actions: [ content:
TextButton( Text(Languages.of(context)!.cannotOrder),
child: Text(Languages.of(context)!.close), actions: [
onPressed: () { TextButton(
Navigator.pop(bc); 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 { onLongPress: () async {
if (!j.objednano || j.burzaUrl == null) return; if (!j.objednano || j.burzaUrl == null) return;
@ -350,7 +393,7 @@ class _JidelnicekPageState extends State<JidelnicekPage> {
currentDate: den, currentDate: den,
firstDate: DateTime(2019, 1, 1), firstDate: DateTime(2019, 1, 1),
lastDate: DateTime(den.year + 1, 12, 31), lastDate: DateTime(den.year + 1, 12, 31),
locale: const Locale("cs")); locale: Localizations.localeOf(context));
if (datePicked == null) return; if (datePicked == null) return;
setState(() { setState(() {
den = datePicked; den = datePicked;

2
pubspec.yaml
View file

@ -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.1.0+4 version: 1.1.1+5
environment: environment:
sdk: ">=2.16.1 <3.0.0" sdk: ">=2.16.1 <3.0.0"