Merge pull request #100 from lsj8706/fix/#99-자체QA반영

[Fix] #99 - 자체 QA 반영

Author: lsj8706

Runnect-iOS/.swiftlint.yml

@@ -5,7 +5,6 @@ disabled_rules:
   - type_name
   - legacy_constructor
   - unused_setter_value
-  - force_try
 
 included:
   - Runnect-iOS

Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj

@@ -14,9 +14,7 @@
 		A3BC2F2F2962C40A00198261 /* UploadedCourseInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F2E2962C40A00198261 /* UploadedCourseInfoVC.swift */; };
 		A3BC2F322962E0DB00198261 /* GoalRewardInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F312962E0DB00198261 /* GoalRewardInfoModel.swift */; };
 		A3BC2F34296303A600198261 /* GoalRewardInfoCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F33296303A600198261 /* GoalRewardInfoCVC.swift */; };
-		A3BC2F382963CE3700198261 /* ActivityRecordInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F372963CE3700198261 /* ActivityRecordInfoModel.swift */; };
 		A3BC2F3A2963D0ED00198261 /* ActivityRecordInfoTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F392963D0ED00198261 /* ActivityRecordInfoTVC.swift */; };
-		A3BC2F3D296468E500198261 /* UploadedCourseInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F3C296468E500198261 /* UploadedCourseInfoModel.swift */; };
 		A3BC2F3F2964706100198261 /* UploadedCourseInfoCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F3E2964706100198261 /* UploadedCourseInfoCVC.swift */; };
 		A3BC2F4129667A0D00198261 /* NicknameEditorVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F4029667A0D00198261 /* NicknameEditorVC.swift */; };
 		A3BC2F432966A93100198261 /* CourseDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F422966A93100198261 /* CourseDetailVC.swift */; };
