Skip to content
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

Switch a bunch of colours to standard iOS #71

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Switch a bunch of colours to standard iOS #71

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57fb3a1
Switch a bunch of colours to standard iOS
rmccue Dec 27, 2019
c855ae3
Fix linting errors
rmccue Dec 27, 2019
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
29 changes: 18 additions & 11 deletions Routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,11 @@ import SitesView from './containers/Sites/View';
import SettingsList from './containers/Settings/List';
import CommentsEdit from './containers/Comments/Edit';

import { getBrandColor, getSemanticColor } from './theme';

const defaultOptions = {
cardStyle: {
backgroundColor: 'white',
borderTopWidth: 0,
shadowRadius: 0,
shadowOffset: {
height: 0,
},
shadowColor: 'transparent',
},
headerStyle: {
shadowOpacity: 0,
backgroundColor: getSemanticColor( 'systemBackground' ),
},
headerStyleInterpolator: HeaderStyleInterpolators.forUIKit,
};
Expand Down Expand Up @@ -144,12 +137,26 @@ const MainStack = () => {
}

export default function RootStack() {
const theme = {
dark: false,
colors: {
primary: getBrandColor( 'primary' ),
backgroundColor: getSemanticColor( 'systemBackground' ),
card: getSemanticColor( 'secondarySystemBackground' ),
text: getSemanticColor( 'label' ),
border: getSemanticColor( 'separator' ),
},
};

return (
<NavigationNativeContainer>
<NavigationNativeContainer
theme={ theme }
>
<Root.Navigator
headerMode="none"
mode="modal"
screenOptions={ {
...defaultOptions,
...TransitionPresets.ModalPresentationIOS,
cardOverlayEnabled: true,
gestureEnabled: true,
Expand Down
13 changes: 5 additions & 8 deletions components/General/FormRow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,23 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { View, Text, StyleSheet } from 'react-native';

import { getSemanticColor } from '../../theme';

const styles = StyleSheet.create( {
field: {
backgroundColor: '#FFFFFF',
backgroundColor: getSemanticColor( 'systemBackground' ),
height: 44,
flexDirection: 'row',
alignItems: 'center',
borderBottomWidth: 1,
borderBottomColor: '#f9f9f9',
borderBottomColor: getSemanticColor( 'separator' ),
},
label: {
width: 130,
marginLeft: 10,
},
labelText: {
color: getSemanticColor( 'label' ),
fontSize: 15,
lineHeight: 16,
},
Expand All @@ -25,12 +28,6 @@ const styles = StyleSheet.create( {
flexDirection: 'row',
marginRight: 10,
},
descriptionText: {
fontSize: 11,
color: '#999999',
margin: 8,
marginBottom: 15,
},
} );

export default class FormRow extends Component {
Expand Down
11 changes: 7 additions & 4 deletions components/General/RichItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import React, { Component } from 'react';
import { StyleSheet, View, Text, Image } from 'react-native';
import { WebView } from 'react-native-webview';

import { getSemanticColor } from '../../theme';

const styles = StyleSheet.create( {
container: {
marginBottom: 0,
Expand All @@ -11,17 +13,17 @@ const styles = StyleSheet.create( {
},
authorName: {
lineHeight: 16,
color: getSemanticColor( 'label' ),
},
contentRight: {
flex: 1,
backgroundColor: 'white',
},
content: {
marginBottom: 15,
},
webView: {
height: 10,
backgroundColor: 'white',
backgroundColor: 'transparent',
},
authorImage: {
marginRight: 15,
Expand All @@ -45,7 +47,7 @@ export default class RichItem extends Component {
};

state = {
webViewHeight: 0,
webViewHeight: 150,
};

onMessage = event => {
Expand All @@ -59,9 +61,10 @@ export default class RichItem extends Component {
<meta name="viewport" content="width = device-width" />
<style>
body {
background: ${ getSemanticColor( 'systemBackground' ) };
font-size: 15px;
line-height: 20px;
color: #666;
color: ${ getSemanticColor( 'secondaryLabel' ) };
font-family: sans-serif;
margin: 0;
max-width: 100%;
Expand Down
4 changes: 3 additions & 1 deletion components/Navigation/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { StyleSheet, TouchableOpacity, Text } from 'react-native';

import { getSemanticColor } from '../../theme';

const styles = StyleSheet.create( {
container: {
paddingRight: 10,
},
text: {
lineHeight: 16,
fontSize: 16,
color: '#3578F6',
color: getSemanticColor( 'link' ),
},
} );

Expand Down
4 changes: 3 additions & 1 deletion components/Posts/List.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import { ScrollView, View, StyleSheet } from 'react-native';
import ViennaPropTypes from '../../PropTypes';
import ListItem from './ListItem';

import { getSemanticColor } from '../../theme';

const styles = StyleSheet.create( {
listItem: {
padding: 15,
borderBottomColor: '#F7F7F7',
borderBottomColor: getSemanticColor( 'separator' ),
borderBottomWidth: 1,
},
} );
Expand Down
8 changes: 5 additions & 3 deletions components/Posts/ListItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { FontAwesome as Icon } from '@expo/vector-icons';
import ConfirmButton from '../ConfirmButton';
import RichItem from '../General/RichItem';

import { getBrandColor, getSemanticColor, getSystemColor } from '../../theme';

const styles = StyleSheet.create( {
container: {},
title: {
Expand Down Expand Up @@ -35,7 +37,7 @@ const styles = StyleSheet.create( {
textAlign: 'center',
padding: 5,
fontSize: 14,
color: '#666666',
color: getSemanticColor( 'secondaryLabel' ),
},
featuredMedia: {
height: 180,
Expand Down Expand Up @@ -83,7 +85,7 @@ export default class ListItem extends Component {
onPress={ this.props.onEdit }
>
<View style={ styles.actionsButton }>
<Icon name="pencil" size={ 14 } color="#888888" />
<Icon name="pencil" size={ 14 } color={ getSemanticColor( 'secondaryLabel' )} />
<Text style={ styles.actionsButtonText }>Edit</Text>
</View>
</TouchableOpacity>
Expand All @@ -94,7 +96,7 @@ export default class ListItem extends Component {
onPress={ this.props.onView }
>
<View style={ styles.actionsButton }>
<Icon name="external-link" size={ 14 } color="#888888" />
<Icon name="external-link" size={ 14 } color={ getSemanticColor( 'secondaryLabel' )} />
<Text style={ styles.actionsButtonText }>View</Text>
</View>
</TouchableOpacity>
Expand Down
5 changes: 4 additions & 1 deletion components/Sites/ListItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import React, { Component } from 'react';
import { StyleSheet, View, Text, Image } from 'react-native';
import { FontAwesome as Icon } from '@expo/vector-icons';

import { getSemanticColor } from '../../theme';

const styles = StyleSheet.create( {
container: {
flexDirection: 'row',
Expand All @@ -15,10 +17,11 @@ const styles = StyleSheet.create( {
marginLeft: 5,
},
title: {
color: getSemanticColor( 'label' ),
fontSize: 16,
},
url: {
color: '#999999',
color: getSemanticColor( 'secondaryLabel' ),
fontSize: 12,
lineHeight: 12,
},
Expand Down
6 changes: 4 additions & 2 deletions containers/Posts/List.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ import {
} from 'react-native';
import { isEmpty } from 'lodash';
import { connect } from 'react-redux';

import { trashPost, fetchPosts, updatePostfilter } from '../../actions';
import PostsList from '../../components/Posts/List';
import MediaList from '../../components/Media/List';
import Filter from '../../components/Posts/Filter';
import ListError from '../../components/General/ListError';
import NavigationButton from '../../components/Navigation/Button';
import { getSemanticColor } from '../../theme';

const styles = StyleSheet.create( {
creating: {
Expand Down Expand Up @@ -122,13 +124,13 @@ class List extends Component {
refreshing={ type.list.loading }
style={ { backgroundColor: 'transparent' } }
onRefresh={ this.onRefresh.bind( this ) }
tintColor="#666666"
tintColor={ getSemanticColor( 'secondaryLabel' ) }
title={
type.list.loading
? 'Loading ' + type.name + '...'
: 'Pull to Refresh...'
}
titleColor="#000000"
titleColor={ getSemanticColor( 'label' ) }
/>
}
posts={ Object.values( posts ).filter( this.filterPosts.bind( this ) ) }
Expand Down
25 changes: 14 additions & 11 deletions containers/Sites/View.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,19 @@ import {
fetchSiteData,
} from '../../actions';

import { getBrandColor, getSemanticColor, getSystemColor } from '../../theme';

const styles = StyleSheet.create( {
container: {
flex: 1,
},
divider: {
borderBottomColor: '#F0F4F7',
borderBottomColor: getSystemColor( 'gray6' ),
borderBottomWidth: 1,
margin: 20,
},
sectionTitle: {
color: '#999999',
color: getSemanticColor( 'secondaryLabel' ),
fontSize: 11,
marginTop: 15,
marginLeft: 60,
Expand All @@ -42,17 +44,18 @@ const styles = StyleSheet.create( {
paddingLeft: 0,
},
listItemDivider: {
borderBottomColor: '#f1f1f1',
borderBottomColor: getSemanticColor( 'separator' ),
marginLeft: 60,
marginRight: 30,
},
listItemName: {
color: getSemanticColor( 'label' ),
fontSize: 16,
flex: 1,
},
listItemNameCentered: {
textAlign: 'center',
color: 'red',
color: getBrandColor( 'primary' ),
flex: 1,
},
listItemIcon: {
Expand Down Expand Up @@ -124,7 +127,7 @@ class _View extends Component {
return trimmedString;
}
render() {
let chevron = <Icon name="chevron-right" size={ 20 } color="#BBBBBB" />;
let chevron = <Icon name="chevron-right" size={ 20 } color={ getSemanticColor( 'secondaryLabel' ) } />;

if ( ! this.props.types ) {
return null;
Expand All @@ -138,7 +141,7 @@ class _View extends Component {
refreshing={ false }
style={ { backgroundColor: 'transparent' } }
onRefresh={ this.onRefresh.bind( this ) }
tintColor="#666666"
tintColor={ getBrandColor( 'primary' ) }
title="Pull to Refresh..."
titleColor="#000000"
/>
Expand All @@ -164,7 +167,7 @@ class _View extends Component {
style={ styles.listItemIcon }
name={ iconName }
size={ 16 }
color="#999999"
color={ getSemanticColor( 'secondaryLabel' ) }
/>
<Text style={ styles.listItemName }>{ type.name }</Text>
<View style={ styles.listItemValue }>{ chevron }</View>
Expand Down Expand Up @@ -198,7 +201,7 @@ class _View extends Component {
style={ styles.listItemIcon }
name={ iconName }
size={ 16 }
color="#999999"
color={ getSemanticColor( 'secondaryLabel' ) }
/>
<Text style={ styles.listItemName }>{ taxonomy.name }</Text>
<View style={ styles.listItemValue }>{ chevron }</View>
Expand All @@ -220,7 +223,7 @@ class _View extends Component {
style={ styles.listItemIcon }
name="comments"
size={ 16 }
color="#999999"
color={ getSemanticColor( 'secondaryLabel' ) }
/>
<Text style={ styles.listItemName }>Comments</Text>
<View style={ styles.listItemValue }>{ chevron }</View>
Expand All @@ -234,7 +237,7 @@ class _View extends Component {
style={ styles.listItemIcon }
name="users"
size={ 16 }
color="#999999"
color={ getSemanticColor( 'secondaryLabel' ) }
/>
<Text style={ styles.listItemName }>Users</Text>
<View style={ styles.listItemValue }>{ chevron }</View>
Expand All @@ -248,7 +251,7 @@ class _View extends Component {
style={ styles.listItemIcon }
name="gear"
size={ 20 }
color="#999999"
color={ getSemanticColor( 'secondaryLabel' ) }
/>
<Text style={ styles.listItemName }>Settings</Text>
<View style={ styles.listItemValue }>{ chevron }</View>
Expand Down
Loading