Rlgus 중간 커밋충돌 이슈

ToDO/MainVC.swift

@@ -9,7 +9,7 @@ import UIKit
 import SnapKit
 
 class MainVC: UIViewController {
-
+    
 
     var ImageButton: UIButton = {
         let button = UIButton()
@@ -18,7 +18,7 @@ class MainVC: UIViewController {
         button.translatesAutoresizingMaskIntoConstraints = false
         button.setTitle("동물 버튼", for: .normal)
         return button
-
+        
     }()
 
     var TodoButton: UIButton = {
@@ -27,33 +27,54 @@ class MainVC: UIViewController {
         button.layer.cornerRadius = 10
         button.translatesAutoresizingMaskIntoConstraints = false
         button.setTitle("투두 리스트 입력!", for: .normal)
-
+        
 
         return button
     }()
+
+    var imageView: UIImageView = {
+        let imageView = UIImageView()
+        imageView.translatesAutoresizingMaskIntoConstraints = false
+        imageView.contentMode = .scaleAspectFit
+        if let imageURL = URL(string: "https://spartacodingclub.kr/css/images/scc-og.jpg"),
+           let imageData = try? Data(contentsOf: imageURL),
+           let image = UIImage(data: imageData) {
+            imageView.image = image
+        }
+        return imageView
+    }()
     override func viewDidLoad() {
         super.viewDidLoad()
-        view.backgroundColor = .red
+        view.backgroundColor = .systemBackground
         view.addSubview(ImageButton)
         view.addSubview(TodoButton)
+        view.addSubview(imageView)
         setupConstraints()
 
         TodoButton.addTarget(self, action: #selector(todoButtonTapped), for: .touchUpInside)
     }
     func setupConstraints() {
-          ImageButton.snp.makeConstraints { make in
-              make.center.equalToSuperview()
-              make.width.equalTo(200)
-              make.height.equalTo(50)
-          }
+        ImageButton.snp.makeConstraints { make in
+            make.center.equalToSuperview()
+            make.width.equalTo(200)
+            make.height.equalTo(50)
+        }
 
         TodoButton.snp.makeConstraints { make in
             make.top.equalTo(ImageButton).offset(80)
             make.centerX.equalToSuperview()
             make.width.equalTo(200)
             make.height.equalTo(50)
         }
-      }
+        imageView.snp.makeConstraints { make in
+            make.top.equalTo(ImageButton).offset(-300)
+            make.centerX.equalToSuperview()
+            make.width.equalTo(300)
+            make.height.equalTo(300)
+        }
+
+
+    }
     @objc func todoButtonTapped() {
         let vc = ViewController()
         navigationController?.pushViewController(vc, animated: true)

ToDO/ToDO/Assets.xcassets/AppIcon 1.appiconset/Contents.json

@@ -0,0 +1,80 @@
+{
+  "images" : [
+    {
+      "filename" : "40.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "60.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "29.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "58.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "87.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "80.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "57.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "114.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ToDO/ToDO/Assets.xcassets/AppIcons/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ToDO/ToDO/Assets.xcassets/AppIcons/appstore.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "appstore.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ToDO/ToDO/Assets.xcassets/AppIcons/playstore.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "playstore.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}