Remove loading screen again

This commit is contained in:
Julia Friesel
2018-08-10 13:26:34 +02:00
parent 611e9057b4
commit 863ac6b122
+13 -24
View File
@@ -1,5 +1,5 @@
import React, { Component } from 'react' import React, { Component } from 'react'
import { View, FlatList, Dimensions } from 'react-native' import { View, FlatList } from 'react-native'
import range from 'date-range' import range from 'date-range'
import { LocalDate } from 'js-joda' import { LocalDate } from 'js-joda'
import { yAxis, normalizeToScale } from './y-axis' import { yAxis, normalizeToScale } from './y-axis'
@@ -29,11 +29,9 @@ export default class CycleChart extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = { this.state = {
columns: makeColumnInfo(config.xAxisRangeInDays), columns: makeColumnInfo(config.xAxisRangeInDays)
loading: true
} }
this.renderColumn = ({item, index}) => { this.renderColumn = ({item, index}) => {
if (index === 15 + 1 && this.state.loading) this.setState({loading: false})
return ( return (
<DayColumn <DayColumn
item={item} item={item}
@@ -59,27 +57,18 @@ export default class CycleChart extends Component {
render() { render() {
const {height, width} = Dimensions.get('window')
return ( return (
<View> <View style={{ flexDirection: 'row' }}>
{this.state.loading && {yAxisView}
<View <FlatList
width={width} horizontal={true}
height={height} inverted={true}
backgroundColor='lightblue' showsHorizontalScrollIndicator={false}
/>} data={this.state.columns}
<View style={{ flexDirection: 'row' }}> renderItem={this.renderColumn}
{yAxisView} keyExtractor={item => item.dateString}
<FlatList >
horizontal={true} </FlatList>
inverted={true}
showsHorizontalScrollIndicator={false}
data={this.state.columns}
renderItem={this.renderColumn}
keyExtractor={item => item.dateString}
>
</FlatList>
</View>
</View> </View>
) )
} }