Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Author: laktyushin

Random.txt

@@ -1 +1 @@
-1e13d2cafc34e31a
+06de25b179c80e56

Telegram/NotificationService/Sources/NotificationService.swift

@@ -113,7 +113,7 @@ final class AuthorizationSequenceEmailEntryControllerNode: ASDisplayNode, UIText
             (self.signInWithAppleButton as? ASAuthorizationAppleIDButton)?.cornerRadius = 11
         }
 
-        self.proceedNode = SolidRoundedButtonNode(title: self.strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: self.theme), glass: true, height: 50.0, cornerRadius: 50.0 * 0.5)
+        self.proceedNode = SolidRoundedButtonNode(title: self.strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: self.theme), glass: false, height: 50.0, cornerRadius: 50.0 * 0.5)
         self.proceedNode.progressType = .embedded
 
         self.codeSeparatorNode = ASDisplayNode()

submodules/AuthorizationUI/Sources/AuthorizationSequenceEmailEntryControllerNode.swift

@@ -107,7 +107,7 @@ final class AuthorizationSequencePasswordEntryControllerNode: ASDisplayNode, UIT
         self.codeField.textField.tintColor = self.theme.list.itemAccentColor
         self.codeField.textField.accessibilityHint = self.strings.Login_VoiceOver_Password
 
-        self.proceedNode = SolidRoundedButtonNode(title: self.strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: self.theme), glass: true, height: 50.0, cornerRadius: 50.0 * 0.5)
+        self.proceedNode = SolidRoundedButtonNode(title: self.strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: self.theme), glass: false, height: 50.0, cornerRadius: 50.0 * 0.5)
         self.proceedNode.progressType = .embedded
         self.proceedNode.isEnabled = false
 

submodules/AuthorizationUI/Sources/AuthorizationSequencePasswordEntryControllerNode.swift

@@ -423,7 +423,7 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
 
         self.phoneAndCountryNode = PhoneAndCountryNode(strings: strings, theme: theme)
 
-        self.proceedNode = SolidRoundedButtonNode(title: self.strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: self.theme), glass: true, height: 50.0, cornerRadius: 50 * 0.5)
+        self.proceedNode = SolidRoundedButtonNode(title: self.strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: self.theme), glass: false, height: 50.0, cornerRadius: 50 * 0.5)
         self.proceedNode.progressType = .embedded
         self.proceedNode.isEnabled = false
 
@@ -857,7 +857,7 @@ final class PhoneConfirmationController: ViewController {
             self.cancelButton.accessibilityTraits = [.button]
             self.cancelButton.accessibilityLabel = strings.Login_Edit
 
-            self.proceedNode = SolidRoundedButtonNode(title: strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: theme), glass: true, height: 50.0, cornerRadius: 50.0 * 0.5)
+            self.proceedNode = SolidRoundedButtonNode(title: strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: theme), glass: false, height: 50.0, cornerRadius: 50.0 * 0.5)
             self.proceedNode.progressType = .embedded
 
             let font = Font.with(size: 20.0, design: .regular, traits: [.monospacedNumbers])

submodules/AuthorizationUI/Sources/AuthorizationSequencePhoneEntryControllerNode.swift

@@ -152,7 +152,7 @@ final class AuthorizationSequenceSignUpControllerNode: ASDisplayNode, UITextFiel
         self.addPhotoButton.addSubnode(self.currentPhotoNode)
         self.addPhotoButton.allowsGroupOpacity = true
 
-        self.proceedNode = SolidRoundedButtonNode(title: self.strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: self.theme), glass: true, height: 50.0, cornerRadius: 50.0 * 0.5)
+        self.proceedNode = SolidRoundedButtonNode(title: self.strings.Login_Continue, theme: SolidRoundedButtonTheme(theme: self.theme), glass: false, height: 50.0, cornerRadius: 50.0 * 0.5)
         self.proceedNode.progressType = .embedded
 
         super.init()

submodules/AuthorizationUI/Sources/AuthorizationSequenceSignUpControllerNode.swift

@@ -73,7 +73,7 @@ public final class AuthorizationSequenceSplashController: ViewController {
 
         self.controller = RMIntroViewController(backgroundColor: theme.list.plainBackgroundColor, primaryColor: theme.list.itemPrimaryTextColor, buttonColor: theme.intro.startButtonColor, accentColor: theme.list.itemAccentColor, regularDotColor: theme.intro.dotColor, highlightedDotColor: theme.list.itemAccentColor, suggestedLocalizationSignal: localizationSignal)
 
-        self.startButton = SolidRoundedButtonNode(title: "Start Messaging", theme: SolidRoundedButtonTheme(theme: theme), glass: true, height: 50.0, cornerRadius: 50.0 * 0.5, isShimmering: true)
+        self.startButton = SolidRoundedButtonNode(title: "Start Messaging", theme: SolidRoundedButtonTheme(theme: theme), glass: false, height: 50.0, cornerRadius: 50.0 * 0.5, isShimmering: true)
 
         super.init(navigationBarPresentationData: nil)
 

submodules/AuthorizationUI/Sources/AuthorizationSequenceSplashController.swift

@@ -665,7 +665,7 @@ final class CallListControllerNode: ASDisplayNode {
                 }
             }
 
