diff --git a/asset/menu/chair_pose.jpg b/asset/menu/chair_pose.jpg new file mode 100644 index 0000000..5146894 Binary files /dev/null and b/asset/menu/chair_pose.jpg differ diff --git a/asset/menu/hip_lifts.jpg b/asset/menu/hip_lifts.jpg new file mode 100644 index 0000000..acb7c64 Binary files /dev/null and b/asset/menu/hip_lifts.jpg differ diff --git a/asset/menu/inverse_plank_on_ball.jpg b/asset/menu/inverse_plank_on_ball.jpg new file mode 100644 index 0000000..1e5bdd3 Binary files /dev/null and b/asset/menu/inverse_plank_on_ball.jpg differ diff --git a/asset/menu/knee_push_ups.jpg b/asset/menu/knee_push_ups.jpg new file mode 100644 index 0000000..0ae8f08 Binary files /dev/null and b/asset/menu/knee_push_ups.jpg differ diff --git a/asset/menu/leg_raises_with_lifted_hip.jpg b/asset/menu/leg_raises_with_lifted_hip.jpg new file mode 100644 index 0000000..4e49bf8 Binary files /dev/null and b/asset/menu/leg_raises_with_lifted_hip.jpg differ diff --git a/asset/menu/opened_side_plank.jpg b/asset/menu/opened_side_plank.jpg new file mode 100644 index 0000000..b2256c2 Binary files /dev/null and b/asset/menu/opened_side_plank.jpg differ diff --git a/asset/menu/plank_on_ball.jpg b/asset/menu/plank_on_ball.jpg new file mode 100644 index 0000000..e09db37 Binary files /dev/null and b/asset/menu/plank_on_ball.jpg differ diff --git a/asset/menu/side_plank.jpg b/asset/menu/side_plank.jpg new file mode 100644 index 0000000..da75f4a Binary files /dev/null and b/asset/menu/side_plank.jpg differ diff --git a/asset/menu/squats_with_kettlebell.jpg b/asset/menu/squats_with_kettlebell.jpg new file mode 100644 index 0000000..6961fb4 Binary files /dev/null and b/asset/menu/squats_with_kettlebell.jpg differ diff --git a/asset/menu/warrior_stand.jpg b/asset/menu/warrior_stand.jpg new file mode 100644 index 0000000..7d5b0b7 Binary files /dev/null and b/asset/menu/warrior_stand.jpg differ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 5dad58a..ebf5959 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 = 1; + CURRENT_PROJECT_VERSION = 2; 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 = 1; + CURRENT_PROJECT_VERSION = 2; 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 = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = SFJJBDCU6Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/lib/bloc/customer_change/customer_change_event.dart b/lib/bloc/customer_change/customer_change_event.dart index da7da66..26d47c9 100644 --- a/lib/bloc/customer_change/customer_change_event.dart +++ b/lib/bloc/customer_change/customer_change_event.dart @@ -40,7 +40,7 @@ class CustomerBirthYearChange extends CustomerChangeEvent { } class CustomerWeightChange extends CustomerChangeEvent { - final int weight; + final double weight; const CustomerWeightChange({required this.weight}); @override diff --git a/lib/bloc/exercise_new/exercise_new_bloc.dart b/lib/bloc/exercise_new/exercise_new_bloc.dart index a8d53df..423510a 100644 --- a/lib/bloc/exercise_new/exercise_new_bloc.dart +++ b/lib/bloc/exercise_new/exercise_new_bloc.dart @@ -102,7 +102,7 @@ class ExerciseNewBloc extends Bloc with Logg yield ExerciseNewReady(); } else if (event is ExerciseNewWeightChange) { yield ExerciseNewLoading(); - customerRepository.setWeight(event.value.toInt()); + customerRepository.setWeight(event.value); changedWeight = true; weight = event.value; getBMI(); diff --git a/lib/repository/customer_repository.dart b/lib/repository/customer_repository.dart index 7494356..ce1ed93 100644 --- a/lib/repository/customer_repository.dart +++ b/lib/repository/customer_repository.dart @@ -125,9 +125,9 @@ class CustomerRepository with Logging { this.customer!.sex = sex; } - setWeight(int weight) { + setWeight(double weight) { final propertyName = "Weight"; - this.setCustomerProperty(propertyName, weight.toDouble()); + this.setCustomerProperty(propertyName, weight); } setHeight(int height) { diff --git a/lib/view/customer_modify_page.dart b/lib/view/customer_modify_page.dart index d3697b8..45643fe 100644 --- a/lib/view/customer_modify_page.dart +++ b/lib/view/customer_modify_page.dart @@ -260,7 +260,7 @@ class CustomerModifyPage extends StatelessWidget with Trans { initalValue: customerBloc.weight.toInt(), unit: " ", color: Colors.indigo, - onChange: (value) => {customerBloc.add(CustomerWeightChange(weight: value.toInt()))}), + onChange: (value) => {customerBloc.add(CustomerWeightChange(weight: value))}), SizedBox(width: 30), ], )), diff --git a/pubspec.yaml b/pubspec.yaml index 2b18ffb..ba3742b 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.13+66 +version: 1.1.13+67 environment: sdk: ">=2.12.0 <3.0.0" @@ -250,6 +250,7 @@ flutter: - asset/menu/cable_flyes.jpg - asset/menu/cable_rows.jpg - asset/menu/chair_leg_raises.jpg + - asset/menu/chair_pose.jpg - asset/menu/chest_press_machine.jpg - asset/menu/chest_press.jpg - asset/menu/chins.jpg @@ -280,6 +281,7 @@ flutter: - asset/menu/hammer_curl.jpg - asset/menu/hanging_leg_raises.jpg - asset/menu/head-on-bench_dumbbell_rear_delt_raise.jpg + - asset/menu/hip_lifts.jpg - asset/menu/hyperextension.jpg - asset/menu/hyperextension_floor.jpg - asset/menu/incline_cable_flyes.jpg @@ -290,9 +292,12 @@ flutter: - asset/menu/incline_press.jpg - asset/menu/incline_pushups.jpg - asset/menu/incline_triceps_extension.jpg + - asset/menu/inverse_plank_on_ball.jpg + - asset/menu/knee_push_ups.jpg - asset/menu/leg_abductor.jpg - asset/menu/leg_curls.jpg - asset/menu/leg_extension.jpg + - asset/menu/leg_raises_with_lifted_hip.jpg - asset/menu/legpress.jpg - asset/menu/lower_body_test.jpg - asset/menu/lunges_with_dumbbells.jpg @@ -310,9 +315,11 @@ flutter: - asset/menu/oblique_crunch.jpg - asset/menu/olympic_squat.jpg - asset/menu/one_arm_row.jpg + - asset/menu/opened_side_plank.jpg - asset/menu/overhead_dumbbell_triceps_extension.jpg - asset/menu/own_body.jpg - asset/menu/peck_deck_flyes.jpg + - asset/menu/plank_on_ball.jpg - asset/menu/plank.jpg - asset/menu/pull_up.jpg - asset/menu/pulldown_machine.jpg @@ -330,6 +337,7 @@ flutter: - asset/menu/seated_lateral_raises.jpg - asset/menu/seated_triceps_extension.jpg - asset/menu/shrugs.jpg + - asset/menu/side_plank.jpg - asset/menu/side_to_side_chop.jpg - asset/menu/single_arm_bent_over_cable_reverse_fly.jpg - asset/menu/single_arm_t-bar_rows.jpg @@ -340,6 +348,7 @@ flutter: - asset/menu/situps.jpg - asset/menu/sizes.jpg - asset/menu/smith_machine_chest_press.jpg + - asset/menu/squats_with_kettlebell.jpg - asset/menu/squat_jump_weight.jpg - asset/menu/squat_jump.jpg - asset/menu/squat_without_weight.jpg @@ -369,6 +378,7 @@ flutter: - asset/menu/upper_body.jpg - asset/menu/v_ups.jpg - asset/menu/wall_sit.jpg + - asset/menu/warrior_stand.jpg - asset/menu/weight_free_test.jpg - asset/menu/weighted_bench_dip.jpg - asset/menu/wide_grip_behind_the_neck_pull_ups.jpg