Skip to content
This repository was archived by the owner on Sep 14, 2024. It is now read-only.

Commit 8896e93

Browse files
Teifun2Teifun2
committed
Merge branch 'release/0.7.7'
2 parents 2b00673 + 96dab9d commit 8896e93

File tree

79 files changed

+1036
-362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1036
-362
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v3
10-
- uses: actions/setup-java@v2
10+
- uses: actions/setup-java@v3
1111
with:
1212
java-version: '12.x'
1313
distribution: 'adopt'
14-
- uses: subosito/flutter-action@v2.3.0
14+
- uses: subosito/flutter-action@v2.7.0
1515
with:
16-
flutter-version: '2.10.4'
16+
flutter-version: '3.3.0'
1717
- run: flutter pub get
1818
- run: flutter build apk --debug

‎android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ apply plugin: 'com.android.application'
3131
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3232

3333
android {
34-
compileSdkVersion flutter.compileSdkVersion
34+
compileSdkVersion 33
3535

3636
defaultConfig {
3737
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).

‎android/app/src/main/AndroidManifest.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,12 @@
3838
android:name="flutterEmbedding"
3939
android:value="2" />
4040
</application>
41+
42+
<queries>
43+
<!-- If your app opens https URLs -->
44+
<intent>
45+
<action android:name="android.intent.action.VIEW" />
46+
<data android:scheme="https" />
47+
</intent>
48+
</queries>
4149
</manifest>

‎android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
9+
classpath 'com.android.tools.build:gradle:7.0.4'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

‎android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

‎assets/i18n/bg_BG.json

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"self_signed_certificate": "Игнориране на невалиден сертификат.\nНеобходимо е за самоподписани сертификати.\n(Използвате на свой собствен риск!)"
2727
},
2828
"button": "Вписване",
29-
"retry": "Retry Login!",
30-
"reset": "Reset Credentials!",
29+
"retry": "Опитайте да влезете отново!",
30+
"reset": "Възстановяване на идентификационни данни!",
3131
"errors": {
3232
"not_reachable": "Невъзможно достигане до: {server_url}\n{error_msg}",
3333
"certificate_failed": "Сертификатът на сървъра не можа да бъде проверен: {server_url}\n{error_msg}",
@@ -39,8 +39,8 @@
3939
"failed_remove_remote": "Неуспешно премахване на паролата за дистанционно приложение!",
4040
"failure": "Процесът на вписване не можа да завърши правилно.\n{status_code}\n{status_message}",
4141
"credentials_invalid": "Съхранените идентификационни данни вече не са валидни и сте отписани!",
42-
"no_internet": "Authentication check was not successful.\nMaybe there is no internet connection?\nError Message: {error_msg}",
43-
"wrong_status": "Authentication check was not successful.\nMaybe the provided server host is not correct?\nError Message: {error_msg}"
42+
"no_internet": "Проверката за удостоверяване не беше успешна.\nМоже би няма интернет връзка?\nСъобщение за грешка: {error_msg}",
43+
"wrong_status": "Проверката за удостоверяване не беше успешна.\nМоже би предоставеният хост на сървър не е правилен?\nСъобщение за грешка: {error_msg}"
4444
}
4545
},
4646
"categories": {
@@ -82,23 +82,25 @@
8282
"time": {
8383
"prep": "Време за подготовка:",
8484
"cook": "Време за готвене:",
85-
"total": "Общо време:"
85+
"total": "Общо време:",
86+
"hours": "Часове",
87+
"minutes": "Минути "
8688
},
8789
"nutrition": {
88-
"title": "Nutrition Information",
90+
"title": "Информация за храната",
8991
"items": {
90-
"calories": "Energy",
91-
"carbohydrateContent": "Carbohydrate",
92-
"cholesterolContent": "Cholesterol",
93-
"fatContent": "Fat total",
94-
"fiberContent": "Fiber",
95-
"proteinContent": "Protein",
96-
"saturatedFatContent": "Saturated Fat",
97-
"servingSize": "Serving size",
98-
"sodiumContent": "Sodium",
99-
"sugarContent": "Sugar",
100-
"transFatContent": "Trans-fat content",
101-
"unsaturatedFatContent": "Unsaturated-fat content"
92+
"calories": "Енергия",
93+
"carbohydrateContent": "Въглехидрати",
94+
"cholesterolContent": "Холестерол",
95+
"fatContent": "Общо мазнини",
96+
"fiberContent": "Фибри",
97+
"proteinContent": "Протеин",
98+
"saturatedFatContent": "Наситени мазнини",
99+
"servingSize": "Размер на порция",
100+
"sodiumContent": "Натрий",
101+
"sugarContent": "Захар",
102+
"transFatContent": "Съдържание на трансмазнини",
103+
"unsaturatedFatContent": "Съдържание на ненаситени мазнини"
102104
}
103105
},
104106
"tools": "Инструменти:",
@@ -111,7 +113,7 @@
111113
},
112114
"recipe_edit": {
113115
"title": "Редактиране на Рецепта",
114-
"button": "Редакция",
116+
"button": "Запиши",
115117
"errors": {
116118
"update_failed": "Актуализацията не беше успешна {error_msg}"
117119
}
@@ -142,8 +144,9 @@
142144
"timer": {
143145
"title": "Вашите таймери",
144146
"started": "Таймерът стартира.",
145-
"finished": "is finished.",
146-
"done": "Таймерът е готов."
147+
"finished": " е завършен.",
148+
"done": "Таймерът е готов.",
149+
"missing": "Трябва да зададете времето за готвене, за да използвате таймер."
147150
},
148151
"settings": {
149152
"title": "Настройки на приложението",

‎assets/i18n/cs_CZ.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
},
2323
"settings": {
2424
"title": "Pokročilá nastavení",
25-
"app_password": "Použít vygenerované heslo pro aplikaci.\nPotřebné k účtům s dvoufázovým ověřováním se.",
26-
"self_signed_certificate": "Ignorovat neplatný certifikát.\nPotřebné pro certifikáty podepsané samotnou organizací.\n(Používejte na vlastní riziko!)"
25+
"app_password": "Použít vygenerované heslo pro jednotlivou aplikaci.\nPotřebné pro účty s dvoufázovým ověřováním se.",
26+
"self_signed_certificate": "Ignorovat neplatný certifikát.\nPotřebné pro certifikáty podepsané samy sebou.\n(Používejte na vlastní riziko!)"
2727
},
2828
"button": "Přihlásit",
2929
"retry": "Zkusit se znovu přihlásit!",
3030
"reset": "Resetovat přihlašovací údaje!",
3131
"errors": {
3232
"not_reachable": "Nelze se připojit k: {server_url}\n{error_msg}",
3333
"certificate_failed": "Certifikát serveru se nepodařilo ověřit: {server_url}\n{error_msg}",
34-
"request_failed": "Žádost o heslo pro aplikaci se nezdařila:\n{error_msg}",
35-
"parse_failed": "Nedaří se zpracovat heslo pro aplikaci!\n{error_msg}",
36-
"parse_missing": "V odpovědi se nedaří najít heslo aplikace:\n{error_msg}",
34+
"request_failed": "Žádost o heslo pro jednotlivou aplikaci se nezdařila:\n{error_msg}",
35+
"parse_failed": "Nedaří se zpracovat odpověď s heslem pro jednotlivou aplikaci!\n{error_msg}",
36+
"parse_missing": "V odpovědi se nedaří najít heslo pro jednotlivou aplikaci:\n{error_msg}",
3737
"auth_failed": "Uživatelské jméno a / nebo heslo není správné!",
3838
"authentication_not_found": "V úložišti nebyla nalezena autentifikace",
3939
"failed_remove_remote": "Nepovedlo se odstranit heslo pro externí aplikaci!",
@@ -82,7 +82,9 @@
8282
"time": {
8383
"prep": "Doba přípravy:",
8484
"cook": "Doba vaření:",
85-
"total": "Celková doba:"
85+
"total": "Celková doba:",
86+
"hours": "Hodin",
87+
"minutes": "Minut"
8688
},
8789
"nutrition": {
8890
"title": "Výživové informace",
@@ -101,7 +103,7 @@
101103
"unsaturatedFatContent": "Obsah nenasycených tuků"
102104
}
103105
},
104-
"tools": "Nástroje:",
106+
"tools": "Vybavení:",
105107
"ingredients": "Přísady:",
106108
"instructions": "Postup:"
107109
},
@@ -111,7 +113,7 @@
111113
},
112114
"recipe_edit": {
113115
"title": "Upravit recept",
114-
"button": "Upravit",
116+
"button": "Uložit",
115117
"errors": {
116118
"update_failed": "Aktualizace se nezdařila: {error_msg}"
117119
}
@@ -143,7 +145,8 @@
143145
"title": "Vaše minutky",
144146
"started": "Minutka spuštěna.",
145147
"finished": "je dokončeno.",
146-
"done": "Minutka zvonila."
148+
"done": "Minutka zvonila.",
149+
"missing": "Pokud chcete použít časovač, je třeba nastavit dobu vaření."
147150
},
148151
"settings": {
149152
"title": "Nastavení aplikace",
@@ -157,12 +160,12 @@
157160
"title": "Jazyk"
158161
},
159162
"stay_awake": {
160-
"title": "Buďte bdělí",
163+
"title": "Nezhasínat",
161164
"subtitle": "Při zobrazování receptu se obrazovka nevypne."
162165
},
163166
"recipe_font_size": {
164167
"title": "Velikost písma receptů",
165-
"subtitle": "Změní velikost písma nástrojů receptu, přísad a pokynů tak, aby bylo lépe čitelné."
168+
"subtitle": "Změní velikost písma vybavení, přísad a pokynů pro recept tak, aby bylo lépe čitelné."
166169
},
167170
"category_font_size": {
168171
"title": "Velikost písma kategorií",

‎assets/i18n/de.json

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"server_url": {
1111
"field": "Server-URL",
1212
"validator": {
13-
"empty": "Bitte die URL der Nextcloud-Instanz angeben.",
13+
"empty": "Bitte die URL deiner Nextcloud-Instanz angeben.",
1414
"pattern": "Bitte eine gültige URL angeben"
1515
}
1616
},
@@ -38,7 +38,7 @@
3838
"authentication_not_found": "Keine Authentifizierung im Speicher gefunden",
3939
"failed_remove_remote": "Remote-App-Passwort konnte nicht entfernt werden!",
4040
"failure": "Anmeldevorgang konnte nicht ordnungsgemäß beendet werden.\n{status_code}\n{status_message}",
41-
"credentials_invalid": "Die gespeicherten Anmeldedaten waren nicht mehr gültig und Du wurdest abgemeldet!",
41+
"credentials_invalid": "Die gespeicherten Anmeldedaten waren nicht mehr gültig und du wurdest abgemeldet!",
4242
"no_internet": "Die Authentifizierungsprüfung war nicht erfolgreich.\nVielleicht gibt es keine Internetverbindung?\nFehlermeldung: {error_msg}",
4343
"wrong_status": "Die Authentifizierungsprüfung war nicht erfolgreich.\nVielleicht ist der angegebene Server-Host nicht korrekt?\nFehlermeldung: {error_msg}"
4444
}
@@ -82,7 +82,9 @@
8282
"time": {
8383
"prep": "Vorbereitungsdauer:",
8484
"cook": "Kochdauer:",
85-
"total": "Gesamtzeit:"
85+
"total": "Gesamtzeit:",
86+
"hours": "Stunden",
87+
"minutes": "Minuten"
8688
},
8789
"nutrition": {
8890
"title": "Nährwertangaben",
@@ -111,16 +113,16 @@
111113
},
112114
"recipe_edit": {
113115
"title": "Rezept bearbeiten",
114-
"button": "Bearbeiten",
116+
"button": "Speichern",
115117
"errors": {
116118
"update_failed": "Aktualisierung fehlgeschlagen {error_msg}"
117119
}
118120
},
119121
"recipe_create": {
120-
"title": "Neues Rezept anlegen",
122+
"title": "Neues Rezept erstellen",
121123
"button": "Erstellen",
122124
"errors": {
123-
"update_failed": "Anlegen fehlgeschlagen {error_msg}"
125+
"update_failed": "Erstellen fehlgeschlagen {error_msg}"
124126
}
125127
},
126128
"recipe_import": {
@@ -140,10 +142,11 @@
140142
}
141143
},
142144
"timer": {
143-
"title": "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
145+
"title": "Deine Timer",
144146
"started": "Timer gestartet.",
145147
"finished": "ist abgeschlossen.",
146-
"done": "Timer ist fertig."
148+
"done": "Timer ist fertig.",
149+
"missing": "Um einen Timer zu verwenden, musst du die Kochzeit angeben."
147150
},
148151
"settings": {
149152
"title": "App-Einstellungen",
@@ -166,7 +169,7 @@
166169
},
167170
"category_font_size": {
168171
"title": "Kategorie Schriftgröße",
169-
"subtitle": "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE)."
172+
"subtitle": "Ändert die Schriftgröße des Kategorietitels. Dies kann nützlich sein, wenn du lange Kategorienamen verwendest."
170173
}
171174
}
172175
}

