Skip to content

Commit d521dd6

Browse files
committed
Run automated theme migration
1 parent 9ce4246 commit d521dd6

File tree

422 files changed

+1465
-881
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

422 files changed

+1465
-881
lines changed

src/components/AddPlaidBankAccount.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import useNetwork from '@hooks/useNetwork';
99
import KeyboardShortcut from '@libs/KeyboardShortcut';
1010
import Log from '@libs/Log';
1111
import {plaidDataPropTypes} from '@pages/ReimbursementAccount/plaidDataPropTypes';
12-
import styles from '@styles/styles';
13-
import themeColors from '@styles/themes/default';
12+
import useTheme from '@styles/themes/useTheme';
13+
import useThemeStyles from '@styles/useThemeStyles';
1414
import * as App from '@userActions/App';
1515
import * as BankAccounts from '@userActions/BankAccounts';
1616
import CONST from '@src/CONST';
@@ -83,6 +83,8 @@ function AddPlaidBankAccount({
8383
allowDebit,
8484
isPlaidDisabled,
8585
}) {
86+
const theme = useTheme();
87+
const styles = useThemeStyles();
8688
const subscribedKeyboardShortcuts = useRef([]);
8789
const previousNetworkState = useRef();
8890

@@ -186,7 +188,7 @@ function AddPlaidBankAccount({
186188
{lodashGet(plaidData, 'isLoading') && (
187189
<View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter]}>
188190
<ActivityIndicator
189-
color={themeColors.spinner}
191+
color={theme.spinner}
190192
size="large"
191193
/>
192194
</View>

src/components/AddressSearch/CurrentLocationButton.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
77
import useLocalize from '@hooks/useLocalize';
88
import getButtonState from '@libs/getButtonState';
99
import colors from '@styles/colors';
10-
import styles from '@styles/styles';
1110
import * as StyleUtils from '@styles/StyleUtils';
11+
import useThemeStyles from '@styles/useThemeStyles';
1212

1313
const propTypes = {
1414
/** Callback that runs when location button is clicked */
@@ -24,6 +24,7 @@ const defaultProps = {
2424
};
2525

2626
function CurrentLocationButton({onPress, isDisabled}) {
27+
const styles = useThemeStyles();
2728
const {translate} = useLocalize();
2829

2930
return (

src/components/AddressSearch/index.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import * as ApiUtils from '@libs/ApiUtils';
1414
import compose from '@libs/compose';
1515
import getCurrentPosition from '@libs/getCurrentPosition';
1616
import * as GooglePlacesUtils from '@libs/GooglePlacesUtils';
17-
import styles from '@styles/styles';
1817
import * as StyleUtils from '@styles/StyleUtils';
19-
import themeColors from '@styles/themes/default';
18+
import useTheme from '@styles/themes/useTheme';
19+
import useThemeStyles from '@styles/useThemeStyles';
2020
import variables from '@styles/variables';
2121
import CONST from '@src/CONST';
2222
import CurrentLocationButton from './CurrentLocationButton';
@@ -144,6 +144,8 @@ const defaultProps = {
144144
// Relevant thread: https://expensify.slack.com/archives/C03TQ48KC/p1634088400387400
145145
// Reference: https://github.com/FaridSafi/react-native-google-places-autocomplete/issues/609#issuecomment-886133839
146146
function AddressSearch(props) {
147+
const theme = useTheme();
148+
const styles = useThemeStyles();
147149
const [displayListViewBorder, setDisplayListViewBorder] = useState(false);
148150
const [isTyping, setIsTyping] = useState(false);
149151
const [isFocused, setIsFocused] = useState(false);
@@ -392,7 +394,7 @@ function AddressSearch(props) {
392394
listLoaderComponent={
393395
<View style={[styles.pv4]}>
394396
<ActivityIndicator
395-
color={themeColors.spinner}
397+
color={theme.spinner}
396398
size="small"
397399
/>
398400
</View>
@@ -489,8 +491,8 @@ function AddressSearch(props) {
489491
}}
490492
numberOfLines={2}
491493
isRowScrollable={false}
492-
listHoverColor={themeColors.border}
493-
listUnderlayColor={themeColors.buttonPressedBG}
494+
listHoverColor={theme.border}
495+
listUnderlayColor={theme.buttonPressedBG}
494496
onLayout={(event) => {
495497
// We use the height of the element to determine if we should hide the border of the listView dropdown
496498
// to prevent a lingering border when there are no address suggestions.

src/components/AmountTextInput.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import PropTypes from 'prop-types';
22
import React from 'react';
3-
import styles from '@styles/styles';
3+
import useThemeStyles from '@styles/useThemeStyles';
44
import CONST from '@src/CONST';
55
import refPropTypes from './refPropTypes';
66
import TextInput from './TextInput';
@@ -39,6 +39,7 @@ const defaultProps = {
3939
};
4040

4141
function AmountTextInput(props) {
42+
const styles = useThemeStyles();
4243
return (
4344
<TextInput
4445
disableKeyboard

src/components/AnchorForAttachmentsOnly/index.native.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import React from 'react';
2-
import styles from '@styles/styles';
2+
import useThemeStyles from '@styles/useThemeStyles';
33
import * as anchorForAttachmentsOnlyPropTypes from './anchorForAttachmentsOnlyPropTypes';
44
import BaseAnchorForAttachmentsOnly from './BaseAnchorForAttachmentsOnly';
55

66
function AnchorForAttachmentsOnly(props) {
7+
const styles = useThemeStyles();
78
return (
89
<BaseAnchorForAttachmentsOnly
910
// eslint-disable-next-line react/jsx-props-no-spreading

src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
1111
import * as DeviceCapabilities from '@libs/DeviceCapabilities';
1212
import * as ContextMenuActions from '@pages/home/report/ContextMenu/ContextMenuActions';
1313
import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
14-
import styles from '@styles/styles';
1514
import * as StyleUtils from '@styles/StyleUtils';
15+
import useThemeStyles from '@styles/useThemeStyles';
1616
import CONST from '@src/CONST';
1717
import {propTypes as anchorForCommentsOnlyPropTypes} from './anchorForCommentsOnlyPropTypes';
1818

@@ -32,6 +32,7 @@ const propTypes = {
3232
* This is a default anchor component for regular links.
3333
*/
3434
function BaseAnchorForCommentsOnly({onPressIn, onPressOut, href = '', rel = '', target = '', children = null, style = {}, onPress, ...rest}) {
35+
const styles = useThemeStyles();
3536
useEffect(
3637
() => () => {
3738
ReportActionContextMenu.hideContextMenu();

src/components/AnonymousReportFooter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
22
import React from 'react';
33
import {Text, View} from 'react-native';
44
import reportPropTypes from '@pages/reportPropTypes';
5-
import styles from '@styles/styles';
5+
import useThemeStyles from '@styles/useThemeStyles';
66
import * as Session from '@userActions/Session';
77
import AvatarWithDisplayName from './AvatarWithDisplayName';
88
import Button from './Button';
@@ -29,6 +29,7 @@ const defaultProps = {
2929
};
3030

3131
function AnonymousReportFooter(props) {
32+
const styles = useThemeStyles();
3233
return (
3334
<View style={styles.anonymousRoomFooter(props.isSmallSizeLayout)}>
3435
<View style={[styles.flexRow, styles.flexShrink1]}>

src/components/ArchivedReportFooter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as ReportActionsUtils from '@libs/ReportActionsUtils';
99
import * as ReportUtils from '@libs/ReportUtils';
1010
import personalDetailsPropType from '@pages/personalDetailsPropType';
1111
import reportPropTypes from '@pages/reportPropTypes';
12-
import styles from '@styles/styles';
12+
import useThemeStyles from '@styles/useThemeStyles';
1313
import CONST from '@src/CONST';
1414
import ONYXKEYS from '@src/ONYXKEYS';
1515
import Banner from './Banner';
@@ -50,6 +50,7 @@ const defaultProps = {
5050
};
5151

5252
function ArchivedReportFooter(props) {
53+
const styles = useThemeStyles();
5354
const archiveReason = lodashGet(props.reportClosedAction, 'originalMessage.reason', CONST.REPORT.ARCHIVE_REASON.DEFAULT);
5455
let displayName = PersonalDetailsUtils.getDisplayNameOrDefault(props.personalDetails, [props.report.ownerAccountID, 'displayName']);
5556

src/components/AttachmentModal.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import * as ReportUtils from '@libs/ReportUtils';
1919
import * as TransactionUtils from '@libs/TransactionUtils';
2020
import useNativeDriver from '@libs/useNativeDriver';
2121
import reportPropTypes from '@pages/reportPropTypes';
22-
import styles from '@styles/styles';
2322
import * as StyleUtils from '@styles/StyleUtils';
24-
import themeColors from '@styles/themes/default';
23+
import useTheme from '@styles/themes/useTheme';
24+
import useThemeStyles from '@styles/useThemeStyles';
2525
import * as IOU from '@userActions/IOU';
2626
import * as Policy from '@userActions/Policy';
2727
import CONST from '@src/CONST';
@@ -111,6 +111,8 @@ const defaultProps = {
111111
};
112112

113113
function AttachmentModal(props) {
114+
const theme = useTheme();
115+
const styles = useThemeStyles();
114116
const onModalHideCallbackRef = useRef(null);
115117
const [isModalOpen, setIsModalOpen] = useState(props.defaultOpen);
116118
const [shouldLoadAttachment, setShouldLoadAttachment] = useState(false);
@@ -411,7 +413,7 @@ function AttachmentModal(props) {
411413
onSubmit={submitAndClose}
412414
onClose={closeModal}
413415
isVisible={isModalOpen}
414-
backgroundColor={themeColors.componentBG}
416+
backgroundColor={theme.componentBG}
415417
onModalShow={() => {
416418
props.onModalShow();
417419
setShouldLoadAttachment(true);

src/components/AttachmentPicker/index.native.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
1414
import useLocalize from '@hooks/useLocalize';
1515
import useWindowDimensions from '@hooks/useWindowDimensions';
1616
import * as FileUtils from '@libs/fileDownload/FileUtils';
17-
import styles from '@styles/styles';
17+
import useThemeStyles from '@styles/useThemeStyles';
1818
import CONST from '@src/CONST';
1919
import {defaultProps as baseDefaultProps, propTypes as basePropTypes} from './attachmentPickerPropTypes';
2020
import launchCamera from './launchCamera';
@@ -101,6 +101,7 @@ const getDataForUpload = (fileData) => {
101101
* @returns {JSX.Element}
102102
*/
103103
function AttachmentPicker({type, children, shouldHideCameraOption}) {
104+
const styles = useThemeStyles();
104105
const [isVisible, setIsVisible] = useState(false);
105106

106107
const completeAttachmentSelection = useRef();

src/components/Attachments/AttachmentCarousel/AttachmentCarouselCellRenderer.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
22
import React from 'react';
33
import {PixelRatio, View} from 'react-native';
44
import useWindowDimensions from '@hooks/useWindowDimensions';
5-
import styles from '@styles/styles';
5+
import useThemeStyles from '@styles/useThemeStyles';
66

77
const propTypes = {
88
/** Cell Container styles */
@@ -14,6 +14,7 @@ const defaultProps = {
1414
};
1515

1616
function AttachmentCarouselCellRenderer(props) {
17+
const styles = useThemeStyles();
1718
const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
1819
const modalStyles = styles.centeredModalStyles(isSmallScreenWidth, true);
1920
const style = [props.style, styles.h100, {width: PixelRatio.roundToNearestPixel(windowWidth - (modalStyles.marginHorizontal + modalStyles.borderWidth) * 2)}];

src/components/Attachments/AttachmentCarousel/CarouselButtons.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import * as Expensicons from '@components/Icon/Expensicons';
88
import Tooltip from '@components/Tooltip';
99
import useLocalize from '@hooks/useLocalize';
1010
import useWindowDimensions from '@hooks/useWindowDimensions';
11-
import styles from '@styles/styles';
12-
import themeColors from '@styles/themes/default';
11+
import useTheme from '@styles/themes/useTheme';
12+
import useThemeStyles from '@styles/useThemeStyles';
1313

1414
const propTypes = {
1515
/** Where the arrows should be visible */
@@ -36,6 +36,8 @@ const defaultProps = {
3636
};
3737

3838
function CarouselButtons({page, attachments, shouldShowArrows, onBack, onForward, cancelAutoHideArrow, autoHideArrow}) {
39+
const theme = useTheme();
40+
const styles = useThemeStyles();
3941
const isBackDisabled = page === 0;
4042
const isForwardDisabled = page === _.size(attachments) - 1;
4143

@@ -51,7 +53,7 @@ function CarouselButtons({page, attachments, shouldShowArrows, onBack, onForward
5153
small
5254
innerStyles={[styles.arrowIcon]}
5355
icon={Expensicons.BackArrow}
54-
iconFill={themeColors.text}
56+
iconFill={theme.text}
5557
iconStyles={[styles.mr0]}
5658
onPress={onBack}
5759
onPressIn={cancelAutoHideArrow}
@@ -67,7 +69,7 @@ function CarouselButtons({page, attachments, shouldShowArrows, onBack, onForward
6769
small
6870
innerStyles={[styles.arrowIcon]}
6971
icon={Expensicons.ArrowRight}
70-
iconFill={themeColors.text}
72+
iconFill={theme.text}
7173
iconStyles={[styles.mr0]}
7274
onPress={onForward}
7375
onPressIn={cancelAutoHideArrow}

src/components/Attachments/AttachmentCarousel/CarouselItem.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import SafeAreaConsumer from '@components/SafeAreaConsumer';
99
import Text from '@components/Text';
1010
import useLocalize from '@hooks/useLocalize';
1111
import ReportAttachmentsContext from '@pages/home/report/ReportAttachmentsContext';
12-
import styles from '@styles/styles';
12+
import useThemeStyles from '@styles/useThemeStyles';
1313
import CONST from '@src/CONST';
1414

1515
const propTypes = {
@@ -49,6 +49,7 @@ const defaultProps = {
4949
};
5050

5151
function CarouselItem({item, isFocused, onPress}) {
52+
const styles = useThemeStyles();
5253
const {translate} = useLocalize();
5354
const {isAttachmentHidden} = useContext(ReportAttachmentsContext);
5455
// eslint-disable-next-line es/no-nullish-coalescing-operators

src/components/Attachments/AttachmentCarousel/Pager/ImageTransformer.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import Animated, {
1515
withDecay,
1616
withSpring,
1717
} from 'react-native-reanimated';
18-
import styles from '@styles/styles';
18+
import useThemeStyles from '@styles/useThemeStyles';
1919
import AttachmentCarouselPagerContext from './AttachmentCarouselPagerContext';
2020
import ImageWrapper from './ImageWrapper';
2121

@@ -60,6 +60,7 @@ const imageTransformerDefaultProps = {
6060
};
6161

6262
function ImageTransformer({imageWidth, imageHeight, imageScaleX, imageScaleY, scaledImageWidth, scaledImageHeight, isActive, children}) {
63+
const styles = useThemeStyles();
6364
const {canvasWidth, canvasHeight, onTap, onSwipe, onSwipeSuccess, pagerRef, shouldPagerScroll, isScrolling, onPinchGestureChange} = useContext(AttachmentCarouselPagerContext);
6465

6566
const minImageScale = useMemo(() => Math.min(imageScaleX, imageScaleY), [imageScaleX, imageScaleY]);

src/components/Attachments/AttachmentCarousel/Pager/ImageWrapper.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ import PropTypes from 'prop-types';
22
import React from 'react';
33
import {StyleSheet} from 'react-native';
44
import Animated from 'react-native-reanimated';
5-
import styles from '@styles/styles';
5+
import useThemeStyles from '@styles/useThemeStyles';
66

77
const imageWrapperPropTypes = {
88
children: PropTypes.node.isRequired,
99
};
1010

1111
function ImageWrapper({children}) {
12+
const styles = useThemeStyles();
1213
return (
1314
<Animated.View
1415
collapsable={false}

src/components/Attachments/AttachmentCarousel/Pager/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import PagerView from 'react-native-pager-view';
66
import Animated, {runOnJS, useAnimatedProps, useAnimatedReaction, useEvent, useHandler, useSharedValue} from 'react-native-reanimated';
77
import _ from 'underscore';
88
import refPropTypes from '@components/refPropTypes';
9-
import styles from '@styles/styles';
9+
import useThemeStyles from '@styles/useThemeStyles';
1010
import AttachmentCarouselPagerContext from './AttachmentCarouselPagerContext';
1111

1212
const AnimatedPagerView = Animated.createAnimatedComponent(createNativeWrapper(PagerView));
@@ -80,6 +80,7 @@ function AttachmentCarouselPager({
8080
containerWidth,
8181
containerHeight,
8282
}) {
83+
const styles = useThemeStyles();
8384
const shouldPagerScroll = useSharedValue(true);
8485
const pagerRef = useRef(null);
8586

src/components/Attachments/AttachmentCarousel/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import withWindowDimensions from '@components/withWindowDimensions';
1010
import compose from '@libs/compose';
1111
import * as DeviceCapabilities from '@libs/DeviceCapabilities';
1212
import Navigation from '@libs/Navigation/Navigation';
13-
import styles from '@styles/styles';
13+
import useThemeStyles from '@styles/useThemeStyles';
1414
import variables from '@styles/variables';
1515
import ONYXKEYS from '@src/ONYXKEYS';
1616
import AttachmentCarouselCellRenderer from './AttachmentCarouselCellRenderer';
@@ -28,6 +28,7 @@ const viewabilityConfig = {
2828
};
2929

3030
function AttachmentCarousel({report, reportActions, parentReportActions, source, onNavigate, setDownloadButtonVisibility, translate, transaction}) {
31+
const styles = useThemeStyles();
3132
const scrollRef = useRef(null);
3233

3334
const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();

src/components/Attachments/AttachmentCarousel/index.native.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as Illustrations from '@components/Icon/Illustrations';
88
import withLocalize from '@components/withLocalize';
99
import compose from '@libs/compose';
1010
import Navigation from '@libs/Navigation/Navigation';
11-
import styles from '@styles/styles';
11+
import useThemeStyles from '@styles/useThemeStyles';
1212
import variables from '@styles/variables';
1313
import ONYXKEYS from '@src/ONYXKEYS';
1414
import {defaultProps, propTypes} from './attachmentCarouselPropTypes';
@@ -19,6 +19,7 @@ import AttachmentCarouselPager from './Pager';
1919
import useCarouselArrows from './useCarouselArrows';
2020

2121
function AttachmentCarousel({report, reportActions, parentReportActions, source, onNavigate, setDownloadButtonVisibility, translate, transaction, onClose}) {
22+
const styles = useThemeStyles();
2223
const pagerRef = useRef(null);
2324

2425
const [containerDimensions, setContainerDimensions] = useState({width: 0, height: 0});

src/components/Attachments/AttachmentView/AttachmentViewImage/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ImageView from '@components/ImageView';
33
import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
44
import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
55
import compose from '@libs/compose';
6-
import styles from '@styles/styles';
6+
import useThemeStyles from '@styles/useThemeStyles';
77
import CONST from '@src/CONST';
88
import {attachmentViewImageDefaultProps, attachmentViewImagePropTypes} from './propTypes';
99

@@ -13,6 +13,7 @@ const propTypes = {
1313
};
1414

1515
function AttachmentViewImage({source, file, isAuthTokenRequired, loadComplete, onPress, isImage, onScaleChanged, translate, onError}) {
16+
const styles = useThemeStyles();
1617
const children = (
1718
<ImageView
1819
onScaleChanged={onScaleChanged}

0 commit comments

Comments
 (0)