From fb853d50b937069bf1cb07e1323959a577a76250 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 29 Apr 2025 18:54:14 +0400 Subject: [PATCH] Various fixes --- Telegram/Telegram-iOS/en.lproj/Localizable.strings | 2 ++ submodules/PremiumUI/Sources/PremiumLimitScreen.swift | 3 ++- .../Sources/MediaEditorStoryCompletion.swift | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings index aa26391efb..b806c2063c 100644 --- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings @@ -14296,3 +14296,5 @@ Sorry for the inconvenience."; "Gift.Transfer.Unavailable.Title" = "Transfer Gift"; "Gift.Transfer.Unavailable.Text" = "Sorry, you can't transfer this gift yet.\n\Transferring will be available on %@."; + +"Premium.CreateMultipleStories" = "Create Multiple Stories"; diff --git a/submodules/PremiumUI/Sources/PremiumLimitScreen.swift b/submodules/PremiumUI/Sources/PremiumLimitScreen.swift index be2c2e03cc..e47d2a92ab 100644 --- a/submodules/PremiumUI/Sources/PremiumLimitScreen.swift +++ b/submodules/PremiumUI/Sources/PremiumLimitScreen.swift @@ -1124,7 +1124,8 @@ private final class LimitSheetContent: CombinedComponent { premiumValue = component.count >= premiumLimit ? "" : "\(premiumLimit)" badgePosition = max(0.32, CGFloat(component.count) / CGFloat(premiumLimit)) badgeGraphPosition = badgePosition - + titleText = strings.Premium_CreateMultipleStories + if isPremiumDisabled { badgeText = "\(limit)" let numberString = strings.Premium_MaxExpiringStoriesNoPremiumTextNumberFormat(Int32(limit)) diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorStoryCompletion.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorStoryCompletion.swift index 56541d36e5..1b48021c76 100644 --- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorStoryCompletion.swift +++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorStoryCompletion.swift @@ -597,7 +597,7 @@ extension MediaEditorScreenImpl { orderedResults.append(item) } } - self.completion(results, { [weak self] finished in + self.completion(orderedResults, { [weak self] finished in self?.node.animateOut(finished: true, saveDraft: false, completion: { [weak self] in self?.dismiss() Queue.mainQueue().justDispatch { @@ -737,7 +737,10 @@ extension MediaEditorScreenImpl { DispatchQueue.main.async { if let image { itemMediaEditor.replaceSource(image, additionalImage: nil, time: .zero, mirror: false) - + if itemMediaEditor.values.gradientColors == nil { + itemMediaEditor.setGradientColors(mediaEditorGetGradientColors(from: image)) + } + if let resultImage = itemMediaEditor.resultImage { makeEditorImageComposition( context: self.node.ciContext,