Show invisible element on scroll

martenrebane · Dec 18, 2023 · 22e02c8 · 22e02c8
1 parent 7b5918a
commit 22e02c8
Show file tree

Hide file tree

Showing 17 changed files with 76 additions and 2 deletions.
diff --git a/MoppApp/MoppApp/AccessibilityViewController.swift b/MoppApp/MoppApp/AccessibilityViewController.swift
@@ -28,7 +28,7 @@ class AccessibilityViewController : MoppViewController, UITextViewDelegate {
     @IBOutlet weak var scrollView: UIScrollView!
 
     @IBOutlet weak var closeButton: UIButton!
-
+    
     @IBOutlet weak var titleLabel: UILabel!
 
     @IBOutlet weak var contentView: UIView!
@@ -40,6 +40,8 @@ class AccessibilityViewController : MoppViewController, UITextViewDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        scrollView.delegate = self
+
         titleLabel.text = L(.accessibilityIntroductionTitle)
 
         var previousLabel: UILabel?

diff --git a/MoppApp/MoppApp/AddresseeViewController.swift b/MoppApp/MoppApp/AddresseeViewController.swift
@@ -62,6 +62,7 @@ class AddresseeViewController : MoppViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        tableView.delegate = self
         dismissKeyboard()
         LandingViewController.shared.tabButtonsDelegate = self
         LandingViewController.shared.presentButtons([])

diff --git a/MoppApp/MoppApp/ContainerViewController.swift b/MoppApp/MoppApp/ContainerViewController.swift
@@ -147,6 +147,7 @@ class ContainerViewController : MoppViewController, ContainerActions, PreviewAct
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        tableView.delegate = self
         tableView.contentInsetAdjustmentBehavior = .never
         updateState(.loading)
 

diff --git a/MoppApp/MoppApp/CryptoViewController.swift b/MoppApp/MoppApp/CryptoViewController.swift
@@ -72,6 +72,8 @@ class CryptoViewController : MoppViewController {
     }
 
     @IBAction func menuActivationSelector() {
+        let invisibleLabel = getInvisibleLabelInView(MoppApp.instance.rootViewController?.view, accessibilityIdentifier: invisibleElementAccessibilityIdentifier)
+        invisibleLabel?.isHidden = true
         let menuViewController = UIStoryboard.menu.instantiateInitialViewController()!
         menuViewController.modalPresentationStyle = .overFullScreen
         MoppApp.instance.rootViewController?.present(menuViewController, animated: true, completion: nil)

diff --git a/MoppApp/MoppApp/DiagnosticsViewController.swift b/MoppApp/MoppApp/DiagnosticsViewController.swift
@@ -26,6 +26,7 @@ class DiagnosticsViewController: MoppViewController, UIDocumentPickerDelegate {
 
     private var isSavingOneTimeLog = false
 
+    @IBOutlet weak var scrollView: UIScrollView!
     @IBOutlet weak var titleLabel: UILabel!
     @IBOutlet weak var appVersionLabel: UILabel!
     @IBOutlet weak var opSysVersionLabel: UILabel!
@@ -135,6 +136,8 @@ class DiagnosticsViewController: MoppViewController, UIDocumentPickerDelegate {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        scrollView.delegate = self
 
         printLog("Setting up diagnostics data")
 

diff --git a/MoppApp/MoppApp/Extensions/UIViewController+Additions.swift b/MoppApp/MoppApp/Extensions/UIViewController+Additions.swift
@@ -145,6 +145,7 @@ extension UIViewController {
             label.alpha = 0.0
             label.isUserInteractionEnabled = false
             label.isEnabled = false
+            return
         }
 
         let usedView = customView ?? view
@@ -155,6 +156,7 @@ extension UIViewController {
             if let scrollView = subview as? UIScrollView,
                let lastSubview = scrollView.subviews.last(where: { type(of: $0) == UIView.self }) {
                 addLabelToBottom(label: label, lastSubview: lastSubview)
+                changeInvisibleLabelVisibility(label, scrollView, false)
                 return
             } else if let lastSubview = view.subviews.last(where: { type(of: $0) == UIView.self }) {
                 addLabelToBottom(label: label, lastSubview: lastSubview)
@@ -184,4 +186,36 @@ extension UIViewController {
         label.topAnchor.constraint(equalTo: lastElement.bottomAnchor, constant: 16).isActive = true
         label.centerXAnchor.constraint(equalTo: lastElement.centerXAnchor).isActive = true
     }
+
+    func changeInvisibleLabelVisibility(_ invisibleLabel: UILabel, _ scrollView: UIScrollView?, _ isVisible: Bool? = nil) {
+        if let isVisible = isVisible {
+            invisibleLabel.isHidden = !isVisible
+        } else {
+            guard let scrollView = scrollView else {
+                invisibleLabel.isHidden = false
+                return
+            }
+
+            let visibleRect = CGRect(origin: scrollView.contentOffset, size: scrollView.bounds.size)
+            invisibleLabel.isHidden = !visibleRect.intersects(invisibleLabel.frame)
+        }
+    }
+
+    func getInvisibleLabelInView(_ view: UIView?, accessibilityIdentifier identifier: String) -> UILabel? {
+        guard let view = view else {
+            return nil
+        }
+
+        if let invisibleLabel = view.subviews.compactMap({ $0 as? UILabel }).first(where: { $0.accessibilityIdentifier == identifier }) {
+            return invisibleLabel
+        }
+
+        for subview in view.subviews {
+            if let invisibleLabel = getInvisibleLabelInView(subview, accessibilityIdentifier: identifier) {
+                return invisibleLabel
+            }
+        }
+
+        return nil
+    }
 }
diff --git a/MoppApp/MoppApp/IdCardViewController.swift b/MoppApp/MoppApp/IdCardViewController.swift
@@ -83,6 +83,8 @@ class IdCardViewController : MoppViewController, TokenFlowSigning {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        scrollView.delegate = self
 
         MoppLibCardReaderManager.sharedInstance().delegate = self
 

diff --git a/MoppApp/MoppApp/MenuViewController.swift b/MoppApp/MoppApp/MenuViewController.swift
@@ -195,6 +195,8 @@ extension MenuViewController : UITableViewDelegate {
 
 extension MenuViewController : MenuHeaderDelegate {
     func menuHeaderDismiss() {
+        let invisibleLabel = getInvisibleLabelInView(MoppApp.instance.rootViewController?.view, accessibilityIdentifier: invisibleElementAccessibilityIdentifier)
+        invisibleLabel?.isHidden = false
         dismiss(animated: true, completion: nil)
     }
 }

diff --git a/MoppApp/MoppApp/MobileIDEditViewController.swift b/MoppApp/MoppApp/MobileIDEditViewController.swift
@@ -67,6 +67,8 @@ class MobileIDEditViewController : MoppViewController, TokenFlowSigning {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        scrollView.delegate = self
 
         idCodeTextField.moppPresentDismissButton()
         phoneTextField.moppPresentDismissButton()

diff --git a/MoppApp/MoppApp/MoppViewController.swift b/MoppApp/MoppApp/MoppViewController.swift
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
-class MoppViewController : UIViewController {
+class MoppViewController : UIViewController, UIScrollViewDelegate {
 
     @IBOutlet weak var myLabel: UILabel!
 
@@ -172,4 +172,14 @@ class MoppViewController : UIViewController {
         }
         return nil
     }
+
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        if DefaultsHelper.isDebugMode {
+            guard let label = getInvisibleLabelInView(view, accessibilityIdentifier: invisibleElementAccessibilityIdentifier) else {
+                return
+            }
+
+            changeInvisibleLabelVisibility(label, scrollView)
+        }
+    }
 }
diff --git a/MoppApp/MoppApp/MyEid.storyboard b/MoppApp/MoppApp/MyEid.storyboard
@@ -374,6 +374,7 @@
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="tableView" destination="YRp-KX-D2F" id="jIh-pb-Wn3"/>
                         <outlet property="ui" destination="BwH-nR-tQl" id="z1S-FG-kGa"/>
                     </connections>
                 </viewController>
@@ -589,6 +590,7 @@
                     </view>
                     <size key="freeformSize" width="375" height="767"/>
                     <connections>
+                        <outlet property="scrollView" destination="UZI-z6-jr7" id="iCh-XK-l2J"/>
                         <outlet property="ui" destination="Pbk-gd-VHp" id="ywA-Rp-vxk"/>
                     </connections>
                 </viewController>

diff --git a/MoppApp/MoppApp/MyeIDChangeCodesViewController.swift b/MoppApp/MoppApp/MyeIDChangeCodesViewController.swift
@@ -21,6 +21,7 @@
  *
  */
 class MyeIDChangeCodesViewController: MoppViewController {
+    @IBOutlet weak var scrollView: UIScrollView!
     @IBOutlet weak var ui: MyeIDChangeCodesViewControllerUI!
     var model = MyeIDChangeCodesModel()
 
@@ -35,6 +36,7 @@ class MyeIDChangeCodesViewController: MoppViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         LandingViewController.shared.presentButtons([])
+        scrollView.delegate = self
         ui.delegate = self
     }
 

diff --git a/MoppApp/MoppApp/MyeIDInfoViewController.swift b/MoppApp/MoppApp/MyeIDInfoViewController.swift
@@ -24,6 +24,7 @@
 import Foundation
 
 class MyeIDInfoViewController: MoppViewController {
+    @IBOutlet weak var tableView: UITableView!
     @IBOutlet weak var ui: MyeIDInfoViewControllerUI!
 
     weak var infoManager: MyeIDInfoManager!
@@ -56,6 +57,8 @@ class MyeIDInfoViewController: MoppViewController {
         }
         ui.setupOnce()
         ui.delegate = self
+
+        tableView.delegate = self
 
         NotificationCenter.default.addObserver(
             self,

diff --git a/MoppApp/MoppApp/Settings.storyboard b/MoppApp/MoppApp/Settings.storyboard
@@ -806,6 +806,7 @@
                         <outlet property="rpUUIDInfo" destination="9M0-ZI-Vph" id="hFZ-Ln-SfA"/>
                         <outlet property="saveDiagnosticsLabel" destination="wJ6-Ui-Rim" id="oTD-d1-7Id"/>
                         <outlet property="saveLogButtonLabel" destination="YuQ-2C-isn" id="3ga-jj-Iq7"/>
+                        <outlet property="scrollView" destination="Ki8-k3-cmp" id="b7L-RB-fck"/>
                         <outlet property="sivaURL" destination="mys-OT-GnR" id="urG-d8-7zH"/>
                         <outlet property="smartIdSKURL" destination="ruH-oH-HXZ" id="mkI-1f-AwI"/>
                         <outlet property="smartIdURL" destination="axW-Sz-ktm" id="Uc2-Sx-eU7"/>

diff --git a/MoppApp/MoppApp/SettingsViewController.swift b/MoppApp/MoppApp/SettingsViewController.swift
@@ -21,6 +21,7 @@
  *
  */
 class SettingsViewController: MoppViewController {
+
     private(set) var timestampUrl: String!
     @IBOutlet weak var tableView: UITableView!
 
@@ -99,6 +100,8 @@ class SettingsViewController: MoppViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        tableView.delegate = self
+
         timestampUrl = DefaultsHelper.timestampUrl
         isDefaultTimestampValue = DefaultsHelper.defaultSettingsSwitch
     }

diff --git a/MoppApp/MoppApp/SigningViewController.swift b/MoppApp/MoppApp/SigningViewController.swift
@@ -78,6 +78,8 @@ class SigningViewController : MoppViewController {
     }
 
     @IBAction func menuActivationSelector() {
+        let invisibleLabel = getInvisibleLabelInView(MoppApp.instance.rootViewController?.view, accessibilityIdentifier: invisibleElementAccessibilityIdentifier)
+        invisibleLabel?.isHidden = true
         let menuViewController = UIStoryboard.menu.instantiateInitialViewController()!
             menuViewController.modalPresentationStyle = .overFullScreen
         MoppApp.instance.rootViewController?.present(menuViewController, animated: true, completion: nil)

diff --git a/MoppApp/MoppApp/SmartIDEditViewController.swift b/MoppApp/MoppApp/SmartIDEditViewController.swift
@@ -73,6 +73,8 @@ class SmartIDEditViewController : MoppViewController, TokenFlowSigning {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        scrollView.delegate = self
 
         titleLabel.text = L(.smartIdTitle)
         countryLabel.text = L(.smartIdCountryTitle)