Merge remote-tracking branch 'origin/ejectedExpo' into ejectedExpo

components/SwipeableRow.js

@@ -10,7 +10,7 @@ import { Overlay } from 'react-native-elements';
 const AnimatedIcon = Animated.createAnimatedComponent(IconMaterialIcons);
 const AnimatedIcon = Animated.createAnimatedComponent(IconMaterialIcons);
 
 
 const Row = ({ data }) => (
 const Row = ({ data }) => (
-	<RectButton style={styles.rectButton} onPress={() => alert('hello ' + data.id)}>
+	<RectButton style={styles.rectButton} onPress={() => alert('hello ' + data.name)}>
 		<View
 		<View
 			style={{
 			style={{
 				flexDirection: 'row',
 				flexDirection: 'row',
@@ -33,8 +33,8 @@ const Row = ({ data }) => (
 											? color.primary
 											? color.primary
 											: color.grey
 											: color.grey
 										: item.dayActive
 										: item.dayActive
-										? color.grey
-										: color.darkGrey,
+										? color.darkGrey
+										: color.grey,
 								},
 								},
 							]}
 							]}
 						>
 						>

screens/Private/TimerScreen/TimerScreen.js

@@ -451,7 +451,7 @@ export default class TimerScreen extends Component {
 									style={{ flex: 1, justifyContent: 'center' }}
 									style={{ flex: 1, justifyContent: 'center' }}
 									onPress={() => this.setState({ isVisible: false })}
 									onPress={() => this.setState({ isVisible: false })}
 								>
 								>
-									<Text style={{ color: '#aeaeae' }}>Cancel</Text>
+									<Text style={{ color: color.grey }}>Cancel</Text>
 								</Button>
 								</Button>
 								<Button
 								<Button
 									rounded
 									rounded
@@ -462,7 +462,7 @@ export default class TimerScreen extends Component {
 									}}
 									}}
 									onPress={() => this.setState({ isVisible: false })}
 									onPress={() => this.setState({ isVisible: false })}
 								>
 								>
-									<Text style={{ color: '#fff' }}>Confirm</Text>
+									<Text style={{ color: color.white }}>Confirm</Text>
 								</Button>
 								</Button>
 							</View>
 							</View>
 						</ScrollView>
 						</ScrollView>