Skip to content
Snippets Groups Projects
Commit 93abc9e9 authored by Bruno Muniz's avatar Bruno Muniz :apple:
Browse files

Fix MR comments

parent 02cb15fd
No related branches found
No related tags found
3 merge requests!71Releasing v1.1.5 (214),!68Terms and condition feature,!67v1.1.5 b(203)
......@@ -116,7 +116,7 @@ let package = Package(
),
.package(
url: "https://git.xx.network/elixxir/client-ios-db.git",
branch: "feature/blocked-and-banned-contacts"
.upToNextMajor(from: "1.1.0")
),
.package(
url: "https://github.com/firebase/firebase-ios-sdk.git",
......
......@@ -86,8 +86,7 @@ final class LaunchViewModel {
Task {
do {
network.writeLogs()
let bannedList = try await fetchBannedList()
process(bannedList: bannedList)
let _ = try await fetchBannedList()
network.updateNDF { [weak self] in
guard let self = self else { return }
......@@ -209,14 +208,9 @@ final class LaunchViewModel {
}
private func fetchBannedList() async throws -> Data {
let request = URLRequest(
url: URL(string: "https://elixxir-bins.s3.us-west-1.amazonaws.com/client/bannedUsers/banned.csv")!,
cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
timeoutInterval: 5
)
let url = URL(string: "https://elixxir-bins.s3.us-west-1.amazonaws.com/client/bannedUsers/banned.csv")
return try await withCheckedThrowingContinuation { continuation in
URLSession.shared.dataTask(with: request) { data, _, error in
URLSession.shared.dataTask(with: url!) { data, _, error in
if let error = error {
return continuation.resume(throwing: error)
}
......@@ -226,15 +220,4 @@ final class LaunchViewModel {
}.resume()
}
}
private func process(bannedList: Data) {
if let csv: CSV = try? CSV<Enumerated>(
string: String(data: bannedList, encoding: .utf8)!,
loadColumns: false
) {
/// csv.rows[0][0] == userId
/// csv.rows[0][1] == username
csv.rows.forEach { print("^^^ Banned row: \($0)") }
}
}
}
......@@ -27,6 +27,7 @@ public final class OnboardingStartController: UIViewController {
public override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
navigationItem.backButtonTitle = ""
navigationController?.navigationBar.customize(translucent: true)
}
......
......@@ -23,6 +23,7 @@ public final class OnboardingUsernameController: UIViewController {
public override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
statusBarController.style.send(.darkContent)
navigationItem.backButtonTitle = ""
navigationController?.navigationBar.customize(translucent: true)
}
......@@ -49,26 +50,6 @@ public final class OnboardingUsernameController: UIViewController {
}
}
private func setupNavigationBar() {
navigationItem.backButtonTitle = ""
let backButton = UIButton()
backButton.setImage(Asset.navigationBarBack.image, for: .normal)
backButton.tintColor = Asset.neutralActive.color
backButton.imageView?.contentMode = .center
backButton.snp.makeConstraints { $0.width.equalTo(50) }
backButton
.publisher(for: .touchUpInside)
.receive(on: DispatchQueue.main)
.sink { [unowned self] in
navigationController?.popViewController(animated: true)
}.store(in: &cancellables)
navigationItem.leftBarButtonItem = UIBarButtonItem(
customView: UIStackView(arrangedSubviews: [backButton])
)
}
private func setupScrollView() {
scrollViewController.scrollView.backgroundColor = .white
......
......@@ -4,14 +4,18 @@ public extension UINavigationBar {
func customize(
translucent: Bool = false,
backgroundColor: UIColor = .clear,
shadowColor: UIColor? = nil
shadowColor: UIColor? = nil,
tint: UIColor = Asset.neutralActive.color
) {
isTranslucent = translucent
let barAppearance = UINavigationBarAppearance()
barAppearance.backgroundColor = backgroundColor
barAppearance.backgroundEffect = .none
barAppearance.shadowColor = shadowColor
tintColor = tint
compactAppearance = barAppearance
standardAppearance = barAppearance
scrollEdgeAppearance = standardAppearance
scrollEdgeAppearance = barAppearance
}
}
......@@ -36,27 +36,9 @@ public final class TermsConditionsController: UIViewController {
public override func viewDidLoad() {
super.viewDidLoad()
navigationItem.backButtonTitle = ""
let backButton = UIButton()
backButton.setImage(Asset.navigationBarBack.image, for: .normal)
backButton.tintColor = Asset.neutralActive.color
backButton.imageView?.contentMode = .center
backButton.snp.makeConstraints { $0.width.equalTo(50) }
backButton
.publisher(for: .touchUpInside)
.receive(on: DispatchQueue.main)
.sink { [unowned self] in
navigationController?.popViewController(animated: true)
}.store(in: &cancellables)
navigationItem.leftBarButtonItem = UIBarButtonItem(
customView: UIStackView(arrangedSubviews: [backButton])
)
screenView.radioComponent
.radioButton.publisher(for: .touchUpInside)
.receive(on: DispatchQueue.main)
.radioButton
.publisher(for: .touchUpInside)
.sink { [unowned self] in
screenView.radioComponent.isEnabled.toggle()
screenView.nextButton.isEnabled = screenView.radioComponent.isEnabled
......@@ -64,7 +46,6 @@ public final class TermsConditionsController: UIViewController {
screenView.nextButton
.publisher(for: .touchUpInside)
.receive(on: DispatchQueue.main)
.sink { [unowned self] in
didAcceptTerms = true
......@@ -77,7 +58,6 @@ public final class TermsConditionsController: UIViewController {
screenView.showTermsButton
.publisher(for: .touchUpInside)
.receive(on: DispatchQueue.main)
.sink { _ in
// TODO
}.store(in: &cancellables)
......
......@@ -59,8 +59,8 @@
"kind" : "remoteSourceControl",
"location" : "https://git.xx.network/elixxir/client-ios-db.git",
"state" : {
"branch" : "feature/blocked-and-banned-contacts",
"revision" : "b35a3779c276471aa6e79f047e1c843e49b0dea8"
"revision" : "f8e3e0088de8301d6c4816e12f0aca1d6f02a280",
"version" : "1.1.0"
}
},
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment