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

- Fixed TC 51, TC 49, TC 48, TC 46

Browse Source 
- TC 52, 53
- Added banner to home
This commit is contained in:
Bilal khan
2024-09-02 19:59:53 +05:30
parent 0b05ce017a
commit d66df15fbb
26 changed files with 345 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
WOKA.xcodeproj/project.pbxproj
View File

@@ -249,6 +249,7 @@
52DAC6482C21762900E2F85B /* WebSeries.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 52DAC6472C21762900E2F85B /* WebSeries.storyboard */; };
52DAC64E2C21775300E2F85B /* WebSeriesVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52DAC64D2C21775300E2F85B /* WebSeriesVC.swift */; };
52E214C72C2AD47F00BC2D29 /* EpisodeDetailsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E214C62C2AD47F00BC2D29 /* EpisodeDetailsVC.swift */; };
52E5B3442C859104000291E0 /* WOKA.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 52E5B3422C859104000291E0 /* WOKA.xcdatamodeld */; };
52F4E8662C3D123B00778FBC /* JWKaraokePlayerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52F4E8652C3D123B00778FBC /* JWKaraokePlayerVC.swift */; };
52FB2D8F2BDF898F0009B0C7 /* TextFieldPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52FB2D8E2BDF898F0009B0C7 /* TextFieldPadding.swift */; };
52FDBA782BFF23F4009D7AC7 /* TimePeriod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52FDBA772BFF23F4009D7AC7 /* TimePeriod.swift */; };
@@ -356,7 +357,6 @@
9CDAEB142C54132E00890C47 /* CheckEddDM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CDAEB132C54132E00890C47 /* CheckEddDM.swift */; };
9CDC343C2BDBBC6B00093089 /* SelectAgeVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CDC343B2BDBBC6B00093089 /* SelectAgeVC.swift */; };
9CDCE1452BDB9B9A003FEF11 /* OnBoardMainSound.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 9CDCE1442BDB9B9A003FEF11 /* OnBoardMainSound.m4a */; };
9CF8994C2C8191F70038790E /* WOKA.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 9CF8994A2C8191F70038790E /* WOKA.xcdatamodeld */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -648,6 +648,7 @@
52DAC6472C21762900E2F85B /* WebSeries.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = WebSeries.storyboard; sourceTree = "<group>"; };
52DAC64D2C21775300E2F85B /* WebSeriesVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSeriesVC.swift; sourceTree = "<group>"; };
52E214C62C2AD47F00BC2D29 /* EpisodeDetailsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EpisodeDetailsVC.swift; sourceTree = "<group>"; };
52E5B3432C859104000291E0 /* WOKA.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WOKA.xcdatamodel; sourceTree = "<group>"; };
52E7E0F62BDF7DD500C86E10 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AuthenticationSB.strings; sourceTree = "<group>"; };
52E7E0F82BDF7DD900C86E10 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/AuthenticationSB.strings; sourceTree = "<group>"; };
52F477A42C492ED900F79200 /* JWPlayerKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = JWPlayerKit.xcframework; path = Pods/JWPlayerKit/JWPlayerKit.xcframework; sourceTree = "<group>"; };
@@ -747,7 +748,6 @@
9CDCE1412BDB94BA003FEF11 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Main.strings; sourceTree = "<group>"; };
9CDCE1422BDB94BD003FEF11 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
9CDCE1442BDB9B9A003FEF11 /* OnBoardMainSound.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = OnBoardMainSound.m4a; sourceTree = "<group>"; };
9CF8994B2C8191F70038790E /* WOKA.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WOKA.xcdatamodel; sourceTree = "<group>"; };
C83A2BA3B8F575DC890CC5DD /* Pods-WOKA.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WOKA.debug.xcconfig"; path = "Target Support Files/Pods-WOKA/Pods-WOKA.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -954,7 +954,7 @@
9C535DC82C00C34000DA6DCD /* Theme */,
52DAC6462C21761700E2F85B /* WebSeries */,
9C834ED92C1C20EC00B29A9C /* WOKA.entitlements */,
9CF8994A2C8191F70038790E /* WOKA.xcdatamodeld */,
52E5B3422C859104000291E0 /* WOKA.xcdatamodeld */,
52ACC1292C610EC900791528 /* PersistentStorage.swift */,
);
path = WOKA;
@@ -2448,7 +2448,7 @@
9CBE1B432C0F37B300CA6E61 /* DropDown.swift in Sources */,
52A6DC9C2C4E38E000F63C51 /* ShopListingVC.swift in Sources */,
52C8B0742BDA7626003B51D0 /* OnBoardVC.swift in Sources */,
9CF8994C2C8191F70038790E /* WOKA.xcdatamodeld in Sources */,
52E5B3442C859104000291E0 /* WOKA.xcdatamodeld in Sources */,
5219C2C22C086D9C00A1DF4D /* DataTypeConversion.swift in Sources */,
525953CF2BE8B28F00191286 /* Utilities.swift in Sources */,
52BFB5332C33DAD700BAAE15 /* AudioBookHomeVC.swift in Sources */,
@@ -2778,7 +2778,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = WOKA/WOKA.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 4S9A74ZB6H;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
@@ -2818,7 +2818,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = WOKA/WOKA.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 4S9A74ZB6H;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
@@ -3110,14 +3110,14 @@
/* End XCSwiftPackageProductDependency section */
/* Begin XCVersionGroup section */
9CF8994A2C8191F70038790E /* WOKA.xcdatamodeld */ = {
52E5B3422C859104000291E0 /* WOKA.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
9CF8994B2C8191F70038790E /* WOKA.xcdatamodel */,
52E5B3432C859104000291E0 /* WOKA.xcdatamodel */,
);
currentVersion = 9CF8994B2C8191F70038790E /* WOKA.xcdatamodel */;
currentVersion = 52E5B3432C859104000291E0 /* WOKA.xcdatamodel */;
name = WOKA.xcdatamodeld;
path = /Users/bilal/Desktop/woka_native_ios_swift/WOKA/WOKA.xcdatamodeld;
path = /Users/macbookpro/Desktop/WOKA/WOKA/WOKA.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
};

84
WOKA/Address/Address.storyboard
View File

