mirrors
/
nightguard
mirror of https://github.com/nightscout/nightguard.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed a UI Warning regarding a dynamic font size. Added localized Strings for the 'disable all Alarms' feature.

This commit is contained in:
dirk 2020-06-27 18:16:32 +02:00
parent 9c18ec8a7b
commit 8cfe534219
14 changed files with 85 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,3 +1,3 @@
source "https://rubygems.org"
gem "fastlane"
gem "fastlane", ">= 2.150.rc1"

51
Gemfile.lock
View File

@ -6,21 +6,21 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.308.0)
aws-sdk-core (3.94.0)
aws-partitions (1.334.0)
aws-sdk-core (3.102.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sdk-kms (1.35.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.63.0)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-s3 (1.70.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.3)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-sigv4 (1.2.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.3)
claide (1.0.3)
colored (1.2)
@ -34,16 +34,16 @@ GEM
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.5)
emoji_regex (1.0.1)
excon (0.73.0)
faraday (0.17.3)
excon (0.75.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
fastimage (2.1.7)
fastlane (2.146.1)
fastlane (2.150.0.rc3)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
aws-sdk-s3 (~> 1.0)
@ -54,12 +54,12 @@ GEM
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 2.0)
excon (>= 0.71.0, < 1.0.0)
faraday (~> 0.17)
faraday (>= 0.17, < 2.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.13.1)
faraday_middleware (>= 0.13.1, < 2.0)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.29.2, < 0.37.0)
google-api-client (>= 0.37.0, < 0.39.0)
google-cloud-storage (>= 1.15.0, < 2.0.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
@ -68,7 +68,6 @@ GEM
multi_xml (~> 0.5)
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
public_suffix (~> 2.0.0)
rubyzip (>= 1.3.0, < 2.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
@ -82,7 +81,7 @@ GEM
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-api-client (0.36.4)
google-api-client (0.38.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
@ -93,17 +92,17 @@ GEM
google-cloud-core (1.5.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.3.1)
google-cloud-env (1.3.2)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.0)
google-cloud-storage (1.26.0)
google-cloud-errors (1.0.1)
google-cloud-storage (1.26.2)
addressable (~> 2.5)
digest-crc (~> 0.4)
google-api-client (~> 0.33)
google-cloud-core (~> 1.2)
googleauth (~> 0.9)
mini_mime (~> 1.0)
googleauth (0.12.0)
googleauth (0.13.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
@ -127,7 +126,7 @@ GEM
naturally (2.2.0)
os (1.1.0)
plist (3.5.0)
public_suffix (2.0.5)
public_suffix (4.0.5)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
@ -149,7 +148,7 @@ GEM
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tty-cursor (0.7.1)
tty-screen (0.7.1)
tty-screen (0.8.0)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
@ -158,7 +157,7 @@ GEM
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
word_wrap (1.0.0)
xcodeproj (1.16.0)
xcodeproj (1.17.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
@ -173,7 +172,7 @@ PLATFORMS
ruby
DEPENDENCIES
fastlane
fastlane (>= 2.150.rc1)
BUNDLED WITH
1.17.2

2
nightguard WatchKit App/Info.plist
View File

@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>547</string>
<string>548</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>

2
nightguard WatchKit Extension/Info.plist
View File

@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>547</string>
<string>548</string>
<key>CLKComplicationPrincipalClass</key>
<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
<key>CLKComplicationSupportedFamilies</key>

6
nightguard.xcodeproj/project.pbxproj
View File

@ -85,6 +85,7 @@
43647C0B1BFF6435004389F9 /* ExtensionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43647C0A1BFF6435004389F9 /* ExtensionDelegate.swift */; };
43647C0D1BFF6435004389F9 /* NotificationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43647C0C1BFF6435004389F9 /* NotificationController.swift */; };
43647C0F1BFF6435004389F9 /* ComplicationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43647C0E1BFF6435004389F9 /* ComplicationController.swift */; };
436BE82D24A322AE00FDCBB5 /* BloodSugar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F1E0EC1D07693300C329A2 /* BloodSugar.swift */; };
43794F421C2F435A00DB8B58 /* AppConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43794F411C2F435A00DB8B58 /* AppConstants.swift */; };
43794F481C30482500DB8B58 /* DataRepositoryTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43794F471C30482500DB8B58 /* DataRepositoryTest.swift */; };
43794F491C30489C00DB8B58 /* NightscoutDataRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43794F451C303E4200DB8B58 /* NightscoutDataRepository.swift */; };
@ -1455,6 +1456,7 @@
43647BEE1BFF6435004389F9 /* nightguardUITests.swift in Sources */,
4330664023AFB6D200690C4A /* NightscoutDataRepository.swift in Sources */,
4330663C23AFB5F900690C4A /* ObservationToken.swift in Sources */,
436BE82D24A322AE00FDCBB5 /* BloodSugar.swift in Sources */,
4330663223AFB36D00690C4A /* NightscoutService.swift in Sources */,
4330663A23AFB5B100690C4A /* UserDefaultsValueGroups.swift in Sources */,
4330663523AFB3D900690C4A /* UserDefaultsRepository.swift in Sources */,
@ -1885,7 +1887,7 @@
CODE_SIGN_ENTITLEMENTS = nightguard/scoutwatch.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 544;
CURRENT_PROJECT_VERSION = 548;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = BSAVUVP8PV;
ENABLE_BITCODE = YES;
@ -1913,7 +1915,7 @@
CODE_SIGN_ENTITLEMENTS = nightguard/scoutwatch.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 544;
CURRENT_PROJECT_VERSION = 548;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = BSAVUVP8PV;
ENABLE_BITCODE = YES;

