From 110c7bb01a39d86e29293d14d08ff1a3bb4e00d6 Mon Sep 17 00:00:00 2001
From: Morgan Pretty <morgan.t.pretty@gmail.com>
Date: Tue, 1 Mar 2022 10:25:54 +1100
Subject: [PATCH] Addressed PR comments

Moved the 'backBarButtonItem' into the BaseVC (and removed it for being duplicated in various view controllers)
Removed a redundant line of code
---
 Session/Conversations/ConversationVC.swift | 6 ------
 Session/Home/HomeVC.swift                  | 5 -----
 Session/Settings/SettingsVC.swift          | 3 ---
 Session/Shared/BaseVC.swift                | 6 ++++++
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index f3fee082f..03d148f9a 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -466,11 +466,6 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
     // MARK: Updating
     
     func updateNavBarButtons() {
-        // Back button (to appear on pushed screen)
-        let backButton = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
-        backButton.tintColor = Colors.text
-        navigationItem.backBarButtonItem = backButton
-        
         navigationItem.hidesBackButton = isShowingSearchUI
         
         if isShowingSearchUI {
@@ -478,7 +473,6 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
             navigationItem.rightBarButtonItems = []
         }
         else {
-            navigationItem.hidesBackButton = false
             navigationItem.leftBarButtonItem = UIViewController.createOWSBackButton(withTarget: self, selector: #selector(handleBackPressed))
             
             if let contactThread: TSContactThread = thread as? TSContactThread {
diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift
index 01677bf05..3d3217e0f 100644
--- a/Session/Home/HomeVC.swift
+++ b/Session/Home/HomeVC.swift
@@ -394,11 +394,6 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv
         pathStatusView.pin(.trailing, to: .trailing, of: profilePictureViewContainer)
         pathStatusView.pin(.bottom, to: .bottom, of: profilePictureViewContainer)
         
-        // Back button (to appear on pushed screen)
-        let backButton = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
-        backButton.tintColor = Colors.text
-        navigationItem.backBarButtonItem = backButton
-        
         // Left bar button item
         let leftBarButtonItem = UIBarButtonItem(customView: profilePictureViewContainer)
         leftBarButtonItem.accessibilityLabel = "Settings button"
diff --git a/Session/Settings/SettingsVC.swift b/Session/Settings/SettingsVC.swift
index 72228f5a8..9641f53dd 100644
--- a/Session/Settings/SettingsVC.swift
+++ b/Session/Settings/SettingsVC.swift
@@ -139,9 +139,6 @@ final class SettingsVC : BaseVC, AvatarViewHelperDelegate {
         setUpNavBarStyle()
         setNavBarTitle(NSLocalizedString("vc_settings_title", comment: ""))
         // Navigation bar buttons
-        let backButton = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
-        backButton.tintColor = Colors.text
-        navigationItem.backBarButtonItem = backButton
         updateNavigationBarButtons()
         // Profile picture view
         let profilePictureTapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(showEditProfilePictureUI))
diff --git a/Session/Shared/BaseVC.swift b/Session/Shared/BaseVC.swift
index 1f2ad64d9..b0692e5b7 100644
--- a/Session/Shared/BaseVC.swift
+++ b/Session/Shared/BaseVC.swift
@@ -46,6 +46,7 @@ class BaseVC : UIViewController {
 
     internal func setUpNavBarStyle() {
         guard let navigationBar = navigationController?.navigationBar else { return }
+        
         if #available(iOS 15.0, *) {
             let appearance = UINavigationBarAppearance()
             appearance.configureWithOpaqueBackground()
@@ -59,6 +60,11 @@ class BaseVC : UIViewController {
             navigationBar.isTranslucent = false
             navigationBar.barTintColor = Colors.navigationBarBackground
         }
+        
+        // Back button (to appear on pushed screen)
+        let backButton = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+        backButton.tintColor = Colors.text
+        navigationItem.backBarButtonItem = backButton
     }
 
     internal func setNavBarTitle(_ title: String, customFontSize: CGFloat? = nil) {