mirror of
https://github.com/ecency/ecency-mobile.git
synced 2024-12-24 13:53:23 +03:00
Merge branch 'development' of github.com:esteemapp/esteem-mobile into bugfix/wallet-to-profile
This commit is contained in:
commit
cf9b451c9b
@ -6,7 +6,7 @@ export default EStyleSheet.create({
|
||||
borderTopRightRadius: 8,
|
||||
marginTop: 16,
|
||||
flexDirection: 'row',
|
||||
backgroundColor: '$primaryGray',
|
||||
backgroundColor: '$primaryLightBackground',
|
||||
height: 60,
|
||||
borderBottomWidth: 2,
|
||||
},
|
||||
|
@ -5,6 +5,7 @@ import FastImage from 'react-native-fast-image';
|
||||
// Components
|
||||
import { TextInput } from '../../textInput';
|
||||
import { Icon } from '../../icon';
|
||||
import { ThemeContainer } from '../../../containers';
|
||||
|
||||
// Utils
|
||||
import { getResizedAvatar } from '../../../utils/image';
|
||||
@ -68,6 +69,7 @@ class FormInputView extends Component {
|
||||
height,
|
||||
inputStyle,
|
||||
} = this.props;
|
||||
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
@ -95,6 +97,8 @@ class FormInputView extends Component {
|
||||
)
|
||||
)}
|
||||
<View style={styles.textInput}>
|
||||
<ThemeContainer>
|
||||
{({ isDarkTheme }) => (
|
||||
<TextInput
|
||||
style={inputStyle}
|
||||
onFocus={() => this.setState({ inputBorderColor: '#357ce6' })}
|
||||
@ -107,7 +111,10 @@ class FormInputView extends Component {
|
||||
textContentType={type}
|
||||
onChangeText={this._handleOnChange}
|
||||
value={value}
|
||||
placeholderTextColor={isDarkTheme ? '#526d91' : '#788187'}
|
||||
/>
|
||||
)}
|
||||
</ThemeContainer>
|
||||
</View>
|
||||
|
||||
{value && value.length > 0 ? (
|
||||
|
@ -24,7 +24,7 @@ export default EStyleSheet.create({
|
||||
},
|
||||
buttonWithoutBorder: {
|
||||
borderWidth: 0,
|
||||
backgroundColor: '$primaryWhiteLightBackground',
|
||||
backgroundColor: 'transparent',
|
||||
width: '$deviceWidth / 7',
|
||||
height: '$deviceWidth / 7',
|
||||
alignItems: 'center',
|
||||
|
@ -1,10 +1,10 @@
|
||||
import React, { PureComponent } from 'react';
|
||||
import React, { Component } from 'react';
|
||||
import { Animated, Easing, View } from 'react-native';
|
||||
|
||||
// Styles
|
||||
import styles from './pinAnimatedInputStyles';
|
||||
|
||||
class PinAnimatedInput extends PureComponent {
|
||||
class PinAnimatedInput extends Component {
|
||||
/* Props
|
||||
*
|
||||
* @prop { string } pin - Description.
|
||||
|
@ -31,7 +31,7 @@ const VotersDisplayView = ({ votes, navigation }) => {
|
||||
const _renderItem = (item, index) => {
|
||||
const value = `$ ${item.value}`;
|
||||
const percent = `${item.percent}%`;
|
||||
console.log(item);
|
||||
|
||||
return (
|
||||
<UserListItem
|
||||
index={index}
|
||||
|
@ -119,6 +119,7 @@ class LoginScreen extends PureComponent {
|
||||
type="username"
|
||||
isFirstImage
|
||||
value={username}
|
||||
inputStyle={styles.input}
|
||||
/>
|
||||
<FormInput
|
||||
rightIconName="lock"
|
||||
@ -131,6 +132,7 @@ class LoginScreen extends PureComponent {
|
||||
isEditable
|
||||
secureTextEntry
|
||||
type="password"
|
||||
inputStyle={styles.input}
|
||||
/>
|
||||
<InformationArea
|
||||
description={intl.formatMessage({
|
||||
|
@ -39,4 +39,7 @@ export default EStyleSheet.create({
|
||||
marginHorizontal: 30,
|
||||
marginVertical: 10,
|
||||
},
|
||||
input: {
|
||||
color: '$primaryDarkText',
|
||||
},
|
||||
});
|
||||
|
@ -25,13 +25,14 @@ export const parsePost = async (post, currentUserName, isPromoted) => {
|
||||
if (!post) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const activeVotes = await getActiveVotes(get(post, 'author'), get(post, 'permlink'));
|
||||
if (currentUserName === post.author) {
|
||||
post.markdownBody = post.body;
|
||||
}
|
||||
post.is_promoted = isPromoted;
|
||||
post.json_metadata = JSON.parse(post.json_metadata);
|
||||
post.image = postImage(post.json_metadata, post.body);
|
||||
post.active_votes = activeVotes;
|
||||
post.vote_count = post.active_votes.length;
|
||||
post.author_reputation = getReputation(post.author_reputation);
|
||||
post.avatar = getResizedAvatar(get(post, 'author'));
|
||||
|
Loading…
Reference in New Issue
Block a user