Updates and Structure changes

README.md

@@ -19,15 +19,17 @@ allprojects {
 app build.gradle
 ```groovy
 dependencies {
-    compile 'com.github.TellH:RecyclerTreeView:1.2.0'
+    implementation 'com.github.AZKZero:RecyclerTreeView:1.3.0'
 }
 ```
 
 
 
 ### Quick Start
 
-- Create a Java bean class and  implement the LayoutItemType, to attach item layout id to it.
+- Create a Java bean class and  implement the LayoutItemType 
+- Attach item layout id to it.
+- Attach toggle view id to it. (also you can stop toggle entirely or use the full view as toggle)
 
 ```java
 public class Dir implements LayoutItemType {
@@ -41,12 +43,18 @@ public class Dir implements LayoutItemType {
     public int getLayoutId() {
         return R.layout.item_dir;
     }
+
+    @Override
+    public int getToggleViewId() {
+        return R.id.iv_arrow;
+    }
 }
 ```
 
 
 
 - Create a ViewBinder to bind view with the data bean. As you see, `provideViewHolder(View itemView)` corresponds for `onCreateViewHolder` in RecyclerView, and `bindView` corresponds for `onBindViewHolder` in RecyclerView. 
+- For safety, follow the same ids provided the bean files.
 
 ```java
 public class FileNodeBinder extends TreeViewBinder<FileNodeBinder.ViewHolder> {
@@ -66,6 +74,11 @@ public class FileNodeBinder extends TreeViewBinder<FileNodeBinder.ViewHolder> {
         return R.layout.item_file;
     }
 
+    @Override
+    public int getToggleViewId() {
+        return NO_TOGGLE_ATTACHED;
+    }
+
     public class ViewHolder extends TreeViewBinder.ViewHolder {
         public TextView tvName;
 
@@ -128,7 +141,7 @@ public class FileNodeBinder extends TreeViewBinder<FileNodeBinder.ViewHolder> {
             public boolean onClick(TreeNode node, RecyclerView.ViewHolder holder) {
                 if (!node.isLeaf()) {
                     //Update and toggle the node.
-                    onToggle(!node.isExpand(), holder);
+                    //onToggle(!node.isExpand(), holder); onToggle is now called automatically
                 }
                 return false;
             }

app/build.gradle

@@ -1,32 +1,36 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 31
+    buildToolsVersion '30.0.3'
     defaultConfig {
         applicationId "tellh.com.recyclertreeview"
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support:recyclerview-v7:26.1.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     testCompile 'junit:junit:4.12'
-    compile project(path: ':recyclertreeview-lib')
-//    compile 'com.github.TellH:RecyclerTreeView:1.2.0'
+    implementation project(path: ':recyclertreeview-lib')
+//    implementation 'com.github.TellH:RecyclerTreeView:1.2.0'
 }

app/src/androidTest/java/tellh/com/recyclertreeview/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package tellh.com.recyclertreeview;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/main/java/tellh/com/recyclertreeview/MainActivity.java

@@ -1,12 +1,13 @@
 package tellh.com.recyclertreeview;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ImageView;
+import android.widget.Toast;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -74,9 +75,10 @@ private void initData() {
         adapter.setOnTreeNodeListener(new TreeViewAdapter.OnTreeNodeListener() {
             @Override
             public boolean onClick(TreeNode node, RecyclerView.ViewHolder holder) {
+                Toast.makeText(MainActivity.this, "Item Clicked!", Toast.LENGTH_SHORT).show();
                 if (!node.isLeaf()) {
                     //Update and toggle the node.
-                    onToggle(!node.isExpand(), holder);
+//                    onToggle(!node.isExpand(), holder);
 //                    if (!node.isExpand())
 //                        adapter.collapseBrotherNode(node);
                 }
@@ -85,6 +87,8 @@ public boolean onClick(TreeNode node, RecyclerView.ViewHolder holder) {
 
             @Override
             public void onToggle(boolean isExpand, RecyclerView.ViewHolder holder) {
+                Toast.makeText(MainActivity.this, "Item Toggled!", Toast.LENGTH_SHORT).show();
+
                 DirectoryNodeBinder.ViewHolder dirViewHolder = (DirectoryNodeBinder.ViewHolder) holder;
                 final ImageView ivArrow = dirViewHolder.getIvArrow();
                 int rotateDegree = isExpand ? 90 : -90;

app/src/main/java/tellh/com/recyclertreeview/bean/Dir.java

@@ -18,4 +18,9 @@ public Dir(String dirName) {
     public int getLayoutId() {
         return R.layout.item_dir;
     }
+
+    @Override
+    public int getToggleViewId() {
+        return R.id.iv_arrow;
+    }
 }

app/src/main/java/tellh/com/recyclertreeview/bean/File.java

@@ -18,4 +18,9 @@ public File(String fileName) {
     public int getLayoutId() {
         return R.layout.item_file;
     }
+
+    @Override
+    public int getToggleViewId() {
+        return NO_TOGGLE_ATTACHED;
+    }
 }

app/src/main/java/tellh/com/recyclertreeview/viewbinder/DirectoryNodeBinder.java

@@ -37,6 +37,11 @@ public int getLayoutId() {
         return R.layout.item_dir;
     }
 
+    @Override
+    public int getToggleViewId() {
+        return R.id.iv_arrow;
+    }
+
     public static class ViewHolder extends TreeViewBinder.ViewHolder {
         private ImageView ivArrow;
         private TextView tvName;

app/src/main/java/tellh/com/recyclertreeview/viewbinder/FileNodeBinder.java

@@ -29,6 +29,11 @@ public int getLayoutId() {
         return R.layout.item_file;
     }
 
+    @Override
+    public int getToggleViewId() {
+        return NO_TOGGLE_ATTACHED;
+    }
+
     public class ViewHolder extends TreeViewBinder.ViewHolder {
         public TextView tvName;
 

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rv"