From 667dd036d8256e361dc75596832591a0da8e1c21 Mon Sep 17 00:00:00 2001 From: Nicolas Centa Date: Fri, 7 Dec 2018 12:28:55 +0900 Subject: [PATCH 1/3] Migrated to AndroidX. --- .idea/codeStyles/Project.xml | 29 +++++++++++++++++++ .idea/vcs.xml | 6 ++++ README.md | 29 +++++++------------ app/build.gradle | 16 +++++----- .../com/recyclertreeview/MainActivity.java | 8 +++-- app/src/main/res/layout/activity_main.xml | 3 +- build.gradle | 3 +- gradle/wrapper/gradle-wrapper.properties | 4 +-- recyclertreeview-lib/build.gradle | 10 +++---- .../com/recyclertreeview_lib/TreeNode.java | 2 +- .../recyclertreeview_lib/TreeViewAdapter.java | 10 ++++--- .../recyclertreeview_lib/TreeViewBinder.java | 5 ++-- 12 files changed, 80 insertions(+), 45 deletions(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 703ac25..8ce4b3c 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,16 @@ -# RecyclerTreeView -[![](https://jitpack.io/v/TellH/RecyclerTreeView.svg)](https://jitpack.io/#TellH/RecyclerTreeView)
+# RecyclerTreeViewAndroidX + TreeView implement in Android with RecyclerView.. +This is an update to AndroidX from the [original branch](https://github.com/TellH/RecyclerTreeView). + ## Effect ![](https://raw.githubusercontent.com/TellH/RecyclerTreeView/master/raw/effect.gif) ## Usage ### Setup -root build.gradle -```groovy -allprojects { - repositories { - jcenter() - maven { url "https://jitpack.io" } - } -} -``` -app build.gradle -```groovy -dependencies { - compile 'com.github.TellH:RecyclerTreeView:1.2.0' -} -``` - +This section will be updated as soon as possible. ### Quick Start @@ -147,3 +134,9 @@ public class FileNodeBinder extends TreeViewBinder { Please check out the Demo and source code for more information. If you have any question, feel free to raise an issue. Thanks a lot! + +## Credits + +Thanks to [TellH](https://github.com/TellH) for developing (RecyclerTreeView)[https://github.com/TellH/RecyclerTreeView]. + +This code is distributed under the [Apache License version 2.0](https://www.apache.org/licenses/LICENSE-2.0.html). \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 17a0186..b29d745 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "tellh.com.recyclertreeview" minSdkVersion 14 @@ -20,13 +20,13 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { 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' - testCompile 'junit:junit:4.12' - compile project(path: ':recyclertreeview-lib') + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + testImplementation 'junit:junit:4.12' + implementation project(path: ':recyclertreeview-lib') // compile 'com.github.TellH:RecyclerTreeView:1.2.0' } diff --git a/app/src/main/java/tellh/com/recyclertreeview/MainActivity.java b/app/src/main/java/tellh/com/recyclertreeview/MainActivity.java index 5fc3861..960959e 100644 --- a/app/src/main/java/tellh/com/recyclertreeview/MainActivity.java +++ b/app/src/main/java/tellh/com/recyclertreeview/MainActivity.java @@ -1,9 +1,11 @@ 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.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; + import android.view.Menu; import android.view.MenuItem; import android.widget.ImageView; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 869486d..64eb07f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,6 @@ - Date: Fri, 7 Dec 2018 12:37:23 +0900 Subject: [PATCH 2/3] Prepared for merge by removing Android Studio files and restoring README.md. --- README.md | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8ce4b3c..703ac25 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,29 @@ -# RecyclerTreeViewAndroidX - +# RecyclerTreeView +[![](https://jitpack.io/v/TellH/RecyclerTreeView.svg)](https://jitpack.io/#TellH/RecyclerTreeView)
TreeView implement in Android with RecyclerView.. -This is an update to AndroidX from the [original branch](https://github.com/TellH/RecyclerTreeView). - ## Effect ![](https://raw.githubusercontent.com/TellH/RecyclerTreeView/master/raw/effect.gif) ## Usage ### Setup +root build.gradle +```groovy +allprojects { + repositories { + jcenter() + maven { url "https://jitpack.io" } + } +} +``` +app build.gradle +```groovy +dependencies { + compile 'com.github.TellH:RecyclerTreeView:1.2.0' +} +``` + -This section will be updated as soon as possible. ### Quick Start @@ -134,9 +147,3 @@ public class FileNodeBinder extends TreeViewBinder { Please check out the Demo and source code for more information. If you have any question, feel free to raise an issue. Thanks a lot! - -## Credits - -Thanks to [TellH](https://github.com/TellH) for developing (RecyclerTreeView)[https://github.com/TellH/RecyclerTreeView]. - -This code is distributed under the [Apache License version 2.0](https://www.apache.org/licenses/LICENSE-2.0.html). \ No newline at end of file From 781803436b90da10869d3368ae340b6034b1bbda Mon Sep 17 00:00:00 2001 From: Nicolas Centa Date: Fri, 7 Dec 2018 12:41:11 +0900 Subject: [PATCH 3/3] Removed Android Studio files from commit --- .gitignore | 2 ++ .idea/codeStyles/Project.xml | 29 ----------------------------- .idea/vcs.xml | 6 ------ 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 39fb081..55a038f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ /local.properties /.idea/workspace.xml /.idea/libraries +/.idea/codeStyles/Project.xml +/.idea/vcs.xml .DS_Store /build /captures diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file