Replaced management of top bar for suggestion in dialogs with rpl.

Telegram/Resources/langs/lang.strings

@@ -3863,10 +3863,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_dialogs_skip_archive_in_search" = "Skip results from archive";
 "lng_dialogs_show_archive_in_search" = "With results from archive";
 
-"lng_dialogs_top_bar_suggestions_birthday_title" = "Add your birthday! 🎂";
+"lng_dialogs_suggestions_birthday_title" = "Add your birthday! 🎂";
-"lng_dialogs_top_bar_suggestions_birthday_about" = "Let your contacts know when you’re celebrating.";
+"lng_dialogs_suggestions_birthday_about" = "Let your contacts know when you’re celebrating.";
-"lng_dialogs_top_bar_suggestions_premium_annual_title" = "Telegram Premium with a {text} discount";
+"lng_dialogs_suggestions_premium_annual_title" = "Telegram Premium with a {text} discount";
-"lng_dialogs_top_bar_suggestions_premium_annual_about" = "Sign up for the annual payment plan for Telegram Premium now to get the discount.";
+"lng_dialogs_suggestions_premium_annual_about" = "Sign up for the annual payment plan for Telegram Premium now to get the discount.";
 
 "lng_about_random" = "Send a {emoji} emoji to any chat to try your luck.";
 "lng_about_random_send" = "Send";

Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp

@@ -39,119 +39,140 @@ constexpr auto kSugPremiumAnnual = "PREMIUM_ANNUAL"_cs;
 
 } // namespace
 
