Merge branch 'release/v1.3.0'

GitTime/Resources/Assets.xcassets/favorite/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GitTime/Resources/Assets.xcassets/favorite/favorite_empty.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "favorite_empty.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GitTime/Resources/Assets.xcassets/favorite/favorite_fill.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "favorite_fill.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GitTime/Sources/AppDependency.swift

@@ -56,7 +56,7 @@ final class AppDependency {
 
         // Toaster
         let toastAppearance = ToastView.appearance()
-        toastAppearance.bottomOffsetPortrait = UIScreen.main.bounds.height / 2
+        toastAppearance.bottomOffsetPortrait = 30.0
         toastAppearance.textColor = .invertTitle
         toastAppearance.backgroundColor = .invertBackground
     }
@@ -79,6 +79,8 @@ final class AppDependency {
         let activityService = ActivityService(networking: GitTimeProvider<GitHubAPI>(plugins: [AuthPlugin(keychainService: keychainService)]))
         let crawlerService = GitTimeCrawlerService(networking: GitTimeProvider<GitTimeCrawlerAPI>())
         let searchService = SearchService(networking: GitTimeProvider<GitHubAPI>(plugins: [AuthPlugin(keychainService: keychainService)]))
+        let realmService = RealmService()
+        let languageService = LanguagesService()
 
         let firstLaunch: Bool = userDefaultsService.value(forKey: UserDefaultsKey.firstLaunch) ?? true
         if firstLaunch {
@@ -113,8 +115,9 @@ final class AppDependency {
             followVC.tabBarItem.selectedImage = UIImage.assetImage(name: TabBarImages.followFilled)
 
             let searchReactor = SearchViewReactor(searchService: searchService,
-                                                  languageService: LanguagesService(),
-                                                  realmService: RealmService())
+                                                  languageService: languageService,
+                                                  realmService: realmService,
+                                                  userdefaultsService: userDefaultsService)
 
             let searchVC = SearchViewController.instantiate(withReactor: searchReactor)
             searchVC.title = "Search"

GitTime/Sources/Models/FavoriteLanguage.swift

@@ -0,0 +1,30 @@
+//
+//  FavoriteLanguage.swift
+//  GitTime
+//
+//  Created by Kanz on 2020/01/18.
+//  Copyright © 2020 KanzDevelop. All rights reserved.
+//
+
+import Realm
+import RealmSwift
+
+class FavoriteLanguage: Object {
+    @objc dynamic var id: Int = 0
+    @objc dynamic var name: String = ""
+    @objc dynamic var type: String = ""
+    @objc dynamic var color: String = ""
+
+    override class func primaryKey() -> String? {
+        return "id"
+    }
+}
+
+extension FavoriteLanguage {
+    func toLanguage() -> Language {
+        return Language(id: self.id,
+                        name: self.name,
+                        type: self.type,
+                        color: self.color)
+    }
+}

GitTime/Sources/Models/Language.swift

@@ -13,6 +13,7 @@ struct Language: Codable {
     let name: String
     let type: LanguageTypes
     let color: String
+    var isFavorite: Bool = false
 
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -37,6 +38,13 @@ struct Language: Codable {
         self.color = ""
     }
 
+    init(id: Int, name: String, type: String, color: String) {
+        self.id = id
+        self.name = name
+        self.type = LanguageTypes(rawValue: type) ?? .programming
+        self.color = color
+    }
+
     enum CodingKeys: String, CodingKey {
         case id
         case name
@@ -48,3 +56,14 @@ struct Language: Codable {
         return Language(name: "All Languages")
     }
 }
+
+extension Language {
+    func toFavoriteLanguage() -> FavoriteLanguage {
+        let favorite = FavoriteLanguage()
+        favorite.id = self.id
+        favorite.name = self.name
+        favorite.color = self.color
+        favorite.type = self.type.rawValue
+        return favorite
+    }
+}

GitTime/Sources/Network/GitHubAPI.swift

@@ -15,7 +15,7 @@ enum GitHubAPI {
     case followers(userName: String, page: Int)
     case following(userName: String, page: Int)
     case searchUser(query: String, page: Int)
-    case searchRepo(query: String, page: Int)
+    case searchRepo(query: String, page: Int, language: String?)
 }
 
 extension GitHubAPI: TargetType {
@@ -59,14 +59,27 @@ extension GitHubAPI: TargetType {
                 "page": page
             ]
             return .requestParameters(parameters: params, encoding: URLEncoding.default)
+
         case let .activityEvent(_, page):
             let params: [String: Any] = [
                 "per_page": 30,
                 "page": page
             ]
             return .requestParameters(parameters: params, encoding: URLEncoding.default)
-        case let .searchUser(query, page),
-             let .searchRepo(query, page):
+
+        case let .searchUser(query, page):
+            let params: [String: Any] = [
+                "q": query,
+                "page": page
+            ]
+            return .requestParameters(parameters: params, encoding: URLEncoding.default)
+
+        case let .searchRepo(query, page, language):
+            var query = query
+            if let language = language {
+                query = "\(query)+\(language.lowercased())"
+            }
+
             let params: [String: Any] = [
                 "q": query,
                 "page": page

GitTime/Sources/Sections/FavoriteLanguageSection.swift

@@ -0,0 +1,33 @@
+//
+//  FavoriteLanguageSection.swift
+//  GitTime
+//
+//  Created by Kanz on 2020/02/29.
+//  Copyright © 2020 KanzDevelop. All rights reserved.
+//
+
+import RxDataSources
+
+enum FavoriteLanguageSection {
+    case favorite([FavoriteLanguageSectionItem])
+}
+
+extension FavoriteLanguageSection: SectionModelType {
+    var items: [FavoriteLanguageSectionItem] {
+        switch self {
+        case .favorite(let items):
+            return items
+        }
+    }
+
+    init(original: FavoriteLanguageSection, items: [FavoriteLanguageSectionItem]) {
+        switch original {
+        case .favorite:
+            self = .favorite(items)
+        }
+    }
+}
+
+enum FavoriteLanguageSectionItem {
+    case favorite(FavoriteLanguageTableViewCellReactor)
+}

GitTime/Sources/Sections/LanguageSection.swift

@@ -11,6 +11,7 @@ import RxDataSources
 enum LanguageSection {
     case allLanguage([LanguageSectionItem])
     case languages([LanguageSectionItem])
+    case emptyFavorites([LanguageSectionItem])
 }
 
 extension LanguageSection: SectionModelType {
@@ -21,6 +22,8 @@ extension LanguageSection: SectionModelType {
             return items
         case .languages(let items):
             return items
+        case .emptyFavorites(let items):
+            return items
         }
     }
 
@@ -30,11 +33,14 @@ extension LanguageSection: SectionModelType {
             self = .allLanguage(items)
         case .languages:
             self = .languages(items)
+        case .emptyFavorites:
+            self = .emptyFavorites(items)
         }
     }
 }
 
 enum LanguageSectionItem {
     case allLanguage(LanguageListCellReactor)
     case languages(LanguageListCellReactor)
+    case emptyFavorites(FavoriteLanguageTableViewCellReactor)
 }

GitTime/Sources/Services/RealmService.swift

@@ -10,15 +10,21 @@ import RealmSwift
 import RxSwift
 
 protocol RealmServiceType {
+    // Search History
     func addSearchText(text: String)
     func recentSearchTextList() -> Observable<[SearchHistory]>
     func removeSearchText(text: String)
+
+    // Favorite Language
+    func addFavoriteLanguage(_ language: Language)
+    func removeFavoriteLanguage(_ language: FavoriteLanguage)
+    func loadFavoriteLanguages() -> Observable<[FavoriteLanguage]>
 }
 
 class RealmService: RealmServiceType {
 
+    // MARK: - Search History
     func addSearchText(text: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -61,6 +67,50 @@ class RealmService: RealmServiceType {
             log.error(error.localizedDescription)
         }
     }
+
+    // MARK: Favorite Lanuages
+    func addFavoriteLanguage(_ language: Language) {
+        do {
+            let realm = try Realm(configuration: Realm.Configuration.defaultConfiguration)
+            try realm.write {
+                realm.create(FavoriteLanguage.self,
+                             value: [
+                                "id": language.id,
+                                "name": language.name,
+                                "color": language.color,
+                                "type": language.type.rawValue
+                ], update: Realm.UpdatePolicy.all)
+            }
+        } catch {
+            log.error(error.localizedDescription)
+        }
+    }
+
+    func removeFavoriteLanguage(_ language: FavoriteLanguage) {
+        do {
+            let realm = try Realm(configuration: Realm.Configuration.defaultConfiguration)
+            let predicate = NSPredicate(format: "id == %d", language.id)
+            let results = realm.objects(FavoriteLanguage.self).filter(predicate)
+
+            try realm.write {
+                realm.delete(results)
+            }
+        } catch {
+            log.error(error.localizedDescription)
+        }
+    }
+
+    func loadFavoriteLanguages() -> Observable<[FavoriteLanguage]> {
+        do {
+            let realm = try Realm(configuration: Realm.Configuration.defaultConfiguration)
+            let result = realm.objects(FavoriteLanguage.self)
+                .toArray(ofType: FavoriteLanguage.self)
+            return Observable.just(result)
+        } catch {
+            log.error(error.localizedDescription)
+            return .empty()
+        }
+    }
 }
 
 extension Results {

GitTime/Sources/Services/SearchService.swift

@@ -10,7 +10,7 @@ import RxSwift
 
 protocol SearchServiceType {
     func searchUser(query: String, page: Int) -> Observable<([User], Bool)>
-    func searchRepo(query: String, page: Int) -> Observable<([Repository], Bool)>
+    func searchRepo(query: String, page: Int, language: String?) -> Observable<([Repository], Bool)>
 }
 
 class SearchService: SearchServiceType {
@@ -31,32 +31,12 @@ class SearchService: SearchServiceType {
             .asObservable()
     }
 
-    func searchRepo(query: String, page: Int) -> Observable<([Repository], Bool)> {
-        return self.networking.request(.searchRepo(query: query, page: page))
+    func searchRepo(query: String, page: Int, language: String?) -> Observable<([Repository], Bool)> {
+        return self.networking.request(.searchRepo(query: query, page: page, language: language))
             .map(SearchResults<Repository>.self)
             .map { result -> ([Repository], Bool) in
                 let canLoadMore = result.totalCount > page * 30
                 return (result.items, canLoadMore)
         }
     }
-
-//    private trialSearchUser() -> Observable<([User], Bool)> {
-//        guard let searchedUsers: SearchResults<User> = Bundle.resource(name: "", extensionType: "json") else { return .empty() }
-//        let users = searchedUsers.map { result -> [User] in
-//
-//        }
-////        .map { result -> ([User], Bool) in
-////            let canLoadMore = result.totalCount > page * 30
-////            return (result.items, canLoadMore)
-////        }
-////        .asObservable()
-//
-//        return .just(searchedUsers)
-//    }
-//
-//    private func trialSearchRepo() -> Observable<([Repository], Bool)> {
-//        guard let searchedRepos: SearchResults<Repository> = Bundle.resource(name: "", extensionType: "json") else { return .empty() }
-//        return .just(searchedRepos)
-//    }
-
 }

GitTime/Sources/Utils/Extensions/UIViewController+Extensions.swift

@@ -28,11 +28,20 @@ extension UIViewController {
 
 // MARK: - Pan Modal
 extension UIViewController {
+    /*
     func presentPanModalWeb(urlString: String) {
         guard let url = URL(string: urlString) else { return }
         
         let safariVC = SFSafariViewController(url: url)
         let nav = PanModalNaivgationController(rootViewController: safariVC)
         presentPanModal(nav)
     }
+    */
+    func presentModalWeb(urlString: String) {
+        guard let url = URL(string: urlString) else { return }
+
+        let safariVC = SFSafariViewController(url: url)
+        safariVC.modalPresentationStyle = .formSheet
+        self.present(safariVC, animated: true, completion: nil)
+    }
 }