Merge branch 'master' into feature/exercise-crowdsourcing

# Conflicts: # pubspec.lock # pubspec.yaml
2026-02-19 07:50:52 +01:00 · 2022-09-07 20:09:28 +02:00
parent a7cd041295 d4dc0db984
commit 4b6093f8a5
6 changed files with 137 additions and 114 deletions
--- a/fastlane/metadata/android/pt/full_description.txt
+++ b/fastlane/metadata/android/pt/full_description.txt
@@ -0,0 +1,39 @@
+De amantes de fitness a amantes de fitness - organize sua saúde com WGER, seu Workout Manager!
+
+Você já encontrou seu aplicativo de fitness n.º 1 e adora criar suas próprias rotinas esportivas? Não importa que tipo de animal esportivo você seja - todos nós temos algo em comum: adoramos acompanhar nossos dados de saúde <3
+
+Portanto, não o julgamos por você ainda gerenciar sua jornada de condicionamento físico com seu pequeno livro de registro de treino, mas bem-vindo a 2022!
+
+Desenvolvemos um aplicativo rastreador digital de saúde e condicionamento físico 100% gratuito para você, dimensionado para os recursos mais relevantes para facilitar sua vida. Comece, continue treinando, e comemore seu progresso!
+
+wger é um projeto de código aberto é sobre:
+* Seu corpo
+* Seus treinos
+* Seu progresso
+* Seus dados
+
+Seu corpo:
+Não há necessidade de pesquisar no Google os ingredientes de suas guloseimas favoritas - escolha suas refeições diárias entre mais de 78.000 produtos e veja os valores nutricionais. Adicione refeições ao plano nutricional e mantenha uma visão geral de sua dieta no calendário.
+
+Seus treinos:
+Você sabe o que é melhor para o seu corpo. Crie seus próprios treinos a partir de uma variedade crescente de 200 exercícios diferentes. Em seguida, use o Modo Academia para guiá-lo pelo treinamento enquanto registra seus pesos com um toque.
+
+Seu progresso:
+Nunca perca de vista seus objetivos. Acompanhe seu peso e mantenha suas estatísticas.
+
+Seus dados:
+wger é o seu diário de fitness personalizado - mas você possui seus dados. Use a API REST para acessar e fazer coisas incríveis com ela.
+
+Observação: este aplicativo gratuito não se baseia em financiamentos adicionais e não solicitamos que você doe dinheiro. Mais do que isso, é um projeto comunitário em constante crescimento. Portanto, esteja preparado para novos recursos a qualquer momento!
+
+#OpenSource – o que isso significa?
+
+Open Source significa que todo o código-fonte para este aplicativo e o servidor com o qual ele se comunica é gratuito e disponível para qualquer pessoa:
+* Você deseja executar o wger em seu próprio servidor para você ou em sua academia local? Vá em frente!
+* Você sente falta de um recurso e quer implementá-lo? Comece agora!
+* Deseja verificar se nada está sendo enviado para lugar algum? Você pode!
+
+Junte-se à nossa comunidade e torne-se parte dos entusiastas do esporte e geeks de TI de todo o mundo. Continuamos trabalhando para ajustar e otimizar o aplicativo personalizado às nossas necessidades. Adoramos sua opinião, então sinta-se à vontade para participar a qualquer momento e contribuir com seus desejos e ideias!
+
+-> encontre o código-fonte em https://github.com/wger-project
+-> tire suas dúvidas ou apenas dê um alô em nosso servidor do discord https://discord.gg/rPWFv6W
--- a/fastlane/metadata/android/pt/short_description.txt
+++ b/fastlane/metadata/android/pt/short_description.txt
@@ -0,0 +1 @@
+Fitness/treino, nutrição e controle de peso
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -536,5 +536,13 @@
  "close": "Fermer",
  "@close": {
    "description": "Translation for close"
+  },
+  "productFound": "Produit trouvé",
+  "@productFound": {
+    "description": "Header label for dialog when product is found with barcode"
+  },
+  "weekAverage": "Moyenne sur 7 jours",
+  "@weekAverage": {
+    "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week"
  }
 }
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -552,5 +552,9 @@
  "close": "Закрити",
  "@close": {
    "description": "Translation for close"
+  },
+  "rir": "RiR",
+  "@rir": {
+    "description": "Shorthand for Repetitions In Reserve"
  }
 }
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,14 +7,14 @@ packages:
      name: _fe_analyzer_shared
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "41.0.0"
+    version: "38.0.0"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.2.0"
+    version: "3.4.1"
  android_metadata:
    dependency: "direct main"
    description:
