Introduce item text customizations

Author: andremion

README.md

@@ -37,7 +37,7 @@ or in your `pom.xml` if you are using Maven
 </dependency>
 ```
 
-## Usage
+## Usage example
 
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
@@ -59,6 +59,7 @@ or in your `pom.xml` if you are using Maven
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/fab_margin"
+        android:theme="@style/AppTheme.AppBarOverlay"
         app:layout_anchor="@id/toolbar"
         app:layout_anchorGravity="bottom|end"
         app:drawMenuBelowFab="true"
@@ -75,7 +76,13 @@ or in your `pom.xml` if you are using Maven
 
 - Layout resource to inflate as the header
 `<attr name="headerLayout" format="reference" />`
-    
+
+- Item text customizations
+`<attr name="itemIconTint" format="color"/>`
+`<attr name="itemTextColor" format="color"/>`
+`<attr name="itemBackground" format="reference"/>`
+`<attr name="itemTextAppearance" format="reference"/>`
+
 - If menu must be drawn below the FAB
 `<attr name="drawMenuBelowFab" format="boolean" />`
 
@@ -93,6 +100,16 @@ The recommended way to customize the background color is by using the `app:backg
 mNavigationView.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#009688")));
 ```
 
+You can also set the button icon color according to the theme by setting the `android:tint` to a theme attribute:
+
+```xml
+<com.andremion.floatingnavigationview.FloatingNavigationView
+        android:id="@+id/floating_navigation_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:tint="?android:textColorPrimary" />
+```
+
 See more at the [sample](https://github.com/andremion/Floating-Navigation-View/tree/master/sample)
 
 ## Libraries and tools used in the project

library/src/main/java/com/andremion/floatingnavigationview/FloatingNavigationView.java

@@ -20,6 +20,7 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
@@ -32,7 +33,6 @@
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MotionEvent;
 import android.view.View;
@@ -41,11 +41,6 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.google.android.material.circularreveal.CircularRevealCompat;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.internal.NavigationMenuView;
-import com.google.android.material.navigation.NavigationView;
-
 import androidx.annotation.ColorInt;
 import androidx.annotation.IdRes;
 import androidx.annotation.LayoutRes;
@@ -61,6 +56,11 @@
 import androidx.customview.view.AbsSavedState;
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
 
+import com.google.android.material.circularreveal.CircularRevealCompat;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.internal.NavigationMenuView;
+import com.google.android.material.navigation.NavigationView;
+
 @SuppressWarnings({"FieldCanBeLocal", "InflateParams", "RtlHardcoded", "unused", "WeakerAccess"})
 public class FloatingNavigationView extends FloatingActionButton {
 
@@ -113,26 +113,38 @@ public FloatingNavigationView(Context context, AttributeSet attrs, int defStyleA
 
         mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
 
-        mNavigationView = (CircularRevealNavigationView) LayoutInflater.from(context).inflate(R.layout.navigation_view, null);
+        mNavigationView = new CircularRevealNavigationView(context, attrs, defStyleAttr);
+        setupNavigationView(context, attrs);
+        mNavigationMenuView = mNavigationView.findViewById(R.id.design_navigation_view);
+
+        mFabView = new ImageView(context, attrs, defStyleAttr);
+        setupFabView(context, attrs);
+
+        // Custom attributes
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.FloatingNavigationView);
+        mDrawMenuBelowFab = a.getBoolean(R.styleable.FloatingNavigationView_drawMenuBelowFab, false);
+        a.recycle();
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private void setupNavigationView(Context context, AttributeSet attrs) {
         mNavigationView.setBackground(new ColorDrawable(getBackgroundColor()));
         mNavigationView.setOnTouchListener(mNavigationTouchListener);
-        mNavigationMenuView = (NavigationMenuView) mNavigationView.findViewById(R.id.design_navigation_view);
+    }
 
-        mFabView = (ImageView) mNavigationView.findViewById(R.id.fab_view);
+    @SuppressLint("PrivateResource")
+    private void setupFabView(Context context, AttributeSet attrs) {
+        TypedArray a = context.obtainStyledAttributes(attrs, new int[]{R.attr.selectableItemBackgroundBorderless});
+        mFabView.setScaleType(ScaleType.CENTER);
+        mFabView.setBackground(a.getDrawable(0));
         mFabView.setOnClickListener(mFabClickListener);
         mFabView.setContentDescription(getContentDescription());
         mFabView.bringToFront();
-
-        // Custom attributes
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.MenuView, defStyleAttr, R.style.Widget_Design_NavigationView);
-        if (a.hasValue(R.styleable.MenuView_menu)) {
-            mNavigationView.inflateMenu(a.getResourceId(R.styleable.MenuView_menu, 0));
-        }
-        if (a.hasValue(R.styleable.MenuView_headerLayout)) {
-            mNavigationView.inflateHeaderView(a.getResourceId(R.styleable.MenuView_headerLayout, 0));
-        }
-        mDrawMenuBelowFab = a.getBoolean(R.styleable.MenuView_drawMenuBelowFab, false);
         a.recycle();
+        mNavigationView.addView(mFabView, new FrameLayout.LayoutParams(
+                getResources().getDimensionPixelSize(R.dimen.design_fab_size_normal),
+                getResources().getDimensionPixelSize(R.dimen.design_fab_size_normal)
+        ));
     }
 
     private @ColorInt int getBackgroundColor() {

library/src/main/res/layout/navigation_view.xml

@@ -15,11 +15,7 @@
 -->
 <resources>
 
-    <declare-styleable name="MenuView">
-        <!-- The menu resource to inflate and populate items from -->
-        <attr name="menu" format="reference" />
-        <!-- Layout resource to inflate as the header -->
-        <attr name="headerLayout" format="reference" />
+    <declare-styleable name="FloatingNavigationView">
         <!-- If menu must be drawn below the FAB -->
         <attr name="drawMenuBelowFab" format="boolean" />
     </declare-styleable>

library/src/main/res/values/attrs.xml

@@ -28,6 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/fab_margin"
+        android:theme="@style/AppTheme.AppBarOverlay"
         app:drawMenuBelowFab="false"
         app:headerLayout="@layout/navigation_view_header"
         app:layout_anchor="@id/toolbar"