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

- Updated the flow of auth.

Browse Source 
- Finalised the Localization for the auth flow.
This commit is contained in:
Bilal khan
2024-05-14 11:12:28 +05:30
parent ecfa31b57f
commit 6ee8786f65
19 changed files with 212 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WOKA/Alerts/AlertCustomVC.swift
View File

@@ -41,6 +41,8 @@ class AlertCustomVC: UIViewController {
self.contentTextLbl.text = contentLabel.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
if let yesBtnText = yesBtnText {
self.yesBtn.setTitle(yesBtnText, for: .normal)
}else{
self.yesBtn.setTitle("Ok,Got it.".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), for: .normal)
}
if let mainTitleText = mainTitleText {

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

@@ -60,7 +60,7 @@
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="useless@yopmail.com" placeholder="Enter your email" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DSB-Ge-wNO" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="useless@yopmail.com" placeholder="Enter your email" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DSB-Ge-wNO" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="34.5" width="354" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
@@ -350,44 +350,8 @@ Sent to Your Parent’s Email</string>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="bJs-H6-708">
<rect key="frame" x="10" y="135" width="354" height="375.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="qSD-g5-OZA">
<rect key="frame" x="0.0" y="0.0" width="354" height="99.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WHAT’S YOUR NAME?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eZm-zl-55m" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="354" height="19.5"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your name" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="tgW-LH-XfR" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="34.5" width="354" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="XQt-fy-rey"/>
</constraints>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
<textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="no" enablesReturnKeyAutomatically="YES" textContentType="name"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="paddingLeftCustom">
<real key="value" value="25"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="paddingRightCustom">
<real key="value" value="25"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y3K-h2-Gbg">
<rect key="frame" x="0.0" y="99.5" width="354" height="0.0"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="LUQ-BX-nHw">
<rect key="frame" x="0.0" y="129.5" width="354" height="99.5"/>
<rect key="frame" x="0.0" y="0.0" width="354" height="99.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SELECT USERNAME" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w7B-kJ-IgM" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="354" height="19.5"/>
@@ -395,7 +359,7 @@ Sent to Your Parent’s Email</string>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your username" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="m50-FZ-yVO" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your username" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="m50-FZ-yVO" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="34.5" width="354" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
@@ -422,6 +386,42 @@ Sent to Your Parent’s Email</string>
</label>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="qSD-g5-OZA">
<rect key="frame" x="0.0" y="129.5" width="354" height="99.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WHAT’S YOUR NAME?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eZm-zl-55m" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="354" height="19.5"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your name" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="tgW-LH-XfR" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="34.5" width="354" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="XQt-fy-rey"/>
</constraints>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
<textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="no" enablesReturnKeyAutomatically="YES" textContentType="name"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="paddingLeftCustom">
<real key="value" value="25"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="paddingRightCustom">
<real key="value" value="25"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y3K-h2-Gbg">
<rect key="frame" x="0.0" y="99.5" width="354" height="0.0"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="hWX-C0-soL">
<rect key="frame" x="0.0" y="259" width="354" height="116.5"/>
<subviews>
@@ -431,7 +431,7 @@ Sent to Your Parent’s Email</string>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your password" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4gw-z0-s4a" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your password" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4gw-z0-s4a" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="34.5" width="354" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
@@ -503,6 +503,7 @@ Sent to Your Parent’s Email</string>
</view>
<navigationItem key="navigationItem" id="as0-6B-j9I"/>
<connections>
<outlet property="dontSharePassLabel" destination="3LF-iY-Hoi" id="fOm-ti-ZGs"/>
<outlet property="enterNameTF" destination="tgW-LH-XfR" id="4Vt-ub-4z2"/>
<outlet property="enterPasswordTF" destination="4gw-z0-s4a" id="0nn-80-Rli"/>
<outlet property="enterUserNameTF" destination="m50-FZ-yVO" id="dNR-QE-LZs"/>
@@ -533,7 +534,7 @@ Sent to Your Parent’s Email</string>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="03q-h4-3f0">
<rect key="frame" x="10" y="0.0" width="394" height="68"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Nice to meet you," textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pix-7E-Qy7">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Nice to meet you," textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pix-7E-Qy7" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="394" height="31.5"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="26"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -554,7 +555,7 @@ Sent to Your Parent’s Email</string>
</label>
</subviews>
</stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Can we know a bit more about you?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SDb-xl-JQx">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Can we know a bit more about you?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SDb-xl-JQx" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="10" y="103" width="394" height="26.5"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="22"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -563,7 +564,7 @@ Sent to Your Parent’s Email</string>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="3iR-vv-IUk">
<rect key="frame" x="10" y="164.5" width="394" height="138"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="YOUR GENDER" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GuV-CV-Huq">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="YOUR GENDER" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GuV-CV-Huq" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="394" height="22"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -631,7 +632,7 @@ Sent to Your Parent’s Email</string>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="713-kI-2TZ">
<rect key="frame" x="10" y="337.5" width="394" height="137"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WHEN IS YOUR BIRTHDAY?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J83-KL-Pex">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WHEN IS YOUR BIRTHDAY?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J83-KL-Pex" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="394" height="22"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -648,7 +649,7 @@ Sent to Your Parent’s Email</string>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="8nq-Pj-Asi">
<rect key="frame" x="10" y="509.5" width="394" height="222"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WHEN ARE YOUR INTRESTS?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agP-Pb-cQD">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WHEN ARE YOUR INTRESTS?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agP-Pb-cQD" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="394" height="22"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -665,7 +666,7 @@ Sent to Your Parent’s Email</string>
</collectionView>
</subviews>
</stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select as many as you want" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LYR-yD-QKs">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select as many as you want" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LYR-yD-QKs" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="10" y="766.5" width="394" height="19.5"/>
<constraints>
<constraint firstAttribute="height" constant="19.5" id="yPv-4R-Lm1"/>
@@ -723,6 +724,8 @@ Sent to Your Parent’s Email</string>
</view>
<navigationItem key="navigationItem" id="gHq-kx-Fzi"/>
<connections>
<outlet property="GirlText" destination="K9G-cT-fBK" id="SOd-tD-A4A"/>
<outlet property="boyText" destination="nnY-MI-513" id="aND-2D-Dbf"/>
<outlet property="boyView" destination="vzD-bQ-1cP" id="Sq8-2n-ZeA"/>
<outlet property="collectionView" destination="s7g-G0-W2v" id="BEQ-be-g2O"/>
<outlet property="contentHeight" destination="auZ-NR-TCk" id="cCY-Sh-DxC"/>
@@ -919,11 +922,11 @@ Sent to Your Parent’s Email</string>
</label>
</subviews>
</stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yp6-2q-OZC">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yp6-2q-OZC" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="104.5" width="374" height="31"/>
<color key="tintColor" name="TextDarkBlue"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" title="Forget Password?">
<buttonConfiguration key="configuration" style="plain" title="Forgot Password">
<fontDescription key="titleFontDescription" name="Exo2-Regular" family="Exo 2" pointSize="14"/>
</buttonConfiguration>
<connections>
@@ -958,18 +961,12 @@ Sent to Your Parent’s Email</string>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="Nnb-iQ-OQs">
<rect key="frame" x="20" y="627.5" width="374" height="106"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ly3-jW-G7X">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ly3-jW-G7X" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="374" height="36"/>
<color key="tintColor" name="TextDarkBlue"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain">
<attributedString key="attributedTitle">
<fragment content="Continue as a Guest">
<attributes>
<font key="NSFont" size="18" name="Exo2-Bold"/>
</attributes>
</fragment>
</attributedString>
<buttonConfiguration key="configuration" style="plain" title="Continue as a Guest">
<fontDescription key="titleFontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
</buttonConfiguration>
<connections>
<action selector="continueGuestBtnTapped:" destination="vuc-DA-J2M" eventType="touchUpInside" id="50B-ge-oNj"/>
@@ -1073,13 +1070,13 @@ Sent to Your Parent’s Email</string>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="Jlq-Ct-Mrz">
<rect key="frame" x="10" y="104" width="354" height="99.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PLEASE GIVE US YOUR USERNAME" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fCB-jL-yE4">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PLEASE GIVE US YOUR USERNAME" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fCB-jL-yE4" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="354" height="19.5"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your username" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wy2-0C-rxG" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your username" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wy2-0C-rxG" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="34.5" width="354" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
@@ -1202,7 +1199,7 @@ Sent to Your Parent’s Email</string>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter new password" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Skx-Ig-91N" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter new password" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Skx-Ig-91N" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="34.5" width="354" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
@@ -1238,7 +1235,7 @@ Sent to Your Parent’s Email</string>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="confirm your password" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="JRR-Bk-5UP" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="confirm your password" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="JRR-Bk-5UP" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="34.5" width="354" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
@@ -1420,40 +1417,40 @@ Sent to Your Parent’s Email</string>
<size key="intrinsicContentSize" width="8.5" height="23.5"/>
</designable>
<designable name="4gw-z0-s4a">
<size key="intrinsicContentSize" width="150.5" height="20"/>
<size key="intrinsicContentSize" width="200.5" height="20"/>
</designable>
<designable name="68c-1b-KSI">
<size key="intrinsicContentSize" width="151.5" height="21"/>
<size key="intrinsicContentSize" width="201.5" height="21"/>
</designable>
<designable name="81S-Fa-CiD">
<size key="intrinsicContentSize" width="8.5" height="23.5"/>
</designable>
<designable name="DSB-Ge-wNO">
<size key="intrinsicContentSize" width="160" height="21"/>
<size key="intrinsicContentSize" width="210" height="21"/>
</designable>
<designable name="Hcd-Mm-IxW">
<size key="intrinsicContentSize" width="8.5" height="23.5"/>
</designable>
<designable name="JRR-Bk-5UP">
<size key="intrinsicContentSize" width="168" height="20"/>
<size key="intrinsicContentSize" width="218" height="20"/>
</designable>
<designable name="MpT-bm-drv">
<size key="intrinsicContentSize" width="8.5" height="23.5"/>
</designable>
<designable name="Skx-Ig-91N">
<size key="intrinsicContentSize" width="149" height="20"/>
<size key="intrinsicContentSize" width="199" height="20"/>
</designable>
<designable name="iJE-dm-qal">
<size key="intrinsicContentSize" width="150.5" height="20"/>
<size key="intrinsicContentSize" width="200.5" height="20"/>
</designable>
<designable name="m50-FZ-yVO">
<size key="intrinsicContentSize" width="151.5" height="21"/>
<size key="intrinsicContentSize" width="201.5" height="21"/>
</designable>
<designable name="tgW-LH-XfR">
<size key="intrinsicContentSize" width="119.5" height="21"/>
<size key="intrinsicContentSize" width="169.5" height="21"/>
</designable>
<designable name="wy2-0C-rxG">
<size key="intrinsicContentSize" width="151.5" height="21"/>
<size key="intrinsicContentSize" width="201.5" height="21"/>
</designable>
</designables>
<resources>

2
WOKA/Authentication/Controller/EmailVC.swift
View File

@@ -49,7 +49,7 @@ class EmailVC: UIViewController {
let emailValidate = EmailValidation(email: enterEmailTF.text!).validate()
if emailValidate != .isCorrect{
enterEmailTF.rightView?.isHidden = false
enterEmailTF.setError(emailValidate.rawValue, show: true)
enterEmailTF.setError(emailValidate.rawValue.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
Utilities.dismissProgressHUD()
return
}

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

@@ -34,7 +34,7 @@ class LoginVC: UIViewController {
*/
if userName.count < 2{
userNameTF.rightView?.isHidden = false
userNameTF.setError("Username is too short.", show: true)
userNameTF.setError("Username is too short.".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
return
}
@@ -45,8 +45,8 @@ class LoginVC: UIViewController {
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 = "Error".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
// vcPush.onDoneBlock = { isDone in }
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve

2
WOKA/Authentication/Controller/ResetPassUserNameVC.swift
View File

@@ -38,7 +38,7 @@ class ResetPassUserNameVC: UIViewController {
*/
if usernameTF.text!.count < 3{
usernameTF.rightView?.isHidden = false
usernameTF.setError(K.ConstantString.shortUsername, show: true)
usernameTF.setError(K.ConstantString.shortUsername.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
return
}

4
WOKA/Authentication/Controller/SelectAvatarVC.swift
View File

@@ -36,8 +36,8 @@ class SelectAvatarVC: UIViewController {
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = K.ConstantString.intrest
vcPush.mainTitleText = K.ConstantString.error
vcPush.contentLabel = K.ConstantString.intrest.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = K.ConstantString.error.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
// vcPush.onDoneBlock = { isDone in }
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve

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

@@ -13,6 +13,7 @@ class UserDetailsRegisterVC : UIViewController{
@IBOutlet weak var enterNameTF: TextFieldShadow!
@IBOutlet weak var enterUserNameTF: TextFieldShadow!
@IBOutlet weak var enterPasswordTF: TextFieldShadow!
@IBOutlet weak var dontSharePassLabel: LocalisedElementsLabel!
var vm = UserDetailsRegisterVM()
@@ -37,21 +38,21 @@ class UserDetailsRegisterVC : UIViewController{
@IBAction func nextBtnTapped(_ sender: LocalisedElementsButton) {
guard let name = enterNameTF.text ,let userName = enterUserNameTF.text , let pass = enterPasswordTF.text else{return}
/*
Check for name
*/
if name.count < 2{
enterNameTF.rightView?.isHidden = false
enterNameTF.setError("Name is too short.", show: true)
return
}
/*
Check for username
*/
if userName.count < 3{
enterUserNameTF.rightView?.isHidden = false
enterUserNameTF.setError(K.ConstantString.shortUsername, show: true)
enterUserNameTF.setError(K.ConstantString.shortUsername.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
return
}
/*
Check for name
*/
if name.count < 2{
enterNameTF.rightView?.isHidden = false
enterNameTF.setError("Name is too short.".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue) , show: true)
return
}
@@ -62,8 +63,8 @@ class UserDetailsRegisterVC : UIViewController{
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = K.ConstantString.shortPass
vcPush.mainTitleText = K.ConstantString.error
vcPush.contentLabel = K.ConstantString.shortPass.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = K.ConstantString.error.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
// vcPush.onDoneBlock = { isDone in }
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
@@ -117,9 +118,9 @@ extension UserDetailsRegisterVC : UITextFieldDelegate{
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
switch textField{
case enterNameTF:
enterUserNameTF.becomeFirstResponder()
case enterUserNameTF:
enterNameTF.becomeFirstResponder()
case enterNameTF:
enterPasswordTF.becomeFirstResponder()
case enterPasswordTF:
enterPasswordTF.resignFirstResponder()

10
WOKA/Authentication/Controller/UserIntrestVC.swift
View File

@@ -25,6 +25,8 @@ class UserIntrestVC: UIViewController {
@IBOutlet weak var intrestStackView: UIStackView!
@IBOutlet weak var selectAsManyYouWant: UILabel!
@IBOutlet weak var boyText: UILabel!
@IBOutlet weak var GirlText: UILabel!
var vm = UserIntrestVM()
var test = [Temp(text: "ADVENTURES", selected: false),
Temp(text: "CARTOONS", selected: false),
@@ -72,8 +74,8 @@ class UserIntrestVC: UIViewController {
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = K.ConstantString.genderSel
vcPush.mainTitleText = K.ConstantString.error
vcPush.contentLabel = K.ConstantString.genderSel.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = K.ConstantString.error.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
// vcPush.onDoneBlock = { isDone in }
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
@@ -87,8 +89,8 @@ class UserIntrestVC: UIViewController {
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = K.ConstantString.intrest
vcPush.mainTitleText = K.ConstantString.error
vcPush.contentLabel = K.ConstantString.intrest.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = K.ConstantString.error.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
// vcPush.onDoneBlock = { isDone in }
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve

4
WOKA/Authentication/ViewModel/EmailVM.swift
View File

@@ -53,7 +53,9 @@ class EmailVM{
"email": vc.enterEmailTF.text!,
"user_type": "2"
]
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.check_exist_email, method: .post ,parameters: params) {(result : Result<BaseResponseModel<UserDataDM>, NetworkManager.APIError>) in
let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"]
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.check_exist_email, method: .post ,parameters: params,headers: headers) {(result : Result<BaseResponseModel<UserDataDM>, NetworkManager.APIError>) in
switch result{
case .success(let data):
switch data.success{

5
WOKA/Authentication/ViewModel/LoginVM.swift
View File

@@ -15,6 +15,8 @@ class LoginVM{
func initView(){
vc.passwordTF.delegate = self.vc
vc.userNameTF.delegate = self.vc
vc.passwordTF.placeholder = "Enter your password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vc.userNameTF.placeholder = "Enter your username".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vc.userNameTF.addRightButton(title: "", tintColor: UIColor.red, btnImage: UIImage(systemName: "exclamationmark.circle.fill"), target: self, action: #selector(validationIconTapped))
vc.userNameTF.rightView?.isHidden = true
@@ -64,7 +66,8 @@ class LoginVM{
"username": vc.userNameTF.text!,
"password": vc.passwordTF.text!
]
let header : HTTPHeaders = ["device-id" : AuthFunc.shareInstance.getDeviceUUID()]
let header : HTTPHeaders = ["device-id" : AuthFunc.shareInstance.getDeviceUUID(),
"Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"]
Utilities.startProgressHUD()
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.login, method: .post ,parameters: params, headers: header) {(result : Result<BaseResponseModel<UserDataDM?>, NetworkManager.APIError>) in

5
WOKA/Authentication/ViewModel/NewPasswordVM.swift
View File

@@ -34,9 +34,10 @@ class NewPasswordVM{
"password": vc.enterNewPasswordTF.text!,
"password_confirmation": vc.confirmPassTF.text!
]
let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"]
Utilities.startProgressHUD()
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.update_password, method: .post ,parameters: params) {(result : Result<BaseResponseModel<ForgotPassDM>, NetworkManager.APIError>) in
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.update_password, method: .post ,parameters: params,headers: headers) {(result : Result<BaseResponseModel<ForgotPassDM>, NetworkManager.APIError>) in
switch result{
case .success(let data):
switch data.success{

20
WOKA/Authentication/ViewModel/OTPVM.swift
View File

@@ -73,7 +73,9 @@ class OTPVM{
let seconds = Int(remainingTime) % 60
let timeString = String(format: "%02d:%02d", minutes, seconds)
vc.otpValidTillLabel.isHidden = false
vc.otpValidTillLabel.text = "OTP is valid for \(timeString) Min"
let text1 = "OTP is valid for".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
let text2 = "Min".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vc.otpValidTillLabel.text = text1 + " \(timeString) " + text2
}
// MARK: - OTP Validation
@@ -82,7 +84,7 @@ class OTPVM{
let otp = vc.tf1.text! + vc.tf2.text! + vc.tf3.text! + vc.tf4.text!
if otp.count != 4{
self.vc.toast(msg: "Please enter code!", time: 1.8)
self.vc.toast(msg: "Please enter code!".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), time: 1.8)
return
}
@@ -99,9 +101,10 @@ class OTPVM{
"unique_string": validateString,
"otp": otp
]
let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"]
Utilities.startProgressHUD()
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.validate_otp, method: .post ,parameters: params) {(result : Result<BaseResponseModel<UserEmailVerifyDM>, NetworkManager.APIError>) in
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.validate_otp, method: .post ,parameters: params,headers: headers) {(result : Result<BaseResponseModel<UserEmailVerifyDM>, NetworkManager.APIError>) in
switch result{
case .success(let data):
switch data.success{
@@ -130,8 +133,10 @@ class OTPVM{
"otp": otp
]
let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"]
Utilities.startProgressHUD()
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.forgot_password_verify_otp, method: .post ,parameters: params) {(result : Result<BaseResponseModel<ForgotPassDM>, NetworkManager.APIError>) in
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.forgot_password_verify_otp, method: .post ,parameters: params,headers: headers) {(result : Result<BaseResponseModel<ForgotPassDM>, NetworkManager.APIError>) in
switch result{
case .success(let data):
switch data.success{
@@ -195,9 +200,10 @@ class OTPVM{
let params: Parameters = [
"email": AuthFunc.shareInstance.regData.email!,
]
let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"]
Utilities.startProgressHUD()
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.get_linked_child, method: .post ,parameters: params) {(result : Result<BaseResponseModel<LinkedChildDM>, NetworkManager.APIError>) in
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.get_linked_child, method: .post ,parameters: params, headers: headers) {(result : Result<BaseResponseModel<LinkedChildDM>, NetworkManager.APIError>) in
switch result{
case .success(let data):
switch data.success{

4
WOKA/Authentication/ViewModel/ResetPassUserNameVM.swift
View File

@@ -19,6 +19,7 @@ class ResetPassUserNameVM{
vc.nextBtn.applyGradient(colors: [color1, color2], startPoint: CGPoint(x: 0, y: 0), endPoint: CGPoint(x: 0.8, y: 0))
vc.nextBtn.roundCorner()
vc.usernameTF.placeholder = "We will send a reset code to their email".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vc.usernameTF.delegate = self.vc
//Adding error view to the name tf
@@ -37,8 +38,9 @@ class ResetPassUserNameVM{
func sendOtpToUserName(){
let params : Parameters = ["username" : vc.usernameTF.text!]
let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"]
Utilities.startProgressHUD()
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.forgot_password_send_otp, method: .post, parameters: params) {(result : Result<BaseResponseModel<ForgotPassDM>, NetworkManager.APIError>) in
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.forgot_password_send_otp, method: .post, parameters: params,headers: headers) {(result : Result<BaseResponseModel<ForgotPassDM>, NetworkManager.APIError>) in
switch result{
case .success(let data):
switch data.success{

15
WOKA/Authentication/ViewModel/SelectAvatarVM.swift
View File

@@ -20,6 +20,8 @@ class SelectAvatarVM{
vc.nextBtn.roundCorner()
setupCell()
getAvatarListing()
self.vc.title = "Select your Avatar".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
}
func setupCell(){
@@ -32,7 +34,9 @@ class SelectAvatarVM{
func getAvatarListing(){
Utilities.startProgressHUD()
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.avatar_listing, method: .get) {(result : Result<BaseResponseModel<AvatarDM>, NetworkManager.APIError>) in
let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"]
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.avatar_listing, method: .get, headers : headers) {(result : Result<BaseResponseModel<AvatarDM>, NetworkManager.APIError>) in
switch result{
case .success(let data):
switch data.success{
@@ -103,7 +107,8 @@ class SelectAvatarVM{
Utilities.startProgressHUD()
let headers : HTTPHeaders = ["device-id" : AuthFunc.shareInstance.getDeviceUUID()]
let headers : HTTPHeaders = ["device-id" : AuthFunc.shareInstance.getDeviceUUID(),
"Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"]
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.child_registration, method: .post,parameters: AuthFunc.shareInstance.regData.dictionaryRepresentation, headers: headers) {(result : Result<BaseResponseModel<UserDataDM>, NetworkManager.APIError>) in
switch result{
@@ -115,8 +120,8 @@ class SelectAvatarVM{
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = data.message ?? "Unrecognised error"
vcPush.mainTitleText = "Error"
vcPush.yesBtnText = "Retry?"
vcPush.mainTitleText = "Error".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.yesBtnText = "Retry?".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.onDoneBlock = { isDone in
self.getAvatarListing()
}
@@ -127,7 +132,7 @@ class SelectAvatarVM{
case 1:
Utilities.dismissProgressHUD()
AuthFunc.shareInstance.regData = UserRegPostModel()
print(data.data?.result)
self.vc.toast(msg: data.message ?? "Something" , time: 2)
default:
break
}

7
WOKA/Authentication/ViewModel/UserDetailsRegisterVM.swift
View File

@@ -33,6 +33,8 @@ class UserDetailsRegisterVM{
vc.enterNameTF.rightView?.isHidden = true
vc.enterUserNameTF.addRightButton(title: "", tintColor: UIColor.red, btnImage: UIImage(systemName: "exclamationmark.circle.fill"), target: self, action: #selector(errorUserName))
vc.enterUserNameTF.rightView?.isHidden = true
AuthFunc.shareInstance.userType == .adult ? (vc.dontSharePassLabel.isHidden = true) : (vc.dontSharePassLabel.isHidden = false)
}
@objc func errorName(){
@@ -70,9 +72,10 @@ class UserDetailsRegisterVM{
"username": vc.enterUserNameTF.text!,
"user_type": AuthFunc.shareInstance.userType == .adult ? "2" :"1"
]
let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"]
Utilities.startProgressHUD(msg: K.ConstantString.userNameVerify)
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.check_exist_username, method: .post,parameters: params) {(result : Result<BaseResponseModel<IntrestTopicDM>, NetworkManager.APIError>) in
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.check_exist_username, method: .post,parameters: params, headers: headers) {(result : Result<BaseResponseModel<IntrestTopicDM>, NetworkManager.APIError>) in
switch result{
case .success(let data):
//0 -> Username already used. , 1-> Username available

10
WOKA/Authentication/ViewModel/UserIntrestVM.swift
View File

@@ -14,15 +14,21 @@ class UserIntrestVM{
var intrestTopics = [IntrestTopicDM.Result]()
func initView(){
let loc = Locale(identifier: "hi")
self.vc.datePicker.locale = loc
/*
Setting the minimum and maximum date as per user type
*/
if AuthFunc.shareInstance.userType == .adult{
vc.datePicker.minimumDate = Calendar.current.date(byAdding: .year, value: -150, to: Date())
vc.datePicker.maximumDate = Calendar.current.date(byAdding: .year, value: -16, to: Date())
vc.boyText.text = "MALE".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vc.GirlText.text = "FEMALE".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
}else{
vc.datePicker.minimumDate = Calendar.current.date(byAdding: .year, value: -16, to: Date())
vc.datePicker.maximumDate = Calendar.current.date(byAdding: .year, value: -3, to: Date())
vc.boyText.text = "BOY".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vc.GirlText.text = "GIRL".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
}
vc.fullName.text = (AuthFunc.shareInstance.regData.full_name != nil && AuthFunc.shareInstance.regData.full_name != "") ? AuthFunc.shareInstance.regData.full_name : "Guardian"
@@ -123,7 +129,9 @@ class UserIntrestVM{
func getIntrests(){
Utilities.startProgressHUD()
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.interest_topic_listing, method: .post) {(result : Result<BaseResponseModel<IntrestTopicDM>, NetworkManager.APIError>) in
let headers : HTTPHeaders = ["Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"]
NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.interest_topic_listing, method: .post,headers : headers) {(result : Result<BaseResponseModel<IntrestTopicDM>, NetworkManager.APIError>) in
switch result{
case .success(let data):
switch data.success{

3
WOKA/Constants K/ConstantString.swift
View File

@@ -24,7 +24,8 @@ extension K{
static let shortPass = "Password is too short."
static let shortUsername = "Username is too short."
static let userNameVerify = "Verifying Username"
static let intrest = "Please select intrest."
static let intrest = "Please select intrest"
static let avatar = "Please select avatar"
static let dob = "Please select DOB."
static let registerUser = "Please wait registering user."

2
WOKA/Helpers/ActivityToast&Indicator/Utilities.swift
View File

@@ -22,7 +22,7 @@ class Utilities{
// }
static func startProgressHUD(progress: Float? = nil, msg : String? = nil) {
LLSpinner.spin(text: (msg != "" && msg != nil) ? msg : "Please wait...")
LLSpinner.spin(text: (msg != "" && msg != nil) ? msg : "Please wait...".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue))
// if let progress = progress {
// SVProgressHUD.showProgress(progress)
// } else {

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

@@ -1,5 +1,34 @@
"Hello" = "नमस्ते";
"Error" = "गलती";
"Retry?" = "पुनः प्रयास करें?";
"Please wait..." = "कृपया प्रतीक्षा करें";
/*
Login VC
*/
"USERNAME" = "उपयोगकर्ता नाम";
"PASSWORD" = "पासवर्ड";
"Login to WOKA" = "WOKA में लॉग इन करें";
"Enter your username" = "अपना उपयोगकर्ता नाम दर्ज करें";
"Enter your password" = "अपना उपयोगकर्ता नाम दर्ज करें";
"Forgot Password" = "पासवर्ड भूल गए?";
/*
Forgot Password VC
*/
"Forgot your Password?" = "अपना पासवर्ड भूल गए?";
"PLEASE GIVE US YOUR USERNAME" = "कृपया हमें अपना उपयोगकर्ता नाम दें";
"We will send a reset code to their email" = "हम आपके माता-पिता के ईमेल पर एक रीसेट कोड भेजेंगे";
/*
Create PAssword VC
*/
"Great! Select New Password" = "नया पासवर्ड चुनें";
"CREATE YOUR PASSWORD" = "नया पासवर्ड दर्ज करें";
"CONFIRM YOUR PASSWORD" = "नया पासवर्ड पुन: दर्ज करें";
"Enter your password" = "अपना पासवर्ड दर्ज करें";
"Confirm your password" = "अपने पासवर्ड की पुष्टि करें";
/*
Carousel Text
@@ -61,13 +90,19 @@
"PLEASE ENTER THE CODE" = "कृपया कोड दर्ज करें";
"PLEASE ENTER THE OTP" = "कृपया ओटीपी दर्ज करें";
"Don’t forget to check your JUNK/SPAM folder" = "अपना जंक/स्पैम फ़ोल्डर जांचना न भूलें";
"Your Email Looks Familiar!" = "आपका ईमेल परिचित लग रहा है!";
"WE FOUND BELOW USERNAMES LINKED TO THIS EMAIL ADDRESS" = "हमें नीचे इस ईमेल पते से जुड़े उपयोगकर्ता नाम मिले";
/*
UserDetails Registeration VC
*/
"WHAT’S YOUR NAME?" = "तुम्हारा नाम क्या है?";
"Please enter your email" = "अपना ईमेल दर्ज करें";
"OTP is valid for" = "ओटीपी";
"Please enter code!" = "कृपया कोड दर्ज करें!";
"Name is too short." = "नाम बहुत छोटा है।";
"Min" = "मिनट के लिए वैध है";
"SELECT USERNAME" = "उपयोक्तानाम चुनें";
"CREATE YOUR PASSWORD" = "अपना पासवर्ड बनाएं";
"Great! Now Let’s Create Your WOKAccount" = "महान! आइए अब अपना WOKA अकाउंट बनाएं";
@@ -75,3 +110,29 @@
"Enter a username" = "एक उपयोगकर्ता नाम दर्ज करें";
"Enter your name" = "आपका नाम क्या है?";
"Enter your password" = "अपना पासवर्ड भरें";
"Password is too short." = "पारण शब्द बहुत छोटा है।";
"Username is too short." = "उपयोक्तानाम बहुत छोटा है.";
"MALE" = "पुरुष";
"FEMALE" = "महिला";
"BOY" = "लड़का";
"GIRL" = "लड़की";
"Nice to meet you," = "आपसे मिलकर अच्छा लगा,";
"Can we know a bit more about you?" = "क्या हम आपके बारे में कुछ और जान सकते हैं?";
"YOUR GENDER" = "आपका लिंग";
"WHEN IS YOUR BIRTHDAY?" = "आपका जन्मदिन कब है?";
"WHEN ARE YOUR INTRESTS?" = "तुम्हारी अभिरूचियाँ क्या है?";
"Select as many as you want" = "आप जितने चाहें उतने चुनें";
"Ok,Got it." = "ठीक है।";
/*
Intrest VC
*/
"Please select Gender." = "कृपया लिंग चुनें।";
"Select your Avatar" = "अपना अवतार चुनें";
"Please select intrest" = "अपना अवतार चुनें";
/*
Avatar VC
*/
"Please select avatar" = "कृपया अवतार चुनें";