Merge pull request #32 from nnsnodnb/develop

20180404_2

Author: nnsnodnb

NowPlaying.xcodeproj/xcshareddata/xcschemes/NowPlaying.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

NowPlaying/Resources/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt

@@ -4,7 +4,7 @@ version: 3.10.1
 
 name: Fabric, nameSpecified: 
 body: Fabric: Copyright 20…
-version: 1.7.5
+version: 1.7.6
 
 name: Firebase, nameSpecified: 
 body: Copyright 2017 Googl…

NowPlaying/Resources/Settings.bundle/com.mono0926.LicensePlist.plist

@@ -40,7 +40,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/Fabric</string>
 			<key>Title</key>
-			<string>Fabric (1.7.5)</string>
+			<string>Fabric (1.7.6)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>

NowPlaying/Scripts/ViewController/Play/PlayViewController.swift

@@ -6,6 +6,7 @@
 //  Copyright © 2017年 Oka Yuya. All rights reserved.
 //
 
+import Foundation
 import UIKit
 import MediaPlayer
 import TwitterKit
@@ -247,17 +248,13 @@ class PlayViewController: UIViewController {
         dateFormatter.timeZone = NSTimeZone.system
         dateFormatter.locale = Locale(identifier: "en_US_POSIX")
         dateFormatter.dateFormat = "yyyy-MM-dd"
-        let untilFreePurchaseDate = dateFormatter.date(from: "2018-04-20")!
-        if untilFreePurchaseDate < Date() {
+        if let untilFreePurchaseDate = dateFormatter.date(from: "2018-04-20"), untilFreePurchaseDate < Date() {
             return
         }
-        let alert = UIAlertController(title: "自動ツイートについてのお知らせ", message: "自動ツイートの機能のみ課金制になりました。なお2018年4月20日までに設定画面より無料で入手することが可能です。お試しください。", preferredStyle: .alert)
-        let tryAction = UIAlertAction(title: "試す", style: .default) { [unowned self] (_) in
-            self.onTapGearButton(nil)
-        }
-        alert.addAction(tryAction)
-        alert.addAction(UIAlertAction(title: "あとで", style: .cancel, handler: nil))
-        alert.preferredAction = tryAction
+        let alert = UIAlertController(title: "自動ツイートについてのお知らせ",
+                                      message: "自動ツイートの機能のみ課金制になりました。なお2018年4月20日までに設定画面より無料で入手することが可能です。お試しください。",
+                                      preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
         DispatchQueue.main.async { [unowned self] in
             self.present(alert, animated: true) {
                 UserDefaults.standard.set(true, forKey: UserDefaultsKey.update2_1_0.rawValue)

NowPlaying/Scripts/ViewController/Setting/SettingViewController.swift

@@ -363,7 +363,7 @@ class SettingViewController: FormViewController {
             cell.textLabel?.textAlignment = .left
             cell.textLabel?.textColor = UIColor.black
             cell.accessoryType = .disclosureIndicator
-        }).onCellSelection({ [unowned self] (cell, row) in
+        }).onCellSelection({ (cell, row) in
             Analytics.logEvent("tap", parameters: [
                 "type": "action",
                 "button": "appstore_review",