chore: add api to APIService

Localization/app.json

@@ -231,6 +231,12 @@
                 "private": "Followers only",
                 "direct": "Only people I mention"
             }
+        },
+        "search": {
+            "searchBar": {
+                "placeholder": "Search hashtags and users",
+                "cancel": "Cancel"
+            }
         }
     }
 }

Mastodon.xcodeproj/project.pbxproj

@@ -30,6 +30,9 @@
 		2D32EAAC25CB96DC00C9ED86 /* TimelineMiddleLoaderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D32EAAB25CB96DC00C9ED86 /* TimelineMiddleLoaderTableViewCell.swift */; };
 		2D32EABA25CB9B0500C9ED86 /* UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D32EAB925CB9B0500C9ED86 /* UIView.swift */; };
 		2D32EADA25CBCC3300C9ED86 /* PublicTimelineViewModel+LoadMiddleState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D32EAD925CBCC3300C9ED86 /* PublicTimelineViewModel+LoadMiddleState.swift */; };
+		2D34D9CB261489930081BFC0 /* SearchViewController+recomendView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D34D9CA261489930081BFC0 /* SearchViewController+recomendView.swift */; };
+		2D34D9D126148D9E0081BFC0 /* APIService+Recommend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D34D9D026148D9E0081BFC0 /* APIService+Recommend.swift */; };
+		2D34D9DB261494120081BFC0 /* APIService+Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D34D9DA261494120081BFC0 /* APIService+Search.swift */; };
 		2D364F7225E66D7500204FDC /* MastodonResendEmailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D364F7125E66D7500204FDC /* MastodonResendEmailViewController.swift */; };
 		2D364F7825E66D8300204FDC /* MastodonResendEmailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D364F7725E66D8300204FDC /* MastodonResendEmailViewModel.swift */; };
 		2D38F1C625CD37F400561493 /* ContentOffsetAdjustableTimelineViewControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D38F1C525CD37F400561493 /* ContentOffsetAdjustableTimelineViewControllerDelegate.swift */; };
@@ -96,9 +99,6 @@
 		2DF75BA725D10E1000694EC8 /* APIService+Favorite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DF75BA625D10E1000694EC8 /* APIService+Favorite.swift */; };
 		2DF75BB925D1474100694EC8 /* ManagedObjectObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DF75BB825D1474100694EC8 /* ManagedObjectObserver.swift */; };
 		2DF75BC725D1475D00694EC8 /* ManagedObjectContextObjectsDidChange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DF75BC625D1475D00694EC8 /* ManagedObjectContextObjectsDidChange.swift */; };
-		5D526FE225BE9AC400460CB9 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 5D526FE125BE9AC400460CB9 /* SwiftPackageProductDependency */; };
-		5D0393902612D259007FE196 /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D03938F2612D259007FE196 /* WebViewController.swift */; };
-		5D0393962612D266007FE196 /* WebViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D0393952612D266007FE196 /* WebViewModel.swift */; };
 		5D526FE225BE9AC400460CB9 /* MastodonSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 5D526FE125BE9AC400460CB9 /* MastodonSDK */; };
 		5DF1054125F886D400D6C0D4 /* ViedeoPlaybackService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DF1054025F886D400D6C0D4 /* ViedeoPlaybackService.swift */; };
 		5DF1054725F8870E00D6C0D4 /* VideoPlayerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DF1054625F8870E00D6C0D4 /* VideoPlayerViewModel.swift */; };
@@ -336,6 +336,9 @@
 		2D32EAAB25CB96DC00C9ED86 /* TimelineMiddleLoaderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineMiddleLoaderTableViewCell.swift; sourceTree = "<group>"; };
 		2D32EAB925CB9B0500C9ED86 /* UIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIView.swift; sourceTree = "<group>"; };
 		2D32EAD925CBCC3300C9ED86 /* PublicTimelineViewModel+LoadMiddleState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PublicTimelineViewModel+LoadMiddleState.swift"; sourceTree = "<group>"; };
+		2D34D9CA261489930081BFC0 /* SearchViewController+recomendView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchViewController+recomendView.swift"; sourceTree = "<group>"; };
+		2D34D9D026148D9E0081BFC0 /* APIService+Recommend.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "APIService+Recommend.swift"; sourceTree = "<group>"; };
+		2D34D9DA261494120081BFC0 /* APIService+Search.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "APIService+Search.swift"; sourceTree = "<group>"; };
 		2D364F7125E66D7500204FDC /* MastodonResendEmailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonResendEmailViewController.swift; sourceTree = "<group>"; };
 		2D364F7725E66D8300204FDC /* MastodonResendEmailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonResendEmailViewModel.swift; sourceTree = "<group>"; };
 		2D38F1C525CD37F400561493 /* ContentOffsetAdjustableTimelineViewControllerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentOffsetAdjustableTimelineViewControllerDelegate.swift; sourceTree = "<group>"; };
@@ -1102,6 +1105,8 @@
 				DB49A62A25FF36C700B98345 /* APIService+CustomEmoji.swift */,
 				DB9A488326034BD7008B817C /* APIService+Status.swift */,
 				DB9A488F26035963008B817C /* APIService+Media.swift */,
