From 00f0a50ee4529afbfeb9bf6249ce9c92b3ef67f7 Mon Sep 17 00:00:00 2001 From: Jordon de Hoog Date: Tue, 16 Jan 2024 12:38:40 -0500 Subject: [PATCH] Feature: Add missing parameters from MaterialTheme (#75) * Add missing parameters from MaterialTheme * run apiDump --- material-kolor/api/android/material-kolor.api | 5 +++-- material-kolor/api/jvm/material-kolor.api | 5 +++-- .../com/materialkolor/DynamicMaterialTheme.kt | 20 +++++++++++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/material-kolor/api/android/material-kolor.api b/material-kolor/api/android/material-kolor.api index ab7fed3..8b031ca 100644 --- a/material-kolor/api/android/material-kolor.api +++ b/material-kolor/api/android/material-kolor.api @@ -4,8 +4,8 @@ public final class com/materialkolor/DynamicColorSchemeKt { } public final class com/materialkolor/DynamicMaterialThemeKt { - public static final fun AnimatedDynamicMaterialTheme-ZPw9REg (JZLcom/materialkolor/PaletteStyle;DLandroidx/compose/animation/core/AnimationSpec;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V - public static final fun DynamicMaterialTheme-yWKOrZg (JZLcom/materialkolor/PaletteStyle;DLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V + public static final fun AnimatedDynamicMaterialTheme-pzZJ40c (JZLcom/materialkolor/PaletteStyle;DLandroidx/compose/animation/core/AnimationSpec;Landroidx/compose/material3/Shapes;Landroidx/compose/material3/Typography;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V + public static final fun DynamicMaterialTheme-Pd0R-II (JZLcom/materialkolor/PaletteStyle;DLandroidx/compose/material3/Shapes;Landroidx/compose/material3/Typography;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } public final class com/materialkolor/LocalDynamicMaterialThemeSeedKt { @@ -22,6 +22,7 @@ public final class com/materialkolor/PaletteStyle : java/lang/Enum { public static final field Rainbow Lcom/materialkolor/PaletteStyle; public static final field TonalSpot Lcom/materialkolor/PaletteStyle; public static final field Vibrant Lcom/materialkolor/PaletteStyle; + public static fun getEntries ()Lkotlin/enums/EnumEntries; public static fun valueOf (Ljava/lang/String;)Lcom/materialkolor/PaletteStyle; public static fun values ()[Lcom/materialkolor/PaletteStyle; } diff --git a/material-kolor/api/jvm/material-kolor.api b/material-kolor/api/jvm/material-kolor.api index ab7fed3..8b031ca 100644 --- a/material-kolor/api/jvm/material-kolor.api +++ b/material-kolor/api/jvm/material-kolor.api @@ -4,8 +4,8 @@ public final class com/materialkolor/DynamicColorSchemeKt { } public final class com/materialkolor/DynamicMaterialThemeKt { - public static final fun AnimatedDynamicMaterialTheme-ZPw9REg (JZLcom/materialkolor/PaletteStyle;DLandroidx/compose/animation/core/AnimationSpec;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V - public static final fun DynamicMaterialTheme-yWKOrZg (JZLcom/materialkolor/PaletteStyle;DLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V + public static final fun AnimatedDynamicMaterialTheme-pzZJ40c (JZLcom/materialkolor/PaletteStyle;DLandroidx/compose/animation/core/AnimationSpec;Landroidx/compose/material3/Shapes;Landroidx/compose/material3/Typography;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V + public static final fun DynamicMaterialTheme-Pd0R-II (JZLcom/materialkolor/PaletteStyle;DLandroidx/compose/material3/Shapes;Landroidx/compose/material3/Typography;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } public final class com/materialkolor/LocalDynamicMaterialThemeSeedKt { @@ -22,6 +22,7 @@ public final class com/materialkolor/PaletteStyle : java/lang/Enum { public static final field Rainbow Lcom/materialkolor/PaletteStyle; public static final field TonalSpot Lcom/materialkolor/PaletteStyle; public static final field Vibrant Lcom/materialkolor/PaletteStyle; + public static fun getEntries ()Lkotlin/enums/EnumEntries; public static fun valueOf (Ljava/lang/String;)Lcom/materialkolor/PaletteStyle; public static fun values ()[Lcom/materialkolor/PaletteStyle; } diff --git a/material-kolor/src/commonMain/kotlin/com/materialkolor/DynamicMaterialTheme.kt b/material-kolor/src/commonMain/kotlin/com/materialkolor/DynamicMaterialTheme.kt index e13dfca..d43a19c 100644 --- a/material-kolor/src/commonMain/kotlin/com/materialkolor/DynamicMaterialTheme.kt +++ b/material-kolor/src/commonMain/kotlin/com/materialkolor/DynamicMaterialTheme.kt @@ -7,6 +7,8 @@ import androidx.compose.animation.core.spring import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.ColorScheme import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Shapes +import androidx.compose.material3.Typography import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.derivedStateOf @@ -20,6 +22,8 @@ public fun DynamicMaterialTheme( useDarkTheme: Boolean = isSystemInDarkTheme(), style: PaletteStyle = PaletteStyle.TonalSpot, contrastLevel: Double = 0.0, + shapes: Shapes = MaterialTheme.shapes, + typography: Typography = MaterialTheme.typography, content: @Composable () -> Unit, ) { val colorScheme: ColorScheme by remember(seedColor, useDarkTheme, style, contrastLevel) { @@ -34,7 +38,12 @@ public fun DynamicMaterialTheme( } CompositionLocalProvider(LocalDynamicMaterialThemeSeed provides seedColor) { - MaterialTheme(colorScheme = colorScheme, content = content) + MaterialTheme( + colorScheme = colorScheme, + shapes = shapes, + typography = typography, + content = content, + ) } } @@ -45,6 +54,8 @@ public fun AnimatedDynamicMaterialTheme( style: PaletteStyle = PaletteStyle.TonalSpot, contrastLevel: Double = 0.0, animationSpec: AnimationSpec = spring(stiffness = Spring.StiffnessLow), + shapes: Shapes = MaterialTheme.shapes, + typography: Typography = MaterialTheme.typography, content: @Composable () -> Unit, ) { val colors: ColorScheme by remember(seedColor, useDarkTheme, style, contrastLevel) { @@ -77,6 +88,11 @@ public fun AnimatedDynamicMaterialTheme( ) CompositionLocalProvider(LocalDynamicMaterialThemeSeed provides seedColor) { - MaterialTheme(colorScheme = animatedColorScheme, content = content) + MaterialTheme( + colorScheme = animatedColorScheme, + shapes = shapes, + typography = typography, + content = content, + ) } } \ No newline at end of file