单选支持取消选中

Author: LuckyCodeer

README.md

@@ -3,16 +3,15 @@ Android上的标签布局、流式布局，支持单选、多选等操作
 
 ### 引入依赖
 
-```kotlin
+```groovy
 allprojects {
 		repositories {
-			...
 			maven { url 'https://jitpack.io' }
 		}
 	}
 
 dependencies {
-            implementation 'com.github.LuckyCodeer:TagLayout:1.0.5'
+            implementation 'com.github.LuckyCodeer:TagLayout:1.0.6'
 	}
 ```
 
@@ -61,6 +60,7 @@ dependencies {
 ##### 布局属性
 1. app:defaultChoicePosition="0" //单选时默认选中项
 2. app:choiceMode="none" //设置选择模式，支持单选(singleChoice)和多选(multipleChoice) 默认(none)表示不设置选择模式
+3. app:singleChoiceSupportCancel="false" //单选支持取消已选中项，默认为false
 
 
 #### 动态添加数据
@@ -102,6 +102,7 @@ tagLayout2.onMultipleCheckedChangeListener =
 //获取选中项
 getIndexBtn.setOnClickListener{
     if(tagLayout2.getChoiceMode() == TagLayout.ChoiceMode.SingleChoice.choiceMode){
+        //tagLayout2.getCheckedPosition() 返回-1代表未选中任何选项
         Toast.makeText(this@MainActivity, "单选了 ${tagLayout2.getCheckedPosition()}", Toast.LENGTH_SHORT).show()
     }else if(tagLayout2.getChoiceMode() == TagLayout.ChoiceMode.MultipleChoice.choiceMode){
         Toast.makeText(this@MainActivity, "多选了 ${tagLayout2.getCheckedList()}", Toast.LENGTH_SHORT).show()

app/src/main/res/layout/activity_main.xml

@@ -36,14 +36,16 @@
             android:background="@drawable/tag_selector_bg"
             android:padding="10dp"
             android:text="多选" />
+
     </com.yhw.taglayout.TagLayout>
 
     <com.yhw.taglayout.TagLayout
         android:id="@+id/tag_layout_2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:choiceMode="none"
-        app:defaultChoicePosition="0" />
+        app:defaultChoicePosition="0"
+        app:singleChoiceSupportCancel="true"/>
 
     <LinearLayout
         android:layout_width="match_parent"

build.gradle

@@ -1,19 +1,26 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.31"
+    ext {
+        agp_version = '7.1.2'
+    }
+    ext.kotlin_version = "1.6.10"
     repositories {
+        maven { url 'https://maven.aliyun.com/repository/public/' }
+        maven { url 'https://maven.aliyun.com/repository/google/' }
         google()
         mavenCentral()
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.2"
+        classpath "com.android.tools.build:gradle:$agp_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
+        maven { url 'https://maven.aliyun.com/repository/public/' }
+        maven { url 'https://maven.aliyun.com/repository/google/' }
         google()
         mavenCentral()
         maven { url 'https://jitpack.io' }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Mar 18 16:31:36 CST 2021
+#Wed Sep 06 15:10:03 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

library/src/main/java/com/yhw/taglayout/TagLayout.kt

@@ -27,7 +27,8 @@ class TagLayout : ViewGroup {
     var onItemLongClickListener: OnItemLongClickListener? = null
     var onSingleCheckedChangeListener: OnSingleCheckedChangeListener? = null
     var onMultipleCheckedChangeListener: OnMultipleCheckedChangeListener? = null
-    var mScreenWidth = 0 //屏幕宽度
+    private var mScreenWidth = 0 //屏幕宽度
+    private var mSingleChoiceSupportCancel = false //单选是否支持取消
 
     constructor(context: Context) : this(context, null)
     constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
@@ -39,6 +40,7 @@ class TagLayout : ViewGroup {
         val ta = context.obtainStyledAttributes(attrs, R.styleable.TagLayout)
         choiceMode = ta.getInt(R.styleable.TagLayout_choiceMode, ChoiceMode.None.choiceMode)
         defChoicePosition = ta.getInt(R.styleable.TagLayout_defaultChoicePosition, 0)
+        mSingleChoiceSupportCancel = ta.getBoolean(R.styleable.TagLayout_singleChoiceSupportCancel, false)
         ta.recycle()
 
         val windowManager = context
@@ -139,7 +141,11 @@ class TagLayout : ViewGroup {
                         onItemClickListener?.onItemClick(position, it)
                     }
                     if (choiceMode == ChoiceMode.SingleChoice.choiceMode) {
-                        this.defChoicePosition = position
+                        if (it.isSelected) {
+                            this.defChoicePosition = position
+                        } else {
+                            this.defChoicePosition = -1
+                        }
                         if (onSingleCheckedChangeListener != null) {
                             onSingleCheckedChangeListener?.onCheckedChanged(defChoicePosition)
                         }
@@ -154,10 +160,10 @@ class TagLayout : ViewGroup {
             if (onItemLongClickListener != null) {
                 childView.isClickable = true
                 childView.isFocusable = true
-                childView.setOnLongClickListener(OnLongClickListener { v ->
+                childView.setOnLongClickListener { v ->
                     onItemLongClickListener?.onItemLongClick(i, v)
                     true
-                })
+                }
             }
             i++
         }
@@ -175,7 +181,15 @@ class TagLayout : ViewGroup {
                 continue
             }
             if (choiceMode == ChoiceMode.SingleChoice.choiceMode) {
-                view.isSelected = index == position
+                if (mSingleChoiceSupportCancel) {
+                    if (index == position) {
+                        view.isSelected = !view.isSelected
+                    } else {
+                        view.isSelected = false
+                    }
+                } else {
+                    view.isSelected = index == position
+                }
             } else if (choiceMode == ChoiceMode.MultipleChoice.choiceMode) {
                 if (index == position) {
                     view.isSelected = !view.isSelected

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

@@ -12,5 +12,7 @@
 
         <!--单选时默认选择项-->
         <attr name="defaultChoicePosition" format="integer"/>
+        <!--单选支持取消-->
+        <attr name="singleChoiceSupportCancel" format="boolean"/>
     </declare-styleable>
 </resources>