react-native-navigation 7.47.0 → 7.49.0

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

@@ -1,18 +1,34 @@
 package com.reactnativenavigation.views.bottomtabs;
 
+import static android.view.Gravity.CENTER_HORIZONTAL;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+
 import android.content.Context;
+import android.graphics.Color;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+import com.reactnativenavigation.RNNFeatureToggles;
+import com.reactnativenavigation.RNNToggles;
+
+import eightbitlab.com.blurview.BlurTarget;
 
+/**
+ * Implementation note: The space-view and its containing linear-layout is a trick meant to force
+ * a bottom margin layout which isn't based on a `MarginLayoutParams.bottomMargin`. That's because
+ * it is not always honored by the CoordinatorLayout. This appears to be an ok work-around (which
+ * BTW actually would have been an idiomatic solution in ComposeUI).
+ */
 public class BottomTabsLayout extends CoordinatorLayout {
 
     private BottomTabsContainer bottomTabsContainer;
+    private View spaceView;
+    private BlurTarget blurSurface;
 
     public BottomTabsLayout(Context context) {
         super(context);
@@ -21,16 +37,52 @@ public class BottomTabsLayout extends CoordinatorLayout {
     @Override
     public void addView(View child, int index, ViewGroup.LayoutParams params) {
         if (bottomTabsContainer != null && child != bottomTabsContainer) {
-            super.addView(child, getChildCount() - 1, params);
+            if (RNNFeatureToggles.isEnabled(RNNToggles.TAB_BAR_TRANSLUCENCE)) {
+                // As loosely explained in BlurView's README, the blur *view* and blur *target* must
+                // reside in different sub-sections of the view-hierarchy
+                lazyInitBlurSurface();
+                blurSurface.addView(child, -1, params);
+            } else {
+                super.addView(child, getChildCount() - 1, params);
+            }
         } else {
             super.addView(child, 0, params);
         }
+
+        if (bottomTabsContainer != null && blurSurface != null) {
+            bottomTabsContainer.setBlurSurface(blurSurface);
+        }
     }
 
     public void addBottomTabsContainer(BottomTabsContainer bottomTabsContainer) {
-        CoordinatorLayout.LayoutParams lp = new CoordinatorLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
-        lp.gravity = Gravity.BOTTOM;
-        addView(bottomTabsContainer, lp);
+        View spaceView = new View(getContext());
+        spaceView.setLayoutParams(new LinearLayout.LayoutParams(WRAP_CONTENT, 0));
+
+        LinearLayout surface = new LinearLayout(getContext());
+        surface.setOrientation(LinearLayout.VERTICAL);
+        surface.setGravity(CENTER_HORIZONTAL);
+        surface.setBackgroundColor(Color.TRANSPARENT);
+        surface.addView(bottomTabsContainer, new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
+        surface.addView(spaceView);
+
+        // Note: Width should always be WRAP_CONTENT so we could delegate the width-related decision
+        // making to the bottom-tabs view hierarchy itself (i.e. based on user properties).
+        CoordinatorLayout.LayoutParams lp = new CoordinatorLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
+        lp.gravity = Gravity.BOTTOM | CENTER_HORIZONTAL;
+        addView(surface, -1, lp);
+
         this.bottomTabsContainer = bottomTabsContainer;
+        this.spaceView = spaceView;
+    }
+
+    public void setBottomMargin(int bottomMargin) {
+        ((MarginLayoutParams) spaceView.getLayoutParams()).bottomMargin = bottomMargin;
+    }
+
+    private void lazyInitBlurSurface() {
+        if (blurSurface == null) {
+            blurSurface = new BlurTarget(getContext());
+            super.addView(blurSurface, super.getChildCount() - 1, new CoordinatorLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        }
     }
 }

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

@@ -13,7 +13,7 @@ private const val MAX_ANGLE = 360.0f
 private const val MIN_RADIUS = 0.1f
 private const val MIN_ANGLE = 0.0f
 
-open class ShadowLayout constructor(context: Context) : FrameLayout(context) {
+open class ShadowLayout(context: Context) : FrameLayout(context) {
     private val paint: Paint = Paint(ANTI_ALIAS_FLAG).apply {
         isDither = true
         isFilterBitmap = true
@@ -43,7 +43,7 @@ open class ShadowLayout constructor(context: Context) : FrameLayout(context) {
     var isShadowed: Boolean = false
         set(isShadowed) {
             field = isShadowed
-            this.updatePadding()
+            updatePadding()
             postInvalidate()
         }
 
@@ -108,11 +108,8 @@ open class ShadowLayout constructor(context: Context) : FrameLayout(context) {
         if (isShadowed) {
             if (invalidateShadow) {
                 if (bounds.width() != 0 && bounds.height() != 0) {
-                    bitmap = Bitmap.createBitmap(
-                            bounds.width(), bounds.height(), Bitmap.Config.ARGB_8888
-                    )
-                    bitmap?.let {
-                        mainCanvas.setBitmap(bitmap)
+                    bitmap = Bitmap.createBitmap(bounds.width(), bounds.height(), Bitmap.Config.ARGB_8888).also {
+                        mainCanvas.setBitmap(it)
                         invalidateShadow = false
 
                         super.dispatchDraw(mainCanvas)
@@ -135,5 +132,4 @@ open class ShadowLayout constructor(context: Context) : FrameLayout(context) {
 
         super.dispatchDraw(canvas)
     }
-
 }

package/lib/dist/src/interfaces/Options.d.ts

@@ -773,7 +773,9 @@ export interface OptionsBottomTabs {
      */
     drawBehind?: boolean;
     /**
-     * Set a background color for the bottom tabs
+     * Set a background color for the bottom tabs.<br/>
+     * On Android - also applicable when translucence is applied, but a semi-transparent
+     * color should be used (e.g. `rgba(255, 0, 0, 0.25)`).
      */
     backgroundColor?: Color;
     /**
@@ -789,10 +791,42 @@ export interface OptionsBottomTabs {
      */
     barStyle?: 'default' | 'black';
     /**
-     * Allows the Bottom Tabs to be translucent (blurred)
-     * #### (iOS specific)
+     * Control the way the bottom tabs are laid out.
+     * - `stretch`: Fill the entire width of the screen.
+     * - `compact`: Occupy the minimum width needed to hold tab buttons. Recommended for
+     * usage in conjunction with `drawBehind: true`.
+     *
+     * #### (Android specific)
+     * @default 'stretch'
+     */
+    layoutStyle?: 'stretch' | 'compact';
+    /**
+     * Specify a corner-radius (in dip) in order to apply round corners to the tabs container.<br/>
+     * Mainly suitable when used in conjunction with `layoutStyle: 'compact'`
+     * #### (Android specific)
+     */
+    cornerRadius?: AndroidDensityNumber;
+    /**
+     * Bottom-margin to set in order to apply a "hover" effect.
+     * Works best when used in conjunction with `layoutStyle: 'compact'` and `drawBehind: true`.
+     * #### (Android specific)
+     */
+    bottomMargin?: AndroidDensityNumber;
+    /**
+     * Allows the bottom tabs to be translucent (blurred). Doesn't necessarily play
+     * nice with shadow effects on Android.
+     * #### Android: experimental, turn on using native toggle `TAB_BAR_TRANSLUCENCE`.
      */
     translucent?: boolean;
+    /**
+     * Set a custom radius to be used in the blur effect. Higher is blurrier, but
+     * also more CPU-intensive.<br/>
+     * Note: The blurring is performed following a bitmap downscale of x4.0, so
+     * ultimately the actual radius is (4*blurRadius).
+     * #### (Android specific)
+     * @defaultValue 1.0
+     */
+    blurRadius?: AndroidDensityNumber;
     /**
      * Hide the top line of the Tab Bar
      * #### (iOS specific)
@@ -986,10 +1020,19 @@ export interface SideMenuSide {
     height?: number;
     /**
      * Stretch sideMenu contents when opened past the width
+     *
+     * **Not applicable when `openMode` is `aboveContent`**
+     *
      * #### (iOS specific)
      * @default true
      */
     shouldStretchDrawer?: boolean;
+    /**
+     * Configure the opening mode of the side menu
+     * #### (iOS specific)
+     * @default 'pushContent'
+     */
+    openMode?: 'pushContent' | 'aboveContent';
 }
 export interface OptionsSideMenu {
     /**

package/lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController.h

@@ -127,6 +127,14 @@ typedef void (^MMDrawerControllerDrawerVisualStateBlock)(MMDrawerController *dra
 
 @interface MMDrawerController : UIViewController
 
+/**
+ Enum defining how the drawer opens
+ */
+ typedef NS_ENUM(NSInteger, MMDrawerOpenMode) {
+  MMDrawerOpenModePushContent = 0, // Original behavior - pushes content aside
+  MMDrawerOpenModeAboveContent = 1, // Overlay behavior - opens above content
+};
+
 ///---------------------------------------
 /// @name Accessing Drawer Container View Controller Properties
 ///---------------------------------------
@@ -213,6 +221,18 @@ typedef void (^MMDrawerControllerDrawerVisualStateBlock)(MMDrawerController *dra
 @property(nonatomic, assign) BOOL shouldStretchLeftDrawer;
 @property(nonatomic, assign) BOOL shouldStretchRightDrawer;
 
+/**
+ * Specifies how the drawer should open relative to the center content.
+ * 
+ * Possible values:
+ * - MMDrawerOpenModePushContent: The drawer will push the center content aside when opening (traditional behavior).
+ * - MMDrawerOpenModeAboveContent: The drawer will open above the center content with a semi-transparent overlay.
+ *
+ * By default, this value is set to MMDrawerOpenModePushContent.
+ */
+@property(nonatomic, assign) MMDrawerOpenMode leftDrawerOpenMode;
+@property(nonatomic, assign) MMDrawerOpenMode rightDrawerOpenMode;
+
 /**
  The current open side of the drawer.
 
@@ -600,4 +620,6 @@ typedef void (^MMDrawerControllerDrawerVisualStateBlock)(MMDrawerController *dra
     (BOOL (^)(MMDrawerController *drawerController, UIGestureRecognizer *gesture,
               UITouch *touch))gestureShouldRecognizeTouchBlock;
 
+- (void)side:(MMDrawerSide)drawerSide openMode:(MMDrawerOpenMode)openMode;
+
 @end