Icon size and animation issue (#33)

* Add default unselectedColor * Add iconSize attribute * Fix animation for HorizontaMenuItem on portrait
ismaeldivita · Mar 22, 2020 · 72d3331 · 72d3331
1 parent 9a4459c
commit 72d3331
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 28 deletions.
diff --git a/chip-navigation-bar/src/main/java/com/ismaeldivita/chipnavigation/ChipNavigationBar.kt b/chip-navigation-bar/src/main/java/com/ismaeldivita/chipnavigation/ChipNavigationBar.kt
@@ -51,22 +51,7 @@ class ChipNavigationBar @JvmOverloads constructor(
             else -> MenuOrientation.HORIZONTAL
         }
 
-        val textAppearance = a.getResourceId(R.styleable.ChipNavigationBar_cnb_textAppearance, -1)
-        val radius = a.getDimension(R.styleable.ChipNavigationBar_cnb_radius, Float.MAX_VALUE)
-        val badgeColor = a.getColor(
-            R.styleable.ChipNavigationBar_cnb_badgeColor,
-            ContextCompat.getColor(context, R.color.cnb_default_badge_color)
-        )
-        val unselectedColor = a.getColor(
-            R.styleable.ChipNavigationBar_cnb_unselectedColor,
-            context.getValueFromAttr(R.attr.colorButtonNormal)
-        )
-        menuStyle = MenuStyle(
-            badgeColor = badgeColor,
-            unselectedColor = unselectedColor,
-            radius = radius,
-            textAppearance = textAppearance.takeIf { it > 0 }
-        )
+        menuStyle = MenuStyle(context, a)
 
         a.recycle()
         setMenuOrientation(orientation)

diff --git a/chip-navigation-bar/src/main/java/com/ismaeldivita/chipnavigation/model/MenuStyle.kt b/chip-navigation-bar/src/main/java/com/ismaeldivita/chipnavigation/model/MenuStyle.kt
@@ -1,11 +1,35 @@
 package com.ismaeldivita.chipnavigation.model
 
+import android.content.Context
+import android.content.res.TypedArray
 import androidx.annotation.ColorInt
 import androidx.annotation.IdRes
+import androidx.core.content.ContextCompat
+import com.ismaeldivita.chipnavigation.R
 
-class MenuStyle(
-    @ColorInt val badgeColor: Int,
-    @ColorInt val unselectedColor: Int,
-    @IdRes val textAppearance: Int?,
+class MenuStyle(context: Context, attr: TypedArray) {
+
+    @ColorInt val badgeColor: Int
+    @ColorInt val unselectedColor: Int
+    @IdRes val textAppearance: Int?
     val radius: Float
-)
+    val iconSize: Int
+
+    init {
+        textAppearance = attr.getResourceId(R.styleable.ChipNavigationBar_cnb_textAppearance, -1)
+            .takeIf { it > 0 }
+
+        radius = attr.getDimension(R.styleable.ChipNavigationBar_cnb_radius, Float.MAX_VALUE)
+        badgeColor = attr.getColor(R.styleable.ChipNavigationBar_cnb_badgeColor,
+            ContextCompat.getColor(context, R.color.cnb_default_badge_color)
+        )
+        unselectedColor = attr.getColor(
+            R.styleable.ChipNavigationBar_cnb_unselectedColor,
+            ContextCompat.getColor(context, R.color.cnb_default_unselected_color)
+        )
+        iconSize = attr.getDimension(
+            R.styleable.ChipNavigationBar_cnb_iconSize,
+            context.resources.getDimension(R.dimen.cnb_icon_size)
+        ).toInt()
+    }
+}
diff --git a/...vigation-bar/src/main/java/com/ismaeldivita/chipnavigation/view/HorizontalMenuItemView.kt b/...vigation-bar/src/main/java/com/ismaeldivita/chipnavigation/view/HorizontalMenuItemView.kt
@@ -7,6 +7,7 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.util.AttributeSet
 import android.view.View
+import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
 import android.widget.LinearLayout.LayoutParams
@@ -44,13 +45,16 @@ internal class HorizontalMenuItemView @JvmOverloads constructor(
             unselectedColor = item.menuStyle.unselectedColor
         )
 
+        icon.layoutParams.width = item.menuStyle.iconSize
+        icon.layoutParams.height = item.menuStyle.iconSize
         icon.setImageResource(item.icon)
         icon.setBadgeColor(item.menuStyle.badgeColor)
         icon.setColorStateListAnimator(
             color = item.iconColor,
             unselectedColor = item.menuStyle.unselectedColor,
             mode = item.tintMode
         )
+
         val containerBackground = GradientDrawable().apply {
             cornerRadius = item.menuStyle.radius
             setTint(item.backgroundColor)
@@ -82,6 +86,7 @@ internal class HorizontalMenuItemView @JvmOverloads constructor(
     override fun setSelected(selected: Boolean) {
         super.setSelected(selected)
         val isPortrait = context.resources.configuration.orientation == ORIENTATION_PORTRAIT
+        val childCollapse = (parent as ViewGroup).childCount > 3
 
         if (selected) {
             /** Hack to fix the ripple issue before a scene transition on SDKs < P */
@@ -90,7 +95,7 @@ internal class HorizontalMenuItemView @JvmOverloads constructor(
             container.visibility = View.VISIBLE
 
             beginDelayedTransitionOnParent()
-            if (isPortrait) {
+            if (isPortrait && childCollapse) {
 
                 updateLayoutParams<LinearLayout.LayoutParams> {
                     width = WRAP_CONTENT
@@ -99,7 +104,7 @@ internal class HorizontalMenuItemView @JvmOverloads constructor(
             }
             title.visibility = View.VISIBLE
         } else {
-            if (isPortrait) {
+            if (isPortrait && childCollapse) {
                 updateLayoutParams<LinearLayout.LayoutParams> {
                     width = 0
                     weight = 1F

diff --git a/...navigation-bar/src/main/java/com/ismaeldivita/chipnavigation/view/VerticalMenuItemView.kt b/...navigation-bar/src/main/java/com/ismaeldivita/chipnavigation/view/VerticalMenuItemView.kt
@@ -61,7 +61,8 @@ internal class VerticalMenuItemView @JvmOverloads constructor(
             color = item.textColor,
             unselectedColor = item.menuStyle.unselectedColor
         )
-
+        icon.layoutParams.width = item.menuStyle.iconSize
+        icon.layoutParams.height = item.menuStyle.iconSize
         icon.setBadgeColor(item.menuStyle.badgeColor)
         icon.setImageResource(item.icon)
         icon.setColorStateListAnimator(

diff --git a/chip-navigation-bar/src/main/res/layout/cnb_horizontal_menu_item.xml b/chip-navigation-bar/src/main/res/layout/cnb_horizontal_menu_item.xml
@@ -19,8 +19,8 @@
 
         <com.ismaeldivita.chipnavigation.view.BadgeImageView
             android:id="@+id/cnb_item_icon"
-            android:layout_width="@dimen/cnb_icon_size"
-            android:layout_height="@dimen/cnb_icon_size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|start"
             android:duplicateParentState="true"
             tools:src="@android:drawable/btn_star_big_off" />

diff --git a/chip-navigation-bar/src/main/res/layout/cnb_vertical_menu_item.xml b/chip-navigation-bar/src/main/res/layout/cnb_vertical_menu_item.xml
@@ -21,8 +21,8 @@
 
         <com.ismaeldivita.chipnavigation.view.BadgeImageView
             android:id="@+id/cnb_item_icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/cnb_double_space"
             android:duplicateParentState="true"
             tools:src="@android:drawable/btn_star_big_off"

diff --git a/chip-navigation-bar/src/main/res/values/attrs.xml b/chip-navigation-bar/src/main/res/values/attrs.xml
@@ -17,6 +17,7 @@
         <attr name="cnb_unselectedColor" format="color" />
         <attr name="cnb_radius" format="dimension" />
         <attr name="cnb_textAppearance" format="reference" />
+        <attr name="cnb_iconSize" format="dimension" />
     </declare-styleable>
 
     <declare-styleable name="ChipMenuItem">

diff --git a/chip-navigation-bar/src/main/res/values/colors.xml b/chip-navigation-bar/src/main/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="cnb_default_badge_color">#F44336</color>
+    <color name="cnb_default_unselected_color">#696969</color>
     <public/>
 </resources>