From 5bf9d0a68b42a8bf95b212de34748c003f2d5185 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Tue, 3 Mar 2020 16:17:46 +1100 Subject: [PATCH] deal with the conflicts the right way.... --- Signal/src/Loki/View Controllers/HomeVC.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Signal/src/Loki/View Controllers/HomeVC.swift b/Signal/src/Loki/View Controllers/HomeVC.swift index 22fbffedc..5bc989837 100644 --- a/Signal/src/Loki/View Controllers/HomeVC.swift +++ b/Signal/src/Loki/View Controllers/HomeVC.swift @@ -104,7 +104,11 @@ final class HomeVC : UIViewController, UITableViewDataSource, UITableViewDelegat tableView.pin(.trailing, to: .trailing, of: view) tableView.pin(.bottom, to: .bottom, of: view) view.addSubview(fadeView) - fadeView.pin(to: view) + fadeView.pin(.leading, to: .leading, of: view) + let topInset = 0.15 * view.height() + fadeView.pin(.top, to: .top, of: view, withInset: topInset) + fadeView.pin(.trailing, to: .trailing, of: view) + fadeView.pin(.bottom, to: .bottom, of: view) // Set up search bar // tableView.tableHeaderView = searchBar // searchBar.sizeToFit()