diff --git a/WOKA.xcodeproj/project.pbxproj b/WOKA.xcodeproj/project.pbxproj index 0193ece..65bd7f4 100644 --- a/WOKA.xcodeproj/project.pbxproj +++ b/WOKA.xcodeproj/project.pbxproj @@ -65,6 +65,7 @@ 5272FCE32BDFDB05000ECB1D /* UserDetailsRegisterVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5272FCE22BDFDB05000ECB1D /* UserDetailsRegisterVC.swift */; }; 5272FCE52BDFDC8C000ECB1D /* UserDetailsRegisterVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5272FCE42BDFDC8C000ECB1D /* UserDetailsRegisterVM.swift */; }; 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 */; }; 52A3F6A82BECBF2A0000BB0B /* LinkedChildCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52A3F6A62BECBF2A0000BB0B /* LinkedChildCell.swift */; }; 52A3F6A92BECBF2A0000BB0B /* LinkedChildCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 52A3F6A72BECBF2A0000BB0B /* LinkedChildCell.xib */; }; @@ -174,6 +175,8 @@ 26B5FF3DFDEFA683C1B79490 /* 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 = ""; }; 5202AAFD2BDF90590043B7BD /* TextFieldImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldImage.swift; sourceTree = ""; }; 5202AB002BDFA7900043B7BD /* EmailValidation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailValidation.swift; sourceTree = ""; }; + 520B6E3E2C0751E90091C478 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Theme.strings; sourceTree = ""; }; + 520B6E402C0751EF0091C478 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Theme.strings; sourceTree = ""; }; 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 = ""; }; @@ -228,6 +231,7 @@ 5272FCE22BDFDB05000ECB1D /* UserDetailsRegisterVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDetailsRegisterVC.swift; sourceTree = ""; }; 5272FCE42BDFDC8C000ECB1D /* UserDetailsRegisterVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDetailsRegisterVM.swift; 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 = ""; }; 52A3F6A62BECBF2A0000BB0B /* LinkedChildCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkedChildCell.swift; sourceTree = ""; }; 52A3F6A72BECBF2A0000BB0B /* LinkedChildCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LinkedChildCell.xib; sourceTree = ""; }; @@ -248,8 +252,6 @@ 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 = ""; }; - 52C1A4EF2C05DA49007BAA50 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Theme.strings; sourceTree = ""; }; - 52C1A4F12C05DA4C007BAA50 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Theme.strings; sourceTree = ""; }; 52C6E0192BE383C000E22D59 /* YourIntrestCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YourIntrestCell.swift; sourceTree = ""; }; 52C6E01A2BE383C000E22D59 /* YourIntrestCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = YourIntrestCell.xib; sourceTree = ""; }; 52C6E01D2BE3847F00E22D59 /* BorderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BorderView.swift; sourceTree = ""; }; @@ -482,6 +484,7 @@ isa = PBXGroup; children = ( 9C27E16A2BDB774D00EC1DA9 /* CarouselData.swift */, + 529B0DD52C070C0F00CFC54B /* GuestDataDM.swift */, ); path = Model; sourceTree = ""; @@ -1131,6 +1134,7 @@ 5202AAFE2BDF90590043B7BD /* TextFieldImage.swift in Sources */, 52FDDAB52BF34DC300E037C1 /* YesNoAlertVC.swift in Sources */, 52C6E0232BE3B3E300E22D59 /* SelectAvatarVC.swift in Sources */, + 529B0DD62C070C0F00CFC54B /* GuestDataDM.swift in Sources */, 5259545C2BEBB80400191286 /* AvatarDM.swift in Sources */, 52C8B06C2BDA6E87003B51D0 /* LocalizedString.swift in Sources */, 525953D42BE8B2DF00191286 /* UIApplication.swift in Sources */, @@ -1299,8 +1303,8 @@ isa = PBXVariantGroup; children = ( 52C1A4E62C05C95D007BAA50 /* Base */, - 52C1A4EF2C05DA49007BAA50 /* en */, - 52C1A4F12C05DA4C007BAA50 /* hi */, + 520B6E3E2C0751E90091C478 /* en */, + 520B6E402C0751EF0091C478 /* hi */, ); name = Theme.storyboard; sourceTree = ""; diff --git a/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Contents.json new file mode 100644 index 0000000..e9ada95 --- /dev/null +++ b/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "Notification.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Notification@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Notification@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "original" + } +} diff --git a/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Notification.png b/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Notification.png new file mode 100644 index 0000000..607fb46 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Notification.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Notification@2x.png b/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Notification@2x.png new file mode 100644 index 0000000..f42d50f Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Notification@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Notification@3x.png b/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Notification@3x.png new file mode 100644 index 0000000..7625656 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Notification.imageset/Notification@3x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/AudioBooks.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/AudioBooks.png deleted file mode 100644 index a61f403..0000000 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/AudioBooks.png and /dev/null differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/AudioBooks@2x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/AudioBooks@2x.png deleted file mode 100644 index 47e4e26..0000000 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/AudioBooks@2x.png and /dev/null differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/AudioBooks@3x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/AudioBooks@3x.png deleted file mode 100644 index 4a2b937..0000000 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/AudioBooks@3x.png and /dev/null differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Contents.json index 899fe27..3422b8b 100644 --- a/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Contents.json +++ b/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "AudioBooks.png", + "filename" : "Group 168.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "AudioBooks@2x.png", + "filename" : "Group 168@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "AudioBooks@3x.png", + "filename" : "Group 168@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Group 168.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Group 168.png new file mode 100644 index 0000000..1c65dc2 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Group 168.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Group 168@2x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Group 168@2x.png new file mode 100644 index 0000000..5269fdb Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Group 168@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Group 168@3x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Group 168@3x.png new file mode 100644 index 0000000..b15d71b Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Theme2/AudioBooksT2.imageset/Group 168@3x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games.png index c705ac8..8d3b45f 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games@2x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games@2x.png index 10a29ba..95d33a6 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games@2x.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games@3x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games@3x.png index 00102eb..c294903 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games@3x.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/GamesT2.imageset/Games@3x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke.png index 7eaf743..ecd8684 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke@2x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke@2x.png index a7b3c05..670eb03 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke@2x.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke@3x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke@3x.png index b475fdd..818d0b4 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke@3x.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/KaraokeT2.imageset/Karaoke@3x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV.png index 2cf6ff3..09244e0 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV@2x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV@2x.png index 5ddc119..7900b70 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV@2x.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV@3x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV@3x.png index 118e554..609540b 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV@3x.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/LiveTVT2.imageset/LiveTV@3x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop.png index deb5205..4c043e7 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop@2x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop@2x.png index 902d3f4..6551dd6 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop@2x.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop@3x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop@3x.png index df45303..a96a276 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop@3x.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/ShopT2.imageset/Shop@3x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Contents.json index b898334..0ea876a 100644 --- a/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Contents.json +++ b/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "WebSeries.png", + "filename" : "Group 165.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "WebSeries@2x.png", + "filename" : "Group 165@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "WebSeries@3x.png", + "filename" : "Group 165@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Group 165.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Group 165.png new file mode 100644 index 0000000..0c16b18 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Group 165.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Group 165@2x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Group 165@2x.png new file mode 100644 index 0000000..3a80f72 Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Group 165@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/WebSeries@3x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Group 165@3x.png similarity index 51% rename from WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/WebSeries@3x.png rename to WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Group 165@3x.png index 70da666..b5063ef 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/WebSeries@3x.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/Group 165@3x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/WebSeries.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/WebSeries.png deleted file mode 100644 index 101aba0..0000000 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/WebSeries.png and /dev/null differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/WebSeries@2x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/WebSeries@2x.png deleted file mode 100644 index ed750a3..0000000 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/WebSeriesT2.imageset/WebSeries@2x.png and /dev/null differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM.png index 6ee53fa..2b49c1a 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM@2x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM@2x.png index 1563641..858678c 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM@2x.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM@2x.png differ diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM@3x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM@3x.png index cba06fc..a5fe48e 100644 Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM@3x.png and b/WOKA/Assets/Assets.xcassets/Home/Theme2/WokaFMT2.imageset/WokaFM@3x.png differ diff --git a/WOKA/Authentication/Model/UserDataDM.swift b/WOKA/Authentication/Model/UserDataDM.swift index a259abf..15d5703 100644 --- a/WOKA/Authentication/Model/UserDataDM.swift +++ b/WOKA/Authentication/Model/UserDataDM.swift @@ -14,11 +14,11 @@ struct UserDataDM: Codable { // MARK: - Result struct ResultData: Codable { let id: Int? - let username, fullname: String? + var username, fullname: String? // let gender: Gender? let birthdate, email: String? let avtar: String? - let userType: String? + var userType: String? let languageMasterID: Int? let lastLogin, rememberToken: String? let childDetail: ChildDetail? diff --git a/WOKA/Authentication/ViewModel/LoginVM.swift b/WOKA/Authentication/ViewModel/LoginVM.swift index 69e5636..c0af142 100644 --- a/WOKA/Authentication/ViewModel/LoginVM.swift +++ b/WOKA/Authentication/ViewModel/LoginVM.swift @@ -101,9 +101,7 @@ class LoginVM{ if user is not logined on other device directly nav him to home */ self.vc.toast(msg: data.message ?? K.ConstantString.unRecognised, time: 2) { - UserDefaults.standard.set(true, forKey: K.UserDefaultsStruct.isUserLogined) - UserDefaults.standard.set(dataResult.rememberToken, forKey: K.UserDefaultsStruct.userAccessToken) - UIApplication.setRootView(SideMenuController.instantiate(from: .Home)) + self.loginDefaults(data: dataResult) } } default: @@ -137,9 +135,9 @@ class LoginVM{ self.vc.toast(msg: data.message ?? "Unrecognised error" , time: 2) case 1: Utilities.dismissProgressHUD() + guard let dataResult = data.data?.result else{return} self.vc.toast(msg: data.message ?? "Unrecognised error" , time: 2) { - UserDefaults.standard.set(true, forKey: K.UserDefaultsStruct.isUserLogined) - UIApplication.setRootView(SideMenuController.instantiate(from: .Home)) + self.loginDefaults(data: dataResult) } default: break @@ -151,6 +149,13 @@ class LoginVM{ } } + private func loginDefaults(data : UserDataDM.ResultData){ + AuthFunc.shareInstance.userData = data + UserDefaults.standard.set(true, forKey: K.UserDefaultsStruct.isUserLogined) + UserDefaults.standard.set(data.rememberToken, forKey: K.UserDefaultsStruct.userAccessToken) + UIApplication.setRootView(SideMenuController.instantiate(from: .Home)) + } + /* Guest Login */ diff --git a/WOKA/Constants K/OnBoardVM.swift b/WOKA/Constants K/OnBoardVM.swift index 7df06d9..855f326 100644 --- a/WOKA/Constants K/OnBoardVM.swift +++ b/WOKA/Constants K/OnBoardVM.swift @@ -122,7 +122,7 @@ class OnBoardVM{ "Accept-Language" : AuthFunc.shareInstance.languageSelected == .english ? "English" : "Hindi"] Utilities.startProgressHUD() - NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.guest_login, method: .post ,parameters: params, headers: header) {(result : Result, NetworkManager.APIError>) in + NetworkManager.shareInstance.apiRequest(url: APIEndPoints.Auth.guest_login, method: .post ,parameters: params, headers: header) {(result : Result, NetworkManager.APIError>) in switch result{ case .success(let data): switch data.success{ @@ -131,7 +131,11 @@ class OnBoardVM{ self.vc.toast(msg: data.message ?? "Unrecognised error" , time: 2) case 1: Utilities.dismissProgressHUD() - self.vc.toast(msg: data.message ?? "Unrecognised error" , time: 2) + guard let dataUser = data.data else{return} + AuthFunc.shareInstance.userData = UserDataDM.ResultData(id: nil, username: dataUser.username, fullname: dataUser.fullname, birthdate: nil, email: nil, avtar: nil, userType: "3", languageMasterID: nil, lastLogin: nil, rememberToken: nil, childDetail: nil, language: nil, alreadyLoggedIn: nil) + self.vc.toast(msg: data.message ?? "Unrecognised error" , time: 2) { + UIApplication.setRootView(SideMenuController.instantiate(from: .Home)) + } default: break } diff --git a/WOKA/Constants K/UserDefaultsStruct.swift b/WOKA/Constants K/UserDefaultsStruct.swift index 413460f..4601a53 100644 --- a/WOKA/Constants K/UserDefaultsStruct.swift +++ b/WOKA/Constants K/UserDefaultsStruct.swift @@ -20,6 +20,7 @@ extension K{ static let themeDefault = "themeDefault" static let isUserLogined = "isUserLogined" static let userAccessToken = "userAccessToken" + static let defaultLanguage = "defaultLanguage" } } diff --git a/WOKA/Home/Home.storyboard b/WOKA/Home/Home.storyboard index cd84f7e..bed2912 100644 --- a/WOKA/Home/Home.storyboard +++ b/WOKA/Home/Home.storyboard @@ -71,7 +71,7 @@ - + @@ -318,47 +318,54 @@ - + - - - - + - + @@ -486,9 +493,15 @@ + + + + + + @@ -497,6 +510,7 @@ + diff --git a/WOKA/Localized Module/en.lproj/Localizable.strings b/WOKA/Localized Module/en.lproj/Localizable.strings index a777186..3cad313 100644 --- a/WOKA/Localized Module/en.lproj/Localizable.strings +++ b/WOKA/Localized Module/en.lproj/Localizable.strings @@ -29,3 +29,15 @@ "अधिक" = "MORE"; "थीम" = "THEME"; "लॉग आउट" = "LOGOUT"; + +/* + Theme 2 + */ +"वोका एफएम" = "WOKA FM"; +"लाइव टीवी" = "LIVE TV"; +"वेब सीरीज" = "WEB SERIES"; +"खेल" = "GAMES"; +"ऑडियो पुस्तकें" = "AUDIO BOOKS"; +"कराओके" = "KARAOKE"; +"दुकान" = "SHOP"; +"वोका का अन्वेषण करें" = "Explore WOKA"; diff --git a/WOKA/Localized Module/hi.lproj/Localizable.strings b/WOKA/Localized Module/hi.lproj/Localizable.strings index 64a5f5a..727a1c4 100644 --- a/WOKA/Localized Module/hi.lproj/Localizable.strings +++ b/WOKA/Localized Module/hi.lproj/Localizable.strings @@ -172,3 +172,15 @@ लाइव टीवी वोकलैंड में आपका स्वागत है */ + +/* + Theme 2 + */ +"WOKA FM" = "वोका एफएम"; +"LIVE TV" = "लाइव टीवी"; +"WEB SERIES" = "वेब सीरीज"; +"GAMES" = "खेल"; +"AUDIO BOOKS" = "ऑडियो पुस्तकें"; +"KARAOKE" = "कराओके"; +"SHOP" = "दुकान"; +"Explore WOKA" = "वोका का अन्वेषण करें"; diff --git a/WOKA/Main/AuthFunc/AuthFunc.swift b/WOKA/Main/AuthFunc/AuthFunc.swift index 4be3954..a666fc8 100644 --- a/WOKA/Main/AuthFunc/AuthFunc.swift +++ b/WOKA/Main/AuthFunc/AuthFunc.swift @@ -9,6 +9,10 @@ import Foundation import AVFoundation import UIKit +enum GetSet{ + case get + case set +} class AuthFunc{ /** @@ -77,14 +81,35 @@ class AuthFunc{ return accessToken ?? "" } + /* + Get/Set the default language in Userdefaults + */ + func getSetDefaultLanguage(language : LocalizedEnum? ,getSet : GetSet) -> LocalizedEnum?{ + switch getSet{ + case .get: + let accessToken = UserDefaults.standard.string(forKey: K.UserDefaultsStruct.defaultLanguage) + if accessToken == LocalizedEnum.english.rawValue{ + return .english + }else{ + return .hindi + } + case .set: + guard let language else{return nil} + AuthFunc.shareInstance.languageSelected = language + UserDefaults.standard.setValue(language.rawValue, forKey: K.UserDefaultsStruct.userAccessToken) + return nil + } + } + /* This func will remove the selected userdefaults while logout */ func logout(){ - //Reset Theme to defaults + //Reset All to defaults UserDefaults.standard.setValue(nil, forKey: K.UserDefaultsStruct.themeDefault) UserDefaults.standard.setValue(nil, forKey: K.UserDefaultsStruct.isUserLogined) userData = nil + selectedTheme = .theme1 } } diff --git a/WOKA/OnBoarding Module/Model/GuestDataDM.swift b/WOKA/OnBoarding Module/Model/GuestDataDM.swift new file mode 100644 index 0000000..21b550e --- /dev/null +++ b/WOKA/OnBoarding Module/Model/GuestDataDM.swift @@ -0,0 +1,17 @@ +// +// GuestDataDM.swift +// WOKA +// +// Created by MacBook Pro on 29/05/24. +// + +import Foundation + +struct GuestDataDM: Codable { + var username: String? + var fullname: String? + + enum CodingKeys: String, CodingKey { + case username, fullname + } +} diff --git a/WOKA/OnBoarding Module/ViewModel/SplashVM.swift b/WOKA/OnBoarding Module/ViewModel/SplashVM.swift index 3901465..0a615d2 100644 --- a/WOKA/OnBoarding Module/ViewModel/SplashVM.swift +++ b/WOKA/OnBoarding Module/ViewModel/SplashVM.swift @@ -37,6 +37,11 @@ class SplashVM{ vc.englishBtn.roundCorner() selectTheme() vc.activityIndicator.stopAnimating() + + // check if user has selected the default language + if let language = AuthFunc.shareInstance.getSetDefaultLanguage(language: nil, getSet: .get){ + AuthFunc.shareInstance.languageSelected = language + } } func selectTheme(){ diff --git a/WOKA/TabBar & SideMenu/Controller/SideMenuVC.swift b/WOKA/TabBar & SideMenu/Controller/SideMenuVC.swift index a7adbbd..129f8ac 100644 --- a/WOKA/TabBar & SideMenu/Controller/SideMenuVC.swift +++ b/WOKA/TabBar & SideMenu/Controller/SideMenuVC.swift @@ -23,7 +23,15 @@ class SideMenuVC: UIViewController { @IBOutlet weak var themetwoCheckMark: UIImageView! @IBOutlet weak var userName: UILabel! + @IBOutlet weak var aboutBtn: UIButton! + @IBOutlet weak var faqBtn: UIButton! + @IBOutlet weak var wokaSupportBtn: UIButton! + @IBOutlet weak var profileBtn: UIButton! + @IBOutlet weak var addChildBtn: UIButton! + @IBOutlet weak var deactivateBtn: UIButton! + @IBOutlet weak var avatarImage: UIImageView! + @IBOutlet weak var scrollView: UIScrollView! var vm = SideMenuVM() @@ -67,9 +75,9 @@ class SideMenuVC: UIViewController { Timer.scheduledTimer(withTimeInterval: 0.2, repeats: false) { _ in switch sender.selectedSegmentIndex{ case 0: // English - AuthFunc.shareInstance.languageSelected = .english + _ = AuthFunc.shareInstance.getSetDefaultLanguage(language: .english, getSet: .set) case 1: // Hindi - AuthFunc.shareInstance.languageSelected = .hindi + _ = AuthFunc.shareInstance.getSetDefaultLanguage(language: .english, getSet: .set) default: break } diff --git a/WOKA/TabBar & SideMenu/Controller/TabBarVC.swift b/WOKA/TabBar & SideMenu/Controller/TabBarVC.swift index 5028c37..7451ebb 100644 --- a/WOKA/TabBar & SideMenu/Controller/TabBarVC.swift +++ b/WOKA/TabBar & SideMenu/Controller/TabBarVC.swift @@ -21,7 +21,7 @@ class TabBarVC: UITabBarController { self.setupTabBarUI() self.addCustomTabBarView() NotificationCenter.default.addObserver(self, selector: #selector(languageDidChange), name: .languageDidChange, object: nil) - + customizeTabBarItemIconSize() } deinit{ @@ -66,7 +66,7 @@ class TabBarVC: UITabBarController { // function to set tab bar item font func customizeTabBarItemFont() { // Set the font attributes - let attributes = [NSAttributedString.Key.font: FontCustom.shareInstance.customFont(fontName: .Exo2_Bold, size: 12)] + let attributes = [NSAttributedString.Key.font: FontCustom.shareInstance.customFont(fontName: .Exo2_Bold, size: 13)] // Apply the attributes to the appearance proxy of UITabBarItem UITabBarItem.appearance().setTitleTextAttributes(attributes, for: .normal) diff --git a/WOKA/TabBar & SideMenu/ViewModel/SideMenuVM.swift b/WOKA/TabBar & SideMenu/ViewModel/SideMenuVM.swift index 056d2e6..61336d6 100644 --- a/WOKA/TabBar & SideMenu/ViewModel/SideMenuVM.swift +++ b/WOKA/TabBar & SideMenu/ViewModel/SideMenuVM.swift @@ -12,11 +12,13 @@ class SideMenuVM{ weak var vc : SideMenuVC! func initView(){ + AuthFunc.shareInstance.getSetDefaultLanguage(language: nil, getSet: .get) == .english ? (vc.languageControl.selectedSegmentIndex = 0) : (vc.languageControl.selectedSegmentIndex = 1) + customizeSegmentControl() - AuthFunc.shareInstance.languageSelected == .english ? (vc.languageControl.selectedSegmentIndex = 0) : (vc.languageControl.selectedSegmentIndex = 1) let color1 = #colorLiteral(red: 0.144693464, green: 0.1426281333, blue: 0.6686832905, alpha: 1) let color2 = #colorLiteral(red: 0.6901960784, green: 0.2745098039, blue: 0.7568627451, alpha: 1) - vc.logoutBtn.applyGradient(colors: [color1, color2], startPoint: CGPoint(x: 0, y: 0), endPoint: CGPoint(x: 0.8, y: 0)) + + vc.logoutBtn.applyGradient(colors: [color1, color2], startPoint: CGPoint(x: 0, y: 0), endPoint: CGPoint(x: 0, y: 0.8)) vc.logoutBtn.layer.cornerRadius = vc.logoutBtn.frame.height / 2 // Adding the trailing constriant to make the view appeared center when expanded @@ -52,18 +54,36 @@ class SideMenuVM{ } } + setData() } func setData(){ guard let data = AuthFunc.shareInstance.userData else{return} + + /* + Check User Type, + Dont show username if the user type is guest + */ + switch data.userType{ + case "1": // child + vc.addChildBtn.isHidden = true + vc.userName.text = (data.fullname == nil || data.fullname == "") ? "User" : data.fullname + case "2" : // adult + vc.addChildBtn.isHidden = false + vc.userName.text = (data.fullname == nil || data.fullname == "") ? "User" : data.fullname + case "3": // Guest + vc.userName.text = "" + break + default: + break + } + //set the first name as the name - vc.userName.text = (data.fullname == nil || data.fullname == "") ? "User" : data.fullname if let avatar = data.avtar{ //https://wokaland.com/admin/storage/app/public/uploads/avtar/avatar2.png?d=1716889852 vc.avatarImage.imageURL("https://wokaland.com/admin/storage/app/public/uploads/avtar/avatar2.png?d=1716889852",color: .white) } - } func themeSelect(){ @@ -94,6 +114,4 @@ class SideMenuVM{ vc.languageControl.layer.masksToBounds = true vc.languageControl.clipsToBounds = true } - - } diff --git a/WOKA/Theme/Base.lproj/Theme.storyboard b/WOKA/Theme/Base.lproj/Theme.storyboard index ca2194b..604840e 100644 --- a/WOKA/Theme/Base.lproj/Theme.storyboard +++ b/WOKA/Theme/Base.lproj/Theme.storyboard @@ -79,8 +79,8 @@ - - + + - + + - - + - - - - - - - - + @@ -361,8 +379,7 @@ - - + @@ -376,6 +393,7 @@ + @@ -402,6 +420,7 @@ + @@ -423,14 +442,14 @@ - + - + - + + + + + - - + + - + + + + + + + - + - + - + + @@ -559,6 +597,7 @@ + diff --git a/WOKA/Theme/Controller/ThemeOneVC.swift b/WOKA/Theme/Controller/ThemeOneVC.swift index 9133861..10efb05 100644 --- a/WOKA/Theme/Controller/ThemeOneVC.swift +++ b/WOKA/Theme/Controller/ThemeOneVC.swift @@ -19,6 +19,7 @@ class ThemeOneVC: UIViewController { @IBOutlet weak var welcomeLabel: LocalisedElementsLabel! @IBOutlet weak var HelloLabel: LocalisedElementsLabel! + @IBOutlet weak var notificationBtnn: UIButton! @IBOutlet weak var avatarImage: UIImageView! @IBOutlet weak var webSeriesView: UIStackView! @@ -37,9 +38,7 @@ class ThemeOneVC: UIViewController { NotificationCenter.default.removeObserver(self, name: UIApplication.didEnterBackgroundNotification, object: nil) NotificationCenter.default.removeObserver(self, name: UIApplication.willEnterForegroundNotification, object: nil) NotificationCenter.default.removeObserver(self, name: NSNotification.Name(rawValue: K.NotificationCenterReloads.reloadTheme), object: nil) - } - - + } override func viewDidLoad() { super.viewDidLoad() diff --git a/WOKA/Theme/Controller/ThemeTwoVC.swift b/WOKA/Theme/Controller/ThemeTwoVC.swift index 7dae614..4855379 100644 --- a/WOKA/Theme/Controller/ThemeTwoVC.swift +++ b/WOKA/Theme/Controller/ThemeTwoVC.swift @@ -12,6 +12,8 @@ class ThemeTwoVC: UIViewController { weak var delegate: ChildViewControllerDelegate? @IBOutlet weak var collectionView: UICollectionView! @IBOutlet weak var liveTvView: UIView! + @IBOutlet weak var nameLabel: UILabel! + @IBOutlet weak var avatarImage: UIImageView! var vm = ThemeTwoVM() @@ -44,7 +46,7 @@ extension ThemeTwoVC : CollectionViewSRC{ func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { let cell = collectionView.dequeueReusableCell(withReuseIdentifier: K.CellIdentifier.Theme.homeExploreCell, for: indexPath) as! HomeExploreCell - cell.setData(image: vm.cellData[indexPath.row]) + cell.setData(data : vm.cellData[indexPath.row]) return cell } diff --git a/WOKA/Theme/View/HomeExploreCell.swift b/WOKA/Theme/View/HomeExploreCell.swift index 96268fc..fb5aa01 100644 --- a/WOKA/Theme/View/HomeExploreCell.swift +++ b/WOKA/Theme/View/HomeExploreCell.swift @@ -10,12 +10,21 @@ import UIKit class HomeExploreCell: UICollectionViewCell { @IBOutlet weak var cellBtn: UIImageView! + @IBOutlet weak var cellLabel: LocalisedElementsLabel! + override func awakeFromNib() { super.awakeFromNib() - // Initialization code + self.addTapGesture { + + } } - func setData(image : String){ - self.cellBtn.image = UIImage(named: image) + func btnTap(){ + + } + + func setData(data : Theme2Struct){ + self.cellBtn.image = UIImage(named: data.imageName) + self.cellLabel.text = data.text.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue) } } diff --git a/WOKA/Theme/View/HomeExploreCell.xib b/WOKA/Theme/View/HomeExploreCell.xib index b971a56..73bbe3a 100644 --- a/WOKA/Theme/View/HomeExploreCell.xib +++ b/WOKA/Theme/View/HomeExploreCell.xib @@ -7,6 +7,11 @@ + + + Exo2-Bold + + @@ -17,21 +22,45 @@ - - - + + + + + + + + + + + + + + + + + + - - - - + + + + + diff --git a/WOKA/Theme/ViewModel/ThemeOneVM.swift b/WOKA/Theme/ViewModel/ThemeOneVM.swift index 42407a6..8e52746 100644 --- a/WOKA/Theme/ViewModel/ThemeOneVM.swift +++ b/WOKA/Theme/ViewModel/ThemeOneVM.swift @@ -33,7 +33,24 @@ class ThemeOneVM{ func setData(){ guard let data = AuthFunc.shareInstance.userData else{return} //set the first name as the name - vc.nameLabel.text = data.fullname?.components(separatedBy: " ").first + /* + Check User Type, + Dont show username if the user type is guest + */ + switch data.userType{ + case "1": // child + vc.nameLabel.text = data.fullname?.components(separatedBy: " ").first + vc.notificationBtnn.isHidden = false + case "2" : // adult + vc.nameLabel.text = data.fullname?.components(separatedBy: " ").first + vc.notificationBtnn.isHidden = false + case "3": // Guest + vc.nameLabel.text = "" + vc.notificationBtnn.isHidden = true + break + default: + break + } if let avatar = data.avtar{ //https://wokaland.com/admin/storage/app/public/uploads/avtar/avatar2.png?d=1716889852 vc.avatarImage.imageURL("https://wokaland.com/admin/storage/app/public/uploads/avtar/" + avatar) diff --git a/WOKA/Theme/ViewModel/ThemeTwoVM.swift b/WOKA/Theme/ViewModel/ThemeTwoVM.swift index 1d07aa0..7fa4628 100644 --- a/WOKA/Theme/ViewModel/ThemeTwoVM.swift +++ b/WOKA/Theme/ViewModel/ThemeTwoVM.swift @@ -7,17 +7,55 @@ import UIKit +struct Theme2Struct{ + let imageName : String + let text : String +} class ThemeTwoVM{ weak var vc : ThemeTwoVC! - var cellData = ["WokaFMT2", "LiveTVT2", "WebSeriesT2", "GamesT2", "AudioBooksT2", "KaraokeT2", "ShopT2"] +// var cellData = ["WokaFMT2", "LiveTVT2", "WebSeriesT2", "GamesT2", "AudioBooksT2", "KaraokeT2", "ShopT2"] + var cellData = [Theme2Struct(imageName: "WokaFMT2", text: "WOKA FM"), + Theme2Struct(imageName: "LiveTVT2", text: "LIVE TV"), + Theme2Struct(imageName: "WebSeriesT2", text: "WEB SERIES"), + Theme2Struct(imageName: "GamesT2", text: "GAMES"), + Theme2Struct(imageName: "AudioBooksT2", text: "AUDIO BOOKS"), + Theme2Struct(imageName: "KaraokeT2", text: "KARAOKE"), + Theme2Struct(imageName: "ShopT2", text: "SHOP")] func initView(){ setupCell() + setData() NotificationCenter.default.addObserver(self, selector: #selector(self.reloadTheme), name: NSNotification.Name(rawValue: K.NotificationCenterReloads.reloadTheme), object: nil) } + func setData(){ + guard let data = AuthFunc.shareInstance.userData else{return} + //set the first name as the name + /* + Check User Type, + Dont show username if the user type is guest + */ + switch data.userType{ + case "1": // child + vc.nameLabel.text = data.fullname?.components(separatedBy: " ").first + case "2" : // adult + vc.nameLabel.text = data.fullname?.components(separatedBy: " ").first + case "3": // Guest + vc.nameLabel.text = "" + break + default: + break + } + + if let avatar = data.avtar{ + //https://wokaland.com/admin/storage/app/public/uploads/avtar/avatar2.png?d=1716889852 + vc.avatarImage.imageURL("https://wokaland.com/admin/storage/app/public/uploads/avtar/" + avatar) + } + + } + // MARK: - Notification Center Handlers @objc func reloadTheme(){ diff --git a/WOKA/Theme/en.lproj/Theme.strings b/WOKA/Theme/en.lproj/Theme.strings index 9301add..56aabfe 100644 --- a/WOKA/Theme/en.lproj/Theme.strings +++ b/WOKA/Theme/en.lproj/Theme.strings @@ -5,12 +5,15 @@ /* Class = "UILabel"; text = "MORE"; ObjectID = "4pq-lE-hJz"; */ "4pq-lE-hJz.text" = "MORE"; -/* Class = "UILabel"; text = "Hi, Vijay"; ObjectID = "IFj-XX-sbq"; */ -"IFj-XX-sbq.text" = "Hi, Vijay"; +/* Class = "UILabel"; text = "Hello"; ObjectID = "IFj-XX-sbq"; */ +"IFj-XX-sbq.text" = "Hello"; /* Class = "UILabel"; text = "Welcome to WOKALAND"; ObjectID = "Nbe-Ob-bia"; */ "Nbe-Ob-bia.text" = "Welcome to WOKALAND"; +/* Class = "UILabel"; text = "Hello"; ObjectID = "Qn2-Bb-Ud6"; */ +"Qn2-Bb-Ud6.text" = "Hello"; + /* Class = "UILabel"; text = "AUDIO BOOKS"; ObjectID = "Y9F-E4-lgm"; */ "Y9F-E4-lgm.text" = "AUDIO BOOKS"; diff --git a/WOKA/Theme/hi.lproj/Theme.strings b/WOKA/Theme/hi.lproj/Theme.strings index 9301add..56aabfe 100644 --- a/WOKA/Theme/hi.lproj/Theme.strings +++ b/WOKA/Theme/hi.lproj/Theme.strings @@ -5,12 +5,15 @@ /* Class = "UILabel"; text = "MORE"; ObjectID = "4pq-lE-hJz"; */ "4pq-lE-hJz.text" = "MORE"; -/* Class = "UILabel"; text = "Hi, Vijay"; ObjectID = "IFj-XX-sbq"; */ -"IFj-XX-sbq.text" = "Hi, Vijay"; +/* Class = "UILabel"; text = "Hello"; ObjectID = "IFj-XX-sbq"; */ +"IFj-XX-sbq.text" = "Hello"; /* Class = "UILabel"; text = "Welcome to WOKALAND"; ObjectID = "Nbe-Ob-bia"; */ "Nbe-Ob-bia.text" = "Welcome to WOKALAND"; +/* Class = "UILabel"; text = "Hello"; ObjectID = "Qn2-Bb-Ud6"; */ +"Qn2-Bb-Ud6.text" = "Hello"; + /* Class = "UILabel"; text = "AUDIO BOOKS"; ObjectID = "Y9F-E4-lgm"; */ "Y9F-E4-lgm.text" = "AUDIO BOOKS";