diff --git a/animation/report/compose-metrics/animation_debug-module.json b/animation/report/compose-metrics/animation_debug-module.json index 789b84356..814d99280 100644 --- a/animation/report/compose-metrics/animation_debug-module.json +++ b/animation/report/compose-metrics/animation_debug-module.json @@ -7,10 +7,10 @@ "totalGroups": 5, "staticArguments": 1, "certainArguments": 25, - "knownStableArguments": 41, + "knownStableArguments": 42, "knownUnstableArguments": 9, "unknownStableArguments": 1, - "totalArguments": 51, + "totalArguments": 52, "markedStableClasses": 0, "inferredStableClasses": 0, "inferredUnstableClasses": 1, diff --git a/animation/report/compose-metrics/animation_release-module.json b/animation/report/compose-metrics/animation_release-module.json index 789b84356..814d99280 100644 --- a/animation/report/compose-metrics/animation_release-module.json +++ b/animation/report/compose-metrics/animation_release-module.json @@ -7,10 +7,10 @@ "totalGroups": 5, "staticArguments": 1, "certainArguments": 25, - "knownStableArguments": 41, + "knownStableArguments": 42, "knownUnstableArguments": 9, "unknownStableArguments": 1, - "totalArguments": 51, + "totalArguments": 52, "markedStableClasses": 0, "inferredStableClasses": 0, "inferredUnstableClasses": 1, diff --git a/bom/version.txt b/bom/version.txt index 13cd79a44..b2f23bdbc 100644 --- a/bom/version.txt +++ b/bom/version.txt @@ -1 +1 @@ -2023.06.05 +2023.06.29 diff --git a/build-logic/src/main/kotlin/QuackMavenPublishingPlugin.kt b/build-logic/src/main/kotlin/QuackMavenPublishingPlugin.kt index 01baa4ad4..aa0aa7c78 100644 --- a/build-logic/src/main/kotlin/QuackMavenPublishingPlugin.kt +++ b/build-logic/src/main/kotlin/QuackMavenPublishingPlugin.kt @@ -35,7 +35,7 @@ class QuackMavenPublishingPlugin : Plugin { } val (group, module, version) = ArtifactConfig.of(this).also { artifact -> - logger.lifecycle("Publishing $artifact...") + logger.warn("Publishing $artifact...") } extensions.configure { diff --git a/casa-ui/report/compose-metrics/casa-ui_debug-module.json b/casa-ui/report/compose-metrics/casa-ui_debug-module.json index e185dc504..63583ad10 100644 --- a/casa-ui/report/compose-metrics/casa-ui_debug-module.json +++ b/casa-ui/report/compose-metrics/casa-ui_debug-module.json @@ -7,10 +7,10 @@ "totalGroups": 47, "staticArguments": 61, "certainArguments": 42, - "knownStableArguments": 509, + "knownStableArguments": 511, "knownUnstableArguments": 6, "unknownStableArguments": 0, - "totalArguments": 515, + "totalArguments": 517, "markedStableClasses": 0, "inferredStableClasses": 0, "inferredUnstableClasses": 0, diff --git a/casa-ui/report/compose-metrics/casa-ui_release-module.json b/casa-ui/report/compose-metrics/casa-ui_release-module.json index e185dc504..63583ad10 100644 --- a/casa-ui/report/compose-metrics/casa-ui_release-module.json +++ b/casa-ui/report/compose-metrics/casa-ui_release-module.json @@ -7,10 +7,10 @@ "totalGroups": 47, "staticArguments": 61, "certainArguments": 42, - "knownStableArguments": 509, + "knownStableArguments": 511, "knownUnstableArguments": 6, "unknownStableArguments": 0, - "totalArguments": 515, + "totalArguments": 517, "markedStableClasses": 0, "inferredStableClasses": 0, "inferredUnstableClasses": 0, diff --git a/material/README.md b/material/README.md new file mode 100644 index 000000000..3a73cf5af --- /dev/null +++ b/material/README.md @@ -0,0 +1 @@ +![](https://img.shields.io/maven-central/v/team.duckie.quackquack.material/material?style=flat-square) diff --git a/material/version.txt b/material/version.txt index 36cde3682..89fb2a078 100644 --- a/material/version.txt +++ b/material/version.txt @@ -1 +1 @@ -2.0.0-alpha06 +2.0.0-alpha07 diff --git a/ui/README.md b/ui/README.md new file mode 100644 index 000000000..a2e0f09bc --- /dev/null +++ b/ui/README.md @@ -0,0 +1 @@ +![quackquack-ui](https://img.shields.io/maven-central/v/team.duckie.quackquack.ui/ui?style=flat-square) diff --git a/ui/report/compose-metrics/ui_debug-module.json b/ui/report/compose-metrics/ui_debug-module.json index 020c1b46d..9b72ddd73 100644 --- a/ui/report/compose-metrics/ui_debug-module.json +++ b/ui/report/compose-metrics/ui_debug-module.json @@ -2,24 +2,24 @@ "skippableComposables": 6, "restartableComposables": 11, "readonlyComposables": 1, - "totalComposables": 48, + "totalComposables": 49, "restartGroups": 11, - "totalGroups": 61, - "staticArguments": 33, - "certainArguments": 221, - "knownStableArguments": 463, - "knownUnstableArguments": 26, + "totalGroups": 62, + "staticArguments": 46, + "certainArguments": 255, + "knownStableArguments": 558, + "knownUnstableArguments": 28, "unknownStableArguments": 0, - "totalArguments": 489, + "totalArguments": 586, "markedStableClasses": 16, "inferredStableClasses": 11, "inferredUnstableClasses": 0, "inferredUncertainClasses": 0, "effectivelyStableClasses": 27, "totalClasses": 27, - "memoizedLambdas": 19, - "singletonLambdas": 2, + "memoizedLambdas": 22, + "singletonLambdas": 5, "singletonComposableLambdas": 0, "composableLambdas": 3, - "totalLambdas": 27 + "totalLambdas": 32 } \ No newline at end of file diff --git a/ui/report/compose-metrics/ui_debugUnitTest-module.json b/ui/report/compose-metrics/ui_debugUnitTest-module.json index 80a79f6ff..7a590e18f 100644 --- a/ui/report/compose-metrics/ui_debugUnitTest-module.json +++ b/ui/report/compose-metrics/ui_debugUnitTest-module.json @@ -1,25 +1,25 @@ { - "skippableComposables": 53, - "restartableComposables": 56, + "skippableComposables": 132, + "restartableComposables": 135, "readonlyComposables": 0, - "totalComposables": 56, - "restartGroups": 56, - "totalGroups": 56, - "staticArguments": 134, - "certainArguments": 3, - "knownStableArguments": 561, + "totalComposables": 135, + "restartGroups": 135, + "totalGroups": 136, + "staticArguments": 428, + "certainArguments": 4, + "knownStableArguments": 1737, "knownUnstableArguments": 1, "unknownStableArguments": 0, - "totalArguments": 562, + "totalArguments": 1738, "markedStableClasses": 0, "inferredStableClasses": 3, "inferredUnstableClasses": 4, "inferredUncertainClasses": 4, "effectivelyStableClasses": 3, "totalClasses": 11, - "memoizedLambdas": 79, - "singletonLambdas": 25, - "singletonComposableLambdas": 33, - "composableLambdas": 50, - "totalLambdas": 82 + "memoizedLambdas": 203, + "singletonLambdas": 70, + "singletonComposableLambdas": 93, + "composableLambdas": 129, + "totalLambdas": 206 } \ No newline at end of file diff --git a/ui/report/compose-metrics/ui_release-module.json b/ui/report/compose-metrics/ui_release-module.json index 020c1b46d..9b72ddd73 100644 --- a/ui/report/compose-metrics/ui_release-module.json +++ b/ui/report/compose-metrics/ui_release-module.json @@ -2,24 +2,24 @@ "skippableComposables": 6, "restartableComposables": 11, "readonlyComposables": 1, - "totalComposables": 48, + "totalComposables": 49, "restartGroups": 11, - "totalGroups": 61, - "staticArguments": 33, - "certainArguments": 221, - "knownStableArguments": 463, - "knownUnstableArguments": 26, + "totalGroups": 62, + "staticArguments": 46, + "certainArguments": 255, + "knownStableArguments": 558, + "knownUnstableArguments": 28, "unknownStableArguments": 0, - "totalArguments": 489, + "totalArguments": 586, "markedStableClasses": 16, "inferredStableClasses": 11, "inferredUnstableClasses": 0, "inferredUncertainClasses": 0, "effectivelyStableClasses": 27, "totalClasses": 27, - "memoizedLambdas": 19, - "singletonLambdas": 2, + "memoizedLambdas": 22, + "singletonLambdas": 5, "singletonComposableLambdas": 0, "composableLambdas": 3, - "totalLambdas": 27 + "totalLambdas": 32 } \ No newline at end of file diff --git a/ui/report/compose-metrics/ui_releaseUnitTest-module.json b/ui/report/compose-metrics/ui_releaseUnitTest-module.json index 80a79f6ff..7a590e18f 100644 --- a/ui/report/compose-metrics/ui_releaseUnitTest-module.json +++ b/ui/report/compose-metrics/ui_releaseUnitTest-module.json @@ -1,25 +1,25 @@ { - "skippableComposables": 53, - "restartableComposables": 56, + "skippableComposables": 132, + "restartableComposables": 135, "readonlyComposables": 0, - "totalComposables": 56, - "restartGroups": 56, - "totalGroups": 56, - "staticArguments": 134, - "certainArguments": 3, - "knownStableArguments": 561, + "totalComposables": 135, + "restartGroups": 135, + "totalGroups": 136, + "staticArguments": 428, + "certainArguments": 4, + "knownStableArguments": 1737, "knownUnstableArguments": 1, "unknownStableArguments": 0, - "totalArguments": 562, + "totalArguments": 1738, "markedStableClasses": 0, "inferredStableClasses": 3, "inferredUnstableClasses": 4, "inferredUncertainClasses": 4, "effectivelyStableClasses": 3, "totalClasses": 11, - "memoizedLambdas": 79, - "singletonLambdas": 25, - "singletonComposableLambdas": 33, - "composableLambdas": 50, - "totalLambdas": 82 + "memoizedLambdas": 203, + "singletonLambdas": 70, + "singletonComposableLambdas": 93, + "composableLambdas": 129, + "totalLambdas": 206 } \ No newline at end of file diff --git a/ui/report/compose-reports/ui_debug-classes.txt b/ui/report/compose-reports/ui_debug-classes.txt index 673e5fc1f..68e0c90c4 100644 --- a/ui/report/compose-reports/ui_debug-classes.txt +++ b/ui/report/compose-reports/ui_debug-classes.txt @@ -160,7 +160,7 @@ stable class TextFieldColors { } stable class TextFieldColors { stable val backgroundColor: QuackColor? - stable val backgroundColorGetter: Function2<@[ParameterName(name = 'text')] String, @[ParameterName(name = 'focusInteraction')] FocusInteraction, QuackColor>? + stable val backgroundColorGetter: Function2<@[ParameterName(name = 'text')] String, @[ParameterName(name = 'focusInteraction')] FocusInteraction?, QuackColor>? stable val contentColor: QuackColor stable val placeholderColor: QuackColor = Stable diff --git a/ui/report/compose-reports/ui_debug-composables.csv b/ui/report/compose-reports/ui_debug-composables.csv index b6cd37c0d..b6026634e 100644 --- a/ui/report/compose-reports/ui_debug-composables.csv +++ b/ui/report/compose-reports/ui_debug-composables.csv @@ -1,5 +1,5 @@ package,name,composable,skippable,restartable,readonly,inline,isLambda,hasDefaults,defaultsGroup,groups,calls, -team.duckie.quackquack.ui.QuackButton,QuackButton,1,0,0,0,0,0,0,0,1,6, +team.duckie.quackquack.ui.QuackButton,QuackButton,1,0,0,0,0,0,0,0,1,5, team.duckie.quackquack.ui.QuackBaseButton,QuackBaseButton,1,1,1,0,0,0,0,0,1,2, team.duckie.quackquack.ui.QuackIcon,QuackIcon,1,0,0,0,0,0,0,0,2,3, team.duckie.quackquack.ui.QuackImage,QuackImage,1,0,0,0,0,0,0,0,1,1, @@ -29,13 +29,14 @@ team.duckie.quackquack.ui.sugar.QuackTitle1,QuackTitle1,1,0,0,0,0,0,0,0,1,1, team.duckie.quackquack.ui.sugar.QuackTitle2,QuackTitle2,1,0,0,0,0,0,0,0,1,1, team.duckie.quackquack.ui.QuackTag,QuackTag,1,0,0,0,0,0,0,0,1,6, team.duckie.quackquack.ui.QuackBaseTag,QuackBaseTag,1,1,1,0,0,0,0,0,1,2, -team.duckie.quackquack.ui.QuackText,QuackText,1,1,1,0,0,0,0,0,4,7, -team.duckie.quackquack.ui.QuackClickableText,QuackClickableText,1,1,1,0,0,0,0,0,1,3, +team.duckie.quackquack.ui.QuackText,QuackText,1,1,1,0,0,0,0,0,4,10, +team.duckie.quackquack.ui.ClickableText,ClickableText,1,1,1,0,0,0,0,0,1,4, team.duckie.quackquack.ui.rememberSpanAnnotatedString,rememberSpanAnnotatedString,1,0,0,0,0,0,0,0,1,1, team.duckie.quackquack.ui.QuackDefaultTextField,QuackDefaultTextField,1,0,0,0,0,0,0,0,1,7, team.duckie.quackquack.ui.QuackDefaultTextField,QuackDefaultTextField,1,0,0,0,0,0,0,0,1,9, -team.duckie.quackquack.ui.rememberLtrTextMeasurer,rememberLtrTextMeasurer,1,0,0,0,0,0,0,0,1,3, -team.duckie.quackquack.ui.QuackBaseDefaultTextField,QuackBaseDefaultTextField,1,1,1,0,0,0,0,0,1,29, -team.duckie.quackquack.ui.QuackFilledTextField,QuackFilledTextField,1,0,0,0,0,0,0,0,1,0, +team.duckie.quackquack.ui.QuackFilledTextField,QuackFilledTextField,1,0,0,0,0,0,0,0,1,7, +team.duckie.quackquack.ui.QuackFilledTextField,QuackFilledTextField,1,0,0,0,0,0,0,0,1,9, +team.duckie.quackquack.ui.QuackBaseDefaultTextField,QuackBaseDefaultTextField,1,1,1,0,0,0,0,0,1,27, team.duckie.quackquack.ui.QuackOutlinedTextField,QuackOutlinedTextField,1,0,0,0,0,0,0,0,1,0, +team.duckie.quackquack.ui.util.rememberLtrTextMeasurer,rememberLtrTextMeasurer,1,0,0,0,0,0,0,0,1,3, team.duckie.quackquack.ui.util.currentFontScale,currentFontScale,1,0,0,1,1,0,0,0,1,1, diff --git a/ui/report/compose-reports/ui_debug-composables.txt b/ui/report/compose-reports/ui_debug-composables.txt index c7de72357..d243b0f98 100644 --- a/ui/report/compose-reports/ui_debug-composables.txt +++ b/ui/report/compose-reports/ui_debug-composables.txt @@ -1,8 +1,8 @@ scheme("[androidx.compose.ui.UiComposable]") fun QuackButton( + stable text: String + stable style: QuackButtonStyle stable modifier: Modifier? = @static Companion stable enabled: Boolean = @static true - stable style: QuackButtonStyle - stable text: String stable rippleEnabled: Boolean = @static true stable onClick: Function0 ) @@ -237,11 +237,11 @@ restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun QuackText stable softWrap: Boolean = @static true stable overflow: TextOverflow = @static Companion.Ellipsis ) -restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun QuackClickableText( +restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun ClickableText( stable modifier: Modifier stable text: String stable highlightData: TextHighlightData - stable style: QuackTypography + stable style: TextStyle stable softWrap: Boolean stable overflow: TextOverflow stable maxLines: Int @@ -314,9 +314,64 @@ scheme("[androidx.compose.ui.UiComposable]") fun QuackDefaultTextField( } , $composer, 0) ) -fun rememberLtrTextMeasurer( - stable cacheSize: Int = @static 8 -): TextMeasurer +fun QuackFilledTextField( + stable value: String + stable onValueChange: Function1<@[ParameterName(name = 'value')] String, Unit> + stable style: QuackTextFieldStyle + stable modifier: Modifier? = @static Companion + stable enabled: Boolean = @static true + stable readOnly: Boolean = @static false + stable placeholderText: String? = @static null + stable placeholderStrategy: TextFieldPlaceholderStrategy? = @static TextFieldPlaceholderStrategy.Hidable + stable keyboardOptions: KeyboardOptions? = @static Companion.Default + stable keyboardActions: KeyboardActions? = @static Companion.Default + stable singleLine: Boolean = @static false + stable minLines: Int = @static 1 + stable maxLines: Int = @dynamic if (singleLine) { + 1 +} else { + Companion . MAX_VALUE +} + + stable visualTransformation: VisualTransformation? = @static Companion.None + stable onTextLayout: Function1<@[ParameterName(name = 'layoutResult')] TextLayoutResult, Unit>? = @static { it: TextLayoutResult -> + +} + + stable interactionSource: MutableInteractionSource? = @static remember({ + MutableInteractionSource ( ) +} +, $composer, 0) +) +scheme("[androidx.compose.ui.UiComposable]") fun QuackFilledTextField( + stable value: TextFieldValue + stable onValueChange: Function1<@[ParameterName(name = 'value')] TextFieldValue, Unit> + stable style: QuackTextFieldStyle + stable modifier: Modifier? = @static Companion + stable enabled: Boolean = @static true + stable readOnly: Boolean = @static false + stable placeholderText: String? = @static null + stable placeholderStrategy: TextFieldPlaceholderStrategy? = @static TextFieldPlaceholderStrategy.Hidable + stable keyboardOptions: KeyboardOptions? = @static Companion.Default + stable keyboardActions: KeyboardActions? = @static Companion.Default + stable singleLine: Boolean = @static false + stable minLines: Int = @static 1 + stable maxLines: Int = @dynamic if (singleLine) { + 1 +} else { + Companion . MAX_VALUE +} + + stable visualTransformation: VisualTransformation? = @static Companion.None + stable onTextLayout: Function1<@[ParameterName(name = 'layoutResult')] TextLayoutResult, Unit>? = @static { it: TextLayoutResult -> + +} + + stable interactionSource: MutableInteractionSource? = @static remember({ + MutableInteractionSource ( ) +} +, $composer, 0) +) restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun QuackBaseDefaultTextField( stable value: TextFieldValue stable onValueChange: Function1<@[ParameterName(name = 'value')] TextFieldValue, Unit> @@ -332,17 +387,18 @@ restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun QuackBase stable maxLines: Int stable visualTransformation: VisualTransformation stable onTextLayout: Function1<@[ParameterName(name = 'layoutResult')] TextLayoutResult, Unit> - stable validationState: TextFieldValidationState - stable validationLabelVisibilityStrategy: TextFieldValidationLabelVisibilityStrategy + stable validationState: TextFieldValidationState? + stable validationLabelVisibilityStrategy: TextFieldValidationLabelVisibilityStrategy? stable interactionSource: MutableInteractionSource stable backgroundColor: QuackColor stable contentPadding: PaddingValues? stable contentSpacedBy: Dp - stable validationLabelAndIndicatorSpacedBy: Dp + stable validationLabelAndIndicatorSpacedBy: Dp? stable typography: QuackTypography stable placeholderTypography: QuackTypography - stable errorTypography: QuackTypography - stable successTypography: QuackTypography + stable errorTypography: QuackTypography? + stable successTypography: QuackTypography? + stable textFieldType: QuackTextFieldType stable leadingIcon: ImageVector? stable leadingIconSize: Dp? stable leadingIconTint: QuackColor? @@ -364,8 +420,10 @@ restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun QuackBase stable counterBaseAndHighlightGap: Dp? stable counterMaxLength: Int? ) -fun QuackFilledTextField() fun QuackOutlinedTextField() +fun rememberLtrTextMeasurer( + stable cacheSize: Int = @static 8 +): TextMeasurer readonly inline fun currentFontScale( stable content: Function1<@[ParameterName(name = 'fontScale')] Float, T> ): T diff --git a/ui/report/compose-reports/ui_debugUnitTest-composables.csv b/ui/report/compose-reports/ui_debugUnitTest-composables.csv index 55c0889a4..aa562c9bb 100644 --- a/ui/report/compose-reports/ui_debugUnitTest-composables.csv +++ b/ui/report/compose-reports/ui_debugUnitTest-composables.csv @@ -1,4 +1,4 @@ package,name,composable,skippable,restartable,readonly,inline,isLambda,hasDefaults,defaultsGroup,groups,calls, team.duckie.quackquack.ui.snapshot.util.TestColumn,TestColumn,1,1,1,0,0,0,0,0,1,1, -team.duckie.quackquack.ui.snapshot.util.WithLabel,WithLabel,1,1,1,0,0,0,0,0,1,1, +team.duckie.quackquack.ui.snapshot.util.WithLabel,WithLabel,1,1,1,0,0,0,1,0,2,1, team.duckie.quackquack.ui.snapshot.util.withIncreaseFontScale,withIncreaseFontScale,1,1,1,0,0,0,0,0,1,2, diff --git a/ui/report/compose-reports/ui_debugUnitTest-composables.txt b/ui/report/compose-reports/ui_debugUnitTest-composables.txt index 3c20f77b7..bbaa45a5e 100644 --- a/ui/report/compose-reports/ui_debugUnitTest-composables.txt +++ b/ui/report/compose-reports/ui_debugUnitTest-composables.txt @@ -1,9 +1,18 @@ restartable skippable scheme("[androidx.compose.ui.UiComposable, [androidx.compose.ui.UiComposable]]") fun TestColumn( + stable contentGap: Dp = @static 15.dp stable content: Function2 ) restartable skippable scheme("[androidx.compose.ui.UiComposable, [androidx.compose.ui.UiComposable]]") fun WithLabel( stable label: String - stable content: Function2 + stable isTitle: Boolean = @static false + stable labelGap: Dp = @static 4.dp + stable contentGap: Dp = @dynamic if (isTitle) { + 15 . dp +} else { + 4 . dp +} + + stable content: @[ExtensionFunctionType] Function3 ) restartable skippable scheme("[0, [0]]") fun withIncreaseFontScale( stable fontScale: Float diff --git a/ui/report/compose-reports/ui_release-classes.txt b/ui/report/compose-reports/ui_release-classes.txt index 673e5fc1f..68e0c90c4 100644 --- a/ui/report/compose-reports/ui_release-classes.txt +++ b/ui/report/compose-reports/ui_release-classes.txt @@ -160,7 +160,7 @@ stable class TextFieldColors { } stable class TextFieldColors { stable val backgroundColor: QuackColor? - stable val backgroundColorGetter: Function2<@[ParameterName(name = 'text')] String, @[ParameterName(name = 'focusInteraction')] FocusInteraction, QuackColor>? + stable val backgroundColorGetter: Function2<@[ParameterName(name = 'text')] String, @[ParameterName(name = 'focusInteraction')] FocusInteraction?, QuackColor>? stable val contentColor: QuackColor stable val placeholderColor: QuackColor = Stable diff --git a/ui/report/compose-reports/ui_release-composables.csv b/ui/report/compose-reports/ui_release-composables.csv index b6cd37c0d..b6026634e 100644 --- a/ui/report/compose-reports/ui_release-composables.csv +++ b/ui/report/compose-reports/ui_release-composables.csv @@ -1,5 +1,5 @@ package,name,composable,skippable,restartable,readonly,inline,isLambda,hasDefaults,defaultsGroup,groups,calls, -team.duckie.quackquack.ui.QuackButton,QuackButton,1,0,0,0,0,0,0,0,1,6, +team.duckie.quackquack.ui.QuackButton,QuackButton,1,0,0,0,0,0,0,0,1,5, team.duckie.quackquack.ui.QuackBaseButton,QuackBaseButton,1,1,1,0,0,0,0,0,1,2, team.duckie.quackquack.ui.QuackIcon,QuackIcon,1,0,0,0,0,0,0,0,2,3, team.duckie.quackquack.ui.QuackImage,QuackImage,1,0,0,0,0,0,0,0,1,1, @@ -29,13 +29,14 @@ team.duckie.quackquack.ui.sugar.QuackTitle1,QuackTitle1,1,0,0,0,0,0,0,0,1,1, team.duckie.quackquack.ui.sugar.QuackTitle2,QuackTitle2,1,0,0,0,0,0,0,0,1,1, team.duckie.quackquack.ui.QuackTag,QuackTag,1,0,0,0,0,0,0,0,1,6, team.duckie.quackquack.ui.QuackBaseTag,QuackBaseTag,1,1,1,0,0,0,0,0,1,2, -team.duckie.quackquack.ui.QuackText,QuackText,1,1,1,0,0,0,0,0,4,7, -team.duckie.quackquack.ui.QuackClickableText,QuackClickableText,1,1,1,0,0,0,0,0,1,3, +team.duckie.quackquack.ui.QuackText,QuackText,1,1,1,0,0,0,0,0,4,10, +team.duckie.quackquack.ui.ClickableText,ClickableText,1,1,1,0,0,0,0,0,1,4, team.duckie.quackquack.ui.rememberSpanAnnotatedString,rememberSpanAnnotatedString,1,0,0,0,0,0,0,0,1,1, team.duckie.quackquack.ui.QuackDefaultTextField,QuackDefaultTextField,1,0,0,0,0,0,0,0,1,7, team.duckie.quackquack.ui.QuackDefaultTextField,QuackDefaultTextField,1,0,0,0,0,0,0,0,1,9, -team.duckie.quackquack.ui.rememberLtrTextMeasurer,rememberLtrTextMeasurer,1,0,0,0,0,0,0,0,1,3, -team.duckie.quackquack.ui.QuackBaseDefaultTextField,QuackBaseDefaultTextField,1,1,1,0,0,0,0,0,1,29, -team.duckie.quackquack.ui.QuackFilledTextField,QuackFilledTextField,1,0,0,0,0,0,0,0,1,0, +team.duckie.quackquack.ui.QuackFilledTextField,QuackFilledTextField,1,0,0,0,0,0,0,0,1,7, +team.duckie.quackquack.ui.QuackFilledTextField,QuackFilledTextField,1,0,0,0,0,0,0,0,1,9, +team.duckie.quackquack.ui.QuackBaseDefaultTextField,QuackBaseDefaultTextField,1,1,1,0,0,0,0,0,1,27, team.duckie.quackquack.ui.QuackOutlinedTextField,QuackOutlinedTextField,1,0,0,0,0,0,0,0,1,0, +team.duckie.quackquack.ui.util.rememberLtrTextMeasurer,rememberLtrTextMeasurer,1,0,0,0,0,0,0,0,1,3, team.duckie.quackquack.ui.util.currentFontScale,currentFontScale,1,0,0,1,1,0,0,0,1,1, diff --git a/ui/report/compose-reports/ui_release-composables.txt b/ui/report/compose-reports/ui_release-composables.txt index c7de72357..d243b0f98 100644 --- a/ui/report/compose-reports/ui_release-composables.txt +++ b/ui/report/compose-reports/ui_release-composables.txt @@ -1,8 +1,8 @@ scheme("[androidx.compose.ui.UiComposable]") fun QuackButton( + stable text: String + stable style: QuackButtonStyle stable modifier: Modifier? = @static Companion stable enabled: Boolean = @static true - stable style: QuackButtonStyle - stable text: String stable rippleEnabled: Boolean = @static true stable onClick: Function0 ) @@ -237,11 +237,11 @@ restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun QuackText stable softWrap: Boolean = @static true stable overflow: TextOverflow = @static Companion.Ellipsis ) -restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun QuackClickableText( +restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun ClickableText( stable modifier: Modifier stable text: String stable highlightData: TextHighlightData - stable style: QuackTypography + stable style: TextStyle stable softWrap: Boolean stable overflow: TextOverflow stable maxLines: Int @@ -314,9 +314,64 @@ scheme("[androidx.compose.ui.UiComposable]") fun QuackDefaultTextField( } , $composer, 0) ) -fun rememberLtrTextMeasurer( - stable cacheSize: Int = @static 8 -): TextMeasurer +fun QuackFilledTextField( + stable value: String + stable onValueChange: Function1<@[ParameterName(name = 'value')] String, Unit> + stable style: QuackTextFieldStyle + stable modifier: Modifier? = @static Companion + stable enabled: Boolean = @static true + stable readOnly: Boolean = @static false + stable placeholderText: String? = @static null + stable placeholderStrategy: TextFieldPlaceholderStrategy? = @static TextFieldPlaceholderStrategy.Hidable + stable keyboardOptions: KeyboardOptions? = @static Companion.Default + stable keyboardActions: KeyboardActions? = @static Companion.Default + stable singleLine: Boolean = @static false + stable minLines: Int = @static 1 + stable maxLines: Int = @dynamic if (singleLine) { + 1 +} else { + Companion . MAX_VALUE +} + + stable visualTransformation: VisualTransformation? = @static Companion.None + stable onTextLayout: Function1<@[ParameterName(name = 'layoutResult')] TextLayoutResult, Unit>? = @static { it: TextLayoutResult -> + +} + + stable interactionSource: MutableInteractionSource? = @static remember({ + MutableInteractionSource ( ) +} +, $composer, 0) +) +scheme("[androidx.compose.ui.UiComposable]") fun QuackFilledTextField( + stable value: TextFieldValue + stable onValueChange: Function1<@[ParameterName(name = 'value')] TextFieldValue, Unit> + stable style: QuackTextFieldStyle + stable modifier: Modifier? = @static Companion + stable enabled: Boolean = @static true + stable readOnly: Boolean = @static false + stable placeholderText: String? = @static null + stable placeholderStrategy: TextFieldPlaceholderStrategy? = @static TextFieldPlaceholderStrategy.Hidable + stable keyboardOptions: KeyboardOptions? = @static Companion.Default + stable keyboardActions: KeyboardActions? = @static Companion.Default + stable singleLine: Boolean = @static false + stable minLines: Int = @static 1 + stable maxLines: Int = @dynamic if (singleLine) { + 1 +} else { + Companion . MAX_VALUE +} + + stable visualTransformation: VisualTransformation? = @static Companion.None + stable onTextLayout: Function1<@[ParameterName(name = 'layoutResult')] TextLayoutResult, Unit>? = @static { it: TextLayoutResult -> + +} + + stable interactionSource: MutableInteractionSource? = @static remember({ + MutableInteractionSource ( ) +} +, $composer, 0) +) restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun QuackBaseDefaultTextField( stable value: TextFieldValue stable onValueChange: Function1<@[ParameterName(name = 'value')] TextFieldValue, Unit> @@ -332,17 +387,18 @@ restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun QuackBase stable maxLines: Int stable visualTransformation: VisualTransformation stable onTextLayout: Function1<@[ParameterName(name = 'layoutResult')] TextLayoutResult, Unit> - stable validationState: TextFieldValidationState - stable validationLabelVisibilityStrategy: TextFieldValidationLabelVisibilityStrategy + stable validationState: TextFieldValidationState? + stable validationLabelVisibilityStrategy: TextFieldValidationLabelVisibilityStrategy? stable interactionSource: MutableInteractionSource stable backgroundColor: QuackColor stable contentPadding: PaddingValues? stable contentSpacedBy: Dp - stable validationLabelAndIndicatorSpacedBy: Dp + stable validationLabelAndIndicatorSpacedBy: Dp? stable typography: QuackTypography stable placeholderTypography: QuackTypography - stable errorTypography: QuackTypography - stable successTypography: QuackTypography + stable errorTypography: QuackTypography? + stable successTypography: QuackTypography? + stable textFieldType: QuackTextFieldType stable leadingIcon: ImageVector? stable leadingIconSize: Dp? stable leadingIconTint: QuackColor? @@ -364,8 +420,10 @@ restartable skippable scheme("[androidx.compose.ui.UiComposable]") fun QuackBase stable counterBaseAndHighlightGap: Dp? stable counterMaxLength: Int? ) -fun QuackFilledTextField() fun QuackOutlinedTextField() +fun rememberLtrTextMeasurer( + stable cacheSize: Int = @static 8 +): TextMeasurer readonly inline fun currentFontScale( stable content: Function1<@[ParameterName(name = 'fontScale')] Float, T> ): T diff --git a/ui/report/compose-reports/ui_releaseUnitTest-composables.csv b/ui/report/compose-reports/ui_releaseUnitTest-composables.csv index 55c0889a4..aa562c9bb 100644 --- a/ui/report/compose-reports/ui_releaseUnitTest-composables.csv +++ b/ui/report/compose-reports/ui_releaseUnitTest-composables.csv @@ -1,4 +1,4 @@ package,name,composable,skippable,restartable,readonly,inline,isLambda,hasDefaults,defaultsGroup,groups,calls, team.duckie.quackquack.ui.snapshot.util.TestColumn,TestColumn,1,1,1,0,0,0,0,0,1,1, -team.duckie.quackquack.ui.snapshot.util.WithLabel,WithLabel,1,1,1,0,0,0,0,0,1,1, +team.duckie.quackquack.ui.snapshot.util.WithLabel,WithLabel,1,1,1,0,0,0,1,0,2,1, team.duckie.quackquack.ui.snapshot.util.withIncreaseFontScale,withIncreaseFontScale,1,1,1,0,0,0,0,0,1,2, diff --git a/ui/report/compose-reports/ui_releaseUnitTest-composables.txt b/ui/report/compose-reports/ui_releaseUnitTest-composables.txt index 3c20f77b7..bbaa45a5e 100644 --- a/ui/report/compose-reports/ui_releaseUnitTest-composables.txt +++ b/ui/report/compose-reports/ui_releaseUnitTest-composables.txt @@ -1,9 +1,18 @@ restartable skippable scheme("[androidx.compose.ui.UiComposable, [androidx.compose.ui.UiComposable]]") fun TestColumn( + stable contentGap: Dp = @static 15.dp stable content: Function2 ) restartable skippable scheme("[androidx.compose.ui.UiComposable, [androidx.compose.ui.UiComposable]]") fun WithLabel( stable label: String - stable content: Function2 + stable isTitle: Boolean = @static false + stable labelGap: Dp = @static 4.dp + stable contentGap: Dp = @dynamic if (isTitle) { + 15 . dp +} else { + 4 . dp +} + + stable content: @[ExtensionFunctionType] Function3 ) restartable skippable scheme("[0, [0]]") fun withIncreaseFontScale( stable fontScale: Float diff --git a/ui/version.txt b/ui/version.txt index 89fb2a078..88b304c20 100644 --- a/ui/version.txt +++ b/ui/version.txt @@ -1 +1 @@ -2.0.0-alpha07 +2.0.0-alpha08 diff --git a/website/docs/relnotes/material.mdx b/website/docs/relnotes/material.mdx index e5e4b4ab8..ee1ba20c1 100644 --- a/website/docs/relnotes/material.mdx +++ b/website/docs/relnotes/material.mdx @@ -1,14 +1,26 @@ +## 2.0.0-alpha07 + +*2023-06-29* + +### New + +- Increase the deprecation level of `QuackImage` using `ImageVector` to Error. + +### Fixed + +- The trailing lambda of `quackClickable` is provided as `onClick` instead of `onLongClick`. ([#764](https://github.com/duckie-team/quack-quack-android/issues/764)) +- `quackClickable` starts referencing `InteractionSource` as an argument. ([#702](https://github.com/duckie-team/quack-quack-android/issues/702)) + ## 2.0.0-alpha06 *2023-06-05* ⚠️ This release includes a breaking change. -⚠️ This release does not include sugar component updates. - ### New - `QuackIcon` now uses an `ImageVector`. +- `QuackIcon` is now provided as a new `material-icon` artifact. ## 2.0.0-alpha05 diff --git a/website/docs/relnotes/ui.mdx b/website/docs/relnotes/ui.mdx index 55ca14c76..7ffe3b417 100644 --- a/website/docs/relnotes/ui.mdx +++ b/website/docs/relnotes/ui.mdx @@ -1,3 +1,24 @@ +## 2.0.0-alpha08 + +*2023-06-29* + +⚠️ This release does not include sugar component updates. + +⚠️ This release includes a breaking change. + +### New + +- The `compose-ui-text` artifact is now managed separately. + +### Changed + +- `QuackButton`'s arguments are reordered. (`text` and `style` come first) +- Modernize the typography of the `QuackPrimaryOutlinedRoundSmallButtonDefaults` style. + +### Fixed + +- Remove unnecessary inspections from the `QuackButton`. + ## 2.0.0-alpha07 *2023-06-05*