bilal.khan/Woka_Native_iOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- TC 18, TC 20, TC 21, TC 23, TC 25, TC 26, TC 27, TC 28, TC 30, TC 33, TC 34, TC 37, TC 38

Browse Source 
- Fixed contact support name error , if user goes back it used to display on top
This commit is contained in:
Bilal khan
2024-08-22 19:55:17 +05:30
parent c760af6179
commit d654dba8fe
18 changed files with 471 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/Contents.json vendored
View File

@@ -1,17 +1,15 @@
{
"images" : [
{
"filename" : "icons8-ok 1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icons8-ok 1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icons8-ok 1@3x.png",
"filename" : "check.png",
"idiom" : "universal",
"scale" : "3x"
}

BIN
WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/check.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 981 B

BIN
WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.7 KiB

BIN
WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

651
WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard
View File

File diff suppressed because it is too large Load Diff

22
WOKA/Authentication/Controller/LoginVC.swift
View File

@@ -32,11 +32,17 @@ class LoginVC: UIViewController {
@IBAction func loginBtnTapped(_ sender: LocalisedElementsButton) {
vm.hideErrors()
PersistentStorage.shared.addOthersCount()
guard let userName = userNameTF.text?.trimmingCharacters(in: .whitespaces) , let pass = passwordTF.text else{return}
guard let userName = userNameTF.text?.trimmingCharacters(in: .whitespaces) , let pass = passwordTF.text?.trimmingCharacters(in: .whitespaces) else{return}
/*
Check for userName
*/
if userName.count == 0{
userNameTF.rightView?.isHidden = false
userNameTF.setError(K.ConstantString.enterUserName.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
return
}
if userName.count < 2{
userNameTF.rightView?.isHidden = false
userNameTF.setError("Username is too short.".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
@@ -46,6 +52,20 @@ class LoginVC: UIViewController {
/*
Check for password
*/
if pass.count == 0{
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = "Enter your password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
// vcPush.onDoneBlock = { isDone in }
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
self.present(vcPush, animated: true)
return
}
if pass.count < 6{
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC

23
WOKA/Authentication/Controller/NewPasswordVC.swift
View File

@@ -39,17 +39,30 @@ class NewPasswordVC: UIViewController {
@IBAction func nextBtnTapped(_ sender: LocalisedElementsButton) {
PersistentStorage.shared.addOthersCount()
guard let pass = enterNewPasswordTF.text , let confirmPass = confirmPassTF.text else{return}
guard let pass = enterNewPasswordTF.text?.trimmingCharacters(in: .whitespaces) , let confirmPass = confirmPassTF.text?.trimmingCharacters(in: .whitespaces) else{return}
/*
Check for password
*/
if pass.count == 0 || confirmPass.count == 0{
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = "Enter your password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
// vcPush.onDoneBlock = { isDone in }
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
self.present(vcPush, animated: true)
return
}
if pass.count < 6 || confirmPass.count < 6{
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = "Password is too short."
vcPush.mainTitleText = "Error"
vcPush.contentLabel = "Password is too short.".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
// vcPush.onDoneBlock = { isDone in }
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
@@ -64,8 +77,8 @@ class NewPasswordVC: UIViewController {
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = "Password doesn't match"
vcPush.mainTitleText = "Error"
vcPush.contentLabel = "Password doesn't match".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
// vcPush.onDoneBlock = { isDone in }
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve

17
WOKA/Authentication/Controller/UserDetailsRegisterVC.swift
View File

@@ -37,6 +37,9 @@ class UserDetailsRegisterVC : UIViewController{
super.viewWillDisappear(animated)
navigationController?.setNavigationBarHidden(true, animated: animated)
enterNameTF.hideError()
enterUserNameTF.hideError()
if self.isMovingFromParent {
// Back button was pressed
PersistentStorage.shared.addOthersCount()
@@ -47,11 +50,17 @@ class UserDetailsRegisterVC : UIViewController{
@IBAction func nextBtnTapped(_ sender: LocalisedElementsButton) {
PersistentStorage.shared.addOthersCount()
guard let name = enterNameTF.text ,let userName = enterUserNameTF.text , let pass = enterPasswordTF.text else{return}
guard let name = enterNameTF.text?.trimmingCharacters(in: .whitespaces) ,let userName = enterUserNameTF.text?.trimmingCharacters(in: .whitespaces) , let pass = enterPasswordTF.text?.trimmingCharacters(in: .whitespaces) else{return}
/*
Check for username, minimum 3 letters required
*/
if userName.count == 0{
enterUserNameTF.rightView?.isHidden = false
enterUserNameTF.setError(K.ConstantString.enterUserName.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
return
}
if userName.count < 3{
enterUserNameTF.rightView?.isHidden = false
enterUserNameTF.setError(K.ConstantString.shortUsername.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
@@ -61,6 +70,12 @@ class UserDetailsRegisterVC : UIViewController{
/*
Check for name
*/
if name.count == 0{
enterNameTF.rightView?.isHidden = false
enterNameTF.setError(K.ConstantString.enterName.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue) , show: true)
return
}
if name.count < 2{
enterNameTF.rightView?.isHidden = false
enterNameTF.setError("Name is too short.".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue) , show: true)

5
WOKA/Constants K/ConstantString.swift
View File

@@ -24,6 +24,11 @@ extension K{
static let shortPass = "Password is too short."
static let shortUsername = "Username is too short."
static let shortName = "Name is too short."
static let required = "Required."
static let enterUserName = "Enter your username."
static let enterName = "Enter your Name."
static let enterPass = "Enter your password"
static let userNameVerify = "Verifying Username"
static let intrest = "Please select intrest"
static let avatar = "Please select avatar"

2
WOKA/Home/Home.storyboard
View File

@@ -1625,7 +1625,7 @@
<image name="AudioBookIcon" width="33.666667938232422" height="30.333333969116211"/>
<image name="BackArrow" width="21.333333969116211" height="21.333333969116211"/>
<image name="BlogsIcon" width="33.333332061767578" height="33.333332061767578"/>
<image name="CheckMark" width="48" height="48"/>
<image name="CheckMark" width="10.666666984558105" height="10.666666984558105"/>
<image name="CloseIcon" width="61.333332061767578" height="61.333332061767578"/>
<image name="ExploreWoka" width="36.666667938232422" height="25"/>
<image name="GamesIcon" width="33.666667938232422" height="30"/>

13
WOKA/Localized Module/hi.lproj/Localizable.strings
View File

@@ -11,6 +11,7 @@
"Please wait..." = "कृपया प्रतीक्षा करें";
"Activate WOKA Account" = "WOKA खाता सक्रिय करें";
"Would you like to reactivate your account?" = "क्या आप अपना खाता पुनः सक्रिय करना चाहेंगे?रें";
"Password doesn't match" = "पासवर्ड मेल नहीं खाता";
/*
Login VC
@@ -44,6 +45,16 @@
"Enter your password" = "अपना पासवर्ड दर्ज करें";
"Confirm your password" = "अपने पासवर्ड की पुष्टि करें";
/*
Support VC
*/
"Message" = "संदेश";
"Subject" = "विषय";
"Please select subject" = "कृपया विषय चुनें";
"Message is too short" = "संदेश बहुत छोटा है";
"Password" = "पासवर्ड";
"Enter your Name." = "अपना नाम दर्ज करें।";
/*
Carousel Text
*/
@@ -258,3 +269,5 @@
*/
"SING ALONG & DANCE" = "साथ गायें और नाचें";
"SING NOW" = "अभी गायें";
"Enter your username." = "अपना उपयोगकर्ता नाम दर्ज करें";
"Required." = "कृपया दर्ज करे";

1
WOKA/Shop/Controller/ShopProductsVC.swift
View File

@@ -116,6 +116,7 @@ extension ShopProductsVC : CollectionViewSRC{
Utilities.startProgressHUD()
vm.pageNo = 0
vm.getShopProducts(subCategoryID: selectedSubCategory)
productCV.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
}
default:
break

40
WOKA/SideBarNav/Controller/ContactSupportVC.swift
View File

@@ -48,6 +48,15 @@ class ContactSupportVC: UIViewController {
override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
navigationController?.setNavigationBarHidden(true, animated: animated)
if let errorView = errorViews.object(forKey: emailTF) {
errorView.isHidden = true
}
if let errorView = errorViews.object(forKey: nameTF) {
errorView.isHidden = true
}
if self.isMovingFromParent {
// Back button was pressed
PersistentStorage.shared.addOthersCount()
@@ -61,10 +70,11 @@ class ContactSupportVC: UIViewController {
/*
if user is guest check for name and email
*/
guard let email = emailTF.text?.trimmingCharacters(in: .whitespaces), let name = nameTF.text?.trimmingCharacters(in: .whitespaces), let message = messageTextView.text?.trimmingCharacters(in: .whitespaces) else{return}
if AuthFunc.shareInstance.getUserType() == 3{
if emailTF.text != nil{
//validate email fiirst
let emailValidate = EmailValidation(email: emailTF.text!).validate()
let emailValidate = EmailValidation(email: email).validate()
if emailValidate != .isCorrect{
emailTF.rightView?.isHidden = false
emailTF.setError(emailValidate.rawValue.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
@@ -72,7 +82,16 @@ class ContactSupportVC: UIViewController {
}
}
if nameTF.text!.count < 3{
if name.count == 0{
/*
Check for username
*/
nameTF.rightView?.isHidden = false
nameTF.setError(K.ConstantString.required.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
return
}
if name.count < 3{
/*
Check for username
*/
@@ -87,18 +106,29 @@ class ContactSupportVC: UIViewController {
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = "Please select subject".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Error".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Subject".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
self.present(vcPush, animated: true)
return
}
if messageTextView.text.count < 3 || messageTextView.text == nil{
if message.count == 0{
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = K.ConstantString.required.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Message".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
self.present(vcPush, animated: true)
return
}
if message.count < 3{
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = "Message is too short".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Error".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Message".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
self.present(vcPush, animated: true)

16
WOKA/SideBarNav/SideBarNav.storyboard
View File

@@ -167,7 +167,7 @@
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="vjt-jD-4f3" userLabel="Email Stack">
<rect key="frame" x="15" y="253.5" width="384" height="55"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="E-Mail" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ma-au-unt">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="E-Mail" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ma-au-unt" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="384" height="0.0"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -197,7 +197,7 @@
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="2qP-Pd-7IW" userLabel="Name">
<rect key="frame" x="15" y="253.5" width="384" height="55"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9nm-R6-MHb">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9nm-R6-MHb" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="384" height="0.0"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -227,7 +227,7 @@
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="SlR-If-pxh" userLabel="Subject">
<rect key="frame" x="15" y="278" width="384" height="77"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subject" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k7q-3i-LMr">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subject" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k7q-3i-LMr" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="384" height="22"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -261,7 +261,7 @@
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="gXQ-Yb-IGC" userLabel="Message">
<rect key="frame" x="15" y="404" width="384" height="155"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="csz-ff-Kvd">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="csz-ff-Kvd" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="384" height="22"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -864,16 +864,16 @@ Retry after some time</string>
</scenes>
<designables>
<designable name="arD-av-w7V">
<size key="intrinsicContentSize" width="119.5" height="21"/>
<size key="intrinsicContentSize" width="169.5" height="21"/>
</designable>
<designable name="fZS-d6-t0h">
<size key="intrinsicContentSize" width="119" height="21"/>
<size key="intrinsicContentSize" width="169" height="21"/>
</designable>
<designable name="fiK-Gg-JDj">
<size key="intrinsicContentSize" width="119.5" height="21"/>
<size key="intrinsicContentSize" width="169.5" height="21"/>
</designable>
<designable name="zMI-2r-pRQ">
<size key="intrinsicContentSize" width="119" height="21"/>
<size key="intrinsicContentSize" width="169" height="21"/>
</designable>
</designables>
<resources>

16
WOKA/SideBarNav/ViewModel/ProfileVM.swift
View File

@@ -66,17 +66,17 @@ class ProfileVM{
} else{
enableDisableNextBtn(enable: false)
}
}
if let genderData = data.genderData ,let id = genderData.id {
if gender == id{
enableDisableNextBtn(enable: false)
}else{
if let genderData = data.genderData ,let id = genderData.id {
if gender == id{
enableDisableNextBtn(enable: false)
}else{
enableDisableNextBtn(enable: true)
}
}else{
enableDisableNextBtn(enable: true)
}
}else{
enableDisableNextBtn(enable: true)
}
}
}
private func enableDisableNextBtn(enable : Bool){

8
WOKA/Theme/Controller/PlayerVC.swift
View File

@@ -223,6 +223,14 @@ class PlayerVC: JWPlayerViewController, JWPlayerViewControllerDelegate{
super.jwplayer(player, didLoadPlaylistItem: item, at: index)
print("didLoadPlaylistItem ", index)
// if currentplaylist index is not set, and the video index that we got from back screen check with the load index
if contentType == .webSeries{
if let videoIndex,vm.currentPlayingIndex == -1 && (index != videoIndex){
return
}
}
if vm.currentPlayingIndex != -1 && vm.currentPlayingIndex != index{
// so update the loaded index and increase the current playing index
vm.updateUserView()

4
WOKA/Theme/Controller/ThemeOneVC.swift
View File

@@ -110,7 +110,9 @@ class ThemeOneVC: UIViewController {
}
override func viewDidLayoutSubviews() {
vm.playerLayer.frame = self.liveTvPlayer.bounds
if vm.playerLayer != nil{
vm.playerLayer.frame = self.liveTvPlayer.bounds
}
}
// Define a function to customize tab bar item icon size