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

Fix: Big number pad button size is not justified on small screens #25656

Merged
merged 11 commits into from
Aug 28, 2023
Merged

Fix: Big number pad button size is not justified on small screens #25656

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a4e7b4f
fix: big number pad button size is not justified on small screens
tienifr Aug 22, 2023
bf24973
medium size next button
tienifr Aug 22, 2023
03a7079
Merge branch 'main' of https://github.com/tienifr/App into fix/24603-…
tienifr Aug 23, 2023
b50d567
small button on extremely small screens only
tienifr Aug 23, 2023
5e60f94
use isExtraSmallScreenWidth
tienifr Aug 23, 2023
93604aa
medium number pad on extra small screens only
tienifr Aug 23, 2023
50d1ed9
check height instead of width
tienifr Aug 23, 2023
9db29de
Merge branch 'main' of https://github.com/tienifr/App into fix/24603-…
tienifr Aug 23, 2023
5c7d439
Merge branch 'main' into fix/24603
tienifr Aug 25, 2023
bd3d3b8
fix lint
tienifr Aug 25, 2023
6c54020
Merge branch 'main' of https://github.com/tienifr/App into fix/24603-…
tienifr Aug 28, 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
3 changes: 3 additions & 0 deletions src/components/BigNumberPad.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import styles from '../styles/styles';
import Button from './Button';
import ControlSelection from '../libs/ControlSelection';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import useWindowDimensions from '../hooks/useWindowDimensions';

const propTypes = {
/** Callback to inform parent modal with key pressed */
Expand Down Expand Up @@ -34,6 +35,7 @@ const padNumbers = [

function BigNumberPad(props) {
const [timer, setTimer] = useState(null);
const {isExtraSmallScreenHeight} = useWindowDimensions();

/**
* Handle long press key on number pad.
Expand Down Expand Up @@ -71,6 +73,7 @@ function BigNumberPad(props) {
return (
<Button
key={column}
medium={isExtraSmallScreenHeight}
shouldEnableHapticFeedback
style={[styles.flex1, marginLeft]}
text={column === '<' ? column : props.toLocaleDigit(column)}
Expand Down
2 changes: 2 additions & 0 deletions src/hooks/useWindowDimensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ import variables from '../styles/variables';
*/
export default function () {
const {width: windowWidth, height: windowHeight} = useWindowDimensions();
const isExtraSmallScreenHeight = windowHeight <= variables.extraSmallMobileResponsiveHeightBreakpoint;
const isSmallScreenWidth = windowWidth <= variables.mobileResponsiveWidthBreakpoint;
const isMediumScreenWidth = windowWidth > variables.mobileResponsiveWidthBreakpoint && windowWidth <= variables.tabletResponsiveWidthBreakpoint;
const isLargeScreenWidth = windowWidth > variables.tabletResponsiveWidthBreakpoint;
return {
windowWidth,
windowHeight,
isExtraSmallScreenHeight,
isSmallScreenWidth,
isMediumScreenWidth,
isLargeScreenWidth,
Expand Down
3 changes: 3 additions & 0 deletions src/pages/iou/steps/MoneyRequestAmountForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import TextInputWithCurrencySymbol from '../../../components/TextInputWithCurren
import useLocalize from '../../../hooks/useLocalize';
import CONST from '../../../CONST';
import refPropTypes from '../../../components/refPropTypes';
import useWindowDimensions from '../../../hooks/useWindowDimensions';

const propTypes = {
/** IOU amount saved in Onyx */
Expand Down Expand Up @@ -59,6 +60,7 @@ const NUM_PAD_CONTAINER_VIEW_ID = 'numPadContainerView';
const NUM_PAD_VIEW_ID = 'numPadView';

function MoneyRequestAmountForm({amount, currency, isEditing, forwardedRef, onCurrencyButtonPress, onSubmitButtonPress}) {
const {isExtraSmallScreenHeight} = useWindowDimensions();
const {translate, toLocaleDigit, numberFormat} = useLocalize();

const textInput = useRef(null);
Expand Down Expand Up @@ -221,6 +223,7 @@ function MoneyRequestAmountForm({amount, currency, isEditing, forwardedRef, onCu
) : null}
<Button
success
medium={isExtraSmallScreenHeight}
style={[styles.w100, styles.mt5]}
onPress={submitAndNavigateToNextPage}
pressOnEnter
Expand Down
1 change: 1 addition & 0 deletions src/styles/variables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export default {
emojiLineHeight: 28,
iouAmountTextSize: 40,
extraSmallMobileResponsiveWidthBreakpoint: 320,
extraSmallMobileResponsiveHeightBreakpoint: 550,
Copy link
Member

Choose a reason for hiding this comment

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

How did we come up with this value?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I use iPhoneSE view port as the threshold.

Copy link
Member

@parasharrajat parasharrajat Aug 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

But the iPhone SE viewport height is 667px.

Screenshot 2023-08-24 at 9 47 52 PM

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm sorry. Actually it was the screen height when open app on Safari. It was 520, then I rounded up to 550. The page on native app has enough space thus not require medium button size.

mobileResponsiveWidthBreakpoint: 800,
modalFullscreenBackdropOpacity: 0.5,
tabletResponsiveWidthBreakpoint: 1024,
Expand Down