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/analyzing screen #2 #48

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open
Changes from 3 commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
0da2676
[feat]api호출 키수정해야함
zeeun Dec 29, 2023
3ceaa5f
[feat]중간저장
zeeun Jan 5, 2024
52f52cd
[feat]fromdata이미지전송
zeeun Jan 5, 2024
f6a78f8
[feat]onboarding화면
zeeun Jan 16, 2024
17b0e75
Merge pull request #1 from Regular-Pharmasist/feat/APIconnecting-#1
zeeun Jan 16, 2024
e852bf7
[feat]카메라기능추가
zeeun Jan 16, 2024
91b7bfe
[feat]메뉴,카카오연결(수정필요), 홈화면 버튼 및 카메라 추가
zeeun Jan 17, 2024
41e88d8
[feat]카카오 소셜로그인 성공
zeeun Jan 19, 2024
d92a230
Merge pull request #2 from Regular-Pharmasist/feat/APIconnecting-#1
zeeun Jan 19, 2024
08096b5
[fix]오류해결
zeeun Jan 24, 2024
97f8c6b
Merge pull request #3 from Regular-Pharmasist/feat/APIconnecting-#1
zeeun Jan 24, 2024
cb665e5
[feat]navigation수정
zeeun Jan 26, 2024
99f16b8
[fix]온보딩화면 수정
zeeun Jan 31, 2024
762a1c0
Merge pull request #4 from Regular-Pharmasist/feat/APIconnecting-#1
zeeun Jan 31, 2024
7960294
[feat]스택화면추가
zeeun Feb 5, 2024
6df46cd
Merge pull request #5 from Regular-Pharmasist/feat/APIconnecting-#1
zeeun Feb 5, 2024
c80f600
[feat] 이미지피커 스택화면 구성완료
zeeun Feb 5, 2024
9462763
[fix]스택및 헤더수정
zeeun Feb 5, 2024
c9bc211
Merge pull request #6 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Feb 5, 2024
37f2782
[feat]카드,블록 뉴스택스크린적용
zeeun Feb 12, 2024
e86b57d
[fix]홈화면 버튼 style 수정
zeeun Feb 12, 2024
a92e0d3
[style]홈화면 UI 중간완성
zeeun Feb 12, 2024
56dccef
Merge pull request #7 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Feb 12, 2024
d4c3889
[style]온보딩화면수정 및 폰트적용
zeeun Feb 12, 2024
f0c7964
Merge pull request #8 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Feb 12, 2024
d9cc826
[feat]약물분석기록추가
zeeun Feb 15, 2024
a3b7afe
Merge pull request #9 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Feb 15, 2024
e56f0c7
[feat]복용기록확인 페이지생성
zeeun Feb 21, 2024
1420153
Merge pull request #10 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Feb 21, 2024
3a8fcd3
[feat]로그인후화면전환
zeeun Feb 21, 2024
25b9be4
[feat]레전드분석결과출력
zeeun Feb 24, 2024
785f7d0
Merge pull request #11 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Feb 24, 2024
64b9527
[feat]약물분석기능완성
zeeun Feb 29, 2024
f371f28
Merge pull request #12 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Feb 29, 2024
0b6330e
[Feat] 복용 기록
h2st0n Mar 11, 2024
158a6c0
[Design] UI 디자인 수정 #1
h2st0n Mar 11, 2024
2015259
[Design] UI 수정
h2st0n Mar 11, 2024
3c59c34
Merge pull request #14 from Regular-Pharmasist/UIDesign
h2st0n Mar 11, 2024
b46d2ce
[fix]리다이렉트 uri 수정
zeeun Mar 12, 2024
e785c3e
Merge pull request #15 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Mar 12, 2024
a10a339
[fix] UI 오류 수정
h2st0n Mar 14, 2024
b54a6eb
Merge pull request #16 from Regular-Pharmasist/UIDesign-#2
h2st0n Mar 14, 2024
b9fdd7a
[feat]모달창 drugcard로옮기고 프로필작업
zeeun Mar 16, 2024
3ed206d
Merge branch 'master' into feat/AnalyzingScreen-#2
zeeun Mar 16, 2024
5120841
Merge pull request #17 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Mar 16, 2024
f44a767
[Design] UI 디자인 수정 #2
h2st0n Mar 17, 2024
66a0519
Merge pull request #18 from Regular-Pharmasist/UIDesign-#3
h2st0n Mar 17, 2024
52c3ac5
[Design] UI 디자인 수정 #3
h2st0n Mar 17, 2024
e0abe1c
[feat] 프로필완성
zeeun Mar 18, 2024
0d7f581
Merge branch 'master' into feat/AnalyzingScreen-#2
zeeun Mar 18, 2024
a2341ea
[feat]복용기록기능완성
zeeun Mar 18, 2024
5bda595
Merge pull request #19 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Mar 18, 2024
b838758
[feat]기록수정
zeeun Mar 18, 2024
fc9090e
Merge pull request #20 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Mar 18, 2024
4f94801
[feat]상세약물기능완료
zeeun Mar 18, 2024
b1eb702
[Design] UI 디자인 수정 #3
h2st0n Mar 18, 2024
2b26f5f
[feat]경고카드작성
zeeun Mar 18, 2024
c3b6488
[feat]디스크립션, 경고 완성
zeeun Mar 18, 2024
f02b683
Merge branch 'master' into feat/AnalyzingScreen-#2
zeeun Mar 18, 2024
798455d
Merge pull request #21 from Regular-Pharmasist/feat/AnalyzingScreen-#2
zeeun Mar 18, 2024
6f479c9
Merge branch 'master' into feat/AnalyzingScreen-#2
zeeun Mar 18, 2024
ba2943a
Merge branch 'feat/AnalyzingScreen-#2' of https://github.com/Regular-…
zeeun Mar 18, 2024
91686b4
[Design] UI 디자인 수정 #4
h2st0n Mar 18, 2024
ed5a2eb
[feat]카메라이상한거 교정
zeeun Mar 18, 2024
8a357d2
Merge branch 'master' into feat/AnalyzingScreen-#2
zeeun Mar 18, 2024
f98698e
[FIX]완성
zeeun Mar 19, 2024
63346e5
[fix]디버깅완성
zeeun Mar 19, 2024
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
44 changes: 25 additions & 19 deletions components/DrawerItem.js
Original file line number Diff line number Diff line change
@@ -1,58 +1,64 @@
import React from "react";
import { StyleSheet, TouchableOpacity, Linking } from "react-native";
import { Block, Text, theme } from "galio-framework";
import { FontAwesome, MaterialIcons, Feather, MaterialCommunityIcons } from '@expo/vector-icons';

