Feature/expo update

.storybook/index.tsx

@@ -1,9 +1,11 @@
-import AsyncStorage from '@react-native-async-storage/async-storage'
+import { createAsyncStorage } from '@react-native-async-storage/async-storage'
 
 import { view } from './storybook.requires'
 
+const storage = createAsyncStorage('storybook')
+
 const StorybookUIRoot = view.getStorybookUI({
-  storage: { getItem: AsyncStorage.getItem, setItem: AsyncStorage.setItem },
+  storage,
   theme: {
     typography: {
       size: {

.storybook/preview.tsx

@@ -1,14 +1,28 @@
 import type { Preview } from '@storybook/react'
-import { StyleSheet } from 'react-native-unistyles'
-import { ThemeContextProvider, ThemeVariant } from '../src'
-import { View } from 'react-native'
-import React, { type FunctionComponent, type ReactNode } from 'react'
+import { useArgs } from '@storybook/preview-api'
+import { StyleSheet, UnistylesRuntime } from 'react-native-unistyles'
+import { ThemeContextProvider, ThemeVariant } from '../src/theme'
+import { View, Appearance } from 'react-native'
+import React, {
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  type FunctionComponent,
+  type ReactNode,
+} from 'react'
+
+let currentTheme =
+  Appearance.getColorScheme() === 'dark'
+    ? ThemeVariant.Dark
+    : ThemeVariant.Light
 
 const preview: Preview = {
   decorators: [
-    (Story, { args }) => {
+    (Story, context) => {
+      const [args, updateArgs] = useArgs<StorybookThemeArgs>()
+
       return (
-        <Container theme={args.theme}>
+        <Container theme={args.theme} updateArgs={updateArgs}>
           <View style={{ padding: 16, flex: 1 }}>
             <Story />
           </View>
@@ -26,17 +40,45 @@ const preview: Preview = {
       control: { type: 'radio' },
     },
   },
-  args: { theme: ThemeVariant.Light },
+  args: { theme: currentTheme },
 }
 
 export default preview
 
+interface StorybookThemeArgs {
+  theme: ThemeVariant
+}
+
+const THEME_NAME_MAP: Record<ThemeVariant, 'light' | 'dark'> = {
+  [ThemeVariant.Light]: 'light',
+  [ThemeVariant.Dark]: 'dark',
+}
+
 const Container: FunctionComponent<{
   children: ReactNode
   theme: ThemeVariant
-}> = ({ children, theme }) => {
+  updateArgs: (args: StorybookThemeArgs) => void
+}> = ({ children, theme, updateArgs }) => {
+  const themeSynchronized = useRef(false)
+
+  useEffect(() => {
+    if (!themeSynchronized.current) {
+      themeSynchronized.current = true
+      updateArgs({ theme: currentTheme })
+    }
+  }, [updateArgs])
+
+  useLayoutEffect(() => {
+    if (themeSynchronized.current) {
+      const nextTheme = THEME_NAME_MAP[theme]
+      Appearance.setColorScheme(nextTheme)
+      UnistylesRuntime.setTheme(nextTheme)
+      currentTheme = theme
+    }
+  }, [theme])
+
   return (
-    <ThemeContextProvider initialTheme={theme}>
+    <ThemeContextProvider initialTheme={currentTheme}>
       <View style={styles.container}>{children}</View>
     </ThemeContextProvider>
   )

.storybook/storybook.requires.ts

@@ -1,5 +1,6 @@
 /* do not change this file, it is auto generated by storybook. */
-import { start, updateView, View } from '@storybook/react-native';
+/// <reference types="@storybook/react-native/metro-env" />
+import { start, updateView, View, type Features } from '@storybook/react-native';
 
 import "@storybook/addon-ondevice-notes/register";
 import "@storybook/addon-ondevice-controls/register";
@@ -11,7 +12,6 @@ const normalizedStories = [
     directory: "./src",
     files: "**/*.stories.?(ts|tsx|js|jsx)",
     importPathMatcher: /^\.(?:(?:^|\/|(?:(?:(?!(?:^|\/)\.).)*?)\/)(?!\.)(?=.)[^/]*?\.stories\.(?:ts|tsx|js|jsx)?)$/,
-    // @ts-ignore
     req: require.context(
       '../src',
       true,
@@ -24,6 +24,10 @@ const normalizedStories = [
 declare global {
   var view: View;
   var STORIES: typeof normalizedStories;
+  var STORYBOOK_WEBSOCKET:
+    | { host?: string; port?: number; secured?: boolean }
+    | undefined;
+  var FEATURES: Features;
 }
 
 
@@ -32,21 +36,21 @@ const annotations = [
   require("@storybook/react-native/preview")
 ];
 
-global.STORIES = normalizedStories;
+globalThis.STORIES = normalizedStories;
+
 
-// @ts-ignore
 module?.hot?.accept?.();
 
 
 
-if (!global.view) {
-  global.view = start({
+if (!globalThis.view) {
+  globalThis.view = start({
     annotations,
     storyEntries: normalizedStories,
 
   });
 } else {
-  updateView(global.view, annotations, normalizedStories);
+  updateView(globalThis.view, annotations, normalizedStories);
 }
 
-export const view: View = global.view;
+export const view: View = globalThis.view;

android/app/build.gradle

@@ -11,7 +11,7 @@ def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath()
 react {
     entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", projectRoot, "android", "absolute"].execute(null, rootDir).text.trim())
     reactNativeDir = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
-    hermesCommand = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsolutePath() + "/sdks/hermesc/%OS-BIN%/hermesc"
+    hermesCommand = new File(["node", "--print", "require.resolve('hermes-compiler/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().getAbsolutePath() + "/hermesc/%OS-BIN%/hermesc"
     codegenDir = new File(["node", "--print", "require.resolve('@react-native/codegen/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
 
     enableBundleCompression = (findProperty('android.enableBundleCompression') ?: false).toBoolean()

android/app/src/debugOptimized/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" tools:replace="android:usesCleartextTraffic" />
+</manifest>

android/app/src/main/AndroidManifest.xml

@@ -1,9 +1,9 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
   <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" tools:replace="android:maxSdkVersion"/>
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32" tools:replace="android:maxSdkVersion"/>
   <queries>
     <intent>
       <action android:name="android.intent.action.VIEW"/>
@@ -15,7 +15,7 @@
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
-    <activity android:name=".MainActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
+    <activity android:name=".MainActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|uiMode|smallestScreenSize" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>

android/app/src/main/java/ru/cdek/uikit/prime/MainApplication.kt

@@ -6,37 +6,26 @@ import android.content.res.Configuration
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
-import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
 import com.facebook.react.ReactHost
 import com.facebook.react.common.ReleaseLevel
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
-import com.facebook.react.defaults.DefaultReactNativeHost
 
 import expo.modules.ApplicationLifecycleDispatcher
-import expo.modules.ReactNativeHostWrapper
+import expo.modules.ExpoReactHostFactory
 
 class MainApplication : Application(), ReactApplication {
 
-  override val reactNativeHost: ReactNativeHost = ReactNativeHostWrapper(
-      this,
-      object : DefaultReactNativeHost(this) {
-        override fun getPackages(): List<ReactPackage> =
-            PackageList(this).packages.apply {
-              // Packages that cannot be autolinked yet can be added manually here, for example:
-              // add(MyReactNativePackage())
-            }
-
-          override fun getJSMainModuleName(): String = ".expo/.virtual-metro-entry"
-
-          override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
-
-          override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-      }
-  )
-
-  override val reactHost: ReactHost
-    get() = ReactNativeHostWrapper.createReactHost(applicationContext, reactNativeHost)
+  override val reactHost: ReactHost by lazy {
+    ExpoReactHostFactory.getDefaultReactHost(
+      context = applicationContext,
+      packageList =
+        PackageList(this).packages.apply {
+          // Packages that cannot be autolinked yet can be added manually here, for example:
+          // add(MyReactNativePackage())
+        }
+    )
+  }
 
   override fun onCreate() {
     super.onCreate()

android/app/src/main/res/values/colors.xml

@@ -2,5 +2,4 @@
   <color name="splashscreen_background">#FFFFFF</color>
   <color name="iconBackground">#ffffff</color>
   <color name="colorPrimary">#023c69</color>
-  <color name="colorPrimaryDark">#FFFFFF</color>
 </resources>

android/app/src/main/res/values/strings.xml

@@ -1,5 +1,4 @@
 <resources>
   <string name="app_name">CDEK UI</string>
   <string name="expo_splash_screen_resize_mode" translatable="false">cover</string>
-  <string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -1,9 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
-    <item name="android:enforceNavigationBarContrast" tools:targetApi="29">true</item>
     <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
     <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="android:statusBarColor">#FFFFFF</item>
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:navigationBarColor">@android:color/transparent</item>
   </style>
   <style name="Theme.App.SplashScreen" parent="AppTheme">
     <item name="android:windowBackground">@drawable/ic_launcher_background</item>

android/gradle.properties

@@ -59,7 +59,3 @@ EX_DEV_CLIENT_NETWORK_INSPECTOR=true
 
 # Use legacy packaging to compress native libraries in the resulting APK.
 expo.useLegacyPackaging=false
-
-# Specifies whether the app is configured to use edge-to-edge via the app config or plugin
-# WARNING: This property has been deprecated and will be removed in Expo SDK 55. Use `edgeToEdgeEnabled` or `react.edgeToEdgeEnabled` to determine whether the project is using edge-to-edge.
-expo.edgeToEdgeEnabled=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

app.config.ts

@@ -21,7 +21,6 @@ export default {
     icon: './icon.png',
     updates: { fallbackToCacheTimeout: 0 },
     plugins: ['./expo/plugins/withEnsureBundler.js'],
-    newArchEnabled: true,
     assetBundlePatterns: ['**/*'],
   } satisfies ExpoConfig,
 }