diff --git a/asset/image/continue.png b/asset/image/continue.png new file mode 100644 index 0000000..cb0abf1 Binary files /dev/null and b/asset/image/continue.png differ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 5e40a53..8ef63ee 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -388,7 +388,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = SFJJBDCU6Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -531,7 +531,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = SFJJBDCU6Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -566,7 +566,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = SFJJBDCU6Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/lib/view/training_plan_exercise.dart b/lib/view/training_plan_exercise.dart index dad8353..9617ed0 100644 --- a/lib/view/training_plan_exercise.dart +++ b/lib/view/training_plan_exercise.dart @@ -23,46 +23,62 @@ class TrainingPlanExercise extends StatelessWidget with Trans { setContext(context); return Scaffold( - appBar: AppBarNav(depth: 1), - body: Container( - height: double.infinity, - width: double.infinity, - padding: EdgeInsets.all(20), - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage("asset/image/WT_black_background.jpg"), - fit: BoxFit.cover, - alignment: Alignment.center, + appBar: AppBarNav(depth: 1), + body: Container( + height: double.infinity, + width: double.infinity, + padding: EdgeInsets.all(20), + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage("asset/image/WT_black_background.jpg"), + fit: BoxFit.cover, + alignment: Alignment.center, + ), ), + child: BlocConsumer(listener: (context, state) { + if (state is TrainingPlanError) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(backgroundColor: Colors.orange, content: Text(state.message, style: TextStyle(color: Colors.white)))); + } + }, builder: (context, state) { + return ModalProgressHUD( + child: getExercises(bloc, detail), + inAsyncCall: state is TrainingPlanLoading, + opacity: 0.5, + color: Colors.black54, + progressIndicator: CircularProgressIndicator(), + ); + }), ), - child: BlocConsumer(listener: (context, state) { - if (state is TrainingPlanError) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(backgroundColor: Colors.orange, content: Text(state.message, style: TextStyle(color: Colors.white)))); - } - }, builder: (context, state) { - return ModalProgressHUD( - child: getExercises(bloc, detail), - inAsyncCall: state is TrainingPlanLoading, - opacity: 0.5, - color: Colors.black54, - progressIndicator: CircularProgressIndicator(), - ); - }), - ), - floatingActionButton: FloatingActionButton.extended( - onPressed: () => { - Navigator.of(context).pop(), - bloc.add(TrainingPlanSaveExercise(detail: detail)), - }, - backgroundColor: Colors.orange[800], - icon: Icon(CustomIcon.save), - label: Text( - t("Save"), - style: GoogleFonts.inter(fontWeight: FontWeight.bold, fontSize: 16), - ), - ), - ); + floatingActionButton: Row(mainAxisAlignment: MainAxisAlignment.end, children: [ + FloatingActionButton.extended( + onPressed: () => { + Navigator.of(context).pop(), + bloc.add(TrainingPlanSkipExercise(detail: detail)), + }, + backgroundColor: Colors.grey[700], + icon: Icon(Icons.skip_next), + label: Text( + t("Skip"), + style: GoogleFonts.inter(fontWeight: FontWeight.normal, fontSize: 14), + ), + ), + SizedBox( + width: 20, + ), + FloatingActionButton.extended( + onPressed: () => { + Navigator.of(context).pop(), + bloc.add(TrainingPlanSaveExercise(detail: detail)), + }, + backgroundColor: Colors.orange[800], + icon: Icon(CustomIcon.save), + label: Text( + t("Save"), + style: GoogleFonts.inter(fontWeight: FontWeight.bold, fontSize: 16), + ), + ), + ])); } Widget getExercises(TrainingPlanBloc bloc, CustomerTrainingPlanDetails detail) { diff --git a/lib/widgets/menu_page_widget.dart b/lib/widgets/menu_page_widget.dart index 2d08b1b..1f545d8 100644 --- a/lib/widgets/menu_page_widget.dart +++ b/lib/widgets/menu_page_widget.dart @@ -343,7 +343,7 @@ class _MenuPageWidgetState extends State with Trans, Logging { child: Container( width: animation.value, height: animation.value, - child: Image.asset("asset/image/pict_hypertrophy.png"), + child: Image.asset("asset/image/continue.png"), ), ); })) diff --git a/pubspec.yaml b/pubspec.yaml index 3031f8a..3b35878 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.1.18+86 +version: 1.1.18+87 environment: sdk: ">=2.12.0 <3.0.0" @@ -160,6 +160,7 @@ flutter: - asset/image/button_fb.png - asset/image/button_apple.png - asset/image/button_google.png + - asset/image/continue.png - asset/image/lock.png - asset/image/add_test.png - asset/image/testemfejl400x400.jpg