Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate kmp palette to 3.1.0 #432

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Migrate kmp palette to 3.1.0 #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/github/skydoves/landscapistdemo/ui/MainPosters.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.palette.graphics.Palette
import com.github.skydoves.landscapistdemo.R
import com.github.skydoves.landscapistdemo.model.MockUtil
import com.github.skydoves.landscapistdemo.model.Poster
import com.github.skydoves.landscapistdemo.theme.DisneyComposeTheme
import com.github.skydoves.landscapistdemo.theme.background
import com.kmpalette.palette.graphics.Palette
import com.skydoves.landscapist.ImageOptions
import com.skydoves.landscapist.animation.circular.CircularRevealPlugin
import com.skydoves.landscapist.animation.crossfade.CrossfadePlugin
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/github/skydoves/landscapistdemo/ui/PaletteColorExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package com.github.skydoves.landscapistdemo.ui

import androidx.palette.graphics.Palette
import com.kmpalette.palette.graphics.Palette

fun Palette?.paletteColorList(): List<Int> {
return listOf(
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fresco = "3.1.3"
coil = "2.5.0"
coil3 = "3.0.0-alpha04"
ktor = "2.3.8"
palette = "2.2.0"
palette = "3.1.0"
hilt = "2.50"
spotless = "6.21.0"

Expand Down
6 changes: 3 additions & 3 deletions landscapist-palette/api/android/landscapist-palette.api
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
public abstract interface class com/skydoves/landscapist/palette/PaletteBuilderInterceptor {
public abstract fun intercept (Landroidx/palette/graphics/Palette$Builder;)Landroidx/palette/graphics/Palette$Builder;
public abstract fun intercept (Lcom/kmpalette/palette/graphics/Palette$Builder;)Lcom/kmpalette/palette/graphics/Palette$Builder;
}

public abstract interface class com/skydoves/landscapist/palette/PaletteLoadedListener {
public abstract fun onPaletteLoaded (Landroidx/palette/graphics/Palette;)V
public abstract fun onPaletteLoaded (Lcom/kmpalette/palette/graphics/Palette;)V
}

public final class com/skydoves/landscapist/palette/PalettePlugin : com/skydoves/landscapist/plugins/ImagePlugin$SuccessStatePlugin {
Expand All @@ -20,6 +20,6 @@ public final class com/skydoves/landscapist/palette/PalettePlugin : com/skydoves
}

public final class com/skydoves/landscapist/palette/RememberPaletteStateKt {
public static final fun rememberPaletteState (Landroidx/palette/graphics/Palette;Landroidx/compose/runtime/SnapshotMutationPolicy;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/MutableState;
public static final fun rememberPaletteState (Lcom/kmpalette/palette/graphics/Palette;Landroidx/compose/runtime/SnapshotMutationPolicy;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/MutableState;
}

6 changes: 3 additions & 3 deletions landscapist-palette/api/desktop/landscapist-palette.api
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
public abstract interface class com/skydoves/landscapist/palette/PaletteBuilderInterceptor {
public abstract fun intercept (Landroidx/palette/graphics/Palette$Builder;)Landroidx/palette/graphics/Palette$Builder;
public abstract fun intercept (Lcom/kmpalette/palette/graphics/Palette$Builder;)Lcom/kmpalette/palette/graphics/Palette$Builder;
}

public abstract interface class com/skydoves/landscapist/palette/PaletteLoadedListener {
public abstract fun onPaletteLoaded (Landroidx/palette/graphics/Palette;)V
public abstract fun onPaletteLoaded (Lcom/kmpalette/palette/graphics/Palette;)V
}

public final class com/skydoves/landscapist/palette/PalettePlugin : com/skydoves/landscapist/plugins/ImagePlugin$SuccessStatePlugin {
Expand All @@ -20,6 +20,6 @@ public final class com/skydoves/landscapist/palette/PalettePlugin : com/skydoves
}

public final class com/skydoves/landscapist/palette/RememberPaletteStateKt {
public static final fun rememberPaletteState (Landroidx/palette/graphics/Palette;Landroidx/compose/runtime/SnapshotMutationPolicy;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/MutableState;
public static final fun rememberPaletteState (Lcom/kmpalette/palette/graphics/Palette;Landroidx/compose/runtime/SnapshotMutationPolicy;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/MutableState;
}

2 changes: 1 addition & 1 deletion landscapist-palette/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ android {
compileSdk = Configuration.compileSdk

defaultConfig {
minSdk = Configuration.minSdk24
minSdk = Configuration.minSdk
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
}
Expand Down
1 change: 0 additions & 1 deletion landscapist-palette/src/commonMain/kotlin/com/skydoves/landscapist/palette/BitmapPalette.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package com.skydoves.landscapist.palette
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.graphics.ImageBitmap
import androidx.palette.graphics.Palette
import com.kmpalette.rememberPaletteState

/**
Expand Down
2 changes: 1 addition & 1 deletion ...lette/src/commonMain/kotlin/com/skydoves/landscapist/palette/PaletteBuilderInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package com.skydoves.landscapist.palette

import androidx.palette.graphics.Palette
import com.kmpalette.palette.graphics.Palette

/** A definition for intercepting [Palette.Builder] before loading. */
public fun interface PaletteBuilderInterceptor {
Expand Down
2 changes: 1 addition & 1 deletion ...t-palette/src/commonMain/kotlin/com/skydoves/landscapist/palette/PaletteLoadedListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package com.skydoves.landscapist.palette

import androidx.palette.graphics.Palette
import com.kmpalette.palette.graphics.Palette

/** A definition for listening to the palette loaded. */
public fun interface PaletteLoadedListener {
Expand Down
2 changes: 1 addition & 1 deletion ...st-palette/src/commonMain/kotlin/com/skydoves/landscapist/palette/RememberPaletteState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import androidx.compose.runtime.SnapshotMutationPolicy
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.structuralEqualityPolicy
import androidx.palette.graphics.Palette
import com.kmpalette.palette.graphics.Palette

/**
* Create a mutable state and remember the new instance of [Palette] that is wrapped by [MutableState]
Expand Down