Merge pull request #122 from JYPjoy/develop

[SETTING] 앱스토어 리젝 대비용

Codingdong-iOS/Codingdong-iOS.xcodeproj/project.pbxproj

@@ -1131,6 +1131,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_KEY_CFBundleDisplayName = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
@@ -1189,6 +1190,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_KEY_CFBundleDisplayName = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MTL_ENABLE_DEBUG_INFO = NO;
@@ -1205,11 +1207,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = W43DLLFB4Q;
+				CURRENT_PROJECT_VERSION = 7;
+				DEVELOPMENT_TEAM = XGHDQG66U5;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Codingdong-iOS/Util/Resources/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "코딩동";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "음성인식을 위한 마이크 사용 권한";
 				INFOPLIST_KEY_NSSpeechRecognitionUsageDescription = Codongdong;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -1224,9 +1227,11 @@
 				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.combine.CodingDong;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -1236,11 +1241,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = W43DLLFB4Q;
+				CURRENT_PROJECT_VERSION = 7;
+				DEVELOPMENT_TEAM = XGHDQG66U5;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Codingdong-iOS/Util/Resources/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "코딩동";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "음성인식을 위한 마이크 사용 권한";
 				INFOPLIST_KEY_NSSpeechRecognitionUsageDescription = Codongdong;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -1255,9 +1261,11 @@
 				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.combine.CodingDong;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};

Codingdong-iOS/Codingdong-iOS/Application/SceneDelegate.swift

@@ -20,7 +20,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         window.makeKeyAndVisible()
 
         DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
-            window.rootViewController = UINavigationController(rootViewController: SunAndMoonIntroViewController())
+            window.rootViewController = UINavigationController(rootViewController: OnboardingViewController())
         }
 
         self.window = window

Codingdong-iOS/Codingdong-iOS/Model/Fable.swift

@@ -13,10 +13,11 @@ struct Fable {
 }
 
 var fableList: [Fable] = [
-    Fable(isRead: true, title: "해님달님"),
-    Fable(isRead: false, title: "콩쥐팥쥐"),
-    Fable(isRead: false, title: "별주부전"),
-    Fable(isRead: false, title: "선녀와 나무꾼"),
-    Fable(isRead: false, title: "금도끼 은도끼"),
-    Fable(isRead: false, title: "심청전")
+    Fable(isRead: true, title: "해님달님")
+//    ,
+//    Fable(isRead: false, title: "콩쥐팥쥐"),
+//    Fable(isRead: false, title: "별주부전"),
+//    Fable(isRead: false, title: "선녀와 나무꾼"),
+//    Fable(isRead: false, title: "금도끼 은도끼"),
+//    Fable(isRead: false, title: "심청전")
 ]

Codingdong-iOS/Codingdong-iOS/Presentation/Opening/View/StoryListTableView.swift

@@ -43,7 +43,7 @@ final class StoryListTableView: UIView {
 // MARK: - Extension
 extension StoryListTableView: UITableViewDataSource, UITableViewDelegate {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 3
+        return fableList.count
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {

Codingdong-iOS/Codingdong-iOS/Presentation/Opening/ViewController/MyBookShelfViewController.swift

@@ -158,7 +158,7 @@ final class MyBookShelfViewController: UIViewController, ConfigUI {
         }
 
         badgeTitle.snp.makeConstraints {
-            $0.top.equalTo(storyList.snp.bottom).offset(32)
+            $0.top.equalTo(naviLine.snp.bottom).offset(280)
             $0.left.equalToSuperview().offset(18)
         }
 
@@ -176,7 +176,7 @@ final class MyBookShelfViewController: UIViewController, ConfigUI {
             $0.top.equalTo(storyTitle.snp.bottom).offset(16)
             $0.left.equalToSuperview().offset(16)
             $0.right.equalToSuperview().offset(-16)
-            $0.height.equalTo(180)
+            $0.height.equalTo(60)
         }
 
         cookieContainer.snp.makeConstraints {

README.md

@@ -1 +1,18 @@
-# 🚜 콤바인! 콤바인! 콤바인! 
+# 🗂️ 프로젝트 소개
+초등학교 1-3학년 저시력 시각 장애 어린이들을 위한 전래 동화와 연계한 코딩 교육 서비스입니다.
+
+<br/>
+
+# 🛠️ 기술 스택
+- 화면 구성: UIkit(Code-Based)
+- 디자인 패턴: MVVM
+- 비동기 프로그래밍: Combine, GCD
+- 데이터베이스: SwiftData
+- 애플 고유 기술: UIAccessibility, CoreMotion, CoreHaptic, 
+- 사용툴: 노션, 깃, 피그마
+<br/>
+
+
+# 📱 주요 화면
+<img src = "https://github.com/JYPjoy/MacC-Team5-COMBINE/blob/master/screenshot.png?raw=true" width = "1000">
+