import Icon from "./Icon";
import argonTheme from "../constants/Theme";

class DrawerItem extends React.Component {

iconColor = "#67B779";

renderIcon = () => {
const { title, focused } = this.props;

const iconColor = focused ? "white" : this.iconColor;

switch (title) {
case "홈":
return (
<Icon
name="shop"
family="ArgonExtra"
name="home"
family="FontAwesome"
size={14}
color={focused ? "white" : argonTheme.COLORS.PRIMARY}
color={iconColor}
/>
);
case "복용기록확인":
case "복용 기록 확인":
return (
<Icon
name="map-big"
family="ArgonExtra"
name="history"
family="MaterialIcons"
size={14}
color={focused ? "white" : argonTheme.COLORS.ERROR}
color={iconColor}
/>
);
case "복용알람":
case "복용 알람":
return (
<Icon
name="spaceship"
family="ArgonExtra"
name="bell"
family="Feather"
size={14}
color={focused ? "white" : argonTheme.COLORS.PRIMARY}
color={iconColor}
/>
);
case "중독위험도":
case "중독 위험도":
return (
<Icon
name="chart-pie-35"
family="ArgonExtra"
name="warning"
family="MaterialIcons"
size={14}
color={focused ? "white" : argonTheme.COLORS.WARNING}
color={iconColor}
/>
);
case "프로필":
return (
<Icon
name="calendar-date"
family="ArgonExtra"
name="account-circle"
family="MaterialIcons"
size={14}
color={focused ? "white" : argonTheme.COLORS.INFO}
color={iconColor}
/>
);
case "Getting Started":
@@ -113,7 +119,7 @@ const styles = StyleSheet.create({
paddingHorizontal: 16
},
activeStyle: {
backgroundColor: argonTheme.COLORS.ACTIVE,
backgroundColor: "#67B779",
borderRadius: 4
},
shadow: {
8 changes: 6 additions & 2 deletions navigation/Menu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Block, Text, theme } from "galio-framework";
import { Image, ScrollView, StyleSheet } from "react-native";
import { View, Image, ScrollView, StyleSheet } from "react-native";
import { Icon } from 'react-native-vector-icons/MaterialIcons';

import { DrawerItem as DrawerCustomItem } from "../components";
import Images from "../constants/Images";
@@ -14,6 +15,8 @@ function CustomDrawerContent({
...rest
}) {
const screens = ["홈", "복용 기록 확인", "복용 알람", "중독 위험도", "프로필"];
const focusedColor = "#67B779";

return (
<Block
style={styles.container}
@@ -30,7 +33,8 @@ function CustomDrawerContent({
title={item}
key={index}
navigation={navigation}
focused={state.index === index ? true : false}
focused={state.routeNames[state.index] === item}
focusedColor={focusedColor}
/>
);
})}
8 changes: 4 additions & 4 deletions navigation/Screens.js
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ function ArticlesStack(props) {
component={Articles}
options={{
header: ({ navigation, scene }) => (
<Header title="Articles" navigation={navigation} scene={scene} />
<Header title="중독 위험도" navigation={navigation} scene={scene} />
),
cardStyle: { backgroundColor: "#F8F9FE" },
}}
@@ -121,7 +121,7 @@ function ProfileStack(props) {
<Header
transparent
white
title="Profile"
title="프로필"
navigation={navigation}
scene={scene}
/>
@@ -166,7 +166,7 @@ function DescriptionStack(props) {
options={{
header: ({ navigation, scene }) => (
<Header
title="Description"
title="복용 기록 확인"
navigation={navigation}
scene={scene}
/>
@@ -210,7 +210,7 @@ function HomeStack(props) {
options={{
header: ({ navigation, scene }) => (
<Header
title="Home"
title=""
search
options
navigation={navigation}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -52,6 +52,7 @@
"react-native-render-html": "^6.3.4",
"react-native-safe-area-context": "4.6.3",
"react-native-screens": "~3.22.0",
"react-native-vector-icons": "^10.0.3",
"react-native-web": "~0.19.6",
"react-native-webview": "13.2.2",
"react-native-xml2js": "^1.0.3",