fix: [Regression] Add missing close buttons from settings pages #1977

ruuvi · Feb 24, 2024 · 98a847c · 98a847c
1 parent 80e5ef2
commit 98a847c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/Apps/RuuviStation/Sources/Classes/Presentation/Modules/About/About.storyboard b/Apps/RuuviStation/Sources/Classes/Presentation/Modules/About/About.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Jxi-gj-SMg">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Jxi-gj-SMg">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -175,6 +175,7 @@
                         <outlet property="aboutTextView" destination="pyx-d9-7cb" id="KnS-FS-hFt"/>
                         <outlet property="addedTagsLabel" destination="DQc-Dj-qjx" id="Cb5-s2-ra4"/>
                         <outlet property="databaseSizeLable" destination="8cl-Gj-SSM" id="52A-4u-X9Z"/>
+                        <outlet property="dismissButton" destination="FWL-lH-VPV" id="OLl-1B-1tA"/>
                         <outlet property="headerTitleLabel" destination="ol5-6m-wqF" id="V9G-Zh-5ws"/>
                         <outlet property="storedMeasurementsLabel" destination="Nhq-tg-RXR" id="lfF-HF-veI"/>
                         <outlet property="versionLabel" destination="YZT-Oy-FFh" id="Uqa-1k-Seb"/>
@@ -202,7 +203,7 @@
             <color red="0.20800000429153442" green="0.67799997329711914" blue="0.62400001287460327" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
         </namedColor>
         <systemColor name="labelColor">
-            <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
     </resources>
 </document>
diff --git a/Apps/RuuviStation/Sources/Classes/Presentation/Modules/About/View/AboutViewController.swift b/Apps/RuuviStation/Sources/Classes/Presentation/Modules/About/View/AboutViewController.swift
@@ -4,6 +4,7 @@ import UIKit
 class AboutViewController: UIViewController {
     var output: AboutViewOutput!
 
+    @IBOutlet weak var dismissButton: UIButton!
     @IBOutlet var headerTitleLabel: UILabel!
     @IBOutlet var aboutTextView: UITextView!
     @IBOutlet var versionLabel: UILabel!
@@ -97,6 +98,10 @@ extension AboutViewController: UITextViewDelegate {
 
 extension AboutViewController {
     private func configureViews() {
+        dismissButton.setImage(
+            RuuviAsset.dismissModalIcon.image,
+            for: .normal
+        )
         headerTitleLabel.text = RuuviLocalization.About.AboutHelp.header
         configureTextView()
         bindViewModel()

diff --git a/Apps/RuuviStation/Sources/Classes/Presentation/Modules/My Ruuvi/MyRuuvi.storyboard b/Apps/RuuviStation/Sources/Classes/Presentation/Modules/My Ruuvi/MyRuuvi.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="fDc-IE-4Od">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="fDc-IE-4Od">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -131,6 +131,7 @@
                     </view>
                     <connections>
                         <outlet property="deleteAccountButton" destination="IwE-sw-HXX" id="yww-HF-bnK"/>
+                        <outlet property="dismissButton" destination="aNb-Ai-FKX" id="TD3-tk-Ivq"/>
                         <outlet property="headerTitleLabel" destination="vH0-6s-kzr" id="uf1-WU-evC"/>
                         <outlet property="loggedInLabel" destination="TKl-9g-g1Q" id="mDP-XP-K4m"/>
                         <outlet property="signoutButton" destination="jOJ-fd-bgA" id="d8h-WT-fnR"/>
@@ -162,7 +163,7 @@
             <color red="0.20800000429153442" green="0.67799997329711914" blue="0.62400001287460327" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
         </namedColor>
         <systemColor name="labelColor">
-            <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
     </resources>
 </document>
diff --git a/...ion/Sources/Classes/Presentation/Modules/My Ruuvi/View/MyRuuviAccountViewController.swift b/...ion/Sources/Classes/Presentation/Modules/My Ruuvi/View/MyRuuviAccountViewController.swift
@@ -5,6 +5,7 @@ import UIKit
 class MyRuuviAccountViewController: UIViewController {
     var output: MyRuuviAccountViewOutput!
 
+    @IBOutlet weak var dismissButton: UIButton!
     @IBOutlet var headerTitleLabel: UILabel!
     @IBOutlet var loggedInLabel: UILabel!
     @IBOutlet var usernameLabel: UILabel!
@@ -74,6 +75,10 @@ extension MyRuuviAccountViewController {
     }
 
     private func configureViews() {
+        dismissButton.setImage(
+            RuuviAsset.dismissModalIcon.image,
+            for: .normal
+        )
         headerTitleLabel.text = RuuviLocalization.Menu.Label.MyRuuviAccount.text
         deleteAccountButton.setTitle(RuuviLocalization.MyRuuvi.Settings.DeleteAccount.title, for: .normal)
         deleteAccountButton.setTitle(RuuviLocalization.MyRuuvi.Settings.DeleteAccount.title, for: .normal)

diff --git a/...Classes/Presentation/Modules/Settings/Module/View/Table/SettingsTableViewController.swift b/...Classes/Presentation/Modules/Settings/Module/View/Table/SettingsTableViewController.swift
@@ -76,6 +76,7 @@ class SettingsTableViewController: UITableViewController {
 extension SettingsTableViewController: SettingsViewInput {
     func localize() {
         navigationItem.title = RuuviLocalization.Settings.NavigationItem.title
+        navigationItem.leftBarButtonItem?.image = RuuviAsset.dismissModalIcon.image
         temperatureTitleLabel.text = RuuviLocalization.Settings.Label.TemperatureUnit.text
         humidityTitleLabel.text = RuuviLocalization.Settings.Label.HumidityUnit.text
         pressureTitleLabel.text = RuuviLocalization.Settings.Label.PressureUnit.text