Skip to content

Commit 07eed9b

Browse files
committed
refactor: InpuBar as subview instead of accessoryView
Simplify example launch VC # Conflicts: # Example/Sources/View Controllers/LaunchViewController.swift # Example/Sources/View Controllers/NavigationController.swift
1 parent bcf41f0 commit 07eed9b

File tree

4 files changed

+19
-90
lines changed

4 files changed

+19
-90
lines changed

Example/ChatExample.xcodeproj/project.pbxproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
385C2942211FF38F0010B4BA /* AdvancedExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 385C293B211FF38E0010B4BA /* AdvancedExampleViewController.swift */; };
2929
385C2943211FF38F0010B4BA /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 385C293C211FF38E0010B4BA /* SettingsViewController.swift */; };
3030
385C2944211FF38F0010B4BA /* MessageContainerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 385C293D211FF38F0010B4BA /* MessageContainerController.swift */; };
31-
385C2945211FF38F0010B4BA /* NavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 385C293E211FF38F0010B4BA /* NavigationController.swift */; };
3231
385C2946211FF38F0010B4BA /* LaunchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 385C293F211FF38F0010B4BA /* LaunchViewController.swift */; };
3332
385C2947211FF38F0010B4BA /* BasicExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 385C2940211FF38F0010B4BA /* BasicExampleViewController.swift */; };
3433
385C2948211FF38F0010B4BA /* ChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 385C2941211FF38F0010B4BA /* ChatViewController.swift */; };
@@ -90,7 +89,6 @@
9089
385C293B211FF38E0010B4BA /* AdvancedExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdvancedExampleViewController.swift; sourceTree = "<group>"; };
9190
385C293C211FF38E0010B4BA /* SettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
9291
385C293D211FF38F0010B4BA /* MessageContainerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageContainerController.swift; sourceTree = "<group>"; };
93-
385C293E211FF38F0010B4BA /* NavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationController.swift; sourceTree = "<group>"; };
9492
385C293F211FF38F0010B4BA /* LaunchViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LaunchViewController.swift; sourceTree = "<group>"; };
9593
385C2940211FF38F0010B4BA /* BasicExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicExampleViewController.swift; sourceTree = "<group>"; };
9694
385C2941211FF38F0010B4BA /* ChatViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
@@ -226,7 +224,6 @@
226224
385C2941211FF38F0010B4BA /* ChatViewController.swift */,
227225
385C293F211FF38F0010B4BA /* LaunchViewController.swift */,
228226
385C293D211FF38F0010B4BA /* MessageContainerController.swift */,
229-
385C293E211FF38F0010B4BA /* NavigationController.swift */,
230227
385C293C211FF38E0010B4BA /* SettingsViewController.swift */,
231228
63ECDABD24182A470016C349 /* MessageSubviewViewController.swift */,
232229
63ECDAC1241889630016C349 /* MessageSubviewContainerViewController.swift */,
@@ -504,7 +501,6 @@
504501
385C2931211FF3630010B4BA /* UIColor+Extensions.swift in Sources */,
505502
385C2932211FF3630010B4BA /* UIViewController+Extensions.swift in Sources */,
506503
385C292B211FF3450010B4BA /* Settings+UserDefaults.swift in Sources */,
507-
385C2945211FF38F0010B4BA /* NavigationController.swift in Sources */,
508504
9B49D547263DAA29008804B5 /* CustomTextMessageContentCell.swift in Sources */,
509505
9B49D528263C31FC008804B5 /* CustomLayoutExampleViewController.swift in Sources */,
510506
032A15DD25965D9A00E00FE3 /* AlertService.swift in Sources */,
@@ -623,7 +619,7 @@
623619
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
624620
GCC_WARN_UNUSED_FUNCTION = YES;
625621
GCC_WARN_UNUSED_VARIABLE = YES;
626-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
622+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
627623
MTL_ENABLE_DEBUG_INFO = YES;
628624
ONLY_ACTIVE_ARCH = YES;
629625
SDKROOT = iphoneos;
@@ -676,7 +672,7 @@
676672
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
677673
GCC_WARN_UNUSED_FUNCTION = YES;
678674
GCC_WARN_UNUSED_VARIABLE = YES;
679-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
675+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
680676
MTL_ENABLE_DEBUG_INFO = NO;
681677
SDKROOT = iphoneos;
682678
SWIFT_VERSION = 5.0;

