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

PinPad: increase touch area for each key #907

Merged
merged 2 commits into from
Mar 18, 2022
Merged

PinPad: increase touch area for each key #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c56442a
PinPad: increase touch area for each key
kaloudis Mar 17, 2022
fbe1ec3
iOS: bump build #
kaloudis Mar 18, 2022
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
4 changes: 2 additions & 2 deletions components/PinCircles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ export default function PinCircles({

const filled = [];
for (let i = 0; i < numFilled; i++) {
filled.push(<Filled style={styles.circles} />);
filled.push(<Filled key={`filled-${i}`} style={styles.circles} />);
}

const hollow = [];
if (!hidePinLength) {
for (let i = 0; i < pinLength - numFilled; i++) {
hollow.push(<Hollow style={styles.circles} />);
hollow.push(<Hollow key={`hollow-${i}`} style={styles.circles} />);
Comment on lines -29 to +35
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this to avoid warnings or does it affect functionality?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it clears out the warnings

}
}

Expand Down
304 changes: 145 additions & 159 deletions components/PinPad.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,190 +64,176 @@ export default function PinPad({
setPinValueLength(0);
};

const styles = StyleSheet.create({
pinPadRow: {
justifyContent: 'space-between',
padding: 20
},
pinPadNumber: {
color: themeColor('text'),
fontSize: 20,
fontFamily: 'Lato-Bold'
},
bottom: {
justifyContent: 'flex-end',
marginBottom: 75
},
key: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
height: 30
}
});

return (
<View style={styles.bottom}>
<Row align="flex-end" style={styles.pinPadRow}>
<View style={styles.key}>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[1]);
}}
highlight={numberHighlight}
>
<Text style={styles.pinPadNumber}>{pinNumbers[1]}</Text>
</Touchable>
</View>
<View style={styles.key}>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[2]);
}}
highlight={numberHighlight}
>
<Text style={styles.pinPadNumber}>{pinNumbers[2]}</Text>
</Touchable>
</View>
<View style={styles.key}>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[3]);
}}
highlight={numberHighlight}
>
<Text style={styles.pinPadNumber}>{pinNumbers[3]}</Text>
</Touchable>
</View>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[1]);
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{pinNumbers[1]}</Text>
</Touchable>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[2]);
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{pinNumbers[2]}</Text>
</Touchable>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[3]);
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{pinNumbers[3]}</Text>
</Touchable>
</Row>
<Row align="flex-end" style={styles.pinPadRow}>
<View style={styles.key}>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[4]);
}}
highlight={numberHighlight}
>
<Text style={styles.pinPadNumber}>{pinNumbers[4]}</Text>
</Touchable>
</View>
<View style={styles.key}>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[5]);
}}
highlight={numberHighlight}
>
<Text style={styles.pinPadNumber}>{pinNumbers[5]}</Text>
</Touchable>
</View>
<View style={styles.key}>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[6]);
}}
highlight={numberHighlight}
>
<Text style={styles.pinPadNumber}>{pinNumbers[6]}</Text>
</Touchable>
</View>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[4]);
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{pinNumbers[4]}</Text>
</Touchable>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[5]);
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{pinNumbers[5]}</Text>
</Touchable>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[6]);
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{pinNumbers[6]}</Text>
</Touchable>
</Row>
<Row align="flex-end" style={styles.pinPadRow}>
<View style={styles.key}>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[7]);
}}
highlight={numberHighlight}
>
<Text style={styles.pinPadNumber}>{pinNumbers[7]}</Text>
</Touchable>
</View>
<View style={styles.key}>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[8]);
}}
highlight={numberHighlight}
>
<Text style={styles.pinPadNumber}>{pinNumbers[8]}</Text>
</Touchable>
</View>
<View style={styles.key}>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[9]);
}}
highlight={numberHighlight}
>
<Text style={styles.pinPadNumber}>{pinNumbers[9]}</Text>
</Touchable>
</View>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[7]);
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{pinNumbers[7]}</Text>
</Touchable>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[8]);
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{pinNumbers[8]}</Text>
</Touchable>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[9]);
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{pinNumbers[9]}</Text>
</Touchable>
</Row>
<Row align="flex-end" style={styles.pinPadRow}>
<View style={styles.key}>
<Touchable
touch={() => {
decrementPinValueLength();
deleteValue();
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{'<'}</Text>
</Touchable>
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[0]);
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{pinNumbers[0]}</Text>
</Touchable>
{!hidePinLength && (
<Touchable
touch={() => {
decrementPinValueLength();
deleteValue();
clearPinValueLength();
clearValue();
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{'<'}</Text>
<Text style={styles.pinPadNumber}>C</Text>
</Touchable>
</View>
<View style={styles.key}>
)}
{!!hidePinLength && pinValueLength >= minLength && (
<Touchable
touch={() => {
incrementPinValueLength();
appendValue(pinNumbers[0]);
submitValue();
clearPinValueLength();
}}
highlight={numberHighlight}
style={styles.key}
>
<Text style={styles.pinPadNumber}>{pinNumbers[0]}</Text>
<Success />
</Touchable>
</View>
{!hidePinLength && (
<View style={styles.key}>
<Touchable
touch={() => {
clearPinValueLength();
clearValue();
}}
highlight={numberHighlight}
>
<Text style={styles.pinPadNumber}>C</Text>
</Touchable>
</View>
)}
{!!hidePinLength && pinValueLength >= minLength && (
<View style={styles.key}>
<Touchable
touch={() => {
submitValue();
clearPinValueLength();
}}
highlight={numberHighlight}
>
<Success />
</Touchable>
</View>
)}
{!!hidePinLength && pinValueLength < minLength && (
<View style={styles.key}>
<Pressable></Pressable>
</View>
<Pressable style={styles.key}></Pressable>
)}
</Row>
</View>
);
}

const styles = StyleSheet.create({
pinPadRow: {
justifyContent: 'space-between',
marginTop: 10,
marginBottom: 10
},
pinPadNumber: {
color: themeColor('text'),
fontSize: 20,
fontFamily: 'Lato-Bold'
},
bottom: {
justifyContent: 'flex-end',
marginBottom: 75
},
key: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
height: 60
}
});
14 changes: 11 additions & 3 deletions components/Touchable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,27 @@ interface TouchableProps {
touch: () => void;
highlight: boolean;
children: JSX.Element;
style: any;
}

export default function Touchable({
touch,
highlight,
children
children,
style
}: TouchableProps) {
return (
<>
{highlight && (
<TouchableOpacity onPress={touch}>{children}</TouchableOpacity>
<TouchableOpacity style={style} onPress={touch}>
{children}
</TouchableOpacity>
)}
{!highlight && (
<Pressable style={style} onPress={touch}>
{children}
</Pressable>
)}
{!highlight && <Pressable onPress={touch}>{children}</Pressable>}
</>
);
}
Loading