Merge branch 'release/v1.0.1'

Author: 87kangsw

GitTime/Sources/Models/AppVersion.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 struct AppVersion: ModelType {
-    let result: AppVersionResult
+    let results: [AppVersionResult]
 }
 
 struct AppVersionResult: ModelType {

GitTime/Sources/ViewControllers/Activity/ActivityViewController.swift

@@ -106,8 +106,10 @@ class ActivityViewController: BaseViewController, StoryboardView, ReactorBased {
             .disposed(by: self.disposeBag)
 
         reactor.state.map { $0.contributionInfo }
-            .subscribe(onNext: { info in
-                guard let info = info else { return }
+            .filterNil()
+            .take(1)
+            .subscribe(onNext: { [weak self] info in
+                guard let self = self else { return }
                 let reactor = ActivityContributionViewReactor(contributionInfo: info)
                 self.contributionHeaderView.reactor = reactor
             }).disposed(by: self.disposeBag)

GitTime/Sources/ViewControllers/Setting/SettingViewReactor.swift

@@ -84,7 +84,7 @@ final class SettingViewReactor: Reactor {
         case .versionCheck:
             let versionMutation: Observable<Mutation> = self.appStoreService.getLatestVersion()
                 .map { version -> Mutation in
-                    let storeVersion = version.result.version
+                    let storeVersion = version.results[0].version
                     return .setVersion(storeVersion)
             }.catchErrorJustReturn(.setVersion("⚠️"))
             return versionMutation

GitTime/Sources/ViewControllers/Trend/TrendViewReactor.swift

@@ -44,13 +44,19 @@ final class TrendViewReactor: Reactor {
         var trendSections: [TrendSection] {
             switch self.trendingType {
             case .repositories:
+                guard !self.isRefreshing else {
+                    return [.repo([])]
+                }
                 guard !self.repositories.isEmpty else {
                     let reactor = EmptyTableViewCellReactor(type: .trendingRepo)
                     return [.repo([TrendSectionItem.empty(reactor)])]
                 }
                 return [.repo(self.repositories)]
             case .developers:
-                guard !self.repositories.isEmpty else {
+                guard !self.isRefreshing else {
+                    return [.developer([])]
+                }
+                guard !self.developers.isEmpty else {
                     let reactor = EmptyTableViewCellReactor(type: .trendingDeveloper)
                     return [.repo([TrendSectionItem.empty(reactor)])]
                 }
@@ -87,7 +93,7 @@ final class TrendViewReactor: Reactor {
             let startRefreshing: Observable<Mutation> = .just(.setRefreshing(true))
             let endRefreshing: Observable<Mutation> = .just(.setRefreshing(false))
             let requestMutation = self.requestTrending()
-            return .concat([startRefreshing, endRefreshing.delay(0.5, scheduler: MainScheduler.instance), requestMutation])
+            return .concat([startRefreshing, requestMutation, endRefreshing])
         case .selectPeriod(let period):
             self.userdefaultsService.set(value: period.querySting(),
                                          forKey: UserDefaultsKey.period)

GitTime/Sources/Views/Trend/TrendingRepositoryCell.xib

@@ -83,6 +83,7 @@
                     <constraint firstItem="ktp-Cv-oS3" firstAttribute="leading" secondItem="qJS-QK-QHV" secondAttribute="trailing" constant="5" id="AhI-hi-Xpg"/>
                     <constraint firstItem="1nR-qp-FLh" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="bKj-Xa-yBM" secondAttribute="trailing" constant="16" id="Cpb-ZT-uXq"/>
                     <constraint firstItem="bTb-JI-KSS" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="hEh-IU-vms" secondAttribute="trailing" constant="16" id="DGT-d8-LHL"/>
+                    <constraint firstItem="ktp-Cv-oS3" firstAttribute="top" relation="greaterThanOrEqual" secondItem="Q4S-LT-OWL" secondAttribute="bottom" constant="10" id="IqL-p1-kDM"/>
                     <constraint firstAttribute="trailing" secondItem="Ffb-mT-nkx" secondAttribute="trailing" constant="16" id="OeL-GW-qf1"/>
                     <constraint firstItem="qJS-QK-QHV" firstAttribute="centerY" secondItem="ktp-Cv-oS3" secondAttribute="centerY" id="P6H-Sr-teA"/>
                     <constraint firstItem="Ffb-mT-nkx" firstAttribute="centerY" secondItem="hEh-IU-vms" secondAttribute="centerY" id="P7t-TL-QE9"/>

GitTime/Supporting Files/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,9 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>2</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

README.md

@@ -1,18 +1,20 @@
 # GitTime
+
 GitHub working time - GitTime
+![](https://github.com/87kangsw/resume/blob/master/images/gittime.png)
 
 ## Feature
+
 1. Activity: GitHub Contributions graph & Event lists
 2. Trending: Trending Repositories & Developers
 3. Follow: My Followers & Following
 
-
 ## Skills
+
 - [x] ReactorKit
 - [x] Reactive - RxSwift & RxCocoa & RxDataSources …
 - [x] Moya - Moya/RxSwift
 - [x] SwiftLint
 - [x] Fastlane
 - [x] AcknowList
 - [ ] RxFlow
-