KeyboardObserver injection moved to the root ContentView for wider us…

…age in ongoing views
QuickBirdEng · Dec 8, 2019 · cc22878 · cc22878
1 parent 9aa5336
commit cc22878
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/QBChat-MVVM/QBChat-MVVM/Common/SceneDelegate.swift b/QBChat-MVVM/QBChat-MVVM/Common/SceneDelegate.swift
@@ -24,6 +24,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         let viewModel = AnyViewModel(ChatListViewModel(chatService: chatService))
         let contentView = ChatListView()
             .environmentObject(viewModel)
+            .environmentObject(KeyboardObserver.shared)
 
         // Use a UIHostingController as window root view controller.
         if let windowScene = scene as? UIWindowScene {

diff --git a/QBChat-MVVM/QBChat-MVVM/View/ChatList/ChatListView.swift b/QBChat-MVVM/QBChat-MVVM/View/ChatList/ChatListView.swift
@@ -26,10 +26,8 @@ struct ChatListView: View {
     var body: some View {
         NavigationView {
             List(viewModel.chats) { viewModel in
-                NavigationLink(destination: ChatDetailView()
-                    .environmentObject(viewModel)
-                    .environmentObject(KeyboardObserver.shared)) {
-                        ChatCell(chat: viewModel.state.chat)
+                NavigationLink(destination: ChatDetailView().environmentObject(viewModel)) {
+                    ChatCell(chat: viewModel.state.chat)
                 }
             }
             .navigationBarTitle("Chats")