Merge pull request #8 from lauramarson/viewChanges

View changes

Author: francyanne

AnimalsApp/AnimalsApp.xcodeproj/project.pbxproj.orig

@@ -21,6 +21,7 @@
     "version" : 1
   },
   "properties" : {
+    "localizable" : true,
     "template-rendering-intent" : "original"
   }
 }

AnimalsApp/AnimalsApp/Assets.xcassets/Icons/addFavorite.imageset/Contents.json

@@ -11,14 +11,23 @@ class DetailViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
+        
+        setNavigationItems()
     }
 
-    func setupNavBar() {
+    private func setNavigationItems() {
+        title = "Detalhes"
+        
         let appearance = UINavigationBarAppearance()
         appearance.configureWithOpaqueBackground()
+        appearance.titleTextAttributes = [
+            NSAttributedString.Key.foregroundColor: UIColor.blueTextColor ?? UIColor.blue,
+            NSAttributedString.Key.font: UIFont(name: "OpenSans", size: 20) ?? UIFont.systemFont(ofSize: 20)]
         navigationController?.navigationBar.standardAppearance = appearance
         navigationController?.navigationBar.scrollEdgeAppearance = navigationController?.navigationBar.standardAppearance
+
+        navigationController?.navigationBar.tintColor = UIColor.blueTextColor
+        
     }
 
 }

AnimalsApp/AnimalsApp/Views/DetailViewController/DetailViewController.swift

@@ -12,18 +12,19 @@ class FavoritesViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        view.backgroundColor = .blue
+        setNavigationItems()
     }
 
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
+    private func setNavigationItems() {
+        title = "Favoritos"
+        
+        let appearance = UINavigationBarAppearance()
+        appearance.configureWithOpaqueBackground()
+        appearance.titleTextAttributes = [
+            NSAttributedString.Key.foregroundColor: UIColor.blueTextColor ?? UIColor.blue,
+            NSAttributedString.Key.font: UIFont(name: "OpenSans", size: 20) ?? UIFont.systemFont(ofSize: 20)]
+        navigationController?.navigationBar.standardAppearance = appearance
+        navigationController?.navigationBar.scrollEdgeAppearance = navigationController?.navigationBar.standardAppearance
     }
-    */
 
 }

AnimalsApp/AnimalsApp/Views/FavoritesViewController/FavoritesViewController.swift

@@ -37,6 +37,8 @@ class HomeViewController: UIViewController {
             NSAttributedString.Key.font: UIFont(name: "OpenSans", size: 20) ?? UIFont.systemFont(ofSize: 20)]
         navigationController?.navigationBar.standardAppearance = appearance
         navigationController?.navigationBar.scrollEdgeAppearance = navigationController?.navigationBar.standardAppearance
+        
+        navigationItem.backButtonTitle = ""
     }
 
     private func populateTableView() {
@@ -70,12 +72,13 @@ extension HomeViewController: UITableViewDataSource {
 extension HomeViewController: UITableViewDelegate {
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        print("entrou")
         let detailVC = DetailViewController(nibName: "DetailViewController", bundle: nil)
 
         //continuar
 
         navigationController?.pushViewController(detailVC, animated: true)
+        
+        tableView.deselectRow(at: indexPath, animated: true)
     }
 
 }

AnimalsApp/AnimalsApp/Views/HomeViewController/HomeViewController.swift

@@ -31,7 +31,7 @@ class RegisterViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
-        setNavigationItens()
+        setNavigationItems()
         delegateTextField()
     }
 
@@ -42,9 +42,16 @@ class RegisterViewController: UIViewController {
     }
 
     // MARK: Methods
-    private func setNavigationItens() {
+    private func setNavigationItems() {
         title = "Cadastrar"
-        navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor(named: "blueTabBarColor") ?? ""]
+        
+        let appearance = UINavigationBarAppearance()
+        appearance.configureWithOpaqueBackground()
+        appearance.titleTextAttributes = [
+            NSAttributedString.Key.foregroundColor: UIColor.blueTextColor ?? UIColor.blue,
+            NSAttributedString.Key.font: UIFont(name: "OpenSans", size: 20) ?? UIFont.systemFont(ofSize: 20)]
+        navigationController?.navigationBar.standardAppearance = appearance
+        navigationController?.navigationBar.scrollEdgeAppearance = navigationController?.navigationBar.standardAppearance
     }
 
     private func setupUI() {