Merge pull request #122 from DeveloperAcademy-POSTECH/feature/#116

[Release] 1.1.0 업데이트
DeveloperAcademy-POSTECH · Dec 21, 2023 · b10b204 · b10b204
2 parents e652d3e + f54ff1b
commit b10b204
Show file tree

Hide file tree

Showing 67 changed files with 859 additions and 756 deletions.
diff --git a/Projects/App/Project.swift b/Projects/App/Project.swift
@@ -11,13 +11,13 @@ import ProjectDescriptionHelpers
 private let moduleName = "App"
 
 let infoPlist: [String: Plist.Value] = [
-    "CFBundleShortVersionString": "1.0.3",
+    "CFBundleShortVersionString": "1.1.0",
     "CFBundleVersion": "1",
     "CFBundleDisplayName": "Linable",
     "UIMainStoryboardFile": "",
     "UILaunchStoryboardName": "LaunchScreen",
-    "NSPhotoLibraryAddUsageDescription" : "to let you export images to photo library",
-    "CFBundleAllowMixedLocalizations" : "true",
+    "NSPhotoLibraryAddUsageDescription": "to let you export images to photo library",
+    "CFBundleAllowMixedLocalizations": "true",
     "UISupportedInterfaceOrientations": ["UIInterfaceOrientationPortrait"],
     "LSApplicationCategoryType": "public.app-category.sports",
     "UIUserInterfaceStyle": "Light"

diff --git a/Projects/App/Resources/Localizable.xcstrings b/Projects/App/Resources/Localizable.xcstrings
@@ -69,6 +69,23 @@
         }
       }
     },
+    "Add Team" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Add Team"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "팀 추가"
+          }
+        }
+      }
+    },
     "Change" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -352,87 +369,87 @@
         }
       }
     },
-    "Push To Edit" : {
+    "Registered" : {
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Push to Edit"
+            "value" : "Registered"
           }
         },
         "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "밀어올려서 편집하기"
+            "value" : "등록 완료"
           }
         }
       }
     },
-    "Registered" : {
+    "Share" : {
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Registered"
+            "value" : "Share"
           }
         },
         "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "등록 완료"
+            "value" : "공유하기"
           }
         }
       }
     },
-    "Share" : {
+    "Show More" : {
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Share"
+            "value" : "Show more"
           }
         },
         "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "공유하기"
+            "value" : "더 보기"
           }
         }
       }
     },
-    "Show More" : {
+    "Sub Color" : {
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Show more"
+            "value" : "Sub Color"
           }
         },
         "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "더 보기"
+            "value" : "서브 컬러"
           }
         }
       }
     },
-    "Sub Color" : {
+    "Swipe to edit" : {
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sub Color"
+            "value" : "Swipe to edit"
           }
         },
         "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "서브 컬러"
+            "value" : "밀어올려서 편집하기"
           }
         }
       }

diff --git a/Projects/App/Sources/MyApp.swift b/Projects/App/Sources/MyApp.swift
@@ -14,8 +14,8 @@ import SwiftUI
 struct MyApp: App {
     var body: some Scene {
         WindowGroup {
-            MainView(modelContext: teamContainer.mainContext)
-                .modelContainer(teamContainer)
+            MainView(modelContext: linableContainer.mainContext)
+                .modelContainer(linableContainer)
         }
     }
 }
