ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-16 03:09:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '9acabdd3a447dd717198540c0834bcd66c001780'

Browse Source
This commit is contained in:
Ali 2023-08-10 00:14:27 +03:00
commit 717e91aa9e
7 changed files with 22 additions and 7 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

@ -9754,3 +9754,5 @@ Sorry for the inconvenience.";
"StoryList.TooltipStoriesSavedToProfile_any" = "%d stories archived.";
"Premium.New" = "NEW";
"MediaEditor.AddGif" = "Add GIF";

6
submodules/DrawingUI/Sources/StickerPickerScreen.swift
View File

@ -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 {

2
submodules/PremiumUI/Sources/PremiumLimitsListScreen.swift
View File

@ -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?

4
submodules/PremiumUI/Sources/StoriesPageComponent.swift
View File

@ -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]

3
submodules/TelegramCore/Sources/TelegramEngine/Messages/BotWebView.swift
View File

@ -218,6 +218,9 @@ func _internal_requestAppWebView(postbox: Postbox, network: Network, stateManage
if let _ = payload {
flags |= (1 << 1)
}
if allowWrite {
flags |= (1 << 0)
}
return network.request(Api.functions.messages.requestAppWebView(flags: flags, peer: inputPeer, app: app, startParam: payload, themeParams: serializedThemeParams, platform: botWebViewPlatform))
|> mapError { _ -> RequestAppWebViewError in

4
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift
View File

@ -3950,7 +3950,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)
})
@ -3972,7 +3972,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)
})

8
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift
View File

@ -3190,6 +3190,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),