shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 78 Pull Requests Releases Wiki Activity

Allow saving or following hashtag from Add screen

This commit is contained in:
Shadowfacts 2022-12-12 22:06:55 -05:00
parent 478ba3db28
commit 3c80ec8b43
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tusker/Screens/Explore/AddSavedHashtagViewController.swift
View File

@ -84,7 +84,7 @@ class AddSavedHashtagViewController: UIViewController {
navigationItem.searchController = searchController navigationItem.searchController = searchController
navigationItem.hidesSearchBarWhenScrolling = false navigationItem.hidesSearchBarWhenScrolling = false
navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(cancelButtonPressed)) navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(doneButtonPressed))
} }
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
@ -107,15 +107,12 @@ class AddSavedHashtagViewController: UIViewController {
} }
private func selectHashtag(_ hashtag: Hashtag) { private func selectHashtag(_ hashtag: Hashtag) {
let context = mastodonController.persistentContainer.viewContext show(HashtagTimelineViewController(for: hashtag, mastodonController: mastodonController), sender: nil)
_ = SavedHashtag(hashtag: hashtag, context: context)
try! context.save()
presentingViewController!.dismiss(animated: true)
} }
// MARK: - Interaction // MARK: - Interaction
@objc func cancelButtonPressed() { @objc func doneButtonPressed() {
dismiss(animated: true) dismiss(animated: true)
} }
@ -128,11 +125,6 @@ extension AddSavedHashtagViewController {
enum Item: Hashable { enum Item: Hashable {
case tag(Hashtag) case tag(Hashtag)
} }
// class DataSource: UITableViewDiffableDataSource<Section, Item> {
// override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
// return
// }
// }
} }
extension AddSavedHashtagViewController: UICollectionViewDelegate { extension AddSavedHashtagViewController: UICollectionViewDelegate {

2
Tusker/Screens/Explore/ExploreViewController.swift
View File

@ -437,7 +437,7 @@ extension ExploreViewController {
case let .savedHashtag(hashtag): case let .savedHashtag(hashtag):
return hashtag.name return hashtag.name
case .addSavedHashtag: case .addSavedHashtag:
return NSLocalizedString("Save Hashtag...", comment: "save hashtag nav item title") return NSLocalizedString("Add Hashtag...", comment: "save hashtag nav item title")
case let .savedInstance(url): case let .savedInstance(url):
return url.host! return url.host!
case .findInstance: case .findInstance: