From 407ac14822e697e14e3570beb03e29cd70c2c291 Mon Sep 17 00:00:00 2001 From: Niwin Santhosh Date: Fri, 26 Aug 2016 12:36:20 +0530 Subject: [PATCH 1/5] Update collapseNode() in AndroidTreeView.java Added a "includeSubnodes" parameter in collapseNode function (public method). It would be useful for people who want to collapse a node as well as all of it's subnodes --- .../src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java index 222a43a..70c9a56 100644 --- a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java +++ b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java @@ -162,8 +162,8 @@ public void expandNode(TreeNode node) { expandNode(node, false); } - public void collapseNode(TreeNode node) { - collapseNode(node, false); + public void collapseNode(TreeNode node, Boolean includeSubnodes) { + collapseNode(node, includeSubnodes); } public String getSaveState() { From 58b0d07e408626447a3a4b2bc89f89993a04d225 Mon Sep 17 00:00:00 2001 From: Niwin Santhosh Date: Fri, 26 Aug 2016 15:16:05 +0530 Subject: [PATCH 2/5] Added includeSubnodes param to collapseNode method --- app/build.gradle | 8 ++++---- gradle.properties | 2 +- library/build.gradle | 8 ++++---- .../main/java/com/unnamed/b/atv/view/AndroidTreeView.java | 4 ++++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6d144bb..705080c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) - buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION + compileSdkVersion 23 + buildToolsVersion "23.0.2" defaultConfig { applicationId "com.unnamed.b.atv.demo" minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION) - targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) + targetSdkVersion 21 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) } @@ -20,7 +20,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:21.0.3' + compile 'com.android.support:appcompat-v7:23.1.1' compile 'com.github.johnkil.print:print:1.2.2' compile project(':library') } diff --git a/gradle.properties b/gradle.properties index ddb8205..4bee48b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ VERSION_CODE=11 ANDROID_BUILD_MIN_SDK_VERSION=11 -ANDROID_BUILD_TARGET_SDK_VERSION=21 +ANDROID_BUILD_TARGET_SDK_VERSION=22 ANDROID_BUILD_SDK_VERSION=21 ANDROID_BUILD_TOOLS_VERSION=21.1.2 diff --git a/library/build.gradle b/library/build.gradle index 92ecb9f..7bb1b50 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) - buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION + compileSdkVersion 23 + buildToolsVersion "23.0.2" defaultConfig { minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION) - targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) + targetSdkVersion 23 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) } @@ -19,7 +19,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:21.0.3' + compile 'com.android.support:appcompat-v7:23.1.1' } apply from: '../maven_push.gradle' diff --git a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java index 70c9a56..3249c0a 100644 --- a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java +++ b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java @@ -166,6 +166,10 @@ public void collapseNode(TreeNode node, Boolean includeSubnodes) { collapseNode(node, includeSubnodes); } + public void collapseNode(TreeNode node) { + collapseNode(node, false); + } + public String getSaveState() { final StringBuilder builder = new StringBuilder(); getSaveState(mRoot, builder); From 68cc01267551e6e806c9ec4c20bea3c515a6baa6 Mon Sep 17 00:00:00 2001 From: Niwin Santhosh Date: Fri, 26 Aug 2016 16:43:21 +0530 Subject: [PATCH 3/5] Added includeSubnodes param to collapseNode method --- .../src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java index 3249c0a..c82abb7 100644 --- a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java +++ b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java @@ -162,8 +162,8 @@ public void expandNode(TreeNode node) { expandNode(node, false); } - public void collapseNode(TreeNode node, Boolean includeSubnodes) { - collapseNode(node, includeSubnodes); + public void collapseNodeWithSubnodes(TreeNode node) { + collapseNode(node, true); } public void collapseNode(TreeNode node) { From befd485a8c8bc75922cbebaeca4bb269296b61d3 Mon Sep 17 00:00:00 2001 From: Niwin Santhosh Date: Fri, 26 Aug 2016 16:45:11 +0530 Subject: [PATCH 4/5] Created collapseNodeWithSubnodes method to collapse a node as well it's subnodes --- .../main/java/com/unnamed/b/atv/view/AndroidTreeView.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java index c82abb7..53f8803 100644 --- a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java +++ b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java @@ -162,14 +162,14 @@ public void expandNode(TreeNode node) { expandNode(node, false); } - public void collapseNodeWithSubnodes(TreeNode node) { - collapseNode(node, true); - } - public void collapseNode(TreeNode node) { collapseNode(node, false); } + public void collapseNodeWithSubnodes(TreeNode node) { + collapseNode(node, true); + } + public String getSaveState() { final StringBuilder builder = new StringBuilder(); getSaveState(mRoot, builder); From 05d380377f3ffec136ccc3ec7bb6edbd7e0f5b07 Mon Sep 17 00:00:00 2001 From: Niwin Santhosh Date: Thu, 15 Sep 2016 16:47:19 +0530 Subject: [PATCH 5/5] Update README.md --- README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README.md b/README.md index 89074e2..dfc61b1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,27 @@ AndroidTreeView ==================== +This is a fork of the original AndroidTreeView Project. + +I have added collapseNodeWithSubnodes method in the main class to have the functionality to collapse a node including it's subnodes in a single method call. + +You can use the gradle dependency, you have to add these lines in your build.gradle file: + +```xml +repositories { + maven { url "https://jitpack.io" } +} + +dependencies { + compile 'com.github.vajro:AndroidTreeView:1.3.1' +} +``` +Kindly ensure you add Jitpack's maven repo url in your gradle file. + +#ORIGINAL README + +AndroidTreeView +==================== ### Recent changes