WT 1.1.18+8 skip exercise inside

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 = (

lib/view/training_plan_exercise.dart

@@ -23,46 +23,62 @@ class TrainingPlanExercise extends StatelessWidget with Trans {
 
     setContext(context);
     return Scaffold(
-      appBar: AppBarNav(depth: 1),
+        appBar: AppBarNav(depth: 1),
-      body: Container(
+        body: Container(
-        height: double.infinity,
+          height: double.infinity,
-        width: double.infinity,
+          width: double.infinity,
-        padding: EdgeInsets.all(20),
+          padding: EdgeInsets.all(20),
-        decoration: BoxDecoration(
+          decoration: BoxDecoration(
-          image: DecorationImage(
+            image: DecorationImage(
-            image: AssetImage("asset/image/WT_black_background.jpg"),
+              image: AssetImage("asset/image/WT_black_background.jpg"),
-            fit: BoxFit.cover,
+              fit: BoxFit.cover,
-            alignment: Alignment.center,
+              alignment: Alignment.center,
+            ),
           ),
+          child: BlocConsumer<TrainingPlanBloc, TrainingPlanState>(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<TrainingPlanBloc, TrainingPlanState>(listener: (context, state) {
+        floatingActionButton: Row(mainAxisAlignment: MainAxisAlignment.end, children: [
-          if (state is TrainingPlanError) {
+          FloatingActionButton.extended(
-            ScaffoldMessenger.of(context).showSnackBar(
+            onPressed: () => {
-                SnackBar(backgroundColor: Colors.orange, content: Text(state.message, style: TextStyle(color: Colors.white))));
+              Navigator.of(context).pop(),
-          }
+              bloc.add(TrainingPlanSkipExercise(detail: detail)),
-        }, builder: (context, state) {
+            },
-          return ModalProgressHUD(
+            backgroundColor: Colors.grey[700],
-            child: getExercises(bloc, detail),
+            icon: Icon(Icons.skip_next),
-            inAsyncCall: state is TrainingPlanLoading,
+            label: Text(
-            opacity: 0.5,
+              t("Skip"),
-            color: Colors.black54,
+              style: GoogleFonts.inter(fontWeight: FontWeight.normal, fontSize: 14),
-            progressIndicator: CircularProgressIndicator(),
+            ),
-          );
+          ),
-        }),
+          SizedBox(
-      ),
+            width: 20,
-      floatingActionButton: FloatingActionButton.extended(
+          ),
-        onPressed: () => {
+          FloatingActionButton.extended(
-          Navigator.of(context).pop(),
+            onPressed: () => {
-          bloc.add(TrainingPlanSaveExercise(detail: detail)),
+              Navigator.of(context).pop(),
-        },
+              bloc.add(TrainingPlanSaveExercise(detail: detail)),
-        backgroundColor: Colors.orange[800],
+            },
-        icon: Icon(CustomIcon.save),
+            backgroundColor: Colors.orange[800],
-        label: Text(
+            icon: Icon(CustomIcon.save),
-          t("Save"),
+            label: Text(
-          style: GoogleFonts.inter(fontWeight: FontWeight.bold, fontSize: 16),
+              t("Save"),
-        ),
+              style: GoogleFonts.inter(fontWeight: FontWeight.bold, fontSize: 16),
-      ),
+            ),
-    );
+          ),
+        ]));
   }
 
   Widget getExercises(TrainingPlanBloc bloc, CustomerTrainingPlanDetails detail) {

lib/widgets/menu_page_widget.dart

@@ -343,7 +343,7 @@ class _MenuPageWidgetState extends State<MenuPageWidget> 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"),
                           ),
                         );
                       }))

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