mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-04-17 00:01:27 +02:00
Merge branch 'main' of https://github.com/vitorpamplona/amethyst
This commit is contained in:
Vitor Pamplona
commit
2f1e67779b
@ -3,10 +3,14 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn
|
||||
import android.content.res.Configuration
|
||||
import androidx.activity.compose.BackHandler
|
||||
import androidx.compose.animation.AnimatedContent
|
||||
import androidx.compose.animation.AnimatedVisibility
|
||||
import androidx.compose.animation.scaleIn
|
||||
import androidx.compose.animation.scaleOut
|
||||
import androidx.compose.animation.slideInVertically
|
||||
import androidx.compose.animation.slideOutVertically
|
||||
import androidx.compose.animation.togetherWith
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.statusBarsPadding
|
||||
@ -76,6 +80,7 @@ import com.vitorpamplona.amethyst.ui.screen.NostrHomeRepliesFeedViewModel
|
||||
import com.vitorpamplona.amethyst.ui.screen.NostrVideoFeedViewModel
|
||||
import com.vitorpamplona.amethyst.ui.screen.NotificationViewModel
|
||||
import com.vitorpamplona.amethyst.ui.screen.SharedPreferencesViewModel
|
||||
import com.vitorpamplona.amethyst.ui.theme.Size55Modifier
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlin.math.abs
|
||||
|
||||
@ -324,13 +329,23 @@ fun MainScreen(
|
||||
}
|
||||
},
|
||||
floatingActionButton = {
|
||||
FloatingButtons(
|
||||
navState,
|
||||
accountViewModel,
|
||||
accountStateViewModel,
|
||||
nav,
|
||||
navBottomRow
|
||||
)
|
||||
AnimatedVisibility(
|
||||
visible = shouldShow.value,
|
||||
enter = scaleIn(),
|
||||
exit = scaleOut()
|
||||
) {
|
||||
Box(
|
||||
Size55Modifier
|
||||
) {
|
||||
FloatingButtons(
|
||||
navState,
|
||||
accountViewModel,
|
||||
accountStateViewModel,
|
||||
nav,
|
||||
navBottomRow
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
) {
|
||||
Column(
|
||||
|
||||
@ -146,6 +146,7 @@
|
||||
<string name="login">Connexion</string>
|
||||
<string name="generate_a_new_key">Générer une nouvelle clé</string>
|
||||
<string name="loading_feed">Chargement du flux</string>
|
||||
<string name="loading_account">Chargement du compte</string>
|
||||
<string name="error_loading_replies">"Erreur lors du chargement des réponses : "</string>
|
||||
<string name="try_again">Essayer à nouveau</string>
|
||||
<string name="feed_is_empty">Le flux est vide.</string>
|
||||
@ -519,7 +520,9 @@
|
||||
<string name="error_dialog_pay_invoice_error">Impossible de payer la facture</string>
|
||||
<string name="error_dialog_pay_withdraw_error">Impossible de retirer</string>
|
||||
<string name="error_parsing_nip47_title">Impossible de configurer Wallet Connect</string>
|
||||
<string name="cashu_sucessful_redemption">Cashu reçu</string>
|
||||
<string name="cashu_sucessful_redemption_explainer">%1$s sats ont été envoyés à votre portefeuille. (Frais : %2$s sats)</string>
|
||||
<string name="error_unable_to_fetch_invoice">Impossible de récupérer la facture depuis les serveurs du destinataire</string>
|
||||
<string name="could_not_connect_to_tor">Impossible de se connecter à Tor</string>
|
||||
<string name="unable_to_download_relay_document">Téléchargement du document relais indisponible</string>
|
||||
<string name="could_not_assemble_lnurl_from_lightning_address_check_the_user_s_setup">Impossible d\'assembler LNUrl à partir de l\'adresse Lightning \"%1$s\". Vérifiez la configuration de l\'utilisateur</string>
|
||||
@ -534,4 +537,14 @@
|
||||
<string name="unable_to_create_a_lightning_invoice_before_sending_the_zap_element_pr_not_found_in_the_resulting_json">Impossible de créer une facture lightning avant d\'envoyer le zap. Élément pr introuvable dans le JSON résultant.</string>
|
||||
<string name="read_only_user">Utilisateur en lecture seule</string>
|
||||
<string name="no_reactions_setup">Aucune réaction configurée</string>
|
||||
<string name="select_push_server">Sélectionnez une application UnifiedPush</string>
|
||||
<string name="push_server_title">Notification Push</string>
|
||||
<string name="push_server_explainer">Depuis les applications UnifiedPush installées</string>
|
||||
<string name="push_server_none">Aucun</string>
|
||||
<string name="push_server_none_explainer">Désactive les Notifications Push</string>
|
||||
<string name="push_server_uses_app_explainer">Utilise l\'application %1$s</string>
|
||||
<string name="push_server_install_app">Configuration des Notifications Push</string>
|
||||
<string name="push_server_install_app_description"> Pour recevoir des notifications push, installez n\'importe quelle application qui supporte les [Unified Push](https://unifiedpush.org/), tel que [Nfty](https://ntfy.sh/).
|
||||
Après installation, sélectionnez l\'application que vous voulez utiliser dans les Paramètres.
|
||||
</string>
|
||||
</resources>
|
||||
|
||||
@ -59,7 +59,7 @@
|
||||
<string name="show_more">Meer</string>
|
||||
<string name="lightning_invoice">Lightning invoice</string>
|
||||
<string name="pay">Betalen</string>
|
||||
<string name="lightning_tips">Lighnting tips</string>
|
||||
<string name="lightning_tips">Lightning tips</string>
|
||||
<string name="note_to_receiver">Note aan ontvanger</string>
|
||||
<string name="thank_you_so_much">Hartelijk bedankt!</string>
|
||||
<string name="amount_in_sats">Bedrag in sats</string>
|
||||
@ -110,7 +110,7 @@
|
||||
<string name="join">Lid worden</string>
|
||||
<string name="known">Bekend</string>
|
||||
<string name="new_requests">Nieuw verzoek</string>
|
||||
<string name="blocked_users">Geblokeerde gebruikers</string>
|
||||
<string name="blocked_users">Geblokkeerde gebruikers</string>
|
||||
<string name="new_threads">Nieuwe notes</string>
|
||||
<string name="conversations">Gesprekken</string>
|
||||
<string name="notes">Notes</string>
|
||||
@ -234,7 +234,7 @@
|
||||
<string name="report_dialog_spam">Spam of oplichting</string>
|
||||
<string name="report_dialog_profanity">Godslastering of haatdragend gedrag</string>
|
||||
<string name="report_dialog_impersonation">Kwaadwillige imitatie</string>
|
||||
<string name="report_dialog_nudity">Naaktheid of grafische inhoud</string>
|
||||
<string name="report_dialog_nudity">Naaktheid of gevoelige inhoud</string>
|
||||
<string name="report_dialog_illegal">Illegaal gedrag</string>
|
||||
<string name="report_dialog_blocking_a_user">Als u een gebruiker blokkeert, wordt zijn inhoud in uw app verborgen. Uw notes zijn nog steeds publiekelijk zichtbaar, ook voor mensen die u blokkeert. Geblokkeerde gebruikers worden vermeld in het scherm Beveiligingsfilters.</string>
|
||||
<string name="report_dialog_block_hide_user_btn"><![CDATA[Blokkeer & verberg gebruiker]]></string>
|
||||
@ -312,7 +312,7 @@
|
||||
<string name="upload_server_nostrimg">nostrimg.com - vertrouwd</string>
|
||||
<string name="upload_server_nostrimg_explainer">NostrImg kan het bestand aanpassen</string>
|
||||
<string name="upload_server_nostrbuild">nostr.build - vertrouwd</string>
|
||||
<string name="upload_server_nostrbuild_explainer">Nostr.build kan het bestand aanpassen</string>
|
||||
<string name="upload_server_nostrbuild_explainer">Nostr.build kan mogelijk het bestand aanpassen</string>
|
||||
<string name="upload_server_nostrfilesdev">nostrfiles.dev - vertrouwd</string>
|
||||
<string name="upload_server_nostrfilesdev_explainer">Nostrfiles.dev kan het bestand aanpassen</string>
|
||||
<string name="upload_server_nostrcheckme">nostrcheck.me - vertrouwd</string>
|
||||
@ -365,7 +365,7 @@
|
||||
<string name="channel_list_join_channel">Deelnemen</string>
|
||||
<string name="today">Vandaag</string>
|
||||
<string name="content_warning">Content waarschuwing</string>
|
||||
<string name="content_warning_explanation">Dit bericht bevat gevoelige inhoud die sommige mensen beledigend of verontrustend kunnen vinden</string>
|
||||
<string name="content_warning_explanation">Dit bericht bevat mogelijk beledigend of verontrustend, gevoelige inhoud</string>
|
||||
<string name="content_warning_hide_all_sensitive_content">Verberg altijd gevoelige inhoud</string>
|
||||
<string name="content_warning_show_all_sensitive_content">Toon altijd gevoelige inhoud</string>
|
||||
<string name="content_warning_see_warnings">Toon altijd content waarshuwingen</string>
|
||||
@ -543,4 +543,14 @@
|
||||
<string name="unable_to_create_a_lightning_invoice_before_sending_the_zap_element_pr_not_found_in_the_resulting_json">Kan geen Linghtning invoice aanmaken voor het verzenden van de zap. Element pr niet gevonden in de resulterende JSON.</string>
|
||||
<string name="read_only_user">Read-only gebruiker</string>
|
||||
<string name="no_reactions_setup">Geen reacties setup</string>
|
||||
<string name="select_push_server">Selecteer een UnifiedPush App</string>
|
||||
<string name="push_server_title">Push-notificatie</string>
|
||||
<string name="push_server_explainer">Van geïnstalleerde UnifiedPush apps</string>
|
||||
<string name="push_server_none">Geen</string>
|
||||
<string name="push_server_none_explainer">Push-notificaties uitschakelen</string>
|
||||
<string name="push_server_uses_app_explainer">Gebruikt app %1$s</string>
|
||||
<string name="push_server_install_app">Instellen Push-notificaties</string>
|
||||
<string name="push_server_install_app_description"> Om push-notificaties te ontvangen, installeer een app die [Unified Push] ondersteunt](https://unifiedpush.org/), zoals [Nfty](https://ntfy.sh/).
|
||||
Na installatie selecteer de app die je wilt gebruiken in de instellingen.
|
||||
</string>
|
||||
</resources>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user