ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-15 21:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'fb853d50b937069bf1cb07e1323959a577a76250'

Browse Source
This commit is contained in:
Isaac 2025-04-29 18:15:05 +02:00
commit 058a5297ea
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Telegram-iOS/en.lproj/Localizable.strings
View File

@ -14296,3 +14296,5 @@ Sorry for the inconvenience.";
"Gift.Transfer.Unavailable.Title" = "Transfer Gift"; "Gift.Transfer.Unavailable.Title" = "Transfer Gift";
"Gift.Transfer.Unavailable.Text" = "Sorry, you can't transfer this gift yet.\n\Transferring will be available on %@."; "Gift.Transfer.Unavailable.Text" = "Sorry, you can't transfer this gift yet.\n\Transferring will be available on %@.";
"Premium.CreateMultipleStories" = "Create Multiple Stories";

3
submodules/PremiumUI/Sources/PremiumLimitScreen.swift
View File

@ -1124,7 +1124,8 @@ private final class LimitSheetContent: CombinedComponent {
premiumValue = component.count >= premiumLimit ? "" : "\(premiumLimit)" premiumValue = component.count >= premiumLimit ? "" : "\(premiumLimit)"
badgePosition = max(0.32, CGFloat(component.count) / CGFloat(premiumLimit)) badgePosition = max(0.32, CGFloat(component.count) / CGFloat(premiumLimit))
badgeGraphPosition = badgePosition badgeGraphPosition = badgePosition
titleText = strings.Premium_CreateMultipleStories
if isPremiumDisabled { if isPremiumDisabled {
badgeText = "\(limit)" badgeText = "\(limit)"
let numberString = strings.Premium_MaxExpiringStoriesNoPremiumTextNumberFormat(Int32(limit)) let numberString = strings.Premium_MaxExpiringStoriesNoPremiumTextNumberFormat(Int32(limit))

7
submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorStoryCompletion.swift
View File

@ -597,7 +597,7 @@ extension MediaEditorScreenImpl {
orderedResults.append(item) 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?.node.animateOut(finished: true, saveDraft: false, completion: { [weak self] in
self?.dismiss() self?.dismiss()
Queue.mainQueue().justDispatch { Queue.mainQueue().justDispatch {
@ -737,7 +737,10 @@ extension MediaEditorScreenImpl {
DispatchQueue.main.async { DispatchQueue.main.async {
if let image { if let image {
itemMediaEditor.replaceSource(image, additionalImage: nil, time: .zero, mirror: false) itemMediaEditor.replaceSource(image, additionalImage: nil, time: .zero, mirror: false)
if itemMediaEditor.values.gradientColors == nil {
itemMediaEditor.setGradientColors(mediaEditorGetGradientColors(from: image))
}
if let resultImage = itemMediaEditor.resultImage { if let resultImage = itemMediaEditor.resultImage {
makeEditorImageComposition( makeEditorImageComposition(
context: self.node.ciContext, context: self.node.ciContext,