Removed subscription options from Settings when there is only one.
This commit is contained in:
parent
7ed10eaacc
commit
b2d72e2541
|
@ -162,7 +162,7 @@ void GiftBox(
|
||||||
auto text = tr::lng_premium_gift_button(
|
auto text = tr::lng_premium_gift_button(
|
||||||
tr::now,
|
tr::now,
|
||||||
lt_cost,
|
lt_cost,
|
||||||
options[value].total);
|
options[value].costTotal);
|
||||||
state->buttonText.fire(std::move(text));
|
state->buttonText.fire(std::move(text));
|
||||||
});
|
});
|
||||||
Ui::Premium::AddGiftOptions(
|
Ui::Premium::AddGiftOptions(
|
||||||
|
|
|
@ -1121,11 +1121,11 @@ void Premium::setupSubscriptionOptions(
|
||||||
|
|
||||||
AddSkip(content, st::settingsPremiumOptionsPadding.top());
|
AddSkip(content, st::settingsPremiumOptionsPadding.top());
|
||||||
|
|
||||||
|
const auto apiPremium = &_controller->session().api().premium();
|
||||||
Ui::Premium::AddGiftOptions(
|
Ui::Premium::AddGiftOptions(
|
||||||
content,
|
content,
|
||||||
_radioGroup,
|
_radioGroup,
|
||||||
SubscriptionOptionsForRows(
|
SubscriptionOptionsForRows(apiPremium->subscriptionOptions()),
|
||||||
_controller->session().api().premium().subscriptionOptions()),
|
|
||||||
st::premiumSubscriptionOption,
|
st::premiumSubscriptionOption,
|
||||||
true);
|
true);
|
||||||
|
|
||||||
|
@ -1137,9 +1137,13 @@ void Premium::setupSubscriptionOptions(
|
||||||
|
|
||||||
auto toggleOn = rpl::combine(
|
auto toggleOn = rpl::combine(
|
||||||
Data::AmPremiumValue(&_controller->session()),
|
Data::AmPremiumValue(&_controller->session()),
|
||||||
rpl::single(!!(Ref::EmojiStatus::Parse(_ref)))
|
rpl::single(!!(Ref::EmojiStatus::Parse(_ref))),
|
||||||
) | rpl::map([=](bool premium, bool isEmojiStatus) {
|
apiPremium->statusTextValue(
|
||||||
return !premium && !isEmojiStatus;
|
) | rpl::map([=] {
|
||||||
|
return apiPremium->subscriptionOptions().size() < 2;
|
||||||
|
})
|
||||||
|
) | rpl::map([=](bool premium, bool isEmojiStatus, bool noOptions) {
|
||||||
|
return !premium && !isEmojiStatus && !noOptions;
|
||||||
});
|
});
|
||||||
options->toggleOn(rpl::duplicate(toggleOn), anim::type::instant);
|
options->toggleOn(rpl::duplicate(toggleOn), anim::type::instant);
|
||||||
skip->toggleOn(std::move(
|
skip->toggleOn(std::move(
|
||||||
|
|
Loading…
Reference in New Issue