From 94e6f28efe43c25d78b8b0fd81a8d33236c70512 Mon Sep 17 00:00:00 2001
From: Ali <>
Date: Sat, 24 Jun 2023 14:06:04 +0300
Subject: [PATCH] Adjust tap

---
 .../Sources/ChatListController.swift          |  7 ++++-
 .../Sources/ContactsControllerNode.swift      |  2 +-
 .../Sources/ChatListNavigationBar.swift       | 29 ++-----------------
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift
index eea9e7d14e..a4b4776d43 100644
--- a/submodules/ChatListUI/Sources/ChatListController.swift
+++ b/submodules/ChatListUI/Sources/ChatListController.swift
@@ -5744,7 +5744,12 @@ private final class ChatListLocationContext {
         
         self.parentController?.requestLayout(transition: .animated(duration: 0.45, curve: .spring))
         
-        self.parentController?.maybeDisplayStoryTooltip()
+        Queue.mainQueue().after(1.0, { [weak self] in
+            guard let self else {
+                return
+            }
+            self.parentController?.maybeDisplayStoryTooltip()
+        })
     }
     
     private func updateForum(
diff --git a/submodules/ContactListUI/Sources/ContactsControllerNode.swift b/submodules/ContactListUI/Sources/ContactsControllerNode.swift
index fd1819c371..078e3302ae 100644
--- a/submodules/ContactListUI/Sources/ContactsControllerNode.swift
+++ b/submodules/ContactListUI/Sources/ContactsControllerNode.swift
@@ -490,7 +490,7 @@ final class ContactsControllerNode: ASDisplayNode, UIGestureRecognizerDelegate {
         }
         
         if let navigationBarComponentView = self.navigationBarView.view as? ChatListNavigationBar.View {
-            navigationBarComponentView.applyScroll(offset: offset, allowAvatarsExpansion: true, transition: Transition(transition))
+            navigationBarComponentView.applyScroll(offset: offset, allowAvatarsExpansion: false, transition: Transition(transition))
         }
     }
     
diff --git a/submodules/TelegramUI/Components/ChatListHeaderComponent/Sources/ChatListNavigationBar.swift b/submodules/TelegramUI/Components/ChatListHeaderComponent/Sources/ChatListNavigationBar.swift
index d5d24278f7..6c2d8421f7 100644
--- a/submodules/TelegramUI/Components/ChatListHeaderComponent/Sources/ChatListNavigationBar.swift
+++ b/submodules/TelegramUI/Components/ChatListHeaderComponent/Sources/ChatListNavigationBar.swift
@@ -298,28 +298,6 @@ public final class ChatListNavigationBar: Component {
                 self.addSubview(searchContentNode.view)
             }
             
-            /*let clippedStoriesOverscrollOffset = -min(0.0, clippedScrollOffset)
-            let clippedStoriesOffset = max(0.0, min(clippedScrollOffset, defaultStoriesOffsetDistance))
-            var storiesOffsetFraction: CGFloat
-            var storiesUnlockedOffsetFraction: CGFloat
-            if !component.isSearchActive, component.secondaryTransition == 0.0, let storySubscriptions = component.storySubscriptions, !storySubscriptions.items.isEmpty, allowAvatarsExpansion {
-                if component.storiesUnlocked {
-                    storiesOffsetFraction = clippedStoriesOffset / defaultStoriesOffsetDistance
-                    storiesUnlockedOffsetFraction = 1.0
-                } else {
-                    storiesOffsetFraction = 1.0 - (clippedStoriesOverscrollOffset / defaultStoriesOffsetDistance)
-                    storiesUnlockedOffsetFraction = 1.0
-                }
-            } else {
-                storiesOffsetFraction = 1.0
-                storiesUnlockedOffsetFraction = 1.0
-            }
-            
-            if self.applyScrollFractionAnimator != nil {
-                storiesOffsetFraction = self.applyScrollFraction * storiesOffsetFraction + (1.0 - self.applyScrollFraction) * self.storiesOffsetStartFraction
-                storiesUnlockedOffsetFraction = self.applyScrollUnlockedFraction * storiesUnlockedOffsetFraction + (1.0 - self.applyScrollUnlockedFraction) * self.storiesUnlockedStartFraction
-            }*/
-            
             let searchSize = CGSize(width: currentLayout.size.width, height: navigationBarSearchContentHeight)
             var searchFrame = CGRect(origin: CGPoint(x: 0.0, y: visibleSize.height - searchSize.height), size: searchSize)
             if component.tabsNode != nil {
@@ -338,9 +316,6 @@ public final class ChatListNavigationBar: Component {
             searchContentNode.updateLayout(size: searchSize, leftInset: component.sideInset, rightInset: component.sideInset, transition: transition.containedViewLayoutTransition)
             
             let headerTransition = transition
-            /*if self.applyScrollFractionAnimator != nil {
-                headerTransition = .immediate
-            }*/
             
             let storiesOffsetFraction: CGFloat
             let storiesUnlocked: Bool
@@ -362,9 +337,9 @@ public final class ChatListNavigationBar: Component {
             if allowAvatarsExpansion && transition.animation.isImmediate {
                 if self.storiesUnlocked != storiesUnlocked {
                     if storiesUnlocked {
-                        HapticFeedback().impact()
+                        HapticFeedback().impact(.veryLight)
                     } else {
-                        HapticFeedback().tap()
+                        HapticFeedback().impact(.veryLight)
                     }
                 }
             }