Merge pull request #56 from leeari95/release/v1.2.0

leeari95 · Nov 30, 2022 · c06f156 · c06f156
2 parents f4f2e35 + e9a974a
commit c06f156
Show file tree

Hide file tree

Showing 117 changed files with 2,228 additions and 266 deletions.
diff --git a/Animal-Crossing-Wiki/.swiftlint.yml b/Animal-Crossing-Wiki/.swiftlint.yml
@@ -3,6 +3,7 @@ included:
 excluded: # 린트 과정에서 무시할 파일 경로. `included`보다 우선순위 높음
   - Animal-Crossing-Wiki/Resources/AppDelegate.swift
   - Animal-Crossing-Wiki/Resources/SceneDelegate.swift
+  - Animal-Crossing-Wiki/Sources/Utility/Items.swift
 type_body_length: # 타입 길이
     warning: 200
     error: 250
@@ -18,7 +19,7 @@ function_body_length:
   error: 300
 type_body_length:
     - 300 # warning
-    - 400
+    - 500
 file_length:
     warning: 500
     error: 1200
@@ -30,6 +31,8 @@ disabled_rules: # 실행에서 제외할 룰 식별자들
     - trailing_whitespace
     - vertical_parameter_alignment
     - cyclomatic_complexity
+    - void_function_in_ternary
+    - comment_spacing
 opt_in_rules: # 일부 룰은 옵트 인 형태로 제공
     - empty_count
     - conditional_returns_on_newline
diff --git a/Animal-Crossing-Wiki/Animal-Crossing-Wiki.xcodeproj/project.pbxproj b/Animal-Crossing-Wiki/Animal-Crossing-Wiki.xcodeproj/project.pbxproj
diff --git a/...sing-Wiki/Animal-Crossing-Wiki/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/...sing-Wiki/Animal-Crossing-Wiki/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -150,6 +150,66 @@
       "scale" : "1x",
       "size" : "1024x1024"
     },
