git.iko.soy/dashared/GDproject
on master help sign in
Fixed a few bags. by Ilyas iPhon X
12b1bfdDarya Rednikina
GDproject/Controller/ News and channels/NewsController.swift+2−1
compare with master
unifiedsplit
@@ -82,7 +82,7 @@ class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWi
82 searchController?.searchBar.placeholder = "Search tags"
82 searchController?.searchBar.placeholder = "Search tags"
83 }
83 }
84
84
85− @objc func refreshPostsData( _ ff: UIRefreshControl){
85+ @objc func refreshPostsData( _ ff: UIRefreshControl) {
86 decideWhatChannelDisplay()
86 decideWhatChannelDisplay()
87 }
87 }
88
88
@@ -122,6 +122,7 @@ class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWi
122 }
122 }
123 }
123 }
124 default:
124 default:
125+ refreshContr.endRefreshing()
125 break
126 break
126 }
127 }
127
128
GDproject/Controller/Messages/Dialog/DialogViewController.swift+3−3
@@ -158,7 +158,7 @@ class DialogViewController: UIViewController, UpdatableGroup, UITableViewDelegat
158
158
159 messageSendView.edgesToSuperview(excluding: [.top,.bottom])
159 messageSendView.edgesToSuperview(excluding: [.top,.bottom])
160
160
161− bottomConstraint = NSLayoutConstraint(item: messageSendView, attribute: .bottom, relatedBy: .equal, toItem: view, attribute: .bottom, multiplier: 1, constant: 0)
161+ bottomConstraint = NSLayoutConstraint(item: messageSendView, attribute: .bottom, relatedBy: .equal, toItem: self.view.safeAreaLayoutGuide, attribute: .bottom, multiplier: 1, constant: 0)
162 view.addConstraint(bottomConstraint)
162 view.addConstraint(bottomConstraint)
163
163
164 messageSendView.height(60)
164 messageSendView.height(60)
@@ -172,7 +172,7 @@ class DialogViewController: UIViewController, UpdatableGroup, UITableViewDelegat
172 messageTextView.edgesToSuperview(excluding: .right)
172 messageTextView.edgesToSuperview(excluding: .right)
173 messageTextView.rightToLeft(of: sendButton)
173 messageTextView.rightToLeft(of: sendButton)
174
174
175− tableView.edgesToSuperview(excluding: .bottom)
175+ tableView.edgesToSuperview(excluding: .bottom, insets: .top(self.navigationController?.navigationBar.frame.size.height ?? 0))
176 tableView.bottomToTop(of: messageSendView)
176 tableView.bottomToTop(of: messageSendView)
177
177
178 self.view.layoutSubviews()
178 self.view.layoutSubviews()
@@ -191,7 +191,7 @@ class DialogViewController: UIViewController, UpdatableGroup, UITableViewDelegat
191
191
192 let keyBoardFrame = (userInfo[UIResponder.keyboardFrameEndUserInfoKey] as! NSValue).cgRectValue
192 let keyBoardFrame = (userInfo[UIResponder.keyboardFrameEndUserInfoKey] as! NSValue).cgRectValue
193
193
194− bottomConstraint.constant = notification.name == UIResponder.keyboardWillShowNotification ? -(keyBoardFrame.height) : 0
194+ bottomConstraint.constant = notification.name == UIResponder.keyboardWillShowNotification ? -(keyBoardFrame.height) + self.view.safeAreaInsets.bottom : 0
195
195
196 UIView.animate(withDuration: 0, delay: 0, options: .curveEaseOut, animations: {
196 UIView.animate(withDuration: 0, delay: 0, options: .curveEaseOut, animations: {
197 self.view.layoutIfNeeded()
197 self.view.layoutIfNeeded()