Last second optimization

nssina · Dec 10, 2020 · d9224ba · d9224ba
1 parent 836eafd
commit d9224ba
Show file tree

Hide file tree

Showing 31 changed files with 129 additions and 88 deletions.
diff --git a/GHFollowers.xcodeproj/project.pbxproj b/GHFollowers.xcodeproj/project.pbxproj
@@ -121,10 +121,10 @@
 				D3E4AE95257AAB3600D5FFE0 /* Utilities */,
 				D3E4AE91257AA30600D5FFE0 /* Managers */,
 				D3E4AE89257A9B8800D5FFE0 /* Model */,
-				D3E4AE86257A914300D5FFE0 /* Support */,
 				D3E4AE84257A90EA00D5FFE0 /* Extensions */,
 				D3E4AE83257A90B700D5FFE0 /* Custom Views */,
 				D3E4AE82257A908500D5FFE0 /* Screens */,
+				D3E4AE86257A914300D5FFE0 /* Support */,
 				D31C9AF4257913800091A931 /* Info.plist */,
 			);
 			path = GHFollowers;
@@ -537,6 +537,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 0.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.sinarabiei.GHFollowers;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -556,6 +557,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 0.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.sinarabiei.GHFollowers;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/...codeproj/project.xcworkspace/xcuserdata/nssina.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/nssina.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/GHFollowers/Custom Views/Buttons/GFButton.swift b/GHFollowers/Custom Views/Buttons/GFButton.swift
@@ -14,23 +14,27 @@ class GFButton: UIButton {
         configure()
     }
 
+
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+
     convenience init(backgroundColor: UIColor, title: String) {
         self.init(frame: .zero)
         self.backgroundColor = backgroundColor
         self.setTitle(title, for: .normal)
     }
 
+
     private func configure() {
         layer.cornerRadius = 10
         setTitleColor(.white, for: .normal)
         titleLabel?.font = UIFont.preferredFont(forTextStyle: .headline)
         translatesAutoresizingMaskIntoConstraints = false
     }
 
+
     func set(background: UIColor, title: String) {
         self.backgroundColor = background
         setTitle(title, for: .normal)

diff --git a/GHFollowers/Custom Views/Cells/FavoriteCell.swift b/GHFollowers/Custom Views/Cells/FavoriteCell.swift
@@ -26,11 +26,8 @@ class FavoriteCell: UITableViewCell {
 
 
     func set(favorite: Follower) {
+        avatarImageView.downloadAvatarImage(fromURL: favorite.avatarUrl)
         usernameLabel.text = favorite.login
-        NetworkManager.shared.donwloadImage(from: favorite.avatarUrl) { [weak self] (image) in
-            guard let self = self else { return }
-            DispatchQueue.main.async { self.avatarImageView.image = image }
-        }
     }
 
 
@@ -52,5 +49,4 @@ class FavoriteCell: UITableViewCell {
             usernameLabel.heightAnchor.constraint(equalToConstant: 40)
         ])
     }
-
 }
