From d66df15fbb015acc54c136e85754e3cea5298347 Mon Sep 17 00:00:00 2001 From: BilalKhanWDI Date: Mon, 2 Sep 2024 19:59:53 +0530 Subject: [PATCH] - Fixed TC 51, TC 49, TC 48, TC 46 - TC 52, 53 - Added banner to home --- WOKA.xcodeproj/project.pbxproj | 20 ++--- WOKA/Address/Address.storyboard | 84 +++++++++--------- WOKA/Address/Controller/AddNewAddressVC.swift | 13 +-- .../Controller/VerifyAddressPincodeVC.swift | 11 ++- .../Assets.xcassets/Banners/Contents.json | 6 ++ .../HomeTestBanner.imageset/Contents.json | 21 +++++ .../HomeTestBanner.imageset/app-banners.png | Bin 0 -> 28477 bytes .../Placeholder.imageset/Contents.json | 21 +++++ .../Placeholder.imageset/Untitled design.png | Bin 0 -> 10271 bytes .../Base.lproj/AuthenticationSB.storyboard | 40 ++++----- .../Controller/UserDetailsRegisterVC.swift | 39 +++++--- .../ViewModel/UserDetailsRegisterVM.swift | 20 ----- WOKA/Helpers/LoadingIndicatorImageView.swift | 2 - WOKA/Network Adapter/APIEndPoints.swift | 3 +- WOKA/Shop/Controller/ShopProductsVC.swift | 7 ++ WOKA/Shop/ViewModel/ShopProductsVM.swift | 12 +++ WOKA/SideBarNav/SideBarNav.storyboard | 64 ++++++------- WOKA/Theme/Base.lproj/Theme.storyboard | 34 ++++--- WOKA/Theme/Controller/ThemeOneVC.swift | 6 +- WOKA/Theme/View/BlogsCell.swift | 6 +- WOKA/Theme/ViewModel/MoreVM.swift | 8 +- WOKA/Theme/ViewModel/ThemeOneVM.swift | 42 +++++++-- WOKA/WOKAFM/ViewModel/WokaFMVM.swift | 4 +- .../Controller/WebSeriesSeasonVC.swift | 4 + .../ViewModel/WebSeriesSeasonVM.swift | 4 + WOKA/WebSeries/WebSeries.storyboard | 44 ++++++++- 26 files changed, 345 insertions(+), 170 deletions(-) create mode 100644 WOKA/Assets/Assets.xcassets/Banners/Contents.json create mode 100644 WOKA/Assets/Assets.xcassets/Banners/HomeTestBanner.imageset/Contents.json create mode 100644 WOKA/Assets/Assets.xcassets/Banners/HomeTestBanner.imageset/app-banners.png create mode 100644 WOKA/Assets/Assets.xcassets/Placeholder.imageset/Contents.json create mode 100644 WOKA/Assets/Assets.xcassets/Placeholder.imageset/Untitled design.png diff --git a/WOKA.xcodeproj/project.pbxproj b/WOKA.xcodeproj/project.pbxproj index 272d276..4eddd52 100644 --- a/WOKA.xcodeproj/project.pbxproj +++ b/WOKA.xcodeproj/project.pbxproj @@ -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 = ""; }; 52DAC64D2C21775300E2F85B /* WebSeriesVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSeriesVC.swift; sourceTree = ""; }; 52E214C62C2AD47F00BC2D29 /* EpisodeDetailsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EpisodeDetailsVC.swift; sourceTree = ""; }; + 52E5B3432C859104000291E0 /* WOKA.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WOKA.xcdatamodel; sourceTree = ""; }; 52E7E0F62BDF7DD500C86E10 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AuthenticationSB.strings; sourceTree = ""; }; 52E7E0F82BDF7DD900C86E10 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/AuthenticationSB.strings; sourceTree = ""; }; 52F477A42C492ED900F79200 /* JWPlayerKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = JWPlayerKit.xcframework; path = Pods/JWPlayerKit/JWPlayerKit.xcframework; sourceTree = ""; }; @@ -747,7 +748,6 @@ 9CDCE1412BDB94BA003FEF11 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Main.strings; sourceTree = ""; }; 9CDCE1422BDB94BD003FEF11 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = ""; }; 9CDCE1442BDB9B9A003FEF11 /* OnBoardMainSound.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = OnBoardMainSound.m4a; sourceTree = ""; }; - 9CF8994B2C8191F70038790E /* WOKA.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WOKA.xcdatamodel; sourceTree = ""; }; 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 = ""; }; /* 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 = ""; versionGroupType = wrapper.xcdatamodel; }; diff --git a/WOKA/Address/Address.storyboard b/WOKA/Address/Address.storyboard index 46f76d6..ed97c06 100644 --- a/WOKA/Address/Address.storyboard +++ b/WOKA/Address/Address.storyboard @@ -27,16 +27,16 @@ - + - + @@ -55,7 +55,7 @@