diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
index 5a9a65de3..04eb408b9 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
@@ -283,7 +283,7 @@ private fun DisplayAddress(
}
@Composable
-public fun DisplayUser(
+fun DisplayUser(
userHex: HexKey,
originalNip19: String,
additionalChars: String?,
@@ -320,7 +320,7 @@ public fun DisplayUser(
}
@Composable
-public fun RenderUserAsClickableText(
+fun RenderUserAsClickableText(
baseUser: User,
additionalChars: String?,
nav: INav,
@@ -328,7 +328,7 @@ public fun RenderUserAsClickableText(
val userState by observeUserInfo(baseUser)
CreateClickableTextWithEmoji(
- clickablePart = userState?.bestName() ?: ("@" + baseUser.pubkeyDisplayHex()),
+ clickablePart = "@" + (userState?.bestName() ?: baseUser.pubkeyDisplayHex()),
suffix = additionalChars?.ifBlank { null },
maxLines = 1,
route = remember(baseUser) { routeFor(baseUser) },
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt
index 33365c39d..5e1e8e4bd 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt
@@ -75,11 +75,7 @@ class MarkdownMediaRenderer(
uri: String,
): Boolean =
if (canPreview && uri.startsWith("http")) {
- if (title.isNullOrBlank() || title == uri) {
- true
- } else {
- false
- }
+ title.isNullOrBlank() || title == uri
} else {
false
}
@@ -189,7 +185,7 @@ class MarkdownMediaRenderer(
richTextStringBuilder: RichTextString.Builder,
) {
val tagWithoutHash = tag.removePrefix("#")
- renderAsCompleteLink(tag, "nostr:nashtag?id=$tagWithoutHash", richTextStringBuilder)
+ renderAsCompleteLink(tag, "nostr:hashtag?id=$tagWithoutHash", richTextStringBuilder)
val hashtagIcon: HashtagIcon? = checkForHashtagWithIcon(tagWithoutHash)
if (hashtagIcon != null) {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt
index 4e419bb82..3c4cba49a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt
@@ -20,7 +20,6 @@
*/
package com.vitorpamplona.amethyst.ui.note.types
-import android.R.attr.maxLines
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/DiscoverScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/DiscoverScreen.kt
index 6f6a77990..096efcdf4 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/DiscoverScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/DiscoverScreen.kt
@@ -25,7 +25,6 @@ import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.grid.GridCells
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/marketplace/NewProductScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/marketplace/NewProductScreen.kt
index 61166421c..2c45f957f 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/marketplace/NewProductScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/marketplace/NewProductScreen.kt
@@ -94,7 +94,6 @@ import com.vitorpamplona.amethyst.ui.note.creators.zapsplits.ForwardZapTo
import com.vitorpamplona.amethyst.ui.note.creators.zapsplits.ForwardZapToButton
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.DisplayPreviews
import com.vitorpamplona.amethyst.ui.screen.loggedIn.PostButton
import com.vitorpamplona.amethyst.ui.stringRes
import com.vitorpamplona.amethyst.ui.theme.FillWidthQuoteBorderModifier
diff --git a/amethyst/src/main/res/values-hu-rHU/strings.xml b/amethyst/src/main/res/values-hu-rHU/strings.xml
index f43bfc6ed..c37ff26a5 100644
--- a/amethyst/src/main/res/values-hu-rHU/strings.xml
+++ b/amethyst/src/main/res/values-hu-rHU/strings.xml
@@ -71,6 +71,8 @@
Hiba a hibaüzenet elemzésekor
" Követett"
" Követő"
+ "%1$s követett"
+ "%1$s követő"
Profil
Biztonsági szűrők
Kijelentkezés
@@ -155,6 +157,7 @@
Galéria
"Követett"
"Bejelentés"
+ "%1$s jelentés"
További beállítások
" Átjátszó"
Weboldal
@@ -795,6 +798,7 @@
Új bejegyzés
Új rövidek: képek vagy videók
Új közösségi bejegyzés
+ Új termék
A bejegyzésre adott összes reakció kibontása
A bejegyzésre adott összes reakció összecsukása
Válasz