Skip to content

Commit

Permalink
Merge pull request #8 from SOPT28th-SOPKATHON-Kick/feat/#7
Browse files Browse the repository at this point in the history
[Feat] 메인 뷰 데모
  • Loading branch information
Hansangjin98 authored May 22, 2021
2 parents e25f5a7 + fe7cb4b commit 81b4c07
Show file tree
Hide file tree
Showing 10 changed files with 503 additions and 14 deletions.
64 changes: 62 additions & 2 deletions SOPKATHON_Kick.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
4039178E265947D200BF2C6F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 403917712659434900BF2C6F /* Main.storyboard */; };
4058242726593B5B00845A48 /* Login.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4058242626593B5B00845A48 /* Login.storyboard */; };
4058242B26593BAB00845A48 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4058242A26593BAB00845A48 /* LoginViewController.swift */; };
40F598E22659568F005DD065 /* HomeCollectionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40F598E12659568F005DD065 /* HomeCollectionViewModel.swift */; };
40F598E926595E86005DD065 /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40F598E826595E86005DD065 /* UIColor.swift */; };
40F598EF26596594005DD065 /* HomeTableViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40F598EE26596594005DD065 /* HomeTableViewModel.swift */; };
40F598F326596C59005DD065 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40F598F226596C59005DD065 /* HomeCollectionViewCell.swift */; };
40F598F626596D7B005DD065 /* HomeTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40F598F526596D7B005DD065 /* HomeTableViewCell.swift */; };
5601F4C72F3894872F74A14A /* Pods_SOPKATHON_Kick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49F03FBAA0C8B548BCAF5943 /* Pods_SOPKATHON_Kick.framework */; };
/* End PBXBuildFile section */

