diff --git a/README.md b/README.md index 3e18bc0..564db3a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Watch a short **[Demo Video](https://youtu.be/XngUY3PN1IQ)** on YouTube or try i - Option to disable shadow for buttons and (or) labels - Option to set custom animations - Option to set custom icon drawable -- Support for **normal** `56dp` and **mini** `40dp` button sizes +- Support for **normal** `56dp` and **mini** `40dp` standard button sizes, but also **big** `72dp` - Custom FloatingActionMenu icon animations - Option to expand menu up and down - Option to show labels to the left and to the right of the menu diff --git a/library/src/main/java/com/github/clans/fab/FloatingActionButton.java b/library/src/main/java/com/github/clans/fab/FloatingActionButton.java index ea72dd2..4d3a561 100755 --- a/library/src/main/java/com/github/clans/fab/FloatingActionButton.java +++ b/library/src/main/java/com/github/clans/fab/FloatingActionButton.java @@ -42,6 +42,7 @@ public class FloatingActionButton extends ImageButton { public static final int SIZE_NORMAL = 0; public static final int SIZE_MINI = 1; + public static final int SIZE_BIG = 2; int mFabSize; boolean mShowShadow; @@ -178,8 +179,8 @@ private void initHideAnimation(TypedArray attr) { } private int getCircleSize() { - return getResources().getDimensionPixelSize(mFabSize == SIZE_NORMAL - ? R.dimen.fab_size_normal : R.dimen.fab_size_mini); + return getResources().getDimensionPixelSize(mFabSize == SIZE_NORMAL ? R.dimen.fab_size_normal + : (mFabSize == SIZE_MINI ? R.dimen.fab_size_mini : R.dimen.fab_size_big)); } private int calculateMeasuredWidth() { diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml index 6348758..53f9fef 100755 --- a/library/src/main/res/values/attrs.xml +++ b/library/src/main/res/values/attrs.xml @@ -14,6 +14,7 @@ + @@ -64,6 +65,7 @@ + diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml index e957310..7be5767 100755 --- a/library/src/main/res/values/dimens.xml +++ b/library/src/main/res/values/dimens.xml @@ -3,6 +3,7 @@ 56dp 40dp + 72dp 14sp \ No newline at end of file diff --git a/sample/src/main/res/layout/floating_menus_activity.xml b/sample/src/main/res/layout/floating_menus_activity.xml index 0761f01..c10fc7e 100755 --- a/sample/src/main/res/layout/floating_menus_activity.xml +++ b/sample/src/main/res/layout/floating_menus_activity.xml @@ -257,6 +257,7 @@ android:paddingRight="10dp" android:paddingBottom="10dp" android:paddingLeft="10dp" + fab:menu_fab_size="big" fab:menu_labels_ellipsize="end" fab:menu_labels_singleLine="true" fab:menu_backgroundColor="#ccffffff" @@ -266,21 +267,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_edit" - fab:fab_size="mini" fab:fab_label="Menu item 1" />