From b712f0e815505c0fe9ab345ada5f01578d65072c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= <contact@hernikplays.cz>
Date: Wed, 8 Jun 2022 19:06:30 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20poupravit=20chov=C3=A1n=C3=AD=20nastaven?=
 =?UTF-8?q?=C3=AD=20+=20tla=C4=8D=C3=ADtko=20dnes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                             |   1 +
 android/app/src/main/AndroidManifest.xml |   3 +-
 lib/lang/lang.dart                       |   4 +
 lib/lang/lang_cz.dart                    |   7 +
 lib/lang/lang_en.dart                    |   9 +-
 lib/okna/jidelnicek.dart                 |  27 ++--
 lib/okna/nastaveni.dart                  | 157 +++++++++++++----------
 pubspec.yaml                             |   2 +-
 8 files changed, 132 insertions(+), 78 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e7e417..326172f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 1.3.0
 - Odstranit connectivity_plus
 - Přidat možnost oznámení s info o obědu v daný čas
+- Přidat k jídelníčku tlačítko, které zobrazí dnešní jídelníček
 # 1.2.0
 - Přidat možnost zobrazení oznámení v případě neobjednaného jídla na příští týden
 - Přidat oznámení o rozbitých uložených údajích
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 49bb8be..58aa68e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:showWhenLocked="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
diff --git a/lib/lang/lang.dart b/lib/lang/lang.dart
index 3dce765..6c2a9d1 100644
--- a/lib/lang/lang.dart
+++ b/lib/lang/lang.dart
@@ -156,4 +156,8 @@ abstract class Languages {
 
   // Oznámit před obědem
   String get lunchNotif;
+
+  String get error;
+
+  String get needRemember;
 }
diff --git a/lib/lang/lang_cz.dart b/lib/lang/lang_cz.dart
index 1fc83a9..749d04f 100644
--- a/lib/lang/lang_cz.dart
+++ b/lib/lang/lang_cz.dart
@@ -217,4 +217,11 @@ class LanguageCz extends Languages {
 
   @override
   String get lunchNotif => "Dnes máte objednáno";
+
+  @override
+  String get error => "Chyba";
+
+  @override
+  String get needRemember =>
+      "Musíte své přihlašovací údaje uložit na přihlašovací obrazovce";
 }
diff --git a/lib/lang/lang_en.dart b/lib/lang/lang_en.dart
index 6c0b887..2e653dc 100644
--- a/lib/lang/lang_en.dart
+++ b/lib/lang/lang_en.dart
@@ -212,7 +212,14 @@ class LanguageEn extends Languages {
 
   @override
   String get notifyLunch => "Send a notification with meal info";
-  
+
   @override
   String get lunchNotif => "Today's ordered meal";
+
+  @override
+  String get error => "Error";
+
+  @override
+  String get needRemember =>
+      "You need to save your login details on the login screen first";
 }