Expand All @@ -45,6 +50,11 @@
403917862659462100BF2C6F /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = "<group>"; };
4058242626593B5B00845A48 /* Login.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = "<group>"; };
4058242A26593BAB00845A48 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
40F598E12659568F005DD065 /* HomeCollectionViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewModel.swift; sourceTree = "<group>"; };
40F598E826595E86005DD065 /* UIColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColor.swift; sourceTree = "<group>"; };
40F598EE26596594005DD065 /* HomeTableViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTableViewModel.swift; sourceTree = "<group>"; };
40F598F226596C59005DD065 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = "<group>"; };
40F598F526596D7B005DD065 /* HomeTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTableViewCell.swift; sourceTree = "<group>"; };
49F03FBAA0C8B548BCAF5943 /* Pods_SOPKATHON_Kick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SOPKATHON_Kick.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FA81244F86E24D2DAFA2C3D9 /* Pods-SOPKATHON_Kick.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SOPKATHON_Kick.release.xcconfig"; path = "Target Support Files/Pods-SOPKATHON_Kick/Pods-SOPKATHON_Kick.release.xcconfig"; sourceTree = "<group>"; };
FF8A74EE6ADFCE2FEB2CB831 /* Pods-SOPKATHON_Kick.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SOPKATHON_Kick.debug.xcconfig"; path = "Target Support Files/Pods-SOPKATHON_Kick/Pods-SOPKATHON_Kick.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -83,6 +93,7 @@
400CFA08265932CF0080CB1B /* SOPKATHON_Kick */ = {
isa = PBXGroup;
children = (
40F598E626595E65005DD065 /* Common */,
4058241F26593AA600845A48 /* Sources */,
4058241E26593A8A00845A48 /* Resources */,
4058241D265939C700845A48 /* Application */,
Expand Down Expand Up @@ -134,10 +145,11 @@
4058242126593AD600845A48 /* Home */ = {
isa = PBXGroup;
children = (
40F598E426595926005DD065 /* Cell */,
40F598E026595673005DD065 /* Model */,
40F598DF265954D7005DD065 /* MainTabBar */,
403917692659416F00BF2C6F /* HomeViewController.swift */,
4039176D265941B000BF2C6F /* Home.storyboard */,
403917712659434900BF2C6F /* Main.storyboard */,
403917862659462100BF2C6F /* MainTabBarController.swift */,
);
path = Home;
sourceTree = "<group>";
Expand Down Expand Up @@ -176,6 +188,49 @@
path = Detail;
sourceTree = "<group>";
};
40F598DF265954D7005DD065 /* MainTabBar */ = {
isa = PBXGroup;
children = (
403917712659434900BF2C6F /* Main.storyboard */,
403917862659462100BF2C6F /* MainTabBarController.swift */,
);
path = MainTabBar;
sourceTree = "<group>";
};
40F598E026595673005DD065 /* Model */ = {
isa = PBXGroup;
children = (
40F598E12659568F005DD065 /* HomeCollectionViewModel.swift */,
40F598EE26596594005DD065 /* HomeTableViewModel.swift */,
);
path = Model;
sourceTree = "<group>";
};
40F598E426595926005DD065 /* Cell */ = {
isa = PBXGroup;
children = (
40F598F226596C59005DD065 /* HomeCollectionViewCell.swift */,
40F598F526596D7B005DD065 /* HomeTableViewCell.swift */,
);
path = Cell;
sourceTree = "<group>";
};
40F598E626595E65005DD065 /* Common */ = {
isa = PBXGroup;
children = (
40F598E726595E6C005DD065 /* Extension */,
);
path = Common;
sourceTree = "<group>";
};
40F598E726595E6C005DD065 /* Extension */ = {
isa = PBXGroup;
children = (
40F598E826595E86005DD065 /* UIColor.swift */,
);
path = Extension;
sourceTree = "<group>";
};
7476745A01D2EAECE836D67A /* Pods */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -314,12 +369,17 @@
files = (
403917752659447300BF2C6F /* WritingViewController.swift in Sources */,
4058242B26593BAB00845A48 /* LoginViewController.swift in Sources */,
40F598F626596D7B005DD065 /* HomeTableViewCell.swift in Sources */,
403917872659462100BF2C6F /* MainTabBarController.swift in Sources */,
40F598EF26596594005DD065 /* HomeTableViewModel.swift in Sources */,
403917812659450A00BF2C6F /* MyPageViewController.swift in Sources */,
400CFA0A265932CF0080CB1B /* AppDelegate.swift in Sources */,
40F598E22659568F005DD065 /* HomeCollectionViewModel.swift in Sources */,
400CFA0C265932CF0080CB1B /* SceneDelegate.swift in Sources */,
4039176A2659416F00BF2C6F /* HomeViewController.swift in Sources */,
4039177E265944D500BF2C6F /* KingViewController.swift in Sources */,
40F598E926595E86005DD065 /* UIColor.swift in Sources */,
40F598F326596C59005DD065 /* HomeCollectionViewCell.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
26 changes: 26 additions & 0 deletions SOPKATHON_Kick/Common/Extension/UIColor.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// UIColor.swift
// SOPKATHON_Kick
//
// Created by 한상진 on 2021/05/23.
//

import Foundation
import UIKit

extension UIColor {

// MARK: hex 변환 가능 init
convenience init(hex: UInt, alpha: CGFloat = 1.0) {
self.init(
red: CGFloat((hex & 0xFF0000) >> 16) / 255.0,
green: CGFloat((hex & 0x00FF00) >> 8) / 255.0,
blue: CGFloat(hex & 0x0000FF) / 255.0,
alpha: CGFloat(alpha)
)
}

class var main_Color: UIColor { UIColor(hex: 0xFF6C6C) }


}
15 changes: 15 additions & 0 deletions SOPKATHON_Kick/Sources/Home/Cell/HomeCollectionViewCell.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// HomeCollectionViewCell.swift
// SOPKATHON_Kick
//
// Created by 한상진 on 2021/05/23.
//

import UIKit

class HomeCollectionViewCell: UICollectionViewCell {

@IBOutlet weak var image: UIImageView!
@IBOutlet weak var title: UILabel!
@IBOutlet weak var content: UILabel!
}
29 changes: 29 additions & 0 deletions SOPKATHON_Kick/Sources/Home/Cell/HomeTableViewCell.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//
// HomeTableViewCell.swift
// SOPKATHON_Kick
//
// Created by 한상진 on 2021/05/23.
//

import UIKit

class HomeTableViewCell: UITableViewCell {

@IBOutlet weak var title: UILabel!
@IBOutlet weak var content: UILabel!
@IBOutlet weak var clickAndTime: UILabel!
@IBOutlet weak var like: UILabel!


override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
}

override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)

// Configure the view for the selected state
}

}
Loading

0 comments on commit 81b4c07

Please sign in to comment.