UPDATE : 1.0

dimodamo.xcodeproj/project.pbxproj

@@ -2240,14 +2240,14 @@
 				CODE_SIGN_ENTITLEMENTS = dimodamo/dimodamo.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = V237TD2AXA;
 				INFOPLIST_FILE = dimodamo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.03;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = jjikkyu.dimodamo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2264,14 +2264,14 @@
 				CODE_SIGN_ENTITLEMENTS = dimodamo/dimodamoRelease.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = V237TD2AXA;
 				INFOPLIST_FILE = dimodamo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.03;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = jjikkyu.dimodamo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

dimodamo.xcworkspace/xcuserdata/jjikkyu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -473,8 +473,8 @@
             filePath = "dimodamo/Pages/Community/Article/Main/ArticleViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "160"
-            endingLineNumber = "160"
+            startingLineNumber = "170"
+            endingLineNumber = "170"
             landmarkName = "prepare(for:sender:)"
             landmarkType = "7">
          </BreakpointContent>

dimodamo/Domain/APIService/APIService.swift

@@ -84,7 +84,7 @@ class APIService {
 
 class API {
     // 심사 제출할 때는 바꿀 것
-    static let admobKey = API.admobKey_test
+    static let admobKey = API.admobKey_banner
 
     static let admobKey_banner = "ca-app-pub-7521278168972722/4086329917"
     static let admobKey_test = "ca-app-pub-3940256099942544/2934735716"

dimodamo/Pages/Community/Article/Detail/ArticleDetailViewModel.swift

@@ -283,7 +283,7 @@ class ArticleDetailViewModel {
             return
         }
 
-        if self.blockedUserMap[commentUserID] == true {
+        if (BlockUserManager.blockedUserMap[commentUserID] != nil) == true {
             comment.comment = "차단한 유저입니다"
             comment.nickname = "익명"
             comment.userDpti = "DD"

dimodamo/Pages/Community/Article/Main/ArticleViewController.swift

@@ -21,7 +21,7 @@ class ArticleViewController: UIViewController {
     var disposeBag = DisposeBag()
 
     // 구글 광고
-    var bannerView: GADBannerView!
+    @IBOutlet weak var bannerView: GADBannerView!
 
     @IBOutlet weak var navItem: UINavigationItem!
 
@@ -116,6 +116,19 @@ class ArticleViewController: UIViewController {
         navigationController?.presentTransparentNavigationBar()
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+        self.loadBannerAd()// 광고 로드
+    }
+
+    override func viewWillTransition(to size: CGSize,
+                                     with coordinator: UIViewControllerTransitionCoordinator) {
+        super.viewWillTransition(to:size, with:coordinator)
+        coordinator.animate(alongsideTransition: { _ in
+            self.loadBannerAd()
+        })
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -144,11 +157,8 @@ class ArticleViewController: UIViewController {
         // 테스트용 : ca-app-pub-3940256099942544/2934735716
         // 서비스용 : ca-app-pub-1168603177352985/3339402643
 
-        bannerView = GADBannerView(adSize: kGADAdSizeBanner)
-        addBannerViewToView(bannerView)
         bannerView.adUnitID = API.admobKey
         bannerView.rootViewController = self
-        bannerView.load(GADRequest()) // 광고 로드
     }
 
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
@@ -391,4 +401,27 @@ extension ArticleViewController {
                                 constant: 0)
             ])
     }
+
+    func loadBannerAd() {
+        // Step 2 - Determine the view width to use for the ad width.
+        let frame = { () -> CGRect in
+            // Here safe area is taken into account, hence the view frame is used
+            // after the view has been laid out.
+            if #available(iOS 11.0, *) {
+                return view.frame.inset(by: view.safeAreaInsets)
+            } else {
+                return view.frame
+            }
+        }()
+        let viewWidth = frame.size.width
+
+        // Step 3 - Get Adaptive GADAdSize and set the ad view.
+        // Here the current interface orientation is used. If the ad is being preloaded
+        // for a future orientation change or different orientation, the function for the
+        // relevant orientation should be used.
+        bannerView.adSize = GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(viewWidth)
+
+        // Step 4 - Create an ad request and load the adaptive banner ad.
+        bannerView.load(GADRequest())
+    }
 }

dimodamo/Pages/Community/Information/Main/InformationVC.swift

@@ -26,7 +26,7 @@ class InformationVC: UIViewController {
     @IBOutlet weak var navItem: UINavigationItem!
 
     // 구글 광고
-    var bannerView: GADBannerView!
+    @IBOutlet weak var bannerView: GADBannerView!
 
     let viewModel = InformationViewModel()
     var disposeBag = DisposeBag()
@@ -114,6 +114,20 @@ class InformationVC: UIViewController {
         self.viewModel.paginateData()
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+        self.loadBannerAd()// 광고 로드
+    }
+
+    override func viewWillTransition(to size: CGSize,
+                                     with coordinator: UIViewControllerTransitionCoordinator) {
+        super.viewWillTransition(to:size, with:coordinator)
+        coordinator.animate(alongsideTransition: { _ in
+            self.loadBannerAd()
+        })
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -152,11 +166,8 @@ class InformationVC: UIViewController {
          구글 광고 로드
          */
         // In this case, we instantiate the banner with desired ad size.
-        bannerView = GADBannerView(adSize: kGADAdSizeBanner)
-        addBannerViewToView(bannerView)
         bannerView.adUnitID = API.admobKey
         bannerView.rootViewController = self
-        bannerView.load(GADRequest()) // 광고 로드
         bannerView.delegate = self
 
     }
@@ -366,6 +377,29 @@ extension InformationVC: GADBannerViewDelegate {
             ])
     }
 
+    func loadBannerAd() {
+            // Step 2 - Determine the view width to use for the ad width.
+            let frame = { () -> CGRect in
+              // Here safe area is taken into account, hence the view frame is used
+              // after the view has been laid out.
+              if #available(iOS 11.0, *) {
+                return view.frame.inset(by: view.safeAreaInsets)
+              } else {
+                return view.frame
+              }
+            }()
+            let viewWidth = frame.size.width
+
+            // Step 3 - Get Adaptive GADAdSize and set the ad view.
+            // Here the current interface orientation is used. If the ad is being preloaded
+            // for a future orientation change or different orientation, the function for the
+            // relevant orientation should be used.
+            bannerView.adSize = GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(viewWidth)
+
+            // Step 4 - Create an ad request and load the adaptive banner ad.
+            bannerView.load(GADRequest())
+          }
+
 
     func adView(_ bannerView: GADBannerView, didFailToReceiveAdWithError error: GADRequestError) {
         print("@@@@@@ 광고 에러 발생 : \(error.localizedDescription)")

dimodamo/Pages/Main/Settings/Main/SettingMainVC.swift

@@ -87,6 +87,7 @@ class SettingMainVC: UIViewController {
                 self.present(mainVC, animated: true, completion: nil)
 
             }
+            action.setValue(UIColor.appColor(.green2), forKey: "titleTextColor")
             alert.addAction(action)
             self.present(alert, animated: true, completion: nil)
         }