+				2D34D9D026148D9E0081BFC0 /* APIService+Recommend.swift */,
+				2D34D9DA261494120081BFC0 /* APIService+Search.swift */,
 			);
 			path = APIService;
 			sourceTree = "<group>";
@@ -1387,6 +1392,7 @@
 			isa = PBXGroup;
 			children = (
 				DB9D6BE825E4F5340051B173 /* SearchViewController.swift */,
+				2D34D9CA261489930081BFC0 /* SearchViewController+recomendView.swift */,
 				2D6DE3FF26141DF600A63F6A /* SearchViewModel.swift */,
 			);
 			path = Search;
@@ -1869,6 +1875,7 @@
 				DB59F0FE25EF5D96001F1DAB /* StatusProvider+UITableViewDelegate.swift in Sources */,
 				DB68586425E619B700F0A850 /* NSKeyValueObservation.swift in Sources */,
 				2D61335825C188A000CAE157 /* APIService+Persist+Status.swift in Sources */,
+				2D34D9DB261494120081BFC0 /* APIService+Search.swift in Sources */,
 				DB45FAE325CA7181005A8AC7 /* MastodonUser.swift in Sources */,
 				DB2FF510260B113300ADA9FE /* ComposeStatusPollExpiresOptionCollectionViewCell.swift in Sources */,
 				DB0AC6FC25CD02E600D75117 /* APIService+Instance.swift in Sources */,
@@ -1929,6 +1936,7 @@
 				DBC7A672260C897100E57475 /* StatusContentWarningEditorView.swift in Sources */,
 				DB59F10E25EF724F001F1DAB /* APIService+Poll.swift in Sources */,
 				DB47229725F9EFAD00DA7F53 /* NSManagedObjectContext.swift in Sources */,
+				2D34D9D126148D9E0081BFC0 /* APIService+Recommend.swift in Sources */,
 				2D42FF7E25C82218004A627A /* ActionToolBarContainer.swift in Sources */,
 				DB221B16260C395900AEFE46 /* CustomEmojiPickerInputViewModel.swift in Sources */,
 				DB0140A125C40C0600F9F3CF /* MastodonPinBasedAuthenticationViewController.swift in Sources */,
@@ -1959,6 +1967,7 @@
 				DB49A63D25FF609300B98345 /* PlayerContainerView+MediaTypeIndicotorView.swift in Sources */,
 				DB0140CF25C42AEE00F9F3CF /* OSLog.swift in Sources */,
 				DB44384F25E8C1FA008912A2 /* CALayer.swift in Sources */,
+				2D34D9CB261489930081BFC0 /* SearchViewController+recomendView.swift in Sources */,
 				2D206B8625F5FB0900143C56 /* Double.swift in Sources */,
 				DB9A485C2603010E008B817C /* PHPickerResultLoader.swift in Sources */,
 				2D76319F25C1521200929FB9 /* StatusSection.swift in Sources */,

Mastodon/Generated/Strings.swift

@@ -365,6 +365,14 @@ internal enum L10n {
         }
       }
     }
+    internal enum Search {
+      internal enum Searchbar {
+        /// Cancel
+        internal static let cancel = L10n.tr("Localizable", "Scene.Search.Searchbar.Cancel")
+        /// Search hashtags and users
+        internal static let placeholder = L10n.tr("Localizable", "Scene.Search.Searchbar.Placeholder")
+      }
+    }
     internal enum ServerPicker {
       /// Pick a Server,\nany server.
       internal static let title = L10n.tr("Localizable", "Scene.ServerPicker.Title")

Mastodon/Resources/en.lproj/Localizable.strings

@@ -114,6 +114,8 @@ tap the link to confirm your account.";
 "Scene.Register.Input.Username.DuplicatePrompt" = "This username is taken.";
 "Scene.Register.Input.Username.Placeholder" = "username";
 "Scene.Register.Title" = "Tell us about you.";
+"Scene.Search.Searchbar.Cancel" = "Cancel";
+"Scene.Search.Searchbar.Placeholder" = "Search hashtags and users";
 "Scene.ServerPicker.Button.Category.All" = "All";
 "Scene.ServerPicker.Button.SeeLess" = "See Less";
 "Scene.ServerPicker.Button.SeeMore" = "See More";

Mastodon/Scene/Search/SearchViewController+recomendView.swift

@@ -0,0 +1,33 @@
+//
+//  SearchViewController+recomemndView.swift
+//  Mastodon
+//
+//  Created by sxiaojian on 2021/3/31.
+//
+
+import Foundation
+import UIKit
+
+
+extension SearchViewController {
+    func setuprecomemndView() {
+        recomemndView.dataSource = self
+        recomemndView.delegate = self
+    }
+}
+
+extension SearchViewController: UICollectionViewDelegate {
+    
+}
+
+extension SearchViewController: UICollectionViewDataSource {
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return 0
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        return UICollectionViewCell()
+    }
+    
+    
+}

