zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

Show magnifying glass next to hashtags (IOS-141)

This commit is contained in:
Nathan Mattes 2023-09-17 17:44:38 +02:00
parent c4b31112a4
commit 11863b9458
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mastodon.xcodeproj/project.pbxproj
View File

@ -2154,13 +2154,6 @@
path = Status; path = Status;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
DB4F098026A0475500D62E92 /* View */ = {
isa = PBXGroup;
children = (
);
path = View;
sourceTree = "<group>";
};
DB4FFC2D269EC39C00D62E92 /* Search */ = { DB4FFC2D269EC39C00D62E92 /* Search */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -2935,7 +2928,6 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
DB63F7502799449300455B82 /* Cell */, DB63F7502799449300455B82 /* Cell */,
DB4F098026A0475500D62E92 /* View */,
DBF1D250269DB01200C1C08A /* SearchHistoryViewController.swift */, DBF1D250269DB01200C1C08A /* SearchHistoryViewController.swift */,
DB63F76127996B6600455B82 /* SearchHistoryViewController+DataSourceProvider.swift */, DB63F76127996B6600455B82 /* SearchHistoryViewController+DataSourceProvider.swift */,
DB4F097426A037F500D62E92 /* SearchHistoryViewModel.swift */, DB4F097426A037F500D62E92 /* SearchHistoryViewModel.swift */,

4
Mastodon/Scene/Search/SearchDetail/Search Results Overview/Cells/SearchResultDefaultSectionTableViewCell.swift
View File

@ -12,7 +12,7 @@ class SearchResultDefaultSectionTableViewCell: UITableViewCell {
content.text = item.title content.text = item.title
content.imageProperties.tintColor = Asset.Colors.Brand.blurple.color content.imageProperties.tintColor = Asset.Colors.Brand.blurple.color
self.contentConfiguration = content contentConfiguration = content
} }
func configure(item: SearchResultOverviewItem.SuggestionSectionEntry) { func configure(item: SearchResultOverviewItem.SuggestionSectionEntry) {
@ -21,6 +21,6 @@ class SearchResultDefaultSectionTableViewCell: UITableViewCell {
content.text = item.title content.text = item.title
content.imageProperties.tintColor = Asset.Colors.Brand.blurple.color content.imageProperties.tintColor = Asset.Colors.Brand.blurple.color
self.contentConfiguration = content contentConfiguration = content
} }
} }

3
Mastodon/Scene/Search/SearchDetail/SearchHistory/SearchHistorySection.swift
View File

@ -8,6 +8,7 @@
import UIKit import UIKit
import CoreDataStack import CoreDataStack
import MastodonCore import MastodonCore
import MastodonAsset
enum SearchHistorySection: Hashable { enum SearchHistorySection: Hashable {
case main case main
@ -47,6 +48,8 @@ extension SearchHistorySection {
context.managedObjectContext.performAndWait { context.managedObjectContext.performAndWait {
guard let hashtag = item.object(in: context.managedObjectContext) else { return } guard let hashtag = item.object(in: context.managedObjectContext) else { return }
var contentConfiguration = cell.defaultContentConfiguration() var contentConfiguration = cell.defaultContentConfiguration()
contentConfiguration.image = UIImage(systemName: "magnifyingglass")
contentConfiguration.imageProperties.tintColor = Asset.Colors.Brand.blurple.color
contentConfiguration.text = "#" + hashtag.name contentConfiguration.text = "#" + hashtag.name
cell.contentConfiguration = contentConfiguration cell.contentConfiguration = contentConfiguration
} }