diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ProgressIndicator.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ProgressIndicator.kt index ef2ece8..00db1fb 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ProgressIndicator.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ProgressIndicator.kt @@ -6,7 +6,7 @@ * Apache License Version 2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. + * you may not use this file except in compliance using the License. * You may obtain a copy of the License at * * https://www.apache.org/licenses/LICENSE-2.0 @@ -19,7 +19,7 @@ * * This file is created by fankes on 2023/11/8. */ -@file:Suppress("unused", "ObjectPropertyName") +@file:Suppress("unused", "ObjectPropertyName", "ktlint:standard:backing-property-naming") package com.highcapable.flexiui.component @@ -226,7 +226,7 @@ fun CircularProgressIndicator( infiniteRepeatable( animation = keyframes { durationMillis = headAndTailAnimationDuration * 2 - 0f at 0 with CircularEasing + 0f at 0 using CircularEasing animation.jumpRotationAngle at headAndTailAnimationDuration } ) @@ -237,7 +237,7 @@ fun CircularProgressIndicator( infiniteRepeatable( animation = keyframes { durationMillis = headAndTailAnimationDuration * 2 - 0f at headAndTailAnimationDuration with CircularEasing + 0f at headAndTailAnimationDuration using CircularEasing animation.jumpRotationAngle at durationMillis } ) @@ -302,7 +302,7 @@ fun LinearProgressIndicator( infiniteRepeatable( animation = keyframes { durationMillis = animation.duration - 0f at animation.firstLineHeadDelay with FirstLineHeadEasing + 0f at animation.firstLineHeadDelay using FirstLineHeadEasing 1f at animation.firstLineHeadDuration + animation.firstLineHeadDelay } ) @@ -313,7 +313,7 @@ fun LinearProgressIndicator( infiniteRepeatable( animation = keyframes { durationMillis = animation.duration - 0f at animation.firstLineTailDelay with FirstLineTailEasing + 0f at animation.firstLineTailDelay using FirstLineTailEasing 1f at animation.firstLineTailDuration + animation.firstLineTailDelay } ) @@ -324,7 +324,7 @@ fun LinearProgressIndicator( infiniteRepeatable( animation = keyframes { durationMillis = animation.duration - 0f at animation.secondLineHeadDelay with SecondLineHeadEasing + 0f at animation.secondLineHeadDelay using SecondLineHeadEasing 1f at animation.secondLineHeadDuration + animation.secondLineHeadDelay } ) @@ -335,7 +335,7 @@ fun LinearProgressIndicator( infiniteRepeatable( animation = keyframes { durationMillis = animation.duration - 0f at animation.secondLineTailDelay with SecondLineTailEasing + 0f at animation.secondLineTailDelay using SecondLineTailEasing 1f at animation.secondLineTailDuration + animation.secondLineTailDelay } ) diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt index 5a76e05..e885837 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt @@ -85,7 +85,7 @@ fun Text( fontFamily: FontFamily? = null, letterSpacing: TextUnit = TextUnit.Unspecified, textDecoration: TextDecoration? = null, - textAlign: TextAlign? = null, + textAlign: TextAlign = TextAlign.Unspecified, lineHeight: TextUnit = TextUnit.Unspecified, singleLine: Boolean = false, maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE, @@ -152,7 +152,7 @@ fun Text( fontFamily: FontFamily? = null, letterSpacing: TextUnit = TextUnit.Unspecified, textDecoration: TextDecoration? = null, - textAlign: TextAlign? = null, + textAlign: TextAlign = TextAlign.Unspecified, lineHeight: TextUnit = TextUnit.Unspecified, singleLine: Boolean = false, maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE, @@ -224,7 +224,7 @@ fun SecondaryText( fontFamily: FontFamily? = null, letterSpacing: TextUnit = TextUnit.Unspecified, textDecoration: TextDecoration? = null, - textAlign: TextAlign? = null, + textAlign: TextAlign = TextAlign.Unspecified, lineHeight: TextUnit = TextUnit.Unspecified, singleLine: Boolean = false, maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE, @@ -291,7 +291,7 @@ fun SecondaryText( fontFamily: FontFamily? = null, letterSpacing: TextUnit = TextUnit.Unspecified, textDecoration: TextDecoration? = null, - textAlign: TextAlign? = null, + textAlign: TextAlign = TextAlign.Unspecified, lineHeight: TextUnit = TextUnit.Unspecified, singleLine: Boolean = false, maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE,