diff --git a/iOS/rainbow/Config/Info.plist b/iOS/rainbow/Config/Info.plist
index 52c6956..686467b 100644
--- a/iOS/rainbow/Config/Info.plist
+++ b/iOS/rainbow/Config/Info.plist
@@ -19,7 +19,7 @@
CFBundleShortVersionString
1.1
CFBundleVersion
- 1
+ 2
LSRequiresIPhoneOS
NSAppTransportSecurity
@@ -28,9 +28,7 @@
NSCameraUsageDescription
- WatsonML can't see very well without a camera!
- NSMicrophoneUsageDescription
- WatsonML requires the use of a microphone for using the camera.
+ To play WatsonML, we require the use of your device camera.
UIAppFonts
IBMPlexSans-Bold.ttf
diff --git a/iOS/rainbow/Controller/AvatarAPI/AvatarClient.swift b/iOS/rainbow/Controller/AvatarAPI/AvatarClient.swift
index 8d115be..5d54301 100644
--- a/iOS/rainbow/Controller/AvatarAPI/AvatarClient.swift
+++ b/iOS/rainbow/Controller/AvatarAPI/AvatarClient.swift
@@ -8,6 +8,7 @@
import Foundation
import UIKit
+import SVProgressHUD
struct UserAvatar: Codable {
var name: String
@@ -30,6 +31,11 @@ class AvatarClient {
static func getRandomAvatar(completion: @escaping (_ avatar: UserAvatar?, _ error: Error?) -> Void) {
let request = RestRequest(method: .get, url: "https://avatar-rainbow.mybluemix.net/new", containsSelfSignedCert: false)
+// request.circuitParameters = CircuitParameters(timeout: 30, fallback: { _, _ in
+// DispatchQueue.main.async {
+// SVProgressHUD.showError(withStatus: "Could not get avatar")
+// }
+// })
request.responseObject { (response: RestResponse) in
DispatchQueue.main.async {
switch response.result {
diff --git a/iOS/rainbow/Controller/Camera/CameraController.swift b/iOS/rainbow/Controller/Camera/CameraController.swift
index 83a8a3b..34a168f 100644
--- a/iOS/rainbow/Controller/Camera/CameraController.swift
+++ b/iOS/rainbow/Controller/Camera/CameraController.swift
@@ -201,7 +201,7 @@ class CameraController: LuminaViewController {
}
private func promptForLatestModel() {
- let alert = UIAlertController.init(title: "Load New Visual Model", message: "This will attempt to download a file that is between 15-20 MBs. Do you want to continue?", preferredStyle: .alert)
+ let alert = UIAlertController.init(title: "Load New Visual Model", message: "A new recognition model is available, and requires a download of 15-20 MB. Would you like to improve your gameplay?", preferredStyle: .alert)
let cancelAction = UIAlertAction(title: "Cancel", style: .cancel, handler: nil)
let okAction = UIAlertAction(title: "Download", style: .default) { _ in
UIApplication.shared.isNetworkActivityIndicatorVisible = true
diff --git a/iOS/rainbow/Controller/Leaderboard/ParticipantViewController.swift b/iOS/rainbow/Controller/Leaderboard/ParticipantViewController.swift
index d14a58a..bb30801 100644
--- a/iOS/rainbow/Controller/Leaderboard/ParticipantViewController.swift
+++ b/iOS/rainbow/Controller/Leaderboard/ParticipantViewController.swift
@@ -19,10 +19,10 @@ class ParticipantViewController: UIViewController {
@IBOutlet weak var nowPlayingLabel: UILabel?
override func viewDidAppear(_ animated: Bool) {
- ScoreEntry.ServerCalls.getCount { count, error in
+ ScoreEntry.ServerCalls.getCount { count, _ in
DispatchQueue.main.async {
if let count = count {
- self.nowPlayingLabel?.text = "Now Playing: \(count.totalUsers) players"
+ self.nowPlayingLabel?.text = "\(count.totalUsers) Players"
}
}
}
diff --git a/iOS/rainbow/Controller/MainTabBarController.swift b/iOS/rainbow/Controller/MainTabBarController.swift
index 18494cb..1be98f7 100644
--- a/iOS/rainbow/Controller/MainTabBarController.swift
+++ b/iOS/rainbow/Controller/MainTabBarController.swift
@@ -14,7 +14,12 @@ class MainTabBarController: UITabBarController {
override func viewDidLoad() {
super.viewDidLoad()
NotificationCenter.default.addObserver(self, selector: #selector(MainTabBarController.deviceRegistrationComplete(notification:)), name: Notification.Name("viva-ml-device-token-registered"), object: nil)
- SVProgressHUD.show(withStatus: "Preparing WatsonML...")
+ do {
+ _ = try ScoreEntry.ClientPersistence.get()
+ } catch {
+ // if there are any issues finding an existing users, this is the only reason we need to show this
+ SVProgressHUD.show(withStatus: "Preparing WatsonML...")
+ }
}
@objc func deviceRegistrationComplete(notification: Notification) {
diff --git a/iOS/rainbow/View/Base.lproj/Main.storyboard b/iOS/rainbow/View/Base.lproj/Main.storyboard
index e7db855..219fd86 100644
--- a/iOS/rainbow/View/Base.lproj/Main.storyboard
+++ b/iOS/rainbow/View/Base.lproj/Main.storyboard
@@ -411,23 +411,45 @@
-
+
-
-
+
+