Merge branch 'release/0.7.7'

Teifun2 · Sep 18, 2022 · 8896e93 · 8896e93
2 parents 2b00673 + 96dab9d
commit 8896e93
Show file tree

Hide file tree

Showing 79 changed files with 1,036 additions and 362 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,12 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v3
       with:
         java-version: '12.x'
         distribution: 'adopt'
-    - uses: subosito/flutter-action@v2.3.0
+    - uses: subosito/flutter-action@v2.7.0
       with:
-        flutter-version: '2.10.4'
+        flutter-version: '3.3.0'
     - run: flutter pub get
     - run: flutter build apk --debug
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -31,7 +31,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 33
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -38,4 +38,12 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+
+    <queries>
+        <!-- If your app opens https URLs -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" />
+        </intent>
+    </queries>
 </manifest>
diff --git a/android/build.gradle b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/assets/i18n/bg_BG.json b/assets/i18n/bg_BG.json
@@ -26,8 +26,8 @@
       "self_signed_certificate": "Игнориране на невалиден сертификат.\nНеобходимо е за самоподписани сертификати.\n(Използвате на свой собствен риск!)"
     },
     "button": "Вписване",
-    "retry": "Retry Login!",
-    "reset": "Reset Credentials!",
+    "retry": "Опитайте да влезете отново!",
+    "reset": "Възстановяване на идентификационни данни!",
     "errors": {
       "not_reachable": "Невъзможно достигане до: {server_url}\n{error_msg}",
       "certificate_failed": "Сертификатът на сървъра не можа да бъде проверен: {server_url}\n{error_msg}",
@@ -39,8 +39,8 @@
       "failed_remove_remote": "Неуспешно премахване на паролата за дистанционно приложение!",
       "failure": "Процесът на вписване не можа да завърши правилно.\n{status_code}\n{status_message}",
       "credentials_invalid": "Съхранените идентификационни данни вече не са валидни и сте отписани!",
-      "no_internet": "Authentication check was not successful.\nMaybe there is no internet connection?\nError Message: {error_msg}",
-      "wrong_status": "Authentication check was not successful.\nMaybe the provided server host is not correct?\nError Message: {error_msg}"
+      "no_internet": "Проверката за удостоверяване не беше успешна.\nМоже би няма интернет връзка?\nСъобщение за грешка: {error_msg}",
+      "wrong_status": "Проверката за удостоверяване не беше успешна.\nМоже би предоставеният хост на сървър не е правилен?\nСъобщение за грешка: {error_msg}"
     }
   },
   "categories": {
@@ -82,23 +82,25 @@
       "time": {
         "prep": "Време за подготовка:",
         "cook": "Време за готвене:",
-        "total": "Общо време:"
+        "total": "Общо време:",
+        "hours": "Часове",
+        "minutes": "Минути "
       },
       "nutrition": {
-        "title": "Nutrition Information",
+        "title": "Информация за храната",
         "items": {
-          "calories": "Energy",
-          "carbohydrateContent": "Carbohydrate",
-          "cholesterolContent": "Cholesterol",
-          "fatContent": "Fat total",
-          "fiberContent": "Fiber",
-          "proteinContent": "Protein",
-          "saturatedFatContent": "Saturated Fat",
-          "servingSize": "Serving size",
-          "sodiumContent": "Sodium",
-          "sugarContent": "Sugar",
-          "transFatContent": "Trans-fat content",
-          "unsaturatedFatContent": "Unsaturated-fat content"
+          "calories": "Енергия",
+          "carbohydrateContent": "Въглехидрати",
+          "cholesterolContent": "Холестерол",
+          "fatContent": "Общо мазнини",
+          "fiberContent": "Фибри",
+          "proteinContent": "Протеин",
+          "saturatedFatContent": "Наситени мазнини",
+          "servingSize": "Размер на порция",
+          "sodiumContent": "Натрий",
+          "sugarContent": "Захар",
+          "transFatContent": "Съдържание на трансмазнини",
+          "unsaturatedFatContent": "Съдържание на ненаситени мазнини"
         }
       },
       "tools": "Инструменти:",
@@ -111,7 +113,7 @@
   },
   "recipe_edit": {
     "title": "Редактиране на Рецепта",
-    "button": "Редакция",
+    "button": "Запиши",
     "errors": {
       "update_failed": "Актуализацията не беше успешна {error_msg}"
     }
@@ -142,8 +144,9 @@
   "timer": {
     "title": "Вашите таймери",
     "started": "Таймерът стартира.",
-    "finished": "is finished.",
-    "done": "Таймерът е готов."
+    "finished": " е завършен.",
+    "done": "Таймерът е готов.",
+    "missing": "Трябва да зададете времето за готвене, за да използвате таймер."
   },
   "settings": {
     "title": "Настройки на приложението",

diff --git a/assets/i18n/cs_CZ.json b/assets/i18n/cs_CZ.json
@@ -22,18 +22,18 @@
     },
     "settings": {
       "title": "Pokročilá nastavení",
-      "app_password": "Použít vygenerované heslo pro aplikaci.\nPotřebné k účtům s dvoufázovým ověřováním se.",
-      "self_signed_certificate": "Ignorovat neplatný certifikát.\nPotřebné pro certifikáty podepsané samotnou organizací.\n(Používejte na vlastní riziko!)"
+      "app_password": "Použít vygenerované heslo pro jednotlivou aplikaci.\nPotřebné pro účty s dvoufázovým ověřováním se.",
+      "self_signed_certificate": "Ignorovat neplatný certifikát.\nPotřebné pro certifikáty podepsané samy sebou.\n(Používejte na vlastní riziko!)"
     },
     "button": "Přihlásit",
     "retry": "Zkusit se znovu přihlásit!",
     "reset": "Resetovat přihlašovací údaje!",
     "errors": {
       "not_reachable": "Nelze se připojit k: {server_url}\n{error_msg}",
       "certificate_failed": "Certifikát serveru se nepodařilo ověřit: {server_url}\n{error_msg}",
-      "request_failed": "Žádost o heslo pro aplikaci se nezdařila:\n{error_msg}",
-      "parse_failed": "Nedaří se zpracovat heslo pro aplikaci!\n{error_msg}",
-      "parse_missing": "V odpovědi se nedaří najít heslo aplikace:\n{error_msg}",
+      "request_failed": "Žádost o heslo pro jednotlivou aplikaci se nezdařila:\n{error_msg}",
+      "parse_failed": "Nedaří se zpracovat odpověď s heslem pro jednotlivou aplikaci!\n{error_msg}",
+      "parse_missing": "V odpovědi se nedaří najít heslo pro jednotlivou aplikaci:\n{error_msg}",
       "auth_failed": "Uživatelské jméno a / nebo heslo není správné!",
       "authentication_not_found": "V úložišti nebyla nalezena autentifikace",
       "failed_remove_remote": "Nepovedlo se odstranit heslo pro externí aplikaci!",
@@ -82,7 +82,9 @@
       "time": {
         "prep": "Doba přípravy:",
         "cook": "Doba vaření:",
-        "total": "Celková doba:"
+        "total": "Celková doba:",
+        "hours": "Hodin",
+        "minutes": "Minut"
       },
       "nutrition": {
         "title": "Výživové informace",
@@ -101,7 +103,7 @@
           "unsaturatedFatContent": "Obsah nenasycených tuků"
         }
       },
-      "tools": "Nástroje:",
+      "tools": "Vybavení:",
       "ingredients": "Přísady:",
       "instructions": "Postup:"
     },
