diff --git a/WOKA.xcodeproj/project.pbxproj b/WOKA.xcodeproj/project.pbxproj
index ddac312..8cbeb14 100644
--- a/WOKA.xcodeproj/project.pbxproj
+++ b/WOKA.xcodeproj/project.pbxproj
@@ -2909,7 +2909,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = WOKA/WOKA.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 7;
+ CURRENT_PROJECT_VERSION = 8;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 4S9A74ZB6H;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2953,7 +2953,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = WOKA/WOKA.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 7;
+ CURRENT_PROJECT_VERSION = 8;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 4S9A74ZB6H;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
diff --git a/WOKA/Games/Controller/GamesListVC.swift b/WOKA/Games/Controller/GamesListVC.swift
index b1b37a7..a7d399a 100644
--- a/WOKA/Games/Controller/GamesListVC.swift
+++ b/WOKA/Games/Controller/GamesListVC.swift
@@ -247,6 +247,7 @@ extension GamesListVC : GADBannerViewDelegate{
switch bannerView{
case vm.headerBannerView:
headerView.stopShimmer()
+ vm.setHeaderData()
case vm.headerBannerBottomView:
headerTitleLabel.isHidden = true
headerBtn.isHidden = true
diff --git a/WOKA/Games/ViewModel/GamesListVM.swift b/WOKA/Games/ViewModel/GamesListVM.swift
index be2a09c..621d358 100644
--- a/WOKA/Games/ViewModel/GamesListVM.swift
+++ b/WOKA/Games/ViewModel/GamesListVM.swift
@@ -38,7 +38,6 @@ class GamesListVM{
maxHeaderHeight = UIScreen.main.bounds.width * 0.55
vc.headerHeight.constant = maxHeaderHeight
- checkAds()
}
func checkAds(){
@@ -166,6 +165,8 @@ class GamesListVM{
self.vc.loadMoreActivityIndicator.stopAnimating()
self.vc.loadMoreActivityIndicator.hidesWhenStopped = true
+ checkAds()
+
/*
MAke logic for ads
// */
diff --git a/WOKA/Home/Controller/MyListVC.swift b/WOKA/Home/Controller/MyListVC.swift
index 1ae7b29..93b13ad 100644
--- a/WOKA/Home/Controller/MyListVC.swift
+++ b/WOKA/Home/Controller/MyListVC.swift
@@ -811,9 +811,10 @@ extension MyListVC : UICollectionViewDelegateFlowLayout{
extension MyListVC : GADBannerViewDelegate{
func bannerViewDidReceiveAd(_ bannerView: GADBannerView) {
- bannerView.alpha = 0
- UIView.animate(withDuration: 0.2, animations: {
- bannerView.alpha = 1
+ adView.alpha = 0
+ adView.isHidden = false
+ UIView.animate(withDuration: 0.2, animations: { [weak self] in
+ self?.adView.alpha = 1
})
print("bannerViewDidReceiveAd")
}
diff --git a/WOKA/Home/Home.storyboard b/WOKA/Home/Home.storyboard
index 016c570..c6df64b 100644
--- a/WOKA/Home/Home.storyboard
+++ b/WOKA/Home/Home.storyboard
@@ -1076,31 +1076,30 @@
-
+
-
+
-
+
-
+
@@ -1125,28 +1124,27 @@
-
+
-
+
-
+
@@ -1171,28 +1169,27 @@
-
+
-
+
-
+
@@ -1217,24 +1214,24 @@
-
+
-
+
-
+
@@ -1262,28 +1259,27 @@
-
+
-
+
-
+
@@ -1308,7 +1304,7 @@
-
+
@@ -1330,7 +1326,7 @@
-
+
@@ -1630,10 +1626,10 @@
-
+
-
+
diff --git a/WOKA/Home/ViewModel/MyListVM.swift b/WOKA/Home/ViewModel/MyListVM.swift
index a611fbc..f70512c 100644
--- a/WOKA/Home/ViewModel/MyListVM.swift
+++ b/WOKA/Home/ViewModel/MyListVM.swift
@@ -38,6 +38,21 @@ class MyListVM{
return
}
+
+
+ setupCell()
+ startShimmer(load: true)
+ getFavouriteListing()
+
+
+ vc.karaokeViewBtn.roundCorner()
+ vc.audioBooksBtn.roundCorner()
+ vc.gamesBtn.roundCorner()
+ vc.webSeriesBtn.roundCorner()
+ vc.webSeriesHindiBtn.roundCorner()
+ }
+
+ func checkAds(){
/*
First check if webSeries ad is present via slug, then check for Local Ads, if not then check google ads.
*/
@@ -98,17 +113,6 @@ class MyListVM{
})
}
}
-
- setupCell()
- startShimmer(load: true)
- getFavouriteListing()
-
-
- vc.karaokeViewBtn.roundCorner()
- vc.audioBooksBtn.roundCorner()
- vc.gamesBtn.roundCorner()
- vc.webSeriesBtn.roundCorner()
- vc.webSeriesHindiBtn.roundCorner()
}
func startShimmer(load : Bool){
@@ -228,6 +232,7 @@ class MyListVM{
}
reloadCollections()
checkNil()
+ checkAds()
case 1:
self.refreshControl.endRefreshing()
Utilities.dismissProgressHUD()
@@ -242,6 +247,7 @@ class MyListVM{
feedbackGenerator.impactOccurred()
checkNil()
checkViewAll()
+ checkAds()
default:
break
}
diff --git a/WOKA/Karaoke/Controller/KaraokeListingVC.swift b/WOKA/Karaoke/Controller/KaraokeListingVC.swift
index ef49b45..8594cfc 100644
--- a/WOKA/Karaoke/Controller/KaraokeListingVC.swift
+++ b/WOKA/Karaoke/Controller/KaraokeListingVC.swift
@@ -348,6 +348,8 @@ extension KaraokeListingVC : GADBannerViewDelegate{
switch bannerView{
case vm.headerBannerView:
headerView.stopShimmer()
+ vm.headerData = vm.karaokeListData.first
+ vm.setHeaderData()
case vm.headerBannerBottomView:
headerTitleLabel.isHidden = true
headerBtn.isHidden = true
diff --git a/WOKA/Theme/ViewModel/ThemeOneVM.swift b/WOKA/Theme/ViewModel/ThemeOneVM.swift
index 11f78ef..f2a42fd 100644
--- a/WOKA/Theme/ViewModel/ThemeOneVM.swift
+++ b/WOKA/Theme/ViewModel/ThemeOneVM.swift
@@ -35,7 +35,7 @@ class ThemeOneVM{
// func requestIDFA() {
// ATTrackingManager.requestTrackingAuthorization { status in
-// switch status {
+// switch status {b
// case .authorized:
// // User granted permission, now you can access IDFA
// let idfa = ASIdentifierManager.shared().advertisingIdentifier.uuidString