기록 수정 기능 구현

Project_Timer/Global/DailyManager.swift

@@ -41,4 +41,11 @@ class DailyManager {
             print("update daily!")
         }
     }
+
+    func modifyDaily(_ newDaily: Daily) {
+        guard let index = self.dailys.firstIndex(where: { $0.day == newDaily.day }) else { return }
+        self.dailys[index] = newDaily
+
+        self.saveDailys()
+    }
 }

Project_Timer/Global/DailyViewModel.swift

@@ -28,6 +28,10 @@ class DailyViewModel {
         manager.loadDailys()
     }
 
+    func modifyDaily(_ daily: Daily) {
+        manager.modifyDaily(daily)
+    }
+
     func totalStudyTimeofMonth(month: Int, completion: @escaping (Int) -> ()) {
         let monthData = dailys.filter { $0.day.month == month }
         completion(monthData.reduce(0, { $0 + $1.totalTime }))

Project_Timer/Global/Extension/Date+Extension.swift

@@ -27,6 +27,12 @@ extension Date {
         return dateFormatter.string(from: self)
     }
 
+    var HHmmssStyleString: String {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "HH:mm:ss"
+        return dateFormatter.string(from: self)
+    }
+
     func isSameDate(with date: Date) -> Bool {
         return self.YYYYMMDDstyleString == date.YYYYMMDDstyleString
     }
@@ -84,4 +90,8 @@ extension Date {
         let timeComponents = Calendar.current.dateComponents([.hour, .minute, .second], from: from, to: to)
         return (timeComponents.hour ?? 0)*3600 + (timeComponents.minute ?? 0)*60 + (timeComponents.second ?? 0)
     }
+
+    var truncateSeconds: Date? {
+        return Calendar.current.date(from: Calendar.current.dateComponents([.year, .month, .day, .hour, .minute], from: self))
+    }
 }

Project_Timer/Global/Extension/Int+Extension.swift

@@ -22,6 +22,19 @@ extension Int {
         }
     }
 
