git.iko.soy/dashared/hookah-tau
on develop help sign in
Добавила значок загрузки на экраны бронирований
commit89d52cced51d8375526c91930af5935b661bfcfa authorDarya Rednikina <rednikina.com@yandex.ru> dateWed 8 Jan 2020, 16:22 (7 years ago) parent6d49be3
2 files changed+13−1
compare with develop
unifiedsplit
Hookah Tau/Controllers/Admin/Reservations/List of reservations/AdminReservationsController.swift+7−1 Hookah Tau/Controllers/Client/Reservations/Active Reservations/ReservationsViewController.swift+6
Hookah Tau/Controllers/Admin/Reservations/List of reservations/AdminReservationsController.swift+7−1
@@ -35,6 +35,8 @@ class AdminReservationsController: BaseViewController {
3535
3636 var refrControl: UIRefreshControl?
3737
38+ var activityIndicator: UIActivityIndicatorView?
39+
3840 var activeReservations: [ReservationWithUser] = [] {
3941 didSet {
4042 guard let empty = noReservationsView else { return }
@@ -45,7 +47,7 @@ class AdminReservationsController: BaseViewController {
4547 contentView.sendSubviewToBack(empty)
4648 tableView?.alpha = 1
4749 }
48−
50+ activityIndicator?.stopAnimating()
4951 tableView?.reloadData()
5052 }
5153 }
@@ -77,6 +79,10 @@ class AdminReservationsController: BaseViewController {
7779 func setUpContentView() {
7880 self.view.addSubviewThatFills(contentView)
7981
82+ activityIndicator = UIActivityIndicatorView()
83+ contentView.addSubviewThatFills(activityIndicator)
84+ activityIndicator?.startAnimating()
85+
8086 // empty
8187 noReservationsView = AdminNoReservationsView.loadFromNib()
8288 contentView.addSubviewThatFills(noReservationsView)
Hookah Tau/Controllers/Client/Reservations/Active Reservations/ReservationsViewController.swift+6
@@ -23,6 +23,7 @@ class ReservationsViewController: BaseViewController {
2323 tableView?.alpha = 1
2424 }
2525
26+ activityIndicator.stopAnimating()
2627 tableView?.reloadData()
2728 }
2829 }
@@ -45,6 +46,8 @@ class ReservationsViewController: BaseViewController {
4546 return tableView
4647 }()
4748
49+ var activityIndicator = UIActivityIndicatorView()
50+
4851 // MARK: - Lifecycle
4952
5053 override func viewDidLoad() {
@@ -74,6 +77,9 @@ class ReservationsViewController: BaseViewController {
7477 func setUpContentView() {
7578 self.view.addSubviewThatFills(contentView)
7679
80+ contentView.addSubviewThatFills(activityIndicator)
81+ activityIndicator.startAnimating()
82+
7783 // empty
7884 noReservationsView = NoReservationsView.loadFromNib()
7985 contentView.addSubviewThatFills(noReservationsView)