Updated dependencies

TBXark · Mar 16, 2018 · d4646bd · d4646bd
1 parent 2ba2db9
commit d4646bd
Show file tree

Hide file tree

Showing 11 changed files with 239 additions and 104 deletions.
diff --git a/Icon.sketch b/Icon.sketch
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,20 +1,18 @@
 PODS:
-  - OpenCV (3.2.0):
-    - OpenCV/Dynamic (= 3.2.0)
-  - OpenCV/Dynamic (3.2.0)
-  - R.swift (3.3.0):
-    - R.swift.Library (~> 3.0.2)
-  - R.swift.Library (3.0.2)
+  - OpenCV (3.3.1)
+  - R.swift (4.0.0):
+    - R.swift.Library (~> 4.0.0)
+  - R.swift.Library (4.0.0)
 
 DEPENDENCIES:
   - OpenCV
   - R.swift
 
 SPEC CHECKSUMS:
-  OpenCV: 0f7ab403d1e81769bc6f4f524c3c6928ecb1fdb8
-  R.swift: bde9704d50ff36820f49e266bc88ef545e1e9b36
-  R.swift.Library: fbdec16c9802ad104fc1ba53415dc190e6ec5c73
+  OpenCV: d81447860f038d60723084aa02ecc963f95c55fa
+  R.swift: d6a5ec2f55a8441dc0ed9f1f8b37d7d11ae85c66
+  R.swift.Library: c3af34921024333546e23b70e70d0b4e0cffca75
 
 PODFILE CHECKSUM: e5d35b3dab5712e772c691383deac10a3227ad20
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.4.0
diff --git a/Ruler.xcodeproj/project.pbxproj b/Ruler.xcodeproj/project.pbxproj
@@ -56,6 +56,7 @@
 		6A68615A1F6FB8B500882BCE /* LineNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineNode.swift; sourceTree = "<group>"; };
 		6A68615C1F6FBAF000882BCE /* ARKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ARKit.framework; path = System/Library/Frameworks/ARKit.framework; sourceTree = SDKROOT; };
 		6A68615E1F6FBAF800882BCE /* SceneKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SceneKit.framework; path = System/Library/Frameworks/SceneKit.framework; sourceTree = SDKROOT; };
+		6A7EDABF205BC03000C72D8A /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/SettingViewController.storyboard; sourceTree = "<group>"; };
 		6AA965BE1F7015AA0027ACAC /* UIAlertController+Dismiss.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Dismiss.swift"; sourceTree = "<group>"; };
 		6AA965C91F7101F30027ACAC /* MeasurementUnit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeasurementUnit.swift; sourceTree = "<group>"; };
 		6AA965E11F711B020027ACAC /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -67,7 +68,6 @@
 		6AF69F2E1F712AF100556339 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6AF69F2F1F71327D00556339 /* ApplicationSetting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationSetting.swift; sourceTree = "<group>"; };
 		6AF69F321F71378500556339 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "zh-Hans"; path = "zh-Hans.lproj/SettingViewController.storyboard"; sourceTree = "<group>"; };
-		6AF69F351F7144E900556339 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/SettingViewController.storyboard; sourceTree = "<group>"; };
 		6AFF56831F78B53B00AE7595 /* RulerARProViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RulerARProViewController.swift; sourceTree = "<group>"; };
 		6AFF56851F78BD7B00AE7595 /* PopButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopButton.swift; sourceTree = "<group>"; };
 		7610879C429C51E6F2EE786A /* Pods-Ruler.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ruler.release.xcconfig"; path = "Pods/Target Support Files/Pods-Ruler/Pods-Ruler.release.xcconfig"; sourceTree = "<group>"; };
@@ -374,7 +374,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"$PODS_ROOT/R.swift/rswift\" \"$SRCROOT/Ruler/Source\"";
+			shellScript = "\"$PODS_ROOT/R.swift/rswift\" generate \"$SRCROOT/Ruler/Source\"";
 		};
 		999369B764C5FFCCCA6E714D /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -436,7 +436,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				6AF69F321F71378500556339 /* zh-Hans */,
-				6AF69F351F7144E900556339 /* en */,
+				6A7EDABF205BC03000C72D8A /* en */,
 			);
 			name = SettingViewController.storyboard;
 			sourceTree = "<group>";

diff --git a/Ruler/Info.plist b/Ruler/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
-	<string>09262355</string>
+	<string>03161650</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

diff --git a/Ruler/Modules/Ruler/RulerARProViewController.swift b/Ruler/Modules/Ruler/RulerARProViewController.swift
@@ -102,15 +102,15 @@ class RulerARProViewController: UIViewController {
             switch lastState {
             case .notAvailable:
                 guard HUG.isVisible else { return }
-                HUG.show(title: Localization.aRNotAvailable())
+                HUG.show(title: Localization.arNotAvailable())
             case .limited(let reason):
                 switch reason {
                 case .initializing:
-                    HUG.show(title: Localization.aRInitializing(), message: Localization.aRInitializingMessage(), inSource: self, autoDismissDuration: nil)
+                    HUG.show(title: Localization.arInitializing(), message: Localization.arInitializingMessage(), inSource: self, autoDismissDuration: nil)
                 case .insufficientFeatures:
-                    HUG.show(title: Localization.aRExcessiveMotion(), message: Localization.aRInitializingMessage(), inSource: self, autoDismissDuration: 5)
+                    HUG.show(title: Localization.arExcessiveMotion(), message: Localization.arInitializingMessage(), inSource: self, autoDismissDuration: 5)
                 case .excessiveMotion:
-                    HUG.show(title: Localization.aRExcessiveMotion(), message: Localization.aRExcessiveMotionMessage(), inSource: self, autoDismissDuration: 5)
+                    HUG.show(title: Localization.arExcessiveMotion(), message: Localization.arExcessiveMotionMessage(), inSource: self, autoDismissDuration: 5)
                 }
             case .normal:
                 HUG.dismiss()

diff --git a/Ruler/Modules/Setting/SettingViewController.swift b/Ruler/Modules/Setting/SettingViewController.swift
@@ -34,6 +34,11 @@ class SettingViewController: UIViewController {
         ApplicationSetting.Status.displayFocus = sender.isOn
     }
 
+    @IBAction func pixoAppDidTap(_ sender: Any) {
+        UIApplication.shared.open(URL(string: "https://itunes.apple.com/app/id1333531743")!,
+                                  options: [:],
+                                  completionHandler: nil)
+    }
     @IBAction func playAppDidTap(_ sender: Any) {
         UIApplication.shared.open(URL(string: "https://itunes.apple.com/app/id1071726144")!,
                                   options: [:],