Merge pull request #31 from johnchoi96/1.2

1.2

Author: johnchoi96

EmployeeManager.xcodeproj/project.pbxproj

@@ -168,7 +168,6 @@
 				D22C7A7D247372FE00FA5DFC /* Info.plist */,
 				D2454BA024B1A8BA00624B37 /* GoogleService-Info.plist */,
 				D22C7A8E2473894D00FA5DFC /* Constants.swift */,
-				D2454B9824AD8F8600624B37 /* GoogleService-Info.plist */,
 				D24ABC77248C834900016D2E /* Localizable.strings */,
 			);
 			path = EmployeeManager;
@@ -642,15 +641,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = EmployeeManager/Employees.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 200712;
+				CURRENT_PROJECT_VERSION = 200719;
 				DEVELOPMENT_TEAM = 2JDGUK4DRH;
 				INFOPLIST_FILE = EmployeeManager/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.johnchoi96.EmployeeManager;
 				PRODUCT_NAME = Employees;
 				SWIFT_VERSION = 5.0;
@@ -665,15 +664,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = EmployeeManager/Employees.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 200712;
+				CURRENT_PROJECT_VERSION = 200719;
 				DEVELOPMENT_TEAM = 2JDGUK4DRH;
 				INFOPLIST_FILE = EmployeeManager/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.johnchoi96.EmployeeManager;
 				PRODUCT_NAME = Employees;
 				SWIFT_VERSION = 5.0;

EmployeeManager/Controllers/EmployeeDetailViewController.swift

@@ -25,8 +25,21 @@ class EmployeeDetailViewController: UIViewController {
 
     @IBOutlet weak var middleNameStackView: UIStackView!
 
+    @IBOutlet weak var sliderStack: UIStackView!
+    
     var employee: Employee!
 
+    @IBOutlet weak var hoursInputSegmentControl: UISegmentedControl!
+    
+    @IBOutlet weak var hourSlider: UISlider!
+    @IBOutlet weak var minuteSlider: UISlider!
+    @IBOutlet weak var hourLabel: UILabel!
+    @IBOutlet weak var minuteLabel: UILabel!
+    
+    let hapticFeedback = UINotificationFeedbackGenerator()
+    
+    let selectionFeedback = UISelectionFeedbackGenerator()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -44,6 +57,18 @@ class EmployeeDetailViewController: UIViewController {
         idLabel.text = "\(employee.id)    " // 4 spaces at the end for label rotation
         payRateLabel.text = String(format: "$%.2f", employee.payRate)
         payCheckLabel.text = String(format: "$%.2f", employee.getPaycheck(hours: 1, minutes: 0))
+        
+        // set up slider view
+        sliderStack.isHidden = true
+        hourSlider.maximumValue = 200
+        hourSlider.minimumValue = 0
+        minuteSlider.maximumValue = 59
+        minuteSlider.minimumValue = 0
+        
+        hourSlider.value = 1
+        minuteSlider.value = 0
+        
+        hapticFeedback.prepare()
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -59,6 +84,9 @@ class EmployeeDetailViewController: UIViewController {
         payrateLabel.text = NSLocalizedString("pay rate label", comment: "Pay rate label")
         hoursWorkedLabel.text = NSLocalizedString("hours worked label", comment: "Hours worked label")
         paycheckLabel.text = NSLocalizedString("pay check label", comment: "Pay check label")
+        
+        hoursInputSegmentControl.setTitle("Time Picker", forSegmentAt: 0)
+        hoursInputSegmentControl.setTitle("Time Slider", forSegmentAt: 1)
     }
 
     @IBAction func timeChanged(_ sender: UIDatePicker) {
@@ -78,7 +106,37 @@ class EmployeeDetailViewController: UIViewController {
         let alert = UIAlertController(title: NSLocalizedString("copied confirmation alert", comment: ""), message: "", preferredStyle: .alert)
         let action = UIAlertAction(title: NSLocalizedString("Close message", comment: ""), style: .default, handler: nil)
         alert.addAction(action)
-        present(alert, animated: true, completion: nil)
+        present(alert, animated: true) {
+            self.hapticFeedback.notificationOccurred(.success)
+        }
+    }
+    
+    @IBAction func hoursModeChanged(_ sender: UISegmentedControl) {
+        if sender.selectedSegmentIndex == 0 {
+            hoursWorked.isHidden = false
+            sliderStack.isHidden = true
+        } else {
+            selectionFeedback.prepare()
+            hoursWorked.isHidden = true
+            sliderStack.isHidden = false
+        }
+    }
+    
+    @IBAction func sliderChanged(_ sender: UISlider) {
+        let value = Int(sender.value)
+        // if sender tag is 0, hour slider. if sender tag is 1, minute slider
+        if sender.tag == 0 {
+            hourLabel.text = String(value) + " " + (value == 1 ? "Hour" : "Hours")
+        } else {
+            minuteLabel.text = String(value) + " " + (value == 1 ? "Minute" : "Minutes")
+        }
+        let hour = Int(hourLabel.text!.split(separator: " ")[0])!
+        let minute = Int(minuteLabel.text!.split(separator: " ")[0])!
+        let paycheck = employee.getPaycheck(hours: hour, minutes: minute)
+        payCheckLabel.text = String(format: "$%.2f", paycheck)
+        
+        // haptic feedback
+        selectionFeedback.selectionChanged()
     }
 
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {