Merge pull request #1607 from ruuvi/testflight

v2.3.0 RC
ruuvi · Aug 24, 2023 · ea0bff4 · ea0bff4
2 parents ce00e0f + 2b686b8
commit ea0bff4
Show file tree

Hide file tree

Showing 121 changed files with 1,784 additions and 443 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (7.0.5)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -16,20 +16,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.780.0)
-    aws-sdk-core (3.175.0)
+    aws-partitions (1.791.0)
+    aws-sdk-core (3.178.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.67.0)
-      aws-sdk-core (~> 3, >= 3.174.0)
+    aws-sdk-kms (1.71.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.125.0)
-      aws-sdk-core (~> 3, >= 3.174.0)
+    aws-sdk-s3 (1.131.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -76,7 +76,7 @@ GEM
       highline (~> 2.0.0)
     concurrent-ruby (1.2.2)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -115,7 +115,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.213.0)
+    fastlane (2.214.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -159,9 +159,9 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.43.0)
+    google-apis-androidpublisher_v3 (0.46.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-core (0.11.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -190,7 +190,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.5.2)
+    googleauth (1.7.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)

diff --git a/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/Discover.storyboard b/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/Discover.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="D0E-ge-INE">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="D0E-ge-INE">
     <device id="retina6_1" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <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"/>
@@ -142,7 +142,7 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                                 <connections>
-                                    <action selector="handleBuyRuuviSensorsButtonTap:" destination="D0E-ge-INE" eventType="touchUpInside" id="Ub8-fc-zsD"/>
+                                    <action selector="handleActionButtonTap:" destination="D0E-ge-INE" eventType="touchUpInside" id="KpX-z4-1fT"/>
                                 </connections>
                             </button>
                         </subviews>
@@ -168,7 +168,7 @@
                     </navigationItem>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
                     <connections>
-                        <outlet property="buyRuuviSensorsButton" destination="pg7-cc-cA4" id="r8h-af-kih"/>
+                        <outlet property="actionButton" destination="pg7-cc-cA4" id="TqK-bY-WiB"/>
                         <outlet property="closeBarButtonItem" destination="1c0-rk-0ZN" id="DBf-CC-kMF"/>
                         <outlet property="tableView" destination="0mX-s6-EdV" id="7PU-eV-ReJ"/>
                     </connections>

diff --git a/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/de.lproj/RuuviDiscover.strings b/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/de.lproj/RuuviDiscover.strings
@@ -14,3 +14,17 @@
 "WebTagLocationSource.current" = "Ihr Standort";
 "WebTagLocationSource.manual" = "Wählen Sie aus der Karte";
 "Ruuvi.BuySensors.URL.IOS" = "https://ruuvi.com/products?utm_campaign=app_ua&utm_medium=referral&utm_source=ios";
+"add_with_nfc" = "Mit NFC hinzufügen";
+"sensor_details" = "Sensordetails";
+"add_sensor" = "Sensor hinzufügen";
+"copy_mac_address" = "MAC-Adresse kopieren";
+"copy_unique_id" = "Eindeutige ID kopieren";
+"name" = "Name:";
+"mac_address" = "MAC-Adresse:";
+"go_to_sensor" = "Gehen Sie zur Sensorkarte";
+"unique_id" = "Eindeutige ID:";
+"firmware_version" = "Firmware Version:";
+"close" = "Schließen";
+"add_sensor_nfc_df3_error" = "Dieser Sensor kann aufgrund der alten Firmware nicht mit NFC hinzugefügt werden. Bitte fügen Sie den Sensor über Bluetooth hinzu und aktualisieren Sie die Firmware.";
+"add_sensor_description" = "Auf dieser Seite werden Ruuvi-Sensoren in der Nähe angezeigt, die der App noch nicht hinzugefügt wurden. Tippen Sie auf einen Sensor, um ihn hinzuzufügen.";
+"add_sensor_via_nfc" = "Alternatively, you can add a sensor using NFC by selecting Add with NFC and touching it with your phone.";
diff --git a/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/en.lproj/RuuviDiscover.strings b/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/en.lproj/RuuviDiscover.strings
@@ -14,3 +14,17 @@
 "WebTagLocationSource.current" = "Your location";
 "WebTagLocationSource.manual" = "Pick from the map";
 "Ruuvi.BuySensors.URL.IOS" = "https://ruuvi.com/products?utm_campaign=app_ua&utm_medium=referral&utm_source=ios";
+"add_with_nfc" = "Add with NFC";
+"sensor_details" = "Sensor Details";
+"add_sensor" = "Add Sensor";
+"copy_mac_address" = "Copy MAC Address";
+"copy_unique_id" = "Copy Unique ID";
+"name" = "Name:";
+"mac_address" = "Mac Address:";
+"go_to_sensor" = "Go to sensor card";
+"unique_id" = "Unique ID:";
+"firmware_version" = "Firmware Version:";
+"close" = "Close";
+"add_sensor_nfc_df3_error" = "This tag cannot be added with NFC due to old firmware. Please add the tag with Bluetooth and update firmware.";
+"add_sensor_description" = "This page shows nearby Ruuvi sensors not yet added to the app. Tap a sensor to add it.";
+"add_sensor_via_nfc" = "Alternatively, you can add a sensor using NFC by selecting Add with NFC and touching it with your phone.";
diff --git a/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/fi.lproj/RuuviDiscover.strings b/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/fi.lproj/RuuviDiscover.strings
@@ -14,3 +14,17 @@
 "WebTagLocationSource.current" = "Nykyinen sijaintisi";
 "WebTagLocationSource.manual" = "Valitse kartalta";
 "Ruuvi.BuySensors.URL.IOS" = "https://ruuvi.com/fi/tuotteet?utm_campaign=app_ua&utm_medium=referral&utm_source=ios";
+"add_with_nfc" = "Lisää NFC:llä";
+"sensor_details" = "Anturin tiedot";
+"add_sensor" = "Lisää anturi";
+"copy_mac_address" = "Kopioi MAC-osoite";
+"copy_unique_id" = "Kopioi yksilöivä tunniste";
+"name" = "Nimi:";
+"mac_address" = "MAC-osoite:";
+"go_to_sensor" = "Siirry anturikortille";
+"unique_id" = "Yksilöivä tunniste:";
+"firmware_version" = "Laiteohjelmistoversio:";
+"close" = "Sulje";
+"add_sensor_nfc_df3_error" = "Vanha laiteohjelmisto ei salli anturin lisäämistä NFC:llä. Lisää anturi Bluetooth-yhteydellä ja päivitä laiteohjelmisto.";
+"add_sensor_description" = "Tällä sivulla näet lähelläsi olevat Ruuvi-anturit, joita ei ole vielä lisätty sovellukseen. Lisää listattu anturi napauttamalla.";
+"add_sensor_via_nfc" = "Voit vaihtoehtoisesti lisätä anturin sovellukseen NFC:llä napauttamalla Lisää NFC:llä painiketta ja koskettamalla sitä.";
diff --git a/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/fr.lproj/RuuviDiscover.strings b/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/fr.lproj/RuuviDiscover.strings
@@ -14,3 +14,17 @@
 "WebTagLocationSource.current" = "Localisation actuelle";
 "WebTagLocationSource.manual" = "Choisir sur la carte";
 "Ruuvi.BuySensors.URL.IOS" = "https://ruuvi.com/products?utm_campaign=app_ua&utm_medium=referral&utm_source=ios";
+"add_with_nfc" = "Ajouter avec NFC";
+"sensor_details" = "Détails du capteur";
+"add_sensor" = "Ajouter un capteur";
+"copy_mac_address" = "Copier l'adresse MAC";
+"copy_unique_id" = "Copier l'identifiant unique";
+"name" = "Nom:";
+"mac_address" = "Adresse Mac:";
+"go_to_sensor" = "Aller à la carte du capteur";
+"unique_id" = "Identifiant unique:";
+"firmware_version" = "Version du firmware:";
+"close" = "Fermer";
+"add_sensor_nfc_df3_error" = "Ce capteur ne peut pas être ajouté avec NFC en raison d'un ancien firmware. Veuillez ajouter le capteur avec Bluetooth et mettre à jour le firmware.";
+"add_sensor_description" = "Cette page montre les capteurs Ruuvi à proximité qui n'ont pas encore été ajoutés à l'application. Appuyez sur un capteur pour l'ajouter.";
+"add_sensor_via_nfc" = "Alternatively, you can add a sensor using NFC by selecting Add with NFC and touching it with your phone.";
diff --git a/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/ru.lproj/RuuviDiscover.strings b/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/ru.lproj/RuuviDiscover.strings
@@ -14,3 +14,17 @@
 "WebTagLocationSource.current" = "Ваше текущее месторасположение";
 "WebTagLocationSource.manual" = "Месторасположение на карте";
 "Ruuvi.BuySensors.URL.IOS" = "https://ruuvi.com/products?utm_campaign=app_ua&utm_medium=referral&utm_source=ios";
+"add_with_nfc" = "Add with NFC";
+"sensor_details" = "Sensor Details";
+"add_sensor" = "Add Sensor";
+"copy_mac_address" = "Копировать MAC-адрес";
+"copy_unique_id" = "Скопировать уникальный идентификатор";
+"name" = "Name:";
+"mac_address" = "Mac Address:";
+"go_to_sensor" = "Go to sensor card";
+"unique_id" = "Unique ID:";
+"firmware_version" = "Firmware Version:";
+"close" = "Close";
+"add_sensor_nfc_df3_error" = "This sensor cannot be added with NFC due to old firmware. Please add the sensor with Bluetooth and update firmware.";
+"add_sensor_description" = "Здесь показаны датчики Ruuvi, которые еще не были добавлены в приложение. Нажмите на сенсор, чтобы добавить его.";
+"add_sensor_via_nfc" = "Alternatively, you can add a sensor using NFC by selecting Add with NFC and touching it with your phone.";
diff --git a/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/sv.lproj/RuuviDiscover.strings b/Modules/RuuviDiscover/Sources/RuuviDiscover/Resources/sv.lproj/RuuviDiscover.strings
@@ -14,3 +14,17 @@
 "WebTagLocationSource.current" = "Din plats";
 "WebTagLocationSource.manual" = "Välj från karta";
 "Ruuvi.BuySensors.URL.IOS" = "https://ruuvi.com/products?utm_campaign=app_ua&utm_medium=referral&utm_source=ios";
+"add_with_nfc" = "Lägg till med NFC";
+"sensor_details" = "Sensordetaljer";
+"add_sensor" = "Lägg till sensor";
+"copy_mac_address" = "Kopiera MAC-adress";
+"copy_unique_id" = "Kopiera unikt ID";
+"name" = "Namn:";
+"mac_address" = "MAC-adress:";
+"go_to_sensor" = "Gå till sensorkortet";
+"unique_id" = "Unikt ID:";
+"firmware_version" = "Firmwareversion:";
+"close" = "Stänga";
+"add_sensor_nfc_df3_error" = "Denna sensor kan inte läggas till med NFC på grund av gammal firmware. Lägg till sensorn med Bluetooth och uppdatera firmware.";
+"add_sensor_description" = "Den här sidan visar närliggande Ruuvi-sensorer som ännu inte har lagts till i appen. Tryck på en sensor för att lägga till den.";
+"add_sensor_via_nfc" = "Alternatively, you can add a sensor using NFC by selecting Add with NFC and touching it with your phone.";
diff --git a/Modules/RuuviDiscover/Sources/RuuviDiscover/RuuviDiscover.swift b/Modules/RuuviDiscover/Sources/RuuviDiscover/RuuviDiscover.swift
@@ -12,6 +12,7 @@ public protocol RuuviDiscover: AnyObject {
 public protocol RuuviDiscoverOutput: AnyObject {
     func ruuviDiscoverWantsClose(_ ruuviDiscover: RuuviDiscover)
     func ruuvi(discover: RuuviDiscover, didAdd ruuviTag: AnyRuuviTagSensor)
+    func ruuvi(discover: RuuviDiscover, didSelectFromNFC ruuviTag: RuuviTagSensor)
     // Will be deprecated in near future. Currently retained to support already
     // added web tags.
     func ruuviDiscoverWantsPickLocation(_ ruuviDiscover: RuuviDiscover)