Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump iOS target to iOS 13 and remove version checks #4327

Merged
merged 3 commits into from
Nov 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions ios/Rainbow.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@
INFOPLIST_FILE = ImageNotification/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = ImageNotification;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Rainbow. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 1.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand Down Expand Up @@ -1409,7 +1409,7 @@
INFOPLIST_FILE = ImageNotification/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = ImageNotification;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Rainbow. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 1.0;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -1457,7 +1457,7 @@
INFOPLIST_FILE = ImageNotification/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = ImageNotification;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Rainbow. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 1.0;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -1505,7 +1505,7 @@
INFOPLIST_FILE = ImageNotification/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = ImageNotification;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Rainbow. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 1.0;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -1568,7 +1568,7 @@
);
INFOPLIST_FILE = Rainbow/Info.plist;
INTENTS_CODEGEN_LANGUAGE = "Objective-C";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1633,7 +1633,7 @@
);
INFOPLIST_FILE = Rainbow/Info.plist;
INTENTS_CODEGEN_LANGUAGE = "Objective-C";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1694,7 +1694,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INTENTS_CODEGEN_LANGUAGE = Swift;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
Expand Down Expand Up @@ -1742,7 +1742,7 @@
);
INFOPLIST_FILE = Rainbow/Info.plist;
INTENTS_CODEGEN_LANGUAGE = "Objective-C";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1804,7 +1804,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INTENTS_CODEGEN_LANGUAGE = Swift;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
Expand Down Expand Up @@ -1852,7 +1852,7 @@
);
INFOPLIST_FILE = Rainbow/Info.plist;
INTENTS_CODEGEN_LANGUAGE = "Objective-C";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1918,7 +1918,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INTENTS_CODEGEN_LANGUAGE = Swift;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "";
Expand Down Expand Up @@ -1963,7 +1963,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INTENTS_CODEGEN_LANGUAGE = Swift;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
Expand Down
6 changes: 2 additions & 4 deletions ios/ThemeModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ + (BOOL)requiresMainQueueSetup
RCT_EXPORT_MODULE()

RCT_EXPORT_METHOD(setMode:(NSString *)mode) {
if (@available(iOS 13.0, *)) {
((AppDelegate*) UIApplication.sharedApplication.delegate).window.overrideUserInterfaceStyle =
[mode isEqualToString:@"dark"] ? UIUserInterfaceStyleDark : UIUserInterfaceStyleLight;
}
((AppDelegate*) UIApplication.sharedApplication.delegate).window.overrideUserInterfaceStyle =
[mode isEqualToString:@"dark"] ? UIUserInterfaceStyleDark : UIUserInterfaceStyleLight;
}

@end
4 changes: 2 additions & 2 deletions src/components/ens-profile/ActionButtons/SendButton.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React, { useCallback } from 'react';
import ActionButton from './ActionButton';
import isNativeStackAvailable from '@/helpers/isNativeStackAvailable';
import { useNavigation } from '@/navigation';
import Routes from '@/navigation/routesNames';
import { IS_IOS } from '@/env';

