react-native-navigation 7.27.1 → 7.28.0-snapshot.636

package/autolink/postlink/activityLinker.js

@@ -8,6 +8,7 @@ class ActivityLinker {
     this.activityPath = path.mainActivityJava;
     this.extendNavigationActivitySuccess = false;
     this.removeGetMainComponentNameSuccess = false;
+    this.removeCreateReactActivityDelegate = false;
   }
 
   link() {
@@ -36,6 +37,8 @@ class ActivityLinker {
       errorn('   ' + e.message);
     }
 
+    activityContent = this._removeCreateReactActivityDelegate(activityContent);
+
     fs.writeFileSync(this.activityPath, activityContent);
     if (this.extendNavigationActivitySuccess && this.removeGetMainComponentNameSuccess) {
       infon('MainActivity linked successfully!\n');
@@ -75,7 +78,7 @@ class ActivityLinker {
           'import com.reactnativenavigation.NavigationActivity;'
         );
     }
-    if (this._hasAlreadyExtendReactActivity) {
+    if (this._hasAlreadyExtendReactActivity(activityContent)) {
       warnn('   MainActivity already extends NavigationActivity');
       return activityContent;
     }
@@ -92,6 +95,27 @@ class ActivityLinker {
   _hasAlreadyExtendReactActivity(activityContent) {
     return /public\s+class\s+MainActivity\s+extends\s+ReactActivity\s*/.test(activityContent);
   }
+
+  _removeCreateReactActivityDelegate(activityContent) {
+    if (this._hasCreateReactActivityDelegate(activityContent)) {
+      debugn('   Removing createReactActivityDelegate function');
+      return activityContent.replace(
+        /\/\*\*(\s+\*.+)+\s+@Override\s+protected ReactActivityDelegate createReactActivityDelegate\(\) {(\s*[\w*(,);])*\s*}/,
+        '',
+      );
+    } else {
+      warnn(
+        '   createReactActivityDelegate is already not defined in MainActivity',
+      );
+      return activityContent;
+    }
+  }
+
+  _hasCreateReactActivityDelegate(activityContent) {
+    return /\/\*\*(\s+\*.+)+\s+@Override\s+protected ReactActivityDelegate createReactActivityDelegate\(\) {(\s*[\w*(,);])*\s*}/.test(
+      activityContent,
+    );
+  }
 }
 
 module.exports = ActivityLinker;

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsPresenter.kt

@@ -71,7 +71,7 @@ class BottomTabsPresenter(
             bottomTabs.titleState = bottomTabsOptions.titleDisplayMode.toState()
         }
         if (bottomTabsOptions.backgroundColor.hasValue()) {
-            bottomTabs.setBackgroundColor(bottomTabsOptions.backgroundColor.get())
+            bottomTabsContainer.setBackgroundColor(bottomTabsOptions.backgroundColor.get())
         }
         if (bottomTabsOptions.animateTabSelection.hasValue()) {
             bottomTabs.setAnimateTabSelection(bottomTabsOptions.animateTabSelection.get())
@@ -143,7 +143,7 @@ class BottomTabsPresenter(
         bottomTabs.setLayoutDirection(options.layout.direction)
         bottomTabs.setPreferLargeIcons(options.bottomTabsOptions.preferLargeIcons[false])
         bottomTabs.titleState = bottomTabsOptions.titleDisplayMode[defaultTitleState]
-        bottomTabs.setBackgroundColor(bottomTabsOptions.backgroundColor.get(Color.WHITE)!!)
+        bottomTabsContainer.setBackgroundColor(bottomTabsOptions.backgroundColor.get(Color.WHITE)!!)
         bottomTabs.setAnimateTabSelection(bottomTabsOptions.animateTabSelection.get(true))
         if (bottomTabsOptions.currentTabIndex.hasValue()) {
             val tabIndex = bottomTabsOptions.currentTabIndex.get()
@@ -175,7 +175,7 @@ class BottomTabsPresenter(
             }
         }
         if (bottomTabsOptions.elevation.hasValue()) {
-            bottomTabs.setUseElevation(true, bottomTabsOptions.elevation.get().toFloat())
+            bottomTabsContainer.setElevation(bottomTabsOptions.elevation)
         }
 
         when {

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt

@@ -159,6 +159,7 @@ open class ButtonPresenter(private val context: Context, private val button: But
         iconResolver.resolve(button) { icon: Drawable ->
             setIconColor(icon)
             toolbar.setNavigationOnClickListener { onPress(button) }
+            toolbar.navigationIcon = null
             toolbar.navigationIcon = icon
             setLeftButtonTestId(toolbar)
             if (button.accessibilityLabel.hasValue()) toolbar.navigationContentDescription = button.accessibilityLabel.get()

package/lib/android/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabs.java

@@ -2,6 +2,7 @@ package com.reactnativenavigation.views.bottomtabs;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -28,6 +29,7 @@ public class BottomTabs extends AHBottomNavigation {
     public BottomTabs(Context context) {
         super(context);
         setId(R.id.bottomTabs);
+        setDefaultBackgroundColor(Color.TRANSPARENT);
     }
 
     public void disableItemsCreation() {

package/lib/android/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabsContainer.kt

@@ -7,6 +7,8 @@ import android.view.View
 import android.widget.LinearLayout
 import androidx.annotation.RestrictTo
 import androidx.core.graphics.ColorUtils
+import com.reactnativenavigation.options.params.Fraction
+import com.reactnativenavigation.utils.UiUtils.dpToPx
 import kotlin.math.roundToInt
 
 
@@ -91,5 +93,9 @@ class BottomTabsContainer(context: Context, val bottomTabs: BottomTabs) : Shadow
     fun hideTopOutLine() {
         topOutLineView.alpha = 0f
     }
+
+    fun setElevation(elevation: Fraction) {
+        setElevation(dpToPx(context, elevation.get().toFloat()))
+    }
 }
 

package/lib/ios/UINavigationController+RNNOptions.m

@@ -72,7 +72,7 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 }
 
 - (CGFloat)getTopBarHeight {
-    return self.navigationBar.frame.size.height;
+    return self.navigationBar.frame.origin.y + self.navigationBar.frame.size.height;
 }
 
 @end

package/lib/ios/UIViewController+LayoutProtocol.m

@@ -146,23 +146,11 @@
 }
 
 - (CGFloat)getTopBarHeight {
-    for (UIViewController *child in [self childViewControllers]) {
-        CGFloat childTopBarHeight = [child getTopBarHeight];
-        if (childTopBarHeight > 0)
-            return childTopBarHeight;
-    }
-
-    return 0;
+    return [self.presentedComponentViewController.navigationController getTopBarHeight];
 }
 
 - (CGFloat)getBottomTabsHeight {
-    for (UIViewController *child in [self childViewControllers]) {
-        CGFloat childBottomTabsHeight = [child getBottomTabsHeight];
-        if (childBottomTabsHeight > 0)
-            return childBottomTabsHeight;
-    }
-
-    return 0;
+    return [self.presentedComponentViewController.tabBarController getBottomTabsHeight];
 }
 
 - (void)screenPopped {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.27.1",
+  "version": "7.28.0-snapshot.636",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,