Merge pull request #59 from jinSasaki/update-example

Update example
jinSasaki · Aug 12, 2021 · 5ad2e9e · 5ad2e9e
2 parents 392e05e + fcd669e
commit 5ad2e9e
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 33 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,11 +1,11 @@
 excluded:
-  - Example
+  - Examples
 
 disabled_rules:
   - xctfail_message
   - nesting
 file_length:
-  - 600 # warning
+  - 800 # warning
   - 1000 # error
 line_length:
   - 200 # warning

diff --git a/...omInAppPurchaseSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...omInAppPurchaseSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,7 +6,7 @@
         "repositoryURL": "https://github.com/jinSasaki/InAppPurchase.git",
         "state": {
           "branch": "master",
-          "revision": "25c9e5fdb9d3263c4c8628c49ca94f6257874d45",
+          "revision": "392e05ecf7aad96e12c95bccfda630380581ade7",
           "version": null
         }
       }

diff --git a/Examples/Custom/CustomInAppPurchaseSample/ViewController.swift b/Examples/Custom/CustomInAppPurchaseSample/ViewController.swift
@@ -18,7 +18,7 @@ enum Constant {
 
 final class ViewController: UIViewController {
 
-    var responses: [PaymentResponse] = []
+    var transactions: [PaymentTransaction] = []
 
     @IBOutlet private weak var tableView: UITableView! {
         didSet {
@@ -27,6 +27,14 @@ final class ViewController: UIViewController {
         }
     }
 
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { [weak self] _ in
+            self?.reloadTransactions()
+        }
+    }
+
     @IBAction func tapPurchaseCoin() {
         let id = Constant.Product.coin
         InAppPurchase.custom.purchase(productIdentifier: id) { [weak self] result in
@@ -59,36 +67,39 @@ final class ViewController: UIViewController {
             case .deferred:
                 print("[DEFERRED] \(response.transaction.transactionIdentifier ?? "nil")")
             }
-            self.responses.append(response)
-            self.tableView.reloadData()
+            self.reloadTransactions()
         case .failure(let error):
             print(error)
         }
     }
+
+    private func reloadTransactions() {
+        self.transactions = InAppPurchase.custom.transactions
+        self.tableView.reloadData()
+    }
 }
 
 extension ViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return responses.count
+        return transactions.count
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = UITableViewCell(style: .subtitle, reuseIdentifier: "default")
-        let response = responses[indexPath.row]
-        cell.textLabel?.text = "\(response.transaction.productIdentifier) \(response.transaction.transactionIdentifier ?? "-")"
-        cell.detailTextLabel?.text = "\(response.state)"
+        let transaction = transactions[indexPath.row]
+        cell.textLabel?.text = "\(transaction.productIdentifier) \(transaction.transactionIdentifier ?? "-")"
+        cell.detailTextLabel?.text = "\(transaction.state)"
         return cell
     }
 }
 
 extension ViewController: UITableViewDelegate {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let response = responses[indexPath.row]
-        let alert = UIAlertController(title: "Finish transaction?", message: response.transaction.transactionIdentifier, preferredStyle: .alert)
+        let transaction = transactions[indexPath.row]
+        let alert = UIAlertController(title: "Finish transaction?", message: transaction.transactionIdentifier, preferredStyle: .alert)
         alert.addAction(.init(title: "Finish", style: .default, handler: { [weak self] _ in
-            InAppPurchase.custom.finish(transaction: response.transaction)
-            self?.responses.removeAll(where: { $0.transaction.transactionIdentifier == response.transaction.transactionIdentifier })
-            self?.tableView.reloadData()
+            InAppPurchase.custom.finish(transaction: transaction)
+            self?.reloadTransactions()
         }))
         alert.addAction(.init(title: "Cancel", style: .cancel, handler: nil))
         self.present(alert, animated: true, completion: nil)

diff --git a/InAppPurchase.xcodeproj/project.pbxproj b/InAppPurchase.xcodeproj/project.pbxproj
@@ -340,7 +340,6 @@
 				938BFA751F5E8411006A4C2A /* Sources */,
 				938BFA761F5E8411006A4C2A /* Frameworks */,
 				938BFA771F5E8411006A4C2A /* Resources */,
-				939016A91F72D44E0061C83B /* SwiftLint */,
 			);
 			buildRules = (
 			);
@@ -423,20 +422,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		939016A91F72D44E0061C83B /* SwiftLint */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = SwiftLint;
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
-		};
 		93C3297D1F5EA27F00F7A5E7 /* Swiftlint */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -449,7 +434,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
+			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/Package.swift b/Package.swift
@@ -10,12 +10,12 @@ let package = Package(
     ],
     products: [
         .library(name: "InAppPurchase", targets: ["InAppPurchase"]),
-        .library(name: "InAppPurchaseStubs", targets: ["InAppPurchaseStubs"]),
+        .library(name: "InAppPurchaseStubs", targets: ["InAppPurchaseStubs"])
     ],
     targets: [
         .target(name: "InAppPurchase", path: "Sources"),
         .target(name: "InAppPurchaseStubs", dependencies: ["InAppPurchase"], path: "InAppPurchaseStubs"),
-        .testTarget(name: "InAppPurchaseTests", dependencies: ["InAppPurchase", "InAppPurchaseStubs"], path: "Tests"),
+        .testTarget(name: "InAppPurchaseTests", dependencies: ["InAppPurchase", "InAppPurchaseStubs"], path: "Tests")
     ],
     swiftLanguageVersions: [.v5]
 )