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

Commit

Permalink
Merge branch 'release/0.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Teifun2 committed Apr 17, 2021
2 parents b613723 + 033379a commit 9bddf08
Show file tree
Hide file tree
Showing 38 changed files with 502 additions and 104 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/setup-java@v1
- uses: actions/setup-java@v2
with:
java-version: '12.x'
distribution: 'adopt'
- uses: subosito/flutter-action@v1
with:
flutter-version: '1.22.4'
flutter-version: '2.0.4'
- run: flutter pub get
- run: flutter build apk --debug
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ Current Features:
- View all recipes by Category
- Search Recipes by Name
- Recipe Editing
- Recipe Import

Planned Features:
- Recipe Creating *
- Recipe Import
- Darkmode
- Offline Usage (Caching)

Expand All @@ -40,7 +40,7 @@ https://www.transifex.com/nextcloud/nextcloud/cookbook_flutter/
<img src="https://user-images.githubusercontent.com/7461832/106359788-0daf7e00-6315-11eb-8604-7abbc541e344.png" alt="Search" width="300px" /> <img src="https://user-images.githubusercontent.com/7461832/106359787-0daf7e00-6315-11eb-88a4-b305b796d512.png" alt="Category Recipes" width="300px" />
<img src="https://user-images.githubusercontent.com/7461832/106396792-8a705400-640a-11eb-9d81-8ca421a689f2.png" alt="Recipe" width="300px" /> <img src="https://user-images.githubusercontent.com/7461832/106359785-0d16e780-6315-11eb-9099-0c33aa8943be.png" alt="Recipe Details" width="300px" />
<img src="https://user-images.githubusercontent.com/7461832/106396793-8c3a1780-640a-11eb-9324-7a9d26205814.png" alt="Recipe Edit 1" width="300px" /> <img src="https://user-images.githubusercontent.com/7461832/106396794-8c3a1780-640a-11eb-8d64-5eb4fc90faa9.png" alt="Recipe Edit 2" width="300px" />

<img src="https://user-images.githubusercontent.com/7461832/115114582-6e536c00-9f90-11eb-873f-5f2cf9ef1e82.png" alt="Recipe Import" width="300px" />



