diff --git a/WOKA.xcodeproj/project.pbxproj b/WOKA.xcodeproj/project.pbxproj index d205275..c3fec10 100644 --- a/WOKA.xcodeproj/project.pbxproj +++ b/WOKA.xcodeproj/project.pbxproj @@ -68,6 +68,11 @@ 52663FFB2BDFB1700001D8CE /* TextFieldShadow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52663FFA2BDFB1700001D8CE /* TextFieldShadow.swift */; }; 5272FCE32BDFDB05000ECB1D /* UserDetailsRegisterVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5272FCE22BDFDB05000ECB1D /* UserDetailsRegisterVC.swift */; }; 5272FCE52BDFDC8C000ECB1D /* UserDetailsRegisterVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5272FCE42BDFDC8C000ECB1D /* UserDetailsRegisterVM.swift */; }; + 527AC6F72C171C8F00434FB7 /* BlogsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 527AC6F52C171C8F00434FB7 /* BlogsCell.swift */; }; + 527AC6F82C171C8F00434FB7 /* BlogsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 527AC6F62C171C8F00434FB7 /* BlogsCell.xib */; }; + 527AC6FA2C17387300434FB7 /* SongBlogDM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 527AC6F92C17387300434FB7 /* SongBlogDM.swift */; }; + 527AC6FD2C173A5100434FB7 /* SongListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 527AC6FB2C173A5100434FB7 /* SongListCell.swift */; }; + 527AC6FE2C173A5100434FB7 /* SongListCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 527AC6FC2C173A5100434FB7 /* SongListCell.xib */; }; 529B0DD42C06156B00CFC54B /* LoginNavVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 529B0DD32C06156B00CFC54B /* LoginNavVC.swift */; }; 529B0DD62C070C0F00CFC54B /* GuestDataDM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 529B0DD52C070C0F00CFC54B /* GuestDataDM.swift */; }; 52A3F6A52BECBA8D0000BB0B /* LinkedChildDM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52A3F6A42BECBA8D0000BB0B /* LinkedChildDM.swift */; }; @@ -91,6 +96,10 @@ 52BC3BE52C0E0326002FACA6 /* FaqCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BC3BE32C0E0326002FACA6 /* FaqCell.swift */; }; 52BC3BE62C0E0326002FACA6 /* FaqCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 52BC3BE42C0E0326002FACA6 /* FaqCell.xib */; }; 52BC3BE82C0E04A9002FACA6 /* FaqListDM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BC3BE72C0E04A9002FACA6 /* FaqListDM.swift */; }; + 52BC3BEC2C16DF9F002FACA6 /* MyOrdersVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BC3BEB2C16DF9F002FACA6 /* MyOrdersVC.swift */; }; + 52BC3BEE2C16FBDB002FACA6 /* MoreVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BC3BED2C16FBDB002FACA6 /* MoreVC.swift */; }; + 52BC3BF02C1701F8002FACA6 /* BlogDM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BC3BEF2C1701F8002FACA6 /* BlogDM.swift */; }; + 52BC3BF22C170264002FACA6 /* MoreVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BC3BF12C170264002FACA6 /* MoreVM.swift */; }; 52C1A4E12C05B69F007BAA50 /* UIApplicationSwitchRoot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52C1A4E02C05B69F007BAA50 /* UIApplicationSwitchRoot.swift */; }; 52C1A4E52C05BC86007BAA50 /* MainNavController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52C1A4E42C05BC86007BAA50 /* MainNavController.swift */; }; 52C1A4E82C05C95D007BAA50 /* Theme.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 52C1A4E72C05C95D007BAA50 /* Theme.storyboard */; }; @@ -260,6 +269,11 @@ 52663FFA2BDFB1700001D8CE /* TextFieldShadow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldShadow.swift; sourceTree = ""; }; 5272FCE22BDFDB05000ECB1D /* UserDetailsRegisterVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDetailsRegisterVC.swift; sourceTree = ""; }; 5272FCE42BDFDC8C000ECB1D /* UserDetailsRegisterVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDetailsRegisterVM.swift; sourceTree = ""; }; + 527AC6F52C171C8F00434FB7 /* BlogsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlogsCell.swift; sourceTree = ""; }; + 527AC6F62C171C8F00434FB7 /* BlogsCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BlogsCell.xib; sourceTree = ""; }; + 527AC6F92C17387300434FB7 /* SongBlogDM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SongBlogDM.swift; sourceTree = ""; }; + 527AC6FB2C173A5100434FB7 /* SongListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SongListCell.swift; sourceTree = ""; }; + 527AC6FC2C173A5100434FB7 /* SongListCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SongListCell.xib; sourceTree = ""; }; 529B0DD32C06156B00CFC54B /* LoginNavVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginNavVC.swift; sourceTree = ""; }; 529B0DD52C070C0F00CFC54B /* GuestDataDM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuestDataDM.swift; sourceTree = ""; }; 52A3F6A42BECBA8D0000BB0B /* LinkedChildDM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkedChildDM.swift; sourceTree = ""; }; @@ -284,6 +298,10 @@ 52BC3BE32C0E0326002FACA6 /* FaqCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaqCell.swift; sourceTree = ""; }; 52BC3BE42C0E0326002FACA6 /* FaqCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FaqCell.xib; sourceTree = ""; }; 52BC3BE72C0E04A9002FACA6 /* FaqListDM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaqListDM.swift; sourceTree = ""; }; + 52BC3BEB2C16DF9F002FACA6 /* MyOrdersVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyOrdersVC.swift; sourceTree = ""; }; + 52BC3BED2C16FBDB002FACA6 /* MoreVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreVC.swift; sourceTree = ""; }; + 52BC3BEF2C1701F8002FACA6 /* BlogDM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlogDM.swift; sourceTree = ""; }; + 52BC3BF12C170264002FACA6 /* MoreVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreVM.swift; sourceTree = ""; }; 52C1A4E02C05B69F007BAA50 /* UIApplicationSwitchRoot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIApplicationSwitchRoot.swift; sourceTree = ""; }; 52C1A4E42C05BC86007BAA50 /* MainNavController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainNavController.swift; sourceTree = ""; }; 52C1A4E62C05C95D007BAA50 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Theme.storyboard; sourceTree = ""; }; @@ -480,6 +498,7 @@ 9C7939182C0F345000F5D6E6 /* ContactSupportVC.swift */, 9CA7C6BF2C1093E500D73742 /* ProfileVC.swift */, 9C8C4FAD2C1315410017DD3B /* WebViewVC.swift */, + 52BC3BEB2C16DF9F002FACA6 /* MyOrdersVC.swift */, ); path = Controller; sourceTree = ""; @@ -850,6 +869,8 @@ isa = PBXGroup; children = ( 52FDBA772BFF23F4009D7AC7 /* TimePeriod.swift */, + 52BC3BEF2C1701F8002FACA6 /* BlogDM.swift */, + 527AC6F92C17387300434FB7 /* SongBlogDM.swift */, ); path = Model; sourceTree = ""; @@ -859,6 +880,10 @@ children = ( 9C535DC32C00BF2400DA6DCD /* HomeExploreCell.swift */, 9C535DC42C00BF2400DA6DCD /* HomeExploreCell.xib */, + 527AC6F52C171C8F00434FB7 /* BlogsCell.swift */, + 527AC6F62C171C8F00434FB7 /* BlogsCell.xib */, + 527AC6FB2C173A5100434FB7 /* SongListCell.swift */, + 527AC6FC2C173A5100434FB7 /* SongListCell.xib */, ); path = View; sourceTree = ""; @@ -923,6 +948,7 @@ 9CBCB2A92BE51A52007D7934 /* ThemeOneVC.swift */, 9C535DC12C00B36900DA6DCD /* ThemeTwoVC.swift */, 52AECA7F2C08BCB6004A7579 /* PlayerVC.swift */, + 52BC3BED2C16FBDB002FACA6 /* MoreVC.swift */, ); path = Controller; sourceTree = ""; @@ -932,6 +958,7 @@ children = ( 52FDBA7C2BFF481A009D7AC7 /* ThemeOneVM.swift */, 524C422A2C04781B0016A11C /* ThemeTwoVM.swift */, + 52BC3BF12C170264002FACA6 /* MoreVM.swift */, ); path = ViewModel; sourceTree = ""; @@ -1204,9 +1231,11 @@ 525954302BEA394400191286 /* CustomAlerts.storyboard in Resources */, 52C8B0632BDA6993003B51D0 /* Localizable.strings in Resources */, 523ED2672BDA2BC900CFED02 /* Assets.xcassets in Resources */, + 527AC6FE2C173A5100434FB7 /* SongListCell.xib in Resources */, 523ED26A2BDA2BC900CFED02 /* Base in Resources */, 52C8B05B2BDA5924003B51D0 /* WokaSplashSound.m4a in Resources */, 525954352BEB4B3B00191286 /* Exo2-Thin.ttf in Resources */, + 527AC6F82C171C8F00434FB7 /* BlogsCell.xib in Resources */, 52C1A4E82C05C95D007BAA50 /* Theme.storyboard in Resources */, 525954362BEB4B3B00191286 /* Exo2-Medium.ttf in Resources */, 525954372BEB4B3B00191286 /* Exo2-Bold.ttf in Resources */, @@ -1323,9 +1352,11 @@ 52AECA802C08BCB6004A7579 /* PlayerVC.swift in Sources */, 5202AB012BDFA7900043B7BD /* EmailValidation.swift in Sources */, 52B8D4E12C04A25E00ED65F3 /* BasicTransitionAnimator.swift in Sources */, + 52BC3BF02C1701F8002FACA6 /* BlogDM.swift in Sources */, 525954192BE8CC3400191286 /* ConstantString.swift in Sources */, 52D774EB2BDFC0BF001D87DE /* OTPVC.swift in Sources */, 9C27E16F2BDB866500EC1DA9 /* CellIdentifier.swift in Sources */, + 52BC3BF22C170264002FACA6 /* MoreVM.swift in Sources */, 9CBE1B412C0F37B300CA6E61 /* DPDUIView+Extension.swift in Sources */, 9C27E1632BDB6F1900EC1DA9 /* AuthFunc.swift in Sources */, 9C0A85412BEE35670093783D /* ResetPassUserNameVM.swift in Sources */, @@ -1335,6 +1366,7 @@ 52C6E01B2BE383C000E22D59 /* YourIntrestCell.swift in Sources */, 525954142BE8C87300191286 /* ExtensionVCToastAlert.swift in Sources */, 52B8D4D92C04A25E00ED65F3 /* UIViewController+Container.swift in Sources */, + 527AC6F72C171C8F00434FB7 /* BlogsCell.swift in Sources */, 523ED25E2BDA2BC700CFED02 /* AppDelegate.swift in Sources */, 9C7939132C0EFCAE00F5D6E6 /* FaqVM.swift in Sources */, 52D774ED2BDFC13F001D87DE /* OTPVM.swift in Sources */, @@ -1363,6 +1395,7 @@ 9CBCB2AA2BE51A52007D7934 /* ThemeOneVC.swift in Sources */, 52D774E92BDFBDA4001D87DE /* AuthenticationStringConstant.swift in Sources */, 5259541B2BE8D6F900191286 /* NetworkReachibility.swift in Sources */, + 527AC6FD2C173A5100434FB7 /* SongListCell.swift in Sources */, 9C27E1672BDB706700EC1DA9 /* StoryBoard.swift in Sources */, 52C8B0692BDA6E1E003B51D0 /* LocalizedEnum.swift in Sources */, 525954122BE8C84900191286 /* Toast.swift in Sources */, @@ -1373,6 +1406,7 @@ 52A3F6AF2BECC0690000BB0B /* LinkedChildVM.swift in Sources */, 525954252BE8F01600191286 /* ValueWrapper.swift in Sources */, 52A3F6A82BECBF2A0000BB0B /* LinkedChildCell.swift in Sources */, + 52BC3BEE2C16FBDB002FACA6 /* MoreVC.swift in Sources */, 52C6E01E2BE3847F00E22D59 /* BorderView.swift in Sources */, 52FDBA7D2BFF481A009D7AC7 /* ThemeOneVM.swift in Sources */, 9C7939192C0F345000F5D6E6 /* ContactSupportVC.swift in Sources */, @@ -1381,6 +1415,7 @@ 5219C2C22C086D9C00A1DF4D /* DataTypeConversion.swift in Sources */, 525953CF2BE8B28F00191286 /* Utilities.swift in Sources */, 9CBCB2A12BE4E50A007D7934 /* TextFieldPassword.swift in Sources */, + 52BC3BEC2C16DF9F002FACA6 /* MyOrdersVC.swift in Sources */, 9C56E8482BDBEFAB00E4CA14 /* AssetColor.swift in Sources */, 9C0A85432BEE3EC90093783D /* NewPasswordVM.swift in Sources */, 524C42332C049D590016A11C /* CustomizableSegmentControl.swift in Sources */, @@ -1395,6 +1430,7 @@ 525954272BE9178F00191286 /* UserDataDM.swift in Sources */, 9C27E1652BDB6FBC00EC1DA9 /* StoryBoardID.swift in Sources */, 52FDBA782BFF23F4009D7AC7 /* TimePeriod.swift in Sources */, + 527AC6FA2C17387300434FB7 /* SongBlogDM.swift in Sources */, 522A931C2C0DE9150098FE49 /* AboutUsVc.swift in Sources */, 9CB4C5A92C118EF300737C00 /* NavBarColor.swift in Sources */, 525954322BEA39D200191286 /* AddTapGesture.swift in Sources */, diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme1/BlogOuterView.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Home/Theme1/BlogOuterView.imageset/Contents.json new file mode 100644 index 0000000..d0920df --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/Home/Theme1/BlogOuterView.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group 184.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme1/BlogOuterView.imageset/Group 184.png b/WOKA/Assets/Assets.xcassets/Home/Theme1/BlogOuterView.imageset/Group 184.png new file mode 100644 index 0000000..7e2f0da Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Theme1/BlogOuterView.imageset/Group 184.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme1/MoreBG.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Home/Theme1/MoreBG.imageset/Contents.json new file mode 100644 index 0000000..7036f03 --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/Home/Theme1/MoreBG.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "img_more_bg.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme1/MoreBG.imageset/img_more_bg.png b/WOKA/Assets/Assets.xcassets/Home/Theme1/MoreBG.imageset/img_more_bg.png new file mode 100644 index 0000000..29ec334 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Theme1/MoreBG.imageset/img_more_bg.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/Contents.json new file mode 100644 index 0000000..bb0c813 --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "icons8-down_button.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icons8-down_button@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icons8-down_button@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/icons8-down_button.png b/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/icons8-down_button.png new file mode 100644 index 0000000..e6de5f0 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/icons8-down_button.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/icons8-down_button@2x.png b/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/icons8-down_button@2x.png new file mode 100644 index 0000000..952fd7a Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/icons8-down_button@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/icons8-down_button@3x.png b/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/icons8-down_button@3x.png new file mode 100644 index 0000000..27584cc Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Theme1/UpArrowMore.imageset/icons8-down_button@3x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Contents.json new file mode 100644 index 0000000..c648f1c --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "Group 183.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group 183@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group 183@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "original" + } +} diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Group 183.png b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Group 183.png new file mode 100644 index 0000000..11d5eb1 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Group 183.png differ diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Group 183@2x.png b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Group 183@2x.png new file mode 100644 index 0000000..51627c5 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Group 183@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Group 183@3x.png b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Group 183@3x.png new file mode 100644 index 0000000..30fda85 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/CartIcon.imageset/Group 183@3x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/OrderBottom.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/OrderBottom.imageset/Contents.json new file mode 100644 index 0000000..e2cb707 --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/OrderBottom.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "bg.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "original" + } +} diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/OrderBottom.imageset/bg.png b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/OrderBottom.imageset/bg.png new file mode 100644 index 0000000..e26f491 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/OrderBottom.imageset/bg.png differ diff --git a/WOKA/Constants K/CellIdentifier.swift b/WOKA/Constants K/CellIdentifier.swift index 563a5c0..b83b809 100644 --- a/WOKA/Constants K/CellIdentifier.swift +++ b/WOKA/Constants K/CellIdentifier.swift @@ -30,5 +30,10 @@ extension K{ struct SideBarNav{ static let faqCell = "FaqCell" } + + struct Home{ + static let blogsCell = "BlogsCell" + static let songListCell = "SongListCell" + } } } diff --git a/WOKA/Constants K/StoryBoardID.swift b/WOKA/Constants K/StoryBoardID.swift index 8268392..efa9015 100644 --- a/WOKA/Constants K/StoryBoardID.swift +++ b/WOKA/Constants K/StoryBoardID.swift @@ -41,6 +41,7 @@ extension K{ struct Theme{ static let themeOneVC = "ThemeOneVC" static let themeTwoVC = "ThemeTwoVC" + static let moreVC = "MoreVC" } struct SideBarNav{ @@ -49,6 +50,7 @@ extension K{ static let contactSupportVC = "ContactSupportVC" static let profileVC = "ProfileVC" static let webViewVC = "WebViewVC" + static let myOrdersVC = "MyOrdersVC" } } } diff --git a/WOKA/Network Adapter/APIEndPoints.swift b/WOKA/Network Adapter/APIEndPoints.swift index 63f09d0..db10649 100644 --- a/WOKA/Network Adapter/APIEndPoints.swift +++ b/WOKA/Network Adapter/APIEndPoints.swift @@ -64,6 +64,11 @@ struct APIEndPoints { static let user_deactivate_account = makeURL(path: "user_deactivate_account") } + struct Home{ + static let blogs = makeURL(path: "blogs") + static let song_listing = makeURL(path: "song_listing") + } + // Other endpoint categories... struct Links { static let privacyPolicy = "https://www.wokaland.com/privacy-policy/" diff --git a/WOKA/SideBarNav/Controller/FaqVC.swift b/WOKA/SideBarNav/Controller/FaqVC.swift index e4a306a..dfb5d8b 100644 --- a/WOKA/SideBarNav/Controller/FaqVC.swift +++ b/WOKA/SideBarNav/Controller/FaqVC.swift @@ -42,10 +42,11 @@ class FaqVC: UIViewController { override func viewWillDisappear(_ animated: Bool) { super.viewWillDisappear(animated) navigationController?.setNavigationBarHidden(true, animated: animated) - - self.navigationController?.setColor(color: .black) } + override func viewDidDisappear(_ animated: Bool) { + self.navigationController?.setColor(color: .black) + } } // MARK: - TableView DataSource , Delegates diff --git a/WOKA/SideBarNav/Controller/MyOrdersVC.swift b/WOKA/SideBarNav/Controller/MyOrdersVC.swift new file mode 100644 index 0000000..1ef44f4 --- /dev/null +++ b/WOKA/SideBarNav/Controller/MyOrdersVC.swift @@ -0,0 +1,71 @@ +// +// MyOrdersVC.swift +// WOKA +// +// Created by MacBook Pro on 10/06/24. +// + +import UIKit + +class MyOrdersVC: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + self.title = "MY ORDERS" + + // Create the button + let backbutton = UIButton(type: .custom) + backbutton.setImage(UIImage(named: "CartIcon"), for: .normal) // Image can be downloaded from the provided link + backbutton.setTitleColor(.black, for: .normal) // You can change the TitleColor + backbutton.addTarget(self, action: #selector(cartBtnTapped), for: .touchUpInside) + + // Set button height and width + let buttonHeight: CGFloat = 60 + let buttonWidth: CGFloat = 60 + backbutton.translatesAutoresizingMaskIntoConstraints = false + backbutton.widthAnchor.constraint(equalToConstant: buttonWidth).isActive = true + backbutton.heightAnchor.constraint(equalToConstant: buttonHeight).isActive = true + + // Create a container view for the button + let containerView = UIView(frame: CGRect(x: 0, y: 0, width: buttonWidth, height: buttonHeight)) + containerView.addSubview(backbutton) + + // Set constraints for the button inside the container view + NSLayoutConstraint.activate([ + backbutton.centerYAnchor.constraint(equalTo: containerView.centerYAnchor), + backbutton.centerXAnchor.constraint(equalTo: containerView.centerXAnchor) + ]) + + // Create a UIBarButtonItem with the custom view + let customBarButton = UIBarButtonItem(customView: containerView) + + // Create a flexible space item to push the custom view to the left + let flexibleSpace = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil) + flexibleSpace.width = 20 + // Create a negative spacer to fine-tune the position + let negativeSpacer = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil) + negativeSpacer.width = 10 // Adjust this value to move the button to the left + + // Add the custom bar button and the spacer to the navigation bar + self.navigationItem.rightBarButtonItems = [flexibleSpace,negativeSpacer, customBarButton] + + } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + navigationController?.setNavigationBarHidden(false, animated: animated) + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + navigationController?.setNavigationBarHidden(true, animated: animated) + } + + override func viewDidDisappear(_ animated: Bool) { + self.navigationController?.setColor(color: .black) + } + + @objc func cartBtnTapped(){ + + } +} diff --git a/WOKA/SideBarNav/SideBarNav.storyboard b/WOKA/SideBarNav/SideBarNav.storyboard index 7e5aa1a..b3e8f0f 100644 --- a/WOKA/SideBarNav/SideBarNav.storyboard +++ b/WOKA/SideBarNav/SideBarNav.storyboard @@ -131,7 +131,7 @@ - + @@ -225,16 +225,16 @@ - + - + - + - + @@ -378,10 +378,10 @@ - + - + @@ -403,7 +403,7 @@ - + - + @@ -439,7 +439,7 @@ - + - + @@ -475,7 +475,7 @@ - + - + - +