Ads view supporting dark mode now. #58 (#60)

Author: b0nsun9

Surcharges/PresentationLayer/UIs/CommonUI/Sources/Text+extension/blurBackground.swift

@@ -13,17 +13,11 @@ import Resources
 public extension View {
 	func blurBackground() -> some View {
 		self
-			.padding([.top, .bottom], 10)
-			.padding([.leading, .trailing], 20)
-			.frame(maxWidth: .infinity, alignment: .leading)
 			.background(.ultraThinMaterial, in: Rectangle())
 	}
 
 	func blurRoundedBackground(cornerRadius: CGFloat) -> some View {
 		self
-			.padding([.top, .bottom], 10)
-			.padding([.leading, .trailing], 20)
-			.frame(maxWidth: .infinity, alignment: .leading)
 			.background(.ultraThinMaterial, in: RoundedRectangle(cornerRadius: cornerRadius))
 	}
 }

Surcharges/PresentationLayer/UIs/Main/Sources/MainView.swift

@@ -74,10 +74,6 @@ public struct MainView<VM: MainViewModelProtocol, Router: MainRouterProtocol, Ad
 
 						if _viewModel.noResults {
 
-							if _adsService.isShowingAds {
-								ListAdsView(unitId: _adsService.listBannerUnitId)
-							}
-							
 							NoResultView(searchedText: _viewModel.searchedText)
 								.padding(.top, 40)
 								.padding([.leading, .trailing], 20)
@@ -86,10 +82,6 @@ public struct MainView<VM: MainViewModelProtocol, Router: MainRouterProtocol, Ad
 
 							if !_viewModel.mainModel.places.isEmpty {
 
-								if _adsService.isShowingAds {
-									ListAdsView(unitId: _adsService.listBannerUnitId)
-								}
-								
 								Section {
 									PlacesView(
 										mainModel: $_viewModel.mainModel,
@@ -104,8 +96,22 @@ public struct MainView<VM: MainViewModelProtocol, Router: MainRouterProtocol, Ad
 									)
 
 								} header: {
-									Text("🔎\(R.string.localizable.searchFor(_viewModel.searchedText))")
-										.blurBackground()
+									
+									VStack(spacing: 0) {
+										
+										if _adsService.isShowingAds {
+											ListAdsView(unitId: _adsService.listBannerUnitId)
+										}
+									
+										Text("🔎\(R.string.localizable.searchFor(_viewModel.searchedText))")
+											.frame(maxWidth: .infinity, alignment: .leading)
+											.padding([.leading, .trailing], 20)
+											.padding(.top, 10)
+											.padding(.bottom, 10)
+										
+									}
+									.blurBackground()
+
 								}
 
 							} else {
@@ -115,9 +121,10 @@ public struct MainView<VM: MainViewModelProtocol, Router: MainRouterProtocol, Ad
 									.padding([.leading, .trailing], 20)
 
 								FixedAdsView(isAdShowing: $_adsService.isShowingAds, unitId: _adsService.fixedBannerUnitId)
-									.padding(.top, 20)
+									.blurRoundedBackground(cornerRadius: 20)
+									.padding([.top, .bottom], 10)
 									.padding([.leading, .trailing], 20)
-								
+
 							}
 						}
 					}

Surcharges/PresentationLayer/UIs/MobileAds/Sources/FixedAdsView.swift

@@ -95,7 +95,6 @@ public struct FixedAdsView: View {
 
 			}
 		}
-		.background(R.color.gray100.color)
 		.frame(minHeight: _adSize.size.width, maxHeight: _adSize.size.width)
 		.cornerRadius(20)
 		.readSize { size in

Surcharges/PresentationLayer/UIs/MobileAds/Sources/ListAdsView.swift

@@ -30,7 +30,6 @@ public struct ListAdsView: View {
 				.frame(height: _adSize.size.height)
 		}
 		.background(R.color.gray100.color)
-		.cornerRadius(20)
 		.readSize { size in
 			_adSize = GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(size.width)
 		}