diff --git a/lib/okna/jidelnicek.dart b/lib/okna/jidelnicek.dart
index e1e74b9..cd1f588 100644
--- a/lib/okna/jidelnicek.dart
+++ b/lib/okna/jidelnicek.dart
@@ -428,16 +428,23 @@ class _JidelnicekPageState extends State<JidelnicekPage> {
                       child: Text(
                           "${den.day}. ${den.month}. ${den.year} - $denTydne")),
                   IconButton(
-                      onPressed: () {
-                        setState(() {
-                          den = den.add(const Duration(days: 1));
-                          if (den.weekday == 6 && _skipWeekend) {
-                            den = den.add(const Duration(days: 2));
-                          }
-                          nactiJidlo();
-                        });
-                      },
-                      icon: const Icon(Icons.arrow_right)),
+                    onPressed: () {
+                      setState(() {
+                        den = den.add(const Duration(days: 1));
+                        if (den.weekday == 6 && _skipWeekend) {
+                          den = den.add(const Duration(days: 2));
+                        }
+                        nactiJidlo();
+                      });
+                    },
+                    icon: const Icon(Icons.arrow_right),
+                  ),
+                  IconButton(
+                      onPressed: () => setState(() {
+                            den = DateTime.now();
+                            nactiJidlo();
+                          }),
+                      icon: const Icon(Icons.calendar_today))
                 ]),
                 SingleChildScrollView(
                   physics: const AlwaysScrollableScrollPhysics(),
diff --git a/lib/okna/nastaveni.dart b/lib/okna/nastaveni.dart
index ea81d45..57a0725 100644
--- a/lib/okna/nastaveni.dart
+++ b/lib/okna/nastaveni.dart
@@ -27,10 +27,12 @@ class _NastaveniState extends State<Nastaveni> {
   bool _preskakovatVikend = false;
   bool _kontrolovatTyden = false;
   bool _oznameniObed = false;
+  bool _zapamatovany = false;
   TimeOfDay _oznameniCas = TimeOfDay.now();
 
   void najitNastaveni() async {
     var preferences = await SharedPreferences.getInstance();
+    _zapamatovany = await LoginManager.zapamatovat();
     setState(() {
       _ukladatOffline = preferences.getBool("offline") ?? false;
       _preskakovatVikend = preferences.getBool("skip") ?? false;
@@ -118,79 +120,66 @@ class _NastaveniState extends State<Nastaveni> {
                 Flexible(child: Text(Languages.of(context)!.notifyLunch)),
                 Switch(
                     value: _oznameniObed,
+                    thumbColor: (!_zapamatovany
+                        ? MaterialStateProperty.all(Colors.grey)
+                        : null),
                     onChanged: (value) {
-                      setState(() {
-                        _oznameniObed = value;
-                        zmenitNastaveni("oznamit",
-                            value); // TODO: změnit pouze s uloženými údaji
-                      });
+                      if (!_zapamatovany) {
+                        showDialog(
+                            context: context,
+                            builder: (bc) => AlertDialog(
+                                  title: Text(Languages.of(context)!.error),
+                                  content:
+                                      Text(Languages.of(context)!.needRemember),
+                                  actions: [
+                                    TextButton(
+                                      child: Text(Languages.of(context)!.ok),
+                                      onPressed: () {
+                                        Navigator.of(context).pop();
+                                      },
+                                    )
+                                  ],
+                                ));
+                      } else {
+                        setState(() {
+                          _oznameniObed = value;
+                          if (_oznameniObed) {
+                            vytvoritOznameni(casNaDate(_oznameniCas));
+                          }
+                          zmenitNastaveni("oznamit", value);
+                        });
+                      }
                     })
               ],
             ),
             Text(Languages.of(context)!.notifyAt),
             TextButton(
-                style: ButtonStyle(
-                    textStyle: MaterialStateProperty.all(TextStyle(
-                        color: (_oznameniObed) ? Colors.grey : Colors.purple))),
-                onPressed: () async {
-                  if (_oznameniObed) {
-                    var cas = await showTimePicker(
-                        context: context, initialTime: _oznameniCas);
-                    if (cas != null) {
-                      var prefs = await SharedPreferences.getInstance();
-                      prefs.setString(
-                          "oznameni_cas",
-                          casNaDate(cas)
-                              .toString()); // aktualizovat vybraný čas
-                      var d = await LoginManager.getDetails(); // získat údaje
-                      if (d != null) {
-                        // Nové oznámení
-                        var c = Canteen(d["url"]!);
-                        if (await c.login(d["user"]!, d["pass"]!)) {
-                          var jidla = await c.jidelnicekDen();
-                          try {
-                            var jidlo = jidla.jidla
-                                .singleWhere((element) => element.objednano);
-
-                            const AndroidNotificationDetails androidSpec =
-                                AndroidNotificationDetails(
-                                    'opencanteen', 'predobjedem',
-                                    channelDescription:
-                                        'Oznámení o dnešním jídle',
-                                    importance: Importance.max,
-                                    priority: Priority.high,
-                                    ticker: 'today meal');
-                            const IOSNotificationDetails iOSpec =
-                                IOSNotificationDetails(
-                                    presentAlert: true, presentBadge: true);
-                            debugPrint(casNaDate(cas).toString());
-                            var l = tz.getLocation(
-                                await FlutterNativeTimezone.getLocalTimezone());
-                            await widget.n.zonedSchedule(
-                                // Vytvoří nové oznámení pro daný čas a datum
-                                0,
-                                Languages.of(context)!.lunchNotif,
-                                "${jidlo.nazev} - ${jidlo.varianta}",
-                                tz.TZDateTime.from(casNaDate(cas), l),
-                                const NotificationDetails(
-                                    android: androidSpec, iOS: iOSpec),
-                                androidAllowWhileIdle: true,
-                                uiLocalNotificationDateInterpretation:
-                                    UILocalNotificationDateInterpretation
-                                        .absoluteTime);
-                          } on StateError catch (_) {
-                            // nenalezeno
-                          }
-                        }
-                      }
+              onPressed: () async {
+                if (_oznameniObed) {
+                  var cas = await showTimePicker(
+                      context: context, initialTime: _oznameniCas);
+                  if (cas != null) {
+                    var prefs = await SharedPreferences.getInstance();
+                    prefs.setString("oznameni_cas",
+                        casNaDate(cas).toString()); // aktualizovat vybraný čas
+                    var den = casNaDate(cas);
+                    debugPrint(den.isAfter(DateTime.now()).toString());
+                    if (den.isAfter(DateTime.now())) {
+                      // znovu vytvořit oznámení POUZE když je čas v budoucnosti
+                      vytvoritOznameni(den);
                     }
-                    setState(() {
-                      _oznameniCas = cas ?? _oznameniCas;
-                    });
                   }
-                },
-                child: Text(
-                    "${(_oznameniCas.hour < 10 ? "0" : "") + _oznameniCas.hour.toString()}:${(_oznameniCas.minute < 10 ? "0" : "") + _oznameniCas.minute.toString()}")),
+                  setState(() {
+                    _oznameniCas = cas ?? _oznameniCas;
+                  });
+                }
+              },
+              child: Text(
+                "${(_oznameniCas.hour < 10 ? "0" : "") + _oznameniCas.hour.toString()}:${(_oznameniCas.minute < 10 ? "0" : "") + _oznameniCas.minute.toString()}",
+                style: TextStyle(
+                    color: (!_oznameniObed) ? Colors.grey : Colors.purple),
+              ),
+            ),
           ],
         ),
       )),
@@ -208,4 +197,42 @@ class _NastaveniState extends State<Nastaveni> {
       }
     }
   }
