-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/origin/suyeon'
Conflicts: KkuMulKum.xcodeproj/project.pbxproj
- Loading branch information
Showing
11 changed files
with
397 additions
and
48 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
KkuMulKum/Resource/Assets.xcassets/Image/img_edit.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } |
Binary file added
BIN
+660 Bytes
KkuMulKum/Resource/Assets.xcassets/Image/img_edit.imageset/edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+6.31 KB
KkuMulKum/Resource/Assets.xcassets/Image/img_profile.imageset/my_btn_edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) // 최소 높이 설정 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| addSubview(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) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.