ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-07 08:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '488504793d5959039e2a772142b9c1e11562dfe8'

Browse Source
This commit is contained in:
Ali 2023-10-24 17:14:48 +04:00
commit f8060fa83d
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -424,6 +424,8 @@ public class ReplaceBoostScreen: ViewController {
positionTransition.updatePosition(layer: self.footerView.layer, position: CGPoint(x: self.footerView.center.x, y: self.bounds.height + self.footerView.bounds.height / 2.0)) positionTransition.updatePosition(layer: self.footerView.layer, position: CGPoint(x: self.footerView.center.x, y: self.bounds.height + self.footerView.bounds.height / 2.0))
let alphaTransition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut) let alphaTransition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut)
alphaTransition.updateAlpha(node: self.dim, alpha: 0.0) alphaTransition.updateAlpha(node: self.dim, alpha: 0.0)
self.controller?.updateModalStyleOverlayTransitionFactor(0.0, transition: positionTransition)
} }
func containerLayoutUpdated(layout: ContainerViewLayout, navigationHeight: CGFloat, transition: Transition) { func containerLayoutUpdated(layout: ContainerViewLayout, navigationHeight: CGFloat, transition: Transition) {

2
submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift
View File

@ -61,7 +61,7 @@ public func customizeDefaultDarkPresentationTheme(theme: PresentationTheme, edit
0x0771ff, 0x0771ff,
0x9047ff, 0x9047ff,
0xa256bf, 0xa256bf,
] ].reversed()
} else { } else {
bubbleColors = [accentColor.withMultiplied(hue: 0.966, saturation: 0.61, brightness: 0.98).rgb, accentColor.rgb] bubbleColors = [accentColor.withMultiplied(hue: 0.966, saturation: 0.61, brightness: 0.98).rgb, accentColor.rgb]
} }

3
submodules/TelegramStringFormatting/Sources/Geo.swift
View File

@ -46,6 +46,9 @@ public func stringForDistance(strings: PresentationStrings, distance: CLLocation
} }
public func flagEmoji(countryCode: String) -> String { public func flagEmoji(countryCode: String) -> String {
if countryCode.uppercased() == "FT" {
return "🏴‍☠️"
}
let base : UInt32 = 127397 let base : UInt32 = 127397
var flagString = "" var flagString = ""
for v in countryCode.uppercased().unicodeScalars { for v in countryCode.uppercased().unicodeScalars {

2
submodules/TelegramUI/Components/Chat/ChatMessageGiveawayBubbleContentNode/Sources/ChatMessageGiveawayBubbleContentNode.swift
View File

@ -258,7 +258,7 @@ public class ChatMessageGiveawayBubbleContentNode: ChatMessageBubbleContentNode
let locale = localeWithStrings(item.presentationData.strings) let locale = localeWithStrings(item.presentationData.strings)
let countryNames = giveaway.countries.map { id in let countryNames = giveaway.countries.map { id in
if let countryName = locale.localizedString(forRegionCode: id) { if let countryName = locale.localizedString(forRegionCode: id) {
return "\(flagEmoji(countryCode: id))\(countryName)" return "\(flagEmoji(countryCode: id))\u{feff}\(countryName)"
} else { } else {
return id return id
} }

4
submodules/TelegramUI/Sources/ChatThemeScreen.swift
View File

@ -955,6 +955,10 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, UIScrollViewDelega
self.updateCancelButton() self.updateCancelButton()
} }
deinit {
self.disposable.dispose()
}
private func enqueueTransition(_ transition: ThemeSettingsThemeItemNodeTransition) { private func enqueueTransition(_ transition: ThemeSettingsThemeItemNodeTransition) {
self.enqueuedTransitions.append(transition) self.enqueuedTransitions.append(transition)