+
+  void vytvoritOznameni(DateTime den) async {
+    await widget.n.cancelAll();
+    var d = await LoginManager.getDetails(); // získat údaje
+    if (d != null) {
+      // Nové oznámení
+      var c = Canteen(d["url"]!);
+      if (await c.login(d["user"]!, d["pass"]!)) {
+        var jidla = await c.jidelnicekDen();
+        try {
+          var jidlo = jidla.jidla.singleWhere((element) => element.objednano);
+
+          const AndroidNotificationDetails androidSpec =
+              AndroidNotificationDetails('opencanteen', 'predobjedem',
+                  channelDescription: 'Oznámení o dnešním jídle',
+                  importance: Importance.max,
+                  priority: Priority.high,
+                  ticker: 'today meal');
+          const IOSNotificationDetails iOSpec =
+              IOSNotificationDetails(presentAlert: true, presentBadge: true);
+          var l =
+              tz.getLocation(await FlutterNativeTimezone.getLocalTimezone());
+          await widget.n.zonedSchedule(
+              // Vytvoří nové oznámení pro daný čas a datum
+              0,
+              Languages.of(context)!.lunchNotif,
+              "${jidlo.nazev} - ${jidlo.varianta}",
+              tz.TZDateTime.from(den, l),
+              const NotificationDetails(android: androidSpec, iOS: iOSpec),
+              androidAllowWhileIdle: true,
+              uiLocalNotificationDateInterpretation:
+                  UILocalNotificationDateInterpretation.absoluteTime);
+        } on StateError catch (_) {
+          // nenalezeno
+        }
+      }
+    }
+  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 816a923..9c73992 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.2.0+14
+version: 1.3.0+15
 
 environment:
   sdk: ">=2.16.1 <3.0.0"