diff --git a/app/actions/summaryHelper.js b/app/actions/summaryHelper.js index 5a7e4d2..95c87cc 100644 --- a/app/actions/summaryHelper.js +++ b/app/actions/summaryHelper.js @@ -46,7 +46,7 @@ export function setSummaryCount(data, callback){ } } var parseValue = { - VOCABULARY : initialArr.length + vocabularyArr.length, + VOCABULARY : vocabularyArr.length, GRAMMAR : grammarArr.length, KANJI : kanjiArr.length, diff --git a/app/screens/sketch.js b/app/screens/sketch.js index 688ad72..7d59297 100644 --- a/app/screens/sketch.js +++ b/app/screens/sketch.js @@ -79,11 +79,15 @@ export default class HL4 extends Component { } getRandom = () =>{ - var count = HLlist.length; - var random = Math.floor(Math.random() * count); - while( HLlist[random]['id'] == ""){ - var random = Math.floor(Math.random() * count); - } + var randomVal = [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,130,131,132,133,134,135,136,137,138,139,140,141,142]; + var count = randomVal.length; + var randomSet = Math.floor(Math.random() * count); + var random = randomVal[randomSet]; + // var count = HLlist.length; + // var random = Math.floor(Math.random() * count); + // while( HLlist[random]['id'] == ""){ + // var random = Math.floor(Math.random() * count); + // } this.canvasBg.clear(); this.canvasCorrect.clear(); this.canvas2.clear(); diff --git a/app/styles/score.js b/app/styles/score.js index b1a88e5..a97f574 100644 --- a/app/styles/score.js +++ b/app/styles/score.js @@ -199,6 +199,7 @@ module.exports = StyleSheet.create({ borderTopColor : '#ddd', borderTopWidth : 1, padding: 20, + zIndex:120 }, imageHomeCon : { position : 'absolute', @@ -206,10 +207,13 @@ module.exports = StyleSheet.create({ right: 0, width: 80, height: 200, + zIndex: 121, + elevation: 3 }, imageHome : { width: '100%', height: '100%', + elevation: 4 }, ruleScore:{ fontSize:16, diff --git a/app/styles/style.js b/app/styles/style.js index e7e270f..d82e9ab 100644 --- a/app/styles/style.js +++ b/app/styles/style.js @@ -119,7 +119,7 @@ module.exports = StyleSheet.create({ backgroundColor: primaryColor, }, highPrio: { - zIndex:999 + zIndex:100 }, //Header headContainer:{