kylefang/GitHawk
1
0
Fork 0
mirror of https://github.com/zhigang1992/GitHawk.git synced 2026-04-24 04:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add keyboard helpers to remove duped code (#897)

Browse Source
This commit is contained in:
Ryan Nystrom
2017-11-09 10:38:58 -05:00
committed by GitHub
parent 7a91200d3b
commit f208148ba0
7 changed files with 123 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Classes/Bookmark v2/BookmarkViewController.swift
View File

@@ -31,7 +31,7 @@ TabNavRootViewControllerType {
view.backgroundColor = Styles.Colors.background
return view
}()
private var originalContentInset: UIEdgeInsets = .zero
private var keyboardAdjuster: ScrollViewKeyboardAdjuster?
var bookmarkStore: BookmarkStore
@@ -61,6 +61,11 @@ TabNavRootViewControllerType {
override func viewDidLoad() {
super.viewDidLoad()
keyboardAdjuster = ScrollViewKeyboardAdjuster(
scrollView: collectionView,
viewController: self
)
makeBackBarItemEmpty()
view.backgroundColor = Styles.Colors.background
@@ -76,25 +81,7 @@ TabNavRootViewControllerType {
searchBar.searchBarStyle = .minimal
navigationItem.titleView = searchBar
let nc = NotificationCenter.default
nc.addObserver(
self,
selector: #selector(onKeyboardWillShow(notification:)),
name: .UIKeyboardWillShow,
object: nil
)
nc.addObserver(
self,
selector: #selector(onKeyboardWillHide(notification:)),
name: .UIKeyboardWillHide,
object: nil
)
nc.addObserver(
searchBar,
selector: #selector(UISearchBar.resignFirstResponder),
name: .UIKeyboardWillHide,
object: nil)
searchBar.resignWhenKeyboardHides()
}
override func viewWillAppear(_ animated: Bool) {
@@ -113,28 +100,6 @@ TabNavRootViewControllerType {
}
}
// MARK: Notifications
@objc func onKeyboardWillShow(notification: NSNotification) {
guard let frame = notification.userInfo?[UIKeyboardFrameEndUserInfoKey] as? CGRect else { return }
originalContentInset = collectionView.contentInset
let converted = view.convert(frame, from: nil)
let intersection = converted.intersection(frame)
let bottomInset = intersection.height - bottomLayoutGuide.length
var inset = originalContentInset
inset.bottom = bottomInset
collectionView.contentInset = inset
collectionView.scrollIndicatorInsets = inset
}
@objc func onKeyboardWillHide(notification: NSNotification) {
collectionView.contentInset = originalContentInset
collectionView.scrollIndicatorInsets = originalContentInset
}
private func update(animated: Bool) {
adapter.performUpdates(animated: animated)
}

34
Classes/Issues/EditComment/EditCommentViewController.swift
View File

@@ -25,6 +25,7 @@ class EditCommentViewController: UIViewController {
private let issueModel: IssueDetailsModel
private let isRoot: Bool
private let originalMarkdown: String
private var keyboardAdjuster: ScrollViewKeyboardAdjuster?
init(
client: GithubClient,
@@ -49,6 +50,11 @@ class EditCommentViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
keyboardAdjuster = ScrollViewKeyboardAdjuster(
scrollView: textView,
viewController: self
)
textView.githawkConfigure(inset: true)
view.addSubview(textView)
textView.snp.makeConstraints { make in
@@ -64,20 +70,6 @@ class EditCommentViewController: UIViewController {
action: #selector(EditCommentViewController.onCancel)
)
setRightBarItemIdle()
let nc = NotificationCenter.default
nc.addObserver(
self,
selector: #selector(EditCommentViewController.onKeyboardWillShow(notification:)),
name: NSNotification.Name.UIKeyboardWillShow,
object: nil
)
nc.addObserver(
self,
selector: #selector(EditCommentViewController.onKeyboardWillHide(notification:)),
name: NSNotification.Name.UIKeyboardWillHide,
object: nil
)
}
override func viewDidAppear(_ animated: Bool) {
@@ -169,18 +161,4 @@ class EditCommentViewController: UIViewController {
ToastManager.showGenericError()
}
// MARK: Notifications
@objc func onKeyboardWillShow(notification: NSNotification) {
guard let frame = notification.userInfo?[UIKeyboardFrameEndUserInfoKey] as? CGRect else { return }
let inset = UIEdgeInsets(top: 0, left: 0, bottom: frame.height, right: 0)
textView.contentInset = inset
textView.scrollIndicatorInsets = inset
}
@objc func onKeyboardWillHide(notification: NSNotification) {
textView.contentInset = .zero
textView.scrollIndicatorInsets = .zero
}
}

48
Classes/Search/SearchViewController.swift
View File

@@ -25,6 +25,7 @@ SearchResultSectionControllerDelegate {
private let recentHeaderKey = "com.freetime.SearchViewController.recent-header-key" as ListDiffable
private var recentStore = SearchRecentStore()
private let debouncer = Debouncer()
private var keyboardAdjuster: ScrollViewKeyboardAdjuster?
enum State {
case idle
@@ -53,7 +54,6 @@ SearchResultSectionControllerDelegate {
view.backgroundColor = Styles.Colors.background
return view
}()
private var originalContentInset: UIEdgeInsets = .zero
init(client: GithubClient) {
self.client = client
@@ -67,6 +67,11 @@ SearchResultSectionControllerDelegate {
override func viewDidLoad() {
super.viewDidLoad()
keyboardAdjuster = ScrollViewKeyboardAdjuster(
scrollView: collectionView,
viewController: self
)
makeBackBarItemEmpty()
view.backgroundColor = Styles.Colors.background
@@ -82,25 +87,7 @@ SearchResultSectionControllerDelegate {
searchBar.searchBarStyle = .minimal
navigationItem.titleView = searchBar
let nc = NotificationCenter.default
nc.addObserver(
self,
selector: #selector(onKeyboardWillShow(notification:)),
name: .UIKeyboardWillShow,
object: nil
)
nc.addObserver(
self,
selector: #selector(onKeyboardWillHide(notification:)),
name: .UIKeyboardWillHide,
object: nil
)
nc.addObserver(
searchBar,
selector: #selector(UISearchBar.resignFirstResponder),
name: .UIKeyboardWillHide,
object: nil)
searchBar.resignWhenKeyboardHides()
}
override func viewWillAppear(_ animated: Bool) {
@@ -117,27 +104,6 @@ SearchResultSectionControllerDelegate {
collectionView.collectionViewLayout.invalidateLayout()
}
}
// MARK: Notifications
@objc func onKeyboardWillShow(notification: NSNotification) {
guard let frame = notification.userInfo?[UIKeyboardFrameEndUserInfoKey] as? CGRect else { return }
originalContentInset = collectionView.contentInset
let converted = view.convert(frame, from: nil)
let intersection = converted.intersection(frame)
let bottomInset = intersection.height - bottomLayoutGuide.length
var inset = originalContentInset
inset.bottom = bottomInset
collectionView.contentInset = inset
collectionView.scrollIndicatorInsets = inset
}
@objc func onKeyboardWillHide(notification: NSNotification) {
collectionView.contentInset = originalContentInset
collectionView.scrollIndicatorInsets = originalContentInset
}
// MARK: Data Loading/Paging

6
Classes/Section Controllers/SearchBar/SearchBarCell.swift
View File

@@ -36,11 +36,7 @@ final class SearchBarCell: UICollectionViewCell, UISearchBarDelegate {
make.centerY.equalTo(contentView)
}
NotificationCenter.default
.addObserver(searchBar,
selector: #selector(UISearchBar.resignFirstResponder),
name: .UIKeyboardWillHide,
object: nil)
searchBar.resignWhenKeyboardHides()
}
required init?(coder aDecoder: NSCoder) {

68
Classes/Systems/ScrollViewKeyboardAdjuster.swift Normal file
View File

@@ -0,0 +1,68 @@
//
// ScrollViewKeyboardAdjuster.swift
// Freetime
//
// Created by Ryan Nystrom on 11/7/17.
// Copyright © 2017 Ryan Nystrom. All rights reserved.
//
import UIKit
final class ScrollViewKeyboardAdjuster {
private let scrollView: UIScrollView
private var originalContentInset: UIEdgeInsets = .zero
private weak var viewController: UIViewController?
init(scrollView: UIScrollView, viewController: UIViewController) {
self.scrollView = scrollView
self.viewController = viewController
let nc = NotificationCenter.default
nc.addObserver(
self,
selector: #selector(onKeyboardWillShow(notification:)),
name: .UIKeyboardWillShow,
object: nil
)
nc.addObserver(
self,
selector: #selector(onKeyboardWillHide(notification:)),
name: .UIKeyboardWillHide,
object: nil
)
}
// MARK: Notifications
@objc func onKeyboardWillShow(notification: NSNotification) {
guard let frame = notification.userInfo?[UIKeyboardFrameEndUserInfoKey] as? CGRect,
let duration = notification.userInfo?[UIKeyboardAnimationDurationUserInfoKey] as? TimeInterval,
let viewController = self.viewController
else { return }
var inset = scrollView.contentInset
originalContentInset = inset
let converted = viewController.view.convert(frame, from: nil)
let intersection = converted.intersection(frame)
let bottomInset = intersection.height - viewController.bottomLayoutGuide.length
inset.bottom = bottomInset
UIView.animate(withDuration: duration, delay: 0, options: [.beginFromCurrentState], animations: {
self.scrollView.contentInset = inset
self.scrollView.scrollIndicatorInsets = inset
})
}
@objc func onKeyboardWillHide(notification: NSNotification) {
guard let duration = notification.userInfo?[UIKeyboardAnimationDurationUserInfoKey] as? TimeInterval
else { return }
UIView.animate(withDuration: duration, delay: 0, options: [.beginFromCurrentState], animations: {
self.scrollView.contentInset = self.originalContentInset
self.scrollView.scrollIndicatorInsets = self.originalContentInset
})
}
}

24
Classes/Views/UISearchBar+Keyboard.swift Normal file
View File

@@ -0,0 +1,24 @@
//
// UISearchBar+Keyboard.swift
// Freetime
//
// Created by Ryan Nystrom on 11/7/17.
// Copyright © 2017 Ryan Nystrom. All rights reserved.
//
import UIKit
extension UISearchBar {
// MARK: Public API
func resignWhenKeyboardHides() {
NotificationCenter.default.addObserver(
self,
selector: #selector(resignFirstResponder),
name: .UIKeyboardWillHide,
object: nil
)
}
}

12
Freetime.xcodeproj/project.pbxproj
View File

@@ -173,6 +173,8 @@
2949674E1EF9719300B1CF1A /* IssueCommentHrCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2949674D1EF9719300B1CF1A /* IssueCommentHrCell.swift */; };
294967511EFC1E9E00B1CF1A /* IssueCommentHtmlModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294967501EFC1E9E00B1CF1A /* IssueCommentHtmlModel.swift */; };
294967531EFC1EDB00B1CF1A /* IssueCommentHtmlCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294967521EFC1EDB00B1CF1A /* IssueCommentHtmlCell.swift */; };
294A3D761FB29843000E81A4 /* ScrollViewKeyboardAdjuster.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294A3D751FB29843000E81A4 /* ScrollViewKeyboardAdjuster.swift */; };
294A3D781FB29E2A000E81A4 /* UISearchBar+Keyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294A3D771FB29E2A000E81A4 /* UISearchBar+Keyboard.swift */; };
294B111E1F7B07BB00E04F2D /* TabNavRootViewControllerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294B111D1F7B07BB00E04F2D /* TabNavRootViewControllerType.swift */; };
294B11201F7B07DD00E04F2D /* TabBarControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294B111F1F7B07DD00E04F2D /* TabBarControllerDelegate.swift */; };
294B11221F7B0B9500E04F2D /* UIScrollView+ScrollToTop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294B11211F7B0B9500E04F2D /* UIScrollView+ScrollToTop.swift */; };
@@ -548,6 +550,8 @@
2949674D1EF9719300B1CF1A /* IssueCommentHrCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IssueCommentHrCell.swift; sourceTree = "<group>"; };
294967501EFC1E9E00B1CF1A /* IssueCommentHtmlModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IssueCommentHtmlModel.swift; sourceTree = "<group>"; };
294967521EFC1EDB00B1CF1A /* IssueCommentHtmlCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IssueCommentHtmlCell.swift; sourceTree = "<group>"; };
294A3D751FB29843000E81A4 /* ScrollViewKeyboardAdjuster.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollViewKeyboardAdjuster.swift; sourceTree = "<group>"; };
294A3D771FB29E2A000E81A4 /* UISearchBar+Keyboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UISearchBar+Keyboard.swift"; sourceTree = "<group>"; };
294B111D1F7B07BB00E04F2D /* TabNavRootViewControllerType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabNavRootViewControllerType.swift; sourceTree = "<group>"; };
294B111F1F7B07DD00E04F2D /* TabBarControllerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarControllerDelegate.swift; sourceTree = "<group>"; };
294B11211F7B0B9500E04F2D /* UIScrollView+ScrollToTop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIScrollView+ScrollToTop.swift"; sourceTree = "<group>"; };
@@ -1331,6 +1335,7 @@
297AE8671EC0D5C200B44A1F /* AppDelegate.swift */,
290744B01F250A1D00FD9E48 /* Autocomplete */,
291929661F3FF9C50012067B /* BadgeNotifications.swift */,
DC78570F1F97F546009BADDA /* Debouncer.swift */,
29C167791ECA14F700439D62 /* Feed.swift */,
54AD5E8D1F24D953004A4BD6 /* FeedSelectionProviding.swift */,
29EB1EEE1F425E5100A200B4 /* ForegroundHandler.swift */,
@@ -1347,6 +1352,8 @@
2980033A1F51E82400BE90F4 /* Rating */,
293189271F5391F700EF0911 /* Result.swift */,
29316DC21ECC981D007CAE3F /* RootNavigationManager.swift */,
294A3D751FB29843000E81A4 /* ScrollViewKeyboardAdjuster.swift */,
3E79A2FE1F8A7DA700E1126B /* ShortcutHandler.swift */,
29973E551F68BFDE0004B693 /* Signature.swift */,
2971722A1F069E6B005E43AC /* SpinnerSectionController.swift */,
29416BFC1F118DD700D03E1A /* String+QueryItemValue.swift */,
@@ -1354,8 +1361,6 @@
2939718A1F904D2A002FAC4B /* Toast+GitHawk.swift */,
292CD3CF1F0DBB5C00D3D57B /* WebviewCellHeightCache.swift */,
2930F2721F8A27750082BA26 /* WidthCache.swift */,
3E79A2FE1F8A7DA700E1126B /* ShortcutHandler.swift */,
DC78570F1F97F546009BADDA /* Debouncer.swift */,
);
path = Systems;
sourceTree = "<group>";
@@ -1419,6 +1424,7 @@
29A4769F1ED0E6C6005D0953 /* UIColor+Overlay.swift */,
290744B91F26863100FD9E48 /* UIScrollView+ScrollToBottom.swift */,
294B11211F7B0B9500E04F2D /* UIScrollView+ScrollToTop.swift */,
294A3D771FB29E2A000E81A4 /* UISearchBar+Keyboard.swift */,
29AF1E831F8AAB4A0008A0EF /* UITextView+GitHawk.swift */,
292FF8B11F302FE7009E63F7 /* UITextView+SelectedRange.swift */,
298BA08E1EC90FEE00B01946 /* UIView+BottomBorder.swift */,
@@ -2349,6 +2355,7 @@
29DA1E861F5E26D30050C64B /* SearchRecentSectionController.swift in Sources */,
29DA1E821F5DF5CC0050C64B /* SearchRecentStore.swift in Sources */,
986B871B1F2B87DD00AAB55C /* SearchRepoResult.swift in Sources */,
294A3D761FB29843000E81A4 /* ScrollViewKeyboardAdjuster.swift in Sources */,
986B87251F2B990A00AAB55C /* SearchRepoResultCell.swift in Sources */,
986B87231F2B98AD00AAB55C /* SearchResultSectionController.swift in Sources */,
29AF1E8E1F8ABC900008A0EF /* RepositoryFile.swift in Sources */,
@@ -2360,6 +2367,7 @@
298BA09A1EC947FC00B01946 /* SegmentedControlModel.swift in Sources */,
DCA5ED0E1FAED91F0072F074 /* BookmarkViewController.swift in Sources */,
298BA0981EC947F100B01946 /* SegmentedControlSectionController.swift in Sources */,
294A3D781FB29E2A000E81A4 /* UISearchBar+Keyboard.swift in Sources */,
29C33FDF1F128D4400EC8D40 /* SelectableCell.swift in Sources */,
293971891F904C82002FAC4B /* Toast.swift in Sources */,
297FB7781F51128A00F2E618 /* SettingsAccountsViewController.swift in Sources */,