From 695cf8abb8d8f2f822c677169236fc96852eab76 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 30 Jun 2020 16:07:23 -0400 Subject: [PATCH 1/2] Remove breathless description images --- .../Breathless/BreathlessViewController.swift | 2 +- .../FollowUp/Breathless/BreathlessViewController.xib | 2 +- .../FollowUp/Breathless/BreathlessViewModel.swift | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.swift b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.swift index cdff3b2..e02c0f2 100644 --- a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.swift +++ b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.swift @@ -97,7 +97,7 @@ extension BreathlessDataSource: UITableViewDataSource { cell.textLabel?.lineBreakMode = .byWordWrapping cell.backgroundColor = .clear cell.selectionStyle = .none - cell.imageView?.image = UIImage(named: viewData.imageName) +// cell.imageView?.image = UIImage(named: viewData.imageName) return cell } diff --git a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib index 62d3c15..52c5736 100644 --- a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib +++ b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib @@ -1,5 +1,5 @@ - + diff --git a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewModel.swift b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewModel.swift index b9d0ac0..caf3e7e 100644 --- a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewModel.swift +++ b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewModel.swift @@ -2,7 +2,7 @@ import RxSwift import RxCocoa struct BreathlessItemViewData { - let imageName: String +// let imageName: String let text: String let cause: SymptomInputs.Breathlessness.Cause } @@ -21,23 +21,23 @@ class BreathlessViewModel { viewData = Observable.just([ BreathlessItemViewData( - imageName: "house", +// imageName: "house", text: breath.p0, cause: .leavingHouseOrDressing), BreathlessItemViewData( - imageName: "stop", +// imageName: "stop", text: breath.p1, cause: .walkingYardsOrMinsOnGround), BreathlessItemViewData( - imageName: "ground", +// imageName: "ground", text: breath.p2, cause: .groundOwnPace), BreathlessItemViewData( - imageName: "hill", +// imageName: "hill", text: breath.p3, cause: .hurryOrHill), BreathlessItemViewData( - imageName: "exercise", +// imageName: "exercise", text: breath.p4, cause: .exercise) ]).asDriver(onErrorJustReturn: []) From 2a755c245782866746c6ea1705422a0ef2350bf8 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 30 Jun 2020 16:44:14 -0400 Subject: [PATCH 2/2] Remove commented breathless fields --- .../FollowUp/Breathless/BreathlessViewController.swift | 1 - .../FollowUp/Breathless/BreathlessViewModel.swift | 6 ------ 2 files changed, 7 deletions(-) diff --git a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.swift b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.swift index e02c0f2..d6191a5 100644 --- a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.swift +++ b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.swift @@ -97,7 +97,6 @@ extension BreathlessDataSource: UITableViewDataSource { cell.textLabel?.lineBreakMode = .byWordWrapping cell.backgroundColor = .clear cell.selectionStyle = .none -// cell.imageView?.image = UIImage(named: viewData.imageName) return cell } diff --git a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewModel.swift b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewModel.swift index caf3e7e..14eeeaa 100644 --- a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewModel.swift +++ b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewModel.swift @@ -2,7 +2,6 @@ import RxSwift import RxCocoa struct BreathlessItemViewData { -// let imageName: String let text: String let cause: SymptomInputs.Breathlessness.Cause } @@ -21,23 +20,18 @@ class BreathlessViewModel { viewData = Observable.just([ BreathlessItemViewData( -// imageName: "house", text: breath.p0, cause: .leavingHouseOrDressing), BreathlessItemViewData( -// imageName: "stop", text: breath.p1, cause: .walkingYardsOrMinsOnGround), BreathlessItemViewData( -// imageName: "ground", text: breath.p2, cause: .groundOwnPace), BreathlessItemViewData( -// imageName: "hill", text: breath.p3, cause: .hurryOrHill), BreathlessItemViewData( -// imageName: "exercise", text: breath.p4, cause: .exercise) ]).asDriver(onErrorJustReturn: [])