UI: Make UI more consistent

3DprintFIT · May 14, 2017 · b4d53a8 · b4d53a8
1 parent 6b1e301
commit b4d53a8
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 3 deletions.
diff --git a/OctoPhone/Coordinators/DetailCoordinator.swift b/OctoPhone/Coordinators/DetailCoordinator.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Icons
 
 /// Printer detail flow controller
 final class DetailCoordinator: TabCoordinator {
@@ -29,6 +30,8 @@ final class DetailCoordinator: TabCoordinator {
         let controller = DetailViewController(viewModel: viewModel)
 
         controller.title = tr(.printerDetail)
+        controller.tabBarItem = UITabBarItem(withIcon: .ulIcon, size: CGSize(width: 22, height: 22),
+                                             title: tr(.printerDetail))
         navigationController?.pushViewController(controller, animated: false)
     }
 }

diff --git a/OctoPhone/Coordinators/FilesCoordinator.swift b/OctoPhone/Coordinators/FilesCoordinator.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import UIKit
+import Icons
 
 /// Stored files list coordinator
 final class FilesCoordinator: TabCoordinator {
@@ -16,6 +17,8 @@ final class FilesCoordinator: TabCoordinator {
         let controller = FilesViewController(viewModel: viewModel)
 
         controller.title = tr(.files)
+        controller.tabBarItem = UITabBarItem(withIcon: ._429Icon, size: CGSize(width: 22, height: 22),
+                                             title: tr(.files))
         navigationController?.pushViewController(controller, animated: false)
     }
 }

diff --git a/OctoPhone/Coordinators/SettingsCoordinator.swift b/OctoPhone/Coordinators/SettingsCoordinator.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Icons
 
 /// Printer settings flow controller
 final class SettingsCoordinator: TabCoordinator {
@@ -15,6 +16,8 @@ final class SettingsCoordinator: TabCoordinator {
         let controller = SettingsViewController(viewModel: viewModel)
 
         controller.title = tr(.settings)
+        navigationController?.tabBarItem = UITabBarItem(withIcon: .cogIcon, size: CGSize(width: 22, height: 22),
+                                             title: tr(.settings))
         navigationController?.pushViewController(controller, animated: false)
     }
 }

diff --git a/OctoPhone/View Related/Files/FileCollectionViewCell.swift b/OctoPhone/View Related/Files/FileCollectionViewCell.swift
@@ -31,6 +31,8 @@ class FileCollectionViewCell: UICollectionViewCell {
     override init(frame: CGRect) {
         super.init(frame: frame)
 
+        backgroundColor = .white
+
         bindViewModel()
     }
 

diff --git a/OctoPhone/View Related/Files/FilesViewController.swift b/OctoPhone/View Related/Files/FilesViewController.swift
@@ -152,14 +152,20 @@ extension FilesViewController {
     }
 }
 
-// MARK: - UICollectionViewDataSource
+// MARK: - UICollectionViewDelegateFlowLayout
 extension FilesViewController: UICollectionViewDelegateFlowLayout {
     func collectionView(_ collectionView: UICollectionView,
                         layout collectionViewLayout: UICollectionViewLayout,
                         sizeForItemAt indexPath: IndexPath) -> CGSize {
 
         return CGSize(width: collectionView.frame.width, height: 44)
     }
+
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout,
+                        minimumLineSpacingForSectionAt section: Int) -> CGFloat {
+
+        return 0.5
+    }
 }
 
 // MARK: - UICollectionViewDelegate

diff --git a/OctoPhone/View Related/Settings/SettingsCollectionViewCell.swift b/OctoPhone/View Related/Settings/SettingsCollectionViewCell.swift
@@ -25,6 +25,8 @@ class SettingsCollectionViewCell: UICollectionViewCell {
     override init(frame: CGRect) {
         super.init(frame: frame)
 
+        backgroundColor = .white
+
         contentView.addSubview(settingsTextLabel)
         bindViewModel()
     }

diff --git a/OctoPhone/View Related/Settings/SettingsViewController.swift b/OctoPhone/View Related/Settings/SettingsViewController.swift
@@ -114,10 +114,15 @@ extension SettingsViewController {
 
 // MARK: - UICollectionViewDelegateFlowLayout
 extension SettingsViewController: UICollectionViewDelegateFlowLayout {
-    func collectionView(_ collectionView: UICollectionView,
-                        layout collectionViewLayout: UICollectionViewLayout,
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout,
                         sizeForItemAt indexPath: IndexPath) -> CGSize {
 
         return CGSize(width: view.frame.width, height: 40)
     }
+
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout,
+                        minimumLineSpacingForSectionAt section: Int) -> CGFloat {
+
+        return 0.5
+    }
 }