Skip to content

Commit

Permalink
sdp-tech#115 feat : update minor design changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kimheonningg committed Sep 30, 2024
1 parent 1e23580 commit b760fc5
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 52 deletions.
1 change: 1 addition & 0 deletions src/components/Home/Market/InfoPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const InfoPage = () => {
return (
<Tabs.FlatList
data={data}
style={{ marginTop: 12 }}
renderItem={({ item }: any) => {
return (
<InfoSection>
Expand Down
35 changes: 19 additions & 16 deletions src/components/Home/Market/ServicePage.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import { useState } from 'react';
import { View, ScrollView } from 'react-native';
import { View, ScrollView, StyleSheet, Text } from 'react-native';
import { Tabs } from 'react-native-collapsible-tab-view';
import styled from 'styled-components/native';
import { Subtitle18B } from '../../../styles/GlobalText';
import Carousel from '../../../common/Carousel';

import ServiceItem from '../components/ServiceItem';

import { LIGHTGRAY } from '../../../styles/GlobalColor';

interface ServicePageProps {
scrollViewRef: React.RefObject<ScrollView>;
}
Expand All @@ -35,10 +31,8 @@ const ServicePage: React.FC<ServicePageProps> = ({ scrollViewRef }) => {
style={{ marginBottom: service || product ? 60 : -2000 }}
bounces={false}
overScrollMode="never">
<View>
<LabelButton onPress={() => setService(!service)}>
<Subtitle18B>리폼러의 서비스</Subtitle18B>
</LabelButton>
<View style={styles.container}>
<Text style={TextStyles.title}>리폼러의 서비스</Text>
{service ? (
<View>
{items.map((item, index) => (
Expand All @@ -47,7 +41,7 @@ const ServicePage: React.FC<ServicePageProps> = ({ scrollViewRef }) => {
</View>
) : (
<Carousel
data={[...new Array(6).keys()]}
data={[...new Array(1).keys()]}
renderItem={({ item, index }: any) => {
return <ServiceItem onPress={() => {}} key={index} />;
}}
Expand All @@ -60,11 +54,20 @@ const ServicePage: React.FC<ServicePageProps> = ({ scrollViewRef }) => {
);
};

const LabelButton = styled.TouchableOpacity`
display: flex;
flex-direction: row;
padding: 4px 16px;
margin-top: 12px;
`;
const styles = StyleSheet.create({
container: {},
});

const TextStyles = StyleSheet.create({
title: {
color: '#222',
fontFamily: 'Pretendard Variable',
fontSize: 18,
fontWeight: '700',
lineHeight: 24,
marginTop: 12,
marginHorizontal: 16,
},
});

export default ServicePage;
37 changes: 1 addition & 36 deletions src/components/Home/components/ServiceItem.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { useState } from 'react';
import { StyleSheet, View } from 'react-native';
import styled from 'styled-components/native';
import { View } from 'react-native';

import ServiceImage2 from '../../../assets/common/ServiceImage2.svg';

Expand All @@ -27,38 +26,4 @@ const ServiceItem = ({ onPress }: ServiceItemProps) => {
);
};

const TitleContainer = styled.View`
display: flex;
flex-direction: row;
justify-content: space-between;
padding-vertical: 5px;
`;

const TextStyles = StyleSheet.create({
title: {
color: '#222',
fontFamily: 'Pretendard Variable',
fontSize: 18,
fontWeight: '700',
lineHeight: 24,
},
detail: {
color: '#222',
fontFamily: 'Pretendard Variable',
fontSize: 14,
fontWeight: '400',
lineHeight: 24,
},
price: {
color: '#fff',
textAlign: 'right',
fontFamily: 'Pretendard Variable',
fontSize: 18,
fontWeight: '700',
lineHeight: 24,
marginRight: 11,
marginBottom: 13,
},
});

export default ServiceItem;

0 comments on commit b760fc5

Please sign in to comment.