diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings index 00648a40d0..72eb35c170 100644 --- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings @@ -9754,3 +9754,5 @@ Sorry for the inconvenience."; "StoryList.TooltipStoriesSavedToProfile_any" = "%d stories archived."; "Premium.New" = "NEW"; + +"MediaEditor.AddGif" = "Add GIF"; diff --git a/submodules/DrawingUI/Sources/StickerPickerScreen.swift b/submodules/DrawingUI/Sources/StickerPickerScreen.swift index 6410f5d443..8720b77c81 100644 --- a/submodules/DrawingUI/Sources/StickerPickerScreen.swift +++ b/submodules/DrawingUI/Sources/StickerPickerScreen.swift @@ -708,7 +708,7 @@ public class StickerPickerScreen: ViewController { if !canSaveGif { isGifSaved = false } - let presentationData = context.sharedContext.currentPresentationData.with { $0 } + let presentationData = context.sharedContext.currentPresentationData.with { $0 }.withUpdated(theme: defaultDarkPresentationTheme) let message = Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: PeerId(0), namespace: Namespaces.Message.Local, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 0, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: nil, text: "", attributes: [], media: [file.media], peers: SimpleDictionary(), associatedMessages: SimpleDictionary(), associatedMessageIds: [], associatedMedia: [:], associatedThreadInfo: nil, associatedStories: [:]) @@ -717,8 +717,8 @@ public class StickerPickerScreen: ViewController { gallery.setHintWillBePresentedInPreviewingContext(true) var items: [ContextMenuItem] = [] - items.append(.action(ContextMenuActionItem(text: presentationData.strings.MediaPicker_Send, icon: { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.actionSheet.primaryTextColor) + items.append(.action(ContextMenuActionItem(text: presentationData.strings.MediaEditor_AddGif, icon: { theme in + return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Add"), color: theme.actionSheet.primaryTextColor) }, action: { [weak self] _, f in f(.default) if let self { diff --git a/submodules/PremiumUI/Sources/PremiumLimitsListScreen.swift b/submodules/PremiumUI/Sources/PremiumLimitsListScreen.swift index 4e7c1bb32a..02f870ac95 100644 --- a/submodules/PremiumUI/Sources/PremiumLimitsListScreen.swift +++ b/submodules/PremiumUI/Sources/PremiumLimitsListScreen.swift @@ -256,6 +256,8 @@ public class PremiumLimitsListScreen: ViewController { }) let alphaTransition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut) alphaTransition.updateAlpha(node: self.dim, alpha: 0.0) + + self.controller?.updateModalStyleOverlayTransitionFactor(0.0, transition: positionTransition) } private var dismissOffset: CGFloat? diff --git a/submodules/PremiumUI/Sources/StoriesPageComponent.swift b/submodules/PremiumUI/Sources/StoriesPageComponent.swift index a1369162ed..0114304454 100644 --- a/submodules/PremiumUI/Sources/StoriesPageComponent.swift +++ b/submodules/PremiumUI/Sources/StoriesPageComponent.swift @@ -359,7 +359,7 @@ private final class StoriesListComponent: CombinedComponent { component: AnyComponent(ParagraphComponent( title: "Stealth Mode", titleColor: titleColor, - text: "Hide the fact that you viewd other people's stories.", + text: "Hide the fact that you viewed other people's stories.", textColor: textColor, iconName: "Premium/Stories/Stealth", iconColor: colors[1] @@ -373,7 +373,7 @@ private final class StoriesListComponent: CombinedComponent { component: AnyComponent(ParagraphComponent( title: "Permanent Views History", titleColor: titleColor, - text: "Check who opens your stories - even after they expire.", + text: "Check who opens your stories — even after they expire.", textColor: textColor, iconName: "Premium/Stories/Views", iconColor: colors[2] diff --git a/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift b/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift index 82d0015f39..cbb0ac0db8 100644 --- a/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift +++ b/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift @@ -3839,7 +3839,7 @@ public final class StoryItemSetContainerComponent: Component { guard let file else { let context = component.context var replaceImpl: ((ViewController) -> Void)? - let controller = PremiumDemoScreen(context: context, subject: .uniqueReactions, action: { + let controller = PremiumDemoScreen(context: context, subject: .uniqueReactions, forceDark: true, action: { let controller = PremiumIntroScreen(context: context, source: .reactions) replaceImpl?(controller) }) @@ -3861,7 +3861,7 @@ public final class StoryItemSetContainerComponent: Component { let context = component.context var replaceImpl: ((ViewController) -> Void)? - let controller = PremiumDemoScreen(context: context, subject: .uniqueReactions, action: { + let controller = PremiumDemoScreen(context: context, subject: .uniqueReactions, forceDark: true, action: { let controller = PremiumIntroScreen(context: context, source: .reactions) replaceImpl?(controller) }) diff --git a/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift b/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift index dd72cef086..bd90cee06b 100644 --- a/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift +++ b/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift @@ -3143,6 +3143,14 @@ final class StoryItemSetContainerSendMessage { let node = controller.displayNode let menuController = ContextMenuController(actions: actions, blurred: true) menuController.centerHorizontally = true + menuController.dismissed = { [weak self, weak view] in + if let self, let view { + Queue.mainQueue().after(0.1) { + self.menuController = nil + view.updateIsProgressPaused() + } + } + } controller.present( menuController, in: .window(.root),