Adjust screen timeout and add colorless mana

Mana Count.xcodeproj/project.pbxproj

@@ -219,7 +219,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -270,7 +270,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -285,7 +285,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 98PHYR992B;
 				INFOPLIST_FILE = "Mana Count/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = manaCount;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -301,7 +301,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 98PHYR992B;
 				INFOPLIST_FILE = "Mana Count/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = manaCount;
 				PRODUCT_NAME = "$(TARGET_NAME)";

Mana Count.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Mana Count/AppDelegate.swift

@@ -13,10 +13,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
-        UIApplication.shared.statusBarStyle = .lightContent
+        application.statusBarStyle = .lightContent
+        application.isIdleTimerDisabled = true
         return true
     }
 

Mana Count/Assets.xcassets/waste.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Wastes-MtG-Art-Oath-of-the-Gatewatch-.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Mana Count/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

Mana Count/Settings.bundle/Root.plist

@@ -72,6 +72,16 @@
 			<key>DefaultValue</key>
 			<false/>
 		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>Colorless Mana</string>
+			<key>Key</key>
+			<string>colorless</string>
+			<key>DefaultValue</key>
+			<false/>
+		</dict>
 	</array>
 </dict>
 </plist>

Mana Count/ViewController.swift

@@ -10,20 +10,23 @@ class ViewController: UIViewController {
     final let BLUE = "blue"
     final let GREEN = "green"
     final let BLACK = "black"
+    final let COLORLESS = "colorless"
 
     @IBOutlet weak var stormView: UIView!
     @IBOutlet weak var whiteView: UIView!
     @IBOutlet weak var redView: UIView!
     @IBOutlet weak var blueView: UIView!
     @IBOutlet weak var greenView: UIView!
     @IBOutlet weak var blackView: UIView!
+    @IBOutlet weak var colorlessView: UIView!
 
     @IBOutlet weak var stormImage: UIImageView!
     @IBOutlet weak var plainsImage: UIImageView!
     @IBOutlet weak var mountainImage: UIImageView!
     @IBOutlet weak var islandImage: UIImageView!
     @IBOutlet weak var forestImage: UIImageView!
     @IBOutlet weak var swampImage: UIImageView!
+    @IBOutlet weak var wasteImage: UIImageView!
 
     @IBOutlet weak var stormPlus: UIView!
     @IBOutlet weak var stormMinus: UIView!
@@ -37,13 +40,16 @@ class ViewController: UIViewController {
     @IBOutlet weak var forestMinus: UIView!
     @IBOutlet weak var swampPlus: UIView!
     @IBOutlet weak var swampMinus: UIView!
+    @IBOutlet weak var wastePlus: UIView!
+    @IBOutlet weak var wasteMinus: UIView!
 
     @IBOutlet weak var stormCount: UILabel!
     @IBOutlet weak var plainsCount: UILabel!
     @IBOutlet weak var mountainCount: UILabel!
     @IBOutlet weak var islandCount: UILabel!
     @IBOutlet weak var forestCount: UILabel!
     @IBOutlet weak var swampCount: UILabel!
+    @IBOutlet weak var wasteCount: UILabel!
 
     @IBAction func stormPlusGesture(_ sender: UILongPressGestureRecognizer) {
         handleCounterTouch(target: stormPlus, count: stormCount, up: true, gesture: sender)
@@ -81,6 +87,12 @@ class ViewController: UIViewController {
     @IBAction func swampMinusGesture(_ sender: UILongPressGestureRecognizer) {
         handleCounterTouch(target: swampMinus, count: swampCount, up: false, gesture: sender)
     }
+    @IBAction func wastePlusGesture(_ sender: UILongPressGestureRecognizer) {
+        handleCounterTouch(target: wastePlus, count: wasteCount, up: true, gesture: sender)
+    }
+    @IBAction func wasteMinusGesture(_ sender: UILongPressGestureRecognizer) {
+        handleCounterTouch(target: wasteMinus, count: wasteCount, up: false, gesture: sender)
+    }
 
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return .lightContent
@@ -173,7 +185,8 @@ class ViewController: UIViewController {
                 self.mountainCount.text != "0" ||
                 self.islandCount.text != "0" ||
                 self.forestCount.text != "0" ||
-                self.swampCount.text != "0")
+                self.swampCount.text != "0" ||
+                self.wasteCount.text != "0")
     }
 
     func setCountersToZero() {
@@ -183,20 +196,12 @@ class ViewController: UIViewController {
         self.islandCount.text = "0"
         self.forestCount.text = "0"
         self.swampCount.text = "0"
+        self.wasteCount.text = "0"
     }
 
     @objc func setupSelectedCounters() {
         unhideAllCounterViews()
         showSelectedCounterViews()
-
-        //print(UserDefaults.standard.bool(forKey: STORM))
-        //print(UserDefaults.standard.bool(forKey: WHITE))
-        //print(UserDefaults.standard.bool(forKey: RED))
-        //print(UserDefaults.standard.bool(forKey: BLUE))
-        //print(UserDefaults.standard.bool(forKey: GREEN))
-        //print(UserDefaults.standard.bool(forKey: BLACK))
-
-
     }
 
     func unhideAllCounterViews() {
@@ -206,6 +211,7 @@ class ViewController: UIViewController {
         blueView.isHidden = false
         greenView.isHidden = false
         blackView.isHidden = false
+        colorlessView.isHidden = false
     }
 
     func showSelectedCounterViews() {
@@ -233,6 +239,10 @@ class ViewController: UIViewController {
             blackView.isHidden = true
             swampCount.text = "0"
         }
+        if !UserDefaults.standard.bool(forKey: COLORLESS) {
+            colorlessView.isHidden = true
+            wasteCount.text = "0"
+        }
     }
 
     func setupImageBorderRadii() {
@@ -242,6 +252,7 @@ class ViewController: UIViewController {
         islandImage.layer.cornerRadius = 10
         forestImage.layer.cornerRadius = 10
         swampImage.layer.cornerRadius = 10
+        wasteImage.layer.cornerRadius = 10
     }
 
     func handleCounterTouch(target: UIView, count: UILabel, up: Bool, gesture: UILongPressGestureRecognizer) {