- Added coma to theme 1 and 2 namaste/ hello.

- Epxlore dismiss when clicked outside.
- Webseries hindi english in mylist added hindi linugal files.
- Karaoke & Audio books continue watching handled hindi language.
- Load more overall module added hindi text.
- More section added linngual support.
- Blog now handles with hindi language.
This commit is contained in:
2024-10-03 19:29:50 +05:30
parent 7efcbb2d24
commit 17b634e132
16 changed files with 104 additions and 90 deletions

View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -103,7 +103,7 @@
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="wjN-Eq-Uv8">
<rect key="frame" x="10" y="-270" width="373" height="270"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CONTINUE WATCHING" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ovn-Ul-XkS" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CONTINUE AUDIO BOOK" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ovn-Ul-XkS" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="373" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="cCE-6Z-kw0"/>

View File

@@ -28,6 +28,10 @@ class ExploreWokaVC: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
drawBackgroundBlur()
self.extraView.addTapGesture {
self.dismiss(animated: true)
}
}
override func viewDidLayoutSubviews() {

View File

@@ -117,9 +117,10 @@
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ExploreWoka" translatesAutoresizingMaskIntoConstraints="NO" id="9zy-xC-ddd">
<rect key="frame" x="10" y="10" width="70" height="70"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="9zy-xC-ddd" firstAttribute="leading" secondItem="HcQ-Ty-2GV" secondAttribute="leading" constant="10" id="BTl-hT-QCb"/>
<constraint firstAttribute="width" secondItem="HcQ-Ty-2GV" secondAttribute="height" multiplier="1:1" id="H37-O7-73G"/>
@@ -1097,14 +1098,8 @@
</constraints>
<color key="tintColor" name="ImageDarkBlue"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain">
<attributedString key="attributedTitle">
<fragment content="VIEW ALL">
<attributes>
<font key="NSFont" size="14" name="Exo2-Bold"/>
</attributes>
</fragment>
</attributedString>
<buttonConfiguration key="configuration" style="plain" title="VIEW ALL">
<fontDescription key="titleFontDescription" name="Exo2-Bold" family="Exo 2" pointSize="14"/>
</buttonConfiguration>
<connections>
<action selector="viewAllBtnTapped:" destination="55l-Gk-Npk" eventType="touchUpInside" id="kfL-Hw-odi"/>
@@ -1149,14 +1144,8 @@
</constraints>
<color key="tintColor" name="ImageDarkBlue"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain">
<attributedString key="attributedTitle">
<fragment content="VIEW ALL">
<attributes>
<font key="NSFont" size="14" name="Exo2-Bold"/>
</attributes>
</fragment>
</attributedString>
<buttonConfiguration key="configuration" style="plain" title="VIEW ALL">
<fontDescription key="titleFontDescription" name="Exo2-Bold" family="Exo 2" pointSize="14"/>
</buttonConfiguration>
<connections>
<action selector="viewAllBtnTapped:" destination="55l-Gk-Npk" eventType="touchUpInside" id="M41-T6-ZPA"/>
@@ -1201,14 +1190,8 @@
</constraints>
<color key="tintColor" name="ImageDarkBlue"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain">
<attributedString key="attributedTitle">
<fragment content="VIEW ALL">
<attributes>
<font key="NSFont" size="14" name="Exo2-Bold"/>
</attributes>
</fragment>
</attributedString>
<buttonConfiguration key="configuration" style="plain" title="VIEW ALL">
<fontDescription key="titleFontDescription" name="Exo2-Bold" family="Exo 2" pointSize="14"/>
</buttonConfiguration>
<connections>
<action selector="viewAllBtnTapped:" destination="55l-Gk-Npk" eventType="touchUpInside" id="dK1-eI-Lq5"/>
@@ -1258,14 +1241,8 @@
</constraints>
<color key="tintColor" name="ImageDarkBlue"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain">
<attributedString key="attributedTitle">
<fragment content="VIEW ALL">
<attributes>
<font key="NSFont" size="14" name="Exo2-Bold"/>
</attributes>
</fragment>
</attributedString>
<buttonConfiguration key="configuration" style="plain" title="VIEW ALL">
<fontDescription key="titleFontDescription" name="Exo2-Bold" family="Exo 2" pointSize="14"/>
</buttonConfiguration>
<connections>
<action selector="viewAllBtnTapped:" destination="55l-Gk-Npk" eventType="touchUpInside" id="pAS-gT-xTU"/>
@@ -1310,14 +1287,8 @@
</constraints>
<color key="tintColor" name="ImageDarkBlue"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain">
<attributedString key="attributedTitle">
<fragment content="VIEW ALL">
<attributes>
<font key="NSFont" size="14" name="Exo2-Bold"/>
</attributes>
</fragment>
</attributedString>
<buttonConfiguration key="configuration" style="plain" title="VIEW ALL">
<fontDescription key="titleFontDescription" name="Exo2-Bold" family="Exo 2" pointSize="14"/>
</buttonConfiguration>
<connections>
<action selector="viewAllBtnTapped:" destination="55l-Gk-Npk" eventType="touchUpInside" id="ley-C1-dsk"/>
@@ -1657,10 +1628,10 @@
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
<systemColor name="systemGreenColor">
<color red="0.20392156862745098" green="0.7803921568627451" blue="0.34901960784313724" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.20392156859999999" green="0.78039215689999997" blue="0.34901960780000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="systemMintColor">
<color red="0.0" green="0.7803921568627451" blue="0.74509803921568629" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.0" green="0.78039215689999997" blue="0.74509803919999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>

View File

@@ -95,6 +95,7 @@ class MyListVM{
startShimmer(load: true)
getFavouriteListing()
vc.karaokeViewBtn.roundCorner()
vc.audioBooksBtn.roundCorner()
vc.gamesBtn.roundCorner()

View File

@@ -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";

View File

@@ -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." = "कृपया दर्ज करे";

View File

@@ -81,7 +81,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// }
//
// scheduleTasks()
return true
}

View File

@@ -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
})