-object_ptr<Ui::SlideWrap<Ui::RpWidget>> CreateTopBarSuggestion(
+rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 		not_null<Ui::RpWidget*> parent,
 		not_null<Main::Session*> session) {
-	const auto content = Ui::CreateChild<TopBarSuggestionContent>(parent);
+	return [=](auto consumer) {
-	auto result = object_ptr<Ui::SlideWrap<Ui::RpWidget>>(
+		auto lifetime = rpl::lifetime();
-		parent,
-		object_ptr<Ui::RpWidget>::fromRaw(content));
-	const auto wrap = result.data();
-	wrap->toggle(false, anim::type::instant);
-	struct State {
-		rpl::lifetime birthdayLifetime;
-		rpl::lifetime premiumLifetime;
-	};
-	const auto state = content->lifetime().make_state<State>();
 
-	const auto processCurrentSuggestion = [=](auto repeat) -> void {
+		struct State {
-		if (session->appConfig().suggestionCurrent(kSugSetBirthday.utf8())
+			TopBarSuggestionContent *content = nullptr;
-			&& !Data::IsBirthdayToday(session->user()->birthday())) {
+			Ui::SlideWrap<Ui::RpWidget> *wrap = nullptr;
-			content->setRightIcon(TopBarSuggestionContent::RightIcon::Close);
+			rpl::lifetime birthdayLifetime;
-			content->setClickedCallback([=] {
+			rpl::lifetime premiumLifetime;
-				const auto controller = FindSessionController(parent);
+		};
-				if (!controller) {
+		const auto state = lifetime.make_state<State>();
-					return;
+		const auto ensureWrap = [=] {
-				}
+			if (!state->content) {
-				Core::App().openInternalUrl(
+				state->content = Ui::CreateChild<TopBarSuggestionContent>(
-					u"internal:edit_birthday"_q,
+					parent);
-					QVariant::fromValue(ClickHandlerContext{
+				rpl::combine(
-						.sessionWindow = base::make_weak(controller),
+					parent->widthValue(),
-					}));
+					state->content->desiredHeightValue()
+				) | rpl::start_with_next([=](int width, int height) {
+					state->content->resize(width, height);
+				}, state->content->lifetime());
+			}
+			if (!state->wrap) {
+				state->wrap = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
+					parent,
+					object_ptr<Ui::RpWidget>::fromRaw(state->content));
+				state->wrap->toggle(false, anim::type::instant);
+			}
+		};
 
-				state->birthdayLifetime = Info::Profile::BirthdayValue(
+		const auto processCurrentSuggestion = [=](auto repeat) -> void {
-					session->user()
+			ensureWrap();
-				) | rpl::map(
+			const auto content = state->content;
-					Data::IsBirthdayTodayValue
+			const auto wrap = state->wrap;
-				) | rpl::flatten_latest(
+			using RightIcon = TopBarSuggestionContent::RightIcon;
-				) | rpl::distinct_until_changed(
+			if (session->appConfig().suggestionCurrent(kSugSetBirthday.utf8())
-				) | rpl::start_with_next([=] {
+				&& !Data::IsBirthdayToday(session->user()->birthday())) {
-					repeat(repeat);
+				content->setRightIcon(RightIcon::Close);
-				});
-			});
-			content->setHideCallback([=] {
-				session->appConfig().dismissSuggestion(
-					kSugSetBirthday.utf8());
-				repeat(repeat);
-			});
-			content->setContent(
-				tr::lng_dialogs_top_bar_suggestions_birthday_title(
-					tr::now,
-					Ui::Text::Bold),
-				tr::lng_dialogs_top_bar_suggestions_birthday_about(
-					tr::now,
-					TextWithEntities::Simple));
-			wrap->toggle(true, anim::type::normal);
-		} else if (session->premiumPossible()
-			&& !session->premium()
-			&& session->appConfig().suggestionCurrent(
-				kSugPremiumAnnual.utf8())) {
-			content->setRightIcon(TopBarSuggestionContent::RightIcon::Arrow);
-			const auto api = &session->api().premium();
-			const auto set = [=](QString discount) {
-				constexpr auto kMinus = QChar(0x2212);
-				content->setContent(
-					tr::lng_dialogs_top_bar_suggestions_premium_annual_title(
-						tr::now,
-						lt_text,
-						{ discount.replace(kMinus, QChar()) },
-						Ui::Text::Bold),
-					tr::lng_dialogs_top_bar_suggestions_premium_annual_about(
-						tr::now,
-						TextWithEntities::Simple));
 				content->setClickedCallback([=] {
 					const auto controller = FindSessionController(parent);
 					if (!controller) {
 						return;
 					}
-					Settings::ShowPremium(controller, "dialogs_hint");
+					Core::App().openInternalUrl(
+						u"internal:edit_birthday"_q,
+						QVariant::fromValue(ClickHandlerContext{
+							.sessionWindow = base::make_weak(controller),
+						}));
+
+					state->birthdayLifetime = Info::Profile::BirthdayValue(
+						session->user()
+					) | rpl::map(
+						Data::IsBirthdayTodayValue
+					) | rpl::flatten_latest(
+					) | rpl::distinct_until_changed(
+					) | rpl::start_with_next([=] {
+						repeat(repeat);
+					});
+				});
+				content->setHideCallback([=] {
 					session->appConfig().dismissSuggestion(
-						kSugPremiumAnnual.utf8());
+						kSugSetBirthday.utf8());
 					repeat(repeat);
 				});
+				content->setContent(
+					tr::lng_dialogs_suggestions_birthday_title(
+						tr::now,
+						Ui::Text::Bold),
+					tr::lng_dialogs_suggestions_birthday_about(
+						tr::now,
+						TextWithEntities::Simple));
 				wrap->toggle(true, anim::type::normal);
-			};
+			} else if (session->premiumPossible()
-			api->statusTextValue(
+				&& !session->premium()
-			) | rpl::start_with_next([=] {
+				&& session->appConfig().suggestionCurrent(
-				for (const auto &option : api->subscriptionOptions()) {
+					kSugPremiumAnnual.utf8())) {
-					if (option.months == 12) {
+				content->setRightIcon(RightIcon::Arrow);
-						set(option.discount);
+				const auto api = &session->api().premium();
-						state->premiumLifetime.destroy();
+				const auto set = [=](QString discount) {
-						return;
+					constexpr auto kMinus = QChar(0x2212);
+					content->setContent(
+						tr::lng_dialogs_suggestions_premium_annual_title(
+							tr::now,
+							lt_text,
+							{ discount.replace(kMinus, QChar()) },
+							Ui::Text::Bold),
+						tr::lng_dialogs_suggestions_premium_annual_about(
+							tr::now,
+							TextWithEntities::Simple));
+					content->setClickedCallback([=] {
+						const auto controller = FindSessionController(parent);
+						if (!controller) {
+							return;
+						}
+						Settings::ShowPremium(controller, "dialogs_hint");
+						session->appConfig().dismissSuggestion(
+							kSugPremiumAnnual.utf8());
+						repeat(repeat);
+					});
+					wrap->toggle(true, anim::type::normal);
+				};
+				api->statusTextValue(
+				) | rpl::start_with_next([=] {
+					for (const auto &option : api->subscriptionOptions()) {
+						if (option.months == 12) {
+							set(option.discount);
+							state->premiumLifetime.destroy();
+							return;
+						}
 					}
-				}
+				}, state->premiumLifetime);
-			}, state->premiumLifetime);
+				api->reload();
-			api->reload();
+			} else {
-		} else {
+				wrap->toggle(false, anim::type::normal);
-			wrap->toggle(false, anim::type::normal);
+				base::call_delayed(st::slideWrapDuration * 2, wrap, [=] {
-			base::call_delayed(st::slideWrapDuration * 2, wrap, [=] {
+					state->content = nullptr;
-				delete wrap;
+					state->wrap = nullptr;
-			});
+					consumer.put_next(nullptr);
-		}
+				});
+			}
+		};
+
+		session->appConfig().value() | rpl::start_with_next([=] {
+			const auto was = state->wrap;
+			processCurrentSuggestion(processCurrentSuggestion);
+			if (was != state->wrap) {
+				consumer.put_next_copy(state->wrap);
+			}
+		}, lifetime);
+
+		return lifetime;
 	};
-
-	session->appConfig().refreshed() | rpl::start_with_next([=] {
-		processCurrentSuggestion(processCurrentSuggestion);
-	}, content->lifetime());
-
-	rpl::combine(
-		parent->widthValue(),
-		content->desiredHeightValue()
-	) | rpl::start_with_next([=](int width, int height) {
-		content->resize(width, height);
-	}, content->lifetime());
-
-	return result;
 }
 
 } // namespace Dialogs

Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.h

