Fixing new line of Loading Animation and Download buttons for images.

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt

@@ -103,8 +103,7 @@ fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, re
                 TopAppBar(
                     title = {
                         Row(
-                            modifier = Modifier
-                                .fillMaxWidth(),
+                            modifier = Modifier.fillMaxWidth(),
                             horizontalArrangement = Arrangement.SpaceBetween,
                             verticalAlignment = Alignment.CenterVertically
                         ) {

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt

@@ -685,7 +685,8 @@ fun InLineIconRenderer(
         }
     }.associate { it.first to it.second }
 
-    val annotatedText = buildAnnotatedString {
+    val annotatedText = remember {
+        buildAnnotatedString {
             wordsInOrder.forEachIndexed { idx, value ->
                 withStyle(
                     style
@@ -698,6 +699,7 @@ fun InLineIconRenderer(
                 }
             }
         }
+    }
 
     Text(
         text = annotatedText,

app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt

@@ -556,17 +556,16 @@ private fun RenderHashtag(
     nav: (String) -> Unit
 ) {
     val primary = MaterialTheme.colorScheme.primary
+    val background = MaterialTheme.colorScheme.onBackground
     val hashtagIcon = remember(segment.hashtag) {
         checkForHashtagWithIcon(segment.hashtag, primary)
     }
 
-    val regularText =
-        SpanStyle(color = MaterialTheme.colorScheme.onBackground)
+    val regularText = remember { SpanStyle(color = background) }
+    val clickableTextStyle = remember { SpanStyle(color = primary) }
 
-    val clickableTextStyle =
-        SpanStyle(color = primary)
-
-    val annotatedTermsString = buildAnnotatedString {
+    val annotatedTermsString = remember {
+        buildAnnotatedString {
             withStyle(clickableTextStyle) {
                 pushStringAnnotation("routeToHashtag", "")
                 append("#${segment.hashtag}")
@@ -585,6 +584,7 @@ private fun RenderHashtag(
                 }
             }
         }
+    }
 
     val inlineContent = if (hashtagIcon != null) {
         mapOf("inlineContent" to InlineIcon(hashtagIcon))
@@ -592,9 +592,11 @@ private fun RenderHashtag(
         emptyMap()
     }
 
-    val pressIndicator = Modifier.clickable {
+    val pressIndicator = remember {
+        Modifier.clickable {
             nav("Hashtag/${segment.hashtag}")
         }
+    }
 
     Text(
         text = annotatedTermsString,

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt

@@ -41,7 +41,6 @@ import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Surface
@@ -62,11 +61,13 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.Placeholder
 import androidx.compose.ui.text.PlaceholderVerticalAlign
+import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.Dp
@@ -305,7 +306,9 @@ private fun LocalImageView(
             }
 
             val verifierModifier = if (topPaddingForControllers.isSpecified) {
-                Modifier.padding(top = topPaddingForControllers).align(Alignment.TopEnd)
+                Modifier
+                    .padding(top = topPaddingForControllers)
+                    .align(Alignment.TopEnd)
             } else {
                 Modifier.align(Alignment.TopEnd)
             }
@@ -373,7 +376,9 @@ private fun UrlImageView(
         }
 
         val verifierModifier = if (topPaddingForControllers.isSpecified) {
-            Modifier.padding(top = topPaddingForControllers).align(Alignment.TopEnd)
+            Modifier
+                .padding(top = topPaddingForControllers)
+                .align(Alignment.TopEnd)
         } else {
             Modifier.align(Alignment.TopEnd)
         }
@@ -405,11 +410,58 @@ private fun UrlImageView(
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun ImageUrlWithDownloadButton(url: String, showImage: MutableState<Boolean>) {
-    FlowRow() {
-        ClickableUrl(urlText = url, url = url)
+    val uri = LocalUriHandler.current
+
+    val primary = MaterialTheme.colorScheme.primary
+    val background = MaterialTheme.colorScheme.onBackground
+
+    val regularText = remember { SpanStyle(color = background) }
+    val clickableTextStyle = remember { SpanStyle(color = primary) }
+
+    val annotatedTermsString = remember {
+        buildAnnotatedString {
+            withStyle(clickableTextStyle) {
+                pushStringAnnotation("routeToImage", "")
+                append("$url ")
+            }
+
+            withStyle(clickableTextStyle) {
+                pushStringAnnotation("routeToImage", "")
+                appendInlineContent("inlineContent", "[icon]")
+            }
+
+            withStyle(regularText) {
+                append(" ")
+            }
+        }
+    }
+
+    val inlineContent = mapOf("inlineContent" to InlineDownloadIcon(showImage))
+
+    val pressIndicator = remember {
+        Modifier.clickable {
+            runCatching { uri.openUri(url) }
+        }
+    }
+
+    Text(
+        text = annotatedTermsString,
+        modifier = pressIndicator,
+        inlineContent = inlineContent
+    )
+}
+
+@Composable
+private fun InlineDownloadIcon(showImage: MutableState<Boolean>) =
+    InlineTextContent(
+        Placeholder(
+            width = Font17SP,
+            height = Font17SP,
+            placeholderVerticalAlign = PlaceholderVerticalAlign.Center
+        )
+    ) {
         IconButton(
             modifier = Modifier.size(Size20dp),
             onClick = { showImage.value = true }
@@ -417,7 +469,6 @@ fun ImageUrlWithDownloadButton(url: String, showImage: MutableState<Boolean>) {
             DownloadForOfflineIcon(Size24dp)
         }
     }
-}
 
 @Composable
 @OptIn(ExperimentalLayoutApi::class)
@@ -548,24 +599,59 @@ private fun DisplayUrlWithLoadingSymbol(content: ZoomableContent) {
 
 @Composable
 private fun DisplayUrlWithLoadingSymbolWait(content: ZoomableContent) {
+    val uri = LocalUriHandler.current
+
+    val primary = MaterialTheme.colorScheme.primary
+    val background = MaterialTheme.colorScheme.onBackground
+
+    val regularText = remember { SpanStyle(color = background) }
+    val clickableTextStyle = remember { SpanStyle(color = primary) }
+
+    val annotatedTermsString = remember {
+        buildAnnotatedString {
             if (content is ZoomableUrlContent) {
-        ClickableUrl(urlText = remember { "${content.url} " }, url = content.url)
+                withStyle(clickableTextStyle) {
+                    pushStringAnnotation("routeToImage", "")
+                    append(content.url + " ")
+                }
             } else {
-        Text("Loading content... ")
+                withStyle(regularText) {
+                    append("Loading content...")
+                }
             }
 
-    val myId = "inlineContent"
-    val emptytext = buildAnnotatedString {
-        withStyle(
-            LocalTextStyle.current.copy(color = MaterialTheme.colorScheme.primary).toSpanStyle()
-        ) {
-            append("")
-            appendInlineContent(myId, "[icon]")
+            withStyle(clickableTextStyle) {
+                pushStringAnnotation("routeToImage", "")
+                appendInlineContent("inlineContent", "[icon]")
+            }
+
+            withStyle(regularText) {
+                append(" ")
             }
         }
-    val inlineContent = mapOf(
-        Pair(
-            myId,
+    }
+
+    val inlineContent = mapOf("inlineContent" to InlineLoadingIcon())
+
+    val pressIndicator = remember {
+        if (content is ZoomableUrlContent) {
+            Modifier.clickable {
+                runCatching { uri.openUri(content.url) }
+            }
+        } else {
+            Modifier
+        }
+    }
+
+    Text(
+        text = annotatedTermsString,
+        modifier = pressIndicator,
+        inlineContent = inlineContent
+    )
+}
+
+@Composable
+private fun InlineLoadingIcon() =
     InlineTextContent(
         Placeholder(
             width = Font17SP,
@@ -575,15 +661,6 @@ private fun DisplayUrlWithLoadingSymbolWait(content: ZoomableContent) {
     ) {
         LoadingAnimation()
     }
-        )
-    )
-
-    // Empty Text for Size of Icon
-    Text(
-        text = emptytext,
-        inlineContent = inlineContent
-    )
-}
 
 @Composable
 private fun DisplayBlurHash(

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt

@@ -4,7 +4,6 @@ import androidx.compose.animation.Crossfade
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -55,15 +54,13 @@ fun RefresheableCardView(
     )
 
     val modifier = if (enablePullRefresh) {
-        Modifier.pullRefresh(pullRefreshState)
+        Modifier.fillMaxSize().pullRefresh(pullRefreshState)
     } else {
-        Modifier
+        Modifier.fillMaxSize()
     }
 
     Box(modifier) {
-        Column {
         SaveableCardFeedState(viewModel, accountViewModel, nav, routeForLastRead, scrollStateKey)
-        }
 
         if (enablePullRefresh) {
             PullRefreshIndicator(refreshing, pullRefreshState, Modifier.align(Alignment.TopCenter))

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/RelayFeedView.kt

@@ -2,7 +2,7 @@ package com.vitorpamplona.amethyst.ui.screen
 
 import android.util.Log
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -126,13 +126,12 @@ fun RelayFeedView(
     val pullRefreshState = rememberPullRefreshState(refreshing, onRefresh = refresh)
 
     val modifier = if (enablePullRefresh) {
-        Modifier.pullRefresh(pullRefreshState)
+        Modifier.fillMaxSize().pullRefresh(pullRefreshState)
     } else {
-        Modifier
+        Modifier.fillMaxSize()
     }
 
     Box(modifier) {
-        Column() {
         val listState = rememberLazyListState()
 
         LazyColumn(
@@ -148,7 +147,6 @@ fun RelayFeedView(
                 )
             }
         }
-        }
 
         if (enablePullRefresh) {
             PullRefreshIndicator(refreshing, pullRefreshState, Modifier.align(Alignment.TopCenter))

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/BookmarkListScreen.kt

@@ -3,7 +3,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material3.MaterialTheme
@@ -17,7 +16,6 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.dal.BookmarkPrivateFeedFilter
@@ -31,17 +29,13 @@ import kotlinx.coroutines.launch
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun BookmarkListScreen(accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account
-
-    if (account != null) {
-        BookmarkPublicFeedFilter.account = account
-        BookmarkPrivateFeedFilter.account = account
+    BookmarkPublicFeedFilter.account = accountViewModel.account
+    BookmarkPrivateFeedFilter.account = accountViewModel.account
 
     val publicFeedViewModel: NostrBookmarkPublicFeedViewModel = viewModel()
     val privateFeedViewModel: NostrBookmarkPrivateFeedViewModel = viewModel()
 
-        val userState by account.userProfile().live().bookmarks.observeAsState()
+    val userState by accountViewModel.account.userProfile().live().bookmarks.observeAsState()
 
     LaunchedEffect(userState) {
         publicFeedViewModel.invalidateData()
@@ -49,7 +43,6 @@ fun BookmarkListScreen(accountViewModel: AccountViewModel, nav: (String) -> Unit
     }
 
     Column(Modifier.fillMaxHeight()) {
-            Column(modifier = Modifier.padding(start = 10.dp, end = 10.dp)) {
         val pagerState = rememberPagerState() { 2 }
         val coroutineScope = rememberCoroutineScope()
 
@@ -91,6 +84,4 @@ fun BookmarkListScreen(accountViewModel: AccountViewModel, nav: (String) -> Unit
             }
         }
     }
-        }
-    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HiddenUsersScreen.kt

@@ -58,7 +58,6 @@ import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.ButtonPadding
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.HorzPadding
-import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.StdPadding
 import com.vitorpamplona.amethyst.ui.theme.TabRowHeight
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -109,7 +108,6 @@ fun HiddenUsersScreen(
     }
 
     Column(Modifier.fillMaxHeight()) {
-        Column(modifier = Modifier.padding(start = 10.dp, end = 10.dp)) {
         val pagerState = rememberPagerState() { 3 }
         val coroutineScope = rememberCoroutineScope()
         var warnAboutReports by remember { mutableStateOf(accountViewModel.account.warnAboutPostsWithReports) }
@@ -183,7 +181,6 @@ fun HiddenUsersScreen(
             }
         }
     }
-    }
 }
 
 @Composable
@@ -203,7 +200,7 @@ private fun HiddenWordsFeed(
 
 @Composable
 private fun AddMuteWordTextField(accountViewModel: AccountViewModel) {
-    Row(modifier = Modifier.padding(vertical = Size10dp)) {
+    Row() {
         val currentWordToAdd = remember {
             mutableStateOf("")
         }
@@ -217,7 +214,7 @@ private fun AddMuteWordTextField(accountViewModel: AccountViewModel) {
             value = currentWordToAdd.value,
             onValueChange = { currentWordToAdd.value = it },
             label = { Text(text = stringResource(R.string.hide_new_word_label)) },
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth().padding(10.dp),
             placeholder = {
                 Text(
                     text = stringResource(R.string.hide_new_word_label),

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt

@@ -97,9 +97,6 @@ fun NotificationScreen(
     }
 
     Column(Modifier.fillMaxHeight()) {
-        Column(
-            modifier = Modifier.padding(vertical = 0.dp)
-        ) {
         SummaryBar(
             model = userReactionsStatsModel
         )
@@ -112,7 +109,6 @@ fun NotificationScreen(
             scrollStateKey = ScrollStateKeys.NOTIFICATION_SCREEN
         )
     }
-    }
 }
 
 @OptIn(ExperimentalPermissionsApi::class)

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SettingsScreen.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.windowInsetsPadding
@@ -132,6 +133,7 @@ fun SettingsScreen(
 
     Column(
         Modifier
+            .fillMaxSize()
             .padding(top = Size10dp, start = Size20dp, end = Size20dp)
             .verticalScroll(rememberScrollState()),
         horizontalAlignment = Alignment.CenterHorizontally