Skip to content

Commit

Permalink
Merge branch 'develop' into feat/#21-join
Browse files Browse the repository at this point in the history
  • Loading branch information
@Heyjooo
Heyjooo authored Jan 10, 2024
2 parents 6135382 + ac35614 commit 30fe931
Show file tree
Hide file tree
Showing 21 changed files with 758 additions and 92 deletions.
49 changes: 31 additions & 18 deletions DontBe-iOS/DontBe-iOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,21 @@
2AAEFC992B4A9E3B00C2D323 /* DontBeTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAEFC982B4A9E3B00C2D323 /* DontBeTabBarController.swift */; };
2AC9FB1B2B4DE77400D31071 /* AgreementListCustomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC9FB1A2B4DE77400D31071 /* AgreementListCustomView.swift */; };
2AC9FB1F2B4E634A00D31071 /* JoinAgreeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC9FB1E2B4E634A00D31071 /* JoinAgreeView.swift */; };
2F8735402B4BE65300E55552 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F87353F2B4BE65300E55552 /* HomeView.swift */; };
2F8735422B4BE66500E55552 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F8735412B4BE66500E55552 /* HomeViewController.swift */; };
2F8735442B4BE67300E55552 /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F8735432B4BE67300E55552 /* HomeViewModel.swift */; };
2F8735462B4C34A500E55552 /* HomeCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F8735452B4C34A500E55552 /* HomeCollectionView.swift */; };
2F8735482B4C355100E55552 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F8735472B4C355100E55552 /* HomeCollectionViewCell.swift */; };
2F87354A2B4C427000E55552 /* UICollectionViewRegisterable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F8735492B4C427000E55552 /* UICollectionViewRegisterable.swift */; };
2F87354C2B4D28D700E55552 /* HomeCollectionFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F87354B2B4D28D700E55552 /* HomeCollectionFooterView.swift */; };
3C01692A2B4DC82D0075334B /* DontBePopupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0920DB2B4D78DA003BD080 /* DontBePopupView.swift */; };
3C0920DE2B4D98CD003BD080 /* DontBeToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0920DD2B4D98CD003BD080 /* DontBeToastView.swift */; };
3C2854F72B3A9E8300369C99 /* View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854F62B3A9E8300369C99 /* View.swift */; };
3C2854F92B3A9E8A00369C99 /* ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854F82B3A9E8A00369C99 /* ViewModel.swift */; };
3C2854FB2B3A9E9000369C99 /* Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854FA2B3A9E9000369C99 /* Cell.swift */; };
3C2854FD2B3A9FD800369C99 /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854FC2B3A9FD800369C99 /* ExampleViewController.swift */; };
3C2854FF2B3AA01700369C99 /* ExampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854FE2B3AA01700369C99 /* ExampleView.swift */; };
3C2855012B3AA0A000369C99 /* ExampleCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2855002B3AA0A000369C99 /* ExampleCollectionViewCell.swift */; };
3C35565B2B494F0A0016BA49 /* UIColor+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C35565A2B494F0A0016BA49 /* UIColor+.swift */; };
3C6192ED2B3A719A00220CEB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6192EC2B3A719A00220CEB /* AppDelegate.swift */; };
3C6192EF2B3A719A00220CEB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6192EE2B3A719A00220CEB /* SceneDelegate.swift */; };
3C6192F12B3A719A00220CEB /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6192F02B3A719A00220CEB /* ViewController.swift */; };
3C6192F62B3A719C00220CEB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3C6192F52B3A719C00220CEB /* Assets.xcassets */; };
3C61930A2B3A781300220CEB /* ImageLiterals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6193092B3A781300220CEB /* ImageLiterals.swift */; };
3C61930C2B3A782100220CEB /* StringLiterals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C61930B2B3A782100220CEB /* StringLiterals.swift */; };
Expand Down Expand Up @@ -92,19 +95,22 @@
2AAEFC982B4A9E3B00C2D323 /* DontBeTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBeTabBarController.swift; sourceTree = "<group>"; };
2AC9FB1A2B4DE77400D31071 /* AgreementListCustomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgreementListCustomView.swift; sourceTree = "<group>"; };
2AC9FB1E2B4E634A00D31071 /* JoinAgreeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinAgreeView.swift; sourceTree = "<group>"; };
2F87353F2B4BE65300E55552 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
2F8735412B4BE66500E55552 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
2F8735432B4BE67300E55552 /* HomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModel.swift; sourceTree = "<group>"; };
2F8735452B4C34A500E55552 /* HomeCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionView.swift; sourceTree = "<group>"; };
2F8735472B4C355100E55552 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = "<group>"; };
2F8735492B4C427000E55552 /* UICollectionViewRegisterable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UICollectionViewRegisterable.swift; sourceTree = "<group>"; };
2F87354B2B4D28D700E55552 /* HomeCollectionFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionFooterView.swift; sourceTree = "<group>"; };
3C0920DB2B4D78DA003BD080 /* DontBePopupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBePopupView.swift; sourceTree = "<group>"; };
3C0920DD2B4D98CD003BD080 /* DontBeToastView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBeToastView.swift; sourceTree = "<group>"; };
3C2854F62B3A9E8300369C99 /* View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = View.swift; sourceTree = "<group>"; };
3C2854F82B3A9E8A00369C99 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = "<group>"; };
3C2854FA2B3A9E9000369C99 /* Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cell.swift; sourceTree = "<group>"; };
3C2854FC2B3A9FD800369C99 /* ExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleViewController.swift; sourceTree = "<group>"; };
3C2854FE2B3AA01700369C99 /* ExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleView.swift; sourceTree = "<group>"; };
3C2855002B3AA0A000369C99 /* ExampleCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleCollectionViewCell.swift; sourceTree = "<group>"; };
3C35565A2B494F0A0016BA49 /* UIColor+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+.swift"; sourceTree = "<group>"; };
3C6192E92B3A719A00220CEB /* DontBe-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DontBe-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3C6192EC2B3A719A00220CEB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3C6192EE2B3A719A00220CEB /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
3C6192F02B3A719A00220CEB /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
3C6192F52B3A719C00220CEB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
3C6192FA2B3A719C00220CEB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3C6193092B3A781300220CEB /* ImageLiterals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageLiterals.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -415,31 +421,34 @@
3C6193102B3A7A0D00220CEB /* Views */ = {
isa = PBXGroup;
children = (
3C2854F62B3A9E8300369C99 /* View.swift */,
2F87353F2B4BE65300E55552 /* HomeView.swift */,
2F8735452B4C34A500E55552 /* HomeCollectionView.swift */,
2F87354B2B4D28D700E55552 /* HomeCollectionFooterView.swift */,
2F8735492B4C427000E55552 /* UICollectionViewRegisterable.swift */,
);
path = Views;
sourceTree = "<group>";
};
3C6193112B3A7A1500220CEB /* ViewControllers */ = {
isa = PBXGroup;
children = (
3C6192F02B3A719A00220CEB /* ViewController.swift */,
2F8735412B4BE66500E55552 /* HomeViewController.swift */,
);
path = ViewControllers;
sourceTree = "<group>";
};
3C6193122B3A7A1E00220CEB /* ViewModel */ = {
isa = PBXGroup;
children = (
3C2854F82B3A9E8A00369C99 /* ViewModel.swift */,
2F8735432B4BE67300E55552 /* HomeViewModel.swift */,
);
path = ViewModel;
sourceTree = "<group>";
};
3C6193132B3A7A2400220CEB /* Cells */ = {
isa = PBXGroup;
children = (
3C2854FA2B3A9E9000369C99 /* Cell.swift */,
2F8735472B4C355100E55552 /* HomeCollectionViewCell.swift */,
);
path = Cells;
sourceTree = "<group>";
Expand All @@ -458,8 +467,6 @@
children = (
3CE9C12B2B4BE7300086E4A3 /* WriteView.swift */,
3CE9C12D2B4C08AE0086E4A3 /* WriteTextView.swift */,
3C0920DB2B4D78DA003BD080 /* DontBePopupView.swift */,
3C0920DD2B4D98CD003BD080 /* DontBeToastView.swift */,
);
path = Views;
sourceTree = "<group>";
Expand All @@ -475,6 +482,8 @@
3CE9C1332B4C4BA90086E4A3 /* Helpers */ = {
isa = PBXGroup;
children = (
3C0920DB2B4D78DA003BD080 /* DontBePopupView.swift */,
3C0920DD2B4D98CD003BD080 /* DontBeToastView.swift */,
3CE9C1342B4C4BC20086E4A3 /* CircleProgressbar.swift */,
2A2672042B4C3C00009D214F /* CancelBag.swift */,
2A8D70C22B4D7FF5009F4C6C /* BackButton.swift */,
Expand Down Expand Up @@ -563,15 +572,17 @@
buildActionMask = 2147483647;
files = (
2A8D70CA2B4D9787009F4C6C /* IntroductionView.swift in Sources */,
2F87354A2B4C427000E55552 /* UICollectionViewRegisterable.swift in Sources */,
2A8D70CA2B4D9787009F4C6C /* OnboardingEndingView.swift in Sources */,
3C6193172B3A7A7B00220CEB /* UIStackView+.swift in Sources */,
3CE9C12E2B4C08AE0086E4A3 /* WriteTextView.swift in Sources */,
2A8D70BD2B4D61A1009F4C6C /* OnboardingDummy.swift in Sources */,
3C6193152B3A7A6400220CEB /* UIView+.swift in Sources */,
2AC9FB1F2B4E634A00D31071 /* JoinAgreeView.swift in Sources */,
3C6192F12B3A719A00220CEB /* ViewController.swift in Sources */,
3C61930C2B3A782100220CEB /* StringLiterals.swift in Sources */,
2F8735462B4C34A500E55552 /* HomeCollectionView.swift in Sources */,
2F8735422B4BE66500E55552 /* HomeViewController.swift in Sources */,
2A8D70B42B4C999F009F4C6C /* CustomButton.swift in Sources */,
3C2854FB2B3A9E9000369C99 /* Cell.swift in Sources */,
3C61930A2B3A781300220CEB /* ImageLiterals.swift in Sources */,
2A8D70C52B4D8079009F4C6C /* UIViewController+.swift in Sources */,
2A6D54C12B479B4300F9891E /* adjusted+.swift in Sources */,
Expand All @@ -588,12 +599,14 @@
2A8D70B82B4C9A59009F4C6C /* OnboardingViewController.swift in Sources */,
2A2672022B4C3B44009D214F /* ViewModelType.swift in Sources */,
3C6192ED2B3A719A00220CEB /* AppDelegate.swift in Sources */,
3C2854F72B3A9E8300369C99 /* View.swift in Sources */,
2F8735402B4BE65300E55552 /* HomeView.swift in Sources */,
2F8735442B4BE67300E55552 /* HomeViewModel.swift in Sources */,
2F87354C2B4D28D700E55552 /* HomeCollectionFooterView.swift in Sources */,
2F8735482B4C355100E55552 /* HomeCollectionViewCell.swift in Sources */,
3CE9C12A2B4BE6780086E4A3 /* WriteViewController.swift in Sources */,
3C2854FD2B3A9FD800369C99 /* ExampleViewController.swift in Sources */,
2AAEFC992B4A9E3B00C2D323 /* DontBeTabBarController.swift in Sources */,
2AAEFC972B4A9C3700C2D323 /* DontBeTabBarItem.swift in Sources */,
3C2854F92B3A9E8A00369C99 /* ViewModel.swift in Sources */,
3C0920DE2B4D98CD003BD080 /* DontBeToastView.swift in Sources */,
3CE9C1302B4C2F740086E4A3 /* UIImageView+.swift in Sources */,
2A51AE852B4B05AA00FF770A /* SplashViewController.swift in Sources */,
Expand Down
5 changes: 5 additions & 0 deletions DontBe-iOS/DontBe-iOS/Global/Literals/StringLiterals.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,9 @@ enum StringLiterals {
static let start = "시작하기"
static let finish = "완료하기"
}

enum Toast {
static let uploading = "게시 중..."
static let uploaded = "게시 완료!"
}
}
41 changes: 28 additions & 13 deletions ...ntation/Write/Views/DontBePopupView.swift → ...resentation/Helpers/DontBePopupView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ final class DontBePopupView: UIView {
init(popupTitle: String, popupContent: String, leftButtonTitle: String, rightButtonTitle: String) {
super.init(frame: .zero)

setUI()
setHierarchy()
setLayout()
setAddTarget()

popupTitleLabel.text = popupTitle // 팝업 타이틀
popupContentLabel.text = popupContent // 팝업 내용
cancleButton.setTitle(leftButtonTitle, for: .normal) // 팝업 왼쪽 버튼 타이틀
confirmButton.setTitle(rightButtonTitle, for: .normal) // 팝업 오른쪽 버튼 타이틀

setUI()
setHierarchy()
setLayout()
setAddTarget()
}

@available(*, unavailable)
Expand Down Expand Up @@ -116,26 +116,41 @@ extension DontBePopupView {
// 팝업뷰 타이틀이 없는 경우
if popupTitleLabel.text == nil {
container.snp.makeConstraints {
$0.leading.trailing.equalToSuperview().inset(24)
$0.leading.trailing.equalToSuperview().inset(24.adjusted)
$0.centerY.equalToSuperview()
$0.height.equalTo(140)
}

popupContentLabel.snp.makeConstraints {
$0.top.equalToSuperview().inset(24)
$0.leading.trailing.equalToSuperview().inset(18)
$0.bottom.equalTo(cancleButton.snp.top).offset(-26)
$0.top.equalToSuperview().inset(24.adjusted)
$0.leading.trailing.equalToSuperview().inset(18.adjusted)
$0.bottom.equalTo(cancleButton.snp.top).offset(-26.adjusted)
}

buttonStackView.snp.makeConstraints {
$0.leading.trailing.bottom.equalToSuperview().inset(20)
$0.height.equalTo(44)
$0.leading.trailing.bottom.equalToSuperview().inset(20.adjusted)
$0.height.equalTo(44.adjusted)
}
} else {
container.snp.makeConstraints {
$0.leading.trailing.equalToSuperview().inset(24)
$0.leading.trailing.equalToSuperview().inset(24.adjusted)
$0.centerY.equalToSuperview()
}

popupTitleLabel.snp.makeConstraints {
$0.top.equalToSuperview().inset(24.adjusted)
$0.leading.trailing.equalToSuperview().inset(18.adjusted)
}

popupContentLabel.snp.makeConstraints {
$0.top.equalTo(popupTitleLabel.snp.bottom).offset(12.adjusted)
$0.leading.trailing.equalToSuperview().inset(18.adjusted)
$0.bottom.equalTo(cancleButton.snp.top).offset(-26.adjusted)
}

buttonStackView.snp.makeConstraints {
$0.leading.trailing.bottom.equalToSuperview().inset(20.adjusted)
$0.height.equalTo(44.adjusted)
}
}
}

Expand Down
21 changes: 11 additions & 10 deletions ...ntation/Write/Views/DontBeToastView.swift → ...resentation/Helpers/DontBeToastView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,31 @@ final class DontBeToastView: UIView {

// MARK: - UI Components

private let container: UIView = {
let container: UIView = {
let view = UIView()
view.backgroundColor = .donGray7
view.layer.cornerRadius = 4
view.backgroundColor = .donGray3
view.layer.cornerRadius = 4.adjusted
return view
}()

private let circleProgressBar: CircleProgressbar = {
let circleProgressBar: CircleProgressbar = {
let circle = CircleProgressbar()
circle.backgroundColor = .clear
circle.circleTintColor = .donPrimary
circle.circleBackgroundColor = .donWhite
return circle
}()

private let checkImageView: UIImageView = {
let checkImageView: UIImageView = {
let imageView = UIImageView()
imageView.image = ImageLiterals.Toast.icnCheck
imageView.contentMode = .scaleAspectFit
return imageView
}()

private let toastLabel: UILabel = {
let toastLabel: UILabel = {
let label = UILabel()
label.text = "게시 중..."
label.text = StringLiterals.Toast.uploading
label.textColor = .donBlack
label.textAlignment = .center
label.font = UIFont.font(.body3)
Expand All @@ -65,16 +65,17 @@ final class DontBeToastView: UIView {
// MARK: - Extensions

extension DontBeToastView {
func setUI() {
private func setUI() {
checkImageView.alpha = 0
circleProgressBar.value = 0
}

func setHierarchy() {
private func setHierarchy() {
self.addSubview(container)
container.addSubviews(circleProgressBar, checkImageView, toastLabel)
}

func setLayout() {
private func setLayout() {
container.snp.makeConstraints {
$0.edges.equalToSuperview()
}
Expand Down
8 changes: 0 additions & 8 deletions DontBe-iOS/DontBe-iOS/Presentation/Home/Cells/Cell.swift
View file

This file was deleted.

Loading

0 comments on commit 30fe931

Please sign in to comment.