From 5d0896739df7707179a6b2256becfef96abc2696 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Tue, 2 Apr 2024 17:09:40 -0300 Subject: [PATCH] minor cleanup --- android/app/build.gradle | 23 +--------- .../chat/rocket/reactnative/MainActivity.kt | 6 --- .../rocket/reactnative/MainApplication.kt | 7 ---- android/build.gradle | 42 ------------------- app/lib/hooks/useFrequentlyUsedEmoji.ts | 7 +--- 5 files changed, 3 insertions(+), 82 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 67bde36e7..3f52509fe 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -94,7 +94,7 @@ android { targetSdkVersion rootProject.ext.targetSdkVersion versionCode VERSIONCODE as Integer versionName "4.48.0" - vectorDrawables.useSupportLibrary = true // need this? + vectorDrawables.useSupportLibrary = true if (!isFoss) { manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" // See note below! @@ -181,19 +181,6 @@ android { manifest.srcFile 'src/play/AndroidManifest.xml' } } - - // need this? - // bundle { - // language { - // enableSplit = false - // } - // density { - // enableSplit = true - // } - // abi { - // enableSplit = true - // } - // } } dependencies { @@ -224,14 +211,6 @@ dependencies { implementation 'com.facebook.soloader:soloader:0.10.4' implementation("com.facebook.fresco:animated-gif:2.5.0") implementation "com.facebook.fresco:imagepipeline-okhttp3:3.1.3" - - // need this? - // react-native-screens was pointing to a newer version of this lib that is currently not supported in our app - // implementation ('com.google.android.material:material:1.6.0') { - // version { - // strictly '1.6.0' - // } - // } } apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) diff --git a/android/app/src/main/java/chat/rocket/reactnative/MainActivity.kt b/android/app/src/main/java/chat/rocket/reactnative/MainActivity.kt index c48748320..e8521fcd5 100644 --- a/android/app/src/main/java/chat/rocket/reactnative/MainActivity.kt +++ b/android/app/src/main/java/chat/rocket/reactnative/MainActivity.kt @@ -37,10 +37,4 @@ class MainActivity : ReactActivity() { intent.putExtra("newConfig", newConfig) sendBroadcast(intent) } - - // need this? - // @Override - // public void invokeDefaultOnBackPressed() { - // moveTaskToBack(true); - // } } \ No newline at end of file diff --git a/android/app/src/main/java/chat/rocket/reactnative/MainApplication.kt b/android/app/src/main/java/chat/rocket/reactnative/MainApplication.kt index 3a0029f27..cb955a97d 100644 --- a/android/app/src/main/java/chat/rocket/reactnative/MainApplication.kt +++ b/android/app/src/main/java/chat/rocket/reactnative/MainApplication.kt @@ -14,7 +14,6 @@ import com.facebook.soloader.SoLoader import expo.modules.ApplicationLifecycleDispatcher import expo.modules.ReactNativeHostWrapper -// import org.wonday.orientation.OrientationActivityLifecycle; import chat.rocket.reactnative.networking.SSLPinningPackage; import com.reactnativecommunity.viewpager.RNCViewPagerPackage; import android.content.res.Configuration; @@ -47,17 +46,11 @@ open class MainApplication : Application(), ReactApplication { super.onCreate() SoLoader.init(this, false) - // need this? - // if (!BuildConfig.REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS) { - // ReactFeatureFlags.unstable_useRuntimeSchedulerAlways = false - // } if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { // If you opted-in for the New Architecture, we load the native entry point for this app. load() } - // ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager) ApplicationLifecycleDispatcher.onApplicationCreate(this) - // registerActivityLifecycleCallbacks(OrientationActivityLifecycle.getInstance()); } override fun onConfigurationChanged(newConfig: Configuration) { diff --git a/android/build.gradle b/android/build.gradle index 3d607da57..4cd2ea2bf 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -17,10 +17,6 @@ buildscript { repositories { google() - // mavenLocal() - // maven { - // url 'https://maven.fabric.io/public' - // } mavenCentral() } @@ -38,16 +34,6 @@ buildscript { allprojects { repositories { - // mavenLocal() - // maven { - // // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - // url("$rootDir/../node_modules/react-native/android") - // } - // maven { - // // Android JSC is installed from npm - // url("$rootDir/../node_modules/jsc-android/dist") - // } - maven { url "$rootDir/../node_modules/detox/Detox-android" } @@ -56,34 +42,6 @@ allprojects { // expo-camera bundles a custom com.google.android:cameraview url "$rootDir/../node_modules/expo-camera/android/maven" } - - // mavenCentral { - // content { - // excludeGroup "com.facebook.react" - // } - // } - - // google() - // maven { url 'https://maven.google.com' } - // maven { url 'https://www.jitpack.io' } - - // // https://stackoverflow.com/a/74333788/5447468 - // // TODO: remove once we update RN - // exclusiveContent { - // // We get React Native's Android binaries exclusively through npm, - // // from a local Maven repo inside node_modules/react-native/. - // // (The use of exclusiveContent prevents looking elsewhere like Maven Central - // // and potentially getting a wrong version.) - // filter { - // includeGroup "com.facebook.react" - // } - // forRepository { - // maven { - // // NOTE: if you are in a monorepo, you may have "$rootDir/../../../node_modules/react-native/android" - // url "$rootDir/../node_modules/react-native/android" - // } - // } - // } } } diff --git a/app/lib/hooks/useFrequentlyUsedEmoji.ts b/app/lib/hooks/useFrequentlyUsedEmoji.ts index 4652166f5..7c694ce86 100644 --- a/app/lib/hooks/useFrequentlyUsedEmoji.ts +++ b/app/lib/hooks/useFrequentlyUsedEmoji.ts @@ -31,11 +31,8 @@ export const useFrequentlyUsedEmoji = ( .slice(0, DEFAULT_EMOJIS.length); } - // TODO: remove once we update to React 18 - unstable_batchedUpdates(() => { - setFrequentlyUsed(frequentlyUsedEmojis); - setLoaded(true); - }); + setFrequentlyUsed(frequentlyUsedEmojis); + setLoaded(true); }; getFrequentlyUsedEmojis(); }, []);