-            self.listNode.visibleContentOffsetChanged = { [weak self] offset in
+            self.listNode.visibleContentOffsetChanged = { [weak self] offset, _ in
                 if let strongSelf = self {
                     var previousContentOffsetValue: CGFloat?
                     if let previousContentOffset = strongSelf.previousContentOffset, case let .known(value) = previousContentOffset {

submodules/CallListUI/Sources/CallListControllerNode.swift

@@ -165,6 +165,7 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
             previousItemNode.listNode.updatePeerGrouping = nil
             previousItemNode.listNode.contentOffsetChanged = nil
             previousItemNode.listNode.contentScrollingEnded = nil
+            previousItemNode.listNode.pinnedHeaderDisplayFractionUpdated = nil
             previousItemNode.listNode.didBeginInteractiveDragging = nil
             previousItemNode.listNode.endedInteractiveDragging = { _ in }
             previousItemNode.listNode.shouldStopScrolling = nil
@@ -327,11 +328,12 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
             }
 
             return self.contentScrollingEnded?(listView) ?? false
-            //DispatchQueue.main.async { [weak self] in
-            //    let _ = self?.contentScrollingEnded?(listView)
-            //}
-            
-            //return false
+        }
+        itemNode.listNode.pinnedHeaderDisplayFractionUpdated = { [weak self] transition in
+            guard let self else {
+                return
+            }
+            self.pinnedHeaderDisplayFractionUpdated?(transition)
         }
         itemNode.listNode.activateChatPreview = { [weak self] item, threadId, sourceNode, gesture, location in
             self?.activateChatPreview?(item, threadId, sourceNode, gesture, location)
@@ -427,6 +429,7 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
     var contentOffset: ListViewVisibleContentOffset?
     public var contentOffsetChanged: ((ListViewVisibleContentOffset, ListView) -> Void)?
     public var contentScrollingEnded: ((ListView) -> Bool)?
+    public var pinnedHeaderDisplayFractionUpdated: ((ContainedViewLayoutTransition) -> Void)?
     var didBeginInteractiveDragging: ((ListView) -> Void)?
     var endedInteractiveDragging: ((ListView) -> Void)?
     var shouldStopScrolling: ((ListView, CGFloat) -> Bool)?
@@ -443,6 +446,34 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
     var canExpandHiddenItems: (() -> Bool)?
     public var displayFilterLimit: (() -> Void)?
 
+    public var pinnedHeaderDisplayFraction: CGFloat {
+        guard let currentItemNodeValue = self.currentItemNodeValue else {
+            return 0.0
+        }
+        if self.transitionFraction != 0.0 {
+            var nextItemNode: ChatListContainerItemNode?
+            if let selectedIndex = self.availableFilters.firstIndex(where: { $0.id == self.selectedId }) {
+                if self.transitionFraction < 0.0 {
+                    if selectedIndex + 1 < self.availableFilters.count {
+                        nextItemNode = self.itemNodes[self.availableFilters[selectedIndex + 1].id]
+                    }
+                } else {
+                    if selectedIndex > 0 {
+                        nextItemNode = self.itemNodes[self.availableFilters[selectedIndex - 1].id]
+                    }
+                }
+            }
+            
+            if let nextItemNode {
+                let absTransitionFraction = abs(self.transitionFraction)
+                return (1.0 - absTransitionFraction) * currentItemNodeValue.listNode.pinnedScrollFraction + absTransitionFraction * nextItemNode.listNode.pinnedScrollFraction
+            } else {
+                return currentItemNodeValue.listNode.pinnedScrollFraction
+            }
+        }
+        return currentItemNodeValue.listNode.pinnedScrollFraction
+    }
+    
     public init(
         context: AccountContext,
         controller: ChatListControllerImpl?,
@@ -584,6 +615,7 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
                         self.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, originalNavigationHeight: originalNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, insets: insets, isReorderingFilters: isReorderingFilters, isEditing: isEditing, inlineNavigationLocation: inlineNavigationLocation, inlineNavigationTransitionFraction: inlineNavigationTransitionFraction, storiesInset: storiesInset, transition: .immediate)
                         self.isSwitchingCurrentItemFilterByDragging = true
                         self.currentItemFilterUpdated?(self.currentItemFilter, self.transitionFraction, .immediate, true)
+                        self.pinnedHeaderDisplayFractionUpdated?(.immediate)
                     }
                 }
             }
