From 9e86b0742ba977543aa9250f5496956463dd27b7 Mon Sep 17 00:00:00 2001 From: Juan Nascimento Date: Sat, 6 Jan 2024 16:08:41 -0300 Subject: [PATCH] update: dependencies updated --- app/build.gradle.kts | 56 +++++++++---------- .../manager/adapter/FileModelAdapter.kt | 19 ++----- gradle/libs.versions.toml | 4 +- 3 files changed, 36 insertions(+), 43 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 641e486..f9f6592 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -80,28 +80,28 @@ android { } dependencies { - val material3 = "1.2.0-alpha05" - val navigationVersion = "2.6.0" + val material3 = "1.2.0-beta01" + val navigationVersion = "2.7.6" val composeBom = platform("androidx.compose:compose-bom:2023.10.01") - val roomVersion = "2.5.2" + val roomVersion = "2.6.1" // AndroidX Libraries - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") - implementation("androidx.recyclerview:recyclerview:1.3.1") - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1") - implementation("androidx.core:core-ktx:+") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + implementation("androidx.recyclerview:recyclerview:1.3.2") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2") + implementation("androidx.core:core-ktx:1.12.0") // UI Libraries - implementation("androidx.core:core-ktx:1.10.1") + implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.9.0") + implementation("com.google.android.material:material:1.11.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.preference:preference-ktx:1.2.0") + implementation("androidx.preference:preference-ktx:1.2.1") implementation("androidx.legacy:legacy-support-v4:1.0.0") implementation("androidx.recyclerview:recyclerview-selection:1.1.0") - implementation("me.zhanghai.android.fastscroll:library:1.2.0") + implementation("me.zhanghai.android.fastscroll:library:1.3.0") // Tests testImplementation("junit:junit:4.13.2") @@ -109,15 +109,15 @@ dependencies { androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") // Third-party Libraries - implementation(platform("io.github.Rosemoe.sora-editor:bom:0.21.1")) + implementation(platform("io.github.Rosemoe.sora-editor:bom:0.22.2")) implementation("io.github.Rosemoe.sora-editor:editor") implementation("io.github.Rosemoe.sora-editor:language-textmate") - implementation("commons-net:commons-net:3.9.0") + implementation("commons-net:commons-net:3.10.0") implementation("org.tukaani:xz:1.9") implementation("com.jakewharton.threetenabp:threetenabp:1.4.6") implementation("dev.rikka.rikkax.preference:simplemenu-preference:1.0.3") - implementation("dev.rikka.shizuku:api:12.2.0") - runtimeOnly("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1") + implementation("dev.rikka.shizuku:api:13.1.5") + runtimeOnly("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") //https://github.com/Glavo/kala-compress implementation("org.glavo.kala:kala-compress:1.21.0.1-beta3") @@ -146,28 +146,28 @@ dependencies { implementation("androidx.compose.material3:material3-window-size-class:$material3") implementation("androidx.compose.runtime:runtime-livedata") implementation("androidx.compose.ui:ui-tooling") - implementation("com.google.accompanist:accompanist-themeadapter-material:0.28.0") + implementation("com.google.accompanist:accompanist-themeadapter-material:0.32.0") implementation("androidx.compose.material:material-icons-extended") implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1") - implementation("androidx.activity:activity-compose:1.7.2") + implementation("androidx.activity:activity-compose:1.8.2") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") - implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.1") + implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.2") //Google accompanist implementation("com.google.accompanist:accompanist-navigation-animation:0.33.1-alpha") //Glide Compose implementation("com.github.bumptech.glide:glide:4.16.0") - implementation("com.github.bumptech.glide:compose:1.0.0-alpha.5") + implementation("com.github.bumptech.glide:compose:1.0.0-beta01") //ExoPlayer - implementation("androidx.media3:media3-exoplayer:1.1.0") - implementation("androidx.media3:media3-ui:1.1.0") + implementation("androidx.media3:media3-exoplayer:1.2.0") + implementation("androidx.media3:media3-ui:1.2.0") //zoomable - implementation("net.engawapg.lib:zoomable:1.5.0-beta1") + implementation("net.engawapg.lib:zoomable:1.5.3") //Coil implementation(platform("io.coil-kt:coil-bom:2.5.0")) @@ -178,18 +178,18 @@ dependencies { //Room implementation("androidx.room:room-runtime:$roomVersion") - implementation("androidx.core:core-ktx:1.10.1") + implementation("androidx.core:core-ktx:1.12.0") ksp("androidx.room:room-compiler:$roomVersion") implementation("androidx.room:room-ktx:$roomVersion") - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2") //Dagger - Hilt - implementation("com.google.dagger:hilt-android:2.44") - implementation("androidx.hilt:hilt-navigation-compose:1.1.0-alpha01") - ksp("androidx.hilt:hilt-compiler:1.0.0") - ksp("com.google.dagger:hilt-compiler:2.44") + implementation("com.google.dagger:hilt-android:2.50") + implementation("androidx.hilt:hilt-navigation-compose:1.1.0") + ksp("androidx.hilt:hilt-compiler:1.1.0") + ksp("com.google.dagger:hilt-compiler:2.50") //Baseline Profile baselineProfile(project(":app:benchmark")) diff --git a/app/src/main/java/com/etb/filemanager/manager/adapter/FileModelAdapter.kt b/app/src/main/java/com/etb/filemanager/manager/adapter/FileModelAdapter.kt index 2c62845..987b148 100644 --- a/app/src/main/java/com/etb/filemanager/manager/adapter/FileModelAdapter.kt +++ b/app/src/main/java/com/etb/filemanager/manager/adapter/FileModelAdapter.kt @@ -213,8 +213,7 @@ class FileModelAdapter( } - } else - loadImageFromDirectory(binding) + } else loadImageFromDirectory(binding) binding.fileTitle.text = file.fileName @@ -290,8 +289,7 @@ class FileModelAdapter( private fun getIconByMimeType( - mimeType: String?, - binding: FileItemBinding + mimeType: String?, binding: FileItemBinding ) { val icFile = AppCompatResources.getDrawable(mContext, R.drawable.file_generic_icon) val tint = getTintForIcons() @@ -308,12 +306,8 @@ class FileModelAdapter( val imageView = binding.iconFile binding.iconFile.clearColorFilter() - Glide.with(mContext) - .load(path) - .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC) - .override(50, 50) - .placeholder(R.drawable.ic_image) - .into(imageView) + Glide.with(mContext).load(path).diskCacheStrategy(DiskCacheStrategy.AUTOMATIC) + .override(50, 50).placeholder(R.drawable.ic_image).into(imageView) } private fun loadImageFromDirectory(binding: FileItemBinding) { @@ -367,10 +361,9 @@ class FileModelAdapter( } - override fun getPopupText(position: Int): CharSequence { - val file = getItem(position) + override fun getPopupText(view: View, position: Int): CharSequence { val locale = Locale(Preferences.Interface.language) - return file.fileName.take(1).uppercase(locale) + return getItem(position).fileName.take(1).uppercase(locale) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ce41783..6f44575 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,8 +4,8 @@ agp = "8.2.0" kotlin = "1.9.20" junit = "1.1.5" espresso-core = "3.5.1" -uiautomator = "2.3.0-alpha04" -benchmark-macro-junit4 = "1.2.0-beta04" +uiautomator = "2.3.0-beta01" +benchmark-macro-junit4 = "1.2.2" baseline-profile = "1.2.0-beta04" [libraries]