From 85d7250afeca8b3a7b90a6237867b45404a7efa0 Mon Sep 17 00:00:00 2001 From: Mustafa Buyukcelebi Date: Sun, 16 Dec 2018 18:34:23 +0300 Subject: [PATCH 1/3] Fixed #184 --- ...agePickerController-QBImagePicker.xcscheme | 33 ++-- .../xcschemes/xcschememanagement.plist | 37 ++++ .../xcschemes/xcschememanagement.plist | 14 ++ .../UserInterfaceState.xcuserstate | Bin 19986 -> 20517 bytes .../xcschemes/xcschememanagement.plist | 19 ++ .../container/postButtonContainer.js | 5 +- .../postButton/view/postButtonView.js | 10 +- .../postButton/view/postButtonsForAndroid.js | 179 ++++++++++++++++++ src/screens/root/container/rootContainer.js | 4 +- 9 files changed, 281 insertions(+), 20 deletions(-) create mode 100644 ios/eSteem.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 src/components/postButton/view/postButtonsForAndroid.js diff --git a/ios/Pods/Pods.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/QBImagePickerController-QBImagePicker.xcscheme b/ios/Pods/Pods.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/QBImagePickerController-QBImagePicker.xcscheme index 04cbcd5a9..53d84600d 100644 --- a/ios/Pods/Pods.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/QBImagePickerController-QBImagePicker.xcscheme +++ b/ios/Pods/Pods.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/QBImagePickerController-QBImagePicker.xcscheme @@ -7,30 +7,33 @@ buildImplicitDependencies = "YES"> + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + ReferencedContainer = "container:Pods.xcodeproj"> + shouldUseLaunchSchemeArgsEnv = "YES"> + + + + + + + debugDocumentVersioning = "YES"> diff --git a/ios/Pods/Pods.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/Pods/Pods.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist index 540c7144d..15b36d954 100644 --- a/ios/Pods/Pods.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/ios/Pods/Pods.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist @@ -8,56 +8,93 @@ isShown + orderHint + 0 + + FLAnimatedImage.xcscheme_^#shared#^_ + + orderHint + 65 Folly.xcscheme isShown + orderHint + 4 Pods-eSteem-tvOS.xcscheme isShown + orderHint + 8 Pods-eSteem-tvOSTests.xcscheme isShown + orderHint + 9 Pods-eSteem.xcscheme isShown + orderHint + 7 Pods-eSteemTests.xcscheme isShown + orderHint + 10 QBImagePickerController-QBImagePicker.xcscheme isShown + orderHint + 12 QBImagePickerController.xcscheme isShown + orderHint + 11 RNImageCropPicker.xcscheme isShown + orderHint + 16 RSKImageCropper.xcscheme isShown + orderHint + 17 + + SDWebImage.xcscheme_^#shared#^_ + + orderHint + 67 glog.xcscheme isShown + orderHint + 6 + + react-native-fast-image.xcscheme_^#shared#^_ + + orderHint + 66 SuppressBuildableAutocreation diff --git a/ios/eSteem.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/eSteem.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 000000000..6da404b1c --- /dev/null +++ b/ios/eSteem.xcodeproj/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + eSteem-tvOS.xcscheme_^#shared#^_ + + orderHint + 3 + + + + diff --git a/ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/UserInterfaceState.xcuserstate b/ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/UserInterfaceState.xcuserstate index edce061094428602aea2fa660faa589358676f5e..308c3f67adaf1ecdf1985385296a219be17b7848 100644 GIT binary patch delta 8765 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

