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.7.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
Teifun2 committed Mar 25, 2023
2 parents e2df4e0 + 0b08cc3 commit 68b1de2
Show file tree
Hide file tree
Showing 91 changed files with 2,117 additions and 1,671 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: "Build"
on:
pull_request:
types: [review_requested, ready_for_review]
push:
jobs:
build:
Expand All @@ -11,7 +12,7 @@ jobs:
with:
java-version: '12.x'
distribution: 'adopt'
- uses: subosito/flutter-action@v2.7.1
- uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.3.0'
- run: flutter pub get
Expand Down
5 changes: 3 additions & 2 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[main]
host = https://www.transifex.com

[nextcloud.cookbook_flutter]
[o:nextcloud:p:nextcloud:r:cookbook_flutter]
file_filter = assets/i18n/<lang>.json
source_file = assets/i18n/en.json
source_lang = en
type = KEYVALUEJSON
type = KEYVALUEJSON

9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
![GitHub](https://img.shields.io/github/license/Teifun2/nextcloud-cookbook-flutter) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/Teifun2/nextcloud-cookbook-flutter) ![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/Teifun2/nextcloud-cookbook-flutter/Build/master)
![GitHub](https://img.shields.io/github/license/Teifun2/nextcloud-cookbook-flutter) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/Teifun2/nextcloud-cookbook-flutter) ![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/Teifun2/nextcloud-cookbook-flutter/build.yml?branch=master)

[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
alt="Get it on F-Droid"
height="80">](https://f-droid.org/packages/com.nextcloud_cookbook_flutter/)
[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
[<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"
alt="Get it on Google Play"
height="80">](https://play.google.com/store/apps/details?id=com.nextcloud_cookbook_flutter)
[<img src="https://developer.apple.com/assets/elements/badges/download-on-the-app-store.svg"
[<img src="https://user-images.githubusercontent.com/7461832/211680075-d3a9e06d-0f41-4153-8f54-7ed133f854b1.png"
alt="Get it on the App Store"
height="55" style="padding-bottom: 12px; padding-left: 10px">](https://apps.apple.com/us/app/nextcloud-cookbook/id1619926634)
height="82" style="padding-bottom: 20px; padding-left: 10px">](https://apps.apple.com/us/app/nextcloud-cookbook/id1619926634)


# Nextcloud Cookbook Mobile Client written in Flutter

Expand Down
7 changes: 7 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file configures the analyzer to use the lint rule set from `package:lint`

include: package:lint/strict.yaml

linter:
rules:
sort_pub_dependencies: false
2 changes: 1 addition & 1 deletion assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"recipe_font_size": {
"title": "Rezept Schriftgröße",
"subtitle": "Ändert die Schriftgröße von Rezeptwerkzeugen, Zutaten und Anweisungen für eine bessere Lesbarkeit."
"subtitle": "Ändert die Schriftgröße von \"Utensilien\", \"Zutaten\" und \"Zubereitung\" für eine bessere Lesbarkeit."
},
"category_font_size": {
"title": "Kategorie Schriftgröße",
Expand Down
175 changes: 175 additions & 0 deletions assets/i18n/en_GB.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
{
"app_bar": {
"search": "Search",
"refresh": "Refresh",
"logout": "Logout",
"clear_all": "Clear all"
},
"login": {
"title": "Login",
"server_url": {
"field": "Server URL",
"validator": {
"empty": "Please enter the URL to your Nextcloud instance.",
"pattern": "Please enter a valid URL"
}
},
"username": {
"field": "Username"
},
"password": {
"field": "Password"
},
"settings": {
"title": "Advanced Settings",
"app_password": "Use self generated App Password.\nNeeded for accounts with 2FA.",
"self_signed_certificate": "Ignore invalid certificate.\nNeeded for self signed certificates.\n(Use at your own risk!)"
},
"button": "Login",
"retry": "Retry Login!",
"reset": "Reset Credentials!",
"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": "App Password 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}",
"auth_failed": "Username and / or Password is incorrect!",
"authentication_not_found": "No authentication found in Storage",
"failed_remove_remote": "Failed to remove remote App Password!",
"failure": "Login Process could not finish properly.\n{status_code}\n{status_message}",
"credentials_invalid": "The stored credentials where no longer valid an you have been logged out!",
"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}"
}
},
"categories": {
"title": "Cookbook",
"all_categories": "All",
"drawer": {
"import": "Import Recipe",
"settings": "Settings"
},
"errors": {
"unknown": "Categories in unknown state",
"load_failed": "Category load failed: {error_msg}",
"load_no_response": "Could not retrieve the Categories from the server.",
"api_version_check_failed": "Failed to check the API version of the server:\n{error_msg}",
"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}",
"plugin_missing": "Categories could not be loaded. Make sure that the Cookbook plugin is installed on this Nextcloud instance!"
}
},
"recipe_list": {
"title_category": "Category: {category}",
"errors": {
"load_failed": "Failed to load Recipes Short!"
}
},
"recipe": {
"title": "Recipe:",
"prep": "Preparation time",
"cook": "Cooking time",
"total": "Total time",
"fields": {
"name": "Recipe Name:",
"description": "Recipe Description:",
"keywords": "Keywords:",
"category": "Category:",
"servings": "Servings:",
"source": "Source:",
"source_button": "Source",
"image": "Image:",
"time": {
"prep": "Preparation time:",
"cook": "Cooking time:",
"total": "Total time:",
"hours": "Hours",
"minutes": "Minutes"
},
"nutrition": {
"title": "Nutrition Information",
"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"
}
},
"tools": "Tools:",
"ingredients": "Ingredients:",
"instructions": "Instructions:"
},
"errors": {
"load_failed": "Failed to load Recipe!"
}
},
"recipe_edit": {
"title": "Edit Recipe",
"button": "Save",
"errors": {
"update_failed": "Update Failed {error_msg}"
}
},
"recipe_create": {
"title": "Create Recipe",
"button": "Create",
"errors": {
"update_failed": "Create 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 Recipe",
"nothing_found": "No recipe found!",
"errors": {
"search_failed": "Unable to load all Recipes!\n{error_msg}"
}
},
"timer": {
"title": "Your timers",
"started": "Timer started.",
"finished": "is finished.",
"done": "Timer is done.",
"missing": "You need to set the cooking time to use a timer."
},
"settings": {
"title": "App Settings",
"dark_mode": {
"title": "Dark Mode",
"system": "System Default",
"dark": "Always",
"light": "Never"
},
"language": {
"title": "Language"
},
"stay_awake": {
"title": "Stay Awake",
"subtitle": "Screen will stay on while on the recipe screen."
},
"recipe_font_size": {
"title": "Recipe Font Size",
"subtitle": "Changes the font size of recipe tools, ingredients and instructions for better readability."
},
"category_font_size": {
"title": "Category Font Size",
"subtitle": "Changes the font size of category title. This can be useful if you have long category names."
}
}
}
2 changes: 1 addition & 1 deletion assets/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"recipe_list": {
"title_category": "Catégorie : {category}",
"errors": {
"load_failed": "Failed to load Recipes Short!"
"load_failed": "Impossible de charger le raccourci de recette!"
}
},
"recipe": {
Expand Down
6 changes: 3 additions & 3 deletions assets/i18n/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"button": "Inloggen",
"retry": "Retry Login!",
"reset": "Reset Credentials!",
"reset": "Reset inloggegevens",
"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}",
Expand All @@ -39,8 +39,8 @@
"failed_remove_remote": "Kon het remote App-wachtwoord niet verwijderen!",
"failure": "Het inlogproces kon niet goed eindigen.\n {status_code}\n {status_message}",
"credentials_invalid": "De opgeslagen inloggegevens zijn niet meer geldig en je bent uitgelogd!",
"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": "Authenticatie is niet gelukt.\nMisschien is er geen internetverbinding?\nFoutmelding: {error_msg}",
"wrong_status": "Authenticatiecontrole is niet gelukt.\nMisschien is de opgegeven host niet correct?\nFoutmelding: {error_msg}"
}
},
"categories": {
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 @@ -26,7 +26,7 @@
"self_signed_certificate": "忽略无效证书对自签名证书是必须的(使用风险自担!)"
},
"button": "登录",
"retry": "Retry Login!",
"retry": "重试登录!",
"reset": "Reset Credentials!",
"errors": {
"not_reachable": "无法抵达:{server_url}{error_msg}",
Expand Down
5 changes: 5 additions & 0 deletions build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
targets:
$default:
builders:
copy_with_extension_gen:
enabled: true
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/24.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- API Update
- Bugfixes
Loading

0 comments on commit 68b1de2

Please sign in to comment.