View File

@@ -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)
}
}
}

View File

@@ -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<BaseResponseModel<UserEmailVerifyDM>, NetworkManager.APIError>) in
switch result{

View File

@@ -84,17 +84,17 @@
<rect key="frame" x="63" y="0.0" width="49.5" height="50"/>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="JE2-1V-ByS">
<rect key="frame" x="37.5" y="55" width="100" height="24"/>
<rect key="frame" x="35.5" y="55" width="104.5" height="24"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hello" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YmK-3m-WeD" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="50.5" height="24"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hello," textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YmK-3m-WeD" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="55" height="24"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="20"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="User" textAlignment="center" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tQN-s8-9SK">
<rect key="frame" x="55.5" y="0.0" width="44.5" height="24"/>
<rect key="frame" x="60" y="0.0" width="44.5" height="24"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="20"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -551,7 +551,7 @@
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="UpArrowMore" translatesAutoresizingMaskIntoConstraints="NO" id="BkY-MX-g4T">
<rect key="frame" x="0.0" y="0.0" width="45" height="25"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Home" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cao-XI-lT8" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="751" text="HOME" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cao-XI-lT8" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="27" width="45" height="18"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="12"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -620,7 +620,7 @@
<action selector="playTrailerBtnTapped:" destination="Faj-VN-SMZ" eventType="touchUpInside" id="dJK-SJ-dR8"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MASILA" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="biB-gs-Rgq">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MASILA" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="biB-gs-Rgq" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="7" y="152" width="380" height="22"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
<color key="textColor" name="TextDarkBlue"/>
@@ -950,17 +950,17 @@
<rect key="frame" x="60" y="0.0" width="279" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="Eb9-At-Mtt">
<rect key="frame" x="0.0" y="0.0" width="53.5" height="25.5"/>
<rect key="frame" x="0.0" y="0.0" width="58" height="25.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Hello" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IFj-XX-sbq" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="50.5" height="25.5"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Hello," lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IFj-XX-sbq" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="55" height="25.5"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="20"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qn2-Bb-Ud6">
<rect key="frame" x="53.5" y="0.0" width="0.0" height="25.5"/>
<rect key="frame" x="58" y="0.0" width="0.0" height="25.5"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="20"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1379,10 +1379,10 @@
</label>
</subviews>
</stackView>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" editable="NO" usesAttributedText="YES" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2tU-Z6-Wgy">
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" editable="NO" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2tU-Z6-Wgy">
<rect key="frame" x="15" y="235" width="344" height="236.5"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<attributedString key="attributedText"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
</subviews>
@@ -1415,6 +1415,7 @@
<outlet property="blogDescription" destination="2tU-Z6-Wgy" id="9GC-0m-UrI"/>
<outlet property="blogImage" destination="2FK-rk-obG" id="xsI-NI-Tzk"/>
<outlet property="blogTitle" destination="r5a-5v-xNf" id="i1Z-tU-G4k"/>
<outlet property="outerView" destination="bQW-EN-5cE" id="pIM-ne-mKv"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dyo-bM-Qn7" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -1461,7 +1462,7 @@
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
<systemColor name="systemBrownColor">
<color red="0.63529411764705879" green="0.51764705882352946" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.63529411759999999" green="0.51764705879999995" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>

View File

@@ -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) {

View File

@@ -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
}
}

View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -49,7 +49,7 @@
Label
Label</string>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="13"/>
<nil key="textColor"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>

View File

@@ -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";

View File

@@ -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";