From 015a690494707d30ef62fbfe23096a2d12e1fc02 Mon Sep 17 00:00:00 2001 From: Tautvydas Milciunas Date: Wed, 27 Dec 2017 22:11:41 +0200 Subject: [PATCH] Fix for 16821 https://github.com/facebook/react-native/issues/16821 --- package.json | 1 + src/components/ExerciseDetails.js | 4 +-- src/screens/Home.js | 29 +++++++++++++++++++--- src/state/sagas/workoutSaga.js | 8 +++--- yarn.lock | 41 ++++++++++++++++++++----------- 5 files changed, 60 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 6a6703c..fcabae7 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "moment": "^2.20.1", "react": "16.0.0", "react-native": "0.50.3", + "react-native-calendar-strip": "^1.3.0", "react-native-flex-image": "^1.1.0", "react-native-router-flux": "^4.0.0-beta.24", "react-redux": "^5.0.6", diff --git a/src/components/ExerciseDetails.js b/src/components/ExerciseDetails.js index 8acea90..5766c91 100644 --- a/src/components/ExerciseDetails.js +++ b/src/components/ExerciseDetails.js @@ -19,7 +19,7 @@ class ExerciseDetails extends Component { } render() { - const { image_end, image_start, muscle, name, sets_x_reps, type } = this.props.details; + const { image_end, image_start, muscle, name, sets_x_reps } = this.props.details; return ( @@ -45,7 +45,7 @@ class ExerciseDetails extends Component { - {'Sets x Repetitions: '} + {'Sets and Repetitions: '} {sets_x_reps} diff --git a/src/screens/Home.js b/src/screens/Home.js index d19d707..2d10899 100644 --- a/src/screens/Home.js +++ b/src/screens/Home.js @@ -11,19 +11,37 @@ class HomeScreen extends Component { loading: PropTypes.bool } + constructor() { + super(); + + this.state = { + shouldRender: false + }; + } + + componentDidMount() { + setTimeout(() => { + this.setState({ + shouldRender: true + }); + }, 3000); + } + render() { console.log('HOME props ', this.props); console.log('HOME props ', this.props.loading); - if (this.props.loading) { + if (this.props.loading && !this.state.shouldRender) { return ; } return ( - + @@ -50,5 +68,10 @@ const styles = StyleSheet.create({ flex: 1, justifyContent: 'center', padding: 10 + }, + loadingIncidator: { + flex: 1, + justifyContent: 'center', + alignItems: 'center' } }); diff --git a/src/state/sagas/workoutSaga.js b/src/state/sagas/workoutSaga.js index 3f37403..b692fdb 100644 --- a/src/state/sagas/workoutSaga.js +++ b/src/state/sagas/workoutSaga.js @@ -205,15 +205,15 @@ export function calculateWorkoutSize(workout, details) { if (exercise) { if (details.level.toLowerCase() === 'beginner') { if (details.goal === 'gain') { - exercise['sets_x_reps'] = gain.beginner.reps + 'x' + gain.beginner.sets; + exercise['sets_x_reps'] = gain.beginner.sets + 'x' + gain.beginner.reps; } else { - exercise['sets_x_reps'] = loss.beginner.reps + 'x' + loss.beginner.sets; + exercise['sets_x_reps'] = loss.beginner.sets + 'x' + loss.beginner.reps; } } else { if (details.goal === 'gain') { - exercise['sets_x_reps'] = gain.intermediate.reps + 'x' + gain.intermediate.sets; + exercise['sets_x_reps'] = gain.intermediate.sets + 'x' + gain.intermediate.reps; } else { - exercise['sets_x_reps'] = loss.intermediate.reps + 'x' + loss.intermediate.sets; + exercise['sets_x_reps'] = loss.intermediate.sets + 'x' + loss.intermediate.reps; } } diff --git a/yarn.lock b/yarn.lock index e560c56..9a5b61b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -572,13 +572,15 @@ babel-core@^6.0.0, babel-core@^6.24.1, babel-core@^6.26.0, babel-core@^6.7.2: source-map "^0.5.6" babel-eslint@^8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.3.tgz#f29ecf02336be438195325cd47c468da81ee4e98" + version "8.1.2" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.1.2.tgz#a39230b0c20ecbaa19a35d5633bf9b9ca2c8116f" dependencies: "@babel/code-frame" "7.0.0-beta.31" "@babel/traverse" "7.0.0-beta.31" "@babel/types" "7.0.0-beta.31" babylon "7.0.0-beta.31" + eslint-scope "~3.7.1" + eslint-visitor-keys "^1.0.0" babel-generator@^6.18.0, babel-generator@^6.24.1, babel-generator@^6.26.0: version "6.26.0" @@ -2114,8 +2116,8 @@ es6-error@^4.0.2: resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98" es6-promise@^4.0.3: - version "4.2.1" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.1.tgz#3b98a6714ba1b9267428b2c00e6265b16dab0205" + version "4.2.2" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.2.tgz#f722d7769af88bd33bc13ec6605e1f92966b82d9" es6-promisify@^5.0.0: version "5.0.0" @@ -2188,28 +2190,32 @@ eslint-plugin-react@^7.5.1: jsx-ast-utils "^2.0.0" prop-types "^15.6.0" -eslint-scope@^3.7.1: +eslint-scope@^3.7.1, eslint-scope@~3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" dependencies: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-visitor-keys@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" + eslint@^4.12.1: - version "4.13.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.13.1.tgz#0055e0014464c7eb7878caf549ef2941992b444f" + version "4.14.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.14.0.tgz#96609768d1dd23304faba2d94b7fefe5a5447a82" dependencies: ajv "^5.3.0" babel-code-frame "^6.22.0" chalk "^2.1.0" concat-stream "^1.6.0" cross-spawn "^5.1.0" - debug "^3.0.1" + debug "^3.1.0" doctrine "^2.0.2" eslint-scope "^3.7.1" + eslint-visitor-keys "^1.0.0" espree "^3.5.2" esquery "^1.0.0" - estraverse "^4.2.0" esutils "^2.0.2" file-entry-cache "^2.0.0" functional-red-black-tree "^1.0.1" @@ -4394,7 +4400,7 @@ mobx@^3.3.1: version "3.4.1" resolved "https://registry.yarnpkg.com/mobx/-/mobx-3.4.1.tgz#37abe5ee882d401828d9f26c6c1a2f47614bbbef" -moment@2.x.x, moment@^2.10.6, moment@^2.20.1: +moment@2.x.x, moment@^2.10.6, moment@^2.17.1, moment@^2.20.1: version "2.20.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd" @@ -5163,6 +5169,13 @@ react-native-branch@2.0.0-beta.3: version "2.0.0-beta.3" resolved "https://registry.yarnpkg.com/react-native-branch/-/react-native-branch-2.0.0-beta.3.tgz#2167af86bbc9f964bd45bd5f37684e5b54965e32" +react-native-calendar-strip@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/react-native-calendar-strip/-/react-native-calendar-strip-1.3.0.tgz#bf845f56acd7afa06dcae04999a2a1f4eb23cc06" + dependencies: + moment "^2.17.1" + prop-types "^15.6.0" + react-native-dismiss-keyboard@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/react-native-dismiss-keyboard/-/react-native-dismiss-keyboard-1.0.0.tgz#32886242b3f2317e121f3aeb9b0a585e2b879b49" @@ -5905,8 +5918,8 @@ slugid@^1.1.0: uuid "^2.0.1" slugify@^1.0.2: - version "1.2.7" - resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.2.7.tgz#49998fa5f26e001ca366298937ad25fb6e9742cf" + version "1.2.8" + resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.2.8.tgz#f74581b0376d1ccec9a4abfaf06c7aaa9737caef" smart-buffer@^1.0.13: version "1.1.15" @@ -6397,8 +6410,8 @@ ua-parser-js@^0.7.9: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" uglify-es@^3.1.8: - version "3.2.2" - resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.2.2.tgz#15c62b7775002c81b7987a1c49ecd3f126cace73" + version "3.3.2" + resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.2.tgz#2401df8be2a433314523753f28810793a40c5462" dependencies: commander "~2.12.1" source-map "~0.6.1"