From e07a738dcd226f68b1751d9bdefc982af13389e9 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 23 May 2018 10:39:23 -0400 Subject: [PATCH] Remove orientation dependency (#1698) * Remove orientation dependency * Update NOTICES --- Makefile | 3 +- NOTICE.txt | 40 ------------------- android/app/build.gradle | 9 ++--- .../mattermost/rnbeta/MainApplication.java | 2 - android/settings.gradle | 2 - app/actions/device/index.js | 25 +++++------- .../safe_area_view/safe_area_view.ios.js | 7 ++-- app/mattermost.js | 24 +++++------ app/screens/login/login.js | 6 +-- app/screens/login_options/login_options.js | 6 +-- ios/Mattermost.xcodeproj/project.pbxproj | 38 +----------------- ios/Mattermost/AppDelegate.m | 6 --- package-lock.json | 5 --- package.json | 1 - 14 files changed, 36 insertions(+), 138 deletions(-) diff --git a/Makefile b/Makefile index ce855579b..926b5e779 100644 --- a/Makefile +++ b/Makefile @@ -78,9 +78,8 @@ post-install: @sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-messageformat/package.json @sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-relativeformat/package.json @sed -i'' -e 's|"./locale-data/complete.js": false|"./locale-data/complete.js": "./locale-data/complete.js"|g' node_modules/intl/package.json - @sed -i'' -e 's|auto("auto", Configuration.ORIENTATION_UNDEFINED, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);|auto("auto", Configuration.ORIENTATION_UNDEFINED, ActivityInfo.SCREEN_ORIENTATION_FULL_USER);|g' node_modules/react-native-navigation/android/app/src/main/java/com/reactnativenavigation/params/Orientation.java - @sed -i'' -e "s|activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);|activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);|g" node_modules/react-native-orientation/android/src/main/java/com/github/yamill/orientation/OrientationModule.java @sed -i'' -e "s|super.onBackPressed();|this.moveTaskToBack(true);|g" node_modules/react-native-navigation/android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java + @sed -i'' -e "s|compile 'com.facebook.react:react-native:0.17.+'|compile 'com.facebook.react:react-native:+'|g" node_modules/react-native-bottom-sheet/android/build.gradle @if [ $(shell grep "const Platform" node_modules/react-native/Libraries/Lists/VirtualizedList.js | grep -civ grep) -eq 0 ]; then \ sed $ -i'' -e "s|const ReactNative = require('ReactNative');|const ReactNative = require('ReactNative');`echo $\\\\\\r;`const Platform = require('Platform');|g" node_modules/react-native/Libraries/Lists/VirtualizedList.js; \ fi diff --git a/NOTICE.txt b/NOTICE.txt index f274a29e6..00eea9f35 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2098,25 +2098,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI --- -## react-native-orientation - -This product contains a modified version of 'react-native-orientation'. Allows to listen to device orientation changes in React Native applications and programmatically set preferred orientation on a per screen basis. - -* HOMEPAGE: - * https://github.com/yamill/react-native-orientation - -* LICENSE: - -ISC License - -Copyright 2017 React Native Orientation - -Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - ---- - ## reselect This project is a simple “selector” library for Redux. @@ -2332,27 +2313,6 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE --- -## babel-polyfill - -This project includes a custom regenerator runtime and core-js. - -* HOMEPAGE: - * https://github.com/babel/babel/tree/master/packages/babel-polyfill - -* LICENSE: - -The MIT License (MIT) - -Copyright (c) 2017 Brian Ng - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ---- - ## react-native-media-controls This product contains a modified version of 'react-native-media-controls' This project is a UI component to manipulate your media. diff --git a/android/app/build.gradle b/android/app/build.gradle index a66cf20b8..a2c56754f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -183,17 +183,16 @@ configurations.all { } dependencies { - compile project(':react-native-document-picker') - compile project(':react-native-keychain') - compile project(':react-native-doc-viewer') - compile project(':react-native-video') compile fileTree(dir: "libs", include: ["*.jar"]) compile "com.android.support:appcompat-v7:25.0.1" compile 'com.android.support:percent:25.3.1' compile "com.facebook.react:react-native:+" // From node_modules + compile project(':react-native-document-picker') + compile project(':react-native-keychain') + compile project(':react-native-doc-viewer') + compile project(':react-native-video') compile project(':react-native-navigation') compile project(':react-native-image-picker') - compile project(':react-native-orientation') compile project(':react-native-bottom-sheet') compile ('com.google.android.gms:play-services-gcm:9.4.0') { force = true; diff --git a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java index ef6f01b2f..b1da95ad6 100644 --- a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java +++ b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java @@ -27,7 +27,6 @@ import com.learnium.RNDeviceInfo.RNDeviceInfo; import com.psykar.cookiemanager.CookieManagerPackage; import com.oblador.vectoricons.VectorIconsPackage; import com.BV.LinearGradient.LinearGradientPackage; -import com.github.yamill.orientation.OrientationPackage; import com.reactnativenavigation.NavigationApplication; import com.wix.reactnativenotifications.RNNotificationsPackage; import com.wix.reactnativenotifications.core.notification.INotificationsApplication; @@ -62,7 +61,6 @@ public class MainApplication extends NavigationApplication implements INotificat new VectorIconsPackage(), new SvgPackage(), new LinearGradientPackage(), - new OrientationPackage(), new RNNotificationsPackage(this), new LocalAuthPackage(), new JailMonkeyPackage(), diff --git a/android/settings.gradle b/android/settings.gradle index 154166adf..4af58e508 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -37,7 +37,5 @@ project(':reactnativenotifications').projectDir = new File(rootProject.projectDi include ':app' include ':react-native-svg' project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android') -include ':react-native-orientation' -project(':react-native-orientation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-orientation/android') include ':react-native-linear-gradient' project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android') diff --git a/app/actions/device/index.js b/app/actions/device/index.js index d03947657..1b182918f 100644 --- a/app/actions/device/index.js +++ b/app/actions/device/index.js @@ -1,21 +1,8 @@ // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import {Dimensions} from 'react-native'; - import {DeviceTypes} from 'app/constants'; -export function calculateDeviceDimensions() { - const {height, width} = Dimensions.get('window'); - return { - type: DeviceTypes.DEVICE_DIMENSIONS_CHANGED, - data: { - deviceHeight: height, - deviceWidth: width, - }, - }; -} - export function connection(isOnline) { return async (dispatch, getState) => { dispatch({ @@ -32,6 +19,16 @@ export function setStatusBarHeight(height = 20) { }; } +export function setDeviceDimensions(height, width) { + return { + type: DeviceTypes.DEVICE_DIMENSIONS_CHANGED, + data: { + deviceHeight: height, + deviceWidth: width, + }, + }; +} + export function setDeviceOrientation(orientation) { return { type: DeviceTypes.DEVICE_ORIENTATION_CHANGED, @@ -47,8 +44,8 @@ export function setDeviceAsTablet() { } export default { - calculateDeviceDimensions, connection, + setDeviceDimensions, setDeviceOrientation, setDeviceAsTablet, setStatusBarHeight, diff --git a/app/components/safe_area_view/safe_area_view.ios.js b/app/components/safe_area_view/safe_area_view.ios.js index bb3f7e442..3d4544bde 100644 --- a/app/components/safe_area_view/safe_area_view.ios.js +++ b/app/components/safe_area_view/safe_area_view.ios.js @@ -3,10 +3,9 @@ import React, {PureComponent} from 'react'; import PropTypes from 'prop-types'; -import {Keyboard, NativeModules, View} from 'react-native'; +import {Dimensions, Keyboard, NativeModules, View} from 'react-native'; import DeviceInfo from 'react-native-device-info'; import SafeArea from 'react-native-safe-area'; -import Orientation from 'react-native-orientation'; const {StatusBarManager} = NativeModules; @@ -54,7 +53,7 @@ export default class SafeAreaIos extends PureComponent { } componentDidMount() { - Orientation.addOrientationListener(this.getSafeAreaInsets); + Dimensions.addEventListener('change', this.getSafeAreaInsets); this.keyboardDidShowListener = Keyboard.addListener('keyboardWillShow', this.keyboardWillShow); this.keyboardDidHideListener = Keyboard.addListener('keyboardWillHide', this.keyboardWillHide); this.getStatusBarHeight(); @@ -62,7 +61,7 @@ export default class SafeAreaIos extends PureComponent { componentWillUnmount() { this.mounted = false; - Orientation.removeOrientationListener(this.getSafeAreaInsets); + Dimensions.removeEventListener('change', this.getSafeAreaInsets); this.keyboardDidShowListener.remove(); this.keyboardDidHideListener.remove(); this.mounted = false; diff --git a/app/mattermost.js b/app/mattermost.js index bb3195198..23a234bd4 100644 --- a/app/mattermost.js +++ b/app/mattermost.js @@ -5,6 +5,7 @@ import { Alert, AppState, + Dimensions, InteractionManager, Platform, NativeModules, @@ -35,7 +36,7 @@ import {configurePushNotifications} from 'app/utils/push_notifications'; import PushNotifications from 'app/push_notifications'; import {registerScreens} from 'app/screens'; import { - calculateDeviceDimensions, + setDeviceDimensions, setDeviceOrientation, setDeviceAsTablet, setStatusBarHeight, @@ -55,11 +56,9 @@ export const store = configureStore(initialState); registerScreens(store, Provider); const lazyLoadExternalModules = () => { - const Orientation = require('react-native-orientation'); const StatusBarSizeIOS = require('react-native-status-bar-size'); const initializeErrorHandling = require('app/utils/error_handling').initializeErrorHandling; return { - Orientation, StatusBarSizeIOS, initializeErrorHandling, }; @@ -75,16 +74,14 @@ const lazyLoadAnalytics = () => { const initializeModules = () => { const { - Orientation, StatusBarSizeIOS, initializeErrorHandling, } = lazyLoadExternalModules(); const { config, } = store.getState().entities.general; - const orientation = Orientation.getInitialOrientation(); + const window = Dimensions.get('window'); - Orientation.unlockAllOrientations(); initializeErrorHandling(); EventEmitter.on(NavigationTypes.NAVIGATION_RESET, handleLogout); @@ -92,7 +89,7 @@ const initializeModules = () => { EventEmitter.on(General.SERVER_VERSION_CHANGED, handleServerVersionChanged); EventEmitter.on(General.CONFIG_CHANGED, handleConfigChanged); EventEmitter.on(General.DEFAULT_CHANNEL, handleResetChannelDisplayName); - Orientation.addOrientationListener(handleOrientationChange); + Dimensions.addEventListener('change', handleOrientationChange); mattermostManaged.addEventListener('managedConfigDidChange', () => { handleManagedConfig(true); }); @@ -101,9 +98,7 @@ const initializeModules = () => { configureAnalytics(config); } - if (orientation) { - handleOrientationChange(orientation); - } + handleOrientationChange({window}); if (Platform.OS === 'ios') { StatusBarSizeIOS.addEventListener('willChange', handleStatusBarHeightChange); @@ -196,16 +191,17 @@ const handleStatusBarHeightChange = (nextStatusBarHeight) => { store.dispatch(setStatusBarHeight(nextStatusBarHeight)); }; -const handleOrientationChange = (orientation) => { +const handleOrientationChange = (dimensions) => { const {dispatch} = store; if (DeviceInfo.isTablet()) { dispatch(setDeviceAsTablet()); } + const {height, width} = dimensions.window; + const orientation = height > width ? 'PORTRAIT' : 'LANDSCAPE'; + dispatch(setDeviceOrientation(orientation)); - setTimeout(() => { - dispatch(calculateDeviceDimensions()); - }, 100); + dispatch(setDeviceDimensions(height, width)); }; export const handleManagedConfig = async (eventFromEmmServer = false) => { diff --git a/app/screens/login/login.js b/app/screens/login/login.js index 725e0cbff..f346baf74 100644 --- a/app/screens/login/login.js +++ b/app/screens/login/login.js @@ -6,6 +6,7 @@ import PropTypes from 'prop-types'; import {injectIntl, intlShape} from 'react-intl'; import { ActivityIndicator, + Dimensions, Image, InteractionManager, Keyboard, @@ -17,7 +18,6 @@ import { } from 'react-native'; import Button from 'react-native-button'; import {KeyboardAwareScrollView} from 'react-native-keyboard-aware-scroll-view'; -import Orientation from 'react-native-orientation'; import ErrorText from 'app/components/error_text'; import FormattedText from 'app/components/formatted_text'; @@ -61,7 +61,7 @@ class Login extends PureComponent { } componentWillMount() { - Orientation.addOrientationListener(this.orientationDidChange); + Dimensions.addEventListener('change', this.orientationDidChange); } componentWillReceiveProps(nextProps) { @@ -73,7 +73,7 @@ class Login extends PureComponent { } componentWillUnmount() { - Orientation.removeOrientationListener(this.orientationDidChange); + Dimensions.removeEventListener('change', this.orientationDidChange); } goToLoadTeam = (expiresAt) => { diff --git a/app/screens/login_options/login_options.js b/app/screens/login_options/login_options.js index 2ebce8714..5c143215d 100644 --- a/app/screens/login_options/login_options.js +++ b/app/screens/login_options/login_options.js @@ -5,13 +5,13 @@ import React, {PureComponent} from 'react'; import PropTypes from 'prop-types'; import {injectIntl, intlShape} from 'react-intl'; import { + Dimensions, Image, ScrollView, StyleSheet, Text, } from 'react-native'; import Button from 'react-native-button'; -import Orientation from 'react-native-orientation'; import {ViewTypes} from 'app/constants'; import FormattedText from 'app/components/formatted_text'; @@ -33,11 +33,11 @@ class LoginOptions extends PureComponent { }; componentWillMount() { - Orientation.addOrientationListener(this.orientationDidChange); + Dimensions.addEventListener('change', this.orientationDidChange); } componentWillUnmount() { - Orientation.removeOrientationListener(this.orientationDidChange); + Dimensions.removeEventListener('change', this.orientationDidChange); } goToLogin = preventDoubleTap(() => { diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index 96361949e..6d5451088 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -26,7 +26,6 @@ 1BCA51319AC6442991C6A208 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0A091BF1A3D04650AD306A0D /* Zocial.ttf */; }; 2B4C9B708010475DA575B81D /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1F071EE85494E269A50AE88 /* SimpleLineIcons.ttf */; }; 2D5296A8926B4D7FBAF2D6E2 /* OpenSans-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6561AEAC21CC40B8A72ABB93 /* OpenSans-Light.ttf */; }; - 374634801E8480C2005E1244 /* libRCTOrientation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 374634671E848085005E1244 /* libRCTOrientation.a */; }; 375218501F4B9EE70035444B /* libRCTCameraRoll.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3752184F1F4B9E980035444B /* libRCTCameraRoll.a */; }; 37ABD3C81F4CE142001FDE6B /* libART.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 37ABD39C1F4CE13B001FDE6B /* libART.a */; }; 382D94CF15EE4FC292C3F341 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 51F5A483EA9F4A9A87ACFB59 /* Foundation.ttf */; }; @@ -64,9 +63,9 @@ 7F43D6401F6BFA82001FC614 /* libRCTPushNotification.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F63D2811E6C957C001FAE12 /* libRCTPushNotification.a */; }; 7F50C96A203C6E80007CA374 /* SessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F50C969203C6E80007CA374 /* SessionManager.m */; }; 7F50C96B203C6E80007CA374 /* SessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F50C969203C6E80007CA374 /* SessionManager.m */; }; + 7F5CA9A0208FE3B9004F91CE /* libRNDocumentPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F5CA991208FE38F004F91CE /* libRNDocumentPicker.a */; }; 7F642DF02093533300F3165E /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F642DED2093530B00F3165E /* libRNDeviceInfo.a */; }; 7F642DF1209353A400F3165E /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F642DED2093530B00F3165E /* libRNDeviceInfo.a */; }; - 7F5CA9A0208FE3B9004F91CE /* libRNDocumentPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F5CA991208FE38F004F91CE /* libRNDocumentPicker.a */; }; 7F6877B31E7836070094B63F /* libToolTipMenu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F6877B01E7835E50094B63F /* libToolTipMenu.a */; }; 7F6C47A51FE87E8C00F5A912 /* PerformRequests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F6C47A41FE87E8C00F5A912 /* PerformRequests.m */; }; 7F7D7F98201645E100D31155 /* libReactNativePermissions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F7D7F87201645D300D31155 /* libReactNativePermissions.a */; }; @@ -85,7 +84,6 @@ 7FF7BE6E1FDEE5E8005E55FE /* MattermostBucket.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FF7BE6C1FDEE5E8005E55FE /* MattermostBucket.m */; }; 7FF7BE6F1FDF3CE4005E55FE /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FDF290C1E1F4B4E00DBBE56 /* libRNVectorIcons.a */; }; 7FF7BE701FDF3EE7005E55FE /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2DCFD31D3F4A4154822AB532 /* Ionicons.ttf */; }; - 7FF7BE721FE01FC7005E55FE /* libRCTOrientation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 374634671E848085005E1244 /* libRCTOrientation.a */; }; 7FFDB3191FE3566C009E3BCF /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 005346E5C0E542BFABAE1411 /* FontAwesome.ttf */; }; 7FFE329E1FD9CB650038C7A0 /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FFE329D1FD9CB650038C7A0 /* ShareViewController.m */; }; 7FFE32A11FD9CB650038C7A0 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7FFE329F1FD9CB650038C7A0 /* MainInterface.storyboard */; }; @@ -186,13 +184,6 @@ remoteGlobalIDString = 1BD725DA1CF77A8B005DBD79; remoteInfo = RNCookieManagerIOS; }; - 374634661E848085005E1244 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5C3B95629BA74FB3A8377CB7 /* RCTOrientation.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RCTOrientation; - }; 375218401F4B9E320035444B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 546CB0A5BB8F453890CBA559 /* RNFetchBlob.xcodeproj */; @@ -699,7 +690,6 @@ 50ECB1D221E44F51B5690DF2 /* FastImage.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = FastImage.xcodeproj; path = "../node_modules/react-native-fast-image/ios/FastImage.xcodeproj"; sourceTree = ""; }; 51F5A483EA9F4A9A87ACFB59 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; }; 546CB0A5BB8F453890CBA559 /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFetchBlob.xcodeproj; path = "../node_modules/react-native-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = ""; }; - 5C3B95629BA74FB3A8377CB7 /* RCTOrientation.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTOrientation.xcodeproj; path = "../node_modules/react-native-orientation/iOS/RCTOrientation.xcodeproj"; sourceTree = ""; }; 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; 62A58E5E984E4CF1811620B8 /* RNCookieManagerIOS.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCookieManagerIOS.xcodeproj; path = "../node_modules/react-native-cookies/ios/RNCookieManagerIOS.xcodeproj"; sourceTree = ""; }; 634A8F047C73D24A87850EC0 /* Pods-Mattermost.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mattermost.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Mattermost/Pods-Mattermost.debug.xcconfig"; sourceTree = ""; }; @@ -810,7 +800,6 @@ 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */, 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */, 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, - 374634801E8480C2005E1244 /* libRCTOrientation.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, 7F43D63F1F6BFA19001FC614 /* libBVLinearGradient.a in Frameworks */, @@ -848,7 +837,6 @@ 7F642DF1209353A400F3165E /* libRNDeviceInfo.a in Frameworks */, 7F3F660F1FE4280D0085CA0E /* libReactNativeExceptionHandler.a in Frameworks */, 7FB6006B1FE3116800DB284F /* libRNFetchBlob.a in Frameworks */, - 7FF7BE721FE01FC7005E55FE /* libRCTOrientation.a in Frameworks */, 7FF7BE6F1FDF3CE4005E55FE /* libRNVectorIcons.a in Frameworks */, 7F380D0B1FDB3CFC0061AAD2 /* libRCTVideo.a in Frameworks */, 7FFE32F11FD9D64E0038C7A0 /* libRCTWebSocket.a in Frameworks */, @@ -1029,14 +1017,6 @@ name = Products; sourceTree = ""; }; - 374634571E848085005E1244 /* Products */ = { - isa = PBXGroup; - children = ( - 374634671E848085005E1244 /* libRCTOrientation.a */, - ); - name = Products; - sourceTree = ""; - }; 3752181C1F4B9E320035444B /* Products */ = { isa = PBXGroup; children = ( @@ -1371,7 +1351,6 @@ 2CBE9C0FB56E4FDA96C30792 /* RNSVG.xcodeproj */, 2B25899FDAC149EB96ED3305 /* RNVectorIcons.xcodeproj */, 7DCC3D826CE640AF8F491692 /* BVLinearGradient.xcodeproj */, - 5C3B95629BA74FB3A8377CB7 /* RCTOrientation.xcodeproj */, D0281D64B98143668D6AD42B /* RNLocalAuth.xcodeproj */, EBA6063A99C141098D40C67A /* RNPasscodeStatus.xcodeproj */, 27A6EA89298440439DA9F98D /* JailMonkey.xcodeproj */, @@ -1592,10 +1571,6 @@ ProductGroup = 00C302D41ABCB9D200DB3ED1 /* Products */; ProjectRef = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */; }, - { - ProductGroup = 374634571E848085005E1244 /* Products */; - ProjectRef = 5C3B95629BA74FB3A8377CB7 /* RCTOrientation.xcodeproj */; - }, { ProductGroup = 7F63D27C1E6C957C001FAE12 /* Products */; ProjectRef = 7F63D27B1E6C957C001FAE12 /* RCTPushNotification.xcodeproj */; @@ -1778,13 +1753,6 @@ remoteRef = 372E25661F5F0E1800A2BFAB /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 374634671E848085005E1244 /* libRCTOrientation.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTOrientation.a; - remoteRef = 374634661E848085005E1244 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 375218411F4B9E320035444B /* libRNFetchBlob.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -2554,7 +2522,6 @@ ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( "$(SRCROOT)/../node_modules/react-native/Libraries/PushNotificationIOS/**", - "$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**", "$(SRCROOT)/../node_modules/react-native-navigation/ios/**", "$(SRCROOT)/../node_modules/react-native-notifications/RNNotifications/**", "$(SRCROOT)/../node_modules/react-native-local-auth", @@ -2605,7 +2572,6 @@ ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( "$(SRCROOT)/../node_modules/react-native/Libraries/PushNotificationIOS/**", - "$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**", "$(SRCROOT)/../node_modules/react-native-navigation/ios/**", "$(SRCROOT)/../node_modules/react-native-notifications/RNNotifications/**", "$(SRCROOT)/../node_modules/react-native-local-auth", @@ -2665,7 +2631,6 @@ GCC_C_LANGUAGE_STANDARD = gnu11; HEADER_SEARCH_PATHS = ( "$(SRCROOT)/../node_modules/react-native/Libraries/PushNotificationIOS/**", - "$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**", "$(SRCROOT)/../node_modules/react-native-navigation/ios/**", "$(SRCROOT)/../node_modules/react-native-notifications/RNNotifications/**", "$(SRCROOT)/../node_modules/react-native-local-auth", @@ -2726,7 +2691,6 @@ GCC_C_LANGUAGE_STANDARD = gnu11; HEADER_SEARCH_PATHS = ( "$(SRCROOT)/../node_modules/react-native/Libraries/PushNotificationIOS/**", - "$(SRCROOT)/../node_modules/react-native-orientation/iOS/RCTOrientation/**", "$(SRCROOT)/../node_modules/react-native-navigation/ios/**", "$(SRCROOT)/../node_modules/react-native-notifications/RNNotifications/**", "$(SRCROOT)/../node_modules/react-native-local-auth", diff --git a/ios/Mattermost/AppDelegate.m b/ios/Mattermost/AppDelegate.m index 49c3c621e..7b179e960 100644 --- a/ios/Mattermost/AppDelegate.m +++ b/ios/Mattermost/AppDelegate.m @@ -16,7 +16,6 @@ #else #import "RNSentry.h" // This is used for versions of react < 0.40 #endif -#import "Orientation.h" #import "RCCManager.h" #import "RNNotifications.h" #import "SessionManager.h" @@ -37,11 +36,6 @@ return YES; } -// Required for orientation -- (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window { - return [Orientation getOrientation]; -} - // Required to register for notifications - (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings { diff --git a/package-lock.json b/package-lock.json index cdce33207..63dcc3a8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14579,11 +14579,6 @@ } } }, - "react-native-orientation": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/react-native-orientation/-/react-native-orientation-3.1.3.tgz", - "integrity": "sha512-A0h0E+2f95X4avmhaBG1ZT8WDxBACA/q//JN2eF1E7kq8AJVxt5XDiavv+aSBkBlqFsfF3bIS+T/DB5mXmnxuA==" - }, "react-native-passcode-status": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/react-native-passcode-status/-/react-native-passcode-status-1.1.1.tgz", diff --git a/package.json b/package.json index f628962b7..1f5427fd2 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "react-native-local-auth": "enahum/react-native-local-auth.git#cc9ce2f468fbf7b431dfad3191a31aaa9227a6ab", "react-native-navigation": "1.1.450", "react-native-notifications": "enahum/react-native-notifications.git#663ffe3c4403b185093920c4551f117801499b73", - "react-native-orientation": "3.1.3", "react-native-passcode-status": "1.1.1", "react-native-permissions": "1.1.1", "react-native-safe-area": "0.2.3",