refactor: use styled-components in comment-list-item #557
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
|
|
||
| import React, { Component } from 'react'; | ||
| import { connect } from 'react-redux'; | ||
| import styled from 'styled-components/native'; | ||
| import { GithubHtmlView } from 'components'; | ||
| import { Icon } from 'react-native-elements'; | ||
| import ActionSheet from 'react-native-actionsheet'; | ||
|
|
@@ -13,71 +13,71 @@ import moment from 'moment/min/moment-with-locales.min'; | |
| import { translate } from 'utils'; | ||
| import { colors, fonts, normalize } from 'config'; | ||
|
|
||
| const Container = styled.View` | ||
| padding: 10px 10px 0 0; | ||
| background-color: transparent; | ||
| `; | ||
|
|
||
| const Header = styled.View` | ||
| flex-direction: row; | ||
| margin-left: 10px; | ||
|
Member
There was a problem hiding this comment. Nice catch for those shorthands properties. But shall we always add units for properties? (cc @alejandronanez)
Contributor
Author
There was a problem hiding this comment. I don’t know. It’s up to you. I never use units for 0 in css.
Member
There was a problem hiding this comment. I think we should stick to unitless, that's what we've been doing in other PRs |
||
| align-items: center; | ||
| `; | ||
|
|
||
| const AvatarContainer = styled.TouchableOpacity` | ||
| background-color: ${colors.greyLight}; | ||
| border-radius: 17px; | ||
| width: 34px; | ||
| height: 34px; | ||
| `; | ||
|
|
||
| const Avatar = styled.Image` | ||
| border-radius: 17px; | ||
| width: 34px; | ||
| height: 34px; | ||
| `; | ||
|
|
||
| const TitleSubtitleContainer = styled.View` | ||
| justify-content: center; | ||
| flex: 1; | ||
| margin-left: 10px; | ||
| `; | ||
|
|
||
| const DateContainer = styled.View` | ||
| flex: 0.1; | ||
| align-items: flex-end; | ||
| justify-content: center; | ||
| `; | ||
|
|
||
| const LinkDescription = styled.Text` | ||
| ${{ ...fonts.fontPrimaryBold }}; | ||
|
Member
There was a problem hiding this comment. Can we just write as
Contributor
Author
There was a problem hiding this comment. I don’t kno. I’m not sure how this actually works. Just copied it from the other already concerted components. I handle fonts differently in my apps.
Member
There was a problem hiding this comment. This should be:
EDIT: Actually, let's keep it like you did, I think it would be better to get rid of |
||
| font-size: ${normalize(13)}; | ||
| color: ${colors.primaryDark}; | ||
| `; | ||
|
|
||
| const DateLabel = styled.Text` | ||
| color: ${colors.greyDark}; | ||
| `; | ||
|
|
||
| const CommentContainer = styled.View` | ||
| padding-top: 5px; | ||
| margin-left: 54px; | ||
| border-bottom-color: ${colors.greyLight}; | ||
| border-bottom-width: 1px; | ||
| padding-bottom: ${props => (props.bottomPadding ? 15 : 0)}px; | ||
| `; | ||
|
|
||
| const CommentTextNone = styled.Text` | ||
| ${{ ...fonts.fontPrimary }}; | ||
|
|
||
| color: ${colors.primaryDark}; | ||
| font-style: italic; | ||
| `; | ||
|
|
||
| const ActionButtonIconContainer = styled.View` | ||
| padding: 5px 0; | ||
| align-items: flex-end; | ||
| justify-content: center; | ||
| `; | ||
|
|
||
| const mapStateToProps = state => ({ | ||
| authUser: state.auth.user, | ||
|
|
@@ -133,11 +133,10 @@ class CommentListItemComponent extends Component { | |
| comment.user && authUser.login === comment.user.login; | ||
|
|
||
| return ( | ||
| <Container> | ||
| <Header> | ||
| {comment.user && ( | ||
| <AvatarContainer | ||
| onPress={() => | ||
| navigation.navigate( | ||
| authUser.login === comment.user.login | ||
|
|
@@ -148,19 +147,17 @@ class CommentListItemComponent extends Component { | |
| } | ||
| )} | ||
| > | ||
| <Avatar | ||
| source={{ | ||
| uri: comment.user.avatar_url, | ||
| }} | ||
| /> | ||
| </AvatarContainer> | ||
| )} | ||
|
|
||
| {comment.user && ( | ||
| <TitleSubtitleContainer> | ||
| <LinkDescription | ||
| onPress={() => | ||
| navigation.navigate( | ||
| authUser.login === comment.user.login | ||
|
|
@@ -172,46 +169,39 @@ class CommentListItemComponent extends Component { | |
| )} | ||
| > | ||
| {comment.user.login} | ||
| </LinkDescription> | ||
| </TitleSubtitleContainer> | ||
| )} | ||
|
|
||
| <DateContainer> | ||
| <DateLabel>{moment(comment.created_at).fromNow()}</DateLabel> | ||
| </DateContainer> | ||
| </Header> | ||
|
|
||
| <CommentContainer bottomPadding={!isActionMenuEnabled}> | ||
| {commentPresent ? ( | ||
| <GithubHtmlView | ||
| source={comment.body_html} | ||
| onLinkPress={onLinkPress} | ||
| /> | ||
| ) : ( | ||
| <CommentTextNone> | ||
| {translate('issue.main.noDescription', locale)} | ||
| </CommentTextNone> | ||
| )} | ||
|
|
||
| {isActionMenuEnabled && ( | ||
| <ActionButtonIconContainer> | ||
| <Icon | ||
| color={colors.grey} | ||
| size={20} | ||
| name={'ellipsis-h'} | ||
| type={'font-awesome'} | ||
| onPress={this.showMenu} | ||
| /> | ||
| </ActionButtonIconContainer> | ||
| )} | ||
| </CommentContainer> | ||
|
|
||
| <ActionSheet | ||
| ref={o => { | ||
|
|
@@ -225,7 +215,7 @@ class CommentListItemComponent extends Component { | |
| cancelButtonIndex={this.commentActionSheetOptions(comment).length} | ||
| onPress={this.handlePress} | ||
| /> | ||
| </Container> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎉 You contributed codes in fact.