From 58780fd6a2baca6ed71a8a5f5d0016f06d7f3328 Mon Sep 17 00:00:00 2001 From: jonnwon Date: Thu, 4 Apr 2024 06:23:05 +0900 Subject: [PATCH 1/6] =?UTF-8?q?feat=09=20=20=20=20:=20=ED=82=A4=EB=B3=B4?= =?UTF-8?q?=EB=93=9C=20=ED=83=80=EC=9E=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - textView의 키보드를 emailAddress타입으로 변경 --- iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift b/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift index 8808a66..0f411f3 100644 --- a/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift +++ b/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift @@ -41,6 +41,7 @@ class AddBookmarkView: UIView { $0.font = .cellTitleFont $0.textColor = .label $0.isScrollEnabled = true + $0.keyboardType = .emailAddress } private let separatorView = UIView().then { @@ -60,6 +61,7 @@ class AddBookmarkView: UIView { $0.font = .cellTitleFont $0.textColor = .label $0.isScrollEnabled = true + $0.keyboardType = .emailAddress } private let button = UIButton(type: .custom).then { From e05bffdfd3a8d0b294a851d0ba0d6da15cfccbb3 Mon Sep 17 00:00:00 2001 From: jonnwon Date: Thu, 4 Apr 2024 06:28:42 +0900 Subject: [PATCH 2/6] =?UTF-8?q?refactor=20=20:=20Label=EC=A0=9C=EC=95=BD?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - '목록'버튼 label의 width제약 삭제 - 선택된 폴더를 나타내는 label의 width 제약설정 --- iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift b/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift index 0f411f3..28819c1 100644 --- a/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift +++ b/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift @@ -176,7 +176,6 @@ class AddBookmarkView: UIView { buttonLabel.snp.makeConstraints { make in make.leading.equalTo(button.snp.leading).offset(20) make.centerY.equalTo(button.snp.centerY) - make.width.equalTo(40) make.height.equalTo(40) } @@ -184,6 +183,7 @@ class AddBookmarkView: UIView { make.trailing.equalTo(chevronImageView.snp.leading).offset(-10) make.centerY.equalTo(button.snp.centerY) make.height.equalTo(40) + make.width.equalTo(100) } chevronImageView.snp.makeConstraints { make in From 2813c2d9eeda2eb0d2ff5ab063f41ad870f40fa4 Mon Sep 17 00:00:00 2001 From: jonnwon Date: Thu, 4 Apr 2024 06:32:39 +0900 Subject: [PATCH 3/6] =?UTF-8?q?refactor=20=20:=20folderNameLabel=20?= =?UTF-8?q?=EC=A0=9C=EC=95=BD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Folder이름이 긴 경우 이름이 체크표시 침범, FolderListCell 내 folderNameLabel 제약수정 --- iBox/Sources/BoxList/AddBookmark/FolderListCell.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iBox/Sources/BoxList/AddBookmark/FolderListCell.swift b/iBox/Sources/BoxList/AddBookmark/FolderListCell.swift index e77e200..ad39291 100644 --- a/iBox/Sources/BoxList/AddBookmark/FolderListCell.swift +++ b/iBox/Sources/BoxList/AddBookmark/FolderListCell.swift @@ -68,7 +68,7 @@ class FolderListCell: UITableViewCell { folderNameLabel.snp.makeConstraints { make in make.centerY.equalToSuperview() make.leading.equalTo(folderImageView.snp.trailing).offset(10) - make.trailing.lessThanOrEqualToSuperview().offset(-20) + make.trailing.lessThanOrEqualToSuperview().offset(-60) make.top.greaterThanOrEqualToSuperview().offset(10) make.bottom.lessThanOrEqualToSuperview().offset(-10) } From 069281dd81b4749dd3133c1426f1794803fb00ac Mon Sep 17 00:00:00 2001 From: jonnwon Date: Thu, 4 Apr 2024 06:37:51 +0900 Subject: [PATCH 4/6] =?UTF-8?q?refactor=20=20:=20AddBookmarkView=20?= =?UTF-8?q?=EB=82=B4=20textField=20top=20=EC=A0=9C=EC=95=BD=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift b/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift index 28819c1..7d44ef2 100644 --- a/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift +++ b/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift @@ -130,7 +130,7 @@ class AddBookmarkView: UIView { private func setupLayout() { textFieldView.snp.makeConstraints { make in - make.top.equalToSuperview().offset(100) + make.top.equalToSuperview().offset(70) make.height.equalTo(150) make.leading.equalToSuperview().offset(20) make.trailing.equalToSuperview().offset(-20) From 7c79c2db66413fa7a4e52f7cc8bf22694fc393e2 Mon Sep 17 00:00:00 2001 From: jonnwon Date: Thu, 4 Apr 2024 06:41:17 +0900 Subject: [PATCH 5/6] =?UTF-8?q?feat=09=20=20=20=20:=20AddBookmarkView=20?= =?UTF-8?q?=EB=82=B4=20Responder=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - UITextView가 편집되기 시작할 때 텍스트의 끝으로 포커스 이동 - nameTextView에서 return 시 urlTextView로 포커스 이동 - urlTextView에서 return 시 키보드 내림 --- .../BoxList/AddBookmark/AddBookmarkView.swift | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift b/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift index 7d44ef2..5b57e35 100644 --- a/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift +++ b/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift @@ -228,6 +228,22 @@ class AddBookmarkView: UIView { } extension AddBookmarkView: UITextViewDelegate { + func textViewDidBeginEditing(_ textView: UITextView) { + let textLength: Int = textView.text.count + textView.selectedRange = NSRange(location: textLength, length: 0) + } + + func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { + if text == "\n" { + if textView == nameTextView { + urlTextView.becomeFirstResponder() + } else if textView == urlTextView { + textView.resignFirstResponder() + } + return false + } + return true + } func textViewDidChange(_ textView: UITextView) { From edcf86670aba15b1fdfc04031a8a7b63636da337 Mon Sep 17 00:00:00 2001 From: jonnwon Date: Thu, 4 Apr 2024 06:51:34 +0900 Subject: [PATCH 6/6] =?UTF-8?q?feat=09=20=20=20=20:=20AddBookmarkView=20?= =?UTF-8?q?=EB=82=B4=20textView=20=EC=9E=90=EB=8F=99=EB=B3=B4=EC=A0=95=20?= =?UTF-8?q?=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift b/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift index 5b57e35..8d431c1 100644 --- a/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift +++ b/iBox/Sources/BoxList/AddBookmark/AddBookmarkView.swift @@ -42,6 +42,7 @@ class AddBookmarkView: UIView { $0.textColor = .label $0.isScrollEnabled = true $0.keyboardType = .emailAddress + $0.autocorrectionType = .no } private let separatorView = UIView().then { @@ -62,6 +63,7 @@ class AddBookmarkView: UIView { $0.textColor = .label $0.isScrollEnabled = true $0.keyboardType = .emailAddress + $0.autocorrectionType = .no } private let button = UIButton(type: .custom).then {