Merge branch 'develop' into Feat/#5_memo_ui

ProjectInTheClass · Nov 14, 2023 · b8ddb35 · b8ddb35
2 parents e24c410 + 98f878c
commit b8ddb35
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -8,6 +8,8 @@
 
 ## 리뷰 포인트
 
+## 기타 사항
+구현하면서 고민되었던 부분이나 질문 사항 등
 
 ## References
 

diff --git a/ReadLog/ReadLog.xcodeproj/project.pbxproj b/ReadLog/ReadLog.xcodeproj/project.pbxproj
@@ -31,6 +31,7 @@
 		E6E4BF552B01BF4000FEEE10 /* Header.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Header.swift; sourceTree = "<group>"; };
 		E6E4BF582B01C88500FEEE10 /* Note.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Note.swift; sourceTree = "<group>"; };
 		E6E4BF5A2B01CE1100FEEE10 /* NoteLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteLabel.swift; sourceTree = "<group>"; };
+
 		E6E68ED72AF1DD7B00172557 /* ReadLog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ReadLog.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E6E68EDA2AF1DD7B00172557 /* ReadLogApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadLogApp.swift; sourceTree = "<group>"; };
 		E6E68EDC2AF1DD7B00172557 /* RootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootView.swift; sourceTree = "<group>"; };
@@ -57,6 +58,7 @@
 			path = Fonts;
 			sourceTree = "<group>";
 		};
+
 		E6E4BF542B01BD9B00FEEE10 /* AddNote */ = {
 			isa = PBXGroup;
 			children = (
@@ -73,6 +75,7 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
+
 		E6E68ECE2AF1DD7B00172557 = {
 			isa = PBXGroup;
 			children = (
@@ -176,7 +179,9 @@
 			children = (
 				E622526D2AFB7CB300D33EC3 /* Color+Extension.swift */,
 				E622526F2AFB7E7000D33EC3 /* TextStyle+Extension.swift */,
+
 				E6C73D5A2B02F82E00A3C9C9 /* UINavigationController+Extension.swift */,
+
 			);
 			path = Extension;
 			sourceTree = "<group>";

diff --git a/ReadLog/ReadLog/Assets.xcassets/background.colorset/Contents.json b/ReadLog/ReadLog/Assets.xcassets/background.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF1",
+          "green" : "0xF7",
+          "red" : "0xFA"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}