Skip to content

Commit

Permalink
fix/#149 충돌 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
JinUng41 committed Jul 11, 2024
1 parent 00a74c1 commit c0d189a
Show file tree
Hide file tree
Showing 33 changed files with 1,253 additions and 71 deletions.
8 changes: 0 additions & 8 deletions File.swift

This file was deleted.

192 changes: 180 additions & 12 deletions KkuMulKum.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions KkuMulKum/Application/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {

// sleep(1)
// KakaoSDK 초기화 과정에서 앱 키를 동적으로 불러오기
if let kakaoAppKey = fetchKakaoAppKeyFromPrivacyInfo() {
KakaoSDK.initSDK(appKey: kakaoAppKey)
Expand Down
2 changes: 1 addition & 1 deletion KkuMulKum/Application/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
) {
guard let windowScene = (scene as? UIWindowScene) else { return }
self.window = UIWindow(windowScene: windowScene)
self.window?.rootViewController = MainTabBarController()
self.window?.rootViewController = NicknameViewController()
self.window?.makeKeyAndVisible()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "edit.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"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.
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
{
"images" : [
{
"filename" : "ic_profilebasic.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
"filename" : "Mask group.svg",
"idiom" : "universal"
}
],
"info" : {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
23 changes: 23 additions & 0 deletions KkuMulKum/Resource/Assets.xcassets/Splash.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Splash.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Splash 1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Splash 2.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.
32 changes: 26 additions & 6 deletions KkuMulKum/Resource/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?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="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand All @@ -11,15 +14,32 @@
<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="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Splash" translatesAutoresizingMaskIntoConstraints="NO" id="jM3-k4-ltG">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="jM3-k4-ltG" secondAttribute="trailing" id="9Ol-QN-Vio"/>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="jM3-k4-ltG" secondAttribute="bottom" constant="-34" id="DOx-Gi-miq"/>
<constraint firstItem="jM3-k4-ltG" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="h7v-dB-NQw"/>
<constraint firstItem="jM3-k4-ltG" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="-59" id="isO-fU-3Vp"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
<point key="canvasLocation" x="52.671755725190835" y="374.64788732394368"/>
</scene>
</scenes>
<resources>
<image name="Splash" width="375" height="812"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
4 changes: 4 additions & 0 deletions KkuMulKum/Resource/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!</string>
<key>NSCameraUsageDescription</key>
<string>정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!정혜진!</string>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>CFBundleURLTypes</key>
Expand Down
29 changes: 0 additions & 29 deletions KkuMulKum/Source/MyPage/MyPageViewController.swift

This file was deleted.

80 changes: 80 additions & 0 deletions KkuMulKum/Source/MyPage/View/MyPageAlarmSettingView.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
//
// MyPageAlarmSettingView.swift
// KkuMulKum
//
// Created by 이지훈 on 7/9/24.
//

import UIKit

import SnapKit
import Then

class AlarmSettingView: BaseView {
private let containerView = UIView().then {
$0.backgroundColor = .white
$0.layer.borderWidth = 1
$0.layer.borderColor = UIColor.gray2.cgColor
$0.layer.cornerRadius = 8
}

private let stackView = UIStackView(axis: .vertical).then {
$0.spacing = 8
$0.alignment = .fill
$0.distribution = .fill
}

private let titleStackView = UIStackView(axis: .horizontal).then {
$0.alignment = .center
$0.distribution = .equalSpacing
}

private let titleLabel = UILabel().then {
$0.setText("알림 설정", style: .body03, color: .black)

}

private let toggleSwitch = UISwitch().then {
$0.onTintColor = .green
}

private let subtitleLabel = UILabel().then {
$0.setText("준비, 이동을 시작해야할 시간에\n푸시 알림을 받을 수 있습니다.", style: .caption02, color: .gray)
}

override func setupView() {
super.setupView()
backgroundColor = .systemMint.withAlphaComponent(0.1)

addSubview(containerView)
containerView.addSubview(stackView)

titleStackView.addArrangedSubviews(titleLabel, toggleSwitch)
stackView.addArrangedSubviews(titleStackView, subtitleLabel)
}

override func setupAutoLayout() {
super.setupAutoLayout()

containerView.snp.makeConstraints {
$0.edges.equalToSuperview()
}

stackView.snp.makeConstraints {
$0.edges.equalToSuperview().inset(15)
}

titleStackView.snp.makeConstraints {
$0.height.greaterThanOrEqualTo(44)
}

toggleSwitch.snp.makeConstraints {
$0.width.equalTo(51)
$0.height.equalTo(31)
}

subtitleLabel.snp.makeConstraints {
$0.height.greaterThanOrEqualTo(40) // 최소 높이 설정
}
}
}
84 changes: 84 additions & 0 deletions KkuMulKum/Source/MyPage/View/MyPageContentView.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
//
// MyPageContentView.swift
// KkuMulKum
//
// Created by 이지훈 on 7/9/24.
//

import UIKit

import SnapKit
import Then

class MyPageContentView: BaseView {
let profileStackView = UIStackView(axis: .vertical).then {
$0.spacing = 12
$0.alignment = .center
}

let profileImageView = UIImageView().then {
$0.image = UIImage(named: "img_profile")
$0.contentMode = .scaleAspectFill
$0.clipsToBounds = true
}

let nameLabel = UILabel().then {
$0.font = UIFont.pretendard(.body01)
$0.textColor = .gray8
$0.text = "꾸물리안 님"
}

let levelView = UIView().then {
$0.backgroundColor = .maincolor
$0.layer.cornerRadius = 20
}

let levelLabel = UILabel().then {
$0.textColor = .white
$0.font = UIFont.pretendard(.body02)
$0.text = "Lv. 1 지각대장 꾸물이"
}

let separatorView = UIView().then {
$0.backgroundColor = .green2
}

override func setupView() {
backgroundColor = .clear
addSubviews(profileStackView,levelView,separatorView)
profileStackView.addArrangedSubviews(profileImageView, nameLabel)
levelView.addSubview(levelLabel)
}

override func setupAutoLayout() {
profileStackView.snp.makeConstraints {
$0.top.equalToSuperview().offset(20)
$0.centerX.equalToSuperview()
}

profileImageView.snp.makeConstraints {
$0.size.equalTo(100)
}

nameLabel.snp.makeConstraints {
$0.top.equalTo(profileImageView.snp.bottom).offset(12)
}

levelView.snp.makeConstraints {
$0.top.equalTo(nameLabel.snp.bottom).offset(12)
$0.height.equalTo(36)
$0.leading.trailing.equalToSuperview().inset(80)
}

levelLabel.snp.makeConstraints {
$0.center.equalToSuperview()
}

separatorView.snp.makeConstraints {
$0.height.equalTo(6)
$0.leading.trailing.equalToSuperview()
$0.top.equalTo(levelView.snp.bottom).offset(35)
$0.bottom.equalToSuperview().offset(-20)
}
}
}
Loading

0 comments on commit c0d189a

Please sign in to comment.