mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-08-01 16:06:59 +00:00
Merge commit '488504793d5959039e2a772142b9c1e11562dfe8'
This commit is contained in:
commit
f8060fa83d
@ -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))
|
||||
let alphaTransition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut)
|
||||
alphaTransition.updateAlpha(node: self.dim, alpha: 0.0)
|
||||
|
||||
self.controller?.updateModalStyleOverlayTransitionFactor(0.0, transition: positionTransition)
|
||||
}
|
||||
|
||||
func containerLayoutUpdated(layout: ContainerViewLayout, navigationHeight: CGFloat, transition: Transition) {
|
||||
|
@ -61,7 +61,7 @@ public func customizeDefaultDarkPresentationTheme(theme: PresentationTheme, edit
|
||||
0x0771ff,
|
||||
0x9047ff,
|
||||
0xa256bf,
|
||||
]
|
||||
].reversed()
|
||||
} else {
|
||||
bubbleColors = [accentColor.withMultiplied(hue: 0.966, saturation: 0.61, brightness: 0.98).rgb, accentColor.rgb]
|
||||
}
|
||||
|
@ -46,6 +46,9 @@ public func stringForDistance(strings: PresentationStrings, distance: CLLocation
|
||||
}
|
||||
|
||||
public func flagEmoji(countryCode: String) -> String {
|
||||
if countryCode.uppercased() == "FT" {
|
||||
return "🏴☠️"
|
||||
}
|
||||
let base : UInt32 = 127397
|
||||
var flagString = ""
|
||||
for v in countryCode.uppercased().unicodeScalars {
|
||||
|
@ -258,7 +258,7 @@ public class ChatMessageGiveawayBubbleContentNode: ChatMessageBubbleContentNode
|
||||
let locale = localeWithStrings(item.presentationData.strings)
|
||||
let countryNames = giveaway.countries.map { id in
|
||||
if let countryName = locale.localizedString(forRegionCode: id) {
|
||||
return "\(flagEmoji(countryCode: id))\(countryName)"
|
||||
return "\(flagEmoji(countryCode: id))\u{feff}\(countryName)"
|
||||
} else {
|
||||
return id
|
||||
}
|
||||
|
@ -955,6 +955,10 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, UIScrollViewDelega
|
||||
self.updateCancelButton()
|
||||
}
|
||||
|
||||
deinit {
|
||||
self.disposable.dispose()
|
||||
}
|
||||
|
||||
private func enqueueTransition(_ transition: ThemeSettingsThemeItemNodeTransition) {
|
||||
self.enqueuedTransitions.append(transition)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user