diff --git a/src/Dusken.js b/src/Dusken.js index d01e384..62a9c64 100644 --- a/src/Dusken.js +++ b/src/Dusken.js @@ -3,6 +3,7 @@ import {connect} from "react-redux"; import {TabNavigator, StackNavigator} from "react-navigation"; import EventsScreen from "./screens/EventScreen"; +import EventDetailsScreen from "./screens/EventDetailsScreen"; import AboutScreen from "./screens/AboutScreen"; import MembershipScreen from "./screens/MembershipScreen"; @@ -22,6 +23,7 @@ const tabNav = TabNavigator(tabBarRoutes, tabBarOptions); const DuskenContainer = StackNavigator({ Root: { screen: tabNav}, + EventDetails: { screen: EventDetailsScreen }, }); export default connect()(DuskenContainer); \ No newline at end of file diff --git a/src/modules/events/EventDetails.js b/src/modules/events/EventDetails.js new file mode 100644 index 0000000..0bb69d7 --- /dev/null +++ b/src/modules/events/EventDetails.js @@ -0,0 +1,12 @@ +import React, { Component } from 'react'; +import {ScrollView, Text} from "react-native"; + +export default class EventDetails extends Component { + + render() { + const item = this.props.item; + return ( + {item.link} + ) + } +} diff --git a/src/modules/events/EventList.js b/src/modules/events/EventList.js index d2ba341..b245bcd 100644 --- a/src/modules/events/EventList.js +++ b/src/modules/events/EventList.js @@ -36,7 +36,7 @@ export default class EventList extends Component { }; _onPressItem = (item) => { - Linking.openURL(item.link); + this.props.showEvent(item); }; diff --git a/src/modules/events/EventListContainer.js b/src/modules/events/EventListContainer.js index 8f2573f..23d4f0a 100644 --- a/src/modules/events/EventListContainer.js +++ b/src/modules/events/EventListContainer.js @@ -99,8 +99,12 @@ class EventListContainer extends React.Component { this.fetchEvents(); } + showEvent = (item) => { + this.props.showEvent(item); + }; + render() { - return () + return () } } diff --git a/src/screens/EventDetailsScreen.js b/src/screens/EventDetailsScreen.js new file mode 100644 index 0000000..dd93667 --- /dev/null +++ b/src/screens/EventDetailsScreen.js @@ -0,0 +1,13 @@ +import React, { Component } from 'react'; +import EventDetails from "../modules/events/EventDetails"; + +export default class EventDetailsScreen extends Component { + static navigationOptions = { + title: 'Detaljer', + }; + + render() { + const { params } = this.props.navigation.state; + return (); + } +} \ No newline at end of file diff --git a/src/screens/EventScreen.js b/src/screens/EventScreen.js index c0df039..47ad1eb 100644 --- a/src/screens/EventScreen.js +++ b/src/screens/EventScreen.js @@ -10,7 +10,12 @@ export default class EventsScreen extends Component { ), }; + showEvent = (item) => { + const { navigate } = this.props.navigation; + navigate('EventDetails', {item: item}) + }; + render() { - return (); + return (); } } \ No newline at end of file