diff --git a/WOKA/Audio Books/AudioBooks.storyboard b/WOKA/Audio Books/AudioBooks.storyboard
index ac865a7..7b2c9d7 100644
--- a/WOKA/Audio Books/AudioBooks.storyboard
+++ b/WOKA/Audio Books/AudioBooks.storyboard
@@ -1,9 +1,9 @@
-
+
-
+
@@ -103,7 +103,7 @@
-
diff --git a/WOKA/Home/ViewModel/MyListVM.swift b/WOKA/Home/ViewModel/MyListVM.swift
index 3f9f18c..a4f1c57 100644
--- a/WOKA/Home/ViewModel/MyListVM.swift
+++ b/WOKA/Home/ViewModel/MyListVM.swift
@@ -95,6 +95,7 @@ class MyListVM{
startShimmer(load: true)
getFavouriteListing()
+
vc.karaokeViewBtn.roundCorner()
vc.audioBooksBtn.roundCorner()
vc.gamesBtn.roundCorner()
diff --git a/WOKA/Localized Module/en.lproj/Localizable.strings b/WOKA/Localized Module/en.lproj/Localizable.strings
index 5374621..18f25ae 100644
--- a/WOKA/Localized Module/en.lproj/Localizable.strings
+++ b/WOKA/Localized Module/en.lproj/Localizable.strings
@@ -25,11 +25,13 @@
"ऑडियो-किताबें" = "AUDIO BOOKS";
"खेल" = "GAMES";
"वोकलैंड में आपका स्वागत है" = "Welcome to WOKALAND";
-"नमस्ते" = "Hello";
+"नमस्ते," = "Hello,";
"अधिक" = "MORE";
"थीम" = "THEME";
"लॉग आउट" = "LOGOUT";
"ब्लॉग" = "BLOG";
+"पसंदीदा" = "FAVORITES";
+
/*
Theme 2
*/
@@ -41,6 +43,10 @@
"कराओके" = "KARAOKE";
"दुकान" = "SHOP";
"वोका का अन्वेषण करें" = "Explore WOKA";
+"और देखें" = "VIEW ALL";
+
+
+
/*
@@ -64,3 +70,14 @@
"डिलीट" = "Delete";
"चेतावनी!" = "Alert!";
"ब्लोग्स" = "BLOGS";
+
+/*
+ KARAOKE
+ */
+"फिर से गाएं" = "SING AGAIN";
+
+
+/*
+ AUDIOBOOKS
+ */
+"सुनना जारी रखें" = "CONTINUE AUDIO BOOK";
diff --git a/WOKA/Localized Module/hi.lproj/Localizable.strings b/WOKA/Localized Module/hi.lproj/Localizable.strings
index a24e931..d947611 100644
--- a/WOKA/Localized Module/hi.lproj/Localizable.strings
+++ b/WOKA/Localized Module/hi.lproj/Localizable.strings
@@ -12,6 +12,7 @@
"Activate WOKA Account" = "WOKA खाता सक्रिय करें";
"Would you like to reactivate your account?" = "क्या आप अपना खाता पुनः सक्रिय करना चाहेंगे?रें";
"Password doesn't match" = "पासवर्ड मेल नहीं खाता";
+"LOAD MORE" = "और लोड करें";
/*
Login VC
@@ -179,11 +180,17 @@
"AUDIO BOOKS" = "ऑडियो-किताबें";
"GAMES" = "खेल";
"Welcome to WOKALAND" = "वोकलैंड में आपका स्वागत है";
-"Hello" = "नमस्ते";
+"Hello," = "नमस्ते,";
"MORE" = "अधिक";
"THEME" = "थीम";
"LOGOUT" = "लॉग आउट";
"BLOG" = "ब्लॉग";
+"FAVORITES" = "पसंदीदा";
+"VIEW ALL" = "और देखें";
+"Coming Soon on WOKA" = "जल्द ही Woka पर आ रहा है";
+"MASILA" = "मासिला";
+"WOKA Songs" = "WOKA गाने";
+
/*
SideBar Nav
*/
@@ -195,6 +202,7 @@
"By clicking the button below, your account will be deactivated. Your data will be erased after one month." = "नीचे दिए गए बटन पर क्लिक करने से आपका अकाउंट निष्क्रिय हो जाएगा। एक महीने के बाद आपका डेटा मिटा दिया जाएगा।";
"Do you want to LOGOUT from the WOKA APP" = "क्या आप Woka ऐप से लॉग आउट करना चाहते हैं?";
"BLOGS" = "ब्लोग्स";
+
/*
Cart
*/
@@ -234,8 +242,8 @@
/*
My List
*/
-"WebSeries (English)" = "वेबसीरीज (अंग्रेजी)";
-"WebSeries (Hindi)" = "वेबसीरीज (हिंदी)";
+"WEBSERIES (ENGLISH)" = "वेबसीरीज (अंग्रेजी)";
+"WEBSERIES (HINDI)" = "वेबसीरीज (हिंदी)";
//"Audio Books" = "ऑडियो पुस्तकें";
//"Karaoke" = "कराओके";
//"Games" = "खेल";
@@ -266,7 +274,7 @@
*/
"LISTEN & ENJOY" = "सुनें और आनंद लें";
"LISTEN" = "सुनें";
-
+"CONTINUE AUDIO BOOK" = "सुनना जारी रखें";
/*
Games
*/
@@ -277,5 +285,6 @@
*/
"SING ALONG & DANCE" = "साथ गायें और नाचें";
"SING NOW" = "अभी गायें";
+"SING AGAIN" = "फिर से गाएं";
"Enter your username." = "अपना उपयोगकर्ता नाम दर्ज करें";
"Required." = "कृपया दर्ज करे";
diff --git a/WOKA/Main/Delegate/AppDelegate.swift b/WOKA/Main/Delegate/AppDelegate.swift
index 013b019..c5b82ff 100644
--- a/WOKA/Main/Delegate/AppDelegate.swift
+++ b/WOKA/Main/Delegate/AppDelegate.swift
@@ -81,7 +81,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// }
//
// scheduleTasks()
-
return true
}
diff --git a/WOKA/Shop/Controller/ShopCategoryVC.swift b/WOKA/Shop/Controller/ShopCategoryVC.swift
index def926c..76bed8f 100644
--- a/WOKA/Shop/Controller/ShopCategoryVC.swift
+++ b/WOKA/Shop/Controller/ShopCategoryVC.swift
@@ -87,7 +87,6 @@ extension ShopCategoryVC : GADBannerViewDelegate{
func bannerViewDidReceiveAd(_ bannerView: GADBannerView) {
adView.isHidden = false
bannerView.alpha = 0
- bannerView.backgroundColor = #colorLiteral(red: 0.01960784314, green: 0, blue: 0.2196078431, alpha: 1)
UIView.animate(withDuration: 0.2, animations: {
bannerView.alpha = 1
})
diff --git a/WOKA/Shop/ViewModel/ShopCategoryVM.swift b/WOKA/Shop/ViewModel/ShopCategoryVM.swift
index 8f97e97..f484dd3 100644
--- a/WOKA/Shop/ViewModel/ShopCategoryVM.swift
+++ b/WOKA/Shop/ViewModel/ShopCategoryVM.swift
@@ -94,7 +94,7 @@ class ShopCategoryVM{
if let shopSuperCatAd = adsData.result?.filter({$0.slug == AdsEnum.shop_super_category.rawValue}).first{
if shopSuperCatAd.googleAd != nil{
//setup google banner ads.
- AdReusable.sharedInstance.setupBannerAd(bannerView: self.bottomBanner, in: vc.adView, adUnitID: K.GoogleAdIDs.shop, viewController: self.vc, height: 8, width: 15)
+ AdReusable.sharedInstance.setupBannerAd(bannerView: self.bottomBanner, in: vc.adView, adUnitID: K.GoogleAdIDs.shop, viewController: self.vc)
}
}
}
diff --git a/WOKA/TabBar & SideMenu/Controller/TabBarVC.swift b/WOKA/TabBar & SideMenu/Controller/TabBarVC.swift
index efd2e72..08748ae 100644
--- a/WOKA/TabBar & SideMenu/Controller/TabBarVC.swift
+++ b/WOKA/TabBar & SideMenu/Controller/TabBarVC.swift
@@ -18,7 +18,6 @@ class TabBarVC: UITabBarController {
super.viewDidLoad()
self.delegate = self
self.title = ""
- customizeTabBarItemFont()
updateText()
self.setupTabBarUI()
self.addCustomTabBarView()
@@ -26,9 +25,9 @@ class TabBarVC: UITabBarController {
NotificationCenter.default.addObserver(self, selector: #selector(linkPush), name: .linkPush, object: nil)
customizeTabBarItemIconSize()
+ customizeTabBarItemFont()
self.navigationController?.setColor(color: .black)
-
}
deinit{
@@ -128,13 +127,6 @@ class TabBarVC: UITabBarController {
}
- func updateText(){
- guard let tabItems = self.tabBar.items else{return}
- tabItems[0].title = tabItems[0].title?.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
- tabItems[1].title = tabItems[1].title?.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
- tabItems[2].title = tabItems[2].title?.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
- }
-
func customizeTabBarItemIconSize() {
// Get a reference to the tab bar controller
if let tabBarController = self.tabBarController {
@@ -147,20 +139,27 @@ class TabBarVC: UITabBarController {
}
}
+ func updateText(){
+ guard let tabItems = self.tabBar.items else{return}
+ tabItems[0].title = tabItems[0].title?.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+ tabItems[1].title = tabItems[1].title?.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+ tabItems[2].title = tabItems[2].title?.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+ }
+
// function to set tab bar item font
func customizeTabBarItemFont() {
// Set the font attributes
- let attributes = [NSAttributedString.Key.font: FontCustom.shareInstance.customFont(fontName: .Exo2_Bold, size: 13)]
+ let attributes = [NSAttributedString.Key.font: FontCustom.shareInstance.customFont(fontName: .Exo2_Bold, size: 15)]
// Apply the attributes to the appearance proxy of UITabBarItem
UITabBarItem.appearance().setTitleTextAttributes(attributes, for: .normal)
+ UITabBarItem.appearance().setTitleTextAttributes(attributes, for: .selected)
}
// MARK: - Deactivate Account API Call
func deactivateAccount(){
- let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi",
- "access-token" : AuthFunc.shareInstance.getAccessToken()]
+ let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi","access-token" : AuthFunc.shareInstance.getAccessToken()]
Utilities.startProgressHUD()
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.SideBarNav.user_deactivate_account, method: .get,headers: headers) {(result : Result, NetworkManager.APIError>) in
switch result{
diff --git a/WOKA/Theme/Base.lproj/Theme.storyboard b/WOKA/Theme/Base.lproj/Theme.storyboard
index 992113f..1d6d8e2 100644
--- a/WOKA/Theme/Base.lproj/Theme.storyboard
+++ b/WOKA/Theme/Base.lproj/Theme.storyboard
@@ -84,17 +84,17 @@
-
+
-
diff --git a/WOKA/Theme/Controller/BlogDetailsVC.swift b/WOKA/Theme/Controller/BlogDetailsVC.swift
index 28b80cc..ffba9b2 100644
--- a/WOKA/Theme/Controller/BlogDetailsVC.swift
+++ b/WOKA/Theme/Controller/BlogDetailsVC.swift
@@ -12,12 +12,17 @@ class BlogDetailsVC: UIViewController {
@IBOutlet weak var blogImage: UIImageView!
@IBOutlet weak var blogTitle: UILabel!
@IBOutlet weak var blogDescription: UITextView!
+ @IBOutlet weak var outerView: UIView!
var blogData : BlogDM.Blog?
override func viewDidLoad() {
super.viewDidLoad()
updateUI()
+
+ outerView.addTapGesture {
+ self.dismiss(animated: true)
+ }
}
@IBAction func clostBtnTapped(_ sender: UIButton) {
diff --git a/WOKA/Theme/View/BlogsCell.swift b/WOKA/Theme/View/BlogsCell.swift
index 329a582..85eaad0 100644
--- a/WOKA/Theme/View/BlogsCell.swift
+++ b/WOKA/Theme/View/BlogsCell.swift
@@ -21,10 +21,19 @@ class BlogsCell: UICollectionViewCell {
func setData(data : BlogDM.Blog){
if let url = data.thumbnailPath{
- self.blogImage.imageURL(data.thumbnailPath!)
+ self.blogImage.imageURL(url)
}else{
self.blogImage.image = UIImage(named: "Placeholder")
}
- self.blogTitle.text = data.title
+
+ if AuthFunc.shareInstance.getDefaultLanguage() == .english{ // 1 enlgish , 2 hindi
+ guard let languageData = data.contentMoreDetails?.filter({$0.languageMasterID == 1}).first else{return}
+ self.blogTitle.text = languageData.title
+
+ }else{
+ guard let languageData = data.contentMoreDetails?.filter({$0.languageMasterID == 2}).first else{return}
+ self.blogTitle.text = languageData.title
+ }
+// self.blogTitle.text = data.title
}
}
diff --git a/WOKA/Theme/View/BlogsCell.xib b/WOKA/Theme/View/BlogsCell.xib
index aea5f3b..b0e6c8b 100644
--- a/WOKA/Theme/View/BlogsCell.xib
+++ b/WOKA/Theme/View/BlogsCell.xib
@@ -1,9 +1,9 @@
-
+
-
+
@@ -49,7 +49,7 @@
Label
Label
-
+
diff --git a/WOKA/Theme/en.lproj/Theme.strings b/WOKA/Theme/en.lproj/Theme.strings
index 56aabfe..8a1c826 100644
--- a/WOKA/Theme/en.lproj/Theme.strings
+++ b/WOKA/Theme/en.lproj/Theme.strings
@@ -6,19 +6,19 @@
"4pq-lE-hJz.text" = "MORE";
/* Class = "UILabel"; text = "Hello"; ObjectID = "IFj-XX-sbq"; */
-"IFj-XX-sbq.text" = "Hello";
+"IFj-XX-sbq.text" = "Hello,";
/* Class = "UILabel"; text = "Welcome to WOKALAND"; ObjectID = "Nbe-Ob-bia"; */
"Nbe-Ob-bia.text" = "Welcome to WOKALAND";
/* Class = "UILabel"; text = "Hello"; ObjectID = "Qn2-Bb-Ud6"; */
-"Qn2-Bb-Ud6.text" = "Hello";
+"Qn2-Bb-Ud6.text" = "Hello,";
/* Class = "UILabel"; text = "AUDIO BOOKS"; ObjectID = "Y9F-E4-lgm"; */
"Y9F-E4-lgm.text" = "AUDIO BOOKS";
/* Class = "UILabel"; text = "Hello"; ObjectID = "YmK-3m-WeD"; */
-"YmK-3m-WeD.text" = "Hello";
+"YmK-3m-WeD.text" = "Hello,";
/* Class = "UILabel"; text = "KARAOKE"; ObjectID = "Yyo-6X-Jk4"; */
"Yyo-6X-Jk4.text" = "KARAOKE";
diff --git a/WOKA/Theme/hi.lproj/Theme.strings b/WOKA/Theme/hi.lproj/Theme.strings
index 56aabfe..8a1c826 100644
--- a/WOKA/Theme/hi.lproj/Theme.strings
+++ b/WOKA/Theme/hi.lproj/Theme.strings
@@ -6,19 +6,19 @@
"4pq-lE-hJz.text" = "MORE";
/* Class = "UILabel"; text = "Hello"; ObjectID = "IFj-XX-sbq"; */
-"IFj-XX-sbq.text" = "Hello";
+"IFj-XX-sbq.text" = "Hello,";
/* Class = "UILabel"; text = "Welcome to WOKALAND"; ObjectID = "Nbe-Ob-bia"; */
"Nbe-Ob-bia.text" = "Welcome to WOKALAND";
/* Class = "UILabel"; text = "Hello"; ObjectID = "Qn2-Bb-Ud6"; */
-"Qn2-Bb-Ud6.text" = "Hello";
+"Qn2-Bb-Ud6.text" = "Hello,";
/* Class = "UILabel"; text = "AUDIO BOOKS"; ObjectID = "Y9F-E4-lgm"; */
"Y9F-E4-lgm.text" = "AUDIO BOOKS";
/* Class = "UILabel"; text = "Hello"; ObjectID = "YmK-3m-WeD"; */
-"YmK-3m-WeD.text" = "Hello";
+"YmK-3m-WeD.text" = "Hello,";
/* Class = "UILabel"; text = "KARAOKE"; ObjectID = "Yyo-6X-Jk4"; */
"Yyo-6X-Jk4.text" = "KARAOKE";