react-native-navigation 7.24.3 → 7.25.0-snapshot.552

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/ViewController.java

@@ -1,5 +1,8 @@
 package com.reactnativenavigation.viewcontrollers.viewcontroller;
 
+import static com.reactnativenavigation.utils.CollectionUtils.forEach;
+import static com.reactnativenavigation.utils.ObjectUtils.perform;
+
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.view.View;
@@ -9,11 +12,13 @@ import android.view.ViewTreeObserver;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.CheckResult;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
 import com.reactnativenavigation.options.Options;
+import com.reactnativenavigation.options.OverlayAttachOptions;
 import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.options.params.NullBool;
 import com.reactnativenavigation.react.CommandListener;
@@ -25,15 +30,13 @@ import com.reactnativenavigation.viewcontrollers.parent.ParentController;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.overlay.ViewControllerOverlay;
 import com.reactnativenavigation.views.BehaviourAdapter;
+import com.reactnativenavigation.views.overlay.ViewTooltip;
 import com.reactnativenavigation.views.component.Component;
 import com.reactnativenavigation.views.component.Renderable;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.reactnativenavigation.utils.CollectionUtils.forEach;
-import static com.reactnativenavigation.utils.ObjectUtils.perform;
-
 public abstract class ViewController<T extends ViewGroup> implements ViewTreeObserver.OnGlobalLayoutListener,
         ViewGroup.OnHierarchyChangeListener,
         BehaviourAdapter {
@@ -157,6 +160,14 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         }
     }
 
+    public ViewController<?> getTopMostParent(){
+        if(parentController!=null){
+            return parentController.getTopMostParent();
+        }else{
+            return this;
+        }
+    }
+
     @CallSuper
     public void applyOptions(Options options) {
 
@@ -289,6 +300,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
             if (view.getParent() instanceof ViewGroup) {
                 ((ViewManager) view.getParent()).removeView(view);
             }
+            setParentController(null);
             view = null;
             isDestroyed = true;
         }
@@ -383,6 +395,15 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
 
     }
 
+    protected View findTooltipAnchorView(OverlayAttachOptions options) {
+        return null;
+    }
+
+    public ViewTooltip.TooltipView showAnchoredOverlay(@NonNull View anchorView,
+                                                       @NonNull OverlayAttachOptions overlayAttachOptions,
+                                                       @NonNull   ViewController<?> overlayViewController) {
+        return null;
+    }
     public int getBottomInset() {
         return perform(parentController, 0, p -> p.getBottomInset(this));
     }

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

@@ -12,7 +12,9 @@ import com.reactnativenavigation.R;
 import com.reactnativenavigation.options.LayoutDirection;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import androidx.annotation.IntRange;
 
