diff --git a/app/android/.gitignore b/app/android/.gitignore index 8a6be077..1ea9b646 100644 --- a/app/android/.gitignore +++ b/app/android/.gitignore @@ -12,5 +12,8 @@ local.properties *.hprof .cxx/ +# generated inline modules +app/src/main/java/inline/ + # Bundle artifacts *.jsbundle diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle index 59eec6ca..40390cac 100644 --- a/app/android/app/build.gradle +++ b/app/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() diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml index 86af9337..888ebf52 100644 --- a/app/android/app/src/main/AndroidManifest.xml +++ b/app/android/app/src/main/AndroidManifest.xml @@ -1,10 +1,14 @@ - + + + + + - + @@ -12,11 +16,12 @@ - + + - + diff --git a/app/android/app/src/main/java/com/anonymous/app/MainApplication.kt b/app/android/app/src/main/java/com/anonymous/app/MainApplication.kt index 80fd324b..b80f3232 100644 --- a/app/android/app/src/main/java/com/anonymous/app/MainApplication.kt +++ b/app/android/app/src/main/java/com/anonymous/app/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 = - 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() diff --git a/app/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png b/app/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png index 09081379..248abef8 100644 Binary files a/app/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png and b/app/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png differ diff --git a/app/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png b/app/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png index ac8a5bbd..581236fe 100644 Binary files a/app/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png and b/app/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png differ diff --git a/app/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png b/app/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png index cec33611..b2cf5135 100644 Binary files a/app/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png and b/app/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png differ diff --git a/app/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png b/app/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png index 6c08a119..b18d7fcf 100644 Binary files a/app/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png and b/app/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png differ diff --git a/app/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png b/app/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png index fbe261ef..8273b8db 100644 Binary files a/app/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png and b/app/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png differ diff --git a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp index 7fae0ccb..b79da728 100644 Binary files a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index afa0a4ef..1b406d1e 100644 Binary files a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp index 78aaf454..415741ff 100644 Binary files a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index c4f6e101..068bde02 100644 Binary files a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 7a0f085f..47d6c730 100644 Binary files a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 6c2d40bf..d97a4c44 100644 Binary files a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 730e3fa5..f60dccf3 100644 Binary files a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index 34526158..6941d79d 100644 Binary files a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index b11a322a..c61c9a7a 100644 Binary files a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index b51fd15c..ba59367f 100644 Binary files a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/android/app/src/main/res/values/colors.xml b/app/android/app/src/main/res/values/colors.xml index f387b901..26ddd538 100644 --- a/app/android/app/src/main/res/values/colors.xml +++ b/app/android/app/src/main/res/values/colors.xml @@ -2,5 +2,4 @@ #ffffff #ffffff #023c69 - #ffffff \ No newline at end of file diff --git a/app/android/app/src/main/res/values/strings.xml b/app/android/app/src/main/res/values/strings.xml index bbb79969..a82f28e1 100644 --- a/app/android/app/src/main/res/values/strings.xml +++ b/app/android/app/src/main/res/values/strings.xml @@ -1,5 +1,4 @@ app contain - false \ No newline at end of file diff --git a/app/android/app/src/main/res/values/styles.xml b/app/android/app/src/main/res/values/styles.xml index 45a97e61..1a134df1 100644 --- a/app/android/app/src/main/res/values/styles.xml +++ b/app/android/app/src/main/res/values/styles.xml @@ -1,9 +1,9 @@