diff --git a/mobile/android/android-components/components/browser/icons/build.gradle b/mobile/android/android-components/components/browser/icons/build.gradle index e6e97478684f..e8ac5843ada7 100644 --- a/mobile/android/android-components/components/browser/icons/build.gradle +++ b/mobile/android/android-components/components/browser/icons/build.gradle @@ -44,6 +44,7 @@ tasks.register("updateBuiltInExtensionVersion", Copy) { task -> } dependencies { + implementation project(':concept-base') implementation project(':concept-engine') implementation project(':concept-fetch') implementation project(':browser-state') diff --git a/mobile/android/android-components/components/browser/tabstray/build.gradle b/mobile/android/android-components/components/browser/tabstray/build.gradle index b17d10831c08..0e6a58c32109 100644 --- a/mobile/android/android-components/components/browser/tabstray/build.gradle +++ b/mobile/android/android-components/components/browser/tabstray/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation project(':ui-icons') implementation project(':ui-colors') - implementation project(':support-base') + implementation project(':concept-base') implementation project(':support-images') implementation project(':support-ktx') diff --git a/mobile/android/android-components/components/browser/tabstray/src/main/java/mozilla/components/browser/tabstray/TabViewHolder.kt b/mobile/android/android-components/components/browser/tabstray/src/main/java/mozilla/components/browser/tabstray/TabViewHolder.kt index 715e155738ac..bf1f4630beba 100644 --- a/mobile/android/android-components/components/browser/tabstray/src/main/java/mozilla/components/browser/tabstray/TabViewHolder.kt +++ b/mobile/android/android-components/components/browser/tabstray/src/main/java/mozilla/components/browser/tabstray/TabViewHolder.kt @@ -16,8 +16,8 @@ import mozilla.components.browser.tabstray.thumbnail.TabThumbnailView import mozilla.components.concept.tabstray.Tab import mozilla.components.concept.tabstray.TabsTray import mozilla.components.support.base.observer.Observable -import mozilla.components.support.images.ImageLoadRequest -import mozilla.components.support.images.loader.ImageLoader +import mozilla.components.concept.base.images.ImageLoadRequest +import mozilla.components.concept.base.images.ImageLoader import mozilla.components.support.ktx.android.util.dpToPx import mozilla.components.support.ktx.kotlin.tryGetHostFromUrl @@ -99,7 +99,8 @@ class DefaultTabViewHolder( val thumbnailSize = THUMBNAIL_SIZE.dpToPx(thumbnailView.context.resources.displayMetrics) thumbnailLoader.loadIntoView( thumbnailView, - ImageLoadRequest(id = tab.id, size = thumbnailSize)) + ImageLoadRequest(id = tab.id, size = thumbnailSize) + ) } else if (tab.thumbnail != null) { thumbnailView.setImageBitmap(tab.thumbnail) } diff --git a/mobile/android/android-components/components/browser/tabstray/src/main/java/mozilla/components/browser/tabstray/TabsAdapter.kt b/mobile/android/android-components/components/browser/tabstray/src/main/java/mozilla/components/browser/tabstray/TabsAdapter.kt index bb204ad36d88..a2fa486ad35b 100644 --- a/mobile/android/android-components/components/browser/tabstray/src/main/java/mozilla/components/browser/tabstray/TabsAdapter.kt +++ b/mobile/android/android-components/components/browser/tabstray/src/main/java/mozilla/components/browser/tabstray/TabsAdapter.kt @@ -11,7 +11,7 @@ import mozilla.components.concept.tabstray.Tabs import mozilla.components.concept.tabstray.TabsTray import mozilla.components.support.base.observer.Observable import mozilla.components.support.base.observer.ObserverRegistry -import mozilla.components.support.images.loader.ImageLoader +import mozilla.components.concept.base.images.ImageLoader /** * Function responsible for creating a `TabViewHolder` in the `TabsAdapter`. diff --git a/mobile/android/android-components/components/browser/tabstray/src/test/java/mozilla/components/browser/tabstray/DefaultTabViewHolderTest.kt b/mobile/android/android-components/components/browser/tabstray/src/test/java/mozilla/components/browser/tabstray/DefaultTabViewHolderTest.kt index e1ca7e1b10cd..a46cae5a9275 100644 --- a/mobile/android/android-components/components/browser/tabstray/src/test/java/mozilla/components/browser/tabstray/DefaultTabViewHolderTest.kt +++ b/mobile/android/android-components/components/browser/tabstray/src/test/java/mozilla/components/browser/tabstray/DefaultTabViewHolderTest.kt @@ -13,8 +13,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import mozilla.components.concept.tabstray.Tab import mozilla.components.concept.tabstray.TabsTray import mozilla.components.support.base.observer.ObserverRegistry -import mozilla.components.support.images.ImageLoadRequest -import mozilla.components.support.images.loader.ImageLoader +import mozilla.components.concept.base.images.ImageLoadRequest +import mozilla.components.concept.base.images.ImageLoader import mozilla.components.support.test.any import mozilla.components.support.test.eq import mozilla.components.support.test.mock diff --git a/mobile/android/android-components/components/browser/thumbnails/build.gradle b/mobile/android/android-components/components/browser/thumbnails/build.gradle index 18c19f72e739..814cc31fec5d 100644 --- a/mobile/android/android-components/components/browser/thumbnails/build.gradle +++ b/mobile/android/android-components/components/browser/thumbnails/build.gradle @@ -35,8 +35,9 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { dependencies { implementation project(':browser-state') implementation project(':concept-engine') - implementation project(':support-images') + implementation project(':concept-base') implementation project(':support-ktx') + implementation project(':support-images') implementation Dependencies.androidx_annotation implementation Dependencies.androidx_core_ktx diff --git a/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/loader/ThumbnailLoader.kt b/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/loader/ThumbnailLoader.kt index 110f42122059..beca6cadb753 100644 --- a/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/loader/ThumbnailLoader.kt +++ b/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/loader/ThumbnailLoader.kt @@ -15,8 +15,8 @@ import kotlinx.coroutines.launch import mozilla.components.browser.thumbnails.R import mozilla.components.browser.thumbnails.storage.ThumbnailStorage import mozilla.components.support.images.CancelOnDetach -import mozilla.components.support.images.ImageLoadRequest -import mozilla.components.support.images.loader.ImageLoader +import mozilla.components.concept.base.images.ImageLoadRequest +import mozilla.components.concept.base.images.ImageLoader import java.lang.ref.WeakReference /** diff --git a/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/storage/ThumbnailStorage.kt b/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/storage/ThumbnailStorage.kt index 9968eedadae7..97c95f01d26f 100644 --- a/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/storage/ThumbnailStorage.kt +++ b/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/storage/ThumbnailStorage.kt @@ -18,8 +18,8 @@ import mozilla.components.browser.thumbnails.R import mozilla.components.browser.thumbnails.utils.ThumbnailDiskCache import mozilla.components.support.base.log.logger.Logger import mozilla.components.support.images.DesiredSize -import mozilla.components.support.images.ImageLoadRequest -import mozilla.components.support.images.ImageSaveRequest +import mozilla.components.concept.base.images.ImageLoadRequest +import mozilla.components.concept.base.images.ImageSaveRequest import mozilla.components.support.images.decoder.AndroidImageDecoder import java.util.concurrent.Executors diff --git a/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/utils/ThumbnailDiskCache.kt b/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/utils/ThumbnailDiskCache.kt index bb2f12fa5688..a6c25a14969c 100644 --- a/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/utils/ThumbnailDiskCache.kt +++ b/mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/utils/ThumbnailDiskCache.kt @@ -8,8 +8,8 @@ import android.content.Context import android.graphics.Bitmap import com.jakewharton.disklrucache.DiskLruCache import mozilla.components.support.base.log.logger.Logger -import mozilla.components.support.images.ImageLoadRequest -import mozilla.components.support.images.ImageSaveRequest +import mozilla.components.concept.base.images.ImageLoadRequest +import mozilla.components.concept.base.images.ImageSaveRequest import java.io.File import java.io.IOException diff --git a/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/loader/ThumbnailLoaderTest.kt b/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/loader/ThumbnailLoaderTest.kt index 2ef460fc2036..b4150464181c 100644 --- a/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/loader/ThumbnailLoaderTest.kt +++ b/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/loader/ThumbnailLoaderTest.kt @@ -16,7 +16,7 @@ import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.setMain import mozilla.components.browser.thumbnails.R import mozilla.components.browser.thumbnails.storage.ThumbnailStorage -import mozilla.components.support.images.ImageLoadRequest +import mozilla.components.concept.base.images.ImageLoadRequest import mozilla.components.support.test.any import mozilla.components.support.test.eq import mozilla.components.support.test.mock diff --git a/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/storage/ThumbnailStorageTest.kt b/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/storage/ThumbnailStorageTest.kt index ba73325a1586..31145dc1ce66 100644 --- a/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/storage/ThumbnailStorageTest.kt +++ b/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/storage/ThumbnailStorageTest.kt @@ -8,7 +8,7 @@ import android.graphics.Bitmap import androidx.test.ext.junit.runners.AndroidJUnit4 import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.runBlocking -import mozilla.components.support.images.ImageLoadRequest +import mozilla.components.concept.base.images.ImageLoadRequest import mozilla.components.support.test.ext.joinBlocking import mozilla.components.support.test.mock import mozilla.components.support.test.robolectric.testContext diff --git a/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/utils/ThumbnailDiskCacheTest.kt b/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/utils/ThumbnailDiskCacheTest.kt index 9e5ee84da075..e0d2cbeecc69 100644 --- a/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/utils/ThumbnailDiskCacheTest.kt +++ b/mobile/android/android-components/components/browser/thumbnails/src/test/java/mozilla/components/browser/thumbnails/utils/ThumbnailDiskCacheTest.kt @@ -6,7 +6,7 @@ package mozilla.components.browser.thumbnails.utils import android.graphics.Bitmap import androidx.test.ext.junit.runners.AndroidJUnit4 -import mozilla.components.support.images.ImageLoadRequest +import mozilla.components.concept.base.images.ImageLoadRequest import mozilla.components.support.test.any import mozilla.components.support.test.mock import mozilla.components.support.test.robolectric.testContext diff --git a/mobile/android/android-components/components/concept/base/build.gradle b/mobile/android/android-components/components/concept/base/build.gradle index 0dd496c70a41..79b566d0b9e6 100644 --- a/mobile/android/android-components/components/concept/base/build.gradle +++ b/mobile/android/android-components/components/concept/base/build.gradle @@ -27,6 +27,7 @@ android { dependencies { implementation Dependencies.kotlin_stdlib implementation Dependencies.kotlin_coroutines + implementation Dependencies.androidx_annotation testImplementation Dependencies.androidx_test_junit testImplementation Dependencies.testing_robolectric diff --git a/mobile/android/android-components/components/support/images/src/main/java/mozilla/components/support/images/loader/ImageLoader.kt b/mobile/android/android-components/components/concept/base/src/main/java/mozilla/components/concept/base/images/ImageLoader.kt similarity index 90% rename from mobile/android/android-components/components/support/images/src/main/java/mozilla/components/support/images/loader/ImageLoader.kt rename to mobile/android/android-components/components/concept/base/src/main/java/mozilla/components/concept/base/images/ImageLoader.kt index b18de18360fb..65b8e608efd8 100644 --- a/mobile/android/android-components/components/support/images/src/main/java/mozilla/components/support/images/loader/ImageLoader.kt +++ b/mobile/android/android-components/components/concept/base/src/main/java/mozilla/components/concept/base/images/ImageLoader.kt @@ -2,12 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.support.images.loader +package mozilla.components.concept.base.images import android.graphics.drawable.Drawable import android.widget.ImageView import androidx.annotation.MainThread -import mozilla.components.support.images.ImageLoadRequest /** * A loader that can load an image from an ID directly into an [ImageView]. diff --git a/mobile/android/android-components/components/support/images/src/main/java/mozilla/components/support/images/ImageRequest.kt b/mobile/android/android-components/components/concept/base/src/main/java/mozilla/components/concept/base/images/ImageRequest.kt similarity index 92% rename from mobile/android/android-components/components/support/images/src/main/java/mozilla/components/support/images/ImageRequest.kt rename to mobile/android/android-components/components/concept/base/src/main/java/mozilla/components/concept/base/images/ImageRequest.kt index e63fec99fa45..fd4eacb20a92 100644 --- a/mobile/android/android-components/components/support/images/src/main/java/mozilla/components/support/images/ImageRequest.kt +++ b/mobile/android/android-components/components/concept/base/src/main/java/mozilla/components/concept/base/images/ImageRequest.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package mozilla.components.support.images +package mozilla.components.concept.base.images import androidx.annotation.Px diff --git a/mobile/android/android-components/components/support/images/build.gradle b/mobile/android/android-components/components/support/images/build.gradle index d0db64ebf261..770f9aa8e540 100644 --- a/mobile/android/android-components/components/support/images/build.gradle +++ b/mobile/android/android-components/components/support/images/build.gradle @@ -37,7 +37,6 @@ android { dependencies { implementation project(':support-base') - implementation Dependencies.androidx_annotation implementation Dependencies.kotlin_stdlib implementation Dependencies.kotlin_coroutines diff --git a/mobile/android/android-components/docs/changelog.md b/mobile/android/android-components/docs/changelog.md index 8f62f9f85bc8..418027070799 100644 --- a/mobile/android/android-components/docs/changelog.md +++ b/mobile/android/android-components/docs/changelog.md @@ -28,6 +28,9 @@ permalink: /changelog/ * **feature-customtabs** * The drawable for the Action button icon in custom tabs is now scaled to 24dp width an 24dp height. +* **support-images** + * ⚠️ **This is a breaking change**: `ImageLoader` and `ImageRequest` have moved to the `concept-base` component. + # 61.0.0 * [Commits](https://github.com/mozilla-mobile/android-components/compare/v60.0.0...v61.0.0) diff --git a/mobile/android/android-components/samples/browser/build.gradle b/mobile/android/android-components/samples/browser/build.gradle index 3467f496738b..5b02a1da49b5 100644 --- a/mobile/android/android-components/samples/browser/build.gradle +++ b/mobile/android/android-components/samples/browser/build.gradle @@ -72,6 +72,7 @@ dependencies { implementation project(':concept-tabstray') implementation project(':concept-toolbar') implementation project(':concept-storage') + implementation project(':concept-base') implementation project(':browser-awesomebar') implementation project(':browser-engine-system') @@ -123,7 +124,6 @@ dependencies { implementation project(':support-utils') implementation project(':feature-downloads') - implementation project(':support-images') implementation project(':support-ktx') implementation project(':support-webextensions') implementation project(':support-rustlog')