Merge branch 'main' of https://github.com/greenart7c3/amethyst

2023-09-27 10:48:53 -03:00
parent e762ad5e18 9b1bd2127f
commit 40dae875b8
11 changed files with 152 additions and 90 deletions
@@ -12,7 +12,7 @@ import java.io.File

@UnstableApi object VideoCache {

-    var exoPlayerCacheSize: Long = 90 * 1024 * 1024 // 90MB
+    var exoPlayerCacheSize: Long = 150 * 1024 * 1024 // 90MB

    var leastRecentlyUsedCacheEvictor = LeastRecentlyUsedCacheEvictor(exoPlayerCacheSize)

@@ -214,7 +214,10 @@ fun NewPostView(
                            PostButton(
                                onPost = {
                                    postViewModel.sendPost(relayList = relayList)
-                                    onClose()
+                                    scope.launch {
+                                        delay(100)
+                                        onClose()
+                                    }
                                },
                                isActive = postViewModel.canPost()
                            )
@@ -224,7 +227,10 @@ fun NewPostView(
                        Spacer(modifier = StdHorzSpacer)
                        CloseButton(onPress = {
                            postViewModel.cancel()
-                            onClose()
+                            scope.launch {
+                                delay(100)
+                                onClose()
+                            }
                        })
                    },
                    backgroundColor = MaterialTheme.colors.surface,
@@ -1220,9 +1226,7 @@ private fun MarkAsSensitive(
@Composable
 fun CloseButton(onPress: () -> Unit) {
    Button(
-        onClick = {
-            onPress()
-        },
+        onClick = onPress,
        shape = ButtonBorder,
        colors = ButtonDefaults
            .buttonColors(
@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components

+import android.content.Context
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
 import android.net.Uri
@@ -206,34 +207,36 @@ fun VideoViewInner(
        )
    }

-    val mediaItem = remember(videoUri) {
-        MediaItem.Builder()
-            .setMediaId(videoUri)
-            .setUri(videoUri)
-            .setMediaMetadata(
-                MediaMetadata.Builder()
-                    .setArtist(authorName?.ifBlank { null })
-                    .setTitle(title?.ifBlank { null } ?: videoUri)
-                    .setArtworkUri(
-                        try {
-                            if (artworkUri != null) {
-                                Uri.parse(artworkUri)
-                            } else {
-                                null
-                            }
-                        } catch (e: Exception) {
-                            null
-                        }
-                    )
-                    .build()
-            )
-            .build()
-    }
-
    if (!automaticallyStartPlayback.value) {
        ImageUrlWithDownloadButton(url = videoUri, showImage = automaticallyStartPlayback)
    } else {
        VideoPlayerActiveMutex(videoUri) { activeOnScreen ->
+            val mediaItem = remember(videoUri) {
+                mutableStateOf(
+                    MediaItem.Builder()
+                        .setMediaId(videoUri)
+                        .setUri(videoUri)
+                        .setMediaMetadata(
+                            MediaMetadata.Builder()
+                                .setArtist(authorName?.ifBlank { null })
+                                .setTitle(title?.ifBlank { null } ?: videoUri)
+                                .setArtworkUri(
+                                    try {
+                                        if (artworkUri != null) {
+                                            Uri.parse(artworkUri)
+                                        } else {
+                                            null
+                                        }
+                                    } catch (e: Exception) {
+                                        null
+                                    }
+                                )
+                                .build()
+                        )
+                        .build()
+                )
+            }
+
            GetVideoController(
                mediaItem = mediaItem,
                videoUri = videoUri,
@@ -258,7 +261,7 @@ fun VideoViewInner(
@Composable
@OptIn(UnstableApi::class)
 fun GetVideoController(
-    mediaItem: MediaItem,
+    mediaItem: MutableState<MediaItem>,
    videoUri: String,
    defaultToStart: Boolean = false,
    nostrUriCallback: String? = null,
@@ -288,14 +291,16 @@ fun GetVideoController(
    DisposableEffect(key1 = videoUri) {
        // If it is not null, the user might have come back from a playing video, like clicking on
        // the notification of the video player.
-        scope.launch(Dispatchers.IO) {
-            if (controller.value == null) {
+        if (controller.value == null) {
+            scope.launch(Dispatchers.IO) {
                PlaybackClientController.prepareController(
                    uid,
                    videoUri,
                    nostrUriCallback,
                    context
                ) {
+                    // REQUIRED TO BE RUN IN THE MAIN THREAD
+
                    // checks again because of race conditions.
                    if (controller.value == null) { // still prone to race conditions.
                        controller.value = it
@@ -311,7 +316,7 @@ fun GetVideoController(
                            }
                        }

-                        controller.value?.setMediaItem(mediaItem)
+                        controller.value?.setMediaItem(mediaItem.value)
                        controller.value?.prepare()
                    } else if (controller.value != it) {
                        // discards the new controller because there is an existing one
@@ -329,27 +334,27 @@ fun GetVideoController(
                                    it.volume = if (defaultToStart) 0f else 1f
                                }

-                                it.setMediaItem(mediaItem)
+                                it.setMediaItem(mediaItem.value)
                                it.prepare()
                            }
                        }
                    }
                }
-            } else {
-                controller.value?.let {
-                    if (it.playbackState == Player.STATE_IDLE || it.playbackState == Player.STATE_ENDED) {
-                        if (it.isPlaying) {
-                            // There is a video playing, start this one on mute.
-                            it.volume = 0f
-                        } else {
-                            // There is no other video playing. Use the default mute state to
-                            // decide if sound is on or not.
-                            it.volume = if (defaultToStart) 0f else 1f
-                        }
-
-                        it.setMediaItem(mediaItem)
-                        it.prepare()
+            }
+        } else {
+            controller.value?.let {
+                if (it.playbackState == Player.STATE_IDLE || it.playbackState == Player.STATE_ENDED) {
+                    if (it.isPlaying) {
+                        // There is a video playing, start this one on mute.
+                        it.volume = 0f
+                    } else {
+                        // There is no other video playing. Use the default mute state to
+                        // decide if sound is on or not.
+                        it.volume = if (defaultToStart) 0f else 1f
                    }
+
+                    it.setMediaItem(mediaItem.value)
+                    it.prepare()
                }
            }
        }
@@ -379,6 +384,8 @@ fun GetVideoController(
                            nostrUriCallback,
                            context
                        ) {
+                            // REQUIRED TO BE RUN IN THE MAIN THREAD
+
                            // checks again to make sure no other thread has created a controller.
                            if (controller.value == null) {
                                controller.value = it
@@ -394,7 +401,7 @@ fun GetVideoController(
                                    }
                                }

-                                controller.value?.setMediaItem(mediaItem)
+                                controller.value?.setMediaItem(mediaItem.value)
                                controller.value?.prepare()
                            } else if (controller.value != it) {
                                // discards the new controller because there is an existing one
@@ -460,7 +467,7 @@ fun VideoPlayerActiveMutex(videoUri: String, inner: @Composable (MutableState<Bo
        }
    }

-    Box(
+    val myModifier = remember(videoUri) {
        Modifier
            .fillMaxWidth()
            .defaultMinSize(minHeight = 70.dp)
@@ -489,7 +496,9 @@ fun VideoPlayerActiveMutex(videoUri: String, inner: @Composable (MutableState<Bo
                    }
                }
            }
-    ) {
+    }
+
+    Box(modifier = myModifier) {
        inner(active)
    }
 }
@@ -511,8 +520,6 @@ private fun RenderVideoPlayer(
    activeOnScreen: MutableState<Boolean>,
    onDialog: ((Boolean) -> Unit)?
 ) {
-    val context = LocalContext.current
-
    ControlWhenPlayerIsActive(controller, keepPlaying, automaticallyStartPlayback, activeOnScreen)

    val controllerVisible = remember(controller) {
@@ -520,9 +527,11 @@ private fun RenderVideoPlayer(
    }

    BoxWithConstraints() {
-        AndroidView(
-            modifier = if (roundedCorner) {
-                MaterialTheme.colors.imageModifier
+        val borders = MaterialTheme.colors.imageModifier
+
+        val myModifier = remember {
+            if (roundedCorner) {
+                borders
                    .defaultMinSize(minHeight = 100.dp)
                    .align(Alignment.Center)
            } else {
@@ -530,8 +539,11 @@ private fun RenderVideoPlayer(
                    .fillMaxWidth()
                    .defaultMinSize(minHeight = 100.dp)
                    .align(Alignment.Center)
-            },
-            factory = {
+            }
+        }
+
+        val factory = remember(controller) {
+            { context: Context ->
                PlayerView(context).apply {
                    player = controller
                    layoutParams = FrameLayout.LayoutParams(
@@ -556,10 +568,15 @@ private fun RenderVideoPlayer(
                    )
                }
            }
+        }
+
+        AndroidView(
+            modifier = myModifier,
+            factory = factory
        )

        waveform?.let {
-            Waveform(it, controller, Modifier.align(Alignment.Center))
+            Waveform(it, controller, remember { Modifier.align(Alignment.Center) })
        }

        val startingMuteState = remember(controller) {
@@ -580,7 +597,7 @@ private fun RenderVideoPlayer(
            controller.volume = if (mute) 0f else 1f
        }

-        KeepPlayingButton(keepPlaying, controllerVisible, Modifier.align(Alignment.TopEnd)) { newKeepPlaying: Boolean ->
+        KeepPlayingButton(keepPlaying, controllerVisible, remember { Modifier.align(Alignment.TopEnd) }) { newKeepPlaying: Boolean ->
            // If something else is playing and the user marks this video to keep playing, stops the other one.
            if (newKeepPlaying) {
                if (keepPlayingMutex != null && keepPlayingMutex != controller) {
@@ -840,34 +840,17 @@ private fun CheckNewAndRenderNote(
    val backgroundColor = remember { mutableStateOf<Color>(defaultBackgroundColor) }

    LaunchedEffect(key1 = routeForLastRead, key2 = parentBackgroundColor?.value) {
-        launch(Dispatchers.IO) {
-            routeForLastRead?.let {
-                val lastTime = accountViewModel.account.loadLastRead(it)
-
-                val createdAt = baseNote.createdAt()
-                if (createdAt != null) {
-                    accountViewModel.account.markAsRead(it, createdAt)
-
-                    val isNew = createdAt > lastTime
-
-                    val newBackgroundColor = if (isNew) {
-                        if (parentBackgroundColor != null) {
-                            newItemColor.compositeOver(parentBackgroundColor.value)
-                        } else {
-                            newItemColor.compositeOver(defaultBackgroundColor)
-                        }
+        routeForLastRead?.let {
+            accountViewModel.loadAndMarkAsRead(it, baseNote.createdAt()) { isNew ->
+                val newBackgroundColor = if (isNew) {
+                    if (parentBackgroundColor != null) {
+                        newItemColor.compositeOver(parentBackgroundColor.value)
                    } else {
-                        parentBackgroundColor?.value ?: defaultBackgroundColor
-                    }
-
-                    if (newBackgroundColor != backgroundColor.value) {
-                        launch(Dispatchers.Main) {
-                            backgroundColor.value = newBackgroundColor
-                        }
+                        newItemColor.compositeOver(defaultBackgroundColor)
                    }
+                } else {
+                    parentBackgroundColor?.value ?: defaultBackgroundColor
                }
-            } ?: run {
-                val newBackgroundColor = parentBackgroundColor?.value ?: defaultBackgroundColor

                if (newBackgroundColor != backgroundColor.value) {
                    launch(Dispatchers.Main) {
@@ -875,6 +858,14 @@ private fun CheckNewAndRenderNote(
                    }
                }
            }
+        } ?: run {
+            val newBackgroundColor = parentBackgroundColor?.value ?: defaultBackgroundColor
+
+            if (newBackgroundColor != backgroundColor.value) {
+                launch(Dispatchers.Main) {
+                    backgroundColor.value = newBackgroundColor
+                }
+            }
        }
    }

@@ -63,6 +63,7 @@ class NostrChatroomFeedViewModel(val user: ChatroomKey, val account: Account) :
    }
 }

+@Stable
 class NostrVideoFeedViewModel(val account: Account) : FeedViewModel(VideoFeedFilter(account)) {
    class Factory(val account: Account) : ViewModelProvider.Factory {
        override fun <NostrVideoFeedViewModel : ViewModel> create(modelClass: Class<NostrVideoFeedViewModel>): NostrVideoFeedViewModel {
@@ -726,6 +726,19 @@ class AccountViewModel(val account: Account) : ViewModel(), Dao {
        }
    }

+    fun loadAndMarkAsRead(routeForLastRead: String, baseNoteCreatedAt: Long?, onIsNew: (Boolean) -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            val lastTime = account.loadLastRead(routeForLastRead)
+
+            if (baseNoteCreatedAt != null) {
+                account.markAsRead(routeForLastRead, baseNoteCreatedAt)
+                onIsNew(baseNoteCreatedAt > lastTime)
+            } else {
+                onIsNew(false)
+            }
+        }
+    }
+
    class Factory(val account: Account) : ViewModelProvider.Factory {
        override fun <AccountViewModel : ViewModel> create(modelClass: Class<AccountViewModel>): AccountViewModel {
            return AccountViewModel(account) as AccountViewModel
@@ -229,7 +229,7 @@ fun SlidingCarousel(
    VerticalPager(
        state = pagerState,
        beyondBoundsPageCount = 1,
-        modifier = Modifier.fillMaxSize(1f),
+        modifier = Modifier.fillMaxSize(),
        key = { index ->
            feed.value.getOrNull(index)?.idHex ?: "$index"
        }
@@ -246,7 +246,7 @@ fun LoadedVideoCompose(
    accountViewModel: AccountViewModel,
    nav: (String) -> Unit
 ) {
-    var state by remember {
+    var state by remember(note) {
        mutableStateOf(
            AccountViewModel.NoteComposeReportState()
        )
@@ -12,6 +12,7 @@
    <string name="could_not_decrypt_the_message">Nepodařilo se dešifrovat zprávu</string>
    <string name="group_picture">Obrázek skupiny</string>
    <string name="explicit_content">Explicitní obsah</string>
+    <string name="spam">Spam</string>
    <string name="impersonation">Zneužívání identity</string>
    <string name="illegal_behavior">Nezákonné jednání</string>
    <string name="unknown">Neznámý</string>
@@ -169,6 +170,9 @@
    <string name="nip_05">Nostr Adresa</string>
    <string name="never">nikdy</string>
    <string name="now">nyní</string>
+    <string name="h">h</string>
+    <string name="m">m</string>
+    <string name="d">d</string>
    <string name="nudity">Nahota</string>
    <string name="profanity_hateful_speech">Neslušnost / Nenávistná řeč</string>
    <string name="report_hateful_speech">Nahlásit nenávistnou řeč</string>
@@ -263,6 +267,7 @@
    <string name="poll_zap_value_min">Minimální zaps</string>
    <string name="poll_zap_value_max">Maximální zaps</string>
    <string name="poll_consensus_threshold">Konsensus</string>
+    <string name="poll_consensus_threshold_percent">(0–100)%</string>
    <string name="poll_closing_time">Uzavřít po</string>
    <string name="poll_closing_time_days">dnech</string>
    <string name="poll_is_closed">Hlasování je uzavřeno pro nové hlasy</string>
@@ -334,6 +339,7 @@
        \n5. Nastavte port Socks v této obrazovce
        \n6. Stiskněte tlačítko Aktivovat Tor
    </string>
+    <string name="orbot_socks_port">Port Orbot Socks</string>
    <string name="invalid_port_number">Neplatné číslo portu</string>
    <string name="use_orbot">Použít Orbot</string>
    <string name="disconnect_from_your_orbot_setup">Odpojit Tor/Orbot</string>
@@ -341,6 +347,7 @@
    <string name="app_notification_dms_channel_description">Upozorní vás, když dorazí soukromá zpráva</string>
    <string name="app_notification_zaps_channel_name">Přijaté zapsy</string>
    <string name="app_notification_zaps_channel_description">Upozorní vás, když vás někdo zapsne</string>
+    <string name="app_notification_zaps_channel_message">%1$s sats</string>
    <string name="app_notification_zaps_channel_message_from">Od %1$s</string>
    <string name="app_notification_zaps_channel_message_for">pro %1$s</string>
    <string name="reply_notify">Upozornit: </string>
@@ -369,6 +376,7 @@
    <string name="an_error_occurred_trying_to_get_relay_information">Při pokusu o získání informací z Relay se vyskytla chyba z %1$s</string>
    <string name="owner">Vlastník</string>
    <string name="version">Verze</string>
+    <string name="software">Programové vybavení</string>
    <string name="contact">Kontakt</string>
    <string name="supports">Podporované NIPs</string>
    <string name="admission_fees">Vstupné</string>
@@ -388,10 +396,12 @@
    <string name="minimum_pow">Minimální PoW</string>
    <string name="auth">Ověření</string>
    <string name="payment">Platba</string>
+    <string name="cashu">Cashu Token</string>
    <string name="cashu_redeem">Vyměnit</string>
    <string name="no_lightning_address_set">Není nastavena žádná Lightning adresa</string>
    <string name="copied_token_to_clipboard">Token zkopírován do schránky</string>
    <string name="live_stream_live_tag">ŽIVĚ</string>
+    <string name="live_stream_offline_tag">OFFLINE</string>
    <string name="live_stream_ended_tag">UKONČENO</string>
    <string name="live_stream_planned_tag">PLÁNOVÁNO</string>
    <string name="live_stream_is_offline">Živé vysílání je offline</string>
@@ -467,6 +477,7 @@
    <string name="poll_zap_value_min_max_explainer">Hlasy jsou váženy podle hodnoty zapu. Můžete nastavit minimální částku, abyste se vyhnuli spammerům, a maximální částku, abyste zabránili velkým zapperům, kteří by mohli ovládnout hlasování. Použijte stejnou částku v obou polích, aby byla hodnota každého hlasu stejná. Nechte prázdné pro přijetí libovolné částky.</string>
    <string name="error_dialog_zap_error">Nelze odeslat zap</string>
    <string name="error_dialog_talk_to_user">Poslat zprávu uživateli</string>
+    <string name="error_dialog_button_ok">OK</string>
    <string name="relay_information_document_error_assemble_url">Nepodařilo se dosáhnout %1$s: %2$s</string>
    <string name="relay_information_document_error_reach_server">Nepodařilo se dosáhnout %1$s: %2$s</string>
    <string name="relay_information_document_error_parse_result">Nepodařilo se zpracovat výsledek z %1$s: %2$s</string>
@@ -483,6 +494,7 @@
    <string name="zap_split_serarch_and_add_user_placeholder">Uživatelské jméno nebo zobrazované jméno</string>
    <string name="user_x_does_not_have_a_lightning_address_setup_to_receive_sats">Uživatel %1$s nemá nastavenou bleskovou adresu pro přijímání satoshi</string>
    <string name="zap_split_weight">Procenta</string>
+    <string name="zap_split_weight_placeholder">25</string>
    <string name="splitting_zaps_with">Rozdělování Zapů s</string>
    <string name="forwarding_zaps_to">Přeposílání Zapů na</string>
    <string name="lightning_wallets_not_found2">Bleskové peněženky nenalezený</string>
@@ -12,6 +12,7 @@
    <string name="could_not_decrypt_the_message">Nachricht konnte nicht entschlüsselt werden</string>
    <string name="group_picture">Gruppenbild</string>
    <string name="explicit_content">Expliziter Inhalt</string>
+    <string name="spam">Spam</string>
    <string name="impersonation">Vortäuschung</string>
    <string name="illegal_behavior">Illegales Verhalten</string>
    <string name="unknown">Unbekannt</string>
@@ -35,6 +36,7 @@
    <string name="login_with_a_private_key_to_be_able_to_send_zaps">Melden Sie sich mit einem privaten Schlüssel an, um Zaps senden zu können</string>
    <string name="login_with_a_private_key_to_be_able_to_follow">Melden Sie sich mit einem privaten Schlüssel an, um zu folgen</string>
    <string name="login_with_a_private_key_to_be_able_to_unfollow">Melden Sie sich mit einem privaten Schlüssel an, um nicht mehr zu folgen</string>
+    <string name="zaps">Zaps</string>
    <string name="view_count">Aufrufe</string>
    <string name="boost">Verstärken</string>
    <string name="boosted">Verstärkt</string>
@@ -76,6 +78,7 @@
    <string name="failed_to_upload_the_image">Fehler beim Hochladen des Bildes</string>
    <string name="relay_address">Relay-Adresse</string>
    <string name="posts">Beiträge</string>
+    <string name="bytes">Bytes</string>
    <string name="errors">Fehler</string>
    <string name="home_feed">Startseite</string>
    <string name="private_message_feed">Private Nachrichten</string>
@@ -162,6 +165,7 @@ anz der Bedingungen ist erforderlich</string>
    <string name="public_chat">Öffentlicher Chat</string>
    <string name="posts_received">empfangene Beiträge</string>
    <string name="remove">Entfernen</string>
+    <string name="translations_auto">Automatisch</string>
    <string name="translations_translated_from">übersetzt von</string>
    <string name="translations_to">zu</string>
    <string name="translations_show_in_lang_first">Zuerst in %1$s anzeigen</string>
@@ -171,6 +175,7 @@ anz der Bedingungen ist erforderlich</string>
    <string name="never">nie</string>
    <string name="now">jetzt</string>
    <string name="h">s</string>
+    <string name="m">m</string>
    <string name="d">t</string>
    <string name="nudity">Nacktheit</string>
    <string name="profanity_hateful_speech">Beleidigungen / Hassrede</string>
@@ -261,11 +266,13 @@ anz der Bedingungen ist erforderlich</string>
    <string name="poll_heading_required">Erforderliche Felder:</string>
    <string name="poll_zap_recipients">Zap-Empfänger</string>
    <string name="poll_primary_description">Hauptbeschreibung der Umfrage…</string>
+    <string name="poll_option_index">Wahl %s</string>
    <string name="poll_option_description">Beschreibung der Umfrageoption</string>
    <string name="poll_heading_optional">Optionale Felder:</string>
    <string name="poll_zap_value_min">Mindest-Zap-Betrag</string>
    <string name="poll_zap_value_max">Maximaler Zap-Betrag</string>
    <string name="poll_consensus_threshold">Konsens</string>
+    <string name="poll_consensus_threshold_percent">(0–100)%</string>
    <string name="poll_closing_time">Schließen nach</string>
    <string name="poll_closing_time_days">Tagen</string>
    <string name="poll_is_closed">Umfrage ist für neue Stimmen geschlossen</string>
@@ -372,6 +379,8 @@ anz der Bedingungen ist erforderlich</string>
    <string name="write_to_relay">In Relay schreiben</string>
    <string name="an_error_occurred_trying_to_get_relay_information">Ein Fehler ist beim Abrufen von Relay-Informationen von %1$s aufgetreten</string>
    <string name="owner">Inhaber</string>
+    <string name="version">Version</string>
+    <string name="software">Programme</string>
    <string name="contact">Kontakt</string>
    <string name="supports">Unterstützte NIPs</string>
    <string name="admission_fees">Eintrittsgebühren</string>
@@ -379,6 +388,7 @@ anz der Bedingungen ist erforderlich</string>
    <string name="limitations">Einschränkungen</string>
    <string name="countries">Länder</string>
    <string name="languages">Sprachen</string>
+    <string name="tags">Tags</string>
    <string name="posting_policy">Veröffentlichungsrichtlinie</string>
    <string name="message_length">Nachrichtenlänge</string>
    <string name="subscriptions">Abonnements</string>
@@ -394,6 +404,8 @@ anz der Bedingungen ist erforderlich</string>
    <string name="cashu_redeem">Einlösen</string>
    <string name="no_lightning_address_set">Keine Lightning-Adresse festgelegt</string>
    <string name="copied_token_to_clipboard">Token in die Zwischenablage kopiert</string>
+    <string name="live_stream_live_tag">LIVE</string>
+    <string name="live_stream_offline_tag">OFFLINE</string>
    <string name="live_stream_ended_tag">BEENDET</string>
    <string name="live_stream_planned_tag">GEPLANT</string>
    <string name="live_stream_is_offline">Livestream ist offline</string>
@@ -401,6 +413,9 @@ 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_live">Live</string>
+    <string name="discover_community">Gemeinschaft</string>
+    <string name="discover_chat">Chats</string>
    <string name="community_approved_posts">Genehmigte Beiträge</string>
    <string name="groups_no_descriptor">Diese Gruppe hat keine Beschreibung oder Regeln. Sprechen Sie mit dem Eigentümer, um eine hinzuzufügen.</string>
    <string name="community_no_descriptor">Diese Community hat keine Beschreibung. Sprechen Sie mit dem Eigentümer, um eine hinzuzufügen.</string>
@@ -410,6 +425,7 @@ anz der Bedingungen ist erforderlich</string>
    <string name="connectivity_type_always">Immer</string>
    <string name="connectivity_type_wifi_only">Nur WLAN</string>
    <string name="connectivity_type_never">Nie</string>
+    <string name="system">System</string>
    <string name="light">Hell</string>
    <string name="dark">Dunkel</string>
    <string name="application_preferences">Anwendungseinstellungen</string>
@@ -465,6 +481,7 @@ anz der Bedingungen ist erforderlich</string>
    <string name="poll_zap_value_min_max_explainer">Die Abstimmungen werden nach der Höhe des Zaps gewichtet. Sie können einen Mindestbetrag festlegen, um Spam zu verhindern, und einen Höchstbetrag, um zu verhindern, dass große Zapper die Abstimmung dominieren. Verwenden Sie denselben Betrag in beiden Feldern, um sicherzustellen, dass jeder Stimme der gleiche Wert zukommt. Lassen Sie es leer, um jeden Betrag zu akzeptieren.</string>
    <string name="error_dialog_zap_error">Zap konnte nicht gesendet werden</string>
    <string name="error_dialog_talk_to_user">Mit dem Benutzer kommunizieren</string>
+    <string name="error_dialog_button_ok">OK</string>
    <string name="relay_information_document_error_assemble_url">Konnte %1$s nicht erreichen: %2$s</string>
    <string name="relay_information_document_error_reach_server">Konnte %1$s nicht erreichen: %2$s</string>
    <string name="relay_information_document_error_parse_result">Konnte das Ergebnis von %1$s nicht verarbeiten: %2$s</string>
@@ -472,6 +489,8 @@ anz der Bedingungen ist erforderlich</string>
    <string name="active_for">Aktiv für: </string>
    <string name="active_for_home">Startseite</string>
    <string name="active_for_msg">Nachrichten</string>
+    <string name="active_for_chats">Chats</string>
+    <string name="active_for_global">Global</string>
    <string name="active_for_search">Suche</string>
    <string name="zap_split_title">Zaps aufteilen und weiterleiten</string>
    <string name="zap_split_explainer">Unterstützende Clients werden Zaps an die hier hinzugefügten Benutzer aufteilen und weiterleiten, anstatt an Sie</string>
@@ -479,6 +498,7 @@ anz der Bedingungen ist erforderlich</string>
    <string name="zap_split_serarch_and_add_user_placeholder">Benutzername oder Anzeigename</string>
    <string name="user_x_does_not_have_a_lightning_address_setup_to_receive_sats">Benutzer %1$s hat keine Lightning-Adresse eingerichtet, um Sats zu empfangen</string>
    <string name="zap_split_weight">Prozent</string>
+    <string name="zap_split_weight_placeholder">25</string>
    <string name="splitting_zaps_with">Zaps aufteilen mit</string>
    <string name="forwarding_zaps_to">Zaps weiterleiten an</string>
    <string name="lightning_wallets_not_found2">Lightning-Wallets nicht gefunden</string>
@@ -430,6 +430,8 @@
    <string name="automatically_load_images_gifs">Képek/GIF-ek automatikus betöltése</string>
    <string name="automatically_play_videos">Videók automatikus betöltése</string>
    <string name="automatically_show_url_preview">Az URL előnézetének automatikus megjelenítése</string>
+    <string name="automatically_hide_nav_bars">Magával ragadó görgetés</string>
+    <string name="automatically_hide_nav_bars_description">Navigációs sáv görgetés közbeni elrejtése</string>
    <string name="load_image">Kép Betöltése</string>
    <string name="spamming_users">Spammerek</string>
    <string name="muted_button">Lenémítva. Kattínts a feloldásért</string>
@@ -502,4 +504,6 @@
    <string name="sign_request_rejected">Aláírási kérés elutasítva</string>
    <string name="no_wallet_found_with_error">Nem található tárca a Lighning számla kifizetésére (Hiba: %1$s). Kérjük, a zap-ek használatához telepítsen egy Lightning pénztárcát</string>
    <string name="no_wallet_found">Nem található tárca a Lighning számla kifizetésére. Kérjük, a zap-ek használatához telepítsen egy Lightning pénztárcát</string>
+    <string name="hidden_words">Elrejtett Szavak</string>
+    <string name="hide_new_word_label">Új szó vagy mondat elrejtése</string>
 </resources>