@@ -156,9 +154,7 @@
 		A3BC2F2E2962C40A00198261 /* UploadedCourseInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadedCourseInfoVC.swift; sourceTree = "<group>"; };
 		A3BC2F312962E0DB00198261 /* GoalRewardInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalRewardInfoModel.swift; sourceTree = "<group>"; };
 		A3BC2F33296303A600198261 /* GoalRewardInfoCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalRewardInfoCVC.swift; sourceTree = "<group>"; };
-		A3BC2F372963CE3700198261 /* ActivityRecordInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityRecordInfoModel.swift; sourceTree = "<group>"; };
 		A3BC2F392963D0ED00198261 /* ActivityRecordInfoTVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityRecordInfoTVC.swift; sourceTree = "<group>"; };
-		A3BC2F3C296468E500198261 /* UploadedCourseInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadedCourseInfoModel.swift; sourceTree = "<group>"; };
 		A3BC2F3E2964706100198261 /* UploadedCourseInfoCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadedCourseInfoCVC.swift; sourceTree = "<group>"; };
 		A3BC2F4029667A0D00198261 /* NicknameEditorVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NicknameEditorVC.swift; sourceTree = "<group>"; };
 		A3BC2F422966A93100198261 /* CourseDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseDetailVC.swift; sourceTree = "<group>"; };
@@ -176,7 +172,6 @@
 		CE10064D29680D2500FD31FB /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = "<group>"; };
 		CE10064F29680D3300FD31FB /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = "<group>"; };
 		CE10065029680D3800FD31FB /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = "<group>"; };
-		CE10065129680D3F00FD31FB /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = "<group>"; };
 		CE10065229680D4400FD31FB /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = "<group>"; };
 		CE10065429680F7000FD31FB /* DepartureSearchingResponseDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DepartureSearchingResponseDto.swift; sourceTree = "<group>"; };
 		CE1006562968230800FD31FB /* DepartureLocationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DepartureLocationModel.swift; sourceTree = "<group>"; };
@@ -284,7 +279,6 @@
 		CEEC6B3B2961C51A00D00E1E /* CourseStorageVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseStorageVC.swift; sourceTree = "<group>"; };
 		CEEC6B3D2961C53700D00E1E /* CourseDiscoveryVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseDiscoveryVC.swift; sourceTree = "<group>"; };
 		CEEC6B3F2961C55000D00E1E /* MyPageVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageVC.swift; sourceTree = "<group>"; };
-		CEEC6B432961C59F00D00E1E /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = "<group>"; };
 		CEEC6B442961C5A800D00E1E /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = "<group>"; };
 		CEEC6B452961C5B200D00E1E /* .gitkeep */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitkeep; sourceTree = "<group>"; };
 		CEEC6B482961C5E200D00E1E /* SplashVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashVC.swift; sourceTree = "<group>"; };
@@ -350,7 +344,6 @@
 		A3BC2F302962E08400198261 /* GoalRewardInfoCollectionView */ = {
 			isa = PBXGroup;
 			children = (
-				A3BC2F312962E0DB00198261 /* GoalRewardInfoModel.swift */,
 				A3BC2F33296303A600198261 /* GoalRewardInfoCVC.swift */,
 			);
 			path = GoalRewardInfoCollectionView;
@@ -359,7 +352,6 @@
 		A3BC2F362963CD2100198261 /* ActivityRecordInfoTableView */ = {
 			isa = PBXGroup;
 			children = (
-				A3BC2F372963CE3700198261 /* ActivityRecordInfoModel.swift */,
 				A3BC2F392963D0ED00198261 /* ActivityRecordInfoTVC.swift */,
 			);
 			path = ActivityRecordInfoTableView;
@@ -368,7 +360,6 @@
 		A3BC2F3B2964671D00198261 /* UploadedCourseInfoCollectionView */ = {
 			isa = PBXGroup;
 			children = (
-				A3BC2F3C296468E500198261 /* UploadedCourseInfoModel.swift */,
 				A3BC2F3E2964706100198261 /* UploadedCourseInfoCVC.swift */,
 			);
 			path = UploadedCourseInfoCollectionView;
@@ -481,7 +472,7 @@
 		CE10064829680CF200FD31FB /* MyPageModel */ = {
 			isa = PBXGroup;
 			children = (
-				CE10065129680D3F00FD31FB /* .gitkeep */,
+				A3BC2F312962E0DB00198261 /* GoalRewardInfoModel.swift */,
 			);
 			path = MyPageModel;
 			sourceTree = "<group>";
@@ -661,7 +652,6 @@
 				DAD5A3DB296C6DB800C8166B /* MapCollectionViewCell.swift */,
 				DAD5A3D9296C6DA500C8166B /* TitleCollectionViewCell.swift */,
 				DAD5A3D7296C6D9600C8166B /* AdImageCollectionViewCell.swift */,
-				CEEC6B432961C59F00D00E1E /* .gitkeep */,
 				CE17F0432961C3D600E1DED0 /* VC */,
 			);
 			path = Views;
@@ -1384,7 +1374,6 @@
 				A3BC2F432966A93100198261 /* CourseDetailVC.swift in Sources */,
 				DAD5A3D8296C6D9600C8166B /* AdImageCollectionViewCell.swift in Sources */,
 				CE18E890296C76C100FEB569 /* RNLocationModel.swift in Sources */,
-				A3BC2F3D296468E500198261 /* UploadedCourseInfoModel.swift in Sources */,
 				CE6655DC295D873500C64E12 /* UIButton+.swift in Sources */,
 				CE6655D4295D865B00C64E12 /* Publisher+UIControl.swift in Sources */,
 				CE0D9FD329648DA300CEB5CD /* CustomAlertVC.swift in Sources */,
@@ -1430,7 +1419,6 @@
 				CEC2A68E2962AF2C00160BF7 /* RNMarker.swift in Sources */,
 				CE6655D2295D862A00C64E12 /* Publisher+Driver.swift in Sources */,
 				CE4942AA296FCCFC00736701 /* UploadedCourseDetailRouter.swift in Sources */,
-				A3BC2F382963CE3700198261 /* ActivityRecordInfoModel.swift in Sources */,
 				CE6655E6295D887F00C64E12 /* UIStackView+.swift in Sources */,
 				A3BC2F34296303A600198261 /* GoalRewardInfoCVC.swift in Sources */,
 				DA97A035296E685C0086760E /* CourseUploadingRouter.swift in Sources */,

Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift

@@ -63,6 +63,7 @@ enum ImageLiterals {
     static var imgTelescope: UIImage { .load(named: "img_telescope") }
     static var imgSpaceship: UIImage { .load(named: "img_spaceship") }
     static var imgAppIcon: UIImage { .load(named: "img_app_icon") }
+    static var imgAd: UIImage { .load(named: "img_ad") }
 }
 
 extension UIImage {

Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/adimage.imageset/Mask group.png

@@ -11,6 +11,7 @@
       "scale" : "2x"
     },
     {
+      "filename" : "Mask [email protected]",
       "idiom" : "universal",
       "scale" : "3x"
     }

Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/adimage.imageset/Mask [email protected]

@@ -52,23 +52,22 @@ final class RNMapView: UIView {
 
     public init() {
         super.init(frame: .zero)
-        setUI()
-        setLayout()
-        setDelegate()
-        setMap()
-        getLocationAuth()
-        setPathOverlay()
+        self.mapInit()
     }
 
     override init(frame: CGRect) {
         super.init(frame: frame)
+        self.mapInit()
+        setLocationOverlay()
+    }
+    
+    private func mapInit() {
         setUI()
         setLayout()
         setDelegate()
         setMap()
         getLocationAuth()
         setPathOverlay()
-        setLocationOverlay()
     }
 
     required init?(coder: NSCoder) {
@@ -148,7 +147,6 @@ extension RNMapView {
         locations[1...].forEach { location in
             makeMarker(at: location)
         }
-        
         return self
     }
 
@@ -191,7 +189,6 @@ extension RNMapView {
     @discardableResult
     func moveToLocation(location: NMGLatLng) -> Self {
         let cameraUpdate = NMFCameraUpdate(scrollTo: location)
-        
         DispatchQueue.main.async { [self] in
             cameraUpdate.animation = .easeIn
             self.map.mapView.moveCamera(cameraUpdate)
@@ -304,7 +301,7 @@ extension RNMapView {
         map.mapView.extent = NMGLatLngBounds(southWestLat: 31.43, southWestLng: 122.37, northEastLat: 44.35, northEastLng: 132)
         map.showLocationButton = false
         map.showScaleBar = false
-        
+        map.showZoomControls = false
         map.mapView.logoAlign = .rightTop
     }