New buttons and fixes

skiser · Nov 12, 2019 · 1d92fc0 · 1d92fc0
1 parent 1632673
commit 1d92fc0
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 45 deletions.
diff --git a/Routinely/app/components/img/NotesButton.png b/Routinely/app/components/img/NotesButton.png
diff --git a/Routinely/app/components/img/NotesHome.png b/Routinely/app/components/img/NotesHome.png
diff --git a/Routinely/app/components/img/circle-plus.png b/Routinely/app/components/img/circle-plus.png
diff --git a/Routinely/app/screens/alarm.js b/Routinely/app/screens/alarm.js
@@ -149,7 +149,7 @@ class AlarmScreen extends Component {
         <Divider />
         <ColorPicker />
         <AwesomeButtonBlue
-          width={350}
+          width={395}
           title="addAlarm"
           onPress={() => this.addAlarm(this.state.title)}>
           Add Alarm
@@ -214,7 +214,7 @@ const styles = StyleSheet.create({
   },
   card1: {
     paddingVertical: 16,
-    width: 350,
+    width: 400,
   },
   submit: {
     paddingVertical: 16,

diff --git a/Routinely/app/screens/calendar.js b/Routinely/app/screens/calendar.js
@@ -478,7 +478,10 @@ class CalendarScreen extends Component {
             <TouchableHighlight
               onPress={() => this.props.navigation.navigate('Notes')}
               underlayColor={'#ededed'}>
-              <Text>Notes ></Text>
+              <Image
+                style={styles.icon}
+                source={require('../components/img/NotesHome.png')}
+              />
             </TouchableHighlight>
             <Divider />
             <FlatList
@@ -515,8 +518,8 @@ class CalendarScreen extends Component {
 
 const styles = StyleSheet.create({
   container: {
-    marginLeft: 15,
-    marginRight: 15,
+    marginLeft: 10,
+    marginRight: 10,
   },
   greyBackground: {
     backgroundColor: '#ededed',
@@ -582,7 +585,7 @@ const styles = StyleSheet.create({
     //alignItems: 'baseline',
     position: 'absolute',
     bottom: 25,
-    marginLeft: 300,
+    marginLeft: 340,
   },
   plusImage: {
     width: 60,

diff --git a/Routinely/app/screens/event.js b/Routinely/app/screens/event.js
@@ -1,5 +1,14 @@
 import React, {Component, useState} from 'react';
-import {StyleSheet, Text, View, Button, TextInput, Platform, UIManager, DatePickerIOS,} from 'react-native';
+import {
+  StyleSheet,
+  Text,
+  View,
+  Button,
+  TextInput,
+  Platform,
+  UIManager,
+  DatePickerIOS,
+} from 'react-native';
 import * as AddCalendarEvent from 'react-native-add-calendar-event';
 import moment from 'moment';
 import DayPicker from '../components/alarm_components/DayPicker';
@@ -17,10 +26,10 @@ const utcDateToString = (momentInUTC: moment): string => {
   return time;
 };
 
-const user = [{"email": ''}];
-if(firebase.auth().currentUser !== null){
+const user = [{email: ''}];
+if (firebase.auth().currentUser !== null) {
   const currentUser = firebase.auth().currentUser;
-  user.email= currentUser.email;
+  user.email = currentUser.email;
 }
 
 class EventScreen extends Component {
@@ -42,28 +51,33 @@ class EventScreen extends Component {
     //this.setDate = this.setDate.bind(this);
   }
 
-  onButtonPress = (day) => {
+  onButtonPress = day => {
     this.setState({
-      day: true
+      day: true,
     });
-  }
+  };
 
-  addEvent = async (title) => {
+  addEvent = async title => {
     //const title = this.state.title.toString();
-    const addEvent = firestore().collection('users').doc(user.email).collection('events');
+    const addEvent = firestore()
+      .collection('users')
+      .doc(user.email)
+      .collection('events');
     try {
-      addEvent.doc().set({
-        title: this.state.title,
-        notes: this.state.notes,
-        chosenDate: this.state.chosenDate,
-        Sun: this.state.Sun,
-        Mon: this.state.Mon,
-        Tue: this.state.Tue,
-        Wed: this.state.Wed,
-        Thu: this.state.Thu,
-        Fri: this.state.Fri,
-        Sat: this.state.Sat,
-      })
+      addEvent
+        .doc()
+        .set({
+          title: this.state.title,
+          notes: this.state.notes,
+          chosenDate: this.state.chosenDate,
+          Sun: this.state.Sun,
+          Mon: this.state.Mon,
+          Tue: this.state.Tue,
+          Wed: this.state.Wed,
+          Thu: this.state.Thu,
+          Fri: this.state.Fri,
+          Sat: this.state.Sat,
+        })
         .then(ref => {
           console.log('Added doc w ID: ', ref.id);
         });
@@ -138,10 +152,9 @@ class EventScreen extends Component {
           />
         </View>
         <AwesomeButtonBlue
-          width={350}
+          width={395}
           title="addEvent"
           onPress={() => this.addEvent(this.state.title)}>
-
           Add Event
         </AwesomeButtonBlue>
       </View>
@@ -199,11 +212,11 @@ const styles = StyleSheet.create({
   },
   card1: {
     paddingVertical: 16,
-    width: 350,
+    width: 400,
   },
   submit: {
     paddingVertical: 16,
-    width: 350,
+    width: 400,
   },
 });
 export default EventScreen;
diff --git a/Routinely/app/screens/menu.js b/Routinely/app/screens/menu.js
@@ -42,17 +42,16 @@ class MenuScreen extends Component {
               />
             </TouchableHighlight>
           </View>
+          <View>
+            <TouchableHighlight
+              onPress={() => this.props.navigation.navigate('Notes')}>
+              <Image
+                style={styles.icon}
+                source={require('../components/img/NotesButton.png')}
+              />
+            </TouchableHighlight>
+          </View>
         </View>
-        <Button
-          title="Back"
-          color="#90A4AE"
-          onPress={() => this.props.navigation.navigate('Calendar')}
-        />
-        <Button
-          title="Notes"
-          color="#90A4AE"
-          onPress={() => this.props.navigation.navigate('Notes')}
-        />
       </View>
     );
   }
@@ -67,18 +66,19 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   icon: {
-    width: 180,
+    width: 200,
     height: 100,
     marginLeft: 5,
+    marginTop: 5,
   },
   row: {
     flexDirection: 'row',
   },
   MenuButton: {
     backgroundColor: 'red',
-    width: '45%',
-    height: '35%',
-    borderRadius: 10,
+    width: '50%',
+    height: '40%',
+    borderRadius: 14,
     margin: 10,
   },
 });