Allow playing single lottie icon repeatedly or once.

Telegram/SourceFiles/boxes/change_phone_box.cpp

@@ -510,7 +510,7 @@ void ChangePhone::setupContent() {
 }
 
 void ChangePhone::showFinished() {
-	_animate();
+	_animate(anim::repeat::loop);
 }
 
 } // namespace Settings

Telegram/SourceFiles/boxes/change_phone_box.h

@@ -36,7 +36,7 @@ private:
 	void setupContent();
 
 	const not_null<Window::SessionController*> _controller;
-	Fn<void()> _animate;
+	Fn<void(anim::repeat)> _animate;
 
 };
 

Telegram/SourceFiles/settings/settings_blocked_peers.cpp

@@ -171,13 +171,12 @@ void Blocked::setupContent() {
 					st::changePhoneIconSize,
 				},
 			},
-			st::blockedUsersListIconPadding,
+			st::blockedUsersListIconPadding);
-			true);
 		content->add(std::move(icon.widget));
 
 		_showFinished.events(
 		) | rpl::start_with_next([animate = std::move(icon.animate)] {
-			animate();
+			animate(anim::repeat::once);
 		}, content->lifetime());
 
 		content->add(

Telegram/SourceFiles/settings/settings_common.cpp

@@ -249,8 +249,7 @@ not_null<Ui::FlatLabel*> AddSubsectionTitle(
 LottieIcon CreateLottieIcon(
 		not_null<QWidget*> parent,
 		Lottie::IconDescriptor &&descriptor,
-		style::margins padding,
+		style::margins padding) {
-		bool playOnce) {
 	auto object = object_ptr<Ui::RpWidget>(parent);
 	const auto raw = object.data();
 
@@ -263,23 +262,22 @@ LottieIcon CreateLottieIcon(
 	const auto icon = owned.get();
 
 	raw->lifetime().add([kept = std::move(owned)]{});
-	const auto animationRequired = raw->lifetime().make_state<bool>(true);
+	const auto looped = raw->lifetime().make_state<bool>(true);
 
-	const auto animate = [=] {
+	const auto start = [=] {
-		if (playOnce) {
-			if (!base::take(*animationRequired)) {
-				return;
-			}
-		}
 		icon->animate([=] { raw->update(); }, 0, icon->framesCount() - 1);
 	};
+	const auto animate = [=](anim::repeat repeat) {
+		*looped = (repeat == anim::repeat::loop);
+		start();
+	};
 	raw->paintRequest(
 	) | rpl::start_with_next([=] {
 		auto p = QPainter(raw);
 		const auto left = (raw->width() - width) / 2;
 		icon->paint(p, left, padding.top());
-		if (!icon->animating() && icon->frameIndex() > 0) {
+		if (!icon->animating() && icon->frameIndex() > 0 && *looped) {
-			animate();
+			start();
 		}
 
 	}, raw->lifetime());

Telegram/SourceFiles/settings/settings_common.h

@@ -13,6 +13,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/object_ptr.h"
 #include "settings/settings_type.h"
 
+namespace anim {
+enum class repeat : uchar;
+} // namespace anim
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -180,13 +184,12 @@ not_null<Ui::FlatLabel*> AddSubsectionTitle(
 
 struct LottieIcon {
 	object_ptr<Ui::RpWidget> widget;
-	Fn<void()> animate;
+	Fn<void(anim::repeat repeat)> animate;
 };
 [[nodiscard]] LottieIcon CreateLottieIcon(
 	not_null<QWidget*> parent,
 	Lottie::IconDescriptor &&descriptor,
-	style::margins padding = {},
+	style::margins padding = {});
-	bool playOnce = false);
 
 void FillMenu(
 	not_null<Window::SessionController*> controller,

Telegram/SourceFiles/settings/settings_folders.cpp

@@ -613,11 +613,10 @@ QPointer<Ui::RpWidget> Folders::createPinnedToTop(not_null<QWidget*> parent) {
 				st::settingsFilterIconSize,
 			},
 		},
-		st::settingsFilterIconPadding,
+		st::settingsFilterIconPadding);
-		true);
 	_showFinished.events(
 	) | rpl::start_with_next([animate = std::move(icon.animate)] {
-		animate();
+		animate(anim::repeat::once);
 	}, verticalLayout->lifetime());
 	verticalLayout->add(std::move(icon.widget));
 

Telegram/lib_ui

@@ -1 +1 @@
-Subproject commit 9d07d6a476f057c55af9392804c3e8b6246c637c
+Subproject commit 9b6e11db62810626a56431cdc8eeb771817f6560