From 179b32f33845f7ced7bd537269613bfab99f8647 Mon Sep 17 00:00:00 2001
From: Minny27 <dltmdals0608@naver.com>
Date: Thu, 20 Oct 2022 23:49:50 +0900
Subject: [PATCH] =?UTF-8?q?[#36]Feat:=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?=
 =?UTF-8?q?=EC=84=9C=EC=B9=98=20=EB=B0=94=20=EA=B5=AC=ED=98=84=20-=20?=
 =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=B6=94=EA=B0=80=20-=20?=
 =?UTF-8?q?=ED=86=A0=ED=81=B0=EC=9D=B4=20=EC=9E=88=EC=9D=84=20=EB=95=8C=20?=
 =?UTF-8?q?=EB=B0=94=EB=A1=9C=20=ED=99=88=20=ED=99=94=EB=A9=B4=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 제목의 길이는 최대 40글자까지 한글로 간단 명료하게 작성
# 제목을 작성하고 반드시 빈 줄 한 줄을 만들어야 함 # 제목에 .(마침표) 금지
# <label> 리스트
# Feat: 새로운 기능
# Fix: 버그 수정
# Update: Swift 파일 (생성, 삭제, 이동, 이름 변경)
# Style: 코드 스타일 혹은 포맷 등에 관한 커밋
# Docs: 문서 (md 파일 추가, 수정, 삭제)
# Refactor: 코드 가독성과 유지 보수의 편의에 관한 커밋
# Test: 테스트
# <description>
# 내용의 길이는 한 줄당 60글자 내외에서 줄 바꿈. 한글로 간단 명료하게 작성
# 어떻게 보다는 무엇을, 왜 변경했는지를 작성할 것 (필수)
# <issue-number>
# 연관된 이슈 첨부, 여러 개 추가 가능
---
 Sparky-iOS.xcodeproj/project.pbxproj          |  18 +++++
 .../NavigationBar/SparkySearchBar.swift       |  70 ++++++++++++++++++
 .../Custom/Shareing/TagBottomSheetVC.swift    |  35 ++++-----
 .../Shareing/TagCollectionViewModel.swift     |   2 +
 Sparky-iOS/Extension/Color+.swift             |   1 +
 Sparky-iOS/Manager/CrawlManager.swift         |   1 -
 Sparky-iOS/SceneDelegate.swift                |  13 ++--
 Sparky-iOS/Scenes/Home/HomeVC.swift           |  59 ++++++++++++++-
 Sparky-iOS/Scenes/MyScrap/MyScrapVC.swift     |  21 ++++++
 .../Colors/background.colorset/Contents.json  |  20 +++++
 .../Images/logo.imageset/Contents.json        |  21 ++++++
 .../Images/logo.imageset/logo.png             | Bin 0 -> 1925 bytes
 .../Images/profile.imageset/Contents.json     |  21 ++++++
 .../Images/profile.imageset/profile.png       | Bin 0 -> 632 bytes
 .../Images/search.imageset/Contents.json      |   6 +-
 15 files changed, 255 insertions(+), 33 deletions(-)
 create mode 100644 Sparky-iOS/Custom/NavigationBar/SparkySearchBar.swift
 create mode 100644 Sparky-iOS/Scenes/MyScrap/MyScrapVC.swift
 create mode 100644 Sparky-iOS/SupprotingFiles/Assets.xcassets/Colors/background.colorset/Contents.json
 create mode 100644 Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/logo.imageset/Contents.json
 create mode 100644 Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/logo.imageset/logo.png
 create mode 100644 Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/profile.imageset/Contents.json
 create mode 100644 Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/profile.imageset/profile.png

diff --git a/Sparky-iOS.xcodeproj/project.pbxproj b/Sparky-iOS.xcodeproj/project.pbxproj
index 43aab81..e6c6048 100644
--- a/Sparky-iOS.xcodeproj/project.pbxproj
+++ b/Sparky-iOS.xcodeproj/project.pbxproj
@@ -60,6 +60,9 @@
 		56A0AA7628FC3BE100726C13 /* SparkyNavBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56A0AA7428FC3AD400726C13 /* SparkyNavBar.swift */; };
 		56A0AA7728FC3BE200726C13 /* SparkyNavBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56A0AA7428FC3AD400726C13 /* SparkyNavBar.swift */; };
 		56A6FAF328E4BB4B009EA038 /* SignUpVC2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56A6FAF228E4BB4B009EA038 /* SignUpVC2.swift */; };