export default function SendButton({ ensName }: { ensName?: string }) {
const { navigate } = useNavigation();
const handlePressSend = useCallback(async () => {
if (isNativeStackAvailable) {
if (IS_IOS) {
navigate(Routes.SEND_FLOW, {
params: {
address: ensName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import { FloatingEmojisTapper } from '../floating-emojis';
import { AssetPanel, FloatingPanels } from '../floating-panels';
import { Centered } from '../layout';
import { Text } from '../text';
import isNativeStackAvailable from '@/helpers/isNativeStackAvailable';
import { useDimensions } from '@/hooks';
import { wyreSupportedCountries } from '@/references';
import styled from '@/styled-thing';
import { padding } from '@/styles';
import { neverRerender } from '@/utils';
import { IS_IOS } from '@/env';

const Panel = styled(FloatingPanels)(
({ deviceDimensions: { isTallPhone, width } }) => ({
marginBottom: (isTallPhone ? 90 : 45) + (isNativeStackAvailable ? 10 : 0),
marginBottom: (isTallPhone ? 90 : 45) + (IS_IOS ? 10 : 0),
maxWidth: Math.min(270, width - 100),
})
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
import { useRoute } from '@react-navigation/native';
import React from 'react';
import isNativeStackAvailable from '../../../helpers/isNativeStackAvailable';
import TouchableBackdrop from '../../TouchableBackdrop';
import { AssetPanel, FloatingPanels } from '../../floating-panels';
import { KeyboardFixedOpenLayout } from '../../layout';
import { useDimensions } from '@/hooks';
import { IS_IOS } from '@/env';

export default function ProfileModalContainer({ onPressBackdrop, ...props }) {
const { width: deviceWidth } = useDimensions();
const { params } = useRoute();

return (
<KeyboardFixedOpenLayout
additionalPadding={
params?.additionalPadding && isNativeStackAvailable ? 80 : 0
}
additionalPadding={params?.additionalPadding && IS_IOS ? 80 : 0}
position="absolute"
>
<TouchableBackdrop onPress={onPressBackdrop} />
Expand Down
4 changes: 2 additions & 2 deletions src/components/sheet/sheet-action-buttons/SendActionButton.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import lang from 'i18n-js';
import React, { useCallback } from 'react';
import isNativeStackAvailable from '../../../helpers/isNativeStackAvailable';
import SheetActionButton from './SheetActionButton';
import { useExpandedStateNavigation } from '@/hooks';
import Routes from '@/navigation/routesNames';
import { IS_IOS } from '@/env';

function SendActionButton({ asset, color: givenColor, ...props }) {
const { colors } = useTheme();
Expand All @@ -13,7 +13,7 @@ function SendActionButton({ asset, color: givenColor, ...props }) {
() =>
navigate(Routes.SEND_FLOW, params => {
const updatedParams = { ...params, asset };
return isNativeStackAvailable
return IS_IOS
? {
params: updatedParams,
screen: Routes.SEND_SHEET,
Expand Down
17 changes: 5 additions & 12 deletions src/components/showcase/ShowcaseHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
import { Text, TruncatedAddress } from '../text';
import { getContacts } from '@/handlers/localstorage/contacts';
import { isHexString } from '@/handlers/web3';
import isNativeStackAvailable from '@/helpers/isNativeStackAvailable';
import { useImportingWallet, useWallets } from '@/hooks';
import { useNavigation } from '@/navigation';
import Routes from '@/navigation/routesNames';
Expand Down Expand Up @@ -137,18 +136,12 @@ export function Header() {

const onSend = useCallback(async () => {
goBack();
if (isNativeStackAvailable || android) {
navigate(Routes.SEND_FLOW, {
params: {
address: contextValue?.addressOrDomain || contextValue?.address,
},
screen: Routes.SEND_SHEET,
});
} else {
navigate(Routes.SEND_FLOW, {
navigate(Routes.SEND_FLOW, {
params: {
address: contextValue?.addressOrDomain || contextValue?.address,
});
}
},
screen: Routes.SEND_SHEET,
});
}, [contextValue?.address, contextValue?.addressOrDomain, goBack, navigate]);

const { handleSetSeedPhrase, handlePressImportButton } = useImportingWallet();
Expand Down
4 changes: 0 additions & 4 deletions src/helpers/isNativeStackAvailable.ts

This file was deleted.

6 changes: 3 additions & 3 deletions src/hooks/useMagicAutofocus.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { useFocusEffect, useIsFocused } from '@react-navigation/native';
import { useCallback, useRef } from 'react';
import { InteractionManager, TextInput } from 'react-native';
import isNativeStackAvailable from '../helpers/isNativeStackAvailable';
import { setListener } from '../navigation/nativeStackHelpers';
import { setListener } from '@/navigation/nativeStackHelpers';
import useInteraction from './useInteraction';
import { IS_ANDROID } from '@/env';

const { currentlyFocusedInput, focusTextInput } = TextInput.State;

Expand Down Expand Up @@ -102,7 +102,7 @@ export default function useMagicAutofocus(
delay = false;
}, 200);
});
} else if (!isNativeStackAvailable) {
} else if (IS_ANDROID) {
// We need to do this in order to assure that the input gets focused
// when using fallback stacks.
InteractionManager.runAfterInteractions(fallbackRefocusLastInput);
Expand Down
89 changes: 13 additions & 76 deletions src/navigation/Routes.ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ import Routes from './routesNames';
import { ExchangeModalNavigator } from './index';
import { StatusBarHelper } from '@/helpers';
import useExperimentalFlag, { PROFILES } from '@/config/experimentalHooks';
import isNativeStackAvailable from '@/helpers/isNativeStackAvailable';
import { omitFlatten } from '@/helpers/utilities';
import createNativeStackNavigator from '@/react-native-cool-modals/createNativeStackNavigator';
import QRScannerScreen from '@/screens/QRScannerScreen';
Expand Down Expand Up @@ -171,7 +170,7 @@ function MainNavigator() {
);
}

function MainNavigatorWrapper() {
function MainStack() {
return (
<Stack.Navigator
initialRouteName={Routes.MAIN_NAVIGATOR_WRAPPER}
Expand All @@ -186,58 +185,6 @@ function MainNavigatorWrapper() {
);
}

function NativeStackFallbackNavigator() {
return (
<Stack.Navigator
initialRouteName={Routes.MAIN_NAVIGATOR}
{...stackNavigationConfig}
screenOptions={defaultScreenStackOptions}
>
<Stack.Screen component={MainNavigator} name={Routes.MAIN_NAVIGATOR} />
<Stack.Screen
component={ImportSeedPhraseSheet}
name={Routes.IMPORT_SEED_PHRASE_SHEET}
options={{
...sheetPreset,
onTransitionStart: StatusBarHelper.setLightContent,
}}
/>
<Stack.Screen
component={AddCashSheet}
name={Routes.ADD_CASH_SHEET}
options={sheetPreset}
/>
<Stack.Screen
component={ModalScreen}
name={Routes.MODAL_SCREEN}
options={overlayExpandedPreset}
/>
<Stack.Screen
component={SendSheet}
name={Routes.SEND_SHEET}
options={{
...omitFlatten(sheetPreset, 'gestureResponseDistance'),
onTransitionStart: StatusBarHelper.setLightContent,
}}
/>
<Stack.Screen
component={ModalScreen}
name={Routes.SUPPORTED_COUNTRIES_MODAL_SCREEN}
options={overlayExpandedPreset}
/>
<Stack.Screen
component={ExchangeModalNavigator}
name={Routes.EXCHANGE_MODAL}
options={exchangePreset}
/>
</Stack.Navigator>
);
}

const MainStack = isNativeStackAvailable
? MainNavigatorWrapper
: NativeStackFallbackNavigator;

function NativeStackNavigator() {
const { colors, isDarkMode } = useTheme();
const profilesEnabled = useExperimentalFlag(PROFILES);
Expand Down Expand Up @@ -467,28 +414,18 @@ function NativeStackNavigator() {
/>
</>
)}
{isNativeStackAvailable ? (
<>
<NativeStack.Screen
component={SendFlowNavigator}
name={Routes.SEND_SHEET_NAVIGATOR}
/>
<NativeStack.Screen
component={ImportSeedPhraseFlowNavigator}
name={Routes.IMPORT_SEED_PHRASE_SHEET_NAVIGATOR}
/>
<NativeStack.Screen
component={AddCashFlowNavigator}
name={Routes.ADD_CASH_SCREEN_NAVIGATOR}
/>
</>
) : (
<NativeStack.Screen
component={ImportSeedPhraseFlowNavigator}
name={Routes.IMPORT_SEED_PHRASE_SHEET_NAVIGATOR}
options={{ customStack: true }}
/>
)}
<NativeStack.Screen
component={SendFlowNavigator}
name={Routes.SEND_SHEET_NAVIGATOR}
/>
<NativeStack.Screen
component={ImportSeedPhraseFlowNavigator}
name={Routes.IMPORT_SEED_PHRASE_SHEET_NAVIGATOR}
/>
<NativeStack.Screen
component={AddCashFlowNavigator}
name={Routes.ADD_CASH_SCREEN_NAVIGATOR}
/>
<NativeStack.Screen
component={WalletConnectApprovalSheet}
name={Routes.WALLET_CONNECT_APPROVAL_SHEET}
Expand Down
Loading