@@ -661,6 +693,7 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
                 self.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, originalNavigationHeight: originalNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, insets: insets, isReorderingFilters: isReorderingFilters, isEditing: isEditing, inlineNavigationLocation: inlineNavigationLocation, inlineNavigationTransitionFraction: inlineNavigationTransitionFraction, storiesInset: storiesInset, transition: .immediate)
                 self.isSwitchingCurrentItemFilterByDragging = true
                 self.currentItemFilterUpdated?(self.currentItemFilter, self.transitionFraction, transition, false)
+                self.pinnedHeaderDisplayFractionUpdated?(transition)
             }
         case .cancelled, .ended:
             if let (layout, navigationBarHeight, visualNavigationHeight, originalNavigationHeight: originalNavigationHeight, cleanNavigationBarHeight, insets, isReorderingFilters, isEditing, inlineNavigationLocation, inlineNavigationTransitionFraction, storiesInset) = self.validLayout, let selectedIndex = self.availableFilters.firstIndex(where: { $0.id == self.selectedId }) {
@@ -723,6 +756,7 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
                 }
                 self.isSwitchingCurrentItemFilterByDragging = false
                 self.currentItemFilterUpdated?(self.currentItemFilter, self.transitionFraction, transition, false)
+                self.pinnedHeaderDisplayFractionUpdated?(transition)
             }
         default:
             break
@@ -843,6 +877,7 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
                 let transition: ContainedViewLayoutTransition = .animated(duration: 0.35, curve: .spring)
                 self.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, originalNavigationHeight: originalNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, insets: insets, isReorderingFilters: isReorderingFilters, isEditing: isEditing, inlineNavigationLocation: inlineNavigationLocation, inlineNavigationTransitionFraction: inlineNavigationTransitionFraction, storiesInset: storiesInset, transition: transition)
                 self.currentItemFilterUpdated?(self.currentItemFilter, self.transitionFraction, transition, false)
+                self.pinnedHeaderDisplayFractionUpdated?(transition)
                 itemNode.emptyNode?.restartAnimation()
                 completion?()
             } else if self.pendingItemNode == nil {
@@ -889,6 +924,7 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
                         strongSelf.selectedId = id
                         strongSelf.applyItemNodeAsCurrent(id: id, itemNode: itemNode)
                         strongSelf.currentItemFilterUpdated?(strongSelf.currentItemFilter, strongSelf.transitionFraction, .immediate, false)
+                        strongSelf.pinnedHeaderDisplayFractionUpdated?(.immediate)
 
                         completion?()
                         return
@@ -945,6 +981,7 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
                         strongSelf.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, originalNavigationHeight: originalNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, insets: insets, isReorderingFilters: isReorderingFilters, isEditing: isEditing, inlineNavigationLocation: inlineNavigationLocation, inlineNavigationTransitionFraction: inlineNavigationTransitionFraction, storiesInset: storiesInset, transition: .immediate)
 
                         strongSelf.currentItemFilterUpdated?(strongSelf.currentItemFilter, strongSelf.transitionFraction, transition, false)
+                        strongSelf.pinnedHeaderDisplayFractionUpdated?(transition)
                     }
 
                     completion?()
