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.

Sign up for GitHub

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

Jump to bottom

[24321] Large amounts are no longer cut off on smaller widths. #26280

Merged
merged 19 commits into from
Sep 11, 2023
Merged

[24321] Large amounts are no longer cut off on smaller widths. #26280

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4a167a5
[24321] Large amounts are no longer cut off on smaller widths.
DanutGavrus Aug 30, 2023
26768ae
Small adjustments.
DanutGavrus Aug 30, 2023
a985412
Also reduced the lineHeight.
DanutGavrus Aug 30, 2023
f4f17b3
Restore settings gradle file changes which should have remaned only o…
DanutGavrus Aug 30, 2023
11c73f0
Fix lint: useWindowDimensions is called conditionally.
DanutGavrus Aug 30, 2023
f3b209d
Fixed spelling mistake.
DanutGavrus Aug 30, 2023
eba1a8c
Moved method to StyleUtils for future use.
DanutGavrus Aug 30, 2023
ff2551d
Run prettier.
DanutGavrus Aug 30, 2023
0a95938
Make sure the amount can not overlap the avatar icons.
DanutGavrus Aug 30, 2023
a013406
Replaced if conditions with a range switch.
DanutGavrus Aug 30, 2023
c87eb08
Moved condition higer in order to make it more clear.
DanutGavrus Aug 30, 2023
c56712a
Fix lint error.
DanutGavrus Aug 30, 2023
67e8d2e
Merge branch 'main' into fix/24321-large-amounts-cut-off
DanutGavrus Aug 31, 2023
28045d6
Merge branch 'main' into fix/24321-large-amounts-cut-off
DanutGavrus Sep 1, 2023
821785d
Fixed conflicts.
DanutGavrus Sep 4, 2023
850a1ca
Updated sizes calculations.
DanutGavrus Sep 4, 2023
0b0d30c
Fixed merge conflicts.
DanutGavrus Sep 5, 2023
fe584b8
updated to ts
DanutGavrus Sep 5, 2023
bc0527f
Fixed conflicts.
DanutGavrus Sep 8, 2023
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
16 changes: 15 additions & 1 deletion src/components/ReportActionItem/MoneyRequestPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ import PressableWithFeedback from '../Pressable/PressableWithoutFeedback';
import * as ReceiptUtils from '../../libs/ReceiptUtils';
import ReportActionItemImages from './ReportActionItemImages';
import transactionPropTypes from '../transactionPropTypes';
import * as StyleUtils from '../../styles/StyleUtils';
import colors from '../../styles/colors';
import variables from '../../styles/variables';
import useWindowDimensions from '../../hooks/useWindowDimensions';
import MoneyRequestSkeletonView from '../MoneyRequestSkeletonView';

const propTypes = {
Expand Down Expand Up @@ -135,9 +138,12 @@ const defaultProps = {
};

function MoneyRequestPreview(props) {
const {isSmallScreenWidth, windowWidth} = useWindowDimensions();

if (_.isEmpty(props.iouReport) && !props.isBillSplit) {
return null;
}

const sessionAccountID = lodashGet(props.session, 'accountID', null);
const managerID = props.iouReport.managerID || '';
const ownerAccountID = props.iouReport.ownerAccountID || '';
Expand Down Expand Up @@ -263,7 +269,15 @@ function MoneyRequestPreview(props) {
</View>
<View style={[styles.flexRow]}>
<View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
<Text style={styles.textHeadline}>{getDisplayAmountText()}</Text>
<Text
style={[
styles.moneyRequestPreviewAmount,
StyleUtils.getAmountFontSizeAndLineHeight(variables.fontSizeXLarge, variables.lineHeightXXLarge, isSmallScreenWidth, windowWidth),
]}
Comment on lines +275 to +278
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR caused a regression in #30275. This dynamic style caused an inconsistency of the text style for amount with the money report preview in ReportPreview which has a fixed style for the amount.

numberOfLines={1}
>
{getDisplayAmountText()}
</Text>
{ReportUtils.isSettled(props.iouReport.reportID) && !props.isBillSplit && (
<View style={styles.defaultCheckmarkWrapper}>
<Icon
Expand Down
30 changes: 30 additions & 0 deletions src/styles/StyleUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,35 @@ function getDropDownButtonHeight(buttonSize: ButtonSizeValue): ViewStyle | CSSPr
};
}

/**
* Returns fitting fontSize and lineHeight values in order to prevent large amounts from being cut off on small screen widths.
*/
function getAmountFontSizeAndLineHeight(baseFontSize: number, baseLineHeight: number, isSmallScreenWidth: boolean, windowWidth: number): ViewStyle | CSSProperties {
let toSubtract = 0;

if (isSmallScreenWidth) {
const widthDifference = variables.mobileResponsiveWidthBreakpoint - windowWidth;
switch (true) {
case widthDifference > 450:
toSubtract = 11;
break;
case widthDifference > 400:
toSubtract = 8;
break;
case widthDifference > 350:
toSubtract = 4;
break;
default:
break;
}
}

return {
fontSize: baseFontSize - toSubtract,
lineHeight: baseLineHeight - toSubtract,
};
}

export {
getAvatarSize,
getAvatarWidthStyle,
Expand Down Expand Up @@ -1256,4 +1285,5 @@ export {
getDisabledLinkStyles,
getCheckboxContainerStyle,
getDropDownButtonHeight,
getAmountFontSizeAndLineHeight,
};
6 changes: 6 additions & 0 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2700,6 +2700,12 @@ const styles = {
marginBottom: 0,
},

moneyRequestPreviewAmount: {
...headlineFont,
...whiteSpace.preWrap,
color: themeColors.heading,
},

defaultCheckmarkWrapper: {
marginLeft: 8,
alignSelf: 'center',
Expand Down
Loading