wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 23:42:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/exercise-crowdsourcing

Browse Source 
# Conflicts:
#	pubspec.lock
#	pubspec.yaml
This commit is contained in:
Roland Geider
2022-05-10 14:47:56 +02:00
parent 8bd0c99816 46ad19dd45
commit f2ebfc9c75
4 changed files with 98 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
fastlane/metadata/android/README.md
View File

@@ -1,4 +1,6 @@
# Dry-run release before uploading
# Release process
## 1. Dry-run release before uploading
* Increase build nr in pubspec.yaml
* `flutter build appbundle --release`
@@ -7,13 +9,22 @@
It might be necessary to repeat these steps if upload_to_play_store returns any errors
such as a missing title or similar.
# Accepted language codes
Also note that if a language was added over the weblate UI, it might be necessary
to set the correct language code:
<https://support.google.com/googleplay/android-developer/answer/9844778?hl=en#zippy=%2Cview-list-of-available-languages>
https://support.google.com/googleplay/android-developer/answer/9844778?hl=en#zippy=%2Cview-list-of-available-languages
## 2. Push tags to trigger release
# Push tags to trigger release
Make sure that the commit that will be tagged was already pushed or didn't change
any dart code, otherwise the automatic linter might push a "correction" commit
and the build step will fail.
Set the vX.Y.Z tag here, push it and delete it, since it gets re-created by github actions
to just X.Y.Z
Set the vX.Y.Z tag locally, push it and delete it. It will get recreated to X.Y.Z.
by github actions.
`TAG=vX.Y.Z && git tag $TAG && git push origin $TAG && git tag -d $TAG`
`TAG=vX.Y.Z && git tag $TAG && git push origin $TAG && git tag -d $TAG`
## 3. Edit release
I necessary, edit the created release on github

42
lib/l10n/app_uk.arb Normal file
View File

@@ -0,0 +1,42 @@
{
"weight": "Вага",
"@weight": {
"description": "The weight of a workout log or body weight entry"
},
"login": "Увійти",
"@login": {
"description": "Text for login button"
},
"logout": "Вийти",
"@logout": {
"description": "Text for logout button"
},
"register": "Реєстрація",
"@register": {
"description": "Text for registration button"
},
"useDefaultServer": "Використати сервер за замовчуванням",
"@useDefaultServer": {
"description": "Toggle button allowing users to switch between the default and a custom wger server"
},
"useCustomServer": "Використати користувацький сервер",
"@useCustomServer": {
"description": "Toggle button allowing users to switch between the default and a custom wger server"
},
"invalidUrl": "Будь ласка, введіть прийнятну URL-адресу",
"@invalidUrl": {
"description": "Error message when the user enters an invalid URL, e.g. in the login form"
},
"nutritionalPlan": "План харчування",
"@nutritionalPlan": {},
"difference": "Різниця",
"@difference": {},
"edit": "Змінити",
"@edit": {},
"delete": "Видалити",
"@delete": {},
"date": "Дата",
"@date": {
"description": "The date of a workout log or body weight entry"
}
}

105
pubspec.lock
View File

