ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-11-30 06:12:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'stackNav-profile' of https://github.com/esteemapp/esteem-mobile into feature/postScreen

Browse Source
This commit is contained in:
ue 2018-10-29 13:39:40 +03:00
commit ea2de95c90
4 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/header/container/headerContainer.js
View File

@ -37,7 +37,7 @@ class HeaderContainer extends Component {
_handleOnPressBackButton = () => {
const { navigation } = this.props;
navigation.navigate('HomeScreen');
navigation.goBack();
};
render() {

6
src/components/postCard/view/postCardView.js
View File

@ -145,7 +145,11 @@ class PostCard extends Component {
</TouchableOpacity>
<Body style={styles.body}>
<View style={styles.author}>
<Text style={styles.authorName}>{content.author}</Text>
<TouchableOpacity
onPress={() => this._handleOnUserPress()}
>
<Text style={styles.authorName}>{content.author}</Text>
</TouchableOpacity>
</View>
<View style={styles.badge}>
<Text style={styles.text}>{content.author_reputation}</Text>

2
src/components/profileSummary/view/profileSummaryView.js
View File

@ -61,7 +61,7 @@ class ProfileSummaryView extends Component {
: null;
const isColumn = rowLength && DEVICE_WIDTH / rowLength <= 15;
return (
<Fragment>
<View style={[isColumn ? styles.textWithIconWrapperColumn : styles.textWithIconWrapper]}>

38
src/config/routes.js
View File

@ -1,4 +1,4 @@
import { DrawerNavigator, SwitchNavigator } from 'react-navigation';
import { DrawerNavigator, SwitchNavigator, createStackNavigator } from 'react-navigation';
import { BaseNavigator } from '../navigation';
import { default as ROUTES } from '../constants/routeNames';
@ -14,9 +14,6 @@ const mainNavigation = DrawerNavigator(
{
[ROUTES.SCREENS.HOME]: {
screen: BaseNavigator,
navigationOptions: {
header: () => null,
},
},
},
{
@ -24,12 +21,39 @@ const mainNavigation = DrawerNavigator(
},
);
const stackNavigatior = createStackNavigator(
{
[ROUTES.DRAWER.MAIN]: {
screen: mainNavigation,
navigationOptions: {
header: () => null,
},
},
[ROUTES.SCREENS.PROFILE]: {
screen: Profile,
navigationOptions: {
header: () => null,
},
},
[ROUTES.SCREENS.EDITOR]: {
screen: Editor,
navigationOptions: {
header: () => null,
},
},
},
{
cardStyle: {
backgroundColor: 'white',
},
},
);
export default SwitchNavigator({
[ROUTES.DRAWER.MAIN]: mainNavigation,
[ROUTES.SCREENS.EDITOR]: { screen: Editor },
stackNavigatior,
[ROUTES.SCREENS.LOGIN]: { screen: Login },
[ROUTES.SCREENS.PINCODE]: { screen: PinCode },
[ROUTES.SCREENS.PROFILE]: { screen: Profile },
[ROUTES.SCREENS.SPLASH]: { screen: Splash },
[ROUTES.SCREENS.STEEM_CONNECT]: { screen: SteemConnect },
});