Commit e0ac2db
committed
Merge remote-tracking branch 'origin/master' into feat/edge2edge-android
# Conflicts:
# android/build.gradle
# android/src/main/java/com/reactnativenavigation/utils/SystemUiUtils.kt
# android/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/Presenter.java
# android/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabsContainer.kt
# e2e/SideMenu.test.js
# e2e/assets/overlay_banner_padding.png
# lib/android/app/build.gradle
# lib/android/app/src/main/java/com/reactnativenavigation/utils/ColorUtils.java
# lib/android/app/src/main/java/com/reactnativenavigation/utils/ReactViewGroup.kt
# lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/Presenter.java
# lib/android/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabsLayout.java
# lib/android/app/src/main/java/com/reactnativenavigation/views/element/animators/BackgroundColorAnimator.kt
# lib/android/app/src/main/java/com/reactnativenavigation/views/element/animators/BackgroundColorEvaluator.kt
# lib/android/app/src/reactNative71/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt
# lib/android/app/src/test/java/com/reactnativenavigation/TestApplication.java
# lib/android/app/src/test/java/com/reactnativenavigation/mocks/TitleBarReactViewCreatorMock.java
# lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/bottomtabs/attacher/modes/AttachModeTest.java
# lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/child/ChildControllerTest.java
# lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/child/ChildControllersRegistryTest.java
# lib/ios/RNNAppDelegate.mm
# package.json
# playground/android/settings.gradle
# playground/package.json
# yarn.lock18 files changed
Lines changed: 1957 additions & 3188 deletions
File tree
- e2e
- assets
- lib
- android/app
- src
- ios
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | 120 | | |
125 | 121 | | |
126 | 122 | | |
| |||
132 | 128 | | |
133 | 129 | | |
134 | 130 | | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
| |||
This file was deleted.
Binary file not shown.
This file was deleted.
Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 0 additions & 7 deletions
This file was deleted.
0 commit comments