mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-15 13:35:19 +00:00
Merge commit 'fb853d50b937069bf1cb07e1323959a577a76250'
This commit is contained in:
commit
058a5297ea
@ -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";
|
||||
|
@ -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))
|
||||
|
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user