From 003c54dcdff442fe5c8f9f87697ea49a222b5fbf Mon Sep 17 00:00:00 2001 From: Naveen Singh Date: Sat, 3 Oct 2026 18:22:03 +0530 Subject: [PATCH] fix: remove glide compose lib --- commons/build.gradle.kts | 2 - .../commons/dialogs/WritePermissionDialog.kt | 43 +++++++------------ gradle/libs.versions.toml | 2 - 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/commons/build.gradle.kts b/commons/build.gradle.kts index 04cbb3268..f0a41342e 100644 --- a/commons/build.gradle.kts +++ b/commons/build.gradle.kts @@ -64,7 +64,6 @@ android { "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api", "-opt-in=androidx.compose.material.ExperimentalMaterialApi", "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi", - "-opt-in=com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi", "-Xcontext-receivers" ) ) @@ -124,7 +123,6 @@ dependencies { api(libs.material) api(libs.gson) - implementation(libs.glide.compose) api(libs.glide) ksp(libs.glide.compiler) diff --git a/commons/src/main/kotlin/org/fossify/commons/dialogs/WritePermissionDialog.kt b/commons/src/main/kotlin/org/fossify/commons/dialogs/WritePermissionDialog.kt index 5c37daf7a..e0dadcce4 100644 --- a/commons/src/main/kotlin/org/fossify/commons/dialogs/WritePermissionDialog.kt +++ b/commons/src/main/kotlin/org/fossify/commons/dialogs/WritePermissionDialog.kt @@ -6,6 +6,7 @@ import android.text.Spanned import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.appcompat.app.AlertDialog +import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.rememberScrollState @@ -18,8 +19,10 @@ import androidx.compose.runtime.Immutable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.PreviewParameter @@ -28,9 +31,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.window.DialogProperties import com.bumptech.glide.Glide -import com.bumptech.glide.integration.compose.GlideImage import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions -import com.bumptech.glide.request.transition.DrawableCrossFadeFactory import org.fossify.commons.R import org.fossify.commons.activities.BaseSimpleActivity import org.fossify.commons.compose.alert_dialog.AlertDialogState @@ -151,10 +152,6 @@ fun WritePermissionAlertDialog( dialogTitle = R.string.confirm_storage_access_title ) } - val crossFadeTransition = remember { - DrawableTransitionOptions().crossFade(DrawableCrossFadeFactory.Builder(350).setCrossFadeEnabled(true).build()) - } - AlertDialog( onDismissRequest = alertDialogState::hide andThen onCancelCallback, modifier = modifier @@ -180,18 +177,16 @@ fun WritePermissionAlertDialog( when (writePermissionDialogMode) { WritePermissionDialog.WritePermissionDialogMode.CreateDocumentSDK30 -> CreateDocumentSDK30( - crossFadeTransition = crossFadeTransition, onImageClick = alertDialogState::hide andThen callback ) is WritePermissionDialog.WritePermissionDialogMode.OpenDocumentTreeSDK30 -> OpenDocumentTreeSDK30( - crossFadeTransition = crossFadeTransition, onImageClick = alertDialogState::hide andThen callback, path = writePermissionDialogMode.path ) - WritePermissionDialog.WritePermissionDialogMode.Otg -> OTG(crossFadeTransition) - WritePermissionDialog.WritePermissionDialogMode.SdCard -> SDCard(crossFadeTransition) + WritePermissionDialog.WritePermissionDialogMode.Otg -> OTG() + WritePermissionDialog.WritePermissionDialogMode.SdCard -> SDCard() } Spacer(Modifier.padding(vertical = SimpleTheme.dimens.padding.extraLarge)) } @@ -214,59 +209,53 @@ fun WritePermissionAlertDialog( } @Composable -private fun CreateDocumentSDK30(crossFadeTransition: DrawableTransitionOptions, onImageClick: () -> Unit) { +private fun CreateDocumentSDK30(onImageClick: () -> Unit) { WritePermissionText(stringResource(R.string.confirm_create_doc_for_new_folder_text).fromHtml()) WritePermissionImage( - crossFadeTransition = crossFadeTransition, drawable = R.drawable.img_write_storage_create_doc_sdk_30, modifier = Modifier.clickable(onClick = onImageClick) ) } @Composable -private fun OpenDocumentTreeSDK30(crossFadeTransition: DrawableTransitionOptions, onImageClick: () -> Unit, path: String) { +private fun OpenDocumentTreeSDK30(onImageClick: () -> Unit, path: String) { val context = LocalContext.current val view = LocalView.current val humanizedPath = remember { if (!view.isInEditMode) context.humanizePath(path) else "" } WritePermissionText(stringResource(R.string.confirm_storage_access_android_text_specific, humanizedPath).fromHtml()) WritePermissionImage( - crossFadeTransition = crossFadeTransition, drawable = R.drawable.img_write_storage_sdk_30, modifier = Modifier.clickable(onClick = onImageClick) ) } @Composable -private fun SDCard(crossFadeTransition: DrawableTransitionOptions) { +private fun SDCard() { WritePermissionText(R.string.confirm_storage_access_text) - WritePermissionImage(crossFadeTransition = crossFadeTransition, drawable = R.drawable.img_write_storage) + WritePermissionImage(drawable = R.drawable.img_write_storage) WritePermissionText(R.string.confirm_storage_access_text_sd) - WritePermissionImage(crossFadeTransition = crossFadeTransition, drawable = R.drawable.img_write_storage_sd) + WritePermissionImage(drawable = R.drawable.img_write_storage_sd) } @Composable -private fun OTG( - crossFadeTransition: DrawableTransitionOptions -) { +private fun OTG() { WritePermissionText(R.string.confirm_usb_storage_access_text) - WritePermissionImage(crossFadeTransition = crossFadeTransition, drawable = R.drawable.img_write_storage_otg) + WritePermissionImage(drawable = R.drawable.img_write_storage_otg) } @Composable private fun WritePermissionImage( modifier: Modifier = Modifier, - crossFadeTransition: DrawableTransitionOptions, @DrawableRes drawable: Int ) { - GlideImage( + Image( modifier = modifier .padding(horizontal = SimpleTheme.dimens.padding.extraLarge.plus(SimpleTheme.dimens.padding.large)), - model = drawable, + painter = painterResource(id = drawable), contentDescription = null, - ) { requestBuilder -> - requestBuilder.transition(crossFadeTransition) - } + contentScale = ContentScale.Fit, + ) } @Composable diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d19740490..51bf9147b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -35,7 +35,6 @@ compose = "1.7.6" composeMaterial3 = "1.4.0" #Glide glide = "5.0.7" -glideCompose = "4.14.0" #Room room = "2.8.4" #ezVcard @@ -88,7 +87,6 @@ compose-view-binding = { module = "androidx.compose.ui:ui-viewbinding", version. compose-detekt = { module = "io.nlopez.compose.rules:detekt", version.ref = "detektCompose" } #Glide glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" } -glide-compose = { module = "com.github.bumptech.glide:compose", version.ref = "glideCompose" } glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" } #Material material = { module = "com.google.android.material:material", version.ref = "material" }