ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-12-25 14:22:14 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #296 from esteemapp/enhancment/ui

Browse Source 
Enhancment/ui
This commit is contained in:
uğur erdal 2018-12-21 16:53:14 +03:00 committed by GitHub
commit ea99464376
39 changed files with 162 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/basicHeader/view/basicHeaderView.js
View File

@ -87,8 +87,8 @@ class BasicHeaderView extends Component {
<View style={styles.backWrapper}>
<IconButton
iconStyle={[styles.backIcon, isModalHeader && styles.closeIcon]}
iconType={isModalHeader && 'FontAwesome'}
name={isModalHeader ? 'close' : 'md-arrow-back'}
iconType="MaterialIcons"
name={isModalHeader ? 'arrow-back' : 'arrow-back'}
onPress={() => (isModalHeader ? handleOnPressClose() : handleOnPressBackButton())}
/>
{isHasIcons && !isReply && (
@ -96,8 +96,9 @@ class BasicHeaderView extends Component {
{!isDraftSaving ? (
<IconButton
iconStyle={[styles.saveIcon, isDraftSaved && styles.savedIcon]}
iconType="FontAwesome"
iconType="MaterialIcons"
name="save"
size={25}
onPress={() => handleOnSaveButtonPress && handleOnSaveButtonPress()}
/>
) : (
@ -173,14 +174,16 @@ class BasicHeaderView extends Component {
style={styles.iconButton}
iconStyle={styles.rightIcon}
size={20}
name="ios-timer"
iconType="MaterialIcons"
name="timer"
/>
<IconButton
style={styles.iconButton}
size={25}
onPress={() => handleOnPressPreviewButton()}
iconStyle={styles.rightIcon}
name={isPreviewActive ? 'ios-eye' : 'ios-eye-off'}
iconType="MaterialIcons"
name={isPreviewActive ? 'remove-red-eye' : 'remove-red-eye'}
/>
{!isLoading ? (
<TextButton

5
src/components/basicUIElements/view/tag/tagStyles.js
View File

@ -2,14 +2,15 @@ import EStyleSheet from 'react-native-extended-stylesheet';
export default EStyleSheet.create({
text: {
color: '$primaryBackgroundColor',
color: '$pureWhite',
fontSize: 10,
fontWeight: 'bold',
},
isPin: {
backgroundColor: '$primaryBlue',
},
isPostCardTag: {
backgroundColor: '$iconColor',
backgroundColor: '$tagColor',
},
textWrapper: {
paddingHorizontal: 10,

2
src/components/collapsibleCard/view/collapsibleCardView.js
View File

@ -88,7 +88,7 @@ class CollapsibleCardView extends PureComponent {
title={title}
defaultTitle={defaultTitle}
isBoldTitle={isBoldTitle}
iconName={expanded ? 'md-arrow-dropdown' : 'md-arrow-dropup'}
iconName={expanded ? 'arrow-drop-down' : 'arrow-drop-up'}
/>
)}
</TouchableHighlight>

2
src/components/commentsDisplay/view/commentsDisplayView.js
View File

@ -38,7 +38,7 @@ class CommentsDisplayView extends PureComponent {
{commentCount > 0 && (
<Fragment>
<FilterBar
dropdownIconName="md-arrow-dropdown"
dropdownIconName="arrow-drop-down"
options={['NEW COMMENTS']}
defaultText="NEW COMMENTS"
onDropdownSelect={this._handleOnDropdownSelect}

2
src/components/containerHeader/view/containerHeaderStyles.js
View File

@ -27,7 +27,7 @@ export default EStyleSheet.create({
icon: {
alignSelf: 'center',
color: '$iconColor',
fontSize: 18,
fontSize: 22,
marginRight: 32,
},
});

4
src/components/containerHeader/view/containerHeaderView.js
View File

@ -1,10 +1,10 @@
import React, { PureComponent } from 'react';
import { View, Text } from 'react-native';
import Ionicons from 'react-native-vector-icons/Ionicons';
// Constants
// Components
import { Icon } from '../../icon';
// Styles
import styles from './containerHeaderStyles';
@ -51,7 +51,7 @@ class ContainerHeaderView extends PureComponent {
>
{title || defaultTitle}
</Text>
{iconName && <Ionicons style={styles.icon} name={iconName} />}
{iconName && <Icon style={styles.icon} iconType="MaterialIcons" name={iconName} />}
</View>
);
}

15
src/components/dropdownButton/view/dropdownButtonStyles.js
View File

@ -14,10 +14,9 @@ export default EStyleSheet.create({
// marginLeft: 25,
// },
dropdownIcon: {
fontSize: 18,
color: '$iconColor',
marginLeft: 7,
marginTop: 1,
fontSize: 22,
color: '$primaryDarkText',
marginLeft: -10,
},
dropdown: {
marginTop: 5,
@ -40,7 +39,7 @@ export default EStyleSheet.create({
},
dropdownText: {
fontSize: 10,
color: '$primaryDarkGray',
color: '$primaryDarkText',
padding: 5,
borderColor: '#e7e7e7',
},
@ -52,10 +51,10 @@ export default EStyleSheet.create({
marginLeft: 25,
},
buttonText: {
fontSize: 9,
fontSize: 10,
alignSelf: 'center',
color: '$primaryDarkGray',
fontWeight: 'normal',
color: '$primaryDarkText',
fontWeight: 'bold',
},
rowWrapper: {
height: 35,

13
src/components/dropdownButton/view/dropdownButtonView.js
View File

@ -3,7 +3,7 @@ import { View, Text, TouchableHighlight } from 'react-native';
// External components
import ModalDropdown from 'react-native-modal-dropdown';
import Ionicons from 'react-native-vector-icons/Ionicons';
import { Icon } from '../../icon';
// Styles
import styles from './dropdownButtonStyles';
@ -67,16 +67,21 @@ const DropdownButtonView = ({
>
{isHasChildIcon && (
<View style={[styles.iconWrapper, childIconWrapperStyle && childIconWrapperStyle]}>
<Ionicons
<Icon
style={[styles.dropdownIcon, iconStyle]}
name={!iconName ? 'md-arrow-dropdown' : iconName}
iconType="MaterialIcons"
name={!iconName ? 'arrow-drop-down' : iconName}
/>
</View>
)}
</ModalDropdown>
{!children && !isHasChildIcon && (
<View style={styles.iconWrapper}>
<Ionicons style={styles.dropdownIcon} name={!iconName ? 'md-arrow-dropdown' : iconName} />
<Icon
style={styles.dropdownIcon}
iconType="MaterialIcons"
name={!iconName ? 'arrow-drop-down' : iconName}
/>
</View>
)}
</View>

4
src/components/filterBar/view/filterBarStyles.js
View File

@ -10,11 +10,11 @@ export default EStyleSheet.create({
justifyContent: 'space-between',
},
rightIconWrapper: {
marginRight: 32,
marginRight: 16,
alignSelf: 'center',
},
rightIcon: {
color: '$iconColor',
color: '$primaryDarkText',
textAlign: 'center',
},
});

4
src/components/filterBar/view/filterBarView.js
View File

@ -30,7 +30,7 @@ const FilterBarView = ({
}) => (
<View style={styles.container}>
{!isHide && (
<LineBreak height={35}>
<LineBreak height={38}>
<View style={styles.filterBarWrapper}>
<DropdownButton
iconName={dropdownIconName}
@ -46,7 +46,7 @@ const FilterBarView = ({
>
<Icon
style={styles.rightIcon}
size={iconSize || 32}
size={iconSize || 28}
iconType={rightIconType}
name={rightIconName}
/>

8
src/components/formInput/view/formInputView.js
View File

@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { View } from 'react-native';
import Ionicons from 'react-native-vector-icons/Ionicons';
import FastImage from 'react-native-fast-image';
import { Icon } from '../../icon';
// Constants
@ -76,6 +76,7 @@ class FormInputView extends Component {
leftIconName,
rightIconName,
secureTextEntry,
iconType,
} = this.props;
return (
<View
@ -98,7 +99,7 @@ class FormInputView extends Component {
/>
</View>
) : (
<Ionicons name={rightIconName} style={styles.icon} />
<Icon iconType={iconType || 'MaterialIcons'} name={rightIconName} style={styles.icon} />
)}
<View style={styles.textInput}>
<TextInput
@ -115,7 +116,8 @@ class FormInputView extends Component {
</View>
{value && value.length > 0 ? (
<Ionicons
<Icon
iconType={iconType || 'MaterialIcons'}
onPress={() => this.setState({ value: '' })}
name={leftIconName}
style={styles.icon}

9
src/components/header/container/headerContainer.js
View File

@ -41,7 +41,12 @@ class HeaderContainer extends PureComponent {
render() {
const {
isLoggedIn, currentAccount, selectedUser, isReverse, isLoginDone,
isLoggedIn,
currentAccount,
selectedUser,
isReverse,
isLoginDone,
isDarkTheme,
} = this.props;
let displayName;
let username;
@ -67,6 +72,7 @@ class HeaderContainer extends PureComponent {
displayName={displayName}
username={username}
reputation={reputation}
isDarkTheme={isDarkTheme}
/>
);
}
@ -75,6 +81,7 @@ class HeaderContainer extends PureComponent {
const mapStateToProps = state => ({
isLoggedIn: state.application.isLoggedIn,
isLoginDone: state.application.isLoginDone,
isDarkTheme: state.application.isDarkTheme,
currentAccount: state.account.currentAccount,
});

4
src/components/header/view/headerStyles.js
View File

@ -39,14 +39,14 @@ export default EStyleSheet.create({
title: {
fontSize: 14,
fontWeight: 'bold',
color: '$primaryDarkGray',
color: '$primaryDarkText',
},
noAuthTitle: {
fontSize: 14,
color: '$iconColor',
},
subTitle: {
color: '$primaryDarkGray',
color: '$primaryDarkText',
fontSize: 12,
},
avatar: {

10
src/components/header/view/headerView.js
View File

@ -45,8 +45,16 @@ class HeaderView extends Component {
isReverse,
reputation,
username,
isDarkTheme,
} = this.props;
const { isSearchModalOpen } = this.state;
let gredientColor = isDarkTheme ? ['#081c36', '#43638e'] : ['#2d5aa0', '#357ce6'];
if (isReverse) {
gredientColor = isDarkTheme ? ['#43638e', '#081c36'] : ['#357ce6', '#2d5aa0'];
} else {
gredientColor = isDarkTheme ? ['#081c36', '#43638e'] : ['#2d5aa0', '#357ce6'];
}
return (
<SafeAreaView style={[styles.container, isReverse && styles.containerReverse]}>
@ -64,7 +72,7 @@ class HeaderView extends Component {
<LinearGradient
start={{ x: 0, y: 0 }}
end={{ x: 1, y: 0 }}
colors={['#2d5aa0', '#357ce6']}
colors={gredientColor}
style={[
styles.avatarButtonWrapper,
isReverse ? styles.avatarButtonWrapperReverse : styles.avatarDefault,

6
src/components/icon/view/iconView.js
View File

@ -55,11 +55,7 @@ class IconView extends PureComponent {
case 'MaterialIcons':
return <MaterialIcons {...this.props}>{children}</MaterialIcons>;
case 'MaterialCommunityIcons':
return (
<MaterialCommunityIcons name={_name} {...this.props}>
{children}
</MaterialCommunityIcons>
);
return <MaterialCommunityIcons {...this.props}>{children}</MaterialCommunityIcons>;
default:
return <Ionicons name={_name} {...this.props} />;
}

3
src/components/loginHeader/view/loginHeaderStyles.js
View File

@ -33,9 +33,8 @@ export default EStyleSheet.create({
mascot: {
position: 'absolute',
width: 160,
height: 227,
marginTop: 10,
marginTop: 40,
right: -20,
},
titleText: {

4
src/components/markdownEditor/view/formats/applyWebLinkFormat.js
View File

@ -19,7 +19,7 @@ export default ({
newText = replaceBetween(text, selection, `${imagePrefix}[${itemText}](${selectedText})`);
newSelection = {
start: selection.start + 1,
end: selection.start + 1 + itemText.length,
end: selection.start + 1 + itemText && itemText.length,
};
} else {
newText = replaceBetween(text, selection, `${imagePrefix}[${selectedText}](${itemUrl})`);
@ -32,7 +32,7 @@ export default ({
newText = replaceBetween(text, selection, `${imagePrefix}[${itemText}](${itemUrl})`);
newSelection = {
start: selection.start + 1,
end: selection.start + 1 + itemText.length,
end: selection.start + 1 + itemText && itemText.length,
};
}
setState({ text: newText }, () => {

2
src/components/notification/view/notificationView.js
View File

@ -75,7 +75,7 @@ class NotificationView extends PureComponent {
return (
<View style={styles.container}>
<FilterBar
dropdownIconName="md-arrow-dropdown"
dropdownIconName="arrow-drop-down"
options={filters.map(item => item.value)}
defaultText="ALL ACTIVITIES"
onDropdownSelect={this._handleOnDropdownSelect}

4
src/components/notificationLine/view/notificationLineStyles.js
View File

@ -48,8 +48,8 @@ export default EStyleSheet.create({
},
isNewNotification: {
backgroundColor: '$primaryLightBlue',
borderTopWidth: 0.3,
borderBottomWidth: 0.3,
borderBottomWidth: 0.5,
borderBottomColor: '$notificationBorder',
},
hasNoAvatar: {
backgroundColor: '#d8d8d8',

10
src/components/notificationLine/view/notificationLineView.js
View File

@ -3,7 +3,7 @@ import {
View, Text, Image, TouchableHighlight,
} from 'react-native';
import { injectIntl } from 'react-intl';
import FastImage from 'react-native-fast-image';
// Constants
// Components
@ -14,9 +14,9 @@ import styles from './notificationLineStyles';
class NotificationLineView extends PureComponent {
/* Props
* ------------------------------------------------
* @prop { type } name - Description....
*/
* ------------------------------------------------
* @prop { type } name - Description....
*/
constructor(props) {
super(props);
@ -40,7 +40,7 @@ class NotificationLineView extends PureComponent {
key={Math.random()}
style={[styles.notificationWrapper, !notification.read && styles.isNewNotification]}
>
<Image
<FastImage
style={[styles.avatar, !notification.avatar && styles.hasNoAvatar]}
source={{
uri: `https://steemitimages.com/u/${notification.source}/avatar/small`,

15
src/components/postCard/view/postCardStyles.js
View File

@ -2,14 +2,16 @@ import EStyleSheet from 'react-native-extended-stylesheet';
export default EStyleSheet.create({
post: {
shadowColor: '$white',
padding: 0,
marginRight: 0,
marginLeft: 0,
marginTop: 10,
marginBottom: 0,
marginTop: 5,
marginBottom: 10,
borderRadius: 5,
backgroundColor: '$primaryBackgroundColor',
shadowOpacity: 0.2,
shadowColor: '$shadowColor',
elevation: 3,
},
avatar: {
width: 30,
@ -161,15 +163,13 @@ export default EStyleSheet.create({
backgroundColor: '$primaryBackgroundColor',
},
title: {
fontSize: 14,
fontSize: 16,
fontWeight: 'bold',
marginVertical: 12,
color: '$primaryBlack',
},
summary: {
fontSize: 12,
fontWeight: '200',
overflow: 'hidden',
fontSize: 13,
color: '$primaryDarkGray',
},
bodyFooter: {
@ -181,6 +181,7 @@ export default EStyleSheet.create({
bodyHeader: {
backgroundColor: '$primaryBackgroundColor',
flexDirection: 'row',
marginTop: 16,
marginHorizontal: 12,
marginBottom: 12,
},

2
src/components/postCard/view/postCardView.js
View File

@ -4,7 +4,6 @@ import FastImage from 'react-native-fast-image';
import { PostHeaderDescription } from '../../postElements';
import { PostDropdown } from '../../postDropdown';
import { Icon } from '../../icon';
import { LineBreak } from '../../basicUIElements';
// STEEM
import { Upvote } from '../../upvote';
@ -112,7 +111,6 @@ class PostCard extends Component {
<Text style={styles.comment}>{content.children}</Text>
</TouchableOpacity>
</View>
<LineBreak height={8} />
</View>
);
}

1
src/components/postDropdown/container/postDropdownContainer.js
View File

@ -96,7 +96,6 @@ class PostDropdownContainer extends PureComponent {
}
const mapStateToProps = state => ({
selectedApi: state.application.api,
isLoggedIn: state.application.isLoggedIn,
currentAccount: state.account.currentAccount,
});

8
src/components/postDropdown/view/postDropdownStyles.js Normal file
View File

@ -0,0 +1,8 @@
import EStyleSheet from 'react-native-extended-stylesheet';
export default EStyleSheet.create({
icon: {
color: '$iconColor',
marginRight: 2.7,
},
});

5
src/components/postDropdown/view/postDropdownView.js
View File

@ -3,6 +3,7 @@ import React, { PureComponent } from 'react';
// Constants
// Components
import { DropdownButton } from '../../dropdownButton';
import styles from './postDropdownStyles';
class PostDropdownView extends PureComponent {
/* Props
@ -25,11 +26,11 @@ class PostDropdownView extends PureComponent {
return (
<DropdownButton
isHasChildIcon
iconName="md-more"
// options={['BOOKMARK', 'REBLOG', 'REPLY']}
iconName="more-vert"
options={options}
onSelect={handleOnDropdownSelect}
noHighlight
iconStyle={styles.icon}
/>
);
}

5
src/components/postElements/headerDescription/view/postHeaderDescriptionStyles.js
View File

@ -8,17 +8,18 @@ export default EStyleSheet.create({
avatar: {
borderColor: '$borderColor',
borderWidth: 1,
marginRight: 5,
},
name: {
marginHorizontal: 3,
fontSize: 10,
fontSize: 11,
color: '$primaryBlack',
fontFamily: '$primaryFont',
fontWeight: 'bold',
alignSelf: 'center',
},
reputation: {
fontSize: 10,
fontSize: 11,
color: '$primaryDarkGray',
marginRight: 8,
alignSelf: 'center',

4
src/components/posts/view/postsStyles.js
View File

@ -1,7 +1,9 @@
import EStyleSheet from 'react-native-extended-stylesheet';
export default EStyleSheet.create({
container: {},
container: {
backgroundColor: '$primaryLightBackground',
},
placeholder: {
backgroundColor: '$primaryBackgroundColor',
padding: 20,

6
src/components/posts/view/postsView.js
View File

@ -178,10 +178,10 @@ class PostsView extends Component {
} = this.props;
return (
<Fragment>
<View style={styles.container}>
{filterOptions && (
<FilterBar
dropdownIconName="md-arrow-dropdown"
dropdownIconName="arrow-drop-down"
options={filterOptions}
selectedOptionIndex={0}
defaultText={filterOptions[0]}
@ -237,7 +237,7 @@ class PostsView extends Component {
<PostCardPlaceHolder />
</Fragment>
)}
</Fragment>
</View>
);
}
}

5
src/components/tabBar/view/tabBarStyles.js
View File

@ -19,4 +19,9 @@ export default EStyleSheet.create({
tabButton: {
flex: 1,
},
text: {
fontSize: 16,
fontFamily: '$primaryFont',
marginBottom: 12,
},
});

16
src/components/tabBar/view/tabBarView.js
View File

@ -15,18 +15,18 @@ import styles from './tabBarStyles';
class TabBar extends PureComponent {
/* Props
* ------------------------------------------------ TODO: Fill fallowlines
* @prop { type } name - Description.
* @prop { type } name - Description.
*
*/
* ------------------------------------------------ TODO: Fill fallowlines
* @prop { type } name - Description.
* @prop { type } name - Description.
*
*/
constructor(props) {
super(props);
this.state = {
activeColor: !props.isDarkTheme ? '#357ce6' : '#357ce6',
inactiveColor: !props.isDarkTheme ? '#788187' : '#eaf2fc',
activeColor: !props.isDarkTheme ? '#357ce6' : '#96c0ff',
inactiveColor: !props.isDarkTheme ? '#788187' : '#526d91',
};
}
@ -47,7 +47,7 @@ class TabBar extends PureComponent {
onPress={() => onPressHandler(page)}
>
<View style={styles.tab}>
<Text style={[{ color: textColor, fontWeight }]}>{name}</Text>
<Text style={[{ color: textColor, fontWeight }, styles.text]}>{name}</Text>
</View>
</Button>
);

2
src/components/transaction/view/transactionView.js
View File

@ -37,7 +37,7 @@ class TransactionView extends PureComponent {
<Fragment>
{/* this feature not implemented yet */}
{/* <FilterBar
dropdownIconName="md-arrow-dropdown"
dropdownIconName="arrow-drop-down"
options={['ALL TRANSACTIONS', 'VOTES', 'REPLIES']}
defaultText="ALL TRANSACTIONS"
onDropdownSelect={() => this._handleOnDropdownSelect()}

30
src/navigation/baseNavigator.js
View File

@ -19,11 +19,11 @@ const BaseNavigator = createBottomTabNavigator(
navigationOptions: () => ({
tabBarIcon: ({ tintColor }) => (
<Icon
iconType="FontAwesome"
style={{ padding: 20 }}
name="list"
iconType="MaterialIcons"
style={{ padding: 15 }}
name="menu"
color={tintColor}
size={20}
size={26}
/>
),
}),
@ -35,11 +35,11 @@ const BaseNavigator = createBottomTabNavigator(
<IconContainer
isBadge
badgeType="notification"
iconType="FontAwesome"
name="bell-o"
iconType="MaterialIcons"
name="notifications"
color={tintColor}
size={20}
style={{ padding: 20 }}
size={26}
style={{ padding: 15 }}
/>
),
}),
@ -55,11 +55,11 @@ const BaseNavigator = createBottomTabNavigator(
navigationOptions: () => ({
tabBarIcon: ({ tintColor }) => (
<Icon
iconType="FontAwesome"
style={{ padding: 20 }}
name="envelope-o"
iconType="MaterialIcons"
style={{ padding: 15 }}
name="mail-outline"
color={tintColor}
size={20}
size={26}
/>
),
}),
@ -69,11 +69,11 @@ const BaseNavigator = createBottomTabNavigator(
navigationOptions: () => ({
tabBarIcon: ({ tintColor }) => (
<Icon
iconType="FontAwesome"
style={{ padding: 20 }}
iconType="MaterialIcons"
style={{ padding: 15 }}
name="credit-card"
color={tintColor}
size={20}
size={26}
/>
),
}),

2
src/screens/home/screen/homeScreen.js
View File

@ -23,7 +23,7 @@ class HomeScreen extends PureComponent {
currentAccount, intl, isLoggedIn, isLoginDone,
} = this.props;
const _filterOptions = [
'FEED',
'NEW POSTS',
'TRENDING',
'HOT',
'NEW',

4
src/screens/home/screen/homeStyles.js
View File

@ -19,6 +19,10 @@ export default EStyleSheet.create({
alignSelf: 'center',
height: 40,
backgroundColor: '$primaryBackgroundColor',
shadowOpacity: 0.2,
shadowColor: '$shadowColor',
shadowOffset: { height: 4 },
zIndex: 99,
},
tabbarItem: {
flex: 1,

26
src/screens/login/screen/loginScreen.js
View File

@ -24,7 +24,6 @@ import { MainButton } from '../../../components/mainButton';
import { Modal } from '../../../components';
import { TabBar } from '../../../components/tabBar';
import { TextButton } from '../../../components/buttons';
import STEEM_CONNECT_LOGO from '../../../assets/steem_connect.png';
import SteemConnect from '../../steem-connect/steemConnect';
// Constants
@ -32,6 +31,7 @@ import { default as ROUTES } from '../../../constants/routeNames';
// Styles
import styles from './loginStyles';
import STEEM_CONNECT_LOGO from '../../../assets/steem_connect.png';
class LoginScreen extends PureComponent {
constructor(props) {
@ -87,16 +87,20 @@ class LoginScreen extends PureComponent {
Linking.openURL('https://signup.steemit.com/?ref=esteem').catch(err => alert('An error occurred', err));
};
_handleOnModalToggle = () => {
const { isModalOpen } = this.state;
this.setState({ isModalOpen: !isModalOpen });
}
};
render() {
const { navigation, intl, setPinCodeState } = this.props;
const {
isLoading, username, isUsernameValid, keyboardIsOpen, password, isModalOpen,
isLoading,
username,
isUsernameValid,
keyboardIsOpen,
password,
isModalOpen,
} = this.state;
return (
@ -141,8 +145,9 @@ class LoginScreen extends PureComponent {
contentContainerStyle={{ flexGrow: 1 }}
>
<FormInput
rightIconName="md-at"
leftIconName="md-close-circle"
rightIconName="at"
leftIconName="close"
iconType="MaterialCommunityIcons"
isValid={isUsernameValid}
onChange={value => this._handleUsernameChange(value)}
placeholder={intl.formatMessage({
@ -154,8 +159,8 @@ class LoginScreen extends PureComponent {
value={username}
/>
<FormInput
rightIconName="md-lock"
leftIconName="md-close-circle"
rightIconName="lock"
leftIconName="close"
isValid={isUsernameValid}
onChange={value => this._handleOnPasswordChange(value)}
placeholder={intl.formatMessage({
@ -217,7 +222,10 @@ class LoginScreen extends PureComponent {
handleOnModalClose={this._handleOnModalToggle}
title="Steemconnect Login"
>
<SteemConnect handleOnModalClose={this._handleOnModalToggle} setPinCodeState={setPinCodeState} />
<SteemConnect
handleOnModalClose={this._handleOnModalToggle}
setPinCodeState={setPinCodeState}
/>
</Modal>
</View>
);

2
src/screens/voters/screen/votersScreen.js
View File

@ -82,7 +82,7 @@ class VotersScreen extends PureComponent {
handleOnSearch={this._handleSearch}
/>
<FilterBar
dropdownIconName="md-arrow-dropdown"
dropdownIconName="arrow-drop-down"
options={['REWARDS', 'PERCENT', 'TIME']}
defaultText="REWARDS"
onDropdownSelect={this._handleOnDropdownSelect}

8
src/themes/darkTheme.js
View File

@ -16,20 +16,24 @@ export default {
$primaryLightGray: '#f6f6f6',
$primaryRed: '#e63535',
$primaryBlack: '#c1c5c7',
$primaryDarkText: '#526d91',
// General Colors
$borderColor: '#c5c5c5',
$tagColor: '#2e3d51',
$bubblesBlue: '#5CCDFF',
$borderTopColor: '#757575',
$iconColor: '#c1c5c7',
$iconColor: '#788187',
$dangerColor: '#fff',
$warningColor: '#fff',
$successColor: '#fff',
$disableButton: '#fff',
$shadowColor: '#b0b0b0',
$shadowColor: '#80000000',
$disableGray: '#fff',
$editorButtonColor: '#fff',
$pureWhite: '#ffffff',
$notificationBorder: '#1e2835',
// Devices Sizes
$deviceHeight: Dimensions.get('window').height,
$deviceWidth: Dimensions.get('window').width,

4
src/themes/lightTheme.js
View File

@ -16,9 +16,10 @@ export default {
$primaryLightGray: '#f6f6f6',
$primaryRed: '#e63535',
$primaryBlack: '#3c4449',
$primaryDarkText: '#788187',
// General Colors
$borderColor: '#c5c5c5',
$tagColor: '#c1c5c7',
$bubblesBlue: '#5CCDFF',
$iconColor: '#c1c5c7',
$borderTopColor: '#cfcfcf',
@ -30,6 +31,7 @@ export default {
$disableGray: '#fff',
$editorButtonColor: '#3c4449',
$pureWhite: '#ffffff',
$notificationBorder: '#fff',
// Devices Sizes
$deviceHeight: Dimensions.get('window').height,

2
src/utils/postParser.js
View File

@ -19,7 +19,7 @@ export const parsePost = (post, currentUserName) => {
post.author_reputation = getReputation(post.author_reputation);
post.avatar = `https://steemitimages.com/u/${post.author}/avatar/small`;
post.body = markDown2Html(post.body);
post.summary = getPostSummary(post.body, 100);
post.summary = getPostSummary(post.body, 150);
post.raw_body = post.body;
post.active_votes.sort((a, b) => b.rshares - a.rshares);
const totalPayout = parseFloat(post.pending_payout_value)