@@ -10,11 +10,13 @@ import UIKit
1010
1111class AddGoalViewController : UIViewController {
1212
13- @IBOutlet weak var segmentedControl : UISegmentedControl !
14- @IBOutlet weak var instructionLabel : UILabel !
1513 @IBOutlet weak var datePicker : UIDatePicker !
14+ @IBOutlet weak var promptView : UITextView !
1615 @IBOutlet weak var goalWritingView : UITextView !
1716
17+ @IBOutlet weak var opaqueView : UIView !
18+ @IBOutlet weak var opaqueViewYPosition : NSLayoutConstraint !
19+
1820 @IBOutlet weak var cubeView : CubeView !
1921 internal var cubeFaces : [ UIImageView ] = [ ]
2022
@@ -24,54 +26,49 @@ class AddGoalViewController: UIViewController {
2426 public static var activeRecommendations : [ String ] = [ ]
2527
2628 internal var lastUpdated : Date = Date ( )
27- internal var selectedSegment : Int = 0
2829
2930 override func viewDidLoad( ) {
3031 super. viewDidLoad ( )
3132 // Do any additional setup after loading the view.
33+ NotificationCenter . default. addObserver ( self , selector: #selector( keyboardWillShow ( _: ) ) , name: UIResponder . keyboardWillShowNotification, object: nil )
34+ NotificationCenter . default. addObserver ( self , selector: #selector( keyboardWillHide ( _: ) ) , name: UIResponder . keyboardWillHideNotification, object: nil )
3235
33- // engageTableView()
36+ opaqueView . layer . maskedCorners = [ . layerMinXMinYCorner , . layerMaxXMinYCorner ]
3437
3538 let tap = UITapGestureRecognizer ( target: self , action: #selector( onCubeTap ( _: ) ) )
3639 cubeView. addGestureRecognizer ( tap)
37-
3840 setupCubeView ( )
3941 cubeView. enableMotion ( )
4042
41- NotificationCenter . default. addObserver ( self , selector: #selector( keyboardWillShow ( _: ) ) , name: UIResponder . keyboardWillShowNotification, object: nil )
42- NotificationCenter . default. addObserver ( self , selector: #selector( keyboardWillHide ( _: ) ) , name: UIResponder . keyboardWillHideNotification, object: nil )
43+ goalWritingView. delegate = self
4344 }
4445
4546 override func viewDidAppear( _ animated: Bool ) {
4647 super. viewDidAppear ( animated)
48+ goalWritingView. becomeFirstResponder ( )
4749
4850 cubeView. needsTaring = true
4951 cubeView. trackMotion ( true )
5052
5153 CLPProfile . shared. onFetchSuccess {
5254 self . setupCubeView ( )
53- // self.updateTableView ()
55+ self . onCubeTap ( )
5456 }
5557 if CLPProfile . shared. basicInformation. lastModified > lastUpdated {
5658 self . setupCubeView ( )
57- // self.updateTableView ()
59+ self . onCubeTap ( )
5860 }
61+ self . onCubeTap ( )
5962 }
6063
6164 override func viewDidDisappear( _ animated: Bool ) {
6265 super. viewDidDisappear ( animated)
63-
66+ goalWritingView . resignFirstResponder ( )
6467 cubeView. trackMotion ( false )
6568 }
6669
67- @IBAction func onSegmentSwitch( _ sender: UISegmentedControl ) {
68- selectedSegment = sender. selectedSegmentIndex
69- switch selectedSegment {
70- case 0 : instructionLabel. text = " Tap the dice (bottom left), then tap a prompt "
71- case 1 : instructionLabel. text = " Enter your goal and set a deadline "
72- default : break
73- }
74- // updateTableView()
70+ @IBAction func onModalViewTap( _ sender: UITapGestureRecognizer ) {
71+ dismiss ( animated: true , completion: nil )
7572 }
7673
7774 @objc func onCubeTap( _ sender: UITapGestureRecognizer ? = nil ) {
@@ -81,17 +78,32 @@ class AddGoalViewController: UIViewController {
8178 let i = cubeView. topFaceIndex % CLPProfile. shared. basicInformation. values. count
8279 Self . activeValueForRecs = VALUE_LIST . owned [ i] . name
8380
84- // updateTableView ()
81+ updatePrompt ( )
8582 }
8683 }
8784
85+ private func updatePrompt( ) {
86+ let prompt = Self . activeRecommendations. randomElement ( ) ?? " What's something you've always wanted to do? "
87+ if prompt. contains ( " ? " ) {
88+ promptView. text = prompt
89+ goalWritingView. text = " "
90+ } else {
91+ promptView. text = " Personalize the given goal. It will be easier to accomplish if it's more specific. "
92+ goalWritingView. text = prompt
93+ }
94+
95+ // if !goalWritingView.isFirstResponder {
96+ // goalWritingView.textColor = .lightGray
97+ // }
98+ }
99+
88100 private func setupCubeView( ) {
89101 cubeFaces = cubeView. createFaces ( in: cubeView. bounds)
90102 cubeView. situate ( in: cubeView. bounds)
91103
92104 let backgroundColor : UIColor ?
93105 // cannot use ternary operator because #available is special
94- if #available( iOS 13 . 0 , * ) { backgroundColor = . lightGray } else { backgroundColor = . lightGray }
106+ if #available( iOS 13 . 0 , * ) { backgroundColor = . label } else { backgroundColor = . black }
95107
96108 var images = VALUE_LIST . owned. map ( { $0. image} )
97109 // one image will be duplicated because user has 5 strengths
@@ -112,12 +124,9 @@ class AddGoalViewController: UIViewController {
112124
113125extension AddGoalViewController : UITextViewDelegate {
114126 func textViewDidBeginEditing( _ textView: UITextView ) {
115- if textView. text. contains ( " ? " ) { textView. clearsOnInsertion = true }
116127 }
117128
118129 func textViewDidEndEditing( _ textView: UITextView ) {
119- // guard let indexPath = tableView.indexPathForSelectedRow else {return}
120- // if (selectedSegment == 0 && Self.activeRecommendations.count > indexPath.row) {Self.activeRecommendations[indexPath.row] = textView.text}
121130 }
122131
123132 func textView( _ textView: UITextView , shouldChangeTextIn range: NSRange , replacementText text: String ) -> Bool {
@@ -129,25 +138,24 @@ extension AddGoalViewController: UITextViewDelegate {
129138 }
130139
131140 func textViewDidChange( _ textView: UITextView ) {
132- UIView . setAnimationsEnabled ( false )
133- textView. sizeToFit ( )
134- // DispatchQueue.main.async {
135- // self.tableView.beginUpdates()
136- // self.tableView.endUpdates()
137- // UIView.setAnimationsEnabled(true)
138- // }
139141 }
140142}
141143
142144extension AddGoalViewController {
143145 @objc func keyboardWillShow( _ notification: Notification ) {
144146 if let keyboardSize = ( notification. userInfo ? [ UIResponder . keyboardFrameBeginUserInfoKey] as? NSValue ) ? . cgRectValue {
145- // tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: keyboardSize.height, right: 0)
147+ self . opaqueViewYPosition. constant = keyboardSize. height
148+ UIView . animate ( withDuration: 0.1 ) {
149+ self . view. layoutIfNeeded ( )
150+ }
146151 }
147152 }
148153 @objc func keyboardWillHide( _ notification: Notification ) {
149154 if let _ = ( notification. userInfo ? [ UIResponder . keyboardFrameBeginUserInfoKey] as? NSValue ) ? . cgRectValue {
150- // tableView.contentInset = UIEdgeInsets.zero
155+ self . opaqueViewYPosition. constant = 0
156+ UIView . animate ( withDuration: 0.1 ) {
157+ self . view. layoutIfNeeded ( )
158+ }
151159 }
152160 }
153161}
0 commit comments