Skip to content

Commit debd03a

Browse files
committed
Gallery: Remove unused and update dependencies
Signed-off-by: IacobIonut01 <paulionut2003@gmail.com>
1 parent a9c463c commit debd03a

File tree

8 files changed

+12
-80
lines changed

8 files changed

+12
-80
lines changed

app/build.gradle.kts

+3-18
Original file line numberDiff line numberDiff line change
@@ -103,27 +103,24 @@ android {
103103
}
104104

105105
dependencies {
106-
implementation(libs.androidx.profileinstaller)
106+
runtimeOnly(libs.androidx.profileinstaller)
107107
implementation(project(":libs:cropper"))
108108
"baselineProfile"(project(mapOf("path" to ":baselineprofile")))
109109

110110
// Core
111111
implementation(libs.androidx.core.ktx)
112112
implementation(libs.androidx.appcompat)
113-
implementation(libs.androidx.navigation.runtime.ktx)
114113

115114
// Core - Lifecycle
116115
implementation(libs.androidx.lifecycle.runtime.ktx)
117116
implementation(libs.compose.lifecycle.runtime)
118-
implementation(libs.androidx.lifecycle.livedata.ktx)
119117

120118
// Compose
121119
implementation(libs.compose.activity)
122120
implementation(platform(libs.compose.bom))
123121
implementation(libs.compose.ui)
124122
implementation(libs.compose.ui.graphics)
125123
implementation(libs.compose.ui.tooling.preview)
126-
implementation(libs.compose.ui.util)
127124
implementation(libs.compose.material.icons.extended)
128125

129126
// Compose - Shimmer
@@ -143,7 +140,7 @@ dependencies {
143140

144141
// Kotlin - Coroutines
145142
implementation(libs.kotlinx.coroutines.core)
146-
implementation(libs.kotlinx.coroutines.android)
143+
runtimeOnly(libs.kotlinx.coroutines.android)
147144

148145
// Dagger - Hilt
149146
implementation(libs.androidx.hilt.navigation.compose)
@@ -158,16 +155,6 @@ dependencies {
158155
// Kotlin Extensions and Coroutines support for Room
159156
implementation(libs.room.ktx)
160157

161-
// Glide
162-
implementation(libs.glide)
163-
implementation(libs.glide.avif)
164-
implementation(libs.glide.compose)
165-
implementation(libs.jxl.coder.glide)
166-
ksp(libs.glide.compiler)
167-
168-
// SVG Support for Glide
169-
implementation(libs.glide.svg)
170-
171158
// Coil
172159
implementation(libs.coil.compose)
173160
implementation(libs.coil.svg)
@@ -204,11 +191,9 @@ dependencies {
204191
// Tests
205192
testImplementation(libs.junit)
206193
androidTestImplementation(libs.androidx.test.ext.junit)
207-
androidTestImplementation(libs.espresso.core)
208194
androidTestImplementation(platform(libs.compose.bom))
209-
androidTestImplementation(libs.compose.ui.test.junit4)
210195
debugImplementation(libs.compose.ui.tooling)
211-
debugImplementation(libs.compose.ui.test.manifest)
196+
debugRuntimeOnly(libs.compose.ui.test.manifest)
212197
}
213198

214199
fun getApiKey(): String {

app/src/main/kotlin/com/dot/gallery/feature_node/presentation/albums/components/PinnedAlbumsCarousel.kt

+2-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import androidx.core.view.updateLayoutParams
2626
import androidx.recyclerview.widget.DiffUtil
2727
import androidx.recyclerview.widget.ListAdapter
2828
import androidx.recyclerview.widget.RecyclerView
29-
import com.bumptech.glide.Glide
29+
import coil.load
3030
import com.dot.gallery.R
3131
import com.dot.gallery.feature_node.domain.model.Album
3232
import com.google.android.material.carousel.CarouselLayoutManager
@@ -97,10 +97,7 @@ private class PinnedAlbumsAdapter(
9797
GradientDrawable.Orientation.BOTTOM_TOP,
9898
intArrayOf(containerColor, Color.TRANSPARENT)
9999
)
100-
Glide
101-
.with(albumImage.context)
102-
.load(album.pathToThumbnail)
103-
.into(albumImage)
100+
albumImage.load(album.uri)
104101
albumImage.isClickable = true
105102
albumImage.setOnClickListener {
106103
onAlbumClick.invoke(album)

app/src/main/kotlin/com/dot/gallery/feature_node/presentation/search/components/HistoryItem.kt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.dot.gallery.feature_node.presentation.search.components
22

3-
import androidx.compose.foundation.ExperimentalFoundationApi
43
import androidx.compose.foundation.clickable
54
import androidx.compose.foundation.layout.Row
65
import androidx.compose.material.icons.Icons

app/src/main/kotlin/com/dot/gallery/feature_node/presentation/util/newImageLoader.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ fun newImageLoader(
1717
return ImageLoader.Builder(context)
1818
.components {
1919
// SVGs
20-
add(SvgDecoder.Factory())
20+
add(SvgDecoder.Factory(false))
2121
// Temporarily disabled
2222
add(JxlDecoder.Factory())
2323
addPlatformComponents()
2424
}
2525
.memoryCache {
2626
MemoryCache.Builder()
2727
// Set the max size to 25% of the app's available memory.
28-
.maxSizePercent(context, percent = 0.25)
28+
.maxSizePercent(context, percent = 0.5)
2929
.build()
3030
}
3131
.diskCache {

app/src/main/kotlin/com/dot/gallery/injection/GalleryGlideModule.kt

-27
This file was deleted.

gradle/libs.versions.toml

+5-21
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ agp = "8.2.2"
33
benchmarkMacroJunit4 = "1.2.3"
44
composeCompiler = "1.5.8"
55
appcompat = "1.6.1"
6-
coilVersion = "3.0.0-alpha04"
6+
coilVersion = "3.0.0-alpha06"
77
fuzzywuzzy = "1.4.0"
8-
glideCompose = "1.0.0-beta01"
98
exifinterface = "1.3.7"
10-
glideSvg = "4.0.2"
11-
glideVersion = "4.16.0"
129
gpuimage = "2.1.0"
1310
jxlCoder = "1.8.8"
1411
kotlin = "1.9.22"
@@ -20,7 +17,7 @@ androidx-test-ext-junit = "1.1.5"
2017
espresso-core = "3.5.1"
2118
lifecycle-runtime = "2.7.0"
2219
activity-compose = "1.8.2"
23-
compose-bom = "2024.02.00"
20+
compose-bom = "2024.02.01"
2421
hilt = "2.50"
2522
material = "1.11.0"
2623
material3 = "1.2.0"
@@ -32,8 +29,7 @@ profileinstaller = "1.3.1"
3229
room = "2.6.1"
3330
accompanist = "0.34.0"
3431
datastore ="1.1.0-beta01"
35-
subSamplingImage = "0.8.0"
36-
uiautomator = "2.2.0"
32+
uiautomator = "2.3.0"
3733
zoomable = "1.6.0"
3834
zoomableImageCoil = "0.8.0"
3935

@@ -43,12 +39,10 @@ androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro
4339
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
4440
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
4541
androidx-exifinterface = { module = "androidx.exifinterface:exifinterface", version.ref = "exifinterface" }
46-
androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle-runtime" }
4742
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle-runtime" }
4843
androidx-media3-ui = { module = "androidx.media3:media3-ui", version.ref = "media3Ui" }
4944
androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3Exoplayer" }
5045
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-runtime-ktx" }
51-
androidx-navigation-runtime-ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigation-runtime-ktx" }
5246
androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version.ref = "profileinstaller" }
5347

5448
# Coil
@@ -59,13 +53,6 @@ coil-svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coilVersion" }
5953
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilVersion" }
6054
coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coilVersion" }
6155

62-
# Glide
63-
glide-compiler = { module = "com.github.bumptech.glide:ksp", version.ref = "glideVersion" }
64-
glide-avif = { module = "com.github.bumptech.glide:avif-integration", version.ref = "glideVersion" }
65-
glide-compose = { module = "com.github.bumptech.glide:compose", version.ref = "glideCompose" }
66-
glide = { module = "com.github.bumptech.glide:glide", version.ref = "glideVersion" }
67-
glide-svg = { module = "com.github.qoqa:glide-svg", version.ref = "glideSvg" }
68-
6956
# Compose
7057
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
7158
compose-activity = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }
@@ -76,7 +63,6 @@ compose-material-icons-extended = { module = "androidx.compose.material:material
7663
compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
7764
compose-material3-window-size = { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "material3" }
7865
compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
79-
compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" }
8066
compose-ui-tooling-preview = { group = "androidx.compose.ui", name= "ui-tooling-preview" }
8167
compose-ui = { group = "androidx.compose.ui", name = "ui" }
8268
compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
@@ -91,13 +77,12 @@ compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4
9177
# Dagger
9278
dagger-hilt = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
9379
dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
94-
androidx-hilt-compiler = { group = "androidx.hilt", name = "hilt-compiler", version = "1.1.0" }
95-
androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version = "1.1.0" }
80+
androidx-hilt-compiler = { group = "androidx.hilt", name = "hilt-compiler", version = "1.2.0" }
81+
androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version = "1.2.0" }
9682

9783
# Room
9884
gpuimage = { module = "jp.co.cyberagent.android:gpuimage", version.ref = "gpuimage" }
9985
jxl-coder-coil = { module = "com.github.awxkee:jxl-coder-coil", version.ref = "jxlCoder" }
100-
jxl-coder-glide = { module = "com.github.awxkee:jxl-coder-glide", version.ref = "jxlCoder" }
10186
pinchzoomgrid = { module = "io.github.dokar3:pinchzoomgrid", version.ref = "pinchzoomgrid" }
10287
room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
10388
room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
@@ -112,7 +97,6 @@ accompanist-permissions = { group = "com.google.accompanist", name = "accompanis
11297
accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanist" }
11398

11499
# Zoomable
115-
sub-sampling-image = { module = "me.saket.telephoto:sub-sampling-image", version.ref = "subSamplingImage" }
116100
zoomable = { module = "net.engawapg.lib:zoomable", version.ref = "zoomable" }
117101

118102
# Kotlinx

libs/cropper/build.gradle.kts

-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ android {
4040
}
4141

4242
dependencies {
43-
implementation(libs.androidx.core.ktx)
44-
4543
implementation(platform(libs.compose.bom))
4644
implementation(libs.compose.foundation)
4745
implementation(libs.compose.ui)

libs/gesture/build.gradle.kts

-4
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,8 @@ android {
3838
}
3939

4040
dependencies {
41-
implementation(libs.androidx.core.ktx)
42-
4341
implementation(platform(libs.compose.bom))
4442
implementation(libs.compose.foundation)
4543
implementation(libs.compose.ui)
4644
implementation(libs.compose.runtime)
47-
implementation(libs.compose.material3)
48-
implementation(libs.compose.material.icons.extended)
4945
}

0 commit comments

Comments
 (0)