From 27ab2a621a97e1678c3625b5b114bed67a132850 Mon Sep 17 00:00:00 2001
From: relikd <info@relikd.de>
Date: Tue, 8 Sep 2020 02:51:25 +0200
Subject: [PATCH] Set recording time as filter

---
 main/GUI/Base.lproj/Recordings.storyboard | 37 +++++++++++++++--------
 main/Recordings/VCEditRecording.swift     | 14 +++++++--
 main/Requests/VCDateFilter.swift          |  7 +++++
 main/TBCMain.swift                        |  1 +
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/main/GUI/Base.lproj/Recordings.storyboard b/main/GUI/Base.lproj/Recordings.storyboard
index b92f7a1..ecc6169 100644
--- a/main/GUI/Base.lproj/Recordings.storyboard
+++ b/main/GUI/Base.lproj/Recordings.storyboard
@@ -497,18 +497,18 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <navigationBar contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2yS-xK-Wac">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="0.0"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                 <gestureRecognizers/>
                                 <items>
                                     <navigationItem title="Edit" id="JSi-oz-VRx">
                                         <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="TGg-60-wZW">
                                             <connections>
-                                                <action selector="didTapCancel:" destination="VRk-wv-rhk" id="Kff-ed-gdd"/>
+                                                <action selector="didTapCancel" destination="VRk-wv-rhk" id="idg-Q7-qLu"/>
                                             </connections>
                                         </barButtonItem>
                                         <barButtonItem key="rightBarButtonItem" enabled="NO" style="done" systemItem="save" id="rWg-hE-Ydl">
                                             <connections>
-                                                <action selector="didTapSave:" destination="VRk-wv-rhk" id="Xee-qo-bQx"/>
+                                                <action selector="didTapSave" destination="VRk-wv-rhk" id="fPE-i2-I06"/>
                                             </connections>
                                         </barButtonItem>
                                     </navigationItem>
@@ -518,7 +518,7 @@
                                 </connections>
                             </navigationBar>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="xdn-EU-IMx">
-                                <rect key="frame" x="16" y="12" width="288" height="347.5"/>
+                                <rect key="frame" x="16" y="52" width="288" height="307.5"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Guy-Ra-fpS" userLabel="Title">
                                         <rect key="frame" x="0.0" y="0.0" width="288" height="40"/>
@@ -562,7 +562,7 @@
                                         </connections>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ybL-UG-dwT" userLabel="Notes">
-                                        <rect key="frame" x="0.0" y="48" width="288" height="200.5"/>
+                                        <rect key="frame" x="0.0" y="48" width="288" height="160.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Notes" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QJp-6C-yoZ">
                                                 <rect key="frame" x="0.0" y="0.0" width="288" height="24"/>
@@ -572,7 +572,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NXU-yU-eST">
-                                                <rect key="frame" x="0.0" y="24" width="288" height="176.5"/>
+                                                <rect key="frame" x="0.0" y="24" width="288" height="136.5"/>
                                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                                 <string key="text">1. Line
 2. Line
@@ -596,7 +596,7 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QiY-Mm-Dej" userLabel="Details">
-                                        <rect key="frame" x="0.0" y="256.5" width="288" height="91"/>
+                                        <rect key="frame" x="0.0" y="216.5" width="288" height="91"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Details" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="FR1-Nt-XuB">
                                                 <rect key="frame" x="0.0" y="0.0" width="288" height="24"/>
@@ -605,9 +605,8 @@
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="scaleToFill" fixedFrame="YES" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" editable="NO" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pql-H5-k6U">
+                                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" editable="NO" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pql-H5-k6U">
                                                 <rect key="frame" x="0.0" y="24" width="288" height="67"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                                 <string key="text">Start:       1970-01-01 01:00
 End:        1970-01-01 02:00
@@ -616,10 +615,23 @@ Duration:   60:00</string>
                                                 <fontDescription key="fontDescription" type="system" weight="light" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                             </textView>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LOr-e7-foG">
+                                                <rect key="frame" x="268" y="46.5" width="20" height="22"/>
+                                                <state key="normal" image="filter-clear"/>
+                                                <connections>
+                                                    <action selector="didTapFilter" destination="VRk-wv-rhk" eventType="touchUpInside" id="5NH-qa-yMg"/>
+                                                </connections>
+                                            </button>
                                         </subviews>
                                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                         <constraints>
+                                            <constraint firstAttribute="trailing" secondItem="pql-H5-k6U" secondAttribute="trailing" id="44x-p3-qWK"/>
+                                            <constraint firstItem="LOr-e7-foG" firstAttribute="trailing" secondItem="pql-H5-k6U" secondAttribute="trailing" id="5sr-Cf-h0c"/>
+                                            <constraint firstItem="pql-H5-k6U" firstAttribute="top" secondItem="FR1-Nt-XuB" secondAttribute="bottom" id="As8-Px-t6G"/>
+                                            <constraint firstItem="pql-H5-k6U" firstAttribute="leading" secondItem="QiY-Mm-Dej" secondAttribute="leading" id="ItB-cO-reV"/>
+                                            <constraint firstItem="LOr-e7-foG" firstAttribute="centerY" secondItem="pql-H5-k6U" secondAttribute="centerY" id="OLu-MI-3sa"/>
                                             <constraint firstAttribute="height" priority="250" constant="91" id="or7-9o-FZb"/>
+                                            <constraint firstAttribute="bottom" secondItem="pql-H5-k6U" secondAttribute="bottom" id="pbd-43-eN0"/>
                                         </constraints>
                                     </view>
                                 </subviews>
