diff --git a/native/account/logged-out-modal.react.js b/native/account/logged-out-modal.react.js --- a/native/account/logged-out-modal.react.js +++ b/native/account/logged-out-modal.react.js @@ -1,5 +1,6 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome'; import _isEqual from 'lodash/fp/isEqual'; import * as React from 'react'; import { @@ -15,7 +16,6 @@ } from 'react-native'; import Animated, { EasingNode } from 'react-native-reanimated'; import { SafeAreaView } from 'react-native-safe-area-context'; -import Icon from '@expo/vector-icons/FontAwesome'; import { useDispatch } from 'react-redux'; import { isLoggedIn } from 'lib/selectors/user-selectors'; diff --git a/native/account/panel-components.react.js b/native/account/panel-components.react.js --- a/native/account/panel-components.react.js +++ b/native/account/panel-components.react.js @@ -1,5 +1,6 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome'; import * as React from 'react'; import { View, @@ -9,7 +10,6 @@ ScrollView, } from 'react-native'; import Animated from 'react-native-reanimated'; -import Icon from '@expo/vector-icons/FontAwesome'; import type { LoadingStatus } from 'lib/types/loading-types'; diff --git a/native/calendar/entry.react.js b/native/calendar/entry.react.js --- a/native/calendar/entry.react.js +++ b/native/calendar/entry.react.js @@ -1,5 +1,6 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome'; import invariant from 'invariant'; import _isEqual from 'lodash/fp/isEqual'; import _omit from 'lodash/fp/omit'; @@ -14,7 +15,6 @@ LayoutAnimation, Keyboard, } from 'react-native'; -import Icon from '@expo/vector-icons/FontAwesome'; import { useDispatch } from 'react-redux'; import shallowequal from 'shallowequal'; import tinycolor from 'tinycolor2'; diff --git a/native/calendar/loading-indicator.react.js b/native/calendar/loading-indicator.react.js --- a/native/calendar/loading-indicator.react.js +++ b/native/calendar/loading-indicator.react.js @@ -1,8 +1,8 @@ // @flow +import Icon from '@expo/vector-icons/Feather'; import * as React from 'react'; import { ActivityIndicator, StyleSheet, Platform } from 'react-native'; -import Icon from '@expo/vector-icons/Feather'; import type { LoadingStatus } from 'lib/types/loading-types'; diff --git a/native/chat/chat-input-bar.react.js b/native/chat/chat-input-bar.react.js --- a/native/chat/chat-input-bar.react.js +++ b/native/chat/chat-input-bar.react.js @@ -1,5 +1,6 @@ // @flow +import Icon from '@expo/vector-icons/Ionicons'; import invariant from 'invariant'; import _throttle from 'lodash/throttle'; import * as React from 'react'; @@ -15,7 +16,6 @@ } from 'react-native'; import { TextInputKeyboardMangerIOS } from 'react-native-keyboard-input'; import Animated, { EasingNode } from 'react-native-reanimated'; -import Icon from '@expo/vector-icons/Ionicons'; import { useDispatch } from 'react-redux'; import { diff --git a/native/chat/chat-thread-list-see-more-sidebars.react.js b/native/chat/chat-thread-list-see-more-sidebars.react.js --- a/native/chat/chat-thread-list-see-more-sidebars.react.js +++ b/native/chat/chat-thread-list-see-more-sidebars.react.js @@ -1,8 +1,8 @@ // @flow +import Icon from '@expo/vector-icons/Ionicons'; import * as React from 'react'; import { Text } from 'react-native'; -import Icon from '@expo/vector-icons/Ionicons'; import type { ThreadInfo } from 'lib/types/thread-types'; diff --git a/native/chat/chat-thread-list.react.js b/native/chat/chat-thread-list.react.js --- a/native/chat/chat-thread-list.react.js +++ b/native/chat/chat-thread-list.react.js @@ -1,5 +1,6 @@ // @flow +import IonIcon from '@expo/vector-icons/Ionicons'; import invariant from 'invariant'; import _sum from 'lodash/fp/sum'; import * as React from 'react'; @@ -13,7 +14,6 @@ } from 'react-native'; import { FloatingAction } from 'react-native-floating-action'; import Animated from 'react-native-reanimated'; -import IonIcon from '@expo/vector-icons/Ionicons'; import { createSelector } from 'reselect'; import { searchUsers } from 'lib/actions/user-actions'; diff --git a/native/chat/composed-message.react.js b/native/chat/composed-message.react.js --- a/native/chat/composed-message.react.js +++ b/native/chat/composed-message.react.js @@ -1,10 +1,10 @@ // @flow +import Icon from '@expo/vector-icons/Feather'; import invariant from 'invariant'; import * as React from 'react'; import { StyleSheet, View } from 'react-native'; import Animated from 'react-native-reanimated'; -import Icon from '@expo/vector-icons/Feather'; import { createMessageReply } from 'lib/shared/message-utils'; import { assertComposableMessageType } from 'lib/types/message-types'; diff --git a/native/chat/inline-multimedia.react.js b/native/chat/inline-multimedia.react.js --- a/native/chat/inline-multimedia.react.js +++ b/native/chat/inline-multimedia.react.js @@ -1,10 +1,10 @@ // @flow +import Icon from '@expo/vector-icons/Feather'; +import IonIcon from '@expo/vector-icons/Ionicons'; import * as React from 'react'; import { View, StyleSheet, Text } from 'react-native'; import * as Progress from 'react-native-progress'; -import Icon from '@expo/vector-icons/Feather'; -import IonIcon from '@expo/vector-icons/Ionicons'; import tinycolor from 'tinycolor2'; import { isLocalUploadID } from 'lib/media/media-utils'; diff --git a/native/chat/message-list-header-title.react.js b/native/chat/message-list-header-title.react.js --- a/native/chat/message-list-header-title.react.js +++ b/native/chat/message-list-header-title.react.js @@ -1,12 +1,12 @@ // @flow +import Icon from '@expo/vector-icons/Ionicons'; import { HeaderTitle, type StackHeaderTitleInputProps, } from '@react-navigation/elements'; import * as React from 'react'; import { View, Platform } from 'react-native'; -import Icon from '@expo/vector-icons/Ionicons'; import type { ThreadInfo } from 'lib/types/thread-types'; import { firstLine } from 'lib/utils/string-utils'; diff --git a/native/chat/new-messages-pill.react.js b/native/chat/new-messages-pill.react.js --- a/native/chat/new-messages-pill.react.js +++ b/native/chat/new-messages-pill.react.js @@ -1,8 +1,8 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome'; import * as React from 'react'; import { TouchableOpacity, View, Text, Platform, Animated } from 'react-native'; -import Icon from '@expo/vector-icons/FontAwesome'; import { useStyles } from '../themes/colors'; import type { ViewStyle } from '../types/styles'; diff --git a/native/chat/relationship-prompt.react.js b/native/chat/relationship-prompt.react.js --- a/native/chat/relationship-prompt.react.js +++ b/native/chat/relationship-prompt.react.js @@ -1,8 +1,8 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome5'; import * as React from 'react'; import { Alert, Text, View } from 'react-native'; -import Icon from '@expo/vector-icons/FontAwesome5'; import { useRelationshipPrompt } from 'lib/hooks/relationship-prompt'; import { userRelationshipStatus } from 'lib/types/relationship-types'; diff --git a/native/chat/settings/color-selector-modal.react.js b/native/chat/settings/color-selector-modal.react.js --- a/native/chat/settings/color-selector-modal.react.js +++ b/native/chat/settings/color-selector-modal.react.js @@ -1,8 +1,8 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome'; import * as React from 'react'; import { TouchableHighlight, Alert } from 'react-native'; -import Icon from '@expo/vector-icons/FontAwesome'; import { changeThreadSettingsActionTypes, diff --git a/native/chat/settings/compose-subchannel-modal.react.js b/native/chat/settings/compose-subchannel-modal.react.js --- a/native/chat/settings/compose-subchannel-modal.react.js +++ b/native/chat/settings/compose-subchannel-modal.react.js @@ -1,8 +1,8 @@ // @flow +import IonIcon from '@expo/vector-icons/Ionicons'; import * as React from 'react'; import { Text } from 'react-native'; -import IonIcon from '@expo/vector-icons/Ionicons'; import { threadTypeDescriptions } from 'lib/shared/thread-utils'; import { type ThreadInfo, threadTypes } from 'lib/types/thread-types'; diff --git a/native/chat/settings/thread-settings-list-action.react.js b/native/chat/settings/thread-settings-list-action.react.js --- a/native/chat/settings/thread-settings-list-action.react.js +++ b/native/chat/settings/thread-settings-list-action.react.js @@ -1,9 +1,9 @@ // @flow -import * as React from 'react'; -import { View, Text, Platform } from 'react-native'; import type { IoniconsGlyphs } from '@expo/vector-icons'; import Icon from '@expo/vector-icons/Ionicons'; +import * as React from 'react'; +import { View, Text, Platform } from 'react-native'; import Button from '../../components/button.react'; import { useStyles } from '../../themes/colors'; diff --git a/native/chat/swipeable-message.react.js b/native/chat/swipeable-message.react.js --- a/native/chat/swipeable-message.react.js +++ b/native/chat/swipeable-message.react.js @@ -1,5 +1,6 @@ // @flow +import type { IconProps } from '@expo/vector-icons'; import { GestureHandlerRefContext } from '@react-navigation/stack'; import * as Haptics from 'expo-haptics'; import * as React from 'react'; @@ -16,7 +17,6 @@ Extrapolate, type SharedValue, } from 'react-native-reanimated'; -import type { IconProps } from '@expo/vector-icons'; import tinycolor from 'tinycolor2'; import CommIcon from '../components/comm-icon.react'; diff --git a/native/chat/swipeable-thread.react.js b/native/chat/swipeable-thread.react.js --- a/native/chat/swipeable-thread.react.js +++ b/native/chat/swipeable-thread.react.js @@ -1,8 +1,8 @@ // @flow +import MaterialIcon from '@expo/vector-icons/MaterialCommunityIcons'; import { useNavigation } from '@react-navigation/native'; import * as React from 'react'; -import MaterialIcon from '@expo/vector-icons/MaterialCommunityIcons'; import useToggleUnreadStatus from 'lib/hooks/toggle-unread-status'; import type { ThreadInfo } from 'lib/types/thread-types'; diff --git a/native/chat/thread-settings-button.react.js b/native/chat/thread-settings-button.react.js --- a/native/chat/thread-settings-button.react.js +++ b/native/chat/thread-settings-button.react.js @@ -1,7 +1,7 @@ // @flow -import * as React from 'react'; import Icon from '@expo/vector-icons/Ionicons'; +import * as React from 'react'; import { type ThreadInfo } from 'lib/types/thread-types'; diff --git a/native/components/action-row.react.js b/native/components/action-row.react.js --- a/native/components/action-row.react.js +++ b/native/components/action-row.react.js @@ -1,9 +1,9 @@ // @flow +import type { IoniconsGlyphs } from '@expo/vector-icons'; +import RawIcon from '@expo/vector-icons/Ionicons'; import * as React from 'react'; import { View, Text as RawText } from 'react-native'; -import RawIcon from '@expo/vector-icons/Ionicons'; -import type { IoniconsGlyphs } from '@expo/vector-icons'; import Button from '../components/button.react'; import { useColors, useStyles } from '../themes/colors'; diff --git a/native/components/thread-ancestors-label.react.js b/native/components/thread-ancestors-label.react.js --- a/native/components/thread-ancestors-label.react.js +++ b/native/components/thread-ancestors-label.react.js @@ -1,8 +1,8 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome5'; import * as React from 'react'; import { Text, View } from 'react-native'; -import Icon from '@expo/vector-icons/FontAwesome5'; import { useAncestorThreads } from 'lib/shared/ancestor-threads'; import { type ThreadInfo } from 'lib/types/thread-types'; diff --git a/native/components/thread-ancestors.react.js b/native/components/thread-ancestors.react.js --- a/native/components/thread-ancestors.react.js +++ b/native/components/thread-ancestors.react.js @@ -1,8 +1,8 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome5'; import * as React from 'react'; import { View, ScrollView } from 'react-native'; -import Icon from '@expo/vector-icons/FontAwesome5'; import { ancestorThreadInfos } from 'lib/selectors/thread-selectors'; import type { ThreadInfo } from 'lib/types/thread-types'; diff --git a/native/components/thread-icon.react.js b/native/components/thread-icon.react.js --- a/native/components/thread-icon.react.js +++ b/native/components/thread-icon.react.js @@ -1,8 +1,8 @@ // @flow +import EntypoIcon from '@expo/vector-icons/Entypo'; import * as React from 'react'; import { StyleSheet } from 'react-native'; -import EntypoIcon from '@expo/vector-icons/Entypo'; import { threadTypes, type ThreadType } from 'lib/types/thread-types'; diff --git a/native/crash.react.js b/native/crash.react.js --- a/native/crash.react.js +++ b/native/crash.react.js @@ -1,5 +1,6 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome'; import Clipboard from '@react-native-clipboard/clipboard'; import invariant from 'invariant'; import _shuffle from 'lodash/fp/shuffle'; @@ -13,7 +14,6 @@ ActivityIndicator, } from 'react-native'; import ExitApp from 'react-native-exit-app'; -import Icon from '@expo/vector-icons/FontAwesome'; import { sendReportActionTypes, sendReport } from 'lib/actions/report-actions'; import { logOutActionTypes, logOut } from 'lib/actions/user-actions'; diff --git a/native/media/camera-modal.react.js b/native/media/camera-modal.react.js --- a/native/media/camera-modal.react.js +++ b/native/media/camera-modal.react.js @@ -1,5 +1,6 @@ // @flow +import Icon from '@expo/vector-icons/Ionicons'; import invariant from 'invariant'; import * as React from 'react'; import { @@ -24,7 +25,6 @@ import Reanimated, { EasingNode as ReanimatedEasing, } from 'react-native-reanimated'; -import Icon from '@expo/vector-icons/Ionicons'; import { useDispatch } from 'react-redux'; import { pathFromURI, filenameFromPathOrURI } from 'lib/media/file-utils'; diff --git a/native/media/media-gallery-media.react.js b/native/media/media-gallery-media.react.js --- a/native/media/media-gallery-media.react.js +++ b/native/media/media-gallery-media.react.js @@ -1,5 +1,7 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome'; +import MaterialIcon from '@expo/vector-icons/MaterialIcons'; import LottieView from 'lottie-react-native'; import * as React from 'react'; import { @@ -14,8 +16,6 @@ import Reanimated, { EasingNode as ReanimatedEasing, } from 'react-native-reanimated'; -import Icon from '@expo/vector-icons/FontAwesome'; -import MaterialIcon from '@expo/vector-icons/MaterialIcons'; import Video from 'react-native-video'; import { type MediaLibrarySelection } from 'lib/types/media-types'; diff --git a/native/media/send-media-button.react.js b/native/media/send-media-button.react.js --- a/native/media/send-media-button.react.js +++ b/native/media/send-media-button.react.js @@ -1,5 +1,6 @@ // @flow +import Icon from '@expo/vector-icons/FontAwesome'; import * as React from 'react'; import { TouchableOpacity, @@ -9,7 +10,6 @@ Platform, Animated, } from 'react-native'; -import Icon from '@expo/vector-icons/FontAwesome'; import type { ViewStyle } from '../types/styles'; diff --git a/native/media/video-playback-modal.react.js b/native/media/video-playback-modal.react.js --- a/native/media/video-playback-modal.react.js +++ b/native/media/video-playback-modal.react.js @@ -1,5 +1,6 @@ // @flow +import Icon from '@expo/vector-icons/MaterialCommunityIcons'; import invariant from 'invariant'; import * as React from 'react'; import { useState } from 'react'; @@ -7,7 +8,6 @@ import { TapGestureHandler } from 'react-native-gesture-handler'; import * as Progress from 'react-native-progress'; import Animated from 'react-native-reanimated'; -import Icon from '@expo/vector-icons/MaterialCommunityIcons'; import Video from 'react-native-video'; import { useIsAppBackgroundedOrInactive } from 'lib/shared/lifecycle-utils'; diff --git a/native/root.react.js b/native/root.react.js --- a/native/root.react.js +++ b/native/root.react.js @@ -9,6 +9,7 @@ import invariant from 'invariant'; import * as React from 'react'; import { Platform, UIManager, StyleSheet, LogBox } from 'react-native'; +import { GestureHandlerRootView } from 'react-native-gesture-handler'; import Orientation from 'react-native-orientation-locker'; import { SafeAreaProvider, @@ -16,7 +17,6 @@ } from 'react-native-safe-area-context'; import { Provider } from 'react-redux'; import { PersistGate as ReduxPersistGate } from 'redux-persist/integration/react'; -import { GestureHandlerRootView } from 'react-native-gesture-handler'; import { actionLogger } from 'lib/utils/action-logger'; diff --git a/native/themes/fonts.js b/native/themes/fonts.js --- a/native/themes/fonts.js +++ b/native/themes/fonts.js @@ -4,13 +4,13 @@ import Feather from '@expo/vector-icons/Feather'; import FontAwesome from '@expo/vector-icons/FontAwesome'; import FontAwesome5 from '@expo/vector-icons/FontAwesome5'; -import Ionicons from '@expo/vector-icons/Ionicons' +import Ionicons from '@expo/vector-icons/Ionicons'; import MaterialCommunityIcons from '@expo/vector-icons/MaterialCommunityIcons'; import MaterialIcon from '@expo/vector-icons/MaterialIcons'; import { useFonts } from 'expo-font'; -import SWMansionIcons from '../fonts/SWMansionIcons.ttf'; import CommIcons from '../fonts/CommIcons.ttf'; +import SWMansionIcons from '../fonts/SWMansionIcons.ttf'; function useLoadCommFonts(): boolean { const [fontsLoaded] = useFonts({