diff --git a/src/auth/screens/events.screen.js b/src/auth/screens/events.screen.js
index 69b28ca02..523753574 100644
--- a/src/auth/screens/events.screen.js
+++ b/src/auth/screens/events.screen.js
@@ -1,9 +1,10 @@
/* eslint react/prop-types: 0 */
/* eslint-disable no-shadow */
import React, { Component } from 'react';
+import styled from 'styled-components/native';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
-import { StyleSheet, Text, FlatList, View } from 'react-native';
+import { Text, FlatList, View } from 'react-native';
import moment from 'moment/min/moment-with-locales.min';
import { LoadingUserListItem, UserListItem, ViewContainer } from 'components';
@@ -29,52 +30,58 @@ const mapDispatchToProps = dispatch =>
dispatch
);
-const styles = StyleSheet.create({
- descriptionContainer: {
- justifyContent: 'center',
- flex: 1,
- marginLeft: 10,
- color: colors.primaryDark,
- ...fonts.fontPrimaryLight,
- },
- linkDescription: {
- ...fonts.fontPrimarySemiBold,
- },
- linkBranchDescription: {
- ...fonts.fontCode,
- },
- deletedLinkBranchDescription: {
- color: colors.greyDarkest,
- ...fonts.fontCode,
- },
- date: {
- color: colors.greyDark,
- },
- subtitleContainer: {
- paddingHorizontal: 15,
- paddingBottom: 10,
- borderBottomColor: colors.greyLight,
- borderBottomWidth: 1,
- },
- subtitle: {
- color: colors.greyDark,
- fontSize: normalize(11),
- marginTop: 1,
- ...fonts.fontPrimarySemiBold,
- marginLeft: 39,
- },
- textContainer: {
- flex: 1,
- alignItems: 'center',
- justifyContent: 'center',
- marginHorizontal: 15,
- },
- noneTitle: {
- fontSize: normalize(14),
- textAlign: 'center',
- ...fonts.fontPrimary,
- },
-});
+const DescriptionContainer = styled.Text`
+ justify-content: center;
+ flex: 1;
+ margin-left: 10;
+ color: ${colors.primaryDark};
+ ${fonts.fontPrimaryLight};
+`;
+
+const LinkDescription = styled.Text`
+ ${fonts.fontPrimarySemiBold};
+`;
+
+const LinkBranchDescription = styled.Text`
+ ${fonts.fontCode};
+`;
+
+const DeletedLinkBranchDescription = styled.Text`
+ color: ${colors.greyDarkest};
+ ${fonts.fontCode};
+`;
+
+const Datestamp = styled.Text`
+ color: ${colors.greyDark};
+`;
+
+const SubtitleContainer = styled.View`
+ padding-horizontal: 15;
+ padding-bottom: 10;
+ border-bottom-color: ${colors.greyLight};
+ border-bottom-width: 1;
+`;
+
+const Subtitle = styled.Text`
+ color: ${colors.greyDark};
+ font-size: ${normalize(11)};
+ margin-top: 1;
+ ${fonts.fontPrimarySemiBold};
+ margin-left: 39;
+`;
+
+const TextContainer = styled.View`
+ flex: 1;
+ align-items: center;
+ justify-content: center;
+ margin-horizontal: 15;
+`;
+
+const NoneTitle = styled.Text`
+ font-size: ${normalize(14)};
+ text-align: center;
+ ${fonts.fontPrimary};
+`;
class Events extends Component {
componentDidMount() {
@@ -206,18 +213,17 @@ class Events extends Component {
userEvent.payload.ref_type === 'tag'
) {
return (
-
+
{userEvent.payload.ref}
-
+
);
} else if (userEvent.payload.ref_type === 'repository') {
return (
- this.navigateToRepository(userEvent)}
>
{userEvent.repo.name}
-
+
);
}
@@ -225,76 +231,62 @@ class Events extends Component {
}
case 'DeleteEvent':
return (
-
+
{userEvent.payload.ref}
-
+
); // can only be branch or tag
case 'ForkEvent':
case 'WatchEvent':
case 'PublicEvent':
return (
- this.navigateToRepository(userEvent)}
- >
+ this.navigateToRepository(userEvent)}>
{userEvent.repo.name}
-
+
);
case 'GollumEvent':
return (
the{' '}
- this.navigateToRepository(userEvent)}
>
{userEvent.repo.name}
- {' '}
+ {' '}
wiki
);
case 'IssueCommentEvent':
case 'IssuesEvent':
return (
- this.navigateToIssue(userEvent)}
- >
+ this.navigateToIssue(userEvent)}>
{userEvent.payload.issue.title}
-
+
);
case 'MemberEvent':
return (
- this.navigateToProfile(userEvent)}
- >
+ this.navigateToProfile(userEvent)}>
{userEvent.payload.member.login}
-
+
);
case 'PullRequestEvent':
case 'PullRequestReviewEvent':
case 'PullRequestReviewCommentEvent':
return (
- this.navigateToIssue(userEvent)}
- >
+ this.navigateToIssue(userEvent)}>
{userEvent.payload.pull_request.title}
-
+
);
case 'PushEvent':
return (
-
+
{userEvent.payload.ref.replace('refs/heads/', '')}
-
+
);
case 'ReleaseEvent':
return `${userEvent.payload.release.id}`;
case 'RepositoryEvent':
return (
- {
if (userEvent.action !== 'deleted') {
this.navigateToRepository(userEvent);
@@ -302,7 +294,7 @@ class Events extends Component {
}}
>
{userEvent.repo.name}
-
+
);
default:
return null;
@@ -351,12 +343,11 @@ class Events extends Component {
userEvent.payload.ref_type === 'tag'
) {
return (
- this.navigateToRepository(userEvent)}
>
{userEvent.repo.name}
-
+
);
}
@@ -370,21 +361,17 @@ class Events extends Component {
case 'MemberEvent':
case 'PullRequestReviewCommentEvent':
return (
- this.navigateToRepository(userEvent)}
- >
+ this.navigateToRepository(userEvent)}>
{userEvent.repo.name}
-
+
);
case 'ForkEvent':
return (
- this.navigateToRepository(userEvent, true)}
>
{userEvent.payload.forkee.full_name}
-
+
);
default:
return null;
@@ -484,13 +471,12 @@ class Events extends Component {
renderDescription(userEvent) {
return (
-
-
+ this.navigateToProfile(userEvent, true)}
>
{userEvent.actor.login}{' '}
-
+
{this.getAction(userEvent)}
{this.getItem(userEvent)}
{this.getAction(userEvent) && ' '}
@@ -498,10 +484,8 @@ class Events extends Component {
{this.getItem(userEvent) && ' '}
{this.getSecondItem(userEvent)}
{this.getItem(userEvent) && this.getConnector(userEvent) && ' '}
-
- {moment(userEvent.created_at).fromNow()}
-
-
+ {moment(userEvent.created_at).fromNow()}
+
);
}
@@ -517,11 +501,11 @@ class Events extends Component {
});
} else if (!isPendingEvents && userEvents && userEvents.length === 0) {
content = (
-
-
+
+
{translate('auth.events.welcomeMessage', locale)}
-
-
+
+
);
} else {
content = (
@@ -548,13 +532,13 @@ class Events extends Component {
{(item.type === 'IssueCommentEvent' ||
item.type === 'PullRequestReviewCommentEvent') && (
-
-
+
+
{emojifyText(
item.payload.comment.body.replace(linebreaksPattern, ' ')
)}
-
-
+
+
)}
)}