diff --git a/androidx-palette/api/android/androidx-palette.api b/androidx-palette/api/android/androidx-palette.api index f67adf2..071cde1 100644 --- a/androidx-palette/api/android/androidx-palette.api +++ b/androidx-palette/api/android/androidx-palette.api @@ -1,56 +1,56 @@ -public final class androidx/palette/graphics/Palette { +public final class com/kmpalette/palette/graphics/Palette { public static final field $stable I - public static final field Companion Landroidx/palette/graphics/Palette$Companion; + public static final field Companion Lcom/kmpalette/palette/graphics/Palette$Companion; public static final field DEFAULT_CALCULATE_NUMBER_COLORS I public static final field DEFAULT_RESIZE_BITMAP_AREA I public static final field MIN_CONTRAST_BODY_TEXT F public static final field MIN_CONTRAST_TITLE_TEXT F public final fun generate ()V - public final fun getColorForTarget (Landroidx/palette/graphics/Target;I)I + public final fun getColorForTarget (Lcom/kmpalette/palette/graphics/Target;I)I public final fun getDarkMutedColor (I)I - public final fun getDarkMutedSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getDarkMutedSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getDarkVibrantColor (I)I - public final fun getDarkVibrantSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getDarkVibrantSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getDominantColor (I)I - public final fun getDominantSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getDominantSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getLightMutedColor (I)I - public final fun getLightMutedSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getLightMutedSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getLightVibrantColor (I)I - public final fun getLightVibrantSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getLightVibrantSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getMutedColor (I)I - public final fun getMutedSwatch ()Landroidx/palette/graphics/Palette$Swatch; - public final fun getSwatchForTarget (Landroidx/palette/graphics/Target;)Landroidx/palette/graphics/Palette$Swatch; + public final fun getMutedSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; + public final fun getSwatchForTarget (Lcom/kmpalette/palette/graphics/Target;)Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getSwatches ()Ljava/util/List; public final fun getVibrantColor (I)I - public final fun getVibrantSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getVibrantSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; } -public final class androidx/palette/graphics/Palette$Builder { +public final class com/kmpalette/palette/graphics/Palette$Builder { public static final field $stable I public fun (Landroidx/compose/ui/graphics/ImageBitmap;)V public fun (Ljava/util/List;)V - public final fun addFilter (Landroidx/palette/graphics/Palette$Filter;)Landroidx/palette/graphics/Palette$Builder; - public final fun addTarget (Landroidx/palette/graphics/Target;)Landroidx/palette/graphics/Palette$Builder; - public final fun clearFilters ()Landroidx/palette/graphics/Palette$Builder; - public final fun clearRegion ()Landroidx/palette/graphics/Palette$Builder; - public final fun clearTargets ()Landroidx/palette/graphics/Palette$Builder; - public final fun generate ()Landroidx/palette/graphics/Palette; - public final fun maximumColorCount (I)Landroidx/palette/graphics/Palette$Builder; - public final fun resizeBitmapArea (I)Landroidx/palette/graphics/Palette$Builder; - public final fun setRegion (IIII)Landroidx/palette/graphics/Palette$Builder; + public final fun addFilter (Lcom/kmpalette/palette/graphics/Palette$Filter;)Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun addTarget (Lcom/kmpalette/palette/graphics/Target;)Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun clearFilters ()Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun clearRegion ()Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun clearTargets ()Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun generate ()Lcom/kmpalette/palette/graphics/Palette; + public final fun maximumColorCount (I)Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun resizeBitmapArea (I)Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun setRegion (IIII)Lcom/kmpalette/palette/graphics/Palette$Builder; } -public final class androidx/palette/graphics/Palette$Companion { - public final fun from (Landroidx/compose/ui/graphics/ImageBitmap;)Landroidx/palette/graphics/Palette$Builder; - public final fun from (Ljava/util/List;)Landroidx/palette/graphics/Palette; - public final fun getDEFAULT_FILTER ()Landroidx/palette/graphics/Palette$Filter; +public final class com/kmpalette/palette/graphics/Palette$Companion { + public final fun from (Landroidx/compose/ui/graphics/ImageBitmap;)Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun from (Ljava/util/List;)Lcom/kmpalette/palette/graphics/Palette; + public final fun getDEFAULT_FILTER ()Lcom/kmpalette/palette/graphics/Palette$Filter; } -public abstract interface class androidx/palette/graphics/Palette$Filter { +public abstract interface class com/kmpalette/palette/graphics/Palette$Filter { public abstract fun isAllowed (I[F)Z } -public final class androidx/palette/graphics/Palette$Swatch { +public final class com/kmpalette/palette/graphics/Palette$Swatch { public static final field $stable I public fun (II)V public fun equals (Ljava/lang/Object;)Z @@ -63,9 +63,9 @@ public final class androidx/palette/graphics/Palette$Swatch { public fun toString ()Ljava/lang/String; } -public final class androidx/palette/graphics/Target { +public final class com/kmpalette/palette/graphics/Target { public static final field $stable I - public static final field Companion Landroidx/palette/graphics/Target$Companion; + public static final field Companion Lcom/kmpalette/palette/graphics/Target$Companion; public final fun getLightnessTargets ()[F public final fun getLightnessWeight ()F public final fun getMaximumLightness ()F @@ -83,30 +83,30 @@ public final class androidx/palette/graphics/Target { public final fun setExclusive (Z)V } -public final class androidx/palette/graphics/Target$Builder { +public final class com/kmpalette/palette/graphics/Target$Builder { public static final field $stable I public fun ()V - public fun (Landroidx/palette/graphics/Target;)V - public synthetic fun (Landroidx/palette/graphics/Target;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun build ()Landroidx/palette/graphics/Target; - public final fun setExclusive (Z)Landroidx/palette/graphics/Target$Builder; - public final fun setLightnessWeight (F)Landroidx/palette/graphics/Target$Builder; - public final fun setMaximumLightness (F)Landroidx/palette/graphics/Target$Builder; - public final fun setMaximumSaturation (F)Landroidx/palette/graphics/Target$Builder; - public final fun setMinimumLightness (F)Landroidx/palette/graphics/Target$Builder; - public final fun setMinimumSaturation (F)Landroidx/palette/graphics/Target$Builder; - public final fun setPopulationWeight (F)Landroidx/palette/graphics/Target$Builder; - public final fun setSaturationWeight (F)Landroidx/palette/graphics/Target$Builder; - public final fun setTargetLightness (F)Landroidx/palette/graphics/Target$Builder; - public final fun setTargetSaturation (F)Landroidx/palette/graphics/Target$Builder; + public fun (Lcom/kmpalette/palette/graphics/Target;)V + public synthetic fun (Lcom/kmpalette/palette/graphics/Target;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun build ()Lcom/kmpalette/palette/graphics/Target; + public final fun setExclusive (Z)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setLightnessWeight (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setMaximumLightness (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setMaximumSaturation (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setMinimumLightness (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setMinimumSaturation (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setPopulationWeight (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setSaturationWeight (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setTargetLightness (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setTargetSaturation (F)Lcom/kmpalette/palette/graphics/Target$Builder; } -public final class androidx/palette/graphics/Target$Companion { - public final fun getDARK_MUTED ()Landroidx/palette/graphics/Target; - public final fun getDARK_VIBRANT ()Landroidx/palette/graphics/Target; - public final fun getLIGHT_MUTED ()Landroidx/palette/graphics/Target; - public final fun getLIGHT_VIBRANT ()Landroidx/palette/graphics/Target; - public final fun getMUTED ()Landroidx/palette/graphics/Target; - public final fun getVIBRANT ()Landroidx/palette/graphics/Target; +public final class com/kmpalette/palette/graphics/Target$Companion { + public final fun getDARK_MUTED ()Lcom/kmpalette/palette/graphics/Target; + public final fun getDARK_VIBRANT ()Lcom/kmpalette/palette/graphics/Target; + public final fun getLIGHT_MUTED ()Lcom/kmpalette/palette/graphics/Target; + public final fun getLIGHT_VIBRANT ()Lcom/kmpalette/palette/graphics/Target; + public final fun getMUTED ()Lcom/kmpalette/palette/graphics/Target; + public final fun getVIBRANT ()Lcom/kmpalette/palette/graphics/Target; } diff --git a/androidx-palette/api/jvm/androidx-palette.api b/androidx-palette/api/jvm/androidx-palette.api index f67adf2..071cde1 100644 --- a/androidx-palette/api/jvm/androidx-palette.api +++ b/androidx-palette/api/jvm/androidx-palette.api @@ -1,56 +1,56 @@ -public final class androidx/palette/graphics/Palette { +public final class com/kmpalette/palette/graphics/Palette { public static final field $stable I - public static final field Companion Landroidx/palette/graphics/Palette$Companion; + public static final field Companion Lcom/kmpalette/palette/graphics/Palette$Companion; public static final field DEFAULT_CALCULATE_NUMBER_COLORS I public static final field DEFAULT_RESIZE_BITMAP_AREA I public static final field MIN_CONTRAST_BODY_TEXT F public static final field MIN_CONTRAST_TITLE_TEXT F public final fun generate ()V - public final fun getColorForTarget (Landroidx/palette/graphics/Target;I)I + public final fun getColorForTarget (Lcom/kmpalette/palette/graphics/Target;I)I public final fun getDarkMutedColor (I)I - public final fun getDarkMutedSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getDarkMutedSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getDarkVibrantColor (I)I - public final fun getDarkVibrantSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getDarkVibrantSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getDominantColor (I)I - public final fun getDominantSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getDominantSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getLightMutedColor (I)I - public final fun getLightMutedSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getLightMutedSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getLightVibrantColor (I)I - public final fun getLightVibrantSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getLightVibrantSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getMutedColor (I)I - public final fun getMutedSwatch ()Landroidx/palette/graphics/Palette$Swatch; - public final fun getSwatchForTarget (Landroidx/palette/graphics/Target;)Landroidx/palette/graphics/Palette$Swatch; + public final fun getMutedSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; + public final fun getSwatchForTarget (Lcom/kmpalette/palette/graphics/Target;)Lcom/kmpalette/palette/graphics/Palette$Swatch; public final fun getSwatches ()Ljava/util/List; public final fun getVibrantColor (I)I - public final fun getVibrantSwatch ()Landroidx/palette/graphics/Palette$Swatch; + public final fun getVibrantSwatch ()Lcom/kmpalette/palette/graphics/Palette$Swatch; } -public final class androidx/palette/graphics/Palette$Builder { +public final class com/kmpalette/palette/graphics/Palette$Builder { public static final field $stable I public fun (Landroidx/compose/ui/graphics/ImageBitmap;)V public fun (Ljava/util/List;)V - public final fun addFilter (Landroidx/palette/graphics/Palette$Filter;)Landroidx/palette/graphics/Palette$Builder; - public final fun addTarget (Landroidx/palette/graphics/Target;)Landroidx/palette/graphics/Palette$Builder; - public final fun clearFilters ()Landroidx/palette/graphics/Palette$Builder; - public final fun clearRegion ()Landroidx/palette/graphics/Palette$Builder; - public final fun clearTargets ()Landroidx/palette/graphics/Palette$Builder; - public final fun generate ()Landroidx/palette/graphics/Palette; - public final fun maximumColorCount (I)Landroidx/palette/graphics/Palette$Builder; - public final fun resizeBitmapArea (I)Landroidx/palette/graphics/Palette$Builder; - public final fun setRegion (IIII)Landroidx/palette/graphics/Palette$Builder; + public final fun addFilter (Lcom/kmpalette/palette/graphics/Palette$Filter;)Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun addTarget (Lcom/kmpalette/palette/graphics/Target;)Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun clearFilters ()Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun clearRegion ()Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun clearTargets ()Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun generate ()Lcom/kmpalette/palette/graphics/Palette; + public final fun maximumColorCount (I)Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun resizeBitmapArea (I)Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun setRegion (IIII)Lcom/kmpalette/palette/graphics/Palette$Builder; } -public final class androidx/palette/graphics/Palette$Companion { - public final fun from (Landroidx/compose/ui/graphics/ImageBitmap;)Landroidx/palette/graphics/Palette$Builder; - public final fun from (Ljava/util/List;)Landroidx/palette/graphics/Palette; - public final fun getDEFAULT_FILTER ()Landroidx/palette/graphics/Palette$Filter; +public final class com/kmpalette/palette/graphics/Palette$Companion { + public final fun from (Landroidx/compose/ui/graphics/ImageBitmap;)Lcom/kmpalette/palette/graphics/Palette$Builder; + public final fun from (Ljava/util/List;)Lcom/kmpalette/palette/graphics/Palette; + public final fun getDEFAULT_FILTER ()Lcom/kmpalette/palette/graphics/Palette$Filter; } -public abstract interface class androidx/palette/graphics/Palette$Filter { +public abstract interface class com/kmpalette/palette/graphics/Palette$Filter { public abstract fun isAllowed (I[F)Z } -public final class androidx/palette/graphics/Palette$Swatch { +public final class com/kmpalette/palette/graphics/Palette$Swatch { public static final field $stable I public fun (II)V public fun equals (Ljava/lang/Object;)Z @@ -63,9 +63,9 @@ public final class androidx/palette/graphics/Palette$Swatch { public fun toString ()Ljava/lang/String; } -public final class androidx/palette/graphics/Target { +public final class com/kmpalette/palette/graphics/Target { public static final field $stable I - public static final field Companion Landroidx/palette/graphics/Target$Companion; + public static final field Companion Lcom/kmpalette/palette/graphics/Target$Companion; public final fun getLightnessTargets ()[F public final fun getLightnessWeight ()F public final fun getMaximumLightness ()F @@ -83,30 +83,30 @@ public final class androidx/palette/graphics/Target { public final fun setExclusive (Z)V } -public final class androidx/palette/graphics/Target$Builder { +public final class com/kmpalette/palette/graphics/Target$Builder { public static final field $stable I public fun ()V - public fun (Landroidx/palette/graphics/Target;)V - public synthetic fun (Landroidx/palette/graphics/Target;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun build ()Landroidx/palette/graphics/Target; - public final fun setExclusive (Z)Landroidx/palette/graphics/Target$Builder; - public final fun setLightnessWeight (F)Landroidx/palette/graphics/Target$Builder; - public final fun setMaximumLightness (F)Landroidx/palette/graphics/Target$Builder; - public final fun setMaximumSaturation (F)Landroidx/palette/graphics/Target$Builder; - public final fun setMinimumLightness (F)Landroidx/palette/graphics/Target$Builder; - public final fun setMinimumSaturation (F)Landroidx/palette/graphics/Target$Builder; - public final fun setPopulationWeight (F)Landroidx/palette/graphics/Target$Builder; - public final fun setSaturationWeight (F)Landroidx/palette/graphics/Target$Builder; - public final fun setTargetLightness (F)Landroidx/palette/graphics/Target$Builder; - public final fun setTargetSaturation (F)Landroidx/palette/graphics/Target$Builder; + public fun (Lcom/kmpalette/palette/graphics/Target;)V + public synthetic fun (Lcom/kmpalette/palette/graphics/Target;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun build ()Lcom/kmpalette/palette/graphics/Target; + public final fun setExclusive (Z)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setLightnessWeight (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setMaximumLightness (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setMaximumSaturation (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setMinimumLightness (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setMinimumSaturation (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setPopulationWeight (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setSaturationWeight (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setTargetLightness (F)Lcom/kmpalette/palette/graphics/Target$Builder; + public final fun setTargetSaturation (F)Lcom/kmpalette/palette/graphics/Target$Builder; } -public final class androidx/palette/graphics/Target$Companion { - public final fun getDARK_MUTED ()Landroidx/palette/graphics/Target; - public final fun getDARK_VIBRANT ()Landroidx/palette/graphics/Target; - public final fun getLIGHT_MUTED ()Landroidx/palette/graphics/Target; - public final fun getLIGHT_VIBRANT ()Landroidx/palette/graphics/Target; - public final fun getMUTED ()Landroidx/palette/graphics/Target; - public final fun getVIBRANT ()Landroidx/palette/graphics/Target; +public final class com/kmpalette/palette/graphics/Target$Companion { + public final fun getDARK_MUTED ()Lcom/kmpalette/palette/graphics/Target; + public final fun getDARK_VIBRANT ()Lcom/kmpalette/palette/graphics/Target; + public final fun getLIGHT_MUTED ()Lcom/kmpalette/palette/graphics/Target; + public final fun getLIGHT_VIBRANT ()Lcom/kmpalette/palette/graphics/Target; + public final fun getMUTED ()Lcom/kmpalette/palette/graphics/Target; + public final fun getVIBRANT ()Lcom/kmpalette/palette/graphics/Target; } diff --git a/androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/BucketTests.kt b/androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/BucketTests.kt similarity index 96% rename from androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/BucketTests.kt rename to androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/BucketTests.kt index 80bfab4..671c341 100644 --- a/androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/BucketTests.kt +++ b/androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/BucketTests.kt @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.palette.graphics +package com.kmpalette.palette.graphics import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint import androidx.compose.ui.graphics.asImageBitmap -import androidx.palette.graphics.TestUtils.assertCloseColors -import androidx.palette.graphics.TestUtils.loadSampleBitmap import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import com.kmpalette.palette.graphics.TestUtils.assertCloseColors +import com.kmpalette.palette.graphics.TestUtils.loadSampleBitmap import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Assert diff --git a/androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/ConsistencyTest.kt b/androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/ConsistencyTest.kt similarity index 98% rename from androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/ConsistencyTest.kt rename to androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/ConsistencyTest.kt index 20469dc..2490f5b 100644 --- a/androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/ConsistencyTest.kt +++ b/androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/ConsistencyTest.kt @@ -15,7 +15,7 @@ */ @file:OptIn(ExperimentalCoroutinesApi::class) -package androidx.palette.graphics +package com.kmpalette.palette.graphics import androidx.compose.ui.graphics.ImageBitmap import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/MaxColorsTest.kt b/androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/MaxColorsTest.kt similarity index 93% rename from androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/MaxColorsTest.kt rename to androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/MaxColorsTest.kt index df46adb..a446af2 100644 --- a/androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/MaxColorsTest.kt +++ b/androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/MaxColorsTest.kt @@ -15,11 +15,11 @@ */ @file:OptIn(ExperimentalCoroutinesApi::class) -package androidx.palette.graphics +package com.kmpalette.palette.graphics -import androidx.palette.graphics.TestUtils.loadSampleBitmap import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import com.kmpalette.palette.graphics.TestUtils.loadSampleBitmap import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Assert diff --git a/androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/SwatchTests.kt b/androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/SwatchTests.kt similarity index 95% rename from androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/SwatchTests.kt rename to androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/SwatchTests.kt index 868dae6..ea3ec40 100644 --- a/androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/SwatchTests.kt +++ b/androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/SwatchTests.kt @@ -16,14 +16,14 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package androidx.palette.graphics +package com.kmpalette.palette.graphics import android.graphics.Color import androidx.core.graphics.ColorUtils -import androidx.palette.graphics.Palette.Swatch -import androidx.palette.graphics.TestUtils.loadSampleBitmap import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import com.kmpalette.palette.graphics.Palette.Swatch +import com.kmpalette.palette.graphics.TestUtils.loadSampleBitmap import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Assert diff --git a/androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/TestUtils.kt b/androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/TestUtils.kt similarity index 96% rename from androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/TestUtils.kt rename to androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/TestUtils.kt index d8d0a9c..e6107e7 100644 --- a/androidx-palette/src/androidInstrumentedTest/kotlin/androidx/palette/graphics/TestUtils.kt +++ b/androidx-palette/src/androidInstrumentedTest/kotlin/com/kmpalette/palette/graphics/TestUtils.kt @@ -1,4 +1,4 @@ -package androidx.palette.graphics +package com.kmpalette.palette.graphics import android.content.Context import android.graphics.BitmapFactory diff --git a/androidx-palette/src/commonMain/kotlin/androidx/palette/graphics/Palette.kt b/androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/graphics/Palette.kt similarity index 99% rename from androidx-palette/src/commonMain/kotlin/androidx/palette/graphics/Palette.kt rename to androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/graphics/Palette.kt index 54a38f7..9a0ba66 100644 --- a/androidx-palette/src/commonMain/kotlin/androidx/palette/graphics/Palette.kt +++ b/androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/graphics/Palette.kt @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.palette.graphics +package com.kmpalette.palette.graphics import androidx.compose.ui.geometry.Rect import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette.Builder +import com.kmpalette.palette.graphics.Palette.Builder import com.kmpalette.palette.internal.ColorCutQuantizer import com.kmpalette.palette.internal.annotation.ColorInt import com.kmpalette.palette.internal.scale diff --git a/androidx-palette/src/commonMain/kotlin/androidx/palette/graphics/Target.kt b/androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/graphics/Target.kt similarity index 99% rename from androidx-palette/src/commonMain/kotlin/androidx/palette/graphics/Target.kt rename to androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/graphics/Target.kt index 77b505d..0ff99b6 100644 --- a/androidx-palette/src/commonMain/kotlin/androidx/palette/graphics/Target.kt +++ b/androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/graphics/Target.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.palette.graphics +package com.kmpalette.palette.graphics /** * A class which allows custom selection of colors in a [Palette]'s generation. Instances diff --git a/androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/internal/ColorCutQuantizer.kt b/androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/internal/ColorCutQuantizer.kt index acdc43f..bad5093 100644 --- a/androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/internal/ColorCutQuantizer.kt +++ b/androidx-palette/src/commonMain/kotlin/com/kmpalette/palette/internal/ColorCutQuantizer.kt @@ -15,7 +15,7 @@ */ package com.kmpalette.palette.internal -import androidx.palette.graphics.Palette +import com.kmpalette.palette.graphics.Palette import com.kmpalette.palette.internal.utils.ColorUtils import com.kmpalette.palette.internal.utils.PriorityQueue import kotlin.math.min diff --git a/demo/composeApp/src/commonMain/kotlin/com/kmpalette/demo/palette/PaletteScreen.kt b/demo/composeApp/src/commonMain/kotlin/com/kmpalette/demo/palette/PaletteScreen.kt index db9c482..627af0e 100644 --- a/demo/composeApp/src/commonMain/kotlin/com/kmpalette/demo/palette/PaletteScreen.kt +++ b/demo/composeApp/src/commonMain/kotlin/com/kmpalette/demo/palette/PaletteScreen.kt @@ -40,7 +40,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.unit.dp -import androidx.palette.graphics.Palette import com.kmpalette.PaletteResult import com.kmpalette.PaletteState import com.kmpalette.demo.SelectedColor @@ -49,6 +48,7 @@ import com.kmpalette.demo.theme.AppTheme import com.kmpalette.demo.util.ColorBox import com.kmpalette.demo.util.colorSchemePairs import com.kmpalette.demo.util.conditional +import com.kmpalette.palette.graphics.Palette import com.materialkolor.PaletteStyle @Composable diff --git a/extensions-base64/src/commonMain/kotlin/com/kmpalette/extensions/base64/Base64DominantColorState.kt b/extensions-base64/src/commonMain/kotlin/com/kmpalette/extensions/base64/Base64DominantColorState.kt index 4713afc..7c6cc60 100644 --- a/extensions-base64/src/commonMain/kotlin/com/kmpalette/extensions/base64/Base64DominantColorState.kt +++ b/extensions-base64/src/commonMain/kotlin/com/kmpalette/extensions/base64/Base64DominantColorState.kt @@ -3,9 +3,9 @@ package com.kmpalette.extensions.base64 import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette import com.kmpalette.DominantColorState import com.kmpalette.loader.Base64Loader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberDominantColorState import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/extensions-base64/src/commonMain/kotlin/com/kmpalette/extensions/base64/Base64PaletteState.kt b/extensions-base64/src/commonMain/kotlin/com/kmpalette/extensions/base64/Base64PaletteState.kt index f016f96..04811f3 100644 --- a/extensions-base64/src/commonMain/kotlin/com/kmpalette/extensions/base64/Base64PaletteState.kt +++ b/extensions-base64/src/commonMain/kotlin/com/kmpalette/extensions/base64/Base64PaletteState.kt @@ -1,9 +1,9 @@ package com.kmpalette.extensions.base64 import androidx.compose.runtime.Composable -import androidx.palette.graphics.Palette import com.kmpalette.PaletteState import com.kmpalette.loader.Base64Loader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberPaletteState import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayDominantColorState.kt b/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayDominantColorState.kt index 670c769..f3be587 100644 --- a/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayDominantColorState.kt +++ b/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayDominantColorState.kt @@ -3,10 +3,10 @@ package com.kmpalette.extensions.bytearray import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette import com.kmpalette.DominantColorState import com.kmpalette.DominantColorState.Companion.DEFAULT_CACHE_SIZE import com.kmpalette.loader.ByteArrayLoader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberDominantColorState import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayPalette.kt b/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayPalette.kt index 980cc36..a8b67e1 100644 --- a/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayPalette.kt +++ b/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayPalette.kt @@ -3,9 +3,9 @@ package com.kmpalette.extensions.bytearray import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette import com.kmpalette.PaletteResult import com.kmpalette.loader.toImageBitmap +import com.kmpalette.palette.graphics.Palette import kotlin.coroutines.CoroutineContext private val loader: (ByteArray) -> suspend () -> ImageBitmap = { { it.toImageBitmap() } } diff --git a/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayPaletteState.kt b/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayPaletteState.kt index 8c7444c..7d1b708 100644 --- a/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayPaletteState.kt +++ b/extensions-bytearray/src/commonMain/kotlin/com/kmpalette/extensions/bytearray/ByteArrayPaletteState.kt @@ -1,10 +1,10 @@ package com.kmpalette.extensions.bytearray import androidx.compose.runtime.Composable -import androidx.palette.graphics.Palette import com.kmpalette.PaletteState import com.kmpalette.PaletteState.Companion.DEFAULT_CACHE_SIZE import com.kmpalette.loader.ByteArrayLoader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberPaletteState import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathDominantColorState.kt b/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathDominantColorState.kt index 3e87c8b..01eb3f1 100644 --- a/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathDominantColorState.kt +++ b/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathDominantColorState.kt @@ -3,10 +3,10 @@ package com.kmpalette.extensions.file import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette import com.kmpalette.DominantColorState import com.kmpalette.loader.FilePathLoader import com.kmpalette.loader.PathLoader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberDominantColorState import kotlinx.coroutines.Dispatchers import okio.Path diff --git a/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathPalette.kt b/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathPalette.kt index 7907883..5eafadc 100644 --- a/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathPalette.kt +++ b/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathPalette.kt @@ -3,9 +3,9 @@ package com.kmpalette.extensions.file import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette import com.kmpalette.PaletteResult import com.kmpalette.loader.toImageBitmap +import com.kmpalette.palette.graphics.Palette import kotlinx.coroutines.Dispatchers import okio.Path import okio.Path.Companion.toPath diff --git a/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathPaletteState.kt b/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathPaletteState.kt index d58e276..78bdd96 100644 --- a/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathPaletteState.kt +++ b/extensions-file/src/commonMain/kotlin/com/kmpalette/extensions/file/FilePathPaletteState.kt @@ -1,10 +1,10 @@ package com.kmpalette.extensions.file import androidx.compose.runtime.Composable -import androidx.palette.graphics.Palette import com.kmpalette.PaletteState import com.kmpalette.loader.FilePathLoader import com.kmpalette.loader.PathLoader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberPaletteState import kotlinx.coroutines.Dispatchers import okio.Path diff --git a/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresDominantColorState.kt b/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresDominantColorState.kt index 08cc349..e3559b8 100644 --- a/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresDominantColorState.kt +++ b/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresDominantColorState.kt @@ -3,9 +3,9 @@ package com.kmpalette.extensions.libres import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette import com.kmpalette.DominantColorState import com.kmpalette.loader.LibresLoader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberDominantColorState import io.github.skeptick.libres.images.Image import kotlinx.coroutines.Dispatchers diff --git a/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresPalette.kt b/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresPalette.kt index f736b76..bb7e27b 100644 --- a/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresPalette.kt +++ b/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresPalette.kt @@ -3,9 +3,9 @@ package com.kmpalette.extensions.libres import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette import com.kmpalette.PaletteResult import com.kmpalette.loader.toImageBitmap +import com.kmpalette.palette.graphics.Palette import io.github.skeptick.libres.images.Image import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresPaletteState.kt b/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresPaletteState.kt index 7dadaa0..6b71240 100644 --- a/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresPaletteState.kt +++ b/extensions-libres/src/commonMain/kotlin/com/kmpalette/extensions/libres/LibresPaletteState.kt @@ -1,9 +1,9 @@ package com.kmpalette.extensions.libres import androidx.compose.runtime.Composable -import androidx.palette.graphics.Palette import com.kmpalette.PaletteState import com.kmpalette.loader.LibresLoader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberPaletteState import io.github.skeptick.libres.images.Image import kotlinx.coroutines.Dispatchers diff --git a/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkDominantColorState.kt b/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkDominantColorState.kt index 9c3c03a..7726295 100644 --- a/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkDominantColorState.kt +++ b/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkDominantColorState.kt @@ -3,9 +3,9 @@ package com.kmpalette.extensions.network import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette import com.kmpalette.DominantColorState import com.kmpalette.loader.NetworkLoader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberDominantColorState import io.ktor.client.HttpClient import io.ktor.client.request.HttpRequestBuilder diff --git a/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkPalette.kt b/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkPalette.kt index 499d5bb..8cdc9d5 100644 --- a/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkPalette.kt +++ b/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkPalette.kt @@ -3,9 +3,9 @@ package com.kmpalette.extensions.network import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette import com.kmpalette.PaletteResult import com.kmpalette.loader.toImageBitmap +import com.kmpalette.palette.graphics.Palette import io.ktor.http.Url import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkPaletteState.kt b/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkPaletteState.kt index cd15234..4b3fc25 100644 --- a/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkPaletteState.kt +++ b/extensions-network/src/commonMain/kotlin/com/kmpalette/extensions/network/NetworkPaletteState.kt @@ -1,9 +1,9 @@ package com.kmpalette.extensions.network import androidx.compose.runtime.Composable -import androidx.palette.graphics.Palette import com.kmpalette.PaletteState import com.kmpalette.loader.NetworkLoader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberPaletteState import io.ktor.client.HttpClient import io.ktor.client.request.HttpRequestBuilder diff --git a/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourceDominantColorState.kt b/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourceDominantColorState.kt index e83ed93..424058d 100644 --- a/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourceDominantColorState.kt +++ b/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourceDominantColorState.kt @@ -3,9 +3,9 @@ package com.kmpalette.extensions.resources import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette import com.kmpalette.DominantColorState import com.kmpalette.loader.ResourceLoader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberDominantColorState import kotlinx.coroutines.Dispatchers import org.jetbrains.compose.resources.ExperimentalResourceApi diff --git a/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourcePalette.kt b/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourcePalette.kt index af2d303..3415513 100644 --- a/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourcePalette.kt +++ b/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourcePalette.kt @@ -3,9 +3,9 @@ package com.kmpalette.extensions.resources import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette import com.kmpalette.PaletteResult import com.kmpalette.loader.toImageBitmap +import com.kmpalette.palette.graphics.Palette import kotlinx.coroutines.Dispatchers import org.jetbrains.compose.resources.ExperimentalResourceApi import org.jetbrains.compose.resources.Resource diff --git a/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourcePaletteState.kt b/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourcePaletteState.kt index adfed70..ec28188 100644 --- a/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourcePaletteState.kt +++ b/extensions-resources/src/commonMain/kotlin/com/kmpalette/extensions.resources/ResourcePaletteState.kt @@ -1,9 +1,9 @@ package com.kmpalette.extensions.resources import androidx.compose.runtime.Composable -import androidx.palette.graphics.Palette import com.kmpalette.PaletteState import com.kmpalette.loader.ResourceLoader +import com.kmpalette.palette.graphics.Palette import com.kmpalette.rememberPaletteState import kotlinx.coroutines.Dispatchers import org.jetbrains.compose.resources.ExperimentalResourceApi diff --git a/kmpalette-core/api/android/kmpalette-core.api b/kmpalette-core/api/android/kmpalette-core.api index 1ecadf8..c395447 100644 --- a/kmpalette-core/api/android/kmpalette-core.api +++ b/kmpalette-core/api/android/kmpalette-core.api @@ -29,11 +29,11 @@ public final class com/kmpalette/PaletteKt { } public abstract interface class com/kmpalette/PaletteResult { - public abstract fun getPaletteOrNull ()Landroidx/palette/graphics/Palette; + public abstract fun getPaletteOrNull ()Lcom/kmpalette/palette/graphics/Palette; } public final class com/kmpalette/PaletteResult$DefaultImpls { - public static fun getPaletteOrNull (Lcom/kmpalette/PaletteResult;)Landroidx/palette/graphics/Palette; + public static fun getPaletteOrNull (Lcom/kmpalette/PaletteResult;)Lcom/kmpalette/palette/graphics/Palette; } public final class com/kmpalette/PaletteResult$Error : com/kmpalette/PaletteResult { @@ -44,7 +44,7 @@ public final class com/kmpalette/PaletteResult$Error : com/kmpalette/PaletteResu public static synthetic fun copy$default (Lcom/kmpalette/PaletteResult$Error;Ljava/lang/Throwable;ILjava/lang/Object;)Lcom/kmpalette/PaletteResult$Error; public fun equals (Ljava/lang/Object;)Z public final fun getCause ()Ljava/lang/Throwable; - public fun getPaletteOrNull ()Landroidx/palette/graphics/Palette; + public fun getPaletteOrNull ()Lcom/kmpalette/palette/graphics/Palette; public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -53,20 +53,20 @@ public final class com/kmpalette/PaletteResult$Loading : com/kmpalette/PaletteRe public static final field $stable I public static final field INSTANCE Lcom/kmpalette/PaletteResult$Loading; public fun equals (Ljava/lang/Object;)Z - public fun getPaletteOrNull ()Landroidx/palette/graphics/Palette; + public fun getPaletteOrNull ()Lcom/kmpalette/palette/graphics/Palette; public fun hashCode ()I public fun toString ()Ljava/lang/String; } public final class com/kmpalette/PaletteResult$Success : com/kmpalette/PaletteResult { public static final field $stable I - public fun (Landroidx/palette/graphics/Palette;)V - public final fun component1 ()Landroidx/palette/graphics/Palette; - public final fun copy (Landroidx/palette/graphics/Palette;)Lcom/kmpalette/PaletteResult$Success; - public static synthetic fun copy$default (Lcom/kmpalette/PaletteResult$Success;Landroidx/palette/graphics/Palette;ILjava/lang/Object;)Lcom/kmpalette/PaletteResult$Success; + public fun (Lcom/kmpalette/palette/graphics/Palette;)V + public final fun component1 ()Lcom/kmpalette/palette/graphics/Palette; + public final fun copy (Lcom/kmpalette/palette/graphics/Palette;)Lcom/kmpalette/PaletteResult$Success; + public static synthetic fun copy$default (Lcom/kmpalette/PaletteResult$Success;Lcom/kmpalette/palette/graphics/Palette;ILjava/lang/Object;)Lcom/kmpalette/PaletteResult$Success; public fun equals (Ljava/lang/Object;)Z - public final fun getPalette ()Landroidx/palette/graphics/Palette; - public fun getPaletteOrNull ()Landroidx/palette/graphics/Palette; + public final fun getPalette ()Lcom/kmpalette/palette/graphics/Palette; + public fun getPaletteOrNull ()Lcom/kmpalette/palette/graphics/Palette; public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -80,7 +80,7 @@ public abstract class com/kmpalette/PaletteState { public synthetic fun (ILkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun generate (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; protected abstract fun getLoader ()Lcom/kmpalette/loader/ImageBitmapLoader; - public final fun getPalette ()Landroidx/palette/graphics/Palette; + public final fun getPalette ()Lcom/kmpalette/palette/graphics/Palette; public final fun getState ()Lcom/kmpalette/PaletteResult; public final fun reset ()V } @@ -95,13 +95,13 @@ public final class com/kmpalette/PaletteStateKt { } public final class com/kmpalette/SwatchKt { - public static final fun bodyTextColor (Landroidx/palette/graphics/Palette$Swatch;)J - public static final fun get (Landroidx/palette/graphics/Palette;Landroidx/palette/graphics/Target;)Landroidx/palette/graphics/Palette$Swatch; - public static final fun get (Landroidx/palette/graphics/Palette;Lcom/kmpalette/SwatchTarget;)Landroidx/palette/graphics/Palette$Swatch; - public static final fun getColor (Landroidx/palette/graphics/Palette$Swatch;)J - public static final fun getOnColor (Landroidx/palette/graphics/Palette$Swatch;)J - public static final fun getSwatch (Landroidx/palette/graphics/Palette;Lcom/kmpalette/SwatchTarget;)Landroidx/palette/graphics/Palette$Swatch; - public static final fun titleTextColor (Landroidx/palette/graphics/Palette$Swatch;)J + public static final fun bodyTextColor (Lcom/kmpalette/palette/graphics/Palette$Swatch;)J + public static final fun get (Lcom/kmpalette/palette/graphics/Palette;Lcom/kmpalette/SwatchTarget;)Lcom/kmpalette/palette/graphics/Palette$Swatch; + public static final fun get (Lcom/kmpalette/palette/graphics/Palette;Lcom/kmpalette/palette/graphics/Target;)Lcom/kmpalette/palette/graphics/Palette$Swatch; + public static final fun getColor (Lcom/kmpalette/palette/graphics/Palette$Swatch;)J + public static final fun getOnColor (Lcom/kmpalette/palette/graphics/Palette$Swatch;)J + public static final fun getSwatch (Lcom/kmpalette/palette/graphics/Palette;Lcom/kmpalette/SwatchTarget;)Lcom/kmpalette/palette/graphics/Palette$Swatch; + public static final fun titleTextColor (Lcom/kmpalette/palette/graphics/Palette$Swatch;)J } public abstract interface class com/kmpalette/SwatchTarget { diff --git a/kmpalette-core/api/jvm/kmpalette-core.api b/kmpalette-core/api/jvm/kmpalette-core.api index 1ecadf8..c395447 100644 --- a/kmpalette-core/api/jvm/kmpalette-core.api +++ b/kmpalette-core/api/jvm/kmpalette-core.api @@ -29,11 +29,11 @@ public final class com/kmpalette/PaletteKt { } public abstract interface class com/kmpalette/PaletteResult { - public abstract fun getPaletteOrNull ()Landroidx/palette/graphics/Palette; + public abstract fun getPaletteOrNull ()Lcom/kmpalette/palette/graphics/Palette; } public final class com/kmpalette/PaletteResult$DefaultImpls { - public static fun getPaletteOrNull (Lcom/kmpalette/PaletteResult;)Landroidx/palette/graphics/Palette; + public static fun getPaletteOrNull (Lcom/kmpalette/PaletteResult;)Lcom/kmpalette/palette/graphics/Palette; } public final class com/kmpalette/PaletteResult$Error : com/kmpalette/PaletteResult { @@ -44,7 +44,7 @@ public final class com/kmpalette/PaletteResult$Error : com/kmpalette/PaletteResu public static synthetic fun copy$default (Lcom/kmpalette/PaletteResult$Error;Ljava/lang/Throwable;ILjava/lang/Object;)Lcom/kmpalette/PaletteResult$Error; public fun equals (Ljava/lang/Object;)Z public final fun getCause ()Ljava/lang/Throwable; - public fun getPaletteOrNull ()Landroidx/palette/graphics/Palette; + public fun getPaletteOrNull ()Lcom/kmpalette/palette/graphics/Palette; public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -53,20 +53,20 @@ public final class com/kmpalette/PaletteResult$Loading : com/kmpalette/PaletteRe public static final field $stable I public static final field INSTANCE Lcom/kmpalette/PaletteResult$Loading; public fun equals (Ljava/lang/Object;)Z - public fun getPaletteOrNull ()Landroidx/palette/graphics/Palette; + public fun getPaletteOrNull ()Lcom/kmpalette/palette/graphics/Palette; public fun hashCode ()I public fun toString ()Ljava/lang/String; } public final class com/kmpalette/PaletteResult$Success : com/kmpalette/PaletteResult { public static final field $stable I - public fun (Landroidx/palette/graphics/Palette;)V - public final fun component1 ()Landroidx/palette/graphics/Palette; - public final fun copy (Landroidx/palette/graphics/Palette;)Lcom/kmpalette/PaletteResult$Success; - public static synthetic fun copy$default (Lcom/kmpalette/PaletteResult$Success;Landroidx/palette/graphics/Palette;ILjava/lang/Object;)Lcom/kmpalette/PaletteResult$Success; + public fun (Lcom/kmpalette/palette/graphics/Palette;)V + public final fun component1 ()Lcom/kmpalette/palette/graphics/Palette; + public final fun copy (Lcom/kmpalette/palette/graphics/Palette;)Lcom/kmpalette/PaletteResult$Success; + public static synthetic fun copy$default (Lcom/kmpalette/PaletteResult$Success;Lcom/kmpalette/palette/graphics/Palette;ILjava/lang/Object;)Lcom/kmpalette/PaletteResult$Success; public fun equals (Ljava/lang/Object;)Z - public final fun getPalette ()Landroidx/palette/graphics/Palette; - public fun getPaletteOrNull ()Landroidx/palette/graphics/Palette; + public final fun getPalette ()Lcom/kmpalette/palette/graphics/Palette; + public fun getPaletteOrNull ()Lcom/kmpalette/palette/graphics/Palette; public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -80,7 +80,7 @@ public abstract class com/kmpalette/PaletteState { public synthetic fun (ILkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun generate (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; protected abstract fun getLoader ()Lcom/kmpalette/loader/ImageBitmapLoader; - public final fun getPalette ()Landroidx/palette/graphics/Palette; + public final fun getPalette ()Lcom/kmpalette/palette/graphics/Palette; public final fun getState ()Lcom/kmpalette/PaletteResult; public final fun reset ()V } @@ -95,13 +95,13 @@ public final class com/kmpalette/PaletteStateKt { } public final class com/kmpalette/SwatchKt { - public static final fun bodyTextColor (Landroidx/palette/graphics/Palette$Swatch;)J - public static final fun get (Landroidx/palette/graphics/Palette;Landroidx/palette/graphics/Target;)Landroidx/palette/graphics/Palette$Swatch; - public static final fun get (Landroidx/palette/graphics/Palette;Lcom/kmpalette/SwatchTarget;)Landroidx/palette/graphics/Palette$Swatch; - public static final fun getColor (Landroidx/palette/graphics/Palette$Swatch;)J - public static final fun getOnColor (Landroidx/palette/graphics/Palette$Swatch;)J - public static final fun getSwatch (Landroidx/palette/graphics/Palette;Lcom/kmpalette/SwatchTarget;)Landroidx/palette/graphics/Palette$Swatch; - public static final fun titleTextColor (Landroidx/palette/graphics/Palette$Swatch;)J + public static final fun bodyTextColor (Lcom/kmpalette/palette/graphics/Palette$Swatch;)J + public static final fun get (Lcom/kmpalette/palette/graphics/Palette;Lcom/kmpalette/SwatchTarget;)Lcom/kmpalette/palette/graphics/Palette$Swatch; + public static final fun get (Lcom/kmpalette/palette/graphics/Palette;Lcom/kmpalette/palette/graphics/Target;)Lcom/kmpalette/palette/graphics/Palette$Swatch; + public static final fun getColor (Lcom/kmpalette/palette/graphics/Palette$Swatch;)J + public static final fun getOnColor (Lcom/kmpalette/palette/graphics/Palette$Swatch;)J + public static final fun getSwatch (Lcom/kmpalette/palette/graphics/Palette;Lcom/kmpalette/SwatchTarget;)Lcom/kmpalette/palette/graphics/Palette$Swatch; + public static final fun titleTextColor (Lcom/kmpalette/palette/graphics/Palette$Swatch;)J } public abstract interface class com/kmpalette/SwatchTarget { diff --git a/kmpalette-core/src/commonMain/kotlin/com/kmpalette/DominantColorState.kt b/kmpalette-core/src/commonMain/kotlin/com/kmpalette/DominantColorState.kt index 7430833..a7b55e1 100644 --- a/kmpalette-core/src/commonMain/kotlin/com/kmpalette/DominantColorState.kt +++ b/kmpalette-core/src/commonMain/kotlin/com/kmpalette/DominantColorState.kt @@ -15,10 +15,10 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.LayoutDirection -import androidx.palette.graphics.Palette import com.kmpalette.internal.LruCache import com.kmpalette.loader.ImageBitmapLoader import com.kmpalette.loader.PainterLoader +import com.kmpalette.palette.graphics.Palette import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/kmpalette-core/src/commonMain/kotlin/com/kmpalette/Palette.kt b/kmpalette-core/src/commonMain/kotlin/com/kmpalette/Palette.kt index 28da4da..4fd2fcd 100644 --- a/kmpalette-core/src/commonMain/kotlin/com/kmpalette/Palette.kt +++ b/kmpalette-core/src/commonMain/kotlin/com/kmpalette/Palette.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.graphics.ImageBitmap -import androidx.palette.graphics.Palette +import com.kmpalette.palette.graphics.Palette import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/kmpalette-core/src/commonMain/kotlin/com/kmpalette/PaletteState.kt b/kmpalette-core/src/commonMain/kotlin/com/kmpalette/PaletteState.kt index 3b0758b..6c27439 100644 --- a/kmpalette-core/src/commonMain/kotlin/com/kmpalette/PaletteState.kt +++ b/kmpalette-core/src/commonMain/kotlin/com/kmpalette/PaletteState.kt @@ -12,10 +12,10 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.LayoutDirection -import androidx.palette.graphics.Palette import com.kmpalette.internal.LruCache import com.kmpalette.loader.ImageBitmapLoader import com.kmpalette.loader.PainterLoader +import com.kmpalette.palette.graphics.Palette import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlin.coroutines.CoroutineContext diff --git a/kmpalette-core/src/commonMain/kotlin/com/kmpalette/Swatch.kt b/kmpalette-core/src/commonMain/kotlin/com/kmpalette/Swatch.kt index 32a1e75..ab410ce 100644 --- a/kmpalette-core/src/commonMain/kotlin/com/kmpalette/Swatch.kt +++ b/kmpalette-core/src/commonMain/kotlin/com/kmpalette/Swatch.kt @@ -1,10 +1,10 @@ package com.kmpalette import androidx.compose.ui.graphics.Color -import androidx.palette.graphics.Palette -import androidx.palette.graphics.Palette.Swatch -import androidx.palette.graphics.Target -import androidx.palette.graphics.Target.Builder +import com.kmpalette.palette.graphics.Palette +import com.kmpalette.palette.graphics.Palette.Builder +import com.kmpalette.palette.graphics.Palette.Swatch +import com.kmpalette.palette.graphics.Target /** * A class which allows custom selection of colors in a [Palette]'s generation. Instances