dimodamo/Pages/Profile/MyProfile/MyProfileVC.swift

@@ -172,6 +172,7 @@ class MyProfileVC: UIViewController {
 
                 // 내 프로필일 경우에 쪽지 보내기 비활성화
                 if self?.viewModel.isMyProfile() == true {
+                    self?.menuBtn.isHidden = true
 //                    self?.messageBtn.isHidden = true
                     self?.messageBtnHeightConstraint.constant = 0
                 } else {

dimodamo/Pages/Register/Clause/ClauseViewController.swift

@@ -56,7 +56,7 @@ class ClauseViewController: UIViewController {
                 self?.nextBtnIsEnabled = true
                 UIView.animate(withDuration: 0.5) {
                     self?.nextBtn.backgroundColor = UIColor.appColor(.systemActive)
-                    self?.animateProgress(value: 0.14)
+                    self?.animateProgress(value: 0.16)
                 }
             } else {
                 self?.nextBtnIsEnabled = false

dimodamo/Pages/Register/ID/RegisterIDViewController.swift

@@ -97,7 +97,7 @@ class RegisterIDViewController: UIViewController, UITextFieldDelegate {
                             self?.emailCertBtn1.alpha = 0
                             self?.emailCertBtn1.isEnabled = false
                             self?.divideLine.backgroundColor = UIColor.appColor(.green3)
-                            self?.progress.setProgress(0.28, animated: true)
+                            self?.progress.setProgress(0.32, animated: true)
                         }
                     }
                     alert.addAction(action)
@@ -118,7 +118,7 @@ class RegisterIDViewController: UIViewController, UITextFieldDelegate {
                         self?.checkMark.alpha = 0
                         self?.divideLine.backgroundColor = UIColor.appColor(.white235)
                         self?.emailCertBtn1.alpha = 1
-                        self?.progress.setProgress(0.14, animated: true)
+                        self?.progress.setProgress(0.16, animated: true)
                     }
                     break
                 }

dimodamo/Pages/Register/Interest/RegisterInterestViewController.swift

@@ -74,12 +74,12 @@ class RegisterInterestViewController: UIViewController {
                 self?.countLabel.text = "\(String((self?.viewModel?.interestList.value.count)!))/3"
                 if (self?.viewModel?.interestList.value.count)! == 3 {
                     UIView.animate(withDuration: 0.5) {
-                        self?.progress.setProgress(0.7, animated: true)
+                        self?.progress.setProgress(0.64, animated: true)
                         AppStyleGuide.systemBtnRadius16(btn: self!.nextBtn, isActive: true)
                     }
                 } else {
                     UIView.animate(withDuration: 0.5) {
-                        self?.progress.setProgress(0.56, animated: true)
+                        self?.progress.setProgress(0.48, animated: true)
                         AppStyleGuide.systemBtnRadius16(btn: self!.nextBtn, isActive: false)
                     }
                 }

dimodamo/Pages/Register/Nickname/RegisterNicknameViewController.swift

@@ -89,7 +89,7 @@ class RegisterNicknameViewController: UIViewController {
                             self?.certBtn.isEnabled = false
                             self?.certBtn.alpha = 0
                             self?.divide.backgroundColor = UIColor.appColor(.green3)
-                            self?.progress.setProgress(0.84, animated: true)
+                            self?.progress.setProgress(0.8, animated: true)
                         }
                     }
                     alert.addAction(action)
@@ -116,7 +116,7 @@ class RegisterNicknameViewController: UIViewController {
                         self?.certBtn.alpha = 1
                         self?.checkIcon.alpha = 0
                         self?.nextBtn.backgroundColor = UIColor.appColor(.gray210)
-                        self?.progress.setProgress(0.7, animated: true)
+                        self?.progress.setProgress(0.64, animated: true)
                     }
                     break
                 }

