eunjooChoi · eunjooChoi · Mar 23, 2024 · Mar 23, 2024
diff --git a/PlantingMind/PlantingMind.xcodeproj/project.pbxproj b/PlantingMind/PlantingMind.xcodeproj/project.pbxproj
@@ -11,6 +11,9 @@
 		7B0A76CE2B904A1200ADC039 /* MoodRecords.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 7B0A76CC2B904A1200ADC039 /* MoodRecords.xcdatamodeld */; };
 		7B0A76D12B906FE100ADC039 /* CoreDataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0A76D02B906FE100ADC039 /* CoreDataStack.swift */; };
 		7B0A77112B93196D00ADC039 /* MoodRecordViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0A77102B93196D00ADC039 /* MoodRecordViewModel.swift */; };
+		7B0E1BCE2BAD57940060458D /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 7B95D1792BA1645C00484F9D /* Localizable.xcstrings */; };
+		7B0E1BCF2BAD57A70060458D /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B95D17B2BA166AC00484F9D /* StringExtension.swift */; };
+		7B0E1BD32BAD6C240060458D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7B11F82B2B4549E000346A41 /* Assets.xcassets */; };
 		7B11F8282B4549DF00346A41 /* PlantingMindApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B11F8272B4549DF00346A41 /* PlantingMindApp.swift */; };
 		7B11F82A2B4549DF00346A41 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B11F8292B4549DF00346A41 /* ContentView.swift */; };
 		7B11F82C2B4549E000346A41 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7B11F82B2B4549E000346A41 /* Assets.xcassets */; };
@@ -480,6 +483,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				7B0E1BCE2BAD57940060458D /* Localizable.xcstrings in Resources */,
+				7B0E1BD32BAD6C240060458D /* Assets.xcassets in Resources */,
 				7B63CAA72BA9CB4700943DED /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -546,6 +551,7 @@
 				7B63CAA52BA9CB4600943DED /* PlantingWidget.swift in Sources */,
 				7BA079972BAAD87A009B5E46 /* ColorExtension.swift in Sources */,
 				7BA079962BAAD834009B5E46 /* Mood.swift in Sources */,
+				7B0E1BCF2BAD57A70060458D /* StringExtension.swift in Sources */,
 				7BA079952BAAD669009B5E46 /* MoodRecords.xcdatamodeld in Sources */,
 				7B63CAA32BA9CB4600943DED /* PlantingWidgetBundle.swift in Sources */,
 				7BA079932BAAD662009B5E46 /* MoodRecord+CoreDataClass.swift in Sources */,

