Merge pull request #69 from boostcamp3-iOS/develop

Week3 demo

.gitignore

@@ -1,3 +1,7 @@
+### Custom 
+
+# About API Key
+Config.swift
 
 # Created by https://www.gitignore.io/api/xcode,swift,macos
 # Edit at https://www.gitignore.io/?templates=xcode,swift,macos
@@ -129,4 +133,4 @@ iOSInjectionProject/
 /*.gcno
 **/xcshareddata/WorkspaceSettings.xcsettings
 
-# End of https://www.gitignore.io/api/xcode,swift,macos
+# End of https://www.gitignore.io/api/xcode,swift,macos

README.md

@@ -1,22 +1,28 @@
-# TREE 🌳
-> 전 세계적인 이슈를 확인할 수 있는 애플리케이션 
+# TREE
+> 전 세계 이슈(급상승 검색어, 뉴스 기사)를 실시간으로 제공하는 애플리케이션
 
-## ⚠️ GROUND RULE ⚠️
+## Team Gardener
+> BoostCamp 3th A-1 Team
 
-- 공통된 코드 컨벤션을 사용합니다.
-- 코드의 효율성을 증대시킵니다.
-- 대화를 통한 적극적인 피드백을 주고받습니다. 
-- 프로젝트 완성을 목표로 합니다.
+- [박성준](https://github.com/godpp) 
+- [김혜리](https://github.com/kimhyeri) 
+- [김현태](https://github.com/onemoongit)
 
-## 📑 앱 기획서 📑
-  ### 기능 트리
-![텍스트목록](./image/1.png)
+## GROUND RULE
 
+* 공통된 코드 컨벤션을 사용합니다.
+  - [Wiki](https://github.com/boostcamp3-iOS/team-a1/wiki/Swift-Style-Guide)에 정의하였습니다.
+* 코드의 효율성을 증대시킵니다.
+  - 재사용 가능한 부분에 대해서는 모듈로 활용하여 사용합니다.
+  - PR에 대한 코멘트를 활용하여 서로의 코드를 적극적으로 리뷰합니다.
+* 대화를 통한 적극적인 피드백을 주고받습니다.
+  - 매일 아침 10시부터 데일리 스크럼을 통해 어제 한 작업을 공유하고 오늘 해야할 작업을 명확하게 설정합니다.
 
-## 🔜 핵심 기능 구현 순서 🔜
+## 기능 트리
+![](./image/functionTree.png)
 
-- 검색을 통해 유저가 원하는 다양한 아티클 검색 가능
-- 가독성을 높이고 빠른 응답 속도를 보여주는 네이티브 뷰어 기능
-- 전 세계에서 업데이트 되는 뉴스를 실시간으로 표시
-- 아티클 스크랩을 할 수 있는 아카이빙 기능
-- 파파고 API를 활용하여 다양한 언어로 번역 가능
+## 현재까지 작업한 뷰
+
+> Search
+
+![](./image/Search.png)

tree/tree.xcodeproj/xcshareddata/xcschemes/tree.xcscheme

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "35DC0DCA21F6F3C700F30416"
+               BuildableName = "tree.app"
+               BlueprintName = "tree"
+               ReferencedContainer = "container:tree.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "35DC0DCA21F6F3C700F30416"
+            BuildableName = "tree.app"
+            BlueprintName = "tree"
+            ReferencedContainer = "container:tree.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "35DC0DCA21F6F3C700F30416"
+            BuildableName = "tree.app"
+            BlueprintName = "tree"
+            ReferencedContainer = "container:tree.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Debug"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "35DC0DCA21F6F3C700F30416"
+            BuildableName = "tree.app"
+            BlueprintName = "tree"
+            ReferencedContainer = "container:tree.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

tree/tree/.swiftlint.yml

@@ -1,5 +1,6 @@
 disabled_rules:
 - line_length
+- trailing_whitespace
 included:
 excluded:
 - Pods

tree/tree/AppDelegate.swift

@@ -7,14 +7,18 @@
 //
 
 import UIKit
+import CoreData
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        // Override point for customization after application launch.
+        if UserDefaults.standard.dictionary(forKey: "searchFilter") == nil {
+            let searchFilter = ["keyword": "Title","sort": "Date","category": "All","language": "eng"]
+            UserDefaults.standard.set(searchFilter, forKey: "searchFilter")
+        } 
         return true
     }
 
@@ -34,6 +38,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     func applicationWillTerminate(_ application: UIApplication) {
+        self.saveContext()
+    }
+
+    // MARK: - Core Data stack
+    lazy var persistentContainer: NSPersistentContainer = {
+        let container = NSPersistentContainer(name: "TreeData")
+        container.loadPersistentStores(completionHandler: { (_, error) in
+            if let error = error as NSError? {
+                fatalError("Unresolved error \(error), \(error.userInfo)")
+            }
+        })
+        return container
+    }()
+
+    private func saveContext () {
+        let context = persistentContainer.viewContext
+        if context.hasChanges {
+            do {
+                try context.save()
+            } catch {
+                let nserror = error as NSError
+                fatalError("Unresolved error \(nserror), \(nserror.userInfo)")
+            }
+        }
     }
 
 }

tree/tree/Assets.xcassets/2.imageset/Contents.json → tree/tree/Assets.xcassets/Live.imageset/Contents.json

@@ -2,15 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "2.jpeg",
+      "filename" : "[email protected]",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

tree/tree/Assets.xcassets/Scrap.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

tree/tree/Assets.xcassets/Search.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

tree/tree/Assets.xcassets/back.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "left-arrow.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

tree/tree/Assets.xcassets/down.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}