@@ -28,14 +28,14 @@ packages:
      name: archive
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.1.11"
+    version: "3.3.0"
  args:
    dependency: transitive
    description:
      name: args
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.1"
+    version: "2.3.0"
  async:
    dependency: transitive
    description:
@@ -77,7 +77,7 @@ packages:
      name: build_resolvers
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.9"
+    version: "2.0.8"
  build_runner:
    dependency: "direct dev"
    description:
@@ -105,7 +105,7 @@ packages:
      name: built_value
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "8.4.0"
+    version: "8.3.0"
  camera:
    dependency: "direct main"
    description:
@@ -126,7 +126,7 @@ packages:
      name: camera_avfoundation
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.9.8+2"
+    version: "0.9.7+1"
  camera_platform_interface:
    dependency: transitive
    description:
@@ -189,7 +189,7 @@ packages:
      name: chewie
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.3.4"
+    version: "1.3.2"
  chewie_audio:
    dependency: transitive
    description:
@@ -204,6 +204,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.1.1"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.5"
  clock:
    dependency: transitive
    description:
@@ -231,28 +238,28 @@ packages:
      name: convert
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.1"
  cross_file:
    dependency: transitive
    description:
      name: cross_file
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.3.3+1"
+    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:
      name: csslib
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.17.2"
+    version: "0.17.1"
  cupertino_icons:
    dependency: "direct main"
    description:
@@ -273,7 +280,7 @@ packages:
      name: equatable
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
  fake_async:
    dependency: transitive
    description:
@@ -287,7 +294,7 @@ packages:
      name: ffi
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.1"
+    version: "1.1.2"
  file:
    dependency: transitive
    description:
@@ -301,7 +308,7 @@ packages:
      name: fixnum
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.1"
+    version: "1.0.0"
  flutter:
    dependency: "direct main"
    description: flutter
@@ -321,11 +328,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.4.0"
-  flutter_driver:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
  flutter_html:
    dependency: "direct main"
    description:
@@ -339,7 +341,7 @@ packages:
      name: flutter_keyboard_visibility
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "5.3.0"
+    version: "5.2.0"
  flutter_keyboard_visibility_platform_interface:
    dependency: transitive
    description:
@@ -360,7 +362,7 @@ packages:
      name: flutter_launcher_icons
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.9.3"
+    version: "0.10.0"
  flutter_layout_grid:
    dependency: transitive
    description:
@@ -393,9 +395,9 @@ packages:
      name: flutter_plugin_android_lifecycle
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.7"
+    version: "2.0.5"
  flutter_svg:
-    dependency: "direct main"
+    dependency: transitive
    description:
      name: flutter_svg
      url: "https://pub.dartlang.org"
@@ -431,19 +433,14 @@ packages:
      name: frontend_server_client
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.3"
-  fuchsia_remote_debug_protocol:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
+    version: "2.1.2"
  glob:
    dependency: transitive
    description:
      name: glob
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.0"
+    version: "2.0.2"
  graphs:
    dependency: transitive
    description:
@@ -464,21 +461,21 @@ packages:
      name: http
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.13.4"
+    version: "0.13.5"
  http_multi_server:
    dependency: transitive
    description:
      name: http_multi_server
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.2.1"
+    version: "3.2.0"
  http_parser:
    dependency: transitive
    description:
      name: http_parser
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.0.1"
+    version: "4.0.0"
  image:
    dependency: transitive
    description:
