Skip to content

Commit

Permalink
Merge pull request #6775 from StoDevX/dependabot/npm_and_yarn/react-n…
Browse files Browse the repository at this point in the history
…ative-paper-5.1.4
  • Loading branch information
hawkrives authored Jan 24, 2023
2 parents 94abf50 + 3140fa2 commit 34f106b
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 38 deletions.
4 changes: 1 addition & 3 deletions modules/app-theme/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import type {ThemingType} from '@callstack/react-theme-provider'
import {createTheming} from '@callstack/react-theme-provider'
import {CombinedDefaultTheme, CombinedDarkTheme} from './paper'

export {CombinedDefaultTheme, CombinedDarkTheme}
export {CombinedLightTheme, CombinedDarkTheme} from './paper'

export type AppTheme = {
accent: string
Expand Down
11 changes: 4 additions & 7 deletions modules/app-theme/paper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@ import merge from 'deepmerge'

import {
DarkTheme as NavigationDarkTheme,
DefaultTheme as NavigationDefaultTheme,
DefaultTheme as NavigationLightTheme,
} from '@react-navigation/native'

import {
DarkTheme as PaperDarkTheme,
DefaultTheme as PaperDefaultTheme,
MD3DarkTheme as PaperDarkTheme,
MD3LightTheme as PaperLightTheme,
} from 'react-native-paper'

export const CombinedDefaultTheme = merge(
PaperDefaultTheme,
NavigationDefaultTheme,
)
export const CombinedLightTheme = merge(PaperLightTheme, NavigationLightTheme)

export const CombinedDarkTheme = merge(PaperDarkTheme, NavigationDarkTheme)
51 changes: 26 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"react-native-ios-context-menu": "1.15.3",
"react-native-keychain": "8.1.1",
"react-native-network-logger": "1.14.0",
"react-native-paper": "4.12.4",
"react-native-paper": "5.1.4",
"react-native-popover-view": "4.1.0",
"react-native-reanimated": "2.14.4",
"react-native-restart": "0.0.24",
Expand Down
4 changes: 2 additions & 2 deletions source/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {Provider as ReduxProvider} from 'react-redux'
import {Provider as PaperProvider} from 'react-native-paper'
import {PersistQueryClientProvider} from '@tanstack/react-query-persist-client'
import {store, persistor} from './redux'
import {ThemeProvider, CombinedDefaultTheme} from '@frogpond/app-theme'
import {ThemeProvider, CombinedLightTheme} from '@frogpond/app-theme'
import {ActionSheetProvider} from '@expo/react-native-action-sheet'
import {NavigationContainer} from '@react-navigation/native'

Expand All @@ -37,7 +37,7 @@ export default function App(): JSX.Element {
client={queryClient}
persistOptions={{persister}}
>
<PaperProvider theme={CombinedDefaultTheme}>
<PaperProvider theme={CombinedLightTheme}>
<ThemeProvider>
<ActionSheetProvider>
<NavigationContainer
Expand Down

0 comments on commit 34f106b

Please sign in to comment.