From d39317aa4ce2d3733e39c24acb6613c45a09207c Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sat, 20 Apr 2024 23:18:35 +0400 Subject: [PATCH] Various fixes --- .../Shortcuts/AppIcon.imageset/Contents.json | 13 ++----------- .../Shortcuts/AppIcon.imageset/appicon.png | Bin 1312 -> 0 bytes .../Shortcuts/AppIcon.imageset/tlogo_24.pdf | Bin 0 -> 2541 bytes ...rizationSequenceCodeEntryControllerNode.swift | 13 ++++++++++++- 4 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/AppIcon.imageset/appicon.png create mode 100644 Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/AppIcon.imageset/tlogo_24.pdf diff --git a/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/AppIcon.imageset/Contents.json b/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/AppIcon.imageset/Contents.json index 133d7727aa..f090bedc35 100644 --- a/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/AppIcon.imageset/Contents.json +++ b/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/AppIcon.imageset/Contents.json @@ -1,17 +1,8 @@ { "images" : [ { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "appicon.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "tlogo_24.pdf", + "idiom" : "universal" } ], "info" : { diff --git a/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/AppIcon.imageset/appicon.png b/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/AppIcon.imageset/appicon.png deleted file mode 100644 index 03845a289923ff138aa3e5ff6e0bd6d1601c1aed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1312 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 literal 0 HcmV?d00001 diff --git a/submodules/AuthorizationUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift b/submodules/AuthorizationUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift index 4624659fe7..70324844b2 100644 --- a/submodules/AuthorizationUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift +++ b/submodules/AuthorizationUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift @@ -366,7 +366,7 @@ final class AuthorizationSequenceCodeEntryControllerNode: ASDisplayNode, UITextF func updatePasteVisibility() { let text = self.textField.textField.text ?? "" - self.pasteButton.isHidden = !text.isEmpty || !UIPasteboard.general.hasStrings + self.pasteButton.isHidden = !text.isEmpty } func updateCode(_ code: String) { @@ -928,6 +928,12 @@ final class AuthorizationSequenceCodeEntryControllerNode: ASDisplayNode, UITextF self.hintButtonNode.alpha = 0.0 self.hintButtonNode.layer.animateAlpha(from: previousHintAlpha, to: 0.0, duration: 0.1) + let previousResetAlpha = self.resetNode.alpha + if !self.resetNode.isHidden { + self.resetNode.alpha = 0.0 + self.resetNode.layer.animateAlpha(from: previousResetAlpha, to: 0.0, duration: 0.1) + } + Queue.mainQueue().after(1.6) { self.errorTextNode.alpha = 0.0 self.errorTextNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15) @@ -935,6 +941,11 @@ final class AuthorizationSequenceCodeEntryControllerNode: ASDisplayNode, UITextF self.hintButtonNode.alpha = previousHintAlpha self.hintButtonNode.layer.animateAlpha(from: 0.0, to: previousHintAlpha, duration: 0.1) + if !self.resetNode.isHidden { + self.resetNode.alpha = previousResetAlpha + self.resetNode.layer.animateAlpha(from: 0.0, to: previousResetAlpha, duration: 0.1) + } + let transition: ContainedViewLayoutTransition = .animated(duration: 0.15, curve: .easeInOut) transition.updateBackgroundColor(node: self.textSeparatorNode, color: self.theme.list.itemPlainSeparatorColor) }