From 6752418e12f88fb16512c2016b4484280225a81d Mon Sep 17 00:00:00 2001 From: seungwon Date: Sun, 11 Jun 2023 18:04:51 +0900 Subject: [PATCH 1/6] =?UTF-8?q?[fix]=20=EC=88=9C=ED=99=98=EC=B0=B8?= =?UTF-8?q?=EC=A1=B0=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sinzak.xcodeproj/project.pbxproj | 2 -- Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Sinzak.xcodeproj/project.pbxproj b/Sinzak.xcodeproj/project.pbxproj index c348602a..74dd6304 100644 --- a/Sinzak.xcodeproj/project.pbxproj +++ b/Sinzak.xcodeproj/project.pbxproj @@ -519,7 +519,6 @@ ED74A07A29F4F8F200F44AA2 /* AppleAuthAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppleAuthAPI.swift; sourceTree = ""; }; ED74A07F29F4FABB00F44AA2 /* AppleAuthManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppleAuthManager.swift; sourceTree = ""; }; ED74A08129F4FB7300F44AA2 /* AppleToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppleToken.swift; sourceTree = ""; }; - ED74A08329F520CF00F44AA2 /* TODO.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = TODO.md; sourceTree = ""; }; ED75587F29E546F700A15977 /* DoubleCheckButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoubleCheckButton.swift; sourceTree = ""; }; ED75588229E7173900A15977 /* UniversityInfoVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UniversityInfoVM.swift; sourceTree = ""; }; ED7F92D029DB0F2A00C55FBF /* SNSLoginDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SNSLoginDTO.swift; sourceTree = ""; }; @@ -1191,7 +1190,6 @@ children = ( A2806120292F50FA005AE0B3 /* .swiftlint.yml */, A23415C52927D7A9007DADE7 /* .gitignore */, - ED74A08329F520CF00F44AA2 /* TODO.md */, A23415B02927D776007DADE7 /* Sinzak */, A2F07847298AB0A7004A2B3F /* SinzakTests */, A23415AF2927D776007DADE7 /* Products */, diff --git a/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift b/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift index 0d39b01f..46a2370b 100644 --- a/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift +++ b/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift @@ -111,7 +111,7 @@ private extension WritePostVC { let vc = PHPickerViewController(configuration: config) vc.view.tintColor = CustomColor.red - vc.delegate = self + vc.delegate = owner vc.modalPresentationStyle = .fullScreen owner.present(vc, animated: true) From 2d672fdd7dc7b2925b41df7cbaa8f46e1ec67c32 Mon Sep 17 00:00:00 2001 From: seungwon Date: Sun, 11 Jun 2023 19:26:31 +0900 Subject: [PATCH 2/6] =?UTF-8?q?[fix]=20=EC=BD=9C=EB=A0=89=EC=85=98=20?= =?UTF-8?q?=EB=B7=B0=20=EC=85=80=EC=9D=98=20=EC=82=AD=EC=A0=9C=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=EC=9D=B4=20=EB=88=8C=EB=A6=AC=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift | 12 +++++++----- .../Write/WritePost/View/SelectedPhotoCVC.swift | 4 +--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift b/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift index 46a2370b..fcb9c405 100644 --- a/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift +++ b/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift @@ -19,6 +19,7 @@ final class WritePostVC: SZVC { private let disposeBag = DisposeBag() private let viewModel: WritePostVM private var keyboardHeight: CGFloat = 0.0 + private var tapGestureRecognizer: UITapGestureRecognizer? init(viewModel: WritePostVM, category: WriteCategory) { self.viewModel = viewModel @@ -89,11 +90,6 @@ private extension WritePostVC { } func bindInput() { - - let tapContentViewGesture = UITapGestureRecognizer(target: self, action: #selector(endEditing)) - mainView.contentView.addGestureRecognizer(tapContentViewGesture) - tapContentViewGesture.delegate = self - mainView.collectionView.rx.itemSelected .asSignal() .emit( @@ -222,8 +218,14 @@ private extension WritePostVC { owner.keyboardHeight = keyboardVisibleHeight if keyboardVisibleHeight > 0 { owner.mainView.remakeKeyboardShowLayout() + let tapGestureRecognizer = UITapGestureRecognizer(target: owner, action: #selector(owner.endEditing)) + owner.mainView.contentView.addGestureRecognizer(tapGestureRecognizer) + tapGestureRecognizer.delegate = self + self.tapGestureRecognizer = tapGestureRecognizer } else { owner.mainView.remakeKeyboardNotShowLayout() + guard let tapGestureRecognizer = owner.tapGestureRecognizer else { return } + owner.mainView.contentView.removeGestureRecognizer(tapGestureRecognizer) } }) diff --git a/Sinzak/Scene/Write/WritePost/View/SelectedPhotoCVC.swift b/Sinzak/Scene/Write/WritePost/View/SelectedPhotoCVC.swift index 8ebdd698..dca5cd3c 100644 --- a/Sinzak/Scene/Write/WritePost/View/SelectedPhotoCVC.swift +++ b/Sinzak/Scene/Write/WritePost/View/SelectedPhotoCVC.swift @@ -8,8 +8,6 @@ import UIKit import SnapKit import Then -import RxSwift -import RxCocoa final class SelectedPhotoCVC: UICollectionViewCell { // MARK: - Properties @@ -18,7 +16,7 @@ final class SelectedPhotoCVC: UICollectionViewCell { // MARK: - UI - private let removePhotoButton = UIButton().then { + private lazy var removePhotoButton = UIButton().then { $0.addTarget(self, action: #selector(deleteTapped), for: .touchUpInside) $0.setImage(UIImage(named: "exclude"), for: .normal) $0.imageView?.contentMode = .center From f87ff5a5b74877008db33ea42b870c872819880e Mon Sep 17 00:00:00 2001 From: seungwon Date: Sun, 11 Jun 2023 19:27:03 +0900 Subject: [PATCH 3/6] =?UTF-8?q?[fix]=20=EC=83=81=EC=88=98=20=EA=B0=92=20?= =?UTF-8?q?=EB=93=A4=EC=96=B4=EC=9E=88=EB=8D=98=20=EA=B2=83=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 --- Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift b/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift index fcb9c405..a9ade5c8 100644 --- a/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift +++ b/Sinzak/Scene/Write/WritePost/VC/WritePostVC.swift @@ -511,14 +511,11 @@ extension WritePostVC { _ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch ) -> Bool { - - var point = touch.location(in: mainView.contentView) - point = CGPoint(x: point.x, y: point.y * 1.25) - if mainView.collectionView.frame.contains(point) { - return false - } else { - return true - } + var point = touch.location(in: mainView.collectionView) + point = CGPoint(x: point.x, y: point.y) + + guard mainView.collectionView.frame.contains(point) else { return true } + return false } } From d3ffbc5d731becb7ab9775199a20be166a813413 Mon Sep 17 00:00:00 2001 From: JongHoon Date: Mon, 12 Jun 2023 06:58:40 +0900 Subject: [PATCH 4/6] Update README.md --- README.md | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 3130b3bf..ba20c6c0 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,25 @@ -# Sinzak iOS -Available on [App Store](https://apps.apple.com/kr/app/%EC%8B%A0%EC%9E%91/id6449455462?l=en) +
+ +![신작1](https://github.com/SINZAK/sinzak-ios/assets/98168685/022514dd-80a3-4f85-8b2c-29b98fa1b9d2) -``` -├── 📂 App -│ ├── AppDelegate -│ ├── SceneDelegate -├── 📂 Global -│ ├── 📂 Base -├───├───├── CustomViews -│ ├── 📂 Extension -│ ├── 📂 Protocol -│ ├── 📂 Literal -├───├───├── Localizable.string -├───├───├── InfoPlist.strings -│ ├── 📂 Resources -│ │ ├── Assets -│ ├── 📂 SupportingFiles -├───├───├── LaunchScreen -├── 📂 Utils -│ ├── Colors -│ ├── Fonts -├── 📂 Data -│ ├── 📂 Network -├── 📂 Scenes -│ ├── 📂 SceneName -│ │ │ ├── Model -│ │ │ ├── ViewModel -│ │ │ ├── View -├───├───├───├── VC -``` +![Frame 75](https://github.com/SINZAK/sinzak-ios/assets/98168685/c401508a-3b52-4b52-a5e0-d93e340dc521) +![Frame 76](https://github.com/SINZAK/sinzak-ios/assets/98168685/9714f9db-8c18-493a-b781-adf2c4798688) +![Frame 77](https://github.com/SINZAK/sinzak-ios/assets/98168685/a6ce28bb-6d9c-46d1-887c-49f142c07be9) +![Frame 78](https://github.com/SINZAK/sinzak-ios/assets/98168685/ac9e167b-1468-4541-91f5-838247ebab53) +![Frame 79](https://github.com/SINZAK/sinzak-ios/assets/98168685/333dc7bf-7ad2-4111-bace-3832a64806c1) + +
+
+ + +
+ +
+ +## 🔗 서비스 링크 +- [Apple App Store](https://apps.apple.com/kr/app/%EC%8B%A0%EC%9E%91/id6449455462) +- [Google Play Store](https://play.google.com/store/apps/details?id=io.sinzak.android&pli=1) +- [sinzak.net](https://sinzak.net/) From 0e89c6df19110a7212af2a1aadab4df8b34043f1 Mon Sep 17 00:00:00 2001 From: JongHoon Date: Mon, 12 Jun 2023 14:56:46 +0900 Subject: [PATCH 5/6] Update README.md --- README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md index ba20c6c0..bfdcd3df 100644 --- a/README.md +++ b/README.md @@ -2,19 +2,12 @@
![신작1](https://github.com/SINZAK/sinzak-ios/assets/98168685/022514dd-80a3-4f85-8b2c-29b98fa1b9d2) - ![Frame 75](https://github.com/SINZAK/sinzak-ios/assets/98168685/c401508a-3b52-4b52-a5e0-d93e340dc521) ![Frame 76](https://github.com/SINZAK/sinzak-ios/assets/98168685/9714f9db-8c18-493a-b781-adf2c4798688) ![Frame 77](https://github.com/SINZAK/sinzak-ios/assets/98168685/a6ce28bb-6d9c-46d1-887c-49f142c07be9) ![Frame 78](https://github.com/SINZAK/sinzak-ios/assets/98168685/ac9e167b-1468-4541-91f5-838247ebab53) ![Frame 79](https://github.com/SINZAK/sinzak-ios/assets/98168685/333dc7bf-7ad2-4111-bace-3832a64806c1) - - -
-
- -

From bf2dc3da9c6e1878d2074d673a885958cbc4d087 Mon Sep 17 00:00:00 2001 From: JongHoon Date: Mon, 12 Jun 2023 15:40:24 +0900 Subject: [PATCH 6/6] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index bfdcd3df..b607cf06 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@
![신작1](https://github.com/SINZAK/sinzak-ios/assets/98168685/022514dd-80a3-4f85-8b2c-29b98fa1b9d2) -![Frame 75](https://github.com/SINZAK/sinzak-ios/assets/98168685/c401508a-3b52-4b52-a5e0-d93e340dc521) ![Frame 76](https://github.com/SINZAK/sinzak-ios/assets/98168685/9714f9db-8c18-493a-b781-adf2c4798688) ![Frame 77](https://github.com/SINZAK/sinzak-ios/assets/98168685/a6ce28bb-6d9c-46d1-887c-49f142c07be9) ![Frame 78](https://github.com/SINZAK/sinzak-ios/assets/98168685/ac9e167b-1468-4541-91f5-838247ebab53)