mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Merge commit '4d37b67932aa2148dd042cafba1c242d7faab442'
This commit is contained in:
commit
8c5f8744e5
@ -143,7 +143,7 @@ public final class ChangePhoneNumberIntroController: ViewController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func proceed() {
|
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 {
|
if let strongSelf = self {
|
||||||
(strongSelf.navigationController as? NavigationController)?.replaceTopController(ChangePhoneNumberController(context: strongSelf.context), animated: true)
|
(strongSelf.navigationController as? NavigationController)?.replaceTopController(ChangePhoneNumberController(context: strongSelf.context), animated: true)
|
||||||
}
|
}
|
||||||
|
@ -165,12 +165,6 @@ public class StickerShimmerEffectNode: ASDisplayNode {
|
|||||||
self.addSubnode(self.foregroundNode)
|
self.addSubnode(self.foregroundNode)
|
||||||
}
|
}
|
||||||
|
|
||||||
public override func didLoad() {
|
|
||||||
super.didLoad()
|
|
||||||
|
|
||||||
self.effectNode.layer.compositingFilter = "screenBlendMode"
|
|
||||||
}
|
|
||||||
|
|
||||||
public var isEmpty: Bool {
|
public var isEmpty: Bool {
|
||||||
return self.currentData == nil
|
return self.currentData == nil
|
||||||
}
|
}
|
||||||
@ -181,6 +175,8 @@ public class StickerShimmerEffectNode: ASDisplayNode {
|
|||||||
}
|
}
|
||||||
self.backdropNode = backdropNode
|
self.backdropNode = backdropNode
|
||||||
self.insertSubnode(backdropNode, at: 0)
|
self.insertSubnode(backdropNode, at: 0)
|
||||||
|
|
||||||
|
self.effectNode.layer.compositingFilter = "screenBlendMode"
|
||||||
}
|
}
|
||||||
|
|
||||||
public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
|
public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
|
||||||
|
@ -2934,10 +2934,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
|
|||||||
currentVideoCallsAvailable = cachedData.videoCallsAvailable
|
currentVideoCallsAvailable = cachedData.videoCallsAvailable
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if let previousSuggestPhoneNumberConfirmation = previousData?.globalSettings?.suggestPhoneNumberConfirmation, previousSuggestPhoneNumberConfirmation != data.globalSettings?.suggestPhoneNumberConfirmation {
|
||||||
|
infoUpdated = true
|
||||||
|
}
|
||||||
if previousCallsPrivate != currentCallsPrivate || previousVideoCallsAvailable != currentVideoCallsAvailable {
|
if previousCallsPrivate != currentCallsPrivate || previousVideoCallsAvailable != currentVideoCallsAvailable {
|
||||||
infoUpdated = true
|
infoUpdated = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if (previousCall == nil) != (currentCall == nil) {
|
if (previousCall == nil) != (currentCall == nil) {
|
||||||
infoUpdated = true
|
infoUpdated = true
|
||||||
}
|
}
|
||||||
@ -5869,7 +5871,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
|
|||||||
}
|
}
|
||||||
for sectionId in removeRegularSections {
|
for sectionId in removeRegularSections {
|
||||||
if let sectionNode = self.regularSections.removeValue(forKey: sectionId) {
|
if let sectionNode = self.regularSections.removeValue(forKey: sectionId) {
|
||||||
sectionNode.removeFromSupernode()
|
transition.updateAlpha(node: sectionNode, alpha: 0.0, completion: { [weak sectionNode] _ in
|
||||||
|
sectionNode?.removeFromSupernode()
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user