Skip to content

Commit

Permalink
Merge pull request #21 from devxsby/feat/#8-스플래시뷰구현
Browse files Browse the repository at this point in the history
[Feat] #8 - 스플래시, 앱아이콘 추가
  • Loading branch information
devxsby authored Nov 28, 2022
2 parents 22eba86 + 967aa8c commit 41c8710
Show file tree
Hide file tree
Showing 27 changed files with 225 additions and 180 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "splashImg1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "splashImg1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "splashImg1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "splashImg2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "splashImg2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "splashImg2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "splashImg3.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "splashImg3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "splashImg3@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CustomButton.swift
// Presentation
// DSKit
//
// Created by sejin on 2022/11/23.
// Copyright © 2022 SOPT-Stamp-iOS. All rights reserved.
Expand All @@ -9,13 +9,12 @@
import UIKit

import Core
import DSKit

final class CustomButton: UIButton {
public class CustomButton: UIButton {

// MARK: - Initialize

init(title: String) {
public init(title: String) {
super.init(frame: .zero)
self.setUI(title)
}
Expand All @@ -30,14 +29,14 @@ final class CustomButton: UIButton {
extension CustomButton {
/// 버튼의 enable 여부 설정
@discardableResult
func setEnabled(_ isEnabled: Bool) -> Self {
public func setEnabled(_ isEnabled: Bool) -> Self {
self.isEnabled = isEnabled
return self
}

/// 버튼의 Title 변경
@discardableResult
func changeTitle(attributedString: NSAttributedString) -> Self {
public func changeTitle(attributedString: NSAttributedString) -> Self {
self.setAttributedTitle(attributedString, for: .normal)
return self
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CustomNavigationBar.swift
// Presentation
// DSKit
//
// Created by 양수빈 on 2022/10/20.
// Copyright © 2022 SOPT-Stamp-iOS. All rights reserved.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CustomTextFieldView.swift
// PresentationTests
// DSKit
//
// Created by sejin on 2022/11/23.
// Copyright © 2022 SOPT-Stamp-iOS. All rights reserved.
Expand All @@ -13,10 +13,9 @@ import SnapKit
import Then

import Core
import DSKit

@frozen
enum TextFieldViewType {
public enum TextFieldViewType {
case plain
case subTitle
case titleWithRightButton
Expand All @@ -34,14 +33,14 @@ enum TextFieldViewType {
}

@frozen
enum TextFieldType {
public enum TextFieldType {
case email
case password
case none
}

@frozen
enum TextFieldViewState {
public enum TextFieldViewState {
case normal
case editing
case alert
Expand Down Expand Up @@ -69,7 +68,7 @@ enum TextFieldViewState {
}
}

final class CustomTextFieldView: UIView {
public class CustomTextFieldView: UIView {

// MARK: - Properties

Expand Down Expand Up @@ -104,7 +103,7 @@ final class CustomTextFieldView: UIView {

// MARK: - Initialize

init(type: TextFieldViewType) {
public init(type: TextFieldViewType) {
super.init(frame: .zero)
self.type = type
self.setUI()
Expand All @@ -123,21 +122,21 @@ final class CustomTextFieldView: UIView {
extension CustomTextFieldView {
/// 버튼의 타이틀 변경
@discardableResult
func setTitle(_ titleText: String) -> Self {
public func setTitle(_ titleText: String) -> Self {
self.titleLabel.text = titleText
return self
}

/// textContainerView 내부의 subTitle text 변경
@discardableResult
func setSubTitle(_ subTitleText: String) -> Self {
public func setSubTitle(_ subTitleText: String) -> Self {
self.subTitleLabel.text = subTitleText
return self
}

/// placeholder text 변경
@discardableResult
func setPlaceholder(_ placeholderText: String) -> Self {
public func setPlaceholder(_ placeholderText: String) -> Self {
self.textField.attributedPlaceholder = NSAttributedString(
string: placeholderText,
attributes: [
Expand All @@ -150,15 +149,15 @@ extension CustomTextFieldView {

/// cornerRadius 설정
@discardableResult
func setCornerRadius(_ radius: CGFloat) -> Self {
public func setCornerRadius(_ radius: CGFloat) -> Self {
self.textFieldContainerView.layer.cornerRadius = radius
self.rightButton.layer.cornerRadius = radius
return self
}

/// TextFieldType에 맞는 키보드, 텍스트 필드 보안 처리 (이메일, 비밀번호 등)
@discardableResult
func setTextFieldType(_ type: TextFieldType) -> Self {
public func setTextFieldType(_ type: TextFieldType) -> Self {
switch type {
case .email:
self.textField.keyboardType = .emailAddress
Expand All @@ -172,7 +171,7 @@ extension CustomTextFieldView {

/// 하단에 경고 문구 라벨 생성
@discardableResult
func setAlertLabelEnabled(_ alertText: String) -> Self {
public func setAlertLabelEnabled(_ alertText: String) -> Self {
self.snp.updateConstraints { make in
make.height.equalTo(self.type.height + 26)
}
Expand All @@ -188,7 +187,7 @@ extension CustomTextFieldView {
}

/// 경고 문구 라벨의 text 설정
func changeAlertLabelText(_ alertText: String) {
public func changeAlertLabelText(_ alertText: String) {
self.alertlabel.text = alertText
}

Expand All @@ -197,7 +196,7 @@ extension CustomTextFieldView {
}

/// textField의 state를 지정하여 자동으로 배경색과 테두리 색이 바뀌도록 설정
func setTextFieldViewState(_ state: TextFieldViewState) {
public func setTextFieldViewState(_ state: TextFieldViewState) {
textFieldContainerView.backgroundColor = state.backgroundColor

if let borderColor = state.borderColor {
Expand Down Expand Up @@ -350,11 +349,11 @@ extension CustomTextFieldView {
// MARK: - UITextFieldDelegate

extension CustomTextFieldView: UITextFieldDelegate {
func textFieldDidBeginEditing(_ textField: UITextField) {
public func textFieldDidBeginEditing(_ textField: UITextField) {
self.setTextFieldViewState(.editing)
}

func textFieldDidEndEditing(_ textField: UITextField) {
public func textFieldDidEndEditing(_ textField: UITextField) {
self.setTextFieldViewState(.normal)
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@
import Foundation

public protocol ModuleFactoryInterface {

func makeSplashVC() -> SplashVC
func makeOnboardingVC() -> OnboardingVC

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
//
// OnboardingVC.swift
// Presentation
//
// Created by devxsby on 2022/11/28.
// Copyright © 2022 SOPT-Stamp-iOS. All rights reserved.
//

import UIKit

import DSKit

import SnapKit
import Then

public class OnboardingVC: UIViewController {

// MARK: - Properties

public var factory: ModuleFactoryInterface!

// MARK: - UI Components

// MARK: - View Life Cycle

public override func viewDidLoad() {
super.viewDidLoad()
self.setUI()
self.setLayout()
}
}

// MARK: - UI & Layout

extension OnboardingVC {

private func setUI() {
self.view.backgroundColor = DSKitAsset.Colors.white.color
}

private func setLayout() {

}
}

// MARK: - Methods
Empty file.
Loading

0 comments on commit 41c8710

Please sign in to comment.