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

Fixed bugs found by QA

parent bdee6cc2
No related branches found
No related tags found
2 merge requests!54Releasing 1.1.4,!50Search UI 2.0
......@@ -90,7 +90,7 @@ public class Client {
public func addJson(_ string: String) {
guard let backupManager = backupManager else {
fatalError()
fatalError("Trying to add json parameters to backup but no backup manager created yet")
}
print("^^^ Set params: \(string) to backup")
......
......@@ -69,6 +69,8 @@ extension Session {
phone = confirmation.content
}
updateFactsOnBackup()
if let _ = client.backupManager {
updateFactsOnBackup()
}
}
}
......@@ -71,8 +71,10 @@ final class RequestsSentViewModel {
item.isResent = true
allRequests.append(item)
let name = (contact.nickname ?? contact.username) ?? ""
self.toastController.enqueueToast(model: .init(
title: Localized.Requests.Sent.Toast.resent(contact.nickname ?? contact.username),
title: Localized.Requests.Sent.Toast.resent(name),
leftImage: Asset.requestSentToaster.image
))
......
......@@ -61,11 +61,14 @@ public final class SearchContainerController: UIViewController {
private func setupBindings() {
screenView.segmentedControl
.actionPublisher
.removeDuplicates()
.receive(on: DispatchQueue.main)
.sink { [unowned self] in
if $0 == .qr {
let point = CGPoint(x: screenView.frame.width, y: 0.0)
screenView.scrollView.setContentOffset(point, animated: true)
leftController.endEditing()
rightController.viewModel.viewWillAppear()
} else {
screenView.scrollView.setContentOffset(.zero, animated: true)
leftController.viewModel.didSelectItem($0)
......
......@@ -35,6 +35,10 @@ final class SearchLeftController: UIViewController {
setupBindings()
}
func endEditing() {
screenView.inputField.endEditing(true)
}
private func setupTableView() {
screenView.tableView.separatorStyle = .none
screenView.tableView.tableFooterView = UIView()
......
......@@ -7,9 +7,9 @@ final class SearchRightController: UIViewController {
lazy private var screenView = SearchRightView()
private let viewModel = SearchRightViewModel()
private var cancellables = Set<AnyCancellable>()
private let cameraController = CameraController()
private(set) var viewModel = SearchRightViewModel()
override func loadView() {
view = screenView
......@@ -26,11 +26,6 @@ final class SearchRightController: UIViewController {
cameraController.previewLayer.frame = screenView.bounds
}
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
viewModel.viewDidAppear()
}
override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
viewModel.viewWillDisappear()
......
......@@ -41,6 +41,8 @@ final class SearchLeftViewModel {
}
func didStartSearching() {
guard stateSubject.value.input.isEmpty == false else { return }
hudSubject.send(.on(nil))
let prefix = stateSubject.value.item.written.first!.uppercased()
......
......@@ -40,7 +40,7 @@ final class SearchRightViewModel {
private let cameraSemaphoreSubject = PassthroughSubject<Bool, Never>()
private(set) var statusSubject = CurrentValueSubject<ScanningStatus, Never>(.reading)
func viewDidAppear() {
func viewWillAppear() {
permissions.requestCamera { [weak self] granted in
guard let self = self else { return }
......
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