.devcontainer/devcontainer.json

@@ -0,0 +1,5 @@
+{
+	"name": "Flutter",
+	"image": "matspfeiffer/flutter:beta",
+	"extensions": ["dart-code.dart-code", "dart-code.flutter"]
+}

.flutter

@@ -1 +1 @@
-Subproject commit 7f20e5d18ce4cb80c621533090a7c5113f5bdc52
+Subproject commit b06b8b2710955028a6b562f5aa6fe62941d6febf

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: hernikplays
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/chybov--hl--en-.md

@@ -0,0 +1,28 @@
+---
+name: Chybové hlášení
+about: Použijte tuto předlohu, pokud se něco rozbilo
+title: ''
+labels: bug
+assignees: hernikplays
+
+---
+
+**Popis chyby**
+Zde popište co se stalo, mělo stát apod.
+
+**Kroky pro replikaci**
+Kroky ke spuštění chyby:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Snímky obrazovky**
+Chcete-li, přiložte snímky
+
+**Info o zařízení**
+ - Verze systému zařízení: [např. Android 12, iOS 9]
+ - Verze aplikace [např. 0.1.0]
+
+**Ostatní**
+Sem vepište doplňující informace

.github/ISSUE_TEMPLATE/n-pad-na-vylep-en-.md

@@ -0,0 +1,11 @@
+---
+name: Nápad na vylepšení
+about: Navrhněte co změnit nebo přidat do aplikace
+title: ''
+labels: vylepšení
+assignees: hernikplays
+
+---
+
+**Souvisí váš navrh s nějakým problémem?**
+Popište váš problém a co čekáte za řešení.

.github/labeler.yml