@@ -111,7 +113,7 @@
   },
   "recipe_edit": {
     "title": "Upravit recept",
-    "button": "Upravit",
+    "button": "Uložit",
     "errors": {
       "update_failed": "Aktualizace se nezdařila: {error_msg}"
     }
@@ -143,7 +145,8 @@
     "title": "Vaše minutky",
     "started": "Minutka spuštěna.",
     "finished": "je dokončeno.",
-    "done": "Minutka zvonila."
+    "done": "Minutka zvonila.",
+    "missing": "Pokud chcete použít časovač, je třeba nastavit dobu vaření."
   },
   "settings": {
     "title": "Nastavení aplikace",
@@ -157,12 +160,12 @@
       "title": "Jazyk"
     },
     "stay_awake": {
-      "title": "Buďte bdělí",
+      "title": "Nezhasínat",
       "subtitle": "Při zobrazování receptu se obrazovka nevypne."
     },
     "recipe_font_size": {
       "title": "Velikost písma receptů",
-      "subtitle": "Změní velikost písma nástrojů receptu, přísad a pokynů tak, aby bylo lépe čitelné."
+      "subtitle": "Změní velikost písma vybavení, přísad a pokynů pro recept tak, aby bylo lépe čitelné."
     },
     "category_font_size": {
       "title": "Velikost písma kategorií",

diff --git a/assets/i18n/de.json b/assets/i18n/de.json
@@ -10,7 +10,7 @@
     "server_url": {
       "field": "Server-URL",
       "validator": {
-        "empty": "Bitte die URL der Nextcloud-Instanz angeben.",
+        "empty": "Bitte die URL deiner Nextcloud-Instanz angeben.",
         "pattern": "Bitte eine gültige URL angeben"
       }
     },
@@ -38,7 +38,7 @@
       "authentication_not_found": "Keine Authentifizierung im Speicher gefunden",
       "failed_remove_remote": "Remote-App-Passwort konnte nicht entfernt werden!",
       "failure": "Anmeldevorgang konnte nicht ordnungsgemäß beendet werden.\n{status_code}\n{status_message}",
-      "credentials_invalid": "Die gespeicherten Anmeldedaten waren nicht mehr gültig und Du wurdest abgemeldet!",
+      "credentials_invalid": "Die gespeicherten Anmeldedaten waren nicht mehr gültig und du wurdest abgemeldet!",
       "no_internet": "Die Authentifizierungsprüfung war nicht erfolgreich.\nVielleicht gibt es keine Internetverbindung?\nFehlermeldung: {error_msg}",
       "wrong_status": "Die Authentifizierungsprüfung war nicht erfolgreich.\nVielleicht ist der angegebene Server-Host nicht korrekt?\nFehlermeldung: {error_msg}"
     }
