From a656562c4945bba291deaa9a42457baf92012735 Mon Sep 17 00:00:00 2001 From: bossanyit Date: Sun, 28 Mar 2021 14:45:10 +0200 Subject: [PATCH] WT1.1.10+6 backwards compatibility with the menu --- ios/Runner.xcodeproj/project.pbxproj | 6 +++--- lib/repository/workout_tree_repository.dart | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 856caf9..8ffd538 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 = 5; + CURRENT_PROJECT_VERSION = 6; 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 = 5; + CURRENT_PROJECT_VERSION = 6; 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 = 5; + CURRENT_PROJECT_VERSION = 6; DEVELOPMENT_TEAM = SFJJBDCU6Z; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/lib/repository/workout_tree_repository.dart b/lib/repository/workout_tree_repository.dart index 9309f0c..e90830f 100644 --- a/lib/repository/workout_tree_repository.dart +++ b/lib/repository/workout_tree_repository.dart @@ -44,7 +44,8 @@ class WorkoutTreeRepository with Logging { if (treeItem.active == true) { String treeName = isEnglish ? treeItem.name : treeItem.nameTranslation; - bool is1RM = treeItem.name.contains("Muscle") || treeItem.name.contains("Shape") ? true : false; + bool is1RM = + treeItem.name.contains("Muscle") || treeItem.name.contains("Shape") || treeItem.name.contains("Strength") ? true : false; if (!is1RM) { is1RM = this.isParent1RM(treeItem.parentId); } @@ -296,7 +297,10 @@ class WorkoutTreeRepository with Logging { sortedTree = SplayTreeMap>(); tree.forEach((key, value) { WorkoutMenuTree workoutTree = value as WorkoutMenuTree; - if (!workoutTree.nameEnglish.contains('Muscle Build') && workoutTree.is1RM && workoutTree.exerciseTypeId == 0) { + if (!workoutTree.nameEnglish.contains('Muscle Build') && + !workoutTree.nameEnglish.contains('Strength') && + workoutTree.is1RM && + workoutTree.exerciseTypeId == 0) { String treeName = getAntagonistSort(workoutTree.nameEnglish) + ". " + workoutTree.name; //print("TreeName $treeName ${workoutTree.name}"); sortedTree[treeName] = this.getBranchList(workoutTree.id);