@@ -1177,6 +1214,9 @@ final class ChatListControllerNode: ASDisplayNode, ASGestureRecognizerDelegate {
         self.mainContainerNode.contentScrollingEnded = { [weak self] listView in
             return self?.contentScrollingEnded(listView: listView, isPrimary: true) ?? false
         }
+        self.mainContainerNode.pinnedHeaderDisplayFractionUpdated = { [weak self] transition in
+            self?.pinnedHeaderDisplayFractionUpdated(transition: transition)
+        }
         self.mainContainerNode.didBeginInteractiveDragging = { [weak self] listView in
             self?.didBeginInteractiveDragging(listView: listView, isPrimary: true)
         }
@@ -2172,6 +2212,19 @@ final class ChatListControllerNode: ASDisplayNode, ASGestureRecognizerDelegate {
         return false
     }
 
+    private func pinnedHeaderDisplayFractionUpdated(transition: ContainedViewLayoutTransition) {
+        var pinnedFraction: CGFloat = 0.0
+        if let inlineStackContainerNode = self.inlineStackContainerNode, self.inlineStackContainerTransitionFraction != 0.0 {
+            pinnedFraction = (1.0 - self.inlineStackContainerTransitionFraction) * self.mainContainerNode.pinnedHeaderDisplayFraction + self.inlineStackContainerTransitionFraction * inlineStackContainerNode.pinnedHeaderDisplayFraction
+        } else {
+            pinnedFraction = self.mainContainerNode.pinnedHeaderDisplayFraction
+        }
+        
+        if let navigationBarComponentView = self.navigationBarView.view as? ChatListNavigationBar.View {
+            navigationBarComponentView.updateEdgeEffectForPinnedFraction(pinnedFraction: pinnedFraction, transition: ComponentTransition(transition))
+        }
+    }
+    
     func makeInlineChatList(location: ChatListControllerLocation) -> ChatListContainerNode {
         var forumPeerId: EnginePeer.Id?
         if case let .forum(peerId) = location {
@@ -2220,6 +2273,9 @@ final class ChatListControllerNode: ASDisplayNode, ASGestureRecognizerDelegate {
                 inlineStackContainerNode.contentScrollingEnded = { [weak self] listView in
                     return self?.contentScrollingEnded(listView: listView, isPrimary: false) ?? false
                 }
+                inlineStackContainerNode.pinnedHeaderDisplayFractionUpdated = { [weak self] transition in
+                    self?.pinnedHeaderDisplayFractionUpdated(transition: transition)
+                }
 
                 inlineStackContainerNode.activateChatPreview = self.mainContainerNode.activateChatPreview
                 inlineStackContainerNode.openStories = self.mainContainerNode.openStories

submodules/ChatListUI/Sources/ChatListControllerNode.swift

@@ -1251,6 +1251,8 @@ public final class ChatListNode: ListView {
     }
 
     public var contentOffsetChanged: ((ListViewVisibleContentOffset) -> Void)?
+    public private(set) var pinnedScrollFraction: CGFloat = 0.0
+    public var pinnedHeaderDisplayFractionUpdated: ((ContainedViewLayoutTransition) -> Void)?
     public var contentScrollingEnded: ((ListView) -> Bool)?
     public var didBeginInteractiveDragging: ((ListView) -> Void)?
 
@@ -2937,7 +2939,6 @@ public final class ChatListNode: ListView {
                 return .single(false)
             }
         }
-        var startedScrollingWithCanExpandHiddenItems = false
 
         self.beganInteractiveDragging = { [weak self] _ in
             guard let strongSelf = self else {
@@ -2950,12 +2951,6 @@ public final class ChatListNode: ListView {
                 strongSelf.startedScrollingAtUpperBound = value <= 0.001
             }
 
-            if let canExpandHiddenItems = strongSelf.canExpandHiddenItems {
-                startedScrollingWithCanExpandHiddenItems = canExpandHiddenItems()
-            } else {
-                startedScrollingWithCanExpandHiddenItems = true
-            }
-            
             if strongSelf.currentState.peerIdWithRevealedOptions != nil {
                 strongSelf.updateState { state in
                     var state = state
@@ -2999,29 +2994,43 @@ public final class ChatListNode: ListView {
             }
         })
 
-        self.visibleContentOffsetChanged = { [weak self] offset in
+        self.visibleContentOffsetChanged = { [weak self] offset, transition in
             guard let strongSelf = self else {
                 return
             }
             if !strongSelf.dequeuedInitialTransitionOnLayout {
                 return
             }
             let atTop: Bool
-            var revealHiddenItems: Bool = false
             switch offset {
-                case .none, .unknown:
-                    atTop = false
-                case let .known(value):
+            case .none, .unknown:
+                atTop = false
+            case let .known(value):
                 atTop = value <= -strongSelf.tempTopInset
-                    if strongSelf.startedScrollingAtUpperBound && startedScrollingWithCanExpandHiddenItems && strongSelf.isTracking {
-                        revealHiddenItems = value <= -strongSelf.tempTopInset - 60.0
-                    }
             }
             strongSelf.scrolledAtTopValue = atTop
-            strongSelf.contentOffsetChanged?(offset)
-            if revealHiddenItems && !strongSelf.currentState.hiddenItemShouldBeTemporaryRevealed {
-                //strongSelf.revealScrollHiddenItem()
+            
+            var maxPinnedOffset: CGFloat = 0.0
+            strongSelf.forEachItemNode { itemNode in
+                if let itemNode = itemNode as? ChatListItemNode, let item = itemNode.item {
+                    if item.isPinned {
+                        maxPinnedOffset = max(maxPinnedOffset, itemNode.frame.maxY)
+                    }
+                }
             }
+            maxPinnedOffset = max(0.0, maxPinnedOffset)
+            var pinnedScrollFraction = 1.0
+            if strongSelf.insets.top == 0.0 {
+                pinnedScrollFraction = 0.0
+            } else {
+                if maxPinnedOffset < strongSelf.insets.top {
+                    pinnedScrollFraction = maxPinnedOffset / strongSelf.insets.top
+                }
+            }
+            
+            strongSelf.contentOffsetChanged?(offset)
+            strongSelf.pinnedScrollFraction = pinnedScrollFraction
+            strongSelf.pinnedHeaderDisplayFractionUpdated?(transition)
         }
 
         self.dynamicVisualInsets = { [weak self] in