2
nightguard/AlarmViewController.swift
View File

@ -45,7 +45,7 @@ class AlarmViewController: CustomFormViewController {
belowSliderRow.cell.slider.addTarget(self, action: #selector(onSliderValueChanged(slider:event:)), for: .valueChanged)
form
+++ Section(header: "", footer: NSLocalizedString("Deactivate all alerts. This is NOT recommended. You will get no alarms whetever you select below.", comment: "Footer for disable all alerts switch."))
+++ Section(header: "", footer: NSLocalizedString("Deactivate all alerts. This is NOT recommended. You will get no alarms or notifications at all anymore!", comment: "Footer for disable all alerts switch."))
<<< SwitchRow("disableAllAlertsRow") { row in
row.title = NSLocalizedString("Disable all alerts", comment: "Label for disable all alerts")
row.value = AlarmRule.areAlertsGenerallyDisabled.value

BIN
nightguard/Base.lproj/Localizable.strings
View File

Binary file not shown.

84
nightguard/Base.lproj/Main.storyboard
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="oic-Vn-yoT">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<device id="retina3_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
@ -13,11 +13,11 @@
<objects>
<viewController storyboardIdentifier="snoozeAlarmViewController" id="pgd-kF-6zp" customClass="SnoozeAlarmViewController" customModule="nightguard" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="IuW-eZ-92X">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kYz-5B-GiV">
<rect key="frame" x="16" y="344" width="167.66666666666666" height="70"/>
<rect key="frame" x="16" y="300" width="140" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<rect key="contentStretch" x="0.0" y="0.0" width="0.5" height="1"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
@ -27,7 +27,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m53-UA-ptg">
<rect key="frame" x="191.66666666666663" y="344" width="167.33333333333337" height="70"/>
<rect key="frame" x="164" y="300" width="140" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<rect key="contentStretch" x="0.0" y="0.0" width="0.5" height="1"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
@ -37,7 +37,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N1c-KO-Mkj">
<rect key="frame" x="16" y="422" width="167.66666666666666" height="70"/>
<rect key="frame" x="16" y="378" width="140" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<rect key="contentStretch" x="0.0" y="0.0" width="0.5" height="1"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
@ -47,7 +47,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6vy-0z-ct0">
<rect key="frame" x="16" y="500" width="167.66666666666666" height="70"/>
<rect key="frame" x="16" y="456" width="140" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<rect key="contentStretch" x="0.0" y="0.0" width="0.5" height="1"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
@ -57,7 +57,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="829-7r-faZ">
<rect key="frame" x="16" y="266" width="167.66666666666666" height="70"/>
<rect key="frame" x="16" y="222" width="140" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="70" id="F2n-Sn-hoH"/>
@ -70,7 +70,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="feH-Wo-uea">
<rect key="frame" x="16" y="188" width="79.666666666666671" height="70"/>
<rect key="frame" x="16" y="144" width="66" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<viewLayoutGuide key="safeArea" id="Mhm-IG-ZGX"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
@ -80,7 +80,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MfQ-kN-jB6">
<rect key="frame" x="103.66666666666669" y="188" width="80" height="70"/>
<rect key="frame" x="90" y="144" width="66" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<viewLayoutGuide key="safeArea" id="IqT-EE-iRB"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
@ -90,13 +90,13 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Snooze Alarms for" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q3I-tj-Pu1">
<rect key="frame" x="16" y="120" width="343" height="36"/>
<rect key="frame" x="16" y="76" width="288" height="36"/>
<fontDescription key="fontDescription" type="system" pointSize="30"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="w2F-L4-3hs">
<rect key="frame" x="191.66666666666663" y="422" width="167.33333333333337" height="70"/>
<rect key="frame" x="164" y="378" width="140" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<rect key="contentStretch" x="0.0" y="0.0" width="0.5" height="1"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
@ -106,7 +106,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rTa-S2-pIs">
<rect key="frame" x="191.66666666666663" y="266" width="167.33333333333337" height="70"/>
<rect key="frame" x="164" y="222" width="140" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
<state key="normal" title="45min"/>
@ -115,7 +115,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xb6-y9-FQ0">
<rect key="frame" x="191.66666666666663" y="500" width="167.33333333333337" height="70"/>
<rect key="frame" x="164" y="456" width="140" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<rect key="contentStretch" x="0.0" y="0.0" width="0.5" height="1"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
@ -125,7 +125,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gRY-rA-xFX">
<rect key="frame" x="16" y="586" width="343" height="70"/>
<rect key="frame" x="16" y="542" width="288" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="32"/>
<state key="normal" title="Stop Snoozing"/>
@ -134,7 +134,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oaN-86-9XF">
<rect key="frame" x="191.66666666666666" y="188" width="79.666666666666657" height="70"/>
<rect key="frame" x="164" y="144" width="66" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<viewLayoutGuide key="safeArea" id="ZCK-y7-eRq"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
@ -144,7 +144,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fTQ-zL-7pq">
<rect key="frame" x="279.33333333333331" y="188" width="79.666666666666686" height="70"/>
<rect key="frame" x="238" y="144" width="66" height="70"/>
<color key="backgroundColor" red="0.35471885910000001" green="0.35471885910000001" blue="0.35471885910000001" alpha="1" colorSpace="calibratedRGB"/>
<viewLayoutGuide key="safeArea" id="TSx-Xp-rwE"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
@ -241,7 +241,7 @@
<navigationController id="GUP-Hx-gmC" sceneMemberID="viewController">
<tabBarItem key="tabBarItem" title="Main" image="Main" id="pbV-EP-yS6"/>
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" barStyle="black" id="7ix-NK-jR9">
<rect key="frame" x="0.0" y="44" width="375" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
@ -257,20 +257,20 @@
<objects>
<viewController id="wFP-V1-Fpg" customClass="MainViewController" customModule="nightguard" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" id="kaq-Fc-h0j">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="JZR-hs-OI1">
<rect key="frame" x="8" y="52" width="359" height="200"/>
<rect key="frame" x="8" y="8" width="304" height="200"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f6k-n0-9ni">
<rect key="frame" x="0.0" y="0.0" width="359" height="104"/>
<rect key="frame" x="0.0" y="0.0" width="304" height="104"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="240" verticalCompressionResistancePriority="1000" axis="vertical" alignment="bottom" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="zgM-gD-e9z">
<rect key="frame" x="0.0" y="0.0" width="193.66666666666666" height="104"/>
<rect key="frame" x="0.0" y="0.0" width="170" height="104"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="240" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" text="222" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="50" translatesAutoresizingMaskIntoConstraints="NO" id="aNX-u1-teT">
<rect key="frame" x="23.666666666666671" y="0.0" width="170" height="80"/>
<rect key="frame" x="0.0" y="0.0" width="170" height="80"/>
<rect key="contentStretch" x="0.0" y="0.0" width="0.0" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="80" id="amT-q9-wHT"/>
@ -280,23 +280,23 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" horizontalCompressionResistancePriority="999" placeholderIntrinsicWidth="168" placeholderIntrinsicHeight="20" translatesAutoresizingMaskIntoConstraints="NO" id="XtI-XB-VeV" customClass="GroupedLabelsView" customModule="nightguard" customModuleProvider="target">
<rect key="frame" x="25.666666666666657" y="84" width="168" height="20"/>
<rect key="frame" x="2" y="84" width="168" height="20"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
</subviews>
</stackView>
<view contentMode="scaleToFill" horizontalHuggingPriority="230" translatesAutoresizingMaskIntoConstraints="NO" id="CuD-yp-5tf" userLabel="Spacer view">
<rect key="frame" x="193.66666666666666" y="0.0" width="50" height="104"/>
<rect key="frame" x="170" y="0.0" width="39" height="104"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="32" id="gBH-rN-ZYN"/>
</constraints>
</view>
<stackView opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="36.5" placeholderIntrinsicHeight="104" axis="vertical" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="6bh-Q2-ugk">
<rect key="frame" x="243.66666666666663" y="0.0" width="40" height="104"/>
<rect key="frame" x="209" y="0.0" width="36.5" height="104"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="---" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="6" translatesAutoresizingMaskIntoConstraints="NO" id="7OG-w8-xXQ">
<rect key="frame" x="0.0" y="0.0" width="40" height="30"/>
<rect key="frame" x="0.0" y="0.0" width="36.5" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="4zp-9Q-nET"/>
</constraints>
@ -305,13 +305,13 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="6" translatesAutoresizingMaskIntoConstraints="NO" id="SLx-m6-8iP">
<rect key="frame" x="0.0" y="42" width="40" height="30"/>
<rect key="frame" x="0.0" y="42" width="36.5" height="30"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0.0U" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="6" translatesAutoresizingMaskIntoConstraints="NO" id="sxg-9W-FFR">
<rect key="frame" x="0.0" y="84" width="40" height="20"/>
<rect key="frame" x="0.0" y="84" width="36.5" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="qMv-Ka-vKS"/>
</constraints>
@ -331,32 +331,32 @@
</variation>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MZQ-Pu-l1x" userLabel="Spacer view">
<rect key="frame" x="283.66666666666669" y="0.0" width="16" height="104"/>
<rect key="frame" x="245.5" y="0.0" width="16" height="104"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="16" id="nJc-UK-Xfm"/>
</constraints>
</view>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="jkn-bn-vCC">
<rect key="frame" x="299.66666666666669" y="0.0" width="59.333333333333314" height="104"/>
<rect key="frame" x="261.5" y="0.0" width="42.5" height="104"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--:--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="6" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YvM-WS-hyk">
<rect key="frame" x="0.0" y="0.0" width="59.333333333333336" height="30"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--:--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="5" translatesAutoresizingMaskIntoConstraints="NO" id="YvM-WS-hyk">
<rect key="frame" x="0.0" y="0.0" width="42.5" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="tWi-VL-fcI"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="27"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0min" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="6" translatesAutoresizingMaskIntoConstraints="NO" id="FFv-EO-ylg">
<rect key="frame" x="0.0" y="42" width="59.333333333333336" height="30"/>
<rect key="frame" x="0.0" y="42" width="42.5" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="27"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="751" text="100%" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="6" translatesAutoresizingMaskIntoConstraints="NO" id="3ZI-eY-05Z">
<rect key="frame" x="0.0" y="84" width="59.333333333333336" height="20"/>
<rect key="frame" x="0.0" y="84" width="42.5" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="fkf-op-N2S"/>
</constraints>
@ -378,7 +378,7 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" placeholderIntrinsicWidth="398" placeholderIntrinsicHeight="80" translatesAutoresizingMaskIntoConstraints="NO" id="8KP-K7-ZDM" customClass="BasicStatsPanelView" customModule="nightguard" customModuleProvider="target">
<rect key="frame" x="0.0" y="120" width="359" height="80"/>
<rect key="frame" x="0.0" y="120" width="304" height="80"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" priority="750" constant="80" id="i40-16-jLK"/>
@ -392,14 +392,14 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dot-Yq-gkc" customClass="SKView">
<rect key="frame" x="0.0" y="268" width="375" height="365"/>
<rect key="frame" x="0.0" y="224" width="320" height="111"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1rF-Wm-FbJ">
<rect key="frame" x="100.00000000000001" y="276" width="175.33333333333337" height="23.666666666666686"/>
<rect key="frame" x="72.5" y="232" width="175.5" height="24"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="❌ Some error message..." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tea-wl-rpX">
<rect key="frame" x="8" y="3.9999999999999991" width="159.33333333333334" height="15.666666666666664"/>
<rect key="frame" x="8" y="4" width="159.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@ -420,14 +420,14 @@
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MNg-kT-Em2" userLabel="Slide to Snooze View" customClass="SlideToSnoozeView" customModule="nightguard" customModuleProvider="target">
<rect key="frame" x="0.0" y="649" width="375" height="80"/>
<rect key="frame" x="0.0" y="351" width="320" height="80"/>
<color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
<constraints>
<constraint firstAttribute="height" constant="80" id="i8h-7H-LUb"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G6P-2g-zF8">
<rect key="frame" x="303" y="657" width="64" height="64"/>
<rect key="frame" x="248" y="359" width="64" height="64"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ifJ-Wp-aAP">
<rect key="frame" x="8" y="8" width="48" height="48"/>
@ -547,7 +547,7 @@
<objects>
<navigationController storyboardIdentifier="snoozeAlarmNavigationController" id="MI8-zz-YdZ" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" barStyle="black" id="KHn-ga-QQJ">
<rect key="frame" x="0.0" y="44" width="375" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>

2
nightguard/Info.plist
View File

@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>547</string>
<string>548</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>

1
nightguard/PrefsViewController.swift
View File

@ -51,6 +51,7 @@ class PrefsViewController: CustomFormViewController {
nightscoutURLRow = URLRow() { row in
row.title = NSLocalizedString("URL", comment: "Title for URL")
row.placeholder = "http://night.fritz.box"
row.placeholderColor = UIColor.gray
row.value = URL(string: UserDefaultsRepository.baseUri.value)
row.add(rule: nightscoutURLRule)
row.validationOptions = .validatesOnDemand

BIN
nightguard/de.lproj/Localizable.strings
View File

Binary file not shown.

6
nightguard/fi-FI.lproj/Localizable.strings
View File

@ -366,3 +366,9 @@
/* Alert popup body text for disabling all alerts */
"It is not recommended to disable all alerts! Do you really want to disable all alerts?" = "It is not recommended to disable all alerts! Do you really want to disable all alerts?";
/* Footer for disable all alerts switch */
"Deactivate all alerts. This is NOT recommended. You will get no alarms or notifications at all anymore!" = "Deactivate all alerts. This is NOT recommended. You will get no alarms or notifications at all anymore!";
/* Label for disable all alerts */
"Disable all alerts" = "Disable all alerts";

2
nightguardTests/Info.plist
View File

@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>547</string>
<string>548</string>
</dict>
</plist>

2
nightguardUITests/Info.plist
View File

@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>547</string>
<string>548</string>
</dict>
</plist>