Skip to content

Use TextButton instead of Button with Clickable in Settings Dialog #1760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dturner merged 3 commits into from
Dec 18, 2024
Merged

Use TextButton instead of Button with Clickable in Settings Dialog #1760

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20e568e
Update SettingsDialog.kt
Stillswarm Dec 18, 2024
a6680e4
Update feature/settings/src/main/kotlin/com/google/samples/apps/nowin…
dturner Dec 18, 2024
9a183d5
Fix spotless
dturner Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions ...s/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import android.content.Intent
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
Expand All @@ -41,6 +40,7 @@
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
Expand Down Expand Up @@ -141,14 +141,13 @@
TrackScreenViewEvent(screenName = "Settings")
},
confirmButton = {
Text(
text = stringResource(string.feature_settings_dismiss_dialog_button_text),
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.primary,
modifier = Modifier
.padding(horizontal = 8.dp)
.clickable { onDismiss() },
)
TextButton(onClick = onDismiss) {
Text(
text = stringResource(string.feature_settings_dismiss_dialog_button_text),
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.primary,
)
}
},
)
}
Expand Down
Loading