diff --git a/Projects/Common/Resources/Assets.xcassets/backgroundBlueClear.imageset/Contents.json b/Projects/Common/Resources/Assets.xcassets/backgroundBlueClear.imageset/Contents.json
@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "backgroundBlue.png",
+      "filename" : "background.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/...ts/Common/Resources/Assets.xcassets/backgroundBlueClear.imageset/background.png b/...ts/Common/Resources/Assets.xcassets/backgroundBlueClear.imageset/background.png
diff --git a/...ommon/Resources/Assets.xcassets/backgroundBlueClear.imageset/backgroundBlue.png b/...ommon/Resources/Assets.xcassets/backgroundBlueClear.imageset/backgroundBlue.png
diff --git a/...ets/backgroundNeon.imageset/Contents.json → ...ts/backgroundLight.imageset/Contents.json b/...ets/backgroundNeon.imageset/Contents.json → ...ts/backgroundLight.imageset/Contents.json
@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "backgroundNeon.png",
+      "filename" : "Large.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/Projects/Common/Resources/Assets.xcassets/backgroundLight.imageset/Large.png b/Projects/Common/Resources/Assets.xcassets/backgroundLight.imageset/Large.png
diff --git a/...cts/Common/Resources/Assets.xcassets/backgroundNeon.imageset/backgroundNeon.png b/...cts/Common/Resources/Assets.xcassets/backgroundNeon.imageset/backgroundNeon.png
diff --git a/Projects/Common/Resources/Assets.xcassets/fieldLightGrayBlue.imageset/Contents.json b/Projects/Common/Resources/Assets.xcassets/fieldLightGrayBlue.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "라이트그레이블루.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Projects/Common/Resources/Assets.xcassets/fieldLightGrayBlue.imageset/라이트그레이블루.png b/Projects/Common/Resources/Assets.xcassets/fieldLightGrayBlue.imageset/라이트그레이블루.png
diff --git a/Projects/Common/Resources/Assets.xcassets/previewBlackBlue.imageset/Contents.json b/Projects/Common/Resources/Assets.xcassets/previewBlackBlue.imageset/Contents.json
@@ -5,11 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Square 2.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "Square 2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/Projects/Common/Resources/Assets.xcassets/previewBlueGray.imageset/Contents.json b/Projects/Common/Resources/Assets.xcassets/previewBlueGray.imageset/Contents.json
@@ -5,11 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Square 3.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "Square 3.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/...ts/shareNeonPurple.imageset/Contents.json → ...s/previewBlueGreen.imageset/Contents.json b/...ts/shareNeonPurple.imageset/Contents.json → ...s/previewBlueGreen.imageset/Contents.json
@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "shareNeonPurple.png",
+      "filename" : "Preview.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/Projects/Common/Resources/Assets.xcassets/previewBlueGreen.imageset/Preview.png b/Projects/Common/Resources/Assets.xcassets/previewBlueGreen.imageset/Preview.png
diff --git a/.../previewNeonPurple.imageset/Contents.json → ...eviewLightGrayBlue.imageset/Contents.json b/.../previewNeonPurple.imageset/Contents.json → ...eviewLightGrayBlue.imageset/Contents.json
@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "previewNeonPurple.png",
+      "filename" : "Preview.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/...ects/Common/Resources/Assets.xcassets/previewLightGrayBlue.imageset/Preview.png b/...ects/Common/Resources/Assets.xcassets/previewLightGrayBlue.imageset/Preview.png
diff --git a/...mmon/Resources/Assets.xcassets/previewNeonPurple.imageset/previewNeonPurple.png b/...mmon/Resources/Assets.xcassets/previewNeonPurple.imageset/previewNeonPurple.png
diff --git a/Projects/Common/Resources/Assets.xcassets/previewWhiteGreen.imageset/Contents.json b/Projects/Common/Resources/Assets.xcassets/previewWhiteGreen.imageset/Contents.json
@@ -5,11 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Square 4.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "Square 4.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/Projects/Common/Resources/Assets.xcassets/shareBlueGreen.imageset/Contents.json b/Projects/Common/Resources/Assets.xcassets/shareBlueGreen.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Share.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Projects/Common/Resources/Assets.xcassets/shareBlueGreen.imageset/Share.png b/Projects/Common/Resources/Assets.xcassets/shareBlueGreen.imageset/Share.png
diff --git a/Projects/Common/Resources/Assets.xcassets/shareLightGrayBlue.imageset/Contents.json b/Projects/Common/Resources/Assets.xcassets/shareLightGrayBlue.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Share.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Projects/Common/Resources/Assets.xcassets/shareLightGrayBlue.imageset/Share.png b/Projects/Common/Resources/Assets.xcassets/shareLightGrayBlue.imageset/Share.png
diff --git a/...s/Common/Resources/Assets.xcassets/shareNeonPurple.imageset/shareNeonPurple.png b/...s/Common/Resources/Assets.xcassets/shareNeonPurple.imageset/shareNeonPurple.png