updated design

This commit is contained in:
u-e 2019-04-24 23:59:46 +03:00
parent 4c782f5a48
commit 8901debceb
4 changed files with 48 additions and 22 deletions

View File

@ -3,7 +3,7 @@ import EStyleSheet from 'react-native-extended-stylesheet';
export default EStyleSheet.create({
pointText: {
color: '$primaryBlue',
fontSize: 24,
fontSize: 26,
marginTop: 24,
justifyContent: 'center',
alignSelf: 'center',
@ -31,6 +31,10 @@ export default EStyleSheet.create({
justifyContent: 'center',
alignItems: 'center',
},
iconButton: {
marginTop: 3,
marginLeft: 1,
},
activeIconWrapper: {
backgroundColor: '$primaryBlue',
},
@ -43,7 +47,7 @@ export default EStyleSheet.create({
},
badge: {
position: 'absolute',
right: -7,
right: -9,
top: 20,
backgroundColor: '$primaryBlue',
justifyContent: 'center',

View File

@ -84,7 +84,9 @@ class PointsView extends Component {
<View styles={styles.iconWrapper}>
<View style={styles.iconWrapper}>
<IconButton
disabled
iconStyle={styles.icon}
style={styles.iconButton}
iconType="MaterialCommunityIcons"
name="pencil"
badgeCount={50}
@ -97,9 +99,11 @@ class PointsView extends Component {
<View styles={styles.iconWrapper}>
<View style={styles.iconWrapper}>
<IconButton
disabled
style={styles.iconButton}
iconStyle={styles.icon}
iconType="MaterialIcons"
name="comment"
iconType="MaterialCommunityIcons"
name="comment-text"
badgeCount={15}
badgeStyle={styles.badge}
badgeTextStyle={styles.badgeText}
@ -110,6 +114,8 @@ class PointsView extends Component {
<View styles={styles.iconWrapper}>
<View style={[styles.iconWrapper, isActiveIcon && styles.activeIconWrapper]}>
<IconButton
disabled
style={styles.iconButton}
iconStyle={[styles.icon, isActiveIcon && styles.activeIcon]}
iconType="MaterialCommunityIcons"
name="clock-outline"
@ -123,6 +129,9 @@ class PointsView extends Component {
</View>
<View style={styles.listWrapper}>
{userActivities && userActivities.length < 1
? <Text style={styles.subText}>{intl.formatMessage({ id: 'points.no_activity' })}</Text>
: (
<FlatList
data={userActivities}
renderItem={({ item, index }) => (
@ -136,10 +145,12 @@ class PointsView extends Component {
isBlackText
iconName={item.icon}
iconType={item.iconType}
rightText={`${item.amount} ESTEEM`}
rightText={`${item.amount} ESTM`}
/>
)}
/>
)
}
</View>
</ScrollView>
</Fragment>

View File

@ -41,7 +41,8 @@
"reblog_title": "Points for reblog",
"login_title": "Points for login",
"checkin_title": "Points for usage",
"checkin_extra_title": "Usage bonus"
"checkin_extra_title": "Usage bonus",
"no_activity": "No activity here!"
},
"messages": {
"comingsoon": "Messages feature is coming soon!"

View File

@ -76,7 +76,17 @@ class NotificationScreen extends PureComponent {
})}
style={styles.tabbarItem}
>
{isLoggedIn ? (
<Points />
) : (
<NoPost
isButtonText
defaultText={intl.formatMessage({
id: 'profile.login_to_see',
})}
handleOnButtonPress={handleLoginPress}
/>
)}
</View>
<View
tabLabel={intl.formatMessage({