Fix layout not refreshing issue

JustinGeorgeJoseph · Mar 20, 2022 · 7712a32 · 7712a32
1 parent 022e3e5
commit 7712a32
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 31 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/justin/custommaterialchipwidget/MainActivity.kt b/app/src/main/java/com/justin/custommaterialchipwidget/MainActivity.kt
@@ -16,24 +16,30 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
         findViewById<MaterialChipSetsContainer>(R.id.materialChipSetsContainer).apply {
 
-            chipSetSolidColorUnselected = ContextCompat.getColor(context, android.R.color.white)
-            chipSetSolidColorSelected = ContextCompat.getColor(context, R.color.selected_blue)
-            chipSetStrokeWidth = Utils.convertDpToPx(this@MainActivity, 2)
+            chipSetSolidColorUnselected = ContextCompat.getColor(context, android.R.color.black)
+            chipSetSolidColorSelected = ContextCompat.getColor(context, R.color.green)
+            chipSetStrokeWidth = Utils.convertDpToPx(this@MainActivity, 3)
             chipSetStrokeColorUnselected =
-                ColorStateList.valueOf(ContextCompat.getColor(context, R.color.light_gray))
+                ColorStateList.valueOf(ContextCompat.getColor(context, R.color.green))
             chipSetStrokeColorSelected =
-                ColorStateList.valueOf(ContextCompat.getColor(context, R.color.selected_blue))
+                ColorStateList.valueOf(ContextCompat.getColor(context, R.color.green))
 
-            chipTextColorUnselected = ContextCompat.getColor(context, android.R.color.black)
+            chipTextColorUnselected = ContextCompat.getColor(context, android.R.color.white)
             chipTextColorSelected = ContextCompat.getColor(context, android.R.color.white)
             chipTextDividerColorUnselected =
-                ContextCompat.getColor(context, android.R.color.darker_gray)
+                ContextCompat.getColor(context, R.color.green)
 
             dataSet = createDataSet()
 
             listener = object: MaterialChipsetWidgetListener {
-                override fun onChipSelectionChanged(name: String?, checked: Boolean) {
+
+                override fun onChipSelectionChanged(
+                    name: String?,
+                    chipSelectionGroup: String,
+                    checked: Boolean,
+                ) {
                     Toast.makeText(this@MainActivity,"onChipSelectionChanged --> $name || $checked",Toast.LENGTH_SHORT).show()
+
                 }
 
                 override fun onChipsetsResetClicked() {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,11 +6,22 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:gravity="center_horizontal"
+    android:background="@color/black_04"
+    android:paddingStart="20dp"
+    android:paddingTop="50dp"
     tools:context=".MainActivity">
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:textSize="22sp"
+        android:textColor="@color/white"
+        android:text="MaterialChipSetWidget"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
     <com.justin.materialchipsetwidget.MaterialChipSetsContainer
         android:id="@+id/materialChipSetsContainer"
         android:layout_width="match_parent"
+        android:layout_marginTop="20dp"
         android:scrollbars="none"
         android:padding="10dp"
         android:layout_height="wrap_content"/>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <color name="purple_200">@color/black</color>
+    <color name="purple_500">@color/black</color>
+    <color name="purple_700">@color/black</color>
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
 
-    <color name="green">#E98FE792</color>
+    <color name="green">#54A442</color>
     <color name="darkGreen">#44EA2A</color>
 
     <color name="selected_blue">#E9165FD3</color>
     <color name="light_gray">@android:color/darker_gray</color>
+    <color name="black_04">#FF040404</color>
+
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.CustomMaterialChipWidget" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.CustomMaterialChipWidget" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>

diff --git a/demo/1.png b/demo/1.png
diff --git a/demo/2.png b/demo/2.png
diff --git a/demo/customChipsetWidget.gif b/demo/customChipsetWidget.gif
diff --git a/demo/header_image.png b/demo/header_image.png
diff --git a/materialchipsetwidget/src/main/java/com/justin/materialchipsetwidget/ChipSetData.kt b/materialchipsetwidget/src/main/java/com/justin/materialchipsetwidget/ChipSetData.kt
@@ -1,4 +1,4 @@
 package com.justin.materialchipsetwidget
 
-data class ChipSetData(val position : Int, val chipList : List<String>, var isSelected : Boolean = false,  var selectedPosition :Int =-1)
+data class ChipSetData(val position : Int, val chipList : List<String>,var chipSelectionGroup:String="", var isSelected : Boolean = false,  var selectedPosition :Int =-1)
 
diff --git a/...rialchipsetwidget/src/main/java/com/justin/materialchipsetwidget/ChipSetWidgetListener.kt b/...rialchipsetwidget/src/main/java/com/justin/materialchipsetwidget/ChipSetWidgetListener.kt
@@ -1,5 +1,5 @@
 package com.justin.materialchipsetwidget
 
 interface ChipSetWidgetListener {
-    fun onChipClicked(position : Int, title : String?, isSelected :Boolean)
-}
+    fun onChipClicked(position : Int,chipSelectionGroup:String, title : String?, isSelected :Boolean)
+}
diff --git a/...rialchipsetwidget/src/main/java/com/justin/materialchipsetwidget/MaterialChipSetWidget.kt b/...rialchipsetwidget/src/main/java/com/justin/materialchipsetwidget/MaterialChipSetWidget.kt
@@ -18,6 +18,7 @@ class MaterialChipSetWidget @JvmOverloads constructor(
 ) : LinearLayout(context, attrs) {
 
     var chipSetWidgetListener : ChipSetWidgetListener? = null
+    var chipSelectionGroup:String=""
 
     var chipDataSet : ChipSetData? = null
         set(value) {
@@ -119,7 +120,7 @@ class MaterialChipSetWidget @JvmOverloads constructor(
                         if (this.title == value ) {
                             this.isSelected = !this.isSelected
                             chipDataSet?.let {
-                                chipSetWidgetListener?.onChipClicked(it.position,this.title,this.isSelected)
+                                chipSetWidgetListener?.onChipClicked(it.position,chipSelectionGroup,this.title,this.isSelected)
                             }
                         } else {
                             this.isSelected = false
@@ -175,4 +176,4 @@ class MaterialChipSetWidget @JvmOverloads constructor(
         updateVisibilityOfChildren(chipDataList)
     }
 
-}
+}
diff --git a/...chipsetwidget/src/main/java/com/justin/materialchipsetwidget/MaterialChipSetsContainer.kt b/...chipsetwidget/src/main/java/com/justin/materialchipsetwidget/MaterialChipSetsContainer.kt
@@ -31,7 +31,7 @@ class MaterialChipSetsContainer @JvmOverloads constructor(
             chipSetDataList = chipSetList
         }
 
-    private var chipSetDataList: List<ChipSetData>? = null
+     private var chipSetDataList: List<ChipSetData>? = null
         set(value) {
             field = value
             refreshWidgetViews(field)
@@ -53,6 +53,7 @@ class MaterialChipSetsContainer @JvmOverloads constructor(
     var chipTextColorUnselected: Int = ContextCompat.getColor(context, R.color.light_gray)
     var chipTextColorSelected: Int = ContextCompat.getColor(context, R.color.light_gray)
     var chipTextDividerColorUnselected = ContextCompat.getColor(context, R.color.light_gray)
+    val chipRadius:Float by lazy { Utils.convertDpToPx(context,48)}
 
     @DrawableRes
     var closeButtonIcon: Int = R.drawable.ic_baseline_close_24
@@ -82,7 +83,7 @@ class MaterialChipSetsContainer @JvmOverloads constructor(
         }
 
         containerLayout.addView(getCloseButton())
-
+        chipSetWidgetList.clear()
         chipSetWidgetList.addAll(getMaterialChipSetWidgets(context, dataSet))
         chipSetWidgetList.forEach { chipSetWidget ->
             containerLayout.addView(chipSetWidget)
@@ -128,21 +129,24 @@ class MaterialChipSetsContainer @JvmOverloads constructor(
                     }
                 }
                 layoutParams = params
+                this.chipSelectionGroup=dataSet[index].chipSelectionGroup
                 this.chipSetWidgetListener = object : ChipSetWidgetListener {
-                    override fun onChipClicked(position: Int, title: String?, isSelected: Boolean) {
-                        updateChipsetWidgetStatus(position, isSelected)
-                        sendChipStatusReturn(title,isSelected)
+                    override fun onChipClicked(position: Int,chipSelectionGroup:String, title: String?, isSelected: Boolean) {
+                            updateChipsetWidgetStatus(position, isSelected)
+                            sendChipStatusReturn(title, chipSelectionGroup, isSelected)
                     }
                 }
                 this.chipDataSet = dataSet[index]
             }
+            materialChipSetWidget.measure(0,0)
+            materialChipSetWidget.background = getBackGroundDrawable(dataSet[index].isSelected)
 
             widgetList.add(materialChipSetWidget)
         }
         return widgetList
     }
 
-    private fun sendChipStatusReturn(title : String?, selected: Boolean) = listener?.onChipSelectionChanged(title,selected)
+    private fun sendChipStatusReturn(title : String?,chipSelectionGroup:String, selected: Boolean) = listener?.onChipSelectionChanged(title,chipSelectionGroup,selected)
 
     private fun updateChipsetWidgetStatus(position: Int, selected: Boolean) {
         chipSetWidgetList[position].background = getBackGroundDrawable(selected)
@@ -220,12 +224,19 @@ class MaterialChipSetsContainer @JvmOverloads constructor(
         solidColor: Int, strokeColor: ColorStateList,
         strokeWidth: Float,
     ): Drawable {
-        val rectangleShape = RectangleShape(radius = resources.getDimension(R.dimen.radius)).apply {
+        val rectangleShape = RectangleShape(radius = chipRadius).apply {
             this.backGroundTintColor = solidColor
             this.strokeWidth = strokeWidth
             this.strokeColor = strokeColor
         }
         return ShapeRender(rectangleShape).getDrawable()
     }
 
-}
+    public fun updateViews(chipSetDataList:List<ChipSetData>){
+        this.chipSetDataList=chipSetDataList
+    }
+    public fun getChipSetDataList(): List<ChipSetData>? {
+        return this.chipSetDataList
+    }
+
+}
diff --git a/...setwidget/src/main/java/com/justin/materialchipsetwidget/MaterialChipsetWidgetListener.kt b/...setwidget/src/main/java/com/justin/materialchipsetwidget/MaterialChipsetWidgetListener.kt
@@ -1,6 +1,9 @@
 package com.justin.materialchipsetwidget
 
 interface MaterialChipsetWidgetListener {
-    fun onChipSelectionChanged(name : String?, checked : Boolean)
+
+    fun onChipSelectionChanged(name: String?, chipSelectionGroup: String, checked: Boolean)
+
     fun onChipsetsResetClicked()
-}
+
+}
diff --git a/materialchipsetwidget/src/main/java/com/justin/materialchipsetwidget/ShapeRender.kt b/materialchipsetwidget/src/main/java/com/justin/materialchipsetwidget/ShapeRender.kt
@@ -4,7 +4,7 @@ import android.graphics.drawable.Drawable
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 
-class ShapeRender(val shape: Shape) {
+class ShapeRender(private val shape: Shape) {
 
     fun getDrawable(): Drawable {