diff --git a/app.config.js b/app.config.js index 7528e9010c..9d80e2526d 100644 --- a/app.config.js +++ b/app.config.js @@ -335,7 +335,7 @@ module.exports = function (_config) { }, ], [ - '@mozzius/expo-dynamic-app-icon', + '@bsky.app/expo-dynamic-app-icon', { /** * Default set diff --git a/package.json b/package.json index e30bb09423..7f9a21675b 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,7 @@ "@bitdrift/react-native": "^0.6.8", "@braintree/sanitize-url": "^6.0.2", "@bsky.app/alf": "^0.1.6", + "@bsky.app/expo-dynamic-app-icon": "^1.8.2", "@bsky.app/expo-image-crop-tool": "^0.5.0", "@bsky.app/react-native-mmkv": "2.12.5", "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet", @@ -99,7 +100,6 @@ "@lingui/react": "^4.14.1", "@mattermost/react-native-paste-input": "mattermost/react-native-paste-input", "@miblanchard/react-native-slider": "^2.6.0", - "@mozzius/expo-dynamic-app-icon": "^1.8.0", "@react-native-async-storage/async-storage": "2.2.0", "@react-navigation/bottom-tabs": "^7.9.0", "@react-navigation/native": "^7.1.26", diff --git a/src/screens/Settings/AppIconSettings/index.tsx b/src/screens/Settings/AppIconSettings/index.tsx index 306f707eb2..8b6a7b7a4d 100644 --- a/src/screens/Settings/AppIconSettings/index.tsx +++ b/src/screens/Settings/AppIconSettings/index.tsx @@ -1,8 +1,8 @@ import {useState} from 'react' import {Alert, View} from 'react-native' +import * as DynamicAppIcon from '@bsky.app/expo-dynamic-app-icon' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import * as DynamicAppIcon from '@mozzius/expo-dynamic-app-icon' import {type NativeStackScreenProps} from '@react-navigation/native-stack' import {PressableScale} from '#/lib/custom-animations/PressableScale' @@ -128,7 +128,7 @@ function getAppIconName(icon: string | false): DynamicAppIcon.IconName { if (!icon || icon === 'DEFAULT') { return 'default_light' } else { - return icon as DynamicAppIcon.IconName + return icon } } @@ -150,7 +150,7 @@ function Group({ values={[value]} maxSelections={1} onChange={vals => { - if (vals[0]) onChange(vals[0] as DynamicAppIcon.IconName) + if (vals[0]) onChange(vals[0]) }}> {children} diff --git a/src/screens/Settings/AppIconSettings/types.ts b/src/screens/Settings/AppIconSettings/types.ts index 02c2791dc9..77eda3036d 100644 --- a/src/screens/Settings/AppIconSettings/types.ts +++ b/src/screens/Settings/AppIconSettings/types.ts @@ -1,5 +1,5 @@ import {type ImageSourcePropType} from 'react-native' -import type * as DynamicAppIcon from '@mozzius/expo-dynamic-app-icon' +import type * as DynamicAppIcon from '@bsky.app/expo-dynamic-app-icon' export type AppIconSet = { id: DynamicAppIcon.IconName diff --git a/src/screens/Settings/AppIconSettings/useCurrentAppIcon.ts b/src/screens/Settings/AppIconSettings/useCurrentAppIcon.ts index 4bc9b665a4..95cdf5467a 100644 --- a/src/screens/Settings/AppIconSettings/useCurrentAppIcon.ts +++ b/src/screens/Settings/AppIconSettings/useCurrentAppIcon.ts @@ -1,5 +1,5 @@ import {useCallback, useMemo, useState} from 'react' -import * as DynamicAppIcon from '@mozzius/expo-dynamic-app-icon' +import * as DynamicAppIcon from '@bsky.app/expo-dynamic-app-icon' import {useFocusEffect} from '@react-navigation/native' import {useAppIconSets} from '#/screens/Settings/AppIconSettings/useAppIconSets' diff --git a/yarn.lock b/yarn.lock index a2f9e62c0c..644e186a69 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3683,6 +3683,14 @@ dependencies: react-responsive "^10.0.1" +"@bsky.app/expo-dynamic-app-icon@^1.8.2": + version "1.8.2" + resolved "https://registry.yarnpkg.com/@bsky.app/expo-dynamic-app-icon/-/expo-dynamic-app-icon-1.8.2.tgz#7c0015f4a05139da1b30ee901604b219543cfbb7" + integrity sha512-yqop/qQrlxwEbdy1icCnILcRspaI+kD+d4Q2Ei1rZ27qw4Dh9wG7wCZPz6AVJfDZ2lHHJ7xzTc4JqNjghzLYVw== + dependencies: + "@expo/image-utils" "^0.8.7" + xcode "^3.0.1" + "@bsky.app/expo-image-crop-tool@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@bsky.app/expo-image-crop-tool/-/expo-image-crop-tool-0.5.0.tgz#4308fbde5c15e6be9122601797bc3d9549c95e31" @@ -5468,14 +5476,6 @@ resolved "https://registry.yarnpkg.com/@miblanchard/react-native-slider/-/react-native-slider-2.6.0.tgz#9f78c805d637ffaff0e3e7429932d2995a67edc9" integrity sha512-o7hk/f/8vkqh6QNR5L52m+ws846fQeD/qNCC9CCSRdBqjq66KiCgbxzlhRzKM/gbtxcvMYMIEEJ1yes5cr6I3A== -"@mozzius/expo-dynamic-app-icon@^1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@mozzius/expo-dynamic-app-icon/-/expo-dynamic-app-icon-1.8.0.tgz#3e98b6dc6d2a90a4274f8d975231f71e1f765142" - integrity sha512-b8/OGbTWrEhNKi8fro9MEpS2aqfP/3uIjgMTlSmEPggwKSVho61sf86t8k1g2BsVt6T+pMbS3FTMsPAVeROiJQ== - dependencies: - "@expo/image-utils" "^0.8.7" - xcode "^3.0.1" - "@napi-rs/wasm-runtime@^0.2.11": version "0.2.12" resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz#3e78a8b96e6c33a6c517e1894efbd5385a7cb6f2"