Merge pull request #47 from douglasjunior/issue-46

Fixing the changes in Dialog size. #46

Author: douglasjunior

.travis.yml

@@ -4,7 +4,7 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-24.0.3
+    - build-tools-25.0.0
     - android-24
     - extra-android-support
     - extra-android-m2repository

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         Before changing "Android Gradle Plugin" version, check he last estable version
         https://developer.android.com/studio/releases/gradle-plugin.html#revisions
          */
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Oct 17 08:28:35 BRST 2016
+#Sun Jul 16 17:17:26 BRT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

library/build.gradle

@@ -5,7 +5,7 @@ group = 'com.github.douglasjunior'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         minSdkVersion 7

library/src/main/java/io/github/douglasjunior/androidSimpleTooltip/SimpleTooltip.java

@@ -100,6 +100,7 @@ public class SimpleTooltip implements PopupWindow.OnDismissListener {
     private final View mAnchorView;
     private final boolean mTransparentOverlay;
     private final float mOverlayOffset;
+    private final boolean mOverlayMatchParent;
     private final float mMaxWidth;
     private View mOverlay;
     private ViewGroup mRootView;
@@ -132,6 +133,7 @@ private SimpleTooltip(Builder builder) {
         mAnchorView = builder.anchorView;
         mTransparentOverlay = builder.transparentOverlay;
         mOverlayOffset = builder.overlayOffset;
+        mOverlayMatchParent = builder.overlayMatchParent;
         mMaxWidth = builder.maxWidth;
         mShowArrow = builder.showArrow;
         mArrowWidth = builder.arrowWidth;
@@ -145,7 +147,7 @@ private SimpleTooltip(Builder builder) {
         mOnDismissListener = builder.onDismissListener;
         mOnShowListener = builder.onShowListener;
         mFocusable = builder.focusable;
-        mRootView = (ViewGroup) mAnchorView.getRootView();
+        mRootView = SimpleTooltipUtils.findFrameLayout(mAnchorView);
         mHighlightShape = builder.highlightShape;
 
         init();
@@ -192,7 +194,10 @@ private void verifyDismissed() {
 
     private void createOverlay() {
         mOverlay = mTransparentOverlay ? new View(mContext) : new OverlayView(mContext, mAnchorView, mHighlightShape, mOverlayOffset);
-        mOverlay.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        if (mOverlayMatchParent)
+            mOverlay.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        else
+            mOverlay.setLayoutParams(new ViewGroup.LayoutParams(mRootView.getWidth(), mRootView.getHeight()));
         mOverlay.setOnTouchListener(mOverlayTouchListener);
         mRootView.addView(mOverlay);
     }
@@ -546,6 +551,7 @@ public static class Builder {
         private int gravity = Gravity.BOTTOM;
         private boolean transparentOverlay = true;
         private float overlayOffset = -1;
+        private boolean overlayMatchParent = true;
         private float maxWidth;
         private boolean showArrow = true;
         private Drawable arrowDrawable;
@@ -1052,5 +1058,20 @@ public Builder overlayOffset(@Dimension float overlayOffset) {
             this.overlayOffset = overlayOffset;
             return this;
         }
+
+        /**
+         * <div class="pt">Define o comportamento do overlay. Utilizado para casos onde a view de Overlay não pode ser MATCH_PARENT.
+         * Como em uma Dialog ou DialogFragment.</div>
+         * <div class="en">Sets the behavior of the overlay view. Used for cases where the Overlay view can not be MATCH_PARENT.
+         * Like in a Dialog or DialogFragment.</div>
+         *
+         * @param overlayMatchParent <div class="pt">True se o overlay deve ser MATCH_PARENT. False se ele deve obter o mesmo tamanho do pai.</div>
+         *                           <div class="en">True if the overlay should be MATCH_PARENT. False if it should get the same size as the parent.</div>
+         * @return this
+         */
+        public Builder overlayMatchParent(boolean overlayMatchParent) {
+            this.overlayMatchParent = overlayMatchParent;
+            return this;
+        }
     }
 }

library/src/main/java/io/github/douglasjunior/androidSimpleTooltip/SimpleTooltipUtils.java

@@ -36,6 +36,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.widget.FrameLayout;
 import android.widget.TextView;
 
 /**
@@ -164,4 +165,19 @@ public static Drawable getDrawable(Context context, @DrawableRes int drawableRes
             return context.getResources().getDrawable(drawableRes);
         }
     }
+
+    /**
+     * Verify if the first child of the rootView is a FrameLayout.
+     * Used for cases where the Tooltip is created inside a Dialog or DialogFragment.
+     *
+     * @param anchorView
+     * @return FrameLayout or anchorView.getRootView()
+     */
+    public static ViewGroup findFrameLayout(View anchorView) {
+        ViewGroup rootView = (ViewGroup) anchorView.getRootView();
+        if (rootView.getChildCount() == 1 && rootView.getChildAt(0) instanceof FrameLayout) {
+            rootView = (ViewGroup) rootView.getChildAt(0);
+        }
+        return rootView;
+    }
 }

sample/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "io.github.douglasjunior.androidSimpleTooltip.sample"

sample/src/main/java/io/github/douglasjunior/androidSimpleTooltip/sample/MainActivity.java

@@ -220,12 +220,6 @@ public void onClick(View v2) {
             dialog.setContentView(R.layout.dialog);
             dialog.show();
 
-            WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
-            lp.copyFrom(dialog.getWindow().getAttributes());
-            lp.width = (int) SimpleTooltipUtils.pxFromDp(300);
-            lp.height = (int) SimpleTooltipUtils.pxFromDp(300);
-            dialog.getWindow().setAttributes(lp);
-
             final Button btnInDialog = (Button) dialog.findViewById(R.id.btn_in_dialog);
             btnInDialog.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -236,6 +230,7 @@ public void onClick(View v) {
                             .gravity(Gravity.BOTTOM)
                             .animated(true)
                             .transparentOverlay(false)
+                            .overlayMatchParent(false)
                             .build()
                             .show();
                 }

sample/src/main/res/layout/dialog.xml

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:background="@color/colorPrimary"
     android:orientation="vertical"
-    android:padding="10dp"
+    android:padding="50dp"
     tools:ignore="Overdraw">
 
     <Button
@@ -24,7 +24,7 @@
         android:id="@+id/btn_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="end"
+        android:layout_gravity="center"
         android:text="@string/btn_close" />
 
 </LinearLayout>