diff --git a/CHANGELOG.md b/CHANGELOG.md index a35d17a..3345f31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 1.6.0 - rozdělit iOS a Android UI zvlášť pro možnost využití Cupertino knihovny - opravit chybu s FlutterLocalNotifications na iOS +- upravit vzhled # 1.5.1 - aktualizovat knihovnu canteenlib - přidat podporu pro splitování APK podle ABI diff --git a/lib/okna/android/jidelnicek.dart b/lib/okna/android/jidelnicek.dart index 26ed693..24749d1 100644 --- a/lib/okna/android/jidelnicek.dart +++ b/lib/okna/android/jidelnicek.dart @@ -339,14 +339,8 @@ class _AndroidJidelnicekState 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/cz/app/opencanteen/id1621124445"), - mode: LaunchMode.externalApplication); + launchUrl(Uri.parse("market://details?id=cz.hernikplays.opencanteen"), + mode: LaunchMode.externalApplication); } else if (value == Languages.of(context)!.reportBugs) { launchUrl(Uri.parse("https://forms.gle/jKN7QeFJwpaApSbC8"), mode: LaunchMode.externalApplication); diff --git a/lib/okna/android/login.dart b/lib/okna/android/login.dart index d7d4915..1269ef6 100644 --- a/lib/okna/android/login.dart +++ b/lib/okna/android/login.dart @@ -272,12 +272,10 @@ class _AndroidLoginState extends State { /// Získá offline soubor a zobrazí údaje void goOffline() async { if (!mounted) return; - if (Platform.isAndroid) { - Navigator.pushAndRemoveUntil( - context, - MaterialPageRoute( - builder: ((context) => const AndroidOfflineJidelnicek())), - (route) => false); - } + Navigator.pushAndRemoveUntil( + context, + MaterialPageRoute( + builder: ((context) => const AndroidOfflineJidelnicek())), + (route) => false); } } diff --git a/lib/okna/android/nastaveni.dart b/lib/okna/android/nastaveni.dart index 05cbd3c..a4a80e2 100644 --- a/lib/okna/android/nastaveni.dart +++ b/lib/okna/android/nastaveni.dart @@ -80,6 +80,7 @@ class _AndroidNastaveniState extends State { Text(Languages.of(context)!.saveOffline), Switch( value: _ukladatOffline, + activeColor: Colors.purple, onChanged: (value) { setState(() { _ukladatOffline = value; @@ -115,6 +116,7 @@ class _AndroidNastaveniState extends State { children: [ Text(Languages.of(context)!.skipWeekend), Switch( + activeColor: Colors.purple, value: _preskakovatVikend, onChanged: (value) { setState(() { @@ -129,6 +131,7 @@ class _AndroidNastaveniState extends State { children: [ Flexible(child: Text(Languages.of(context)!.checkOrdered)), Switch( + activeColor: Colors.purple, value: _kontrolovatTyden, onChanged: (value) { setState(() { @@ -143,6 +146,7 @@ class _AndroidNastaveniState extends State { children: [ Flexible(child: Text(Languages.of(context)!.notifyLunch)), Switch( + activeColor: Colors.purple, value: _oznameniObed, thumbColor: (!_zapamatovany ? MaterialStateProperty.all(Colors.grey) diff --git a/lib/okna/android/offline_jidelnicek.dart b/lib/okna/android/offline_jidelnicek.dart index 794af12..df8814f 100644 --- a/lib/okna/android/offline_jidelnicek.dart +++ b/lib/okna/android/offline_jidelnicek.dart @@ -117,14 +117,8 @@ class _AndroidOfflineJidelnicekState extends State { Navigator.pushReplacement( context, MaterialPageRoute(builder: (c) => const AndroidLogin())); } 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/cz/app/opencanteen/id1621124445"), - mode: LaunchMode.externalApplication); + launchUrl(Uri.parse("market://details?id=cz.hernikplays.opencanteen"), + mode: LaunchMode.externalApplication); } else if (value == Languages.of(context)!.reportBugs) { launchUrl(Uri.parse("https://forms.gle/jKN7QeFJwpaApSbC8"), mode: LaunchMode.externalApplication); diff --git a/lib/okna/ios/login.dart b/lib/okna/ios/login.dart index 3335e09..b3bf79b 100644 --- a/lib/okna/ios/login.dart +++ b/lib/okna/ios/login.dart @@ -33,23 +33,16 @@ class _IOSLoginState extends State { void initState() { super.initState(); LoginManager.getDetails().then((r) async { - if (Platform.isIOS) { - // žádat o oprávnění na iOS - await flutterLocalNotificationsPlugin - .resolvePlatformSpecificImplementation< - IOSFlutterLocalNotificationsPlugin>() - ?.requestPermissions( - alert: true, - badge: true, - sound: true, - ); - } else if (Platform.isAndroid) { - // žádat o oprávnění na android - flutterLocalNotificationsPlugin - .resolvePlatformSpecificImplementation< - AndroidFlutterLocalNotificationsPlugin>() - ?.requestPermission(); - } + // žádat o oprávnění na iOS + await flutterLocalNotificationsPlugin + .resolvePlatformSpecificImplementation< + IOSFlutterLocalNotificationsPlugin>() + ?.requestPermissions( + alert: true, + badge: true, + sound: true, + ); + if (r != null) { // Automaticky přihlásit showDialog( @@ -146,16 +139,14 @@ class _IOSLoginState extends State { Languages.of(context)!.logIn, textAlign: TextAlign.center, ), - TextField( + CupertinoTextField( controller: userControl, autofillHints: const [AutofillHints.username], - decoration: InputDecoration( - labelText: Languages.of(context)!.username), + prefix: Text(Languages.of(context)!.username), ), - TextField( + CupertinoTextField( autofillHints: const [AutofillHints.password], - decoration: InputDecoration( - labelText: Languages.of(context)!.password), + prefix: Text(Languages.of(context)!.password), controller: passControl, obscureText: true, ), @@ -283,12 +274,9 @@ class _IOSLoginState extends State { /// Získá offline soubor a zobrazí údaje void goOffline() async { if (!mounted) return; - if (Platform.isAndroid) { - Navigator.pushAndRemoveUntil( - context, - MaterialPageRoute( - builder: ((context) => const IOSOfflineJidelnicek())), - (route) => false); - } + Navigator.pushAndRemoveUntil( + context, + MaterialPageRoute(builder: ((context) => const IOSOfflineJidelnicek())), + (route) => false); } } diff --git a/lib/okna/ios/nastaveni.dart b/lib/okna/ios/nastaveni.dart index ac22020..d0da422 100644 --- a/lib/okna/ios/nastaveni.dart +++ b/lib/okna/ios/nastaveni.dart @@ -80,6 +80,7 @@ class _IOSNastaveniState extends State { children: [ Text(Languages.of(context)!.saveOffline), CupertinoSwitch( + activeColor: Colors.purple, value: _ukladatOffline, onChanged: (value) { setState(() { @@ -116,6 +117,7 @@ class _IOSNastaveniState extends State { children: [ Text(Languages.of(context)!.skipWeekend), CupertinoSwitch( + activeColor: Colors.purple, value: _preskakovatVikend, onChanged: (value) { setState(() { @@ -130,6 +132,7 @@ class _IOSNastaveniState extends State { children: [ Flexible(child: Text(Languages.of(context)!.checkOrdered)), CupertinoSwitch( + activeColor: Colors.purple, value: _kontrolovatTyden, onChanged: (value) { setState(() { @@ -144,8 +147,8 @@ class _IOSNastaveniState extends State { children: [ Flexible(child: Text(Languages.of(context)!.notifyLunch)), CupertinoSwitch( + activeColor: Colors.purple, value: _oznameniObed, - thumbColor: (Colors.grey), onChanged: (value) { if (!_zapamatovany) { showDialog( diff --git a/lib/okna/ios/offline_jidelnicek.dart b/lib/okna/ios/offline_jidelnicek.dart index 2d036ac..23bdbc6 100644 --- a/lib/okna/ios/offline_jidelnicek.dart +++ b/lib/okna/ios/offline_jidelnicek.dart @@ -117,14 +117,9 @@ class _IOSOfflineJidelnicekState extends State { Navigator.pushReplacement( context, MaterialPageRoute(builder: (c) => const IOSLogin())); } 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/cz/app/opencanteen/id1621124445"), - mode: LaunchMode.externalApplication); + launchUrl( + Uri.parse("https://apps.apple.com/cz/app/opencanteen/id1621124445"), + mode: LaunchMode.externalApplication); } else if (value == Languages.of(context)!.reportBugs) { launchUrl(Uri.parse("https://forms.gle/jKN7QeFJwpaApSbC8"), mode: LaunchMode.externalApplication); diff --git a/metadata/cs-CZ/changelogs/25.txt b/metadata/cs-CZ/changelogs/25.txt index e9c471d..9fa724c 100644 --- a/metadata/cs-CZ/changelogs/25.txt +++ b/metadata/cs-CZ/changelogs/25.txt @@ -1 +1,2 @@ -- Optimalizace ze strany kodu \ No newline at end of file +- Optimalizace ze strany kodu +- Úpravy vzhledu \ No newline at end of file diff --git a/metadata/en-US/changelogs/25.txt b/metadata/en-US/changelogs/25.txt index 28edfaf..62fe449 100644 --- a/metadata/en-US/changelogs/25.txt +++ b/metadata/en-US/changelogs/25.txt @@ -1 +1,2 @@ -- Code optimization \ No newline at end of file +- Code optimization +- Theme edits \ No newline at end of file