Skip to content

refactor(user-profile): use styled-components #724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
machour merged 4 commits into from
Feb 23, 2018
Merged

refactor(user-profile): use styled-components #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e86ec77
refactor(user-profile): use styled-components (#534)
dillansimmons Oct 24, 2017
b1bfd92
fix(style): runnable, unitless and remove useless styles
chinesedfan Feb 12, 2018
9711ad1
fix(user-profile): Migrate ImageZoom and fix badge styles
chinesedfan Feb 13, 2018
0870aa9
feat(user): Make badges the same with repo profile
chinesedfan Feb 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ export * from './search-bar.component'; // eslint-disable-line import/no-unresol
export * from './section-list.component';
export * from './state-badge.component';
export * from './user-list-item.component';
export * from './image-zoom.component';
export * from './user-profile.component';
export * from './view-container.component';
export * from './image-zoom.component';
export * from './button.component';
export * from './notification-icon.component';
export * from './badge.component';
Expand Down
265 changes: 127 additions & 138 deletions src/components/user-profile.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* eslint-disable no-prototype-builtins */
import React, { Component } from 'react';
import { StyleSheet, Text, View, TouchableOpacity } from 'react-native';
import { colors, fonts, normalize } from 'config';
import { translate } from 'utils';
import { ImageZoom } from 'components';
import styled, { css } from 'styled-components';

type Props = {
type: string,
Expand All @@ -16,85 +16,79 @@ type Props = {
navigation: Object,
};

const styles = StyleSheet.create({
container: {
flex: 1,
},
wrapperContainer: {
flex: 1,
alignItems: 'center',
justifyContent: 'center',
},
profile: {
flex: 3,
alignItems: 'center',
justifyContent: 'flex-end',
},
avatar: {
width: 75,
height: 75,
marginBottom: 20,
borderRadius: 37.5,
},
userAvatar: {
borderColor: colors.white,
borderWidth: 2,
},
title: {
color: colors.white,
...fonts.fontPrimaryBold,
fontSize: normalize(16),
marginBottom: 2,
},
subtitle: {
color: colors.white,
...fonts.fontPrimary,
fontSize: normalize(12),
marginBottom: 50,
paddingLeft: 15,
paddingRight: 15,
textAlign: 'center',
},
details: {
flex: 1,
flexDirection: 'row',
},
unit: {
flex: 1,
},
unitNumber: {
textAlign: 'center',
color: colors.white,
...fonts.fontPrimaryBold,
fontSize: normalize(16),
},
unitText: {
textAlign: 'center',
color: colors.white,
fontSize: normalize(10),
...fonts.fontPrimary,
},
unitStatus: {
textAlign: 'center',
color: colors.lighterBoldGreen,
fontSize: normalize(8),
...fonts.fontPrimary,
},
badge: {
paddingTop: 3,
paddingBottom: 3,
marginTop: 5,
marginLeft: 17,
marginRight: 17,
borderWidth: 0.5,
borderRadius: 5,
borderColor: colors.lighterBoldGreen,
justifyContent: 'center',
},
green: {
color: colors.lightGreen,
},
});
const Container = styled.View`
flex: 1;
`;
const Wrapper = styled.View`
flex: 1;
align-items: center;
justify-content: center;
`;
const Profile = styled.View`
flex: 3;
align-items: center;
justify-content: flex-end;
`;
const StyledImageZoom = styled(ImageZoom)`
width: 75;
height: 75;
margin-bottom: 20;
border-radius: 37.5;
${props =>
props.isUser &&
css`
border-color: ${colors.white};
border-width: 2;
`};
`;
const Title = styled.Text`
color: ${colors.white};
${fonts.fontPrimaryBold};
font-size: ${normalize(16)};
margin-bottom: 2;
`;
const SubTitle = styled.Text`
color: ${colors.white};
${fonts.fontPrimary};
font-size: ${normalize(12)};
margin-bottom: 50;
padding-left: 15;
padding-right: 15;
text-align: center;
`;
const Details = styled.View`
flex: 1;
flex-direction: row;
`;
const Unit = styled.TouchableOpacity`
flex: 1;
`;
const UnitNumber = styled.Text`
text-align: center;
color: ${colors.white};
${fonts.fontPrimaryBold};
font-size: ${normalize(16)};
`;
const UnitText = styled.Text`
text-align: center;
color: ${colors.white};
font-size: ${normalize(10)};
${fonts.fontPrimary};
`;
const UnitStatusWrapper = styled.View`
padding: 2px;
margin-top: 5;
margin-left: 20;
margin-right: 20;
border-radius: 5;
background-color: ${colors.lighterBoldGreen};
`;
const UnitStatus = styled.Text`
text-align: center;
color: ${colors.white};
font-size: ${normalize(8)};
${fonts.fontPrimaryBold};
`;

const maxLoadingConstraints = {
maxFollowers: 15,
Expand Down Expand Up @@ -128,29 +122,21 @@ export class UserProfile extends Component {
} = this.props;

return (
<View style={styles.container}>
<Container>
{((user.hasOwnProperty('public_repos') &&
!isNaN(parseInt(starCount, 10))) ||
type === 'org') && (
<View
nativeId="user-profile-container"
style={styles.wrapperContainer}
>
<View style={styles.profile}>
<ImageZoom
<Wrapper nativeId="user-profile-container">
<Profile>
<StyledImageZoom
uri={this.getUserUri()}
style={[
styles.avatar,
(initialUser.type === 'User' || user.type === 'User') &&
styles.userAvatar,
]}
isUser={initialUser.type === 'User' || user.type === 'User'}
/>
<Text style={styles.title}>{user.name || ' '}</Text>
<Text style={styles.subtitle}>{initialUser.login || ' '}</Text>
</View>
<View style={styles.details}>
<TouchableOpacity
style={styles.unit}
<Title>{user.name || ' '}</Title>
<SubTitle>{initialUser.login || ' '}</SubTitle>
</Profile>
<Details>
<Unit
nativeId="touchable-repository-list"
onPress={() =>
navigation.navigate('RepositoryList', {
Expand All @@ -160,22 +146,20 @@ export class UserProfile extends Component {
maxLoadingConstraints.maxPublicRepos,
user.public_repos
),
})}
})
}
>
<Text style={styles.unitNumber}>
<UnitNumber>
{!isNaN(parseInt(user.public_repos, 10))
? user.public_repos + (user.total_private_repos || 0)
: ' '}
</Text>
<Text style={styles.unitText}>
{translate('common.repositories', locale)}
</Text>
</TouchableOpacity>
</UnitNumber>
<UnitText>{translate('common.repositories', locale)}</UnitText>
</Unit>

{type !== 'org' && (
<TouchableOpacity
<Unit
nativeId="touchable-star-count-list"
style={styles.unit}
onPress={() =>
navigation.navigate('StarredRepositoryList', {
title: translate(
Expand All @@ -187,21 +171,21 @@ export class UserProfile extends Component {
maxLoadingConstraints.maxStars,
starCount
),
})}
})
}
>
<Text style={styles.unitNumber}>
<UnitNumber>
{!isNaN(parseInt(starCount, 10)) ? starCount : ' '}
</Text>
<Text style={styles.unitText}>
</UnitNumber>
<UnitText>
{translate('user.starredRepositoryList.text', locale)}
</Text>
</TouchableOpacity>
</UnitText>
</Unit>
)}

{type !== 'org' && (
<TouchableOpacity
<Unit
nativeId="touchable-followers-list"
style={styles.unit}
onPress={() =>
navigation.navigate('FollowerList', {
title: translate('user.followers.title', locale),
Expand All @@ -210,28 +194,30 @@ export class UserProfile extends Component {
maxLoadingConstraints.maxFollowers,
user.followers
),
})}
})
}
>
<Text style={styles.unitNumber}>
<UnitNumber>
{!isNaN(parseInt(user.followers, 10))
? user.followers
: ' '}
</Text>
<Text style={styles.unitText}>
</UnitNumber>
<UnitText>
{translate('user.followers.text', locale)}
</Text>
</UnitText>
{isFollowing && (
<Text style={[styles.unitStatus, styles.badge]}>
{translate('user.following.followingYou', locale)}
</Text>
<UnitStatusWrapper>
<UnitStatus>
{translate('user.following.followingYou', locale)}
</UnitStatus>
</UnitStatusWrapper>
)}
</TouchableOpacity>
</Unit>
)}

{type !== 'org' && (
<TouchableOpacity
<Unit
nativeId="touchable-following-list"
style={styles.unit}
onPress={() =>
navigation.navigate('FollowingList', {
title: translate('user.following.title', locale),
Expand All @@ -240,27 +226,30 @@ export class UserProfile extends Component {
maxLoadingConstraints.maxFollowing,
user.following
),
})}
})
}
>
<Text style={styles.unitNumber}>
<UnitNumber>
{!isNaN(parseInt(user.following, 10))
? user.following
: ' '}
</Text>
<Text style={styles.unitText}>
</UnitNumber>
<UnitText>
{translate('user.following.text', locale)}
</Text>
</UnitText>
{isFollower && (
<Text style={[styles.unitStatus, styles.badge]}>
{translate('user.followers.followsYou')}
</Text>
<UnitStatusWrapper>
<UnitStatus>
{translate('user.followers.followsYou')}
</UnitStatus>
</UnitStatusWrapper>
)}
</TouchableOpacity>
</Unit>
)}
</View>
</View>
</Details>
</Wrapper>
)}
</View>
</Container>
);
}
}