nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

merge

Browse Source
This commit is contained in:
Vitor Pamplona
2025-05-13 14:53:00 -04:00
parent 6ecb25b8e1 a5c63dd311
commit a42afdc78b
12 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt
+4
View File
@@ -80,6 +80,10 @@ class MarkdownMediaRenderer(
false
}
override fun shouldSanitizeUriLabel(): Boolean = true
override fun sanitizeUriLabel(label: String): String = label.filterNot { it == '#' || it == '@' }
override fun renderImage(
title: String?,
uri: String,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Gallery.kt
-1
View File
@@ -36,7 +36,6 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.vitorpamplona.amethyst.model.User
import com.vitorpamplona.amethyst.ui.navigation.EmptyNav.nav
import com.vitorpamplona.amethyst.ui.navigation.INav
import com.vitorpamplona.amethyst.ui.navigation.routeFor
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/ephemChat/metadata/NewEphemeralChatScreen.kt
-1
View File
@@ -39,7 +39,6 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.input.KeyboardCapitalization
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/ChatroomHeaderCompose.kt
-2
View File
@@ -20,7 +20,6 @@
*/
package com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.rooms
import android.R.attr.label
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.height
@@ -55,7 +54,6 @@ import androidx.compose.ui.unit.sp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.logTime
import com.vitorpamplona.amethyst.model.Channel
import com.vitorpamplona.amethyst.model.EphemeralChatChannel
import com.vitorpamplona.amethyst.model.FeatureSetType
import com.vitorpamplona.amethyst.model.Note
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/ChannelCardCompose.kt
-2
View File
@@ -23,8 +23,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.discover
import androidx.compose.foundation.layout.Column
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import com.vitorpamplona.amethyst.model.Note
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/HomeScreen.kt
-1
View File
@@ -88,7 +88,6 @@ import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonRow
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.toImmutableList
import kotlinx.coroutines.launch
import kotlin.collections.forEachIndexed
@Composable
fun HomeScreen(
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/RenderEphemeralBubble.kt
-1
View File
@@ -30,7 +30,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.vitorpamplona.amethyst.model.EphemeralChatChannel
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.channel.observeChannelNoteAuthors
import com.vitorpamplona.amethyst.ui.navigation.EmptyNav.nav
import com.vitorpamplona.amethyst.ui.navigation.INav
import com.vitorpamplona.amethyst.ui.navigation.routeFor
import com.vitorpamplona.amethyst.ui.note.Gallery
amethyst/src/main/res/values-cs-rCZ/strings.xml
+13 -1
View File
@@ -216,6 +216,13 @@
<string name="unfollow">Přestat sledovat</string>
<string name="channel_created">Kanál vytvořen</string>
<string name="channel_information_changed_to">"Informace kanálu změněna na"</string>
<string name="ephemeral_relay_chat">Mizící chat</string>
<string name="relay_chat">Relé chat</string>
<string name="relay_chat_title">Relé chaty</string>
<string name="relay_chat_explainer">Relay chaty jsou chatové skupiny ovládané jejich domácí relé.
Jsou viditelné pro všechny na Nostru a každý se jich může zúčastnit.
Jsou skvělé pro otevřené komunity kolem konkrétních témat. Některé z těchto skupin jsou efemérní
a proto zprávy časem mizí</string>
<string name="public_chat">Veřejný chat</string>
<string name="public_chat_title">Metadata veřejného chatu</string>
<string name="public_chat_explainer">Veřejné konverzace jsou viditelné pro všechny na Nostru a kdokoli
@@ -541,7 +548,9 @@
<string name="are_you_sure_you_want_to_log_out">Odhlášení vymaže všechny vaše místní informace. Ujistěte se, že máte zálohované své privátní klíče, abyste se vyhnuli ztrátě účtu. Chcete pokračovat?</string>
<string name="followed_tags">Sledované značky</string>
<string name="relay_setup">Rele</string>
<string name="discover_content">Objevování poznámek</string>
<string name="discover_follows">Balíčky Sledování</string>
<string name="discover_reads">Přečtené</string>
<string name="discover_content">Algoritmy kanálu</string>
<string name="discover_marketplace">Trh</string>
<string name="discover_live">Živě</string>
<string name="discover_community">Komunita</string>
@@ -604,6 +613,7 @@
<string name="new_feature_nip17_activate">Aktivovat</string>
<string name="messages_create_public_chat">Veřejné</string>
<string name="messages_create_public_private_chat_description">Nová veřejná nebo soukromá skupina</string>
<string name="messages_relay_based">Relé</string>
<string name="messages_new_message">Soukromé</string>
<string name="messages_new_message_to">Pro</string>
<string name="messages_new_message_subject">Předmět</string>
@@ -946,4 +956,6 @@
<string name="select_list_to_filter">Vyberte seznam pro filtrování kanálu</string>
<string name="temporary_account">Odhlásit se na zámek zařízení</string>
<string name="private_message">Soukromá zpráva</string>
<string name="group_relay">Relé chatu</string>
<string name="group_relay_explanation">Relé, ke kterému se všichni uživatelé tohoto chatu připojují</string>
</resources>
amethyst/src/main/res/values-de-rDE/strings.xml
+12
View File
@@ -220,6 +220,13 @@ anz der Bedingungen ist erforderlich</string>
<string name="unfollow">Entfolgen</string>
<string name="channel_created">Kanal erstellt</string>
<string name="channel_information_changed_to">"Kanalinformationen geändert in"</string>
<string name="ephemeral_relay_chat">Verschwindender Chat</string>
<string name="relay_chat">Relay-Chat</string>
<string name="relay_chat_title">Relay-Chats</string>
<string name="relay_chat_explainer">Relaischats sind Chatgruppen, die von ihrem Home-Relais gesteuert werden.
Sie sind für jeden auf Nostr sichtbar und jeder kann an ihnen teilnehmen.
Sie eignen sich hervorragend für offene Communities rund um bestimmte Themen. Einige dieser Gruppen sind kurzsichtig
und daher verschwinden Chat-Nachrichten im Laufe der Zeit</string>
<string name="public_chat">Öffentlicher Chat</string>
<string name="public_chat_title">Öffentliche Chat Metadaten</string>
<string name="public_chat_explainer">Öffentliche Chats sind für jeden auf Nostr sichtbar und jeder
@@ -546,6 +553,8 @@ anz der Bedingungen ist erforderlich</string>
<string name="are_you_sure_you_want_to_log_out">Das Abmelden löscht alle Ihre lokalen Informationen. Stellen Sie sicher, dass Sie Ihre privaten Schlüssel gesichert haben, um einen Kontoverlust zu vermeiden. Möchten Sie fortfahren?</string>
<string name="followed_tags">Gefolgte Tags</string>
<string name="relay_setup">Relais</string>
<string name="discover_follows">Folge Paketen</string>
<string name="discover_reads">Lesungen</string>
<string name="discover_content">Notizen Entdeckung</string>
<string name="discover_marketplace">Marktplatz</string>
<string name="discover_live">Live</string>
@@ -609,6 +618,7 @@ anz der Bedingungen ist erforderlich</string>
<string name="new_feature_nip17_activate">Aktivieren</string>
<string name="messages_create_public_chat">Öffentlich</string>
<string name="messages_create_public_private_chat_description">Neue öffentliche oder private Gruppe</string>
<string name="messages_relay_based">Relais</string>
<string name="messages_new_message">Privat</string>
<string name="messages_new_message_to">An</string>
<string name="messages_new_message_subject">Betreff</string>
@@ -951,4 +961,6 @@ anz der Bedingungen ist erforderlich</string>
<string name="select_list_to_filter">Liste zum Filtern des Feeds auswählen</string>
<string name="temporary_account">Beim Sperren des Geräts abmelden</string>
<string name="private_message">Private Nachricht</string>
<string name="group_relay">Chat-Relais</string>
<string name="group_relay_explanation">Das Relais, mit dem sich alle Benutzer dieses Chats verbinden</string>
</resources>
amethyst/src/main/res/values-pt-rBR/strings.xml
+12
View File
@@ -216,6 +216,13 @@
<string name="unfollow">Desseguir</string>
<string name="channel_created">Canal criado</string>
<string name="channel_information_changed_to">"Informação do canal mudou para"</string>
<string name="ephemeral_relay_chat">Chat Desaparecendo</string>
<string name="relay_chat">Chat Relé</string>
<string name="relay_chat_title">Chat Relés</string>
<string name="relay_chat_explainer">Chat Relés são grupos de chat controlados por seu relé de origem.
Eles são visíveis para todos no Nostr e qualquer pessoa pode participar.
São ótimos para comunidades abertas em torno de tópicos específicos. Alguns desses grupos são efêmeros,
portanto, as mensagens desaparecem com o tempo</string>
<string name="public_chat">Chat público</string>
<string name="public_chat_title">Metadados do Chat Público</string>
<string name="public_chat_explainer">Os chats públicos são visíveis para todos no Nostr, e qualquer pessoa
@@ -541,6 +548,8 @@
<string name="are_you_sure_you_want_to_log_out">Sair exclui todas as suas informações locais. Certifique-se de fazer backup de suas chaves privadas para evitar a perda de sua conta. Você quer continuar?</string>
<string name="followed_tags">Tags Seguidas</string>
<string name="relay_setup">Relés</string>
<string name="discover_follows">Pacotes Seguir</string>
<string name="discover_reads">Leituras</string>
<string name="discover_content">Descoberta de Notas</string>
<string name="discover_marketplace">Mercado</string>
<string name="discover_live">Ao vivo</string>
@@ -604,6 +613,7 @@
<string name="new_feature_nip17_activate">Ativar</string>
<string name="messages_create_public_chat">Público</string>
<string name="messages_create_public_private_chat_description">Novo Grupo Público ou Privado</string>
<string name="messages_relay_based">Relé</string>
<string name="messages_new_message">Privado</string>
<string name="messages_new_message_to">Para</string>
<string name="messages_new_message_subject">Assunto</string>
@@ -946,4 +956,6 @@
<string name="select_list_to_filter">Selecione uma lista para filtrar o feed</string>
<string name="temporary_account">Terminar sessão no bloqueio do dispositivo</string>
<string name="private_message">Mensagem Privada</string>
<string name="group_relay">Relé de chat</string>
<string name="group_relay_explanation">O relé a qual todos os usuários deste chat se conectam</string>
</resources>
amethyst/src/main/res/values-sv-rSE/strings.xml
+12
View File
@@ -216,6 +216,13 @@
<string name="unfollow">Sluta följa</string>
<string name="channel_created">Kanal skapad</string>
<string name="channel_information_changed_to">"Kanalinformation ändrad till"</string>
<string name="ephemeral_relay_chat">Försvinnande chatt</string>
<string name="relay_chat">Relä Chatt</string>
<string name="relay_chat_title">Relä Chattar</string>
<string name="relay_chat_explainer">Relä chattar är chattgrupper som kontrolleras av deras hem relä.
De är synliga för alla på Nostr och vem som helst kan delta på dem.
De är bra för öppna gemenskaper kring specifika ämnen. Några av dessa grupper är kortlivade
och därmed försvinner chattmeddelanden över tiden</string>
<string name="public_chat">Publik Chat</string>
<string name="public_chat_title">Metadata för offentlig chatt</string>
<string name="public_chat_explainer">Offentliga chattar är synliga för alla på Nostr och alla
@@ -540,6 +547,8 @@
<string name="are_you_sure_you_want_to_log_out">Att logga ut raderar all din lokala information. Se till att ha dina privata nycklar säkerhetskopierade för att undvika att förlora ditt konto. Vill du fortsätta?</string>
<string name="followed_tags">Följda taggar</string>
<string name="relay_setup">Reläer</string>
<string name="discover_follows">Följpaket</string>
<string name="discover_reads">Läsningar</string>
<string name="discover_content">Upptäckt av anteckningar</string>
<string name="discover_marketplace">Marknadsplats</string>
<string name="discover_live">Live</string>
@@ -603,6 +612,7 @@
<string name="new_feature_nip17_activate">Aktivera</string>
<string name="messages_create_public_chat">Publik</string>
<string name="messages_create_public_private_chat_description">Ny offentlig eller privat grupp</string>
<string name="messages_relay_based">Relä</string>
<string name="messages_new_message">Privat</string>
<string name="messages_new_message_to">Till</string>
<string name="messages_new_message_subject">Ämne</string>
@@ -945,4 +955,6 @@
<string name="select_list_to_filter">Välj en lista för att filtrera flödet</string>
<string name="temporary_account">Logga ut när enheten låses</string>
<string name="private_message">Privat meddelande</string>
<string name="group_relay">Chatt Relä</string>
<string name="group_relay_explanation">Reläet som alla användare av den här chatten ansluter till</string>
</resources>