Skip to content

Commit

Permalink
clean up loading view
Browse files Browse the repository at this point in the history
  • Loading branch information
@angiemugo
angiemugo committed Nov 23, 2021
1 parent bcc227c commit 6bf29f7
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 122 deletions.
22 changes: 5 additions & 17 deletions Nasa.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
FD87ECC3274A705B00EFBF0C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FD87ECC2274A705B00EFBF0C /* Assets.xcassets */; };
FD87ECC6274A705B00EFBF0C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FD87ECC4274A705B00EFBF0C /* LaunchScreen.storyboard */; };
FD87ECD1274A705B00EFBF0C /* NasaTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD87ECD0274A705B00EFBF0C /* NasaTests.swift */; };
FD87ECDB274A705C00EFBF0C /* NasaUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD87ECDA274A705C00EFBF0C /* NasaUITests.swift */; };
FD87ECDD274A705C00EFBF0C /* NasaUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD87ECDC274A705C00EFBF0C /* NasaUITestsLaunchTests.swift */; };
FD87ECEA274A95D900EFBF0C /* ImagesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD87ECE9274A95D900EFBF0C /* ImagesCell.swift */; };
FD87ECEC274A964300EFBF0C /* ImageCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = FD87ECEB274A964300EFBF0C /* ImageCell.xib */; };
FD87ECEE274A9A2900EFBF0C /* ImagesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD87ECED274A9A2900EFBF0C /* ImagesListViewController.swift */; };
Expand Down Expand Up @@ -48,6 +46,7 @@
FD9812C9274BBAF5002AB1FA /* NasaCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD9812C8274BBAF5002AB1FA /* NasaCoordinator.swift */; };
FD9812CB274BBB90002AB1FA /* DataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD9812CA274BBB90002AB1FA /* DataSource.swift */; };
FDC37A2CD0F98B9F4A264947 /* Pods_NasaTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB39B745A907CC601D420558 /* Pods_NasaTests.framework */; };
FDDCF5F1274D032A00ECA38C /* Date+Nasa.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDDCF5F0274D032A00ECA38C /* Date+Nasa.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -91,8 +90,6 @@
FD87ECCC274A705B00EFBF0C /* NasaTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NasaTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
FD87ECD0274A705B00EFBF0C /* NasaTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NasaTests.swift; sourceTree = "<group>"; };
FD87ECD6274A705C00EFBF0C /* NasaUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NasaUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
FD87ECDA274A705C00EFBF0C /* NasaUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NasaUITests.swift; sourceTree = "<group>"; };
FD87ECDC274A705C00EFBF0C /* NasaUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NasaUITestsLaunchTests.swift; sourceTree = "<group>"; };
FD87ECE9274A95D900EFBF0C /* ImagesCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagesCell.swift; sourceTree = "<group>"; };
FD87ECEB274A964300EFBF0C /* ImageCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageCell.xib; sourceTree = "<group>"; };
FD87ECED274A9A2900EFBF0C /* ImagesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagesListViewController.swift; sourceTree = "<group>"; };
Expand All @@ -119,6 +116,7 @@
FD8EA83B274BA5E200D7A11D /* UITableView+Nasa.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableView+Nasa.swift"; sourceTree = "<group>"; };
FD9812C8274BBAF5002AB1FA /* NasaCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NasaCoordinator.swift; sourceTree = "<group>"; };
FD9812CA274BBB90002AB1FA /* DataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataSource.swift; sourceTree = "<group>"; };
FDDCF5F0274D032A00ECA38C /* Date+Nasa.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Nasa.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -177,7 +175,6 @@
children = (
FD87ECB5274A705800EFBF0C /* Nasa */,
FD87ECCF274A705B00EFBF0C /* NasaTests */,
FD87ECD9274A705C00EFBF0C /* NasaUITests */,
FD87ECB4274A705800EFBF0C /* Products */,
1DFCA58A6E31EBF1B783E380 /* Pods */,
4A5D102889481FA4F402424C /* Frameworks */,
Expand Down Expand Up @@ -228,15 +225,6 @@
path = NasaTests;
sourceTree = "<group>";
};
FD87ECD9274A705C00EFBF0C /* NasaUITests */ = {
isa = PBXGroup;
children = (
FD87ECDA274A705C00EFBF0C /* NasaUITests.swift */,
FD87ECDC274A705C00EFBF0C /* NasaUITestsLaunchTests.swift */,
);
path = NasaUITests;
sourceTree = "<group>";
};
FD87ECF1274A9A8300EFBF0C /* ImagesList */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -273,7 +261,6 @@
FD87ED0F274AAD8400EFBF0C /* APIEndpoint.swift */,
FD87ED11274AAD9900EFBF0C /* APIMethod.swift */,
FD87ED13274AADA600EFBF0C /* RemoteDataSource.swift */,
FD87ED15274AADBB00EFBF0C /* URLRequest+Nasa.swift */,
FD9812CA274BBB90002AB1FA /* DataSource.swift */,
);
path = "Networking ";
Expand All @@ -298,6 +285,8 @@
FD8EA837274B9EE600D7A11D /* UIView+Nasa.swift */,
FD8EA83B274BA5E200D7A11D /* UITableView+Nasa.swift */,
FD76A31B274CF3FD008F754D /* URLResponse+Nasa.swift */,
FDDCF5F0274D032A00ECA38C /* Date+Nasa.swift */,
FD87ED15274AADBB00EFBF0C /* URLRequest+Nasa.swift */,
);
path = Extensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -550,6 +539,7 @@
FD87ED08274AA59800EFBF0C /* NasaErrors.swift in Sources */,
FD87ECF6274A9B2100EFBF0C /* BaseViewModel.swift in Sources */,
FD87ED05274AA55900EFBF0C /* APIClient.swift in Sources */,
FDDCF5F1274D032A00ECA38C /* Date+Nasa.swift in Sources */,
FD9812C9274BBAF5002AB1FA /* NasaCoordinator.swift in Sources */,
FD87ECFA274A9C4600EFBF0C /* ControllerIds.swift in Sources */,
FD87ECEA274A95D900EFBF0C /* ImagesCell.swift in Sources */,
Expand Down Expand Up @@ -588,8 +578,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FD87ECDB274A705C00EFBF0C /* NasaUITests.swift in Sources */,
FD87ECDD274A705C00EFBF0C /* NasaUITestsLaunchTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file modified Nasa.xcworkspace/xcuserdata/Angie.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
26 changes: 26 additions & 0 deletions Nasa/Extensions/Date+Nasa.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// Date+Nasa.swift
// Nasa
//
// Created by Angie Mugo on 23/11/2021.
//


import Foundation

extension Formatter {
static let iso8601: DateFormatter = {
let formatter = DateFormatter()
formatter.calendar = Calendar(identifier: .iso8601)
formatter.locale = Locale(identifier: "en_US_POSIX")
formatter.timeZone = TimeZone(secondsFromGMT: 0)
formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssXXXXX"
return formatter
}()

static func dateString(from date: Date)-> String {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "YY MMM, d"
return dateFormatter.string(from: date)
}
}
19 changes: 0 additions & 19 deletions Nasa/Extensions/UIImageView+Nasa.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,3 @@ extension UIImageView {
}).resume()
}
}

import Foundation

extension Formatter {
static let iso8601: DateFormatter = {
let formatter = DateFormatter()
formatter.calendar = Calendar(identifier: .iso8601)
formatter.locale = Locale(identifier: "en_US_POSIX")
formatter.timeZone = TimeZone(secondsFromGMT: 0)
formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssXXXXX"
return formatter
}()

static func dateString(from date: Date)-> String {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "YY MMM, d"
return dateFormatter.string(from: date)
}
}
1 change: 1 addition & 0 deletions Nasa/Extensions/UIView+Nasa.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ extension UIView {
private var loadingIndicatorView: UIActivityIndicatorView {
let style: UIActivityIndicatorView.Style = .medium
let indicatorView = UIActivityIndicatorView(style: style)
indicatorView.startAnimating()
indicatorView.translatesAutoresizingMaskIntoConstraints = false
return indicatorView
}
Expand Down
0 Nasa/Networking /URLRequest+Nasa.swift → Nasa/Extensions/URLRequest+Nasa.swift
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions Nasa/ImagesList/ImagesListViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,20 @@ final class ImagesListViewController: BaseViewController {
}.disposed(by: disposeBag)
}

func showDetail(_ indexPath: Int) {
private func showDetail(_ indexPath: Int) {
guard let nav = navigationController else { return }
viewModel.goToDetail(indexPath, nav)
}

func configureTableViewCell(indexPath: IndexPath, model: UIModel) -> UITableViewCell {
private func configureTableViewCell(indexPath: IndexPath, model: UIModel) -> UITableViewCell {
if let cell = tableView.dequeueReusableCell(withIdentifier: ImageCell.identifier, for: indexPath) as? ImageCell {
cell.configureCell(model)
return cell
}
return UITableViewCell()
}

func configureObservables() {
private func configureObservables() {
viewModel.errorRelay.bind { [weak self] error in
guard let self = self else { return }
self.showError(error, self.viewModel.fetch)
Expand Down
17 changes: 8 additions & 9 deletions Nasa/ImagesList/ImagesListViewModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@ class ImagesListViewModel: BaseViewModel {
}

func fetch() {
errorRelay.accept(NasaErrors.timeout)
// loadingRelay.accept(true)
// dataSource.fetchNasaImages().subscribe { images in
// self.loadingRelay.accept(false)
// let models = images.collection.items.map { $0.toListUIModel() }
// self.items.accept(models)
// } onFailure: { error in
// self.errorRelay.accept(error)
// }.disposed(by: disposeBag)
loadingRelay.accept(true)
dataSource.fetchNasaImages().subscribe { images in
self.loadingRelay.accept(false)
let models = images.collection.items.map { $0.toListUIModel() }
self.items.accept(models)
} onFailure: { error in
self.errorRelay.accept(error)
}.disposed(by: disposeBag)
}

func goToDetail(_ row: Int, _ nav: UINavigationController) {
Expand Down
42 changes: 0 additions & 42 deletions NasaUITests/NasaUITests.swift
View file

This file was deleted.

32 changes: 0 additions & 32 deletions NasaUITests/NasaUITestsLaunchTests.swift
View file

This file was deleted.

0 comments on commit 6bf29f7

Please sign in to comment.