From c64ffa43c29f720f9cfd41d809029c35d1a27a76 Mon Sep 17 00:00:00 2001 From: Artem Date: Thu, 12 May 2022 09:08:56 +0000 Subject: [PATCH 01/28] Translated using Weblate (Ukrainian) Currently translated at 40.2% (64 of 159 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/uk/ --- lib/l10n/app_uk.arb | 190 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb index 8a27b681..b4ff92e8 100644 --- a/lib/l10n/app_uk.arb +++ b/lib/l10n/app_uk.arb @@ -38,5 +38,195 @@ "date": "Дата", "@date": { "description": "The date of a workout log or body weight entry" + }, + "usernameValidChars": "Ім'я користувача може містити лише літери, цифри й символи @, +, ., - та _", + "@usernameValidChars": { + "description": "Error message when the user tries to register a username with forbidden characters" + }, + "passwordsDontMatch": "Паролі не збігаються", + "@passwordsDontMatch": { + "description": "Error message when the user enters two different passwords during registration" + }, + "confirmPassword": "Підтвердьте пароль", + "@confirmPassword": {}, + "email": "Адреса електронної пошти", + "@email": {}, + "invalidUsername": "Будь ласка, введіть припустиме ім'я користувача", + "@invalidUsername": { + "description": "Error message when the user enters an invalid username" + }, + "username": "Ім'я користувача", + "@username": {}, + "customServerHint": "Введіть адресу свого власного сервера, інакше буде використовуватися сервер за промовчанням", + "@customServerHint": { + "description": "Hint text for the form where the users can enter their own wger instance" + }, + "reset": "Скинути", + "@reset": { + "description": "Button text allowing the user to reset the entered values to the default" + }, + "loginInstead": "Натомість увійти", + "@loginInstead": {}, + "labelWorkoutPlans": "Плани тренувань", + "@labelWorkoutPlans": { + "description": "Title for screen workout plans" + }, + "labelBottomNavWorkout": "Тренування", + "@labelBottomNavWorkout": { + "description": "Label used in bottom navigation, use a short word" + }, + "labelWorkoutLogs": "Журнали тренувань", + "@labelWorkoutLogs": { + "description": "(Workout) logs" + }, + "labelWorkoutPlan": "План тренування", + "@labelWorkoutPlan": { + "description": "Title for screen workout plan" + }, + "labelDashboard": "Панель керування", + "@labelDashboard": { + "description": "Title for screen dashboard" + }, + "successfullyDeleted": "Видалено", + "@successfullyDeleted": { + "description": "Message when an item was successfully deleted" + }, + "exercise": "Вправа", + "@exercise": { + "description": "An exercise for a workout" + }, + "searchExercise": "Пошук вправ для додавання", + "@searchExercise": { + "description": "Label on set form. Selected exercises are added to the set" + }, + "supersetWith": "супер-набір з", + "@supersetWith": { + "description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'" + }, + "equipment": "Обладнання", + "@equipment": { + "description": "Equipment needed to perform an exercise" + }, + "muscles": "М'язи", + "@muscles": { + "description": "(main) muscles trained by an exercise" + }, + "musclesSecondary": "Вторинні м'язи", + "@musclesSecondary": { + "description": "secondary muscles trained by an exercise" + }, + "category": "Категорія", + "@category": { + "description": "Category for an exercise, ingredient, etc." + }, + "newWorkout": "Новий план тренувань", + "@newWorkout": { + "description": "Header when adding a new workout" + }, + "repetitions": "Повторень", + "@repetitions": { + "description": "Repetitions for an exercise set" + }, + "reps": "Повтор", + "@reps": { + "description": "Shorthand for repetitions, used when space constraints are tighter" + }, + "rirNotUsed": "RiR не використовується", + "@rirNotUsed": { + "description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log" + }, + "repetitionUnit": "Одиниця повторень", + "@repetitionUnit": {}, + "set": "Набір", + "@set": { + "description": "A set in a workout plan" + }, + "setNr": "Набір {nr}", + "@setNr": { + "description": "Header in form indicating the number of the current set. Can also be translated as something like 'Set Nr. xy'.", + "type": "text", + "placeholders": { + "nr": {} + } + }, + "sameRepetitions": "Якщо ви робите однакові повторення та вагу для всіх наборів, то ви можете просто заповнити один рядок. Наприклад, для 4 наборів просто введіть 10 для повторень, це автоматично стане «4 x 10».", + "@sameRepetitions": {}, + "comment": "Коментар", + "@comment": { + "description": "Comment, additional information" + }, + "impression": "Враження", + "@impression": { + "description": "General impression (e.g. for a workout session) such as good, bad, etc." + }, + "newDay": "Новий день", + "@newDay": {}, + "selectExercises": "Якщо ви хочете зробити супер-набір, ви можете пошукати декілька вправ, вони будуть згруповані разом", + "@selectExercises": {}, + "gymMode": "Режим тренажерного залу", + "@gymMode": { + "description": "Label when starting the gym mode" + }, + "plateCalculator": "Пластини", + "@plateCalculator": { + "description": "Label used for the plate calculator in the gym mode" + }, + "plateCalculatorNotDivisible": "Неможливо досягти ваги з наявними пластинами", + "@plateCalculatorNotDivisible": { + "description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)" + }, + "pause": "Пауза", + "@pause": { + "description": "Noun, not an imperative! Label used for the pause when using the gym mode" + }, + "jumpTo": "Перейти до", + "@jumpTo": { + "description": "Imperative. Label used in popup allowing the user to jump to a specific exercise while in the gym mode" + }, + "todaysWorkout": "Ваше сьогоднішнє тренування", + "@todaysWorkout": {}, + "password": "Пароль", + "@password": {}, + "passwordTooShort": "Пароль занадто короткий", + "@passwordTooShort": { + "description": "Error message when the user a password that is too short" + }, + "invalidEmail": "Будь ласка, введіть прийнятну адресу електронної пошти", + "@invalidEmail": { + "description": "Error message when the user enters an invalid email" + }, + "customServerUrl": "URL-адреса екземпляра wger", + "@customServerUrl": { + "description": "Label in the form where the users can enter their own wger instance" + }, + "successfullySaved": "Збережено", + "@successfullySaved": { + "description": "Message when an item was successfully saved" + }, + "registerInstead": "Натомість зареєструватися", + "@registerInstead": {}, + "labelBottomNavNutrition": "Харчування", + "@labelBottomNavNutrition": { + "description": "Label used in bottom navigation, use a short word" + }, + "weightUnit": "Одиниця ваги", + "@weightUnit": {}, + "noWorkoutPlans": "У вас немає планів тренувань", + "@noWorkoutPlans": { + "description": "Message shown when the user has no workout plans" + }, + "dayDescriptionHelp": "Опис того, що робиться в цей день (наприклад, «день підтягування») або які частини тіла тренуються (наприклад, «груди та плечі»)", + "@dayDescriptionHelp": {}, + "workoutSession": "Сеанс тренування", + "@workoutSession": { + "description": "A (logged) workout session" + }, + "notes": "Нотатки", + "@notes": { + "description": "Personal notes, e.g. for a workout session" + }, + "newSet": "Новий набір", + "@newSet": { + "description": "Header when adding a new set to a workout day" } } From 04ba7af4a75bf8bc1c98b88caa5c1620aa8cc9fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 01:04:05 +0000 Subject: [PATCH 02/28] Bump url_launcher from 6.1.0 to 6.1.2 Bumps [url_launcher](https://github.com/flutter/plugins) from 6.1.0 to 6.1.2. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/compare/url_launcher-v6.1.0...url_launcher-v6.1.2) --- updated-dependencies: - dependency-name: url_launcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 5843a457..852f550e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -935,7 +935,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.1.0" + version: "6.1.2" url_launcher_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index caf35832..e4cc18a1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -51,7 +51,7 @@ dependencies: rive: ^0.8.1 shared_preferences: ^2.0.13 table_calendar: ^3.0.2 - url_launcher: ^6.1.0 + url_launcher: ^6.1.2 flutter_barcode_scanner: ^2.0.0 video_player: ^2.4.0 From 4b5a68fa6cb8e7c7d2ceee00db7e82ce8f3dafaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 01:04:29 +0000 Subject: [PATCH 03/28] Bump camera from 0.9.4+21 to 0.9.5 Bumps [camera](https://github.com/flutter/plugins) from 0.9.4+21 to 0.9.5. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/compare/camera-v0.9.4...camera-v0.9.5) --- updated-dependencies: - dependency-name: camera dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 5843a457..a0c52b13 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -112,7 +112,7 @@ packages: name: camera url: "https://pub.dartlang.org" source: hosted - version: "0.9.4+21" + version: "0.9.5" camera_platform_interface: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index caf35832..50e0d288 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: sdk: flutter android_metadata: ^0.2.1 - camera: ^0.9.4+14 + camera: ^0.9.5 charts_flutter: ^0.12.0 collection: ^1.15.0-nullsafety.4 cupertino_icons: ^1.0.0 From 9dec33c84308ef5055c21e8027287fc7987af249 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 01:04:51 +0000 Subject: [PATCH 04/28] Bump video_player from 2.4.0 to 2.4.2 Bumps [video_player](https://github.com/flutter/plugins) from 2.4.0 to 2.4.2. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/compare/video_player-v2.4.0...video_player-v2.4.2) --- updated-dependencies: - dependency-name: video_player dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 5843a457..f089d63b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1019,7 +1019,7 @@ packages: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "2.4.0" + version: "2.4.2" video_player_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index caf35832..a67e872e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -53,7 +53,7 @@ dependencies: table_calendar: ^3.0.2 url_launcher: ^6.1.0 flutter_barcode_scanner: ^2.0.0 - video_player: ^2.4.0 + video_player: ^2.4.2 dev_dependencies: flutter_test: From fbef418656f5a001bcb40b6929ceb9012ac8d982 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 01:05:19 +0000 Subject: [PATCH 05/28] Bump shared_preferences from 2.0.13 to 2.0.15 Bumps [shared_preferences](https://github.com/flutter/plugins) from 2.0.13 to 2.0.15. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/compare/shared_preferences-v2.0.13...shared_preferences-v2.0.15) --- updated-dependencies: - dependency-name: shared_preferences dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 5843a457..567828c7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -762,7 +762,7 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "2.0.13" + version: "2.0.15" shared_preferences_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index caf35832..4d6aa047 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -49,7 +49,7 @@ dependencies: package_info: ^2.0.2 provider: ^6.0.1 rive: ^0.8.1 - shared_preferences: ^2.0.13 + shared_preferences: ^2.0.15 table_calendar: ^3.0.2 url_launcher: ^6.1.0 flutter_barcode_scanner: ^2.0.0 From 3387206251b93196c682424eff0f230af3d34f84 Mon Sep 17 00:00:00 2001 From: Artem Date: Sun, 15 May 2022 21:30:01 +0000 Subject: [PATCH 06/28] Translated using Weblate (Ukrainian) Currently translated at 98.1% (156 of 159 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/uk/ --- lib/l10n/app_uk.arb | 324 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 324 insertions(+) diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb index b4ff92e8..44401795 100644 --- a/lib/l10n/app_uk.arb +++ b/lib/l10n/app_uk.arb @@ -228,5 +228,329 @@ "newSet": "Новий набір", "@newSet": { "description": "Header when adding a new set to a workout day" + }, + "measurementCategoriesHelpText": "Категорія вимірювання, така як \"біцепс\" або \"жир тіла\"", + "@measurementCategoriesHelpText": {}, + "time": "Час", + "@time": { + "description": "The time of a meal or workout" + }, + "value": "Значення", + "@value": { + "description": "The value of a measurement entry" + }, + "timeStart": "Час початку", + "@timeStart": { + "description": "The starting time of a workout" + }, + "timeEnd": "Час закінчення", + "@timeEnd": { + "description": "The end time of a workout" + }, + "kcal": "ккал", + "@kcal": { + "description": "Energy in a meal in kilocalories, kcal" + }, + "fat": "Жири", + "@fat": {}, + "newNutritionalPlan": "Новий план харчування", + "@newNutritionalPlan": {}, + "sugars": "Цукри", + "@sugars": {}, + "aboutDescription": "Дякуємо за використання wger! wger - це спільний проєкт з відкритим кодом, створений ентузіастами фітнесу з усього світу.", + "@aboutDescription": { + "description": "Text in the about dialog" + }, + "aboutBugsText": "Зв'яжіться з нами, якщо щось відбувається не так, як очікувалося, або якщо є функція, яка, на вашу думку, відсутня.", + "@aboutBugsText": { + "description": "Text for bugs section in the about dialog" + }, + "selectExercise": "Будь ласка, виберіть вправу", + "@selectExercise": { + "description": "Error message when the user hasn't selected an exercise in the form" + }, + "calendar": "Календар", + "@calendar": {}, + "enterValue": "Будь ласка, введіть значення", + "@enterValue": { + "description": "Error message when the user hasn't entered a value on a required field" + }, + "selectIngredient": "Будь ласка, оберіть інгредієнт", + "@selectIngredient": { + "description": "Error message when the user hasn't selected an ingredient from the autocompleter" + }, + "productFoundDescription": "Штрих-код відповідає цьому виробу: {productName}. Бажаєте продовжити?", + "@productFoundDescription": { + "description": "Dialog info when product is found with barcode", + "type": "text", + "placeholders": { + "productName": {} + } + }, + "description": "Опис", + "@description": {}, + "name": "Ім'я", + "@name": { + "description": "Name for a workout or nutritional plan" + }, + "save": "Зберегти", + "@save": {}, + "addSet": "Додати набір", + "@addSet": { + "description": "Label for the button that adds a set (to a workout day)" + }, + "addMeal": "Додати страву", + "@addMeal": {}, + "mealLogged": "Страву записано в щоденник", + "@mealLogged": {}, + "logMeal": "Записати цю страву", + "@logMeal": {}, + "addIngredient": "Додати інгредієнт", + "@addIngredient": {}, + "logIngredient": "Зберегти в щоденник харчування", + "@logIngredient": {}, + "searchIngredient": "Пошук інгредієнта", + "@searchIngredient": { + "description": "Label on ingredient search form" + }, + "nutritionalDiary": "Щоденник харчування", + "@nutritionalDiary": {}, + "nutritionalPlans": "Плани харчування", + "@nutritionalPlans": {}, + "noNutritionalPlans": "Ви не маєте планів харчування", + "@noNutritionalPlans": { + "description": "Message shown when the user has no nutritional plans" + }, + "anErrorOccurred": "Сталася помилка!", + "@anErrorOccurred": {}, + "measurement": "Вимірювання", + "@measurement": {}, + "logHelpEntries": "Якщо на один день припадає більше одного запису з однаковою кількістю повторень, але різними вагами, то на графіку буде показано тільки запис з більшою вагою.", + "@logHelpEntries": {}, + "logHelpEntriesUnits": "Зверніть увагу, що на графіку відображаються тільки записи з одиницями ваги (кг або lb) і повтореннями. Інші комбінації, такі як час або \"до відмови\", тут ігноруються.", + "@logHelpEntriesUnits": {}, + "measurements": "Вимірювання", + "@measurements": { + "description": "Categories for the measurements such as biceps size, body fat, etc." + }, + "measurementEntriesHelpText": "Одиниця вимірювання, яка використовується для вимірювання категорії, як от \"см\" або \"%\"", + "@measurementEntriesHelpText": {}, + "start": "Почати", + "@start": { + "description": "Label on button to start the gym mode (i.e., an imperative)" + }, + "timeStartAhead": "Час початку не може передувати часу завершення", + "@timeStartAhead": {}, + "ingredient": "Інгредієнт", + "@ingredient": {}, + "energy": "Енергія", + "@energy": { + "description": "Energy in a meal, ingredient etc. e.g. in kJ" + }, + "energyShort": "Е", + "@energyShort": { + "description": "The first letter or short name of the word 'Energy', used in overviews" + }, + "macronutrients": "Макроелементи", + "@macronutrients": {}, + "planned": "Заплановано", + "@planned": { + "description": "Header for the column of 'planned' nutritional values, i.e. what should be eaten" + }, + "logged": "Записано", + "@logged": { + "description": "Header for the column of 'logged' nutritional values, i.e. what was eaten" + }, + "weekAverage": "В середньому за 7 днів", + "@weekAverage": { + "description": "Header for the column of '7 day average' nutritional values, i.e. what was logged last week" + }, + "percentEnergy": "Відсоток енергії", + "@percentEnergy": {}, + "gPerBodyKg": "г на кг тіла", + "@gPerBodyKg": { + "description": "Label used for total sums of e.g. calories or similar in grams per Kg of body weight" + }, + "total": "Усього", + "@total": { + "description": "Label used for total sums of e.g. calories or similar" + }, + "kJ": "кДж", + "@kJ": { + "description": "Energy in a meal in kilo joules, kJ" + }, + "g": "г", + "@g": { + "description": "Abbreviation for gram" + }, + "protein": "Білок", + "@protein": {}, + "proteinShort": "Б", + "@proteinShort": { + "description": "The first letter or short name of the word 'Protein', used in overviews" + }, + "carbohydrates": "Вуглеводи", + "@carbohydrates": {}, + "carbohydratesShort": "В", + "@carbohydratesShort": { + "description": "The first letter or short name of the word 'Carbohydrates', used in overviews" + }, + "fatShort": "Ж", + "@fatShort": { + "description": "The first letter or short name of the word 'Fat', used in overviews" + }, + "saturatedFat": "Насичені жири", + "@saturatedFat": {}, + "fibres": "Волокна", + "@fibres": {}, + "sodium": "Натрій", + "@sodium": {}, + "amount": "Сума", + "@amount": { + "description": "The amount (e.g. in grams) of an ingredient in a meal" + }, + "unit": "Одиниця", + "@unit": { + "description": "The unit used for a repetition (kg, time, etc.)" + }, + "newEntry": "Новий запис", + "@newEntry": { + "description": "Title when adding a new entry such as a weight or log entry" + }, + "noWeightEntries": "У вас немає записів ваги", + "@noWeightEntries": { + "description": "Message shown when the user has no logged weight entries" + }, + "loadingText": "Завантаження...", + "@loadingText": { + "description": "Text to show when entries are being loaded in the background: Loading..." + }, + "confirmDelete": "Ви впевнені, що бажаєте видалити '{toDelete}'?", + "@confirmDelete": { + "description": "Confirmation text before the user deletes an object", + "type": "text", + "placeholders": { + "toDelete": {} + } + }, + "toggleDetails": "Перемкнути відомості", + "@toggleDetails": { + "description": "Switch to toggle detail / overview" + }, + "goToDetailPage": "Перейти до сторінки відомостей", + "@goToDetailPage": {}, + "aboutSourceTitle": "Джерельний код", + "@aboutSourceTitle": { + "description": "Title for source code section in the about dialog" + }, + "aboutSourceText": "Отримайте джерельний код цього додатка та його сервера на github", + "@aboutSourceText": { + "description": "Text for source code section in the about dialog" + }, + "aboutBugsTitle": "У вас є проблема чи ідея?", + "@aboutBugsTitle": { + "description": "Title for bugs section in the about dialog" + }, + "aboutContactUsTitle": "Привітайтеся!", + "@aboutContactUsTitle": { + "description": "Title for contact us section in the about dialog" + }, + "aboutContactUsText": "Якщо ви хочете поспілкуватися з нами, зайдіть на сервер Discord і зв'яжіться з нами", + "@aboutContactUsText": { + "description": "Text for contact us section in the about dialog" + }, + "aboutTranslationTitle": "Перекладання", + "@aboutTranslationTitle": { + "description": "Title for translation section in the about dialog" + }, + "aboutTranslationText": "Цей додаток перекладено на Weblate. Якщо ви також хочете допомогти, клацніть на посилання та почніть переклад", + "@aboutTranslationText": { + "description": "Text for translation section in the about dialog" + }, + "goToToday": "Перейти до сьогодні", + "@goToToday": { + "description": "Label on button to jump back to 'today' in the calendar widget" + }, + "enterRepetitionsOrWeight": "Будь ласка, заповніть кількість повторень або вагу принаймні для одного з наборів", + "@enterRepetitionsOrWeight": { + "description": "Error message when the user hasn't filled in the forms for exercise sets" + }, + "enterCharacters": "Будь ласка, введіть між{min} та {max} символами", + "@enterCharacters": { + "description": "Error message when the user hasn't entered the correct number of characters in a form", + "type": "text", + "placeholders": { + "min": {}, + "max": {} + } + }, + "nrOfSets": "Наборів на вправу: {nrOfSets}", + "@nrOfSets": { + "description": "Label shown on the slider where the user selects the nr of sets", + "type": "text", + "placeholders": { + "nrOfSets": {} + } + }, + "setUnitsAndRir": "Встановіть одиниці вимірювання та RiR", + "@setUnitsAndRir": { + "description": "Label shown on the slider where the user can toggle showing units and RiR", + "type": "text" + }, + "enterValidNumber": "Будь ласка, введіть прийнятний номер", + "@enterValidNumber": { + "description": "Error message when the user has submitted an invalid number (e.g. '3,.,.,.')" + }, + "recentlyUsedIngredients": "Останні інгредієнти", + "@recentlyUsedIngredients": { + "description": "A message when a user adds a new ingredient to a meal." + }, + "selectImage": "Будь ласка, оберіть зображення", + "@selectImage": { + "description": "Label and error message when the user hasn't selected an image to save" + }, + "optionsLabel": "Параметри", + "@optionsLabel": { + "description": "Label for the popup with general app options" + }, + "takePicture": "Зробити знімок", + "@takePicture": {}, + "chooseFromLibrary": "Вибрати з бібліотеки фотографій", + "@chooseFromLibrary": {}, + "gallery": "Галерея", + "@gallery": {}, + "addImage": "Додати зображення", + "@addImage": {}, + "dataCopied": "Дані скопійовано до нового запису", + "@dataCopied": { + "description": "Snackbar message to show on copying data to a new log entry" + }, + "appUpdateTitle": "Потрібне оновлення", + "@appUpdateTitle": {}, + "appUpdateContent": "Ця версія програми несумісна з сервером, будь ласка, оновіть додаток.", + "@appUpdateContent": {}, + "productFound": "Виріб знайдено", + "@productFound": { + "description": "Header label for dialog when product is found with barcode" + }, + "productNotFound": "Виріб не знайдено", + "@productNotFound": { + "description": "Header label for dialog when product is not found with barcode" + }, + "productNotFoundDescription": "Виріб із відсканованим штрих-кодом {barcode} не знайдено в базі даних Wger", + "@productNotFoundDescription": { + "description": "Dialog info when product is not found with barcode", + "type": "text", + "placeholders": { + "barcode": {} + } + }, + "scanBarcode": "Сканувати штрих-код", + "@scanBarcode": { + "description": "Label for scan barcode button" + }, + "close": "Закрити", + "@close": { + "description": "Translation for close" } } From af2d36288b8c3e96acc6f8f115eaa07eb6b53ecb Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Thu, 19 May 2022 12:07:58 +0200 Subject: [PATCH 07/28] Update release process --- fastlane/metadata/android/README.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fastlane/metadata/android/README.md b/fastlane/metadata/android/README.md index 934ba465..4b436265 100644 --- a/fastlane/metadata/android/README.md +++ b/fastlane/metadata/android/README.md @@ -1,6 +1,14 @@ # Release process -## 1. Dry-run release before uploading +## 1. Update flutter version + +If we use a new version, update the version used by + +* Github Actions in `android-release.yaml` in this repository +* Fdroid build recipe in [their repo](https://gitlab.com/fdroid/fdroiddata/-/blob/master/metadata/de.wger.flutter.yml). + Since this can potentially take some time, it should happen well in advance + +## 2. Dry-run release before uploading * Increase build nr in pubspec.yaml * `flutter build appbundle --release` @@ -13,7 +21,7 @@ Also note that if a language was added over the weblate UI, it might be necessar to set the correct language code: -## 2. Push tags to trigger release +## 3. 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 @@ -25,6 +33,6 @@ by github actions. `TAG=vX.Y.Z && git tag $TAG && git push origin $TAG && git tag -d $TAG` -## 3. Edit release +## 4. Edit release I necessary, edit the created release on github From ca2fd8e9ef250d160bbcfd864d4546b61a9429bf Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Fri, 20 May 2022 19:08:13 +0200 Subject: [PATCH 08/28] Add a consumer to the body weight card Closes #144 --- lib/widgets/dashboard/widgets.dart | 112 +++++++++++++++-------------- 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/lib/widgets/dashboard/widgets.dart b/lib/widgets/dashboard/widgets.dart index 94909477..baf1213c 100644 --- a/lib/widgets/dashboard/widgets.dart +++ b/lib/widgets/dashboard/widgets.dart @@ -242,66 +242,68 @@ class _DashboardWeightWidgetState extends State { Widget build(BuildContext context) { weightEntriesData = Provider.of(context, listen: false); - return Card( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - ListTile( - title: Text( - AppLocalizations.of(context).weight, - style: Theme.of(context).textTheme.headline4, + return Consumer( + builder: (context, workoutProvider, child) => Card( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + ListTile( + title: Text( + AppLocalizations.of(context).weight, + style: Theme.of(context).textTheme.headline4, + ), + leading: const FaIcon( + FontAwesomeIcons.weight, + color: Colors.black, + ), + trailing: IconButton( + icon: const Icon(Icons.add), + onPressed: () async { + Navigator.pushNamed( + context, + FormScreen.routeName, + arguments: FormScreenArguments( + AppLocalizations.of(context).newEntry, + WeightForm(), + ), + ); + }, + ), ), - leading: const FaIcon( - FontAwesomeIcons.weight, - color: Colors.black, - ), - trailing: IconButton( - icon: const Icon(Icons.add), - onPressed: () async { - Navigator.pushNamed( - context, - FormScreen.routeName, - arguments: FormScreenArguments( + Column( + children: [ + if (weightEntriesData.items.isNotEmpty) + Column( + children: [ + Container( + padding: const EdgeInsets.all(15), + height: 180, + child: MeasurementChartWidget(weightEntriesData.items + .map((e) => MeasurementChartEntry(e.weight, e.date)) + .toList()), + ), + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + TextButton( + child: Text(AppLocalizations.of(context).goToDetailPage), + onPressed: () { + Navigator.of(context).pushNamed(WeightScreen.routeName); + }), + ], + ), + ], + ) + else + NothingFound( + AppLocalizations.of(context).noWeightEntries, AppLocalizations.of(context).newEntry, WeightForm(), ), - ); - }, + ], ), - ), - Column( - children: [ - if (weightEntriesData.items.isNotEmpty) - Column( - children: [ - Container( - padding: const EdgeInsets.all(15), - height: 180, - child: MeasurementChartWidget(weightEntriesData.items - .map((e) => MeasurementChartEntry(e.weight, e.date)) - .toList()), - ), - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - TextButton( - child: Text(AppLocalizations.of(context).goToDetailPage), - onPressed: () { - Navigator.of(context).pushNamed(WeightScreen.routeName); - }), - ], - ), - ], - ) - else - NothingFound( - AppLocalizations.of(context).noWeightEntries, - AppLocalizations.of(context).newEntry, - WeightForm(), - ), - ], - ), - ], + ], + ), ), ); } From 0c3ee3badfff8dae8e9cd6f71394a7cb900840e8 Mon Sep 17 00:00:00 2001 From: Github-actions Date: Fri, 20 May 2022 17:10:27 +0000 Subject: [PATCH 09/28] Automatic linting --- lib/models/body_weight/weight_entry.g.dart | 3 +- lib/models/exercises/category.g.dart | 3 +- lib/models/exercises/exercise.g.dart | 6 +- lib/models/exercises/image.g.dart | 3 +- .../measurements/measurement_category.g.dart | 4 +- .../measurements/measurement_entry.g.dart | 3 +- lib/models/nutrition/ingredient.g.dart | 3 +- .../nutrition/ingredient_weight_unit.g.dart | 6 +- lib/models/nutrition/log.g.dart | 9 +- lib/models/nutrition/nutritional_plan.g.dart | 3 +- lib/models/nutrition/weight_unit.g.dart | 3 +- lib/models/workouts/repetition_unit.g.dart | 3 +- lib/models/workouts/session.g.dart | 12 +- lib/models/workouts/weight_unit.g.dart | 3 +- lib/models/workouts/workout_plan.g.dart | 3 +- test/gallery/gallery_screen_test.mocks.dart | 69 +++--- ...surement_categories_screen_test.mocks.dart | 59 ++--- .../measurement_provider_test.mocks.dart | 42 ++-- .../nutritional_plan_form_test.mocks.dart | 118 ++++----- test/other/base_provider_test.mocks.dart | 65 ++--- test/workout/workout_form_test.mocks.dart | 232 ++++++++---------- test/workout/workout_set_form_test.mocks.dart | 80 +++--- 22 files changed, 295 insertions(+), 437 deletions(-) diff --git a/lib/models/body_weight/weight_entry.g.dart b/lib/models/body_weight/weight_entry.g.dart index 60ee02c9..d1152d20 100644 --- a/lib/models/body_weight/weight_entry.g.dart +++ b/lib/models/body_weight/weight_entry.g.dart @@ -18,8 +18,7 @@ WeightEntry _$WeightEntryFromJson(Map json) { ); } -Map _$WeightEntryToJson(WeightEntry instance) => - { +Map _$WeightEntryToJson(WeightEntry instance) => { 'id': instance.id, 'weight': numToString(instance.weight), 'date': toDate(instance.date), diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart index 19383107..915120d1 100644 --- a/lib/models/exercises/category.g.dart +++ b/lib/models/exercises/category.g.dart @@ -17,8 +17,7 @@ ExerciseCategory _$ExerciseCategoryFromJson(Map json) { ); } -Map _$ExerciseCategoryToJson(ExerciseCategory instance) => - { +Map _$ExerciseCategoryToJson(ExerciseCategory instance) => { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/exercises/exercise.g.dart b/lib/models/exercises/exercise.g.dart index 614ff9b2..68183089 100644 --- a/lib/models/exercises/exercise.g.dart +++ b/lib/models/exercises/exercise.g.dart @@ -48,8 +48,7 @@ Exercise _$ExerciseFromJson(Map json) { tips: (json['comments'] as List?) ?.map((e) => Comment.fromJson(e as Map)) .toList(), - )..categoryObj = - ExerciseCategory.fromJson(json['category'] as Map); + )..categoryObj = ExerciseCategory.fromJson(json['category'] as Map); } Map _$ExerciseToJson(Exercise instance) => { @@ -60,8 +59,7 @@ Map _$ExerciseToJson(Exercise instance) => { 'description': instance.description, 'category': instance.categoryObj.toJson(), 'muscles': instance.muscles.map((e) => e.toJson()).toList(), - 'muscles_secondary': - instance.musclesSecondary.map((e) => e.toJson()).toList(), + 'muscles_secondary': instance.musclesSecondary.map((e) => e.toJson()).toList(), 'equipment': instance.equipment.map((e) => e.toJson()).toList(), 'images': instance.images.map((e) => e.toJson()).toList(), 'videos': instance.videos.map((e) => e.toJson()).toList(), diff --git a/lib/models/exercises/image.g.dart b/lib/models/exercises/image.g.dart index 1240dc38..6ef7c62e 100644 --- a/lib/models/exercises/image.g.dart +++ b/lib/models/exercises/image.g.dart @@ -20,8 +20,7 @@ ExerciseImage _$ExerciseImageFromJson(Map json) { ); } -Map _$ExerciseImageToJson(ExerciseImage instance) => - { +Map _$ExerciseImageToJson(ExerciseImage instance) => { 'id': instance.id, 'uuid': instance.uuid, 'exercise_base': instance.exerciseBaseId, diff --git a/lib/models/measurements/measurement_category.g.dart b/lib/models/measurements/measurement_category.g.dart index ef4ebcd3..eb887b2e 100644 --- a/lib/models/measurements/measurement_category.g.dart +++ b/lib/models/measurements/measurement_category.g.dart @@ -22,9 +22,7 @@ MeasurementCategory _$MeasurementCategoryFromJson(Map json) { ); } -Map _$MeasurementCategoryToJson( - MeasurementCategory instance) => - { +Map _$MeasurementCategoryToJson(MeasurementCategory instance) => { 'id': instance.id, 'name': instance.name, 'unit': instance.unit, diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart index 4b096960..7f6e346a 100644 --- a/lib/models/measurements/measurement_entry.g.dart +++ b/lib/models/measurements/measurement_entry.g.dart @@ -20,8 +20,7 @@ MeasurementEntry _$MeasurementEntryFromJson(Map json) { ); } -Map _$MeasurementEntryToJson(MeasurementEntry instance) => - { +Map _$MeasurementEntryToJson(MeasurementEntry instance) => { 'id': instance.id, 'category': instance.category, 'date': toDate(instance.date), diff --git a/lib/models/nutrition/ingredient.g.dart b/lib/models/nutrition/ingredient.g.dart index c4afcabb..5c19de59 100644 --- a/lib/models/nutrition/ingredient.g.dart +++ b/lib/models/nutrition/ingredient.g.dart @@ -40,8 +40,7 @@ Ingredient _$IngredientFromJson(Map json) { ); } -Map _$IngredientToJson(Ingredient instance) => - { +Map _$IngredientToJson(Ingredient instance) => { 'id': instance.id, 'code': instance.code, 'name': instance.name, diff --git a/lib/models/nutrition/ingredient_weight_unit.g.dart b/lib/models/nutrition/ingredient_weight_unit.g.dart index 74b1f101..f147a2ee 100644 --- a/lib/models/nutrition/ingredient_weight_unit.g.dart +++ b/lib/models/nutrition/ingredient_weight_unit.g.dart @@ -13,16 +13,14 @@ IngredientWeightUnit _$IngredientWeightUnitFromJson(Map json) { ); return IngredientWeightUnit( id: json['id'] as int, - weightUnit: - WeightUnit.fromJson(json['weight_unit'] as Map), + weightUnit: WeightUnit.fromJson(json['weight_unit'] as Map), ingredient: Ingredient.fromJson(json['ingredient'] as Map), grams: json['grams'] as int, amount: (json['amount'] as num).toDouble(), ); } -Map _$IngredientWeightUnitToJson( - IngredientWeightUnit instance) => +Map _$IngredientWeightUnitToJson(IngredientWeightUnit instance) => { 'id': instance.id, 'weight_unit': instance.weightUnit, diff --git a/lib/models/nutrition/log.g.dart b/lib/models/nutrition/log.g.dart index 39068768..61690155 100644 --- a/lib/models/nutrition/log.g.dart +++ b/lib/models/nutrition/log.g.dart @@ -9,14 +9,7 @@ part of 'log.dart'; Log _$LogFromJson(Map json) { $checkKeys( json, - requiredKeys: const [ - 'id', - 'plan', - 'datetime', - 'ingredient', - 'weight_unit', - 'amount' - ], + requiredKeys: const ['id', 'plan', 'datetime', 'ingredient', 'weight_unit', 'amount'], ); return Log( id: json['id'] as int?, diff --git a/lib/models/nutrition/nutritional_plan.g.dart b/lib/models/nutrition/nutritional_plan.g.dart index 9b10d8a5..661a9f47 100644 --- a/lib/models/nutrition/nutritional_plan.g.dart +++ b/lib/models/nutrition/nutritional_plan.g.dart @@ -18,8 +18,7 @@ NutritionalPlan _$NutritionalPlanFromJson(Map json) { ); } -Map _$NutritionalPlanToJson(NutritionalPlan instance) => - { +Map _$NutritionalPlanToJson(NutritionalPlan instance) => { 'id': instance.id, 'description': instance.description, 'creation_date': toDate(instance.creationDate), diff --git a/lib/models/nutrition/weight_unit.g.dart b/lib/models/nutrition/weight_unit.g.dart index 74e1f0cf..6f2b9607 100644 --- a/lib/models/nutrition/weight_unit.g.dart +++ b/lib/models/nutrition/weight_unit.g.dart @@ -17,8 +17,7 @@ WeightUnit _$WeightUnitFromJson(Map json) { ); } -Map _$WeightUnitToJson(WeightUnit instance) => - { +Map _$WeightUnitToJson(WeightUnit instance) => { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/workouts/repetition_unit.g.dart b/lib/models/workouts/repetition_unit.g.dart index 115dc338..33e6a815 100644 --- a/lib/models/workouts/repetition_unit.g.dart +++ b/lib/models/workouts/repetition_unit.g.dart @@ -17,8 +17,7 @@ RepetitionUnit _$RepetitionUnitFromJson(Map json) { ); } -Map _$RepetitionUnitToJson(RepetitionUnit instance) => - { +Map _$RepetitionUnitToJson(RepetitionUnit instance) => { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/workouts/session.g.dart b/lib/models/workouts/session.g.dart index e16affad..79f4fee4 100644 --- a/lib/models/workouts/session.g.dart +++ b/lib/models/workouts/session.g.dart @@ -9,14 +9,7 @@ part of 'session.dart'; WorkoutSession _$WorkoutSessionFromJson(Map json) { $checkKeys( json, - requiredKeys: const [ - 'id', - 'workout', - 'date', - 'impression', - 'time_start', - 'time_end' - ], + requiredKeys: const ['id', 'workout', 'date', 'impression', 'time_start', 'time_end'], ); return WorkoutSession() ..id = json['id'] as int? @@ -28,8 +21,7 @@ WorkoutSession _$WorkoutSessionFromJson(Map json) { ..timeEnd = stringToTime(json['time_end'] as String?); } -Map _$WorkoutSessionToJson(WorkoutSession instance) => - { +Map _$WorkoutSessionToJson(WorkoutSession instance) => { 'id': instance.id, 'workout': instance.workoutId, 'date': toDate(instance.date), diff --git a/lib/models/workouts/weight_unit.g.dart b/lib/models/workouts/weight_unit.g.dart index 74e1f0cf..6f2b9607 100644 --- a/lib/models/workouts/weight_unit.g.dart +++ b/lib/models/workouts/weight_unit.g.dart @@ -17,8 +17,7 @@ WeightUnit _$WeightUnitFromJson(Map json) { ); } -Map _$WeightUnitToJson(WeightUnit instance) => - { +Map _$WeightUnitToJson(WeightUnit instance) => { 'id': instance.id, 'name': instance.name, }; diff --git a/lib/models/workouts/workout_plan.g.dart b/lib/models/workouts/workout_plan.g.dart index ef156e3e..ac1d6fa9 100644 --- a/lib/models/workouts/workout_plan.g.dart +++ b/lib/models/workouts/workout_plan.g.dart @@ -19,8 +19,7 @@ WorkoutPlan _$WorkoutPlanFromJson(Map json) { ); } -Map _$WorkoutPlanToJson(WorkoutPlan instance) => - { +Map _$WorkoutPlanToJson(WorkoutPlan instance) => { 'id': instance.id, 'creation_date': instance.creationDate.toIso8601String(), 'name': instance.name, diff --git a/test/gallery/gallery_screen_test.mocks.dart b/test/gallery/gallery_screen_test.mocks.dart index 33c31809..89ded6c3 100644 --- a/test/gallery/gallery_screen_test.mocks.dart +++ b/test/gallery/gallery_screen_test.mocks.dart @@ -38,33 +38,31 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { } @override - List<_i5.Image> get images => (super.noSuchMethod(Invocation.getter(#images), - returnValue: <_i5.Image>[]) as List<_i5.Image>); + List<_i5.Image> get images => + (super.noSuchMethod(Invocation.getter(#images), returnValue: <_i5.Image>[]) + as List<_i5.Image>); @override set images(List<_i5.Image>? _images) => - super.noSuchMethod(Invocation.setter(#images, _images), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.setter(#images, _images), returnValueForMissingStub: null); @override - _i2.AuthProvider get auth => (super.noSuchMethod(Invocation.getter(#auth), - returnValue: _FakeAuthProvider_0()) as _i2.AuthProvider); + _i2.AuthProvider get auth => + (super.noSuchMethod(Invocation.getter(#auth), returnValue: _FakeAuthProvider_0()) + as _i2.AuthProvider); @override set auth(_i2.AuthProvider? _auth) => - super.noSuchMethod(Invocation.setter(#auth, _auth), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null); @override - _i3.Client get client => (super.noSuchMethod(Invocation.getter(#client), - returnValue: _FakeClient_1()) as _i3.Client); + _i3.Client get client => + (super.noSuchMethod(Invocation.getter(#client), returnValue: _FakeClient_1()) as _i3.Client); @override set client(_i3.Client? _client) => - super.noSuchMethod(Invocation.setter(#client, _client), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null); @override bool get hasListeners => - (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) - as bool); + (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool); @override - void clear() => super.noSuchMethod(Invocation.method(#clear, []), - returnValueForMissingStub: null); + void clear() => + super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null); @override _i6.Future fetchAndSetGallery() => (super.noSuchMethod(Invocation.method(#fetchAndSetGallery, []), @@ -86,48 +84,41 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider { returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i6.Future); @override - Uri makeUrl(String? path, - {int? id, String? objectMethod, Map? query}) => + Uri makeUrl(String? path, {int? id, String? objectMethod, Map? query}) => (super.noSuchMethod( - Invocation.method(#makeUrl, [path], - {#id: id, #objectMethod: objectMethod, #query: query}), + Invocation.method( + #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}), returnValue: _FakeUri_2()) as Uri); @override - _i6.Future> fetch(Uri? uri) => (super.noSuchMethod( - Invocation.method(#fetch, [uri]), - returnValue: Future>.value({})) - as _i6.Future>); + _i6.Future> fetch(Uri? uri) => + (super.noSuchMethod(Invocation.method(#fetch, [uri]), + returnValue: Future>.value({})) + as _i6.Future>); @override _i6.Future> post(Map? data, Uri? uri) => (super.noSuchMethod(Invocation.method(#post, [data, uri]), - returnValue: - Future>.value({})) + returnValue: Future>.value({})) as _i6.Future>); @override - _i6.Future> patch( - Map? data, Uri? uri) => + _i6.Future> patch(Map? data, Uri? uri) => (super.noSuchMethod(Invocation.method(#patch, [data, uri]), - returnValue: - Future>.value({})) + returnValue: Future>.value({})) as _i6.Future>); @override _i6.Future<_i3.Response> deleteRequest(String? url, int? id) => (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]), - returnValue: Future<_i3.Response>.value(_FakeResponse_3())) - as _i6.Future<_i3.Response>); + returnValue: Future<_i3.Response>.value(_FakeResponse_3())) as _i6.Future<_i3.Response>); @override - void addListener(_i8.VoidCallback? listener) => - super.noSuchMethod(Invocation.method(#addListener, [listener]), - returnValueForMissingStub: null); + void addListener(_i8.VoidCallback? listener) => super + .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null); @override void removeListener(_i8.VoidCallback? listener) => super.noSuchMethod(Invocation.method(#removeListener, [listener]), returnValueForMissingStub: null); @override - void dispose() => super.noSuchMethod(Invocation.method(#dispose, []), - returnValueForMissingStub: null); + void dispose() => + super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null); @override void notifyListeners() => - super.noSuchMethod(Invocation.method(#notifyListeners, []), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null); } diff --git a/test/measurements/measurement_categories_screen_test.mocks.dart b/test/measurements/measurement_categories_screen_test.mocks.dart index 8d19bc6f..99391efb 100644 --- a/test/measurements/measurement_categories_screen_test.mocks.dart +++ b/test/measurements/measurement_categories_screen_test.mocks.dart @@ -20,41 +20,36 @@ import 'package:wger/providers/measurement.dart' as _i4; // ignore_for_file: unnecessary_parenthesis // ignore_for_file: camel_case_types -class _FakeWgerBaseProvider_0 extends _i1.Fake implements _i2.WgerBaseProvider { -} +class _FakeWgerBaseProvider_0 extends _i1.Fake implements _i2.WgerBaseProvider {} -class _FakeMeasurementCategory_1 extends _i1.Fake - implements _i3.MeasurementCategory {} +class _FakeMeasurementCategory_1 extends _i1.Fake implements _i3.MeasurementCategory {} /// A class which mocks [MeasurementProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockMeasurementProvider extends _i1.Mock - implements _i4.MeasurementProvider { +class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvider { MockMeasurementProvider() { _i1.throwOnMissingStub(this); } @override _i2.WgerBaseProvider get baseProvider => - (super.noSuchMethod(Invocation.getter(#baseProvider), - returnValue: _FakeWgerBaseProvider_0()) as _i2.WgerBaseProvider); + (super.noSuchMethod(Invocation.getter(#baseProvider), returnValue: _FakeWgerBaseProvider_0()) + as _i2.WgerBaseProvider); @override List<_i3.MeasurementCategory> get categories => - (super.noSuchMethod(Invocation.getter(#categories), - returnValue: <_i3.MeasurementCategory>[]) + (super.noSuchMethod(Invocation.getter(#categories), returnValue: <_i3.MeasurementCategory>[]) as List<_i3.MeasurementCategory>); @override bool get hasListeners => - (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) - as bool); + (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool); @override - void clear() => super.noSuchMethod(Invocation.method(#clear, []), - returnValueForMissingStub: null); + void clear() => + super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null); @override - _i3.MeasurementCategory findCategoryById(int? id) => (super.noSuchMethod( - Invocation.method(#findCategoryById, [id]), - returnValue: _FakeMeasurementCategory_1()) as _i3.MeasurementCategory); + _i3.MeasurementCategory findCategoryById(int? id) => + (super.noSuchMethod(Invocation.method(#findCategoryById, [id]), + returnValue: _FakeMeasurementCategory_1()) as _i3.MeasurementCategory); @override _i5.Future fetchAndSetCategories() => (super.noSuchMethod(Invocation.method(#fetchAndSetCategories, []), @@ -66,10 +61,10 @@ class MockMeasurementProvider extends _i1.Mock returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i5.Future); @override - _i5.Future fetchAndSetAllCategoriesAndEntries() => (super.noSuchMethod( - Invocation.method(#fetchAndSetAllCategoriesAndEntries, []), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i5.Future); + _i5.Future fetchAndSetAllCategoriesAndEntries() => + (super.noSuchMethod(Invocation.method(#fetchAndSetAllCategoriesAndEntries, []), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i5.Future); @override _i5.Future addCategory(_i3.MeasurementCategory? category) => (super.noSuchMethod(Invocation.method(#addCategory, [category]), @@ -82,8 +77,7 @@ class MockMeasurementProvider extends _i1.Mock returnValueForMissingStub: Future.value()) as _i5.Future); @override _i5.Future editCategory(int? id, String? newName, String? newUnit) => - (super.noSuchMethod( - Invocation.method(#editCategory, [id, newName, newUnit]), + (super.noSuchMethod(Invocation.method(#editCategory, [id, newName, newUnit]), returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i5.Future); @override @@ -97,26 +91,23 @@ class MockMeasurementProvider extends _i1.Mock returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i5.Future); @override - _i5.Future editEntry(int? id, int? categoryId, num? newValue, - String? newNotes, DateTime? newDate) => + _i5.Future editEntry( + int? id, int? categoryId, num? newValue, String? newNotes, DateTime? newDate) => (super.noSuchMethod( - Invocation.method( - #editEntry, [id, categoryId, newValue, newNotes, newDate]), + Invocation.method(#editEntry, [id, categoryId, newValue, newNotes, newDate]), returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i5.Future); @override - void addListener(_i7.VoidCallback? listener) => - super.noSuchMethod(Invocation.method(#addListener, [listener]), - returnValueForMissingStub: null); + void addListener(_i7.VoidCallback? listener) => super + .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null); @override void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(Invocation.method(#removeListener, [listener]), returnValueForMissingStub: null); @override - void dispose() => super.noSuchMethod(Invocation.method(#dispose, []), - returnValueForMissingStub: null); + void dispose() => + super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null); @override void notifyListeners() => - super.noSuchMethod(Invocation.method(#notifyListeners, []), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null); } diff --git a/test/measurements/measurement_provider_test.mocks.dart b/test/measurements/measurement_provider_test.mocks.dart index eed83541..67ccb658 100644 --- a/test/measurements/measurement_provider_test.mocks.dart +++ b/test/measurements/measurement_provider_test.mocks.dart @@ -35,47 +35,41 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider { } @override - _i2.AuthProvider get auth => (super.noSuchMethod(Invocation.getter(#auth), - returnValue: _FakeAuthProvider_0()) as _i2.AuthProvider); + _i2.AuthProvider get auth => + (super.noSuchMethod(Invocation.getter(#auth), returnValue: _FakeAuthProvider_0()) + as _i2.AuthProvider); @override set auth(_i2.AuthProvider? _auth) => - super.noSuchMethod(Invocation.setter(#auth, _auth), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null); @override - _i3.Client get client => (super.noSuchMethod(Invocation.getter(#client), - returnValue: _FakeClient_1()) as _i3.Client); + _i3.Client get client => + (super.noSuchMethod(Invocation.getter(#client), returnValue: _FakeClient_1()) as _i3.Client); @override set client(_i3.Client? _client) => - super.noSuchMethod(Invocation.setter(#client, _client), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null); @override - Uri makeUrl(String? path, - {int? id, String? objectMethod, Map? query}) => + Uri makeUrl(String? path, {int? id, String? objectMethod, Map? query}) => (super.noSuchMethod( - Invocation.method(#makeUrl, [path], - {#id: id, #objectMethod: objectMethod, #query: query}), + Invocation.method( + #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}), returnValue: _FakeUri_2()) as Uri); @override - _i5.Future> fetch(Uri? uri) => (super.noSuchMethod( - Invocation.method(#fetch, [uri]), - returnValue: Future>.value({})) - as _i5.Future>); + _i5.Future> fetch(Uri? uri) => + (super.noSuchMethod(Invocation.method(#fetch, [uri]), + returnValue: Future>.value({})) + as _i5.Future>); @override _i5.Future> post(Map? data, Uri? uri) => (super.noSuchMethod(Invocation.method(#post, [data, uri]), - returnValue: - Future>.value({})) + returnValue: Future>.value({})) as _i5.Future>); @override - _i5.Future> patch( - Map? data, Uri? uri) => + _i5.Future> patch(Map? data, Uri? uri) => (super.noSuchMethod(Invocation.method(#patch, [data, uri]), - returnValue: - Future>.value({})) + returnValue: Future>.value({})) as _i5.Future>); @override _i5.Future<_i3.Response> deleteRequest(String? url, int? id) => (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]), - returnValue: Future<_i3.Response>.value(_FakeResponse_3())) - as _i5.Future<_i3.Response>); + returnValue: Future<_i3.Response>.value(_FakeResponse_3())) as _i5.Future<_i3.Response>); } diff --git a/test/nutrition/nutritional_plan_form_test.mocks.dart b/test/nutrition/nutritional_plan_form_test.mocks.dart index 5e61b760..b9f6dda4 100644 --- a/test/nutrition/nutritional_plan_form_test.mocks.dart +++ b/test/nutrition/nutritional_plan_form_test.mocks.dart @@ -42,41 +42,38 @@ class _FakeResponse_7 extends _i1.Fake implements _i3.Response {} /// A class which mocks [NutritionPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockNutritionPlansProvider extends _i1.Mock - implements _i8.NutritionPlansProvider { +class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansProvider { MockNutritionPlansProvider() { _i1.throwOnMissingStub(this); } @override List<_i4.NutritionalPlan> get items => - (super.noSuchMethod(Invocation.getter(#items), - returnValue: <_i4.NutritionalPlan>[]) as List<_i4.NutritionalPlan>); + (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i4.NutritionalPlan>[]) + as List<_i4.NutritionalPlan>); @override - _i2.AuthProvider get auth => (super.noSuchMethod(Invocation.getter(#auth), - returnValue: _FakeAuthProvider_0()) as _i2.AuthProvider); + _i2.AuthProvider get auth => + (super.noSuchMethod(Invocation.getter(#auth), returnValue: _FakeAuthProvider_0()) + as _i2.AuthProvider); @override set auth(_i2.AuthProvider? _auth) => - super.noSuchMethod(Invocation.setter(#auth, _auth), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null); @override - _i3.Client get client => (super.noSuchMethod(Invocation.getter(#client), - returnValue: _FakeClient_1()) as _i3.Client); + _i3.Client get client => + (super.noSuchMethod(Invocation.getter(#client), returnValue: _FakeClient_1()) as _i3.Client); @override set client(_i3.Client? _client) => - super.noSuchMethod(Invocation.setter(#client, _client), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null); @override bool get hasListeners => - (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) - as bool); + (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool); @override - void clear() => super.noSuchMethod(Invocation.method(#clear, []), - returnValueForMissingStub: null); + void clear() => + super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null); @override _i4.NutritionalPlan findById(int? id) => - (super.noSuchMethod(Invocation.method(#findById, [id]), - returnValue: _FakeNutritionalPlan_2()) as _i4.NutritionalPlan); + (super.noSuchMethod(Invocation.method(#findById, [id]), returnValue: _FakeNutritionalPlan_2()) + as _i4.NutritionalPlan); @override _i5.Meal? findMealById(int? id) => (super.noSuchMethod(Invocation.method(#findMealById, [id])) as _i5.Meal?); @@ -93,20 +90,17 @@ class MockNutritionPlansProvider extends _i1.Mock @override _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod(Invocation.method(#fetchAndSetPlanSparse, [planId]), - returnValue: - Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2())) + returnValue: Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2())) as _i9.Future<_i4.NutritionalPlan>); @override _i9.Future<_i4.NutritionalPlan> fetchAndSetPlanFull(int? planId) => (super.noSuchMethod(Invocation.method(#fetchAndSetPlanFull, [planId]), - returnValue: - Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2())) + returnValue: Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2())) as _i9.Future<_i4.NutritionalPlan>); @override _i9.Future<_i4.NutritionalPlan> addPlan(_i4.NutritionalPlan? planData) => (super.noSuchMethod(Invocation.method(#addPlan, [planData]), - returnValue: - Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2())) + returnValue: Future<_i4.NutritionalPlan>.value(_FakeNutritionalPlan_2())) as _i9.Future<_i4.NutritionalPlan>); @override _i9.Future editPlan(_i4.NutritionalPlan? plan) => @@ -114,31 +108,26 @@ class MockNutritionPlansProvider extends _i1.Mock returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i9.Future); @override - _i9.Future deletePlan(int? id) => - (super.noSuchMethod(Invocation.method(#deletePlan, [id]), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i9.Future); + _i9.Future deletePlan(int? id) => (super.noSuchMethod(Invocation.method(#deletePlan, [id]), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i9.Future); @override _i9.Future<_i5.Meal> addMeal(_i5.Meal? meal, int? planId) => (super.noSuchMethod(Invocation.method(#addMeal, [meal, planId]), - returnValue: Future<_i5.Meal>.value(_FakeMeal_3())) - as _i9.Future<_i5.Meal>); + returnValue: Future<_i5.Meal>.value(_FakeMeal_3())) as _i9.Future<_i5.Meal>); @override _i9.Future<_i5.Meal> editMeal(_i5.Meal? meal) => (super.noSuchMethod(Invocation.method(#editMeal, [meal]), - returnValue: Future<_i5.Meal>.value(_FakeMeal_3())) - as _i9.Future<_i5.Meal>); + returnValue: Future<_i5.Meal>.value(_FakeMeal_3())) as _i9.Future<_i5.Meal>); @override _i9.Future deleteMeal(_i5.Meal? meal) => (super.noSuchMethod(Invocation.method(#deleteMeal, [meal]), returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i9.Future); @override - _i9.Future<_i6.MealItem> addMealItem( - _i6.MealItem? mealItem, _i5.Meal? meal) => + _i9.Future<_i6.MealItem> addMealItem(_i6.MealItem? mealItem, _i5.Meal? meal) => (super.noSuchMethod(Invocation.method(#addMealItem, [mealItem, meal]), - returnValue: Future<_i6.MealItem>.value(_FakeMealItem_4())) - as _i9.Future<_i6.MealItem>); + returnValue: Future<_i6.MealItem>.value(_FakeMealItem_4())) as _i9.Future<_i6.MealItem>); @override _i9.Future deleteMealItem(_i6.MealItem? mealItem) => (super.noSuchMethod(Invocation.method(#deleteMealItem, [mealItem]), @@ -155,27 +144,21 @@ class MockNutritionPlansProvider extends _i1.Mock returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i9.Future); @override - _i9.Future> searchIngredient(String? name, - [String? languageCode = r'en']) => - (super.noSuchMethod( - Invocation.method(#searchIngredient, [name, languageCode]), - returnValue: Future>.value([])) - as _i9.Future>); + _i9.Future> searchIngredient(String? name, [String? languageCode = r'en']) => + (super.noSuchMethod(Invocation.method(#searchIngredient, [name, languageCode]), + returnValue: Future>.value([])) as _i9.Future>); @override _i9.Future<_i7.Ingredient?> searchIngredientWithCode(String? code) => (super.noSuchMethod(Invocation.method(#searchIngredientWithCode, [code]), - returnValue: Future<_i7.Ingredient?>.value()) - as _i9.Future<_i7.Ingredient?>); + returnValue: Future<_i7.Ingredient?>.value()) as _i9.Future<_i7.Ingredient?>); @override _i9.Future logMealToDiary(_i5.Meal? meal) => (super.noSuchMethod(Invocation.method(#logMealToDiary, [meal]), returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i9.Future); @override - _i9.Future logIngredentToDiary(_i6.MealItem? mealItem, int? planId, - [DateTime? dateTime]) => - (super.noSuchMethod( - Invocation.method(#logIngredentToDiary, [mealItem, planId, dateTime]), + _i9.Future logIngredentToDiary(_i6.MealItem? mealItem, int? planId, [DateTime? dateTime]) => + (super.noSuchMethod(Invocation.method(#logIngredentToDiary, [mealItem, planId, dateTime]), returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i9.Future); @override @@ -189,48 +172,41 @@ class MockNutritionPlansProvider extends _i1.Mock returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i9.Future); @override - Uri makeUrl(String? path, - {int? id, String? objectMethod, Map? query}) => + Uri makeUrl(String? path, {int? id, String? objectMethod, Map? query}) => (super.noSuchMethod( - Invocation.method(#makeUrl, [path], - {#id: id, #objectMethod: objectMethod, #query: query}), + Invocation.method( + #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}), returnValue: _FakeUri_6()) as Uri); @override - _i9.Future> fetch(Uri? uri) => (super.noSuchMethod( - Invocation.method(#fetch, [uri]), - returnValue: Future>.value({})) - as _i9.Future>); + _i9.Future> fetch(Uri? uri) => + (super.noSuchMethod(Invocation.method(#fetch, [uri]), + returnValue: Future>.value({})) + as _i9.Future>); @override _i9.Future> post(Map? data, Uri? uri) => (super.noSuchMethod(Invocation.method(#post, [data, uri]), - returnValue: - Future>.value({})) + returnValue: Future>.value({})) as _i9.Future>); @override - _i9.Future> patch( - Map? data, Uri? uri) => + _i9.Future> patch(Map? data, Uri? uri) => (super.noSuchMethod(Invocation.method(#patch, [data, uri]), - returnValue: - Future>.value({})) + returnValue: Future>.value({})) as _i9.Future>); @override _i9.Future<_i3.Response> deleteRequest(String? url, int? id) => (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]), - returnValue: Future<_i3.Response>.value(_FakeResponse_7())) - as _i9.Future<_i3.Response>); + returnValue: Future<_i3.Response>.value(_FakeResponse_7())) as _i9.Future<_i3.Response>); @override - void addListener(_i10.VoidCallback? listener) => - super.noSuchMethod(Invocation.method(#addListener, [listener]), - returnValueForMissingStub: null); + void addListener(_i10.VoidCallback? listener) => super + .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null); @override void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(Invocation.method(#removeListener, [listener]), returnValueForMissingStub: null); @override - void dispose() => super.noSuchMethod(Invocation.method(#dispose, []), - returnValueForMissingStub: null); + void dispose() => + super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null); @override void notifyListeners() => - super.noSuchMethod(Invocation.method(#notifyListeners, []), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null); } diff --git a/test/other/base_provider_test.mocks.dart b/test/other/base_provider_test.mocks.dart index b9dbf7c8..59ccffaa 100644 --- a/test/other/base_provider_test.mocks.dart +++ b/test/other/base_provider_test.mocks.dart @@ -23,8 +23,7 @@ import 'package:mockito/mockito.dart' as _i1; class _FakeResponse_0 extends _i1.Fake implements _i2.Response {} -class _FakeStreamedResponse_1 extends _i1.Fake implements _i3.StreamedResponse { -} +class _FakeStreamedResponse_1 extends _i1.Fake implements _i3.StreamedResponse {} /// A class which mocks [Client]. /// @@ -37,71 +36,49 @@ class MockClient extends _i1.Mock implements _i4.Client { @override _i5.Future<_i2.Response> head(Uri? url, {Map? headers}) => (super.noSuchMethod(Invocation.method(#head, [url], {#headers: headers}), - returnValue: Future<_i2.Response>.value(_FakeResponse_0())) - as _i5.Future<_i2.Response>); + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>); @override _i5.Future<_i2.Response> get(Uri? url, {Map? headers}) => (super.noSuchMethod(Invocation.method(#get, [url], {#headers: headers}), - returnValue: Future<_i2.Response>.value(_FakeResponse_0())) - as _i5.Future<_i2.Response>); + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>); @override _i5.Future<_i2.Response> post(Uri? url, - {Map? headers, - Object? body, - _i6.Encoding? encoding}) => + {Map? headers, Object? body, _i6.Encoding? encoding}) => (super.noSuchMethod( - Invocation.method(#post, [url], - {#headers: headers, #body: body, #encoding: encoding}), - returnValue: Future<_i2.Response>.value(_FakeResponse_0())) - as _i5.Future<_i2.Response>); + Invocation.method(#post, [url], {#headers: headers, #body: body, #encoding: encoding}), + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>); @override _i5.Future<_i2.Response> put(Uri? url, - {Map? headers, - Object? body, - _i6.Encoding? encoding}) => + {Map? headers, Object? body, _i6.Encoding? encoding}) => (super.noSuchMethod( - Invocation.method(#put, [url], - {#headers: headers, #body: body, #encoding: encoding}), - returnValue: Future<_i2.Response>.value(_FakeResponse_0())) - as _i5.Future<_i2.Response>); + Invocation.method(#put, [url], {#headers: headers, #body: body, #encoding: encoding}), + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>); @override _i5.Future<_i2.Response> patch(Uri? url, - {Map? headers, - Object? body, - _i6.Encoding? encoding}) => + {Map? headers, Object? body, _i6.Encoding? encoding}) => (super.noSuchMethod( - Invocation.method(#patch, [url], - {#headers: headers, #body: body, #encoding: encoding}), - returnValue: Future<_i2.Response>.value(_FakeResponse_0())) - as _i5.Future<_i2.Response>); + Invocation.method(#patch, [url], {#headers: headers, #body: body, #encoding: encoding}), + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>); @override _i5.Future<_i2.Response> delete(Uri? url, - {Map? headers, - Object? body, - _i6.Encoding? encoding}) => + {Map? headers, Object? body, _i6.Encoding? encoding}) => (super.noSuchMethod( - Invocation.method(#delete, [url], - {#headers: headers, #body: body, #encoding: encoding}), - returnValue: Future<_i2.Response>.value(_FakeResponse_0())) - as _i5.Future<_i2.Response>); + Invocation.method(#delete, [url], {#headers: headers, #body: body, #encoding: encoding}), + returnValue: Future<_i2.Response>.value(_FakeResponse_0())) as _i5.Future<_i2.Response>); @override _i5.Future read(Uri? url, {Map? headers}) => (super.noSuchMethod(Invocation.method(#read, [url], {#headers: headers}), returnValue: Future.value('')) as _i5.Future); @override - _i5.Future<_i7.Uint8List> readBytes(Uri? url, - {Map? headers}) => - (super.noSuchMethod( - Invocation.method(#readBytes, [url], {#headers: headers}), - returnValue: Future<_i7.Uint8List>.value(_i7.Uint8List(0))) - as _i5.Future<_i7.Uint8List>); + _i5.Future<_i7.Uint8List> readBytes(Uri? url, {Map? headers}) => + (super.noSuchMethod(Invocation.method(#readBytes, [url], {#headers: headers}), + returnValue: Future<_i7.Uint8List>.value(_i7.Uint8List(0))) as _i5.Future<_i7.Uint8List>); @override _i5.Future<_i3.StreamedResponse> send(_i8.BaseRequest? request) => (super.noSuchMethod(Invocation.method(#send, [request]), - returnValue: - Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_1())) + returnValue: Future<_i3.StreamedResponse>.value(_FakeStreamedResponse_1())) as _i5.Future<_i3.StreamedResponse>); @override - void close() => super.noSuchMethod(Invocation.method(#close, []), - returnValueForMissingStub: null); + void close() => + super.noSuchMethod(Invocation.method(#close, []), returnValueForMissingStub: null); } diff --git a/test/workout/workout_form_test.mocks.dart b/test/workout/workout_form_test.mocks.dart index 496409c2..26464a9a 100644 --- a/test/workout/workout_form_test.mocks.dart +++ b/test/workout/workout_form_test.mocks.dart @@ -55,79 +55,73 @@ class _FakeResponse_11 extends _i1.Fake implements _i5.Response {} /// A class which mocks [WorkoutPlansProvider]. /// /// See the documentation for Mockito's code generation for more information. -class MockWorkoutPlansProvider extends _i1.Mock - implements _i12.WorkoutPlansProvider { +class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProvider { MockWorkoutPlansProvider() { _i1.throwOnMissingStub(this); } @override List<_i6.WorkoutPlan> get items => - (super.noSuchMethod(Invocation.getter(#items), - returnValue: <_i6.WorkoutPlan>[]) as List<_i6.WorkoutPlan>); + (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i6.WorkoutPlan>[]) + as List<_i6.WorkoutPlan>); @override List<_i2.WeightUnit> get weightUnits => - (super.noSuchMethod(Invocation.getter(#weightUnits), - returnValue: <_i2.WeightUnit>[]) as List<_i2.WeightUnit>); + (super.noSuchMethod(Invocation.getter(#weightUnits), returnValue: <_i2.WeightUnit>[]) + as List<_i2.WeightUnit>); @override _i2.WeightUnit get defaultWeightUnit => - (super.noSuchMethod(Invocation.getter(#defaultWeightUnit), - returnValue: _FakeWeightUnit_0()) as _i2.WeightUnit); + (super.noSuchMethod(Invocation.getter(#defaultWeightUnit), returnValue: _FakeWeightUnit_0()) + as _i2.WeightUnit); @override List<_i3.RepetitionUnit> get repetitionUnits => - (super.noSuchMethod(Invocation.getter(#repetitionUnits), - returnValue: <_i3.RepetitionUnit>[]) as List<_i3.RepetitionUnit>); + (super.noSuchMethod(Invocation.getter(#repetitionUnits), returnValue: <_i3.RepetitionUnit>[]) + as List<_i3.RepetitionUnit>); @override _i3.RepetitionUnit get defaultRepetitionUnit => (super.noSuchMethod(Invocation.getter(#defaultRepetitionUnit), returnValue: _FakeRepetitionUnit_1()) as _i3.RepetitionUnit); @override - _i4.AuthProvider get auth => (super.noSuchMethod(Invocation.getter(#auth), - returnValue: _FakeAuthProvider_2()) as _i4.AuthProvider); + _i4.AuthProvider get auth => + (super.noSuchMethod(Invocation.getter(#auth), returnValue: _FakeAuthProvider_2()) + as _i4.AuthProvider); @override set auth(_i4.AuthProvider? _auth) => - super.noSuchMethod(Invocation.setter(#auth, _auth), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null); @override - _i5.Client get client => (super.noSuchMethod(Invocation.getter(#client), - returnValue: _FakeClient_3()) as _i5.Client); + _i5.Client get client => + (super.noSuchMethod(Invocation.getter(#client), returnValue: _FakeClient_3()) as _i5.Client); @override set client(_i5.Client? _client) => - super.noSuchMethod(Invocation.setter(#client, _client), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null); @override bool get hasListeners => - (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) - as bool); + (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool); @override - void clear() => super.noSuchMethod(Invocation.method(#clear, []), - returnValueForMissingStub: null); + void clear() => + super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null); @override _i6.WorkoutPlan findById(int? id) => - (super.noSuchMethod(Invocation.method(#findById, [id]), - returnValue: _FakeWorkoutPlan_4()) as _i6.WorkoutPlan); + (super.noSuchMethod(Invocation.method(#findById, [id]), returnValue: _FakeWorkoutPlan_4()) + as _i6.WorkoutPlan); @override - int findIndexById(int? id) => (super - .noSuchMethod(Invocation.method(#findIndexById, [id]), returnValue: 0) - as int); + int findIndexById(int? id) => + (super.noSuchMethod(Invocation.method(#findIndexById, [id]), returnValue: 0) as int); @override void setCurrentPlan(int? id) => - super.noSuchMethod(Invocation.method(#setCurrentPlan, [id]), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.method(#setCurrentPlan, [id]), returnValueForMissingStub: null); @override void resetCurrentPlan() => - super.noSuchMethod(Invocation.method(#resetCurrentPlan, []), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.method(#resetCurrentPlan, []), returnValueForMissingStub: null); @override - _i13.Future fetchAndSetAllPlansFull() => (super.noSuchMethod( - Invocation.method(#fetchAndSetAllPlansFull, []), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i13.Future); + _i13.Future fetchAndSetAllPlansFull() => + (super.noSuchMethod(Invocation.method(#fetchAndSetAllPlansFull, []), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override - _i13.Future fetchAndSetAllPlansSparse() => (super.noSuchMethod( - Invocation.method(#fetchAndSetAllPlansSparse, []), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i13.Future); + _i13.Future fetchAndSetAllPlansSparse() => + (super.noSuchMethod(Invocation.method(#fetchAndSetAllPlansSparse, []), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override _i13.Future<_i6.WorkoutPlan> fetchAndSetPlanSparse(int? planId) => (super.noSuchMethod(Invocation.method(#fetchAndSetPlanSparse, [planId]), @@ -135,8 +129,7 @@ class MockWorkoutPlansProvider extends _i1.Mock as _i13.Future<_i6.WorkoutPlan>); @override _i13.Future<_i6.WorkoutPlan> fetchAndSetWorkoutPlanFull(int? workoutId) => - (super.noSuchMethod( - Invocation.method(#fetchAndSetWorkoutPlanFull, [workoutId]), + (super.noSuchMethod(Invocation.method(#fetchAndSetWorkoutPlanFull, [workoutId]), returnValue: Future<_i6.WorkoutPlan>.value(_FakeWorkoutPlan_4())) as _i13.Future<_i6.WorkoutPlan>); @override @@ -147,89 +140,78 @@ class MockWorkoutPlansProvider extends _i1.Mock @override _i13.Future editWorkout(_i6.WorkoutPlan? workout) => (super.noSuchMethod(Invocation.method(#editWorkout, [workout]), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) - as _i13.Future); + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override - _i13.Future deleteWorkout(int? id) => (super.noSuchMethod( - Invocation.method(#deleteWorkout, [id]), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i13.Future); + _i13.Future deleteWorkout(int? id) => + (super.noSuchMethod(Invocation.method(#deleteWorkout, [id]), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override _i13.Future> fetchLogData( _i6.WorkoutPlan? workout, _i14.Exercise? exercise) => (super.noSuchMethod(Invocation.method(#fetchLogData, [workout, exercise]), - returnValue: - Future>.value({})) + returnValue: Future>.value({})) as _i13.Future>); @override - _i13.Future fetchAndSetRepetitionUnits() => (super.noSuchMethod( - Invocation.method(#fetchAndSetRepetitionUnits, []), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i13.Future); + _i13.Future fetchAndSetRepetitionUnits() => + (super.noSuchMethod(Invocation.method(#fetchAndSetRepetitionUnits, []), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override - _i13.Future fetchAndSetWeightUnits() => (super.noSuchMethod( - Invocation.method(#fetchAndSetWeightUnits, []), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i13.Future); + _i13.Future fetchAndSetWeightUnits() => + (super.noSuchMethod(Invocation.method(#fetchAndSetWeightUnits, []), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override - _i13.Future fetchAndSetUnits() => (super.noSuchMethod( - Invocation.method(#fetchAndSetUnits, []), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i13.Future); + _i13.Future fetchAndSetUnits() => + (super.noSuchMethod(Invocation.method(#fetchAndSetUnits, []), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override _i13.Future<_i7.Day> addDay(_i7.Day? day, _i6.WorkoutPlan? workout) => (super.noSuchMethod(Invocation.method(#addDay, [day, workout]), - returnValue: Future<_i7.Day>.value(_FakeDay_5())) - as _i13.Future<_i7.Day>); + returnValue: Future<_i7.Day>.value(_FakeDay_5())) as _i13.Future<_i7.Day>); @override - _i13.Future editDay(_i7.Day? day) => (super.noSuchMethod( - Invocation.method(#editDay, [day]), + _i13.Future editDay(_i7.Day? day) => (super.noSuchMethod(Invocation.method(#editDay, [day]), returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i13.Future); @override - _i13.Future deleteDay(_i7.Day? day) => (super.noSuchMethod( - Invocation.method(#deleteDay, [day]), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i13.Future); + _i13.Future deleteDay(_i7.Day? day) => + (super.noSuchMethod(Invocation.method(#deleteDay, [day]), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override _i13.Future<_i8.Set> addSet(_i8.Set? workoutSet) => (super.noSuchMethod(Invocation.method(#addSet, [workoutSet]), - returnValue: Future<_i8.Set>.value(_FakeSet_6())) - as _i13.Future<_i8.Set>); + returnValue: Future<_i8.Set>.value(_FakeSet_6())) as _i13.Future<_i8.Set>); @override - _i13.Future editSet(_i8.Set? workoutSet) => (super.noSuchMethod( - Invocation.method(#editSet, [workoutSet]), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i13.Future); + _i13.Future editSet(_i8.Set? workoutSet) => + (super.noSuchMethod(Invocation.method(#editSet, [workoutSet]), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override - _i13.Future> reorderSets( - List<_i8.Set>? sets, int? startIndex) => + _i13.Future> reorderSets(List<_i8.Set>? sets, int? startIndex) => (super.noSuchMethod(Invocation.method(#reorderSets, [sets, startIndex]), - returnValue: Future>.value(<_i8.Set>[])) - as _i13.Future>); + returnValue: Future>.value(<_i8.Set>[])) as _i13.Future>); @override - _i13.Future fetchComputedSettings(_i8.Set? workoutSet) => (super - .noSuchMethod(Invocation.method(#fetchComputedSettings, [workoutSet]), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) - as _i13.Future); + _i13.Future fetchComputedSettings(_i8.Set? workoutSet) => + (super.noSuchMethod(Invocation.method(#fetchComputedSettings, [workoutSet]), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override - _i13.Future fetchSmartText( - _i8.Set? workoutSet, _i14.Exercise? exercise) => - (super.noSuchMethod( - Invocation.method(#fetchSmartText, [workoutSet, exercise]), + _i13.Future fetchSmartText(_i8.Set? workoutSet, _i14.Exercise? exercise) => + (super.noSuchMethod(Invocation.method(#fetchSmartText, [workoutSet, exercise]), returnValue: Future.value('')) as _i13.Future); @override - _i13.Future deleteSet(_i8.Set? workoutSet) => (super.noSuchMethod( - Invocation.method(#deleteSet, [workoutSet]), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i13.Future); + _i13.Future deleteSet(_i8.Set? workoutSet) => + (super.noSuchMethod(Invocation.method(#deleteSet, [workoutSet]), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override _i13.Future<_i9.Setting> addSetting(_i9.Setting? workoutSetting) => (super.noSuchMethod(Invocation.method(#addSetting, [workoutSetting]), - returnValue: Future<_i9.Setting>.value(_FakeSetting_7())) - as _i13.Future<_i9.Setting>); + returnValue: Future<_i9.Setting>.value(_FakeSetting_7())) as _i13.Future<_i9.Setting>); @override _i13.Future fetchSessionData() => (super.noSuchMethod(Invocation.method(#fetchSessionData, []), @@ -237,63 +219,53 @@ class MockWorkoutPlansProvider extends _i1.Mock @override _i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) => (super.noSuchMethod(Invocation.method(#addSession, [session]), - returnValue: - Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8())) + returnValue: Future<_i10.WorkoutSession>.value(_FakeWorkoutSession_8())) as _i13.Future<_i10.WorkoutSession>); @override _i13.Future<_i11.Log> addLog(_i11.Log? log) => (super.noSuchMethod(Invocation.method(#addLog, [log]), - returnValue: Future<_i11.Log>.value(_FakeLog_9())) - as _i13.Future<_i11.Log>); + returnValue: Future<_i11.Log>.value(_FakeLog_9())) as _i13.Future<_i11.Log>); @override - _i13.Future deleteLog(_i11.Log? log) => (super.noSuchMethod( - Invocation.method(#deleteLog, [log]), - returnValue: Future.value(), - returnValueForMissingStub: Future.value()) as _i13.Future); + _i13.Future deleteLog(_i11.Log? log) => + (super.noSuchMethod(Invocation.method(#deleteLog, [log]), + returnValue: Future.value(), + returnValueForMissingStub: Future.value()) as _i13.Future); @override - Uri makeUrl(String? path, - {int? id, String? objectMethod, Map? query}) => + Uri makeUrl(String? path, {int? id, String? objectMethod, Map? query}) => (super.noSuchMethod( - Invocation.method(#makeUrl, [path], - {#id: id, #objectMethod: objectMethod, #query: query}), + Invocation.method( + #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}), returnValue: _FakeUri_10()) as Uri); @override - _i13.Future> fetch(Uri? uri) => (super.noSuchMethod( - Invocation.method(#fetch, [uri]), - returnValue: Future>.value({})) - as _i13.Future>); + _i13.Future> fetch(Uri? uri) => + (super.noSuchMethod(Invocation.method(#fetch, [uri]), + returnValue: Future>.value({})) + as _i13.Future>); @override - _i13.Future> post( - Map? data, Uri? uri) => + _i13.Future> post(Map? data, Uri? uri) => (super.noSuchMethod(Invocation.method(#post, [data, uri]), - returnValue: - Future>.value({})) + returnValue: Future>.value({})) as _i13.Future>); @override - _i13.Future> patch( - Map? data, Uri? uri) => + _i13.Future> patch(Map? data, Uri? uri) => (super.noSuchMethod(Invocation.method(#patch, [data, uri]), - returnValue: - Future>.value({})) + returnValue: Future>.value({})) as _i13.Future>); @override - _i13.Future<_i5.Response> deleteRequest(String? url, int? id) => - (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]), - returnValue: Future<_i5.Response>.value(_FakeResponse_11())) - as _i13.Future<_i5.Response>); + _i13.Future<_i5.Response> deleteRequest(String? url, int? id) => (super.noSuchMethod( + Invocation.method(#deleteRequest, [url, id]), + returnValue: Future<_i5.Response>.value(_FakeResponse_11())) as _i13.Future<_i5.Response>); @override - void addListener(_i15.VoidCallback? listener) => - super.noSuchMethod(Invocation.method(#addListener, [listener]), - returnValueForMissingStub: null); + void addListener(_i15.VoidCallback? listener) => super + .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null); @override void removeListener(_i15.VoidCallback? listener) => super.noSuchMethod(Invocation.method(#removeListener, [listener]), returnValueForMissingStub: null); @override - void dispose() => super.noSuchMethod(Invocation.method(#dispose, []), - returnValueForMissingStub: null); + void dispose() => + super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null); @override void notifyListeners() => - super.noSuchMethod(Invocation.method(#notifyListeners, []), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null); } diff --git a/test/workout/workout_set_form_test.mocks.dart b/test/workout/workout_set_form_test.mocks.dart index 3c93fa25..21519f28 100644 --- a/test/workout/workout_set_form_test.mocks.dart +++ b/test/workout/workout_set_form_test.mocks.dart @@ -39,30 +39,29 @@ class MockExercisesProvider extends _i1.Mock implements _i5.ExercisesProvider { } @override - List<_i4.Exercise> get items => (super.noSuchMethod(Invocation.getter(#items), - returnValue: <_i4.Exercise>[]) as List<_i4.Exercise>); + List<_i4.Exercise> get items => + (super.noSuchMethod(Invocation.getter(#items), returnValue: <_i4.Exercise>[]) + as List<_i4.Exercise>); @override - _i2.AuthProvider get auth => (super.noSuchMethod(Invocation.getter(#auth), - returnValue: _FakeAuthProvider_0()) as _i2.AuthProvider); + _i2.AuthProvider get auth => + (super.noSuchMethod(Invocation.getter(#auth), returnValue: _FakeAuthProvider_0()) + as _i2.AuthProvider); @override set auth(_i2.AuthProvider? _auth) => - super.noSuchMethod(Invocation.setter(#auth, _auth), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.setter(#auth, _auth), returnValueForMissingStub: null); @override - _i3.Client get client => (super.noSuchMethod(Invocation.getter(#client), - returnValue: _FakeClient_1()) as _i3.Client); + _i3.Client get client => + (super.noSuchMethod(Invocation.getter(#client), returnValue: _FakeClient_1()) as _i3.Client); @override set client(_i3.Client? _client) => - super.noSuchMethod(Invocation.setter(#client, _client), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.setter(#client, _client), returnValueForMissingStub: null); @override bool get hasListeners => - (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) - as bool); + (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool); @override - _i4.Exercise findById(int? exerciseId) => - (super.noSuchMethod(Invocation.method(#findById, [exerciseId]), - returnValue: _FakeExercise_2()) as _i4.Exercise); + _i4.Exercise findById(int? exerciseId) => (super + .noSuchMethod(Invocation.method(#findById, [exerciseId]), returnValue: _FakeExercise_2()) + as _i4.Exercise); @override _i6.Future fetchAndSetCategories() => (super.noSuchMethod(Invocation.method(#fetchAndSetCategories, []), @@ -81,63 +80,52 @@ class MockExercisesProvider extends _i1.Mock implements _i5.ExercisesProvider { @override _i6.Future<_i4.Exercise> fetchAndSetExercise(int? exerciseId) => (super.noSuchMethod(Invocation.method(#fetchAndSetExercise, [exerciseId]), - returnValue: Future<_i4.Exercise>.value(_FakeExercise_2())) - as _i6.Future<_i4.Exercise>); + returnValue: Future<_i4.Exercise>.value(_FakeExercise_2())) as _i6.Future<_i4.Exercise>); @override _i6.Future fetchAndSetExercises() => (super.noSuchMethod(Invocation.method(#fetchAndSetExercises, []), returnValue: Future.value(), returnValueForMissingStub: Future.value()) as _i6.Future); @override - _i6.Future> searchExercise(String? name, - [String? languageCode = r'en']) => - (super.noSuchMethod( - Invocation.method(#searchExercise, [name, languageCode]), - returnValue: Future>.value([])) - as _i6.Future>); + _i6.Future> searchExercise(String? name, [String? languageCode = r'en']) => + (super.noSuchMethod(Invocation.method(#searchExercise, [name, languageCode]), + returnValue: Future>.value([])) as _i6.Future>); @override - Uri makeUrl(String? path, - {int? id, String? objectMethod, Map? query}) => + Uri makeUrl(String? path, {int? id, String? objectMethod, Map? query}) => (super.noSuchMethod( - Invocation.method(#makeUrl, [path], - {#id: id, #objectMethod: objectMethod, #query: query}), + Invocation.method( + #makeUrl, [path], {#id: id, #objectMethod: objectMethod, #query: query}), returnValue: _FakeUri_3()) as Uri); @override - _i6.Future> fetch(Uri? uri) => (super.noSuchMethod( - Invocation.method(#fetch, [uri]), - returnValue: Future>.value({})) - as _i6.Future>); + _i6.Future> fetch(Uri? uri) => + (super.noSuchMethod(Invocation.method(#fetch, [uri]), + returnValue: Future>.value({})) + as _i6.Future>); @override _i6.Future> post(Map? data, Uri? uri) => (super.noSuchMethod(Invocation.method(#post, [data, uri]), - returnValue: - Future>.value({})) + returnValue: Future>.value({})) as _i6.Future>); @override - _i6.Future> patch( - Map? data, Uri? uri) => + _i6.Future> patch(Map? data, Uri? uri) => (super.noSuchMethod(Invocation.method(#patch, [data, uri]), - returnValue: - Future>.value({})) + returnValue: Future>.value({})) as _i6.Future>); @override _i6.Future<_i3.Response> deleteRequest(String? url, int? id) => (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]), - returnValue: Future<_i3.Response>.value(_FakeResponse_4())) - as _i6.Future<_i3.Response>); + returnValue: Future<_i3.Response>.value(_FakeResponse_4())) as _i6.Future<_i3.Response>); @override - void addListener(_i7.VoidCallback? listener) => - super.noSuchMethod(Invocation.method(#addListener, [listener]), - returnValueForMissingStub: null); + void addListener(_i7.VoidCallback? listener) => super + .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null); @override void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(Invocation.method(#removeListener, [listener]), returnValueForMissingStub: null); @override - void dispose() => super.noSuchMethod(Invocation.method(#dispose, []), - returnValueForMissingStub: null); + void dispose() => + super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null); @override void notifyListeners() => - super.noSuchMethod(Invocation.method(#notifyListeners, []), - returnValueForMissingStub: null); + super.noSuchMethod(Invocation.method(#notifyListeners, []), returnValueForMissingStub: null); } From 4098b83a74e83b3e09023f4b8d5042269a92161d Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Fri, 20 May 2022 19:10:16 +0200 Subject: [PATCH 10/28] Fix typo --- lib/widgets/nutrition/nutritional_plans_list.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/widgets/nutrition/nutritional_plans_list.dart b/lib/widgets/nutrition/nutritional_plans_list.dart index 2e43a103..c74683c6 100644 --- a/lib/widgets/nutrition/nutritional_plans_list.dart +++ b/lib/widgets/nutrition/nutritional_plans_list.dart @@ -23,16 +23,16 @@ import 'package:wger/providers/nutrition.dart'; import 'package:wger/screens/nutritional_plan_screen.dart'; class NutritionalPlansList extends StatelessWidget { - final NutritionPlansProvider _nutritrionProvider; - const NutritionalPlansList(this._nutritrionProvider); + final NutritionPlansProvider _nutritionProvider; + const NutritionalPlansList(this._nutritionProvider); @override Widget build(BuildContext context) { return ListView.builder( padding: const EdgeInsets.all(10.0), - itemCount: _nutritrionProvider.items.length, + itemCount: _nutritionProvider.items.length, itemBuilder: (context, index) { - final currentPlan = _nutritrionProvider.items[index]; + final currentPlan = _nutritionProvider.items[index]; return Dismissible( key: Key(currentPlan.id.toString()), confirmDismiss: (direction) async { @@ -56,7 +56,7 @@ class NutritionalPlansList extends StatelessWidget { ), onPressed: () { // Confirmed, delete the workout - _nutritrionProvider.deletePlan(currentPlan.id!); + _nutritionProvider.deletePlan(currentPlan.id!); // Close the popup Navigator.of(contextDialog).pop(); From 7ec24f14ce19e48c4513808f03900d6456011b1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 01:08:03 +0000 Subject: [PATCH 11/28] Bump provider from 6.0.2 to 6.0.3 Bumps [provider](https://github.com/rrousselGit/provider) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/rrousselGit/provider/releases) - [Changelog](https://github.com/rrousselGit/provider/blob/master/CHANGELOG.md) - [Commits](https://github.com/rrousselGit/provider/compare/v6.0.2...v6.0.3) --- updated-dependencies: - dependency-name: provider dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 14d082eb..24e5509c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -720,7 +720,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "6.0.2" + version: "6.0.3" pub_semver: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5d7bbf29..8df0e816 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -47,7 +47,7 @@ dependencies: json_annotation: ^4.5.0 version: ^2.0.0 package_info: ^2.0.2 - provider: ^6.0.1 + provider: ^6.0.3 rive: ^0.8.1 shared_preferences: ^2.0.15 table_calendar: ^3.0.2 From 6c5b344e86e4fdcd14d3a18e83dc83d069195a85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 01:08:15 +0000 Subject: [PATCH 12/28] Bump mockito from 5.1.0 to 5.2.0 Bumps [mockito](https://github.com/dart-lang/mockito) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/dart-lang/mockito/releases) - [Changelog](https://github.com/dart-lang/mockito/blob/master/CHANGELOG.md) - [Commits](https://github.com/dart-lang/mockito/compare/5.1.0...5.2.0) --- updated-dependencies: - dependency-name: mockito dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 14d082eb..fd9210c6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -601,7 +601,7 @@ packages: name: mockito url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "5.2.0" nested: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5d7bbf29..b62150a2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -63,7 +63,7 @@ dev_dependencies: build_runner: ^2.1.2 flutter_launcher_icons: ^0.9.1 json_serializable: ^6.2.0 - mockito: ^5.1.0 + mockito: ^5.2.0 network_image_mock: ^2.0.1 flutter_lints: ^1.0.4 cider: ^0.1.1 From ca28655d4d7f1bb20cec4653412fb42d8978c394 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 01:08:33 +0000 Subject: [PATCH 13/28] Bump build_runner from 2.1.10 to 2.1.11 Bumps [build_runner](https://github.com/dart-lang/build) from 2.1.10 to 2.1.11. - [Release notes](https://github.com/dart-lang/build/releases) - [Commits](https://github.com/dart-lang/build/compare/build_runner-v2.1.10...build_runner-v2.1.11) --- updated-dependencies: - dependency-name: build_runner dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 14d082eb..b295a461 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -84,7 +84,7 @@ packages: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.1.10" + version: "2.1.11" build_runner_core: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5d7bbf29..ee954c1e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -60,7 +60,7 @@ dev_dependencies: sdk: flutter #flutter_driver: # sdk: flutter - build_runner: ^2.1.2 + build_runner: ^2.1.11 flutter_launcher_icons: ^0.9.1 json_serializable: ^6.2.0 mockito: ^5.1.0 From 2c4b685d4bfc1ea75c06a70b54d1a0cf09a83a7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 01:08:49 +0000 Subject: [PATCH 14/28] Bump camera from 0.9.5 to 0.9.6 Bumps [camera](https://github.com/flutter/plugins) from 0.9.5 to 0.9.6. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/compare/camera-v0.9.5...camera-v0.9.6) --- updated-dependencies: - dependency-name: camera dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 14d082eb..f6e7e473 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -112,7 +112,7 @@ packages: name: camera url: "https://pub.dartlang.org" source: hosted - version: "0.9.5" + version: "0.9.6" camera_platform_interface: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5d7bbf29..d7d5e788 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: sdk: flutter android_metadata: ^0.2.1 - camera: ^0.9.5 + camera: ^0.9.6 charts_flutter: ^0.12.0 collection: ^1.15.0-nullsafety.4 cupertino_icons: ^1.0.0 From 591832a954a264387091fd1c302ce15741289334 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 01:09:43 +0000 Subject: [PATCH 15/28] Bump camera from 0.9.6 to 0.9.7+1 Bumps [camera](https://github.com/flutter/plugins/tree/main/packages/camera) from 0.9.6 to 0.9.7+1. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/commits/camera-v0.9.7/packages/camera) --- updated-dependencies: - dependency-name: camera dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index b56a2c40..46729f68 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -112,14 +112,14 @@ packages: name: camera url: "https://pub.dartlang.org" source: hosted - version: "0.9.6" + version: "0.9.7+1" camera_platform_interface: dependency: transitive description: name: camera_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.6" + version: "2.2.0" camera_web: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7b7c7002..fdce8ca0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: sdk: flutter android_metadata: ^0.2.1 - camera: ^0.9.6 + camera: ^0.9.7+1 charts_flutter: ^0.12.0 collection: ^1.15.0-nullsafety.4 cupertino_icons: ^1.0.0 From 9d29e5b59b3d87151fca617d75d2a71e2ca5bbec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 01:09:54 +0000 Subject: [PATCH 16/28] Bump table_calendar from 3.0.5 to 3.0.6 Bumps [table_calendar](https://github.com/aleksanderwozniak/table_calendar) from 3.0.5 to 3.0.6. - [Release notes](https://github.com/aleksanderwozniak/table_calendar/releases) - [Changelog](https://github.com/aleksanderwozniak/table_calendar/blob/master/CHANGELOG.md) - [Commits](https://github.com/aleksanderwozniak/table_calendar/commits) --- updated-dependencies: - dependency-name: table_calendar dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index b56a2c40..3705b21b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -893,7 +893,7 @@ packages: name: table_calendar url: "https://pub.dartlang.org" source: hosted - version: "3.0.5" + version: "3.0.6" term_glyph: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7b7c7002..312c99a6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -50,7 +50,7 @@ dependencies: provider: ^6.0.3 rive: ^0.8.1 shared_preferences: ^2.0.15 - table_calendar: ^3.0.2 + table_calendar: ^3.0.6 url_launcher: ^6.1.2 flutter_barcode_scanner: ^2.0.0 video_player: ^2.4.2 From f22ea5592e9b5ae54f9d4263067779e88ea29085 Mon Sep 17 00:00:00 2001 From: Saint Gabriel <53136855+chineduG@users.noreply.github.com> Date: Sat, 4 Jun 2022 00:52:21 +0100 Subject: [PATCH 17/28] Update README.md Corrections of some misspelled words. --- README.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index a6c12794..0758c871 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Mobile app for wger Workout Manager -wger is a free, open source flutter application that manages and tracks/logs -your exercises and personal workouts, weight and diet plans. This is the mobile +wger is a free, open-source flutter application that manages and tracks/logs +your exercises and personal workouts, weight, and diet plans. This is the mobile app written with Flutter, it talks via REST with the main server. If you want to contribute, hop on the Discord server and say hi! @@ -26,13 +26,13 @@ If you want to contribute, hop on the Discord server and say hi! ## Development ### 1 -Install the wger server, the easiest way is starting the development docker-compose: +Install the wger server, the easiest way is to start the development docker-compose: Alternatively, you can use one of our test servers, just ask us for access. ### 2 -Install Flutter, all its dependencies and create a new virtual device: +Install Flutter, and all its dependencies, and create a new virtual device: . The app currently uses flutter 2.10 @@ -45,12 +45,12 @@ WGER_API_KEY=123456 ``` To just run/develop the app it only needs to have any value for WGER_API_KEY, but -you need a correct value if you want to register via the app. For this you need -to allow (a probably dedicated) user on the wger server to register users in its +you need a correct value if you want to register via the app. For this, you need +to allow (a probably dedicated) user on the wger server to register users on its behalf. For this, generate an API KEY by visiting -on your local instance and then run ``python3 manage.py add-user-rest theusername`` +on your local instance and then run ``python3 manage.py add-user-rest the username`` -You can later list all the registered users with: ``python3 manage.py list-users-api`` +You can later list all the registered users with: ``python3 manage.py list-users-API`` [Get it on F-Droid Date: Mon, 6 Jun 2022 01:02:35 +0000 Subject: [PATCH 18/28] Bump cupertino_icons from 1.0.4 to 1.0.5 Bumps [cupertino_icons](https://github.com/flutter/packages/tree/main/third_party/packages) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/cupertino_icons-v1.0.5/third_party/packages) --- updated-dependencies: - dependency-name: cupertino_icons dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 4274e70a..0e459f5b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -245,7 +245,7 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" dart_style: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index d499c570..3f5dfb84 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,7 +35,7 @@ dependencies: camera: ^0.9.7+1 charts_flutter: ^0.12.0 collection: ^1.15.0-nullsafety.4 - cupertino_icons: ^1.0.0 + cupertino_icons: ^1.0.5 equatable: ^2.0.3 flutter_calendar_carousel: ^2.0.3 flutter_html: ^2.1.2 From 20d20bac9078510f858a65d989f9af152db2164f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jun 2022 01:03:41 +0000 Subject: [PATCH 19/28] Bump camera from 0.9.7+1 to 0.9.8 Bumps [camera](https://github.com/flutter/plugins/tree/main/packages/camera) from 0.9.7+1 to 0.9.8. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/commits/camera-v0.9.8/packages/camera) --- updated-dependencies: - dependency-name: camera dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 14 ++++++++++++++ pubspec.yaml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pubspec.lock b/pubspec.lock index 0e459f5b..2b6d18dc 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -112,6 +112,20 @@ packages: name: camera url: "https://pub.dartlang.org" source: hosted + version: "0.9.8" + camera_android: + dependency: transitive + description: + name: camera_android + url: "https://pub.dartlang.org" + source: hosted + version: "0.9.7+1" + camera_avfoundation: + dependency: transitive + description: + name: camera_avfoundation + url: "https://pub.dartlang.org" + source: hosted version: "0.9.7+1" camera_platform_interface: dependency: transitive diff --git a/pubspec.yaml b/pubspec.yaml index 3f5dfb84..610b4987 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: sdk: flutter android_metadata: ^0.2.1 - camera: ^0.9.7+1 + camera: ^0.9.8 charts_flutter: ^0.12.0 collection: ^1.15.0-nullsafety.4 cupertino_icons: ^1.0.5 From 13b24c962ae2b9aa2ac9c5fbd56a45ed52b6c6f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jun 2022 01:04:06 +0000 Subject: [PATCH 20/28] Bump flutter_calendar_carousel from 2.1.0 to 2.2.0 Bumps [flutter_calendar_carousel](https://github.com/dooboolab/flutter_calendar_carousel) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/dooboolab/flutter_calendar_carousel/releases) - [Changelog](https://github.com/dooboolab/flutter_calendar_carousel/blob/main/CHANGELOG.md) - [Commits](https://github.com/dooboolab/flutter_calendar_carousel/commits) --- updated-dependencies: - dependency-name: flutter_calendar_carousel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 0e459f5b..382d8fea 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -306,7 +306,7 @@ packages: name: flutter_calendar_carousel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" flutter_html: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 3f5dfb84..6b6c62f9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,7 +37,7 @@ dependencies: collection: ^1.15.0-nullsafety.4 cupertino_icons: ^1.0.5 equatable: ^2.0.3 - flutter_calendar_carousel: ^2.0.3 + flutter_calendar_carousel: ^2.2.0 flutter_html: ^2.1.2 flutter_typeahead: ^3.2.5 font_awesome_flutter: ">=9.1.0 <11.0.0" From 654776e31479ec4726cba230fe4b04482192526a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jun 2022 01:04:30 +0000 Subject: [PATCH 21/28] Bump flutter_launcher_icons from 0.9.2 to 0.9.3 Bumps [flutter_launcher_icons](https://github.com/fluttercommunity/flutter_launcher_icons) from 0.9.2 to 0.9.3. - [Release notes](https://github.com/fluttercommunity/flutter_launcher_icons/releases) - [Changelog](https://github.com/fluttercommunity/flutter_launcher_icons/blob/master/CHANGELOG.md) - [Commits](https://github.com/fluttercommunity/flutter_launcher_icons/compare/v0.9.2...v0.9.3) --- updated-dependencies: - dependency-name: flutter_launcher_icons dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 0e459f5b..746e0ec4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -341,7 +341,7 @@ packages: name: flutter_launcher_icons url: "https://pub.dartlang.org" source: hosted - version: "0.9.2" + version: "0.9.3" flutter_layout_grid: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 3f5dfb84..f59de2f0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -61,7 +61,7 @@ dev_dependencies: #flutter_driver: # sdk: flutter build_runner: ^2.1.11 - flutter_launcher_icons: ^0.9.1 + flutter_launcher_icons: ^0.9.3 json_serializable: ^6.2.0 mockito: ^5.2.0 network_image_mock: ^2.0.1 From 0cb6504ae1767438331a31b2e64e275980627f75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jun 2022 01:05:01 +0000 Subject: [PATCH 22/28] Bump url_launcher from 6.1.2 to 6.1.3 Bumps [url_launcher](https://github.com/flutter/plugins/tree/main/packages/url_launcher) from 6.1.2 to 6.1.3. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/commits/url_launcher-v6.1.3/packages/url_launcher) --- updated-dependencies: - dependency-name: url_launcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 0e459f5b..4387f373 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -935,7 +935,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.1.3" url_launcher_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 3f5dfb84..acb631ba 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -51,7 +51,7 @@ dependencies: rive: ^0.8.1 shared_preferences: ^2.0.15 table_calendar: ^3.0.6 - url_launcher: ^6.1.2 + url_launcher: ^6.1.3 flutter_barcode_scanner: ^2.0.0 video_player: ^2.4.2 From 0743825ba880be09a125a8c8cf17d54586c4ee72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 01:09:30 +0000 Subject: [PATCH 23/28] Bump version from 2.0.0 to 3.0.2 Bumps [version](https://github.com/dartninja/version) from 2.0.0 to 3.0.2. - [Release notes](https://github.com/dartninja/version/releases) - [Changelog](https://github.com/dartninja/version/blob/master/CHANGELOG.md) - [Commits](https://github.com/dartninja/version/commits) --- updated-dependencies: - dependency-name: version dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pubspec.lock | 20 ++++++++++---------- pubspec.yaml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index a4b7f095..02bf16f3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -224,7 +224,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" convert: dependency: transitive description: @@ -280,7 +280,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" ffi: dependency: transitive description: @@ -531,7 +531,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" json_annotation: dependency: "direct main" description: @@ -594,7 +594,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -657,7 +657,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" path_drawing: dependency: transitive description: @@ -872,7 +872,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -921,7 +921,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.9" timing: dependency: transitive description: @@ -1005,14 +1005,14 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" version: dependency: "direct main" description: name: version url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "3.0.2" version_manipulation: dependency: transitive description: @@ -1168,5 +1168,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.16.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index bc13186e..e79ee0bd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -45,7 +45,7 @@ dependencies: image_picker: ^0.8.4+9 intl: ^0.17.0 json_annotation: ^4.5.0 - version: ^2.0.0 + version: ^3.0.2 package_info: ^2.0.2 provider: ^6.0.3 rive: ^0.8.1 From 998af5083b4c6ca4bacceb7204abc4702c4c92e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 08:55:04 +0000 Subject: [PATCH 24/28] Bump rive from 0.8.4 to 0.9.0 Bumps [rive](https://github.com/rive-app/rive-flutter) from 0.8.4 to 0.9.0. - [Release notes](https://github.com/rive-app/rive-flutter/releases) - [Changelog](https://github.com/rive-app/rive-flutter/blob/master/CHANGELOG.md) - [Commits](https://github.com/rive-app/rive-flutter/commits) --- updated-dependencies: - dependency-name: rive dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 02bf16f3..a6d84068 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -769,7 +769,7 @@ packages: name: rive url: "https://pub.dartlang.org" source: hosted - version: "0.8.4" + version: "0.9.0" shared_preferences: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index e79ee0bd..d9302957 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -48,7 +48,7 @@ dependencies: version: ^3.0.2 package_info: ^2.0.2 provider: ^6.0.3 - rive: ^0.8.1 + rive: ^0.9.0 shared_preferences: ^2.0.15 table_calendar: ^3.0.6 url_launcher: ^6.1.3 From 0edf4adab04d4570483f459295d0320f3ed08aeb Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Tue, 21 Jun 2022 15:31:37 +0200 Subject: [PATCH 25/28] Fix function name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0758c871..293740c6 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ to allow (a probably dedicated) user on the wger server to register users on its behalf. For this, generate an API KEY by visiting on your local instance and then run ``python3 manage.py add-user-rest the username`` -You can later list all the registered users with: ``python3 manage.py list-users-API`` +You can later list all the registered users with: ``python3 manage.py list-users-api`` [Get it on F-Droid Date: Mon, 27 Jun 2022 01:49:08 +0000 Subject: [PATCH 26/28] Bump url_launcher from 6.1.3 to 6.1.4 Bumps [url_launcher](https://github.com/flutter/plugins/tree/main/packages/url_launcher) from 6.1.3 to 6.1.4. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/commits/url_launcher-v6.1.4/packages/url_launcher) --- updated-dependencies: - dependency-name: url_launcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index a6d84068..cb4f8e05 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -949,7 +949,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.1.3" + version: "6.1.4" url_launcher_android: dependency: transitive description: @@ -984,7 +984,7 @@ packages: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.1.0" url_launcher_web: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index d9302957..d9bfbd7e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -51,7 +51,7 @@ dependencies: rive: ^0.9.0 shared_preferences: ^2.0.15 table_calendar: ^3.0.6 - url_launcher: ^6.1.3 + url_launcher: ^6.1.4 flutter_barcode_scanner: ^2.0.0 video_player: ^2.4.2 From b59f096f4e8862b12e616d3fa6e513d3f729a0c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jun 2022 06:47:23 +0000 Subject: [PATCH 27/28] Bump video_player from 2.4.2 to 2.4.5 Bumps [video_player](https://github.com/flutter/plugins/tree/main/packages/video_player) from 2.4.2 to 2.4.5. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/commits/video_player-v2.4.5/packages/video_player) --- updated-dependencies: - dependency-name: video_player dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index a6d84068..5a848088 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1033,14 +1033,14 @@ packages: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "2.4.2" + version: "2.4.5" video_player_android: dependency: transitive description: name: video_player_android url: "https://pub.dartlang.org" source: hosted - version: "2.3.2" + version: "2.3.6" video_player_avfoundation: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index d9302957..bbbdfe14 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -53,7 +53,7 @@ dependencies: table_calendar: ^3.0.6 url_launcher: ^6.1.3 flutter_barcode_scanner: ^2.0.0 - video_player: ^2.4.2 + video_player: ^2.4.5 dev_dependencies: flutter_test: From 4bd916afa69c09fb4ad4efacf115e43db07349fe Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Fri, 1 Jul 2022 09:44:58 +0200 Subject: [PATCH 28/28] Upload coverage results to coveralls --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4e25fc8..6fbbace5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,8 +31,7 @@ jobs: - name: Test app run: flutter test --coverage - #- name: Upload coverage to Codecov - # uses: codecov/codecov-action@v1 - # with: - # token: ${{ secrets.CODECOV_TOKEN }} - # file: coverage/lcov.info + - name: Coveralls + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }}