From b87d175b9051e10c2ba466068512faaf1e1cd56b Mon Sep 17 00:00:00 2001 From: "David W. Berry" Date: Mon, 24 Oct 2016 11:22:13 -0500 Subject: [PATCH 1/2] fix dynamically adding FAB to menu --- .../src/main/java/com/github/clans/fab/FloatingActionMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java b/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java index 0b80e4c..90e91c6 100755 --- a/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java +++ b/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java @@ -959,7 +959,7 @@ public int getMenuButtonColorRipple() { } public void addMenuButton(FloatingActionButton fab) { - addView(fab, mButtonsCount - 2); + addView(fab); mButtonsCount++; addLabel(fab); } From e00959058e2d733922697383bc1dcc1b18084390 Mon Sep 17 00:00:00 2001 From: "David W. Berry" Date: Mon, 24 Oct 2016 11:47:30 -0500 Subject: [PATCH 2/2] Ignore non FloatingActionButton in layout --- .../src/main/java/com/github/clans/fab/FloatingActionMenu.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java b/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java index 90e91c6..5ab5bd1 100755 --- a/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java +++ b/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java @@ -385,6 +385,8 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) { for (int i = mButtonsCount - 1; i >= 0; i--) { View child = getChildAt(i); + if(!(child instanceof FloatingActionButton)) continue; + if (child == mImageToggle) continue; FloatingActionButton fab = (FloatingActionButton) child;