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.

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

[Feat][QA] July QA 변경사항 반영 #216

Merged
merged 4 commits into from
Jul 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ export default function App() {
<Stack.Screen
name="ChallengeEdit"
component={ChallengeEditScreen}
options={{ ...headerOptions, title: '내 목표 수정' }}
options={{ ...headerOptions, title: '내 목표' }}
/>
<Stack.Screen
name="SubjectEdit"
Expand Down
11 changes: 0 additions & 11 deletions assets/svgs/Small=on.svg

This file was deleted.

10 changes: 0 additions & 10 deletions assets/svgs/_friend_plus.svg

This file was deleted.

4 changes: 0 additions & 4 deletions assets/svgs/alarm.svg

This file was deleted.

11 changes: 11 additions & 0 deletions assets/svgs/arrowRightXml.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export const arrowRightXml = `<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_311_23874)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M20.4144 12.195C20.7265 12.5383 20.7265 13.0625 20.4144 13.4058L13.4144 21.1058C13.08 21.4736 12.5108 21.5007 12.143 21.1663C11.7752 20.832 11.7481 20.2628 12.0825 19.895L17.6229 13.8005L4.24987 13.8005C3.75282 13.8005 3.34987 13.3976 3.34987 12.9005C3.34987 12.4034 3.75282 12.0005 4.24987 12.0005L17.805 12.0005L12.0825 5.70579C11.7481 5.338 11.7752 4.76879 12.143 4.43444C12.5108 4.10008 13.08 4.12719 13.4144 4.49498L20.4144 12.195Z" fill="#121314" fill-opacity="0.8"/>
</g>
<defs>
<clipPath id="clip0_311_23874">
<rect width="24" height="24" fill="white" transform="translate(0 0.800293)"/>
</clipPath>
</defs>
</svg>
`;
3 changes: 0 additions & 3 deletions assets/svgs/arrow_forward.svg

This file was deleted.

10 changes: 0 additions & 10 deletions assets/svgs/arrow_left.svg

This file was deleted.

15 changes: 2 additions & 13 deletions assets/svgs/kakaoXml.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
export const kakaoXml = `<svg width="18" height="19" viewBox="0 0 18 19" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g clip-path="url(#clip0_291_10084)">
<rect y="1.30029" width="18" height="17" fill="url(#pattern0)"/>
</g>
<defs>
<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
<use xlink:href="#image0_291_10084" transform="scale(0.0277778 0.0294118)"/>
</pattern>
<clipPath id="clip0_291_10084">
<rect width="18" height="18" fill="white" transform="translate(0 0.800293)"/>
</clipPath>
<image id="image0_291_10084" width="36" height="34" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAiCAYAAAA3WXuFAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAADBBpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDcuMi1jMDAwIDc5LjU2NmViYzViNCwgMjAyMi8wNS8wOS0wODoyNTo1NSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChNYWNpbnRvc2gpIiB4bXA6Q3JlYXRlRGF0ZT0iMjAyMC0wMi0yOFQxMDo1MzoxNyswOTowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMi0wNi0yMlQxNToyNjowMisxNTowMCIgeG1wOk1vZGlmeURhdGU9IjIwMjItMDYtMjJUMTU6MjY6MDIrMTU6MDAiIGRjOmZvcm1hdD0iaW1hZ2UvcG5nIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlCNEZDMTdERUE2MzExRUNCQUM4QUJERTgzOTc4MzVGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlCNEZDMTdFRUE2MzExRUNCQUM4QUJERTgzOTc4MzVGIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6Y2E0NmJlNjgtOTgwOC00NDU0LWIxNGItYzhmNGM2NjNkYWM3Ij4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpjYTQ2YmU2OC05ODA4LTQ0NTQtYjE0Yi1jOGY0YzY2M2RhYzciIHN0RXZ0OndoZW49IjIwMjAtMDItMjhUMTA6NTM6MTcrMDk6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChNYWNpbnRvc2gpIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo1MDViNjhkOC1kYWIxLTQ0ZmMtODQxYS1jMmZhOWQ4MjU5YzYiIHN0RXZ0OndoZW49IjIwMjAtMDItMjhUMTQ6NTY6NTMrMDk6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo4YTVjYmVlOS1hNjU3LTQ0MGMtYTI2MC0yNWQ5MDk5NTY2ZjkiIHN0RXZ0OndoZW49IjIwMjAtMDQtMTBUMTM6MTA6MDcrMDk6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4YTVjYmVlOS1hNjU3LTQ0MGMtYTI2MC0yNWQ5MDk5NTY2ZjkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Y2E0NmJlNjgtOTgwOC00NDU0LWIxNGItYzhmNGM2NjNkYWM3Ii8+IDxwaG90b3Nob3A6VGV4dExheWVycz4gPHJkZjpCYWc+IDxyZGY6bGkgcGhvdG9zaG9wOkxheWVyTmFtZT0i7Lm07Lm07JikIOuhnOq3uOyduCIgcGhvdG9zaG9wOkxheWVyVGV4dD0i7Lm07Lm07JikIOuhnOq3uOyduCIvPiA8cmRmOmxpIHBob3Rvc2hvcDpMYXllck5hbWU9Iuy5tOy5tOyYpCDroZzqt7jsnbgiIHBob3Rvc2hvcDpMYXllclRleHQ9Iuy5tOy5tOyYpCDroZzqt7jsnbgiLz4gPHJkZjpsaSBwaG90b3Nob3A6TGF5ZXJOYW1lPSLsubTsubTsmKQg66Gc6re47J24IiBwaG90b3Nob3A6TGF5ZXJUZXh0PSLsubTsubTsmKQg66Gc6re47J24Ii8+IDxyZGY6bGkgcGhvdG9zaG9wOkxheWVyTmFtZT0i7Lm07Lm07JikIOuhnOq3uOyduCIgcGhvdG9zaG9wOkxheWVyVGV4dD0i7Lm07Lm07JikIOuhnOq3uOyduCIvPiA8cmRmOmxpIHBob3Rvc2hvcDpMYXllck5hbWU9IkxvZ2luIHdpdGggS2FrYW8iIHBob3Rvc2hvcDpMYXllclRleHQ9IkxvZ2luIHdpdGggS2FrYW8iLz4gPHJkZjpsaSBwaG90b3Nob3A6TGF5ZXJOYW1lPSJMb2dpbiB3aXRoIEtha2FvIiBwaG90b3Nob3A6TGF5ZXJUZXh0PSJMb2dpbiB3aXRoIEtha2FvIi8+IDxyZGY6bGkgcGhvdG9zaG9wOkxheWVyTmFtZT0iTG9naW4gd2l0aCBLYWthbyIgcGhvdG9zaG9wOkxheWVyVGV4dD0iTG9naW4gd2l0aCBLYWthbyIvPiA8cmRmOmxpIHBob3Rvc2hvcDpMYXllck5hbWU9IkxvZ2luIHdpdGggS2FrYW8iIHBob3Rvc2hvcDpMYXllclRleHQ9IkxvZ2luIHdpdGggS2FrYW8iLz4gPHJkZjpsaSBwaG90b3Nob3A6TGF5ZXJOYW1lPSLroZzqt7jsnbgiIHBob3Rvc2hvcDpMYXllclRleHQ9IuuhnOq3uOyduCIvPiA8cmRmOmxpIHBob3Rvc2hvcDpMYXllck5hbWU9IuuhnOq3uOyduCIgcGhvdG9zaG9wOkxheWVyVGV4dD0i66Gc6re47J24Ii8+IDxyZGY6bGkgcGhvdG9zaG9wOkxheWVyTmFtZT0i66Gc6re47J24IiBwaG90b3Nob3A6TGF5ZXJUZXh0PSLroZzqt7jsnbgiLz4gPHJkZjpsaSBwaG90b3Nob3A6TGF5ZXJOYW1lPSJMb2dpbiIgcGhvdG9zaG9wOkxheWVyVGV4dD0iTG9naW4iLz4gPHJkZjpsaSBwaG90b3Nob3A6TGF5ZXJOYW1lPSJMb2dpbiIgcGhvdG9zaG9wOkxheWVyVGV4dD0iTG9naW4iLz4gPHJkZjpsaSBwaG90b3Nob3A6TGF5ZXJOYW1lPSJMb2dpbiIgcGhvdG9zaG9wOkxheWVyVGV4dD0iTG9naW4iLz4gPC9yZGY6QmFnPiA8L3Bob3Rvc2hvcDpUZXh0TGF5ZXJzPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pu85RkMAAAH+SURBVHjazJjNK0RRGMbPveOz0SywkCJlQbEhLCzGkKWaFWWBjWRhycbCH6BZWCgW/AGDjSwspkHIgighkiQfk4+hTL6KJs+rV13TzJ07uh/nqd/mzmnmmfc855z3XEVkpiLgBQ2gGpSBYpDHn3+AKLgEx2APrINHoz+gGBiTDfygCzQDNcM/EQdbYA4sgs//GlLZxDAoFeYoAgJsLp6JoQowCeqFNaKpHAIXRgy1gWlQIKzVCxgEK9qHroRBHWBGE1IrlcPZPAOnySrUBOY5xHaKQt4JtrWGPGANlAhndAdaQOx3ykb5gVOivOZSURTe7HZsyo2eaFNtVDlYTpsR7MFPhnxCHvnIUI1EhmpVzpAsKlQNHrB2KU6G7iUyFCVDuxIZOiBDGxIZClF+3Fwlj8NmYnSeUoVewawE1aEuI6ZodskQqHTIzDlop+ND1ZwjA1w2u0Uz1M8e/jTsdEvo407OLr2BXnCSqmO84VXnsyHk1AN1J247riQDb8ECKAdVFplZBj1Gm3yt6Bo0YaKRfTAOVlMNyErzBfkm7S+0goNgM93gdIbStbVPjJsXyDt4ANfgiPNBfJlxlSazhzrhphvKGHg2M1x6FapLYYZCPwLCVqRd78WBN8mzIG8JYeGAlvjlQIRz0OrkQUdTdcUbZUCCTuBn1Uw5cSP5FmAA/WlgA3utsOYAAAAASUVORK5CYII="/>
</defs>
export const kakaoXml = `<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4701 2C6.61971 2 1.83301 5.72299 1.83301 10.2733C1.83301 13.1099 3.66496 15.5919 6.50152 17.0693L5.31962 21.3832C5.20143 21.7969 5.61509 22.0923 5.96967 21.856L11.17 18.4284C11.5837 18.4875 12.0565 18.4875 12.5292 18.4875C18.3796 18.4875 23.1663 14.7645 23.1663 10.2142C23.1072 5.72299 18.3205 2 12.4701 2Z" fill="#121314"/>
</svg>
`;
3 changes: 0 additions & 3 deletions assets/svgs/pencil.svg

This file was deleted.

2 changes: 1 addition & 1 deletion assets/svgs/pencil.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const settingsIcon = `<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
export const pencilIcon = `<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.36905 3.40163L1.73934 11.0313L0.698691 14.9127L0.0141898 17.4697C-0.0048228 17.5411 -0.00472791 17.6163 0.014465 17.6877C0.0336579 17.7591 0.0712748 17.8242 0.123547 17.8765C0.175819 17.9287 0.24091 17.9663 0.312298 17.9855C0.383687 18.0047 0.458866 18.0048 0.530302 17.9858L3.08561 17.3005L6.96782 16.2598H6.96866L14.5984 8.63011L9.36989 3.40163H9.36905ZM17.7531 4.28567L13.7152 0.246859C13.637 0.168604 13.5443 0.106521 13.4421 0.0641621C13.34 0.0218032 13.2305 0 13.1199 0C13.0093 0 12.8998 0.0218032 12.7977 0.0641621C12.6956 0.106521 12.6028 0.168604 12.5247 0.246859L10.4408 2.32983L15.6702 7.55916L17.7531 5.47534C17.8314 5.39722 17.8935 5.30443 17.9358 5.20229C17.9782 5.10015 18 4.99066 18 4.88009C18 4.76951 17.9782 4.66002 17.9358 4.55788C17.8935 4.45574 17.8314 4.36295 17.7531 4.28483" fill="#121314"/>
</svg>
`;
3 changes: 0 additions & 3 deletions assets/svgs/plus.svg

This file was deleted.

5 changes: 5 additions & 0 deletions assets/svgs/saveIcon..ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export const saveIcon = `<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.3272 18.1086C11.6705 18.4207 12.1948 18.4207 12.5381 18.1086L17.6765 13.4373C18.0443 13.103 18.0714 12.5338 17.737 12.166C17.4027 11.7982 16.8335 11.7711 16.4657 12.1054L12.8344 15.4066L12.8344 8.10039C12.8344 7.60333 12.4314 7.20039 11.9344 7.20039C11.4373 7.20039 11.0344 7.60333 11.0344 8.10039L11.0344 15.4097L7.39962 12.1054C7.03183 11.7711 6.46263 11.7982 6.12827 12.166C5.79392 12.5338 5.82102 13.103 6.18881 13.4373L11.3272 18.1086Z" fill="#121314" fill-opacity="0.8"/>
<circle cx="12" cy="12.8003" r="10" stroke="#121314" stroke-opacity="0.8" stroke-width="1.8"/>
</svg>
`;
18 changes: 11 additions & 7 deletions src/screens/Feed/UserSpecificChallengeSection.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { StyleSheet, Text, View } from 'react-native';
import { Pressable, StyleSheet, Text, View } from 'react-native';
import React, { useMemo } from 'react';
import { UserSpecificChallenge } from '../../types/Feed/UserSpecificChallenge';
import { useTheme } from 'react-native-paper';
import { getFormattedDateArray } from '../../utils/helper/UserSpecificChallengeDateFormatter/formatter';
import CircularCheckbox from '../../components/checkbox/CircularCheckbox';
import BottomFixButton from '../../components/buttons/BottomFixButton';
import { formatChallengeText } from '../../utils/helper/UserSpecificChallengeDateFormatter/challengeTextFormatter';
import { AntDesign } from '@expo/vector-icons';
import TodayBubble from './TodayBubble';
import { useNavigation } from '@react-navigation/native';
import { SvgXml } from 'react-native-svg';
import { arrowRightXml } from '../../../assets/svgs/arrowRightXml';

interface UserSpecificChallengeSectionProps {
userSpecificChallenge: UserSpecificChallenge['data'];
Expand All @@ -33,17 +34,20 @@ const UserSpecificChallengeSection = ({
<View style={{ paddingBottom: 8 }}>
<View style={styles.headerCtn}>
<Text style={styles.headerText}>{challengeHeaderText}</Text>
<AntDesign
name="arrowright"
size={24}
color="black"
<Pressable
onPress={() =>
navigation.navigate('ChallengeDetail', {
challengeId: challenge.challengeId,
challengeName: challenge.challengeName,
})
}
/>
hitSlop={{
left: 50,
right: 20,
}}
>
<SvgXml xml={arrowRightXml} />
</Pressable>
</View>

<Text style={[theme.fonts.text.body2.regular, styles.challengeText]}>
Expand Down
6 changes: 3 additions & 3 deletions src/screens/Main/challenge/ChallengeDetailScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import Toast from 'react-native-toast-message';
import { FeedQueryKeys } from '../../../utils/api/FeedAPI';
import ChallengeInvite from './ChallengeInvite';
import { SvgXml } from 'react-native-svg';
import { pencil } from '../../../constants/Icons/home/pencil';
import MainLottie from '../../../components/lotties/MainLottie';
import { settingsIcon } from '../../../../assets/svgs/settingsIcon';

const { width } = Dimensions.get('window');

Expand All @@ -46,10 +46,10 @@ const ChallengeDetailScreen = ({ navigation, route }) => {
<View style={{ flexDirection: 'row' }}>
<ChallengeInvite challengeId={challengeId} />
<Pressable
style={{ paddingRight: 19, paddingTop: 3 }}
style={{ paddingRight: 19, paddingTop: 4 }}
onPress={() => navigation.navigate('ChallengeEdit')}
>
<SvgXml xml={pencil} />
<SvgXml xml={settingsIcon} />
</Pressable>
</View>
);
Expand Down
Loading