diff --git a/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/Contents.json b/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..55b7331dcc8ed2650698484b46e37e9b04368c89
--- /dev/null
+++ b/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/Contents.json
@@ -0,0 +1,26 @@
+{
+ "images" : [
+ {
+ "filename" : "errorIcon.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "errorIcon@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "errorIcon@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
+ }
+}
diff --git a/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/errorIcon.png b/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/errorIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..92f59e794d62d0691feee73f9da2b5f80cde7ae3
Binary files /dev/null and b/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/errorIcon.png differ
diff --git a/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/errorIcon@2x.png b/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/errorIcon@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a0be86e11e8660d4f1b6007c9ad7a4ebd308326
Binary files /dev/null and b/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/errorIcon@2x.png differ
diff --git a/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/errorIcon@3x.png b/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/errorIcon@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..07a9e775a964ecd8b458b361a6dea566bf375c2a
Binary files /dev/null and b/TimeUse+/Assets.xcassets/Events/errorIcon.imageset/errorIcon@3x.png differ
diff --git a/TimeUse+/Screens/Base.lproj/Home.storyboard b/TimeUse+/Screens/Base.lproj/Home.storyboard
index 125758af21ca98e1a7b9af401cf6912088396065..d3b8dd9c9cad10964bb41fe495a79c90c07d2f03 100644
--- a/TimeUse+/Screens/Base.lproj/Home.storyboard
+++ b/TimeUse+/Screens/Base.lproj/Home.storyboard
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="0De-JM-WLC">
- <device id="retina6_7" orientation="portrait" appearance="light"/>
+ <device id="retina5_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
@@ -30,17 +30,17 @@
<objects>
<viewController storyboardIdentifier="CalendarViewController" id="2N2-0S-aay" customClass="CalendarViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="pRQ-Ww-8AK">
- <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UtG-dC-PIf" userLabel="navBar">
- <rect key="frame" x="0.0" y="0.0" width="428" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NCn-La-edk">
- <rect key="frame" x="0.0" y="44" width="428" height="55"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Calendar" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BId-kJ-tGt">
- <rect key="frame" x="180" y="16.333333333333336" width="68" height="22.666666666666664"/>
+ <rect key="frame" x="172.66666666666666" y="17.666666666666668" width="68.666666666666657" height="20.000000000000004"/>
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
<color key="textColor" name="dark"/>
<nil key="highlightedColor"/>
@@ -58,7 +58,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vVu-Zs-P5G">
- <rect key="frame" x="378" y="0.0" width="40" height="55"/>
+ <rect key="frame" x="364" y="0.0" width="40" height="55"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="pmL-Xg-RfH"/>
</constraints>
@@ -95,56 +95,56 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M4I-gg-fqO">
- <rect key="frame" x="0.0" y="99" width="428" height="33"/>
+ <rect key="frame" x="0.0" y="55" width="414" height="33"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="16m-lR-eWE">
- <rect key="frame" x="0.0" y="32" width="428" height="1"/>
+ <rect key="frame" x="0.0" y="32" width="414" height="1"/>
<color key="backgroundColor" name="lightGrey"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="s8h-HY-lCi"/>
</constraints>
</view>
<stackView opaque="NO" contentMode="scaleToFill" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="Shw-IV-hcE">
- <rect key="frame" x="25" y="0.0" width="378" height="33"/>
+ <rect key="frame" x="25" y="0.0" width="364" height="33"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Mon" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c7V-X1-sD7">
- <rect key="frame" x="0.0" y="0.0" width="41" height="33"/>
+ <rect key="frame" x="0.0" y="0.0" width="39" height="33"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Tue" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w5h-Ua-EhF">
- <rect key="frame" x="56" y="0.0" width="41.333333333333343" height="33"/>
+ <rect key="frame" x="54" y="0.0" width="39.333333333333343" height="33"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Wed" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b9E-r8-ahF">
- <rect key="frame" x="112.33333333333334" y="0.0" width="41" height="33"/>
+ <rect key="frame" x="108.33333333333334" y="0.0" width="39" height="33"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="253" verticalHuggingPriority="251" text="Thu" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dtx-X6-VTh">
- <rect key="frame" x="168.33333333333334" y="0.0" width="41.333333333333343" height="33"/>
+ <rect key="frame" x="162.33333333333334" y="0.0" width="39.333333333333343" height="33"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Fri" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7aB-NQ-lTb">
- <rect key="frame" x="224.66666666666666" y="0.0" width="40.999999999999972" height="33"/>
+ <rect key="frame" x="216.66666666666666" y="0.0" width="39" height="33"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="253" verticalHuggingPriority="251" text="Sat" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2U0-eO-aro">
- <rect key="frame" x="280.66666666666669" y="0.0" width="41.333333333333314" height="33"/>
+ <rect key="frame" x="270.66666666666669" y="0.0" width="39.333333333333314" height="33"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sun" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y5L-YL-97l">
- <rect key="frame" x="337" y="0.0" width="41" height="33"/>
+ <rect key="frame" x="325" y="0.0" width="39" height="33"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
@@ -173,7 +173,7 @@
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="N9t-UF-DQ9" customClass="JTACMonthView" customModule="JTAppleCalendar">
- <rect key="frame" x="0.0" y="132" width="428" height="794"/>
+ <rect key="frame" x="0.0" y="88" width="414" height="648"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="hmh-K1-ccs">
<size key="itemSize" width="50" height="44"/>
@@ -198,7 +198,7 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a2j-bU-hBr">
- <rect key="frame" x="17.666666666666668" y="12" width="15.000000000000004" height="20"/>
+ <rect key="frame" x="16.666666666666668" y="13.333333333333334" width="17.000000000000004" height="17.666666666666664"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="dark"/>
<nil key="highlightedColor"/>
@@ -230,11 +230,11 @@
</collectionViewCell>
</cells>
<collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="DateHeader" id="rLa-Iq-5Ui" customClass="DateHeader" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="0.0" y="0.0" width="428" height="65"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="65"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="March 2020" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DOY-M5-L74">
- <rect key="frame" x="5" y="16" width="113.33333333333333" height="41"/>
+ <rect key="frame" x="5" y="16" width="112" height="41"/>
<constraints>
<constraint firstAttribute="height" constant="41" id="fDO-UP-RmW"/>
</constraints>
@@ -259,22 +259,22 @@
</connections>
</collectionView>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="qOn-ZV-95C">
- <rect key="frame" x="204" y="152" width="20" height="20"/>
+ <rect key="frame" x="197" y="108" width="20" height="20"/>
</activityIndicatorView>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W2v-ua-PxH" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="16" y="805" width="396" height="45"/>
+ <rect key="frame" x="16" y="649" width="382" height="45"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YIa-Hh-fNW">
- <rect key="frame" x="69" y="12.666666666666629" width="258.33333333333331" height="20"/>
+ <rect key="frame" x="42.666666666666657" y="13.666666666666631" width="297" height="17.666666666666671"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You have <count> of unvalidated events." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VNz-lc-5La">
- <rect key="frame" x="24.000000000000014" y="0.0" width="234.33333333333337" height="20"/>
+ <rect key="frame" x="24" y="0.0" width="273" height="17.666666666666668"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" red="1" green="0.99999000000000005" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="alert_small_icon" translatesAutoresizingMaskIntoConstraints="NO" id="952-5L-WqL">
- <rect key="frame" x="0.0" y="2" width="16" height="16"/>
+ <rect key="frame" x="0.0" y="1" width="16" height="16"/>
<color key="backgroundColor" name="red"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
@@ -344,11 +344,11 @@
<objects>
<viewController storyboardIdentifier="HomeViewController" id="0De-JM-WLC" customClass="HomeViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="0oy-XA-dUF">
- <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HFO-Bb-LoG">
- <rect key="frame" x="0.0" y="44" width="428" height="50"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YoL-Eh-YJn">
<rect key="frame" x="5" y="0.0" width="50" height="50"/>
@@ -361,7 +361,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Q5d-D0-l0x">
- <rect key="frame" x="373" y="0.0" width="50" height="50"/>
+ <rect key="frame" x="359" y="0.0" width="50" height="50"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="9Ll-Xk-Iqm"/>
</constraints>
@@ -371,7 +371,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dH4-gd-d7y" customClass="ExtendedUIButton" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="150" y="0.0" width="128" height="50"/>
+ <rect key="frame" x="143.66666666666666" y="0.0" width="126.99999999999997" height="50"/>
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
<state key="normal" title="31 March 2020" image="down_arrow_icon">
<color key="titleColor" name="dark"/>
@@ -402,7 +402,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="C55-wj-DpT" customClass="GMSMapView">
- <rect key="frame" x="0.0" y="94" width="428" height="380"/>
+ <rect key="frame" x="0.0" y="50" width="414" height="380"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" priority="950" constant="380" id="o1i-gj-0GY"/>
@@ -435,23 +435,23 @@
<objects>
<viewController storyboardIdentifier="EventDetailsViewController" id="wCw-g2-mLw" customClass="EventDetailsViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="bo4-v1-INg">
- <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Umf-x9-S9y" userLabel="navBar">
- <rect key="frame" x="0.0" y="0.0" width="428" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="2"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="44I-4K-PQH">
- <rect key="frame" x="0.0" y="44" width="428" height="55"/>
+ <rect key="frame" x="0.0" y="-53" width="414" height="55"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Event details" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="28O-GV-UHg">
- <rect key="frame" x="165" y="5" width="98.333333333333314" height="45"/>
+ <rect key="frame" x="158.33333333333334" y="5" width="97.333333333333343" height="45"/>
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hFD-zv-AWt">
- <rect key="frame" x="16" y="0.0" width="40" height="55"/>
+ <rect key="frame" x="16" y="0.0" width="47" height="55"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<state key="normal" title="Cancel">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -461,7 +461,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="656-MF-a8U">
- <rect key="frame" x="388" y="0.0" width="30" height="55"/>
+ <rect key="frame" x="370" y="0.0" width="34" height="55"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<state key="normal" title="Save">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -471,7 +471,7 @@
</connections>
</button>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="jPY-X2-K0E">
- <rect key="frame" x="360" y="17.666666666666664" width="20" height="20"/>
+ <rect key="frame" x="342" y="17.666666666666668" width="20" height="20.000000000000004"/>
</activityIndicatorView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -503,23 +503,23 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uW0-dg-sX3" customClass="GMSMapView">
- <rect key="frame" x="0.0" y="99" width="428" height="140"/>
+ <rect key="frame" x="0.0" y="2" width="414" height="140"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="140" id="bdJ-Nw-oxc"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bEo-q9-eYc">
- <rect key="frame" x="0.0" y="239" width="428" height="82"/>
+ <rect key="frame" x="0.0" y="142" width="414" height="82"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="I8Y-Zi-5HZ">
- <rect key="frame" x="0.0" y="0.0" width="64" height="81.666666666666671"/>
+ <rect key="frame" x="0.0" y="0.0" width="64" height="76.666666666666671"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="D8p-6M-nCf" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="16" y="17" width="48" height="48"/>
+ <rect key="frame" x="16" y="14.333333333333343" width="48" height="48"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="working_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Dw0-Ov-MmB">
- <rect key="frame" x="12" y="13.333333333333314" width="24" height="21"/>
+ <rect key="frame" x="12" y="13.666666666666657" width="24" height="21"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</imageView>
</subviews>
@@ -552,31 +552,31 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CDR-7F-u4G">
- <rect key="frame" x="64" y="0.0" width="106" height="81.666666666666671"/>
+ <rect key="frame" x="63.999999999999993" y="0.0" width="115.33333333333331" height="76.666666666666671"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ga8-3J-76L">
- <rect key="frame" x="8" y="8" width="98" height="65.666666666666671"/>
+ <rect key="frame" x="8" y="7.9999999999999964" width="107.33333333333333" height="60.666666666666657"/>
<connections>
<action selector="editAction:" destination="wCw-g2-mLw" eventType="touchUpInside" id="RmI-zF-oak"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Other other" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NId-cS-GHS">
- <rect key="frame" x="16" y="18" width="90" height="22.666666666666671"/>
+ <rect key="frame" x="15.999999999999993" y="18" width="99.333333333333314" height="20"/>
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
<color key="textColor" name="dark"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="00:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eLh-eU-CdK">
- <rect key="frame" x="16" y="43.666666666666686" width="33" height="20"/>
+ <rect key="frame" x="15.999999999999996" y="41" width="37.666666666666657" height="17.666666666666671"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="time_arrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="3J2-3U-Cet">
- <rect key="frame" x="55" y="51.333333333333314" width="12" height="5"/>
+ <rect key="frame" x="59.666666666666671" y="47.333333333333343" width="12" height="5"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalCompressionResistancePriority="749" text="07:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zIM-Qh-XdF">
- <rect key="frame" x="73" y="43.666666666666686" width="33" height="20"/>
+ <rect key="frame" x="77.666666666666657" y="41" width="37.666666666666657" height="17.666666666666671"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
@@ -601,16 +601,15 @@
<constraint firstItem="3J2-3U-Cet" firstAttribute="leading" secondItem="eLh-eU-CdK" secondAttribute="trailing" constant="6" id="x3G-A4-zqQ"/>
</constraints>
</view>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gai-sR-iCX">
- <rect key="frame" x="395" y="23" width="9" height="36"/>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gai-sR-iCX">
+ <rect key="frame" x="358" y="14.333333333333343" width="48" height="48"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
- <constraint firstAttribute="width" secondItem="gai-sR-iCX" secondAttribute="height" multiplier="1:4" id="8wr-fY-o31"/>
- <constraint firstAttribute="height" constant="36" id="Xh2-hM-Lhe"/>
+ <constraint firstAttribute="width" secondItem="gai-sR-iCX" secondAttribute="height" multiplier="1:1" id="8wr-fY-o31"/>
+ <constraint firstAttribute="height" constant="48" id="Xh2-hM-Lhe"/>
</constraints>
- <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<color key="tintColor" name="darkGrey"/>
- <state key="normal" backgroundImage="other_track_icon">
+ <state key="normal" image="other_track_icon">
<color key="titleColor" name="darkGrey"/>
</state>
<userDefinedRuntimeAttributes>
@@ -629,7 +628,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5KO-zy-6jN" customClass="ExtendedUIButton" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="16" y="81.666666666666686" width="396" height="32"/>
+ <rect key="frame" x="16" y="76.666666666666686" width="382" height="30"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<state key="normal" title="Event did not happen/belongs to previous event">
<color key="titleColor" name="darkGrey"/>
@@ -661,7 +660,7 @@
<constraint firstItem="gai-sR-iCX" firstAttribute="centerY" secondItem="CDR-7F-u4G" secondAttribute="centerY" id="G1B-kA-uos"/>
<constraint firstItem="CDR-7F-u4G" firstAttribute="top" secondItem="bEo-q9-eYc" secondAttribute="top" id="HgG-fR-UQ7"/>
<constraint firstItem="I8Y-Zi-5HZ" firstAttribute="leading" secondItem="bEo-q9-eYc" secondAttribute="leading" id="Yk5-al-mMe"/>
- <constraint firstAttribute="trailing" secondItem="gai-sR-iCX" secondAttribute="trailing" constant="24" id="a2q-yE-bJw"/>
+ <constraint firstAttribute="trailing" secondItem="gai-sR-iCX" secondAttribute="trailing" constant="8" id="a2q-yE-bJw"/>
<constraint firstItem="5KO-zy-6jN" firstAttribute="top" secondItem="CDR-7F-u4G" secondAttribute="bottom" id="dP7-oL-Cms"/>
<constraint firstItem="I8Y-Zi-5HZ" firstAttribute="centerY" secondItem="gai-sR-iCX" secondAttribute="centerY" id="dx0-TG-uXT"/>
<constraint firstAttribute="trailing" secondItem="5KO-zy-6jN" secondAttribute="trailing" constant="16" id="nxV-uD-FlQ"/>
@@ -675,7 +674,7 @@
</variation>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pJj-qb-GJs">
- <rect key="frame" x="0.0" y="321" width="428" height="40"/>
+ <rect key="frame" x="0.0" y="224" width="414" height="40"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0min" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lwa-mE-agz">
<rect key="frame" x="16" y="2" width="38" height="21"/>
@@ -684,13 +683,13 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1h0min" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9oh-67-SS3">
- <rect key="frame" x="357" y="2" width="55" height="21"/>
+ <rect key="frame" x="343" y="2" width="55" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RjX-4e-5go">
- <rect key="frame" x="16" y="31" width="396" height="4"/>
+ <rect key="frame" x="16" y="31" width="382" height="4"/>
<constraints>
<constraint firstAttribute="height" constant="4" id="zI8-eh-gPI"/>
</constraints>
@@ -710,10 +709,10 @@
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="2HA-nf-Z5X">
- <rect key="frame" x="0.0" y="478.33333333333326" width="428" height="413.66666666666674"/>
+ <rect key="frame" x="0.0" y="336" width="414" height="400"/>
<color key="backgroundColor" name="ultraLightGrey"/>
<constraints>
- <constraint firstAttribute="height" priority="100" constant="600" id="5Ca-Kz-UwV"/>
+ <constraint firstAttribute="height" priority="100" constant="400" id="5Ca-Kz-UwV"/>
</constraints>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="QhI-NF-Our">
<size key="itemSize" width="128" height="128"/>
@@ -724,16 +723,16 @@
<cells/>
</collectionView>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No information about activity needed." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dfT-p3-BNk">
- <rect key="frame" x="30" y="441" width="368" height="29.333333333333314"/>
+ <rect key="frame" x="30" y="332" width="354" height="51.333333333333314"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="22"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="88Y-Cm-sqH">
- <rect key="frame" x="204" y="349" width="20" height="20"/>
+ <rect key="frame" x="197" y="240" width="20" height="20"/>
</activityIndicatorView>
- <collectionView hidden="YES" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" alwaysBounceHorizontal="YES" showsVerticalScrollIndicator="NO" bouncesZoom="NO" dataMode="prototypes" id="EfS-2m-PhE" customClass="ActivityLoggedCollectionView" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="8" y="377" width="400" height="52"/>
+ <collectionView hidden="YES" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceHorizontal="YES" showsVerticalScrollIndicator="NO" bouncesZoom="NO" dataMode="prototypes" id="EfS-2m-PhE" customClass="ActivityLoggedCollectionView" customModule="TimeUse" customModuleProvider="target">
+ <rect key="frame" x="8" y="377" width="386" height="52"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" name="ultraLightGrey"/>
<collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="HyF-ec-cV3" customClass="ActivityLogggedCellController">
@@ -782,14 +781,28 @@
</cells>
</collectionView>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ij0-vD-713">
- <rect key="frame" x="0.0" y="44" width="428" height="848"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<subviews>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WAL-lt-08p" userLabel="ContentWrapper">
+ <rect key="frame" x="8" y="0.0" width="398" height="736"/>
+ <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+ </view>
<view alpha="0.75" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b7y-dw-APa">
- <rect key="frame" x="0.0" y="0.0" width="428" height="848"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
+ <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wji-ne-7c3">
+ <rect key="frame" x="8" y="0.0" width="398" height="736"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <state key="normal">
+ <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </state>
+ <connections>
+ <action selector="closeOverlay:" destination="wCw-g2-mLw" eventType="touchUpInside" id="7ep-pd-P5m"/>
+ </connections>
+ </button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QkD-La-IfJ" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="190" y="720" width="48" height="48"/>
+ <rect key="frame" x="183" y="608" width="48" height="48"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="close_icon" translatesAutoresizingMaskIntoConstraints="NO" id="rfJ-cp-bxA">
<rect key="frame" x="17" y="17" width="14" height="14"/>
@@ -826,26 +839,26 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Close" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Qo-Cy-SFm">
- <rect key="frame" x="192.66666666666666" y="768" width="43" height="20.333333333333371"/>
+ <rect key="frame" x="185.66666666666666" y="656" width="43" height="20.333333333333371"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tap to Choose" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3vw-ZQ-woW">
- <rect key="frame" x="141.33333333333337" y="80" width="145.66666666666663" height="26.333333333333329"/>
+ <rect key="frame" x="134.33333333333337" y="40" width="145.66666666666663" height="26.333333333333329"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="11P-6K-3m9">
- <rect key="frame" x="32" y="138.33333333333334" width="364" height="294.66666666666663"/>
+ <rect key="frame" x="32" y="98.333333333333343" width="350" height="274.66666666666663"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Y9h-A3-lyO" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
<rect key="frame" x="80" y="24" width="48" height="48"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="other_track_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Fjd-SK-T4I">
- <rect key="frame" x="22" y="16" width="4" height="16"/>
+ <rect key="frame" x="22" y="16.000000000000014" width="4" height="16"/>
<color key="tintColor" name="blue"/>
</imageView>
</subviews>
@@ -869,7 +882,7 @@
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nwh-Ib-j2B" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="80" y="111.99999999999997" width="48" height="48"/>
+ <rect key="frame" x="80" y="112" width="48" height="48"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="other_stay_icon" translatesAutoresizingMaskIntoConstraints="NO" id="8eP-w5-G4s">
<rect key="frame" x="19" y="12" width="10" height="24"/>
@@ -902,60 +915,60 @@
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chevron.up" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="15n-ER-N2R">
- <rect key="frame" x="81.333333333333329" y="88.666666666666629" width="45.333333333333329" height="26"/>
+ <rect key="frame" x="81.333333333333329" y="88.666666666666686" width="45.333333333333329" height="26"/>
<constraints>
<constraint firstAttribute="width" secondItem="15n-ER-N2R" secondAttribute="height" multiplier="44:35" id="6BF-fe-kZI"/>
<constraint firstAttribute="height" constant="36" id="x4b-OX-MHu"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AyU-hY-40p">
- <rect key="frame" x="0.0" y="183.99999999999997" width="364" height="1"/>
+ <rect key="frame" x="0.0" y="176" width="350" height="1"/>
<color key="backgroundColor" name="darkGrey"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="56n-eH-rWF"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Belongs to previous event" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mDj-In-FcZ">
- <rect key="frame" x="77" y="208.99999999999997" width="210" height="21"/>
+ <rect key="frame" x="70" y="189" width="210" height="21"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select if you wish to merge with previous event" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kCj-4G-B11">
- <rect key="frame" x="24" y="237.99999999999997" width="316" height="40.666666666666657"/>
+ <rect key="frame" x="24" y="218" width="302" height="40.666666666666686"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="30min" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bnm-pW-9Hf">
- <rect key="frame" x="148" y="45" width="36.666666666666657" height="20"/>
+ <rect key="frame" x="148" y="45.000000000000014" width="41.333333333333343" height="17.666666666666671"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="time_arrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Q0p-L2-mYK">
- <rect key="frame" x="188.66666666666666" y="52.666666666666657" width="12" height="5"/>
+ <rect key="frame" x="193.33333333333334" y="51.333333333333329" width="12" height="5"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2h40min" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o7b-jL-cfy">
- <rect key="frame" x="204.66666666666666" y="45" width="51.333333333333343" height="20"/>
+ <rect key="frame" x="209.33333333333334" y="45.000000000000014" width="58.000000000000028" height="17.666666666666671"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="blue"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Other" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rOI-AZ-seC">
- <rect key="frame" x="148" y="111.99999999999997" width="43.333333333333343" height="21"/>
+ <rect key="frame" x="148" y="112.00000000000001" width="43.333333333333343" height="20.999999999999986"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2h10min" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kKq-dE-NDA">
- <rect key="frame" x="148" y="132.99999999999997" width="51.333333333333343" height="20"/>
+ <rect key="frame" x="148" y="133" width="58" height="17.666666666666657"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="F8L-NA-BWF">
- <rect key="frame" x="0.0" y="184.99999999999997" width="364" height="109.66666666666666"/>
+ <rect key="frame" x="0.0" y="177" width="350" height="97.666666666666686"/>
<connections>
<action selector="mergeEventPressed:" destination="wCw-g2-mLw" eventType="touchUpInside" id="7us-m3-yql"/>
</connections>
@@ -991,8 +1004,8 @@
<constraint firstItem="kKq-dE-NDA" firstAttribute="top" secondItem="rOI-AZ-seC" secondAttribute="bottom" id="pWa-ge-KTq"/>
<constraint firstAttribute="trailing" secondItem="kCj-4G-B11" secondAttribute="trailing" constant="24" id="s6F-Rr-NAH"/>
<constraint firstAttribute="bottom" secondItem="kCj-4G-B11" secondAttribute="bottom" constant="16" id="skx-NB-xOp"/>
- <constraint firstItem="AyU-hY-40p" firstAttribute="top" secondItem="nwh-Ib-j2B" secondAttribute="bottom" constant="24" id="wRb-TC-si6"/>
- <constraint firstItem="mDj-In-FcZ" firstAttribute="top" secondItem="AyU-hY-40p" secondAttribute="bottom" constant="24" id="wsg-Rv-ovA"/>
+ <constraint firstItem="AyU-hY-40p" firstAttribute="top" secondItem="nwh-Ib-j2B" secondAttribute="bottom" constant="16" id="wRb-TC-si6"/>
+ <constraint firstItem="mDj-In-FcZ" firstAttribute="top" secondItem="AyU-hY-40p" secondAttribute="bottom" constant="12" id="wsg-Rv-ovA"/>
<constraint firstItem="Q0p-L2-mYK" firstAttribute="centerY" secondItem="Bnm-pW-9Hf" secondAttribute="centerY" id="y8T-yo-Hxg"/>
<constraint firstItem="o7b-jL-cfy" firstAttribute="centerY" secondItem="Q0p-L2-mYK" secondAttribute="centerY" id="yDt-h0-LRJ"/>
</constraints>
@@ -1003,16 +1016,16 @@
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ql4-hZ-Mfu">
- <rect key="frame" x="32" y="449.00000000000006" width="364" height="190.66666666666669"/>
+ <rect key="frame" x="32" y="389" width="350" height="182.66666666666663"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Other" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ftV-Fd-EaR">
- <rect key="frame" x="138.66666666666666" y="38" width="43.333333333333343" height="20.333333333333329"/>
+ <rect key="frame" x="131.66666666666666" y="30" width="43.333333333333343" height="20.333333333333329"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" name="dark"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YC-5P-3py" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="74.666666666666671" y="24" width="48" height="48"/>
+ <rect key="frame" x="67.666666666666671" y="16" width="48" height="48"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="other_stay_icon" translatesAutoresizingMaskIntoConstraints="NO" id="eQI-pv-5PT">
<rect key="frame" x="19" y="12" width="10" height="24"/>
@@ -1039,10 +1052,10 @@
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="amD-tx-Nsd" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="218" y="24" width="48" height="48"/>
+ <rect key="frame" x="211" y="16" width="48" height="48"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="errorIcon.png" translatesAutoresizingMaskIntoConstraints="NO" id="SdB-RE-QDw">
- <rect key="frame" x="7.6666666666666856" y="7.3333333333333712" width="33" height="33.666666666666664"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="errorIcon" translatesAutoresizingMaskIntoConstraints="NO" id="SdB-RE-QDw">
+ <rect key="frame" x="7.6666666666666572" y="7.3333333333333144" width="33" height="33.666666666666664"/>
<color key="tintColor" name="red"/>
</imageView>
</subviews>
@@ -1066,29 +1079,29 @@
</userDefinedRuntimeAttributes>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="time_arrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="5u3-ix-17k">
- <rect key="frame" x="190" y="45.666666666666629" width="12" height="5"/>
+ <rect key="frame" x="183" y="37.666666666666686" width="12" height="5"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ufB-bs-fVp">
- <rect key="frame" x="0.0" y="88" width="364" height="1"/>
+ <rect key="frame" x="0.0" y="80" width="350" height="1"/>
<color key="backgroundColor" name="darkGrey"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="0hj-zr-mG6"/>
</constraints>
</view>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Event did not Happen" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lt4-Hb-sLd">
- <rect key="frame" x="95" y="105" width="174" height="21"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Event did not happen" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lt4-Hb-sLd">
+ <rect key="frame" x="89.333333333333329" y="97" width="171.66666666666669" height="21"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select if this event was wrongly tracked" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vf4-hO-oqr">
- <rect key="frame" x="32" y="134" width="300" height="40.666666666666657"/>
+ <rect key="frame" x="32" y="126.00000000000001" width="286" height="40.666666666666671"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" name="darkGrey"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U35-Ob-9OG">
- <rect key="frame" x="0.0" y="88" width="364" height="102.66666666666669"/>
+ <rect key="frame" x="0.0" y="80" width="350" height="102.66666666666669"/>
<connections>
<action selector="eventDidNotHappenPressed:" destination="wCw-g2-mLw" eventType="touchUpInside" id="dVk-Ti-YIV"/>
</connections>
@@ -1106,7 +1119,7 @@
<constraint firstItem="amD-tx-Nsd" firstAttribute="leading" secondItem="5u3-ix-17k" secondAttribute="trailing" constant="16" id="OUU-vO-gES"/>
<constraint firstItem="vf4-hO-oqr" firstAttribute="leading" secondItem="ql4-hZ-Mfu" secondAttribute="leading" constant="32" id="S0f-21-srI"/>
<constraint firstItem="amD-tx-Nsd" firstAttribute="centerY" secondItem="6YC-5P-3py" secondAttribute="centerY" id="Swh-59-iyn"/>
- <constraint firstItem="6YC-5P-3py" firstAttribute="top" secondItem="ql4-hZ-Mfu" secondAttribute="top" constant="24" id="TZp-YJ-SV7"/>
+ <constraint firstItem="6YC-5P-3py" firstAttribute="top" secondItem="ql4-hZ-Mfu" secondAttribute="top" constant="16" id="TZp-YJ-SV7"/>
<constraint firstItem="5u3-ix-17k" firstAttribute="centerY" secondItem="ftV-Fd-EaR" secondAttribute="centerY" id="XpK-W4-Hq0"/>
<constraint firstItem="ufB-bs-fVp" firstAttribute="top" secondItem="6YC-5P-3py" secondAttribute="bottom" constant="16" id="dzQ-XF-kLh"/>
<constraint firstItem="vf4-hO-oqr" firstAttribute="top" secondItem="Lt4-Hb-sLd" secondAttribute="bottom" constant="8" id="e2o-2K-3y7"/>
@@ -1127,14 +1140,18 @@
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
- <constraint firstItem="3vw-ZQ-woW" firstAttribute="top" secondItem="ij0-vD-713" secondAttribute="top" constant="80" id="5Oq-MA-hjf"/>
+ <constraint firstItem="WAL-lt-08p" firstAttribute="bottom" secondItem="ij0-vD-713" secondAttribute="bottom" id="44s-Ek-eBh"/>
+ <constraint firstItem="3vw-ZQ-woW" firstAttribute="top" secondItem="ij0-vD-713" secondAttribute="top" constant="40" id="5Oq-MA-hjf"/>
<constraint firstAttribute="trailing" secondItem="b7y-dw-APa" secondAttribute="trailing" id="8hQ-kJ-cB9"/>
+ <constraint firstAttribute="trailingMargin" secondItem="WAL-lt-08p" secondAttribute="trailing" id="Sst-jx-o2k"/>
<constraint firstAttribute="trailing" secondItem="11P-6K-3m9" secondAttribute="trailing" constant="32" id="Tne-O3-Klu"/>
<constraint firstAttribute="trailing" secondItem="ql4-hZ-Mfu" secondAttribute="trailing" constant="32" id="VCF-VP-eC1"/>
+ <constraint firstItem="WAL-lt-08p" firstAttribute="top" secondItem="ij0-vD-713" secondAttribute="top" id="VpH-JJ-qpM"/>
<constraint firstItem="11P-6K-3m9" firstAttribute="leading" secondItem="ij0-vD-713" secondAttribute="leading" constant="32" id="Z1l-dp-cYl"/>
<constraint firstItem="6Qo-Cy-SFm" firstAttribute="top" secondItem="QkD-La-IfJ" secondAttribute="bottom" id="a7Y-ZF-gzU"/>
<constraint firstItem="3vw-ZQ-woW" firstAttribute="centerX" secondItem="ij0-vD-713" secondAttribute="centerX" id="aDH-Z3-a3d"/>
<constraint firstItem="ql4-hZ-Mfu" firstAttribute="top" secondItem="11P-6K-3m9" secondAttribute="bottom" constant="16" id="c9c-pC-uVn"/>
+ <constraint firstItem="WAL-lt-08p" firstAttribute="leading" secondItem="ij0-vD-713" secondAttribute="leadingMargin" id="grZ-ih-7rM"/>
<constraint firstAttribute="bottom" secondItem="QkD-La-IfJ" secondAttribute="bottom" constant="80" id="hVN-ZA-6L3"/>
<constraint firstItem="b7y-dw-APa" firstAttribute="top" secondItem="ij0-vD-713" secondAttribute="top" id="k35-vJ-icx"/>
<constraint firstItem="b7y-dw-APa" firstAttribute="leading" secondItem="ij0-vD-713" secondAttribute="leading" id="kKa-be-xMN"/>
@@ -1149,12 +1166,13 @@
<viewLayoutGuide key="safeArea" id="xoY-dU-Vhb"/>
<color key="backgroundColor" name="ultraLightGrey"/>
<constraints>
- <constraint firstItem="2HA-nf-Z5X" firstAttribute="top" secondItem="EfS-2m-PhE" secondAttribute="bottom" priority="100" constant="16" id="3CL-E0-VkY"/>
+ <constraint firstItem="2HA-nf-Z5X" firstAttribute="top" secondItem="EfS-2m-PhE" secondAttribute="bottom" constant="4" id="3CL-E0-VkY"/>
<constraint firstItem="xoY-dU-Vhb" firstAttribute="trailing" secondItem="dfT-p3-BNk" secondAttribute="trailing" constant="30" id="3Mf-Wm-1j9"/>
<constraint firstItem="pJj-qb-GJs" firstAttribute="trailing" secondItem="xoY-dU-Vhb" secondAttribute="trailing" id="3PM-kf-SIb"/>
<constraint firstItem="88Y-Cm-sqH" firstAttribute="centerX" secondItem="2HA-nf-Z5X" secondAttribute="centerX" id="5RF-Fp-l8Z"/>
<constraint firstItem="uW0-dg-sX3" firstAttribute="leading" secondItem="xoY-dU-Vhb" secondAttribute="leading" id="66k-On-5hx"/>
<constraint firstItem="xoY-dU-Vhb" firstAttribute="top" secondItem="44I-4K-PQH" secondAttribute="top" id="6g2-6n-C13"/>
+ <constraint firstItem="dfT-p3-BNk" firstAttribute="top" secondItem="pJj-qb-GJs" secondAttribute="bottom" priority="500" id="7mS-5f-nQX"/>
<constraint firstItem="bEo-q9-eYc" firstAttribute="top" secondItem="uW0-dg-sX3" secondAttribute="bottom" id="8zv-6B-aH5"/>
<constraint firstItem="uW0-dg-sX3" firstAttribute="top" secondItem="Umf-x9-S9y" secondAttribute="bottom" id="91E-7I-vQj"/>
<constraint firstItem="ij0-vD-713" firstAttribute="top" secondItem="xoY-dU-Vhb" secondAttribute="top" id="AQP-fE-qiY"/>
@@ -1172,9 +1190,9 @@
<constraint firstItem="pJj-qb-GJs" firstAttribute="leading" secondItem="xoY-dU-Vhb" secondAttribute="leading" id="Sbu-Oj-xW2"/>
<constraint firstItem="2HA-nf-Z5X" firstAttribute="top" secondItem="EfS-2m-PhE" secondAttribute="bottom" constant="16" id="UOH-bn-Vgk"/>
<constraint firstItem="Umf-x9-S9y" firstAttribute="top" secondItem="bo4-v1-INg" secondAttribute="top" id="WO0-t9-srJ"/>
- <constraint firstItem="dfT-p3-BNk" firstAttribute="top" secondItem="EfS-2m-PhE" secondAttribute="bottom" constant="12" id="XT0-vB-F6Y"/>
+ <constraint firstItem="dfT-p3-BNk" firstAttribute="top" secondItem="EfS-2m-PhE" secondAttribute="bottom" id="XT0-vB-F6Y"/>
<constraint firstItem="xoY-dU-Vhb" firstAttribute="bottom" secondItem="ij0-vD-713" secondAttribute="bottom" id="YKd-eK-aj4"/>
- <constraint firstItem="2HA-nf-Z5X" firstAttribute="top" secondItem="dfT-p3-BNk" secondAttribute="bottom" constant="8" id="cMM-p1-xNE"/>
+ <constraint firstItem="2HA-nf-Z5X" firstAttribute="top" secondItem="dfT-p3-BNk" secondAttribute="bottom" priority="100" constant="4" id="cMM-p1-xNE"/>
<constraint firstItem="Umf-x9-S9y" firstAttribute="trailing" secondItem="xoY-dU-Vhb" secondAttribute="trailing" id="d1D-2Q-6Ld"/>
<constraint firstItem="xoY-dU-Vhb" firstAttribute="trailing" secondItem="ij0-vD-713" secondAttribute="trailing" id="mwL-Nr-XD8"/>
<constraint firstItem="EfS-2m-PhE" firstAttribute="top" secondItem="pJj-qb-GJs" secondAttribute="bottom" constant="16" id="r9l-oo-gY3"/>
@@ -1192,7 +1210,11 @@
</variation>
</view>
<connections>
+ <outlet property="activityCollectionHiddenConstraint" destination="7mS-5f-nQX" id="Gm7-gD-MnX"/>
+ <outlet property="activityCollectionShownConstraint" destination="XT0-vB-F6Y" id="rKj-Pz-blZ"/>
<outlet property="activityIndicator" destination="88Y-Cm-sqH" id="igF-U2-igx"/>
+ <outlet property="activityListHiddenConstraint" destination="cMM-p1-xNE" id="aOS-ai-cdF"/>
+ <outlet property="activityListShownConstraint" destination="3CL-E0-VkY" id="NqO-Mg-qD9"/>
<outlet property="closeOverlayButton" destination="3qo-BW-3au" id="XcV-wA-XF8"/>
<outlet property="collectionView" destination="2HA-nf-Z5X" id="8Ps-v4-hTM"/>
<outlet property="currentEventDeleteIcon" destination="eQI-pv-5PT" id="H2o-Ke-HVQ"/>
@@ -1237,20 +1259,20 @@
<objects>
<viewController storyboardIdentifier="EventTypeViewController" id="q7F-d8-g4L" customClass="EventTypeViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="ssf-zO-CtJ">
- <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tx8-Fo-Sdz" userLabel="navBar">
- <rect key="frame" x="0.0" y="0.0" width="428" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sIz-Ze-wRS">
- <rect key="frame" x="0.0" y="44" width="428" height="55"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O1g-Mk-DmH" customClass="UIControl">
- <rect key="frame" x="15" y="7.6666666666666643" width="41" height="40"/>
+ <rect key="frame" x="15.000000000000004" y="7.6666666666666679" width="46.333333333333343" height="40"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bN5-gO-ilW">
- <rect key="frame" x="12" y="0.0" width="29" height="40"/>
+ <rect key="frame" x="12" y="0.0" width="34.333333333333336" height="40"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@@ -1278,7 +1300,7 @@
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Event type" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wPF-tv-JPB">
- <rect key="frame" x="174" y="16.333333333333336" width="80.333333333333314" height="22.666666666666664"/>
+ <rect key="frame" x="166.66666666666666" y="17.666666666666668" width="80.666666666666657" height="20.000000000000004"/>
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@@ -1304,7 +1326,7 @@
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="TlI-Nr-n5N">
- <rect key="frame" x="0.0" y="99" width="428" height="827"/>
+ <rect key="frame" x="0.0" y="55" width="414" height="681"/>
<color key="backgroundColor" name="ultraLightGrey"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="sFz-51-YWV">
<size key="itemSize" width="128" height="128"/>
@@ -1342,23 +1364,23 @@
<objects>
<viewController storyboardIdentifier="UntrackedEventTypeViewController" id="uQ9-WE-Y3N" customClass="UntrackedEventTypeViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="idJ-O9-Ocg">
- <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ks3-vM-xFA" userLabel="navBar">
- <rect key="frame" x="0.0" y="0.0" width="428" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GYV-x9-j4w">
- <rect key="frame" x="0.0" y="44" width="428" height="55"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Select event type" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vgK-h5-DSQ">
- <rect key="frame" x="148.33333333333337" y="5" width="131.66666666666663" height="45"/>
+ <rect key="frame" x="141.33333333333337" y="5" width="131.66666666666663" height="45"/>
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O0w-Xn-fuc">
- <rect key="frame" x="16" y="0.0" width="40" height="55"/>
+ <rect key="frame" x="16" y="0.0" width="47" height="55"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<state key="normal" title="Cancel">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1368,7 +1390,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="B1u-zY-Hgm">
- <rect key="frame" x="388" y="0.0" width="30" height="55"/>
+ <rect key="frame" x="370" y="0.0" width="34" height="55"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<state key="normal" title="Save">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1378,7 +1400,7 @@
</connections>
</button>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="i5K-Rp-Lau">
- <rect key="frame" x="360" y="17.666666666666664" width="20" height="20"/>
+ <rect key="frame" x="342" y="17.666666666666668" width="20" height="20.000000000000004"/>
</activityIndicatorView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1408,7 +1430,7 @@
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="sp1-6v-a5K">
- <rect key="frame" x="0.0" y="158.33333333333331" width="428" height="767.66666666666674"/>
+ <rect key="frame" x="0.0" y="114.33333333333331" width="414" height="621.66666666666674"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="HcF-SD-xO5">
<size key="itemSize" width="128" height="128"/>
@@ -1419,10 +1441,10 @@
<cells/>
</collectionView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="th9-66-Awl" userLabel="Belongs To Previous Event View">
- <rect key="frame" x="0.0" y="98.999999999999986" width="428" height="59.333333333333329"/>
+ <rect key="frame" x="0.0" y="55" width="414" height="59.333333333333343"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pkd-Wd-JSB">
- <rect key="frame" x="191" y="14.666666666666671" width="46" height="30"/>
+ <rect key="frame" x="184" y="14.666666666666671" width="46" height="30"/>
<state key="normal" title="Button"/>
<connections>
<action selector="belongsToPreviousEventAction:" destination="uQ9-WE-Y3N" eventType="touchUpInside" id="yhd-aF-VDH"/>
@@ -1471,23 +1493,23 @@
<objects>
<viewController storyboardIdentifier="AddActivitiesViewController" id="ebD-6J-AJp" customClass="AddActivitiesViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Xap-Ut-zLa">
- <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hGB-Jf-vzZ" userLabel="navBar">
- <rect key="frame" x="0.0" y="0.0" width="428" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Wf-mC-rFU">
- <rect key="frame" x="0.0" y="44" width="428" height="55"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="50K-ct-xtk">
- <rect key="frame" x="199.33333333333334" y="5" width="29.666666666666657" height="45"/>
+ <rect key="frame" x="193.33333333333334" y="5" width="27.666666666666657" height="45"/>
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
<color key="textColor" name="dark"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NTj-x1-cEY">
- <rect key="frame" x="16" y="0.0" width="40" height="55"/>
+ <rect key="frame" x="16" y="0.0" width="47" height="55"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<state key="normal" title="Cancel">
<color key="titleColor" name="darkGrey"/>
@@ -1497,7 +1519,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="119-Y3-95o">
- <rect key="frame" x="388" y="0.0" width="30" height="55"/>
+ <rect key="frame" x="370" y="0.0" width="34" height="55"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<state key="normal" title="Save">
<color key="titleColor" name="blue"/>
@@ -1526,7 +1548,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rBr-4J-SYB">
- <rect key="frame" x="0.0" y="98" width="428" height="1"/>
+ <rect key="frame" x="0.0" y="54" width="414" height="1"/>
<color key="backgroundColor" name="lightGrey"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="gtq-n5-wDE"/>
@@ -1544,7 +1566,7 @@
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Sjs-AF-h1P">
- <rect key="frame" x="0.0" y="99" width="428" height="827"/>
+ <rect key="frame" x="0.0" y="55" width="414" height="681"/>
<color key="backgroundColor" name="ultraLightGrey"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Dcw-9Y-oaQ">
<size key="itemSize" width="128" height="128"/>
@@ -1583,24 +1605,24 @@
<objects>
<viewController storyboardIdentifier="SettingsViewController" id="TBn-f6-umc" customClass="SettingsViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="TIt-8Y-Jju">
- <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nkj-Mz-3zB" userLabel="navBar">
- <rect key="frame" x="0.0" y="0.0" width="428" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lat-i4-ymn">
- <rect key="frame" x="0.0" y="44" width="428" height="55"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dAQ-YQ-1lM" customClass="UIControl">
- <rect key="frame" x="15" y="7.6666666666666643" width="41" height="40"/>
+ <rect key="frame" x="15.000000000000004" y="7.6666666666666679" width="46.333333333333343" height="40"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="back_icon" translatesAutoresizingMaskIntoConstraints="NO" id="T1l-5i-cN2">
<rect key="frame" x="0.0" y="0.0" width="7" height="40"/>
<color key="tintColor" name="blue"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1kO-GE-cTx">
- <rect key="frame" x="12" y="0.0" width="29" height="40"/>
+ <rect key="frame" x="12" y="0.0" width="34.333333333333336" height="40"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="blue"/>
<nil key="highlightedColor"/>
@@ -1622,7 +1644,7 @@
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Settings" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xc9-ig-Ukw">
- <rect key="frame" x="182" y="16.333333333333336" width="64.333333333333314" height="22.666666666666664"/>
+ <rect key="frame" x="175.66666666666666" y="17.666666666666668" width="62.666666666666657" height="20.000000000000004"/>
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
<color key="textColor" name="dark"/>
<nil key="highlightedColor"/>
@@ -1638,7 +1660,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7VZ-hD-Kp2">
- <rect key="frame" x="0.0" y="98" width="428" height="1"/>
+ <rect key="frame" x="0.0" y="54" width="414" height="1"/>
<color key="backgroundColor" name="lightGrey"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Fu3-6V-tQb"/>
@@ -1656,7 +1678,7 @@
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="3VG-WW-sV1">
- <rect key="frame" x="0.0" y="99" width="428" height="827"/>
+ <rect key="frame" x="0.0" y="55" width="414" height="681"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="OLN-Dy-ubN">
<size key="itemSize" width="128" height="128"/>
@@ -1667,7 +1689,7 @@
<cells/>
</collectionView>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="ywj-4a-cyg">
- <rect key="frame" x="204" y="119" width="20" height="20"/>
+ <rect key="frame" x="197" y="75" width="20" height="20"/>
</activityIndicatorView>
</subviews>
<viewLayoutGuide key="safeArea" id="se8-je-EIy"/>
@@ -1699,24 +1721,24 @@
<objects>
<viewController storyboardIdentifier="FAQViewController" id="Rre-Uz-kUn" customClass="FAQViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="NPP-3U-0NY">
- <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i5Q-Bo-LsH">
- <rect key="frame" x="0.0" y="0.0" width="428" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TiX-mk-oho">
- <rect key="frame" x="0.0" y="44" width="428" height="55"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pLR-WV-h2m" customClass="UIControl">
- <rect key="frame" x="15" y="7.6666666666666643" width="41" height="40"/>
+ <rect key="frame" x="15.000000000000004" y="7.6666666666666679" width="46.333333333333343" height="40"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="back_icon" translatesAutoresizingMaskIntoConstraints="NO" id="8nj-JY-JS3">
<rect key="frame" x="0.0" y="0.0" width="7" height="40"/>
<color key="tintColor" name="blue"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xkX-9D-U2G">
- <rect key="frame" x="12" y="0.0" width="29" height="40"/>
+ <rect key="frame" x="12" y="0.0" width="34.333333333333336" height="40"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="blue"/>
<nil key="highlightedColor"/>
@@ -1738,7 +1760,7 @@
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FAQ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Opp-6p-ZQz">
- <rect key="frame" x="198" y="16.333333333333336" width="32" height="22.666666666666664"/>
+ <rect key="frame" x="190.66666666666666" y="17.666666666666668" width="33" height="20.000000000000004"/>
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
<color key="textColor" name="dark"/>
<nil key="highlightedColor"/>
@@ -1754,7 +1776,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="njV-H2-Zeb">
- <rect key="frame" x="0.0" y="98" width="428" height="1"/>
+ <rect key="frame" x="0.0" y="54" width="414" height="1"/>
<color key="backgroundColor" name="lightGrey"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="2sZ-mk-Ub8"/>
@@ -1772,7 +1794,7 @@
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="CAx-5n-PCn">
- <rect key="frame" x="0.0" y="99" width="428" height="827"/>
+ <rect key="frame" x="0.0" y="55" width="414" height="681"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="3Eo-9p-O6F">
<size key="itemSize" width="128" height="128"/>
@@ -1783,7 +1805,7 @@
<cells/>
</collectionView>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="lna-nX-hQC">
- <rect key="frame" x="204" y="119" width="20" height="20"/>
+ <rect key="frame" x="197" y="75" width="20" height="20"/>
</activityIndicatorView>
</subviews>
<viewLayoutGuide key="safeArea" id="cpe-fr-JIg"/>
@@ -1815,24 +1837,24 @@
<objects>
<viewController storyboardIdentifier="FAQDetailsViewController" id="k4Z-3l-7RX" customClass="FAQDetailsViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="H5X-yK-nnK">
- <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1jF-hf-gVn">
- <rect key="frame" x="0.0" y="0.0" width="428" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="69.666666666666671"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ifn-pu-3cR">
- <rect key="frame" x="0.0" y="44" width="428" height="55"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="69.666666666666671"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ND3-K7-pou" customClass="UIControl">
- <rect key="frame" x="15" y="0.0" width="41" height="55"/>
+ <rect key="frame" x="15.000000000000004" y="0.0" width="46.333333333333343" height="69.666666666666671"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" image="back_icon" translatesAutoresizingMaskIntoConstraints="NO" id="P8q-L5-5KJ">
- <rect key="frame" x="0.0" y="0.0" width="7" height="55"/>
+ <rect key="frame" x="0.0" y="0.0" width="7" height="69.666666666666671"/>
<color key="tintColor" name="blue"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Back" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agh-YH-Voj">
- <rect key="frame" x="12" y="0.0" width="29" height="55"/>
+ <rect key="frame" x="12" y="0.0" width="34.333333333333336" height="69.666666666666671"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="blue"/>
<nil key="highlightedColor"/>
@@ -1853,7 +1875,7 @@
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Where do I see my deleted events that are deleted from the list?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y6s-Bd-eTb">
- <rect key="frame" x="84" y="5" width="260" height="45"/>
+ <rect key="frame" x="83.666666666666671" y="4.9999999999999964" width="246.66666666666663" height="59.666666666666657"/>
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
<color key="textColor" name="dark"/>
<nil key="highlightedColor"/>
@@ -1874,7 +1896,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ant-BF-sXo">
- <rect key="frame" x="0.0" y="98" width="428" height="1"/>
+ <rect key="frame" x="0.0" y="68.666666666666671" width="414" height="1"/>
<color key="backgroundColor" name="lightGrey"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="mkl-2S-3Ia"/>
@@ -1892,7 +1914,7 @@
</constraints>
</view>
<wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MBJ-R4-WDB">
- <rect key="frame" x="0.0" y="99" width="428" height="827"/>
+ <rect key="frame" x="0.0" y="69.666666666666686" width="414" height="666.33333333333326"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<wkWebViewConfiguration key="configuration">
<audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
@@ -1927,20 +1949,20 @@
<objects>
<viewController storyboardIdentifier="ChangePasswordViewController" id="b1l-qd-QLz" customClass="ChangePasswordViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="hKl-Pv-Se3">
- <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gCO-wJ-enL" userLabel="headerView">
- <rect key="frame" x="0.0" y="44" width="428" height="48"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="48"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Change password" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lh3-78-m1v">
- <rect key="frame" x="130" y="20" width="168" height="28"/>
+ <rect key="frame" x="123" y="20" width="168" height="28"/>
<fontDescription key="fontDescription" name="Roboto-Bold" family="Roboto" pointSize="21"/>
<color key="textColor" red="0.094119999999999995" green="0.094119999999999995" blue="0.094119999999999995" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VDK-mv-Vna">
- <rect key="frame" x="388" y="16.666666666666664" width="35" height="35"/>
+ <rect key="frame" x="374" y="16.666666666666671" width="35" height="35"/>
<constraints>
<constraint firstAttribute="width" constant="35" id="bNj-iF-T9Z"/>
<constraint firstAttribute="height" constant="35" id="sgk-9o-iE8"/>
@@ -1963,16 +1985,16 @@
</constraints>
</view>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7ec-BI-L60">
- <rect key="frame" x="0.0" y="124" width="428" height="681"/>
+ <rect key="frame" x="0.0" y="80" width="414" height="569"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T0X-Un-hqz" userLabel="formView">
- <rect key="frame" x="0.0" y="0.0" width="428" height="112"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="112"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mc1-gg-EgZ" userLabel="currentPasswordView" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="40" y="0.0" width="348" height="52"/>
+ <rect key="frame" x="40" y="0.0" width="334" height="52"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7bw-tK-moj" customClass="SkyFloatingLabelTextField" customModule="SkyFloatingLabelTextField">
- <rect key="frame" x="16" y="6" width="316" height="46"/>
+ <rect key="frame" x="16" y="6" width="302" height="46"/>
<constraints>
<constraint firstAttribute="height" constant="46" id="btS-aa-AZk"/>
</constraints>
@@ -2013,7 +2035,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ihi-z4-7gT">
- <rect key="frame" x="308" y="11" width="30" height="30"/>
+ <rect key="frame" x="294" y="11" width="30" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="AXU-a3-NMV"/>
<constraint firstAttribute="width" constant="30" id="Rl4-zZ-hsC"/>
@@ -2050,10 +2072,10 @@
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5MS-Oa-6sD" userLabel="newPasswordView" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="40" y="60" width="348" height="52"/>
+ <rect key="frame" x="40" y="60" width="334" height="52"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="22g-61-Gzz" customClass="SkyFloatingLabelTextField" customModule="SkyFloatingLabelTextField">
- <rect key="frame" x="16" y="6" width="316" height="46"/>
+ <rect key="frame" x="16" y="6" width="302" height="46"/>
<constraints>
<constraint firstAttribute="height" constant="46" id="I5f-aq-QO4"/>
</constraints>
@@ -2094,7 +2116,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yhz-NY-3QL">
- <rect key="frame" x="308" y="11" width="30" height="30"/>
+ <rect key="frame" x="294" y="11" width="30" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="0qY-UT-CeW"/>
<constraint firstAttribute="height" constant="30" id="f75-bH-9B7"/>
@@ -2154,10 +2176,10 @@
<viewLayoutGuide key="frameLayoutGuide" id="3vE-rt-O8g"/>
</scrollView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hWC-Tx-2gn" userLabel="signInView">
- <rect key="frame" x="0.0" y="805" width="428" height="55"/>
+ <rect key="frame" x="0.0" y="649" width="414" height="55"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jip-xh-dfv" customClass="ExtendedUIButton" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="32" y="0.0" width="364" height="55"/>
+ <rect key="frame" x="32" y="0.0" width="350" height="55"/>
<color key="backgroundColor" name="blue"/>
<constraints>
<constraint firstAttribute="height" constant="55" id="eaL-v6-kct"/>
@@ -2176,7 +2198,7 @@
</connections>
</button>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="Sc4-es-iLU">
- <rect key="frame" x="361" y="17.666666666666629" width="20" height="20"/>
+ <rect key="frame" x="347" y="17.666666666666629" width="20" height="20"/>
<color key="color" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</activityIndicatorView>
</subviews>
@@ -2191,7 +2213,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e5t-Jv-bCI" customClass="KeyboardAvoidingView" customModule="TimeUse" customModuleProvider="target">
- <rect key="frame" x="0.0" y="892" width="428" height="0.0"/>
+ <rect key="frame" x="0.0" y="736" width="414" height="0.0"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" id="0pL-ZQ-cxA"/>
@@ -2245,24 +2267,24 @@
<objects>
<viewController storyboardIdentifier="CurrencyViewController" id="ud0-f8-i5D" customClass="CurrencyViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="3Dd-G3-gfO">
- <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Lb-Rt-Pkh">
- <rect key="frame" x="0.0" y="0.0" width="428" height="99"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Eyt-N6-ttD">
- <rect key="frame" x="0.0" y="44" width="428" height="55"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="55"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tlc-fP-i0O" customClass="UIControl">
- <rect key="frame" x="15" y="7.6666666666666643" width="41" height="40"/>
+ <rect key="frame" x="15.000000000000004" y="7.6666666666666679" width="46.333333333333343" height="40"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="back_icon" translatesAutoresizingMaskIntoConstraints="NO" id="tCo-62-M33">
<rect key="frame" x="0.0" y="0.0" width="7" height="40"/>
<color key="tintColor" name="blue"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nfA-q2-s8r">
- <rect key="frame" x="12" y="0.0" width="29" height="40"/>
+ <rect key="frame" x="12" y="0.0" width="34.333333333333336" height="40"/>
<fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
<color key="textColor" name="blue"/>
<nil key="highlightedColor"/>
@@ -2284,7 +2306,7 @@
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Currency" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O6z-gZ-RgV">
- <rect key="frame" x="179.66666666666666" y="16.333333333333336" width="69" height="22.666666666666664"/>
+ <rect key="frame" x="172.66666666666666" y="17.666666666666668" width="69" height="20.000000000000004"/>
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
<color key="textColor" name="dark"/>
<nil key="highlightedColor"/>
@@ -2300,7 +2322,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a3I-zX-S7t">
- <rect key="frame" x="0.0" y="98" width="428" height="1"/>
+ <rect key="frame" x="0.0" y="54" width="414" height="1"/>
<color key="backgroundColor" name="lightGrey"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="uRF-rq-YXv"/>
@@ -2318,7 +2340,7 @@
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="48s-1A-hyq">
- <rect key="frame" x="0.0" y="99" width="428" height="827"/>
+ <rect key="frame" x="0.0" y="55" width="414" height="681"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="iED-l0-Nmi">
<size key="itemSize" width="128" height="128"/>
@@ -2329,7 +2351,7 @@
<cells/>
</collectionView>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="4jc-vi-HWn">
- <rect key="frame" x="204" y="119" width="20" height="20"/>
+ <rect key="frame" x="197" y="75" width="20" height="20"/>
</activityIndicatorView>
</subviews>
<viewLayoutGuide key="safeArea" id="1D2-of-xHK"/>
@@ -2359,10 +2381,10 @@
</scenes>
<designables>
<designable name="22g-61-Gzz">
- <size key="intrinsicContentSize" width="316" height="42.29638671875"/>
+ <size key="intrinsicContentSize" width="302" height="42.29638671875"/>
</designable>
<designable name="7bw-tK-moj">
- <size key="intrinsicContentSize" width="316" height="42.29638671875"/>
+ <size key="intrinsicContentSize" width="302" height="42.29638671875"/>
</designable>
</designables>
<resources>
@@ -2371,7 +2393,7 @@
<image name="chevron.up" catalog="system" width="128" height="72"/>
<image name="close_icon" width="14" height="14"/>
<image name="down_arrow_icon" width="12" height="8"/>
- <image name="errorIcon.png" width="33" height="33.666667938232422"/>
+ <image name="errorIcon" width="33" height="33.666667938232422"/>
<image name="other_stay_icon" width="10" height="24"/>
<image name="other_track_icon" width="4" height="16"/>
<image name="refresh_icon" width="18" height="17"/>
diff --git a/TimeUse+/Screens/Home/AddActivitiesViewController.swift b/TimeUse+/Screens/Home/AddActivitiesViewController.swift
index 517809b296dab1979dee99759dafb4aa9723db74..8918dc308ff01fdafdc34107cba1e9193ba82286 100644
--- a/TimeUse+/Screens/Home/AddActivitiesViewController.swift
+++ b/TimeUse+/Screens/Home/AddActivitiesViewController.swift
@@ -100,7 +100,7 @@ class AddActivitiesViewController: __CollectionFeedController, AttributesSelecti
if activity.settings.isBudgetActive {
addMoneySection(to: &content, with: §ions)
}
- if activity.settings.isExpendituresActive, activity.attribute?.budget != 0 {
+ if activity.settings.isExpendituresActive, (activity.attribute?.budget != 0 && activity.attribute?.budget != nil) {
addExpenditureSection(to: &content, with: §ions)
}
@@ -159,7 +159,7 @@ class AddActivitiesViewController: __CollectionFeedController, AttributesSelecti
guard activity.settings.isExpendituresActive else {
return
}
- if temporaryAttribute.budget == 0 {
+ if temporaryAttribute.budget == 0 || temporaryAttribute.budget == nil{
temporaryAttribute.expenditures = []
if content.last is [ExpenditureStayModel] || content.last is [ExpenditureTrackModel] {
content.removeLast()
diff --git a/TimeUse+/Screens/Home/Cells/BaseAttributeCell/BaseAttributeCell.xib b/TimeUse+/Screens/Home/Cells/BaseAttributeCell/BaseAttributeCell.xib
index ec1beea1baebd933376a7f5d332d9e9a41f0d2ba..62697225e16b5f7f38230add81044e29dc7e83f5 100644
--- a/TimeUse+/Screens/Home/Cells/BaseAttributeCell/BaseAttributeCell.xib
+++ b/TimeUse+/Screens/Home/Cells/BaseAttributeCell/BaseAttributeCell.xib
@@ -33,8 +33,8 @@
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2h10min" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x2c-fk-iah">
- <rect key="frame" x="397" y="89" width="65" height="21"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Basic" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x2c-fk-iah">
+ <rect key="frame" x="420.66666666666669" y="89" width="41.333333333333314" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
diff --git a/TimeUse+/Screens/Home/Cells/BaseAttributeCell/BaseAttributeCellController.swift b/TimeUse+/Screens/Home/Cells/BaseAttributeCell/BaseAttributeCellController.swift
index ba40bb4b9feeeb909a5a9826d7cb141d57f275cb..884beca47e63f95d7494440151dfaae28a0c1092 100644
--- a/TimeUse+/Screens/Home/Cells/BaseAttributeCell/BaseAttributeCellController.swift
+++ b/TimeUse+/Screens/Home/Cells/BaseAttributeCell/BaseAttributeCellController.swift
@@ -108,7 +108,6 @@ class TimeCellController: BaseAttributeCellController<TimeModel> {
sender.value = Float(processedStepValue)
storedCell?.selectedValueLabel.text = convertDurationToString(processedStepValue)
storedTimeContent!.time = Int(processedStepValue)
-
}
@objc private func sliderValueChangeFinish(_ sender:UISlider!) {
@@ -157,9 +156,9 @@ class TimeCellController: BaseAttributeCellController<TimeModel> {
cell.maxValueLabel.text = convertDurationToString(content.endTime)
cell.selectedValueLabel.text = String(convertDurationToString(content.time))
- cell.sliderProperties.value = Float(content.time)
cell.sliderProperties.minimumValue = Float(content.startTime)
cell.sliderProperties.maximumValue = Float(content.endTime)
+ cell.sliderProperties.value = Float(content.time)
cell.sliderProperties.addTarget(self, action: #selector(self.sliderValueDidChange(_:)), for: .valueChanged)
cell.sliderProperties.addTarget(self, action: #selector(self.sliderValueChangeFinish(_:)), for: .touchUpInside)
}
@@ -230,12 +229,14 @@ class MoneyCellController: BaseAttributeCellController<MoneyModel> {
cell.titleLabel.text = Texts.Activity.priceRange.text
cell.selectedValueLabel.text = String(content.value) + content.currency
cell.minValueLabel.text = String(content.minValue)
+
cell.maxValueLabel.isHidden = true
cell.minValueLabel.isHidden = true
-
- cell.sliderProperties.value = Float(content.value) //content.value
+
+
cell.sliderProperties.minimumValue = Float(content.minValue)
cell.sliderProperties.maximumValue = Float(content.maxValue)
+ cell.sliderProperties.setValue(Float(content.value), animated: false)
cell.sliderProperties.addTarget(self, action: #selector(self.sliderValueChange(_:)), for: .valueChanged)
cell.sliderProperties.addTarget(self, action: #selector(self.sliderValueChangeFinish(_:)), for: .touchUpInside)
}
diff --git a/TimeUse+/Screens/Home/Cells/HorizontalCollectionItemCell/HorizontalCollectionItemCell.xib b/TimeUse+/Screens/Home/Cells/HorizontalCollectionItemCell/HorizontalCollectionItemCell.xib
index 01a1606e65a669986f1df88412391e40eb1ba738..7c9c149580639822fc079a2a79770d7ad2c31f4a 100644
--- a/TimeUse+/Screens/Home/Cells/HorizontalCollectionItemCell/HorizontalCollectionItemCell.xib
+++ b/TimeUse+/Screens/Home/Cells/HorizontalCollectionItemCell/HorizontalCollectionItemCell.xib
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
diff --git a/TimeUse+/Screens/Home/Cells/HorizontalCollectionItemCell/HorizontalCollectionItemCellController.swift b/TimeUse+/Screens/Home/Cells/HorizontalCollectionItemCell/HorizontalCollectionItemCellController.swift
index e5a5ec0a0a14425898a31d9d1257134e897c0bb6..061305c02584658e79a9a7fa0867209c0f9bf004 100644
--- a/TimeUse+/Screens/Home/Cells/HorizontalCollectionItemCell/HorizontalCollectionItemCellController.swift
+++ b/TimeUse+/Screens/Home/Cells/HorizontalCollectionItemCell/HorizontalCollectionItemCellController.swift
@@ -43,6 +43,7 @@ class TimeAttributeCellController: HorizontalCollectionItemCellController<TimeAt
configureObservable(cell: cellControler)
var duration = content.event.upperDuration - TemporaryEvent.shared.duration
+// var duration = 0
if let attribute = _parent.activity.attribute {
duration += attribute.duration
}
@@ -67,6 +68,13 @@ class TimeAttributeCellController: HorizontalCollectionItemCellController<TimeAt
return activity.id == _parent.activity.id
}
+ var timeValue = 0
+ if (activity?.attribute?.duration != nil){
+ timeValue = activity!.attribute!.duration
+ } else if (_parent.temporaryAttribute.duration != nil) {
+ timeValue = _parent.temporaryAttribute.duration
+ }
+
for index in stride(from: 0, to: duration, by: timeInterval) {
if index >= 60 {
minutesString = "min"
@@ -75,11 +83,12 @@ class TimeAttributeCellController: HorizontalCollectionItemCellController<TimeAt
let value = index + timeInterval
if ((value == activity?.attribute?.duration || (value == timeInterval && value == duration)) && _parent.temporaryAttribute.duration == nil) || value == _parent.temporaryAttribute.duration {
let timeModel = TimeModel(time: 0, type: minutesString, timeInterval: timeInterval, startTime: 0, endTime: duration, isSelected: true)
+ timeModel.time = timeValue
timeModels.append(timeModel)
_parent.temporaryAttribute.duration = timeModel.time
delegate?.didSelectAttribute()
} else {
- timeModels.append(TimeModel(time: 0, type: minutesString, timeInterval: timeInterval, startTime: 0, endTime: duration, isSelected: true))
+ timeModels.append(TimeModel(time: timeValue, type: minutesString, timeInterval: timeInterval, startTime: 0, endTime: duration, isSelected: true))
}
}
return timeModels[timeModels.count-1]
diff --git a/TimeUse+/Screens/Home/EventDetailsViewController.swift b/TimeUse+/Screens/Home/EventDetailsViewController.swift
index 68173a0457bf2c37fc08eb368178c9469c440f57..ec094eb4dbee73be0ea8b3e6898344c7cd705203 100644
--- a/TimeUse+/Screens/Home/EventDetailsViewController.swift
+++ b/TimeUse+/Screens/Home/EventDetailsViewController.swift
@@ -65,6 +65,12 @@ class EventDetailsViewController: __CollectionFeedController, GoogleMapsProtocol
didSet { _cellController = cellController }
}
+ @IBOutlet weak var activityCollectionHiddenConstraint: NSLayoutConstraint!
+ @IBOutlet weak var activityCollectionShownConstraint: NSLayoutConstraint!
+
+ @IBOutlet weak var activityListShownConstraint: NSLayoutConstraint!
+ @IBOutlet weak var activityListHiddenConstraint: NSLayoutConstraint!
+
var event: Event!
var previousEvent: Event!
var activities: [EventActivity] = []
@@ -187,6 +193,14 @@ func configureUI() {
eventDidNotHappenButton.contentEdgeInsets = UIEdgeInsets(top: 8, left: 16, bottom: 8, right: 16)
noActivityInformationLabel.text = Texts.Other.noActivityInformation.text
noActivityInformationLabel.isHidden = event.duration > minEventDurationTime
+// if(noActivityInformationLabel.isHidden){
+// activityListShownConstraint.priority = UILayoutPriority(rawValue: 100)
+// activityListHiddenConstraint.priority = UILayoutPriority(rawValue: 1000)
+// }
+// else{
+// activityListShownConstraint.priority = UILayoutPriority(rawValue: 1000)
+// activityListHiddenConstraint.priority = UILayoutPriority(rawValue: 100)
+// }
}
func configureOverlay(){
@@ -196,10 +210,10 @@ func configureUI() {
let endIndex = event.timeDuration.index(event.timeDuration.endIndex, offsetBy: -1)
let range = startIndex..<endIndex
currentEventDuration.text = String(event.timeDuration[range])
- currentEventTitle.text = TemporaryEvent.shared.eventType.title
+ currentEventDeleteTitle.text = TemporaryEvent.shared.eventType.title
currentEventDeleteIcon.image = TemporaryEvent.shared.eventType.icon
if(previousEvent == nil){
- previousEventIcon.image = UIImage(named:"other_track_helper")
+// previousEventIcon.image = UIImage(named:"other_track_helper")
previousEventTitle.text = Texts.Event.other.text
previousEventDuration.isHidden = true
mergeEventDuration.isHidden = true
@@ -305,8 +319,12 @@ func configureUI() {
if(totalFilledTime < 1){
loggedActivityCollectionView.isHidden = true
+ activityCollectionShownConstraint.priority = UILayoutPriority(rawValue: 100)
+ activityCollectionHiddenConstraint.priority = UILayoutPriority(rawValue: 1000)
} else {
loggedActivityCollectionView.isHidden = false
+ activityCollectionShownConstraint.priority = UILayoutPriority(rawValue: 1000)
+ activityCollectionHiddenConstraint.priority = UILayoutPriority(rawValue: 100)
}
var filledValueString: String {
var result = totalFilledTime/60>0 ? (String(totalFilledTime/60)+"h") : ""
@@ -381,6 +399,7 @@ func configureUI() {
@IBAction func showOverlay(_ sender: Any) {
+ configureOverlay()
overlayWrapper.isHidden = false
}