Example/Sources/AppDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ final internal class AppDelegate: UIResponder, UIApplicationDelegate {
3131

3232
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
3333

34-
let masterViewController = NavigationController(rootViewController: LaunchViewController())
35-
let detailViewController = NavigationController()
34+
let masterViewController = UINavigationController(rootViewController: LaunchViewController())
35+
let detailViewController = UINavigationController()
3636
let splitViewController = UISplitViewController()
3737
splitViewController.viewControllers = [masterViewController, detailViewController]
3838
splitViewController.preferredDisplayMode = .allVisible

Example/Sources/View Controllers/LaunchViewController.swift

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,33 +28,27 @@ import SafariServices
2828
import SwiftUI
2929

3030
final internal class LaunchViewController: UITableViewController {
31-
32-
override var preferredStatusBarStyle: UIStatusBarStyle {
33-
return .lightContent
34-
}
3531

36-
let cells = ["Basic Example", "Advanced Example", "Autocomplete Example", "Embedded Example", "Custom Layout Example", "Subview Example", "SwiftUI Example", "Settings", "Source Code", "Contributors"]
32+
private let cells = ["Basic Example", "Advanced Example", "Autocomplete Example", "Embedded Example", "Custom Layout Example", "Subview Example", "SwiftUI Example", "Settings", "Source Code", "Contributors"]
3733

3834
// MARK: - View Life Cycle
39-
35+
36+
init() {
37+
super.init(style: .insetGrouped)
38+
}
39+
40+
required init?(coder: NSCoder) { nil }
41+
42+
4043
override func viewDidLoad() {
4144
super.viewDidLoad()
4245
title = "MessageKit"
4346
navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
47+
navigationController?.navigationBar.prefersLargeTitles = false
4448
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "cell")
4549
tableView.tableFooterView = UIView()
4650
}
4751

48-
override func viewWillAppear(_ animated: Bool) {
49-
super.viewWillAppear(animated)
50-
navigationController?.navigationBar.prefersLargeTitles = true
51-
}
52-
53-
override func viewWillDisappear(_ animated: Bool) {
54-
super.viewWillDisappear(animated)
55-
navigationController?.navigationBar.prefersLargeTitles = false
56-
}
57-
5852
// MARK: - UITableViewDataSource
5953

6054
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -76,15 +70,15 @@ final internal class LaunchViewController: UITableViewController {
7670
switch cell {
7771
case "Basic Example":
7872
let viewController = BasicExampleViewController()
79-
let detailViewController = NavigationController(rootViewController: viewController)
73+
let detailViewController = UINavigationController(rootViewController: viewController)
8074
splitViewController?.showDetailViewController(detailViewController, sender: self)
8175
case "Advanced Example":
8276
let viewController = AdvancedExampleViewController()
83-
let detailViewController = NavigationController(rootViewController: viewController)
77+
let detailViewController = UINavigationController(rootViewController: viewController)
8478
splitViewController?.showDetailViewController(detailViewController, sender: self)
8579
case "Autocomplete Example":
8680
let viewController = AutocompleteExampleViewController()
87-
let detailViewController = NavigationController(rootViewController: viewController)
81+
let detailViewController = UINavigationController(rootViewController: viewController)
8882
splitViewController?.showDetailViewController(detailViewController, sender: self)
8983
case "Embedded Example":
9084
navigationController?.pushViewController(MessageContainerController(), animated: true)
@@ -96,11 +90,11 @@ final internal class LaunchViewController: UITableViewController {
9690
}
9791
case "Settings":
9892
let viewController = SettingsViewController()
99-
let detailViewController = NavigationController(rootViewController: viewController)
93+
let detailViewController = UINavigationController(rootViewController: viewController)
10094
splitViewController?.showDetailViewController(detailViewController, sender: self)
10195
case "Subview Example":
10296
let viewController = MessageSubviewContainerViewController()
103-
let detailViewController = NavigationController(rootViewController: viewController)
97+
let detailViewController = UINavigationController(rootViewController: viewController)
10498
splitViewController?.showDetailViewController(detailViewController, sender: self)
10599
case "Source Code":
106100
guard let url = URL(string: "https://github.com/MessageKit/MessageKit") else { return }

Example/Sources/View Controllers/NavigationController.swift

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)