Explorar el Código

fixed safe layour guide issue and changed bg-color of HelpViewController view

nayooti hace 5 años
padre
commit
68fc6db1d8

+ 14 - 4
deltachat-ios/Controller/HelpViewController.swift

@@ -20,9 +20,12 @@ class HelpViewController: UIViewController {
     // MARK: - lifecycle
     // MARK: - lifecycle
     override func viewDidLoad() {
     override func viewDidLoad() {
         super.viewDidLoad()
         super.viewDidLoad()
-        view.backgroundColor = .white
+        view.backgroundColor = .white //DcColors.defaultBackgroundColor
         self.title = String.localized("menu_help")
         self.title = String.localized("menu_help")
         setupSubviews()
         setupSubviews()
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
         loadHtmlContent { [unowned self] url in
         loadHtmlContent { [unowned self] url in
             // return to main thread
             // return to main thread
             DispatchQueue.main.async {
             DispatchQueue.main.async {
@@ -35,11 +38,18 @@ class HelpViewController: UIViewController {
     private func setupSubviews() {
     private func setupSubviews() {
         view.addSubview(webView)
         view.addSubview(webView)
         webView.translatesAutoresizingMaskIntoConstraints = false
         webView.translatesAutoresizingMaskIntoConstraints = false
-        webView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0).isActive = true
+        webView.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
+
         if #available(iOS 11, *) {
         if #available(iOS 11, *) {
-            webView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 0).isActive = true
+            webView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor, constant: 0).isActive = true
+            webView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor, constant: 0).isActive = true
+
+            //webView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 0).isActive = true
         } else {
         } else {
-            webView.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
+            webView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor, constant: 0).isActive = true
+            webView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0).isActive = true
+
+           // webView.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
         }
         }
         webView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0).isActive = true
         webView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0).isActive = true
         webView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true
         webView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true

+ 1 - 0
deltachat-ios/Helper/Colors.swift

@@ -8,6 +8,7 @@ struct DcColors {
     static let messageSecondaryColor = UIColor.themeColor(light: UIColor.init(hexString: "ebebed"),
     static let messageSecondaryColor = UIColor.themeColor(light: UIColor.init(hexString: "ebebed"),
                                                           dark: UIColor.init(hexString: "333333"))
                                                           dark: UIColor.init(hexString: "333333"))
     static let contactCellBackgroundColor = UIColor.themeColor(light: .white, dark: .black)
     static let contactCellBackgroundColor = UIColor.themeColor(light: .white, dark: .black)
+    static let defaultBackgroundColor = UIColor.themeColor(light: .white, dark: .black)
     static let chatBackgroundColor = UIColor.themeColor(light: UIColor(red: 255, green: 255, blue: 255, alpha: 0), dark: .black)
     static let chatBackgroundColor = UIColor.themeColor(light: UIColor(red: 255, green: 255, blue: 255, alpha: 0), dark: .black)
     static let checkmarkGreen = UIColor.themeColor(light: UIColor.rgb(red: 112, green: 177, blue: 92))
     static let checkmarkGreen = UIColor.themeColor(light: UIColor.rgb(red: 112, green: 177, blue: 92))
     static let defaultTextColor = UIColor.themeColor(light: .darkText, dark: .white)
     static let defaultTextColor = UIColor.themeColor(light: .darkText, dark: .white)