{bao8Q8Xdf*2Tr0gb4Haf}~{H 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 Xyd9VqOE_6WJ^B*77yEAf3@rFR2+m8l diff --git a/ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 000000000..6201433a5 --- /dev/null +++ b/ios/eSteem.xcworkspace/xcuserdata/mistik.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,19 @@ + + + + + SchemeUserState + + eSteem-tvOS.xcscheme_^#shared#^_ + + orderHint + 2 + + eSteem.xcscheme_^#shared#^_ + + orderHint + 1 + + + + diff --git a/src/components/postButton/container/postButtonContainer.js b/src/components/postButton/container/postButtonContainer.js index b5d33c53d..a5636d616 100644 --- a/src/components/postButton/container/postButtonContainer.js +++ b/src/components/postButton/container/postButtonContainer.js @@ -31,10 +31,7 @@ class PostButtonContainer extends Component { _handleButtonCollapse = (status) => { const { dispatch, isCollapsePostButtonOpen } = this.props; - - if (isCollapsePostButtonOpen !== status) { - dispatch(isCollapsePostButton(status)); - } + dispatch(isCollapsePostButton(!isCollapsePostButtonOpen)); }; render() { diff --git a/src/components/postButton/view/postButtonView.js b/src/components/postButton/view/postButtonView.js index dc1fd1162..e062f7717 100644 --- a/src/components/postButton/view/postButtonView.js +++ b/src/components/postButton/view/postButtonView.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { - Animated, Easing, TouchableOpacity, View, + Animated, Easing, TouchableOpacity, View, Platform, } from 'react-native'; import { Icon } from '../../icon'; @@ -116,8 +116,7 @@ class PostButtonView extends Component { outputRange: ['0deg', '45deg'], }); - const { handleSubButtonPress } = this.props; - + const { handleSubButtonPress, handleButtonCollapse } = this.props; return ( handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'image')} /> - this._toggleView()} activeOpacity={1}> + (Platform.OS === 'ios' ? this._toggleView() : handleButtonCollapse())} + activeOpacity={1} + > { + const { isCollapse } = this.state; + + if (this.mode._value) { + Animated.parallel( + [this.mode, this.icon1, this.icon2, this.icon3].map(item => Animated.timing(item, { + toValue: 0, + duration: durationIn, + easing: Easing.cubic, + })), + ).start(); + } else { + Animated.parallel([ + Animated.timing(this.mode, { + toValue: 1, + duration: durationOut, + easing: Easing.cubic, + }), + Animated.sequence([ + ...[this.icon1, this.icon2, this.icon3].map(item => Animated.timing(item, { + toValue: 1, + duration: durationOut, + easing: Easing.elastic(1), + })), + ]), + ]).start(); + } + + this.setState({ isCollapse: !isCollapse }); + this._handleButtonCollapse(!isCollapse); + }; + + _handleButtonCollapse = (status) => { + const { dispatch, isCollapsePostButtonOpen } = this.props; + + if (isCollapsePostButtonOpen !== status) { + dispatch(isCollapsePostButton(status)); + } + }; + + _handleSubButtonPress = (route, action) => { + const { navigation } = this.props; + + navigation.navigate({ + routeName: route, + params: { + action, + }, + }); + + // navigation.navigate(route); + }; + + render() { + const firstX = this.icon1.interpolate({ + inputRange: [0, 1], + outputRange: [0, -50], + }); + const firstY = this.icon1.interpolate({ + inputRange: [0, 1], + outputRange: [0, -70], + }); + const secondX = this.icon2.interpolate({ + inputRange: [0, 1], + outputRange: [0, 0], + }); + const secondY = this.icon2.interpolate({ + inputRange: [0, 1], + outputRange: [0, -95], + }); + const thirdX = this.icon3.interpolate({ + inputRange: [0, 1], + outputRange: [0, 50], + }); + const thirdY = this.icon3.interpolate({ + inputRange: [0, 1], + outputRange: [0, -70], + }); + + return ( + + this._handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'camera')} + /> + this._handleSubButtonPress(ROUTES.SCREENS.EDITOR)} + /> + this._handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'image')} + /> + + ); + } +} + +const mapStateToProps = state => ({ + routes: state.nav.routes, + isCollapsePostButtonOpen: state.ui.isCollapsePostButton, +}); + +export default connect(mapStateToProps)(withNavigation(PostButtonsForAndroid)); diff --git a/src/screens/root/container/rootContainer.js b/src/screens/root/container/rootContainer.js index 152d8889a..d53335a92 100644 --- a/src/screens/root/container/rootContainer.js +++ b/src/screens/root/container/rootContainer.js @@ -1,5 +1,5 @@ import React, { Component, Fragment } from 'react'; -import { AppState } from 'react-native'; +import { AppState, Platform } from 'react-native'; import { connect } from 'react-redux'; import Push from 'appcenter-push'; @@ -10,6 +10,7 @@ import { getExistUser } from '../../../realm/realm'; // Components import { Modal } from '../../../components'; import { PinCode } from '../..'; +import PostButtonForAndroid from '../../../components/postButton/view/postButtonsForAndroid'; // Constants import ROUTES from '../../../constants/routeNames'; @@ -108,6 +109,7 @@ const RootContainer = () => (WrappedComponent) => { {...wrappedComponentStates} setPinCodeState={this._setPinCodeState} /> + {Platform.OS === 'android' && } ); } From 01c5250efc48f2ed5ed42432dcbaf1f0b0b09e78 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 16 Dec 2018 19:35:39 +0200 Subject: [PATCH 2/3] upd --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2e7364dad..a75a2c118 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ### eSteem Mobile -iOS ![iOS](https://build.appcenter.ms/v0.1/apps/fc3725c3-719b-4081-8c1b-e65921f76aba/branches/master/badge) - Android ![Android](https://build.appcenter.ms/v0.1/apps/3df3ec7f-c9a2-457b-b132-94dbd7db99db/branches/master/badge) +iOS ![iOS](https://build.appcenter.ms/v0.1/apps/ef80aa2a-d4e1-4f43-a4f8-be12ea72ba9b/branches/master/badge) + Android ![Android](https://build.appcenter.ms/v0.1/apps/12aace32-b58a-49da-bf85-5477f89ae16e/branches/master/badge)) ### I. How do I get set up? From f18083ac94d67ed884a3c658e0755c8f3d783afe Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 16 Dec 2018 19:35:56 +0200 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a75a2c118..a8c59deb3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ### eSteem Mobile iOS ![iOS](https://build.appcenter.ms/v0.1/apps/ef80aa2a-d4e1-4f43-a4f8-be12ea72ba9b/branches/master/badge) - Android ![Android](https://build.appcenter.ms/v0.1/apps/12aace32-b58a-49da-bf85-5477f89ae16e/branches/master/badge)) + Android ![Android](https://build.appcenter.ms/v0.1/apps/12aace32-b58a-49da-bf85-5477f89ae16e/branches/master/badge) ### I. How do I get set up?