diff --git a/GHFollowers/Custom Views/Cells/FollowerCell.swift b/GHFollowers/Custom Views/Cells/FollowerCell.swift
@@ -8,10 +8,12 @@
 import UIKit
 
 class FollowerCell: UICollectionViewCell {
+
     static let reuseID = "FollowerCell"
     let avatarImageView = GFAvatarImageView(frame: .zero)
     let usernameLabel = GFTitleLabel(textAlignment: .center, fontSize: 16)
 
+
     override init(frame: CGRect) {
         super.init(frame: frame)
         configure()
@@ -22,17 +24,15 @@ class FollowerCell: UICollectionViewCell {
         fatalError("init(coder:) has not been implemented")
     }
 
+
     func set(follower: Follower) {
+        avatarImageView.downloadAvatarImage(fromURL: follower.avatarUrl)
         usernameLabel.text = follower.login
-        NetworkManager.shared.donwloadImage(from: follower.avatarUrl) { [weak self] (image) in
-            guard let self = self else { return }
-            DispatchQueue.main.async { self.avatarImageView.image = image }
-        }
     }
 
+
     private func configure() {
         addSubviews(avatarImageView, usernameLabel)
-
         let padding: CGFloat = 8
 
         NSLayoutConstraint.activate([

diff --git a/GHFollowers/Custom Views/ImageViews/GFAvatarImageView.swift b/GHFollowers/Custom Views/ImageViews/GFAvatarImageView.swift
@@ -29,4 +29,12 @@ class GFAvatarImageView: UIImageView {
         image = placeHolderImage
         translatesAutoresizingMaskIntoConstraints = false
     }
+
+
+    func downloadAvatarImage(fromURL url: String) {
+        NetworkManager.shared.donwloadImage(from: url) { [weak self] (image) in
+            guard let self = self else { return }
+            DispatchQueue.main.async { self.image = image }
+        }
+    }
 }
diff --git a/GHFollowers/Custom Views/Labels/GFBodyLabel.swift b/GHFollowers/Custom Views/Labels/GFBodyLabel.swift
@@ -14,15 +14,18 @@ class GFBodyLabel: UILabel {
         configure()
     }
 
+
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+
     convenience init(textAlignment: NSTextAlignment) {
         self.init(frame: .zero)
         self.textAlignment = textAlignment
     }
 
+
     private func configure() {
         textColor = .secondaryLabel
         font = UIFont.preferredFont(forTextStyle: .body)

diff --git a/GHFollowers/Custom Views/Labels/GFSecondaryTitleLabel.swift b/GHFollowers/Custom Views/Labels/GFSecondaryTitleLabel.swift
@@ -14,15 +14,18 @@ class GFSecondaryTitleLabel: UILabel {
         configure()
     }
 
+
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+
     convenience init(fontSize: CGFloat) {
         self.init(frame: .zero)
         font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
     }
 
+
     private func configure() {
         textColor = .secondaryLabel
         adjustsFontSizeToFitWidth = true

diff --git a/GHFollowers/Custom Views/Labels/GFTitleLabel.swift b/GHFollowers/Custom Views/Labels/GFTitleLabel.swift
@@ -14,16 +14,19 @@ class GFTitleLabel: UILabel {
         configure()
     }
 
+
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+
     convenience init(textAlignment: NSTextAlignment, fontSize: CGFloat) {
         self.init(frame: .zero)
         self.textAlignment = textAlignment
         self.font = UIFont.systemFont(ofSize: fontSize, weight: .bold)
     }
 
+
     private func configure() {
         textColor = .label
         adjustsFontSizeToFitWidth = true

diff --git a/GHFollowers/Custom Views/TabbarControllers/GFTabbarController.swift b/GHFollowers/Custom Views/TabbarControllers/GFTabbarController.swift
@@ -15,6 +15,7 @@ class GFTabbarController: UITabBarController {
         viewControllers = [createSearchNC(), createFavoritesNC()]
     }
 
+
     func createSearchNC() -> UINavigationController {
         let searchVC = SearchVC()
         searchVC.title = "Search"
@@ -23,6 +24,7 @@ class GFTabbarController: UITabBarController {
         return UINavigationController(rootViewController: searchVC)
     }
 
+
     func createFavoritesNC() -> UINavigationController {
         let favoritesListVC = FavoritesListVC()
         favoritesListVC.title = "Favorites"

diff --git a/GHFollowers/Custom Views/TextFields/GFTextField.swift b/GHFollowers/Custom Views/TextFields/GFTextField.swift
@@ -14,10 +14,12 @@ class GFTextField: UITextField {
         configure()
     }
 
+
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+
     private func configure() {
         translatesAutoresizingMaskIntoConstraints = false
 

diff --git a/GHFollowers/Custom Views/ViewControllers/GFAlertVC.swift b/GHFollowers/Custom Views/ViewControllers/GFAlertVC.swift
@@ -20,6 +20,7 @@ class GFAlertVC: UIViewController {
 
     let padding: CGFloat = 20
 
+
     init(title: String, message: String, buttonTitle: String) {
         super.init(nibName: nil, bundle: nil)
         self.alertTitle = title
@@ -37,6 +38,7 @@ class GFAlertVC: UIViewController {
         super.viewDidLoad()
         view.backgroundColor = UIColor.black.withAlphaComponent(0.75)
         view.addSubviews(containerView, titleLabel, actionButton, messageLabel)
+
         configureContainerView()
         configureTitleLabel()
         configureActionButton()
@@ -53,6 +55,7 @@ class GFAlertVC: UIViewController {
         ])
     }
 
+
     func configureTitleLabel() {
         titleLabel.text = alertTitle ?? "Something went wrong"
 
@@ -64,6 +67,7 @@ class GFAlertVC: UIViewController {
         ])
     }
 
+
     func configureActionButton() {
         actionButton.setTitle(buttonTitle ?? "OK", for: .normal)
         actionButton.addTarget(self, action: #selector(dismissVC), for: .touchUpInside)
@@ -76,6 +80,7 @@ class GFAlertVC: UIViewController {
         ])
     }
 
+
     func configureMessageLabel() {
         messageLabel.text = message ?? "Unable to complete request"
         messageLabel.numberOfLines = 4
@@ -88,6 +93,7 @@ class GFAlertVC: UIViewController {
         ])
     }
 
+
     @objc func dismissVC() {
         dismiss(animated: true, completion: nil)
     }

diff --git a/GHFollowers/Custom Views/ViewControllers/GFDataLoadingVC.swift b/GHFollowers/Custom Views/ViewControllers/GFDataLoadingVC.swift
@@ -10,11 +10,6 @@ import UIKit
 class GFDataLoadingVC: UIViewController {
 
     var containerView: UIView!
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-    }
 
 
     func showLoadingView() {

diff --git a/GHFollowers/Custom Views/ViewControllers/GFUserInfoHeaderVC.swift b/GHFollowers/Custom Views/ViewControllers/GFUserInfoHeaderVC.swift
@@ -32,14 +32,14 @@ class GFUserInfoHeaderVC: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addSubviews()
+        view.addSubviews(avatarImageView, usernameLabel, nameLabel, locationImageView, locationLabel, bioLabel)
         layoutUI()
         configureUIElements()
     }
 
 
     func configureUIElements() {
-        downloadAvatarImage()
+        avatarImageView.downloadAvatarImage(fromURL: user.avatarUrl)
         usernameLabel.text = user.login
         nameLabel.text = user.name ?? ""
         locationLabel.text = user.location ?? "No Location"
@@ -51,19 +51,6 @@ class GFUserInfoHeaderVC: UIViewController {
     }
 
 
-    func downloadAvatarImage() {
-        NetworkManager.shared.donwloadImage(from: user.avatarUrl) { [weak self] (image) in
-            guard let self = self else { return }
-            DispatchQueue.main.async { self.avatarImageView.image = image }
-        }
-    }
-
-
-    func addSubviews() {
-        view.addSubviews(avatarImageView, usernameLabel, nameLabel, locationImageView, locationLabel, bioLabel)
-    }
-
-
     func layoutUI() {
         let padding: CGFloat = 20
         let textImagePadding: CGFloat = 12

diff --git a/GHFollowers/Custom Views/ViewControllers/ItemInfoVCs/GFFollowerItemVC.swift b/GHFollowers/Custom Views/ViewControllers/ItemInfoVCs/GFFollowerItemVC.swift
@@ -15,6 +15,7 @@ class GFFollowerItemVC: GFItemInfoVC {
 
     weak var delegate: GFFollowerItemVCDelegate!
 
+
     init(user: User, delegate: GFFollowerItemVCDelegate) {
         super.init(user: user)
         self.delegate = delegate
@@ -38,6 +39,7 @@ class GFFollowerItemVC: GFItemInfoVC {
         actionButton.set(background: .systemGreen, title: "Get Followers")
     }
 
+
     override func actionButtonTapped() {
         delegate.didTapGetFollowers(for: user)
     }

diff --git a/GHFollowers/Custom Views/ViewControllers/ItemInfoVCs/GFItemInfoVC.swift b/GHFollowers/Custom Views/ViewControllers/ItemInfoVCs/GFItemInfoVC.swift
@@ -16,6 +16,7 @@ class GFItemInfoVC: UIViewController {
 
     var user: User!
 
+
     init(user: User) {
         super.init(nibName: nil, bundle: nil)
         self.user = user
@@ -58,6 +59,7 @@ class GFItemInfoVC: UIViewController {
 
     @objc func actionButtonTapped() {}
 
+
     private func layoutUI() {
         view.addSubviews(stackView, actionButton)
 

diff --git a/GHFollowers/Custom Views/ViewControllers/ItemInfoVCs/GFRepoItemVC.swift b/GHFollowers/Custom Views/ViewControllers/ItemInfoVCs/GFRepoItemVC.swift
@@ -15,6 +15,7 @@ class GFRepoItemVC: GFItemInfoVC {
 
     weak var delegate: GFRepoItemVCDelegate!
 
+
     init(user: User, delegate: GFRepoItemVCDelegate) {
         super.init(user: user)
         self.delegate = delegate

diff --git a/GHFollowers/Custom Views/Views/GFEmptyStateView.swift b/GHFollowers/Custom Views/Views/GFEmptyStateView.swift
@@ -12,6 +12,7 @@ class GFEmptyStateView: UIView {
     let messageLabel = GFTitleLabel(textAlignment: .center, fontSize: 28)
     let logoImageView = UIImageView()
 
+
     override init(frame: CGRect) {
         super.init(frame: frame)
         configure()
@@ -42,10 +43,8 @@ class GFEmptyStateView: UIView {
 
         let labelCenterYCostant: CGFloat = DeviceType.isiPhoneSE || DeviceType.isiPhone8Zoomed ? -80 : -150
 
-        let messageLabelCenterYConstraint = messageLabel.centerYAnchor.constraint(equalTo: self.centerYAnchor, constant: labelCenterYCostant)
-        messageLabelCenterYConstraint.isActive = true
-
         NSLayoutConstraint.activate([
+            messageLabel.centerYAnchor.constraint(equalTo: self.centerYAnchor, constant: labelCenterYCostant),
             messageLabel.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: 40),
             messageLabel.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: -40),
             messageLabel.heightAnchor.constraint(equalToConstant: 200)
@@ -58,13 +57,12 @@ class GFEmptyStateView: UIView {
         logoImageView.translatesAutoresizingMaskIntoConstraints = false
 
         let logoBottomConstant: CGFloat = DeviceType.isiPhoneSE || DeviceType.isiPhone8Zoomed ? 80 : 40
-        let logoImageViewConstraint = messageLabel.centerYAnchor.constraint(equalTo: self.centerYAnchor, constant: logoBottomConstant)
-        logoImageViewConstraint.isActive = true
 
         NSLayoutConstraint.activate([
             logoImageView.widthAnchor.constraint(equalTo: self.widthAnchor, multiplier: 1.3),
             logoImageView.heightAnchor.constraint(equalTo: self.widthAnchor, multiplier: 1.3),
-            logoImageView.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: 170)
+            logoImageView.trailingAnchor.constraint(equalTo: self.trailingAnchor, constant: 170),
+            logoImageView.centerYAnchor.constraint(equalTo: self.centerYAnchor, constant: logoBottomConstant)
         ])
     }
 }