Rename button to bottomContent

mkhotych · mkhotych · commit 3530b7408aa5 · 2025-10-20T16:47:49.000+03:00
diff --git a/design/api/current.api b/design/api/current.api
@@ -138,8 +138,8 @@ package com.urlaunched.android.design.ui.downloadingprogressdialog {
   }
 
   public final class DownloadingProgressDialogKt {
-    method @androidx.compose.runtime.Composable public static void BaseDownloadingProgressDialog(optional androidx.compose.ui.Modifier modifier, @com.composables.core.androidx.annotation.FloatRange(from=0.0, to=1.0) float progress, optional String? progressText, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressTextStyle progressTextStyle, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressBarStyle progressBarStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional long dialogContainerColor, optional androidx.compose.ui.graphics.Shape dialogContainerShape, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.window.DialogProperties dialogProperties, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? title, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? description, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? supportingText, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? button);
-    method @androidx.compose.runtime.Composable public static void DownloadingProgressDialog(optional androidx.compose.ui.Modifier modifier, @com.composables.core.androidx.annotation.FloatRange(from=0.0, to=1.0) float progress, optional String? progressText, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressTextStyle progressTextStyle, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressBarStyle progressBarStyle, optional long dialogContainerColor, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.graphics.Shape dialogContainerShape, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.window.DialogProperties dialogProperties, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? title, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? description, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? supportingText, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? button);
+    method @androidx.compose.runtime.Composable public static void BaseDownloadingProgressDialog(optional androidx.compose.ui.Modifier modifier, @com.composables.core.androidx.annotation.FloatRange(from=0.0, to=1.0) float progress, optional String? progressText, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressTextStyle progressTextStyle, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressBarStyle progressBarStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional long dialogContainerColor, optional androidx.compose.ui.graphics.Shape dialogContainerShape, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.window.DialogProperties dialogProperties, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? title, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? description, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? supportingText, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? bottomContent);
+    method @androidx.compose.runtime.Composable public static void DownloadingProgressDialog(optional androidx.compose.ui.Modifier modifier, @com.composables.core.androidx.annotation.FloatRange(from=0.0, to=1.0) float progress, optional String? progressText, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressTextStyle progressTextStyle, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressBarStyle progressBarStyle, optional long dialogContainerColor, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.graphics.Shape dialogContainerShape, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.window.DialogProperties dialogProperties, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? title, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? description, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? supportingText, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? bottomContent);
   }
 
 }
diff --git a/design/src/main/java/com/urlaunched/android/design/ui/downloadingprogressdialog/DownloadingProgressDialog.kt b/design/src/main/java/com/urlaunched/android/design/ui/downloadingprogressdialog/DownloadingProgressDialog.kt
@@ -46,7 +46,7 @@ fun DownloadingProgressDialog(
     title: (@Composable ColumnScope.() -> Unit)? = null,
     description: (@Composable ColumnScope.() -> Unit)? = null,
     supportingText: (@Composable BoxScope.() -> Unit)? = null,
-    button: (@Composable ColumnScope.() -> Unit)? = null
+    bottomContent: (@Composable ColumnScope.() -> Unit)? = null
 ) {
     BaseDownloadingProgressDialog(
         progress = progress,
@@ -74,15 +74,15 @@ fun DownloadingProgressDialog(
             }
         },
         supportingText = supportingText,
-        button = button?.let { buttonContent ->
+        bottomContent = bottomContent?.let { bottomContent ->
             @Composable {
                 Column(
                     modifier = Modifier.fillMaxWidth(),
                     horizontalAlignment = Alignment.End
                 ) {
                     Spacer(modifier = Modifier.height(Dimens.spacingLarge))
 
-                    buttonContent()
+                    bottomContent()
                 }
             }
         }
@@ -106,7 +106,7 @@ fun BaseDownloadingProgressDialog(
     title: (@Composable ColumnScope.() -> Unit)? = null,
     description: (@Composable ColumnScope.() -> Unit)? = null,
     supportingText: (@Composable BoxScope.() -> Unit)? = null,
-    button: (@Composable ColumnScope.() -> Unit)? = null
+    bottomContent: (@Composable ColumnScope.() -> Unit)? = null
 ) {
     BasicAlertDialog(
         modifier = modifier,
@@ -138,7 +138,7 @@ fun BaseDownloadingProgressDialog(
                     supportingText = supportingText
                 )
 
-                button?.invoke(this@Column)
+                bottomContent?.invoke(this@Column)
             }
         }
     )
@@ -178,7 +178,7 @@ private fun BaseDownloadingProgressDialogPreview() {
                 }
             }
         },
