Skip to content

Commit 84b70ab

Browse files
committed
Review: Use labelArgument method instead of typedArgument everywhere it's possible
1 parent 9058d92 commit 84b70ab

6 files changed

Lines changed: 13 additions & 7 deletions

File tree

app/src/main/java/com/orange/ouds/app/ui/components/alert/AlertMessageDemoScreen.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import androidx.compose.ui.res.stringResource
2323
import androidx.compose.ui.tooling.preview.PreviewLightDark
2424
import com.orange.ouds.app.R
2525
import com.orange.ouds.app.ui.components.alert.AlertMessageDemoState.Companion.MaxBulletCount
26+
import com.orange.ouds.app.ui.components.labelArgument
2627
import com.orange.ouds.app.ui.components.painterArgument
2728
import com.orange.ouds.app.ui.utilities.Code
2829
import com.orange.ouds.app.ui.utilities.LocalThemeDrawableResources
@@ -202,7 +203,7 @@ private fun Code.Builder.alertMessageDemoCodeSnippet(state: AlertMessageDemoStat
202203
rawArgument(statusParameterName, status::class.java.nestedName)
203204
}
204205
}
205-
typedArgument("label", label)
206+
labelArgument(label)
206207
description?.let { typedArgument("description", description) }
207208
if (hasCloseButton) {
208209
lambdaArgument("onClose") {
@@ -211,7 +212,7 @@ private fun Code.Builder.alertMessageDemoCodeSnippet(state: AlertMessageDemoStat
211212
}
212213
if (!actionLink.isNullOrEmpty()) {
213214
functionCallArgument("actionLink", OudsAlertMessageActionLink::class.java.simpleName) {
214-
typedArgument("label", actionLink)
215+
labelArgument(actionLink)
215216
lambdaArgument("onClick") {
216217
comment("Implement click")
217218
}

app/src/main/java/com/orange/ouds/app/ui/components/alert/InlineAlertDemoScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import androidx.compose.ui.res.painterResource
2323
import androidx.compose.ui.res.stringResource
2424
import androidx.compose.ui.tooling.preview.PreviewLightDark
2525
import com.orange.ouds.app.R
26+
import com.orange.ouds.app.ui.components.labelArgument
2627
import com.orange.ouds.app.ui.components.painterArgument
2728
import com.orange.ouds.app.ui.utilities.Code
2829
import com.orange.ouds.app.ui.utilities.LocalThemeDrawableResources
@@ -144,7 +145,7 @@ private fun Code.Builder.inlineAlertDemoCodeSnippet(state: InlineAlertDemoState,
144145
rawArgument(statusParameterName, status::class.java.nestedName)
145146
}
146147
}
147-
typedArgument("label", label)
148+
labelArgument(label)
148149
}
149150
}
150151
}

app/src/main/java/com/orange/ouds/app/ui/components/bulletlist/BulletListDemoScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import com.orange.ouds.app.R
2424
import com.orange.ouds.app.ui.components.Component
2525
import com.orange.ouds.app.ui.components.bulletlist.BulletListDemoState.Companion.MaxLevelCount
2626
import com.orange.ouds.app.ui.components.bulletlist.BulletListDemoState.Companion.MinLevelCount
27+
import com.orange.ouds.app.ui.components.labelArgument
2728
import com.orange.ouds.app.ui.components.painterArgument
2829
import com.orange.ouds.app.ui.utilities.Code
2930
import com.orange.ouds.app.ui.utilities.LocalThemeDrawableResources
@@ -216,7 +217,7 @@ private fun Code.Builder.bulletListDemoCodeSnippet(state: BulletListDemoState, t
216217
private fun Code.Builder.itemFunctionCall(label: String, content: (Code.Builder.() -> Unit)? = null) = functionCall("item") {
217218
trailingLambda = true
218219
isMultiline = false
219-
typedArgument("label", label)
220+
labelArgument(label)
220221
content?.let {
221222
lambdaArgument("builder") {
222223
content()

app/src/main/java/com/orange/ouds/app/ui/components/floatingactionbutton/FloatingActionButtonDemoScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark
1919
import com.orange.ouds.app.R
2020
import com.orange.ouds.app.ui.components.Component
2121
import com.orange.ouds.app.ui.components.contentDescriptionArgument
22+
import com.orange.ouds.app.ui.components.labelArgument
2223
import com.orange.ouds.app.ui.components.onClickArgument
2324
import com.orange.ouds.app.ui.components.painterArgument
2425
import com.orange.ouds.app.ui.utilities.Code
@@ -151,7 +152,7 @@ private fun Code.Builder.floatingActionButtonDemoCodeSnippet(state: FloatingActi
151152
}
152153
functionCall(functionName) {
153154
if (layout != FloatingActionButtonDemoState.Layout.IconOnly) {
154-
typedArgument("label", label)
155+
labelArgument(label)
155156
}
156157
if (layout != FloatingActionButtonDemoState.Layout.TextOnly) {
157158
constructorCallArgument<OudsFloatingActionButtonIcon>("icon") {

app/src/main/java/com/orange/ouds/app/ui/components/passwordinput/PasswordInputDemoScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import com.orange.ouds.app.R
2020
import com.orange.ouds.app.ui.components.Component
2121
import com.orange.ouds.app.ui.components.constrainedMaxWidthArgument
2222
import com.orange.ouds.app.ui.components.enabledArgument
23+
import com.orange.ouds.app.ui.components.labelArgument
2324
import com.orange.ouds.app.ui.components.readOnlyArgument
2425
import com.orange.ouds.app.ui.utilities.Code
2526
import com.orange.ouds.app.ui.utilities.composable.AppPreview
@@ -155,7 +156,7 @@ private fun Code.Builder.passwordInputDemoCodeSnippet(state: PasswordInputDemoSt
155156
lambdaArgument("onValueChange") {
156157
comment("Update value")
157158
}
158-
if (label.isNotEmpty()) typedArgument("label", label)
159+
if (label.isNotEmpty()) labelArgument(label)
159160
if (placeholder.isNotEmpty()) typedArgument("placeholder", placeholder)
160161
typedArgument("outlined", outlined)
161162
if (lockIcon) typedArgument("lockIcon", lockIcon)

app/src/main/java/com/orange/ouds/app/ui/components/textinput/TextInputDemoScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import com.orange.ouds.app.ui.components.Component
2222
import com.orange.ouds.app.ui.components.constrainedMaxWidthArgument
2323
import com.orange.ouds.app.ui.components.contentDescriptionArgument
2424
import com.orange.ouds.app.ui.components.enabledArgument
25+
import com.orange.ouds.app.ui.components.labelArgument
2526
import com.orange.ouds.app.ui.components.onClickArgument
2627
import com.orange.ouds.app.ui.components.painterArgument
2728
import com.orange.ouds.app.ui.components.readOnlyArgument
@@ -189,7 +190,7 @@ private fun Code.Builder.textInputDemoCodeSnippet(state: TextInputDemoState, the
189190
with(state) {
190191
functionCall("OudsTextInput") {
191192
functionCallArgument("textFieldState", "rememberTextFieldState")
192-
if (label.isNotEmpty()) typedArgument("label", label)
193+
if (label.isNotEmpty()) labelArgument(label)
193194
if (placeholder.isNotEmpty()) typedArgument("placeholder", placeholder)
194195
typedArgument("outlined", outlined)
195196
if (leadingIcon) {

0 commit comments

Comments
 (0)