diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelView.kt index 6eeffdc27..6dab361ae 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelView.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.LocalTextStyle import androidx.compose.material.MaterialTheme import androidx.compose.material.OutlinedTextField import androidx.compose.material.Surface @@ -20,6 +21,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.style.TextDirection import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import androidx.lifecycle.viewmodel.compose.viewModel @@ -82,7 +84,7 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu keyboardOptions = KeyboardOptions.Default.copy( capitalization = KeyboardCapitalization.Sentences ), - textStyle = TextStyle(textDirection = TextDirection.Content) + textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content) ) Spacer(modifier = Modifier.height(15.dp)) @@ -116,7 +118,7 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu keyboardOptions = KeyboardOptions.Default.copy( capitalization = KeyboardCapitalization.Sentences ), - textStyle = TextStyle(textDirection = TextDirection.Content), + textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content), maxLines = 10 ) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt index 244ffd684..8fe0f8a30 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt @@ -16,6 +16,7 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.Button import androidx.compose.material.ButtonDefaults import androidx.compose.material.Icon +import androidx.compose.material.LocalTextStyle import androidx.compose.material.MaterialTheme import androidx.compose.material.OutlinedTextField import androidx.compose.material.Surface @@ -40,6 +41,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.style.TextDirection import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import androidx.lifecycle.viewmodel.compose.viewModel @@ -156,7 +158,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account focusedBorderColor = Color.Transparent ), visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary), - textStyle = TextStyle(textDirection = TextDirection.Content) + textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content) ) val userSuggestions = postViewModel.userSuggestions diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt index 78f551679..584bd72f3 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt @@ -3,12 +3,14 @@ package com.vitorpamplona.amethyst.ui.components import android.util.Patterns import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding +import androidx.compose.material.LocalTextStyle import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextDirection import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.navigation.NavController import com.google.accompanist.flowlayout.FlowRow import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil @@ -71,7 +73,10 @@ fun RichTextViewer(content: String, tags: List>?, navController: Na } else if (tagIndex.matcher(word).matches() && tags != null) { TagLink(word, tags, navController) } else { - Text(text = "$word ", style = TextStyle(textDirection = TextDirection.Content)) + Text( + text = "$word ", + style = LocalTextStyle.current.copy(textDirection = TextDirection.Content), + ) } } } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt index aef0b0e80..d00c4acfe 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.Divider +import androidx.compose.material.LocalTextStyle import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.runtime.Composable @@ -23,6 +24,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextDirection import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.navigation.NavController import coil.compose.AsyncImage import coil.compose.rememberAsyncImagePainter @@ -67,7 +69,7 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr "${channel.info.name}", fontWeight = FontWeight.Bold, modifier = it, - style = TextStyle(textDirection = TextDirection.Content) + style = LocalTextStyle.current.copy(textDirection = TextDirection.Content) ) Text( " Public Chat", @@ -156,7 +158,7 @@ fun ChannelName( color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f), maxLines = 1, overflow = TextOverflow.Ellipsis, - style = TextStyle(textDirection = TextDirection.Content) + style = LocalTextStyle.current.copy(textDirection = TextDirection.Content) ) else Text( diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt index 72694e345..f0f8436c3 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt @@ -15,6 +15,7 @@ import androidx.compose.material.Button import androidx.compose.material.ButtonDefaults import androidx.compose.material.Divider import androidx.compose.material.Icon +import androidx.compose.material.LocalTextStyle import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.material.TextField @@ -118,7 +119,7 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accoun color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f) ) }, - textStyle = TextStyle(textDirection = TextDirection.Content), + textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content), trailingIcon = { PostButton( onPost = { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt index fd9a49d09..9b6df7963 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.Divider +import androidx.compose.material.LocalTextStyle import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.material.TextField @@ -29,6 +30,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.style.TextDirection import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController import coil.compose.AsyncImage @@ -88,7 +90,7 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f) ) }, - textStyle = TextStyle(textDirection = TextDirection.Content), + textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content), trailingIcon = { PostButton( onPost = {