@@ -22,9 +22,10 @@ class SlideWrap;
 
 namespace Dialogs {
 
-[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> CreateTopBarSuggestion(
+[[nodiscard]] auto TopBarSuggestionValue(
 	not_null<Ui::RpWidget*> parent,
-	not_null<Main::Session*>);
+	not_null<Main::Session*>)
+-> rpl::producer<Ui::SlideWrap<Ui::RpWidget>*>;
 
 } // namespace Dialogs
 

Telegram/SourceFiles/dialogs/dialogs_widget.cpp

@@ -380,23 +380,34 @@ Widget::Widget(
 	const auto innerList = _scroll->setOwnedWidget(
 		object_ptr<Ui::VerticalLayout>(this));
 	if (_layout != Layout::Child) {
-		_topBarSuggestion = innerList->add(CreateTopBarSuggestion(
+		TopBarSuggestionValue(
 			innerList,
-			&session()));
+			&session()
-		_topBarSuggestion->lifetime().add([=] {
+		) | rpl::start_with_next([=](Ui::SlideWrap<Ui::RpWidget> *raw) {
-			_topBarSuggestion = nullptr;
+			if (raw) {
-		});
+				_topBarSuggestion = innerList->insert(
-		rpl::combine(
+					0,
-			_topBarSuggestion->entity()->desiredHeightValue(),
+					object_ptr<Ui::SlideWrap<Ui::RpWidget>>::fromRaw(raw));
-			_childListShown.value()
+				rpl::combine(
-		) | rpl::start_with_next([=](int desiredHeight, float64 shown) {
+					_topBarSuggestion->entity()->desiredHeightValue(),
-			const auto newHeight = desiredHeight * (1. - shown);
+					_childListShown.value()
-			_topBarSuggestion->entity()->setMaximumHeight(newHeight);
+				) | rpl::start_with_next([=](
-			_topBarSuggestion->entity()->setMinimumWidth((shown > 0)
+						int desiredHeight,
-				? width()
+						float64 shown) {
-				: 0);
+					const auto newHeight = desiredHeight * (1. - shown);
-			_topBarSuggestion->entity()->resize(width(), newHeight);
+					_topBarSuggestion->entity()->setMaximumHeight(newHeight);
-		}, _topBarSuggestion->lifetime());
+					_topBarSuggestion->entity()->setMinimumWidth((shown > 0)
+						? width()
+						: 0);
+					_topBarSuggestion->entity()->resize(width(), newHeight);
+				}, _topBarSuggestion->lifetime());
+			} else {
+				if (_topBarSuggestion) {
+					delete _topBarSuggestion;
+				}
+				_topBarSuggestion = nullptr;
+			}
+		}, lifetime());
 	}
 	_inner = innerList->add(object_ptr<InnerWidget>(
 		innerList,