Update resources. Allow set if overlay is clickable or not

jahirfiquitiva · jahirfiquitiva · commit 0f5682c577e7 · 2017-07-06T21:50:48.000-05:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+
 apply plugin: 'com.android.application'
 apply from: '../dependencies.gradle'
 
diff --git a/app/src/main/res/drawable-hdpi/ic_fab_star.png b/app/src/main/res/drawable-hdpi/ic_fab_star.png
diff --git a/app/src/main/res/drawable-mdpi/ic_fab_star.png b/app/src/main/res/drawable-mdpi/ic_fab_star.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_fab_star.png b/app/src/main/res/drawable-xhdpi/ic_fab_star.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_fab_star.png b/app/src/main/res/drawable-xxhdpi/ic_fab_star.png
diff --git a/app/src/main/res/drawable/ic_heart.xml b/app/src/main/res/drawable/ic_heart.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2017. Jahir Fiquitiva
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ 	 http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+            android:fillColor="#8A000000"
+            android:pathData="M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pencil.xml b/app/src/main/res/drawable/ic_pencil.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2017. Jahir Fiquitiva
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ 	 http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2017. Jahir Fiquitiva
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ 	 http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+            android:fillColor="#fff"
+            android:pathData="M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_plus.xml b/app/src/main/res/drawable/ic_plus.xml
@@ -2,22 +2,18 @@
 <!--
   ~ Copyright (c) 2017. Jahir Fiquitiva
   ~
-  ~ Licensed under the CreativeCommons Attribution-ShareAlike
-  ~ 4.0 International License. You may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
   ~
-  ~    http://creativecommons.org/licenses/by-sa/4.0/legalcode
+  ~ 	 http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
-  ~
-  ~ Special thanks to the project contributors and collaborators
-  ~ 	https://github.com/jahirfiquitiva/Blueprint#special-thanks
   -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/black_semi_transparent"/>
-    <padding
-        android:left="16dp"
-        android:top="4dp"
-        android:right="16dp"
-        android:bottom="4dp"/>
-    <corners
-        android:radius="2dp"/>
-</shape>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+            android:fillColor="#fff"
+            android:pathData="M21,11L14,4V8C7,9 4,14 3,19C5.5,15.5 9,13.9 14,13.9V18L21,11Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -40,6 +40,7 @@
             <jahirfiquitiva.libs.fabsmenu.TitleFAB
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    fab:srcCompat="@drawable/ic_share"
                     fab:fabSize="mini"
                     fab:backgroundTint="@color/colorAccent"
                     fab:rippleColor="@color/colorAccent"
@@ -51,8 +52,10 @@
                     android:id="@+id/clickable_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    fab:srcCompat="@drawable/ic_pencil"
                     fab:fab_title="Clickable title"
                     fab:fab_enableTitleClick="true"
+                    fab:fab_title_textColor="@color/colorAccent"
                     fab:fabSize="mini"
                     fab:backgroundTint="@color/colorAccent"
                     fab:rippleColor="@color/colorAccent"/>
@@ -61,6 +64,7 @@
                     android:id="@+id/mini_fab"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    fab:srcCompat="@drawable/ic_heart"
                     fab:fab_title="Mini fab with long text"
                     fab:fabSize="mini"
                     fab:backgroundTint="@color/blue_semi"
@@ -70,6 +74,7 @@
                     android:id="@+id/green_fab"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    fab:srcCompat="@drawable/ic_person"
                     fab:fab_title="Fab with even longer text that might not even fit in all the screens"
                     fab:fabSize="normal"
                     fab:backgroundTint="@color/green"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -19,11 +19,6 @@
     <color name="colorPrimary">#2196f3</color>
     <color name="colorPrimaryDark">#197fd2</color>
     <color name="colorAccent">#f44336</color>
