Skip to content

Commit 4d2663f

Browse files
Worked on perfecting the checkOut screen and its elements
1 parent 38c90a4 commit 4d2663f

File tree

6 files changed

+2413
-1899
lines changed

6 files changed

+2413
-1899
lines changed

package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/shop/OrderSummarySection.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ const OrderSummarySection = () => {
3131
Alert.alert('No code entered.');
3232
}
3333
};
34-
3534
return (
36-
<View style={{ paddingBottom: 46 }}>
35+
<View>
3736
<Text22Normal600
3837
style={{
3938
fontSize: 24,
@@ -131,7 +130,6 @@ const OrderSummarySection = () => {
131130
flexDirection: 'row',
132131
justifyContent: 'space-between',
133132
alignItems: 'center',
134-
marginBottom: 26,
135133
}}
136134
>
137135
<ShopTextInput

src/components/shop/ShopBottomButton.tsx

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
import * as React from 'react';
2-
import { Alert, Dimensions, TouchableOpacity, View } from 'react-native';
2+
import { Alert, TouchableOpacity, View } from 'react-native';
33

44
import colors from '../../constants/colors';
55
import { Text16Normal600 } from '../common/typography';
66

77
const ShopBottomButton = () => {
8-
const screenHeight = Dimensions.get('screen').height;
9-
108
return (
119
<View
1210
style={{
13-
height: screenHeight * 0.14,
11+
flex: 1,
12+
width: '100%',
13+
1414
backgroundColor: colors.black,
1515
borderTopWidth: 1,
1616
borderTopColor: colors.darkGrey,
17-
padding: 20,
17+
paddingHorizontal: 20,
18+
paddingTop: 14,
19+
paddingBottom: 34,
20+
position: 'absolute',
21+
bottom: 0,
22+
left: 0,
1823
}}
1924
>
2025
<TouchableOpacity

src/components/shop/ShopCheckOutScreen.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const ShopCheckOutScreen = () => {
2626
<MagicScroll.ScrollView
2727
scollViewProps={{
2828
showsVerticalScrollIndicator: false,
29+
contentContainerStyle: { paddingBottom: 120 },
2930
style: {
3031
paddingHorizontal: 20,
3132
paddingTop: 24,

src/components/shop/SummaryRow.tsx

+8-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,16 @@ const SummmaryRow = ({
1818
totalLine?: boolean;
1919
}) => {
2020
return (
21-
<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
21+
<View
22+
style={{
23+
flexDirection: 'row',
24+
justifyContent: 'space-between',
25+
alignItems: 'center',
26+
marginBottom: 8,
27+
}}
28+
>
2229
<Text16Normal400
2330
style={{
24-
marginBottom: 8,
2531
fontSize: totalLine ? 20 : 16,
2632
fontWeight: totalLine ? '600' : '400',
2733
}}

0 commit comments

Comments
 (0)