diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/AppIcon.appiconset/runnect logo-01 1.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/AppIcon.appiconset/runnect logo-01 1.png index b97a9620..2cf0fca4 100644 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/AppIcon.appiconset/runnect logo-01 1.png and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/AppIcon.appiconset/runnect logo-01 1.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Utils/Toast.swift b/Runnect-iOS/Runnect-iOS/Global/Utils/Toast.swift index d1c1887a..1bed8bfa 100644 --- a/Runnect-iOS/Runnect-iOS/Global/Utils/Toast.swift +++ b/Runnect-iOS/Runnect-iOS/Global/Utils/Toast.swift @@ -43,7 +43,7 @@ public class Toast { toastContainer.snp.makeConstraints { $0.centerX.equalToSuperview() - $0.bottom.equalToSuperview().inset(safeAreaBottomInset+40) + $0.bottom.equalToSuperview().inset(safeAreaBottomInset+80) $0.width.equalTo(200) $0.height.equalTo(44) } diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/Views/CVC/CourseListCVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/Views/CVC/CourseListCVC.swift index 9491930d..9bcf12c5 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/Views/CVC/CourseListCVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/Views/CVC/CourseListCVC.swift @@ -45,6 +45,12 @@ final class CourseListCVC: UICollectionViewCell { $0.clipsToBounds = true } + private let imageCoverView = UIImageView().then { + $0.backgroundColor = .m1.withAlphaComponent(0.2) + $0.layer.cornerRadius = 5 + $0.isHidden = true + } + private let titleLabel = UILabel().then { $0.text = "제목" $0.font = .b4 @@ -109,8 +115,10 @@ extension CourseListCVC { if didSelect { courseImageView.layer.borderColor = UIColor.m1.cgColor courseImageView.layer.borderWidth = 2 + imageCoverView.isHidden = false } else { courseImageView.layer.borderColor = UIColor.clear.cgColor + imageCoverView.isHidden = true } } } @@ -133,7 +141,7 @@ extension CourseListCVC { } private func setLayout() { - self.contentView.addSubviews(courseImageView, labelStackView, likeButton) + self.contentView.addSubviews(courseImageView, imageCoverView, labelStackView, likeButton) courseImageView.snp.makeConstraints { make in make.leading.top.trailing.equalToSuperview() @@ -141,6 +149,10 @@ extension CourseListCVC { make.height.equalTo(imageHeight) } + imageCoverView.snp.makeConstraints { make in + make.edges.equalTo(courseImageView) + } + likeButton.snp.makeConstraints { make in make.top.equalTo(courseImageView.snp.bottom).offset(7) make.trailing.equalToSuperview() diff --git a/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/NicknameEditorVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/NicknameEditorVC.swift index a56a5bf0..fe394512 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/NicknameEditorVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/NicknameEditorVC.swift @@ -25,6 +25,8 @@ final class NicknameEditorVC: UIViewController { weak var delegate: NicknameEditorVCDelegate? + private let nicknameMaxLength: Int = 7 + // MARK: - UI Components private let editorContentView = UIView().then { @@ -55,13 +57,12 @@ final class NicknameEditorVC: UIViewController { override func viewDidLoad() { super.viewDidLoad() - self.tabBarController?.tabBar.isHidden = true nickNameTextField.delegate = self isTextExist(textField: nickNameTextField) - view.backgroundColor = .black.withAlphaComponent(0.8) setUI() setLayout() showKeyboard() + setAddTarget() } } @@ -76,6 +77,10 @@ extension NicknameEditorVC { } } + private func setAddTarget(){ + nickNameTextField.addTarget(self, action: #selector(textFieldTextDidChange), for: .editingChanged) + } + func showKeyboard() { self.nickNameTextField.becomeFirstResponder() } @@ -100,6 +105,16 @@ extension NicknameEditorVC { guard let nickname = nickNameTextField.text else { return } self.updateUserNickname(nickname: nickname) } + + @objc private func textFieldTextDidChange() { + guard let text = nickNameTextField.text else { return } + + if text.count > nicknameMaxLength { + let index = text.index(text.startIndex, offsetBy: nicknameMaxLength) + let newString = text[text.startIndex..