relikd/appchk-app
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Embed Recordings in navigation controller, not the other way around

Browse Source
This commit is contained in:
relikd
2020-08-01 09:33:48 +02:00
parent b270f30f3c
commit a3973c7e9a
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/Recordings/VCRecordings.swift
View File

@@ -7,11 +7,8 @@ class VCRecordings: UIViewController, UINavigationControllerDelegate {
@IBOutlet private var timeLabel: UILabel!
@IBOutlet private var startButton: UIButton!
@IBOutlet private var startNewRecView: UIView!
private var prevRecController: UINavigationController!
override func viewDidLoad() {
prevRecController = (children.first as! UINavigationController)
prevRecController.delegate = self
timeLabel.font = timeLabel.font.monoSpace()
// hide timer if not running
updateUI(setRecording: false, animated: false)
@@ -22,12 +19,16 @@ class VCRecordings: UIViewController, UINavigationControllerDelegate {
}
}
override func viewDidAppear(_ animated: Bool) {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
if currentRecording != nil { startTimer(animate: false) }
navigationController?.setNavigationBarHidden(true, animated: animated)
}
override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
stopTimer(animate: false)
navigationController?.setNavigationBarHidden(false, animated: animated)
}
func navigationController(_ nav: UINavigationController, willShow vc: UIViewController, animated: Bool) {
@@ -57,8 +58,7 @@ class VCRecordings: UIViewController, UINavigationControllerDelegate {
} else {
stopTimer(animate: true)
RecordingsDB.stop(&currentRecording!)
prevRecController.popToRootViewController(animated: true)
let editVC = (prevRecController.topViewController as! TVCPreviousRecords)
let editVC = (children.first as! TVCPreviousRecords)
editVC.insertAndEditRecording(currentRecording!)
currentRecording = nil // otherwise it will restart
}