mirror of
https://github.com/ecency/ecency-mobile.git
synced 2024-12-17 18:31:36 +03:00
Merge pull request #2067 from ecency/nt/profile-modal-tweaks
Nt/profile modal tweaks
This commit is contained in:
commit
8ebefc0d8f
@ -78,7 +78,7 @@
|
||||
"react": "16.13.1",
|
||||
"react-intl": "^3.9.2",
|
||||
"react-native": "0.63.4",
|
||||
"react-native-actions-sheet": "^0.5.4",
|
||||
"react-native-actions-sheet": "^0.4.2",
|
||||
"react-native-actionsheet": "ecency/react-native-actionsheet",
|
||||
"react-native-animatable": "^1.3.3",
|
||||
"react-native-autoheight-webview": "^1.5.8",
|
||||
|
@ -72,7 +72,7 @@ const AccountsBottomSheet = forwardRef(
|
||||
onMomentumScrollEnd={() => bottomSheetModalRef.current?.handleChildScrollEnd()}
|
||||
/>
|
||||
<Separator style={styles.separator} />
|
||||
<View style={{ paddingBottom: insets.bottom }}>
|
||||
<View style={{ paddingBottom: insets.bottom + 16 }}>
|
||||
<TouchableWithoutFeedback
|
||||
style={styles.button}
|
||||
onPress={() => navigateToRoute(ROUTES.SCREENS.REGISTER)}
|
||||
|
@ -15,8 +15,8 @@ interface ActionPanelProps {
|
||||
export const ActionPanel = ({isFollowing, isFavourite, onFavouritePress, onFollowPress}: ActionPanelProps) => {
|
||||
|
||||
const heartColor = isFavourite
|
||||
? '$primaryRed'
|
||||
: '$primaryDarkGray'
|
||||
? '$primaryBlue'
|
||||
: '$iconColor'
|
||||
|
||||
const followIcon = isFollowing
|
||||
? 'user-check'
|
||||
@ -28,7 +28,7 @@ export const ActionPanel = ({isFollowing, isFavourite, onFavouritePress, onFollo
|
||||
iconType='FontAwesome5'
|
||||
name={followIcon}
|
||||
size={20}
|
||||
color={EStyleSheet.value('$primaryDarkGray')}
|
||||
color={EStyleSheet.value('$iconColor')}
|
||||
disabled={isFollowing}
|
||||
onPress={onFollowPress}
|
||||
/>
|
||||
|
@ -53,7 +53,7 @@ export const ProfileBasic = ({avatarUrl, username, about, votingPower, isLoading
|
||||
</View>
|
||||
|
||||
<Text style={styles.title}>{`@${username}`}</Text>
|
||||
<Text style={styles.bodyText} numberOfLines={2} >{about}</Text>
|
||||
{!!about && <Text style={styles.bodyText} numberOfLines={2} >{about}</Text>}
|
||||
<Text style={styles.bodyText}>{joinedString}</Text>
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
|
@ -226,14 +226,14 @@ export const QuickProfileContent = ({
|
||||
|
||||
|
||||
const statsData1 = [
|
||||
{label:'Follower', value:_followerCount},
|
||||
{label:'Following', value:_followingCount},
|
||||
{label:'Posts', value:_postCount},
|
||||
{label:intl.formatMessage({id:'profile.follower'}), value:_followerCount},
|
||||
{label:intl.formatMessage({id:'profile.following'}), value:_followingCount},
|
||||
{label:intl.formatMessage({id:'profile.post'}), value:_postCount},
|
||||
] as StatsData[]
|
||||
|
||||
const statsData2 = [
|
||||
{label:'Resource Credits', value:_resourceCredits, suffix:'%'},
|
||||
{label:'Reputation', value:_reputation},
|
||||
{label:intl.formatMessage({id:'profile.resource_credits'}), value:_resourceCredits, suffix:'%'},
|
||||
{label:intl.formatMessage({id:'profile.reputation'}), value:_reputation},
|
||||
] as StatsData[]
|
||||
|
||||
return (
|
||||
@ -256,7 +256,7 @@ export const QuickProfileContent = ({
|
||||
/>
|
||||
<MainButton
|
||||
style={styles.button}
|
||||
text='VIEW FULL PROFILE'
|
||||
text={intl.formatMessage({id:'profile.view_full'})}
|
||||
onPress={_openFullProfile}
|
||||
/>
|
||||
{isLoggedIn && (
|
||||
|
@ -1,5 +1,6 @@
|
||||
import { TextStyle, ViewStyle, ImageStyle } from 'react-native';
|
||||
import EStyleSheet from 'react-native-extended-stylesheet';
|
||||
import { getBottomSpace } from 'react-native-iphone-x-helper';
|
||||
|
||||
export default EStyleSheet.create({
|
||||
modalStyle: {
|
||||
@ -7,6 +8,7 @@ export default EStyleSheet.create({
|
||||
margin:0,
|
||||
paddingTop:32,
|
||||
marginHorizontal:24,
|
||||
paddingBottom: getBottomSpace() + 8,
|
||||
},
|
||||
|
||||
sheetContent: {
|
||||
@ -53,7 +55,7 @@ export default EStyleSheet.create({
|
||||
alignSelf: 'center',
|
||||
textAlign: 'center',
|
||||
fontSize: 16,
|
||||
fontWeight: 'bold',
|
||||
fontWeight: 'normal',
|
||||
} as TextStyle,
|
||||
|
||||
|
||||
@ -62,10 +64,10 @@ export default EStyleSheet.create({
|
||||
alignSelf: 'center',
|
||||
textAlign: 'center',
|
||||
fontSize: 18,
|
||||
fontWeight: '500',
|
||||
marginTop:6,
|
||||
} as TextStyle,
|
||||
|
||||
|
||||
btnText:{
|
||||
color:'$pureWhite'
|
||||
} as TextStyle,
|
||||
|
@ -175,6 +175,9 @@
|
||||
"hive_dollars": "Hive Dollars",
|
||||
"savings": "Savings",
|
||||
"joined": "Joined {time} ago",
|
||||
"view_full":"VIEW FULL PROFILE",
|
||||
"resource_credits":"Resource Credits",
|
||||
"reputation":"Reputation",
|
||||
"edit": {
|
||||
"display_name": "Display Name",
|
||||
"about": "About",
|
||||
|
@ -8686,10 +8686,10 @@ react-lifecycles-compat@^3.0.4:
|
||||
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
|
||||
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
|
||||
|
||||
react-native-actions-sheet@^0.5.4:
|
||||
version "0.5.4"
|
||||
resolved "https://registry.yarnpkg.com/react-native-actions-sheet/-/react-native-actions-sheet-0.5.4.tgz#e2aae80f4791772cb5f8426a2bfe2e1154eb62b9"
|
||||
integrity sha512-7l+6+kRM5+HC6GlkEqfqvoSLcB29i1IQV40tbohRwe4GKhzlN1h0TmtPHwxw009LpH4b9TYXzM/7z/1t5JsilA==
|
||||
react-native-actions-sheet@^0.4.2:
|
||||
version "0.4.9"
|
||||
resolved "https://registry.yarnpkg.com/react-native-actions-sheet/-/react-native-actions-sheet-0.4.9.tgz#2446f97eca4cc3674128c445665b1f8774a5d64a"
|
||||
integrity sha512-4FuybHH+psq738w/6OIfdUEL4/5pG43yH+C0YeX22jQo0tYppqxVqQr3ITiXHF2PDJtdIiV7egy8Xncuuw5n9w==
|
||||
|
||||
react-native-actionsheet@ecency/react-native-actionsheet:
|
||||
version "2.4.2"
|
||||
|
Loading…
Reference in New Issue
Block a user