Merge pull request #94 from brookmg/master

Add attribute to control which bar corners should be cornered
ibrahimsn98 · Oct 27, 2021 · 0daaf9d · 0daaf9d
2 parents b5c381a + e42a4f7
commit 0daaf9d
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -320,6 +320,8 @@ Prior to the [initial addition of this feature](https://github.com/ibrahimsn98/S
         app:backgroundColor=""
         app:indicatorColor=""
         app:indicatorRadius=""
+        app:cornerRadius=""
+        app:corners=""
         app:sideMargins=""
         app:itemPadding=""
         app:textColor=""

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -27,11 +27,13 @@
         app:textSize="14sp"
         app:iconSize="24dp"
         app:indicatorColor="#2DFFFFFF"
-        app:indicatorRadius="10dp"
+        app:indicatorRadius="16dp"
         app:sideMargins="10dp"
         app:itemPadding="10dp"
         app:iconTint="#C8FFFFFF"
         app:iconTintActive="#FFFFFF"
+        app:cornerRadius="16dp"
+        app:corners="top_left|bottom_right"
         app:menu="@menu/menu_bottom"
         app:layout_constraintBottom_toBottomOf="parent"/>
 

diff --git a/lib/src/main/java/me/ibrahimsn/lib/SmoothBottomBar.kt b/lib/src/main/java/me/ibrahimsn/lib/SmoothBottomBar.kt
@@ -58,6 +58,8 @@ class SmoothBottomBar @JvmOverloads constructor(
 
     @Dimension
     private var _barCornerRadius = context.d2p(DEFAULT_BAR_CORNER_RADIUS)
+
+    private var _barCorners = DEFAULT_BAR_CORNERS
 
     @Dimension
     private var _itemPadding = context.d2p(DEFAULT_ITEM_PADDING)
@@ -128,6 +130,13 @@ class SmoothBottomBar @JvmOverloads constructor(
             invalidate()
         }
 
+    var barCorners: Int
+        get() = _barCorners
+        set(value) {
+            _barCorners = value
+            invalidate()
+        }
+
     var itemTextSize: Float
         @Dimension get() = _itemTextSize
         set(@Dimension value) {
@@ -281,6 +290,10 @@ class SmoothBottomBar @JvmOverloads constructor(
                 R.styleable.SmoothBottomBar_cornerRadius,
                 barCornerRadius
             )
+            barCorners = typedArray.getInteger(
+                R.styleable.SmoothBottomBar_corners,
+                barCorners
+            )
             itemPadding = typedArray.getDimension(
                 R.styleable.SmoothBottomBar_itemPadding,
                 itemPadding
@@ -374,10 +387,39 @@ class SmoothBottomBar @JvmOverloads constructor(
                 0f, 0f,
                 width.toFloat(),
                 height.toFloat(),
-                barCornerRadius,
-                barCornerRadius,
+                minOf(barCornerRadius.toFloat(), height.toFloat() / 2),
+                minOf(barCornerRadius.toFloat(), height.toFloat() / 2),
                 paintBackground
             )
+
+            if (barCorners != ALL_CORNERS) {
+
+                if ((barCorners and TOP_LEFT_CORNER) != TOP_LEFT_CORNER) {
+                    // Draw a box to cover the curve on the top left
+                    canvas.drawRect(0f, 0f, width.toFloat() / 2,
+                        height.toFloat() / 2, paintBackground)
+                }
+
+                if ((barCorners and TOP_RIGHT_CORNER) != TOP_RIGHT_CORNER) {
+                    // Draw a box to cover the curve on the top right
+                    canvas.drawRect(width.toFloat() / 2, 0f, width.toFloat(),
+                        height.toFloat() / 2, paintBackground)
+                }
+
+                if ((barCorners and BOTTOM_LEFT_CORNER) != BOTTOM_LEFT_CORNER) {
+                    // Draw a box to cover the curve on the bottom left
+                    canvas.drawRect(0f, height.toFloat() / 2, width.toFloat() / 2,
+                        height.toFloat(), paintBackground)
+                }
+
+                if ((barCorners and BOTTOM_RIGHT_CORNER) != BOTTOM_RIGHT_CORNER) {
+                    // Draw a box to cover the curve on the bottom right
+                    canvas.drawRect(width.toFloat() / 2, height.toFloat() / 2, width.toFloat(),
+                        height.toFloat(), paintBackground)
+                }
+
+            }
+
         } else {
             canvas.drawRect(
                 0f, 0f,
@@ -597,6 +639,14 @@ class SmoothBottomBar @JvmOverloads constructor(
         private const val DEFAULT_INDICATOR_COLOR = "#2DFFFFFF"
         private const val DEFAULT_TINT = "#C8FFFFFF"
 
+        // corner flags
+        private const val NO_CORNERS = 0;
+        private const val TOP_LEFT_CORNER = 1;
+        private const val TOP_RIGHT_CORNER = 2;
+        private const val BOTTOM_RIGHT_CORNER = 4;
+        private const val BOTTOM_LEFT_CORNER = 8;
+        private const val ALL_CORNERS = 15;
+
         private const val DEFAULT_SIDE_MARGIN = 10f
         private const val DEFAULT_ITEM_PADDING = 10f
         private const val DEFAULT_ANIM_DURATION = 200L
@@ -605,6 +655,7 @@ class SmoothBottomBar @JvmOverloads constructor(
         private const val DEFAULT_TEXT_SIZE = 11F
         private const val DEFAULT_CORNER_RADIUS = 20F
         private const val DEFAULT_BAR_CORNER_RADIUS = 0F
+        private const val DEFAULT_BAR_CORNERS = TOP_LEFT_CORNER or TOP_RIGHT_CORNER
 
         private const val OPAQUE = 255
         private const val TRANSPARENT = 0

diff --git a/lib/src/main/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml
@@ -18,6 +18,14 @@
         <attr name="cornerRadius" format="dimension" />
         <attr name="activeItem" format="integer" />
         <attr name="duration" format="integer" />
+        <attr name="corners">
+            <flag name="none" value="0" />
+            <flag name="top_left" value="1" />
+            <flag name="top_right" value="2" />
+            <flag name="bottom_right" value="4" />
+            <flag name="bottom_left" value="8" />
+            <flag name="all" value="15" />
+        </attr>
     </declare-styleable>
 
     <attr name="SmoothBottomBarStyle" format="reference" />