void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed confusing lock state from button in earn out section.

Browse source
This commit is contained in:
23rd 2024-12-05 18:13:36 +03:00
parent 84f111d641
commit 15c226e6cf
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
View file

@ -244,9 +244,7 @@ void InnerWidget::fill() {
), ),
rpl::duplicate(availableBalanceValue), rpl::duplicate(availableBalanceValue),
rpl::duplicate(dateValue), rpl::duplicate(dateValue),
rpl::duplicate(dateValue) | rpl::map([=](const QDateTime &dt) { _state.isWithdrawalEnabled,
return !dt.isNull() || (!_state.isWithdrawalEnabled);
}),
rpl::duplicate( rpl::duplicate(
availableBalanceValue availableBalanceValue
) | rpl::map([=](StarsAmount v) { ) | rpl::map([=](StarsAmount v) {

5
Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
View file

@ -954,10 +954,7 @@ void InnerWidget::fill() {
), ),
rpl::duplicate(availableBalanceValue), rpl::duplicate(availableBalanceValue),
rpl::duplicate(dateValue), rpl::duplicate(dateValue),
std::move(dateValue) | rpl::map([=](const QDateTime &dt) { _state.creditsEarn.isWithdrawalEnabled,
return !dt.isNull()
|| (!_state.creditsEarn.isWithdrawalEnabled);
}),
rpl::duplicate( rpl::duplicate(
availableBalanceValue availableBalanceValue
) | rpl::map(creditsToUsdMap)); ) | rpl::map(creditsToUsdMap));

21
Telegram/SourceFiles/settings/settings_credits_graphics.cpp
View file

@ -1873,7 +1873,7 @@ void AddWithdrawalWidget(
rpl::producer<QString> secondButtonUrl, rpl::producer<QString> secondButtonUrl,
rpl::producer<StarsAmount> availableBalanceValue, rpl::producer<StarsAmount> availableBalanceValue,
rpl::producer<QDateTime> dateValue, rpl::producer<QDateTime> dateValue,
rpl::producer<bool> lockedValue, bool withdrawalEnabled,
rpl::producer<QString> usdValue) { rpl::producer<QString> usdValue) {
Ui::AddSkip(container); Ui::AddSkip(container);
@ -1915,17 +1915,22 @@ void AddWithdrawalWidget(
Ui::AddSkip(container); Ui::AddSkip(container);
const auto withdrawalWrap = container->add(
object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
container,
object_ptr<Ui::VerticalLayout>(container)));
const auto input = Ui::AddInputFieldForCredits( const auto input = Ui::AddInputFieldForCredits(
container, withdrawalWrap->entity(),
rpl::duplicate(availableBalanceValue)); rpl::duplicate(availableBalanceValue));
Ui::AddSkip(container); Ui::AddSkip(withdrawalWrap->entity());
Ui::AddSkip(container); Ui::AddSkip(withdrawalWrap->entity());
const auto &stButton = st::defaultActiveButton; const auto &stButton = st::defaultActiveButton;
const auto buttonsContainer = container->add( const auto buttonsContainer = withdrawalWrap->entity()->add(
Ui::CreateSkipWidget(container, stButton.height), Ui::CreateSkipWidget(withdrawalWrap->entity(), stButton.height),
st::boxRowPadding); st::boxRowPadding);
withdrawalWrap->toggle(withdrawalEnabled, anim::type::instant);
const auto button = Ui::CreateChild<Ui::RoundButton>( const auto button = Ui::CreateChild<Ui::RoundButton>(
buttonsContainer, buttonsContainer,
@ -1959,6 +1964,10 @@ void AddWithdrawalWidget(
} }
}, buttonsContainer->lifetime()); }, buttonsContainer->lifetime());
auto lockedValue = rpl::duplicate(
dateValue
) | rpl::map([](const QDateTime &dt) { return !dt.isNull(); });
rpl::duplicate( rpl::duplicate(
lockedValue lockedValue
) | rpl::start_with_next([=](bool v) { ) | rpl::start_with_next([=](bool v) {

2
Telegram/SourceFiles/settings/settings_credits_graphics.h
View file

@ -76,7 +76,7 @@ void AddWithdrawalWidget(
rpl::producer<QString> secondButtonUrl, rpl::producer<QString> secondButtonUrl,
rpl::producer<StarsAmount> availableBalanceValue, rpl::producer<StarsAmount> availableBalanceValue,
rpl::producer<QDateTime> dateValue, rpl::producer<QDateTime> dateValue,
rpl::producer<bool> lockedValue, bool withdrawalEnabled,
rpl::producer<QString> usdValue); rpl::producer<QString> usdValue);
void ReceiptCreditsBox( void ReceiptCreditsBox(