+    {
+      "filename" : "16.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "32.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "32.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "64.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "256.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "256.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "512.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "512.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "1024.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    },
     {
       "filename" : "48.png",
       "idiom" : "watch",
@@ -225,6 +285,13 @@
       "size" : "51x51",
       "subtype" : "45mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "54x54",
+      "subtype" : "49mm"
+    },
     {
       "filename" : "172.png",
       "idiom" : "watch",
@@ -257,70 +324,17 @@
       "subtype" : "45mm"
     },
     {
-      "filename" : "1024.png",
-      "idiom" : "watch-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    },
-    {
-      "filename" : "16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "512.png",
-      "idiom" : "mac",
+      "idiom" : "watch",
+      "role" : "quickLook",
       "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
+      "size" : "129x129",
+      "subtype" : "49mm"
     },
     {
       "filename" : "1024.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
+      "idiom" : "watch-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {

diff --git a/...i/Animal-Crossing-Wiki/Resources/Assets.xcassets/icons/icon-photos.imageset/Contents.json b/...i/Animal-Crossing-Wiki/Resources/Assets.xcassets/icons/icon-photos.imageset/Contents.json
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Image.png",
+      "filename" : "icon-photos.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/...al-Crossing-Wiki/Resources/Assets.xcassets/icons/icon-photos.imageset/Image.png b/...al-Crossing-Wiki/Resources/Assets.xcassets/icons/icon-photos.imageset/Image.png
diff --git a/...ssing-Wiki/Resources/Assets.xcassets/icons/icon-photos.imageset/icon-photos.png b/...ssing-Wiki/Resources/Assets.xcassets/icons/icon-photos.imageset/icon-photos.png
diff --git a/...nimal-Crossing-Wiki/Resources/Assets.xcassets/icons/icon-reactions.imageset/Contents.json b/...nimal-Crossing-Wiki/Resources/Assets.xcassets/icons/icon-reactions.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Grin.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...-Crossing-Wiki/Resources/Assets.xcassets/icons/icon-reactions.imageset/Grin.png b/...-Crossing-Wiki/Resources/Assets.xcassets/icons/icon-reactions.imageset/Grin.png
diff --git a/.../Sources/Presentation/AppAppearance.swift → ...sing-Wiki/Sources/App/AppAppearance.swift b/.../Sources/Presentation/AppAppearance.swift → ...sing-Wiki/Sources/App/AppAppearance.swift
diff --git a/...Crossing-Wiki/Resources/AppDelegate.swift → ...ossing-Wiki/Sources/App/AppDelegate.swift b/...Crossing-Wiki/Resources/AppDelegate.swift → ...ossing-Wiki/Sources/App/AppDelegate.swift
diff --git a/...ossing-Wiki/Resources/SceneDelegate.swift → ...sing-Wiki/Sources/App/SceneDelegate.swift b/...ossing-Wiki/Resources/SceneDelegate.swift → ...sing-Wiki/Sources/App/SceneDelegate.swift
diff --git a/...Sources/Presentation/AppCoordinator.swift → ...rossing-Wiki/Sources/AppCoordinator.swift b/...Sources/Presentation/AppCoordinator.swift → ...rossing-Wiki/Sources/AppCoordinator.swift
diff --git a/...ki/Sources/Presentation/Coordinator.swift → ...l-Crossing-Wiki/Sources/Coordinator.swift b/...ki/Sources/Presentation/Coordinator.swift → ...l-Crossing-Wiki/Sources/Coordinator.swift
diff --git a/...es/CoreDataStorage/CoreDataStorage.xcdatamodeld/UserCollectionEntity.xcdatamodel/contents b/...es/CoreDataStorage/CoreDataStorage.xcdatamodeld/UserCollectionEntity.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21F79" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21512" systemVersion="22A400" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="DailyTaskEntity" representedClassName="DailyTaskEntity" syncable="YES" codeGenerationType="class">
         <attribute name="amount" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
@@ -58,6 +58,7 @@
         <attribute name="speakerType" optional="YES" attributeType="String"/>
         <attribute name="styles" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" customClassName="[String]"/>
         <attribute name="tag" optional="YES" attributeType="String"/>
+        <attribute name="themes" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" customClassName="[String]"/>
         <attribute name="translations" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" customClassName="[String: String]"/>
         <attribute name="variation" optional="YES" attributeType="String"/>
         <attribute name="variations" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" customClassName="[[String: Any]]"/>

diff --git a/...Crossing-Wiki/Sources/CoreDataStorage/ItemsStorage/EntityMapping/ItemEntity+Mapping.swift b/...Crossing-Wiki/Sources/CoreDataStorage/ItemsStorage/EntityMapping/ItemEntity+Mapping.swift
@@ -64,6 +64,8 @@ extension ItemEntity {
         self.foodPower = Int64(item.foodPower ?? 0)
         self.doorDeco = item.doorDeco ?? false
         self.musicURL = item.musicURL
+        self.themes = item.themes
+        self.styles = item.styles?.map { $0.rawValue }
     }
 
     func toKeyword() -> [Keyword: [String]] {
@@ -132,7 +134,9 @@ extension ItemEntity {
             variations: variations?.compactMap { Variant($0)},
             foodPower: Int(foodPower),
             doorDeco: doorDeco,
-            musicURL: musicURL
+            musicURL: musicURL,
+            themes: themes,
+            styles: styles?.compactMap { Style(rawValue: $0) }
         )
     }
 }
@@ -298,8 +302,8 @@ extension Variant {
             "variantId": variantId,
             "internalId": internalId,
             "variantTranslations": variantTranslations?.toDictionary() ?? [:],
-            "colors": colors.map { $0.rawValue },
-            "concepts": concepts.map { $0.rawValue },
+            "colors": colors?.map { $0.rawValue } ?? [],
+            "concepts": concepts?.map { $0.rawValue } ?? [],
             "patternTranslations": patternTranslations?.toDictionary() ?? [:]
         ]
     }

diff --git a/...-Crossing-Wiki/Animal-Crossing-Wiki/Sources/Extension/UI/UIViewController+extension.swift b/...-Crossing-Wiki/Animal-Crossing-Wiki/Sources/Extension/UI/UIViewController+extension.swift
@@ -37,7 +37,7 @@ extension UIViewController {
                     popoverController.barButtonItem = barButtonItem
                 } else {
                     popoverController.sourceRect = CGRect(
-                        x: self.view.bounds.midX ,
+                        x: self.view.bounds.midX,
                         y: self.view.bounds.midY,
                         width: .zero,
                         height: .zero