From 9665a0405fdeef4fb70cb1fa04c92a5597bc0544 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Tue, 4 Jul 2023 10:24:17 -0300 Subject: [PATCH] Use react-native-scrollable-tab-view fork --- android/app/build.gradle | 1 - .../chat/rocket/reactnative/MainApplication.java | 2 -- android/settings.gradle | 2 -- package.json | 2 +- yarn.lock | 16 ++++++++-------- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 883e25047..5e9bcff0b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -192,7 +192,6 @@ dependencies { implementation jscFlavor } - implementation project(':@react-native-community_viewpager') implementation "androidx.core:core-splashscreen:1.0.0" playImplementation project(':react-native-notifications') diff --git a/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java b/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java index cc8ceebb9..f2d9777b2 100644 --- a/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java +++ b/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java @@ -11,7 +11,6 @@ import com.facebook.react.ReactPackage; import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint; import com.facebook.react.defaults.DefaultReactNativeHost; import com.facebook.soloader.SoLoader; -import com.reactnativecommunity.viewpager.RNCViewPagerPackage; import com.facebook.react.bridge.JSIModulePackage; import android.content.Context; import android.content.res.Configuration; @@ -36,7 +35,6 @@ public class MainApplication extends Application implements ReactApplication { protected List getPackages() { @SuppressWarnings("UnnecessaryLocalVariable") List packages = new PackageList(this).getPackages(); - packages.add(new RNCViewPagerPackage()); packages.add(new SSLPinningPackage()); List additionalModules = new AdditionalModules().getAdditionalModules(MainApplication.this); packages.addAll(additionalModules); diff --git a/android/settings.gradle b/android/settings.gradle index cfd459e79..023fdef2e 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,6 +1,4 @@ rootProject.name = 'RocketChatRN' -include ':@react-native-community_viewpager' -project(':@react-native-community_viewpager').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/viewpager/android') include ':@react-native-firebase_app' project(':@react-native-firebase_app').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-firebase/app/android') include ':@react-native-firebase_analytics' diff --git a/package.json b/package.json index 86394f981..0c51431eb 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "react-native-restart": "0.0.22", "react-native-safe-area-context": "3.2.0", "react-native-screens": "^3.20.0", - "react-native-scrollable-tab-view": "ptomasroos/react-native-scrollable-tab-view", + "react-native-scrollable-tab-view": "RocketChat/react-native-scrollable-tab-view", "react-native-simple-crypto": "RocketChat/react-native-simple-crypto#0.5.1", "react-native-skeleton-placeholder": "^5.2.4", "react-native-slowlog": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index bb634135f..68cb8df93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5055,11 +5055,6 @@ resolved "https://registry.yarnpkg.com/@react-native-community/slider/-/slider-4.4.2.tgz#1fea0eb3ae31841fe87bd6c4fc67569066e9cf4b" integrity sha512-D9bv+3Vd2gairAhnRPAghwccgEmoM7g562pm8i4qB3Esrms5mggF81G3UvCyc0w3jjtFHh8dpQkfEoKiP0NW/Q== -"@react-native-community/viewpager@3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@react-native-community/viewpager/-/viewpager-3.3.0.tgz#e613747a43a31a6f3278f817ba96fdaaa7941f23" - integrity sha512-tyzh79l4t/hxiyS9QD3LRmWMs8KVkZzjrkQ8U8+8To1wmvVCBtp8BenvNsDLTBO7CpO/YmiThpmIdEZMr1WuVw== - "@react-native-cookies/cookies@6.2.1": version "6.2.1" resolved "https://registry.yarnpkg.com/@react-native-cookies/cookies/-/cookies-6.2.1.tgz#54d50b9496400bbdc19e43c155f70f8f918999e3" @@ -17692,6 +17687,11 @@ react-native-orientation-locker@1.1.8: resolved "https://registry.yarnpkg.com/react-native-orientation-locker/-/react-native-orientation-locker-1.1.8.tgz#45d1c9e002496b8d286ec8932d6e3e7d341f9c85" integrity sha512-+Vd7x6O/3zGqYIMXpeDlaw3ma074Dtnocm8ryT9v5SvaiEcWSzII4frPgXaUcc/MiCq4OWZ1JtVoyw75mdomQw== +react-native-pager-view@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/react-native-pager-view/-/react-native-pager-view-6.2.0.tgz#51380d93fbe47f6380dc71d613a787bf27a4ca37" + integrity sha512-pf9OnL/Tkr+5s4Gjmsn7xh91PtJLDa6qxYa/bmtUhd/+s4cQdWQ8DIFoOFghwZIHHHwVdWtoXkp6HtpjN+r20g== + react-native-picker-select@^8.0.4: version "8.0.4" resolved "https://registry.yarnpkg.com/react-native-picker-select/-/react-native-picker-select-8.0.4.tgz#3f7f1f42df69b06e7d2c10338288332a6c40fd10" @@ -17763,14 +17763,14 @@ react-native-screens@^3.20.0: react-freeze "^1.0.0" warn-once "^0.1.0" -react-native-scrollable-tab-view@ptomasroos/react-native-scrollable-tab-view: +react-native-scrollable-tab-view@RocketChat/react-native-scrollable-tab-view: version "1.1.0" - resolved "https://codeload.github.com/ptomasroos/react-native-scrollable-tab-view/tar.gz/583a66f7fd3eb2cac1a05c71d7167d78a8ad9de6" + resolved "https://codeload.github.com/RocketChat/react-native-scrollable-tab-view/tar.gz/1e5495e9ef9d634683a1afb7dd9293d2ea873a4d" dependencies: - "@react-native-community/viewpager" "3.3.0" create-react-class "^15.6.2" deprecated-react-native-prop-types "^2.3.0" prop-types "^15.6.0" + react-native-pager-view "^6.2.0" react-timer-mixin "^0.13.3" react-native-simple-crypto@RocketChat/react-native-simple-crypto#0.5.1: