From 5c8cbeb8b068b4fa810ca353ac2424fe8a1f900b Mon Sep 17 00:00:00 2001
From: geftimov <jokatavr@gmail.com>
Date: Thu, 5 May 2022 15:56:40 +0100
Subject: [PATCH 1/4] Add option to show at anchor location.

---
 .../java/me/saket/cascade/CascadePopupMenu.kt | 18 +++----
 .../me/saket/cascade/sample/SampleActivity.kt | 19 ++++++--
 sample/src/main/res/layout/activity_main.xml  | 48 +++++++++++++++----
 sample/src/main/res/values/strings.xml        |  1 +
 4 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt b/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
index 9865f16..ec4457c 100644
--- a/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
+++ b/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
@@ -5,12 +5,10 @@ package me.saket.cascade
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.res.Resources
 import android.graphics.drawable.Drawable
-import android.view.Gravity
-import android.view.Menu
-import android.view.MenuItem
-import android.view.SubMenu
-import android.view.View
+import android.util.Log
+import android.view.*
 import android.view.View.SCROLLBARS_INSIDE_OVERLAY
 import android.view.ViewGroup.LayoutParams
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
@@ -27,7 +25,7 @@ import androidx.recyclerview.widget.RecyclerView.RecycledViewPool
 import me.saket.cascade.internal.OverScrollIfContentScrolls
 import me.saket.cascade.internal.dip
 import me.saket.cascade.internal.setCallback
-import java.util.Stack
+import java.util.*
 import kotlin.DeprecationLevel.ERROR
 
 open class CascadePopupMenu @JvmOverloads constructor(
@@ -68,7 +66,7 @@ open class CascadePopupMenu @JvmOverloads constructor(
     }
   }
 
-  fun show() {
+  fun show(atLocation: Boolean = false) {
     // PopupWindow moves the popup to align with the anchor if a fixed width
     // is known before hand. Note to self: If fixedWidth ever needs to be
     // removed, copy over MenuPopup.measureIndividualMenuWidth().
@@ -85,7 +83,11 @@ open class CascadePopupMenu @JvmOverloads constructor(
     }
 
     showMenu(menuBuilder, goingForward = true)
-    popup.showAsDropDown(anchor, 0, 0, gravity)
+    if(atLocation) {
+      popup.showAtLocation(anchor, gravity, anchor.x.toInt(), anchor.y.toInt() + anchor.height)
+    } else {
+      popup.showAsDropDown(anchor, 0, 0, gravity)
+    }
   }
 
   /**
diff --git a/sample/src/main/java/me/saket/cascade/sample/SampleActivity.kt b/sample/src/main/java/me/saket/cascade/sample/SampleActivity.kt
index 360f6a6..3dcb0c0 100644
--- a/sample/src/main/java/me/saket/cascade/sample/SampleActivity.kt
+++ b/sample/src/main/java/me/saket/cascade/sample/SampleActivity.kt
@@ -12,6 +12,7 @@ import android.os.Bundle
 import android.util.TypedValue
 import android.view.SubMenu
 import android.view.View
+import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.widget.Toolbar
@@ -38,11 +39,23 @@ class SampleActivity : AppCompatActivity() {
     val menuButton = toolbar.findViewById<View>(R.id.overflow_menu)
     showcaseMenuButton(toolbar, menuButton)
     menuButton.setOnClickListener {
-      showCascadeMenu(anchor = menuButton)
+      showCascadeMenu(anchor = menuButton, showAtLocation = false)
+    }
+    val button = findViewById<Button>(R.id.button)
+    button.setOnClickListener {
+      showCascadeMenu(anchor = button, showAtLocation = true)
+    }
+    val buttonSecond = findViewById<Button>(R.id.buttonSecond)
+    buttonSecond.setOnClickListener {
+      showCascadeMenu(anchor = buttonSecond, showAtLocation = true)
+    }
+    val buttonThird = findViewById<Button>(R.id.buttonThird)
+    buttonThird.setOnClickListener {
+      showCascadeMenu(anchor = buttonThird, showAtLocation = false)
     }
   }
 
-  private fun showCascadeMenu(anchor: View) {
+  private fun showCascadeMenu(anchor: View, showAtLocation: Boolean) {
     val popupMenu = CascadePopupMenu(this, anchor, styler = cascadeMenuStyler())
     popupMenu.menu.apply {
       MenuCompat.setGroupDividerEnabled(this, true)
@@ -85,7 +98,7 @@ class SampleActivity : AppCompatActivity() {
         }
       }
     }
-    popupMenu.show()
+    popupMenu.show(showAtLocation)
   }
 
   private fun cascadeMenuStyler(): CascadePopupMenu.Styler {
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 19abbdb..294d9c3 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -1,14 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <androidx.appcompat.widget.Toolbar
-    android:id="@+id/toolbar"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:title="@string/app_name"
-    app:titleTextColor="?attr/colorAccent" />
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:title="@string/app_name"
+        app:titleTextColor="?attr/colorAccent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="16dp"
+        android:text="@string/button_text"
+        app:backgroundTint="@color/color_accent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/buttonThird"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="16dp"
+        android:text="@string/button_text"
+        app:backgroundTint="@color/color_accent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/buttonSecond"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_margin="16dp"
+        android:text="@string/button_text"
+        app:backgroundTint="@color/color_accent" />
+
 </FrameLayout>
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 5209b01..281cadb 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
   <string name="app_name">Cascade</string>
+  <string name="button_text">Press</string>
 </resources>

From 5fa4cf33fe986850ad7f0d42bce9b87e6c6f3ec5 Mon Sep 17 00:00:00 2001
From: geftimov <jokatavr@gmail.com>
Date: Tue, 12 Jul 2022 12:03:57 +0100
Subject: [PATCH 2/4] Use absolute position.

---
 .../src/main/java/me/saket/cascade/CascadePopupMenu.kt   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt b/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
index ec4457c..4917844 100644
--- a/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
+++ b/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
@@ -5,9 +5,7 @@ package me.saket.cascade
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.Resources
 import android.graphics.drawable.Drawable
-import android.util.Log
 import android.view.*
 import android.view.View.SCROLLBARS_INSIDE_OVERLAY
 import android.view.ViewGroup.LayoutParams
@@ -83,8 +81,11 @@ open class CascadePopupMenu @JvmOverloads constructor(
     }
 
     showMenu(menuBuilder, goingForward = true)
-    if(atLocation) {
-      popup.showAtLocation(anchor, gravity, anchor.x.toInt(), anchor.y.toInt() + anchor.height)
+
+    if (atLocation) {
+      val outLocation = IntArray(2)
+      anchor.getLocationOnScreen(outLocation)
+      popup.showAtLocation(anchor, gravity, outLocation[0], outLocation[1])
     } else {
       popup.showAsDropDown(anchor, 0, 0, gravity)
     }

From 46307dacdd395f4bce2f1f070f856b606370073c Mon Sep 17 00:00:00 2001
From: geftimov <jokatavr@gmail.com>
Date: Tue, 12 Jul 2022 12:51:07 +0100
Subject: [PATCH 3/4] Addressed PR comments.

---
 .../java/me/saket/cascade/CascadePopupMenu.kt | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt b/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
index 4917844..32eed14 100644
--- a/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
+++ b/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
@@ -6,7 +6,11 @@ package me.saket.cascade
 import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.view.*
+import android.view.Gravity
+import android.view.Menu
+import android.view.MenuItem
+import android.view.SubMenu
+import android.view.View
 import android.view.View.SCROLLBARS_INSIDE_OVERLAY
 import android.view.ViewGroup.LayoutParams
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
@@ -23,7 +27,7 @@ import androidx.recyclerview.widget.RecyclerView.RecycledViewPool
 import me.saket.cascade.internal.OverScrollIfContentScrolls
 import me.saket.cascade.internal.dip
 import me.saket.cascade.internal.setCallback
-import java.util.*
+import java.util.Stack
 import kotlin.DeprecationLevel.ERROR
 
 open class CascadePopupMenu @JvmOverloads constructor(
@@ -64,7 +68,8 @@ open class CascadePopupMenu @JvmOverloads constructor(
     }
   }
 
-  fun show(atLocation: Boolean = false) {
+  @JvmOverloads
+  fun show(fromAnchor: Boolean = false) {
     // PopupWindow moves the popup to align with the anchor if a fixed width
     // is known before hand. Note to self: If fixedWidth ever needs to be
     // removed, copy over MenuPopup.measureIndividualMenuWidth().
@@ -82,10 +87,10 @@ open class CascadePopupMenu @JvmOverloads constructor(
 
     showMenu(menuBuilder, goingForward = true)
 
-    if (atLocation) {
-      val outLocation = IntArray(2)
-      anchor.getLocationOnScreen(outLocation)
-      popup.showAtLocation(anchor, gravity, outLocation[0], outLocation[1])
+    if (fromAnchor) {
+      val anchorLocation = IntArray(2)
+      anchor.getLocationOnScreen(anchorLocation)
+      popup.showAtLocation(anchor, gravity, anchorLocation[0], anchorLocation[1])
     } else {
       popup.showAsDropDown(anchor, 0, 0, gravity)
     }

From 63d254b8f14b290dadbb01921eb0df2fb2d6f3db Mon Sep 17 00:00:00 2001
From: geftimov <jokatavr@gmail.com>
Date: Tue, 12 Jul 2022 12:53:11 +0100
Subject: [PATCH 4/4] FromAnchor should be true by default.

---
 cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt b/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
index 32eed14..b0b26ea 100644
--- a/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
+++ b/cascade/src/main/java/me/saket/cascade/CascadePopupMenu.kt
@@ -69,7 +69,7 @@ open class CascadePopupMenu @JvmOverloads constructor(
   }
 
   @JvmOverloads
-  fun show(fromAnchor: Boolean = false) {
+  fun show(fromAnchor: Boolean = true) {
     // PopupWindow moves the popup to align with the anchor if a fixed width
     // is known before hand. Note to self: If fixedWidth ever needs to be
     // removed, copy over MenuPopup.measureIndividualMenuWidth().