@@ -635,9 +647,9 @@ Duration:   60:00</string>
                             <constraint firstItem="2yS-xK-Wac" firstAttribute="trailing" secondItem="fMa-Lq-tGz" secondAttribute="trailing" id="1io-bA-4p9"/>
                             <constraint firstItem="2yS-xK-Wac" firstAttribute="leading" secondItem="fMa-Lq-tGz" secondAttribute="leading" id="Fv1-fO-22V"/>
                             <constraint firstItem="xdn-EU-IMx" firstAttribute="leading" secondItem="fMa-Lq-tGz" secondAttribute="leading" constant="16" id="JuR-Ro-IPi"/>
-                            <constraint firstItem="xdn-EU-IMx" firstAttribute="top" secondItem="2yS-xK-Wac" secondAttribute="bottom" constant="12" id="Lec-83-aaD"/>
-                            <constraint firstItem="xdn-EU-IMx" firstAttribute="trailing" secondItem="fMa-Lq-tGz" secondAttribute="trailing" constant="-16" id="hhC-bL-G3S"/>
-                            <constraint firstItem="xdn-EU-IMx" firstAttribute="bottom" secondItem="fMa-Lq-tGz" secondAttribute="bottom" constant="-10" id="p7W-sr-Wch"/>
+                            <constraint firstItem="xdn-EU-IMx" firstAttribute="top" secondItem="2yS-xK-Wac" secondAttribute="bottom" constant="8" id="Lec-83-aaD"/>
+                            <constraint firstItem="fMa-Lq-tGz" firstAttribute="trailing" secondItem="xdn-EU-IMx" secondAttribute="trailing" constant="16" id="hhC-bL-G3S"/>
+                            <constraint firstItem="fMa-Lq-tGz" firstAttribute="bottom" secondItem="xdn-EU-IMx" secondAttribute="bottom" constant="10" id="p7W-sr-Wch"/>
                             <constraint firstItem="2yS-xK-Wac" firstAttribute="top" secondItem="fMa-Lq-tGz" secondAttribute="top" id="yKh-gv-mgg"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="fMa-Lq-tGz"/>
@@ -727,6 +739,7 @@ Duration:   60:00</string>
     <resources>
         <image name="LaunchIcon.png" width="128" height="128"/>
         <image name="detail-help" width="22" height="22"/>
+        <image name="filter-clear" width="20" height="20"/>
         <image name="line-expand" width="20" height="20"/>
     </resources>
 </document>
diff --git a/main/Recordings/VCEditRecording.swift b/main/Recordings/VCEditRecording.swift
index 266d6d8..83b4552 100644
--- a/main/Recordings/VCEditRecording.swift
+++ b/main/Recordings/VCEditRecording.swift
@@ -62,7 +62,7 @@ class VCEditRecording: UIViewController, UITextFieldDelegate, UITextViewDelegate
 	
 	// MARK: Save & Cancel Buttons
 	
-	@IBAction func didTapSave(_ sender: UIBarButtonItem) {
+	@IBAction func didTapSave() {
 		let newlyCreated = deleteOnCancel
 		if newlyCreated {
 			// if remains true, `viewDidDisappear` will delete the record
@@ -90,7 +90,7 @@ class VCEditRecording: UIViewController, UITextFieldDelegate, UITextViewDelegate
 		}
 	}
 	
-	@IBAction func didTapCancel(_ sender: UIBarButtonItem) {
+	@IBAction func didTapCancel() {
 		QLog.Debug("discard edit of record #\(record.id)")
 		dismiss(animated: true)
 	}
@@ -103,6 +103,16 @@ class VCEditRecording: UIViewController, UITextFieldDelegate, UITextViewDelegate
 		}
 	}
 	
+	@IBAction func didTapFilter() {
+		if buttonSave.isEnabled {
+			NotificationBanner("Filter set", style: .ok).present(in: self, hideAfter: 1)
+		} else {
+			(presentingViewController as? TBCMain)?.openTab(0)
+			didTapCancel()
+		}
+		VCDateFilter.setFilter(range: record.start, to: record.stop)
+	}
+	
 	
 	// MARK: Handle Keyboard & Notes Frame
 	
diff --git a/main/Requests/VCDateFilter.swift b/main/Requests/VCDateFilter.swift
index c21c640..45c5f08 100644
--- a/main/Requests/VCDateFilter.swift
+++ b/main/Requests/VCDateFilter.swift
@@ -125,4 +125,11 @@ class VCDateFilter: UIViewController, UIGestureRecognizerDelegate {
 			NotifyDateFilterChanged.post()
 		}
 	}
+	
+	static func setFilter(range from: Timestamp?, to: Timestamp?) {
+		Prefs.DateFilter.Kind = .ABRange
+		Prefs.DateFilter.RangeA = from
+		Prefs.DateFilter.RangeB = to
+		NotifyDateFilterChanged.post()
+	}
 }
diff --git a/main/TBCMain.swift b/main/TBCMain.swift
index 2d3ebc8..36803ec 100644
--- a/main/TBCMain.swift
+++ b/main/TBCMain.swift
@@ -43,6 +43,7 @@ class TBCMain: UITabBarController {
 }
 
 extension TBCMain {
+	/// Open tab and pop to root view controller.
 	@discardableResult func openTab(_ index: Int) -> UIViewController? {
 		selectedIndex = index
 		guard let nav = selectedViewController as? UINavigationController else {