diff --git a/...tingMind/PlantingMind/Assets.xcassets/CustomColor/widgetBackground.colorset/Contents.json b/...tingMind/PlantingMind/Assets.xcassets/CustomColor/widgetBackground.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF9",
+          "green" : "0xF9",
+          "red" : "0xF9"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "extended-srgb",
+        "components" : {
+          "alpha" : "0.240",
+          "blue" : "0x63",
+          "green" : "0x63",
+          "red" : "0x63"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/PlantingMind/PlantingMind/ColorExtension.swift b/PlantingMind/PlantingMind/ColorExtension.swift
@@ -10,6 +10,7 @@ import SwiftUI
 
 private enum CustomColor: String {
     case background
+    case widgetBackground
     case line
     case general
     case point
@@ -24,6 +25,7 @@ extension Color {
     struct Custom {
         // Basic Color
         static let background = Color(CustomColor.background.rawValue)
+        static let widgetBackground = Color(CustomColor.widgetBackground.rawValue)
         static let line = Color(CustomColor.line.rawValue)
         static let general = Color(CustomColor.general.rawValue)
         static let point = Color(CustomColor.point.rawValue)

diff --git a/PlantingMind/PlantingMind/CoreData/CoreDataStack.swift b/PlantingMind/PlantingMind/CoreData/CoreDataStack.swift
@@ -15,6 +15,12 @@ enum StorageType {
 
 final class CoreDataStack: ObservableObject {
     let persistentContainer: NSPersistentContainer
+    private let datebaseName = "PlantingMind.sqlite"
+
+    var sharedStoreURL: URL? {
+        let container = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.eunjoo.planting-mind.PlantingMind")
+        return container?.appendingPathComponent(datebaseName)
+    }
 
     init(_ storageType: StorageType = .persistent) {
         self.persistentContainer = NSPersistentContainer(name: "MoodRecords")
@@ -23,6 +29,8 @@ final class CoreDataStack: ObservableObject {
         if storageType == .inMemory {
             let description = NSPersistentStoreDescription(url: URL(filePath: "dev/null"))
             self.persistentContainer.persistentStoreDescriptions = [description]
+        } else {
+            self.persistentContainer.persistentStoreDescriptions.first?.url = self.sharedStoreURL
         }
 
         self.persistentContainer.loadPersistentStores { _, error in

diff --git a/PlantingMind/PlantingMind/DateExtension.swift b/PlantingMind/PlantingMind/DateExtension.swift
@@ -9,15 +9,10 @@ import Foundation
 
 extension Date {
     var startOfMonth: Date? {
-        Calendar.current.date(from: Calendar.current.dateComponents([.year, .month], from: self))
+        Calendar.current.dateInterval(of: .month, for: self)?.start
     }
 
     var endOfMonth: Date? {
-        guard let nextMonth = Calendar.current.date(byAdding: .month, value: 1, to: self),
-              let startOfNextMonth = Calendar.current.date(from: Calendar.current.dateComponents([.year, .month], from: nextMonth)) else {
-            return nil
-        }
-
-        return Calendar.current.date(byAdding: .second, value: -1, to: startOfNextMonth)
+        Calendar.current.dateInterval(of: .month, for: self)?.end
     }
 }
diff --git a/PlantingMind/PlantingMind/Localization/Localizable.xcstrings b/PlantingMind/PlantingMind/Localization/Localizable.xcstrings
@@ -1,6 +1,23 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
+    "app_title" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Planting Mind"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "마음심기"
+          }
+        }
+      }
+    },
     "cancel" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -68,6 +85,40 @@
         }
       }
     },
+    "friday" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "F"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ㄱ"
+          }
+        }
+      }
+    },
+    "monday" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "M"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ㅇ"
+          }
+        }
+      }
+    },
     "mood_reason" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -102,6 +153,23 @@
         }
       }
     },
+    "saturday" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "S"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ㅌ"
+          }
+        }
+      }
+    },
     "save" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -119,6 +187,23 @@
         }
       }
     },
+    "sunday" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "S"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ㅇ"
+          }
+        }
+      }
+    },
     "text_limit" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -135,6 +220,74 @@
           }
         }
       }
+    },
+    "thursday" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "T"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ㅁ"
+          }
+        }
+      }
+    },
+    "tuesday" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "T"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ㅎ"
+          }
+        }
+      }
+    },
+    "wednesday" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "W"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ㅅ"
+          }
+        }
+      }
+    },
+    "widget_desc" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Check the widget to see how you feel."
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "기록한 기분을 위젯으로 확인하세요."
+          }
+        }
+      }
     }
   },
   "version" : "1.0"

diff --git a/PlantingMind/PlantingMind/MoodRecord/MoodRecordViewModel.swift b/PlantingMind/PlantingMind/MoodRecord/MoodRecordViewModel.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 import CoreData
+import WidgetKit
 
 class MoodRecordViewModel: ObservableObject {
     private let context: NSManagedObjectContext
@@ -46,6 +47,7 @@ class MoodRecordViewModel: ObservableObject {
                 record.reason = self.reason
             }
             try context.save()
+            WidgetCenter.shared.reloadAllTimelines()
         } catch {
             print("Failed to save the mood record", error.localizedDescription)
         }