@@ -27,16 +27,16 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="60" translatesAutoresizingMaskIntoConstraints="NO" id="eqb-f6-ptc">
<rect key="frame" x="20" y="74" width="374" height="218"/>
<rect key="frame" x="20" y="73.999999999999986" width="374" height="216.66666666666663"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please enter your Pincode below to check service availability in your area." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4el-im-Ptb" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="374" height="48"/>
<rect key="frame" x="0.0" y="0.0" width="374" height="46.666666666666664"/>
<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="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter Pincode" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8JG-SF-ofW" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="108" width="374" height="50"/>
<rect key="frame" x="0.0" y="106.66666666666666" width="374" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -55,7 +55,7 @@
</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="oUf-8Y-ZJl" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="218" width="374" height="0.0"/>
<rect key="frame" x="0.0" y="216.66666666666669" width="374" height="0.0"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@@ -123,25 +123,25 @@
<rect key="frame" x="0.0" y="44" width="414" height="758"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="Fyh-aj-dYn">
<rect key="frame" x="0.0" y="0.0" width="414" height="883.66666666666663"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="877.66666666666663"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Add New Address" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S8i-lX-bse" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="10" y="10" width="394" height="24"/>
<rect key="frame" x="10" y="9.9999999999999982" width="394" height="23.333333333333329"/>
<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>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="v5u-ae-Jzp">
<rect key="frame" x="10" y="53.999999999999993" width="394" height="79.333333333333314"/>
<rect key="frame" x="10" y="53.333333333333321" width="394" height="78.666666666666686"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Address Name (Firstname &amp; Lastname)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZOH-FN-Yqz" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="0.0" width="384" height="19.333333333333332"/>
<rect key="frame" x="5" y="0.0" width="384" height="18.666666666666668"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter address name" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="M6e-0t-FoD" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="29.333333333333329" width="384" height="50"/>
<rect key="frame" x="5" y="28.666666666666671" width="384" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -164,16 +164,16 @@
<edgeInsets key="layoutMargins" top="0.0" left="5" bottom="0.0" right="5"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="14w-xR-r1s">
<rect key="frame" x="10" y="153.33333333333334" width="394" height="79.333333333333343"/>
<rect key="frame" x="10" y="152" width="394" height="78.666666666666686"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Address Line 1" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4qC-Pk-qkH" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="0.0" width="384" height="19.333333333333332"/>
<rect key="frame" x="5" y="0.0" width="384" height="18.666666666666668"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter address line 1" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4gp-xB-FLw" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="29.333333333333314" width="384" height="50"/>
<rect key="frame" x="5" y="28.666666666666657" width="384" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -196,16 +196,16 @@
<edgeInsets key="layoutMargins" top="0.0" left="5" bottom="0.0" right="5"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="ipZ-MN-bfu">
<rect key="frame" x="10" y="252.66666666666671" width="394" height="79.333333333333343"/>
<rect key="frame" x="10" y="250.66666666666666" width="394" height="78.666666666666657"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Address Line 2" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zm9-HI-4ph" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="0.0" width="384" height="19.333333333333332"/>
<rect key="frame" x="5" y="0.0" width="384" height="18.666666666666668"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter address line 1" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Le6-W7-6jI" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="29.333333333333314" width="384" height="50"/>
<rect key="frame" x="5" y="28.666666666666629" width="384" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -228,16 +228,16 @@
<edgeInsets key="layoutMargins" top="0.0" left="5" bottom="0.0" right="5"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="rcB-OF-B3k">
<rect key="frame" x="10" y="352" width="394" height="79.333333333333314"/>
<rect key="frame" x="10" y="349.33333333333331" width="394" height="78.666666666666686"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="City" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uq9-GD-cPW" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="0.0" width="384" height="19.333333333333332"/>
<rect key="frame" x="5" y="0.0" width="384" height="18.666666666666668"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter city" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BEd-ik-j0X" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="29.333333333333314" width="384" height="50"/>
<rect key="frame" x="5" y="28.666666666666686" width="384" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -260,16 +260,16 @@
<edgeInsets key="layoutMargins" top="0.0" left="5" bottom="0.0" right="5"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="c85-0g-vGf">
<rect key="frame" x="10" y="451.33333333333331" width="394" height="79.333333333333314"/>
<rect key="frame" x="10" y="448" width="394" height="78.666666666666629"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="State" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9DD-Ab-AS9" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="0.0" width="384" height="19.333333333333332"/>
<rect key="frame" x="5" y="0.0" width="384" height="18.666666666666668"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter state" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="SOb-Uq-xld" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="29.333333333333314" width="384" height="50"/>
<rect key="frame" x="5" y="28.666666666666629" width="384" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -292,16 +292,16 @@
<edgeInsets key="layoutMargins" top="0.0" left="5" bottom="0.0" right="5"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="ei6-kZ-2Pa">
<rect key="frame" x="10" y="550.66666666666663" width="394" height="79.333333333333371"/>
<rect key="frame" x="10" y="546.66666666666663" width="394" height="78.666666666666629"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Pincode" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ej4-NQ-wVN" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="0.0" width="384" height="19.333333333333332"/>
<rect key="frame" x="5" y="0.0" width="384" height="18.666666666666668"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter coupon code" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BqV-8B-1vE" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="29.333333333333371" width="384" height="50"/>
<rect key="frame" x="5" y="28.666666666666742" width="384" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -324,16 +324,16 @@
<edgeInsets key="layoutMargins" top="0.0" left="5" bottom="0.0" right="5"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Mzj-PS-LkR">
<rect key="frame" x="10" y="650" width="394" height="79.333333333333371"/>
<rect key="frame" x="10" y="645.33333333333337" width="394" height="78.666666666666629"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Country" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tyL-9S-yyo" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="0.0" width="384" height="19.333333333333332"/>
<rect key="frame" x="5" y="0.0" width="384" height="18.666666666666668"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter country" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="lbG-6e-Siu" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="29.333333333333371" width="384" height="50"/>
<rect key="frame" x="5" y="28.666666666666629" width="384" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -356,16 +356,16 @@
<edgeInsets key="layoutMargins" top="0.0" left="5" bottom="0.0" right="5"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="dHl-UE-mSu">
<rect key="frame" x="10" y="749.33333333333337" width="394" height="79.333333333333371"/>
<rect key="frame" x="10" y="744" width="394" height="78.666666666666629"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Phone Number" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QfX-WL-6A3" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="0.0" width="384" height="19.333333333333332"/>
<rect key="frame" x="5" y="0.0" width="384" height="18.666666666666668"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter phone number" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Kmc-Zf-kNp" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="5" y="29.333333333333258" width="384" height="50"/>
<rect key="frame" x="5" y="28.666666666666629" width="384" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -373,7 +373,7 @@
</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" autocorrectionType="no" keyboardType="phonePad" enablesReturnKeyAutomatically="YES" textContentType="tel"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="numberPad" enablesReturnKeyAutomatically="YES" textContentType="tel"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="paddingLeftCustom">
<real key="value" value="25"/>
@@ -388,7 +388,7 @@
<edgeInsets key="layoutMargins" top="0.0" left="5" bottom="0.0" right="5"/>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JSs-5V-3H5">
<rect key="frame" x="10" y="848.66666666666663" width="394" height="30"/>
<rect key="frame" x="10" y="842.66666666666663" width="394" height="30"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="f6z-cu-XpL"/>
@@ -625,31 +625,31 @@
</scenes>
<designables>
<designable name="4gp-xB-FLw">
<size key="intrinsicContentSize" width="141" height="21"/>
<size key="intrinsicContentSize" width="191.66666666666666" height="20.666666666666668"/>
</designable>
<designable name="8JG-SF-ofW">
<size key="intrinsicContentSize" width="100" height="21"/>
<size key="intrinsicContentSize" width="151" height="20.666666666666668"/>
</designable>
<designable name="BEd-ik-j0X">
<size key="intrinsicContentSize" width="69" height="21"/>
<size key="intrinsicContentSize" width="117.33333333333333" height="20.666666666666668"/>
</designable>
<designable name="BqV-8B-1vE">
<size key="intrinsicContentSize" width="134.33333333333334" height="21"/>
<size key="intrinsicContentSize" width="186.66666666666666" height="20.666666666666668"/>
</designable>
<designable name="Kmc-Zf-kNp">
<size key="intrinsicContentSize" width="148.33333333333334" height="21"/>
<size key="intrinsicContentSize" width="196.66666666666666" height="20.666666666666668"/>
</designable>
<designable name="Le6-W7-6jI">
<size key="intrinsicContentSize" width="141" height="21"/>
<size key="intrinsicContentSize" width="191.66666666666666" height="20.666666666666668"/>
</designable>
<designable name="M6e-0t-FoD">
<size key="intrinsicContentSize" width="145.33333333333334" height="21"/>
<size key="intrinsicContentSize" width="193.66666666666666" height="20.666666666666668"/>
</designable>
<designable name="SOb-Uq-xld">
<size key="intrinsicContentSize" width="80.333333333333329" height="21"/>
<size key="intrinsicContentSize" width="127.66666666666667" height="20.666666666666668"/>
</designable>
<designable name="lbG-6e-Siu">
<size key="intrinsicContentSize" width="99" height="21"/>
<size key="intrinsicContentSize" width="146.33333333333334" height="20.666666666666668"/>
</designable>
</designables>
<resources>
@@ -661,7 +661,7 @@
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
<systemColor name="systemGreenColor">
<color red="0.20392156859999999" green="0.78039215689999997" blue="0.34901960780000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.20392156862745098" green="0.7803921568627451" blue="0.34901960784313724" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>

