diff --git a/Podfile b/Podfile index 4f9c32b..920b610 100644 --- a/Podfile +++ b/Podfile @@ -7,7 +7,6 @@ target 'SodaLive' do # Pods for SodaLive pod 'BootpayUI', '4.3.0' - pod 'Google-Mobile-Ads-SDK' pod 'ObjectBox' end @@ -18,7 +17,6 @@ target 'SodaLive-dev' do # Pods for SodaLive-dev pod 'BootpayUI', '4.3.0' - pod 'Google-Mobile-Ads-SDK' pod 'ObjectBox' end diff --git a/Podfile.lock b/Podfile.lock index faf6ef6..1f90cbc 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -13,63 +13,15 @@ PODS: - SnapKit - SwiftyJSON - CryptoSwift (1.7.1) - - Google-Mobile-Ads-SDK (10.9.0): - - GoogleAppMeasurement (< 11.0, >= 7.0) - - GoogleUserMessagingPlatform (>= 1.1) - - GoogleAppMeasurement (10.13.0): - - GoogleAppMeasurement/AdIdSupport (= 10.13.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - - GoogleUtilities/MethodSwizzler (~> 7.11) - - GoogleUtilities/Network (~> 7.11) - - "GoogleUtilities/NSData+zlib (~> 7.11)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (10.13.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.13.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - - GoogleUtilities/MethodSwizzler (~> 7.11) - - GoogleUtilities/Network (~> 7.11) - - "GoogleUtilities/NSData+zlib (~> 7.11)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (10.13.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - - GoogleUtilities/MethodSwizzler (~> 7.11) - - GoogleUtilities/Network (~> 7.11) - - "GoogleUtilities/NSData+zlib (~> 7.11)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleUserMessagingPlatform (2.1.0) - - GoogleUtilities/AppDelegateSwizzler (7.11.5): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Environment (7.11.5): - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.11.5): - - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.11.5): - - GoogleUtilities/Logger - - GoogleUtilities/Network (7.11.5): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.11.5)" - - GoogleUtilities/Reachability (7.11.5): - - GoogleUtilities/Logger - JGProgressHUD (2.2) - - nanopb (2.30909.0): - - nanopb/decode (= 2.30909.0) - - nanopb/encode (= 2.30909.0) - - nanopb/decode (2.30909.0) - - nanopb/encode (2.30909.0) - ObjectBox (1.8.1) - ObjectMapper (4.2.0) - - PromisesObjC (2.3.1) - SCLAlertView (0.8) - SnapKit (5.6.0) - SwiftyJSON (5.0.1) DEPENDENCIES: - BootpayUI (= 4.3.0) - - Google-Mobile-Ads-SDK - ObjectBox SPEC REPOS: @@ -78,15 +30,9 @@ SPEC REPOS: - Bootpay - BootpayUI - CryptoSwift - - Google-Mobile-Ads-SDK - - GoogleAppMeasurement - - GoogleUserMessagingPlatform - - GoogleUtilities - JGProgressHUD - - nanopb - ObjectBox - ObjectMapper - - PromisesObjC - SCLAlertView - SnapKit - SwiftyJSON @@ -96,19 +42,13 @@ SPEC CHECKSUMS: Bootpay: d753088334a16ce99094142beb66a6610a15d84b BootpayUI: 54dcbe59a23e0d91b07a8add8115e1a6deace0f0 CryptoSwift: d3d18dc357932f7e6d580689e065cf1f176007c1 - Google-Mobile-Ads-SDK: e81e8b009a182dc8dd14951782efdbb30a5e4510 - GoogleAppMeasurement: 3ae505b44174bcc0775f5c86cecc5826259fbb1e - GoogleUserMessagingPlatform: dce302b8f1b84d6e945812ee7a15c3f65a102cbf - GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084 JGProgressHUD: d83d7a981b85d11205e19ff8ad5bb9c40571c847 - nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 ObjectBox: a7900d5335218cd437cbc080b7ccc38a5211f7b4 ObjectMapper: 1eb41f610210777375fa806bf161dc39fb832b81 - PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 SCLAlertView: 6a77bb2edfc65e04dbe57725546cb4107a506b85 SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25 SwiftyJSON: 2f33a42c6fbc52764d96f13368585094bfd8aa5e -PODFILE CHECKSUM: d876c87c55385f76f576689bed2e2309653253c9 +PODFILE CHECKSUM: cdff30c96e85662f4de75ddd8d54358311c1e629 COCOAPODS: 1.12.1 diff --git a/SodaLive/Sources/Advertisement/BannerAdView.swift b/SodaLive/Sources/Advertisement/BannerAdView.swift deleted file mode 100644 index 9c8e625..0000000 --- a/SodaLive/Sources/Advertisement/BannerAdView.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// BannerAdView.swift -// SodaLive -// -// Created by klaus on 2023/09/14. -// - -import SwiftUI -import UIKit - -import GoogleMobileAds - -struct BannerAdView: UIViewControllerRepresentable { - - let adUnitId: String - - func makeUIViewController(context: Context) -> some UIViewController { - let viewController = UIViewController() - - let bannerSize = GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(UIScreen.main.bounds.width) - let banner = GADBannerView(adSize: bannerSize) - banner.rootViewController = viewController - viewController.view.addSubview(banner) - viewController.view.frame = CGRect(origin: .zero, size: bannerSize.size) - - banner.adUnitID = adUnitId - banner.load(GADRequest()) - - return viewController - } - - func updateUIViewController(_ uiViewController: UIViewControllerType, context: Context) {} -} diff --git a/SodaLive/Sources/App/AppDelegate.swift b/SodaLive/Sources/App/AppDelegate.swift index 4a0ffb6..04dae80 100644 --- a/SodaLive/Sources/App/AppDelegate.swift +++ b/SodaLive/Sources/App/AppDelegate.swift @@ -9,7 +9,6 @@ import UIKit import FirebaseCore import FirebaseMessaging -import GoogleMobileAds class AppDelegate: UIResponder, UIApplicationDelegate { @@ -17,8 +16,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { FirebaseApp.configure() - GADMobileAds.sharedInstance().start() - Messaging.messaging().delegate = self // For iOS 10 display notification (sent via APNS) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailView.swift b/SodaLive/Sources/Content/Detail/ContentDetailView.swift index 57306b8..092ccc4 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailView.swift @@ -119,15 +119,6 @@ struct ContentDetailView: View { } } - if audioContent.price <= 0 || (audioContent.price > 0 && !audioContent.existOrdered) { - BannerAdView(adUnitId: FREE_CONTENT_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - .padding(.top, 26.7) - } - ContentDetailOtherContentView( title: "크리에이터의 다른 콘텐츠", items: audioContent.creatorOtherContentList, diff --git a/SodaLive/Sources/Content/Main/ContentMainView.swift b/SodaLive/Sources/Content/Main/ContentMainView.swift index 7101d1f..6b924f9 100644 --- a/SodaLive/Sources/Content/Main/ContentMainView.swift +++ b/SodaLive/Sources/Content/Main/ContentMainView.swift @@ -56,13 +56,6 @@ struct ContentMainView: View { ) .padding(.horizontal, 13.3) - BannerAdView(adUnitId: CURATION_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - .padding(.top, 30) - if viewModel.curationList.count > 0 { ContentMainCurationView(items: viewModel.curationList) .padding(.top, 40) diff --git a/SodaLive/Sources/Debug/Utils/Constants.swift b/SodaLive/Sources/Debug/Utils/Constants.swift index 14dcd0d..d2b3d9d 100644 --- a/SodaLive/Sources/Debug/Utils/Constants.swift +++ b/SodaLive/Sources/Debug/Utils/Constants.swift @@ -14,13 +14,3 @@ let AGORA_APP_ID = "b96574e191a9430fa54c605528aa3ef7" let AGORA_APP_CERTIFICATE = "ae18ade3afcf4086bd4397726eb0654c" let BOOTPAY_APP_ID = "6242a7772701800023f68b2f" -let FREE_CONTENT_BANNER_AD_UNIT_ID = "ca-app-pub-3940256099942544/2934735716" -let CURATION_BANNER_AD_UNIT_ID = "ca-app-pub-3940256099942544/2934735716" -let ORDERLIST_BANNER_AD_UNIT_ID = "ca-app-pub-3940256099942544/2934735716" -let LIVE_BANNER_AD_UNIT_ID = "ca-app-pub-3940256099942544/2934735716" -let FOLLOWING_CHANNEL_LIST_BANNER_AD_UNIT_ID = "ca-app-pub-3940256099942544/2934735716" -let LIVE_NOW_ALL_LIST_BANNER_AD_UNIT_ID = "ca-app-pub-3940256099942544/2934735716" -let CREATOR_CHANNEL_BANNER_AD_UNIT_ID = "ca-app-pub-3940256099942544/2934735716" -let MESSAGE_BANNER_AD_UNIT_ID = "ca-app-pub-3940256099942544/2934735716" -let LIVE_ROOM_BANNER_AD_UNIT_ID = "ca-app-pub-3940256099942544/2934735716" -let EXPLORER_BANNER_AD_UNIT_ID = "ca-app-pub-3940256099942544/2934735716" diff --git a/SodaLive/Sources/Explorer/ExplorerView.swift b/SodaLive/Sources/Explorer/ExplorerView.swift index 644ab8e..fea0f6b 100644 --- a/SodaLive/Sources/Explorer/ExplorerView.swift +++ b/SodaLive/Sources/Explorer/ExplorerView.swift @@ -146,15 +146,6 @@ struct ExplorerView: View { } } .frame(width: screenSize().width - 26.7, alignment: .leading) - - if index == 1 { - BannerAdView(adUnitId: EXPLORER_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - .padding(.top, 26.7) - } } } } diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileView.swift index b3dd86e..7c326f7 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileView.swift @@ -6,7 +6,6 @@ // import SwiftUI -import GoogleMobileAds struct UserProfileView: View { @@ -91,13 +90,6 @@ struct UserProfileView: View { } } - BannerAdView(adUnitId: CREATOR_CHANNEL_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - .padding(.top, 26.7) - if creatorProfile.contentList.count > 0 || userId == UserDefaults.int(forKey: .userId) { @@ -163,13 +155,6 @@ struct UserProfileView: View { .padding(.top, 26.7) } - BannerAdView(adUnitId: CREATOR_CHANNEL_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - .padding(.top, 26.7) - VStack(spacing: 0) { if creatorProfile.similarCreatorList.count > 0 { VStack(spacing: 26.7) { diff --git a/SodaLive/Sources/Follow/FollowCreatorView.swift b/SodaLive/Sources/Follow/FollowCreatorView.swift index e78193c..99db586 100644 --- a/SodaLive/Sources/Follow/FollowCreatorView.swift +++ b/SodaLive/Sources/Follow/FollowCreatorView.swift @@ -6,7 +6,6 @@ // import SwiftUI -import GoogleMobileAds struct FollowCreatorView: View { @@ -17,13 +16,6 @@ struct FollowCreatorView: View { VStack(spacing: 0) { DetailNavigationBar(title: "팔로잉 채널리스트") - BannerAdView(adUnitId: FOLLOWING_CHANNEL_LIST_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - .padding(.vertical, 6.7) - HStack(spacing: 0) { Text("총 ") .font(.custom(Font.medium.rawValue, size: 13.3)) @@ -40,6 +32,7 @@ struct FollowCreatorView: View { Spacer() } .padding(.horizontal, 13.3) + .padding(.top, 6.7) ScrollView(.vertical, showsIndicators: false) { VStack(spacing: 13.3) { diff --git a/SodaLive/Sources/Live/LiveView.swift b/SodaLive/Sources/Live/LiveView.swift index a8acab6..1236ab1 100644 --- a/SodaLive/Sources/Live/LiveView.swift +++ b/SodaLive/Sources/Live/LiveView.swift @@ -6,7 +6,6 @@ // import SwiftUI -import GoogleMobileAds import RefreshableScrollView struct LiveView: View { @@ -42,13 +41,6 @@ struct LiveView: View { ) } - BannerAdView(adUnitId: LIVE_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - .padding(.top, 40) - SectionLiveNowView( items: viewModel.liveNowItems, onClickParticipant: { diff --git a/SodaLive/Sources/Live/Now/All/LiveNowAllView.swift b/SodaLive/Sources/Live/Now/All/LiveNowAllView.swift index 70afd19..dfd7c90 100644 --- a/SodaLive/Sources/Live/Now/All/LiveNowAllView.swift +++ b/SodaLive/Sources/Live/Now/All/LiveNowAllView.swift @@ -6,7 +6,6 @@ // import SwiftUI -import GoogleMobileAds import RefreshableScrollView struct LiveNowAllView: View { @@ -22,13 +21,6 @@ struct LiveNowAllView: View { VStack(spacing: 0) { DetailNavigationBar(title: "지금 라이브 중 전체보기") - BannerAdView(adUnitId: LIVE_NOW_ALL_LIST_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - .padding(.vertical, 6.7) - RefreshableScrollView( refreshing: $viewModel.isRefresh, action: { diff --git a/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift b/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift index 1b7f7f1..821796f 100644 --- a/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift +++ b/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift @@ -7,7 +7,6 @@ import SwiftUI import Kingfisher -import GoogleMobileAds struct LiveDetailView: View { @@ -57,12 +56,6 @@ struct LiveDetailView: View { VStack { Spacer() VStack(spacing: 0) { - BannerAdView(adUnitId: LIVE_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - HStack { Spacer() Image("ic_close_white") diff --git a/SodaLive/Sources/Message/MessageView.swift b/SodaLive/Sources/Message/MessageView.swift index 683c2da..07ed81f 100644 --- a/SodaLive/Sources/Message/MessageView.swift +++ b/SodaLive/Sources/Message/MessageView.swift @@ -6,7 +6,6 @@ // import SwiftUI -import GoogleMobileAds struct MessageView: View { @@ -19,13 +18,6 @@ struct MessageView: View { Tab() - BannerAdView(adUnitId: MESSAGE_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - .padding(.top, 13.3) - Text("※ 보관하지 않은 받은 메시지는 3일 후, 자동 삭제됩니다.") .font(.custom(Font.medium.rawValue, size: 13.3)) .padding(.top, 20) diff --git a/SodaLive/Sources/Message/SelectRecipient/SelectRecipientView.swift b/SodaLive/Sources/Message/SelectRecipient/SelectRecipientView.swift index 7bdfd6c..45b89b5 100644 --- a/SodaLive/Sources/Message/SelectRecipient/SelectRecipientView.swift +++ b/SodaLive/Sources/Message/SelectRecipient/SelectRecipientView.swift @@ -7,7 +7,6 @@ import SwiftUI import Kingfisher -import GoogleMobileAds struct SelectRecipientView: View { @@ -36,12 +35,6 @@ struct SelectRecipientView: View { ScrollView(.vertical, showsIndicators: false) { LazyVStack(spacing: 26.7) { - BannerAdView(adUnitId: MESSAGE_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - ForEach(viewModel.users, id: \.self) { user in HStack(spacing: 13.3) { KFImage(URL(string: user.profileImageUrl)) diff --git a/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift b/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift index 8a3a223..3457ee0 100644 --- a/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift +++ b/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift @@ -6,7 +6,6 @@ // import SwiftUI -import GoogleMobileAds struct TextMessageWriteView: View { @@ -81,13 +80,6 @@ struct TextMessageWriteView: View { } .frame(height: 50) - BannerAdView(adUnitId: MESSAGE_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - .padding(.top, 13.3) - TextViewWrapper( text: $viewModel.message, placeholder: viewModel.placeholder, diff --git a/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift b/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift index d894bf9..c5d2c80 100644 --- a/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift +++ b/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift @@ -6,7 +6,6 @@ // import SwiftUI -import GoogleMobileAds struct VoiceMessageWriteView: View { @@ -35,12 +34,6 @@ struct VoiceMessageWriteView: View { VStack { Spacer() VStack(spacing: 0) { - BannerAdView(adUnitId: MESSAGE_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - HStack(spacing: 0) { Text("음성메시지") .font(.custom(Font.bold.rawValue, size: 18.3)) diff --git a/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift b/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift index 0751b6e..ec31c3c 100644 --- a/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift +++ b/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift @@ -6,7 +6,6 @@ // import SwiftUI -import GoogleMobileAds struct OrderListAllView: View { @@ -39,13 +38,6 @@ struct OrderListAllView: View { LazyVStack(spacing: 10.7) { ScrollerToTop(reader: reader, scrollOnChange: $viewModel.scrollToTop) - BannerAdView(adUnitId: ORDERLIST_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - .padding(.vertical, 6.7) - ForEach(0..