Skip to content

Commit e0ac2db

Browse files
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.lock
2 parents 5ea1125 + b782b6a commit e0ac2db

18 files changed

Lines changed: 1957 additions & 3188 deletions

File tree

android/src/main/java/com/reactnativenavigation/utils/SystemUiUtils.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ object SystemUiUtils {
117117
view.requestApplyInsets()
118118
}
119119

120-
/**
121-
* Clears references to system bar background views.
122-
* Call from Activity.onDestroy to avoid leaking views across activity recreation.
123-
*/
124120
/**
125121
* Returns the default navigation bar color, applying 80% opacity for 3-button navigation.
126122
* Gesture navigation gets a fully opaque color since the bar is minimal.
@@ -132,6 +128,10 @@ object SystemUiUtils {
132128
return Color.argb(alpha, Color.red(DEFAULT_NAV_BAR_COLOR), Color.green(DEFAULT_NAV_BAR_COLOR), Color.blue(DEFAULT_NAV_BAR_COLOR))
133129
}
134130

131+
/**
132+
* Clears references to system bar background views.
133+
* Call from Activity.onDestroy to avoid leaking views across activity recreation.
134+
*/
135135
@JvmStatic
136136
fun tearDown() {
137137
statusBarBackgroundView = null

e2e/SideMenu.test.js

Lines changed: 0 additions & 107 deletions
This file was deleted.
-113 KB
Binary file not shown.

lib/android/app/build.gradle

Lines changed: 0 additions & 219 deletions
This file was deleted.

lib/android/app/src/main/java/com/reactnativenavigation/utils/ColorUtils.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

lib/android/app/src/main/java/com/reactnativenavigation/utils/ReactViewGroup.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)