Updated libraries

* 6: Use data model instead of String. Remove databinding.

* 6: Use online lib dependency

* 6: Remove CircleCI

.circleci/config.yml

@@ -1,86 +0,0 @@
-version: 2.1
-jobs:
-  build:
-    working_directory: ~/code
-    docker:
-      - image: circleci/android:api-29
-    environment:
-      JVM_OPTS: -Xmx3200m
-    steps:
-      - checkout
-      - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
-      - run:
-          name: Download Dependencies
-          command: ./gradlew androidDependencies
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
-
-  tests:
-    working_directory: ~/code
-    docker:
-      - image: circleci/android:api-29
-    environment:
-      JVM_OPTS: -Xmx3200m
-    steps:
-      - checkout
-      - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
-      - store_artifacts:
-          path: app/build/reports
-          destination: reports
-      - run:
-          name: Run Lint Test
-          command: ./gradlew lint
-      - run:
-          name: Run Tests
-          command: ./gradlew lint test
-      - store_artifacts:
-          path: app/build/reports
-          destination: reports
-      - store_test_results:
-          path: app/build/test-results
-
-  deploy:
-    working_directory: ~/code
-    docker:
-      - image: circleci/android:api-29
-    environment:
-      JVM_OPTS: -Xmx3200m
-    steps:
-      - checkout
-      - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
-      - run:
-          name: Build Library
-          command: ./gradlew :expandable-recyclerview:assembleRelease
-      - run:
-          name: Export key
-          command: |
-            mkdir expandable-recyclerview/maven
-            echo ${GPG_KEY_CONTENTS} | base64 -d --ignore-garbage > expandable-recyclerview/maven/secret.gpg
-      - run:
-          name: Staging
-          command: ./gradlew :expandable-recyclerview:publishReleasePublicationToSonatypeRepository
-      - run:
-          name: Release Library
-          command: ./gradlew closeAndReleaseRepository
-
-workflows:
-  version: 2.1
-  build-and-deploy:
-    jobs:
-      - build:
-          filters:  # required since `deploy` has tag filters AND requires `build`
-            tags:
-              only: /.*/
-      - deploy:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /v[0-9]{1,3}\.[0-9]{1,3}\.?[0-9]{0,3}.*/
-            branches:
-              ignore: /.*/

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">

LICENSE

@@ -1,201 +1,21 @@
-                                 Apache License
+MIT License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Copyright (c) 2022 Adrian Kuta
 
-   1. Definitions.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-      "License" shall mean the terms and conditions for use, reproduction,
+The above copyright notice and this permission notice shall be included in all
-      and distribution as defined by Sections 1 through 9 of this document.
+copies or substantial portions of the Software.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-      the copyright owner that is granting the License.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-      "Legal Entity" shall mean the union of the acting entity and all
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-      other entities that control, are controlled by, or are under common
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-      control with that entity. For the purposes of this definition,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-      "control" means (i) the power, direct or indirect, to cause the
+SOFTWARE.
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

app/build.gradle