@@ -21,10 +23,11 @@ import static com.reactnativenavigation.utils.ViewUtils.findChildByClass;
 
 @SuppressLint("ViewConstructor")
 public class BottomTabs extends AHBottomNavigation {
+    public final static int TAB_NOT_FOUND = -1;
     private boolean itemsCreationEnabled = true;
     private boolean shouldCreateItems = true;
     private List<Runnable> onItemCreationEnabled = new ArrayList<>();
-
+    private final Map<String,Integer> idPositionMapping = new HashMap<>();
     public BottomTabs(Context context) {
         super(context);
         setId(R.id.bottomTabs);
@@ -132,4 +135,29 @@ public class BottomTabs extends AHBottomNavigation {
     private boolean hasItemsAndIsMeasured(int w, int h, int oldw, int oldh) {
         return w != 0 && h != 0 && (w != oldw || h != oldh) && getItemsCount() > 0;
     }
+
+
+    public void setTagForTabIndex(int index, String tag) {
+        if(tag==null){
+            String oldTag = null;
+            for(Map.Entry<String,Integer>  e: idPositionMapping.entrySet()){
+                if(e.getValue() == index){
+                    oldTag = e.getKey();
+                    break;
+                }
+            }
+            if(oldTag!=null){
+                idPositionMapping.remove(oldTag);
+            }
+        }else{
+            idPositionMapping.put(tag,index);
+        }
+    }
+
+    public int getTabIndexByTag(String tag) {
+        if(tag!=null && idPositionMapping.containsKey(tag)){
+         return idPositionMapping.get(tag);
+        }
+        return TAB_NOT_FOUND;
+    }
 }

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

@@ -48,6 +48,7 @@ class BottomTabsContainer(context: Context, val bottomTabs: BottomTabs) : Shadow
         this.topOutLineView.visibility = View.GONE
 
         this.addView(linearLayout, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
+
     }
 
     override var shadowRadius: Float

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

@@ -10,12 +10,21 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
+import com.reactnativenavigation.views.overlay.AttachedOverlayContainer;
+
 public class BottomTabsLayout extends CoordinatorLayout {
 
     private BottomTabsContainer bottomTabsContainer;
+    final private AttachedOverlayContainer attachedOverlayContainer ;
 
     public BottomTabsLayout(Context context) {
         super(context);
+        attachedOverlayContainer=new AttachedOverlayContainer(context);
+        this.addView(attachedOverlayContainer, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+    }
+
+    public AttachedOverlayContainer getAttachedOverlayContainer() {
+        return attachedOverlayContainer;
     }
 
     @Override
@@ -33,4 +42,4 @@ public class BottomTabsLayout extends CoordinatorLayout {
         addView(bottomTabsContainer, lp);
         this.bottomTabsContainer = bottomTabsContainer;
     }
-}
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/views/component/ComponentLayout.java

@@ -4,15 +4,16 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.MotionEvent;
 import android.view.ViewGroup;
-import android.view.WindowInsets;
 
 import com.reactnativenavigation.options.ButtonOptions;
+import com.reactnativenavigation.utils.CoordinatorLayoutUtils;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.react.ReactView;
 import com.reactnativenavigation.react.events.ComponentType;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonController;
+import com.reactnativenavigation.views.overlay.AttachedOverlayContainer;
 import com.reactnativenavigation.views.touch.OverlayTouchDelegate;
 
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
@@ -25,14 +26,21 @@ public class ComponentLayout extends CoordinatorLayout implements ReactComponent
     private boolean willAppearSent = false;
     private ReactView reactView;
     private final OverlayTouchDelegate touchDelegate;
+    final private AttachedOverlayContainer attachedOverlayContainer ;
 
     public ComponentLayout(Context context, ReactView reactView) {
         super(context);
         this.reactView = reactView;
+        attachedOverlayContainer =  new AttachedOverlayContainer(context);
         addView(reactView.asView(), matchParentLP());
+        addView(attachedOverlayContainer, CoordinatorLayoutUtils.matchParentLP());
         touchDelegate = new OverlayTouchDelegate(this, reactView);
     }
 
+    public AttachedOverlayContainer getAttachedOverlayContainer() {
+        return attachedOverlayContainer;
+    }
+
     @Override
     public boolean isReady() {
         return reactView.isReady();
@@ -109,4 +117,4 @@ public class ComponentLayout extends CoordinatorLayout implements ReactComponent
     public boolean superOnInterceptTouchEvent(MotionEvent event) {
         return super.onInterceptTouchEvent(event);
     }
-}
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/views/overlay/AttachedOverlayContainer.kt

@@ -0,0 +1,69 @@
+package com.reactnativenavigation.views.overlay
+
+import android.app.Activity
+import android.content.Context
+import android.graphics.Color
+import android.view.View
+import android.widget.FrameLayout
+
+class AttachedOverlayContainer(context: Context) : FrameLayout(context) {
+
+    init {
+        z = Float.MAX_VALUE
+    }
+
+    fun addOverlay(overlayView: View) {
+        addView(overlayView)
+    }
+
+    fun addAnchoredView(anchorView: View, overlayView: View, gravity: String): ViewTooltip.TooltipView? {
+        return when (gravity) {
+            "top" -> {
+                showTooltip(overlayView, anchorView, ViewTooltip.Position.TOP)
+            }
+            "bottom" -> {
+                showTooltip(overlayView, anchorView, ViewTooltip.Position.BOTTOM)
+            }
+            "left" -> {
+                showTooltip(overlayView, anchorView, ViewTooltip.Position.LEFT)
+            }
+            "right" -> {
+                showTooltip(overlayView, anchorView, ViewTooltip.Position.RIGHT)
+            }
+            else -> {
+                showTooltip(overlayView, anchorView, ViewTooltip.Position.TOP)
+            }
+        }
+
+    }
+
+
+    private fun showTooltip(
+        tooltipView: View,
+        tooltipAnchorView: View,
+        pos: ViewTooltip.Position
+    ): ViewTooltip.TooltipView {
+        val tooltipViewContainer = ViewTooltip
+            .on(context as Activity, this, tooltipAnchorView)
+            .autoHide(false, 5000)
+            .clickToHide(false)
+            .align(ViewTooltip.ALIGN.CENTER)
+            .padding(0, 0, 0, 0)
+            .customView(tooltipView)
+            .distanceWithView(0)
+            .color(Color.WHITE)
+            .bubble(false)
+            .arrowHeight(0)
+            .arrowWidth(0)
+            .position(pos)
+
+            .onDisplay {
+            }
+            .onHide {
+
+            }
+            .show()
+        return tooltipViewContainer
+    }
+
+}