Skip to content

Commit

Permalink
Merge pull request #48 from skiser/Chase
Browse files Browse the repository at this point in the history
Stylizing the input and button for event
  • Loading branch information
ChaseTeichmann committed Oct 16, 2019
2 parents 4f2e0eb + 1de26d0 commit 187f0ec
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 41 deletions.
25 changes: 0 additions & 25 deletions Routinely/app/components/eventController.js

This file was deleted.

35 changes: 35 additions & 0 deletions Routinely/app/components/event_components/eventTitle.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import React, {Component} from 'react';
import {AppRegistry, View, StyleSheet} from 'react-native';
import {Hoshi} from 'react-native-textinput-effects';

export default class eventTitle extends Component {
render() {
return (
<View style={styles.container}>
<View style={styles.card1}>
<Hoshi label={'Title'} borderColor={'#2E68FF'} maskColor={'#blue'} />
</View>
</View>
);
}
}
AppRegistry.registerComponent('eventTitle', () => eventTitle);

const styles = StyleSheet.create({
title: {
paddingBottom: 16,
textAlign: 'center',
color: '#404d5b',
fontSize: 50,
fontWeight: 'bold',
opacity: 0.8,
},
card1: {
paddingVertical: 16,
width: 350,
},
container: {
flexDirection: 'row',
padding: 10,
},
});
55 changes: 39 additions & 16 deletions Routinely/app/screens/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import DayPicker from '../components/alarm_components/DayPicker';
import firebase from '@react-native-firebase/app';
import firestore from '@react-native-firebase/firestore';
import '@react-native-firebase/auth';

import {Hoshi} from 'react-native-textinput-effects';
import AwesomeButtonBlue from 'react-native-really-awesome-button/src/themes/blue';
const utcDateToString = (momentInUTC: moment): string => {
let s = moment.utc(momentInUTC).format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
// console.warn(s);
Expand Down Expand Up @@ -45,23 +46,32 @@ class EventScreen extends Component {
render() {
return (
<View style={styles.container}>
<Text style={styles.welcome}>Event title: </Text>
<TextInput
placeholder="enter event title"
onChangeText={title => this.setState({title})}
value={this.state.title}
/>
<Text style={styles.welcome}>Event Notes: </Text>
<TextInput
placeholder="enter event event"
onChangeText={notes => this.setState({notes})}
value={this.state.notes}
/>
<View style={styles.card1}>
<Hoshi
label={'Title'}
onChangeText={title => this.setState({title})}
value={this.state.title}
borderColor={'#2E68FF'}
maskColor={'#blue'}
/>
<Hoshi
label={'Custom Notes'}
onChangeText={notes => this.setState({notes})}
value={this.state.notes}
borderColor={'#2E68FF'}
maskColor={'#blue'}
/>
</View>
{/* <View style={styles.picker}>
<DayPicker />
<TimePicker />
</View> */}
<Button title="addEvent" onPress={() => this.addEvent()} />
<AwesomeButtonBlue
width={350}
title="addEvent"
onPress={() => this.addEvent()}>
Add Event
</AwesomeButtonBlue>
</View>
);
}
Expand Down Expand Up @@ -120,9 +130,10 @@ const styles = StyleSheet.create({
},
container: {
flex: 1,
//justifyContent: 'center',
alignItems: 'center',
alignItems: 'flex-start',
backgroundColor: '#F5FCFF',
paddingLeft: 10,
paddingRight: 10,
},
welcome: {
fontSize: 20,
Expand All @@ -135,9 +146,21 @@ const styles = StyleSheet.create({
color: '#333333',
marginBottom: 5,
},
title: {
paddingBottom: 16,
textAlign: 'center',
color: '#404d5b',
fontSize: 50,
fontWeight: 'bold',
opacity: 0.8,
},
card1: {
paddingVertical: 16,
width: 350,
},
submit: {
paddingVertical: 16,
width: 350,
},
});
export default EventScreen;
1 change: 1 addition & 0 deletions Routinely/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"react-native-elements": "^1.2.5",
"react-native-gesture-handler": "^1.4.1",
"react-native-google-signin": "^2.1.0",
"react-native-really-awesome-button": "^1.4.2",
"react-native-textinput-effects": "^0.5.1",
"react-native-vector-icons": "^6.6.0",
"react-navigation": "^4.0.10",
Expand Down

0 comments on commit 187f0ec

Please sign in to comment.