@@ -23,21 +23,17 @@ android {
     buildFeatures {
         viewBinding true
     }
-    dataBinding {
-        enabled = true
-    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-
+    implementation 'com.github.adriankuta:expandable-recyclerView:2.1.0'
-    implementation project(path: ':expandable-recyclerview')
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

app/src/main/java/com/github/adriankuta/ExpandableAdapter.kt

@@ -3,6 +3,7 @@ package com.github.adriankuta
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isGone
 import androidx.recyclerview.widget.RecyclerView
 import com.github.adriankuta.databinding.ItemLevel1Binding
 import com.github.adriankuta.databinding.ItemLevel2Binding
@@ -12,16 +13,16 @@ import com.github.adriankuta.expandable_recyclerview.ExpandableTreeNode
 import com.github.adriankuta.expandable_recyclerview.expandableTree
 
 class ExpandableAdapter :
-    ExpandableRecyclerViewAdapter<String, ExpandableAdapter.ExpandableViewHolder>() {
+    ExpandableRecyclerViewAdapter<Region, ExpandableAdapter.ExpandableViewHolder>() {
 
-    private var tree: ExpandableTreeNode<String>? = null
+    private var tree: ExpandableTreeNode<Region>? = null
 
-    fun setTree(tree: ExpandableTreeNode<String>) {
+    fun setTree(tree: ExpandableTreeNode<Region>) {
         this.tree = tree
         notifyDataSetChanged()
     }
 
-    override fun getTreeNodes(): ExpandableTreeNode<String> = tree ?: expandableTree("")
+    override fun getTreeNodes(): ExpandableTreeNode<Region> = tree ?: expandableTree(Region(""))
 
     override fun onCreateViewHolder(parent: ViewGroup, nestLevel: Int): ExpandableViewHolder {
         return when (nestLevel) {
@@ -34,7 +35,7 @@ class ExpandableAdapter :
 
     override fun onBindViewHolder(
         holder: ExpandableViewHolder,
-        treeNode: ExpandableTreeNode<String>,
+        treeNode: ExpandableTreeNode<Region>,
         nestLevel: Int
     ) {
         holder.bind(treeNode) {
@@ -46,41 +47,65 @@ class ExpandableAdapter :
 
         class Level1(private val binding: ItemLevel1Binding) : ExpandableViewHolder(binding.root) {
             override fun bind(
-                node: ExpandableTreeNode<String>,
+                node: ExpandableTreeNode<Region>,
-                onClickListener: ((ExpandableTreeNode<String>) -> Unit)?
+                onClickListener: ((ExpandableTreeNode<Region>) -> Unit)?
             ) {
-                binding.node = node
+                binding.apply {
-                binding.root.setOnClickListener { onClickListener?.invoke(node) }
+                    root.setOnClickListener { onClickListener?.invoke(node) }
-                binding.executePendingBindings()
+                    textView.text = node.value.name
+                    expandIcon.isGone = node.children.isEmpty()
+                    expandIcon.setImageResource(
+                        if (node.expanded)
+                            R.drawable.ic_expand_less_black_24dp
+                        else
+                            R.drawable.ic_expand_more_black_24dp
+                    )
+                }
             }
         }
 
         class Level2(private val binding: ItemLevel2Binding) : ExpandableViewHolder(binding.root) {
             override fun bind(
-                node: ExpandableTreeNode<String>,
+                node: ExpandableTreeNode<Region>,
-                onClickListener: ((ExpandableTreeNode<String>) -> Unit)?
+                onClickListener: ((ExpandableTreeNode<Region>) -> Unit)?
             ) {
-                binding.node = node
+                binding.apply {
-                binding.root.setOnClickListener { onClickListener?.invoke(node) }
+                    root.setOnClickListener { onClickListener?.invoke(node) }
-                binding.executePendingBindings()
+                    textView.text = node.value.name
+                    expandIcon.isGone = node.children.isEmpty()
+                    expandIcon.setImageResource(
+                        if (node.expanded)
+                            R.drawable.ic_expand_less_black_24dp
+                        else
+                            R.drawable.ic_expand_more_black_24dp
+                    )
+                }
             }
         }
 
         class Level3(private val binding: ItemLevel3Binding) : ExpandableViewHolder(binding.root) {
             override fun bind(
-                node: ExpandableTreeNode<String>,
+                node: ExpandableTreeNode<Region>,
-                onClickListener: ((ExpandableTreeNode<String>) -> Unit)?
+                onClickListener: ((ExpandableTreeNode<Region>) -> Unit)?
             ) {
-                binding.node = node
+                binding.apply {
-                binding.root.setOnClickListener { onClickListener?.invoke(node) }
+                    root.setOnClickListener { onClickListener?.invoke(node) }
-                binding.executePendingBindings()
+                    textView.text = node.value.name
+                    expandIcon.isGone = node.children.isEmpty()
+                    expandIcon.setImageResource(
+                        if (node.expanded)
+                            R.drawable.ic_expand_less_black_24dp
+                        else
+                            R.drawable.ic_expand_more_black_24dp
+                    )
+                }
             }
         }
 
 
         abstract fun bind(
-            node: ExpandableTreeNode<String>,
+            node: ExpandableTreeNode<Region>,
-            onClickListener: ((ExpandableTreeNode<String>) -> Unit)? = null
+            onClickListener: ((ExpandableTreeNode<Region>) -> Unit)? = null
         )
 
     }

app/src/main/java/com/github/adriankuta/MainActivity.kt

@@ -9,23 +9,24 @@ class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        val tree = expandableTree("World") {
+        val tree = expandableTree(Region("World")) {
-            child("North America") {
+            child(Region("North America")) {
-                child("USA")
+                child(Region("USA"))
             }
-            child("Europe") {
+            child(Region("Europe")) {
-                child("Poland") {
+                child(Region("Poland")) {
-                    child("Warsaw")
+                    child(Region("Warsaw"))
                 }
-                child("Germany")
+                child(Region("Germany"))
             }
-            child("Asia") {
+            child(Region("Asia")) {
-                child("China")
+                child(Region("China"))
             }
         }
 

app/src/main/java/com/github/adriankuta/Region.kt

@@ -0,0 +1,3 @@
+package com.github.adriankuta
+
+data class Region(val name: String)

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

@@ -1,44 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
-    <data>
+    <ImageView
+        android:id="@+id/expand_icon"
+        android:layout_width="24dp"
+        android:layout_height="0dp"
+        android:scaleType="centerInside"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/textView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/textView"
+        tools:src="@drawable/ic_expand_less_black_24dp"
+        tools:visibility="visible" />
 
-        <variable
+    <TextView
-            name="node"
+        android:id="@+id/textView"
-            type="com.github.adriankuta.expandable_recyclerview.ExpandableTreeNode&lt;String>" />
+        android:layout_width="0dp"
-
-        <import type="android.view.View" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:viewBindingIgnore="true">
+        android:padding="8dp"
-
+        android:text="@{node.value}"
-        <ImageView
+        app:layout_constraintBottom_toBottomOf="parent"
-            android:id="@+id/expand_icon"
+        app:layout_constraintEnd_toEndOf="parent"
-            android:layout_width="24dp"
+        app:layout_constraintStart_toEndOf="@id/expand_icon"
-            android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
-            android:scaleType="centerInside"
+        tools:text="@tools:sample/full_names" />
-            android:src="@{node.expanded ? @drawable/ic_expand_more_black_24dp : @drawable/ic_expand_less_black_24dp}"
+</androidx.constraintlayout.widget.ConstraintLayout>
-            android:visibility="@{node.children.empty ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toBottomOf="@id/textView"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/textView"
-            tools:src="@drawable/ic_expand_less_black_24dp" />
-
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:text="@{node.value}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/expand_icon"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/full_names" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

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

@@ -1,46 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
-    <data>
+    <ImageView
+        android:id="@+id/expand_icon"
+        android:layout_width="24dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="24dp"
+        android:scaleType="centerInside"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/textView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/textView"
+        tools:src="@drawable/ic_expand_less_black_24dp"
+        tools:visibility="visible" />
 
-        <variable
+    <TextView
-            name="node"
+        android:id="@+id/textView"
-            type="com.github.adriankuta.expandable_recyclerview.ExpandableTreeNode&lt;String>" />
+        android:layout_width="0dp"
-
-        <import type="android.view.View" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:viewBindingIgnore="true">
+        android:padding="8dp"
-
+        android:text="@{node.value}"
-        <ImageView
+        app:layout_constraintBottom_toBottomOf="parent"
-            android:id="@+id/expand_icon"
+        app:layout_constraintEnd_toEndOf="parent"
-            android:layout_width="24dp"
+        app:layout_constraintStart_toEndOf="@id/expand_icon"
-            android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginStart="24dp"
+        app:layout_goneMarginStart="48dp"
-            android:scaleType="centerInside"
+        tools:text="@tools:sample/full_names" />
-            android:src="@{node.expanded ? @drawable/ic_expand_more_black_24dp : @drawable/ic_expand_less_black_24dp}"
+</androidx.constraintlayout.widget.ConstraintLayout>
-            android:visibility="@{node.children.empty ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toBottomOf="@id/textView"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/textView"
-            tools:src="@drawable/ic_expand_less_black_24dp" />
-
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:text="@{node.value}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/expand_icon"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_goneMarginStart="48dp"
-            tools:text="@tools:sample/full_names" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

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

@@ -1,46 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
-    <data>
+    <ImageView
+        android:id="@+id/expand_icon"
+        android:layout_width="24dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="48dp"
+        android:scaleType="centerInside"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/textView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/textView"
+        tools:src="@drawable/ic_expand_less_black_24dp"
+        tools:visibility="visible"/>
 
-        <variable
+    <TextView
-            name="node"
+        android:id="@+id/textView"
-            type="com.github.adriankuta.expandable_recyclerview.ExpandableTreeNode&lt;String>" />
+        android:layout_width="0dp"
-
-        <import type="android.view.View" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:viewBindingIgnore="true">
+        android:padding="8dp"
-
+        android:text="@{node.value}"
-        <ImageView
+        app:layout_constraintBottom_toBottomOf="parent"
-            android:id="@+id/expand_icon"
+        app:layout_constraintEnd_toEndOf="parent"
-            android:layout_width="24dp"
+        app:layout_constraintStart_toEndOf="@id/expand_icon"
-            android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginStart="48dp"
+        app:layout_goneMarginStart="96dp"
-            android:scaleType="centerInside"
+        tools:text="@tools:sample/full_names" />
-            android:src="@{node.expanded ? @drawable/ic_expand_more_black_24dp : @drawable/ic_expand_less_black_24dp}"
+</androidx.constraintlayout.widget.ConstraintLayout>
-            android:visibility="@{node.children.empty ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toBottomOf="@id/textView"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/textView"
-            tools:src="@drawable/ic_expand_less_black_24dp" />
-
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:text="@{node.value}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/expand_icon"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_goneMarginStart="96dp"
-            tools:text="@tools:sample/full_names" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.8.22'
     repositories {
         google()
         mavenCentral()

expandable-recyclerview/build.gradle

@@ -14,7 +14,7 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 33
-        versionName "2.1.0"
+        versionName "2.1.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -31,14 +31,14 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
-    api "androidx.recyclerview:recyclerview:1.2.1"
+    api "androidx.recyclerview:recyclerview:1.3.0"
-    api "com.github.adriankuta:tree-structure:2.0.3"
+    api "com.github.adriankuta:tree-structure:3.0.2"
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
 
 ext {