@@ -492,40 +489,35 @@ packages:
      name: image_picker
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.8.5+3"
+    version: "0.8.5"
  image_picker_android:
    dependency: transitive
    description:
      name: image_picker_android
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.8.5+1"
+    version: "0.8.4+11"
  image_picker_for_web:
    dependency: transitive
    description:
      name: image_picker_for_web
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.8"
+    version: "2.1.6"
  image_picker_ios:
    dependency: transitive
    description:
      name: image_picker_ios
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.8.5+6"
+    version: "0.8.5"
  image_picker_platform_interface:
    dependency: transitive
    description:
      name: image_picker_platform_interface
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.5.0"
-  integration_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
+    version: "2.4.4"
  intl:
    dependency: "direct main"
    description:
@@ -630,14 +622,7 @@ packages:
      name: mockito
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "5.2.0"
-  multi_select_flutter:
-    dependency: "direct main"
-    description:
-      name: multi_select_flutter
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.1.2"
+    version: "5.3.0"
  nested:
    dependency: transitive
    description:
@@ -665,7 +650,7 @@ packages:
      name: package_config
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.0"
+    version: "2.0.2"
  package_info:
    dependency: "direct main"
    description:
@@ -700,28 +685,28 @@ packages:
      name: path_provider_linux
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.7"
+    version: "2.1.5"
  path_provider_platform_interface:
    dependency: transitive
    description:
      name: path_provider_platform_interface
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.4"
+    version: "2.0.3"
  path_provider_windows:
    dependency: transitive
    description:
      name: path_provider_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.0"
+    version: "2.0.5"
  petitparser:
    dependency: transitive
    description:
      name: petitparser
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "5.0.0"
+    version: "4.4.0"
  platform:
    dependency: transitive
    description:
@@ -742,7 +727,7 @@ packages:
      name: pool
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.5.1"
+    version: "1.5.0"
  process:
    dependency: transitive
    description:
@@ -791,7 +776,7 @@ packages:
      name: rive
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.9.0"
+    version: "0.9.1"
  shared_preferences:
    dependency: "direct main"
    description:
@@ -805,28 +790,28 @@ packages:
      name: shared_preferences_android
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.12"
+    version: "2.0.11"
  shared_preferences_ios:
    dependency: transitive
    description:
      name: shared_preferences_ios
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.0"
  shared_preferences_linux:
    dependency: transitive
    description:
      name: shared_preferences_linux
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.0"
  shared_preferences_macos:
    dependency: transitive
    description:
      name: shared_preferences_macos
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.4"
+    version: "2.0.3"
  shared_preferences_platform_interface:
    dependency: transitive
    description:
@@ -840,28 +825,28 @@ packages:
      name: shared_preferences_web
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.4"
+    version: "2.0.3"
  shared_preferences_windows:
    dependency: transitive
    description:
      name: shared_preferences_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.0"
  shelf:
    dependency: transitive
    description:
      name: shelf
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.3.1"
+    version: "1.3.0"
  shelf_web_socket:
    dependency: transitive
    description:
      name: shelf_web_socket
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.2"
+    version: "1.0.1"
  simple_gesture_detector:
    dependency: transitive
    description:
@@ -923,13 +908,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:
@@ -985,28 +963,28 @@ packages:
      name: url_launcher_android
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "6.0.17"
+    version: "6.0.16"
  url_launcher_ios:
    dependency: transitive
    description:
      name: url_launcher_ios
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "6.0.17"
+    version: "6.0.15"
  url_launcher_linux:
    dependency: transitive
    description:
      name: url_launcher_linux
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.0"
  url_launcher_macos:
    dependency: transitive
    description:
      name: url_launcher_macos
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.0"
  url_launcher_platform_interface:
    dependency: transitive
    description:
