Skip to content

Commit

Permalink
Fix: Duplicate classes by changing package name (#88)
Browse files Browse the repository at this point in the history 
* change package name

* rename package to com.kmpalette.palette.graphics
  • Loading branch information
@jordond
jordond authored Jan 14, 2024
1 parent 6a58d1b commit e739164
Show file tree
Hide file tree
Showing 34 changed files with 175 additions and 175 deletions.
100 changes: 50 additions & 50 deletions androidx-palette/api/android/androidx-palette.api
View file
Original file line number Diff line number Diff line change
@@ -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 <init> (Landroidx/compose/ui/graphics/ImageBitmap;)V
public fun <init> (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 <init> (II)V
public fun equals (Ljava/lang/Object;)Z
Expand All @@ -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
Expand All @@ -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 <init> ()V
public fun <init> (Landroidx/palette/graphics/Target;)V
public synthetic fun <init> (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 <init> (Lcom/kmpalette/palette/graphics/Target;)V
public synthetic fun <init> (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;
}

100 changes: 50 additions & 50 deletions androidx-palette/api/jvm/androidx-palette.api
View file
Original file line number Diff line number Diff line change
@@ -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 <init> (Landroidx/compose/ui/graphics/ImageBitmap;)V
public fun <init> (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 <init> (II)V
public fun equals (Ljava/lang/Object;)Z
Expand All @@ -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
Expand All @@ -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 <init> ()V
public fun <init> (Landroidx/palette/graphics/Target;)V
public synthetic fun <init> (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 <init> (Lcom/kmpalette/palette/graphics/Target;)V
public synthetic fun <init> (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;
}

6 changes: 3 additions & 3 deletions .../androidx/palette/graphics/BucketTests.kt → ...kmpalette/palette/graphics/BucketTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit e739164

Please sign in to comment.