diff --git a/c2tc-mobile/App.js b/c2tc-mobile/App.js index 5f19f52..d9c0155 100644 --- a/c2tc-mobile/App.js +++ b/c2tc-mobile/App.js @@ -9,7 +9,9 @@ import IntroScreen from "./screens/IntroScreen"; import TipForm from "./screens/TipForm"; import TipScreen from "./screens/TipScreen"; import TipDetailsScreen from "./screens/TipDetailsScreen"; +import SettingsScreen from "./screens/SettingsScreen"; import ProfileScreen from "./screens/ProfileScreen"; +import NotificationScreen from "./screens/NotificationScreen"; export default class App extends Component { constructor(props) { @@ -82,5 +84,19 @@ Navigator = createStackNavigator({ header: null, headerMode: "screen" } + }, + Settings: { + screen: SettingsScreen, + navigationOptions: { + header: null, + headerMode: "screen" + } + }, + Notifications: { + screen: NotificationScreen, + navigationOptions: { + header: null, + headerMode: "screen" + } } }); diff --git a/c2tc-mobile/screens/ProfileScreen.js b/c2tc-mobile/screens/ProfileScreen.js index ad8f13d..7977e5c 100644 --- a/c2tc-mobile/screens/ProfileScreen.js +++ b/c2tc-mobile/screens/ProfileScreen.js @@ -85,15 +85,13 @@ export default class ProfileScreen extends React.Component { return ( - - - - {isEditingName ? ( - - ) : ( - - )} - + + + + + this.props.navigation.navigate("Settings")}/> + + { + this.props.navigation.navigate("Profile"); + }; + + render() { + return ( + + + + + + + + console.log("Edit Profile")}> + + + + Phillip Kuo + Edit Your Profile + + + + + + this.props.navigation.navigate("Notifications")}> + + Notifications + + + + + this.props.navigation.navigate("Welcome")}> + + Show App Tutorials + + + + + + )} +} + +const styles = StyleSheet.create({ + profile: { + flexDirection: "row", + padding: 25, + }, + name: { + flexDirection: "row", + paddingLeft: 30, + fontSize: 20 + }, + editProfile: { + paddingLeft: 30, + fontSize: 15, + color: "gray" + }, + list: { + height: 45, + flexDirection: "row", + alignItems: "flex-start" + }, + text: { + paddingHorizontal: 30, + paddingTop: 10, + fontSize: 15, + width: Dimensions.get("window").width - 40 + }, + divider: { + borderBottomColor: 'gray', + borderBottomWidth: 1 + }, + profileArrow: { + paddingTop: 20, + paddingLeft: 100 + }, + arrow: { + paddingTop: 15 + } +}); \ No newline at end of file