📌 Fixing dependencies

Author: yhs0602

app/build.gradle

@@ -84,12 +84,12 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.gms:play-services-ads:20.2.0'
     implementation 'com.github.codekidX:storage-chooser:2.0.4.4'
     implementation 'com.github.skydoves:colorpickerview:2.2.3'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation group: "pl.openrnd.android", name: "multi-level-listview", version: "1.0.1"
+//    implementation group: "pl.openrnd.android", name: "multi-level-listview", version: "1.0.1"
     // https://mvnrepository.com/artifact/commons-io/commons-io
 //    implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
@@ -100,13 +100,14 @@ dependencies {
     implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation("com.louiscad.splitties:splitties-fun-pack-android-base:3.0.0-beta03")
     implementation "com.louiscad.splitties:splitties-systemservices:$splitties_version"
     implementation("com.louiscad.splitties:splitties-appctx:$splitties_version")
     implementation 'org.apache.commons:commons-compress:1.20'
     implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
     // implementation("com.google.guava:guava:29.0-android")
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21"
     implementation 'org.jsoup:jsoup:1.13.1'
 
     // or "kotlin-stdlib-jdk8"
@@ -120,7 +121,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
 
     implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation "com.mikepenz:aboutlibraries:8.8.0"
+    implementation "com.mikepenz:aboutlibraries:8.9.1"
     implementation "androidx.cardview:cardview:1.0.0"
 
 //    implementation 'mnemonik:mnemonik:2.0.2'
@@ -129,6 +130,7 @@ dependencies {
     implementation 'com.github.tingyik90:snackprogressbar:6.4.2'
 
     implementation 'commons-codec:commons-codec:1.15'
+    implementation project(path: ':multilevellistview')
 
     testImplementation "org.junit.jupiter:junit-jupiter:5.7.2"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit5:$kotlin_version"

app/src/main/java/com/kyhsgeekcode/disassembler/FileDrawerListAdapter.kt

@@ -15,9 +15,9 @@ import com.kyhsgeekcode.disassembler.project.ProjectManager
 import com.kyhsgeekcode.disassembler.project.models.ProjectModel
 import com.kyhsgeekcode.disassembler.project.models.ProjectType
 import com.kyhsgeekcode.getDrawable
+import com.kyhsgeekcode.multilevellistview.ItemInfo
+import com.kyhsgeekcode.multilevellistview.MultiLevelListAdapter
 import org.jf.baksmali.Main
-import pl.openrnd.multilevellistview.ItemInfo
-import pl.openrnd.multilevellistview.MultiLevelListAdapter
 import splitties.init.appCtx
 import java.io.File
 import java.io.FileInputStream
@@ -30,14 +30,15 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import kotlin.experimental.and
 
-class FileDrawerListAdapter(val progressHandler: ProgressHandler) : MultiLevelListAdapter() {
+class FileDrawerListAdapter(val progressHandler: ProgressHandler) :
+    MultiLevelListAdapter<FileDrawerListItem>() {
     var mAlwaysExpandend = false
-    override fun isExpandable(anObject: Any): Boolean {
+    override fun isExpandable(anObject: FileDrawerListItem): Boolean {
         val item = anObject as FileDrawerListItem
         return item.isExpandable
     }
 
-    override fun getSubObjects(anObject: Any): List<*> {
+    override fun getSubObjects(anObject: FileDrawerListItem?): List<FileDrawerListItem> {
         val items: MutableList<FileDrawerListItem> = ArrayList()
         val item = anObject as FileDrawerListItem
         // Moved From MainActivity.java
@@ -211,6 +212,10 @@ class FileDrawerListAdapter(val progressHandler: ProgressHandler) : MultiLevelLi
         return items
     }
 
+    override fun getParent(anObject: FileDrawerListItem): FileDrawerListItem {
+        TODO()
+    }
+
     private fun getValueFromTypeKindAndBytes(bytes: ByteArray, kind: Int): Any {
         val bb = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN)
         return when (kind) {
@@ -237,7 +242,12 @@ class FileDrawerListAdapter(val progressHandler: ProgressHandler) : MultiLevelLi
         var nameView: TextView? = null // ImageView arrowView;
     }
 
-    override fun getViewForObject(anObject: Any, convertView: View?, itemInfo: ItemInfo): View {
+    override fun getViewForObject(
+        anObject: FileDrawerListItem,
+        convertView: View?,
+        itemInfo: ItemInfo,
+        pos: Int
+    ): View {
         var convertView2 = convertView
         val viewHolder: ViewHolder
         if (convertView2 == null) {

app/src/main/java/com/kyhsgeekcode/disassembler/MainActivity.kt

@@ -40,13 +40,14 @@ import com.kyhsgeekcode.disassembler.utils.ProjectManager_OLD
 import com.kyhsgeekcode.filechooser.NewFileChooserActivity
 import com.kyhsgeekcode.filechooser.model.FileItem
 import com.kyhsgeekcode.isArchive
+import com.kyhsgeekcode.multilevellistview.ItemInfo
+import com.kyhsgeekcode.multilevellistview.MLLVOnItemClickListener
+import com.kyhsgeekcode.multilevellistview.MultiLevelListAdapter
+import com.kyhsgeekcode.multilevellistview.MultiLevelListView
 import com.kyhsgeekcode.rootpicker.FileSelectorActivity
 import com.kyhsgeekcode.sendErrorReport
 import com.tingyik90.snackprogressbar.SnackProgressBar
 import com.tingyik90.snackprogressbar.SnackProgressBarManager
-import pl.openrnd.multilevellistview.ItemInfo
-import pl.openrnd.multilevellistview.MultiLevelListView
-import pl.openrnd.multilevellistview.OnItemClickListener
 import java.io.DataInputStream
 import java.io.File
 import java.io.IOException
@@ -302,11 +303,11 @@ class MainActivity : AppCompatActivity(),
         )
         mDrawerAdapter.setDataItems(initialDrawers)
         mDrawerAdapter.notifyDataSetChanged()
-        binding.leftDrawer.setOnItemClickListener(object : OnItemClickListener {
+        binding.leftDrawer.setOnItemClickListener(object : MLLVOnItemClickListener<FileDrawerListItem> {
             override fun onItemClicked(
-                parent: MultiLevelListView,
+                parent: MultiLevelListView<FileDrawerListItem>,
                 view: View,
-                item: Any,
+                item: FileDrawerListItem?,
                 itemInfo: ItemInfo
             ) {
                 val fitem = item as FileDrawerListItem
@@ -334,9 +335,9 @@ class MainActivity : AppCompatActivity(),
             }
 
             override fun onGroupItemClicked(
-                parent: MultiLevelListView,
+                parent: MultiLevelListView<FileDrawerListItem>,
                 view: View,
-                item: Any,
+                item: FileDrawerListItem?,
                 itemInfo: ItemInfo
             ) { // Toast.makeText(MainActivity.this,((FileDrawerListItem)item).caption,Toast.LENGTH_SHORT).show();
                 if ((item as FileDrawerListItem).isOpenable)
@@ -520,6 +521,7 @@ class MainActivity : AppCompatActivity(),
         permissions: Array<String>,
         grantResults: IntArray
     ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         when (requestCode) {
             REQUEST_WRITE_STORAGE_REQUEST_CODE -> {
                 // If request is cancelled, the result arrays are empty.

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

@@ -31,7 +31,7 @@
                 android:layout_height="match_parent" />
         </LinearLayout>
 
-        <pl.openrnd.multilevellistview.MultiLevelListView
+        <com.kyhsgeekcode.multilevellistview.MultiLevelListView
             android:id="@+id/left_drawer"
             android:layout_width="300dp"
             android:layout_height="match_parent"

build.gradle

@@ -5,29 +5,29 @@ buildscript {
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
 
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath "de.mannodermaus.gradle.plugins:android-junit5:1.7.0.0"
         classpath "org.jacoco:org.jacoco.core:0.8.7"
 
         classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0"
-        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.8.4"
+        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.9.1"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url "https://jitpack.io" }
         maven { url "https://maven.consulo.io/" }
-        maven { url 'https://dl.bintray.com/guardian/android' }
+//        maven { url 'https://dl.bintray.com/guardian/android' }
 //        maven { url 'http://dev.open-rnd.net:30844/content/groups/public/' }
     }
     ext {

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

multilevellistview/.gitignore

@@ -0,0 +1 @@
+/build

multilevellistview/build.gradle

@@ -0,0 +1,42 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
+
+android {
+    compileSdkVersion 30
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+}

multilevellistview/consumer-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

multilevellistview/proguard-rules.pro

@@ -0,0 +1,24 @@
+package com.kyhsgeekcode.multilevellistview
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.kyhsgeekcode.multilevellistview.test", appContext.packageName)
+    }
+}

multilevellistview/src/androidTest/java/com/kyhsgeekcode/multilevellistview/ExampleInstrumentedTest.kt

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.kyhsgeekcode.multilevellistview">
+
+</manifest>

multilevellistview/src/main/AndroidManifest.xml

@@ -0,0 +1,60 @@
+package com.kyhsgeekcode.multilevellistview
+
+/******************************************************************************
+ *
+ *  2016 (C) Copyright Open-RnD Sp. z o.o.
+ *
+ *  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.
+ *
+ ******************************************************************************/
+
+
+/**
+ * Interface used to get information about list item and its location in MultiLevelListView.
+ */
+interface ItemInfo {
+    /**
+     * Gets item level. Levels starts from 0.
+     *
+     * @return Item level.
+     */
+    val level: Int
+
+    /**
+     * Gets number of items with item level at the same hierarchy.
+     *
+     * @return Total number of items belonging to item's level.
+     */
+    val levelSize: Int
+
+    /**
+     * Gets item index within level.
+     *
+     * @return Item index.
+     */
+    val idxInLevel: Int
+
+    /**
+     * Gets info if item is extended.
+     *
+     * @return true if item is extended, false otherwise.
+     */
+    val isExpanded: Boolean
+
+    /**
+     * Gets info if item is expandable.
+     *
+     * @return true if item is expandable, false otherwise.
+     */
+    val isExpandable: Boolean
+}