ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search filters improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2020-09-09 22:16:58 +03:00
parent cbf67b1deb
commit 2864cb2987
25 changed files with 3950 additions and 3442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
submodules/SettingsUI/Sources/Themes/ThemeGridSearchColorsItem.swift
View File

@@ -9,35 +9,6 @@ import SyncCore
import TelegramPresentationData
import ListSectionHeaderNode
private func nodeColor(for color: WallpaperSearchColor) -> UIColor {
switch color {
case .blue:
return UIColor(rgb: 0x0076ff)
case .red:
return UIColor(rgb: 0xff0000)
case .orange:
return UIColor(rgb: 0xff8a00)
case .yellow:
return UIColor(rgb: 0xffca00)
case .green:
return UIColor(rgb: 0x00e432)
case .teal:
return UIColor(rgb: 0x1fa9ab)
case .purple:
return UIColor(rgb: 0x7300aa)
case .pink:
return UIColor(rgb: 0xf9bec5)
case .brown:
return UIColor(rgb: 0x734021)
case .black:
return UIColor(rgb: 0x000000)
case .gray:
return UIColor(rgb: 0x5c585f)
case .white:
return UIColor(rgb: 0xffffff)
}
}
private class ThemeGridColorNode: HighlightableButtonNode {
let action: () -> Void
@@ -54,7 +25,7 @@ private class ThemeGridColorNode: HighlightableButtonNode {
} else if color == .black && dark {
image = generateFilledCircleImage(diameter: 42.0, color: .black, strokeColor: strokeColor, strokeWidth: 1.0)
} else {
image = generateFilledCircleImage(diameter: 42.0, color: nodeColor(for: color))
image = generateFilledCircleImage(diameter: 42.0, color: color.displayColor)
}
self.setImage(image, for: .normal)
}

55
submodules/SettingsUI/Sources/Themes/ThemeGridSearchContentNode.swift
View File

@@ -12,6 +12,7 @@ import AccountContext
import SearchUI
import ChatListSearchItemHeader
import WebSearchUI
import SearchBarNode
enum WallpaperSearchColor: CaseIterable {
case blue
@@ -56,6 +57,35 @@ enum WallpaperSearchColor: CaseIterable {
}
}
var displayColor: UIColor {
switch self {
case .blue:
return UIColor(rgb: 0x0076ff)
case .red:
return UIColor(rgb: 0xff0000)
case .orange:
return UIColor(rgb: 0xff8a00)
case .yellow:
return UIColor(rgb: 0xffca00)
case .green:
return UIColor(rgb: 0x00e432)
case .teal:
return UIColor(rgb: 0x1fa9ab)
case .purple:
return UIColor(rgb: 0x7300aa)
case .pink:
return UIColor(rgb: 0xf9bec5)
case .brown:
return UIColor(rgb: 0x734021)
case .black:
return UIColor(rgb: 0x000000)
case .gray:
return UIColor(rgb: 0x5c585f)
case .white:
return UIColor(rgb: 0xffffff)
}
}
func localizedString(strings: PresentationStrings) -> String {
switch self {
case .blue:
@@ -658,23 +688,30 @@ final class ThemeGridSearchContentNode: SearchDisplayControllerContentNode {
self.queryPromise.set(.single(query))
if updateInterface {
let prefix: NSAttributedString?
let tokens: [SearchBarToken]
let text: String
let placeholder: String
switch query {
case let .generic(query):
prefix = nil
tokens = []
text = query
placeholder = self.presentationData.strings.Wallpaper_Search
case let .color(color, query):
let prefixString = NSMutableAttributedString()
prefixString.append(NSAttributedString(string: self.presentationData.strings.WallpaperSearch_ColorPrefix, font: Font.regular(17.0), textColor: self.presentationData.theme.rootController.navigationSearchBar.inputTextColor))
prefixString.append(NSAttributedString(string: "\(color.localizedString(strings: self.presentationData.strings)) ", font: Font.regular(17.0), textColor: self.presentationData.theme.rootController.navigationSearchBar.accentColor))
prefix = prefixString
let backgroundColor = color.displayColor
let foregroundColor: UIColor
let strokeColor: UIColor
if color == .white {
foregroundColor = .black
strokeColor = self.presentationData.theme.rootController.navigationSearchBar.inputClearButtonColor
} else {
foregroundColor = .white
strokeColor = color.displayColor
}
tokens = [SearchBarToken(id: 0, icon: UIImage(bundleImageName: "Settings/WallpaperSearchColorIcon"), title: color.localizedString(strings: self.presentationData.strings), style: SearchBarToken.Style(backgroundColor: backgroundColor, foregroundColor: foregroundColor, strokeColor: strokeColor))]
text = query
placeholder = self.presentationData.strings.Wallpaper_SearchShort
}
self.setQuery?(prefix, [], text)
self.setQuery?(nil, tokens, text)
self.setPlaceholder?(placeholder)
}
}
@@ -688,6 +725,10 @@ final class ThemeGridSearchContentNode: SearchDisplayControllerContentNode {
self.updateQuery({ $0.updatedWithColor(nil) }, updateInterface: true)
}
override func searchTextClearTokens() {
self.updateQuery({ $0.updatedWithColor(nil) }, updateInterface: true)
}
private func enqueueRecentTransition(_ transition: ThemeGridSearchContainerRecentTransition, firstTime: Bool) {
self.enqueuedRecentTransitions.append((transition, firstTime))