Mastodon/Scene/Search/SearchViewController.swift

@@ -18,15 +18,63 @@ final class SearchViewController: UIViewController, NeedsDependency {
     
     let searchBar: UISearchBar = {
         let searchBar = UISearchBar()
+        searchBar.placeholder = L10n.Scene.Search.Searchbar.placeholder
+        searchBar.tintColor = Asset.Colors.buttonDefault.color
+        searchBar.translatesAutoresizingMaskIntoConstraints = false
+        let micImage = UIImage(systemName: "mic.fill")
+        searchBar.setImage(micImage, for: .bookmark, state: .normal)
+        searchBar.showsBookmarkButton = true
         return searchBar
     }()
+    
+    let recomemndView: UICollectionView = {
+        let flowLayout = UICollectionViewFlowLayout()
+        flowLayout.scrollDirection = .horizontal
+        let view = ControlContainableCollectionView(frame: .zero, collectionViewLayout: flowLayout)
+        view.backgroundColor = .clear
+        view.showsHorizontalScrollIndicator = false
+        view.showsVerticalScrollIndicator = false
+        view.layer.masksToBounds = false
+        view.translatesAutoresizingMaskIntoConstraints = false
+        return view
+    }()
 }
 
 extension SearchViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-
+        searchBar.delegate = self
+        navigationItem.titleView = searchBar
+        navigationItem.hidesBackButton = true
     }
     
 }
+
+extension SearchViewController: UISearchBarDelegate {
+    func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) {
+        searchBar.setShowsCancelButton(true, animated: true)
+    }
+    
+    func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
+        searchBar.setShowsCancelButton(false, animated: true)
+    }
+    
+    func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {
+        searchBar.setShowsCancelButton(false, animated: true)
+        searchBar.text = ""
+        searchBar.resignFirstResponder()
+    }
+    
+    func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
+        viewModel.searchText.send(searchText)
+    }
+    
+    func searchBarBookmarkButtonClicked(_ searchBar: UISearchBar) {
+        
+    }
+}
+
+extension SearchViewController {
+
+}

Mastodon/Scene/Search/SearchViewModel.swift

@@ -14,12 +14,17 @@ final class SearchViewModel {
     
     var disposeBag = Set<AnyCancellable>()
     
-
-    let context: AppContext
     // input
-    let username = CurrentValueSubject<String, Never>("")
+    let context: AppContext
+    
+    // output
+    let searchText = CurrentValueSubject<String, Never>("")
+    
+    var recommendHashTags = [Mastodon.Entity.Tag]()
+    var recommendAccounts = [Mastodon.Entity.Account]()
     
     init(context: AppContext) {
         self.context  = context
+        
     }
 }

Mastodon/Service/APIService/APIService+Recommend.swift

@@ -0,0 +1,30 @@
+//
+//  APIService+Recommend.swift
+//  Mastodon
+//
+//  Created by sxiaojian on 2021/3/31.
+//
+
+import Foundation
+import MastodonSDK
+import Combine
+
+extension APIService {
+ 
+    func recommendAccount(
+        domain: String,
+        query: Mastodon.API.Suggestions.Query,
+        mastodonAuthenticationBox: AuthenticationService.MastodonAuthenticationBox
+    ) -> AnyPublisher<Mastodon.Response.Content<[Mastodon.Entity.Account]>, Error> {
+        let authorization = mastodonAuthenticationBox.userAuthorization
+
+        return Mastodon.API.Suggestions.get(session: session, domain: domain, query: query, authorization: authorization)
+    }
+    
+    func recommendTrends(
+        domain: String,
+        query: Mastodon.API.Trends.Query
+    ) -> AnyPublisher<Mastodon.Response.Content<[Mastodon.Entity.Tag]>, Error> {
+        return Mastodon.API.Trends.get(session: session, domain: domain, query: query)
+    }
+}

Mastodon/Service/APIService/APIService+Search.swift

@@ -0,0 +1,23 @@
+//
+//  APIService+Search.swift
+//  Mastodon
+//
+//  Created by sxiaojian on 2021/3/31.
+//
+
+import Foundation
+import MastodonSDK
+import Combine
+
+extension APIService {
+ 
+    func search(
+        domain: String,
+        query: Mastodon.API.Search.Query,
+        mastodonAuthenticationBox: AuthenticationService.MastodonAuthenticationBox
+    ) -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.SearchResult>, Error> {
+        let authorization = mastodonAuthenticationBox.userAuthorization
+
+        return Mastodon.API.Search.search(session: session, domain: domain, query: query, authorization: authorization)
+    }
+}