ios: drop support for iOS 10
This commit is contained in:
parent
6121e9fc65
commit
792f506425
|
@ -1,4 +1,4 @@
|
||||||
platform :ios, '10.0'
|
platform :ios, '11.0'
|
||||||
workspace 'jitsi-meet'
|
workspace 'jitsi-meet'
|
||||||
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
|
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ post_install do |installer|
|
||||||
target.build_configurations.each do |config|
|
target.build_configurations.each do |config|
|
||||||
config.build_settings['ENABLE_BITCODE'] = 'YES'
|
config.build_settings['ENABLE_BITCODE'] = 'YES'
|
||||||
config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
|
config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
|
||||||
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0'
|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -553,6 +553,6 @@ SPEC CHECKSUMS:
|
||||||
RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42
|
RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42
|
||||||
Yoga: 02036f6383c0008edb7ef0773a0e6beb6ce82bd1
|
Yoga: 02036f6383c0008edb7ef0773a0e6beb6ce82bd1
|
||||||
|
|
||||||
PODFILE CHECKSUM: 63c90b1d33cd96709fb72bad6be440ae9c3deecb
|
PODFILE CHECKSUM: 0fdfa45ae809c9460c80be3e0d4bbb822fccc418
|
||||||
|
|
||||||
COCOAPODS: 1.8.1
|
COCOAPODS: 1.8.1
|
||||||
|
|
|
@ -747,7 +747,6 @@
|
||||||
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
||||||
);
|
);
|
||||||
INFOPLIST_FILE = src/Info.plist;
|
INFOPLIST_FILE = src/Info.plist;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||||
LIBRARY_SEARCH_PATHS = "$(inherited)";
|
LIBRARY_SEARCH_PATHS = "$(inherited)";
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
|
@ -758,7 +757,6 @@
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
|
PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
|
||||||
PRODUCT_NAME = "jitsi-meet";
|
PRODUCT_NAME = "jitsi-meet";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
};
|
};
|
||||||
|
@ -783,7 +781,6 @@
|
||||||
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
||||||
);
|
);
|
||||||
INFOPLIST_FILE = src/Info.plist;
|
INFOPLIST_FILE = src/Info.plist;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||||
LIBRARY_SEARCH_PATHS = "$(inherited)";
|
LIBRARY_SEARCH_PATHS = "$(inherited)";
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
|
@ -794,7 +791,6 @@
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
|
PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
|
||||||
PRODUCT_NAME = "jitsi-meet";
|
PRODUCT_NAME = "jitsi-meet";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
};
|
};
|
||||||
|
@ -850,10 +846,11 @@
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
||||||
);
|
);
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||||
MTL_ENABLE_DEBUG_INFO = YES;
|
MTL_ENABLE_DEBUG_INFO = YES;
|
||||||
ONLY_ACTIVE_ARCH = YES;
|
ONLY_ACTIVE_ARCH = YES;
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
|
TARGETED_DEVICE_FAMILY = "1,2";
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
};
|
};
|
||||||
|
@ -902,10 +899,11 @@
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
||||||
);
|
);
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||||
MTL_ENABLE_DEBUG_INFO = NO;
|
MTL_ENABLE_DEBUG_INFO = NO;
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
SWIFT_COMPILATION_MODE = wholemodule;
|
SWIFT_COMPILATION_MODE = wholemodule;
|
||||||
|
TARGETED_DEVICE_FAMILY = "1,2";
|
||||||
VALIDATE_PRODUCT = YES;
|
VALIDATE_PRODUCT = YES;
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
|
|
|
@ -555,7 +555,7 @@
|
||||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||||
MTL_ENABLE_DEBUG_INFO = YES;
|
MTL_ENABLE_DEBUG_INFO = YES;
|
||||||
ONLY_ACTIVE_ARCH = YES;
|
ONLY_ACTIVE_ARCH = YES;
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
|
@ -611,7 +611,7 @@
|
||||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||||
MTL_ENABLE_DEBUG_INFO = NO;
|
MTL_ENABLE_DEBUG_INFO = NO;
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
SWIFT_COMPILATION_MODE = wholemodule;
|
SWIFT_COMPILATION_MODE = wholemodule;
|
||||||
|
@ -639,7 +639,6 @@
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = src/Info.plist;
|
INFOPLIST_FILE = src/Info.plist;
|
||||||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
|
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
|
PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
|
@ -650,7 +649,6 @@
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||||
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
|
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
};
|
};
|
||||||
|
@ -671,7 +669,6 @@
|
||||||
ENABLE_BITCODE = YES;
|
ENABLE_BITCODE = YES;
|
||||||
INFOPLIST_FILE = src/Info.plist;
|
INFOPLIST_FILE = src/Info.plist;
|
||||||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
|
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
|
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
|
PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
|
@ -681,7 +678,6 @@
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "";
|
SWIFT_OBJC_BRIDGING_HEADER = "";
|
||||||
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
|
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
|
|
||||||
import Platform from '../react/Platform';
|
|
||||||
import { equals, ReducerRegistry, set } from '../redux';
|
import { equals, ReducerRegistry, set } from '../redux';
|
||||||
|
|
||||||
import { _UPDATE_CONFIG, CONFIG_WILL_LOAD, LOAD_CONFIG_ERROR, SET_CONFIG } from './actionTypes';
|
import { _UPDATE_CONFIG, CONFIG_WILL_LOAD, LOAD_CONFIG_ERROR, SET_CONFIG } from './actionTypes';
|
||||||
|
@ -21,15 +20,6 @@ import { _cleanupConfig } from './functions';
|
||||||
const INITIAL_NON_RN_STATE = {
|
const INITIAL_NON_RN_STATE = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* When we should enable H.264 on mobile. iOS 10 crashes so we disable it there.
|
|
||||||
* See: https://bugs.chromium.org/p/webrtc/issues/detail?id=11002
|
|
||||||
* Note that this is only used for P2P calls.
|
|
||||||
*
|
|
||||||
* @type {boolean}
|
|
||||||
*/
|
|
||||||
const RN_ENABLE_H264 = navigator.product === 'ReactNative' && !(Platform.OS === 'ios' && Platform.Version === 10);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The initial state of the feature base/config when executing in a React Native
|
* The initial state of the feature base/config when executing in a React Native
|
||||||
* environment. The mandatory configuration to be passed to JitsiMeetJS#init().
|
* environment. The mandatory configuration to be passed to JitsiMeetJS#init().
|
||||||
|
@ -50,11 +40,9 @@ const INITIAL_RN_STATE = {
|
||||||
// fastest to merely disable them.
|
// fastest to merely disable them.
|
||||||
disableAudioLevels: true,
|
disableAudioLevels: true,
|
||||||
|
|
||||||
disableH264: !RN_ENABLE_H264,
|
|
||||||
|
|
||||||
p2p: {
|
p2p: {
|
||||||
disableH264: !RN_ENABLE_H264,
|
disableH264: false,
|
||||||
preferH264: RN_ENABLE_H264
|
preferH264: true
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
// @flow
|
// @flow
|
||||||
|
|
||||||
import React, { PureComponent, type Node } from 'react';
|
import React, { PureComponent, type Node } from 'react';
|
||||||
import { Platform, SafeAreaView, ScrollView, View } from 'react-native';
|
import { SafeAreaView, ScrollView, View } from 'react-native';
|
||||||
|
|
||||||
import { ColorSchemeRegistry } from '../../../color-scheme';
|
import { ColorSchemeRegistry } from '../../../color-scheme';
|
||||||
import { SlidingView } from '../../../react';
|
import { SlidingView } from '../../../react';
|
||||||
|
@ -61,43 +61,20 @@ class BottomSheet extends PureComponent<Props> {
|
||||||
styles.sheetItemContainer,
|
styles.sheetItemContainer,
|
||||||
_styles.sheet
|
_styles.sheet
|
||||||
] }>
|
] }>
|
||||||
{ this._getWrappedContent() }
|
<SafeAreaView>
|
||||||
</View>
|
|
||||||
</View>
|
|
||||||
</SlidingView>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wraps the content when needed (iOS 11 and above), or just returns the original content.
|
|
||||||
*
|
|
||||||
* @returns {React$Element}
|
|
||||||
*/
|
|
||||||
_getWrappedContent() {
|
|
||||||
const content = (
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
bounces = { false }
|
bounces = { false }
|
||||||
showsVerticalScrollIndicator = { false } >
|
showsVerticalScrollIndicator = { false } >
|
||||||
{ this.props.children }
|
{ this.props.children }
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
);
|
|
||||||
|
|
||||||
if (Platform.OS === 'ios') {
|
|
||||||
const majorVersionIOS = parseInt(Platform.Version, 10);
|
|
||||||
|
|
||||||
if (majorVersionIOS > 10) {
|
|
||||||
return (
|
|
||||||
<SafeAreaView>
|
|
||||||
{ content }
|
|
||||||
</SafeAreaView>
|
</SafeAreaView>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</SlidingView>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return content;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maps part of the Redux state to the props of this component.
|
* Maps part of the Redux state to the props of this component.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,18 +1,14 @@
|
||||||
// @flow
|
// @flow
|
||||||
|
|
||||||
import React, { Component, type Node } from 'react';
|
import React, { PureComponent, type Node } from 'react';
|
||||||
import { Platform, SafeAreaView, StatusBar, View } from 'react-native';
|
import { SafeAreaView, StatusBar, View } from 'react-native';
|
||||||
|
|
||||||
import { ColorSchemeRegistry } from '../../../color-scheme';
|
import { ColorSchemeRegistry } from '../../../color-scheme';
|
||||||
import { connect } from '../../../redux';
|
import { connect } from '../../../redux';
|
||||||
import { isDarkColor } from '../../../styles';
|
import { isDarkColor } from '../../../styles';
|
||||||
|
|
||||||
import { HEADER_PADDING } from './headerstyles';
|
// Register style
|
||||||
|
import './headerstyles';
|
||||||
/**
|
|
||||||
* Compatibility header padding size for iOS 10 (and older) devices.
|
|
||||||
*/
|
|
||||||
const IOS10_PADDING = 20;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constanst for the (currently) supported statusbar colors.
|
* Constanst for the (currently) supported statusbar colors.
|
||||||
|
@ -44,19 +40,7 @@ type Props = {
|
||||||
/**
|
/**
|
||||||
* A generic screen header component.
|
* A generic screen header component.
|
||||||
*/
|
*/
|
||||||
class Header extends Component<Props> {
|
class Header extends PureComponent<Props> {
|
||||||
/**
|
|
||||||
* Initializes a new {@code Header} instance.
|
|
||||||
*
|
|
||||||
* @inheritdoc
|
|
||||||
*/
|
|
||||||
constructor(props: Props) {
|
|
||||||
super(props);
|
|
||||||
|
|
||||||
this._getIOS10CompatiblePadding
|
|
||||||
= this._getIOS10CompatiblePadding.bind(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implements React's {@link Component#render()}.
|
* Implements React's {@link Component#render()}.
|
||||||
*
|
*
|
||||||
|
@ -66,11 +50,7 @@ class Header extends Component<Props> {
|
||||||
const { _styles } = this.props;
|
const { _styles } = this.props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View
|
<View style = { _styles.headerOverlay }>
|
||||||
style = { [
|
|
||||||
_styles.headerOverlay,
|
|
||||||
this._getIOS10CompatiblePadding()
|
|
||||||
] } >
|
|
||||||
<StatusBar
|
<StatusBar
|
||||||
backgroundColor = { _styles.statusBar }
|
backgroundColor = { _styles.statusBar }
|
||||||
barStyle = { this._getStatusBarContentColor() }
|
barStyle = { this._getStatusBarContentColor() }
|
||||||
|
@ -90,32 +70,6 @@ class Header extends Component<Props> {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
_getIOS10CompatiblePadding: () => Object;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a padding for iOS 10 (and older) devices to avoid clipping with the
|
|
||||||
* status bar.
|
|
||||||
* Note: This is a workaround for iOS 10 (and older) devices only to fix
|
|
||||||
* usability, but it doesn't take orientation into account, so unnecessary
|
|
||||||
* padding is rendered in some cases.
|
|
||||||
*
|
|
||||||
* @private
|
|
||||||
* @returns {Object}
|
|
||||||
*/
|
|
||||||
_getIOS10CompatiblePadding() {
|
|
||||||
if (Platform.OS === 'ios') {
|
|
||||||
const majorVersionIOS = parseInt(Platform.Version, 10);
|
|
||||||
|
|
||||||
if (majorVersionIOS <= 10) {
|
|
||||||
return {
|
|
||||||
paddingTop: HEADER_PADDING + IOS10_PADDING
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calculates the color of the statusbar content (light or dark) based on
|
* Calculates the color of the statusbar content (light or dark) based on
|
||||||
* certain criterias.
|
* certain criterias.
|
||||||
|
|
|
@ -7,8 +7,7 @@ import { BoxModel } from '../../../styles';
|
||||||
|
|
||||||
const HEADER_FONT_SIZE = 18;
|
const HEADER_FONT_SIZE = 18;
|
||||||
const HEADER_HEIGHT = 48;
|
const HEADER_HEIGHT = 48;
|
||||||
|
const HEADER_PADDING = BoxModel.padding / 2;
|
||||||
export const HEADER_PADDING = BoxModel.padding / 2;
|
|
||||||
|
|
||||||
ColorSchemeRegistry.register('Header', {
|
ColorSchemeRegistry.register('Header', {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue