Skip to content

Commit ea29ffb

Browse files
authored
Merge pull request #64 from 87kangsw/release/2.1.1
Release/2.1.1
2 parents ba4b9c2 + 20b783d commit ea29ffb

File tree

4 files changed

+25
-14
lines changed

4 files changed

+25
-14
lines changed

GitTime/Sources/ViewControllers/Setting/SettingViewController.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,13 @@ class SettingViewController: BaseViewController, ReactorKit.View {
204204
}
205205

206206
private func goToRecommendApp() {
207-
let url = URL(string: Constants.URLs.appStoreURL)
207+
guard let url = URL(string: Constants.URLs.appStoreURL) else { return }
208208
let activityController = UIActivityViewController(activityItems: [url], applicationActivities: nil)
209+
if UIDevice.isPad == true {
210+
guard let cell = tableView.cellForRow(at: IndexPath(row: 2, section: 1)) else { return }
211+
activityController.popoverPresentationController?.sourceView = self.tableView
212+
activityController.popoverPresentationController?.sourceRect = cell.frame
213+
}
209214
self.present(activityController, animated: true, completion: nil)
210215
}
211216

GitTime/Sources/ViewControllers/Trend/TrendViewReactor.swift

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -294,14 +294,14 @@ final class TrendViewReactor: Reactor {
294294
currentPeriodStars: 0,
295295
contributors: [])
296296

297-
/// Repository Info
298-
let repositoryInfo = item.xpath(".//h1[@class='h3 lh-condensed']/a")//[index]
299-
let description = item.xpath(".//p[@class='col-9 color-text-secondary my-1 pr-4']")//[index]
297+
// Repository Info
298+
let repositoryInfo = item.xpath(".//h1[@class='h3 lh-condensed']/a")
299+
let description = item.xpath(".//p[@class='col-9 color-fg-muted my-1 pr-4']")
300300
let languageColor = item.xpath(".//span[@class='d-inline-block ml-0 mr-3']/span[1]")
301301
let language = item.xpath(".//span[@class='d-inline-block ml-0 mr-3']/span[2]")
302-
let star = item.xpath(".//div[@class='f6 color-text-secondary mt-2']/a[1]")//[index]
303-
let fork = item.xpath(".//div[@class='f6 color-text-secondary mt-2']/a[2]")//[index]
304-
let todayStar = item.xpath(".//div[@class='f6 color-text-secondary mt-2']/span[@class='d-inline-block float-sm-right']")//[index]
302+
let star = item.xpath(".//div[@class='f6 color-fg-muted mt-2']/a[1]")
303+
let fork = item.xpath(".//div[@class='f6 color-fg-muted mt-2']/a[2]")
304+
let todayStar = item.xpath(".//div[@class='f6 color-fg-muted mt-2']/span[@class='d-inline-block float-sm-right']")
305305
// let contributors = item.xpath(".//div[@class='f6 text-gray mt-2']/span[@class='d-inline-block mr-3']")
306306

307307
// repository Info
@@ -355,9 +355,15 @@ final class TrendViewReactor: Reactor {
355355
/*
356356
/html/body[@class='logged-in env-production page-responsive']/div[@class='application-main ']/main/div[@class='position-relative container-lg p-responsive pt-6']/div[@class='Box']/div[2]/article[@class='Box-row'][1]/div[@class='f6 color-text-secondary mt-2']/span[@class='d-inline-block mr-3']/a[@class='d-inline-block'][1]/img[@class='avatar mb-1 avatar-user']/@src
357357
*/
358+
359+
/*
360+
/html/body[@class='logged-in env-production page-responsive issue-closed-done']/div[@class='application-main ']/main[@id='js-pjax-container']/div[@class='position-relative container-lg p-responsive pt-6']/div[@class='Box']/div[2]/article[@class='Box-row'][2]/div[@class='f6 color-fg-muted mt-2']/span[@class='d-inline-block mr-3']/a[@class='d-inline-block'][1]/img[@class='avatar mb-1 avatar-user']/@src
361+
*/
362+
363+
358364
for i in 1...5 {
359-
if let profile = item.xpath(".//div[@class='f6 color-text-secondary mt-2']/span[@class='d-inline-block mr-3']/a[@class='d-inline-block'][\(i)]/img[@class='avatar mb-1 avatar-user']/@src").first?.text?.striped,
360-
let name = item.xpath(".//div[@class='f6 color-text-secondary mt-2']/span[@class='d-inline-block mr-3']/a[@class='d-inline-block'][\(i)]/@href").first?.text?.striped {
365+
if let profile = item.xpath(".//div[@class='f6 color-fg-muted mt-2']/span[@class='d-inline-block mr-3']/a[@class='d-inline-block'][\(i)]/img[@class='avatar mb-1 avatar-user']/@src").first?.text?.striped,
366+
let name = item.xpath(".//div[@class='f6 color-fg-muted mt-2']/span[@class='d-inline-block mr-3']/a[@class='d-inline-block'][\(i)]/@href").first?.text?.striped {
361367
let contributorModel = TrendRepoContributor(name: String(name.dropFirst()),
362368
profileURL: profile)
363369
trendRepo.contributors.append(contributorModel)

GitTime/Supporting Files/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<key>CFBundlePackageType</key>
8686
<string>APPL</string>
8787
<key>CFBundleShortVersionString</key>
88-
<string>2.1.0</string>
88+
<string>2.1.1</string>
8989
<key>CFBundleURLTypes</key>
9090
<array>
9191
<dict>
@@ -100,7 +100,7 @@
100100
</dict>
101101
</array>
102102
<key>CFBundleVersion</key>
103-
<string>2</string>
103+
<string>3</string>
104104
<key>ITSAppUsesNonExemptEncryption</key>
105105
<false/>
106106
<key>LSApplicationQueriesSchemes</key>

Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- AcknowList (2.0.2)
2+
- AcknowList (2.0.3)
33
- Alamofire (5.4.4)
44
- Bagel (1.4.0):
55
- CocoaAsyncSocket
@@ -279,7 +279,7 @@ CHECKOUT OPTIONS:
279279
:git: https://github.com/devxoul/Toaster.git
280280

281281
SPEC CHECKSUMS:
282-
AcknowList: 209323b0f72625a61e1325f4e67a39015b62d48b
282+
AcknowList: 6d4faca4c3e0173377fe5649e086d627cd60b003
283283
Alamofire: f3b09a368f1582ab751b3fff5460276e0d2cf5c9
284284
Bagel: c3fa6bcbd52db9ca976edbafd7638f0553ded101
285285
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
@@ -332,4 +332,4 @@ SPEC CHECKSUMS:
332332

333333
PODFILE CHECKSUM: ecfb47752adb4f2669fe0fbed01e71aadb792c5e
334334

335-
COCOAPODS: 1.10.0
335+
COCOAPODS: 1.11.2

0 commit comments

Comments
 (0)