diff --git a/SMSH-Summer/Podfile b/SMSH-Summer/Podfile index 71575f0..e21007b 100644 --- a/SMSH-Summer/Podfile +++ b/SMSH-Summer/Podfile @@ -12,4 +12,6 @@ target 'SMSH-Summer' do pod 'NMapsMap','3.15.0' pod 'Then' pod 'YPImagePicker' + pod 'PanModal' + end diff --git a/SMSH-Summer/Podfile.lock b/SMSH-Summer/Podfile.lock index 3b34669..624eabf 100644 --- a/SMSH-Summer/Podfile.lock +++ b/SMSH-Summer/Podfile.lock @@ -1,6 +1,7 @@ PODS: - Kingfisher (7.3.2) - NMapsMap (3.15.0) + - PanModal (1.2.7) - PryntTrimmerView (4.0.2) - Realm (10.28.6): - Realm/Headers (= 10.28.6) @@ -17,6 +18,7 @@ PODS: DEPENDENCIES: - Kingfisher (~> 7.0) - NMapsMap (= 3.15.0) + - PanModal - RealmSwift (~> 10) - SnapKit (~> 5.0.0) - Then @@ -26,6 +28,7 @@ SPEC REPOS: trunk: - Kingfisher - NMapsMap + - PanModal - PryntTrimmerView - Realm - RealmSwift @@ -37,6 +40,7 @@ SPEC REPOS: SPEC CHECKSUMS: Kingfisher: 0086ad83719761ba9b2cdaf6ef4d5b4878cbae23 NMapsMap: f151761c088d6516064c59da03ab6503769486e6 + PanModal: 3e16ead1a907fb06f4df3f13492fd00149fa4974 PryntTrimmerView: 6a43cc90df5d99addeabd33d4ba09b1365322130 Realm: 9b12f16a14446d7d46a9e36225d0a0332a6ec739 RealmSwift: 5927726fce21005f43b1fb57c832297a22031bfc @@ -45,6 +49,6 @@ SPEC CHECKSUMS: Then: 844265ae87834bbe1147d91d5d41a404da2ec27d YPImagePicker: f36043210c10b0783034eb1947d6e06e31c461e4 -PODFILE CHECKSUM: 63b69cc037d6bd173ad0e16cc542dad6b82d1e22 +PODFILE CHECKSUM: 164678ee8a8d7d54bfcfd66fa494a96908415af4 COCOAPODS: 1.11.3 diff --git a/SMSH-Summer/SMSH-Summer.xcodeproj/project.pbxproj b/SMSH-Summer/SMSH-Summer.xcodeproj/project.pbxproj index c65191a..6af3275 100644 --- a/SMSH-Summer/SMSH-Summer.xcodeproj/project.pbxproj +++ b/SMSH-Summer/SMSH-Summer.xcodeproj/project.pbxproj @@ -576,6 +576,7 @@ developmentRegion = ko; hasScannedForEncodings = 0; knownRegions = ( + ko, en, Base, ); @@ -852,6 +853,7 @@ DEVELOPMENT_TEAM = F7B353LPM3; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "SMSH-Summer/Info.plist"; + INFOPLIST_KEY_CFBundleDisplayName = "좋을지도"; INFOPLIST_KEY_NSCameraUsageDescription = "카메라에서 사진을 촬영해 선행 내용에 추가하기 위해 권한이 필요합니다."; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "사용자의 현재 위치 주변의 선행 내역을 보여주고, 현재 위치로 선행 기록을 하기 위해서 권한이 필요합니다."; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "사용자의 현재 위치 주변의 선행 내역을 보여주고, 현재 위치로 선행 기록을 하기 위해서 권한이 필요합니다."; @@ -863,6 +865,7 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; + INFOPLIST_KEY_UIUserInterfaceStyle = Light; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -890,6 +893,7 @@ DEVELOPMENT_TEAM = F7B353LPM3; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "SMSH-Summer/Info.plist"; + INFOPLIST_KEY_CFBundleDisplayName = "좋을지도"; INFOPLIST_KEY_NSCameraUsageDescription = "카메라에서 사진을 촬영해 선행 내용에 추가하기 위해 권한이 필요합니다."; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "사용자의 현재 위치 주변의 선행 내역을 보여주고, 현재 위치로 선행 기록을 하기 위해서 권한이 필요합니다."; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "사용자의 현재 위치 주변의 선행 내역을 보여주고, 현재 위치로 선행 기록을 하기 위해서 권한이 필요합니다."; @@ -901,6 +905,7 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; + INFOPLIST_KEY_UIUserInterfaceStyle = Light; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/SMSH-Summer/SMSH-Summer.xcworkspace/xcshareddata/swiftpm/Package.resolved b/SMSH-Summer/SMSH-Summer.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..8c63ab8 --- /dev/null +++ b/SMSH-Summer/SMSH-Summer.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,14 @@ +{ + "pins" : [ + { + "identity" : "panmodal", + "kind" : "remoteSourceControl", + "location" : "https://github.com/slackhq/PanModal", + "state" : { + "revision" : "b012aecb6b67a8e46369227f893c12544846613f", + "version" : "1.2.7" + } + } + ], + "version" : 2 +} diff --git a/SMSH-Summer/SMSH-Summer/Info.plist b/SMSH-Summer/SMSH-Summer/Info.plist index dfae744..1b19663 100644 --- a/SMSH-Summer/SMSH-Summer/Info.plist +++ b/SMSH-Summer/SMSH-Summer/Info.plist @@ -2,10 +2,6 @@ - CFBundleDevelopmentRegion - ko_KR - UIUserInterfaceStyle - Light NMFClientId 4bvivlu76q UIAppFonts diff --git a/SMSH-Summer/SMSH-Summer/Presentation/WriteView/VC/writeVC.swift b/SMSH-Summer/SMSH-Summer/Presentation/WriteView/VC/writeVC.swift index 86ddf52..fb82ae2 100644 --- a/SMSH-Summer/SMSH-Summer/Presentation/WriteView/VC/writeVC.swift +++ b/SMSH-Summer/SMSH-Summer/Presentation/WriteView/VC/writeVC.swift @@ -7,6 +7,12 @@ import UIKit +enum WriteSection: Int, CaseIterable { + case place = 0 + case typekind + case content +} + class writeVC: UIViewController { // MARK: - UI Components @@ -81,7 +87,7 @@ extension writeVC: UITableViewDelegate { extension writeVC: UITableViewDataSource { func numberOfSections(in tableView: UITableView) -> Int { - return 3 + return WriteSection.allCases.count } func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { @@ -90,13 +96,13 @@ extension writeVC: UITableViewDataSource { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { switch indexPath.section { - case 0: + case WriteSection.place.rawValue: guard let cell = tableView.dequeueReusableCell(withIdentifier: placeTVC.identifier, for: indexPath) as? placeTVC else { return UITableViewCell() } return cell - case 1: + case WriteSection.typekind.rawValue: guard let cell = tableView.dequeueReusableCell(withIdentifier: typeTVC.identifier, for: indexPath) as? typeTVC else { return UITableViewCell() } return cell - case 2: + case WriteSection.content.rawValue: guard let cell = tableView.dequeueReusableCell(withIdentifier: contentTVC.identifier, for: indexPath) as? contentTVC else { return UITableViewCell() } return cell default: @@ -108,11 +114,11 @@ extension writeVC: UITableViewDataSource { let width = UIScreen.main.bounds.size.width switch indexPath.section { - case 0: + case WriteSection.place.rawValue: return width * 0.344 - case 1: + case WriteSection.typekind.rawValue: return width * 0.38 - case 2: + case WriteSection.content.rawValue: return 500 default: return 200