-        button = {
+        bottomContent = {
             TextButton(
                 onClick = {}
             ) {
@@ -222,7 +222,7 @@ private fun DownloadingProgressDialogPreview() {
                 }
             }
         },
-        button = {
+        bottomContent = {
             TextButton(
                 onClick = {}
             ) {

Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,8 @@ package com.urlaunched.android.design.ui.downloadingprogressdialog {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`public final class DownloadingProgressDialogKt {`
`141`		- method @androidx.compose.runtime.Composable public static void BaseDownloadingProgressDialog(optional androidx.compose.ui.Modifier modifier, @com.composables.core.androidx.annotation.FloatRange(from=0.0, to=1.0) float progress, optional String? progressText, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressTextStyle progressTextStyle, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressBarStyle progressBarStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional long dialogContainerColor, optional androidx.compose.ui.graphics.Shape dialogContainerShape, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.window.DialogProperties dialogProperties, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? title, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? description, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? supportingText, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? button);
`142`		- method @androidx.compose.runtime.Composable public static void DownloadingProgressDialog(optional androidx.compose.ui.Modifier modifier, @com.composables.core.androidx.annotation.FloatRange(from=0.0, to=1.0) float progress, optional String? progressText, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressTextStyle progressTextStyle, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressBarStyle progressBarStyle, optional long dialogContainerColor, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.graphics.Shape dialogContainerShape, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.window.DialogProperties dialogProperties, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? title, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? description, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? supportingText, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? button);
	`141`	+ method @androidx.compose.runtime.Composable public static void BaseDownloadingProgressDialog(optional androidx.compose.ui.Modifier modifier, @com.composables.core.androidx.annotation.FloatRange(from=0.0, to=1.0) float progress, optional String? progressText, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressTextStyle progressTextStyle, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressBarStyle progressBarStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional long dialogContainerColor, optional androidx.compose.ui.graphics.Shape dialogContainerShape, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.window.DialogProperties dialogProperties, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? title, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? description, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? supportingText, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? bottomContent);
	`142`	+ method @androidx.compose.runtime.Composable public static void DownloadingProgressDialog(optional androidx.compose.ui.Modifier modifier, @com.composables.core.androidx.annotation.FloatRange(from=0.0, to=1.0) float progress, optional String? progressText, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressTextStyle progressTextStyle, optional com.urlaunched.android.design.ui.downloadingprogressdialog.models.ProgressBarStyle progressBarStyle, optional long dialogContainerColor, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.graphics.Shape dialogContainerShape, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.window.DialogProperties dialogProperties, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? title, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? description, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? supportingText, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? bottomContent);
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ fun DownloadingProgressDialog(`
`46`	`46`	`title: (@Composable ColumnScope.() -> Unit)? = null,`
`47`	`47`	`description: (@Composable ColumnScope.() -> Unit)? = null,`
`48`	`48`	`supportingText: (@Composable BoxScope.() -> Unit)? = null,`
`49`		`- button: (@Composable ColumnScope.() -> Unit)? = null`
	`49`	`+ bottomContent: (@Composable ColumnScope.() -> Unit)? = null`
`50`	`50`	`) {`
`51`	`51`	`BaseDownloadingProgressDialog(`
`52`	`52`	`progress = progress,`
`@@ -74,15 +74,15 @@ fun DownloadingProgressDialog(`
`74`	`74`	`}`
`75`	`75`	`},`
`76`	`76`	`supportingText = supportingText,`
`77`		`- button = button?.let { buttonContent ->`
	`77`	`+ bottomContent = bottomContent?.let { bottomContent ->`
`78`	`78`	`@Composable {`
`79`	`79`	`Column(`
`80`	`80`	`modifier = Modifier.fillMaxWidth(),`
`81`	`81`	`horizontalAlignment = Alignment.End`
`82`	`82`	`) {`
`83`	`83`	`Spacer(modifier = Modifier.height(Dimens.spacingLarge))`
`84`	`84`
`85`		`- buttonContent()`
	`85`	`+ bottomContent()`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
`@@ -106,7 +106,7 @@ fun BaseDownloadingProgressDialog(`
`106`	`106`	`title: (@Composable ColumnScope.() -> Unit)? = null,`
`107`	`107`	`description: (@Composable ColumnScope.() -> Unit)? = null,`
`108`	`108`	`supportingText: (@Composable BoxScope.() -> Unit)? = null,`
`109`		`- button: (@Composable ColumnScope.() -> Unit)? = null`
	`109`	`+ bottomContent: (@Composable ColumnScope.() -> Unit)? = null`
`110`	`110`	`) {`
`111`	`111`	`BasicAlertDialog(`
`112`	`112`	`modifier = modifier,`
`@@ -138,7 +138,7 @@ fun BaseDownloadingProgressDialog(`
`138`	`138`	`supportingText = supportingText`
`139`	`139`	`)`
`140`	`140`
`141`		`- button?.invoke(this@Column)`
	`141`	`+ bottomContent?.invoke(this@Column)`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`)`
`@@ -178,7 +178,7 @@ private fun BaseDownloadingProgressDialogPreview() {`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`	`},`
`181`		`- button = {`
	`181`	`+ bottomContent = {`
`182`	`182`	`TextButton(`
`183`	`183`	`onClick = {}`
`184`	`184`	`) {`
`@@ -222,7 +222,7 @@ private fun DownloadingProgressDialogPreview() {`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`},`
`225`		`- button = {`
	`225`	`+ bottomContent = {`
`226`	`226`	`TextButton(`
`227`	`227`	`onClick = {}`
`228`	`228`	`) {`