wger-project / flutter

46%

master: 54%

LAST BUILD ON BRANCH fix/terminology

branch: fix/terminology

CHANGE BRANCH

x

Reset

• fix/terminology
• 784-fix-timer-issue
• add-const-key-dashboard
• api-token
• calendarFix
• chart-weight-since-plan
• chore/update-flutter
• dart-fix-apply
• dcm-fix
• dependabot/github_actions/actions/checkout-6
• dependabot/pub/build_runner-2.10.1
• dependabot/pub/build_runner-2.10.4
• dependabot/pub/build_runner-2.3.0
• dependabot/pub/build_runner-2.3.2
• dependabot/pub/build_runner-2.3.3
• dependabot/pub/build_runner-2.4.12
• dependabot/pub/build_runner-2.4.13
• dependabot/pub/build_runner-2.4.14
• dependabot/pub/build_runner-2.4.15
• dependabot/pub/build_runner-2.4.8
• dependabot/pub/build_runner-2.4.9
• dependabot/pub/build_runner-2.5.3
• dependabot/pub/build_runner-2.5.4
• dependabot/pub/build_runner-2.6.0
• dependabot/pub/build_runner-2.7.0
• dependabot/pub/build_runner-2.7.1
• dependabot/pub/build_runner-2.7.2
• dependabot/pub/build_runner-2.8.0
• dependabot/pub/build_runner-2.9.0
• dependabot/pub/camera-0.10.1
• dependabot/pub/camera-0.10.21
• dependabot/pub/camera-0.10.3
• dependabot/pub/carousel_slider-4.2.0
• dependabot/pub/carousel_slider-4.2.1
• dependabot/pub/carousel_slider-5.1.1
• dependabot/pub/cider-0.1.21
• dependabot/pub/cider-0.1.3
• dependabot/pub/cider-0.1.4
• dependabot/pub/cider-0.1.5
• dependabot/pub/cider-0.1.6
• dependabot/pub/cider-0.2.6
• dependabot/pub/cider-0.2.7
• dependabot/pub/cider-0.2.9
• dependabot/pub/cupertino_icons-1.0.6
• dependabot/pub/cupertino_icons-1.0.8
• dependabot/pub/drift-2.15.0
• dependabot/pub/drift-2.16.0
• dependabot/pub/drift-2.18.0
• dependabot/pub/drift-2.22.1
• dependabot/pub/drift-2.23.1
• dependabot/pub/drift-2.25.0
• dependabot/pub/drift-2.25.1
• dependabot/pub/drift-2.26.0
• dependabot/pub/drift-2.26.1
• dependabot/pub/drift-2.27.0
• dependabot/pub/drift-2.28.2
• dependabot/pub/drift-2.29.0
• dependabot/pub/drift-2.30.0
• dependabot/pub/drift_dev-2.15.0
• dependabot/pub/drift_dev-2.16.0
• dependabot/pub/drift_dev-2.17.0
• dependabot/pub/drift_dev-2.18.0
• dependabot/pub/drift_dev-2.20.3
• dependabot/pub/drift_dev-2.22.0
• dependabot/pub/drift_dev-2.22.1
• dependabot/pub/drift_dev-2.23.1
• dependabot/pub/drift_dev-2.25.0
• dependabot/pub/drift_dev-2.25.2
• dependabot/pub/drift_dev-2.26.0
• dependabot/pub/drift_dev-2.26.1
• dependabot/pub/drift_dev-2.27.0
• dependabot/pub/drift_dev-2.28.0
• dependabot/pub/drift_dev-2.28.1
• dependabot/pub/drift_dev-2.28.2
• dependabot/pub/drift_dev-2.28.3
• dependabot/pub/drift_dev-2.29.0
• dependabot/pub/drift_dev-2.30.0
• dependabot/pub/equatable-2.0.7
• dependabot/pub/fl_chart-0.65.0
• dependabot/pub/fl_chart-0.66.0
• dependabot/pub/fl_chart-0.66.1
• dependabot/pub/fl_chart-0.66.2
• dependabot/pub/fl_chart-0.68.0
• dependabot/pub/fl_chart-0.69.0
• dependabot/pub/fl_chart-0.69.2
• dependabot/pub/fl_chart-1.1.0
• dependabot/pub/fl_chart-1.1.1
• dependabot/pub/flex_color_scheme-8.0.1
• dependabot/pub/flex_color_scheme-8.0.2
• dependabot/pub/flex_color_scheme-8.1.0
• dependabot/pub/flex_color_scheme-8.1.1
• dependabot/pub/flex_color_scheme-8.3.1
• dependabot/pub/flex_seed_scheme-1.5.0
• dependabot/pub/flex_seed_scheme-3.5.0
• dependabot/pub/flex_seed_scheme-3.5.1
• dependabot/pub/flex_seed_scheme-3.6.1
• dependabot/pub/flex_seed_scheme-4.0.1
• dependabot/pub/flutter_calendar_carousel-2.4.1
• dependabot/pub/flutter_calendar_carousel-2.4.4
• dependabot/pub/flutter_html-3.0.0
• dependabot/pub/flutter_html-3.0.0-beta.2
• dependabot/pub/flutter_launcher_icons-0.11.0
• dependabot/pub/flutter_launcher_icons-0.13.1
• dependabot/pub/flutter_launcher_icons-and-flutter_html-and-flutter_svg-0.12.0
• dependabot/pub/flutter_lints-2.0.2
• dependabot/pub/flutter_lints-2.0.3
• dependabot/pub/flutter_lints-3.0.2
• dependabot/pub/flutter_lints-4.0.0
• dependabot/pub/flutter_lints-5.0.0
• dependabot/pub/flutter_lints-6.0.0
• dependabot/pub/flutter_staggered_grid_view-0.7.0
• dependabot/pub/flutter_svg-2.0.101
• dependabot/pub/flutter_svg-2.0.11
• dependabot/pub/flutter_svg-2.0.14
• dependabot/pub/flutter_svg-2.0.16
• dependabot/pub/flutter_svg-2.0.17
• dependabot/pub/flutter_svg-2.1.0
• dependabot/pub/flutter_svg-2.2.0
• dependabot/pub/flutter_svg-2.2.1
• dependabot/pub/flutter_svg-2.2.2
• dependabot/pub/flutter_svg-2.2.3
• dependabot/pub/flutter_svg-and-flutter_html-1.1.5
• dependabot/pub/flutter_svg-and-flutter_html-2.0.2
• dependabot/pub/flutter_svg-and-flutter_html-2.0.3
• dependabot/pub/flutter_svg-and-flutter_html-2.0.4
• dependabot/pub/flutter_svg-and-flutter_launcher_icons-and-flutter_html-2.0.4
• dependabot/pub/flutter_svg-and-flutter_launcher_icons-and-flutter_html-2.0.5
• dependabot/pub/flutter_svg-and-flutter_launcher_icons-and-rive-and-camera-and-flutter_html-2.0.4
• dependabot/pub/flutter_svg-and-video_player-and-image_picker-and-flutter_launcher_icons-and-flutter_html-2.0.4
• dependabot/pub/flutter_typeahead-4.3.2
• dependabot/pub/flutter_typeahead-4.3.3
• dependabot/pub/flutter_typeahead-4.3.6
• dependabot/pub/flutter_typeahead-4.3.7
• dependabot/pub/flutter_typeahead-4.3.8
• dependabot/pub/flutter_typeahead-4.4.0
• dependabot/pub/flutter_typeahead-4.6.1
• dependabot/pub/flutter_typeahead-4.6.2
• dependabot/pub/flutter_typeahead-4.7.0
• dependabot/pub/flutter_typeahead-4.8.0
• dependabot/pub/flutter_typeahead-5.0.2
• dependabot/pub/flutter_typeahead-5.2.0
• dependabot/pub/flutter_zxing-1.5.2
• dependabot/pub/flutter_zxing-1.8.1
• dependabot/pub/flutter_zxing-1.8.2
• dependabot/pub/flutter_zxing-2.0.0
• dependabot/pub/flutter_zxing-2.1.0
• dependabot/pub/font_awesome_flutter-10.10.0
• dependabot/pub/font_awesome_flutter-10.11.0
• dependabot/pub/font_awesome_flutter-10.12.0
• dependabot/pub/font_awesome_flutter-10.3.0
• dependabot/pub/font_awesome_flutter-10.4.0
• dependabot/pub/font_awesome_flutter-10.7.0
• dependabot/pub/font_awesome_flutter-10.8.0
• dependabot/pub/freezed-2.4.7
• dependabot/pub/freezed-2.5.0
• dependabot/pub/freezed-2.5.1
• dependabot/pub/freezed-2.5.2
• dependabot/pub/freezed-2.5.7
• dependabot/pub/freezed-3.0.0-0.0.dev
• dependabot/pub/freezed-3.0.6
• dependabot/pub/freezed-3.1.0
• dependabot/pub/freezed-3.2.0
• dependabot/pub/freezed-3.2.3
• dependabot/pub/freezed_annotation-2.4.4
• dependabot/pub/freezed_annotation-3.1.0
• dependabot/pub/get_it-7.6.7
• dependabot/pub/get_it-7.6.8
• dependabot/pub/get_it-8.0.0
• dependabot/pub/get_it-8.0.1
• dependabot/pub/get_it-8.0.2
• dependabot/pub/get_it-8.0.3
• dependabot/pub/get_it-8.3.0
• dependabot/pub/get_it-9.0.5
• dependabot/pub/get_it-9.1.0
• dependabot/pub/get_it-9.1.1
• dependabot/pub/get_it-9.2.0
• dependabot/pub/http-1.1.2
• dependabot/pub/http-1.2.0
• dependabot/pub/http-1.2.2
• dependabot/pub/http-1.4.0
• dependabot/pub/image_picker-0.8.7
• dependabot/pub/image_picker-0.8.8
• dependabot/pub/image_picker-0.8.9
• dependabot/pub/image_picker-1.0.6
• dependabot/pub/image_picker-1.0.8
• dependabot/pub/image_picker-1.1.0
• dependabot/pub/image_picker-1.2.0
• dependabot/pub/json_annotation-4.8.0
• dependabot/pub/json_serializable-6.11.0
• dependabot/pub/json_serializable-6.11.1
• dependabot/pub/json_serializable-6.11.2
• dependabot/pub/json_serializable-6.5.1
• dependabot/pub/json_serializable-6.5.3
• dependabot/pub/json_serializable-6.5.4
• dependabot/pub/json_serializable-6.6.0
• dependabot/pub/json_serializable-6.6.1
• dependabot/pub/json_serializable-6.6.2
• dependabot/pub/json_serializable-6.8.0
• dependabot/pub/json_serializable-6.9.0
• dependabot/pub/json_serializable-6.9.4
• dependabot/pub/json_serializable-6.9.5
• dependabot/pub/mockito-5.4.0
• dependabot/pub/mockito-5.4.4
• dependabot/pub/mockito-5.4.6
• dependabot/pub/mockito-5.5.1
• dependabot/pub/mockito-5.6.1
• dependabot/pub/multi-322269ce95
• dependabot/pub/multi-7ece5b0b40
• dependabot/pub/multi-d7f21a0920
• dependabot/pub/multi_select_flutter-4.1.3
• dependabot/pub/package_info_plus-3.1.2
• dependabot/pub/package_info_plus-4.0.0
• dependabot/pub/package_info_plus-4.0.1
• dependabot/pub/package_info_plus-4.0.2
• dependabot/pub/package_info_plus-4.1.0
• dependabot/pub/package_info_plus-4.2.0
• dependabot/pub/package_info_plus-5.0.1
• dependabot/pub/package_info_plus-6.0.0
• dependabot/pub/package_info_plus-7.0.0
• dependabot/pub/package_info_plus-8.0.0
• dependabot/pub/package_info_plus-8.0.2
• dependabot/pub/package_info_plus-8.0.3
• dependabot/pub/package_info_plus-8.1.1
• dependabot/pub/package_info_plus-8.1.3
• dependabot/pub/package_info_plus-8.1.4
• dependabot/pub/package_info_plus-8.2.1
• dependabot/pub/package_info_plus-8.3.0
• dependabot/pub/package_info_plus-9.0.0
• dependabot/pub/path_provider-2.1.3
• dependabot/pub/path_provider-2.1.4
• dependabot/pub/path_provider-2.1.5
• dependabot/pub/provider-6.0.4
• dependabot/pub/provider-6.0.5
• dependabot/pub/provider-6.1.2
• dependabot/pub/provider-6.1.4
• dependabot/pub/provider-6.1.5
• dependabot/pub/rive-0.10.0
• dependabot/pub/rive-0.10.1
• dependabot/pub/rive-0.10.2
• dependabot/pub/rive-0.10.3
• dependabot/pub/rive-0.11.0
• dependabot/pub/rive-0.11.2
• dependabot/pub/rive-0.11.3
• dependabot/pub/rive-0.11.4
• dependabot/pub/rive-0.12.2
• dependabot/pub/rive-0.13.0
• dependabot/pub/rive-0.13.1
• dependabot/pub/rive-0.13.13
• dependabot/pub/rive-0.13.14
• dependabot/pub/rive-0.13.15
• dependabot/pub/rive-0.13.16
• dependabot/pub/rive-0.13.17
• dependabot/pub/rive-0.13.19
• dependabot/pub/rive-0.13.2
• dependabot/pub/rive-0.13.20
• dependabot/pub/shared_preferences-2.0.16
• dependabot/pub/shared_preferences-2.0.17
• dependabot/pub/shared_preferences-2.0.18
• dependabot/pub/shared_preferences-2.0.20
• dependabot/pub/shared_preferences-2.1.0
• dependabot/pub/shared_preferences-2.1.1
• dependabot/pub/shared_preferences-2.1.2
• dependabot/pub/shared_preferences-2.2.0
• dependabot/pub/shared_preferences-2.2.1
• dependabot/pub/shared_preferences-2.2.2
• dependabot/pub/shared_preferences-2.2.3
• dependabot/pub/shared_preferences-2.3.2
• dependabot/pub/shared_preferences-2.3.3
• dependabot/pub/shared_preferences-2.3.5
• dependabot/pub/shared_preferences-2.4.0
• dependabot/pub/shared_preferences-2.5.1
• dependabot/pub/shared_preferences-2.5.2
• dependabot/pub/shared_preferences-2.5.3
• dependabot/pub/sqlite3_flutter_libs-0.5.191
• dependabot/pub/sqlite3_flutter_libs-0.5.20
• dependabot/pub/sqlite3_flutter_libs-0.5.25
• dependabot/pub/sqlite3_flutter_libs-0.5.26
• dependabot/pub/sqlite3_flutter_libs-0.5.27
• dependabot/pub/sqlite3_flutter_libs-0.5.28
• dependabot/pub/sqlite3_flutter_libs-0.5.29
• dependabot/pub/sqlite3_flutter_libs-0.5.30
• dependabot/pub/sqlite3_flutter_libs-0.5.31
• dependabot/pub/sqlite3_flutter_libs-0.5.40
• dependabot/pub/sqlite3_flutter_libs-0.5.41
• dependabot/pub/table_calendar-3.0.8
• dependabot/pub/url_launcher-6.1.10
• dependabot/pub/url_launcher-6.1.11
• dependabot/pub/url_launcher-6.1.6
• dependabot/pub/url_launcher-6.1.7
• dependabot/pub/url_launcher-6.1.8
• dependabot/pub/url_launcher-6.1.9
• dependabot/pub/url_launcher-6.2.4
• dependabot/pub/url_launcher-6.2.5
• dependabot/pub/url_launcher-6.2.6
• dependabot/pub/url_launcher-6.3.1
• dependabot/pub/url_launcher-6.3.2
• dependabot/pub/video_player-2.10.0
• dependabot/pub/video_player-2.4.10
• dependabot/pub/video_player-2.4.8
• dependabot/pub/video_player-2.4.9
• dependabot/pub/video_player-2.5.2
• dependabot/pub/video_player-2.5.3
• dependabot/pub/video_player-2.6.0
• dependabot/pub/video_player-2.7.0
• dependabot/pub/video_player-2.7.1
• dependabot/pub/video_player-2.7.2
• dependabot/pub/video_player-2.8.3
• dependabot/pub/video_player-2.8.5
• dependabot/pub/video_player-2.8.6
• dependabot/pub/video_player-2.9.2
• dependabot/pub/video_player-2.9.3
• dependabot/pub/video_player-2.9.5
• deps/bump-flutter
• edit-session-feature
• enable-dcm
• feat/data-persistence
• feature/adaptive-design
• feature/add-server-validation-comments
• feature/avif
• feature/better-error-handling
• feature/better-logging
• feature/body-weight-unit
• feature/build-process
• feature/bump-flutter
• feature/cache-control
• feature/day-type
• feature/decimal-inputs
• feature/end_workout_button
• feature/exercise-crowdsourcing
• feature/exercise-submission
• feature/flatpak-build
• feature/flexible-routines
• feature/gym-mode
• feature/improve-min-app-version
• feature/ingredient-cache
• feature/ingredient-images
• feature/ingredient-search
• feature/ios-screenshots
• feature/material-3
• feature/nutrition-goals
• feature/quick-increment-weight
• feature/rework-about-us
• feature/use-flatpak-flutter
• feature/weblate
• feature/wysiwyg-description
• fix/dashboard-calendar-crash
• fix/default-rounding-values
• fix/delete-workout-logs
• fix/failing-tests
• fix/fix-debounce-time
• fix/future-routine-dates
• fix/gym-mode-time
• fix/make-routineId-nullable
• fix/mark-current-workout-day
• fix/password-autofill-hint
• fix/refresh-routine-dashboard
• fix/replace-chart-lib
• fix/timezone-handling
• fix/timezone-problems
• fix/translation-handling
• fix/video-error-handling
• fix_Calendar_Future_Dates_issue872
• goal-fiber
• imgbot
• ingredient-details
• ingredient-form-ux
• lint
• log-fractional-meals
• log-meals-empty
• master
• mealDateTime
• measurement-tweaks
• multi-nutrition-plan-fixes
• nutrition-cleanup
• nutrition-cleanup-2
• nutrition-plan-stats
• plate-46-calc
• portion-size-slider-fiber-renames
• powersync
• pr/sizzlesloth/632
• prefs-consts
• recent-ingredient-suggestions-tweaks
• refs/heads/dependabot/pub/flutter_typeahead-4.5.0
• refs/heads/dependabot/pub/rive-0.11.1
• refs/heads/master
• refs/tags/t1.2.3
• refs/tags/v1.5.0
• refs/tags/v1.5.1
• refs/tags/v1.5.2
• refs/tags/v1.5.3
• refs/tags/v1.5.4
• refs/tags/v1.5.5
• refs/tags/v1.5.6
• refs/tags/v1.5.7
• refs/tags/v1.6.0
• refs/tags/v1.6.1
• refs/tags/v1.6.2
• refs/tags/v1.6.3
• refs/tags/v1.6.4
• refs/tags/v1.7.0
• refs/tags/v1.7.1
• refs/tags/v1.7.2
• refs/tags/v1.7.3
• refs/tags/v1.7.4
• refs/tags/v1.7.5
• refs/tags/v1.7.6
• refs/tags/v1.7.8
• refs/tags/v1.7.9
• show-kcal-consumed-vs-planned-on-meal-tiles
• show-kcal-macros-total-for-meal
• show-macros-on-ingredients-tiles
• simplify-tables
• tiny-tweaks
• typeahead-scan-fixes
• use-flutter-3.22
• ux-friendly-log-meals-to-diary
• wip-move-piechart-and-table-to-plan-edit
• yhm/issue-724
• yhm/issue-732

Build # 6816699206

Build Type

push

github

Committed by rolandgeider

Commit Message

Merge branch 'fix/terminology'

# Conflicts:
#	lib/widgets/routines/day.dart
#	lib/widgets/routines/forms.dart
#	lib/widgets/routines/log.dart
#	lib/widgets/routines/routines_list.dart
#	lib/widgets/routines/workout_logs.dart
#	test/routine/gym_mode_screen_test.mocks.dart
#	test/routine/repetition_unit_form_widget_test.mocks.dart
#	test/routine/weight_unit_form_widget_test.mocks.dart
#	test/routine/workout_day_form_test.mocks.dart
#	test/routine/workout_form_test.mocks.dart
#	test/routine/workout_plan_screen_test.mocks.dart
#	test/routine/workout_plans_screen_test.mocks.dart
#	test/routine/workout_provider_test.mocks.dart
#	test/routine/workout_set_form_test.mocks.dart

Run Details

86 of 174 new or added lines in 21 files covered. (49.43%)

2899 of 6337 relevant lines covered (45.75%)

1.18 hits per line