+    var toHHmmss: String {
+        let time = self < 0 ? -self : self
+        let s = time % 60
+        let h = time / 3600
+        let m = (time / 60) - (h * 60)
+
+        if self < 0 {
+            return String(format: "-%d:%02d:%02d", h, m, s)
+        } else {
+            return String(format: "%d:%02d:%02d", h, m, s)
+        }
+    }
+
     var toHM: String {
         let h = self / 3600
         let m = (self / 60) - (h * 60)

Project_Timer/Global/Model/Daily.swift

@@ -8,12 +8,25 @@
 
 import Foundation
 
-struct TaskHistory: Codable {
-    let startDate: Date
-    let endDate: Date
+struct TaskHistory: Codable, Equatable {
+    var startDate: Date
+    var endDate: Date
     var interval: Int {
         return Date.interval(from: startDate, to: endDate)
     }
+
+    mutating func updateStartDate(to date: Date) {
+        self.startDate = date
+    }
+
+    mutating func updateEndDate(to date: Date) {
+        self.endDate = date
+    }
+
+    static func ==(lhs: Self, rhs: Self) -> Bool {
+        return lhs.startDate.YYYYMMDDHMSstyleString == rhs.startDate.YYYYMMDDHMSstyleString
+            && lhs.endDate.YYYYMMDDHMSstyleString == rhs.endDate.YYYYMMDDHMSstyleString
+    }
 }
 
 struct Daily: Codable, CustomStringConvertible {
@@ -109,6 +122,8 @@ extension Daily {
                 taskHistorys[taskName] = []     // 빈 배열로 초기화
             }
             taskHistorys[taskName]?.append(TaskHistory(startDate: startDate, endDate: endDate))
+            // TODO: sort 로직 수정 필요 새벽 5시~새벽4시
+            taskHistorys[taskName]?.sort(by: { $0.startDate < $1.startDate })
             self.taskHistorys = taskHistorys
         } else {
             assertionFailure("taskHistorys 값이 nil 입니다.")
@@ -161,12 +176,29 @@ extension Daily {
         for i in 0...23 { timeline[i] = min(3600, timeline[i]) }
         self.timeline = timeline
     }
+}
+
+// MARK: ModifyRecordVM 내에서 불리는 메소드들
+extension Daily {
+    mutating func changeTaskName(from oldName: String, to newName: String) {
+        // 같은 이름의 과목이 없다는 것이 보장된 상태
+
+        // tasks 업데이트
+        let totalTime = self.tasks[oldName]
+        self.tasks.removeValue(forKey: oldName)
+        self.tasks[newName] = totalTime
+
+        // taskHistorys 업데이트
+        let historys = self.taskHistorys?[oldName]
+        self.taskHistorys?.removeValue(forKey: oldName)
+        self.taskHistorys?[newName] = historys
+    }
 
-    mutating func modifyTaskHistorys(to taskHistorys: [String: [TaskHistory]]) {
-        self.taskHistorys = taskHistorys
+    mutating func updateTaskHistorys(of taskName: String, with historys: [TaskHistory]) {
+        self.taskHistorys?[taskName] = historys
+
         self.updateTasks()
         self.updateMaxTime()
         self.updateTimeline()
-        self.save()
     }
 }

Project_Timer/Global/Model/RecordTimes.swift

@@ -14,8 +14,8 @@ struct RecordTimes: Codable, CustomStringConvertible {
     }
     static let fileName: String = "recordTimes.json"
 
-    private(set) var recordTask: String = "none" // 측정중인 과목명
-    private(set) var recordTaskFromTime: Int = 0 // 측정중인 과목 기준시간값
+    private(set) var recordTask: String = "none" // 측정중인 과목명    ->?
+    private(set) var recordTaskFromTime: Int = 0 // 측정중인 과목 기준시간값    ->?
 
     private(set) var recordStartAt = Date() // 기록측정 시작시각
     private(set) var recording: Bool = false // 기록중인지 여부값, network 상 다른 기기에서도 표시 가능
@@ -24,12 +24,12 @@ struct RecordTimes: Codable, CustomStringConvertible {
     private(set) var settedTimerTime: Int = 2400 // 사용자가 설정한 타이머 시간값
 
     private var recordingMode: Int = 1 // 기록모드값, 1: timer, 2: stopwatch
-    private var savedSumTime: Int = 0 // sum 기준값 및 저장된 sum 값
-    private var savedTimerTime: Int = 2400 // timer 기준값 및 저장된 timer 값
-    private var savedStopwatchTime: Int  = 0// stopwath 기준값 및 저장된 stopwatch 값
-    private var savedGoalTime: Int = 21600 // 저장된 goalTime 값
+    private var savedSumTime: Int = 0 // sum 기준값 및 저장된 sum 값     ->
+    private var savedTimerTime: Int = 2400 // timer 기준값 및 저장된 timer 값    ->
+    private var savedStopwatchTime: Int  = 0// stopwath 기준값 및 저장된 stopwatch 값    ->
+    private var savedGoalTime: Int = 21600 // 저장된 goalTime 값    ->
 
-    private(set) var recordStartTimeline = Array(repeating: 0, count: 24) // 기록시작시 timeline 값
+    private(set) var recordStartTimeline = Array(repeating: 0, count: 24) // 기록시작시 timeline 값    ->
 
     // task 를 변경할 경우 반영 (기록하기 전 반영)
     mutating func updateTask(to taskName: String, fromTime: Int) {

Project_Timer/Global/View/PaddingLabel.swift

@@ -0,0 +1,42 @@
+//
+//  PaddingLabel.swift
+//  Project_Timer
+//
+//  Created by 최수정 on 2022/08/14.
+//  Copyright © 2022 FDEE. All rights reserved.
+//
+
+import UIKit
+
+class PaddingLabel: UILabel {
+    private var padding = UIEdgeInsets(top: 16, left: 16, bottom: 16, right: 16)
+
+    convenience init(vertical: CGFloat, horizontal: CGFloat) {
+        self.init()
+        self.padding = UIEdgeInsets(top: vertical,
+                                    left: horizontal,
+                                    bottom: vertical,
+                                    right: horizontal)
+    }
+
+    convenience init(top: CGFloat, left: CGFloat, bottom: CGFloat, right: CGFloat) {
+        self.init()
+        self.padding = UIEdgeInsets(top: top,
+                                    left: left,
+                                    bottom: bottom,
+                                    right: right)
+    }
+
+    override func drawText(in rect: CGRect) {
+        super.drawText(in: rect.inset(by: padding))
+    }
+
+    override var intrinsicContentSize: CGSize {
+        var contentSize = super.intrinsicContentSize
+
+        contentSize.height += padding.top + padding.bottom
+        contentSize.width += padding.left + padding.right
+
+        return contentSize
+    }
+}

Project_Timer/Logs/Dailys/Cell/StandardDailyTaskCell.swift

@@ -36,4 +36,13 @@ final class StandardDailyTaskCell: UICollectionViewCell {
         self.taskBackgroundView.backgroundColor = color
         self.taskTimeLabel.textColor = color
     }
+
+    func highlightBorder() {
+        self.layer.borderWidth = 2
+        self.layer.borderColor = UIColor.red.cgColor
+    }
+
+    func removeHighlight() {
+        self.layer.borderWidth = 0
+    }
 }

Project_Timer/Logs/Dailys/DailysVC.swift

@@ -11,6 +11,10 @@ import Combine
 import SwiftUI
 import FSCalendar
 
+protocol ModifyRecordDelegate: AnyObject {
+    func showModifyRecordVC(daily: Daily)
+}
+
 final class DailysVC: UIViewController {
     static let identifier = "DailysVC"
     @IBOutlet var calendar: FSCalendar!
@@ -26,8 +30,9 @@ final class DailysVC: UIViewController {
             UserDefaultsManager.set(to: isGraphChecked, forKey: .checks)
         }
     }
+    private weak var delegate: ModifyRecordDelegate?
     private var previusColorIndex: Int?
-    private var isReversColor: Bool = false
+    var isReversColor: Bool = false
     private var viewModel: DailysVM?
     private var cancellables: Set<AnyCancellable> = []
     enum GraphCollectionView: Int {
@@ -54,6 +59,7 @@ final class DailysVC: UIViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         NotificationCenter.default.post(name: LogVC.changePageIndex, object: nil, userInfo: ["pageIndex" : 1])
+        self.viewModel?.updateCurrentDaily()
     }
 
     override func viewWillLayoutSubviews() {
@@ -104,6 +110,28 @@ final class DailysVC: UIViewController {
 
         self.present(activityViewController, animated: true)
     }
+
+    @IBAction func modifyRecord(_ sender: Any) {
+        guard let viewModel = viewModel,
+              let targetDaily = viewModel.currentDaily else {
+            let alert = UIAlertController(title: "Unable to Modify Records".localized(),
+                                          message: "No record exists to modify.".localized(),
+                                          preferredStyle: .alert)
+            let okAction = UIAlertAction(title: "OK", style: .default)
+            alert.addAction(okAction)
+            present(alert, animated: true)
+
+            return
+        }
+
+        self.delegate?.showModifyRecordVC(daily: targetDaily)
+    }
+}
+
+extension DailysVC {
+    func configureDelegate(to delegate: ModifyRecordDelegate) {
+        self.delegate = delegate
+    }
 }
 
 extension DailysVC {
@@ -113,7 +141,7 @@ extension DailysVC {
         self.calendar.appearance.headerDateFormat = "YYYY.MM"
         self.calendar.appearance.headerTitleFont = TiTiFont.HGGGothicssiP80g(size: 25)
         self.calendar.appearance.weekdayFont = TiTiFont.HGGGothicssiP80g(size: 13)
-        self.calendar.appearance.titleFont = TiTiFont.HGGGothicssiP60g(size: 20)
+        self.calendar.appearance.titleFont = TiTiFont.HGGGothicssiP60g(size: 18)
         self.calendar.clipsToBounds = true
         self.calendar.layer.cornerCurve = .continuous
         self.calendar.layer.borderWidth = 2

Project_Timer/Logs/Dailys/DailysVM.swift

@@ -29,6 +29,11 @@ final class DailysVM {
             .map { TaskInfo(taskName: $0.key, taskTime: $0.value) }
     }
 
+    func updateCurrentDaily() {
+        let newDaily = RecordController.shared.dailys.dailys.first(where: { $0.day == self.currentDaily?.day })
+        self.updateDaily(to: newDaily)
+    }
+
     func updateColor(isReverseColor: Bool) {
         self.timelineVM.updateColor(isReversColor: isReverseColor)
     }

Project_Timer/Logs/Dailys/Graph/StandardDailyGraphView.swift

@@ -172,7 +172,9 @@ final class StandardDailyGraphView: UIView {
 
     private func configureCollectionView() {
         let standardDailyTaskCellNib = UINib.init(nibName: StandardDailyTaskCell.identifier, bundle: nil)
+        let addNewTaskHistoryCellNib = UINib.init(nibName: AddNewTaskHistoryCell.identifier, bundle: nil)
         self.tasksCollectionView.register(standardDailyTaskCellNib, forCellWithReuseIdentifier: StandardDailyTaskCell.identifier)
+        self.tasksCollectionView.register(addNewTaskHistoryCellNib, forCellWithReuseIdentifier: AddNewTaskHistoryCell.identifier)
     }
 
     private func configureProgressView() {
@@ -226,6 +228,14 @@ extension StandardDailyGraphView {
     func reload() {
         self.tasksCollectionView.reloadData()
     }
+    /// 컬렉션뷰 테두리 하이라이트
+    func highlightCollectionView() {
+        self.tasksCollectionView.layer.borderColor = UIColor.red.cgColor
+    }
+    /// 컬렉션뷰 테두리 하이라이트 제거
+    func removeCollectionViewHighlight() {
+        self.tasksCollectionView.layer.borderColor = UIColor(named: "System_border")?.cgColor
+    }
 }
 
 // MARK: StandardDailyGraphView Private Actions

Project_Timer/Logs/LogVC.swift

@@ -32,11 +32,13 @@ final class LogVC: UIViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        self.navigationController?.setNavigationBarHidden(true, animated: true)
         self.tabBarController?.updateTabbarColor(backgroundColor: TiTiColor.tabbarBackground, tintColor: .label, normalColor: .lightGray)
     }
 
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
+        self.navigationController?.setNavigationBarHidden(true, animated: true)
         self.tabBarController?.updateTabbarColor(backgroundColor: TiTiColor.tabbarBackground, tintColor: .label, normalColor: .lightGray)
     }
 
@@ -72,8 +74,10 @@ extension LogVC {
 
     private func configureChildViewControllers() {
         guard let logHomeVC = self.storyboard?.instantiateViewController(withIdentifier: LogHomeVC.identifier),
-              let dailysVC = self.storyboard?.instantiateViewController(withIdentifier: DailysVC.identifier),
+              let dailysVC = self.storyboard?.instantiateViewController(withIdentifier: DailysVC.identifier) as? DailysVC,
               let weeksVC = self.storyboard?.instantiateViewController(withIdentifier: WeeksVC.identifier) else { return }
+        dailysVC.configureDelegate(to: self)
+
         self.childVCs = [logHomeVC, dailysVC, weeksVC]
         self.pageViewController.setViewControllers([logHomeVC], direction: .forward, animated: true)
     }
@@ -96,3 +100,13 @@ extension LogVC: UIPageViewControllerDataSource {
         return self.childVCs[index+1]
     }
 }
+
+extension LogVC: ModifyRecordDelegate {
+    func showModifyRecordVC(daily: Daily) {
+        print(daily.day.YYYYMMDDstyleString)
+        guard let modifyRecordVC = self.storyboard?.instantiateViewController(withIdentifier: ModifyRecordVC.identifier) as? ModifyRecordVC,
+              let dailysVC = self.childVCs[1] as? DailysVC else { return }
+        modifyRecordVC.configureViewModel(with: daily, isReverseColor: dailysVC.isReversColor)
+        self.navigationController?.pushViewController(modifyRecordVC, animated: true)
+    }
+}