Skip to content

Fix search bar visibility in HashtagSearchControllerNode #2030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pwd491 wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −1
Open

Fix search bar visibility in HashtagSearchControllerNode #2030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions submodules/AccountContext/Sources/ChatController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,6 +1083,8 @@ public protocol ChatController: ViewController {
var isSendButtonVisible: Bool { get }

var isSelectingMessagesUpdated: ((Bool) -> Void)? { get set }
var onGalleryPresentationInContextChanged: ((Bool) -> Void)? { get set }

func cancelSelectingMessages()
func activateSearch(domain: ChatSearchDomain, query: String)
func activateInput(type: ChatControllerActivateInput)
Expand Down
15 changes: 15 additions & 0 deletions submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,21 @@ final class HashtagSearchControllerNode: ASDisplayNode, ASGestureRecognizerDeleg
}
}

var galleryPresentationCount = 0
let updateSearchBarVisibility: (Bool) -> Void = { [weak self] isPresented in
guard let self else { return }
if isPresented {
galleryPresentationCount += 1
} else {
galleryPresentationCount -= 1
}
let shouldHide = galleryPresentationCount > 0
self.controller?.navigationBar?.setContentNode(shouldHide ? nil : self.searchContentNode, animated: true)
}
self.currentController?.onGalleryPresentationInContextChanged = updateSearchBarVisibility
self.myController?.onGalleryPresentationInContextChanged = updateSearchBarVisibility
self.globalController?.onGalleryPresentationInContextChanged = updateSearchBarVisibility

if controller.mode != .chatOnly {
navigationBar?.setContentNode(self.searchContentNode, animated: false)
}
Expand Down
4 changes: 3 additions & 1 deletion submodules/TelegramUI/Sources/ChatController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
let temporaryHiddenGalleryMediaDisposable = MetaDisposable()

let galleryPresentationContext = PresentationContext()
public var onGalleryPresentationInContextChanged: ((Bool) -> Void)?

let chatBackgroundNode: WallpaperBackgroundNode
public private(set) var controllerInteraction: ChatControllerInteraction?
Expand Down Expand Up @@ -6792,11 +6793,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
override public func loadDisplayNode() {
self.loadDisplayNodeImpl()
self.galleryPresentationContext.view = self.view
self.galleryPresentationContext.controllersUpdated = { [weak self] _ in
self.galleryPresentationContext.controllersUpdated = { [weak self] controllers in
guard let self else {
return
}
self.updateStatusBarPresentation()
self.onGalleryPresentationInContextChanged?(!controllers.isEmpty)
}
}

Expand Down