Merge branch 'dev' into feature_SWColorPicker

Author: iosdevSW

Podfile

@@ -6,8 +6,8 @@ target 'StopWatch' do
   use_frameworks!
 
   # Pods for StopWatch
-	pod 'RealmSwift', '~>10'
-	pod 'Realm', '~>10'
+	pod 'RealmSwift'
+	pod 'Realm'
 	pod 'SnapKit', '~> 5.0.0'
 	pod 'Then'
 	pod 'SWColorPicker'

Podfile.lock

@@ -9,8 +9,8 @@ PODS:
   - Then (3.0.0)
 
 DEPENDENCIES:
-  - Realm (~> 10)
-  - RealmSwift (~> 10)
+  - Realm
+  - RealmSwift
   - SnapKit (~> 5.0.0)
   - SWColorPicker
   - Then

StopWatch/Controllers/CategoryViewController.swift

@@ -45,7 +45,7 @@ final class CategoryViewController: UIViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         self.saveDate = (UIApplication.shared.delegate as! AppDelegate).resetDate
-        StopWatchDAO().create(date: self.saveDate)
+//        StopWatchDAO().create(date: self.saveDate)
 
         self.categoryTableView.reloadData()
         self.configureNavigationBar()

StopWatch/Controllers/StopWatchViewController.swift

@@ -89,17 +89,19 @@ 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.setDeviceMotion()   // coremotion 시작
         self.reloadProgressBar() // 진행바 재로딩
         self.setNavigationBar()  // 네비게이션바 설정
+        self.toDoTableView.reloadData()
+        self.calendarView.calendarView.reloadData()
         self.setDday()
         self.setTimeLabel()
         self.guideLabelView.isHidden = false
@@ -781,11 +783,11 @@ extension StopWatchViewController {
         case 1:
             self.defaultAlert(title: nil, message: "정말 삭제 하시겠습니까?") {
                 StopWatchDAO().deleteTodoList(segData, row: editView.row)
+                StopWatchDAO().deleteDailyData(date: self.calendarView.selectDateComponent.stringFormat) // 데이터베이스에서 삭제
+                self.calendarView.calendarView.reloadData()
+                self.toDoTableView.reloadData()
             }
 
-            StopWatchDAO().deleteDailyData(date: self.calendarView.selectDateComponent.stringFormat) // 데이터베이스에서 삭제
-            self.toDoTableView.reloadData()
-            self.calendarView.calendarView.reloadData()
             self.closeListEditView()
         case 2:
             StopWatchDAO().changeListCheckImage(segData, row: editView.row)

StopWatch/Custom/StopWatchDAO.swift

@@ -32,7 +32,7 @@ class StopWatchDAO {
 
                     day.dailySegment.append(object) // 오늘 데이터에 오늘 과목들 넣기
                 }
-                
+                print(day)
                 realm.add(day)
             }
         }
@@ -48,17 +48,16 @@ class StopWatchDAO {
 
             realm.add(segment)
 
-            let segmentData = SegmentData() // 오늘의 과목에 추가
-            segmentData.date = date
-            segmentData.goal = 0
-            segmentData.value = 0
-            segmentData.segment = segment
-            
-            realm.add(segmentData)
-            
-            let dailyData = realm.object(ofType: DailyData.self, forPrimaryKey: date) // 오늘 데이터 불러오기
-            
-            dailyData?.dailySegment.append(segmentData) // 오늘 데이터에 추가한 과목 추가
+            if let dailyData = realm.object(ofType: DailyData.self, forPrimaryKey: date)  {// 오늘 데이터 불러오기
+                let segmentData = SegmentData() // 오늘의 과목에 추가
+                segmentData.date = date
+                segmentData.goal = 0
+                segmentData.value = 0
+                segmentData.segment = segment
+                
+                realm.add(segmentData)
+                dailyData.dailySegment.append(segmentData) // 오늘 데이터에 추가한 과목 추가
+            }
         }
     }
 

StopWatch/Views/CalendarView/CalendarView.swift

@@ -127,7 +127,7 @@ final class CalendarView: UIView,UICollectionViewDelegate, UICollectionViewDataS
         let daysOfMonth = calendarMethod.getLastDayOfMonth(self.currentCalendarComponent)
         let weekDayAdding = 2 - weekDay
         self.yearMonthLabel.text = calendarMethod.convertYearMonth(self.currentCalendarComponent)
-
+        
         self.days = []
         for day in weekDayAdding...daysOfMonth {
             if day < 1 {
@@ -144,6 +144,7 @@ final class CalendarView: UIView,UICollectionViewDelegate, UICollectionViewDataS
         var tempComponent = self.currentCalendarComponent
         tempComponent.day = day
         let dateString = dateFormatter.string(from: calendar.date(from: tempComponent)!)
+        StopWatchDAO().deleteDailyData(date: currentCalendarComponent.stringFormat)
         if realm.object(ofType: DailyData.self, forPrimaryKey: dateString) == nil {
             return false
         } else {
@@ -238,6 +239,7 @@ final class CalendarView: UIView,UICollectionViewDelegate, UICollectionViewDataS
             cell.dateLabel.text = self.dayArray[indexPath.row]
         } else {
             cell.configureCell()
+            
             cell.dataCheckView.isHidden = !isData(days[indexPath.row])
             cell.dateLabel.text = days[indexPath.row]
             if let day = Int(days[indexPath.row]) {