diff --git a/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release(Development).xcscheme b/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release(Development).xcscheme index 100bbba9..4801e014 100644 --- a/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release(Development).xcscheme +++ b/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release(Development).xcscheme @@ -15,7 +15,7 @@ @@ -67,7 +67,7 @@ @@ -96,7 +96,7 @@ diff --git a/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release(Staging).xcscheme b/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release(Staging).xcscheme index bab21566..73c73568 100644 --- a/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release(Staging).xcscheme +++ b/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release(Staging).xcscheme @@ -15,7 +15,7 @@ @@ -67,7 +67,7 @@ @@ -84,7 +84,7 @@ diff --git a/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release.xcscheme b/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release.xcscheme index ac9e4ea3..18f1597d 100644 --- a/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release.xcscheme +++ b/Hous-iOS-release.xcodeproj/xcshareddata/xcschemes/Hous-iOS-release.xcscheme @@ -15,7 +15,7 @@ @@ -67,7 +67,7 @@ @@ -84,7 +84,7 @@ diff --git a/Hous-iOS-release/Scene/Profile/View/ProfileSetting/ProfileSettingListView.swift b/Hous-iOS-release/Scene/Profile/View/ProfileSetting/ProfileSettingListView.swift index c8c50541..b14ffa00 100644 --- a/Hous-iOS-release/Scene/Profile/View/ProfileSetting/ProfileSettingListView.swift +++ b/Hous-iOS-release/Scene/Profile/View/ProfileSetting/ProfileSettingListView.swift @@ -17,8 +17,6 @@ final class ProfileSettingListView: UIView { private let disposeBag: DisposeBag = DisposeBag() - private let listImage = UIImageView() - private let listTextLabel = UILabel().then { $0.textColor = Colors.black.color $0.font = Fonts.SpoqaHanSansNeo.medium.font(size: 16) @@ -40,7 +38,6 @@ final class ProfileSettingListView: UIView { convenience init(image: UIImage, text: String) { self.init(frame: .zero) - self.listImage.image = image self.listTextLabel.text = text } @@ -49,16 +46,11 @@ final class ProfileSettingListView: UIView { } private func render() { - self.addSubViews([listImage, listTextLabel, forwardButtonImage]) - - listImage.snp.makeConstraints { make in - make.centerY.equalToSuperview() - make.leading.equalToSuperview().offset(24) - } + self.addSubViews([listTextLabel, forwardButtonImage]) listTextLabel.snp.makeConstraints { make in make.centerY.equalToSuperview() - make.leading.equalTo(listImage.snp.trailing).offset(12) + make.leading.equalToSuperview().offset(24) } forwardButtonImage.snp.makeConstraints { make in diff --git a/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift b/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift index e9b44551..aefb2bbd 100644 --- a/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift +++ b/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift @@ -29,9 +29,10 @@ final class ProfileAlarmSettingViewController: BaseViewController, LoadingPresen // MARK: UI Components - private let navigationBarView = ProfileNavigationBarView().then { - $0.titleName.text = "설정" - } + private let navigationBarView = NavBarWithBackButtonView( + title: "알림", + rightButtonText: "" + ) private let alarmSettingCollectionView: UICollectionView = { let layout = UICollectionViewFlowLayout() @@ -81,7 +82,7 @@ final class ProfileAlarmSettingViewController: BaseViewController, LoadingPresen let actionDetected = PublishSubject() - navigationBarView.navigationBackButton.rx.tap + navigationBarView.backButton.rx.tap .observe(on: MainScheduler.asyncInstance) .bind(onNext: { _ in actionDetected.onNext(.didTabBack) diff --git a/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileSettingViewController.swift b/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileSettingViewController.swift index 89c502cc..4f02b50c 100644 --- a/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileSettingViewController.swift +++ b/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileSettingViewController.swift @@ -12,6 +12,7 @@ import Then import MessageUI import SafariServices import BottomSheetKit +import HousUIComponent final class ProfileSettingViewController: UIViewController { @@ -32,9 +33,10 @@ final class ProfileSettingViewController: UIViewController { // MARK: UI Components - private let navigationBarView = ProfileNavigationBarView().then { - $0.titleName.text = "설정" - } + private let navigationBarView = NavBarWithBackButtonView( + title: "설정", + rightButtonText: "" + ) private let settingListStackView = UIStackView().then { $0.alignment = .fill @@ -42,7 +44,7 @@ final class ProfileSettingViewController: UIViewController { $0.axis = .vertical } - private let alarmSetting = ProfileSettingListView(image: Images.icAlarmSetting.image, text: "알람") + private let alarmSetting = ProfileSettingListView(image: Images.icAlarmSetting.image, text: "알림") private let agreementInfo = ProfileSettingListView(image: Images.icInfo.image, text: "개인정보 및 약관") @@ -187,7 +189,7 @@ final class ProfileSettingViewController: UIViewController { }) .disposed(by: disposeBag) - navigationBarView.navigationBackButton.rx.tap + navigationBarView.backButton.rx.tap .observe(on: MainScheduler.asyncInstance) .bind(onNext: { [weak self] in guard let self = self else { return }