diff options
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/compose')
3 files changed, 20 insertions, 20 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/compose/QrCodeUriComposable.kt b/wallet/src/main/java/net/taler/wallet/compose/QrCodeUriComposable.kt index 5359f1a..0157f90 100644 --- a/wallet/src/main/java/net/taler/wallet/compose/QrCodeUriComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/compose/QrCodeUriComposable.kt @@ -29,12 +29,12 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState -import androidx.compose.material.Button -import androidx.compose.material.ButtonColors -import androidx.compose.material.ButtonDefaults -import androidx.compose.material.Icon -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Text +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonColors +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ContentCopy import androidx.compose.runtime.Composable @@ -86,7 +86,7 @@ fun ColumnScope.QrCodeUriComposable( Text( modifier = Modifier.horizontalScroll(scrollState), fontFamily = FontFamily.Monospace, - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.bodyLarge, text = talerUri, ) } @@ -100,11 +100,11 @@ fun ColumnScope.QrCodeUriComposable( label = clipBoardLabel, content = talerUri, buttonText = buttonText, - colors = ButtonDefaults.buttonColors(backgroundColor = Color.Transparent) + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent) ) ShareButton( content = talerUri, - colors = ButtonDefaults.buttonColors(backgroundColor = Color.Transparent) + colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent) ) } } @@ -136,7 +136,7 @@ fun CopyToClipboardButton( Text( modifier = Modifier.padding(start = 8.dp), text = buttonText, - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.bodyLarge, ) } } diff --git a/wallet/src/main/java/net/taler/wallet/compose/ShareButton.kt b/wallet/src/main/java/net/taler/wallet/compose/ShareButton.kt index 0ac7048..ebf2a2f 100644 --- a/wallet/src/main/java/net/taler/wallet/compose/ShareButton.kt +++ b/wallet/src/main/java/net/taler/wallet/compose/ShareButton.kt @@ -21,12 +21,12 @@ import android.content.Intent.ACTION_SEND import android.content.Intent.EXTRA_TEXT import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding -import androidx.compose.material.Button -import androidx.compose.material.ButtonColors -import androidx.compose.material.ButtonDefaults -import androidx.compose.material.Icon -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Text +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonColors +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Share import androidx.compose.runtime.Composable @@ -64,7 +64,7 @@ fun ShareButton( Text( modifier = Modifier.padding(start = 8.dp), text = buttonText, - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.bodyLarge, ) } } diff --git a/wallet/src/main/java/net/taler/wallet/compose/Utils.kt b/wallet/src/main/java/net/taler/wallet/compose/Utils.kt index 8e3a032..9a27431 100644 --- a/wallet/src/main/java/net/taler/wallet/compose/Utils.kt +++ b/wallet/src/main/java/net/taler/wallet/compose/Utils.kt @@ -16,7 +16,7 @@ package net.taler.wallet.compose -import androidx.compose.material.Surface +import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.collectAsState @@ -25,7 +25,7 @@ import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.flowWithLifecycle -import com.google.accompanist.themeadapter.material.MdcTheme +import com.google.accompanist.themeadapter.material3.Mdc3Theme import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow import kotlin.coroutines.CoroutineContext @@ -56,7 +56,7 @@ fun <T> StateFlow<T>.collectAsStateLifecycleAware( @Composable fun TalerSurface(content: @Composable () -> Unit) { - MdcTheme { + Mdc3Theme { Surface { content() } |