diff --git a/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.debug.xcconfig b/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.debug.xcconfig index 0695013b2..d39c7d90b 100644 --- a/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.debug.xcconfig +++ b/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.debug.xcconfig @@ -9,3 +9,4 @@ PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods +USER_HEADER_SEARCH_PATHS = $(inherited) $(SRCROOT)/FLAnimatedImage/FLAnimatedImage diff --git a/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.release.xcconfig b/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.release.xcconfig index 0695013b2..d39c7d90b 100644 --- a/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.release.xcconfig +++ b/ios/Pods/Target Support Files/Pods-esteem/Pods-esteem.release.xcconfig @@ -9,3 +9,4 @@ PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods +USER_HEADER_SEARCH_PATHS = $(inherited) $(SRCROOT)/FLAnimatedImage/FLAnimatedImage diff --git a/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.debug.xcconfig b/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.debug.xcconfig index 1a1659871..e629a3239 100644 --- a/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.debug.xcconfig +++ b/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.debug.xcconfig @@ -8,3 +8,4 @@ PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods +USER_HEADER_SEARCH_PATHS = $(inherited) $(SRCROOT)/FLAnimatedImage/FLAnimatedImage diff --git a/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.release.xcconfig b/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.release.xcconfig index 1a1659871..e629a3239 100644 --- a/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.release.xcconfig +++ b/ios/Pods/Target Support Files/Pods-esteemTests/Pods-esteemTests.release.xcconfig @@ -8,3 +8,4 @@ PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods +USER_HEADER_SEARCH_PATHS = $(inherited) $(SRCROOT)/FLAnimatedImage/FLAnimatedImage diff --git a/src/components/comment/view/commentView.js b/src/components/comment/view/commentView.js index ab280a0da..adc05bc87 100644 --- a/src/components/comment/view/commentView.js +++ b/src/components/comment/view/commentView.js @@ -112,7 +112,7 @@ class CommentView extends PureComponent { /> (this.ActionSheet = o)} - options={['Reblog', intl.formatMessage({ id: 'alert.cancel' })]} + options={[intl.formatMessage({ id: 'alert.delete' }), intl.formatMessage({ id: 'alert.cancel' })]} title={intl.formatMessage({ id: 'alert.delete' })} destructiveButtonIndex={0} cancelButtonIndex={1} diff --git a/src/components/points/view/pointsStyles.js b/src/components/points/view/pointsStyles.js index d428a1108..918fddb73 100644 --- a/src/components/points/view/pointsStyles.js +++ b/src/components/points/view/pointsStyles.js @@ -17,11 +17,15 @@ export default EStyleSheet.create({ marginTop: 5, }, iconsWrapper: { - marginVertical: 32, + marginVertical: 24, + marginHorizontal: 32, justifyContent: 'center', alignSelf: 'center', flexDirection: 'row', }, + iconsList: { + height: 55, + }, iconWrapper: { marginHorizontal: 16, width: 36, @@ -32,7 +36,7 @@ export default EStyleSheet.create({ alignItems: 'center', }, iconButton: { - marginTop: 3, + marginTop: 1, marginLeft: 1, }, activeIconWrapper: { @@ -97,4 +101,5 @@ export default EStyleSheet.create({ scrollContainer: { flex: 1, }, + }); diff --git a/src/components/points/view/pointsView.js b/src/components/points/view/pointsView.js index 17968c94b..c3bf6fc6e 100644 --- a/src/components/points/view/pointsView.js +++ b/src/components/points/view/pointsView.js @@ -13,6 +13,9 @@ import { MainButton } from '../../mainButton'; // Utils import { getTimeFromNow } from '../../../utils/time'; +// Constants +import POINTS, { POINTS_KEYS } from '../../../constants/options/points'; + // Styles import styles from './pointsStyles'; @@ -83,51 +86,28 @@ class PointsView extends Component { } - - - - - {intl.formatMessage({ id: 'points.post' })} - - - - - - {intl.formatMessage({ id: 'points.comment' })} - - - - - - {intl.formatMessage({ id: 'points.checkin' })} - + ( + + + + + {intl.formatMessage({ id: POINTS[item.type].nameKey })} + + )} + /> diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 263518648..21ee85099 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -35,14 +35,25 @@ "post": "Post", "comment": "Comment", "checkin": "Checki-in", + "vote": "Vote", + "reblog": "Reblog", + "login": "Login", + "checkin_extra": "Bonus", "post_title": "Points for post", "comment_title": "Points for comment", "vote_title": "Points for vote", "reblog_title": "Points for reblog", - "login_title": "Points for login", + "login_title": "Points for login", "checkin_title": "Points for usage", "checkin_extra_title": "Usage bonus", - "no_activity": "No activity here!" + "no_activity": "No activity here!", + "post_desc": "You can earn point by posting regularly. Posting gives you 15 points.", + "comment_desc": "Each comment you make helps you to grow your audience and make friendship but also earns you 5 points.", + "checkin_desc": "Checking in on eSteem app gives you 0.25 points and helps you stay connected with your friends and community.", + "vote_desc": "By voting you give reward to other creators and show your appreciation but also earn 0.01 x vote weight points.", + "reblog_desc": " Share what post you like with your friends and earn 1 points.", + "login_desc": "When you login into eSteem app you are entitled to earn 100 points automatically.", + "checkin_extra_desc": "Consistent use of app gives you extra chances to earn more 10 points, be more active and earn more." }, "messages": { "comingsoon": "Messages feature is coming soon!" diff --git a/src/constants/options/points.js b/src/constants/options/points.js index 3b4d16000..f89f74e3b 100644 --- a/src/constants/options/points.js +++ b/src/constants/options/points.js @@ -1,38 +1,82 @@ export default { 100: { - icon: 'post', - textKey: 'points.post_title', - iconType: 'MaterialIcons', + icon: 'pencil', + textKey: 'points.post_title', + nameKey: 'points.post', + descriptionKey: 'points.post_desc', + iconType: 'MaterialCommunityIcons', + point: 15, }, 110: { - icon: 'comment', + icon: 'comment-text-outline', textKey: 'points.comment_title', - iconType: 'MaterialIcons', + nameKey: 'points.comment', + descriptionKey: 'points.comment_desc', + iconType: 'MaterialCommunityIcons', + point: 5, }, 120: { icon: 'upcircle', textKey: 'points.vote_title', + nameKey: 'points.vote', + descriptionKey: 'points.vote_desc', iconType: 'AntDesign', + point: 0.1, }, 130: { icon: 'repeat', textKey: 'points.reblog_title', + nameKey: 'points.reblog', + descriptionKey: 'points.reblog_desc', iconType: 'MaterialIcons', + point: 1, }, 10: { - icon: 'check-circle', + icon: 'ticket', textKey: 'points.checkin_title', + nameKey: 'points.checkin', + descriptionKey: 'points.checkin_desc', iconType: 'MaterialCommunityIcons', + point: 0.2, }, 20: { icon: 'person', textKey: 'points.login_title', + nameKey: 'points.login', + descriptionKey: 'points.login_desc', iconType: 'MaterialIcons', + point: 100, }, 30: { icon: 'check-decagram', textKey: 'points.checkin_extra_title', + nameKey: 'points.checkin_extra', + descriptionKey: 'points.checkin_extra_desc', iconType: 'MaterialCommunityIcons', - + point: 10, }, }; + +export const POINTS_KEYS = [ + { + type: 100, + }, + { + type: 110, + }, + { + type: 120, + }, + { + type: 130, + }, + { + type: 10, + }, + { + type: 20, + }, + { + type: 30, + }, +];