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 branch 'master' into development

Browse Source 
# Conflicts:
#	Example/ChatExample.xcodeproj/project.pbxproj
#	Example/Sources/View Controllers/LaunchViewController.swift
#	README.md
This commit is contained in:
Jakub Kaspar
2020-08-05 23:23:45 +02:00
parent cbc908b710 39e4ad572e
commit b5d163ffc8
7 changed files with 214 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Example/Sources/View Controllers/LaunchViewController.swift
+7 -4
View File
@@ -25,6 +25,7 @@
import UIKit
import MessageKit
import SafariServices
import SwiftUI
final internal class LaunchViewController: UITableViewController {
@@ -32,7 +33,7 @@ final internal class LaunchViewController: UITableViewController {
return .lightContent
}
let cells = ["Basic Example", "Advanced Example", "Autocomplete Example", "Embedded Example", "Subview Example", "Settings", "Source Code", "Contributors"]
let cells = ["Basic Example", "Advanced Example", "Autocomplete Example", "Embedded Example", "Subview Example", "SwiftUI Example", "Settings", "Source Code", "Contributors"]
// MARK: - View Life Cycle
@@ -86,9 +87,11 @@ final internal class LaunchViewController: UITableViewController {
let detailViewController = NavigationController(rootViewController: viewController)
splitViewController?.showDetailViewController(detailViewController, sender: self)
case "Embedded Example":
let viewController = MessageContainerController()
let detailViewController = NavigationController(rootViewController: viewController)
splitViewController?.showDetailViewController(detailViewController, sender: self)
navigationController?.pushViewController(MessageContainerController(), animated: true)
case "SwiftUI Example":
if #available(iOS 13, *) {
navigationController?.pushViewController(UIHostingController(rootView: SwiftUIExampleView()), animated: true)
}
case "Settings":
let viewController = SettingsViewController()
let detailViewController = NavigationController(rootViewController: viewController)