diff --git a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist index 51a860c..d073d4a 100644 --- a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ ParentAssistant.xcscheme orderHint - 0 + 1 diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate index 050387a..5010c5f 100644 Binary files a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate and b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift index a6172b7..a3d5d6b 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift @@ -73,7 +73,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { leftView.addSubview(titleLab) let imageView = UIImageView.init(frame: CGRect.init(x: 50, y: 11, width: 10, height: 22)) - imageView.image = UIImage.init(named: "report_pull") + imageView.image = UIImage.init(named: "report_white_pull") imageView.contentMode = .scaleAspectFit leftView.addSubview(imageView) @@ -91,14 +91,13 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { rightView.addSubview(titleRLab) let imageRView = UIImageView.init(frame: CGRect.init(x: 40, y: 11, width: 10, height: 22)) - imageRView.image = UIImage.init(named: "report_select") + imageRView.image = UIImage.init(named: "report_white_select") imageRView.contentMode = .scaleAspectFit rightView.addSubview(imageRView) // rightView.addTarget(self, action: #selector(showView), for: UIControlEvents.touchDown) self.rightBtn = UIBarButtonItem.init(customView: rightView) - //设置顶部样式 self.configTheme() } diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/ReportViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/ReportViewController.swift index 3a8aff5..d8bf605 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/ReportViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/ReportViewController.swift @@ -26,6 +26,9 @@ class ReportViewController: UIViewController,UITableViewDelegate,UITableViewData table.register(UINib.init(nibName: "GrowSubjectCell", bundle: nil), forCellReuseIdentifier: "GrowSubjectCell") return table }() + + let y = (statusBarHeight+navigationBarHeight!)/2 + override func viewDidLoad() { super.viewDidLoad() @@ -45,13 +48,13 @@ class ReportViewController: UIViewController,UITableViewDelegate,UITableViewData let recognizer = UISwipeGestureRecognizer.init(target: self, action: #selector(showView)) recognizer.direction = UISwipeGestureRecognizerDirection.down headView.addGestureRecognizer(recognizer) - - calendar = CalendarView.init(frame: CGRect.init(x: 0, y: 32, width: screenWidth, height: 280)) + + calendar = CalendarView.init(frame: CGRect.init(x: 0, y: y, width: screenWidth, height: 245)) } @objc func showView(){ keyWindow = UIApplication.shared.keyWindow! - let backBtn = UIButton.init(frame: CGRect.init(x: 0, y: calendar.frame.origin.y+280+22, width: screenWidth, height: screenHeight)) + let backBtn = UIButton.init(frame: CGRect.init(x: 0, y: calendar.frame.origin.y+245+y, width: screenWidth, height: screenHeight)) backBtn.backgroundColor = UIColor.black backBtn.alpha = 0.4 diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/CalendarView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/CalendarView.swift index 45f7c9b..c8b1254 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/CalendarView.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/CalendarView.swift @@ -29,7 +29,7 @@ class CalendarView: UIView,UICollectionViewDelegate,UICollectionViewDataSource { self.todayDay = CalendarDateManager.shared.getTodayDate() //设置layout let flowlayout = UICollectionViewFlowLayout() - flowlayout.itemSize = CGSize.init(width: screenWidth/7, height:40) + flowlayout.itemSize = CGSize.init(width: screenWidth/7, height:35) flowlayout.minimumLineSpacing = 0 flowlayout.minimumInteritemSpacing = 0 flowlayout.headerReferenceSize = CGSize.init(width: 0, height: 0) diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift index 31a65f5..5f0f7c9 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift @@ -120,13 +120,13 @@ extension TabBarController: URLSessionDelegate { securityError = SecPKCS12Import(PKCS12Data as CFData, options, &items) if securityError == errSecSuccess { - let certItems:CFArray = items as CFArray!; + let certItems:CFArray! = items as CFArray?; let certItemsArray:Array = certItems as Array let dict:AnyObject? = certItemsArray.first; if let certEntry:Dictionary = dict as? Dictionary { // grab the identity let identityPointer:AnyObject? = certEntry["identity"]; - let secIdentityRef:SecIdentity = identityPointer as! SecIdentity!; + let secIdentityRef:SecIdentity! = identityPointer as! SecIdentity?; // grab the trust let trustPointer:AnyObject? = certEntry["trust"]; let trustRef:SecTrust = trustPointer as! SecTrust; diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/GetBackPasswordViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/GetBackPasswordViewController.swift index fe6eda1..92899e5 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/GetBackPasswordViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/GetBackPasswordViewController.swift @@ -8,8 +8,8 @@ import UIKit //找回密码 -class GetBackPasswordViewController: UIViewController,UITextFieldDelegate { - @IBOutlet var topView: NSLayoutConstraint! +class GetBackPasswordViewController: UITableViewController,UITextFieldDelegate { + @IBOutlet var rootTableView: UITableView! @IBOutlet var personIconImageView: UIImageView!//系统头像 @IBOutlet var phoneTextField: UITextField!//电话号码 @IBOutlet var codeTextField: UITextField!//验证码 @@ -24,25 +24,75 @@ class GetBackPasswordViewController: UIViewController,UITextFieldDelegate { override func viewDidLoad() { super.viewDidLoad() + layoutSubViews() } + + //MARK: - 用户拖拽 关闭键盘 + override func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) { + phoneTextField.resignFirstResponder() + codeTextField.resignFirstResponder() + passwordTextField.resignFirstResponder() + passwordTwoTextField.resignFirstResponder() + } + //return 关闭键盘 + func textFieldShouldReturn(_ textField: UITextField) -> Bool { + return textField.resignFirstResponder() + } + + //MARK: - UITableView Delegate && DataSource + override func numberOfSections(in tableView: UITableView) -> Int { + return 1 + } + override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + return 6 + } + override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + if indexPath.row == 0 { + return 200 + } + else{ + return 50 + } + } + // MARK: - 设置控件属性 func layoutSubViews(){ self.navigationController?.navigationBar.isHidden = false getCodeBtn.layer.borderWidth = 1.0 getCodeBtn.layer.borderColor = UIColor.lightGray.cgColor - topView.constant = (getScreenHeight()-325)/3 passwordHiddenBtn.setImage(UIImage(named: "my_password_look"), for: UIControlState.selected) NotificationCenter.default.addObserver(self, selector: #selector(GetBackPasswordViewController.keyboardWIllChange(_:)), name: NSNotification.Name.UIKeyboardWillChangeFrame, object: nil) + + //监听按钮状态 + phoneTextField.addTarget(self, action: #selector(textFieldChange), for: UIControlEvents.editingChanged) + codeTextField.addTarget(self, action: #selector(textFieldChange), for: UIControlEvents.editingChanged) + passwordTextField.addTarget(self, action: #selector(textFieldChange), for: UIControlEvents.editingChanged) + passwordTwoTextField.addTarget(self, action: #selector(textFieldChange), for: UIControlEvents.editingChanged) + } + //MARK: - 监听输入长度,显示登录按钮状态 + @objc func textFieldChange(){ + if (phoneTextField.text?.count)!>0 && (passwordTextField.text?.count)!>0 && (codeTextField.text?.count)!>0 && (passwordTwoTextField.text?.count)!>0 { + passwordHiddenBtn.isUserInteractionEnabled = true + passwordHiddenBtn.backgroundColor = navigationColor + }else{ + passwordHiddenBtn.isUserInteractionEnabled = false + passwordHiddenBtn.backgroundColor = UIColor.lightGray + } } // MARK: - 根据键盘调整高度 @objc func keyboardWIllChange(_ noti: Notification){ let userInfo:NSDictionary=noti.userInfo! as NSDictionary let endFrame=(userInfo[UIKeyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue + let y = navigationBarHeight! + statusBarHeight if endFrame?.origin.y == getScreenHeight() { - topView.constant = (getScreenHeight()-325)/3 + UIView.animate(withDuration: 0.5) { + self.rootTableView.frame = CGRect.init(x: 0, y: y, width: screenWidth, height:screenHeight) + } }else{ - topView.constant = (endFrame?.origin.y)!-425 + UIView.animate(withDuration: 0.5) { + self.rootTableView.frame = CGRect.init(x: 0, y: 0, width: screenWidth, height: screenHeight) + } } } // MARK: - 获取验证码 @@ -77,26 +127,18 @@ class GetBackPasswordViewController: UIViewController,UITextFieldDelegate { passwordTwoHiddenBtn.isSelected = !selected passwordTwoTextField.isSecureTextEntry = selected } - // MARK: - 设置键盘消失 - override func touchesBegan(_ touches: Set, with event: UIEvent?) { - self.view.endEditing(true) - } + // MARK: - UITextFieldDelegate func textFieldDidEndEditing(_ textField: UITextField) { if textField==passwordTwoTextField && phoneTextField.text! != "" && codeTextField.text! != "" && passwordTextField.text! != "" && passwordTwoTextField.text! != "" && passwordTextField.text! == passwordTwoTextField.text!{ changeBtn.isUserInteractionEnabled = true - changeBtn.backgroundColor = UIColorFromRGB(0xC5DAFF) + changeBtn.backgroundColor = navigationColor }else{ changeBtn.isUserInteractionEnabled = false changeBtn.backgroundColor = UIColor.lightGray } } - // MARK: - UITextFieldDelegate - func textFieldShouldReturn(_ textField: UITextField) -> Bool { - self.view.endEditing(true) - return true - } func isMobilePhoneNumber(_ mobile:String)->Bool { let str="^1[0-9]{10}" return NSPredicate(format: "SELF MATCHES %@", str).evaluate(with: mobile) @@ -189,14 +231,5 @@ class GetBackPasswordViewController: UIViewController,UITextFieldDelegate { } - - - // MARK: - 登录页面跳转 - - @IBAction func loginAction(_ sender: UIButton) { - let vc = Story.instantiateViewControllerWithIdentifier("LoginViewController", storyName: "My") as! LoginViewController - self.navigationController?.pushViewController(vc, animated: true) - } - } diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift index 7d37f45..57c89fb 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/LoginViewController.swift @@ -8,9 +8,10 @@ import UIKit //登录 -class LoginViewController: UIViewController,UITextFieldDelegate,UIScrollViewDelegate { +class LoginViewController: UITableViewController,UITextFieldDelegate { - @IBOutlet weak var scrollView: UIScrollView! + + @IBOutlet var rootTableView: UITableView! @IBOutlet var iconImageView: UIImageView!//系统头像 @IBOutlet var phoneTextField: UITextField!//电话号码 @IBOutlet var passwordTextField: UITextField!//密码 @@ -21,8 +22,6 @@ class LoginViewController: UIViewController,UITextFieldDelegate,UIScrollViewDele override func viewDidLoad() { super.viewDidLoad() - self.scrollView.contentSize = CGSize.init(width: 0, height: screenHeight) - layoutSubViews() self.phoneTextField.addTarget(self, action: #selector(textFieldChange), for: UIControlEvents.editingChanged) @@ -30,7 +29,7 @@ class LoginViewController: UIViewController,UITextFieldDelegate,UIScrollViewDele } - func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) { + override func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) { phoneTextField.resignFirstResponder() passwordTextField.resignFirstResponder() @@ -47,6 +46,24 @@ class LoginViewController: UIViewController,UITextFieldDelegate,UIScrollViewDele } } + + //MARK: - UITableView Delegate && DataSource + + override func numberOfSections(in tableView: UITableView) -> Int { + return 1 + } + override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + return 5 + } + override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + if indexPath.row == 0 { + return 200 + } + else{ + return 50 + } + } + // MARK: - 设置控件属性 func layoutSubViews(){ self.navigationItem.title = "登录" @@ -60,13 +77,14 @@ class LoginViewController: UIViewController,UITextFieldDelegate,UIScrollViewDele let userInfo:NSDictionary=noti.userInfo! as NSDictionary let endFrame=(userInfo[UIKeyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue + let y = navigationBarHeight! + statusBarHeight if endFrame?.origin.y == getScreenHeight() { UIView.animate(withDuration: 0.5) { - self.scrollView.setContentOffset(CGPoint.init(x: 0, y: 0), animated: true) + self.rootTableView.frame = CGRect.init(x: 0, y: y, width: screenWidth, height: screenHeight) } }else{ UIView.animate(withDuration: 0.5) { - self.scrollView.setContentOffset(CGPoint.init(x: 0, y:80), animated: true) + self.rootTableView.frame = CGRect.init(x: 0, y: 0, width: screenWidth, height: screenHeight) } } } diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard index f845528..92fddab 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard @@ -246,8 +246,8 @@ - - - + @@ -294,512 +294,555 @@ - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift index bce6c47..3522d3a 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift @@ -71,7 +71,7 @@ class MyViewController: UIViewController { loginBtn.isHidden = true currentInfoBtn.isHidden = false //赋值 - headerBackGroundImageView.image = UIImage(named: "my_headerView_backgroundimageView") + headerBackGroundImageView.image = UIImage(named: "my_background") let info = AccountManager.shared personNameLabel.text = info.name() personNumberLabel.text = info.phone() @@ -82,7 +82,7 @@ class MyViewController: UIViewController { personNumberLabel.isHidden = true loginBtn.isHidden = false currentInfoBtn.isHidden = true - headerBackGroundImageView.image = UIImage(named: "navigationBar_backgrounImage") + headerBackGroundImageView.image = UIImage(named: "my_background") personIconImageView.image = UIImage(named: "my_defphoto") } currentInfoTableView.reloadData() diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift index d495f27..c453c84 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/RegisterViewController.swift @@ -23,7 +23,6 @@ class RegisterViewController: UITableViewController,UITextFieldDelegate { override func viewDidLoad() { super.viewDidLoad() - self.rootTableView.tableFooterView = UIView.init() layoutSubViews() } @@ -74,7 +73,7 @@ class RegisterViewController: UITableViewController,UITextFieldDelegate { } } } - + //MARK: - UITableView Delegate && DataSource override func numberOfSections(in tableView: UITableView) -> Int { return 1 } diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/my/my_background.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/my/my_background.imageset/Contents.json new file mode 100644 index 0000000..0c59538 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/my/my_background.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "my_background@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/my/my_background.imageset/my_background@2x.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/my/my_background.imageset/my_background@2x.png new file mode 100644 index 0000000..aee58ee Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/my/my_background.imageset/my_background@2x.png differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_pull.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_pull.imageset/Contents.json new file mode 100644 index 0000000..9e5795a --- /dev/null +++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_pull.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "report_white_pull@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_pull.imageset/report_white_pull@2x.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_pull.imageset/report_white_pull@2x.png new file mode 100644 index 0000000..392b65a Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_pull.imageset/report_white_pull@2x.png differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_select.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_select.imageset/Contents.json new file mode 100644 index 0000000..baee9c4 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_select.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "report_white_select@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_select.imageset/report_white_select@2x.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_select.imageset/report_white_select@2x.png new file mode 100644 index 0000000..3bd2f03 Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_white_select.imageset/report_white_select@2x.png differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard index 3085ae2..8f82c40 100644 --- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard +++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard @@ -555,7 +555,7 @@ - + @@ -765,7 +765,7 @@