@@ -82,7 +82,9 @@
       "time": {
         "prep": "Vorbereitungsdauer:",
         "cook": "Kochdauer:",
-        "total": "Gesamtzeit:"
+        "total": "Gesamtzeit:",
+        "hours": "Stunden",
+        "minutes": "Minuten"
       },
       "nutrition": {
         "title": "Nährwertangaben",
@@ -111,16 +113,16 @@
   },
   "recipe_edit": {
     "title": "Rezept bearbeiten",
-    "button": "Bearbeiten",
+    "button": "Speichern",
     "errors": {
       "update_failed": "Aktualisierung fehlgeschlagen {error_msg}"
     }
   },
   "recipe_create": {
-    "title": "Neues Rezept anlegen",
+    "title": "Neues Rezept erstellen",
     "button": "Erstellen",
     "errors": {
-      "update_failed": "Anlegen fehlgeschlagen {error_msg}"
+      "update_failed": "Erstellen fehlgeschlagen {error_msg}"
     }
   },
   "recipe_import": {
@@ -140,10 +142,11 @@
     }
   },
   "timer": {
-    "title": "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "title": "Deine Timer",
     "started": "Timer gestartet.",
     "finished": "ist abgeschlossen.",
-    "done": "Timer ist fertig."
+    "done": "Timer ist fertig.",
+    "missing": "Um einen Timer zu verwenden, musst du die Kochzeit angeben."
   },
   "settings": {
     "title": "App-Einstellungen",
@@ -166,7 +169,7 @@
     },
     "category_font_size": {
       "title": "Kategorie Schriftgröße",
-      "subtitle": "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE)."
+      "subtitle": "Ändert die Schriftgröße des Kategorietitels. Dies kann nützlich sein, wenn du lange Kategorienamen verwendest."
     }
   }
 }
diff --git a/assets/i18n/de_DE.json b/assets/i18n/de_DE.json
@@ -82,7 +82,9 @@
       "time": {
         "prep": "Vorbereitungsdauer:",
         "cook": "Kochdauer:",
-        "total": "Gesamtzeit:"
+        "total": "Gesamtzeit:",
+        "hours": "Stunden",
+        "minutes": "Minuten"
       },
       "nutrition": {
         "title": "Nährwertangaben",
@@ -111,7 +113,7 @@
   },
   "recipe_edit": {
     "title": "Rezept bearbeiten",
-    "button": "Bearbeiten",
+    "button": "Speichern",
     "errors": {
       "update_failed": "Aktualisierung fehlgeschlagen {error_msg}"
     }
@@ -143,7 +145,8 @@
     "title": "Ihre Timer",
     "started": "Timer gestartet.",
     "finished": "ist abgeschlossen.",
-    "done": "Timer ist fertig."
+    "done": "Timer ist fertig.",
+    "missing": "Um einen Timer zu verwenden, müssen Sie die Kochzeit angeben."
   },
   "settings": {
     "title": "App-Einstellungen",

diff --git a/assets/i18n/en.json b/assets/i18n/en.json
@@ -82,7 +82,9 @@
       "time": {
         "prep": "Preparation time:",
         "cook": "Cooking time:",
-        "total": "Total time:"
+        "total": "Total time:",
+        "hours": "Hours",
+        "minutes": "Minutes"
       },
       "nutrition": {
         "title": "Nutrition Information",
@@ -111,7 +113,7 @@
   },
   "recipe_edit": {
     "title": "Edit Recipe",
-    "button": "Edit",
+    "button": "Save",
     "errors": {
       "update_failed": "Update Failed {error_msg}"
     }
@@ -143,7 +145,8 @@
     "title": "Your timers",
     "started": "Timer started.",
     "finished": "is finished.",
-    "done": "Timer is done."
+    "done": "Timer is done.",
+    "missing": "You need to set the cooking time to use a timer."
   },
   "settings": {
     "title": "App Settings",

diff --git a/assets/i18n/es.json b/assets/i18n/es.json
@@ -82,7 +82,9 @@
       "time": {
         "prep": "Tiempo de preparación:",
         "cook": "Tiempo de cocción:",
-        "total": "Tiempo total:"
+        "total": "Tiempo total:",
+        "hours": "Horas",
+        "minutes": "Minutos"
       },
       "nutrition": {
         "title": "Información nutricional",
@@ -111,7 +113,7 @@
   },
   "recipe_edit": {
     "title": "Editar receta",
-    "button": "Editar",
+    "button": "Guardar",
     "errors": {
       "update_failed": "La actualización falló {error_msg}"
     }
@@ -143,7 +145,8 @@
     "title": "Tus temporizadores",
     "started": "Temporizador iniciado.",
     "finished": "ha terminado.",
-    "done": "El temporizador ha terminado."
+    "done": "El temporizador ha terminado.",
+    "missing": "Necesitas configurar el tiempo de cocinado para usar un temporizador."
   },
   "settings": {
     "title": "Ajustes de la Aplicación",