Skip to content

Commit

Permalink
Deployment: week3
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffoio authored Nov 15, 2021
2 parents 8a13bf7 + a10b02d commit 70fb8ba
Show file tree
Hide file tree
Showing 195 changed files with 4,165 additions and 344 deletions.
14 changes: 3 additions & 11 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
issue number : [#02](../issues/02)
issue number : [#](../issues/)
close #

### ์ž‘์—… ์‚ฌํ•ญ

๋ธ”๋ผ๋ธ”๋ผ

### ์ฐธ๊ณ  ์ž๋ฃŒ

[์ฐธ๊ณ ์ž๋ฃŒ1]()
[์ฐธ๊ณ ์ž๋ฃŒ2]()
[์ฐธ๊ณ ์ž๋ฃŒ1]()

### ์ฒดํฌ๋ฆฌ์ŠคํŠธ

- [ ] Merge ํ•˜๋Š” ๋ธŒ๋žœ์น˜๊ฐ€ ์˜ฌ๋ฐ”๋ฅธ๊ฐ€?
- [ ] ์ฝ”๋”ฉ์ปจ๋ฒค์…˜์„ ์ค€์ˆ˜ํ•˜๋Š”๊ฐ€?
- [ ] PR๊ณผ ๊ด€๋ จ์—†๋Š” ๋ณ€๊ฒฝ์‚ฌํ•ญ์ด ์—†๋Š”๊ฐ€?
- [ ] ๋‚ด ์ฝ”๋“œ์— ๋Œ€ํ•œ ์ž๊ธฐ ๊ฒ€ํ† ๊ฐ€ ๋˜์—ˆ๋Š”๊ฐ€?
- [ ] ๋ณ€๊ฒฝ์‚ฌํ•ญ์ด ํšจ๊ณผ์ ์ด๊ฑฐ๋‚˜ ๋™์ž‘์ด ์ž‘๋™ํ•œ๋‹ค๋Š” ๊ฒƒ์„ ๋ณด์ฆํ•˜๋Š” ํ…Œ์ŠคํŠธ๋ฅผ ์ถ”๊ฐ€ํ•˜์˜€๋Š”๊ฐ€?
- [ ] ์ƒˆ๋กœ์šด ํ…Œ์ŠคํŠธ์™€ ๊ธฐ์กด์˜ ํ…Œ์ŠคํŠธ๊ฐ€ ๋ณ€๊ฒฝ์‚ฌํ•ญ์— ๋Œ€ํ•ด ๋งŒ์กฑํ•˜๋Š”๊ฐ€?
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Pods/
.DS_Store
.AppleDouble
.LSOverride

GoogleService-Info.plist
# Icon must end with two \r
Icon

Expand Down
270 changes: 248 additions & 22 deletions Escaper/Escaper.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Escaper/Escaper/Application/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
//

import UIKit
import Firebase

@main
class AppDelegate: UIResponder, UIApplicationDelegate {

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
FirebaseApp.configure()
return true
}

Expand Down
47 changes: 42 additions & 5 deletions Escaper/Escaper/Application/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="Stack View standard spacing" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand All @@ -11,15 +15,48 @@
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacingType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="AOa-7O-qtR">
<rect key="frame" x="134.5" y="350" width="145" height="196"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fearDetail" translatesAutoresizingMaskIntoConstraints="NO" id="zjE-mK-lS8">
<rect key="frame" x="0.0" y="0.0" width="145" height="159"/>
<constraints>
<constraint firstAttribute="width" secondItem="zjE-mK-lS8" secondAttribute="height" multiplier="74:81" id="Nw4-77-058"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Escaper" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sNo-sB-cCV">
<rect key="frame" x="27" y="167" width="91" height="29"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="24"/>
<color key="textColor" name="skullWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
</subviews>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
<color key="backgroundColor" name="bloodyBlack"/>
<constraints>
<constraint firstItem="zjE-mK-lS8" firstAttribute="width" secondItem="Ze5-6b-2t3" secondAttribute="width" multiplier="0.35" id="d61-GO-RWK"/>
<constraint firstItem="AOa-7O-qtR" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="qQ5-H0-3aW"/>
<constraint firstItem="AOa-7O-qtR" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="u5s-i4-viX"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
<resources>
<image name="fearDetail" width="74" height="81"/>
<namedColor name="bloodyBlack">
<color red="0.11400000005960464" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="skullWhite">
<color red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
3 changes: 1 addition & 2 deletions Escaper/Escaper/Application/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {

func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
guard let windowScene = (scene as? UIWindowScene) else { return }
let viewController = RoomListViewController()
viewController.create()
let viewController = MainTabBarController()
window = UIWindow(frame: UIScreen.main.bounds)
window?.windowScene = windowScene
window?.rootViewController = viewController
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//
// UISearchBar+SetTextFieldColor.swift
// Escaper
//
// Created by TakHyun Jung on 2021/11/13.
//

import UIKit

extension UISearchBar {
func setTextFieldColor(color: UIColor?) {
guard let textField = self.value(forKey: "searchField") as? UITextField else { return }
switch self.searchBarStyle {
case .minimal:
textField.layer.backgroundColor = color?.cgColor
textField.layer.cornerRadius = 6
case .prominent, .default:
textField.backgroundColor = color
@unknown default:
break
}
}
}
17 changes: 17 additions & 0 deletions Escaper/Escaper/Common/Extensions/UIView+RoundCorners.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// UIView+ScaledSize.swift
// Escaper
//
// Created by TakHyun Jung on 2021/11/13.
//

import UIKit

extension UIView {
func roundCorners(corners: UIRectCorner, radius: CGFloat) {
let path = UIBezierPath(roundedRect: self.bounds, byRoundingCorners: corners, cornerRadii: CGSize(width: radius, height: radius))
let mask = CAShapeLayer()
mask.path = path.cgPath
self.layer.mask = mask
}
}
27 changes: 0 additions & 27 deletions Escaper/Escaper/Common/Library/ColorPalette.swift

This file was deleted.

109 changes: 109 additions & 0 deletions Escaper/Escaper/Common/Library/EDSKit.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
//
// DesignSystem.swift
// Escaper
//
// Created by ์ตœ์™„์‹ on 2021/11/05.
//

import UIKit

typealias EDSColor = EDSKit.Color
typealias EDSLabel = EDSKit.Label
typealias EDSImage = EDSKit.Image

enum EDSKit {
enum Label {
static func h01B(text: String = "", color: Color) -> UILabel {
let label = Label.makeLabel(text: text, color: color)
label.font = UIFont.systemFont(ofSize: 24, weight: .bold)
return label
}

static func h02B(text: String = "", color: Color) -> UILabel {
let label = Label.makeLabel(text: text, color: color)
label.font = UIFont.systemFont(ofSize: 22, weight: .bold)
return label
}

static func h03B(text: String = "", color: Color) -> UILabel {
let label = Label.makeLabel(text: text, color: color)
label.font = UIFont.systemFont(ofSize: 20, weight: .bold)
return label
}

static func b01B(text: String = "", color: Color) -> UILabel {
let label = Label.makeLabel(text: text, color: color)
label.font = UIFont.systemFont(ofSize: 14, weight: .bold)
return label
}

static func b02B(text: String = "", color: Color) -> UILabel {
let label = Label.makeLabel(text: text, color: color)
label.font = UIFont.systemFont(ofSize: 12, weight: .bold)
return label
}

static func b03B(text: String = "", color: Color) -> UILabel {
let label = Label.makeLabel(text: text, color: color)
label.font = UIFont.systemFont(ofSize: 10, weight: .bold)
return label
}

static func b01R(text: String = "", color: Color) -> UILabel {
let label = Label.makeLabel(text: text, color: color)
label.font = UIFont.systemFont(ofSize: 14, weight: .regular)
return label
}

static func b02R(text: String = "", color: Color) -> UILabel {
let label = Label.makeLabel(text: text, color: color)
label.font = UIFont.systemFont(ofSize: 12, weight: .regular)
return label
}

static func b03R(text: String = "", color: Color) -> UILabel {
let label = Label.makeLabel(text: text, color: color)
label.font = UIFont.systemFont(ofSize: 10, weight: .regular)
return label
}
}

enum Color {
case bloodyBlack
case bloodyBurgundy
case bloodyDarkBurgundy
case bloodyRed
case charcoal
case gloomyPink
case gloomyPurple
case gloomyRed
case gloomyBrown
case pumpkin
case skullLightWhite
case skullWhite
case skullGrey

var value: UIColor? {
return UIColor(named: String(describing: self))
}
}

enum Image {
var value: UIImage? {
return UIImage(named: String(describing: self))
}

case chevronDown
case recordCard
case plus
}
}

private extension EDSLabel {
static func makeLabel(text: String, color: EDSColor) -> UILabel {
let label = UILabel()
label.text = text
label.textColor = color.value
return label
}
}
14 changes: 14 additions & 0 deletions Escaper/Escaper/Common/Library/Helper.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//
// Helper.swift
// Escaper
//
// Created by ์ตœ์™„์‹ on 2021/11/11.
//

import Foundation

enum Helper {
static func parseUsername(email: String) -> String? {
return email.components(separatedBy: "@").first
}
}
16 changes: 16 additions & 0 deletions Escaper/Escaper/Common/Library/UtilityImage.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// UtilityImage.swift
// Escaper
//
// Created by shinheeRo on 2021/11/09.
//

import Foundation

enum UtilityImage: String {
var name: String {
return self.rawValue
}
case chevronDown
case recordCard
}
14 changes: 14 additions & 0 deletions Escaper/Escaper/Common/Utility/Helper.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//
// Helper.swift
// Escaper
//
// Created by ์ตœ์™„์‹ on 2021/11/10.
//

import Foundation

enum Helper {
static func parseUsername(email: String) -> String? {
return email.components(separatedBy: "@").first
}
}
2 changes: 1 addition & 1 deletion Escaper/Escaper/Domain/DataStruct/District.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

enum District: String, Codable {
enum District: String, CaseIterable, Codable {
var name: String {
return self.rawValue
}
Expand Down
Loading

0 comments on commit 70fb8ba

Please sign in to comment.