Get rid of registerImageEmoji/registerInternalEmoji.

Author: john-preston

Telegram/SourceFiles/boxes/boxes.style

@@ -1116,8 +1116,16 @@ moderateBoxExpandInnerSkip: 2px;
 moderateBoxExpandFont: font(11px);
 moderateBoxExpandToggleSize: 4px;
 moderateBoxExpandToggleFourStrokes: 3px;
-moderateBoxExpandIcon: icon{{ "info/edit/expand_arrow_small-flip_vertical", windowActiveTextFg }};
-moderateBoxExpandIconDown: icon{{ "info/edit/expand_arrow_small", windowActiveTextFg }};
+moderateBoxExpandIcon: IconEmoji{
+	icon: icon{{ "info/edit/expand_arrow_small-flip_vertical", windowActiveTextFg }};
+	padding: margins(-2px, -1px, 0px, 0px);
+	useIconColor: true;
+}
+moderateBoxExpandIconDown: IconEmoji{
+	icon: icon{{ "info/edit/expand_arrow_small", windowActiveTextFg }};
+	padding: margins(-2px, -1px, 0px, 0px);
+	useIconColor: true;
+}
 moderateBoxDividerLabel: FlatLabel(boxDividerLabel) {
 	palette: TextPalette(defaultTextPalette) {
 		selectLinkFg: windowActiveTextFg;

Telegram/SourceFiles/boxes/moderate_messages_box.cpp

@@ -403,22 +403,10 @@ void CreateModerateMessagesBox(
 			const auto container = wrap->entity();
 			wrap->toggle(false, anim::type::instant);
 
-			const auto session = &participants.front()->session();
-			const auto emojiMargin = QMargins(
-				-st::moderateBoxExpandInnerSkip,
-				-st::moderateBoxExpandInnerSkip / 2,
-				0,
-				0);
-			const auto emojiUp = Ui::Text::SingleCustomEmoji(
-				session->data().customEmojiManager().registerInternalEmoji(
-					st::moderateBoxExpandIcon,
-					emojiMargin,
-					false));
-			const auto emojiDown = Ui::Text::SingleCustomEmoji(
-				session->data().customEmojiManager().registerInternalEmoji(
-					st::moderateBoxExpandIconDown,
-					emojiMargin,
-					false));
+			const auto emojiUp = Ui::Text::IconEmoji(
+				&st::moderateBoxExpandIcon);
+			const auto emojiDown = Ui::Text::IconEmoji(
+				&st::moderateBoxExpandIconDown);
 
 			auto label = object_ptr<Ui::FlatLabel>(
 				inner,
@@ -463,9 +451,7 @@ void CreateModerateMessagesBox(
 						Ui::Text::WithEntities);
 			}) | rpl::flatten_latest(
 			) | rpl::start_with_next([=](const TextWithEntities &text) {
-				raw->setMarkedText(
-					Ui::Text::Link(text, u"internal:"_q),
-					Core::TextContext({ .session = session }));
+				raw->setMarkedText(Ui::Text::Link(text, u"internal:"_q));
 			}, label->lifetime());
 
 			Ui::AddSkip(inner);

Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp

@@ -15,7 +15,6 @@ For license and copyright information please follow this link:
 #include "boxes/background_box.h"
 #include "boxes/stickers_box.h"
 #include "chat_helpers/compose/compose_show.h"
-#include "core/ui_integration.h" // TextContext
 #include "data/stickers/data_custom_emoji.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_changes.h"
@@ -164,7 +163,6 @@ class LevelBadge final : public Ui::RpWidget {
 	void updateText();
 
 	const uint32 _level;
-	const TextWithEntities _icon;
 	const Ui::Text::MarkedContext _context;
 	Ui::Text::String _text;
 	bool _minimal = false;
@@ -460,22 +458,12 @@ LevelBadge::LevelBadge(
 	uint32 level,
 	not_null<Main::Session*> session)
 : Ui::RpWidget(parent)
-, _level(level)
-, _icon(Ui::Text::SingleCustomEmoji(
-	session->data().customEmojiManager().registerInternalEmoji(
-		st::settingsLevelBadgeLock,
-		QMargins(0, st::settingsLevelBadgeLockSkip, 0, 0),
-		false)))
-, _context(Core::TextContext({
-	.session = session,
-	.repaint = [this] { update(); },
-})) {
+, _level(level) {
 	updateText();
 }
 
 void LevelBadge::updateText() {
-	auto text = _icon;
-	text.append(' ');
+	auto text = Ui::Text::IconEmoji(&st::settingsLevelBadgeLock).append(' ');
 	if (!_minimal) {
 		text.append(tr::lng_boost_level(
 			tr::now,
@@ -490,7 +478,7 @@ void LevelBadge::updateText() {
 		st,
 		text,
 		kMarkupTextOptions,
-		_context);
+		Ui::Text::MarkedContext{ .repaint = [=] { update(); } });
 	const auto &padding = st::settingsColorSamplePadding;
 	QWidget::resize(
 		_text.maxWidth() + rect::m::sum::h(padding),

Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp

@@ -29,6 +29,7 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item_helpers.h" // GetErrorForSending.
 #include "history/view/history_view_group_call_bar.h" // GenerateUserpics...
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "qr/qr_generate.h"
@@ -42,6 +43,7 @@ For license and copyright information please follow this link:
 #include "ui/controls/userpic_button.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
@@ -247,6 +249,9 @@ class Controller final
 	const Role _role = Role::Joined;
 	rpl::variable<LinkData> _data;
 
+	Ui::Text::CustomEmojiHelper _emojiHelper;
+	TextWithEntities _creditsEmoji;
+
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	rpl::event_stream<Processed> _processed;
 
@@ -408,6 +413,8 @@ Controller::Controller(
 	const auto current = _data.current();
 	_link = current.link;
 	_revoked = current.revoked;
+	_creditsEmoji = _emojiHelper.paletteDependent(
+		Ui::Earn::IconCreditsEmoji());
 }
 
 rpl::producer<LinkData> Controller::dataValue() const {
@@ -725,7 +732,7 @@ void Controller::setupAboveJoinedWidget() {
 				? tr::lng_group_invite_subscription_info_title(
 					tr::now,
 					lt_emoji,
-					session().data().customEmojiManager().creditsEmoji(),
+					_creditsEmoji,
 					lt_price,
 					{ QString::number(current.subscription.credits) },
 					lt_multiplier,
@@ -736,15 +743,12 @@ void Controller::setupAboveJoinedWidget() {
 				: tr::lng_group_invite_subscription_info_title_none(
 					tr::now,
 					lt_emoji,
-					session().data().customEmojiManager().creditsEmoji(),
+					_creditsEmoji,
 					lt_price,
 					{ QString::number(current.subscription.credits) },
 					Ui::Text::WithEntities),
 			kMarkupTextOptions,
-			Core::TextContext({
-				.session = &session(),
-				.repaint = [=] { widget->update(); },
-			}));
+			_emojiHelper.context([=] { widget->update(); }));
 		auto &lifetime = widget->lifetime();
 		const auto rateValue = lifetime.make_state<rpl::variable<float64>>(
 			session().credits().rateValue(_peer));
@@ -991,11 +995,11 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 			tr::lng_credits_subscription_subtitle(
 				tr::now,
 				lt_emoji,
-				session->data().customEmojiManager().creditsEmoji(),
+				_creditsEmoji,
 				lt_cost,
 				{ QString::number(data.subscription.credits) },
 				Ui::Text::WithEntities),
-			Core::TextContext({ .session = session }));
+			_emojiHelper.context());
 		const auto subtitle2 = box->addRow(
 			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
 				box,

Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp

@@ -886,32 +886,18 @@ rpl::producer<int> AddSlowmodeSlider(
 	return secondsCount->value();
 }
 
-void AddBoostsUnrestrictLabels(
-		not_null<Ui::VerticalLayout*> container,
-		not_null<Main::Session*> session) {
+void AddBoostsUnrestrictLabels(not_null<Ui::VerticalLayout*> container) {
 	const auto labels = container->add(
 		object_ptr<Ui::FixedHeightWidget>(container, st::normalFont->height),
 		st::slowmodeLabelsMargin);
-	const auto manager = &session->data().customEmojiManager();
-	const auto one = Ui::Text::SingleCustomEmoji(
-		manager->registerInternalEmoji(
-			st::boostMessageIcon,
-			st::boostMessageIconPadding));
-	const auto many = Ui::Text::SingleCustomEmoji(
-		manager->registerInternalEmoji(
-			st::boostsMessageIcon,
-			st::boostsMessageIconPadding));
-	const auto context = Core::TextContext({
-		.session = session,
-		.customEmojiLoopLimit = 1,
-	});
+	const auto one = Ui::Text::IconEmoji(&st::boostMessageIcon);
+	const auto many = Ui::Text::IconEmoji(&st::boostsMessageIcon);
 	for (auto i = 0; i != kBoostsUnrestrictValues; ++i) {
 		const auto label = Ui::CreateChild<Ui::FlatLabel>(
 			labels,
 			st::boostsUnrestrictLabel);
 		label->setMarkedText(
-			TextWithEntities(i ? many : one).append(QString::number(i + 1)),
-			context);
+			TextWithEntities(i ? many : one).append(QString::number(i + 1)));
 		rpl::combine(
 			labels->widthValue(),
 			label->widthValue()
@@ -977,7 +963,7 @@ rpl::producer<int> AddBoostsUnrestrictSlider(
 
 	const auto inner = outer->entity();
 
-	AddBoostsUnrestrictLabels(inner, &peer->session());
+	AddBoostsUnrestrictLabels(inner);
 
 	const auto slider = inner->add(
 		object_ptr<Ui::MediaSlider>(inner, st::localStorageLimitSlider),

Telegram/SourceFiles/boxes/send_credits_box.cpp

@@ -455,7 +455,7 @@ void SendCreditsBox(
 					lt_count,
 					rpl::single(form->invoice.amount) | tr::to_count(),
 					lt_emoji,
-					rpl::single(CreditsEmojiSmall(session)),
+					rpl::single(CreditsEmojiSmall()),
 					Ui::Text::RichLangValue),
 			state->confirmButtonBusy.value()
 		) | rpl::map([](TextWithEntities &&text, bool busy) {
@@ -502,16 +502,13 @@ void SendCreditsBox(
 	}
 }
 
-TextWithEntities CreditsEmoji(not_null<Main::Session*> session) {
-	return Ui::Text::SingleCustomEmoji(
-		session->data().customEmojiManager().registerInternalEmoji(
-			st::settingsPremiumIconStar,
-			QMargins{ 0, -st::moderateBoxExpandInnerSkip, 0, 0 },
-			true),
+TextWithEntities CreditsEmoji() {
+	return Ui::Text::IconEmoji(
+		&st::starIconEmojiLarge,
 		QString(QChar(0x2B50)));
 }
 
-TextWithEntities CreditsEmojiSmall(not_null<Main::Session*> session) {
+TextWithEntities CreditsEmojiSmall() {
 	return Ui::Text::IconEmoji(
 		&st::starIconEmoji,
 		QString(QChar(0x2B50)));

Telegram/SourceFiles/boxes/send_credits_box.h

@@ -32,11 +32,9 @@ void SendCreditsBox(
 	std::shared_ptr<Payments::CreditsFormData> data,
 	Fn<void()> sent);
 
-[[nodiscard]] TextWithEntities CreditsEmoji(
-	not_null<Main::Session*> session);
+[[nodiscard]] TextWithEntities CreditsEmoji();
 
-[[nodiscard]] TextWithEntities CreditsEmojiSmall(
-	not_null<Main::Session*> session);
+[[nodiscard]] TextWithEntities CreditsEmojiSmall();
 
 not_null<FlatLabel*> SetButtonMarkedLabel(
 	not_null<RpWidget*> button,

Telegram/SourceFiles/boxes/send_files_box.cpp

@@ -843,9 +843,8 @@ void SendFilesBox::refreshPriceTag() {
 			QPainter(raw).drawImage(0, 0, _priceTagBg);
 		}, raw->lifetime());
 
-		const auto session = &_show->session();
 		auto price = _price.value() | rpl::map([=](uint64 amount) {
-			auto result = Ui::Text::Colorized(Ui::CreditsEmoji(session));
+			auto result = Ui::Text::Colorized(Ui::CreditsEmoji());
 			result.append(Lang::FormatCountDecimal(amount));
 			return result;
 		});
@@ -857,10 +856,10 @@ void SendFilesBox::refreshPriceTag() {
 			raw,
 			QString(),
 			st::paidTagLabel);
-		std::move(text) | rpl::start_with_next([=](TextWithEntities &&text) {
-			label->setMarkedText(text, Core::TextContext({
-				.session = session,
-			}));
+		std::move(
+			text
+		) | rpl::start_with_next([=](const TextWithEntities &text) {
+			label->setMarkedText(text);
 		}, label->lifetime());
 		label->show();
 		label->sizeValue() | rpl::start_with_next([=](QSize size) {