Skip to content

refactor: migrate organization screen to styled-components #682

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
housseindjirdeh merged 2 commits into from
Jan 3, 2018
Merged

refactor: migrate organization screen to styled-components #682

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f026676
refactor: migrate organization screen to styled-components
ZahraTee Dec 28, 2017
3dbc799
refactor: remove unused style from organization screen
ZahraTee Dec 28, 2017
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
16 changes: 6 additions & 10 deletions src/organization/screens/organization-profile.screen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, { Component } from 'react';
import styled from 'styled-components/native';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import { StyleSheet, RefreshControl } from 'react-native';
import { RefreshControl } from 'react-native';
import { ListItem } from 'react-native-elements';
import { createStructuredSelector } from 'reselect';
import ActionSheet from 'react-native-actionsheet';
Expand Down Expand Up @@ -47,16 +48,12 @@ const actionCreators = {

const actions = dispatch => bindActionCreators(actionCreators, dispatch);

const styles = StyleSheet.create({
listTitle: {
color: colors.black,
...fonts.fontPrimary,
},
listSubTitle: {
const DescriptionListItem = styled(ListItem).attrs({
subtitleStyle: {
color: colors.greyDark,
...fonts.fontPrimary,
},
});
})``;
Copy link
Copy Markdown
Member

@andrewda andrewda Dec 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this? Was probably just added by prettier for some reason, but I think you can safely get rid of it.

Copy link
Copy Markdown
Member

@machour machour Dec 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's needed by styled components when using attrs()

Copy link
Copy Markdown
Member

@andrewda andrewda Dec 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh alright, yes you're right.


class OrganizationProfile extends Component {
props: {
Expand Down Expand Up @@ -172,9 +169,8 @@ class OrganizationProfile extends Component {
<SectionList
title={translate('organization.main.descriptionTitle', locale)}
>
<ListItem
<DescriptionListItem
subtitle={emojifyText(organization.description)}
subtitleStyle={styles.listSubTitle}
hideChevron
/>
</SectionList>
Expand Down