-    <color name="black_semi_transparent">#B2000000</color>
-    <color name="background">#e5e5e5</color>
-    <color name="half_black">#808080</color>
-    <color name="white">#fafafa</color>
-    <color name="white_pressed">#f1f1f1</color>
     <color name="pink">#e91e63</color>
     <color name="pink_pressed">#ec407a</color>
     <color name="blue_semi">#5677fc</color>
diff --git a/build.gradle b/build.gradle
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 apply from: './dependencies.gradle'
 
diff --git a/library/build.gradle b/library/build.gradle
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply from: '../dependencies.gradle'
diff --git a/library/src/main/java/jahirfiquitiva/libs/fabsmenu/FABSnackbarBehavior.java b/library/src/main/java/jahirfiquitiva/libs/fabsmenu/FABSnackbarBehavior.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017. Jahir Fiquitiva
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	 http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package jahirfiquitiva.libs.fabsmenu;
 
 import android.content.Context;
diff --git a/library/src/main/java/jahirfiquitiva/libs/fabsmenu/FABsMenu.java b/library/src/main/java/jahirfiquitiva/libs/fabsmenu/FABsMenu.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package jahirfiquitiva.libs.fabsmenu;
 
 import android.animation.Animator;
@@ -505,7 +506,7 @@ public void onClick(View view) {
     }
 
     private void toggleOverlay(final boolean show, boolean immediately) {
-        ViewParent parent = getParent();
+        final ViewParent parent = getParent();
         if (parent != null) {
             if (parent instanceof FABsMenuLayout) {
                 final View overlay = ((FABsMenuLayout) parent).getOverlayView();
@@ -523,12 +524,13 @@ public void onAnimationEnd(Animator animation) {
                                     overlay.setVisibility(GONE);
                                     overlay.setOnClickListener(null);
                                 } else {
-                                    overlay.setOnClickListener(new OnClickListener() {
-                                        @Override
-                                        public void onClick(View view) {
-                                            collapse();
-                                        }
-                                    });
+                                    if (((FABsMenuLayout) parent).hasClickableOverlay())
+                                        overlay.setOnClickListener(new OnClickListener() {
+                                            @Override
+                                            public void onClick(View view) {
+                                                collapse();
+                                            }
+                                        });
                                 }
                             }
                         }).start();
diff --git a/library/src/main/java/jahirfiquitiva/libs/fabsmenu/FABsMenuLayout.java b/library/src/main/java/jahirfiquitiva/libs/fabsmenu/FABsMenuLayout.java
@@ -33,6 +33,7 @@ public class FABsMenuLayout extends FrameLayout {
     @ColorInt
     private int overlayColor;
     private View overlayView;
+    private boolean clickableOverlay;
 
     public FABsMenuLayout(@NonNull Context context) {
         super(context);
@@ -54,6 +55,8 @@ private void init(Context context, AttributeSet attrs) {
                 R.styleable.FABsMenuLayout, 0, 0);
         overlayColor = a.getColor(R.styleable.FABsMenuLayout_fabs_menu_overlayColor,
                 Color.parseColor("#4d000000"));
+        clickableOverlay = a.getBoolean(R.styleable.FABsMenuLayout_fabs_menu_cickableOverlay,
+                true);
         a.recycle();
 
         overlayView = new View(context);
@@ -79,4 +82,12 @@ public View getOverlayView() {
     public void setOverlayView(View overlayView) {
         this.overlayView = overlayView;
     }
+
+    public boolean hasClickableOverlay() {
+        return clickableOverlay;
+    }
+
+    public void setClickableOverlay(boolean clickableOverlay) {
+        this.clickableOverlay = clickableOverlay;
+    }
 }
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -18,6 +18,7 @@
 <resources>
     <declare-styleable name="FABsMenuLayout">
         <attr name="fabs_menu_overlayColor" format="color"/>
+        <attr name="fabs_menu_cickableOverlay" format="boolean"/>
     </declare-styleable>
 
     <declare-styleable name="TitleFAB">
diff --git a/settings.gradle b/settings.gradle
@@ -13,4 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+
 include ':app', ':library'
