diff --git a/CHANGELOG.md b/CHANGELOG.md index 764d74d..82997b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 1.4.1 +- aktualizovat knihovnu canteenlib +- změnit odkaz na odeslání zpětné vazby +- přidat odkaz na hodnocení v obchodu s aplikacemi +- opravit chybu s vytvářením notifikace # 1.4.0 - Opravit chybu, kdy po stisknutí tlačítka zpět na hlavní stránce byl uživatel vrácen na přihlašovací obrazovku - Přidat výběr z instancí (aktuálně pouze SŠTE Olomoucká) diff --git a/lib/lang/lang.dart b/lib/lang/lang.dart index 07d398f..3abea23 100644 --- a/lib/lang/lang.dart +++ b/lib/lang/lang.dart @@ -81,6 +81,8 @@ abstract class Languages { String get reportBugs; + String get review; + String get about; String get menu; diff --git a/lib/lang/lang_cz.dart b/lib/lang/lang_cz.dart index 3a43f58..65dcc88 100644 --- a/lib/lang/lang_cz.dart +++ b/lib/lang/lang_cz.dart @@ -122,7 +122,7 @@ class LanguageCz extends Languages { String get rememberMe => "Zapamatovat si mě"; @override - String get reportBugs => "Nahlásit chybu"; + String get reportBugs => "Zpětná vazba"; @override String get saturday => "Sobota"; @@ -234,4 +234,7 @@ class LanguageCz extends Languages { @override String get source => "Zdrojový kód"; + + @override + String get review => "Ohodnotit aplikaci"; } diff --git a/lib/lang/lang_en.dart b/lib/lang/lang_en.dart index 0d6d789..bd26eec 100644 --- a/lib/lang/lang_en.dart +++ b/lib/lang/lang_en.dart @@ -122,7 +122,7 @@ class LanguageEn extends Languages { String get rememberMe => "Remember me"; @override - String get reportBugs => "Report bug"; + String get reportBugs => "Feedback"; @override String get saturday => "Saturday"; @@ -232,4 +232,7 @@ class LanguageEn extends Languages { @override String get source => "Source code"; + + @override + String get review => "Review the app"; } diff --git a/lib/main.dart b/lib/main.dart index 16433b5..cfc473a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -69,7 +69,10 @@ void oznamitPredem(SharedPreferences prefs, tz.Location l) async { (element) => element.objednano); // získá objednané jídlo var kdy = DateTime.parse(prefs.getString( "oznameni_cas")!); // uložíme čas, kdy se má odeslat oznámení - + var cas = casNaDate( + TimeOfDay(hour: kdy.hour, minute: kdy.minute), + ); + if (cas.isBefore(DateTime.now())) return; // data o oznámení const AndroidNotificationDetails androidSpec = AndroidNotificationDetails('predobedem', 'Oznámení před obědem', @@ -85,11 +88,7 @@ void oznamitPredem(SharedPreferences prefs, tz.Location l) async { 0, title, "${jidlo.varianta} - ${jidlo.nazev}", - tz.TZDateTime.from( - casNaDate( - TimeOfDay(hour: kdy.hour, minute: kdy.minute), - ), - l), + tz.TZDateTime.from(cas, l), const NotificationDetails(android: androidSpec, iOS: iOSpec), androidAllowWhileIdle: true, uiLocalNotificationDateInterpretation: diff --git a/lib/okna/jidelnicek.dart b/lib/okna/jidelnicek.dart index b7ec276..e3696e5 100644 --- a/lib/okna/jidelnicek.dart +++ b/lib/okna/jidelnicek.dart @@ -342,9 +342,18 @@ class _JidelnicekPageState extends State { ], ), ); + } else if (value == Languages.of(context)!.review) { + (Platform.isAndroid) + ? launchUrl( + Uri.parse("market://details?id=cz.hernikplays.opencanteen"), + mode: LaunchMode.externalApplication) + : launchUrl( + Uri.parse( + "https://apps.apple.com/cs/app/opencanteen/id1621124445"), + mode: LaunchMode.externalApplication); } else if (value == Languages.of(context)!.reportBugs) { - launchUrl(Uri.parse( - "https://github.com/hernikplays/opencanteen/issues/new/choose")); + launchUrl(Uri.parse("https://forms.gle/jKN7QeFJwpaApSbC8"), + mode: LaunchMode.externalApplication); } else if (value == Languages.of(context)!.about) { var packageInfo = await PackageInfo.fromPlatform(); if (!mounted) return; @@ -434,6 +443,7 @@ class _JidelnicekPageState extends State { itemBuilder: (BuildContext context) { return { Languages.of(context)!.reportBugs, + Languages.of(context)!.review, Languages.of(context)!.settings, Languages.of(context)!.about, Languages.of(context)!.signOut diff --git a/lib/okna/offline_jidelnicek.dart b/lib/okna/offline_jidelnicek.dart index 4bc30ef..b767ca8 100644 --- a/lib/okna/offline_jidelnicek.dart +++ b/lib/okna/offline_jidelnicek.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:flutter/material.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:opencanteen/util.dart'; @@ -81,9 +83,18 @@ class _OfflineJidelnicekState extends State { storage.deleteAll(); Navigator.pushReplacement( context, MaterialPageRoute(builder: (c) => const LoginPage())); + } else if (value == Languages.of(context)!.review) { + (Platform.isAndroid) + ? launchUrl( + Uri.parse("market://details?id=cz.hernikplays.opencanteen"), + mode: LaunchMode.externalApplication) + : launchUrl( + Uri.parse( + "https://apps.apple.com/cs/app/opencanteen/id1621124445"), + mode: LaunchMode.externalApplication); } else if (value == Languages.of(context)!.reportBugs) { - launchUrl(Uri.parse( - "https://github.com/hernikplays/opencanteen/issues/new/choose")); + launchUrl(Uri.parse("https://forms.gle/jKN7QeFJwpaApSbC8"), + mode: LaunchMode.externalApplication); } else if (value == Languages.of(context)!.about) { var packageInfo = await PackageInfo.fromPlatform(); if (!mounted) return; @@ -120,6 +131,7 @@ class _OfflineJidelnicekState extends State { itemBuilder: (BuildContext context) { return { Languages.of(context)!.reportBugs, + Languages.of(context)!.review, Languages.of(context)!.about, Languages.of(context)!.signOut }.map((String choice) { diff --git a/pubspec.lock b/pubspec.lock index 01aab47..1ba9b3e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -28,7 +28,7 @@ packages: name: canteenlib url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" characters: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index a0adc37..b3b604b 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.4.0+19 +version: 1.4.1+20 environment: sdk: ">=2.16.1 <3.0.0" @@ -16,7 +16,7 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - canteenlib: ^1.0.0 + canteenlib: ^1.0.1 flutter_secure_storage: 5.0.2 url_launcher: ^6.0.20 path_provider: ^2.0.9