diff --git a/App.tsx b/App.tsx index cd2e193..2bd3b5b 100644 --- a/App.tsx +++ b/App.tsx @@ -6,8 +6,8 @@ import { import React, { useEffect, useMemo, useState } from 'react' import { DeviceEventEmitter, useColorScheme } from 'react-native' import { - DarkTheme as PaperDarkTheme, - DefaultTheme as PaperDefaultTheme, + MD3DarkTheme as PaperDarkTheme, + MD3LightTheme as PaperDefaultTheme, Provider as PaperProvider, Snackbar, } from 'react-native-paper' diff --git a/colors.ts b/colors.ts index 1caafdb..24726fb 100644 --- a/colors.ts +++ b/colors.ts @@ -1,7 +1,7 @@ -import { DarkTheme, DefaultTheme } from 'react-native-paper' +import { DefaultTheme, MD3DarkTheme } from 'react-native-paper' export const lightColors = [ - { hex: DarkTheme.colors.primary, name: 'Purple' }, + { hex: MD3DarkTheme.colors.primary, name: 'Purple' }, { hex: '#B3E5FC', name: 'Blue' }, { hex: '#FA8072', name: 'Salmon' }, { hex: '#FFC0CB', name: 'Pink' }, diff --git a/package.json b/package.json index c038591..1ea53d9 100644 --- a/package.json +++ b/package.json @@ -38,9 +38,9 @@ "react-native-gesture-handler": "^2.8.0", "react-native-linear-gradient": "^2.6.2", "react-native-pager-view": "^6.0.1", - "react-native-paper": "^4.12.5", + "react-native-paper": "^5.9.1", "react-native-reanimated": "^3.3.0", - "react-native-safe-area-context": "^4.4.1", + "react-native-safe-area-context": "^4.7.1", "react-native-screens": "^3.18.2", "react-native-share": "^7.9.1", "react-native-sqlite-storage": "^6.0.1", diff --git a/use-theme.ts b/use-theme.ts index 420671d..1996519 100644 --- a/use-theme.ts +++ b/use-theme.ts @@ -1,5 +1,5 @@ import { createContext, useContext } from 'react' -import { DarkTheme, DefaultTheme } from 'react-native-paper' +import { MD3DarkTheme, MD3LightTheme } from 'react-native-paper' export const ThemeContext = createContext<{ theme: string @@ -10,10 +10,10 @@ export const ThemeContext = createContext<{ setDarkColor: (value: string) => void }>({ theme: 'system', - lightColor: DefaultTheme.colors.primary, + lightColor: MD3DarkTheme.colors.primary, setTheme: () => null, setLightColor: () => null, - darkColor: DarkTheme.colors.primary, + darkColor: MD3LightTheme.colors.primary, setDarkColor: () => null, }) diff --git a/yarn.lock b/yarn.lock index bc6b416..4ee8dc5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1764,7 +1764,7 @@ __metadata: languageName: node linkType: hard -"@callstack/react-theme-provider@npm:^3.0.7": +"@callstack/react-theme-provider@npm:^3.0.8": version: 3.0.8 resolution: "@callstack/react-theme-provider@npm:3.0.8" dependencies: @@ -3279,6 +3279,13 @@ __metadata: languageName: node linkType: hard +"@yarnpkg/lockfile@npm:^1.1.0": + version: 1.1.0 + resolution: "@yarnpkg/lockfile@npm:1.1.0" + checksum: 05b881b4866a3546861fee756e6d3812776ea47fa6eb7098f983d6d0eefa02e12b66c3fff931574120f196286a7ad4879ce02743c8bb2be36c6a576c7852083a + languageName: node + linkType: hard + "abbrev@npm:^1.0.0": version: 1.1.1 resolution: "abbrev@npm:1.1.1" @@ -3627,6 +3634,13 @@ __metadata: languageName: node linkType: hard +"at-least-node@npm:^1.0.0": + version: 1.0.0 + resolution: "at-least-node@npm:1.0.0" + checksum: 463e2f8e43384f1afb54bc68485c436d7622acec08b6fad269b421cb1d29cebb5af751426793d0961ed243146fe4dc983402f6d5a51b720b277818dbf6f2e49e + languageName: node + linkType: hard + "available-typed-arrays@npm:^1.0.5": version: 1.0.5 resolution: "available-typed-arrays@npm:1.0.5" @@ -4628,7 +4642,7 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^3.2.0": +"ci-info@npm:^3.2.0, ci-info@npm:^3.7.0": version: 3.8.0 resolution: "ci-info@npm:3.8.0" checksum: d0a4d3160497cae54294974a7246202244fff031b0a6ea20dd57b10ec510aa17399c41a1b0982142c105f3255aff2173e5c0dd7302ee1b2f28ba3debda375098 @@ -6081,6 +6095,15 @@ __metadata: languageName: node linkType: hard +"find-yarn-workspace-root@npm:^2.0.0": + version: 2.0.0 + resolution: "find-yarn-workspace-root@npm:2.0.0" + dependencies: + micromatch: ^4.0.2 + checksum: fa5ca8f9d08fe7a54ce7c0a5931ff9b7e36f9ee7b9475fb13752bcea80ec6b5f180fa5102d60b376d5526ce924ea3fc6b19301262efa0a5d248dd710f3644242 + languageName: node + linkType: hard + "flat-cache@npm:^3.0.4": version: 3.0.4 resolution: "flat-cache@npm:3.0.4" @@ -6156,6 +6179,18 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:^9.0.0": + version: 9.1.0 + resolution: "fs-extra@npm:9.1.0" + dependencies: + at-least-node: ^1.0.0 + graceful-fs: ^4.2.0 + jsonfile: ^6.0.1 + universalify: ^2.0.0 + checksum: ba71ba32e0faa74ab931b7a0031d1523c66a73e225de7426e275e238e312d07313d2da2d33e34a52aa406c8763ade5712eb3ec9ba4d9edce652bcacdc29e6b20 + languageName: node + linkType: hard + "fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -6847,6 +6882,15 @@ __metadata: languageName: node linkType: hard +"is-docker@npm:^2.0.0": + version: 2.2.1 + resolution: "is-docker@npm:2.2.1" + bin: + is-docker: cli.js + checksum: 3fef7ddbf0be25958e8991ad941901bf5922ab2753c46980b60b05c1bf9c9c2402d35e6dc32e4380b980ef5e1970a5d9d5e5aa2e02d77727c3b6b5e918474c56 + languageName: node + linkType: hard + "is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" @@ -7017,6 +7061,15 @@ __metadata: languageName: node linkType: hard +"is-wsl@npm:^2.1.1": + version: 2.2.0 + resolution: "is-wsl@npm:2.2.0" + dependencies: + is-docker: ^2.0.0 + checksum: 20849846ae414997d290b75e16868e5261e86ff5047f104027026fd61d8b5a9b0b3ade16239f35e1a067b3c7cc02f70183cb661010ed16f4b6c7c93dad1b19d8 + languageName: node + linkType: hard + "isarray@npm:~1.0.0": version: 1.0.0 resolution: "isarray@npm:1.0.0" @@ -7831,6 +7884,19 @@ __metadata: languageName: node linkType: hard +"jsonfile@npm:^6.0.1": + version: 6.1.0 + resolution: "jsonfile@npm:6.1.0" + dependencies: + graceful-fs: ^4.1.6 + universalify: ^2.0.0 + dependenciesMeta: + graceful-fs: + optional: true + checksum: 7af3b8e1ac8fe7f1eccc6263c6ca14e1966fcbc74b618d3c78a0a2075579487547b94f72b7a1114e844a1e15bb00d440e5d1720bfc4612d790a6f285d5ea8354 + languageName: node + linkType: hard + "jsx-ast-utils@npm:^2.4.1 || ^3.0.0": version: 3.3.4 resolution: "jsx-ast-utils@npm:3.3.4" @@ -7850,6 +7916,15 @@ __metadata: languageName: node linkType: hard +"klaw-sync@npm:^6.0.0": + version: 6.0.0 + resolution: "klaw-sync@npm:6.0.0" + dependencies: + graceful-fs: ^4.1.11 + checksum: 0da397f8961313c3ef8f79fb63af9002cde5a8fb2aeb1a37351feff0dd6006129c790400c3f5c3b4e757bedcabb13d21ec0a5eaef5a593d59515d4f2c291e475 + languageName: node + linkType: hard + "kleur@npm:^3.0.3": version: 3.0.3 resolution: "kleur@npm:3.0.3" @@ -8099,9 +8174,9 @@ __metadata: react-native-gesture-handler: ^2.8.0 react-native-linear-gradient: ^2.6.2 react-native-pager-view: ^6.0.1 - react-native-paper: ^4.12.5 + react-native-paper: ^5.9.1 react-native-reanimated: ^3.3.0 - react-native-safe-area-context: ^4.4.1 + react-native-safe-area-context: ^4.7.1 react-native-screens: ^3.18.2 react-native-share: ^7.9.1 react-native-sqlite-storage: ^6.0.1 @@ -8773,7 +8848,7 @@ __metadata: languageName: node linkType: hard -"micromatch@npm:^4.0.4": +"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4": version: 4.0.5 resolution: "micromatch@npm:4.0.5" dependencies: @@ -9332,6 +9407,16 @@ __metadata: languageName: node linkType: hard +"open@npm:^7.4.2": + version: 7.4.2 + resolution: "open@npm:7.4.2" + dependencies: + is-docker: ^2.0.0 + is-wsl: ^2.1.1 + checksum: 3333900ec0e420d64c23b831bc3467e57031461d843c801f569b2204a1acc3cd7b3ec3c7897afc9dde86491dfa289708eb92bba164093d8bd88fb2c231843c91 + languageName: node + linkType: hard + "optionator@npm:^0.9.3": version: 0.9.3 resolution: "optionator@npm:0.9.3" @@ -9363,6 +9448,13 @@ __metadata: languageName: node linkType: hard +"os-tmpdir@npm:~1.0.2": + version: 1.0.2 + resolution: "os-tmpdir@npm:1.0.2" + checksum: 5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d + languageName: node + linkType: hard + "p-limit@npm:^2.0.0, p-limit@npm:^2.2.0": version: 2.3.0 resolution: "p-limit@npm:2.3.0" @@ -9485,6 +9577,30 @@ __metadata: languageName: node linkType: hard +"patch-package@npm:^7.0.0": + version: 7.0.2 + resolution: "patch-package@npm:7.0.2" + dependencies: + "@yarnpkg/lockfile": ^1.1.0 + chalk: ^4.1.2 + ci-info: ^3.7.0 + cross-spawn: ^7.0.3 + find-yarn-workspace-root: ^2.0.0 + fs-extra: ^9.0.0 + klaw-sync: ^6.0.0 + minimist: ^1.2.6 + open: ^7.4.2 + rimraf: ^2.6.3 + semver: ^7.5.3 + slash: ^2.0.0 + tmp: ^0.0.33 + yaml: ^2.2.2 + bin: + patch-package: index.js + checksum: de2cf60effc8b59ee15d4930f84eea63c217525f0133c926850ee3a2437651d8aabbd0fec4ddee1b8b8da4fd380bcea90ef3c4acd69026057fa80cdc823b59a4 + languageName: node + linkType: hard + "path-exists@npm:^3.0.0": version: 3.0.0 resolution: "path-exists@npm:3.0.0" @@ -9859,15 +9975,6 @@ __metadata: languageName: node linkType: hard -"react-native-iphone-x-helper@npm:^1.3.1": - version: 1.3.1 - resolution: "react-native-iphone-x-helper@npm:1.3.1" - peerDependencies: - react-native: ">=0.42.0" - checksum: 024376646009a966e33e12fc2358751830818b0fb73b1c601a64eb5e490d2dc43eec23668991b985a8c412a84d087f20eb45bb9b593567c08b66e741b7bddda5 - languageName: node - linkType: hard - "react-native-linear-gradient@npm:^2.6.2": version: 2.7.3 resolution: "react-native-linear-gradient@npm:2.7.3" @@ -9888,18 +9995,20 @@ __metadata: languageName: node linkType: hard -"react-native-paper@npm:^4.12.5": - version: 4.12.5 - resolution: "react-native-paper@npm:4.12.5" +"react-native-paper@npm:^5.9.1": + version: 5.9.1 + resolution: "react-native-paper@npm:5.9.1" dependencies: - "@callstack/react-theme-provider": ^3.0.7 + "@callstack/react-theme-provider": ^3.0.8 color: ^3.1.2 - react-native-iphone-x-helper: ^1.3.1 + patch-package: ^7.0.0 + use-latest-callback: ^0.1.5 peerDependencies: react: "*" react-native: "*" + react-native-safe-area-context: "*" react-native-vector-icons: "*" - checksum: 016236b716180025f56642185b53fcf39f795f3da4db8690d34027054ca80e20820423abd77ad4cf386fd759541dfe36a0207e48e62a46e4eb170f55556ab327 + checksum: 47b23f827d3d5d296dc888d8c10c689465ccf2b8d815b2ecea8c5a41b2244776d153a6ffeaf14df61a231cd9542cc26199e85dd94687acec6b6adeb3f0ea271d languageName: node linkType: hard @@ -9924,13 +10033,13 @@ __metadata: languageName: node linkType: hard -"react-native-safe-area-context@npm:^4.4.1": - version: 4.6.3 - resolution: "react-native-safe-area-context@npm:4.6.3" +"react-native-safe-area-context@npm:^4.7.1": + version: 4.7.1 + resolution: "react-native-safe-area-context@npm:4.7.1" peerDependencies: react: "*" react-native: "*" - checksum: f304d22f3df981b7d01b8a983ef5ace161b5352dfd293ef5b525071e861856ff5eda8720eacf1bc1d5153add9e53d09ce59f8cbdd20b590718863b8bb38eeebf + checksum: 2a07c0b0751c9ceb435c7b107a881080d7b4142fca597ea4701894aeb7c2fec02eeaef094bc28f3d2eaed39f4fc8ef26764c156bf17af93407d723db5608e1e5 languageName: node linkType: hard @@ -10417,6 +10526,17 @@ __metadata: languageName: node linkType: hard +"rimraf@npm:^2.6.3": + version: 2.7.1 + resolution: "rimraf@npm:2.7.1" + dependencies: + glob: ^7.1.3 + bin: + rimraf: ./bin.js + checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd + languageName: node + linkType: hard + "rimraf@npm:^3.0.2": version: 3.0.2 resolution: "rimraf@npm:3.0.2" @@ -10666,6 +10786,13 @@ __metadata: languageName: node linkType: hard +"slash@npm:^2.0.0": + version: 2.0.0 + resolution: "slash@npm:2.0.0" + checksum: 512d4350735375bd11647233cb0e2f93beca6f53441015eea241fe784d8068281c3987fbaa93e7ef1c38df68d9c60013045c92837423c69115297d6169aa85e6 + languageName: node + linkType: hard + "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0" @@ -11148,6 +11275,15 @@ __metadata: languageName: node linkType: hard +"tmp@npm:^0.0.33": + version: 0.0.33 + resolution: "tmp@npm:0.0.33" + dependencies: + os-tmpdir: ~1.0.2 + checksum: 902d7aceb74453ea02abbf58c203f4a8fc1cead89b60b31e354f74ed5b3fb09ea817f94fb310f884a5d16987dd9fa5a735412a7c2dd088dd3d415aa819ae3a28 + languageName: node + linkType: hard + "tmpl@npm:1.0.5": version: 1.0.5 resolution: "tmpl@npm:1.0.5" @@ -11445,6 +11581,13 @@ __metadata: languageName: node linkType: hard +"universalify@npm:^2.0.0": + version: 2.0.0 + resolution: "universalify@npm:2.0.0" + checksum: 2406a4edf4a8830aa6813278bab1f953a8e40f2f63a37873ffa9a3bc8f9745d06cc8e88f3572cb899b7e509013f7f6fcc3e37e8a6d914167a5381d8440518c44 + languageName: node + linkType: hard + "unpipe@npm:~1.0.0": version: 1.0.0 resolution: "unpipe@npm:1.0.0" @@ -11773,7 +11916,7 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.2.1": +"yaml@npm:^2.2.1, yaml@npm:^2.2.2": version: 2.3.1 resolution: "yaml@npm:2.3.1" checksum: 2c7bc9a7cd4c9f40d3b0b0a98e370781b68b8b7c4515720869aced2b00d92f5da1762b4ffa947f9e795d6cd6b19f410bd4d15fdd38aca7bd96df59bd9486fb54