13
WOKA/Address/Controller/AddNewAddressVC.swift
View File

@@ -53,31 +53,32 @@ class AddNewAddressVC: UIViewController {
@IBAction func submitBtnTapped(_ sender: LocalisedElementsButton) {
PersistentStorage.shared.addShopCount(postID: 0)
if enterAddressNAmeTF.text!.count < 2 {
if let nameTF = enterAddressNAmeTF.text?.trimmingCharacters(in: .whitespaces) ,nameTF.count < 2 {
Utilities.alertWithBtn(title: "", msgBody: "Name should be minimum 2 Characters.", okBtnStr: "OK", vc: self)
return
}
if addressLine1TF.text!.count < 15 {
if let addressLine1TF = addressLine1TF.text?.trimmingCharacters(in: .whitespaces) , addressLine1TF.count < 15 {
Utilities.alertWithBtn(title: "", msgBody: "Address Line 1 should be minimum 15 Characters.", okBtnStr: "OK", vc: self)
return
}
if addressLine2TF.text!.count < 15 {
if let addressLine2TF = addressLine2TF.text?.trimmingCharacters(in: .whitespaces), addressLine2TF.count < 15 {
Utilities.alertWithBtn(title: "", msgBody: "Address Line 2 should be minimum 15 Characters.", okBtnStr: "OK", vc: self)
return
}
if cityTF.text!.count < 2 {
if let cityTF = cityTF.text?.trimmingCharacters(in: .whitespaces), cityTF.count < 2 {
Utilities.alertWithBtn(title: "", msgBody: "City should be minimum 2 Characters.", okBtnStr: "OK", vc: self)
return
}
if stateTF.text!.count < 2 {
if let stateTF = stateTF.text?.trimmingCharacters(in: .whitespaces), stateTF.count < 2 {
Utilities.alertWithBtn(title: "", msgBody: "State should be minimum 2 Characters.", okBtnStr: "OK", vc: self)
return
}
if countryTF.text!.count < 2 {
if let countryTF = countryTF.text?.trimmingCharacters(in: .whitespaces), countryTF.count < 2 {
Utilities.alertWithBtn(title: "", msgBody: "Country should be minimum 2 Characters.", okBtnStr: "OK", vc: self)
return
}

11
WOKA/Address/Controller/VerifyAddressPincodeVC.swift
View File

@@ -58,6 +58,12 @@ class VerifyAddressPincodeVC: UIViewController {
return
}
if tf == "000000"{
self.pincodeServieable.text = "Pincode is not valid."
proceedBtn.setTitle("CHECK NOW", for: .normal)
return
}
//check if user is checking for same pincode
if let verifyPincodeData{
if tf == verifyPincodeData.lmPincode{
@@ -65,6 +71,7 @@ class VerifyAddressPincodeVC: UIViewController {
return
}
}
checkEstimatedDeliveryData(pinCode: tf)
} else{
let sb = UIStoryboard(name: K.StoryBoard.address, bundle: nil)
@@ -98,6 +105,8 @@ class VerifyAddressPincodeVC: UIViewController {
Error
*/
Utilities.dismissProgressHUD()
self.pincodeServieable.text = data.message ?? "Pincode not serviceable."
proceedBtn.setTitle("CHECK NOW", for: .normal)
case 1:
Utilities.dismissProgressHUD()
guard let data = data.data?.result else{return}
@@ -120,7 +129,7 @@ class VerifyAddressPincodeVC: UIViewController {
func checkServiceAble(){
guard let data = self.verifyPincodeData else{
self.pincodeServieable.text = "Pincode Unserviceable."
self.pincodeServieable.text = "Pincode not serviceable."
proceedBtn.setTitle("CHECK NOW", for: .normal)
return
}

6
WOKA/Assets/Assets.xcassets/Banners/Contents.json Normal file
View File

@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}

21
WOKA/Assets/Assets.xcassets/Banners/HomeTestBanner.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "app-banners.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
WOKA/Assets/Assets.xcassets/Banners/HomeTestBanner.imageset/app-banners.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

21
WOKA/Assets/Assets.xcassets/Placeholder.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Untitled design.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
WOKA/Assets/Assets.xcassets/Placeholder.imageset/Untitled design.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

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

@@ -1382,17 +1382,17 @@ Sent to Your Parent’s Email</string>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="kVU-tZ-Qxe">
<rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
<rect key="frame" x="0.0" y="0.0" width="428" height="932"/>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="Ux8-r9-rZb">
<rect key="frame" x="145" y="50" width="140" height="52.666666666666657"/>
<rect key="frame" x="144" y="50" width="140" height="52.666666666666657"/>
<constraints>
<constraint firstAttribute="width" secondItem="Ux8-r9-rZb" secondAttribute="height" multiplier="8:3" id="3Bo-85-Opy"/>
<constraint firstAttribute="width" constant="140" id="abR-fA-jTS"/>
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="60" translatesAutoresizingMaskIntoConstraints="NO" id="OXs-y6-ZlP">
<rect key="frame" x="36" y="132.66666666666669" width="374" height="675.33333333333326"/>
<rect key="frame" x="34" y="132.66666666666669" width="374" height="675.33333333333326"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Email Looks Familiar!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wlw-Ne-TMy" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="10" y="0.0" width="354" height="29"/>
@@ -1420,10 +1420,10 @@ Sent to Your Parent’s Email</string>
<edgeInsets key="layoutMargins" top="0.0" left="10" bottom="0.0" right="10"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="xXI-1K-L56">
<rect key="frame" x="30" y="828" width="370" height="50"/>
<rect key="frame" x="30" y="828" width="368" height="50"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sli-1N-tGE" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="370" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="368" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="jaN-n0-fQU"/>
</constraints>
@@ -1496,17 +1496,17 @@ Sent to Your Parent’s Email</string>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="XCD-Eq-dfg">
<rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
<rect key="frame" x="0.0" y="0.0" width="428" height="932"/>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="hPv-w5-A5k">
<rect key="frame" x="145" y="50" width="140" height="52.666666666666657"/>
<rect key="frame" x="144" y="50" width="140" height="52.666666666666657"/>
<constraints>
<constraint firstAttribute="width" secondItem="hPv-w5-A5k" secondAttribute="height" multiplier="8:3" id="3G1-6h-fef"/>
<constraint firstAttribute="width" constant="140" id="Tgm-h7-QiJ"/>
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="60" translatesAutoresizingMaskIntoConstraints="NO" id="b6i-JR-2Em">
<rect key="frame" x="36" y="132.66666666666669" width="374" height="675.33333333333326"/>
<rect key="frame" x="34" y="132.66666666666669" width="374" height="675.33333333333326"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username Found" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sbg-9k-ezS" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="10" y="0.0" width="354" height="29"/>
@@ -1534,10 +1534,10 @@ Sent to Your Parent’s Email</string>
<edgeInsets key="layoutMargins" top="0.0" left="10" bottom="0.0" right="10"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="KTf-VW-iuU">
<rect key="frame" x="30" y="828" width="370" height="50"/>
<rect key="frame" x="30" y="828" width="368" height="50"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pa7-nj-fa0" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="370" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="368" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="t2D-jB-n8u"/>
</constraints>
@@ -1709,43 +1709,43 @@ Sent to Your Parent’s Email</string>
<size key="intrinsicContentSize" width="6.666666666666667" height="22.666666666666668"/>
</designable>
<designable name="4gw-z0-s4a">
<size key="intrinsicContentSize" width="148" height="19"/>
<size key="intrinsicContentSize" width="198" height="19"/>
</designable>
<designable name="68c-1b-KSI">
<size key="intrinsicContentSize" width="149" height="20.333333333333332"/>
<size key="intrinsicContentSize" width="199" height="20.333333333333332"/>
</designable>
<designable name="81S-Fa-CiD">
<size key="intrinsicContentSize" width="6.666666666666667" height="22.666666666666668"/>
</designable>
<designable name="DSB-Ge-wNO">
<size key="intrinsicContentSize" width="116" height="20.666666666666668"/>
<size key="intrinsicContentSize" width="166" height="20.666666666666668"/>
</designable>
<designable name="Hcd-Mm-IxW">
<size key="intrinsicContentSize" width="6.666666666666667" height="22.666666666666668"/>
</designable>
<designable name="JRR-Bk-5UP">
<size key="intrinsicContentSize" width="164.33333333333334" height="19"/>
<size key="intrinsicContentSize" width="214.33333333333334" height="19"/>
</designable>
<designable name="MpT-bm-drv">
<size key="intrinsicContentSize" width="6.666666666666667" height="22.666666666666668"/>
</designable>
<designable name="Skx-Ig-91N">
<size key="intrinsicContentSize" width="146.33333333333334" height="19"/>
<size key="intrinsicContentSize" width="196.33333333333334" height="19"/>
</designable>
<designable name="aPP-h8-int">
<size key="intrinsicContentSize" width="165.66666666666666" height="20.666666666666668"/>
<size key="intrinsicContentSize" width="215.66666666666666" height="20.666666666666668"/>
</designable>
<designable name="iJE-dm-qal">
<size key="intrinsicContentSize" width="148" height="19"/>
<size key="intrinsicContentSize" width="198" height="19"/>
</designable>
<designable name="m50-FZ-yVO">
<size key="intrinsicContentSize" width="149" height="20.666666666666668"/>
<size key="intrinsicContentSize" width="199" height="20.666666666666668"/>
</designable>
<designable name="tgW-LH-XfR">
<size key="intrinsicContentSize" width="117.66666666666667" height="20.666666666666668"/>
<size key="intrinsicContentSize" width="168" height="20.666666666666668"/>
</designable>
<designable name="wy2-0C-rxG">
<size key="intrinsicContentSize" width="149" height="20.666666666666668"/>
<size key="intrinsicContentSize" width="199" height="20.666666666666668"/>
</designable>
</designables>
<resources>

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

@@ -57,14 +57,24 @@ class UserDetailsRegisterVC : UIViewController{
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)
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = K.ConstantString.enterUserName.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Username".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
self.present(vcPush, animated: true)
return
}
if userName.count < 3{
enterUserNameTF.rightView?.isHidden = false
enterUserNameTF.setError(K.ConstantString.shortUsername.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = K.ConstantString.shortUsername.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Username".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
self.present(vcPush, animated: true)
return
}
@@ -72,14 +82,24 @@ 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)
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = K.ConstantString.enterName.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Name".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
self.present(vcPush, animated: true)
return
}
if name.count < 2{
enterNameTF.rightView?.isHidden = false
enterNameTF.setError("Name is too short.".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue) , show: true)
let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
vcPush.contentLabel = "Name is too short.".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.mainTitleText = "Name".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vcPush.modalPresentationStyle = .overCurrentContext
vcPush.modalTransitionStyle = .crossDissolve
self.present(vcPush, animated: true)
return
}
@@ -92,7 +112,6 @@ class UserDetailsRegisterVC : UIViewController{
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
self.present(vcPush, animated: true)
@@ -127,11 +146,9 @@ extension UserDetailsRegisterVC : UITextFieldDelegate{
func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool{
switch textField{
case enterNameTF:
textField.hideError()
if !string.nameCharacterOnly(){return false}
return ValidatorClass.sharedInstanec.limitCharacter(length: 50,textField, shouldChangeCharactersIn: range, replacementString: string)
case enterUserNameTF:
textField.hideError()
if !string.userName(){return false}
return ValidatorClass.sharedInstanec.limitCharacter(length: 16,textField, shouldChangeCharactersIn: range, replacementString: string)
case enterPasswordTF:

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

@@ -31,12 +31,6 @@ class UserDetailsRegisterVM{
vc.enterPasswordTF.enablePasswordToggle()
vc.enterPasswordTF.rightView?.isHidden = true
//Adding error view to the name tf
vc.enterNameTF.addRightButton(title: "", tintColor: UIColor.red, btnImage: UIImage(systemName: "exclamationmark.circle.fill"), target: self, action: #selector(errorName))
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
if createChildAccount != nil{ // this is from the home screen when a parent can adda child
vc.dontSharePassLabel.isHidden = true
vc.viewTitleLabel.text = "Add Child Account".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
@@ -48,20 +42,6 @@ class UserDetailsRegisterVM{
}
}
@objc func errorName(){
let errorView = errorViews.object(forKey: vc.enterNameTF)
if let errorView = errorView {
errorView.isHidden.toggle()
}
}
@objc func errorUserName(){
let errorView = errorViews.object(forKey: vc.enterUserNameTF)
if let errorView = errorView {
errorView.isHidden.toggle()
}
}
func hindiEnglishLanguage(){
vc.enterNameTF.placeholder = K.AuthenticationStringConstant.enterName.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
vc.enterUserNameTF.placeholder = K.AuthenticationStringConstant.selectUsername.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)

2
WOKA/Helpers/LoadingIndicatorImageView.swift
View File

@@ -37,7 +37,5 @@ extension UIImageView {
// activityIndicator.removeFromSuperview()
}
}
// }
}
}

3
WOKA/Network Adapter/APIEndPoints.swift
View File

@@ -142,7 +142,8 @@ struct APIEndPoints {
struct Address{
static let parent_address_listing = makeURL(path: "parent_address_listing")
static let add_parent_address = makeURL(path: "add_parent_address")
static let pincode_serviceability_check_edd = makeURL(path: "pincode_serviceability_check_edd")
// static let pincode_serviceability_check_edd = makeURL(path: "pincode_serviceability_check_edd")
static let pincode_serviceability_check_edd = makeURL(path: "v2/pincode_serviceability_check_edd")
}
// Other endpoint categories...

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

@@ -28,6 +28,13 @@ class ShopProductsVC: UIViewController {
override func viewWillAppear(_ animated: Bool) {
self.navigationController?.setNavigationBarHidden(false, animated: animated)
/*
check for single product
*/
if self.vm.shopProductsData.count == 1{
self.navigationController?.popViewController(animated: true)
}
// Update the badge label with the current cart data
if let button = vm.cartButton.customView as? UIButton {
BadgeBarBtn.shared.updateBadge(for: button, with: CartDataCache.cartListData.count.toString())

12
WOKA/Shop/ViewModel/ShopProductsVM.swift
View File

@@ -156,6 +156,18 @@ class ShopProductsVM{
if self.shopProductsData.count == count{
stopFetch = true
}
/*
check for single product
*/
if self.shopProductsData.count == 1{
let sb = UIStoryboard(name: K.StoryBoard.shop, bundle: nil)
let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.Shop.productDetailsVC) as! ProductDetailsVC
if let productID = self.shopProductsData.first?.id{
vcPush.vm.productID = productID
}
self.vc.navigationController?.pushViewController(vcPush, animated: true)
}
default:
Utilities.dismissProgressHUD()
vc.spinnerView.stopAnimating()

64
WOKA/SideBarNav/SideBarNav.storyboard
View File

@@ -131,7 +131,7 @@
<rect key="frame" x="0.0" y="58" width="414" height="729"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="49" translatesAutoresizingMaskIntoConstraints="NO" id="5wC-Rc-bx0">
<rect key="frame" x="0.0" y="0.0" width="414" height="569"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="567"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="qyO-EY-Xz8">
<rect key="frame" x="15" y="10" width="384" height="50"/>
@@ -225,16 +225,16 @@
</subviews>
</stackView>
<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"/>
<rect key="frame" x="15" y="278" width="384" height="76"/>
<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" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="384" height="22"/>
<rect key="frame" x="0.0" y="0.0" width="384" height="21"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3td-Os-A3X">
<rect key="frame" x="0.0" y="27" width="384" height="50"/>
<rect key="frame" x="0.0" y="26" width="384" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select Subject" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CoP-oH-nkk">
<rect key="frame" x="15" y="10" width="329" height="30"/>
@@ -259,16 +259,16 @@
</subviews>
</stackView>
<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"/>
<rect key="frame" x="15" y="403" width="384" height="154"/>
<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" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="384" height="22"/>
<rect key="frame" x="0.0" y="0.0" width="384" height="21"/>
<fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PNw-eT-0fE" customClass="RSKPlaceholderTextView" customModule="RSKPlaceholderTextView">
<rect key="frame" x="0.0" y="27" width="384" height="128"/>
<rect key="frame" x="0.0" y="26" width="384" height="128"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -378,10 +378,10 @@
<rect key="frame" x="0.0" y="48" width="414" height="726"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="uGa-bS-ctr">
<rect key="frame" x="0.0" y="30" width="414" height="730.5"/>
<rect key="frame" x="0.0" y="30" width="414" height="726.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Hvk-Z2-3ji">
<rect key="frame" x="20" y="0.0" width="374" height="116.5"/>
<rect key="frame" x="20" y="0.0" width="374" height="115.5"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rbx-B4-wDn">
<rect key="frame" x="0.0" y="0.0" width="374" height="80"/>
@@ -403,7 +403,7 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="USER" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="clP-p2-fQj">
<rect key="frame" x="0.0" y="85" width="374" height="31.5"/>
<rect key="frame" x="0.0" y="85" width="374" height="30.5"/>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="26"/>
<color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@@ -411,16 +411,16 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="GK8-Ov-3Lf" userLabel="NAME">
<rect key="frame" x="20" y="151.5" width="374" height="99.5"/>
<rect key="frame" x="20" y="150.5" width="374" height="99"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FULL NAME" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dWX-YE-TV0" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="374" height="19.5"/>
<rect key="frame" x="0.0" y="0.0" width="374" height="19"/>
<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="arD-av-w7V" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="34.5" width="374" height="50"/>
<rect key="frame" x="0.0" y="34" width="374" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -439,7 +439,7 @@
</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="Avp-CK-Tfh">
<rect key="frame" x="0.0" y="99.5" width="374" height="0.0"/>
<rect key="frame" x="0.0" y="99" width="374" 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"/>
@@ -447,16 +447,16 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="mF6-Ik-pdq" userLabel="EMAIL">
<rect key="frame" x="20" y="286" width="374" height="99.5"/>
<rect key="frame" x="20" y="284.5" width="374" height="99"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="EMAIL" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lss-KC-4LQ" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="374" height="19.5"/>
<rect key="frame" x="0.0" y="0.0" width="374" height="19"/>
<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" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your email" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fZS-d6-t0h" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="34.5" width="374" height="50"/>
<rect key="frame" x="0.0" y="34" width="374" height="50"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" name="TextDarkBlue"/>
<constraints>
@@ -475,7 +475,7 @@
</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="JVa-mg-KVN">
<rect key="frame" x="0.0" y="99.5" width="374" height="0.0"/>
<rect key="frame" x="0.0" y="99" width="374" 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"/>
@@ -483,28 +483,28 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="dTX-xS-I84" userLabel="GENDER">
<rect key="frame" x="20" y="420.5" width="374" height="138"/>
<rect key="frame" x="20" y="418.5" width="374" height="137"/>
<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="DEA-gr-l2e" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="374" height="22"/>
<rect key="frame" x="0.0" y="0.0" width="374" height="21"/>
<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"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="60" translatesAutoresizingMaskIntoConstraints="NO" id="KhR-hP-jeC">
<rect key="frame" x="0.0" y="38" width="374" height="100"/>
<rect key="frame" x="0.0" y="37" width="374" height="100"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hhf-2M-dfy">
<rect key="frame" x="30" y="0.0" width="127" height="100"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="evt-gm-S0p">
<rect key="frame" x="39" y="10" width="49.5" height="77"/>
<rect key="frame" x="39" y="10" width="49.5" height="76"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Boy" translatesAutoresizingMaskIntoConstraints="NO" id="bty-6i-uBA">
<rect key="frame" x="0.0" y="0.0" width="49.5" height="50"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="BOY" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y4t-AQ-VlC" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="55" width="49.5" height="22"/>
<rect key="frame" x="0.0" y="55" width="49.5" height="21"/>
<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"/>
<nil key="highlightedColor"/>
@@ -522,13 +522,13 @@
<rect key="frame" x="217" y="0.0" width="127" height="100"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="9Tk-3P-f19">
<rect key="frame" x="39.5" y="10" width="48.5" height="77"/>
<rect key="frame" x="39.5" y="10" width="48.5" height="76"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Girl" translatesAutoresizingMaskIntoConstraints="NO" id="m4x-et-VAb">
<rect key="frame" x="0.0" y="0.0" width="48.5" height="50"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GIRL" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="225-qf-t1b" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="55" width="48.5" height="22"/>
<rect key="frame" x="0.0" y="55" width="48.5" height="21"/>
<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"/>
<nil key="highlightedColor"/>
@@ -551,16 +551,16 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="tlL-6r-4eb" userLabel="DOB">
<rect key="frame" x="20" y="593.5" width="374" height="137"/>
<rect key="frame" x="20" y="590.5" width="374" height="136"/>
<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="b73-2Y-tGO" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="374" height="22"/>
<rect key="frame" x="0.0" y="0.0" width="374" height="21"/>
<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"/>
<nil key="highlightedColor"/>
</label>
<datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="date" style="wheels" translatesAutoresizingMaskIntoConstraints="NO" id="kau-8K-eQs">
<rect key="frame" x="0.0" y="37" width="374" height="100"/>
<rect key="frame" x="0.0" y="36" width="374" height="100"/>
<constraints>
<constraint firstAttribute="height" constant="100" id="QOf-a4-wdZ"/>
</constraints>
@@ -864,16 +864,16 @@ Retry after some time</string>
</scenes>
<designables>
<designable name="arD-av-w7V">
<size key="intrinsicContentSize" width="169.5" height="21"/>
<size key="intrinsicContentSize" width="168" height="20.5"/>
</designable>
<designable name="fZS-d6-t0h">
<size key="intrinsicContentSize" width="169" height="21"/>
<size key="intrinsicContentSize" width="166" height="20.5"/>
</designable>
<designable name="fiK-Gg-JDj">
<size key="intrinsicContentSize" width="169.5" height="21"/>
<size key="intrinsicContentSize" width="168" height="20.5"/>
</designable>
<designable name="zMI-2r-pRQ">
<size key="intrinsicContentSize" width="169" height="21"/>
<size key="intrinsicContentSize" width="166" height="20.5"/>
</designable>
</designables>
<resources>

34
WOKA/Theme/Base.lproj/Theme.storyboard
View File

@@ -340,7 +340,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ugr-Tf-Y1l">
<rect key="frame" x="200" y="197" width="100" height="100"/>
<rect key="frame" x="190" y="197" width="100" height="100"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="JHO-R6-WGZ" userLabel="Audio Books">
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
@@ -410,11 +410,18 @@
<constraint firstAttribute="trailing" secondItem="qS4-gX-qTX" secondAttribute="trailing" constant="10" id="YH1-ZC-Y0B"/>
<constraint firstItem="qS4-gX-qTX" firstAttribute="top" secondItem="ppi-HI-rj1" secondAttribute="top" constant="-20" id="Z3W-nR-aoM"/>
<constraint firstItem="yuF-d6-Tag" firstAttribute="top" secondItem="qS4-gX-qTX" secondAttribute="bottom" constant="19.999999999999943" id="ZgC-j6-kZn"/>
<constraint firstItem="ugr-Tf-Y1l" firstAttribute="leading" secondItem="gk8-xm-Hh5" secondAttribute="trailing" constant="65" id="iiR-AX-YQG"/>
<constraint firstItem="ugr-Tf-Y1l" firstAttribute="leading" secondItem="gk8-xm-Hh5" secondAttribute="trailing" constant="55" id="iiR-AX-YQG"/>
<constraint firstItem="feU-AA-gLO" firstAttribute="centerX" secondItem="ppi-HI-rj1" secondAttribute="centerX" id="uhu-hH-X3m"/>
<constraint firstItem="GGC-rX-Pyw" firstAttribute="centerY" secondItem="feU-AA-gLO" secondAttribute="centerY" constant="30" id="vSh-CJ-Awg"/>
</constraints>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HomeTestBanner" translatesAutoresizingMaskIntoConstraints="NO" id="0qL-H2-cMA">
<rect key="frame" x="304" y="742" width="100" height="100"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" secondItem="0qL-H2-cMA" secondAttribute="height" multiplier="1:1" id="lvT-7F-Nt9"/>
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="-2" translatesAutoresizingMaskIntoConstraints="NO" id="LYo-Uy-0nM" userLabel="More">
<rect key="frame" x="173.5" y="802" width="67.5" height="45"/>
<subviews>
@@ -446,6 +453,7 @@
<constraint firstItem="jdZ-WQ-xcr" firstAttribute="leading" secondItem="vdl-cu-G32" secondAttribute="leading" id="5lp-Gk-fkY"/>
<constraint firstItem="s5k-HV-Zkc" firstAttribute="leading" secondItem="rkf-MW-5IL" secondAttribute="trailing" constant="15" id="6G7-em-SiG"/>
<constraint firstItem="Qfe-q3-rbY" firstAttribute="top" secondItem="vdl-cu-G32" secondAttribute="top" constant="5" id="6TP-Kg-skA"/>
<constraint firstItem="vdl-cu-G32" firstAttribute="bottom" secondItem="0qL-H2-cMA" secondAttribute="bottom" constant="20" id="6z6-In-tqu"/>
<constraint firstItem="vdl-cu-G32" firstAttribute="trailing" secondItem="t3E-Cj-I2d" secondAttribute="trailing" constant="105" id="7TO-IK-CxZ"/>
<constraint firstItem="edI-4n-4AY" firstAttribute="height" secondItem="UEh-jl-IQp" secondAttribute="height" multiplier="0.13412" id="9la-bJ-w4R"/>
<constraint firstAttribute="bottom" secondItem="ppi-HI-rj1" secondAttribute="bottom" id="Ahn-Nf-O3r"/>
@@ -470,10 +478,12 @@
<constraint firstItem="jdZ-WQ-xcr" firstAttribute="height" secondItem="UEh-jl-IQp" secondAttribute="height" multiplier="0.625" id="dfh-6o-p0D"/>
<constraint firstItem="LYo-Uy-0nM" firstAttribute="centerX" secondItem="vdl-cu-G32" secondAttribute="centerX" id="f0k-KL-GNO"/>
<constraint firstItem="s5k-HV-Zkc" firstAttribute="centerY" secondItem="rkf-MW-5IL" secondAttribute="centerY" id="fHp-Jm-GAf"/>
<constraint firstItem="vdl-cu-G32" firstAttribute="trailing" secondItem="0qL-H2-cMA" secondAttribute="trailing" constant="10" id="jKA-Na-VIP"/>
<constraint firstItem="jdZ-WQ-xcr" firstAttribute="top" secondItem="UEh-jl-IQp" secondAttribute="top" id="kVK-dJ-BXA"/>
<constraint firstItem="kzE-UE-7KK" firstAttribute="centerX" secondItem="vdl-cu-G32" secondAttribute="centerX" id="lxF-lj-Z1U"/>
<constraint firstItem="XTn-ID-1Yb" firstAttribute="leading" secondItem="vdl-cu-G32" secondAttribute="leading" constant="20" id="pPN-hO-fOe"/>
<constraint firstItem="vdl-cu-G32" firstAttribute="trailing" secondItem="Jbf-Kl-35X" secondAttribute="trailing" constant="30" id="pzf-si-aC5"/>
<constraint firstItem="0qL-H2-cMA" firstAttribute="height" secondItem="UEh-jl-IQp" secondAttribute="height" multiplier="0.111607" id="qGT-xL-8lM"/>
<constraint firstItem="vdl-cu-G32" firstAttribute="bottom" secondItem="LYo-Uy-0nM" secondAttribute="bottom" constant="15" id="qYM-va-cyv"/>
<constraint firstItem="kzE-UE-7KK" firstAttribute="height" secondItem="UEh-jl-IQp" secondAttribute="height" multiplier="0.212054" id="s5Y-TI-1sZ"/>
<constraint firstItem="ppi-HI-rj1" firstAttribute="height" secondItem="UEh-jl-IQp" secondAttribute="height" multiplier="0.535714" id="sLx-ty-T4s"/>
@@ -485,6 +495,7 @@
<tabBarItem key="tabBarItem" title="HOME" image="HomeIcon" selectedImage="HomeIcon" id="4Hm-tg-Heb"/>
<connections>
<outlet property="HelloLabel" destination="YmK-3m-WeD" id="H6O-kI-Xc3"/>
<outlet property="adBanner" destination="0qL-H2-cMA" id="5XM-oT-mgb"/>
<outlet property="allIconView" destination="ppi-HI-rj1" id="dyR-6s-6Xm"/>
<outlet property="audioBooksView" destination="ugr-Tf-Y1l" id="O1d-Jo-Roc"/>
<outlet property="avatarImage" destination="o2x-QJ-V9A" id="rgu-lT-WaZ"/>
@@ -561,16 +572,16 @@
</constraints>
</view>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="U0W-18-4oe">
<rect key="frame" x="0.0" y="45" width="414" height="224"/>
<rect key="frame" x="0.0" y="45" width="414" height="222.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Coming Soon on WOKA" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D2p-c5-usH" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="10" y="10" width="394" height="24"/>
<rect key="frame" x="10" y="10" width="394" height="22.5"/>
<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>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UKc-92-GPa">
<rect key="frame" x="10" y="44" width="394" height="180"/>
<rect key="frame" x="10" y="42.5" width="394" height="180"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="MasilaComingSoon" translatesAutoresizingMaskIntoConstraints="NO" id="Kj9-jH-Y88">
<rect key="frame" x="7" y="7" width="380" height="140"/>
@@ -632,7 +643,7 @@
<edgeInsets key="layoutMargins" top="10" left="10" bottom="0.0" right="10"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Qcq-yj-AzB">
<rect key="frame" x="0.0" y="269" width="414" height="209"/>
<rect key="frame" x="0.0" y="267.5" width="414" height="209"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="BLOGS" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lW0-W4-2hl" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="10" y="10" width="394" height="24"/>
@@ -658,7 +669,7 @@
<edgeInsets key="layoutMargins" top="10" left="10" bottom="0.0" right="10"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="pJu-fq-XmG">
<rect key="frame" x="0.0" y="478" width="414" height="321"/>
<rect key="frame" x="0.0" y="476.5" width="414" height="322.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="WOKA Songs" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FSJ-QT-rAW" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="10" y="10" width="394" height="24"/>
@@ -667,7 +678,7 @@
<nil key="highlightedColor"/>
</label>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="31Z-fz-1ec">
<rect key="frame" x="10" y="44" width="394" height="277"/>
<rect key="frame" x="10" y="44" width="394" height="278.5"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</tableView>
</subviews>
@@ -676,7 +687,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="7bh-PD-sIH">
<rect key="frame" x="164.5" y="441" width="85" height="20"/>
<rect key="frame" x="164.5" y="439.5" width="85" height="20"/>
<subviews>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="S8Q-xR-4aq">
<rect key="frame" x="0.0" y="0.0" width="85" height="20"/>
@@ -707,7 +718,7 @@
</constraints>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="xv5-81-JIV">
<rect key="frame" x="164.5" y="708.5" width="85" height="20"/>
<rect key="frame" x="164.5" y="708" width="85" height="20"/>
<subviews>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="dLn-zw-LM2">
<rect key="frame" x="0.0" y="0.0" width="85" height="20"/>
@@ -1377,6 +1388,7 @@
<image name="Games" width="164" height="130.5"/>
<image name="HomeGrassDay" width="570.66668701171875" height="641.33331298828125"/>
<image name="HomeIcon" width="26.5" height="26.5"/>
<image name="HomeTestBanner" width="85.333335876464844" height="85.333335876464844"/>
<image name="Karaoke" width="172" height="137"/>
<image name="LiveHindi" width="326.66665649414062" height="176.66667175292969"/>
<image name="LiveTV" width="172" height="122.5"/>
@@ -1402,7 +1414,7 @@
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
<systemColor name="systemBrownColor">
<color red="0.63529411759999999" green="0.51764705879999995" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.63529411764705879" green="0.51764705882352946" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>

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

@@ -35,18 +35,19 @@ class ThemeOneVC: UIViewController {
@IBOutlet weak var karaokeView: UIView!
@IBOutlet weak var shopView: UIView!
@IBOutlet weak var allIconView: UIView!
@IBOutlet weak var adBanner: UIImageView!
@IBOutlet weak var liveTVActivityIndicator: UIActivityIndicatorView!
var timer: Timer?
var vm = ThemeOneVM()
weak var delegate: ChildViewControllerDelegate?
// MARK: - LifeCycle
deinit{
timer?.invalidate()
// Removing observers
@@ -100,6 +101,7 @@ class ThemeOneVC: UIViewController {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
guard let self else{return}
vm.moveLiveTVView()
vm.moveCloudView()
}
if let player = vm.avPlayer{
player.play()

6
WOKA/Theme/View/BlogsCell.swift
View File

@@ -20,7 +20,11 @@ class BlogsCell: UICollectionViewCell {
}
func setData(data : BlogDM.Blog){
self.blogImage.imageURL(data.thumbnailPath!)
if let url = data.thumbnailPath{
self.blogImage.imageURL(data.thumbnailPath!)
}else{
self.blogImage.image = UIImage(named: "Placeholder")
}
self.blogTitle.text = data.title
}
}

8
WOKA/Theme/ViewModel/MoreVM.swift
View File

@@ -75,8 +75,12 @@ class MoreVM{
if self.player?.currentTime() == self.player?.currentItem?.duration {
print("Player finished playing")
self.playerStatus = .stopped
self.vc.songTableView.reloadRows(at: [IndexPath(row: currentIndexPlayingSong!, section: 0)], with: .none)
currentIndexPlayingSong = nil
if let currentIndexPlayingSong{
self.vc.songTableView.reloadRows(at: [IndexPath(row: currentIndexPlayingSong, section: 0)], with: .none)
self.currentIndexPlayingSong = nil
}else{
self.vc.songTableView.reloadData()
}
} else {
print("Player is paused")
self.playerStatus = .pause

42
WOKA/Theme/ViewModel/ThemeOneVM.swift
View File

@@ -30,7 +30,7 @@ class ThemeOneVM{
func initView(){
AuthFunc.shareInstance.initTimePeriods()
startInitialTimer()
moveCloudView()
// moveCloudView()
handleTaps()
setUserData()
handleNotificationCenter()
@@ -45,11 +45,11 @@ class ThemeOneVM{
self.vc.allIconView.transform = CGAffineTransform(scaleX: 0.5, y: 0.5) // Set initial scale to 50% of original size
// Perform the animation after the view has been laid out
DispatchQueue.main.async {
UIView.animate(withDuration: 0.7, delay: 0, options: [], animations: {
UIView.animate(withDuration: 0.7, delay: 0, options: [], animations: {
DispatchQueue.main.async {
self.vc.allIconView.transform = CGAffineTransform.identity // Reset the transform to original size
}, completion: nil)
}
}
}, completion: nil)
}
private func handleNotificationCenter(){
@@ -180,6 +180,7 @@ class ThemeOneVM{
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
guard let self else{return}
moveLiveTVView()
moveCloudView()
}
if let player = avPlayer{
player.play()
@@ -267,6 +268,20 @@ class ThemeOneVM{
self.checkType(action: .liveTV)
}
}
/*
If ad banner is set then show the banner
*/
vc.adBanner.addTapGesture {
ViewButtonAnimation.sharedInstance.btnTapped(in: self.vc, view: self.vc.adBanner) { [weak self] in
guard let self else{return}
//check url from api
if let url = URL(string: "https://stackoverflow.com/questions/51068874/open-web-url-link-in-browser-in-swift"), UIApplication.shared.canOpenURL(url) {
UIApplication.shared.open(url)
}
}
}
}
//Get the notification from observer
@@ -363,6 +378,16 @@ class ThemeOneVM{
self.vc.liveTVView.center.x = self.vc.view.center.x // Center the liveTVView horizontally
self.vc.liveTVView.layoutIfNeeded()
}
}
func centerCloudsHorizontally() {
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
self.vc.cloud1.center.x = self.vc.view.center.x // Center the liveTVView horizontally
self.vc.cloud2.center.x = self.vc.view.center.x // Center the liveTVView horizontally
self.vc.cloud1.layoutIfNeeded()
self.vc.cloud2.layoutIfNeeded()
}
}
func moveLiveTVView() {
@@ -397,6 +422,10 @@ class ThemeOneVM{
}
func moveCloudView() {
guard shouldAnimate else {
centerCloudsHorizontally()
return
}
UIView.animate(withDuration: 23, delay: 0, options: [], animations: { [weak self] in
guard let self else{return}
if cloudMovingRight {
@@ -508,7 +537,8 @@ class ThemeOneVM{
guard let self else{return}
isMovingRight = false
self.avPlayer.play()
self.moveLiveTVView()
// self.moveLiveTVView()
// self.moveCloudView()
self.vc.liveTvPlayer.layoutIfNeeded()
}
print("Player Will Exit")

4
WOKA/WOKAFM/ViewModel/WokaFMVM.swift
View File

@@ -45,7 +45,8 @@ class WokaFMVM{
func setupPlayer() {
guard let data = AuthFunc.shareInstance.staticURLs , let liveFmURL = data.liveFmData?.liveFmURL else{
self.vc.toast(msg: "Issue with Radio", time: 2)
AuthFunc.shareInstance.getStaticURLs()
self.vc.toast(msg: "Issue with radio, please try after sometime.", time: 2)
return
}
@@ -53,6 +54,7 @@ class WokaFMVM{
// guard let url = URL(string: "https://a9.asurahosting.com:7530/radio.mp3") else{return}
playerItem = AVPlayerItem(url: url)
player = AVPlayer(playerItem: playerItem)
player.play()
}
func retryConnect(){

4
WOKA/WebSeries/Controller/WebSeriesSeasonVC.swift
View File

@@ -44,6 +44,9 @@ class WebSeriesSeasonVC: UIViewController {
@IBOutlet weak var loadMoreBtn: LocalisedElementsButton!
@IBOutlet weak var loadMoreActivityIndicator: UIActivityIndicatorView!
@IBOutlet weak var scrollView: UIScrollView!
@IBOutlet weak var noDataStack: UIStackView!
var likeFavDelegate : ReloadSeriesFavLike?
override func viewDidLoad() {
@@ -119,6 +122,7 @@ class WebSeriesSeasonVC: UIViewController {
}
@IBAction func retryBtnTapped(_ sender: LocalisedElementsButton) {
vm.getSeasonListing()
}
}

4
WOKA/WebSeries/ViewModel/WebSeriesSeasonVM.swift
View File

@@ -237,9 +237,12 @@ class WebSeriesSeasonVM{
*/
Utilities.dismissProgressHUD()
vc.toast(msg: data.message ?? "Unrecognised error" , time: 2)
self.vc.noDataStack.isHidden = false
case 1:
Utilities.dismissProgressHUD()
guard let data = data.data?.result else{return}
self.vc.noDataStack.isHidden = true
self.vc.scrollView.isHidden = false
self.seasonListingData = data
episodeSelectedCateogory = seasonListingData.first?.id
setSeasonData()
@@ -257,6 +260,7 @@ class WebSeriesSeasonVM{
return
}
Utilities.dismissProgressHUD()
self.vc.noDataStack.isHidden = false
vc.toast(msg: error.localizedDescription , time: 2)
}
}

44
WOKA/WebSeries/WebSeries.storyboard
View File

@@ -359,7 +359,7 @@
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" directionalLockEnabled="YES" showsHorizontalScrollIndicator="NO" indicatorStyle="white" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ka5-Rt-V3L">
<scrollView hidden="YES" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" directionalLockEnabled="YES" showsHorizontalScrollIndicator="NO" indicatorStyle="white" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ka5-Rt-V3L">
<rect key="frame" x="0.0" y="59" width="393" height="793"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="JVZ-ee-mig">
@@ -474,7 +474,7 @@
<rect key="frame" x="340.66666666666669" y="0.0" width="32.333333333333314" height="49"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="hand.thumbsup.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="eng-oC-d9H">
<rect key="frame" x="0.0" y="0.66666666666666785" width="20" height="47.666666666666671"/>
<rect key="frame" x="0.0" y="0.66666666666666785" width="20" height="47.666666666666657"/>
<color key="tintColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Egv-Cu-aPK">
@@ -793,14 +793,52 @@
<viewLayoutGuide key="contentLayoutGuide" id="QMw-h5-HV5"/>
<viewLayoutGuide key="frameLayoutGuide" id="6BC-EI-c6S"/>
</scrollView>
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="MKx-HL-GiZ">
<rect key="frame" x="84.666666666666686" y="339.66666666666669" width="224" height="198.00000000000006"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SupportGirlImage" translatesAutoresizingMaskIntoConstraints="NO" id="ulE-vR-c1s">
<rect key="frame" x="29" y="0.0" width="166" height="130"/>
<constraints>
<constraint firstAttribute="height" constant="130" id="Dfk-dK-YeC"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Something went wrong." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MDT-p0-yOq" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="0.0" y="135" width="224" height="24"/>
<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>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yjl-Lw-O8h" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
<rect key="frame" x="44.333333333333329" y="164" width="135" height="34"/>
<constraints>
<constraint firstAttribute="width" constant="135" id="145-ZS-ak4"/>
</constraints>
<fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<inset key="titleEdgeInsets" minX="10" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Retry?"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<integer key="value" value="25"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="retryBtnTapped:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="05U-AK-6DD"/>
<action selector="retryBtnTapped:" destination="sPj-Um-9Xm" eventType="touchUpInside" id="OJz-nB-OQT"/>
</connections>
</button>
</subviews>
</stackView>
</subviews>
<viewLayoutGuide key="safeArea" id="5r4-z5-Bnx"/>
<color key="backgroundColor" red="0.019607843140000001" green="0.0" blue="0.21960784310000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Ka5-Rt-V3L" firstAttribute="top" secondItem="5r4-z5-Bnx" secondAttribute="top" id="9Yv-dh-L30"/>
<constraint firstItem="MKx-HL-GiZ" firstAttribute="centerY" secondItem="5r4-z5-Bnx" secondAttribute="centerY" id="Ace-kt-N70"/>
<constraint firstAttribute="bottom" secondItem="Ka5-Rt-V3L" secondAttribute="bottom" id="HYj-vK-Xwc"/>
<constraint firstItem="ygJ-Op-sJP" firstAttribute="height" secondItem="wXX-wW-Iuz" secondAttribute="height" multiplier="0.223005" id="g65-es-mTS"/>
<constraint firstItem="Ka5-Rt-V3L" firstAttribute="leading" secondItem="5r4-z5-Bnx" secondAttribute="leading" id="imN-IN-JUq"/>
<constraint firstItem="MKx-HL-GiZ" firstAttribute="centerX" secondItem="5r4-z5-Bnx" secondAttribute="centerX" id="wAE-I9-ekE"/>
<constraint firstItem="Ka5-Rt-V3L" firstAttribute="trailing" secondItem="5r4-z5-Bnx" secondAttribute="trailing" id="y4K-6C-hRq"/>
</constraints>
</view>
@@ -816,6 +854,8 @@
<outlet property="likeView" destination="GRu-Ep-rmR" id="F5U-OH-z0d"/>
<outlet property="loadMoreActivityIndicator" destination="eSs-vC-anB" id="Ehy-49-VBM"/>
<outlet property="loadMoreBtn" destination="ORc-ik-Kgr" id="8mA-Cd-TBN"/>
<outlet property="noDataStack" destination="MKx-HL-GiZ" id="VOi-TC-bfe"/>
<outlet property="scrollView" destination="Ka5-Rt-V3L" id="fhE-mL-ilt"/>
<outlet property="seasonDate" destination="3AX-wl-iqI" id="4Zq-76-ZN2"/>
<outlet property="seasonDesc" destination="DLr-9j-LSn" id="hpg-2G-M9N"/>
<outlet property="seasonEpisodes" destination="G0i-Q1-Tic" id="t9J-Zm-eqb"/>