‎assets/i18n/de_DE.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@
8282
"time": {
8383
"prep": "Vorbereitungsdauer:",
8484
"cook": "Kochdauer:",
85-
"total": "Gesamtzeit:"
85+
"total": "Gesamtzeit:",
86+
"hours": "Stunden",
87+
"minutes": "Minuten"
8688
},
8789
"nutrition": {
8890
"title": "Nährwertangaben",
@@ -111,7 +113,7 @@
111113
},
112114
"recipe_edit": {
113115
"title": "Rezept bearbeiten",
114-
"button": "Bearbeiten",
116+
"button": "Speichern",
115117
"errors": {
116118
"update_failed": "Aktualisierung fehlgeschlagen {error_msg}"
117119
}
@@ -143,7 +145,8 @@
143145
"title": "Ihre Timer",
144146
"started": "Timer gestartet.",
145147
"finished": "ist abgeschlossen.",
146-
"done": "Timer ist fertig."
148+
"done": "Timer ist fertig.",
149+
"missing": "Um einen Timer zu verwenden, müssen Sie die Kochzeit angeben."
147150
},
148151
"settings": {
149152
"title": "App-Einstellungen",

‎assets/i18n/en.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@
8282
"time": {
8383
"prep": "Preparation time:",
8484
"cook": "Cooking time:",
85-
"total": "Total time:"
85+
"total": "Total time:",
86+
"hours": "Hours",
87+
"minutes": "Minutes"
8688
},
8789
"nutrition": {
8890
"title": "Nutrition Information",
@@ -111,7 +113,7 @@
111113
},
112114
"recipe_edit": {
113115
"title": "Edit Recipe",
114-
"button": "Edit",
116+
"button": "Save",
115117
"errors": {
116118
"update_failed": "Update Failed {error_msg}"
117119
}
@@ -143,7 +145,8 @@
143145
"title": "Your timers",
144146
"started": "Timer started.",
145147
"finished": "is finished.",
146-
"done": "Timer is done."
148+
"done": "Timer is done.",
149+
"missing": "You need to set the cooking time to use a timer."
147150
},
148151
"settings": {
149152
"title": "App Settings",

‎assets/i18n/es.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@
8282
"time": {
8383
"prep": "Tiempo de preparación:",
8484
"cook": "Tiempo de cocción:",
85-
"total": "Tiempo total:"
85+
"total": "Tiempo total:",
86+
"hours": "Horas",
87+
"minutes": "Minutos"
8688
},
8789
"nutrition": {
8890
"title": "Información nutricional",
@@ -111,7 +113,7 @@
111113
},
112114
"recipe_edit": {
113115
"title": "Editar receta",
114-
"button": "Editar",
116+
"button": "Guardar",
115117
"errors": {
116118
"update_failed": "La actualización falló {error_msg}"
117119
}
@@ -143,7 +145,8 @@
143145
"title": "Tus temporizadores",
144146
"started": "Temporizador iniciado.",
145147
"finished": "ha terminado.",
146-
"done": "El temporizador ha terminado."
148+
"done": "El temporizador ha terminado.",
149+
"missing": "Necesitas configurar el tiempo de cocinado para usar un temporizador."
147150
},
148151
"settings": {
149152
"title": "Ajustes de la Aplicación",

0 commit comments

Comments
 (0)