Feat: Add SWColorPicker

body: SWColorPicker적용

Author: iosdevSW

Podfile

@@ -10,6 +10,7 @@ target 'StopWatch' do
 	pod 'Realm', '~>10'
 	pod 'SnapKit', '~> 5.0.0'
 	pod 'Then'
+	pod 'SWColorPicker'
 
 
 end

Podfile.lock

@@ -1,31 +1,35 @@
 PODS:
-  - Realm (10.32.3):
-    - Realm/Headers (= 10.32.3)
-  - Realm/Headers (10.32.3)
-  - RealmSwift (10.32.3):
-    - Realm (= 10.32.3)
+  - Realm (10.36.0):
+    - Realm/Headers (= 10.36.0)
+  - Realm/Headers (10.36.0)
+  - RealmSwift (10.36.0):
+    - Realm (= 10.36.0)
   - SnapKit (5.0.1)
+  - SWColorPicker (0.2.1)
   - Then (3.0.0)
 
 DEPENDENCIES:
   - Realm (~> 10)
   - RealmSwift (~> 10)
   - SnapKit (~> 5.0.0)
+  - SWColorPicker
   - Then
 
 SPEC REPOS:
   trunk:
     - Realm
     - RealmSwift
     - SnapKit
+    - SWColorPicker
     - Then
 
 SPEC CHECKSUMS:
-  Realm: fdf6732924dc5e69e30e0db2c11e869f92b53f3d
-  RealmSwift: 7c181da8fa1c2fe613656a77c198d6a3dc3879a1
+  Realm: 3fd136cb4c83a927482a7f1612496d37beed3cf5
+  RealmSwift: 513d4dcbf5bfc4d573454088b592685fc48dd716
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
+  SWColorPicker: 1a4a4d1af47fe4f7b17920fe241eafb26e0a98e0
   Then: 844265ae87834bbe1147d91d5d41a404da2ec27d
 
-PODFILE CHECKSUM: e11d3d0dab59434260704d9b3c3d22d602fd090d
+PODFILE CHECKSUM: 56b323a9a3fa37f4fbd1f8b46fb0580b052ae223
 
 COCOAPODS: 1.11.3

StopWatch/Controllers/EditCategoryViewController.swift

@@ -8,6 +8,7 @@ import UIKit
 import RealmSwift
 import Then
 import SnapKit