@@ -28,7 +28,7 @@ packages:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.6"
version: "3.3.0"
args:
dependency: transitive
description:
@@ -56,7 +56,7 @@ packages:
name: build
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
version: "2.3.0"
build_config:
dependency: transitive
description:
@@ -70,21 +70,21 @@ packages:
name: build_daemon
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.1"
version: "3.1.0"
build_resolvers:
dependency: transitive
description:
name: build_resolvers
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.6"
version: "2.0.8"
build_runner:
dependency: "direct dev"
description:
name: build_runner
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.8"
version: "2.1.10"
build_runner_core:
dependency: transitive
description:
@@ -105,21 +105,21 @@ packages:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
version: "8.1.4"
version: "8.3.0"
camera:
dependency: "direct main"
description:
name: camera
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.4+19"
version: "0.9.4+21"
camera_platform_interface:
dependency: transitive
description:
name: camera_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.5"
version: "2.1.6"
camera_web:
dependency: transitive
description:
@@ -175,7 +175,7 @@ packages:
name: chewie
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
version: "1.3.2"
chewie_audio:
dependency: transitive
description:
@@ -224,14 +224,14 @@ packages:
name: cross_file
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.2"
version: "0.3.3"
crypto:
dependency: transitive
description:
name: crypto
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.1"
version: "3.0.2"
csslib:
dependency: transitive
description:
@@ -252,7 +252,7 @@ packages:
name: dart_style
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.2"
version: "2.2.3"
equatable:
dependency: "direct main"
description:
@@ -307,11 +307,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
flutter_driver:
dependency: transitive
description: flutter
source: sdk
version: "0.0.0"
flutter_html:
dependency: "direct main"
description:
@@ -381,7 +376,7 @@ packages:
source: hosted
version: "2.0.5"
flutter_svg:
dependency: "direct main"
dependency: transitive
description:
name: flutter_svg
url: "https://pub.dartlang.org"
@@ -398,7 +393,7 @@ packages:
name: flutter_typeahead
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.4"
version: "3.2.5"
flutter_web_plugins:
dependency: transitive
description: flutter
@@ -418,11 +413,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.2"
fuchsia_remote_debug_protocol:
dependency: transitive
description: flutter
source: sdk
version: "0.0.0"
glob:
dependency: transitive
description:
@@ -499,7 +489,7 @@ packages:
name: image_picker_ios
url: "https://pub.dartlang.org"
source: hosted
version: "0.8.4+11"
version: "0.8.5"
image_picker_platform_interface:
dependency: transitive
description:
@@ -507,11 +497,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.4"
integration_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
intl:
dependency: "direct main"
description:
@@ -539,14 +524,14 @@ packages:
name: json_annotation
url: "https://pub.dartlang.org"
source: hosted
version: "4.4.0"
version: "4.5.0"
json_serializable:
dependency: "direct dev"
description:
name: json_serializable
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.5"
version: "6.2.0"
klizma:
dependency: transitive
description:
@@ -609,7 +594,7 @@ packages:
name: mime
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "1.0.2"
mockito:
dependency: "direct dev"
description:
@@ -617,13 +602,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "5.1.0"
multi_select_flutter:
dependency: "direct main"
description:
name: multi_select_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "4.1.2"
nested:
dependency: transitive
description:
@@ -763,7 +741,7 @@ packages:
name: quiver
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.1+1"
version: "3.1.0"
rfc_6901:
dependency: transitive
description:
@@ -866,14 +844,14 @@ packages:
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.1"
version: "1.2.2"
source_helper:
dependency: transitive
description:
name: source_helper
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
version: "1.3.2"
source_span:
dependency: transitive
description:
@@ -909,13 +887,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
sync_http:
dependency: transitive
description:
name: sync_http
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.0"
table_calendar:
dependency: "direct main"
description:
@@ -964,14 +935,14 @@ packages:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.20"
version: "6.1.0"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.15"
version: "6.0.16"
url_launcher_ios:
dependency: transitive
description:
@@ -1048,7 +1019,7 @@ packages:
name: video_player
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.0"
version: "2.4.0"
video_player_android:
dependency: transitive
description:
@@ -1062,28 +1033,21 @@ packages:
name: video_player_avfoundation
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.1"
version: "2.3.3"
video_player_platform_interface:
dependency: transitive
description:
name: video_player_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "5.1.1"
version: "5.1.2"
video_player_web:
dependency: transitive
description:
name: video_player_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.7"
vm_service:
dependency: transitive
description:
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
version: "7.5.0"
version: "2.0.8"
wakelock:
dependency: transitive
description:
@@ -1132,14 +1096,7 @@ packages:
name: web_socket_channel
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
webdriver:
dependency: transitive
description:
name: webdriver
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.0"
version: "2.2.0"
webview_flutter:
dependency: transitive
description:
@@ -1153,7 +1110,7 @@ packages:
name: webview_flutter_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.5"
version: "2.8.6"
webview_flutter_platform_interface:
dependency: transitive
description:
@@ -1167,14 +1124,14 @@ packages:
name: webview_flutter_wkwebview
url: "https://pub.dartlang.org"
source: hosted
version: "2.7.2"
version: "2.7.3"
win32:
dependency: transitive
description:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "2.5.1"
version: "2.5.2"
xdg_directories:
dependency: transitive
description:

14
pubspec.yaml
View File

@@ -39,23 +39,23 @@ dependencies:
equatable: ^2.0.3
flutter_calendar_carousel: ^2.0.3
flutter_html: ^2.1.2
flutter_typeahead: ^3.2.0
flutter_typeahead: ^3.2.5
font_awesome_flutter: ">=9.1.0 <11.0.0"
http: ^0.13.3
image_picker: ^0.8.4+11
intl: ^0.17.0
json_annotation: ^4.3.0
json_annotation: ^4.5.0
version: ^2.0.0
package_info: ^2.0.2
provider: ^6.0.1
rive: ^0.8.1
shared_preferences: ^2.0.13
table_calendar: ^3.0.4
url_launcher: ^6.0.20
table_calendar: ^3.0.2
url_launcher: ^6.1.0
flutter_barcode_scanner: ^2.0.0
video_player: ^2.3.0
video_player: ^2.4.0
multi_select_flutter: ^4.0.0
flutter_svg: ^0.23.0+1
flutter_svg: ^0.23.0+1
dev_dependencies:
flutter_test:
@@ -64,7 +64,7 @@ dev_dependencies:
sdk: flutter
build_runner: ^2.1.2
flutter_launcher_icons: ^0.9.1
json_serializable: ^6.1.5
json_serializable: ^6.2.0
mockito: ^5.1.0
network_image_mock: ^2.0.1
flutter_lints: ^1.0.4