Skip to content

Commit 9e86b07

Browse files
committed
update: dependencies updated
1 parent 6fa6bf1 commit 9e86b07

File tree

3 files changed

+36
-43
lines changed

3 files changed

+36
-43
lines changed

app/build.gradle.kts

+28-28
Original file line numberDiff line numberDiff line change
@@ -80,44 +80,44 @@ android {
8080
}
8181
dependencies {
8282

83-
val material3 = "1.2.0-alpha05"
84-
val navigationVersion = "2.6.0"
83+
val material3 = "1.2.0-beta01"
84+
val navigationVersion = "2.7.6"
8585
val composeBom = platform("androidx.compose:compose-bom:2023.10.01")
86-
val roomVersion = "2.5.2"
86+
val roomVersion = "2.6.1"
8787

8888

8989
// AndroidX Libraries
90-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
91-
implementation("androidx.recyclerview:recyclerview:1.3.1")
92-
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1")
93-
implementation("androidx.core:core-ktx:+")
90+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
91+
implementation("androidx.recyclerview:recyclerview:1.3.2")
92+
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2")
93+
implementation("androidx.core:core-ktx:1.12.0")
9494

9595

9696
// UI Libraries
97-
implementation("androidx.core:core-ktx:1.10.1")
97+
implementation("androidx.core:core-ktx:1.12.0")
9898
implementation("androidx.appcompat:appcompat:1.6.1")
99-
implementation("com.google.android.material:material:1.9.0")
99+
implementation("com.google.android.material:material:1.11.0")
100100
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
101-
implementation("androidx.preference:preference-ktx:1.2.0")
101+
implementation("androidx.preference:preference-ktx:1.2.1")
102102
implementation("androidx.legacy:legacy-support-v4:1.0.0")
103103
implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
104-
implementation("me.zhanghai.android.fastscroll:library:1.2.0")
104+
implementation("me.zhanghai.android.fastscroll:library:1.3.0")
105105

106106
// Tests
107107
testImplementation("junit:junit:4.13.2")
108108
androidTestImplementation("androidx.test.ext:junit:1.1.5")
109109
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
110110

111111
// Third-party Libraries
112-
implementation(platform("io.github.Rosemoe.sora-editor:bom:0.21.1"))
112+
implementation(platform("io.github.Rosemoe.sora-editor:bom:0.22.2"))
113113
implementation("io.github.Rosemoe.sora-editor:editor")
114114
implementation("io.github.Rosemoe.sora-editor:language-textmate")
115-
implementation("commons-net:commons-net:3.9.0")
115+
implementation("commons-net:commons-net:3.10.0")
116116
implementation("org.tukaani:xz:1.9")
117117
implementation("com.jakewharton.threetenabp:threetenabp:1.4.6")
118118
implementation("dev.rikka.rikkax.preference:simplemenu-preference:1.0.3")
119-
implementation("dev.rikka.shizuku:api:12.2.0")
120-
runtimeOnly("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
119+
implementation("dev.rikka.shizuku:api:13.1.5")
120+
runtimeOnly("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
121121
//https://github.com/Glavo/kala-compress
122122
implementation("org.glavo.kala:kala-compress:1.21.0.1-beta3")
123123

@@ -146,28 +146,28 @@ dependencies {
146146
implementation("androidx.compose.material3:material3-window-size-class:$material3")
147147
implementation("androidx.compose.runtime:runtime-livedata")
148148
implementation("androidx.compose.ui:ui-tooling")
149-
implementation("com.google.accompanist:accompanist-themeadapter-material:0.28.0")
149+
implementation("com.google.accompanist:accompanist-themeadapter-material:0.32.0")
150150
implementation("androidx.compose.material:material-icons-extended")
151151
implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
152-
implementation("androidx.activity:activity-compose:1.7.2")
152+
implementation("androidx.activity:activity-compose:1.8.2")
153153
implementation("androidx.compose.ui:ui-graphics")
154154
implementation("androidx.compose.ui:ui-tooling-preview")
155-
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.1")
155+
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.2")
156156

157157
//Google accompanist
158158
implementation("com.google.accompanist:accompanist-navigation-animation:0.33.1-alpha")
159159

160160
//Glide Compose
161161
implementation("com.github.bumptech.glide:glide:4.16.0")
162-
implementation("com.github.bumptech.glide:compose:1.0.0-alpha.5")
162+
implementation("com.github.bumptech.glide:compose:1.0.0-beta01")
163163

164164

165165
//ExoPlayer
166-
implementation("androidx.media3:media3-exoplayer:1.1.0")
167-
implementation("androidx.media3:media3-ui:1.1.0")
166+
implementation("androidx.media3:media3-exoplayer:1.2.0")
167+
implementation("androidx.media3:media3-ui:1.2.0")
168168

169169
//zoomable
170-
implementation("net.engawapg.lib:zoomable:1.5.0-beta1")
170+
implementation("net.engawapg.lib:zoomable:1.5.3")
171171

172172
//Coil
173173
implementation(platform("io.coil-kt:coil-bom:2.5.0"))
@@ -178,18 +178,18 @@ dependencies {
178178

179179
//Room
180180
implementation("androidx.room:room-runtime:$roomVersion")
181-
implementation("androidx.core:core-ktx:1.10.1")
181+
implementation("androidx.core:core-ktx:1.12.0")
182182
ksp("androidx.room:room-compiler:$roomVersion")
183183
implementation("androidx.room:room-ktx:$roomVersion")
184184

185185

186-
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
186+
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
187187

188188
//Dagger - Hilt
189-
implementation("com.google.dagger:hilt-android:2.44")
190-
implementation("androidx.hilt:hilt-navigation-compose:1.1.0-alpha01")
191-
ksp("androidx.hilt:hilt-compiler:1.0.0")
192-
ksp("com.google.dagger:hilt-compiler:2.44")
189+
implementation("com.google.dagger:hilt-android:2.50")
190+
implementation("androidx.hilt:hilt-navigation-compose:1.1.0")
191+
ksp("androidx.hilt:hilt-compiler:1.1.0")
192+
ksp("com.google.dagger:hilt-compiler:2.50")
193193

194194
//Baseline Profile
195195
baselineProfile(project(":app:benchmark"))

app/src/main/java/com/etb/filemanager/manager/adapter/FileModelAdapter.kt

+6-13
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,7 @@ class FileModelAdapter(
213213

214214
}
215215

216-
} else
217-
loadImageFromDirectory(binding)
216+
} else loadImageFromDirectory(binding)
218217

219218

220219
binding.fileTitle.text = file.fileName
@@ -290,8 +289,7 @@ class FileModelAdapter(
290289

291290

292291
private fun getIconByMimeType(
293-
mimeType: String?,
294-
binding: FileItemBinding
292+
mimeType: String?, binding: FileItemBinding
295293
) {
296294
val icFile = AppCompatResources.getDrawable(mContext, R.drawable.file_generic_icon)
297295
val tint = getTintForIcons()
@@ -308,12 +306,8 @@ class FileModelAdapter(
308306
val imageView = binding.iconFile
309307

310308
binding.iconFile.clearColorFilter()
311-
Glide.with(mContext)
312-
.load(path)
313-
.diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
314-
.override(50, 50)
315-
.placeholder(R.drawable.ic_image)
316-
.into(imageView)
309+
Glide.with(mContext).load(path).diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
310+
.override(50, 50).placeholder(R.drawable.ic_image).into(imageView)
317311
}
318312

319313
private fun loadImageFromDirectory(binding: FileItemBinding) {
@@ -367,10 +361,9 @@ class FileModelAdapter(
367361

368362
}
369363

370-
override fun getPopupText(position: Int): CharSequence {
371-
val file = getItem(position)
364+
override fun getPopupText(view: View, position: Int): CharSequence {
372365
val locale = Locale(Preferences.Interface.language)
373-
return file.fileName.take(1).uppercase(locale)
366+
return getItem(position).fileName.take(1).uppercase(locale)
374367
}
375368

376369
}

gradle/libs.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ agp = "8.2.0"
44
kotlin = "1.9.20"
55
junit = "1.1.5"
66
espresso-core = "3.5.1"
7-
uiautomator = "2.3.0-alpha04"
8-
benchmark-macro-junit4 = "1.2.0-beta04"
7+
uiautomator = "2.3.0-beta01"
8+
benchmark-macro-junit4 = "1.2.2"
99
baseline-profile = "1.2.0-beta04"
1010

1111
[libraries]

0 commit comments

Comments
 (0)