+import SWColorPicker
 
 final class EditCategoryViewController: UIViewController {
     //MARK: - Properties
@@ -75,6 +76,7 @@ final class EditCategoryViewController: UIViewController {
         self.setNavigationItem()
 
         NotificationCenter.default.addObserver(self, selector: #selector(didRecieveCloseColorEditView(_:)), name: .closeColorEditView, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(didClickColorWell), name: .presentColorPicker, object: nil)
 
         self.saveDate = (UIApplication.shared.delegate as! AppDelegate).saveDate
     }
@@ -159,6 +161,18 @@ final class EditCategoryViewController: UIViewController {
         self.openEditColorView(.edit, palette: self.palette[row])
     }
 
+    @objc func didClickColorWell(_ notification: Notification) {
+        if let color = notification.object as? UIColor {
+            let vc = SWColorPickerViewController(color)
+            vc.delegate = self
+            self.present(vc, animated: true)
+        } else {
+            let vc = SWColorPickerViewController(.white)
+            vc.delegate = self
+            self.present(vc, animated: true)
+        }
+    }
+    
     //MARK: - EditColorViewMethod    
     func openEditColorView(_ mode: ColorViewMode, palette: Palettes?) {
         guard self.editColorView == nil else { return } // 중복 뷰 방지
@@ -290,10 +304,22 @@ extension EditCategoryViewController: UICollectionViewDelegateFlowLayout {
 }
 
 //MARK:- UITextFieldDelegate
-extension CategoryViewController: UITextFieldDelegate {
-    
+extension EditCategoryViewController: UITextFieldDelegate {
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         textField.resignFirstResponder()
         return true
     }
 }
+
+extension EditCategoryViewController: SWColorPickerViewDelegate {
+    func didSelectColor(_ color: UIColor) {
+        var (r,g,b): (CGFloat,CGFloat,CGFloat) = (0,0,0)
+        color.getRed(&r, green: &g, blue: &b, alpha: nil)
+        let red = String(Int(r * 255), radix: 16).padding(toLength: 2, withPad: "0", startingAt: 0).uppercased()
+        let green = String(Int(g * 255), radix: 16).padding(toLength: 2, withPad: "0", startingAt: 0).uppercased()
+        let blue = String(Int(b * 255), radix: 16).padding(toLength: 2, withPad: "0", startingAt: 0).uppercased()
+        let hexCode = red + green + blue
+        
+        editColorView?.selectedColor(hexCode)
+    }
+}

StopWatch/Controllers/StopWatchViewController.swift

@@ -27,8 +27,6 @@ final class StopWatchViewController: UIViewController {
 
     weak var delegate: StopWatchVCDelegate?
 
-    var saveDate: String = ""
-    
     private let guideLabelView = GuideLabelView()
     private let calendarView = CalendarView()
     private let goalTimeView = GoalTimeView()
@@ -92,13 +90,12 @@ final class StopWatchViewController: UIViewController {
         // gesture
         self.hideKeyboardWhenTapped()
 
-        //        print("path =  \(Realm.Configuration.defaultConfiguration.fileURL!)")
+//                print("path =  \(Realm.Configuration.defaultConfiguration.fileURL!)")
     }
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         // 프로퍼티 값 갱신
-        self.saveDate = (UIApplication.shared.delegate as! AppDelegate).resetDate //오늘 날짜!
 
         self.setDeviceMotion()   // coremotion 시작
         self.reloadProgressBar() // 진행바 재로딩
@@ -122,7 +119,7 @@ final class StopWatchViewController: UIViewController {
 
     //MARK: - Method
     private func autoScrollCurrentDate(){ // 현재 날짜로 달력 스크롤
-        let itemIndex = CalendarMethod().returnIndexOfDay(date: self.saveDate)
+        let itemIndex = CalendarMethod().returnIndexOfDay(date: self.calendarView.selectDateComponent.stringFormat)
         self.calendarView.calendarView.scrollToItem(at: IndexPath(item: itemIndex - 1, section: 0), at: .left, animated: true)
     }
 
@@ -171,9 +168,9 @@ final class StopWatchViewController: UIViewController {
         UIView.animate(withDuration: 0.3){
             self.editGoalTimeView!.transform = .identity
         }
-        StopWatchDAO().create(date: self.saveDate) // 오늘 데이터가 없으면 데이터 생성
+        StopWatchDAO().create(date: self.calendarView.selectDateComponent.stringFormat) // 오늘 데이터가 없으면 데이터 생성
 
-        let dailyData = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.saveDate)!
+        let dailyData = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.calendarView.selectDateComponent.stringFormat)!
         let goal = dailyData.totalGoalTime
         let hourIndex = Int(goal / 3600) % 24 // 3600초 (1시간)으로 나눈 몫을 24로 나누면 시간 인덱스와 같다.
         let miniuteIndex = ((Int(goal) % 3600 ) / 60) / 5 // 남은 분을 5로 나누면 5분간격의 분 인덱스와 같다.
@@ -190,7 +187,7 @@ final class StopWatchViewController: UIViewController {
             UIView.animate(withDuration: 0.5,animations: {
                 _editGoalTimeView.transform = CGAffineTransform(translationX: 0, y: self.view.frame.height)
             }){_ in
-                StopWatchDAO().deleteDailyData(date: self.saveDate)
+                StopWatchDAO().deleteDailyData(date: self.calendarView.selectDateComponent.stringFormat)
                 _editGoalTimeView.removeFromSuperview()
                 self.editGoalTimeView = nil
                 self.removeTapGesture()
@@ -225,7 +222,7 @@ final class StopWatchViewController: UIViewController {
         if self.chartView != nil { return }
 
         self.chartView = ChartView().then {
-            $0.saveDate = self.saveDate
+            $0.saveDate = self.calendarView.selectDateComponent.stringFormat
 
             self.frameView.addSubview($0)
             $0.snp.makeConstraints { make in
@@ -338,15 +335,14 @@ final class StopWatchViewController: UIViewController {
 
     @objc func didChangeSaveDate(_ notification: Notification) {
         if let saveDate = notification.userInfo?["selectedDate"] as? String {
-            self.saveDate = saveDate
+            self.chartView?.saveDate = saveDate
         }
 
         self.setGoalTime() // 목표시간 Label 재설정
         self.reloadProgressBar() // 진행바 재로딩
         self.setTimeLabel() // 현재시간 Label 재설정
         self.toDoTableView.reloadData()
         self.calendarView.calendarView.reloadData()
-        self.chartView?.saveDate = self.saveDate
         self.chartView?.setNeedsDisplay() // 차트 다시 그리기
     }
 
@@ -361,7 +357,7 @@ final class StopWatchViewController: UIViewController {
     // 목표 시간 설정 뷰 닫기
     @objc func didFinishEditingGoalTime(_ sender: UIButton){
         if sender.tag == 1 { // 확인버튼
-            let dailyData = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.saveDate)
+            let dailyData = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.calendarView.selectDateComponent.stringFormat)
             try! self.realm.write{
                 dailyData!.totalGoalTime =
                 self.editGoalTimeView!.selectedHour + self.editGoalTimeView!.selectedMinute
@@ -391,9 +387,9 @@ final class StopWatchViewController: UIViewController {
 
     //세션(과목명)을 눌렀을때 호출되는 메소드
     @objc func didClickSection(_ sender: UIButton){
-        StopWatchDAO().create(date: self.saveDate) // 오늘 데이터가 없으면 데이터 생성
+        StopWatchDAO().create(date: self.calendarView.selectDateComponent.stringFormat) // 오늘 데이터가 없으면 데이터 생성
 
-        let dailyData = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.saveDate)!
+        let dailyData = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.calendarView.selectDateComponent.stringFormat)!
 
         let segments = dailyData.dailySegment // 오늘 과목들
         let section = sender.tag
@@ -622,9 +618,9 @@ extension StopWatchViewController: UITableViewDelegate,UITableViewDataSource{
     }
 
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        let filter = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.saveDate)
+        let filter = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.calendarView.selectDateComponent.stringFormat)
         let segment = filter?.dailySegment
-        StopWatchDAO().checkSegmentData(date: self.saveDate)
+        StopWatchDAO().checkSegmentData(date: self.calendarView.selectDateComponent.stringFormat)
         return segment?[section].toDoList.count ?? 0 // 오늘의 리스트가 없으면 0개
     }
 
@@ -706,7 +702,7 @@ extension StopWatchViewController: UITableViewDelegate,UITableViewDataSource{
         // 마지막 섹션에 문구 출력
         if section == (categoryCount - 1) {
             // 오늘의 데이터가 nil일때
-            guard let category = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.saveDate) else { return guideText }
+            guard let category = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.calendarView.selectDateComponent.stringFormat) else { return guideText }
 
             var sum = 0 // todolist 합
 
@@ -726,7 +722,7 @@ extension StopWatchViewController: UITableViewDelegate,UITableViewDataSource{
 extension StopWatchViewController: UITextFieldDelegate {
     //입력이 끝나면 호출되는 델리게이트메소드
     func textFieldDidEndEditing(_ textField: UITextField, reason: UITextField.DidEndEditingReason) {
-        let filter = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.saveDate)
+        let filter = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.calendarView.selectDateComponent.stringFormat)
         let segment = filter!.dailySegment
 
         let row = segment[textField.tag].toDoList.count - 1
@@ -736,7 +732,7 @@ extension StopWatchViewController: UITextFieldDelegate {
                 segment[textField.tag].toDoList.remove(at: row)
                 segment[textField.tag].listCheckImageIndex.remove(at: row)
             }
-            StopWatchDAO().deleteDailyData(date: self.saveDate)
+            StopWatchDAO().deleteDailyData(date: self.calendarView.selectDateComponent.stringFormat)
 
         }else {
             try! self.realm.write{
@@ -754,7 +750,7 @@ extension StopWatchViewController: UITextFieldDelegate {
     }
 
     func textFieldDidChangeSelection(_ textField: UITextField) {
-        let filter = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.saveDate)
+        let filter = self.realm.object(ofType: DailyData.self, forPrimaryKey: self.calendarView.selectDateComponent.stringFormat)
         let segment = filter!.dailySegment
 
         let row = segment[textField.tag].toDoList.count - 1
@@ -821,3 +817,4 @@ extension StopWatchViewController {
         }
     }
 }
+

StopWatch/Resource/images/Assets.xcassets/ColorWell.imageset/[email protected]

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

StopWatch/Resource/images/Assets.xcassets/ColorWell.imageset/[email protected]

@@ -12,4 +12,5 @@ extension Notification.Name {
     static let presentAlert = Notification.Name("presentAlert")
     static let changeSaveDate = Notification.Name("changeSaveDate")
     static let closeColorEditView = Notification.Name("closeColorEditView")
+    static let presentColorPicker = Notification.Name("presentColorPicker")
 }

StopWatch/Resource/images/Assets.xcassets/ColorWell.imageset/[email protected]

@@ -80,6 +80,7 @@ final class CalendarView: UIView,UICollectionViewDelegate, UICollectionViewDataS
             $0.showsHorizontalScrollIndicator = false
             $0.isPagingEnabled = true // 페이징 스크롤 처리
             $0.tag = 1
+            $0.clipsToBounds = false
         }
 
         return view
@@ -264,7 +265,7 @@ final class CalendarView: UIView,UICollectionViewDelegate, UICollectionViewDataS
             } else { // 기본 캘린더일 경우
                 NotificationCenter.default.post(name: .changeSaveDate,
                                                 object: nil,
-                                                userInfo: ["selectedDate" : calendarMethod.componentToDateString(self.selectDateComponent)])
+                                                userInfo: ["selectedDate" : self.selectDateComponent.stringFormat])
             }
         }
     }