@@ -1020,14 +998,14 @@ packages:
      name: url_launcher_web
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.12"
+    version: "2.0.9"
  url_launcher_windows:
    dependency: transitive
    description:
      name: url_launcher_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.0"
  vector_math:
    dependency: transitive
    description:
@@ -1049,55 +1027,55 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.1.0"
+  very_good_analysis:
+    dependency: transitive
+    description:
+      name: very_good_analysis
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  video_player:
    dependency: "direct main"
    description:
      name: video_player
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.4.5"
+    version: "2.4.7"
  video_player_android:
    dependency: transitive
    description:
      name: video_player_android
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.7"
+    version: "2.3.6"
  video_player_avfoundation:
    dependency: transitive
    description:
      name: video_player_avfoundation
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.5"
+    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.3"
+    version: "5.1.2"
  video_player_web:
    dependency: transitive
    description:
      name: video_player_web
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.10"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "8.2.2"
+    version: "2.0.8"
  wakelock:
    dependency: transitive
    description:
      name: wakelock
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.6.2"
+    version: "0.6.1+2"
  wakelock_macos:
    dependency: transitive
    description:
@@ -1140,13 +1118,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.2.0"
-  webdriver:
-    dependency: transitive
-    description:
-      name: webdriver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
  webview_flutter:
    dependency: transitive
    description:
@@ -1160,28 +1131,28 @@ packages:
      name: webview_flutter_android
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.8.14"
+    version: "2.8.6"
  webview_flutter_platform_interface:
    dependency: transitive
    description:
      name: webview_flutter_platform_interface
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.9.1"
+    version: "1.8.1"
  webview_flutter_wkwebview:
    dependency: transitive
    description:
      name: webview_flutter_wkwebview
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.9.1"
+    version: "2.7.3"
  win32:
    dependency: transitive
    description:
      name: win32
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.7.0"
+    version: "2.5.2"
  xdg_directories:
    dependency: transitive
    description:
@@ -1195,14 +1166,14 @@ packages:
      name: xml
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "5.4.1"
+    version: "5.3.1"
  yaml:
    dependency: transitive
    description:
      name: yaml
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.1.1"
+    version: "3.1.0"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  dart: ">=2.17.0-206.0.dev <3.0.0"
+  flutter: ">=2.10.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -36,24 +36,24 @@ dependencies:
  charts_flutter: ^0.12.0
  collection: ^1.15.0-nullsafety.4
  cupertino_icons: ^1.0.5
-  equatable: ^2.0.3
+  equatable: ^2.0.5
  flutter_calendar_carousel: ^2.4.0
  flutter_html: ^2.2.1
  flutter_typeahead: ^4.0.0
  font_awesome_flutter: ">=9.1.0 <11.0.0"
-  http: ^0.13.3
+  http: ^0.13.5
  image_picker: ^0.8.4+9
  intl: ^0.17.0
  json_annotation: ^4.5.0
  version: ^3.0.2
  package_info: ^2.0.2
  provider: ^6.0.3
-  rive: ^0.9.0
+  rive: ^0.9.1
  shared_preferences: ^2.0.15
  table_calendar: ^3.0.6
  url_launcher: ^6.1.5
  flutter_barcode_scanner: ^2.0.0
-  video_player: ^2.4.5
+  video_player: ^2.4.7,
  multi_select_flutter: ^4.1.2
  flutter_svg: ^0.23.0+1

@@ -63,9 +63,9 @@ dev_dependencies:
  integration_test:
    sdk: flutter
  build_runner: ^2.2.0
-  flutter_launcher_icons: ^0.9.3
+  flutter_launcher_icons: ^0.10.0
  json_serializable: ^6.3.1
-  mockito: ^5.2.0
+  mockito: ^5.3.0
  network_image_mock: ^2.1.1
  flutter_lints: ^2.0.1
  cider: ^0.1.1
				`@@ -0,0 +1 @@`
				`Fitness/treino, nutrição e controle de peso`