diff --git a/Podfile b/Podfile index 4fad18a..e6eb8ab 100644 --- a/Podfile +++ b/Podfile @@ -17,7 +17,7 @@ target 'WOKA' do pod 'SDWebImage', '~> 5.19.1' #JwPlayer - pod 'JWPlayerKit', '>= 4.0.0' +# pod 'JWPlayerKit', '>= 4.0.0' # Bottom line is for removing IPHONEOS_DEPLOYMENT_TARGET post_install do |installer| diff --git a/WOKA.xcodeproj/project.pbxproj b/WOKA.xcodeproj/project.pbxproj index 74e2872..f7c431f 100644 --- a/WOKA.xcodeproj/project.pbxproj +++ b/WOKA.xcodeproj/project.pbxproj @@ -13,6 +13,9 @@ 522242662BFC74380085C632 /* MyListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522242632BFC74380085C632 /* MyListVC.swift */; }; 522242682BFC74380085C632 /* TabBarVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522242652BFC74380085C632 /* TabBarVC.swift */; }; 5222426A2BFC7AFC0085C632 /* SideMenuVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522242692BFC7AFC0085C632 /* SideMenuVC.swift */; }; + 522A93132C0DB5D50098FE49 /* JWPlayerKit in Frameworks */ = {isa = PBXBuildFile; productRef = 522A93122C0DB5D50098FE49 /* JWPlayerKit */; }; + 522A931A2C0DE8CC0098FE49 /* SideBarNav.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 522A93192C0DE8CC0098FE49 /* SideBarNav.storyboard */; }; + 522A931C2C0DE9150098FE49 /* AboutUsVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522A931B2C0DE9150098FE49 /* AboutUsVc.swift */; }; 523ED25E2BDA2BC700CFED02 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 523ED25D2BDA2BC700CFED02 /* AppDelegate.swift */; }; 523ED2602BDA2BC700CFED02 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 523ED25F2BDA2BC700CFED02 /* SceneDelegate.swift */; }; 523ED2622BDA2BC700CFED02 /* SplashVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 523ED2612BDA2BC700CFED02 /* SplashVC.swift */; }; @@ -84,6 +87,10 @@ 52B8D4E02C04A25E00ED65F3 /* UIView+Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B8D4D62C04A25D00ED65F3 /* UIView+Container.swift */; }; 52B8D4E12C04A25E00ED65F3 /* BasicTransitionAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B8D4D72C04A25E00ED65F3 /* BasicTransitionAnimator.swift */; }; 52B8D4E22C04A25E00ED65F3 /* Segue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B8D4D82C04A25E00ED65F3 /* Segue.swift */; }; + 52BC3BE22C0E02EE002FACA6 /* FaqVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BC3BE12C0E02EE002FACA6 /* FaqVC.swift */; }; + 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 */; }; 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 */; }; @@ -183,6 +190,8 @@ 522242632BFC74380085C632 /* MyListVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyListVC.swift; sourceTree = ""; }; 522242652BFC74380085C632 /* TabBarVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabBarVC.swift; sourceTree = ""; }; 522242692BFC7AFC0085C632 /* SideMenuVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuVC.swift; sourceTree = ""; }; + 522A93192C0DE8CC0098FE49 /* SideBarNav.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SideBarNav.storyboard; sourceTree = ""; }; + 522A931B2C0DE9150098FE49 /* AboutUsVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutUsVc.swift; sourceTree = ""; }; 523ED25A2BDA2BC700CFED02 /* WOKA.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WOKA.app; sourceTree = BUILT_PRODUCTS_DIR; }; 523ED25D2BDA2BC700CFED02 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 523ED25F2BDA2BC700CFED02 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; @@ -253,6 +262,10 @@ 52B8D4D62C04A25D00ED65F3 /* UIView+Container.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Container.swift"; sourceTree = ""; }; 52B8D4D72C04A25E00ED65F3 /* BasicTransitionAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicTransitionAnimator.swift; sourceTree = ""; }; 52B8D4D82C04A25E00ED65F3 /* Segue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Segue.swift; sourceTree = ""; }; + 52BC3BE12C0E02EE002FACA6 /* FaqVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaqVC.swift; sourceTree = ""; }; + 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 = ""; }; 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 = ""; }; @@ -342,6 +355,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 522A93132C0DB5D50098FE49 /* JWPlayerKit in Frameworks */, 525954512BEB5EB700191286 /* SkeletonView in Frameworks */, 619A5A1BD8BD968ADC83C106 /* Pods_WOKA.framework in Frameworks */, ); @@ -409,6 +423,51 @@ path = SideMenu; sourceTree = ""; }; + 522A93142C0DE8770098FE49 /* SideBarNav */ = { + isa = PBXGroup; + children = ( + 522A93182C0DE8A50098FE49 /* View */, + 522A93172C0DE8A20098FE49 /* Model */, + 522A93162C0DE89F0098FE49 /* ViewModel */, + 522A93152C0DE8960098FE49 /* Controller */, + 522A93192C0DE8CC0098FE49 /* SideBarNav.storyboard */, + ); + path = SideBarNav; + sourceTree = ""; + }; + 522A93152C0DE8960098FE49 /* Controller */ = { + isa = PBXGroup; + children = ( + 522A931B2C0DE9150098FE49 /* AboutUsVc.swift */, + 52BC3BE12C0E02EE002FACA6 /* FaqVC.swift */, + ); + path = Controller; + sourceTree = ""; + }; + 522A93162C0DE89F0098FE49 /* ViewModel */ = { + isa = PBXGroup; + children = ( + ); + path = ViewModel; + sourceTree = ""; + }; + 522A93172C0DE8A20098FE49 /* Model */ = { + isa = PBXGroup; + children = ( + 52BC3BE72C0E04A9002FACA6 /* FaqListDM.swift */, + ); + path = Model; + sourceTree = ""; + }; + 522A93182C0DE8A50098FE49 /* View */ = { + isa = PBXGroup; + children = ( + 52BC3BE32C0E0326002FACA6 /* FaqCell.swift */, + 52BC3BE42C0E0326002FACA6 /* FaqCell.xib */, + ); + path = View; + sourceTree = ""; + }; 523ED2512BDA2BC700CFED02 = { isa = PBXGroup; children = ( @@ -434,6 +493,7 @@ 523ED25C2BDA2BC700CFED02 /* WOKA */ = { isa = PBXGroup; children = ( + 522A93142C0DE8770098FE49 /* SideBarNav */, 523ED26B2BDA2BC900CFED02 /* Info.plist */, 9C9BEEC62BEE1BBF004ECC2F /* CollectionViewCenteredFlowLayout.swift */, 5259541E2BE8E93500191286 /* Config.xcconfig */, @@ -952,6 +1012,7 @@ name = WOKA; packageProductDependencies = ( 525954502BEB5EB700191286 /* SkeletonView */, + 522A93122C0DB5D50098FE49 /* JWPlayerKit */, ); productName = WOKA; productReference = 523ED25A2BDA2BC700CFED02 /* WOKA.app */; @@ -1028,6 +1089,7 @@ mainGroup = 523ED2512BDA2BC700CFED02; packageReferences = ( 5259544F2BEB5EB700191286 /* XCRemoteSwiftPackageReference "SkeletonView" */, + 522A93112C0DB5D50098FE49 /* XCRemoteSwiftPackageReference "JWPlayerKit-package" */, ); productRefGroup = 523ED25B2BDA2BC700CFED02 /* Products */; projectDirPath = ""; @@ -1046,6 +1108,7 @@ buildActionMask = 2147483647; files = ( 9C27E1732BDB86B600EC1DA9 /* OnBoardCell.xib in Resources */, + 522A931A2C0DE8CC0098FE49 /* SideBarNav.storyboard in Resources */, 9CDCE1452BDB9B9A003FEF11 /* OnBoardMainSound.m4a in Resources */, 9C56E84B2BDBF03F00E4CA14 /* AuthenticationSB.storyboard in Resources */, 9CBCB2A82BE5105A007D7934 /* Home.storyboard in Resources */, @@ -1064,6 +1127,7 @@ 9C535DC52C00BF2400DA6DCD /* HomeExploreCell.xib in Resources */, 52A3F6A92BECBF2A0000BB0B /* LinkedChildCell.xib in Resources */, 523ED2652BDA2BC700CFED02 /* Base in Resources */, + 52BC3BE62C0E0326002FACA6 /* FaqCell.xib in Resources */, 52C6E01C2BE383C000E22D59 /* YourIntrestCell.xib in Resources */, 52C6E0262BE3B46A00E22D59 /* SelectAvatarCell.xib in Resources */, 52C8B0712BDA7512003B51D0 /* PassingCloud.json in Resources */, @@ -1188,6 +1252,7 @@ 9CBCB2A52BE50D49007D7934 /* NewPasswordVC.swift in Sources */, 9CBCB29F2BE4E13A007D7934 /* ValidatorClass.swift in Sources */, 9CBCB29B2BE4D614007D7934 /* LoginVC.swift in Sources */, + 52BC3BE82C0E04A9002FACA6 /* FaqListDM.swift in Sources */, 9C56E83B2BDBC6E600E4CA14 /* SelectAgeVM.swift in Sources */, 9C535DC02C00B36000DA6DCD /* HomeVC.swift in Sources */, 52B8D4E22C04A25E00ED65F3 /* Segue.swift in Sources */, @@ -1224,10 +1289,12 @@ 5222426A2BFC7AFC0085C632 /* SideMenuVC.swift in Sources */, 9CBCB29D2BE4D6BB007D7934 /* LoginVM.swift in Sources */, 524C42312C0499560016A11C /* NotificationCenterReloads.swift in Sources */, + 52BC3BE22C0E02EE002FACA6 /* FaqVC.swift in Sources */, 5272FCE52BDFDC8C000ECB1D /* UserDetailsRegisterVM.swift in Sources */, 525954272BE9178F00191286 /* UserDataDM.swift in Sources */, 9C27E1652BDB6FBC00EC1DA9 /* StoryBoardID.swift in Sources */, 52FDBA782BFF23F4009D7AC7 /* TimePeriod.swift in Sources */, + 522A931C2C0DE9150098FE49 /* AboutUsVc.swift in Sources */, 525954322BEA39D200191286 /* AddTapGesture.swift in Sources */, 522242682BFC74380085C632 /* TabBarVC.swift in Sources */, 9C27E1722BDB86B600EC1DA9 /* OnBoardCell.swift in Sources */, @@ -1243,6 +1310,7 @@ 52663FF92BDFAF110001D8CE /* EmailVM.swift in Sources */, 52C1A4E52C05BC86007BAA50 /* MainNavController.swift in Sources */, 525954342BEA620800191286 /* IntrestTopicDM.swift in Sources */, + 52BC3BE52C0E0326002FACA6 /* FaqCell.swift in Sources */, 52663FF52BDFAB830001D8CE /* TextFieldErrorView.swift in Sources */, 9C27E16D2BDB852F00EC1DA9 /* GVar.swift in Sources */, 52B8D4E02C04A25E00ED65F3 /* UIView+Container.swift in Sources */, @@ -1393,7 +1461,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -1452,7 +1520,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -1656,6 +1724,14 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ + 522A93112C0DB5D50098FE49 /* XCRemoteSwiftPackageReference "JWPlayerKit-package" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/jwplayer/JWPlayerKit-package.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 4.19.1; + }; + }; 5259544F2BEB5EB700191286 /* XCRemoteSwiftPackageReference "SkeletonView" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/Juanpe/SkeletonView.git"; @@ -1667,6 +1743,11 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 522A93122C0DB5D50098FE49 /* JWPlayerKit */ = { + isa = XCSwiftPackageProductDependency; + package = 522A93112C0DB5D50098FE49 /* XCRemoteSwiftPackageReference "JWPlayerKit-package" */; + productName = JWPlayerKit; + }; 525954502BEB5EB700191286 /* SkeletonView */ = { isa = XCSwiftPackageProductDependency; package = 5259544F2BEB5EB700191286 /* XCRemoteSwiftPackageReference "SkeletonView" */; diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/Contents.json new file mode 100644 index 0000000..d235032 --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "image_2024_06_03T12_08_51_272Z.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "image_2024_06_03T12_08_51_272Z@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "image_2024_06_03T12_08_51_272Z@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/image_2024_06_03T12_08_51_272Z.png b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/image_2024_06_03T12_08_51_272Z.png new file mode 100644 index 0000000..301be62 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/image_2024_06_03T12_08_51_272Z.png differ diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/image_2024_06_03T12_08_51_272Z@2x.png b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/image_2024_06_03T12_08_51_272Z@2x.png new file mode 100644 index 0000000..00402fa Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/image_2024_06_03T12_08_51_272Z@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/image_2024_06_03T12_08_51_272Z@3x.png b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/image_2024_06_03T12_08_51_272Z@3x.png new file mode 100644 index 0000000..3c1606d Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutKids.imageset/image_2024_06_03T12_08_51_272Z@3x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutVector.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutVector.imageset/Contents.json new file mode 100644 index 0000000..27e1c29 --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutVector.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Vector 1.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutVector.imageset/Vector 1.png b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutVector.imageset/Vector 1.png new file mode 100644 index 0000000..d86bc2c Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/AboutVector.imageset/Vector 1.png differ diff --git a/WOKA/Assets/Assets.xcassets/Menu/SideMenu/Contents.json b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/Menu/SideMenu/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard b/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard index 58d36d0..74319bb 100644 --- a/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard +++ b/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard @@ -43,25 +43,25 @@ - + - + - + @@ -80,7 +80,7 @@ - + - + - + - + - + - + - + - + - + @@ -140,20 +140,20 @@ - + - + - + - + @@ -172,7 +172,7 @@ - +