+		56C41B8828FEC81900D610E5 /* SparkySearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56C41B8728FEC81900D610E5 /* SparkySearchBar.swift */; };
+		56C41B8928FEC8CC00D610E5 /* SparkySearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56C41B8728FEC81900D610E5 /* SparkySearchBar.swift */; };
+		56C41B8C28FECED600D610E5 /* MyScrapVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56C41B8B28FECED600D610E5 /* MyScrapVC.swift */; };
 		56C7B20328E93D9800D638D2 /* UserServiceAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56C7B20228E93D9800D638D2 /* UserServiceAPI.swift */; };
 		56C7B20528E9463600D638D2 /* UserServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56C7B20428E9463600D638D2 /* UserServiceProvider.swift */; };
 		56C7B20728E9687600D638D2 /* EmailSignInViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56C7B20628E9687600D638D2 /* EmailSignInViewModel.swift */; };
@@ -161,6 +164,8 @@
 		56A0AA6E28FBD50F00726C13 /* TagBottomSheetVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagBottomSheetVC.swift; sourceTree = "<group>"; };
 		56A0AA7428FC3AD400726C13 /* SparkyNavBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SparkyNavBar.swift; sourceTree = "<group>"; };
 		56A6FAF228E4BB4B009EA038 /* SignUpVC2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpVC2.swift; sourceTree = "<group>"; };
+		56C41B8728FEC81900D610E5 /* SparkySearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SparkySearchBar.swift; sourceTree = "<group>"; };
+		56C41B8B28FECED600D610E5 /* MyScrapVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyScrapVC.swift; sourceTree = "<group>"; };
 		56C7B20228E93D9800D638D2 /* UserServiceAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserServiceAPI.swift; sourceTree = "<group>"; };
 		56C7B20428E9463600D638D2 /* UserServiceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserServiceProvider.swift; sourceTree = "<group>"; };
 		56C7B20628E9687600D638D2 /* EmailSignInViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailSignInViewModel.swift; sourceTree = "<group>"; };
@@ -255,6 +260,7 @@
 		560BF31A28D0D0F400438463 /* Scenes */ = {
 			isa = PBXGroup;
 			children = (
+				56C41B8A28FECEC200D610E5 /* MyScrap */,
 				56DE426328E1F865000A6A55 /* SignUp */,
 				560BF31F28D0E66400438463 /* Home */,
 				560BF31E28D0E65900438463 /* Signin */,
@@ -465,10 +471,19 @@
 			isa = PBXGroup;
 			children = (
 				56A0AA7428FC3AD400726C13 /* SparkyNavBar.swift */,
+				56C41B8728FEC81900D610E5 /* SparkySearchBar.swift */,
 			);
 			path = NavigationBar;
 			sourceTree = "<group>";
 		};
+		56C41B8A28FECEC200D610E5 /* MyScrap */ = {
+			isa = PBXGroup;
+			children = (
+				56C41B8B28FECED600D610E5 /* MyScrapVC.swift */,
+			);
+			path = MyScrap;
+			sourceTree = "<group>";
+		};
 		56DE426328E1F865000A6A55 /* SignUp */ = {
 			isa = PBXGroup;
 			children = (
@@ -772,6 +787,7 @@
 				5684384E28F5D83C000E5C89 /* TagCollectionViewCell.swift in Sources */,
 				5652A44628EB303F00415738 /* CrawlManager.swift in Sources */,
 				5616C54828DB739800BF7126 /* CustomShareNC.swift in Sources */,
+				56C41B8928FEC8CC00D610E5 /* SparkySearchBar.swift in Sources */,
 				5684384F28F5D96E000E5C89 /* Tag.swift in Sources */,
 				569B79CB28F9F2A000AD9BC3 /* TagCollectionViewFlowLayout.swift in Sources */,
 			);
@@ -808,12 +824,14 @@
 				560BF31D28D0DAB300438463 /* UITextField+.swift in Sources */,
 				56DE426928E20E9A000A6A55 /* SignUpVC4.swift in Sources */,
 				5652A44D28EB4FAA00415738 /* Strings.swift in Sources */,
+				56C41B8C28FECED600D610E5 /* MyScrapVC.swift in Sources */,
 				56DE426728E20E91000A6A55 /* SignUpVC3.swift in Sources */,
 				56A0AA7728FC3BE200726C13 /* SparkyNavBar.swift in Sources */,
 				56902D1C28EAC595005F18B1 /* OTPStackView.swift in Sources */,
 				567DF87428ECA69F005A3E30 /* EmailSendRequest.swift in Sources */,
 				56C7B20928E9710400D638D2 /* EmailSignInView.swift in Sources */,
 				564938F928E8B55E00861D26 /* EmailSignInRequest.swift in Sources */,
+				56C41B8828FEC81900D610E5 /* SparkySearchBar.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Sparky-iOS/Custom/NavigationBar/SparkySearchBar.swift b/Sparky-iOS/Custom/NavigationBar/SparkySearchBar.swift
new file mode 100644
index 0000000..e561ba6
--- /dev/null
+++ b/Sparky-iOS/Custom/NavigationBar/SparkySearchBar.swift
@@ -0,0 +1,70 @@
+//
+//  SparkyTextField.swift
+//  Sparky-iOS
+//
+//  Created by SeungMin on 2022/10/18.
+//
+
+import UIKit
+
+class SparkyTextField: UITextField {
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+
+//        setupUI()
+        setupUnderLine()
+    }
+    
+//    required init?(coder: NSCoder) {
+//        super.init(coder: coder)
+//
+//        setupUnderLine()
+//    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+//    private func setupUI() {
+//        $0.
+//
+//        setupUnderLine()
+//    }
+    
+    private func setupUnderLine() {
+        let bottomLayer = CALayer()
+        bottomLayer.frame = CGRect(x: 0,
+                                   y: self.frame.height,
+                                   width: self.frame.width,
+                                   height: 1)
+        bottomLayer.backgroundColor = UIColor.gray400.cgColor
+        self.layer.addSublayer(bottomLayer)
+    }
+    
+    func setupLeftImageView(image: UIImage) {
+        self.leftViewMode = .always
+        let leftImageView = UIImageView(frame: CGRect(x: 0,
+                                                      y: self.frame.height / 2 - 10,
+                                                      width: 16,
+                                                      height: 16))
+        leftImageView.tintColor = .gray400
+        leftImageView.image = image
+        self.addSubview(leftImageView)
+    }
+    
+    override func placeholderRect(forBounds bounds: CGRect) -> CGRect {
+        let bounds = CGRect(x: 24, y: bounds.size.height / 2 - 10, width: bounds.width, height: bounds.height)
+        return bounds
+    }
+    
+    override func editingRect(forBounds bounds: CGRect) -> CGRect {
+        let bounds = CGRect(x: 24, y: bounds.size.height / 2 - 10, width: bounds.width, height: bounds.height)
+        return bounds
+    }
+    
+    override func textRect(forBounds bounds: CGRect) -> CGRect {
+        let bounds = CGRect(x: 24, y: bounds.size.height / 2 - 10, width: bounds.width, height: bounds.height)
+        return bounds
+    }
+}
diff --git a/Sparky-iOS/Custom/Shareing/TagBottomSheetVC.swift b/Sparky-iOS/Custom/Shareing/TagBottomSheetVC.swift
index 8870490..3de37ff 100644
--- a/Sparky-iOS/Custom/Shareing/TagBottomSheetVC.swift
+++ b/Sparky-iOS/Custom/Shareing/TagBottomSheetVC.swift
@@ -49,17 +49,9 @@ final class TagBottomSheetVC: UIViewController {
         $0.style = .plain
     }
     
-    private let tagSearchBar = UISearchBar().then {
+    private let tagTextField = SparkyTextField(frame: CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width - 40, height: 24)).then {
         $0.placeholder = "검색할 태그를 입력해주세요(최대 7글자)"
-        $0.showsCancelButton = false
-        $0.isTranslucent = false
-        $0.searchBarStyle = .minimal
-        $0.setBackgroundImage(UIImage(), for: .bottom, barMetrics: .default)
-        
-        for view in $0.searchTextField.subviews {
-            view.backgroundColor = .sparkyWhite
-        }
-        
+        $0.setupLeftImageView(image: UIImage(named: "search")!)
     }
     
     private let recentTagTitleLabel = UILabel().then {
@@ -79,9 +71,9 @@ final class TagBottomSheetVC: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        view.backgroundColor = .white
+        view.backgroundColor = .background
         setupNavBar()
-        setupConstraintes()
+        setupConstraints()
         bindViewModel()
         setupCollectionViewDelegate()
         setupDimmendTabGesture()
@@ -104,10 +96,10 @@ final class TagBottomSheetVC: UIViewController {
         customNavBar.layoutIfNeeded()
     }
     
-    private func setupConstraintes() {
+    private func setupConstraints() {
         view.addSubview(dimmedView)
         dimmedView.snp.makeConstraints {
-            $0.top.equalTo(view.safeAreaLayoutGuide)
+            $0.top.equalTo(view)
             $0.left.equalTo(view)
             $0.bottom.equalTo(view)
             $0.right.equalTo(view)
@@ -131,17 +123,16 @@ final class TagBottomSheetVC: UIViewController {
             $0.right.equalTo(tagBottomSheetView)
         }
         
-        tagBottomSheetView.addSubview(tagSearchBar)
-        tagSearchBar.snp.makeConstraints {
-            $0.top.equalTo(customNavBar.snp.bottom).offset(11)
-            $0.left.equalTo(tagBottomSheetView).offset(4)
-            $0.right.equalTo(tagBottomSheetView).offset(-4)
-            $0.height.equalTo(44)
+        tagBottomSheetView.addSubview(tagTextField)
+        tagTextField.snp.makeConstraints {
+            $0.top.equalTo(customNavBar.snp.bottom).offset(12)
+            $0.left.equalTo(tagBottomSheetView).offset(20)
+            $0.right.equalTo(tagBottomSheetView).offset(-20)
         }
         
         tagBottomSheetView.addSubview(recentTagTitleLabel)
         recentTagTitleLabel.snp.makeConstraints {
-            $0.top.equalTo(tagSearchBar.snp.bottom).offset(16)
+            $0.top.equalTo(tagTextField.snp.bottom).offset(16)
             $0.left.equalTo(tagBottomSheetView).offset(20)
         }
         
@@ -156,7 +147,7 @@ final class TagBottomSheetVC: UIViewController {
     private func bindViewModel() {
         viewModel.filterTagList = viewModel.recentTagList
         
-        tagSearchBar.searchTextField.rx.text
+        tagTextField.rx.text
             .orEmpty
             .subscribe(onNext: { text in
                 print("text - \(text.description)")
diff --git a/Sparky-iOS/Custom/Shareing/TagCollectionViewModel.swift b/Sparky-iOS/Custom/Shareing/TagCollectionViewModel.swift
index c7bb001..27768f7 100644
--- a/Sparky-iOS/Custom/Shareing/TagCollectionViewModel.swift
+++ b/Sparky-iOS/Custom/Shareing/TagCollectionViewModel.swift
@@ -10,6 +10,7 @@ import RxSwift
 import RxCocoa
 
 final class TagCollectionViewModel {
+    
     var tagList = BehaviorRelay<[Tag]>(value: [
         Tag(text: "디자인", backgroundColor: .sparkyOrange, buttonType: .delete),
         Tag(text: "시각디자인", backgroundColor: .sparkyPink, buttonType: .delete),
@@ -27,6 +28,7 @@ final class TagCollectionViewModel {
         Tag(text: "태그추가", backgroundColor: .clear, buttonType: .add)
     ])
     
+    
     func didTapDeleteButton(index: Int) {
         var tagListCopy = self.tagList.value
         tagListCopy.remove(at: index)
diff --git a/Sparky-iOS/Extension/Color+.swift b/Sparky-iOS/Extension/Color+.swift
index 6b35a75..beb7acf 100644
--- a/Sparky-iOS/Extension/Color+.swift
+++ b/Sparky-iOS/Extension/Color+.swift
@@ -16,6 +16,7 @@ extension UIColor {
     static let sparkyGreen: UIColor = UIColor(named: "sparkyGreen")!
     static let sparkyBlue: UIColor = UIColor(named: "sparkyBlue")!
     static let sparkyPink: UIColor = UIColor(named: "sparkyPink")!
+    static let background: UIColor = UIColor(named: "background")!
     static let gray100: UIColor = UIColor(named: "gray100")!
     static let gray200: UIColor = UIColor(named: "gray200")!
     static let gray300: UIColor = UIColor(named: "gray300")!
diff --git a/Sparky-iOS/Manager/CrawlManager.swift b/Sparky-iOS/Manager/CrawlManager.swift
index 4611c40..fc089d7 100644
--- a/Sparky-iOS/Manager/CrawlManager.swift
+++ b/Sparky-iOS/Manager/CrawlManager.swift
@@ -61,7 +61,6 @@ final class CrwalManager {
                 scrap = Scrap(thumbnailURL: thumbnailURL,
                               title: title,
                               subTitle: subTitle)
-                print("scrap - \(scrap)")
                 completion(scrap)
             } catch {
                 print(NetworkError.parsingError)
diff --git a/Sparky-iOS/SceneDelegate.swift b/Sparky-iOS/SceneDelegate.swift
index b663171..664c165 100644
--- a/Sparky-iOS/SceneDelegate.swift
+++ b/Sparky-iOS/SceneDelegate.swift
@@ -17,14 +17,17 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         self.window = UIWindow(windowScene: scene)
         self.window?.overrideUserInterfaceStyle = .light
         
-        let rootViewController = UINavigationController(rootViewController: SignInVC())
+        let rootViewController: UINavigationController
+        
+        if let _ = TokenUtils().read("com.sparky.token", account: "accessToken") {
+            rootViewController = UINavigationController(rootViewController: HomeVC())
+        } else {
+            rootViewController = UINavigationController(rootViewController: SignInVC())
+        }
+        
         window?.rootViewController = rootViewController
         window?.makeKeyAndVisible()
     }
-    
-    @objc private func didTapBackButton() {
-        
-    }
 
     func sceneDidDisconnect(_ scene: UIScene) {
         // Called as the scene is being released by the system.
diff --git a/Sparky-iOS/Scenes/Home/HomeVC.swift b/Sparky-iOS/Scenes/Home/HomeVC.swift
index 1e0900b..04709b7 100644
--- a/Sparky-iOS/Scenes/Home/HomeVC.swift
+++ b/Sparky-iOS/Scenes/Home/HomeVC.swift
@@ -6,16 +6,71 @@
 //
 
 import UIKit
+import RxSwift
+import RxCocoa
 
-class HomeVC: UIViewController {
+final class HomeVC: UIViewController {
 
     // MARK: - Properties
+    private let disposeBag = DisposeBag()
     
+    private let scrapTextField = SparkyTextField(frame: CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width - 40, height: 24)).then {
+
+        $0.placeholder = "검색어를 입력해주세요"
+        $0.setupLeftImageView(image: UIImage(named: "search")!)
+        $0.leftView?.tintColor = .gray400
+    }
+    
+    private let myScrapTitleLabel = UILabel().then({
+        $0.text = "내 스크랩"
+        $0.font = .subTitleBold1
+        $0.textAlignment = .center
+        $0.textColor = .sparkyBlack
+    })
     
     
     // MARK: - LifeCycles
     override func viewDidLoad() {
         super.viewDidLoad()
-        view.backgroundColor = .orange
+        
+        view.backgroundColor = .background
+        setupNavBar()
+        setupConstraints()
+    }
+    
+    private func setupNavBar() {
+        let logoButtonItem = UIBarButtonItem(image: UIImage(named: "logo"),
+                                                style: .done,
+                                                target: self,
+                                                action: nil)
+        logoButtonItem.tintColor = .sparkyBlack
+        
+        let profileButtonItem = UIBarButtonItem(image: UIImage(named: "profile"),
+                                                 style: .plain,
+                                                 target: self,
+                                                 action: nil)
+        profileButtonItem.tintColor = .none
+        profileButtonItem.rx.tap
+            .subscribe { _ in
+                self.navigationController?.pushViewController(MyScrapVC(), animated: true)
+            }.disposed(by: disposeBag)
+        
+        navigationItem.leftBarButtonItem = logoButtonItem
+        navigationItem.rightBarButtonItem = profileButtonItem
+    }
+    
+    private func setupConstraints() {
+        view.addSubview(scrapTextField)
+        scrapTextField.snp.makeConstraints {
+            $0.top.equalTo(view.safeAreaLayoutGuide).offset(12)
+            $0.left.equalTo(view).offset(20)
+            $0.right.equalTo(view).offset(-20)
+        }
+        
+        view.addSubview(myScrapTitleLabel)
+        myScrapTitleLabel.snp.makeConstraints {
+            $0.top.equalTo(scrapTextField.snp.bottom).offset(18)
+            $0.left.equalTo(view).offset(20)
+        }
     }
 }
diff --git a/Sparky-iOS/Scenes/MyScrap/MyScrapVC.swift b/Sparky-iOS/Scenes/MyScrap/MyScrapVC.swift
new file mode 100644
index 0000000..2e27b1c
--- /dev/null
+++ b/Sparky-iOS/Scenes/MyScrap/MyScrapVC.swift
@@ -0,0 +1,21 @@
+//
+//  MyScrapVC.swift
+//  Sparky-iOS
+//
+//  Created by SeungMin on 2022/10/18.
+//
+
+import UIKit
+
+final class MyScrapVC: UIViewController {
+    
+    // MARK: - Properties
+    
+    
+    // MARK: - LifeCycles
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        view.backgroundColor = .sparkyGreen
+    }
+}
diff --git a/Sparky-iOS/SupprotingFiles/Assets.xcassets/Colors/background.colorset/Contents.json b/Sparky-iOS/SupprotingFiles/Assets.xcassets/Colors/background.colorset/Contents.json
new file mode 100644
index 0000000..99b0314
--- /dev/null
+++ b/Sparky-iOS/SupprotingFiles/Assets.xcassets/Colors/background.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.969",
+          "green" : "0.976",
+          "red" : "0.980"
+        }
+      },
+      "idiom" : "iphone"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/logo.imageset/Contents.json b/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/logo.imageset/Contents.json
new file mode 100644
index 0000000..063423c
--- /dev/null
+++ b/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/logo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "logo.png",
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/logo.imageset/logo.png b/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/logo.imageset/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..316797f89ac4fcfba5fb3ac7f699647a85ed5536
GIT binary patch
literal 1925
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
LNkvXXu0mjfHp88*

literal 0
HcmV?d00001

diff --git a/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/profile.imageset/Contents.json b/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/profile.imageset/Contents.json
new file mode 100644
index 0000000..71ab5b0
--- /dev/null
+++ b/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/profile.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "profile.png",
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/profile.imageset/profile.png b/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/profile.imageset/profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..54c3748f0be3c0287bc25956dbf1ffcbc2a34d36
GIT binary patch
literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0u4z-K~#7F&6v$`
zf<PFCKXBA59Rw~qo-`H2bYLn_D=-}xJBSr%Du^9KJJ6G(9v~fXbsRPCYmgxZMp1!%
zW>yf;ec1i>SCg37wr#H0>xQoD)%|{7$0fr{#6@zLaBqS%s#GeD#6Y|B!R2z<!lCI&
z#9^vwTEA2(4KI24tk7z;s_%BY0ZvW14F_Vqb7GM~s2XFl*>q7NuX0Bq^`6h?dzNLn
zq4&cs&gXLzKO7-dB^ex)`g2%(X<;%5*e|)gimsB<gI`!pDajDN_$Tv}C?Up7N-{@k
zUY<UFm9bePfCrKRUe%3x?w1f`x{?v7I=>(eLSCn5N_Lo@gI_`&$(|-ZG_RT4q5y~`
zOGoF|5JjL1h3cXRoIz0NK@@>A2^}A%sDr^)W{5f%x+n&PTu}#CH6e#W6Hx>-uy3}q
zsi?!4LL*TGy6BujqH`Qe_Dtz=X!hIf_CqoT18bj0f5y02EI8tuk_}F|T()@PcZ@J>
zOGY5?-tpWQ;+z&i)t8iEp2&MBr$VGyEWRPY)9eNu<{7;3M~KT?1o(^m?qDP?!_~&=
zlKS7^%BIH$laxX=&7zjlp`$$?EEEclNyHTY6V+6Y+BZ789fL(c3scK`tY}&C?c;(l
zii<a_D3;6RI(WmH#DJp!JKkVRx{FXij9WDgq$ecPn*s;7^ju1yG-lUq>HPpAu=(%Z
S%TN0N0000<MNUMnLSTYtDGqi3

literal 0
HcmV?d00001

diff --git a/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/search.imageset/Contents.json b/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/search.imageset/Contents.json
index 04bfcdf..854c1cf 100644
--- a/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/search.imageset/Contents.json
+++ b/Sparky-iOS/SupprotingFiles/Assets.xcassets/Images/search.imageset/Contents.json
@@ -2,15 +2,15 @@
   "images" : [
     {
       "filename" : "Search.png",
-      "idiom" : "universal",
+      "idiom" : "iphone",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
+      "idiom" : "iphone",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
+      "idiom" : "iphone",
       "scale" : "3x"
     }
   ],