Move GlideImage into the glide module.

app/build.gradle.kts

@@ -513,7 +513,7 @@ dependencies {
   implementation(project(":lib:libsignal-service"))
   implementation(project(":lib:paging"))
   implementation(project(":core:util"))
-  implementation(project(":lib:glide-config"))
+  implementation(project(":lib:glide"))
   implementation(project(":lib:video"))
   implementation(project(":lib:device-transfer"))
   implementation(project(":lib:image-editor"))

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallParticipantViewer.kt

@@ -52,13 +52,13 @@ import androidx.compose.ui.viewinterop.AndroidView
 import org.signal.core.ui.compose.Buttons
 import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
+import org.signal.glide.compose.GlideImage
+import org.signal.glide.compose.GlideImageScaleType
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.AvatarImage
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView
 import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImageLarge
 import org.thoughtcrime.securesms.components.webrtc.TextureViewRenderer
-import org.thoughtcrime.securesms.compose.GlideImage
-import org.thoughtcrime.securesms.compose.GlideImageScaleType
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto
 import org.thoughtcrime.securesms.events.CallParticipant
 import org.thoughtcrime.securesms.recipients.Recipient

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/IncomingCallScreen.kt

@@ -37,9 +37,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.signal.core.ui.compose.NightPreview
 import org.signal.core.ui.compose.Previews
+import org.signal.glide.compose.GlideImage
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.AvatarImage
-import org.thoughtcrime.securesms.compose.GlideImage
 import org.thoughtcrime.securesms.recipients.Recipient
 
 private val textShadow = Shadow(

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/PinnedMessagesComponent.kt

@@ -48,9 +48,9 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.view.doOnPreDraw
 import org.signal.core.ui.compose.DropdownMenus
 import org.signal.core.ui.compose.theme.SignalTheme
+import org.signal.glide.compose.GlideImage
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView
-import org.thoughtcrime.securesms.compose.GlideImage
 import org.thoughtcrime.securesms.conversation.ConversationMessage
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.fonts.SignalSymbols

app/src/main/java/org/thoughtcrime/securesms/glide/cache/ByteBufferApngDecoder.java

@@ -7,6 +7,7 @@ import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.engine.Resource;
 
+import org.signal.glide.apng.ApngOptions;
 import org.signal.glide.common.io.ByteBufferReader;
 import org.signal.glide.common.loader.ByteBufferLoader;
 import org.signal.glide.common.loader.Loader;

app/src/main/java/org/thoughtcrime/securesms/glide/cache/StreamApngDecoder.java

@@ -8,6 +8,7 @@ import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.engine.Resource;
 
 import org.signal.core.util.StreamUtil;
+import org.signal.glide.apng.ApngOptions;
 import org.signal.glide.common.io.StreamReader;
 import org.signal.glide.load.resource.apng.decode.APNGDecoder;
 import org.signal.glide.load.resource.apng.decode.APNGParser;

app/src/main/java/org/thoughtcrime/securesms/glide/cache/StreamFactoryApngDecoder.kt

@@ -12,6 +12,7 @@ import com.bumptech.glide.load.Options
 import com.bumptech.glide.load.ResourceDecoder
 import com.bumptech.glide.load.engine.Resource
 import org.signal.core.util.StreamUtil
+import org.signal.glide.apng.ApngOptions
 import org.signal.glide.common.io.InputStreamFactory
 import org.signal.glide.load.ImageHeaderParserUtils
 import org.signal.glide.load.resource.apng.decode.APNGDecoder

app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/KeyboardStickerListAdapter.kt

@@ -6,9 +6,9 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
+import org.signal.glide.apng.ApngOptions
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.database.model.StickerRecord
-import org.thoughtcrime.securesms.glide.cache.ApngOptions
 import org.thoughtcrime.securesms.mms.DecryptableUri
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter

app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/KeyboardStickerPackListAdapter.kt

@@ -5,8 +5,8 @@ import android.view.View
 import android.widget.ImageView
 import androidx.core.widget.ImageViewCompat
 import com.bumptech.glide.RequestManager
+import org.signal.glide.apng.ApngOptions
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.glide.cache.ApngOptions
 import org.thoughtcrime.securesms.mms.DecryptableUri
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter

app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerPackListItems.kt

@@ -36,11 +36,11 @@ import org.signal.core.ui.compose.DropdownMenus
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.signal.core.util.nullIfBlank
+import org.signal.glide.compose.GlideImage
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.compose.RoundCheckbox
 import org.thoughtcrime.securesms.components.transfercontrols.TransferProgressIndicator
 import org.thoughtcrime.securesms.components.transfercontrols.TransferProgressState
-import org.thoughtcrime.securesms.compose.GlideImage
 import org.thoughtcrime.securesms.mms.DecryptableUri
 import org.thoughtcrime.securesms.stickers.StickerPreviewDataFactory
 import org.thoughtcrime.securesms.stickers.manage.AvailableStickerPack.DownloadStatus

app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivity.java

@@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragment;
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs;
-import org.thoughtcrime.securesms.glide.cache.ApngOptions;
+import org.signal.glide.apng.ApngOptions;
 import org.thoughtcrime.securesms.mms.DecryptableUri;
 import org.thoughtcrime.securesms.sharing.MultiShareArgs;
 import org.thoughtcrime.securesms.stickers.StickerManifest;

app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivityV2.kt

@@ -54,9 +54,9 @@ import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.util.orNull
 import org.signal.core.util.toOptional
+import org.signal.glide.compose.GlideImage
 import org.thoughtcrime.securesms.PassphraseRequiredActivity
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.compose.GlideImage
 import org.thoughtcrime.securesms.compose.SignalTheme
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragment
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs

app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewAdapter.java

@@ -13,7 +13,7 @@ import com.bumptech.glide.RequestManager;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.glide.cache.ApngOptions;
+import org.signal.glide.apng.ApngOptions;
 import org.thoughtcrime.securesms.mms.DecryptableUri;
 import org.thoughtcrime.securesms.stickers.StickerManifest;
 import org.thoughtcrime.securesms.stickers.StickerRemoteUri;

lib/glide-config/build.gradle.kts

@@ -1,13 +0,0 @@
-plugins {
-  id("signal-library")
-  id("com.google.devtools.ksp")
-}
-
-android {
-  namespace = "org.signal.glide"
-}
-
-dependencies {
-  implementation(libs.glide.glide)
-  ksp(libs.glide.ksp)
-}

lib/glide/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+  id("signal-library")
+  id("com.google.devtools.ksp")
+  alias(libs.plugins.compose.compiler)
+}
+
+android {
+  namespace = "org.signal.glide"
+
+  buildFeatures {
+    compose = true
+  }
+}
+
+dependencies {
+  implementation(project(":core:util"))
+
+  implementation(libs.glide.glide)
+  ksp(libs.glide.ksp)
+
+  implementation(platform(libs.androidx.compose.bom))
+  implementation(libs.androidx.compose.material3)
+  implementation(libs.accompanist.drawablepainter)
+}

lib/glide/src/main/java/org/signal/glide/apng/ApngOptions.java

@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.glide.cache;
+package org.signal.glide.apng;
 
 import com.bumptech.glide.load.Option;
 

lib/glide/src/main/java/org/signal/glide/compose/GlideImage.kt

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.compose
+package org.signal.glide.compose
 
 import android.graphics.drawable.Drawable
 import android.widget.ImageView
@@ -27,7 +27,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
 import com.google.accompanist.drawablepainter.rememberDrawablePainter
-import org.thoughtcrime.securesms.glide.cache.ApngOptions
+import org.signal.glide.apng.ApngOptions
 
 /**
  * Our very own GlideImage. The GlideImage composable provided by the bumptech library is not suitable because it was is using our encrypted cache decoder/encoder.

settings.gradle.kts

@@ -73,7 +73,7 @@ include(":core:ui")
 
 // Lib modules
 include(":lib:libsignal-service")
-include(":lib:glide-config")
+include(":lib:glide")
 include(":lib:photoview")
 include(":lib:sticky-header-grid")
 include(":lib:billing")