Dependencies update (#2576)
* Dependencies update * Fix WebView * Update to RN 0.58.5 and include the WebSocket fix * Update react-native-video * Fix RNFetchBlob
This commit is contained in:
Elias Nahum
GitHub
parent
f59533d144
commit
88f5848850
27 changed files with 6142 additions and 5179 deletions
2
Makefile
2
Makefile
|
|
@ -216,7 +216,7 @@ unsigned-ios: stop pre-build check-style ## Build an unsigned version of the iOS
|
|||
@echo "Building unsigned iOS app"
|
||||
@cd fastlane && NODE_ENV=production bundle exec fastlane ios unsigned
|
||||
@mkdir -p build-ios
|
||||
@cd ios/ && xcodebuild -workspace Mattermost.xcworkspace/ -scheme Mattermost -sdk iphoneos -configuration Relase -parallelizeTargets -resultBundlePath ../build-ios/result -derivedDataPath ../build-ios/ CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
|
||||
@cd ios/ && xcodebuild -workspace Mattermost.xcworkspace/ -scheme Mattermost -sdk iphoneos -configuration Release -parallelizeTargets -resultBundlePath ../build-ios/result -derivedDataPath ../build-ios/ CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
|
||||
@cd build-ios/ && mkdir -p Payload && cp -R Build/Products/Release-iphoneos/Mattermost.app Payload/ && zip -r Mattermost-unsigned.ipa Payload/
|
||||
@mv build-ios/Mattermost-unsigned.ipa .
|
||||
@rm -rf build-ios/
|
||||
|
|
|
|||
|
|
@ -109,6 +109,11 @@ android {
|
|||
compileSdkVersion rootProject.ext.compileSdkVersion
|
||||
buildToolsVersion rootProject.ext.buildToolsVersion
|
||||
|
||||
packagingOptions {
|
||||
pickFirst 'lib/x86_64/libjsc.so'
|
||||
pickFirst 'lib/arm64-v8a/libjsc.so'
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.mattermost.rnbeta"
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
|
|
@ -192,8 +197,8 @@ configurations.all {
|
|||
dependencies {
|
||||
implementation fileTree(dir: "libs", include: ["*.jar"])
|
||||
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
|
||||
implementation 'com.android.support:design:27.1.1'
|
||||
implementation 'com.android.support:percent:27.1.1'
|
||||
implementation 'com.android.support:design:28.0.0'
|
||||
implementation 'com.android.support:percent:28.0.0'
|
||||
implementation "com.facebook.react:react-native:+" // From node_modules
|
||||
implementation project(':react-native-document-picker')
|
||||
implementation project(':react-native-keychain')
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,6 +1,7 @@
|
|||
package com.mattermost.react_native_interface;
|
||||
|
||||
import com.facebook.react.bridge.Promise;
|
||||
import com.facebook.react.bridge.WritableMap;
|
||||
|
||||
/**
|
||||
* ResolvePromise: Helper class that abstracts boilerplate
|
||||
|
|
@ -16,16 +17,41 @@ public class ResolvePromise implements Promise {
|
|||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reject(String code, WritableMap map) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reject(String code, Throwable e) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reject(Throwable e, WritableMap map) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reject(String code, Throwable e, WritableMap map) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reject(String code, String message, Throwable e, WritableMap map) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reject(String code, String message, Throwable e) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reject(String code, String message, WritableMap map) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reject(String message) {
|
||||
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildscript {
|
||||
ext {
|
||||
buildToolsVersion = "27.0.3"
|
||||
buildToolsVersion = "28.0.3"
|
||||
minSdkVersion = 24
|
||||
compileSdkVersion = 27
|
||||
compileSdkVersion = 28
|
||||
targetSdkVersion = 26
|
||||
supportLibVersion = "27.1.1"
|
||||
supportLibVersion = "28.0.0"
|
||||
}
|
||||
repositories {
|
||||
jcenter()
|
||||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.1.4'
|
||||
classpath 'com.android.tools.build:gradle:3.3.1'
|
||||
classpath 'com.google.gms:google-services:3.2.0'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
|
|
@ -49,9 +49,3 @@ allprojects {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
task wrapper(type: Wrapper) {
|
||||
gradleVersion = '4.4'
|
||||
distributionUrl = distributionUrl.replace("bin", "all")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
|||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
|
||||
|
|
|
|||
|
|
@ -57,11 +57,11 @@ export function handleSuccessfulLogin() {
|
|||
url,
|
||||
token,
|
||||
},
|
||||
}, getState);
|
||||
});
|
||||
|
||||
if (config.DataRetentionEnableMessageDeletion && config.DataRetentionEnableMessageDeletion === 'true' &&
|
||||
license.IsLicensed === 'true' && license.DataRetention === 'true') {
|
||||
getDataRetentionPolicy()(dispatch, getState);
|
||||
dispatch(getDataRetentionPolicy());
|
||||
} else {
|
||||
dispatch({type: GeneralTypes.RECEIVED_DATA_RETENTION_POLICY, data: {}});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@ export default class ProfilePictureButton extends PureComponent {
|
|||
currentUser: PropTypes.object.isRequired,
|
||||
theme: PropTypes.object.isRequired,
|
||||
removeProfileImage: PropTypes.func,
|
||||
children: PropTypes.oneOfType([
|
||||
PropTypes.arrayOf(PropTypes.node),
|
||||
PropTypes.node,
|
||||
]),
|
||||
};
|
||||
|
||||
constructor(props) {
|
||||
|
|
@ -55,7 +59,7 @@ export default class ProfilePictureButton extends PureComponent {
|
|||
};
|
||||
}
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
render() {
|
||||
const {children, ...props} = this.props;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@ export default class ProgressiveImage extends PureComponent {
|
|||
defaultSource: PropTypes.oneOfType([PropTypes.object, PropTypes.number]), // this should be provided by the component
|
||||
filename: PropTypes.string,
|
||||
imageUri: PropTypes.string,
|
||||
onError: PropTypes.func,
|
||||
resizeMethod: PropTypes.string,
|
||||
resizeMode: PropTypes.string,
|
||||
style: CustomPropTypes.Style,
|
||||
theme: PropTypes.object.isRequired,
|
||||
thumbnailUri: PropTypes.string,
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ exports[`edit_profile should match snapshot 1`] = `
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -66,7 +66,7 @@ exports[`edit_profile should match snapshot 1`] = `
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ exports[`ReactionList should match snapshot 1`] = `
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -106,7 +106,7 @@ exports[`ReactionList should match snapshot 1`] = `
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -184,7 +184,7 @@ Array [
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -256,7 +256,7 @@ Array [
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ export default class SelectServer extends PureComponent {
|
|||
});
|
||||
|
||||
handleLoginOptions = (props = this.props) => {
|
||||
const {intl} = this.context;
|
||||
const {formatMessage} = this.context.intl;
|
||||
const {config, license} = props;
|
||||
const samlEnabled = config.EnableSaml === 'true' && license.IsLicensed === 'true' && license.SAML === 'true';
|
||||
const gitlabEnabled = config.EnableSignUpWithGitLab === 'true';
|
||||
|
|
@ -215,10 +215,10 @@ export default class SelectServer extends PureComponent {
|
|||
let title;
|
||||
if (options) {
|
||||
screen = 'LoginOptions';
|
||||
title = intl.formatMessage({id: 'mobile.routes.loginOptions', defaultMessage: 'Login Chooser'});
|
||||
title = formatMessage({id: 'mobile.routes.loginOptions', defaultMessage: 'Login Chooser'});
|
||||
} else {
|
||||
screen = 'Login';
|
||||
title = intl.formatMessage({id: 'mobile.routes.login', defaultMessage: 'Login'});
|
||||
title = formatMessage({id: 'mobile.routes.login', defaultMessage: 'Login'});
|
||||
}
|
||||
|
||||
this.props.actions.resetPing();
|
||||
|
|
@ -249,12 +249,12 @@ export default class SelectServer extends PureComponent {
|
|||
};
|
||||
|
||||
handleShowClientUpgrade = (upgradeType) => {
|
||||
const {intl} = this.context;
|
||||
const {formatMessage} = this.context.intl;
|
||||
const {theme} = this.props;
|
||||
|
||||
this.props.navigator.push({
|
||||
screen: 'ClientUpgrade',
|
||||
title: intl.formatMessage({id: 'mobile.client_upgrade', defaultMessage: 'Client Upgrade'}),
|
||||
title: formatMessage({id: 'mobile.client_upgrade', defaultMessage: 'Client Upgrade'}),
|
||||
backButtonTitle: '',
|
||||
navigatorStyle: {
|
||||
navBarHidden: LocalConfig.AutoSelectServerUrl,
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ class SSO extends PureComponent {
|
|||
renderLoading={this.renderLoading}
|
||||
injectedJavaScript={jsCode}
|
||||
onLoadEnd={this.onLoadEnd}
|
||||
onMessage={messagingEnabled && this.onMessage}
|
||||
onMessage={messagingEnabled ? this.onMessage : null}
|
||||
useWebKit={true}
|
||||
/>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -111,15 +111,15 @@ exports[`TermsOfService should enable/disable navigator buttons on setNavigatorB
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -132,7 +132,7 @@ exports[`TermsOfService should enable/disable navigator buttons on setNavigatorB
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -359,19 +359,19 @@ exports[`TermsOfService should enable/disable navigator buttons on setNavigatorB
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -384,7 +384,7 @@ exports[`TermsOfService should enable/disable navigator buttons on setNavigatorB
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -664,15 +664,15 @@ exports[`TermsOfService should match snapshot on enableNavigatorLogout 1`] = `
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -685,7 +685,7 @@ exports[`TermsOfService should match snapshot on enableNavigatorLogout 1`] = `
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ exports[`thread should match snapshot, has root post 1`] = `
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -73,7 +73,7 @@ exports[`thread should match snapshot, has root post 1`] = `
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -130,7 +130,7 @@ exports[`thread should match snapshot, render footer 1`] = `
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
@ -175,7 +175,7 @@ exports[`thread should match snapshot, render footer 2`] = `
|
|||
],
|
||||
"results": Array [
|
||||
Object {
|
||||
"isThrow": false,
|
||||
"type": "return",
|
||||
"value": undefined,
|
||||
},
|
||||
],
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@
|
|||
7BD159C40A68467FB5A17141 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC1D660B55BE462A9C3B8028 /* FontAwesome5_Solid.ttf */; };
|
||||
7F0AA8C121A613A000E4370E /* libRNSentry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F0AA8BB21A6138200E4370E /* libRNSentry.a */; };
|
||||
7F2691A11EE1DC6A007574FE /* libRNNotifications.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F2691A01EE1DC51007574FE /* libRNNotifications.a */; };
|
||||
7F26C1CC219C463D00FEB42D /* libRNCWebView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F26C1CB219C463300FEB42D /* libRNCWebView.a */; };
|
||||
7F292A711E8AB73400A450A3 /* SplashScreenResource in Resources */ = {isa = PBXBuildFile; fileRef = 7F292A701E8AB73400A450A3 /* SplashScreenResource */; };
|
||||
7F292AA61E8ABB1100A450A3 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F292AA41E8ABB1100A450A3 /* LaunchScreen.xib */; };
|
||||
7F292AA71E8ABB1100A450A3 /* splash.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F292AA51E8ABB1100A450A3 /* splash.png */; };
|
||||
|
|
@ -75,10 +74,13 @@
|
|||
7F6C47A51FE87E8C00F5A912 /* PerformRequests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F6C47A41FE87E8C00F5A912 /* PerformRequests.m */; };
|
||||
7F7D7F98201645E100D31155 /* libReactNativePermissions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F7D7F87201645D300D31155 /* libReactNativePermissions.a */; };
|
||||
7F95132F208646CE00616E3E /* 0155-keys.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F9512EA208646CD00616E3E /* 0155-keys.png */; };
|
||||
7F97F2312217989F00F5BCCC /* libRNCWebView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F26C1CB219C463300FEB42D /* libRNCWebView.a */; };
|
||||
7FBB5E9B1E1F5A4B000DE18A /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FDF290C1E1F4B4E00DBBE56 /* libRNVectorIcons.a */; };
|
||||
7FC200E81EBB65370099331B /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FC200DF1EBB65100099331B /* libReactNativeNavigation.a */; };
|
||||
7FC649EE1FE983660074E4C7 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 349FBA7338E74D9BBD709528 /* EvilIcons.ttf */; };
|
||||
7FC649F01FE9B5D90074E4C7 /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D4B1B363C2414DA19C1AC521 /* OpenSans-Bold.ttf */; };
|
||||
7FCC63CA221C5291002EC8A5 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
|
||||
7FCC63CC221C53BC002EC8A5 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FCC63CB221C53BB002EC8A5 /* JavaScriptCore.framework */; };
|
||||
7FD8DEDE2029EDB7001AAC5E /* libRNTableView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FD8DEDA2029ECDF001AAC5E /* libRNTableView.a */; };
|
||||
7FDB92B11F706F58006CDFD1 /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FDB92A71F706F45006CDFD1 /* libRNImagePicker.a */; };
|
||||
7FEB10981F6101710039A015 /* BlurAppScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEB10971F6101710039A015 /* BlurAppScreen.m */; };
|
||||
|
|
@ -99,7 +101,6 @@
|
|||
7FFE32E71FD9CCD00038C7A0 /* libART.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 37ABD39C1F4CE13B001FDE6B /* libART.a */; };
|
||||
7FFE32E81FD9CCDE0038C7A0 /* libRCTCameraRoll.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3752184F1F4B9E980035444B /* libRCTCameraRoll.a */; };
|
||||
7FFE32E91FD9CCF40038C7A0 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
|
||||
7FFE32EA1FD9CD050038C7A0 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
|
||||
7FFE32EB1FD9CD170038C7A0 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
|
||||
7FFE32EC1FD9CD360038C7A0 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
|
||||
7FFE32ED1FD9CD450038C7A0 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
|
||||
|
|
@ -341,20 +342,6 @@
|
|||
remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
|
||||
remoteInfo = "cxxreact-tvOS";
|
||||
};
|
||||
3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
|
||||
remoteInfo = jschelpers;
|
||||
};
|
||||
3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
|
||||
remoteInfo = "jschelpers-tvOS";
|
||||
};
|
||||
5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
|
||||
|
|
@ -397,20 +384,6 @@
|
|||
remoteGlobalIDString = 134814201AA4EA6300B7C361;
|
||||
remoteInfo = RNSentry;
|
||||
};
|
||||
7F24F9441FFEC06900E6C806 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
|
||||
remoteInfo = privatedata;
|
||||
};
|
||||
7F24F9461FFEC06900E6C806 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
|
||||
remoteInfo = "privatedata-tvOS";
|
||||
};
|
||||
7F26919F1EE1DC51007574FE /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 7F26919B1EE1DC51007574FE /* RNNotifications.xcodeproj */;
|
||||
|
|
@ -565,6 +538,34 @@
|
|||
remoteGlobalIDString = D8AFADBD1BEE6F3F00A4592D;
|
||||
remoteInfo = ReactNativeNavigation;
|
||||
};
|
||||
7FCC63AA221C5270002EC8A5 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = EDEBC6D6214B3E7000DD5AC8;
|
||||
remoteInfo = jsi;
|
||||
};
|
||||
7FCC63AC221C5270002EC8A5 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = EDEBC73B214B45A300DD5AC8;
|
||||
remoteInfo = jsiexecutor;
|
||||
};
|
||||
7FCC63AE221C5270002EC8A5 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = ED296FB6214C9A0900B7C4FE;
|
||||
remoteInfo = "jsi-tvOS";
|
||||
};
|
||||
7FCC63B0221C5270002EC8A5 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = ED296FEE214C9CF800B7C4FE;
|
||||
remoteInfo = "jsiexecutor-tvOS";
|
||||
};
|
||||
7FD8DED92029ECDF001AAC5E /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 7FD8DE972029ECDE001AAC5E /* RNTableView.xcodeproj */;
|
||||
|
|
@ -747,6 +748,7 @@
|
|||
7F7D7F52201645D300D31155 /* ReactNativePermissions.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativePermissions.xcodeproj; path = "../node_modules/react-native-permissions/ios/ReactNativePermissions.xcodeproj"; sourceTree = "<group>"; };
|
||||
7F9512EA208646CD00616E3E /* 0155-keys.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "0155-keys.png"; sourceTree = "<group>"; };
|
||||
7FC200BC1EBB65100099331B /* ReactNativeNavigation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeNavigation.xcodeproj; path = "../node_modules/react-native-navigation/ios/ReactNativeNavigation.xcodeproj"; sourceTree = "<group>"; };
|
||||
7FCC63CB221C53BB002EC8A5 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
|
||||
7FD8DE972029ECDE001AAC5E /* RNTableView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNTableView.xcodeproj; path = "../node_modules/react-native-tableview/RNTableView.xcodeproj"; sourceTree = "<group>"; };
|
||||
7FDB92751F706F45006CDFD1 /* RNImagePicker.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNImagePicker.xcodeproj; path = "../node_modules/react-native-image-picker/ios/RNImagePicker.xcodeproj"; sourceTree = "<group>"; };
|
||||
7FEB10961F6101710039A015 /* BlurAppScreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BlurAppScreen.h; path = Mattermost/BlurAppScreen.h; sourceTree = "<group>"; };
|
||||
|
|
@ -852,14 +854,14 @@
|
|||
7FDB92B11F706F58006CDFD1 /* libRNImagePicker.a in Frameworks */,
|
||||
7F5CA9A0208FE3B9004F91CE /* libRNDocumentPicker.a in Frameworks */,
|
||||
7F43D5DE1F6BF96A001FC614 /* libRCTYouTube.a in Frameworks */,
|
||||
7F26C1CC219C463D00FEB42D /* libRNCWebView.a in Frameworks */,
|
||||
7F43D6061F6BF9EB001FC614 /* libPods-Mattermost.a in Frameworks */,
|
||||
A9B746D2CFA9CEBFB8AE2B5B /* libPods-Mattermost.a in Frameworks */,
|
||||
7F97F2312217989F00F5BCCC /* libRNCWebView.a in Frameworks */,
|
||||
5A0920184BD344979BCFCD5C /* libRCTVideo.a in Frameworks */,
|
||||
3F876A0DC6314E27B16C8A96 /* libRNReactNativeDocViewer.a in Frameworks */,
|
||||
8D26455C994F46C39B1392F2 /* libRNSafeArea.a in Frameworks */,
|
||||
C3BD62ED5B5940AB8C0AC678 /* libz.tbd in Frameworks */,
|
||||
3F55075810254369AB39F032 /* libRNGestureHandler.a in Frameworks */,
|
||||
7F43D6061F6BF9EB001FC614 /* libPods-Mattermost.a in Frameworks */,
|
||||
A9B746D2CFA9CEBFB8AE2B5B /* libPods-Mattermost.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -867,7 +869,8 @@
|
|||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
7FFE32EA1FD9CD050038C7A0 /* libReact.a in Frameworks */,
|
||||
7FCC63CC221C53BC002EC8A5 /* JavaScriptCore.framework in Frameworks */,
|
||||
7FCC63CA221C5291002EC8A5 /* libReact.a in Frameworks */,
|
||||
7FFE32E71FD9CCD00038C7A0 /* libART.a in Frameworks */,
|
||||
7F642DF1209353A400F3165E /* libRNDeviceInfo.a in Frameworks */,
|
||||
7FF7BE6F1FDF3CE4005E55FE /* libRNVectorIcons.a in Frameworks */,
|
||||
|
|
@ -1047,16 +1050,16 @@
|
|||
3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
|
||||
3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
|
||||
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
|
||||
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
|
||||
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
|
||||
7F6FF6B5203499F400150948 /* libjsinspector.a */,
|
||||
7F6FF6B7203499F400150948 /* libjsinspector-tvOS.a */,
|
||||
37DF8AF21F5F0D430079BF89 /* libthird-party.a */,
|
||||
37DF8AF41F5F0D430079BF89 /* libthird-party.a */,
|
||||
37DF8AF61F5F0D430079BF89 /* libdouble-conversion.a */,
|
||||
37DF8AF81F5F0D430079BF89 /* libdouble-conversion.a */,
|
||||
7F24F9451FFEC06900E6C806 /* libprivatedata.a */,
|
||||
7F24F9471FFEC06900E6C806 /* libprivatedata-tvOS.a */,
|
||||
7FCC63AB221C5270002EC8A5 /* libjsi.a */,
|
||||
7FCC63AD221C5270002EC8A5 /* libjsiexecutor.a */,
|
||||
7FCC63AF221C5270002EC8A5 /* libjsi-tvOS.a */,
|
||||
7FCC63B1221C5270002EC8A5 /* libjsiexecutor-tvOS.a */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -1117,6 +1120,7 @@
|
|||
4B992D7BAAEDF8759DB525B5 /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
7FCC63CB221C53BB002EC8A5 /* JavaScriptCore.framework */,
|
||||
74D116A3208A8C8400CF8A79 /* libRNKeychain.a */,
|
||||
7FFE32B51FD9CCAA0038C7A0 /* FLAnimatedImage.framework */,
|
||||
7FFE32B61FD9CCAA0038C7A0 /* KSCrash.framework */,
|
||||
|
|
@ -1949,20 +1953,6 @@
|
|||
remoteRef = 3DAD3EAA1DF850E9000B6D8A /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
path = libjschelpers.a;
|
||||
remoteRef = 3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
path = libjschelpers.a;
|
||||
remoteRef = 3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
|
|
@ -2005,20 +1995,6 @@
|
|||
remoteRef = 7F0AA8BA21A6138200E4370E /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
7F24F9451FFEC06900E6C806 /* libprivatedata.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
path = libprivatedata.a;
|
||||
remoteRef = 7F24F9441FFEC06900E6C806 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
7F24F9471FFEC06900E6C806 /* libprivatedata-tvOS.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
path = "libprivatedata-tvOS.a";
|
||||
remoteRef = 7F24F9461FFEC06900E6C806 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
7F2691A01EE1DC51007574FE /* libRNNotifications.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
|
|
@ -2173,6 +2149,34 @@
|
|||
remoteRef = 7FC200DE1EBB65100099331B /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
7FCC63AB221C5270002EC8A5 /* libjsi.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
path = libjsi.a;
|
||||
remoteRef = 7FCC63AA221C5270002EC8A5 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
7FCC63AD221C5270002EC8A5 /* libjsiexecutor.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
path = libjsiexecutor.a;
|
||||
remoteRef = 7FCC63AC221C5270002EC8A5 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
7FCC63AF221C5270002EC8A5 /* libjsi-tvOS.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
path = "libjsi-tvOS.a";
|
||||
remoteRef = 7FCC63AE221C5270002EC8A5 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
7FCC63B1221C5270002EC8A5 /* libjsiexecutor-tvOS.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
path = "libjsiexecutor-tvOS.a";
|
||||
remoteRef = 7FCC63B0221C5270002EC8A5 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
7FD8DEDA2029ECDF001AAC5E /* libRNTableView.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
|
|
@ -2555,7 +2559,7 @@
|
|||
"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
|
||||
);
|
||||
INFOPLIST_FILE = Mattermost/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
|
|
@ -2607,7 +2611,7 @@
|
|||
"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
|
||||
);
|
||||
INFOPLIST_FILE = Mattermost/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
|
|
@ -2664,7 +2668,7 @@
|
|||
"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
|
||||
);
|
||||
INFOPLIST_FILE = MattermostShare/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
|
|
@ -2726,7 +2730,7 @@
|
|||
"$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**",
|
||||
);
|
||||
INFOPLIST_FILE = MattermostShare/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ NSString* const NotificationClearAction = @"clear";
|
|||
|
||||
// Only if your app is using [Universal Links](https://developer.apple.com/library/prerelease/ios/documentation/General/Conceptual/AppSearch/UniversalLinks.html).
|
||||
- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity
|
||||
restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler
|
||||
restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> *restorableObjects))restorationHandler
|
||||
{
|
||||
return [RCTLinkingManager application:application
|
||||
continueUserActivity:userActivity
|
||||
|
|
|
|||
|
|
@ -11,26 +11,16 @@
|
|||
#define IDIOM UI_USER_INTERFACE_IDIOM()
|
||||
#define IPAD UIUserInterfaceIdiomPad
|
||||
|
||||
@interface RNDocumentPicker () <UIDocumentPickerDelegate>
|
||||
@interface RNDocumentPicker () <UIDocumentMenuDelegate,UIDocumentPickerDelegate>
|
||||
@end
|
||||
|
||||
|
||||
@implementation RNDocumentPicker {
|
||||
NSMutableArray *composeViews;
|
||||
NSMutableArray *composeCallbacks;
|
||||
NSMutableArray *_composeCallbacks;
|
||||
}
|
||||
|
||||
@synthesize bridge = _bridge;
|
||||
|
||||
- (instancetype)init
|
||||
{
|
||||
if ((self = [super init])) {
|
||||
composeCallbacks = [[NSMutableArray alloc] init];
|
||||
composeViews = [[NSMutableArray alloc] init];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (dispatch_queue_t)methodQueue
|
||||
{
|
||||
return dispatch_get_main_queue();
|
||||
|
|
@ -44,7 +34,7 @@ RCT_EXPORT_METHOD(show:(NSDictionary *)options
|
|||
NSArray *allowedUTIs = [RCTConvert NSArray:options[@"filetype"]];
|
||||
UIDocumentPickerViewController *documentPicker = [[UIDocumentPickerViewController alloc] initWithDocumentTypes:(NSArray *)allowedUTIs inMode:UIDocumentPickerModeImport];
|
||||
|
||||
[composeCallbacks addObject:callback];
|
||||
[[self composeCallbacks] addObject:callback];
|
||||
|
||||
|
||||
documentPicker.delegate = self;
|
||||
|
|
@ -66,10 +56,27 @@ RCT_EXPORT_METHOD(show:(NSDictionary *)options
|
|||
}
|
||||
|
||||
|
||||
- (void)documentMenu:(UIDocumentMenuViewController *)documentMenu didPickDocumentPicker:(UIDocumentPickerViewController *)documentPicker {
|
||||
documentPicker.delegate = self;
|
||||
documentPicker.modalPresentationStyle = UIModalPresentationFormSheet;
|
||||
|
||||
UIViewController *rootViewController = [[[[UIApplication sharedApplication]delegate] window] rootViewController];
|
||||
|
||||
while (rootViewController.modalViewController) {
|
||||
rootViewController = rootViewController.modalViewController;
|
||||
}
|
||||
if ( IDIOM == IPAD ) {
|
||||
[documentPicker.popoverPresentationController setSourceRect: CGRectMake(rootViewController.view.frame.size.width/2, rootViewController.view.frame.size.height - rootViewController.view.frame.size.height / 6, 0, 0)];
|
||||
[documentPicker.popoverPresentationController setSourceView: rootViewController.view];
|
||||
}
|
||||
|
||||
[rootViewController presentViewController:documentPicker animated:YES completion:nil];
|
||||
}
|
||||
|
||||
- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentAtURL:(NSURL *)url {
|
||||
if (controller.documentPickerMode == UIDocumentPickerModeImport) {
|
||||
RCTResponseSenderBlock callback = [composeCallbacks lastObject];
|
||||
[composeCallbacks removeLastObject];
|
||||
RCTResponseSenderBlock callback = [[self composeCallbacks] lastObject];
|
||||
[[self composeCallbacks] removeLastObject];
|
||||
|
||||
[url startAccessingSecurityScopedResource];
|
||||
|
||||
|
|
@ -97,4 +104,11 @@ RCT_EXPORT_METHOD(show:(NSDictionary *)options
|
|||
}
|
||||
}
|
||||
|
||||
- (NSMutableArray *)composeCallbacks {
|
||||
if(_composeCallbacks == nil) {
|
||||
_composeCallbacks = [[NSMutableArray alloc] init];
|
||||
}
|
||||
return _composeCallbacks;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
10902
package-lock.json
generated
10902
package-lock.json
generated
File diff suppressed because it is too large
Load diff
94
package.json
94
package.json
|
|
@ -7,40 +7,40 @@
|
|||
"license": "Apache 2.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@babel/polyfill": "7.0.0",
|
||||
"@babel/runtime": "7.1.5",
|
||||
"@babel/polyfill": "7.2.5",
|
||||
"@babel/runtime": "7.3.1",
|
||||
"analytics-react-native": "1.2.0",
|
||||
"commonmark": "github:mattermost/commonmark.js#d5a7a7bfb373778d3bfd4575962c10fb3f3909c6",
|
||||
"commonmark-react-renderer": "github:mattermost/commonmark-react-renderer#3a2ac19cab725ad28b170fdc1d397dddedcf87eb",
|
||||
"deep-equal": "1.0.1",
|
||||
"emoji-regex": "7.0.3",
|
||||
"fuse.js": "3.3.0",
|
||||
"fuse.js": "3.4.2",
|
||||
"intl": "1.2.5",
|
||||
"jail-monkey": "1.0.0",
|
||||
"jsc-android": "236355.1.0",
|
||||
"jail-monkey": "2.0.0",
|
||||
"jsc-android": "236355.1.1",
|
||||
"mattermost-redux": "github:mattermost/mattermost-redux#457943d7154a4a5c62ece9e28e720136d25c8bb4",
|
||||
"mime-db": "1.37.0",
|
||||
"mime-db": "1.38.0",
|
||||
"moment-timezone": "0.5.23",
|
||||
"prop-types": "15.6.2",
|
||||
"react": "16.6.3",
|
||||
"react-intl": "2.7.2",
|
||||
"react-native": "0.57.5",
|
||||
"react-native-animatable": "1.3.0",
|
||||
"prop-types": "15.7.2",
|
||||
"react": "16.8.2",
|
||||
"react-intl": "2.8.0",
|
||||
"react-native": "0.58.5",
|
||||
"react-native-animatable": "1.3.1",
|
||||
"react-native-bottom-sheet": "1.0.3",
|
||||
"react-native-button": "2.3.0",
|
||||
"react-native-calendars": "github:enahum/react-native-calendars#e399bb749c0a944f009e75e7b45748299aea35d6",
|
||||
"react-native-circular-progress": "1.0.1",
|
||||
"react-native-circular-progress": "1.1.0",
|
||||
"react-native-cookies": "github:joeferraro/react-native-cookies#f11374745deba9f18f7b8a9bb4b0b2573026f522",
|
||||
"react-native-device-info": "github:enahum/react-native-device-info#f1c5781c3b38cf1c710834c39f9eb13a0ae08d65",
|
||||
"react-native-device-info": "github:enahum/react-native-device-info#d80037dd7d805bf9e7372aeef098d17c90e75e13",
|
||||
"react-native-doc-viewer": "2.7.8",
|
||||
"react-native-document-picker": "2.1.0",
|
||||
"react-native-exception-handler": "2.10.2",
|
||||
"react-native-gesture-handler": "1.0.10",
|
||||
"react-native-document-picker": "2.2.0",
|
||||
"react-native-exception-handler": "2.10.6",
|
||||
"react-native-gesture-handler": "1.0.15",
|
||||
"react-native-image-gallery": "github:enahum/react-native-image-gallery#a98b1051e94f5a394541ca1ff9b15e2c9ffed84f",
|
||||
"react-native-image-picker": "0.27.2",
|
||||
"react-native-keyboard-aware-scroll-view": "0.7.4",
|
||||
"react-native-keychain": "3.0.0",
|
||||
"react-native-linear-gradient": "2.4.4",
|
||||
"react-native-image-picker": "0.28.0",
|
||||
"react-native-keyboard-aware-scroll-view": "0.8.0",
|
||||
"react-native-keychain": "3.1.1",
|
||||
"react-native-linear-gradient": "2.5.3",
|
||||
"react-native-local-auth": "github:enahum/react-native-local-auth#cc9ce2f468fbf7b431dfad3191a31aaa9227a6ab",
|
||||
"react-native-navigation": "1.1.492",
|
||||
"react-native-notifications": "github:enahum/react-native-notifications#aeb014b4d01db3d0afb091683c45e7ad7e572ea3",
|
||||
|
|
@ -52,13 +52,13 @@
|
|||
"react-native-sentry": "0.39.1",
|
||||
"react-native-slider": "0.11.0",
|
||||
"react-native-status-bar-size": "0.3.3",
|
||||
"react-native-svg": "8.0.8",
|
||||
"react-native-svg": "9.2.4",
|
||||
"react-native-tableview": "2.4.1",
|
||||
"react-native-vector-icons": "6.1.0",
|
||||
"react-native-video": "3.2.1",
|
||||
"react-native-webview": "2.5.0",
|
||||
"react-native-vector-icons": "6.3.0",
|
||||
"react-native-video": "4.4.0",
|
||||
"react-native-webview": "5.2.1",
|
||||
"react-native-youtube": "github:enahum/react-native-youtube#3f395b620ae4e05a3f1c6bdeef3a1158e78daadc",
|
||||
"react-navigation": "2.18.2",
|
||||
"react-navigation": "3.2.3",
|
||||
"react-redux": "5.1.1",
|
||||
"redux": "4.0.1",
|
||||
"redux-batched-actions": "0.4.1",
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
"redux-persist-transform-filter": "0.0.18",
|
||||
"redux-thunk": "2.3.0",
|
||||
"reselect": "4.0.0",
|
||||
"rn-fetch-blob": "github:enahum/react-native-fetch-blob#1f370ab3616101d4ffe919e0b58cbe4ef319ce5d",
|
||||
"rn-fetch-blob": "github:enahum/react-native-fetch-blob#e81b40d87e9e2ca39870d61a6e4c02b9a695aaad",
|
||||
"rn-placeholder": "github:enahum/rn-placeholder#bfee66eb54f1f06d1425a0ad511a5e16559bf82c",
|
||||
"semver": "5.6.0",
|
||||
"shallow-equals": "1.0.0",
|
||||
|
|
@ -74,33 +74,33 @@
|
|||
"url-parse": "1.4.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/cli": "7.1.5",
|
||||
"@babel/core": "7.1.6",
|
||||
"@babel/plugin-transform-runtime": "7.1.0",
|
||||
"@babel/preset-env": "7.1.6",
|
||||
"@babel/cli": "7.2.3",
|
||||
"@babel/core": "7.3.3",
|
||||
"@babel/plugin-transform-runtime": "7.2.0",
|
||||
"@babel/preset-env": "7.3.1",
|
||||
"@babel/register": "7.0.0",
|
||||
"babel-core": "7.0.0-bridge.0",
|
||||
"babel-eslint": "10.0.1",
|
||||
"babel-plugin-module-resolver": "3.1.1",
|
||||
"babel-plugin-module-resolver": "3.2.0",
|
||||
"babel-plugin-transform-remove-console": "6.9.4",
|
||||
"deep-freeze": "0.0.1",
|
||||
"enzyme": "3.7.0",
|
||||
"enzyme-adapter-react-16": "1.7.0",
|
||||
"enzyme-to-json": "3.3.4",
|
||||
"eslint": "5.9.0",
|
||||
"enzyme": "3.8.0",
|
||||
"enzyme-adapter-react-16": "1.9.1",
|
||||
"enzyme-to-json": "3.3.5",
|
||||
"eslint": "5.14.0",
|
||||
"eslint-config-mattermost": "github:mattermost/eslint-config-mattermost",
|
||||
"eslint-plugin-header": "2.0.0",
|
||||
"eslint-plugin-jest": "22.0.0",
|
||||
"eslint-plugin-react": "7.11.1",
|
||||
"jest": "23.6.0",
|
||||
"jest-cli": "23.6.0",
|
||||
"eslint-plugin-header": "3.0.0",
|
||||
"eslint-plugin-jest": "22.3.0",
|
||||
"eslint-plugin-react": "7.12.4",
|
||||
"jest": "24.1.0",
|
||||
"jest-cli": "24.1.0",
|
||||
"jsdom-global": "3.0.2",
|
||||
"metro-react-native-babel-preset": "0.49.2",
|
||||
"nyc": "13.1.0",
|
||||
"react-dom": "16.6.3",
|
||||
"metro-react-native-babel-preset": "0.51.1",
|
||||
"nyc": "13.3.0",
|
||||
"react-dom": "16.8.2",
|
||||
"redux-mock-store": "1.5.3",
|
||||
"remote-redux-devtools": "0.5.13",
|
||||
"socketcluster": "14.3.2",
|
||||
"remote-redux-devtools": "0.5.16",
|
||||
"socketcluster": "14.3.3",
|
||||
"underscore": "1.9.1"
|
||||
},
|
||||
"scripts": {
|
||||
|
|
@ -127,7 +127,9 @@
|
|||
"text-summary"
|
||||
],
|
||||
"preset": "react-native",
|
||||
"setupTestFrameworkScriptFile": "<rootDir>/test/setup.js",
|
||||
"setupFilesAfterEnv": [
|
||||
"<rootDir>/test/setup.js"
|
||||
],
|
||||
"testPathIgnorePatterns": [
|
||||
"/node_modules/"
|
||||
],
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
import React, {PureComponent} from 'react';
|
||||
import {NavigationActions} from 'react-navigation';
|
||||
import TouchableItem from 'react-navigation/src/views/TouchableItem';
|
||||
import TouchableItem from 'react-navigation-stack/dist/views/TouchableItem';
|
||||
import PropTypes from 'prop-types';
|
||||
import {intlShape} from 'react-intl';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
import {createStackNavigator} from 'react-navigation';
|
||||
import {createAppContainer, createStackNavigator} from 'react-navigation';
|
||||
|
||||
import {Preferences} from 'mattermost-redux/constants';
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ const Navigation = createStackNavigator({
|
|||
screen: ExtensionChannels,
|
||||
},
|
||||
}, {
|
||||
navigationOptions: {
|
||||
defaultNavigationOptions: {
|
||||
headerStyle: {
|
||||
backgroundColor: theme.sidebarHeaderBg,
|
||||
},
|
||||
|
|
@ -38,4 +38,4 @@ const Navigation = createStackNavigator({
|
|||
},
|
||||
});
|
||||
|
||||
export default Navigation;
|
||||
export default createAppContainer(Navigation);
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@ jest.mock('NativeModules', () => {
|
|||
MattermostManaged: {
|
||||
getConfig: jest.fn(),
|
||||
},
|
||||
PlatformConstants: {
|
||||
forceTouchAvailable: false,
|
||||
},
|
||||
RNGestureHandlerModule: {
|
||||
State: {
|
||||
BEGAN: 'BEGAN',
|
||||
|
|
|
|||
Loading…
Reference in a new issue