ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4d37b67932aa2148dd042cafba1c242d7faab442'

Browse Source
This commit is contained in:
Ali 2021-06-13 15:09:41 +04:00
commit 8c5f8744e5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift
View File

@ -143,7 +143,7 @@ public final class ChangePhoneNumberIntroController: ViewController {
}
func proceed() {
self.present(textAlertController(context: self.context, title: nil, text: self.presentationData.strings.PhoneNumberHelp_Alert, actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: self.presentationData.strings.Common_OK, action: { [weak self] in
self.present(textAlertController(context: self.context, title: nil, text: self.presentationData.strings.PhoneNumberHelp_Alert, actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: self.presentationData.strings.TwoFactorSetup_Email_Action, action: { [weak self] in
if let strongSelf = self {
(strongSelf.navigationController as? NavigationController)?.replaceTopController(ChangePhoneNumberController(context: strongSelf.context), animated: true)
}

8
submodules/ShimmerEffect/Sources/StickerShimmerEffectNode.swift
View File

@ -164,13 +164,7 @@ public class StickerShimmerEffectNode: ASDisplayNode {
self.addSubnode(self.effectNode)
self.addSubnode(self.foregroundNode)
}
public override func didLoad() {
super.didLoad()
self.effectNode.layer.compositingFilter = "screenBlendMode"
}
public var isEmpty: Bool {
return self.currentData == nil
}
@ -181,6 +175,8 @@ public class StickerShimmerEffectNode: ASDisplayNode {
}
self.backdropNode = backdropNode
self.insertSubnode(backdropNode, at: 0)
self.effectNode.layer.compositingFilter = "screenBlendMode"
}
public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {

10
submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
View File

@ -2925,7 +2925,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
var currentCallsPrivate: Bool?
var previousVideoCallsAvailable: Bool? = true
var currentVideoCallsAvailable: Bool?
if let previousCachedData = previousData?.cachedData as? CachedUserData, let cachedData = data.cachedData as? CachedUserData {
previousCallsPrivate = previousCachedData.callsPrivate ?? false
currentCallsPrivate = cachedData.callsPrivate
@ -2934,10 +2934,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
currentVideoCallsAvailable = cachedData.videoCallsAvailable
}
if let previousSuggestPhoneNumberConfirmation = previousData?.globalSettings?.suggestPhoneNumberConfirmation, previousSuggestPhoneNumberConfirmation != data.globalSettings?.suggestPhoneNumberConfirmation {
infoUpdated = true
}
if previousCallsPrivate != currentCallsPrivate || previousVideoCallsAvailable != currentVideoCallsAvailable {
infoUpdated = true
}
if (previousCall == nil) != (currentCall == nil) {
infoUpdated = true
}
@ -5869,7 +5871,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
}
for sectionId in removeRegularSections {
if let sectionNode = self.regularSections.removeValue(forKey: sectionId) {
sectionNode.removeFromSupernode()
transition.updateAlpha(node: sectionNode, alpha: 0.0, completion: { [weak sectionNode] _ in
sectionNode?.removeFromSupernode()
})
}
}