Skip to content

Commit

Permalink
Merge pull request #40 from dypark26/HOTFIX/dark-mode
Browse files Browse the repository at this point in the history
fix: 다크모드 전환으로 안 보이는 컬러를 수정했습니다. #1
  • Loading branch information
dypark26 authored Jan 13, 2023
2 parents 141a3ee + c22f7a1 commit e3df354
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
3 changes: 3 additions & 0 deletions App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { QueryClientProvider, QueryClient } from 'react-query';
import { NavigationContainer } from '@react-navigation/native';
import { ThemeContextProvider } from './src/context/Theme';
import Root from './src/Navigations/Root';
// import { LogBox } from 'react-native';

const queryClient = new QueryClient();

Expand All @@ -16,3 +17,5 @@ export default function App() {
</QueryClientProvider>
);
}

// LogBox.ignoreAllLogs();
7 changes: 5 additions & 2 deletions src/components/GraphicStatus.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const GraphicStatus = () => {
</SupportText>
</SupportTextContainer>
) : opacity === 1 ? (
<SupportTextContainer>
<SupportTextContainer theme={theme}>
<SupportText theme={theme}>
축하합니다! 캐치필 달성!
</SupportText>
Expand All @@ -125,7 +125,10 @@ const GraphicStatus = () => {
)}
</View>

<SupportTextContainer style={{ display: message ? 'flex' : 'none' }}>
<SupportTextContainer
theme={theme}
style={{ display: message ? 'flex' : 'none' }}
>
{/* 랜덤으로 뽑아준 인덱스 이용해서 응원글 랜덤 뽑기 */}
<SupportText theme={theme}>{supportArr[pop]}</SupportText>
</SupportTextContainer>
Expand Down
10 changes: 6 additions & 4 deletions src/screen/EditPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,23 +96,25 @@ const EditPage = ({ navigation: { navigate }, route: { params } }) => {
<EditForm>
{/* 약 이름 인풋 */}
<BoxShadow color={theme === 'light' ? 'white' : '#343639'}>
<PillInfoTitle>약 이름 :</PillInfoTitle>
<PillInfoTitle theme={theme}>약 이름 :</PillInfoTitle>
<PillNameInput
defaultValue={eachPillName}
placeholder="어떤 약인가요?"
value={pillName}
onChangeText={setPillName}
placeholderTextColor={theme === 'light' ? '#d5d5d5' : '#636568'}
theme={theme}
/>
</BoxShadow>

{/* 약 복용시간 타임피커 */}
<TouchableOpacity onPress={handleOpenModal}>
<BoxShadow color={theme === 'light' ? 'white' : '#343639'}>
<PillInfoTitle>복용 시간 :</PillInfoTitle>
<PillInfoTitle theme={theme}>복용 시간 :</PillInfoTitle>
{isEdit ? (
<TimePicker>{localEditTime}</TimePicker>
<TimePicker theme={theme}>{localEditTime}</TimePicker>
) : (
<TimePicker>{localTime}</TimePicker>
<TimePicker theme={theme}>{localTime}</TimePicker>
)}
</BoxShadow>
</TouchableOpacity>
Expand Down

0 comments on commit e3df354

Please sign in to comment.