dimodamo/Pages/Register/PW/RegisterPWViewController.swift

@@ -82,7 +82,7 @@ class RegisterPWViewController: UIViewController, UITextFieldDelegate {
                     self?.secondPWTextFieldSubTitle.alpha = isValied == true ? 0 : 1
 
                     AppStyleGuide.systemBtnRadius16(btn: self!.nextBtn, isActive: isValied)
-                    self?.progress.setProgress(isValied == true ? 0.42 : 0.28, animated: true)
+                    self?.progress.setProgress(isValied == true ? 0.48 : 0.32, animated: true)
                 }
 
             })

dimodamo/Pages/Register/School/RegisterSchoolViewController.swift

@@ -112,7 +112,7 @@ class RegisterSchoolViewController: UIViewController {
                 } else {
                     AppStyleGuide.systemBtnRadius16(btn: self!.finishBtn, isActive: false)
                     UIView.animate(withDuration: 0.5) {
-                        self?.progress.setProgress(0.84, animated: true)
+                        self?.progress.setProgress(0.8, animated: true)
                     }
                 }
             })

dimodamo/Storyboard/Community.storyboard

@@ -796,7 +796,7 @@
                                     <constraint firstAttribute="trailing" secondItem="Lax-X9-6LN" secondAttribute="trailing" id="NRs-k2-lkP"/>
                                 </constraints>
                             </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Af-Dc-adb" userLabel="AdmobBackground">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Af-Dc-adb" userLabel="AdmobBackground" customClass="GADBannerView">
                                 <rect key="frame" x="0.0" y="812" width="414" height="50"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
@@ -823,6 +823,7 @@
                         </barButtonItem>
                     </navigationItem>
                     <connections>
+                        <outlet property="bannerView" destination="8Af-Dc-adb" id="yt9-Yh-zn6"/>
                         <outlet property="collectionView" destination="Lax-X9-6LN" id="jxu-4A-V7K"/>
                         <outlet property="navItem" destination="FJX-Ua-INJ" id="8eo-zA-5WC"/>
                         <outlet property="sortingPopupView" destination="aTc-Ns-mdX" id="bwH-kb-usm"/>
@@ -2795,7 +2796,7 @@
                                     </tableViewCell>
                                 </prototypes>
                             </tableView>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rZf-13-HBU" userLabel="AdmobBackground">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rZf-13-HBU" userLabel="AdmobBackground" customClass="GADBannerView">
                                 <rect key="frame" x="0.0" y="812" width="414" height="50"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
@@ -2833,6 +2834,7 @@
                         </barButtonItem>
                     </navigationItem>
                     <connections>
+                        <outlet property="bannerView" destination="rZf-13-HBU" id="xgq-ye-tmX"/>
                         <outlet property="loadingView" destination="7y0-vZ-Av1" id="CV2-JG-iK5"/>
                         <outlet property="mainView" destination="KjL-zS-AOV" id="Zep-eX-whd"/>
                         <outlet property="navItem" destination="Phx-4B-Vyv" id="iuM-By-qaV"/>

dimodamo/Xib/EmptyTableViewCell.swift

@@ -73,7 +73,7 @@ class EmptyTableViewCell: UITableViewCell {
 
         case .blockUser:
 
-            tableViewEmptyImageViewHeightConstraint.constant = 236
+            tableViewEmptyImageViewHeightConstraint.constant = 161
             self.tableViewEmptyImageView.image = UIImage(named: "empty_icon_1")
 
             /*