@@ -0,0 +1,8 @@
+'pr: pubspec':
+- pubspec.yaml
+
+'pr: funkce':
+- lib/*
+
+'pr: okno':
+- lib/okna/*

.github/pull_request_template.md

@@ -0,0 +1,14 @@
+Opravuje/implementuje # .
+
+Změny:
+- 1
+- 2
+
+```
+Text výše slouží jen jako předloha, není nutné se ho držet, ale šetříte ostatním čas
+```
+
+- [ ] Otestoval jsem funkčnost celé aplikace po přidání svého kódu
+- [ ] Přidaný kód nebo knihovny neobsahují žádný kód pod nekompatibilní licencí
+
+Doplňující/ostatní informace:

.github/workflows/main.yml

@@ -0,0 +1,30 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Analyze
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  fossa-scan:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: fossas/fossa-action@main 
+        with:
+          api-key: ${{secrets.fossaApiKey}}
+  analyze:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+      - run: flutter pub get
+      - run: flutter analyze

.github/workflows/pr.yml

@@ -0,0 +1,33 @@
+name: "Lint PR"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+jobs:
+  main:
+    name: Validate PR
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: amannn/action-semantic-pull-request@v4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: wagoid/commitlint-github-action@v4
+      - uses: actions/labeler@v4
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+  branch:
+    name: Uzavřít PRy mimo dev větev
+    needs: main
+    if: github.base_ref == 'main' && github.actor != 'hernikplays'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: superbrothers/close-pull-request@v3
+        with:
+          comment: "Všechny pull requesty by měly směřovat na jinou větev, než `main`. Pokud je tohle chyba, napište správci repozitáře."

.vscode/settings.json

@@ -1,7 +1,3 @@
 {
     "dart.flutterSdkPath": ".flutter",
-    "conventionalCommits.scopes": [
-        "dependencies",
-        "nastaveni"
-    ],
 }

CHANGELOG.md

@@ -1,20 +1,3 @@
-# 1.10.0
-- Aktualizovat závislosti
-- Změnit minSdk na 21
-- Přidat možnost zobrazit alergeny
-- Změnit fungování oznámení s aktualizací knihovny
-- Žádost o oprávnění k posílání oznámení by se mělo posílat už jen v případě, že uživatel bude chtít používat funkci oznámení
-# 1.9.1
-- Opravit chybu s propisováním HTML do názvu obědů
-# 1.9.0
-- Opravit vzhled na iOS
-- Opravit chybu s burzou (update canteenlib)
-# 1.8.1
-- aktualizace závislostí
-# 1.8.0
-- aktualizace závislostí
-- předělání nastavení
-- změna nastavení nyní nevyžaduje restart aplikace
 # 1.7.0
 - Implementovat Material 3 (Android)
 - Upravit chování dle platformy

CONTRIBUTING.md

@@ -2,16 +2,6 @@
 OpenCanteen je **aplikace** pro přístup do iCanteen. Pokud chcete přispět kód související s komunikací s iCanteen, podívejte se na [canteenlib](https://github.com/hernikplays/canteenlib).
 
 ## Jak přispět do vývoje
-
-### Používám GitHub pod protestem
-
-Tento projekt je aktuálně hostován i na GitHubu.  To není ideální; GitHub je uzavřený systém plný obchodních tajemství. Doporučuji přečíst si o kampani
-[Give up GitHub](https://GiveUpGitHub.org) od
-[Software Freedom Conservancy](https://sfconservancy.org) pro pochopení proč GitHub není ideální místo pro FOSS projekty.
-
-**Příspěvky do kódu přijímám **pouze** skrz mou Forgejo instanci na adrese https://git.mnau.xyz/hernik/opencanteen**
-
-Jakékoli použití kódu pro učení umělých inteligencí, které neumožňuje samotná licence GNU GPL 3.0 či novější, je děláno bez mého souhlasu a vědomí.
 ### Nahlašování chyb
 Prosté vyhledání a nahlášení chyby je asi nejjednodušší a zároveň nejpřínosnější způsob přispívání. Stačí vám běžné zařízení a stažená aplikace, pokud objevíte jakoukoliv chybu nebo nesrovnalost, nahlaste ji v [Issues](https://github.com/hernikplays/opencanteen/issues/new/choose).
 

README.md

@@ -29,20 +29,11 @@ Jednoduchý návod k použití naleznete [zde](https://github.com/hernikplays/op
 
 ## Přispět
 Přispět na vývoj můžete skrz
+- Liberapay: https://liberapay.com/hernikplays
 - Monero: `49uzFSxAsT92sXUsCEgh11VX7pmNZcoeKi4fEWbLGc2oWGMUVNcDDqGVB97ak96LqEBqsMXLS752bjgyVzbFcVwLNke4pNd`
 - Bitcoin: `3NzqkBZgWgjj1NYj2JwmBBptPWw6wt7dHS`
 - Kód: viz CONTRIBUTING
 
-## Používám GitHub pod protestem
-
-Tento projekt je aktuálně hostován i na GitHubu.  To není ideální; GitHub je uzavřený systém plný obchodních tajemství. Doporučuji přečíst si o kampani
-[Give up GitHub](https://GiveUpGitHub.org) od
-[Software Freedom Conservancy](https://sfconservancy.org) pro pochopení proč GitHub není ideální místo pro FOSS projekty.
-
-Příspěvky do kódu přijímám **pouze** skrz mou Forgejo instanci na adrese https://git.mnau.xyz/hernik/opencanteen
-
-Jakékoli použití kódu pro učení umělých inteligencí, které neumožňuje samotná licence GNU GPL 3.0 či novější, je děláno bez mého souhlasu a vědomí.
-
 ## Licence
 **Copyright (c) 2022 Matyáš Caras a přispěvatelé**
 

android/app/build.gradle

@@ -51,7 +51,7 @@ android {
 
     defaultConfig {
         applicationId "cz.hernikplays.opencanteen"
-        minSdkVersion 21
+        minSdkVersion 18
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="cz.hernikplays.opencanteen">
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
    <application
         android:label="OpenCanteen"
         android:name="${applicationName}"

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.9.10'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-tasks.register("clean", Delete) {
+task clean(type: Delete) {
     delete rootProject.buildDir
 }

commitlint.config.js

@@ -0,0 +1 @@
+module.exports = {extends: ['@commitlint/config-conventional']}

ios/Podfile.lock

@@ -1,79 +1,58 @@
 PODS:
   - Flutter (1.0.0)
-  - flutter_keyboard_visibility (0.0.1):
-    - Flutter
   - flutter_local_notifications (0.0.1):
     - Flutter
   - flutter_native_timezone (0.0.1):
     - Flutter
-  - flutter_secure_storage (6.0.0):
+  - flutter_secure_storage (3.3.1):
     - Flutter
-  - fluttertoast (0.0.2):
-    - Flutter
-    - Toast
   - package_info_plus (0.4.5):
     - Flutter
-  - path_provider_foundation (0.0.1):
+  - path_provider_ios (0.0.1):
     - Flutter
-    - FlutterMacOS
+  - shared_preferences_ios (0.0.1):
-  - shared_preferences_foundation (0.0.1):
     - Flutter
-    - FlutterMacOS
-  - Toast (4.0.0)
   - url_launcher_ios (0.0.1):
     - Flutter
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
-  - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_native_timezone (from `.symlinks/plugins/flutter_native_timezone/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
-  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
-SPEC REPOS:
-  trunk:
-    - Toast
-
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
-  flutter_keyboard_visibility:
-    :path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
   flutter_local_notifications:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
   flutter_native_timezone:
     :path: ".symlinks/plugins/flutter_native_timezone/ios"
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
-  fluttertoast:
-    :path: ".symlinks/plugins/fluttertoast/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
-  path_provider_foundation:
+  path_provider_ios:
-    :path: ".symlinks/plugins/path_provider_foundation/darwin"
+    :path: ".symlinks/plugins/path_provider_ios/ios"
-  shared_preferences_foundation:
+  shared_preferences_ios:
-    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+    :path: ".symlinks/plugins/shared_preferences_ios/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   flutter_native_timezone: 5f05b2de06c9776b4cc70e1839f03de178394d22
-  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
+  flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
-  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
+  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
+  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
-  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
+  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
-  Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.11.3

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -222,12 +222,10 @@
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -238,7 +236,6 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Runner/Info.plist

@@ -50,7 +50,5 @@
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 </dict>
 </plist>

lib/l10n/app_cs.arb

@@ -1,83 +1 @@
-{
+{"about":"O Aplikaci","agree":"Souhlasím","appName":"OpenCanteen","balance":"Kredit: ","cannotOrder":"Toto jídlo není možné objednat.","close":"Zavřít","copyright":"© 2022 Matyáš Caras a přispěvatelé","disagree":"Nesouhlasím","errorContacting":"Nastala chyba při kontaktování serveru, zkontrolujte připojení","errorOrdering":"Jídlo se nepodařilo objednat","exchange":"Burza","exchangeError":"Nepodařilo se vložit jídlo na burzu","friday":"Pátek","home":"Domů","httpLogin":"Snažíte se přihlásit přes nešifrované spojení HTTP, jste si jisti, že tak chcete učinit?","iCanteenUrl":"iCanteen URL","inExchange":"V BURZE","license":"Vydáno pod licencí GNU GPLv3","loading":"Načítání...","logIn":"Přihlášení","loggingIn":"Přihlašuji vás...","loginFailed":"Přihlášení se nezdařilo","menu":"Jídelníček","monday":"Pondělí","mustLogout":"Online přejdete přetažením dolů.","no":"Ne","noChange":"Ne, změnit","noExchange":"Žádné jídlo v burze","noFood":"Žádné jídlo pro tento den","notOfficial":"Toto není oficiální aplikace k ovládání iCanteen. Autor neručí za ztráty nebo nefunkčnost v souvislosti s používáním této aplikace. Pokračováním souhlasíte.","offline":"JSTE OFFLINE","ok":"OK","order":"Objednat","orderSuccess":"Jídlo bylo úspěšně objednáno","ordered":"Objednáno","ordering":"Objednávám...","password":"Heslo","pullToReload":"Potáhněte zvrchu pro načtení","rememberMe":"Zapamatovat si mě","reportBugs":"Zpětná vazba","saturday":"Sobota","saveOffline":"Ukládat jídelníček na dnešní den offline","settings":"Nastavení","signOut":"Odhlásit se","skipWeekend":"Při procházení menu přeskočit víkend","sunday":"Neděle","thursday":"Čtvrtek","tuesday":"Úterý","username":"Uživatelské jméno","verifyExchange":"Opravdu chcete vložit jídlo na burzu?","warning":"Pozor!","wednesday":"Středa","yes":"Ano","aboutFromExch":"Žádné jídlo? Žádný problém!","aboutOrder":"Klepnutím objednáte","aboutToExch":"Nemáte chuť?","appDesc":"OpenCanteen je neoficiální aplikace pro přístup do obědového systému iCanteen","howFromExch":"Z vysunovacího menu přejděte do burzy a objednejte si z dostupných jídel","howOrder":"Jednoduše klepněte na jídlo s modrým políčkem a máte objednáno","howToExch":"Stačí dlouze podržet jméno objednaného jídla a můžete ho přesunout na nebo z burzy","welcome":"Vítejte v OpenCanteen","next":"Další","checkOrdered":"Kontrolovat, jestli mám objednáno na příští týden","noOrder":"Na přístí týden nemáte objednané žádné jídlo!","corrupted":"Nastal problém s dešifrováním uložených údajů, prosím zkuste vyčistit veškerá data této aplikace.","notifyAt":"Odeslat v","notifyLunch":"V určený čas odeslat notifikaci s informacemi o obědě","lunchNotif":"Dnes máte objednáno","error":"Chyba","needRemember":"Musíte své přihlašovací údaje uložit na přihlašovací obrazovce","notifyWarning":"Vaše zařízení může mít povolenou optimalizaci baterie, což může způsobovat neodesílání oznámení. Zkontrolujte nastavení ve vašem zařízení.","signOutWarn":"Opravdu se chcete odhlásit?","jump":"Přeskočit","source":"Zdrojový kód","review":"Ohodnotit aplikaci","saveCount":"Počet dnů dostupných offline (Akt. limit je 7)","errorSaving":"Při ukládání offline nastala chyba, zkuste to znovu později.","todayTooltip":"Přejít na dnešní jídelníček"}
-    "about": "O Aplikaci",
-    "agree": "Souhlasím",
-    "appName": "OpenCanteen",
-    "balance": "Kredit: ",
-    "cannotOrder": "Toto jídlo není možné objednat.",
-    "close": "Zavřít",
-    "copyright": "© 2022 Matyáš Caras a přispěvatelé",
-    "disagree": "Nesouhlasím",
-    "errorContacting": "Nastala chyba při kontaktování serveru, zkontrolujte připojení",
-    "errorOrdering": "Jídlo se nepodařilo objednat",
-    "exchange": "Burza",
-    "exchangeError": "Nepodařilo se vložit jídlo na burzu",
-    "friday": "Pátek",
-    "home": "Domů",
-    "httpLogin": "Snažíte se přihlásit přes nešifrované spojení HTTP, jste si jisti, že tak chcete učinit?",
-    "iCanteenUrl": "iCanteen URL",
-    "inExchange": "V BURZE",
-    "license": "Vydáno pod licencí GNU GPLv3",
-    "loading": "Načítání...",
-    "logIn": "Přihlášení",
-    "loggingIn": "Přihlašuji vás...",
-    "loginFailed": "Přihlášení se nezdařilo",
-    "menu": "Jídelníček",
-    "monday": "Pondělí",
-    "mustLogout": "Online přejdete přetažením dolů.",
-    "no": "Ne",
-    "noChange": "Ne, změnit",
-    "noExchange": "Žádné jídlo v burze",
-    "noFood": "Žádné jídlo pro tento den",
-    "notOfficial": "Toto není oficiální aplikace k ovládání iCanteen. Autor neručí za ztráty nebo nefunkčnost v souvislosti s používáním této aplikace. Pokračováním souhlasíte.",
-    "offline": "JSTE OFFLINE",
-    "ok": "OK",
-    "order": "Objednat",
-    "orderSuccess": "Jídlo bylo úspěšně objednáno",
-    "ordered": "Objednáno",
-    "ordering": "Objednávám...",
-    "password": "Heslo",
-    "pullToReload": "Potáhněte zvrchu pro načtení",
-    "rememberMe": "Zapamatovat si mě",
-    "reportBugs": "Zpětná vazba",
-    "saturday": "Sobota",
-    "saveOffline": "Ukládat jídelníček offline",
-    "settings": "Nastavení",
-    "signOut": "Odhlásit se",
-    "skipWeekend": "Při procházení menu přeskočit víkend",
-    "sunday": "Neděle",
-    "thursday": "Čtvrtek",
-    "tuesday": "Úterý",
-    "username": "Uživatelské jméno",
-    "verifyExchange": "Opravdu chcete vložit jídlo na burzu?",
-    "warning": "Pozor!",
-    "wednesday": "Středa",
-    "yes": "Ano",
-    "aboutFromExch": "Žádné jídlo? Žádný problém!",
-    "aboutOrder": "Klepnutím objednáte",
-    "aboutToExch": "Nemáte chuť?",
-    "appDesc": "OpenCanteen je neoficiální aplikace pro přístup do obědového systému iCanteen",
-    "howFromExch": "Z vysunovacího menu přejděte do burzy a objednejte si z dostupných jídel",
-    "howOrder": "Jednoduše klepněte na jídlo s modrým políčkem a máte objednáno",
-    "howToExch": "Stačí dlouze podržet jméno objednaného jídla a můžete ho přesunout na nebo z burzy",
-    "welcome": "Vítejte v OpenCanteen",
-    "next": "Další",
-    "checkOrdered": "Kontrolovat, jestli mám objednáno na příští týden",
-    "noOrder": "Na přístí týden nemáte objednané žádné jídlo!",
-    "corrupted": "Nastal problém s dešifrováním uložených údajů, prosím zkuste vyčistit veškerá data této aplikace.",
-    "notifyAt": "Odeslat v",
-    "notifyLunch": "V určený čas odeslat notifikaci s informacemi o obědě",
-    "lunchNotif": "Dnes máte objednáno",
-    "error": "Chyba",
-    "needRemember": "Musíte své přihlašovací údaje uložit na přihlašovací obrazovce",
-    "notifyWarning": "Vaše zařízení může mít povolenou optimalizaci baterie, což může způsobovat neodesílání oznámení. Zkontrolujte nastavení ve vašem zařízení.",
-    "signOutWarn": "Opravdu se chcete odhlásit?",
-    "jump": "Přeskočit",
-    "source": "Zdrojový kód",
-    "review": "Ohodnotit aplikaci",
-    "saveCount": "Počet dnů dostupných offline (Akt. limit je 7)",
-    "errorSaving": "Při ukládání offline nastala chyba, zkuste to znovu později.",
-    "todayTooltip": "Přejít na dnešní jídelníček",
-    "settingsExperience":"Zážitek",
-    "settingsFunctions":"Extra funkce",
-    "showAllergens":"Zobrazovat alergeny, jsou-li dostupné"
-}

lib/l10n/app_en.arb

@@ -1,83 +1 @@
-{
+{"about":"About","agree":"I agree","appName":"OpenCanteen","balance":"Balance: ","cannotOrder":"This food cannot be ordered.","close":"Close","copyright":"© 2022 Matyáš Caras and contributors","disagree":"I disagree","errorContacting":"Failed to contact the server, check your connection.","errorOrdering":"Could not order food.","exchange":"Exchange","exchangeError":"Could not put food on exchange.","friday":"Friday","home":"Home","httpLogin":"You are trying to sign in using an insecure HTTP connection, are you sure you want to continue?","iCanteenUrl":"iCanteen URL","inExchange":"ON EXCHANGE","license":"Released under the GNU GPLv3","loading":"Loading...","logIn":"Sign in","loggingIn":"Signing you in...","loginFailed":"Sign in failed","menu":"Food Menu","monday":"Monday","mustLogout":"To go online, pull down.","no":"No","noChange":"No, change","noExchange":"No meal in exchange","noFood":"No meal for this day","notOfficial":"This is not an official app for accessing iCanteen. The author is not responsible for non-functionality or losses while using this app. By continuing you agree.","offline":"YOU ARE OFFLINE","ok":"OK","order":"Order","orderSuccess":"Meal ordered succesfully","ordered":"Ordered","ordering":"Ordering...","password":"Password","pullToReload":"Pull to reload","rememberMe":"Remember me","reportBugs":"Feedback","saturday":"Saturday","saveOffline":"Save today's menu offline","settings":"Settings","signOut":"Sign out","skipWeekend":"Skip weekends when browsing menu","sunday":"Sunday","thursday":"Thursday","tuesday":"Tuesday","username":"Username","verifyExchange":"Are you sure you want to put this meal on exchange?","warning":"Warning!","wednesday":"Wednesday","yes":"Yes","appDesc":"OpenCanteen is a mobile app for accessing iCanteen.","welcome":"Welcome to OpenCanteen","aboutOrder":"Order with a tap","howOrder":"Simply tap on a meal with a blue checkbox next to it and it's done!","aboutToExch":"Don't want your food?","howToExch":"If you cannot cancel your order, simply long-tap on the ordered food and put it into the exchange.","aboutFromExch":"No food? No problem!","howFromExch":"Simply check the exchange from the sidebar and order when a meal is available.","next":"Next","checkOrdered":"Check if I have ordered food for the next week","noOrder":"You did not order any food for the next week!","corrupted":"The saved credentials seem to be corrupted, please try clearing the application's data.","notifyAt":"Send notification at","notifyLunch":"Send a notification with meal info","lunchNotif":"Today's ordered meal","error":"Error","needRemember":"You need to save your login details on the login screen first","notifyWarning":"Your device may have battery optimization enabled. This may cause notifications to not be sent. Check the application info in your device's settings.","signOutWarn":"Do you really want to sign out?","jump":"Jump","source":"Source code","review":"Review the app","saveCount":"Number of days to save offline (Current limit is 7)","errorSaving":"An error occured while trying to save menu offline, try again later.","todayTooltip":"Go to today's meal"}
-    "about": "About",
-    "agree": "I agree",
-    "appName": "OpenCanteen",
-    "balance": "Balance: ",
-    "cannotOrder": "This food cannot be ordered.",
-    "close": "Close",
-    "copyright": "© 2022 Matyáš Caras and contributors",
-    "disagree": "I disagree",
-    "errorContacting": "Failed to contact the server, check your connection.",
-    "errorOrdering": "Could not order food.",
-    "exchange": "Exchange",
-    "exchangeError": "Could not put food on exchange.",
-    "friday": "Friday",
-    "home": "Home",
-    "httpLogin": "You are trying to sign in using an insecure HTTP connection, are you sure you want to continue?",
-    "iCanteenUrl": "iCanteen URL",
-    "inExchange": "ON EXCHANGE",
-    "license": "Released under the GNU GPLv3",
-    "loading": "Loading...",
-    "logIn": "Sign in",
-    "loggingIn": "Signing you in...",
-    "loginFailed": "Sign in failed",
-    "menu": "Food Menu",
-    "monday": "Monday",
-    "mustLogout": "To go online, pull down.",
-    "no": "No",
-    "noChange": "No, change",
-    "noExchange": "No meal in exchange",
-    "noFood": "No meal for this day",
-    "notOfficial": "This is not an official app for accessing iCanteen. The author is not responsible for non-functionality or losses while using this app. By continuing you agree.",
-    "offline": "YOU ARE OFFLINE",
-    "ok": "OK",
-    "order": "Order",
-    "orderSuccess": "Meal ordered succesfully",
-    "ordered": "Ordered",
-    "ordering": "Ordering...",
-    "password": "Password",
-    "pullToReload": "Pull to reload",
-    "rememberMe": "Remember me",
-    "reportBugs": "Feedback",
-    "saturday": "Saturday",
-    "saveOffline": "Save menu offline",
-    "settings": "Settings",
-    "signOut": "Sign out",
-    "skipWeekend": "Skip weekends when browsing menu",
-    "sunday": "Sunday",
-    "thursday": "Thursday",
-    "tuesday": "Tuesday",
-    "username": "Username",
-    "verifyExchange": "Are you sure you want to put this meal on exchange?",
-    "warning": "Warning!",
-    "wednesday": "Wednesday",
-    "yes": "Yes",
-    "appDesc": "OpenCanteen is a mobile app for accessing iCanteen.",
-    "welcome": "Welcome to OpenCanteen",
-    "aboutOrder": "Order with a tap",
-    "howOrder": "Simply tap on a meal with a blue checkbox next to it and it's done!",
-    "aboutToExch": "Don't want your food?",
-    "howToExch": "If you cannot cancel your order, simply long-tap on the ordered food and put it into the exchange.",
-    "aboutFromExch": "No food? No problem!",
-    "howFromExch": "Simply check the exchange from the sidebar and order when a meal is available.",
-    "next": "Next",
-    "checkOrdered": "Check if I have ordered food for the next week",
-    "noOrder": "You did not order any food for the next week!",
-    "corrupted": "The saved credentials seem to be corrupted, please try clearing the application's data.",
-    "notifyAt": "Send notification at",
-    "notifyLunch": "Send a notification with meal info",
-    "lunchNotif": "Today's ordered meal",
-    "error": "Error",
-    "needRemember": "You need to save your login details on the login screen first",
-    "notifyWarning": "Your device may have battery optimization enabled. This may cause notifications to not be sent. Check the application info in your device's settings.",
-    "signOutWarn": "Do you really want to sign out?",
-    "jump": "Jump",
-    "source": "Source code",
-    "review": "Review the app",
-    "saveCount": "Number of days to save offline (Current limit is 7)",
-    "errorSaving": "An error occured while trying to save menu offline, try again later.",
-    "todayTooltip": "Go to today's meal",
-    "settingsExperience":"App Experience",
-    "settingsFunctions":"Extra Functions",
-    "showAllergens":"Show allergens, if available"
-}

lib/main.dart

@@ -35,7 +35,6 @@ Copyright (C) 2022  Matyáš Caras a přispěvatelé
 
 final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
     FlutterLocalNotificationsPlugin();
-final settings = SettingsManager();
 
 /// Used to setup notifications about ordered food
 void setupNotification(SharedPreferences prefs, tz.Location l) async {
@@ -84,7 +83,7 @@ void setupNotification(SharedPreferences prefs, tz.Location l) async {
             "${jidlo.varianta} - ${jidlo.nazev}",
             tz.TZDateTime.from(cas, l),
             const NotificationDetails(android: androidSpec),
-            androidScheduleMode: AndroidScheduleMode.exactAllowWhileIdle,
+            androidAllowWhileIdle: true,
             uiLocalNotificationDateInterpretation:
                 UILocalNotificationDateInterpretation.absoluteTime);
       } on StateError catch (_) {
@@ -105,10 +104,6 @@ void main() async {
   if (prefs.getBool("oznamit") ?? false) {
     setupNotification(prefs, l);
   }
-  settings.checkOrdered = prefs.getBool("tyden") ?? false;
-  settings.saveOffline = prefs.getBool("oznamit") ?? false;
-  settings.skipWeekend = prefs.getBool("skip") ?? false;
-  settings.allergens = prefs.getBool("allergens") ?? false;
 
   // notif library setup
   const AndroidInitializationSettings initializationSettingsAndroid =
@@ -124,7 +119,7 @@ void main() async {
 }
 
 class MyApp extends StatelessWidget {
-  const MyApp({super.key});
+  const MyApp({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -145,26 +140,18 @@ class MyApp extends StatelessWidget {
                 colorScheme: darkColorScheme),
             home: const LoginPage(),
           )
-        : Theme(
+        : const CupertinoApp(
-            data: ThemeData(
+            debugShowCheckedModeBanner: false,
-                useMaterial3: true,
+            localizationsDelegates: [
-                colorScheme: (MediaQuery.of(context).platformBrightness ==
+              AppLocalizations.delegate,
-                        Brightness.dark)
+              ...GlobalMaterialLocalizations.delegates
-                    ? darkColorScheme
+            ],
-                    : lightColorScheme),
+            supportedLocales: AppLocalizations.supportedLocales,
-            child: const CupertinoApp(
+            title: "OpenCanteen",
-              debugShowCheckedModeBanner: false,
+            theme: CupertinoThemeData(
-              localizationsDelegates: [
+              primaryColor: Colors.purple,
-                AppLocalizations.delegate,
-                ...GlobalMaterialLocalizations.delegates
-              ],
-              supportedLocales: AppLocalizations.supportedLocales,
-              title: "OpenCanteen",
-              theme: CupertinoThemeData(
-                primaryColor: Colors.purple,
-              ),
-              home: LoginPage(),
             ),
+            home: LoginPage(),
           );
   }
 }

lib/okna/burza.dart

@@ -8,7 +8,7 @@ import 'package:opencanteen/util.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class BurzaView extends StatefulWidget {
-  const BurzaView({super.key, required this.canteen});
+  const BurzaView({Key? key, required this.canteen}) : super(key: key);
   final Canteen canteen;
   @override
   State<BurzaView> createState() => _BurzaViewState();

lib/okna/jidelnicek.dart

@@ -4,7 +4,6 @@ import 'dart:io';
 import 'package:canteenlib/canteenlib.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:opencanteen/main.dart';
 import 'package:opencanteen/okna/login.dart';
 import 'package:opencanteen/okna/nastaveni.dart';
 import 'package:opencanteen/pw/platformbutton.dart';
@@ -18,7 +17,7 @@ import 'package:url_launcher/url_launcher.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class MealView extends StatefulWidget {
-  const MealView({super.key, required this.canteen});
+  const MealView({Key? key, required this.canteen}) : super(key: key);
   final Canteen canteen;
   @override
   State<MealView> createState() => _MealViewState();
@@ -29,9 +28,11 @@ class _MealViewState extends State<MealView> {
   DateTime day = DateTime.now();
   String dayOWeek = "";
   double balance = 0.0;
+  bool _skipWeekend = false;
 
   void checkWeek(BuildContext context) async {
-    if (settings.checkOrdered) {
+    var prefs = await SharedPreferences.getInstance();
+    if (prefs.getBool("tyden") ?? false) {
       // Check if user has ordered a meal in the next week
       var pristi = day.add(const Duration(days: 6));
       for (var i = 0; i < 5; i++) {
@@ -86,16 +87,15 @@ class _MealViewState extends State<MealView> {
       default:
         dayOWeek = AppLocalizations.of(context)!.monday;
     }
-    Uzivatel uzivatel;
+    var uzivatel = await widget.canteen.ziskejUzivatele().catchError(
-    try {
+      (o) {
-      uzivatel = await widget.canteen.ziskejUzivatele();
+        if (!widget.canteen.prihlasen) {
-    } catch (e) {
+          Navigator.pushReplacement(
-      if (!widget.canteen.prihlasen && mounted) {
+              context, platformRouter((c) => const LoginPage()));
-        Navigator.pushReplacement(
+        }
-            context, platformRouter((c) => const LoginPage()));
+        return Uzivatel(kredit: 0);
-      }
+      },
-      return;
+    );
-    }
     balance = uzivatel.kredit;
     var jd = await widget.canteen.jidelnicekDen(den: day).catchError((_) {
       showInfo(context, AppLocalizations.of(context)!.errorContacting);
@@ -122,9 +122,7 @@ class _MealViewState extends State<MealView> {
                       const SizedBox(width: 10),
                       Flexible(
                         child: Text(
-                          (settings.allergens && j.alergeny.isNotEmpty)
+                          j.nazev,
-                              ? "${j.nazev} (${j.alergeny.map<String>((e) => (e.kod != null) ? e.kod.toString() : e.nazev).join(', ')})"
-                              : j.nazev,
                         ),
                       ),
                       Text((j.naBurze)
@@ -132,16 +130,9 @@ class _MealViewState extends State<MealView> {
                           : "${j.cena} Kč"),
                       Checkbox(
                         value: j.objednano,
-                        side: BorderSide(
+                        fillColor: (j.lzeObjednat)
-                            width: 2,
-                            color: (j.lzeObjednat)
-                                ? (Colors.purple)
-                                : (Colors.grey)),
-                        fillColor: (j.lzeObjednat && j.objednano)
                             ? MaterialStateProperty.all(Colors.purple)
-                            : (j.objednano)
+                            : MaterialStateProperty.all(Colors.grey),
-                                ? MaterialStateProperty.all(Colors.grey)
-                                : MaterialStateProperty.all(Colors.transparent),
                         onChanged: (v) async {
                           if (!j.lzeObjednat) {
                             showDialog(
@@ -395,54 +386,58 @@ class _MealViewState extends State<MealView> {
   }
 
   void loadSettings() async {
+    var prefs = await SharedPreferences.getInstance();
+    _skipWeekend = prefs.getBool("skip") ?? false;
     if (!mounted) return;
     checkWeek(context);
   }
 
   void saveOffline() async {
-    if (!settings.saveOffline) return;
-    // clear offline storage
-    Directory appDocDir = await getApplicationDocumentsDirectory();
-    for (var f in appDocDir.listSync()) {
-      if (f.path.contains("jidelnicek")) {
-        f.deleteSync();
-      }
-    }
     var prefs = await SharedPreferences.getInstance();
-    // save X meal lists
+    if (prefs.getBool("offline") ?? false) {
-    var pocet = prefs.getInt("offline_pocet") ?? 1;
+      // clear offline storage
-    if (pocet > 7) pocet = 7;
+      Directory appDocDir = await getApplicationDocumentsDirectory();
-    for (var i = 0; i < pocet; i++) {
+      for (var f in appDocDir.listSync()) {
-      var d = day.add(Duration(days: i));
+        if (f.path.contains("jidelnicek")) {
-      Jidelnicek? j;
+          f.deleteSync();
-      try {
-        j = await widget.canteen.jidelnicekDen(den: d);
-      } catch (e) {
-        if (!widget.canteen.prihlasen) {
-          if (!mounted) return;
-          ScaffoldMessenger.of(context).hideCurrentSnackBar();
-          ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-            content: Text(AppLocalizations.of(context)!.errorSaving),
-            duration: const Duration(seconds: 5),
-          ));
-          break;
         }
       }
-      var soubor = File(
+
-          "${appDocDir.path}/jidelnicek_${d.year}-${d.month}-${d.day}.json");
+      // save X meal lists
-      soubor.createSync();
+      var pocet = prefs.getInt("offline_pocet") ?? 1;
-      var jidla = [];
+      if (pocet > 7) pocet = 7;
-      for (var jidlo in j!.jidla) {
+      for (var i = 0; i < pocet; i++) {
-        jidla.add({
+        var d = day.add(Duration(days: i));
-          "nazev": jidlo.nazev,
+        Jidelnicek? j;
-          "varianta": jidlo.varianta,
+        try {
-          "objednano": jidlo.objednano,
+          j = await widget.canteen.jidelnicekDen(den: d);
-          "cena": jidlo.cena,
+        } catch (e) {
-          "naBurze": jidlo.naBurze,
+          if (!widget.canteen.prihlasen) {
-          "den": d.toString()
+            if (!mounted) return;
-        });
+            ScaffoldMessenger.of(context).hideCurrentSnackBar();
+            ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+              content: Text(AppLocalizations.of(context)!.errorSaving),
+              duration: const Duration(seconds: 5),
+            ));
+            break;
+          }
+        }
+        var soubor = File(
+            "${appDocDir.path}/jidelnicek_${d.year}-${d.month}-${d.day}.json");
+        soubor.createSync();
+        var jidla = [];
+        for (var jidlo in j!.jidla) {
+          jidla.add({
+            "nazev": jidlo.nazev,
+            "varianta": jidlo.varianta,
+            "objednano": jidlo.objednano,
+            "cena": jidlo.cena,
+            "naBurze": jidlo.naBurze,
+            "den": d.toString()
+          });
+        }
+        await soubor.writeAsString(json.encode(jidla));
       }
-      await soubor.writeAsString(json.encode(jidla));
     }
   }
 
@@ -484,7 +479,7 @@ class _MealViewState extends State<MealView> {
         onRefresh: loadMeals,
         child: Center(
           child: SizedBox(
-            width: MediaQuery.of(context).size.width,
+            width: MediaQuery.of(context).size.width - 50,
             child: Column(
               children: [
                 const SizedBox(height: 10),
@@ -496,7 +491,7 @@ class _MealViewState extends State<MealView> {
                         onPressed: () {
                           setState(() {
                             day = day.subtract(const Duration(days: 1));
-                            if (day.weekday == 7 && settings.skipWeekend) {
+                            if (day.weekday == 7 && _skipWeekend) {
                               day = day.subtract(const Duration(days: 2));
                             }
                             loadMeals();
@@ -524,7 +519,7 @@ class _MealViewState extends State<MealView> {
                       onPressed: () {
                         setState(() {
                           day = day.add(const Duration(days: 1));
-                          if (day.weekday == 6 && settings.skipWeekend) {
+                          if (day.weekday == 6 && _skipWeekend) {
                             day = day.add(const Duration(days: 2));
                           }
                           loadMeals();
@@ -550,7 +545,6 @@ class _MealViewState extends State<MealView> {
                   physics: const AlwaysScrollableScrollPhysics(),
                   child: GestureDetector(
                     child: Container(
-                      padding: const EdgeInsets.only(left: 20, right: 20),
                       color: Theme.of(context)
                           .colorScheme
                           .onPrimary
@@ -562,7 +556,7 @@ class _MealViewState extends State<MealView> {
                       if (details.primaryVelocity?.compareTo(0) == -1) {
                         setState(() {
                           day = day.add(const Duration(days: 1));
-                          if (day.weekday == 6 && settings.skipWeekend) {
+                          if (day.weekday == 6 && _skipWeekend) {
                             day = day.add(const Duration(days: 2));
                           }
                           loadMeals();
@@ -571,7 +565,7 @@ class _MealViewState extends State<MealView> {
                         setState(
                           () {
                             day = day.subtract(const Duration(days: 1));
-                            if (day.weekday == 7 && settings.skipWeekend) {
+                            if (day.weekday == 7 && _skipWeekend) {
                               day = day.subtract(const Duration(days: 2));
                             }
                             loadMeals();

lib/okna/login.dart

@@ -1,6 +1,7 @@
 import 'package:canteenlib/canteenlib.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:opencanteen/okna/welcome.dart';
 import 'package:opencanteen/pw/platformbutton.dart';
@@ -8,13 +9,14 @@ import 'package:opencanteen/pw/platformfield.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import '../../loginmanager.dart';
+import '../../main.dart';
 import '../../util.dart';
 import '../pw/platformswitch.dart';
 import 'jidelnicek.dart';
 import 'offline_jidelnicek.dart';
 
 class LoginPage extends StatefulWidget {
-  const LoginPage({super.key});
+  const LoginPage({Key? key}) : super(key: key);
   @override
   State<LoginPage> createState() => _LoginPageState();
 }
@@ -31,6 +33,12 @@ class _LoginPageState extends State<LoginPage> {
   void initState() {
     super.initState();
     LoginManager.getDetails().then((r) async {
+      // request android notification access
+      flutterLocalNotificationsPlugin
+          .resolvePlatformSpecificImplementation<
+              AndroidFlutterLocalNotificationsPlugin>()
+          ?.requestPermission();
+
       if (r != null) {
         // Autologin
         showDialog(

lib/okna/nastaveni.dart

@@ -8,8 +8,8 @@ import 'package:flutter_native_timezone/flutter_native_timezone.dart';
 import 'package:opencanteen/pw/platformbutton.dart';
 import 'package:opencanteen/pw/platformdialog.dart';
 import 'package:opencanteen/pw/platformfield.dart';
+import 'package:opencanteen/pw/platformswitch.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:settings_ui/settings_ui.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:timezone/timezone.dart' as tz;
 
@@ -19,7 +19,7 @@ import '../../main.dart';
 import '../../util.dart';
 
 class AndroidNastaveni extends StatefulWidget {
-  const AndroidNastaveni({super.key});
+  const AndroidNastaveni({Key? key}) : super(key: key);
 
   @override
   State<AndroidNastaveni> createState() => _AndroidNastaveniState();
@@ -31,7 +31,6 @@ class _AndroidNastaveniState extends State<AndroidNastaveni> {
   bool _checkWeek = false;
   bool _notifyMeal = false;
   bool _remember = false;
-  bool _allergens = false;
   TimeOfDay _notifTime = TimeOfDay.now();
   final TextEditingController _countController =
       TextEditingController(text: "1");
@@ -77,187 +76,167 @@ class _AndroidNastaveniState extends State<AndroidNastaveni> {
       appBar: AppBar(
         title: Text(AppLocalizations.of(context)!.settings),
       ),
-      body: SettingsList(
+      body: Center(
-        platform: DevicePlatform.device,
+        child: SizedBox(
-        sections: [
+          width: MediaQuery.of(context).size.width / 1.1,
-          SettingsSection(
+          child: Column(
-            tiles: [
+            children: [
-              SettingsTile.switchTile(
+              Row(
-                initialValue: _allergens,
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                onToggle: (value) {
+                children: [
-                  _allergens = value;
+                  Text(AppLocalizations.of(context)!.saveOffline),
-                  settings.allergens = value;
+                  PlatformSwitch(
-                  changeSetting("allergens", _allergens);
+                    value: _saveOffline,
-                  setState(() {});
+                    onChanged: (value) {
-                },
+                      setState(() {
-                title: Text(AppLocalizations.of(context)!.showAllergens),
+                        _saveOffline = value;
+                        clear(value);
+                        changeSetting("offline", value);
+                      });
+                    },
+                  )
+                ],
               ),
-              SettingsTile.switchTile(
+              Row(
-                initialValue: _saveOffline,
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                onToggle: (value) {
+                children: [
-                  _saveOffline = value;
+                  Text(AppLocalizations.of(context)!.saveCount),
-                  settings.saveOffline = value;
+                  SizedBox(
-                  changeSetting("offline", value);
+                    width: 35,
-                  setState(() {});
+                    child: PlatformField(
-                },
+                      controller: _countController,
-                title: Text(AppLocalizations.of(context)!.saveOffline),
+                      enabled: _saveOffline,
+                      keyboardType: TextInputType.number,
+                      inputFormatters: [FilteringTextInputFormatter.digitsOnly],
+                      onChanged: (c) {
+                        var cislo = int.tryParse(c);
+                        if (cislo != null) {
+                          preferences!.setInt("offline_pocet", cislo);
+                        }
+                      },
+                    ),
+                  )
+                ],
               ),
-              CustomSettingsTile(
+              Row(
-                child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  mainAxisAlignment: MainAxisAlignment.center,
+                children: [
-                  children: [
+                  Text(AppLocalizations.of(context)!.skipWeekend),
-                    SizedBox(
+                  PlatformSwitch(
-                      width: MediaQuery.of(context).size.width * 0.76,
+                    value: _skipWeekend,
-                      child: Text(
+                    onChanged: (value) {
-                        AppLocalizations.of(context)!.saveCount,
+                      setState(
-                        softWrap: true,
+                        () {
-                        style: TextStyle(
+                          _skipWeekend = value;
-                          fontSize: (Platform.isAndroid) ? 18 : 17,
+                          changeSetting("skip", value);
-                          fontWeight:
-                              (Platform.isAndroid) ? FontWeight.w400 : null,
-                        ),
-                      ),
-                    ),
-                    const SizedBox(
-                      width: 10,
-                    ),
-                    SizedBox(
-                      width: 35,
-                      child: PlatformField(
-                        controller: _countController,
-                        enabled: _saveOffline,
-                        keyboardType: TextInputType.number,
-                        inputFormatters: [
-                          FilteringTextInputFormatter.digitsOnly
-                        ],
-                        onChanged: (c) {
-                          var cislo = int.tryParse(c);
-                          if (cislo != null) {
-                            preferences!.setInt("offline_pocet", cislo);
-                          }
                         },
-                      ),
-                    )
-                  ],
-                ),
-              ),
-              SettingsTile.switchTile(
-                initialValue: _skipWeekend,
-                onToggle: (value) {
-                  _skipWeekend = value;
-                  settings.skipWeekend = value;
-                  changeSetting("skip", value);
-                  setState(() {});
-                },
-                title: Text(AppLocalizations.of(context)!.skipWeekend),
-              ),
-              SettingsTile.switchTile(
-                initialValue: _checkWeek,
-                onToggle: (value) {
-                  _checkWeek = value;
-                  settings.checkOrdered = value;
-                  changeSetting("tyden", value);
-                  setState(() {});
-                },
-                title: Text(AppLocalizations.of(context)!.checkOrdered),
-              ),
-            ],
-            title: Text(AppLocalizations.of(context)!.settingsExperience),
-          ),
-          SettingsSection(
-            tiles: [
-              SettingsTile.switchTile(
-                initialValue: _notifyMeal,
-                enabled: _remember,
-                onToggle: (value) {
-                  if (!_remember) {
-                    showDialog(
-                      context: context,
-                      builder: (bc) => PlatformDialog(
-                        title: AppLocalizations.of(context)!.error,
-                        content: AppLocalizations.of(context)!.needRemember,
-                        actions: [
-                          PlatformButton(
-                            text: AppLocalizations.of(context)!.ok,
-                            onPressed: () {
-                              Navigator.of(bc).pop();
-                            },
-                          )
-                        ],
-                      ),
-                    );
-                  } else {
-                    _notifyMeal = value;
-                    if (_notifyMeal) {
-                      showDialog(
-                        context: context,
-                        builder: (context) => PlatformDialog(
-                          title: AppLocalizations.of(context)!.warning,
-                          content: AppLocalizations.of(context)!.notifyWarning,
-                          actions: [
-                            PlatformButton(
-                              text: AppLocalizations.of(context)!.ok,
-                              onPressed: () {
-                                Navigator.of(context).pop();
-                              },
-                            )
-                          ],
-                        ),
                       );
-                      createNotif(timeToDate(_notifTime));
+                    },
+                  )
+                ],
+              ),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Flexible(
+                      child: Text(AppLocalizations.of(context)!.checkOrdered)),
+                  PlatformSwitch(
+                    value: _checkWeek,
+                    onChanged: (value) {
+                      setState(
+                        () {
+                          _checkWeek = value;
+                          changeSetting("tyden", value);
+                        },
+                      );
+                    },
+                  )
+                ],
+              ),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Flexible(
+                      child: Text(AppLocalizations.of(context)!.notifyLunch)),
+                  PlatformSwitch(
+                    value: _notifyMeal,
+                    thumbColor: (!_remember ? Colors.grey : null),
+                    onChanged: (value) {
+                      if (!_remember) {
+                        showDialog(
+                          context: context,
+                          builder: (bc) => PlatformDialog(
+                            title: AppLocalizations.of(context)!.error,
+                            content: AppLocalizations.of(context)!.needRemember,
+                            actions: [
+                              PlatformButton(
+                                text: AppLocalizations.of(context)!.ok,
+                                onPressed: () {
+                                  Navigator.of(context).pop();
+                                },
+                              )
+                            ],
+                          ),
+                        );
+                      } else {
+                        setState(() {
+                          _notifyMeal = value;
+                          if (_notifyMeal) {
+                            showDialog(
+                              context: context,
+                              builder: (context) => PlatformDialog(
+                                title: AppLocalizations.of(context)!.warning,
+                                content:
+                                    AppLocalizations.of(context)!.notifyWarning,
+                                actions: [
+                                  PlatformButton(
+                                    text: AppLocalizations.of(context)!.ok,
+                                    onPressed: () {
+                                      Navigator.of(context).pop();
+                                    },
+                                  )
+                                ],
+                              ),
+                            );
+                            createNotif(timeToDate(_notifTime));
+                          }
+                          changeSetting("oznamit", value);
+                        });
+                      }
+                    },
+                  )
+                ],
+              ),
+              Text(AppLocalizations.of(context)!.notifyAt),
+              PlatformButton(
+                onPressed: () async {
+                  if (_notifyMeal) {
+                    var cas = await showTimePicker(
+                        context: context, initialTime: _notifTime);
+                    if (cas != null) {
+                      var prefs = await SharedPreferences.getInstance();
+                      prefs.setString(
+                          "oznameni_cas",
+                          timeToDate(cas)
+                              .toString()); // aktualizovat vybraný čas
+                      var den = timeToDate(cas);
+                      debugPrint(den.isAfter(DateTime.now()).toString());
+                      if (den.isAfter(DateTime.now())) {
+                        // znovu vytvořit oznámení POUZE když je čas v budoucnosti
+                        createNotif(den);
+                      }
                     }
-                    changeSetting("oznamit", value);
+                    setState(() {
-                    setState(() {});
+                      _notifTime = cas ?? _notifTime;
+                    });
                   }
                 },
-                title: Text(
+                text:
-                  AppLocalizations.of(context)!.notifyLunch,
+                    "${(_notifTime.hour < 10 ? "0" : "") + _notifTime.hour.toString()}:${(_notifTime.minute < 10 ? "0" : "") + _notifTime.minute.toString()}",
-                ),
               ),
-              CustomSettingsTile(
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Text(
-                      AppLocalizations.of(context)!.notifyAt,
-                      style: TextStyle(
-                        fontSize: (Platform.isAndroid) ? 18 : 17,
-                        fontWeight:
-                            (Platform.isAndroid) ? FontWeight.w400 : null,
-                      ),
-                    ),
-                    PlatformButton(
-                      textStyle:
-                          TextStyle(fontSize: (Platform.isAndroid ? 18 : 17)),
-                      text: _notifTime.format(context),
-                      onPressed: () async {
-                        if (!_notifyMeal) return;
-                        var cas = await showTimePicker(
-                            context: context, initialTime: _notifTime);
-                        if (cas == null) return;
-                        var prefs = await SharedPreferences.getInstance();
-                        prefs.setString(
-                            "oznameni_cas",
-                            timeToDate(cas)
-                                .toString()); // aktualizovat vybraný čas
-                        var den = timeToDate(cas);
-                        debugPrint(den.isAfter(DateTime.now()).toString());
-                        if (den.isAfter(DateTime.now())) {
-                          // znovu vytvořit oznámení POUZE když je čas v budoucnosti
-                          createNotif(den);
-                        }
-
-                        _notifTime = cas;
-                        setState(() {});
-                      },
-                    )
-                  ],
-                ),
-              )
             ],
-            title: Text(AppLocalizations.of(context)!.settingsFunctions),
+          ),
-          )
+        ),
-        ],
       ),
     );
   }
@@ -292,19 +271,6 @@ class _AndroidNastaveniState extends State<AndroidNastaveni> {
                   ticker: 'today meal');
           var l =
               tz.getLocation(await FlutterNativeTimezone.getLocalTimezone());
-          var notifGranted = await flutterLocalNotificationsPlugin
-                  .resolvePlatformSpecificImplementation<
-                      AndroidFlutterLocalNotificationsPlugin>()
-                  ?.requestNotificationsPermission() ??
-              true; // request android notification access
-
-          var granted = await flutterLocalNotificationsPlugin
-                  .resolvePlatformSpecificImplementation<
-                      AndroidFlutterLocalNotificationsPlugin>()
-                  ?.requestExactAlarmsPermission() ??
-              true; // request android exact alarm permission
-
-          if (!granted || !notifGranted) return;
           if (!mounted) return;
           await flutterLocalNotificationsPlugin.zonedSchedule(
               // schedules a notification
@@ -313,7 +279,7 @@ class _AndroidNastaveniState extends State<AndroidNastaveni> {
               "${jidlo.varianta} - ${jidlo.nazev}",
               tz.TZDateTime.from(den, l),
               const NotificationDetails(android: androidSpec),
-              androidScheduleMode: AndroidScheduleMode.exactAllowWhileIdle,
+              androidAllowWhileIdle: true,
               uiLocalNotificationDateInterpretation:
                   UILocalNotificationDateInterpretation.absoluteTime);
         } on StateError catch (_) {

lib/okna/offline_jidelnicek.dart

@@ -14,7 +14,7 @@ import 'package:url_launcher/url_launcher.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class OfflineMealView extends StatefulWidget {
-  const OfflineMealView({super.key});
+  const OfflineMealView({Key? key}) : super(key: key);
   @override
   State<OfflineMealView> createState() => _OfflineMealViewState();
 }

lib/okna/welcome.dart

@@ -7,7 +7,7 @@ import 'package:opencanteen/okna/jidelnicek.dart';
 import 'package:opencanteen/util.dart';
 
 class WelcomePage extends StatefulWidget {
-  const WelcomePage({super.key, required this.canteen});
+  const WelcomePage({Key? key, required this.canteen}) : super(key: key);
 
   final Canteen canteen;
 

lib/pw/platformbutton.dart

@@ -5,23 +5,14 @@ import 'package:opencanteen/pw/platformwidget.dart';
 class PlatformButton extends PlatformWidget<TextButton, CupertinoButton> {
   final String text;
   final void Function()? onPressed;
-
-  final TextStyle? textStyle;
   const PlatformButton(
-      {super.key, required this.text, required this.onPressed, this.textStyle});
+      {super.key, required this.text, required this.onPressed});
 
   @override
-  TextButton createAndroidWidget(BuildContext context) => TextButton(
+  TextButton createAndroidWidget(BuildContext context) =>
-        onPressed: onPressed,
+      TextButton(onPressed: onPressed, child: Text(text));
-        child: Text(
-          text,
-          style: textStyle,
-        ),
-      );
 
   @override
-  CupertinoButton createIosWidget(BuildContext context) => CupertinoButton(
+  CupertinoButton createIosWidget(BuildContext context) =>
-        onPressed: onPressed,
+      CupertinoButton(onPressed: onPressed, child: Text(text));
-        child: Text(text, style: textStyle),
-      );
 }

lib/pw/platformfield.dart

@@ -5,7 +5,7 @@ import 'package:opencanteen/pw/platformwidget.dart';
 
 class PlatformField extends PlatformWidget<TextField, CupertinoTextField> {
   final TextEditingController? controller;
-  final bool enabled;
+  final bool? enabled;
   final bool obscureText;
   final String? labelText;
   final bool autocorrect;
@@ -16,13 +16,13 @@ class PlatformField extends PlatformWidget<TextField, CupertinoTextField> {
   const PlatformField({
     super.key,
     this.controller,
+    this.enabled,
     this.labelText,
     this.obscureText = false,
     this.autocorrect = false,
     this.keyboardType,
     this.inputFormatters = const [],
     this.onChanged,
-    this.enabled = true,
     this.autofillHints,
   });
 

lib/util.dart

@@ -123,10 +123,3 @@ Route platformRouter(Widget Function(BuildContext context) builder) =>
     (Platform.isAndroid)
         ? MaterialPageRoute(builder: builder)
         : CupertinoPageRoute(builder: builder);
-
-class SettingsManager {
-  bool skipWeekend = false;
-  bool checkOrdered = false;
-  bool saveOffline = false;
-  bool allergens = false;
-}

package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies": {
+		"@commitlint/cli": "^17.0.0",
+		"@commitlint/config-conventional": "^17.0.0",
+		"cz-conventional-changelog": "^3.3.0"
+	},
+	"config": {
+		"commitizen": {
+			"path": "./node_modules/cz-conventional-changelog"
+		}
+	}
+}

pubspec.lock

@@ -5,58 +5,58 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b"
+      sha256: d6347d54a2d8028e0437e3c099f66fdb8ae02c4720c1e7534c9f24c10351f85d
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.9"
+    version: "3.3.6"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.3.2"
   async:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.10.0"
   canteenlib:
     dependency: "direct main"
     description:
       name: canteenlib
-      sha256: "7051fd7ad1b2e4e5471b7f55dd092a6586972aad2c0c8f31edf7f0ee5a7e4ee9"
+      sha256: c15aa1d11fb9d6d01d633b8cbb6780d3e63c9058f8cc3b0f7de2fbc21cf4903d
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.6"
+    version: "1.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.2"
   cli_util:
     dependency: transitive
     description:
       name: cli_util
-      sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7
+      sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.0"
+    version: "0.3.5"
   clock:
     dependency: transitive
     description:
@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.0"
   convert:
     dependency: transitive
     description:
@@ -85,143 +85,87 @@ packages:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.2"
-  csslib:
-    dependency: transitive
-    description:
-      name: csslib
-      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   dbus:
     dependency: transitive
     description:
       name: dbus
-      sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac"
+      sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.10"
+    version: "0.7.8"
   dots_indicator:
     dependency: transitive
     description:
       name: dots_indicator
-      sha256: f1599baa429936ba87f06ae5f2adc920a367b16d08f74db58c3d0f6e93bcdb5c
+      sha256: e59dfc90030ee5a4fd4c53144a8ce97cc7a823c2067b8fb9814960cd1ae63f89
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.0"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.0.1"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "6.1.4"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_keyboard_visibility:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility
-      sha256: "4983655c26ab5b959252ee204c2fffa4afeb4413cd030455194ec0caa3b8e7cb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.4.1"
-  flutter_keyboard_visibility_linux:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility_linux
-      sha256: "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  flutter_keyboard_visibility_macos:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility_macos
-      sha256: c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  flutter_keyboard_visibility_platform_interface:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility_platform_interface
-      sha256: e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  flutter_keyboard_visibility_web:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility_web
-      sha256: d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  flutter_keyboard_visibility_windows:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility_windows
-      sha256: fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
       name: flutter_launcher_icons
-      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
+      sha256: ce0e501cfc258907842238e4ca605e74b7fd1cdf04b3b43e86c43f3e40a1592c
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.1"
+    version: "0.11.0"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
+      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "2.0.1"
   flutter_local_notifications:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: bb5cd63ff7c91d6efe452e41d0d0ae6348925c82eafd10ce170ef585ea04776e
+      sha256: f222919a34545931e47b06000836b5101baeffb0e6eb5a4691d2d42851740dd9
       url: "https://pub.dev"
     source: hosted
-    version: "16.2.0"
+    version: "12.0.4"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03"
+      sha256: "3c6d6db334f609a92be0c0915f40871ec56f5d2adf01e77ae364162c587c0ca8"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0+1"
+    version: "2.0.0"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef"
+      sha256: "5ec1feac5f7f7d9266759488bc5f76416152baba9aa1b26fe572246caa00d1ab"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0+1"
+    version: "6.0.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -239,50 +183,50 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
-      sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685
+      sha256: f2afec1f1762c040a349ea2a588e32f442da5d0db3494a52a929a97c9e550bc5
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.0"
+    version: "7.0.1"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
       name: flutter_secure_storage_linux
-      sha256: "3d5032e314774ee0e1a7d0a9f5e2793486f0dff2dd9ef5a23f4e3fb2a0ae6a9e"
+      sha256: "736436adaf91552433823f51ce22e098c2f0551db06b6596f58597a25b8ea797"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.1.2"
   flutter_secure_storage_macos:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: bd33935b4b628abd0b86c8ca20655c5b36275c3a3f5194769a7b3f37c905369c
+      sha256: ff0768a6700ea1d9620e03518e2e25eac86a8bd07ca3556e9617bfa5ace4bd00
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "2.0.1"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
       name: flutter_secure_storage_platform_interface
-      sha256: "0d4d3a5dd4db28c96ae414d7ba3b8422fd735a8255642774803b2532c9a61d7e"
+      sha256: b3773190e385a3c8a382007893d678ae95462b3c2279e987b55d140d3b0cb81b
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.1"
   flutter_secure_storage_web:
     dependency: transitive
     description:
       name: flutter_secure_storage_web
-      sha256: "30f84f102df9dcdaa2241866a958c2ec976902ebdaa8883fbfe525f1f2f3cf20"
+      sha256: "42938e70d4b872e856e678c423cc0e9065d7d294f45bc41fc1981a4eb4beaffe"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.1"
   flutter_secure_storage_windows:
     dependency: transitive
     description:
       name: flutter_secure_storage_windows
-      sha256: "5809c66f9dd3b4b93b0a6e2e8561539405322ee767ac2f64d084e2ab5429d108"
+      sha256: ca89c8059cf439985aa83c59619b3674c7ef6cc2e86943d169a7369d6a69cab5
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "1.1.3"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -292,26 +236,18 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      sha256: dfdde255317af381bfc1c486ed968d5a43a2ded9c931e87cbecd88767d6a71c1
+      sha256: "7cc92eabe01e3f1babe1571c5560b135dfc762a34e41e9056881e2196b178ec1"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.4"
+    version: "8.1.2"
-  html:
-    dependency: transitive
-    description:
-      name: html
-      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.4"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
+      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "0.13.5"
   http_parser:
     dependency: transitive
     description:
@@ -324,234 +260,266 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271"
+      sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.3"
+    version: "3.3.0"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.17.0"
   introduction_screen:
     dependency: "direct main"
     description:
       name: introduction_screen
-      sha256: "72d25ceb71471773783f72783608e17585af93d4bc6474df577fcfe9e7842852"
+      sha256: "73965475d6b271846f81c5fce5b459546a4ea36c285408691522437fd6bbeb69"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.12"
+    version: "3.1.4"
   js:
     dependency: transitive
     description:
       name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    version: "0.6.5"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.8.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "2.0.1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.8.0"
   package_info_plus:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79"
+      sha256: f62d7253edc197fe3c88d7c2ddab82d68f555e778d55390ccc3537eca8e8d637
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.1"
+    version: "1.4.3+1"
+  package_info_plus_linux:
+    dependency: transitive
+    description:
+      name: package_info_plus_linux
+      sha256: "04b575f44233d30edbb80a94e57cad9107aada334fc02aabb42b6becd13c43fc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
+  package_info_plus_macos:
+    dependency: transitive
+    description:
+      name: package_info_plus_macos
+      sha256: a2ad8b4acf4cd479d4a0afa5a74ea3f5b1c7563b77e52cc32b3ee6956d5482a6
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
+      sha256: f7a0c8f1e7e981bc65f8b64137a53fd3c195b18d429fba960babc59a5a1c7ae8
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "1.0.2"
+  package_info_plus_web:
+    dependency: transitive
+    description:
+      name: package_info_plus_web
+      sha256: f0829327eb534789e0a16ccac8936a80beed4e2401c4d3a74f3f39094a822d3b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
+  package_info_plus_windows:
+    dependency: transitive
+    description:
+      name: package_info_plus_windows
+      sha256: "79524f11c42dd9078b96d797b3cf79c0a2883a50c4920dc43da8562c115089bc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.8.2"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.0.12"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
+      sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.0.22"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.1.1"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.1.7"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
+      sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.0.5"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.1.3"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6
+      sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.1"
+    version: "5.1.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
+      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8
+      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.3"
   pointycastle:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
+      sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
       url: "https://pub.dev"
     source: hosted
-    version: "3.7.3"
+    version: "3.6.2"
-  settings_ui:
+  process:
-    dependency: "direct main"
+    dependency: transitive
     description:
-      name: settings_ui
+      name: process
-      sha256: d9838037cb554b24b4218b2d07666fbada3478882edefae375ee892b6c820ef3
+      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "4.2.4"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
+      sha256: "5949029e70abe87f75cfe59d17bf5c397619c4b74a099b10116baeb34786fad9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.0.17"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06"
+      sha256: "955e9736a12ba776bdd261cf030232b30eadfcd9c79b32a3250dd4a494e8c8f7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.0.15"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7"
+      sha256: "1ffa239043ab8baf881ec3094a3c767af9d10399b2839020b9e4d44c0bb23951"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.4"
+    version: "2.1.2"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
+      sha256: f8ea038aa6da37090093974ebdcf4397010605fd2ff65c37a66f9d28394cb874
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.1.3"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a
+      sha256: da9431745ede5ece47bc26d5d73a9d3c6936ef6945c101a5aca46f62e52c1cf3
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.1.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21"
+      sha256: a4b5bc37fe1b368bbc81f953197d55e12f49d0296e7e412dfe2d2d77d6929958
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.0.4"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
+      sha256: "5eaf05ae77658d3521d0e993ede1af962d4b326cd2153d312df716dc250f00c9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.1.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -561,10 +529,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.1"
   string_scanner:
     dependency: transitive
     description:
@@ -585,82 +553,82 @@ packages:
     dependency: "direct main"
     description:
       name: timezone
-      sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
+      sha256: "24c8fcdd49a805d95777a39064862133ff816ebfffe0ceff110fb5960e557964"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.2"
+    version: "0.9.1"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.1"
   url_launcher:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba
+      sha256: "698fa0b4392effdc73e9e184403b627362eb5fbf904483ac9defbb1c2191d809"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.1"
+    version: "6.1.8"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def"
+      sha256: "3e2f6dfd2c7d9cd123296cab8ef66cfc2c1a13f5845f42c7a0f365690a8a7dd1"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.0"
+    version: "6.0.23"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3
+      sha256: bb328b24d3bccc20bdf1024a0990ac4f869d57663660de9c936fb8c043edefe3
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.1"
+    version: "6.0.18"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd"
+      sha256: "318c42cba924e18180c029be69caf0a1a710191b9ec49bb42b5998fdcccee3cc"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.0.2"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
+      sha256: "41988b55570df53b3dd2a7fc90c76756a963de6a8c5f8e113330cb35992e2094"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.0.2"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50"
+      sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.1"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "138bd45b3a456dcfafc46d1a146787424f8d2edfbf2809c9324361e58f851cf7"
+      sha256: "44d79408ce9f07052095ef1f9a693c258d6373dc3944249374e30eff7219ccb0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.0.14"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc"
+      sha256: b6217370f8eb1fd85c8890c539f5a639a01ab209a36db82c921ebeacefc7a615
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.0.3"
   vector_math:
     dependency: transitive
     description:
@@ -669,46 +637,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f"
+      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.0"
+    version: "3.1.3"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2"
+      sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "0.2.0+3"
   xml:
     dependency: transitive
     description:
       name: xml
-      sha256: af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556
+      sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5"
       url: "https://pub.dev"
     source: hosted
-    version: "6.4.2"
+    version: "6.2.2"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.1"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
+  dart: ">=2.18.2 <4.0.0"
-  flutter: ">=3.16.0"
+  flutter: ">=3.0.0"

pubspec.yaml

@@ -6,33 +6,32 @@ 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.10.0+32
+version: 1.7.0+27
 
 environment:
   sdk: ">=2.18.2 <3.0.0"
 
 dependencies:
-  canteenlib: ^3.0.0
   flutter:
     sdk: flutter
-  flutter_local_notifications: ^16.0.0
   flutter_localizations: 
     sdk: flutter
-  flutter_native_timezone: ^2.0.0
+  canteenlib: ^1.1.1
-  flutter_secure_storage: ^9.0.0
+  flutter_secure_storage: ^7.0.1
-  fluttertoast: ^8.1.2
-  intl: ^0.18.0
-  introduction_screen: ^3.0.1
-  package_info_plus: ^5.0.0
-  path_provider: ^2.0.9
-  settings_ui: ^2.0.2
-  shared_preferences: ^2.0.13
-  timezone: ^0.9.0
   url_launcher: ^6.0.20
+  path_provider: ^2.0.9
+  shared_preferences: ^2.0.13
+  introduction_screen: ^3.0.1
+  flutter_local_notifications: ^12.0.3+1
+  timezone: ^0.9.0
+  flutter_native_timezone: ^2.0.0
+  intl: ^0.17.0
+  package_info_plus: ^1.4.3+1
+  fluttertoast: ^8.1.2
 
 dev_dependencies:
-  flutter_launcher_icons: ^0.13.0
+  flutter_lints: ^2.0.1
-  flutter_lints: ^3.0.0
+  flutter_launcher_icons: ^0.11.0
 
 flutter_icons:
   android: true
@@ -48,8 +47,10 @@ flutter:
   # To add assets to your application, add an assets section, like this:
   assets:
     - assets/
+
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.
+
   # To add custom fonts to your application, add a fonts section here,
   # in this "flutter" section. Each entry in this list should have a
   # "family" key with the font family name, and a "fonts" key with a

renovate.json

@@ -1,8 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ],
-  "baseBranches": ["dev"],
-  "enabledManagers":["pub"]
-}