Expand Down
Binary file removed assets/IzzyOnDroid.png
Binary file not shown.
46 changes: 23 additions & 23 deletions assets/i18n/cs_CZ.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,46 +7,46 @@
"login": {
"title": "Přihlásit",
"server_url": {
"field": "URL Serveru",
"field": "URL adresa serveru",
"validator": {
"empty": "Prosím zadejte URL k vašemu Nextcloudu.",
"empty": "Prosím zadejte URL vámi využívané instance Nextcloud.",
"pattern": "Zadejte prosím platnou URL"
}
},
"username": {
"field": "Přezdívka"
"field": "Uživatelské jméno"
},
"password": {
"field": "Heslo"
},
"settings": {
"title": "Pokročilá nastavení",
"app_password": "Použít vygenerované heslo k aplikaci. \nPotřebné k účtům s 2FA",
"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!)"
},
"button": "Přihlásit",
"errors": {
"not_reachable": "Nelze se připojit k: {server_url}\n{error_msg}",
"certificate_failed": "Certifikát serveru nemohl být ověřen: {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 generované aplikací selhala:\n{error_msg}",
"parse_failed": "Nelze parsovat heslo generované aplikací:\n{error_msg}",
"parse_missing": "Nelze najít vygenerované heslo v odpovědi:\n{error_msg}",
"auth_failed": "Přezdívka a / nebo heslo je nesprávné!",
"authentication_not_found": "V uložišti nebyla nalezena autentifikace",
"failed_remove_remote": "Nepovedlo se odstranit heslo generované externí aplikací!",
"failure": "Proces přihlašování nebyl dokončen.\n{status_code}\n{status_message}",
"credentials_invalid": "Uložené přihlašovací údaje již nebyly platné a tak jste byl odhlášen!"
"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}",
"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!",
"failure": "Proces přihlašování se nepodařilo dokončit.\n{status_code}\n{status_message}",
"credentials_invalid": "Uložené přihlašovací údaje nebyly platné a proto jste byli odhlášeni!"
}
},
"categories": {
"title": "Kuchařka",
"all_categories": "Všechno",
"errors": {
"unknown": "Kategorie v neznámém stavu",
"load_failed": "Načítání kategorie selhalo: {error_msg}",
"load_no_response": "Nebylo možné získat kategorie ze serveru.",
"api_version_check_failed": "Nepovedlo se zjistit verzi API serveru:\n{error_msg}",
"api_version_above_confirmed": "Verze API serveru byla updatována. Některé služby nemusí fungovat, jako by se dalo očekávat. Počkejte prosím na update!\n{version}"
"load_failed": "Načítání kategorie se nezdařilo: {error_msg}",
"load_no_response": "Nepodařilo se získat kategorie ze serveru.",
"api_version_check_failed": "Nepovedlo se zjistit verzi API rozhraní serveru:\n{error_msg}",
"api_version_above_confirmed": "Verze API serveru byla updatována. Některé služby nemusí fungovat, tak jak se očekává. Počkejte prosím na update!\n{version}"
}
},
"recipe_list": {
Expand All @@ -62,26 +62,26 @@
"source": "Zdroj:",
"source_button": "Zdroj",
"time": {
"prep": "Čas na přípravu:",
"cook": "Čas vaření:",
"total": "Celkový čas:"
"prep": "Doba přípravy:",
"cook": "Doba vaření:",
"total": "Celková doba:"
},
"tools": "Nástroje:",
"ingredients": "Ingredience:",
"ingredients": "Přísady:",
"instructions": "Postup:"
},
"errors": {
"load_failed": "Nepovedlo se načíst recept!"
"load_failed": "Recept se nepovedlo načíst!"
}
},
"recipe_edit": {
"title": "Upravit recept",
"errors": {
"update_failed": "Update se nezdařil: {error_msg}"
"update_failed": "Aktualizace se nezdařila: {error_msg}"
}
},
"search": {
"title": "Hledat",
"nothing_found": "Žádný recept nebyl nalezen!"
"nothing_found": "Nenalezen žádný recept!"
}
}
2 changes: 1 addition & 1 deletion assets/i18n/de_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"field": "Server-URL",
"validator": {
"empty": "Bitte geben Sie die URL Ihrer Nextcloud an.",
"pattern": "Bitte eine gültige URL angeben"
"pattern": "Bitte eine gültige URL eingeben"
}
},
"username": {
Expand Down
12 changes: 12 additions & 0 deletions assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
"categories": {
"title": "Cookbook",
"all_categories": "All",
"drawer": {
"import": "Import Recipe"
},
"errors": {
"unknown": "Categories in unknown state",
"load_failed": "Category Load Failed: {error_msg}",
Expand Down Expand Up @@ -86,6 +89,15 @@
"update_failed": "Update Failed {error_msg}"
}
},
"recipe_import": {
"title": "Import Recipe",
"button": "Import",
"field": "URL to Recipe",
"clipboard": "Paste Clipboard",
"errors": {
"import_failed": "Import Failed {error_msg}"
}
},
"search": {
"title": "Search",
"nothing_found": "No recipe found!"
Expand Down
2 changes: 1 addition & 1 deletion assets/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"errors": {
"not_reachable": "No se puede alcanzar: {server_url} \n {error_msg}",
"certificate_failed": "No puede verificar el Certificado del servidor: {server_url} \n {error_msg}",
"request_failed": "Falló la consulta a la App Password {error_msg}",
"request_failed": "Falló la consulta a la App Password:\n{error_msg}",
"parse_failed": "¡No se pudo analizar la respuesta de App Password!\n{error_msg}",
"parse_missing": "¡No se pudo encontrar la respuesta de App Password!\n{error_msg}",
"auth_failed": "¡Usuario y/o contraseña incorrectos!",
Expand Down
23 changes: 12 additions & 11 deletions assets/i18n/fi_FI.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
},
"settings": {
"title": "Lisäasetukset",
"app_password": "Käytä itse luotua sovellussalasanaa,\njota tarvitaan tileillä, joilla on kaksivaiheisen tunnistautuminen (2FA) käytössä",
"self_signed_certificate": "Ohita virheellinen sertifikaatti\nTarvitaan itse allekirjoitetuille varmenteille\n(Käytä omalla vastuulla!) "
"app_password": "Käytä itse luotua sovellussalasanaa,\njota tarvitaan tileillä, joilla on kaksivaiheisen tunnistautuminen (2FA) käytössä.",
"self_signed_certificate": "Ohita virheellinen sertifikaatti.\nTarvitaan itse allekirjoitetuille varmenteille.\n(Käytä omalla vastuulla!) "
},
"button": "Kirjaudu sisään",
"errors": {
Expand Down Expand Up @@ -56,18 +56,19 @@
}
},
"recipe": {
"title": "Resepti",
"title": "Resepti:",
"fields": {
"servings": "Annoksia:",
"source": "Lähde",
"source": "Lähde:",
"source_button": "Lähde",
"time": {
"prep": "Esivalmistelujen kesto",
"cook": "Valmistuksen kesto",
"total": "Kokonaiskesto"
"prep": "Esivalmistelujen kesto:",
"cook": "Valmistuksen kesto:",
"total": "Kokonaiskesto:"
},
"tools": "Työvälineet",
"ingredients": "Ainesosat",
"instructions": "Ohjeet"
"tools": "Työvälineet:",
"ingredients": "Ainesosat:",
"instructions": "Ohjeet:"
},
"errors": {
"load_failed": "Reseptin lataus epäonnistui!"
Expand All @@ -83,4 +84,4 @@
"title": "Etsi",
"nothing_found": "Reseptiä ei löytynyt!"
}
}
}
2 changes: 1 addition & 1 deletion assets/i18n/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"errors": {
"not_reachable": "Kan {server_url} niet bereiken\n {error_msg}",
"certificate_failed": "Het certificaat van de server kon niet worden geverifieerd: {server_url} \n {error_msg}",
"request_failed": "App-wachtwoord aanvraag mislukt:\n {error_msg}",
"request_failed": "App wachtwoord aanvraag mislukt:\n {error_msg}",
"parse_failed": "Kan de App-wachtwoord reactie niet interpreteren!\n {error_msg}",
"parse_missing": "Kan App wachtwoord niet vinden in de reactie!\n {error_msg}",
"auth_failed": "Gebruikersnaam en / of wachtwoord onjuist!",
Expand Down
16 changes: 8 additions & 8 deletions assets/i18n/pt_BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
},
"button": "Entrar",
"errors": {
"not_reachable": "Cannot reach: {server_url}\n{error_msg}",
"certificate_failed": "The Certificate of the server could not be verified: {server_url}\n{error_msg}",
"request_failed": "AppPassword request failed:\n{error_msg}",
"parse_failed": "Cannot parse the App Password response!\n{error_msg}",
"parse_missing": "Cannot find App Password in response!\n{error_msg}",
"not_reachable": "Não pode alcançar: {server_url}\n{error_msg}",
"certificate_failed": "O certificado do servidor não pôde ser verificado: {server_url}\n{error_msg}",
"request_failed": "Falha na solicitação de senha de aplicativo: \n{error_msg}",
"parse_failed": "Não é possível analisar a resposta da senha do app!\n{error_msg}",
"parse_missing": "Não é possível encontrar a senha do app em resposta! \n{error_msg}",
"auth_failed": "Usuário e/ou senha incorretos!",
"authentication_not_found": "Nenhuma autenticação encontrada no Armazenamento",
"failed_remove_remote": "Failed to remove remote App Password!",
"failure": "Login Process could not finish properly.\n{status_code}\n{status_message}",
"failed_remove_remote": "Falha ao remover a senha do app remoto! ",
"failure": "O processo de login não pôde terminar corretamente. \n{status_code}\n{status_message}",
"credentials_invalid": "As credenciais armazenadas não eram mais válidas e você foi desconectado!"
}
},
Expand All @@ -46,7 +46,7 @@
"load_failed": "Falha ao carregar categoria: {error_msg}",
"load_no_response": "Não foi possível recuperar as categorias a partir do servidor.",
"api_version_check_failed": "Falha ao verificar a versão da API do servidor:\n{error_msg}",
"api_version_above_confirmed": "A versão da API do servidor foi atualizada. Alguns recursos podem não funcionar como esperado. Aguarde uma atualização!\n{version}"
"api_version_above_confirmed": "A versão API do servidor foi atualizada. Alguns recursos podem não funcionar como esperado. Por favor, espere por uma atualização! \n{version}"
}
},
"recipe_list": {
Expand Down
87 changes: 87 additions & 0 deletions assets/i18n/sc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
{
"app_bar": {
"search": "Chirca",
"refresh": "Agiorna",
"logout": "Essi·nche"
},
"login": {
"title": "Intra",
"server_url": {
"field": "Serbidore URL",
"validator": {
"empty": "Inserta s'URL in s'istàntzia tua de Nextcloud.",
"pattern": "Inserta un'URL vàlidu"
}
},
"username": {
"field": "Nùmene utente"
},
"password": {
"field": "Crae"
},
"settings": {
"title": "Impostatziones avantzadas",
"app_password": "Imprea sa crae de s'aplicatzione generada automaticamente.\nSerbit pro contos cun 2FA.",
"self_signed_certificate": "Non cunsideres su tzertificadu non vàlidu.\nSerbit pro tzertificados auto-firmados.\n(Sa responsabilidade de s'impreu est sa tua!)"
},
"button": "Intra",
"errors": {
"not_reachable": "Impossìbile lòmpere a: {server_url}\n{error_msg}",
"certificate_failed": "No at fatu a averguare su Tzertificadu de su serbidore: {server_url}\n{error_msg}",
"request_failed": "Rechesta de sa crae de s'aplicatzione faddida:\n{error_msg}",
"parse_failed": "Impossìbile analizare sa risposta de sa crae de s'aplicatzione!\n{error_msg}",
"parse_missing": "Impossìbile a agatare sa crae de s'aplicatzione in sa risposta!\n{error_msg}",
"auth_failed": "Su nùmene utente e / o sa crae no est curreta!",
"authentication_not_found": "Peruna autenticatzione agatada in Archiviatzione",
"failed_remove_remote": "No at fatu a nche bogare sa crae de s'aplicatzione remota!",
"failure": "Su atzessu no est agabbadu bene.\n{status_code}\n{status_message}",
"credentials_invalid": "Is credentziales sarvadas non fiant prus vàlidas e t'ant fatu essire!"
}
},
"categories": {
"title": "Libru de retzetas",
"all_categories": "Totu",
"errors": {
"unknown": "Categorias in istadu non connotu",
"load_failed": "Carrigamentu de categoria faddidu: {error_msg}",
"load_no_response": "No at fatu a recuperare is Categorias dae su serbidore.",
"api_version_check_failed": "No at fatu a controllare sa versione API in su serbidore:\n{error_msg}",
"api_version_above_confirmed": "Sa versione API de su serbidore s'est agiornada. Carchi funtzionalidade diat podet funtzionare comente prevìdidu. Abeta pro un'agiornamentu!\n{versione}"
}
},
"recipe_list": {
"title_category": "Categoria: {categoria}",
"errors": {
"load_failed": "No at fatu a carrigare is retzetas!"
}
},
"recipe": {
"title": "Retzeta:",
"fields": {
"servings": "Portziones:",
"source": "Fonte:",
"source_button": "Fonte",
"time": {
"prep": "Tempus de preparatzione:",
"cook": "Tempus de cotura:",
"total": "Tempus totale:"
},
"tools": "Ainas:",
"ingredients": "Ingredientes:",
"instructions": "Inditos:"
},
"errors": {
"load_failed": "No at fatu a carrigare sa retzeta!"
}
},
"recipe_edit": {
"title": "Modìfica retzeta",
"errors": {
"update_failed": "Agiornamentu faddidu {error_msg}"
}
},
"search": {
"title": "Chirca",
"nothing_found": "Peruna retzeta agatada!"
}
}
4 changes: 2 additions & 2 deletions assets/i18n/sl.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"errors": {
"not_reachable": "Povezava s strežnikom ni mogoča: {server_url} \n {error_msg}",
"certificate_failed": "Potrdila strežnika ni mogoče preveriti {server_url} \n{error_msg}",
"request_failed": "Zahteva za geslo programa je spodletela:\n{error_msg}",
"request_failed": "App Password request failed:\n{error_msg}",
"parse_failed": "Ni mogoče razčleniti odziva gesla programa!\n {error_msg}",
"parse_missing": "V odzivu ni mogoče najti odziva gesla programa!\n{error_msg}",
"auth_failed": "Uporabniško ime ali geslo ni veljavno!",
Expand All @@ -46,7 +46,7 @@
"load_failed": "Nalaganje kategorije je spodletelo: {error_msg}",
"load_no_response": "Ni mogoče pridobiti kategorij s strežnika.",
"api_version_check_failed": "Preverjanje različice API strežnika je spodletelo:\n {error_msg}",
"api_version_above_confirmed": "Različica vmesnika API strežnika je posodobljena. Nekatere zmožnosti morda ne bodo delovale pravilno. Počakajte na posodobitev!\n{version}"
"api_version_above_confirmed": "The API version of the Server was Updated. Some features might not work as expected. Please wait for an update!\n{version}"
}
},
"recipe_list": {
Expand Down
2 changes: 1 addition & 1 deletion assets/i18n/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"errors": {
"not_reachable": "Sunucuya erişilemedi: {server_url}\n{error_msg}",
"certificate_failed": "Sunucunun sertifikası doğrulanamadı: {server_url} \n{error_msg}",
"request_failed": "AppPassword isteği yapılamadı:\n {error_msg}",
"request_failed": "App Password isteği yapılamadı:\n{error_msg}",
"parse_failed": "AppPassword yanıtı işlenemedi!\n{error_msg}",
"parse_missing": "Yanıtta AppPassword bulunamadı!\n{error_msg}",
"auth_failed": "Kullanıcı adı ya da parola geçersiz!",
Expand Down
2 changes: 1 addition & 1 deletion assets/i18n/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"load_failed": "类别加载失败:{error_msg}",
"load_no_response": "无法从服务器取得类别",
"api_version_check_failed": "检查服务器的 API 版本失败:{error_msg}",
"api_version_above_confirmed": "服务器的 Api 版本已更新。有些功能可能不能像预期的那样工作。请等待更新!{version}"
"api_version_above_confirmed": "服务器的 API 版本已更新。一些功能可能不像预期得那样工作。请等待一个更新!{version}"
}
},
"recipe_list": {
Expand Down
Loading

0 comments on commit 9bddf08

Please sign in to comment.