GitHub/MessageKit
1
0
Fork 0
mirror of https://github.com/MessageKit/MessageKit.git synced 2026-02-06 19:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1284 from ashleyng/Support_iPad_SplitView

Browse Source 
Add example to show splitview for iPads
This commit is contained in:
Kino Roy
2020-05-13 23:46:37 -07:00
committed by GitHub
parent ad21044aff 9806389593
commit aee2dee9d1
7 changed files with 160 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Example/ChatExample.xcodeproj/project.pbxproj
+8
View File
@@ -29,6 +29,8 @@
50739F9621C5090A008CA369 /* BasicAudioController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50739F9521C5090A008CA369 /* BasicAudioController.swift */; };
5074EF4E2163555900D82952 /* sound2.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 5074EF4C2163555900D82952 /* sound2.m4a */; };
5074EF4F2163555900D82952 /* sound1.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 5074EF4D2163555900D82952 /* sound1.m4a */; };
63ECDABE24182A470016C349 /* MessageSubviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63ECDABD24182A470016C349 /* MessageSubviewViewController.swift */; };
63ECDAC2241889630016C349 /* MessageSubviewContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63ECDAC1241889630016C349 /* MessageSubviewContainerViewController.swift */; };
882B5E811CF7D53600B6E160 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 882B5E781CF7D53600B6E160 /* AppDelegate.swift */; };
882B5E821CF7D53600B6E160 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 882B5E791CF7D53600B6E160 /* Assets.xcassets */; };
882B5E831CF7D53600B6E160 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 882B5E7A1CF7D53600B6E160 /* LaunchScreen.storyboard */; };
@@ -96,6 +98,8 @@
5074EF4C2163555900D82952 /* sound2.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = sound2.m4a; sourceTree = "<group>"; };
5074EF4D2163555900D82952 /* sound1.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = sound1.m4a; sourceTree = "<group>"; };
56F0AC85B38034EC92CCBC7D /* Pods_ChatExampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ChatExampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
63ECDABD24182A470016C349 /* MessageSubviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageSubviewViewController.swift; sourceTree = "<group>"; };
63ECDAC1241889630016C349 /* MessageSubviewContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageSubviewContainerViewController.swift; sourceTree = "<group>"; };
882B5E331CF7D4B900B6E160 /* ChatExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ChatExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
882B5E491CF7D4B900B6E160 /* ChatExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ChatExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
882B5E541CF7D4B900B6E160 /* ChatExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ChatExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -209,6 +213,8 @@
385C293D211FF38F0010B4BA /* MessageContainerController.swift */,
385C293E211FF38F0010B4BA /* NavigationController.swift */,
385C293C211FF38E0010B4BA /* SettingsViewController.swift */,
63ECDABD24182A470016C349 /* MessageSubviewViewController.swift */,
63ECDAC1241889630016C349 /* MessageSubviewContainerViewController.swift */,
);
path = "View Controllers";
sourceTree = "<group>";
@@ -550,6 +556,7 @@
385C2946211FF38F0010B4BA /* LaunchViewController.swift in Sources */,
385C2939211FF37B0010B4BA /* Lorem.swift in Sources */,
385C2928211FF33B0010B4BA /* MockMessage.swift in Sources */,
63ECDABE24182A470016C349 /* MessageSubviewViewController.swift in Sources */,
385C2923211FF32E0010B4BA /* TableViewCells.swift in Sources */,
385C2942211FF38F0010B4BA /* AdvancedExampleViewController.swift in Sources */,
50739F9621C5090A008CA369 /* BasicAudioController.swift in Sources */,
@@ -567,6 +574,7 @@
882B5E811CF7D53600B6E160 /* AppDelegate.swift in Sources */,
385C292D211FF3520010B4BA /* CustomMessageFlowLayout.swift in Sources */,
38CCCC592258419300DD5482 /* AutocompleteExampleViewController.swift in Sources */,
63ECDAC2241889630016C349 /* MessageSubviewContainerViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Example/Sources/AppDelegate.swift
+7 -1
View File
@@ -30,9 +30,15 @@ final internal class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
let masterViewController = NavigationController(rootViewController: LaunchViewController())
let detailViewController = NavigationController()
let splitViewController = UISplitViewController()
splitViewController.viewControllers = [masterViewController, detailViewController]
splitViewController.preferredDisplayMode = .allVisible
window = UIWindow(frame: UIScreen.main.bounds)
window?.rootViewController = NavigationController(rootViewController: LaunchViewController())
window?.rootViewController = splitViewController
window?.makeKeyAndVisible()
if UserDefaults.isFirstLaunch() {
Example/Sources/View Controllers/BasicExampleViewController.swift
+1 -1
View File
@@ -27,7 +27,7 @@ import MapKit
import MessageKit
import PINRemoteImage
final class BasicExampleViewController: ChatViewController {
class BasicExampleViewController: ChatViewController {
override func configureMessageCollectionView() {
super.configureMessageCollectionView()
messagesCollectionView.messagesLayoutDelegate = self
Example/Sources/View Controllers/ChatViewController.swift
+15 -8
View File
@@ -301,9 +301,15 @@ extension ChatViewController: MessageLabelDelegate {
// MARK: - MessageInputBarDelegate
extension ChatViewController: InputBarAccessoryViewDelegate {
@objc
func inputBar(_ inputBar: InputBarAccessoryView, didPressSendButtonWith text: String) {
processInputBar(messageInputBar)
}
func processInputBar(_ inputBar: InputBarAccessoryView) {
// Here we can parse for which substrings were autocompleted
let attributedText = messageInputBar.inputTextView.attributedText!
let attributedText = inputBar.inputTextView.attributedText!
let range = NSRange(location: 0, length: attributedText.length)
attributedText.enumerateAttribute(.autocompleted, in: range, options: []) { (_, range, _) in
@@ -313,18 +319,19 @@ extension ChatViewController: InputBarAccessoryViewDelegate {
}
let components = inputBar.inputTextView.components
messageInputBar.inputTextView.text = String()
messageInputBar.invalidatePlugins()
inputBar.inputTextView.text = String()
inputBar.invalidatePlugins()
// Send button activity animation
messageInputBar.sendButton.startAnimating()
messageInputBar.inputTextView.placeholder = "Sending..."
inputBar.sendButton.startAnimating()
inputBar.inputTextView.placeholder = "Sending..."
// Resign first responder for iPad split view
inputBar.inputTextView.resignFirstResponder()
DispatchQueue.global(qos: .default).async {
// fake send request task
sleep(1)
DispatchQueue.main.async { [weak self] in
self?.messageInputBar.sendButton.stopAnimating()
self?.messageInputBar.inputTextView.placeholder = "Aa"
inputBar.sendButton.stopAnimating()
inputBar.inputTextView.placeholder = "Aa"
self?.insertMessages(components)
self?.messagesCollectionView.scrollToBottom(animated: true)
}
Example/Sources/View Controllers/LaunchViewController.swift
+22 -7
View File
@@ -32,7 +32,7 @@ final internal class LaunchViewController: UITableViewController {
return .lightContent
}
let cells = ["Basic Example", "Advanced Example", "Autocomplete Example", "Embedded Example", "Settings", "Source Code", "Contributors"]
let cells = ["Basic Example", "Advanced Example", "Autocomplete Example", "Embedded Example", "Subview Example", "Settings", "Source Code", "Contributors"]
// MARK: - View Life Cycle
@@ -69,19 +69,34 @@ final internal class LaunchViewController: UITableViewController {
// MARK: - UITableViewDelegate
// swiftlint:disable cyclomatic_complexity
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let cell = cells[indexPath.row]
switch cell {
case "Basic Example":
navigationController?.pushViewController(BasicExampleViewController(), animated: true)
let viewController = BasicExampleViewController()
let detailViewController = NavigationController(rootViewController: viewController)
splitViewController?.showDetailViewController(detailViewController, sender: self)
case "Advanced Example":
navigationController?.pushViewController(AdvancedExampleViewController(), animated: true)
let viewController = AdvancedExampleViewController()
let detailViewController = NavigationController(rootViewController: viewController)
splitViewController?.showDetailViewController(detailViewController, sender: self)
case "Autocomplete Example":
navigationController?.pushViewController(AutocompleteExampleViewController(), animated: true)
let viewController = AutocompleteExampleViewController()
let detailViewController = NavigationController(rootViewController: viewController)
splitViewController?.showDetailViewController(detailViewController, sender: self)
case "Embedded Example":
navigationController?.pushViewController(MessageContainerController(), animated: true)
let viewController = MessageContainerController()
let detailViewController = NavigationController(rootViewController: viewController)
splitViewController?.showDetailViewController(detailViewController, sender: self)
case "Settings":
navigationController?.pushViewController(SettingsViewController(), animated: true)
let viewController = SettingsViewController()
let detailViewController = NavigationController(rootViewController: viewController)
splitViewController?.showDetailViewController(detailViewController, sender: self)
case "Subview Example":
let viewController = MessageSubviewContainerViewController()
let detailViewController = NavigationController(rootViewController: viewController)
splitViewController?.showDetailViewController(detailViewController, sender: self)
case "Source Code":
guard let url = URL(string: "https://github.com/MessageKit/MessageKit") else { return }
openURL(url)
@@ -97,6 +112,6 @@ final internal class LaunchViewController: UITableViewController {
func openURL(_ url: URL) {
let webViewController = SFSafariViewController(url: url)
webViewController.preferredControlTintColor = .primaryColor
present(webViewController, animated: true, completion: nil)
splitViewController?.showDetailViewController(webViewController, sender: self)
}
}
Example/Sources/View Controllers/MessageSubviewContainerViewController.swift
+57
View File
@@ -0,0 +1,57 @@
/*
MIT License
Copyright (c) 2017-2019 MessageKit
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
import Foundation
import UIKit
final class MessageSubviewContainerViewController: UIViewController {
override var preferredStatusBarStyle: UIStatusBarStyle {
return .lightContent
}
let messageSubviewViewController = MessageSubviewViewController()
override func viewDidLoad() {
super.viewDidLoad()
messageSubviewViewController.willMove(toParent: self)
addChild(messageSubviewViewController)
view.addSubview(messageSubviewViewController.view)
messageSubviewViewController.didMove(toParent: self)
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
navigationController?.navigationBar.isTranslucent = true
navigationController?.navigationBar.barTintColor = .clear
}
override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
navigationController?.navigationBar.isTranslucent = false
navigationController?.navigationBar.barTintColor = .primaryColor
}
}
Example/Sources/View Controllers/MessageSubviewViewController.swift
+50
View File
@@ -0,0 +1,50 @@
/*
MIT License
Copyright (c) 2017-2019 MessageKit
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
import Foundation
import InputBarAccessoryView
final class MessageSubviewViewController: BasicExampleViewController {
private var keyboardManager = KeyboardManager()
private let subviewInputBar = InputBarAccessoryView()
override func viewDidLoad() {
super.viewDidLoad()
subviewInputBar.delegate = self
// Take into account the height of the bottom input bar
additionalBottomInset = 88
}
override func didMove(toParent parent: UIViewController?) {
super.didMove(toParent: parent)
parent?.view.addSubview(subviewInputBar)
keyboardManager.bind(inputAccessoryView: subviewInputBar)
}
override func inputBar(_ inputBar: InputBarAccessoryView, didPressSendButtonWith text: String) {
processInputBar(subviewInputBar)
}
}