Skip to content

Upgrade React Navigation v3 and v4. #4249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisbobbe merged 7 commits into from
Sep 17, 2020
Merged

Upgrade React Navigation v3 and v4. #4249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f4b8253
MainScreenWithTabs: Use `router` static, pass `navigation` prop.
chrisbobbe Sep 3, 2020
373e5e3
MessageReactionList [nfc]: Remove a prettier suppression.
chrisbobbe Sep 4, 2020
b080ef2
MessageReactionList: Wrap rogue tab nav in `createNavigationContainer`.
chrisbobbe Sep 3, 2020
99be838
deps: Upgrade to react-navigation v3.
chrisbobbe Sep 3, 2020
f3b6c1f
deps: Upgrade to react-navigation v4.
chrisbobbe Sep 3, 2020
991b036
android nav: Use a better stack-nav animation.
chrisbobbe Sep 15, 2020
ad0b5f3
nav: Enable swiping between top tabs.
chrisbobbe Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .flowconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ node_modules/warning/.*

.*/node_modules/react-native-notifications/.*
.*/node_modules/react-native-tab-view/.*
.*/node_modules/react-navigation-redux-helpers/.*
.*/node_modules/react-native-safe-area/.*
.*/node_modules/flow-coverage-report/.*
.*/node_modules/@snyk/.*
Expand Down
11 changes: 11 additions & 0 deletions android/app/src/main/java/com/zulipmobile/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ import android.os.Bundle
import android.util.Log
import android.webkit.WebView
import com.facebook.react.ReactActivity
import com.facebook.react.ReactActivityDelegate;
import com.facebook.react.ReactRootView;
import com.facebook.react.ReactApplication
import com.facebook.react.bridge.Arguments
import com.facebook.react.bridge.WritableMap
import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
import com.zulipmobile.notifications.*
import com.zulipmobile.sharing.SharingModule

Expand All @@ -23,6 +26,14 @@ open class MainActivity : ReactActivity() {
return "ZulipMobile"
}

override fun createReactActivityDelegate(): ReactActivityDelegate {
return object : ReactActivityDelegate(this, mainComponentName) {
override fun createRootView(): ReactRootView {
return RNGestureHandlerEnabledRootView(this@MainActivity)
}
}
}

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
WebView.setWebContentsDebuggingEnabled(true)
Expand Down
Loading