Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

design: 명함 만들기 뷰 레이아웃 수정 (#418) #433

Merged
merged 3 commits into from
Apr 15, 2023
Merged

design: 명함 만들기 뷰 레이아웃 수정 (#418) #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22f6929
feat: 명함 생성 시 내 명함 탭으로 이동 (#424)
hyun99999 Apr 15, 2023
78e11b6
Merge branch 'develop' of https://github.com/TeamNADA/NADA-iOS-ForRel…
hyun99999 Apr 15, 2023
f7041be
design: 명함 만들기 뷰 레이아웃 수정 (#418)
hyun99999 Apr 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions ...rRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ extension CardCreationCategoryViewController {
.disposed(by: disposeBag)
}

// TODO: - 화면전환 메서드 작성.
private func presentToBasicCardCreationViewController() {
guard let nextVC = UIStoryboard(name: Const.Storyboard.Name.cardCreation, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.cardCreationViewController) as? CardCreationViewController else { return }
let navigationController = UINavigationController(rootViewController: nextVC)
Expand All @@ -210,11 +209,11 @@ extension CardCreationCategoryViewController {
}

private func presentToJobCardCreationViewController() {

// TODO: - 화면전환 메서드 작성.
}

private func presentToDiggingCardCreationViewController() {

// TODO: - 화면전환 메서드 작성.
}

// MARK: - @objc methods
Expand Down Expand Up @@ -271,7 +270,7 @@ extension CardCreationCategoryViewController {
diggingBackgroundView.snp.makeConstraints { make in
make.top.equalTo(basicBackgroundView.snp.bottom).offset(12)
make.leading.trailing.equalToSuperview().inset(24)
make.height.equalTo(basicBackgroundView.snp.width).multipliedBy(117.0 / 327.0)
make.height.equalTo(diggingBackgroundView.snp.width).multipliedBy(117.0 / 327.0)
}

diggingTextlabel.snp.makeConstraints { make in
Expand All @@ -286,9 +285,9 @@ extension CardCreationCategoryViewController {
}

jobBackgroundView.snp.makeConstraints { make in
make.top.equalTo(jobBackgroundView.snp.bottom).offset(12)
make.top.equalTo(diggingBackgroundView.snp.bottom).offset(12)
make.leading.trailing.equalToSuperview().inset(24)
make.height.equalTo(basicBackgroundView.snp.width).multipliedBy(117.0 / 327.0)
make.height.equalTo(jobBackgroundView.snp.width).multipliedBy(117.0 / 327.0)
}

jobTextlabel.snp.makeConstraints { make in
Expand All @@ -303,7 +302,7 @@ extension CardCreationCategoryViewController {
}

checkMarkImageView.snp.makeConstraints { make in
make.top.equalTo(diggingBackgroundView.snp.bottom).offset(10)
make.top.equalTo(jobBackgroundView.snp.bottom).offset(10)
make.leading.equalToSuperview().inset(24)
}

Expand Down
8 changes: 5 additions & 3 deletions ...orRelease/Sources/ViewControllers/CardCreation/VC/CardCreationPreviewViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,13 @@ extension CardCreationPreviewViewController {
case .success:
print("cardCreationWithAPI - success")

guard let presentingVC = self.presentingViewController else { return }

NotificationCenter.default.post(name: .creationReloadMainCardSwiper, object: nil)

guard let presentingTabBarVC = self.presentingViewController as? TabBarViewController,
let presentingNavigationVC = presentingTabBarVC.selectedViewController as? UINavigationController else { return }

self.dismiss(animated: true) {
presentingNavigationVC.popToRootViewController(animated: true)
self.activityIndicator.stopAnimating()
self.loadingBgView.removeFromSuperview()

Expand All @@ -247,7 +249,7 @@ extension CardCreationPreviewViewController {
.setHeight(587)
nextVC.modalPresentationStyle = .overFullScreen

presentingVC.present(nextVC, animated: true) {
presentingTabBarVC.present(nextVC, animated: true) {
UserDefaults.standard.set(false, forKey: Const.UserDefaultsKey.isFirstCard)
}
}
Expand Down