bossanyit/workouttest_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WT1.1.10+6 backwards compatibility with the menu

Browse Source
This commit is contained in:
bossanyit 2021-03-28 14:45:10 +02:00
parent 1962ba24cb
commit a656562c49
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ios/Runner.xcodeproj/project.pbxproj
View File

@ -388,7 +388,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = SFJJBDCU6Z; DEVELOPMENT_TEAM = SFJJBDCU6Z;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -531,7 +531,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = SFJJBDCU6Z; DEVELOPMENT_TEAM = SFJJBDCU6Z;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -566,7 +566,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = SFJJBDCU6Z; DEVELOPMENT_TEAM = SFJJBDCU6Z;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (

8
lib/repository/workout_tree_repository.dart
View File

@ -44,7 +44,8 @@ class WorkoutTreeRepository with Logging {
if (treeItem.active == true) { if (treeItem.active == true) {
String treeName = isEnglish ? treeItem.name : treeItem.nameTranslation; 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) { if (!is1RM) {
is1RM = this.isParent1RM(treeItem.parentId); is1RM = this.isParent1RM(treeItem.parentId);
} }
@ -296,7 +297,10 @@ class WorkoutTreeRepository with Logging {
sortedTree = SplayTreeMap<String, List<WorkoutMenuTree>>(); sortedTree = SplayTreeMap<String, List<WorkoutMenuTree>>();
tree.forEach((key, value) { tree.forEach((key, value) {
WorkoutMenuTree workoutTree = value as WorkoutMenuTree; 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; String treeName = getAntagonistSort(workoutTree.nameEnglish) + ". " + workoutTree.name;
//print("TreeName $treeName ${workoutTree.name}"); //print("TreeName $treeName ${workoutTree.name}");
sortedTree[treeName] = this.getBranchList(workoutTree.id); sortedTree[treeName] = this.getBranchList(workoutTree.id);