From 5b15f377cdf2eb9c4ad76bda1aa475b45ac74abf Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 29 May 2025 19:02:56 +0400 Subject: [PATCH] Improve set direct message price box. --- .../animations/edit_peers/direct_messages.tgs | Bin 0 -> 7075 bytes Telegram/Resources/langs/lang.strings | 7 ++-- .../Resources/qrc/telegram/animations.qrc | 1 + .../SourceFiles/boxes/edit_privacy_box.cpp | 38 +++++++++++++----- .../boxes/peers/edit_peer_info_box.cpp | 2 +- 5 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 Telegram/Resources/animations/edit_peers/direct_messages.tgs diff --git a/Telegram/Resources/animations/edit_peers/direct_messages.tgs b/Telegram/Resources/animations/edit_peers/direct_messages.tgs new file mode 100644 index 0000000000000000000000000000000000000000..3a0806e1ae327429470389ba0ed9e1e464e1d282 GIT binary patch literal 7075 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 N{{wloPVZ&=006|l#rpsN literal 0 HcmV?d00001 diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 0253369e8d..9efcdd8784 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -1891,9 +1891,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_manage_monoforum" = "Direct Messages"; "lng_manage_monoforum_off" = "Off"; "lng_manage_monoforum_free" = "Free"; -"lng_manage_monoforum_allow" = "Allow Direct Messages"; -"lng_manage_monoforum_about" = "Allow users to write direct private messages to your channel, with the option to charge a fee for every message."; -"lng_manage_monoforum_price_about" = "Charge users for the ability to write a direct message to your channel. Your channel will receive {percent} of the selected fee ({amount}) for each incoming message."; +"lng_manage_monoforum_allow" = "Allow Channel Messages"; +"lng_manage_monoforum_price" = "Price for each message"; +"lng_manage_monoforum_about" = "Allow users to send messages to your channel, with the option to charge a fee for each message."; +"lng_manage_monoforum_price_about" = "Your channel will receive {percent} of the selected fee ({amount}) for each incoming message."; "lng_manage_history_visibility_title" = "Chat history for new members"; "lng_manage_history_visibility_shown" = "Visible"; diff --git a/Telegram/Resources/qrc/telegram/animations.qrc b/Telegram/Resources/qrc/telegram/animations.qrc index 09702ee5d0..98917d9924 100644 --- a/Telegram/Resources/qrc/telegram/animations.qrc +++ b/Telegram/Resources/qrc/telegram/animations.qrc @@ -36,6 +36,7 @@ ../../animations/edit_peers/topics.tgs ../../animations/edit_peers/topics_tabs.tgs ../../animations/edit_peers/topics_list.tgs + ../../animations/edit_peers/direct_messages.tgs ../../animations/dice/dice_idle.tgs ../../animations/dice/dart_idle.tgs diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp index 2047539943..88ebe4ccbb 100644 --- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp @@ -511,8 +511,9 @@ auto PrivacyExceptionsBoxController::createRow(not_null history) current->moveToLeft((outer - current->width()) / 2, 0, outer); }; const auto updateByValue = [=](int value) { - current->setText( - tr::lng_action_gift_for_stars(tr::now, lt_count, value)); + current->setText(value > 0 + ? tr::lng_action_gift_for_stars(tr::now, lt_count, value) + : tr::lng_manage_monoforum_free(tr::now)); state->index = 0; auto maxIndex = valuesCount - 1; @@ -1178,7 +1179,9 @@ rpl::producer SetupChargeSlider( const auto chargeStars = savedValue.value_or(defaultValue); state->stars = chargeStars; - Ui::AddSubsectionTitle(container, (group || broadcast) + Ui::AddSubsectionTitle(container, broadcast + ? tr::lng_manage_monoforum_price() + : group ? tr::lng_rights_charge_price() : tr::lng_messages_privacy_price()); @@ -1251,17 +1254,32 @@ void EditDirectMessagesPriceBox( std::optional savedValue, Fn)> callback) { box->setTitle(tr::lng_manage_monoforum()); + box->setWidth(st::boxWideWidth); - const auto toggle = box->addRow(object_ptr( + const auto container = box->verticalLayout(); + + Settings::AddDividerTextWithLottie(container, { + .lottie = u"direct_messages"_q, + .lottieSize = st::settingsFilterIconSize, + .lottieMargins = st::settingsFilterIconPadding, + .showFinished = box->showFinishes(), + .about = tr::lng_manage_monoforum_about( + Ui::Text::RichLangValue + ), + .aboutMargins = st::settingsFilterDividerLabelPadding, + }); + + Ui::AddSkip(container); + + const auto toggle = container->add(object_ptr( box, tr::lng_manage_monoforum_allow(), - st::settingsButtonNoIcon - ), {})->toggleOn(rpl::single(savedValue.has_value())); - Ui::AddSkip(box->verticalLayout()); + st::settingsButtonNoIcon)); + toggle->toggleOn(rpl::single(savedValue.has_value())); - Ui::AddDividerText( - box->verticalLayout(), - tr::lng_manage_monoforum_about()); + Ui::AddSkip(container); + Ui::AddDivider(container); + Ui::AddSkip(container); const auto wrap = box->addRow( object_ptr>( diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp index 9ae378d7db..4604c4f6a7 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp @@ -1087,7 +1087,7 @@ void Controller::fillDirectMessagesButton() { tr::lng_manage_monoforum(), std::move(label), [=] { showEditDirectMessagesBox(); }, - { .icon = &st::menuIconChatBubble, .newBadge = true }); + { .icon = &st::menuIconChats, .newBadge = true }); } // //void Controller::fillInviteLinkButton() {