From 840bcafa09b5ab2c0759e2a39bf8c16a4e82ce53 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sat, 1 Oct 2022 10:24:59 +0200 Subject: [PATCH 1/4] Cleanup --- lib/providers/exercises.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/providers/exercises.dart b/lib/providers/exercises.dart index 2d7ffd8e..5f639800 100644 --- a/lib/providers/exercises.dart +++ b/lib/providers/exercises.dart @@ -374,8 +374,6 @@ class ExercisesProvider with ChangeNotifier { Future fetchAndSetExercises() async { clear(); - //fetchAndSetExerciseBase(9); - // Load exercises from cache, if available final prefs = await SharedPreferences.getInstance(); await checkExerciseCacheVersion(); From e6ea4e605382570489929fdad8842853f3d57f28 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sat, 1 Oct 2022 13:50:58 +0200 Subject: [PATCH 2/4] Remove unused code --- lib/widgets/exercises/list_tile.dart | 61 ---------------------------- 1 file changed, 61 deletions(-) diff --git a/lib/widgets/exercises/list_tile.dart b/lib/widgets/exercises/list_tile.dart index 81b93251..3711389e 100644 --- a/lib/widgets/exercises/list_tile.dart +++ b/lib/widgets/exercises/list_tile.dart @@ -62,67 +62,6 @@ class ExerciseListTile extends StatelessWidget { onTap: () { Navigator.pushNamed(context, ExerciseDetailScreen.routeName, arguments: exerciseBase); }, - /* - trailing: Container( - padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 7), - decoration: BoxDecoration( - color: theme.primaryColorLight.withOpacity(0.15), - border: Border.all(color: Colors.grey[300]!), - borderRadius: BorderRadius.circular(5), - ), - child: Text( - exercise.category.name, - ), - ), - - */ ); - - /* - return Row( - children: [ - Padding( - padding: const EdgeInsets.all(8.0), - child: Container( - width: size.width * 0.2, - child: Center( - child: ExerciseImageWidget( - image: exercise.getMainImage, - ), - ), - ), - ), - Expanded( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 7), - decoration: BoxDecoration( - color: theme.primaryColorLight.withOpacity(0.15), - border: Border.all(color: Colors.grey[300]!), - borderRadius: BorderRadius.circular(5), - ), - child: Text( - exercise.category.name, - ), - ), - Text( - exercise.name, - style: theme.textTheme.headline6, - overflow: TextOverflow.ellipsis, - maxLines: 2, - ), - Text( - exercise.equipment.map((equipment) => equipment.name).join(", "), - ) - ], - ), - ) - ], - ); - - */ } } From 6d1c259c859eb8d39a578d26350ce1c723e0d564 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sat, 1 Oct 2022 15:27:10 +0200 Subject: [PATCH 3/4] Rename widgets and files These names are the same used in the react application --- lib/screens/add_exercise_screen.dart | 20 ++++---- .../steps/{basics.dart => step1basics.dart} | 4 +- .../{variations.dart => step2variations.dart} | 4 +- ...description.dart => step3description.dart} | 4 +- ...anslations.dart => step4translations.dart} | 9 ++-- .../steps/{images.dart => step5images.dart} | 8 ++-- pubspec.lock | 47 ++++++++++++++++++- 7 files changed, 69 insertions(+), 27 deletions(-) rename lib/widgets/add_exercise/steps/{basics.dart => step1basics.dart} (97%) rename lib/widgets/add_exercise/steps/{variations.dart => step2variations.dart} (96%) rename lib/widgets/add_exercise/steps/{description.dart => step3description.dart} (89%) rename lib/widgets/add_exercise/steps/{translations.dart => step4translations.dart} (92%) rename lib/widgets/add_exercise/steps/{images.dart => step5images.dart} (86%) diff --git a/lib/screens/add_exercise_screen.dart b/lib/screens/add_exercise_screen.dart index d31e4904..1bf483b7 100644 --- a/lib/screens/add_exercise_screen.dart +++ b/lib/screens/add_exercise_screen.dart @@ -4,11 +4,11 @@ import 'package:provider/provider.dart'; import 'package:wger/providers/add_exercise_provider.dart'; import 'package:wger/providers/exercises.dart'; import 'package:wger/screens/exercise_screen.dart'; -import 'package:wger/widgets/add_exercise/steps/basics.dart'; -import 'package:wger/widgets/add_exercise/steps/description.dart'; -import 'package:wger/widgets/add_exercise/steps/images.dart'; -import 'package:wger/widgets/add_exercise/steps/translations.dart'; -import 'package:wger/widgets/add_exercise/steps/variations.dart'; +import 'package:wger/widgets/add_exercise/steps/step1basics.dart'; +import 'package:wger/widgets/add_exercise/steps/step2variations.dart'; +import 'package:wger/widgets/add_exercise/steps/step3description.dart'; +import 'package:wger/widgets/add_exercise/steps/step4translations.dart'; +import 'package:wger/widgets/add_exercise/steps/step5images.dart'; import 'package:wger/widgets/core/app_bar.dart'; class AddExerciseScreen extends StatefulWidget { @@ -73,23 +73,23 @@ class _AddExerciseScreenState extends State { steps: [ Step( title: Text(AppLocalizations.of(context).baseData), - content: BasicStepContent(formkey: _keys[0]), + content: Step1Basics(formkey: _keys[0]), ), Step( title: Text(AppLocalizations.of(context).variations), - content: DuplicatesAndVariationsStepContent(formkey: _keys[1]), + content: Step2Variations(formkey: _keys[1]), ), Step( title: Text(AppLocalizations.of(context).description), - content: DescriptionStepContent(formkey: _keys[2]), + content: Step3Description(formkey: _keys[2]), ), Step( title: Text(AppLocalizations.of(context).translation), - content: DescriptionTranslationStepContent(formkey: _keys[3]), + content: Step4Translation(formkey: _keys[3]), ), Step( title: Text(AppLocalizations.of(context).images), - content: ImagesStepContent(formkey: _keys[4]), + content: Step5Images(formkey: _keys[4]), ), ], currentStep: _currentStep, diff --git a/lib/widgets/add_exercise/steps/basics.dart b/lib/widgets/add_exercise/steps/step1basics.dart similarity index 97% rename from lib/widgets/add_exercise/steps/basics.dart rename to lib/widgets/add_exercise/steps/step1basics.dart index 8cb9b593..35f87241 100644 --- a/lib/widgets/add_exercise/steps/basics.dart +++ b/lib/widgets/add_exercise/steps/step1basics.dart @@ -13,9 +13,9 @@ import 'package:wger/widgets/add_exercise/add_exercise_text_area.dart'; import 'package:wger/widgets/exercises/exercises.dart'; import 'package:wger/widgets/exercises/forms.dart'; -class BasicStepContent extends StatelessWidget { +class Step1Basics extends StatelessWidget { final GlobalKey formkey; - const BasicStepContent({required this.formkey}); + const Step1Basics({required this.formkey}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/add_exercise/steps/variations.dart b/lib/widgets/add_exercise/steps/step2variations.dart similarity index 96% rename from lib/widgets/add_exercise/steps/variations.dart rename to lib/widgets/add_exercise/steps/step2variations.dart index 502a74f6..04dff46f 100644 --- a/lib/widgets/add_exercise/steps/variations.dart +++ b/lib/widgets/add_exercise/steps/step2variations.dart @@ -4,10 +4,10 @@ import 'package:provider/provider.dart'; import 'package:wger/providers/add_exercise_provider.dart'; import 'package:wger/providers/exercises.dart'; -class DuplicatesAndVariationsStepContent extends StatelessWidget { +class Step2Variations extends StatelessWidget { final GlobalKey formkey; - const DuplicatesAndVariationsStepContent({required this.formkey}); + const Step2Variations({required this.formkey}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/add_exercise/steps/description.dart b/lib/widgets/add_exercise/steps/step3description.dart similarity index 89% rename from lib/widgets/add_exercise/steps/description.dart rename to lib/widgets/add_exercise/steps/step3description.dart index 39bf3a9a..42070e8b 100644 --- a/lib/widgets/add_exercise/steps/description.dart +++ b/lib/widgets/add_exercise/steps/step3description.dart @@ -5,9 +5,9 @@ import 'package:wger/helpers/exercises/forms.dart'; import 'package:wger/providers/add_exercise_provider.dart'; import 'package:wger/widgets/add_exercise/add_exercise_text_area.dart'; -class DescriptionStepContent extends StatelessWidget { +class Step3Description extends StatelessWidget { final GlobalKey formkey; - const DescriptionStepContent({required this.formkey}); + const Step3Description({required this.formkey}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/add_exercise/steps/translations.dart b/lib/widgets/add_exercise/steps/step4translations.dart similarity index 92% rename from lib/widgets/add_exercise/steps/translations.dart rename to lib/widgets/add_exercise/steps/step4translations.dart index dc28e1f4..651e392c 100644 --- a/lib/widgets/add_exercise/steps/translations.dart +++ b/lib/widgets/add_exercise/steps/step4translations.dart @@ -8,16 +8,15 @@ import 'package:wger/providers/exercises.dart'; import 'package:wger/widgets/add_exercise/add_exercise_text_area.dart'; import 'package:wger/widgets/exercises/forms.dart'; -class DescriptionTranslationStepContent extends StatefulWidget { +class Step4Translation extends StatefulWidget { final GlobalKey formkey; - const DescriptionTranslationStepContent({required this.formkey}); + const Step4Translation({required this.formkey}); @override - State createState() => - _DescriptionTranslationStepContentState(); + State createState() => _Step4TranslationState(); } -class _DescriptionTranslationStepContentState extends State { +class _Step4TranslationState extends State { bool translate = false; @override diff --git a/lib/widgets/add_exercise/steps/images.dart b/lib/widgets/add_exercise/steps/step5images.dart similarity index 86% rename from lib/widgets/add_exercise/steps/images.dart rename to lib/widgets/add_exercise/steps/step5images.dart index a2c0b3de..3f15f1ea 100644 --- a/lib/widgets/add_exercise/steps/images.dart +++ b/lib/widgets/add_exercise/steps/step5images.dart @@ -5,15 +5,15 @@ import 'package:wger/providers/add_exercise_provider.dart'; import 'package:wger/widgets/add_exercise/mixins/image_picker_mixin.dart'; import 'package:wger/widgets/add_exercise/preview_images.dart'; -class ImagesStepContent extends StatefulWidget { +class Step5Images extends StatefulWidget { final GlobalKey formkey; - const ImagesStepContent({required this.formkey}); + const Step5Images({required this.formkey}); @override - State createState() => _ImagesStepContentState(); + State createState() => _Step5ImagesState(); } -class _ImagesStepContentState extends State with ExerciseImagePickerMixin { +class _Step5ImagesState extends State with ExerciseImagePickerMixin { @override Widget build(BuildContext context) { return Form( diff --git a/pubspec.lock b/pubspec.lock index 09d6373e..e5d94189 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -328,6 +328,11 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.4.0" + flutter_driver: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_html: dependency: "direct main" description: @@ -397,7 +402,7 @@ packages: source: hosted version: "2.0.5" flutter_svg: - dependency: transitive + dependency: "direct main" description: name: flutter_svg url: "https://pub.dartlang.org" @@ -434,6 +439,11 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.2" + fuchsia_remote_debug_protocol: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" glob: dependency: transitive description: @@ -518,6 +528,11 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.4.4" + integration_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" intl: dependency: "direct main" description: @@ -623,6 +638,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "5.3.1" + multi_select_flutter: + dependency: "direct main" + description: + name: multi_select_flutter + url: "https://pub.dartlang.org" + source: hosted + version: "4.1.2" nested: dependency: transitive description: @@ -908,6 +930,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.1" + sync_http: + dependency: transitive + description: + name: sync_http + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.1" table_calendar: dependency: "direct main" description: @@ -949,7 +978,7 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" url_launcher: dependency: "direct main" description: @@ -1069,6 +1098,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.8" + vm_service: + dependency: transitive + description: + name: vm_service + url: "https://pub.dartlang.org" + source: hosted + version: "9.0.0" wakelock: dependency: transitive description: @@ -1118,6 +1154,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.2.0" + webdriver: + dependency: transitive + description: + name: webdriver + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.0" webview_flutter: dependency: transitive description: From 4974396a0fc6dd498e25279e95c7622fc39870ab Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sat, 1 Oct 2022 15:30:19 +0200 Subject: [PATCH 4/4] Switch the order of the buttons Also, make the next button more promintent --- lib/screens/add_exercise_screen.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/screens/add_exercise_screen.dart b/lib/screens/add_exercise_screen.dart index 1bf483b7..e809c59c 100644 --- a/lib/screens/add_exercise_screen.dart +++ b/lib/screens/add_exercise_screen.dart @@ -39,6 +39,10 @@ class _AddExerciseScreenState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ + OutlinedButton( + onPressed: details.onStepCancel, + child: Text(AppLocalizations.of(context).previous), + ), if (_currentStep == lastStepIndex) ElevatedButton( onPressed: () async { @@ -50,14 +54,10 @@ class _AddExerciseScreenState extends State { child: Text(AppLocalizations.of(context).save), ) else - OutlinedButton( + ElevatedButton( onPressed: details.onStepContinue, child: Text(AppLocalizations.of(context).next), ), - OutlinedButton( - onPressed: details.onStepCancel, - child: Text(AppLocalizations.of(context).previous), - ), ], ), ],