diff --git a/MTTN.xcodeproj/project.pbxproj b/MTTN.xcodeproj/project.pbxproj index 3345dad..1afb434 100755 --- a/MTTN.xcodeproj/project.pbxproj +++ b/MTTN.xcodeproj/project.pbxproj @@ -7,10 +7,11 @@ objects = { /* Begin PBXBuildFile section */ + 62CAE30B27C6D86E005BB78A /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 62CAE30A27C6D86E005BB78A /* GoogleService-Info.plist */; }; + 62CAE35027CBFCDE005BB78A /* DarkAppIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 62CAE34F27CBFCDE005BB78A /* DarkAppIcon.png */; }; 8B459DF4256C54D800588B2A /* AlertsData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B459DF3256C54D800588B2A /* AlertsData.swift */; }; 8B51469D256C7655008B590B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8B51469C256C7655008B590B /* Assets.xcassets */; }; A6FE82350D04DF9354EC99B8 /* Pods_MTTN.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E8D3196BCED76B1BF7F14610 /* Pods_MTTN.framework */; }; - B204873925A57BB000EB3FF6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B204873825A57BB000EB3FF6 /* GoogleService-Info.plist */; }; B2061CEE229F9F4F0024D8E6 /* SocialData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2061CED229F9F4F0024D8E6 /* SocialData.swift */; }; B20A614022A6B4560044CB2F /* AlertsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20A613F22A6B4560044CB2F /* AlertsViewController.swift */; }; B20A614422A6B5E10044CB2F /* AlertsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20A614322A6B5E10044CB2F /* AlertsTableViewCell.swift */; }; @@ -34,8 +35,6 @@ B21D64572253AAA6000C6854 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = B21D64562253AAA6000C6854 /* String.swift */; }; B225A9CA22B50C5E005E0F46 /* UIButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = B225A9C922B50C5E005E0F46 /* UIButtons.swift */; }; B225A9CE22B51B3F005E0F46 /* SLCMSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B225A9CD22B51B3F005E0F46 /* SLCMSettingsViewController.swift */; }; - B230765922A82C120047A487 /* Dark-Icon-App-60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B230765722A82C120047A487 /* Dark-Icon-App-60x60@2x.png */; }; - B230765A22A82C120047A487 /* Dark-Icon-App-60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B230765822A82C120047A487 /* Dark-Icon-App-60x60@3x.png */; }; B230765C22A82C9A0047A487 /* AppIconService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B230765B22A82C9A0047A487 /* AppIconService.swift */; }; B230767922A83B2F0047A487 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B230767822A83B2F0047A487 /* LoginViewController.swift */; }; B230769622A83CCF0047A487 /* CATransform3D+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B230768022A83CCF0047A487 /* CATransform3D+Helper.swift */; }; @@ -68,7 +67,6 @@ B25B8F8D22A1950F008B588A /* UpcomingEventsCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25B8F8C22A1950F008B588A /* UpcomingEventsCollectionViewCell.swift */; }; B25B8F8F22A197B2008B588A /* UpcomingEventsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25B8F8E22A197B2008B588A /* UpcomingEventsCell.swift */; }; B25B8F9122A19A96008B588A /* UpcomingEventsData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25B8F9022A19A96008B588A /* UpcomingEventsData.swift */; }; - B25B8F9922A1A927008B588A /* NoirSelectCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25B8F9822A1A927008B588A /* NoirSelectCollectionViewCell.swift */; }; B264A4ED22B3CDAF0043F4E9 /* Ratings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B264A4EC22B3CDAF0043F4E9 /* Ratings.swift */; }; B264A4EF22B3D1DC0043F4E9 /* ImagePreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B264A4EE22B3D1DC0043F4E9 /* ImagePreviewViewController.swift */; }; B26D295922B223220053F428 /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B26D295822B223220053F428 /* SearchBar.swift */; }; @@ -79,10 +77,6 @@ B275E97F2364877C007AEF98 /* Green-Icon-App-76x76@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B275E97B2364877A007AEF98 /* Green-Icon-App-76x76@2x.png */; }; B275E9802364877C007AEF98 /* Green-Icon-App-76x76@1x.png in Resources */ = {isa = PBXBuildFile; fileRef = B275E97C2364877B007AEF98 /* Green-Icon-App-76x76@1x.png */; }; B275E9812364877C007AEF98 /* Green-Icon-App-60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B275E97D2364877C007AEF98 /* Green-Icon-App-60x60@3x.png */; }; - B275E98723648847007AEF98 /* Crew-Icon-App-76x76@1x.png in Resources */ = {isa = PBXBuildFile; fileRef = B275E98323648844007AEF98 /* Crew-Icon-App-76x76@1x.png */; }; - B275E98823648847007AEF98 /* Crew-Icon-App-60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B275E98423648845007AEF98 /* Crew-Icon-App-60x60@3x.png */; }; - B275E98923648847007AEF98 /* Crew-Icon-App-60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B275E98523648846007AEF98 /* Crew-Icon-App-60x60@2x.png */; }; - B275E98A23648847007AEF98 /* Crew-Icon-App-76x76@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B275E98623648847007AEF98 /* Crew-Icon-App-76x76@2x.png */; }; B279882222A106CB00142F34 /* YoutubeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B279882122A106CB00142F34 /* YoutubeCollectionViewCell.swift */; }; B279882622A10B8C00142F34 /* YoutubeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B279882522A10B8C00142F34 /* YoutubeCell.swift */; }; B279882922A10BBE00142F34 /* YoutubeData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B279882822A10BBE00142F34 /* YoutubeData.swift */; }; @@ -95,13 +89,10 @@ B2B738AB22AA3A97006F5A3E /* FloatingMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2B738AA22AA3A97006F5A3E /* FloatingMessage.swift */; }; B2E3638922AF496200AF131D /* Networking.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E3638822AF496200AF131D /* Networking.swift */; }; B2E3638B22AF7A3700AF131D /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E3638A22AF7A3700AF131D /* Notifications.swift */; }; - B2F226F522EF285500AAEAC0 /* BlitzKreigCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2F226F422EF285500AAEAC0 /* BlitzKreigCollectionViewCell.swift */; }; B2F3159622891E02008A2611 /* UIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2F3159522891E02008A2611 /* UIHelper.swift */; }; B2F3159822891E8D008A2611 /* UIDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2F3159722891E8D008A2611 /* UIDevice.swift */; }; B2F3159A22891ED2008A2611 /* UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2F3159922891ED2008A2611 /* UserDefaults.swift */; }; B2F42FE7231017CA0002B339 /* UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2F42FE6231017CA0002B339 /* UIImage.swift */; }; - B2FAFF6322B607630007B9BE /* Dark-Icon-App-76x76@1x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2FAFF6122B607630007B9BE /* Dark-Icon-App-76x76@1x.png */; }; - B2FAFF6422B607630007B9BE /* Dark-Icon-App-76x76@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2FAFF6222B607630007B9BE /* Dark-Icon-App-76x76@2x.png */; }; B2FD53D22327A46D00D7C204 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2FD53D12327A46D00D7C204 /* NotificationService.swift */; }; B2FD53D62327A46D00D7C204 /* NotificationServiceExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = B2FD53CF2327A46D00D7C204 /* NotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; B2FD53DF2327A84800D7C204 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2FD53A3232793AB00D7C204 /* UserNotifications.framework */; }; @@ -156,9 +147,10 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 62CAE30A27C6D86E005BB78A /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../Downloads/GoogleService-Info.plist"; sourceTree = ""; }; + 62CAE34F27CBFCDE005BB78A /* DarkAppIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DarkAppIcon.png; path = "../../../../../Downloads/iOS Image 2/DarkAppIcon.png"; sourceTree = ""; }; 8B459DF3256C54D800588B2A /* AlertsData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertsData.swift; sourceTree = ""; }; 8B51469C256C7655008B590B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - B204873825A57BB000EB3FF6 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; B2061CED229F9F4F0024D8E6 /* SocialData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialData.swift; sourceTree = ""; }; B20A613F22A6B4560044CB2F /* AlertsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertsViewController.swift; sourceTree = ""; }; B20A614322A6B5E10044CB2F /* AlertsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertsTableViewCell.swift; sourceTree = ""; }; @@ -186,8 +178,6 @@ B224E35122ACD092004AF0F6 /* MTTN.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MTTN.entitlements; sourceTree = ""; }; B225A9C922B50C5E005E0F46 /* UIButtons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIButtons.swift; sourceTree = ""; }; B225A9CD22B51B3F005E0F46 /* SLCMSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SLCMSettingsViewController.swift; sourceTree = ""; }; - B230765722A82C120047A487 /* Dark-Icon-App-60x60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Dark-Icon-App-60x60@2x.png"; sourceTree = ""; }; - B230765822A82C120047A487 /* Dark-Icon-App-60x60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Dark-Icon-App-60x60@3x.png"; sourceTree = ""; }; B230765B22A82C9A0047A487 /* AppIconService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppIconService.swift; path = ../AppIconService.swift; sourceTree = ""; }; B230767822A83B2F0047A487 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = ""; }; B230768022A83CCF0047A487 /* CATransform3D+Helper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CATransform3D+Helper.swift"; sourceTree = ""; }; @@ -220,7 +210,6 @@ B25B8F8C22A1950F008B588A /* UpcomingEventsCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpcomingEventsCollectionViewCell.swift; sourceTree = ""; }; B25B8F8E22A197B2008B588A /* UpcomingEventsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpcomingEventsCell.swift; sourceTree = ""; }; B25B8F9022A19A96008B588A /* UpcomingEventsData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpcomingEventsData.swift; sourceTree = ""; }; - B25B8F9822A1A927008B588A /* NoirSelectCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoirSelectCollectionViewCell.swift; sourceTree = ""; }; B264A4EC22B3CDAF0043F4E9 /* Ratings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ratings.swift; sourceTree = ""; }; B264A4EE22B3D1DC0043F4E9 /* ImagePreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePreviewViewController.swift; sourceTree = ""; }; B26D295822B223220053F428 /* SearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchBar.swift; sourceTree = ""; }; @@ -231,10 +220,6 @@ B275E97B2364877A007AEF98 /* Green-Icon-App-76x76@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Green-Icon-App-76x76@2x.png"; sourceTree = ""; }; B275E97C2364877B007AEF98 /* Green-Icon-App-76x76@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Green-Icon-App-76x76@1x.png"; sourceTree = ""; }; B275E97D2364877C007AEF98 /* Green-Icon-App-60x60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Green-Icon-App-60x60@3x.png"; sourceTree = ""; }; - B275E98323648844007AEF98 /* Crew-Icon-App-76x76@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Crew-Icon-App-76x76@1x.png"; sourceTree = ""; }; - B275E98423648845007AEF98 /* Crew-Icon-App-60x60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Crew-Icon-App-60x60@3x.png"; sourceTree = ""; }; - B275E98523648846007AEF98 /* Crew-Icon-App-60x60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Crew-Icon-App-60x60@2x.png"; sourceTree = ""; }; - B275E98623648847007AEF98 /* Crew-Icon-App-76x76@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Crew-Icon-App-76x76@2x.png"; sourceTree = ""; }; B279882122A106CB00142F34 /* YoutubeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YoutubeCollectionViewCell.swift; sourceTree = ""; }; B279882522A10B8C00142F34 /* YoutubeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YoutubeCell.swift; sourceTree = ""; }; B279882822A10BBE00142F34 /* YoutubeData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YoutubeData.swift; sourceTree = ""; }; @@ -248,7 +233,6 @@ B2B738AA22AA3A97006F5A3E /* FloatingMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloatingMessage.swift; sourceTree = ""; }; B2E3638822AF496200AF131D /* Networking.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Networking.swift; sourceTree = ""; }; B2E3638A22AF7A3700AF131D /* Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = ""; }; - B2F226F422EF285500AAEAC0 /* BlitzKreigCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlitzKreigCollectionViewCell.swift; sourceTree = ""; }; B2F3159522891E02008A2611 /* UIHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIHelper.swift; sourceTree = ""; }; B2F3159722891E8D008A2611 /* UIDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIDevice.swift; sourceTree = ""; }; B2F3159922891ED2008A2611 /* UserDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaults.swift; sourceTree = ""; }; @@ -258,8 +242,6 @@ B2F42FE4230FEB6A0002B339 /* BulletinDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BulletinDataSource.swift; sourceTree = ""; }; B2F42FE5230FEB6A0002B339 /* DatePickerBulletinItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatePickerBulletinItem.swift; sourceTree = ""; }; B2F42FE6231017CA0002B339 /* UIImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIImage.swift; sourceTree = ""; }; - B2FAFF6122B607630007B9BE /* Dark-Icon-App-76x76@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Dark-Icon-App-76x76@1x.png"; sourceTree = ""; }; - B2FAFF6222B607630007B9BE /* Dark-Icon-App-76x76@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Dark-Icon-App-76x76@2x.png"; sourceTree = ""; }; B2FD53A3232793AB00D7C204 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; }; B2FD53A5232793AB00D7C204 /* UserNotificationsUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotificationsUI.framework; path = System/Library/Frameworks/UserNotificationsUI.framework; sourceTree = SDKROOT; }; B2FD53CF2327A46D00D7C204 /* NotificationServiceExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationServiceExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -495,13 +477,12 @@ B246245222885D7E000FE11A /* Wordpress */, B24BD6DB22A90253003D973B /* SLCM */, B23E8934229F9B9600417E88 /* Social */, - B2F226F422EF285500AAEAC0 /* BlitzKreigCollectionViewCell.swift */, B20A613A22A69C220044CB2F /* Directory */, B20A614522A6C5700044CB2F /* Alerts */, B21D643A2253571E000C6854 /* LaunchScreen.storyboard */, B21D643D2253571E000C6854 /* Info.plist */, 8B51469C256C7655008B590B /* Assets.xcassets */, - B204873825A57BB000EB3FF6 /* GoogleService-Info.plist */, + 62CAE30A27C6D86E005BB78A /* GoogleService-Info.plist */, B2F42FE0230FEB6A0002B339 /* Bulletin */, B205B10E2286F360003A2174 /* Extentions */, B21D644522535778000C6854 /* Dark Mode */, @@ -533,26 +514,14 @@ B230763722A826330047A487 /* Alternate Icons */ = { isa = PBXGroup; children = ( + 62CAE34F27CBFCDE005BB78A /* DarkAppIcon.png */, B275E96F23648003007AEF98 /* GreenAppIcon */, B230765B22A82C9A0047A487 /* AppIconService.swift */, - B275E98B23648855007AEF98 /* CrewAppIcon */, - B230763822A8268D0047A487 /* DarkAppIcon */, B275E9782364839C007AEF98 /* AppIconsViewController.swift */, ); path = "Alternate Icons"; sourceTree = ""; }; - B230763822A8268D0047A487 /* DarkAppIcon */ = { - isa = PBXGroup; - children = ( - B2FAFF6122B607630007B9BE /* Dark-Icon-App-76x76@1x.png */, - B2FAFF6222B607630007B9BE /* Dark-Icon-App-76x76@2x.png */, - B230765722A82C120047A487 /* Dark-Icon-App-60x60@2x.png */, - B230765822A82C120047A487 /* Dark-Icon-App-60x60@3x.png */, - ); - path = DarkAppIcon; - sourceTree = ""; - }; B230767722A83A870047A487 /* Master */ = { isa = PBXGroup; children = ( @@ -630,7 +599,6 @@ isa = PBXGroup; children = ( B25B8F9722A1A8F5008B588A /* Master */, - B2F42FE82310240E0002B339 /* Noir Card */, B25B8F9222A1A874008B588A /* Upcoming Events */, B284679A22A14347001437B8 /* Instagram */, BB935FD625594CE6002F427A /* Twitter */, @@ -753,17 +721,6 @@ path = GreenAppIcon; sourceTree = ""; }; - B275E98B23648855007AEF98 /* CrewAppIcon */ = { - isa = PBXGroup; - children = ( - B275E98523648846007AEF98 /* Crew-Icon-App-60x60@2x.png */, - B275E98423648845007AEF98 /* Crew-Icon-App-60x60@3x.png */, - B275E98323648844007AEF98 /* Crew-Icon-App-76x76@1x.png */, - B275E98623648847007AEF98 /* Crew-Icon-App-76x76@2x.png */, - ); - path = CrewAppIcon; - sourceTree = ""; - }; B279882322A10B7800142F34 /* Youtube */ = { isa = PBXGroup; children = ( @@ -872,14 +829,6 @@ path = Bulletin; sourceTree = ""; }; - B2F42FE82310240E0002B339 /* Noir Card */ = { - isa = PBXGroup; - children = ( - B25B8F9822A1A927008B588A /* NoirSelectCollectionViewCell.swift */, - ); - path = "Noir Card"; - sourceTree = ""; - }; B2FD53D02327A46D00D7C204 /* NotificationServiceExtension */ = { isa = PBXGroup; children = ( @@ -1089,21 +1038,14 @@ buildActionMask = 2147483647; files = ( B21D643C2253571E000C6854 /* LaunchScreen.storyboard in Resources */, - B275E98A23648847007AEF98 /* Crew-Icon-App-76x76@2x.png in Resources */, - B230765922A82C120047A487 /* Dark-Icon-App-60x60@2x.png in Resources */, B275E9812364877C007AEF98 /* Green-Icon-App-60x60@3x.png in Resources */, B275E97E2364877C007AEF98 /* Green-Icon-App-60x60@2x.png in Resources */, + 62CAE35027CBFCDE005BB78A /* DarkAppIcon.png in Resources */, BB57B5BB255F30FB0018F575 /* DropDownCell.xib in Resources */, - B230765A22A82C120047A487 /* Dark-Icon-App-60x60@3x.png in Resources */, - B275E98823648847007AEF98 /* Crew-Icon-App-60x60@3x.png in Resources */, B275E9802364877C007AEF98 /* Green-Icon-App-76x76@1x.png in Resources */, - B2FAFF6322B607630007B9BE /* Dark-Icon-App-76x76@1x.png in Resources */, - B275E98923648847007AEF98 /* Crew-Icon-App-60x60@2x.png in Resources */, - B204873925A57BB000EB3FF6 /* GoogleService-Info.plist in Resources */, - B2FAFF6422B607630007B9BE /* Dark-Icon-App-76x76@2x.png in Resources */, + 62CAE30B27C6D86E005BB78A /* GoogleService-Info.plist in Resources */, B275E97F2364877C007AEF98 /* Green-Icon-App-76x76@2x.png in Resources */, 8B51469D256C7655008B590B /* Assets.xcassets in Resources */, - B275E98723648847007AEF98 /* Crew-Icon-App-76x76@1x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1208,7 +1150,6 @@ BB1223B72509161C00C26B6E /* MusicCollectionViewCell.swift in Sources */, B21D64342253571C000C6854 /* WordpressFeedViewController.swift in Sources */, B2B738AB22AA3A97006F5A3E /* FloatingMessage.swift in Sources */, - B2F226F522EF285500AAEAC0 /* BlitzKreigCollectionViewCell.swift in Sources */, B2F42FE7231017CA0002B339 /* UIImage.swift in Sources */, B21D644D22535778000C6854 /* SubscribableValue.swift in Sources */, BB51D822250A7049000B1747 /* UIView+Layout.swift in Sources */, @@ -1255,7 +1196,6 @@ B2861D5F22A643DB004C3845 /* DirectoryData.swift in Sources */, BB51D820250A6F7D000B1747 /* WordpressFeedTableViewCell.swift in Sources */, B275E9792364839C007AEF98 /* AppIconsViewController.swift in Sources */, - B25B8F9922A1A927008B588A /* NoirSelectCollectionViewCell.swift in Sources */, B20A615122A7AF430044CB2F /* AboutInfoHeader.swift in Sources */, B2E3638B22AF7A3700AF131D /* Notifications.swift in Sources */, B284679D22A1436B001437B8 /* InstagramCell.swift in Sources */, @@ -1437,6 +1377,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = MTTN/MTTN.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; @@ -1466,10 +1407,12 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = MTTN/MTTN.entitlements; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = JB85XJ823E; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/MTTN", @@ -1484,6 +1427,7 @@ MARKETING_VERSION = 2.5; PRODUCT_BUNDLE_IDENTIFIER = com.gauravanandprakash.mttn; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1514,9 +1458,9 @@ B2FD53D92327A46D00D7C204 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = JB85XJ823E; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = NotificationServiceExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -1527,6 +1471,7 @@ MARKETING_VERSION = 2.5; PRODUCT_BUNDLE_IDENTIFIER = com.gauravanandprakash.mttn.NotificationServiceExtension; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1558,9 +1503,9 @@ B2FD53ED2327A84800D7C204 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = JB85XJ823E; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = NotificationsContentExtention/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -1571,6 +1516,7 @@ MARKETING_VERSION = 2.5; PRODUCT_BUNDLE_IDENTIFIER = com.gauravanandprakash.mttn.NotificationsContentExtention; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-60x60@2x.png b/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-60x60@2x.png deleted file mode 100644 index 0f55528..0000000 Binary files a/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-60x60@2x.png and /dev/null differ diff --git a/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-60x60@3x.png b/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-60x60@3x.png deleted file mode 100644 index 34cf2e0..0000000 Binary files a/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-60x60@3x.png and /dev/null differ diff --git a/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-76x76@1x.png b/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-76x76@1x.png deleted file mode 100644 index 266cdef..0000000 Binary files a/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-76x76@1x.png and /dev/null differ diff --git a/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-76x76@2x.png b/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-76x76@2x.png deleted file mode 100644 index 62d9138..0000000 Binary files a/MTTN/Alternate Icons/CrewAppIcon/Crew-Icon-App-76x76@2x.png and /dev/null differ diff --git a/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-60x60@2x.png b/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-60x60@2x.png deleted file mode 100644 index 83f68fa..0000000 Binary files a/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-60x60@2x.png and /dev/null differ diff --git a/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-60x60@3x.png b/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-60x60@3x.png deleted file mode 100644 index f400812..0000000 Binary files a/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-60x60@3x.png and /dev/null differ diff --git a/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-76x76@1x.png b/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-76x76@1x.png deleted file mode 100644 index a277454..0000000 Binary files a/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-76x76@1x.png and /dev/null differ diff --git a/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-76x76@2x.png b/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-76x76@2x.png deleted file mode 100644 index 97f6791..0000000 Binary files a/MTTN/Alternate Icons/DarkAppIcon/Dark-Icon-App-76x76@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/100.png b/MTTN/Assets.xcassets/AppIcon.appiconset/100.png new file mode 100644 index 0000000..0d3254f Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/100.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/1024.png b/MTTN/Assets.xcassets/AppIcon.appiconset/1024.png new file mode 100644 index 0000000..5e084a5 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/114.png b/MTTN/Assets.xcassets/AppIcon.appiconset/114.png new file mode 100644 index 0000000..b8529f7 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/120.png b/MTTN/Assets.xcassets/AppIcon.appiconset/120.png new file mode 100644 index 0000000..6797750 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/144.png b/MTTN/Assets.xcassets/AppIcon.appiconset/144.png new file mode 100644 index 0000000..679b2a5 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/144.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/152.png b/MTTN/Assets.xcassets/AppIcon.appiconset/152.png new file mode 100644 index 0000000..3ab3579 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/152.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/167.png b/MTTN/Assets.xcassets/AppIcon.appiconset/167.png new file mode 100644 index 0000000..e034ef4 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/167.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/180.png b/MTTN/Assets.xcassets/AppIcon.appiconset/180.png new file mode 100644 index 0000000..104cfc4 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/20.png b/MTTN/Assets.xcassets/AppIcon.appiconset/20.png new file mode 100644 index 0000000..43cb923 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/20.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/29.png b/MTTN/Assets.xcassets/AppIcon.appiconset/29.png new file mode 100644 index 0000000..22f6083 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/40.png b/MTTN/Assets.xcassets/AppIcon.appiconset/40.png new file mode 100644 index 0000000..1cff377 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/50.png b/MTTN/Assets.xcassets/AppIcon.appiconset/50.png new file mode 100644 index 0000000..42edf16 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/50.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/57.png b/MTTN/Assets.xcassets/AppIcon.appiconset/57.png new file mode 100644 index 0000000..9961ef2 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/58.png b/MTTN/Assets.xcassets/AppIcon.appiconset/58.png new file mode 100644 index 0000000..e1a5086 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/60.png b/MTTN/Assets.xcassets/AppIcon.appiconset/60.png new file mode 100644 index 0000000..9425d1b Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/72.png b/MTTN/Assets.xcassets/AppIcon.appiconset/72.png new file mode 100644 index 0000000..0d64081 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/72.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/76.png b/MTTN/Assets.xcassets/AppIcon.appiconset/76.png new file mode 100644 index 0000000..797c834 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/76.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/80.png b/MTTN/Assets.xcassets/AppIcon.appiconset/80.png new file mode 100644 index 0000000..b9333f2 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/87.png b/MTTN/Assets.xcassets/AppIcon.appiconset/87.png new file mode 100644 index 0000000..8aa8248 Binary files /dev/null and b/MTTN/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Contents.json b/MTTN/Assets.xcassets/AppIcon.appiconset/Contents.json old mode 100755 new mode 100644 index 4062365..4fdf882 --- a/MTTN/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/MTTN/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,158 +1,158 @@ { "images" : [ { - "size" : "20x20", + "filename" : "40.png", "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "20x20", + "filename" : "60.png", "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { - "size" : "29x29", + "filename" : "29.png", "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "58.png", "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "87.png", "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "29x29" }, { - "size" : "40x40", + "filename" : "80.png", "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { - "size" : "40x40", + "filename" : "120.png", "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "40x40" }, { - "size" : "57x57", + "filename" : "57.png", "idiom" : "iphone", - "filename" : "Icon-App-57x57@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "57x57" }, { - "size" : "57x57", + "filename" : "114.png", "idiom" : "iphone", - "filename" : "Icon-App-57x57@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "57x57" }, { - "size" : "60x60", + "filename" : "120.png", "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "60x60" }, { - "size" : "60x60", + "filename" : "180.png", "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "60x60" }, { - "size" : "20x20", + "filename" : "20.png", "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "20x20" }, { - "size" : "20x20", + "filename" : "40.png", "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "29x29", + "filename" : "29.png", "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "58.png", "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "40x40", + "filename" : "40.png", "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "40x40" }, { - "size" : "40x40", + "filename" : "80.png", "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { - "size" : "50x50", + "filename" : "50.png", "idiom" : "ipad", - "filename" : "Icon-Small-50x50@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "50x50" }, { - "size" : "50x50", + "filename" : "100.png", "idiom" : "ipad", - "filename" : "Icon-Small-50x50@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "50x50" }, { - "size" : "72x72", + "filename" : "72.png", "idiom" : "ipad", - "filename" : "Icon-App-72x72@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "72x72" }, { - "size" : "72x72", + "filename" : "144.png", "idiom" : "ipad", - "filename" : "Icon-App-72x72@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "72x72" }, { - "size" : "76x76", + "filename" : "76.png", "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "76x76" }, { - "size" : "76x76", + "filename" : "152.png", "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "76x76" }, { - "size" : "83.5x83.5", + "filename" : "167.png", "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "83.5x83.5" }, { - "size" : "1024x1024", + "filename" : "1024.png", "idiom" : "ios-marketing", - "filename" : "ItunesArtwork@2x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png deleted file mode 100644 index 9f613c9..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100644 index 77768b3..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index db8645f..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index a3e552a..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index a962131..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100644 index 21b5c62..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100644 index 39c6b7b..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index 1c5fc4e..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index bf4ab16..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png deleted file mode 100644 index ec88cbb..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png deleted file mode 100644 index 957343b..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index bf4ab16..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index ceb610a..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png deleted file mode 100644 index b5c1d38..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png deleted file mode 100644 index 2259456..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index 738b2a6..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100644 index 10ee551..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index bc118ee..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-Small-50x50@1x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-Small-50x50@1x.png deleted file mode 100644 index b1d7b61..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-Small-50x50@1x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-Small-50x50@2x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-Small-50x50@2x.png deleted file mode 100644 index 452bb99..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/Icon-Small-50x50@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png b/MTTN/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png deleted file mode 100644 index 3e68be7..0000000 Binary files a/MTTN/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/DarkAppIcon.imageset/Contents.json b/MTTN/Assets.xcassets/DarkAppIcon.imageset/Contents.json deleted file mode 100755 index e80c1ad..0000000 --- a/MTTN/Assets.xcassets/DarkAppIcon.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "Dark-Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/MTTN/Assets.xcassets/DarkAppIcon.imageset/Dark-Icon-App-76x76@2x.png b/MTTN/Assets.xcassets/DarkAppIcon.imageset/Dark-Icon-App-76x76@2x.png deleted file mode 100644 index 97f6791..0000000 Binary files a/MTTN/Assets.xcassets/DarkAppIcon.imageset/Dark-Icon-App-76x76@2x.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/index.imageset/Contents.json b/MTTN/Assets.xcassets/index.imageset/Contents.json index ff03448..fc9bc00 100755 --- a/MTTN/Assets.xcassets/index.imageset/Contents.json +++ b/MTTN/Assets.xcassets/index.imageset/Contents.json @@ -1,8 +1,8 @@ { "images" : [ { + "filename" : "MTTN-Icon@1x.png", "idiom" : "universal", - "filename" : "index.png", "scale" : "1x" }, { @@ -15,7 +15,7 @@ } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/MTTN/Assets.xcassets/index.imageset/MTTN-Icon@1x.png b/MTTN/Assets.xcassets/index.imageset/MTTN-Icon@1x.png new file mode 100644 index 0000000..1cf9904 Binary files /dev/null and b/MTTN/Assets.xcassets/index.imageset/MTTN-Icon@1x.png differ diff --git a/MTTN/Assets.xcassets/index.imageset/index.png b/MTTN/Assets.xcassets/index.imageset/index.png deleted file mode 100755 index c0589e5..0000000 Binary files a/MTTN/Assets.xcassets/index.imageset/index.png and /dev/null differ diff --git a/MTTN/Assets.xcassets/launch.imageset/Contents.json b/MTTN/Assets.xcassets/launch.imageset/Contents.json new file mode 100644 index 0000000..941506a --- /dev/null +++ b/MTTN/Assets.xcassets/launch.imageset/Contents.json @@ -0,0 +1,56 @@ +{ + "images" : [ + { + "filename" : "mttn_logo_whiteonblack@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "MTTN-Icon@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mttn_logo_whiteonblack@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "MTTN-Icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mttn_logo_whiteonblack@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "MTTN-Icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MTTN/Assets.xcassets/launch.imageset/MTTN-Icon@1x.png b/MTTN/Assets.xcassets/launch.imageset/MTTN-Icon@1x.png new file mode 100644 index 0000000..1cf9904 Binary files /dev/null and b/MTTN/Assets.xcassets/launch.imageset/MTTN-Icon@1x.png differ diff --git a/MTTN/Assets.xcassets/launch.imageset/MTTN-Icon@2x.png b/MTTN/Assets.xcassets/launch.imageset/MTTN-Icon@2x.png new file mode 100644 index 0000000..0cb840b Binary files /dev/null and b/MTTN/Assets.xcassets/launch.imageset/MTTN-Icon@2x.png differ diff --git a/MTTN/Assets.xcassets/launch.imageset/MTTN-Icon@3x.png b/MTTN/Assets.xcassets/launch.imageset/MTTN-Icon@3x.png new file mode 100644 index 0000000..f7f48b6 Binary files /dev/null and b/MTTN/Assets.xcassets/launch.imageset/MTTN-Icon@3x.png differ diff --git a/MTTN/Assets.xcassets/launch.imageset/mttn_logo_whiteonblack@1x.png b/MTTN/Assets.xcassets/launch.imageset/mttn_logo_whiteonblack@1x.png new file mode 100644 index 0000000..b8a5dd2 Binary files /dev/null and b/MTTN/Assets.xcassets/launch.imageset/mttn_logo_whiteonblack@1x.png differ diff --git a/MTTN/Assets.xcassets/launch.imageset/mttn_logo_whiteonblack@2x.png b/MTTN/Assets.xcassets/launch.imageset/mttn_logo_whiteonblack@2x.png new file mode 100644 index 0000000..7c8069e Binary files /dev/null and b/MTTN/Assets.xcassets/launch.imageset/mttn_logo_whiteonblack@2x.png differ diff --git a/MTTN/Assets.xcassets/launch.imageset/mttn_logo_whiteonblack@3x.png b/MTTN/Assets.xcassets/launch.imageset/mttn_logo_whiteonblack@3x.png new file mode 100644 index 0000000..f0aa5fa Binary files /dev/null and b/MTTN/Assets.xcassets/launch.imageset/mttn_logo_whiteonblack@3x.png differ diff --git a/MTTN/Base.lproj/LaunchScreen.storyboard b/MTTN/Base.lproj/LaunchScreen.storyboard index 2c60143..089fdf0 100755 --- a/MTTN/Base.lproj/LaunchScreen.storyboard +++ b/MTTN/Base.lproj/LaunchScreen.storyboard @@ -1,10 +1,11 @@ - + - + + @@ -16,20 +17,17 @@ - - - - - - + + + - + + + - - @@ -38,6 +36,12 @@ - + + + + + + + diff --git a/MTTN/BlitzKreigCollectionViewCell.swift b/MTTN/BlitzKreigCollectionViewCell.swift deleted file mode 100755 index db6225e..0000000 --- a/MTTN/BlitzKreigCollectionViewCell.swift +++ /dev/null @@ -1,133 +0,0 @@ -// -// BlitzKreigCollectionViewController.swift -// MTTN -// -// Created by Naman Jain on 29/07/19. -// Copyright © 2019 Naman Jain. All rights reserved. -// - -import UIKit - -import UIKit -import Alamofire -import Firebase - -struct BlitzVideo { - var youtubeUrl : String? - var thumbnailUrl : String? - var title: String? -} - -class BlitzKreigCollectionViewCell: UICollectionViewCell, UICollectionViewDelegateFlowLayout, UICollectionViewDataSource{ - - private let cellId = "cellID" - weak var socialViewController: SocialViewController? - fileprivate var ref: DatabaseReference? - var youtubeItems = [BlitzVideo]() - - - lazy var titleLabel: UILabel = { - let label = UILabel() - label.text = "Blitzkrieg Dance Crew India" - label.font = UIFont.boldSystemFont(ofSize: 19) - return label - }() - - lazy var youtubeCollectionView: UICollectionView = { - let layout = UICollectionViewFlowLayout() - layout.scrollDirection = .horizontal - let cv = UICollectionView(frame: .zero, collectionViewLayout: layout) - cv.delegate = self - cv.dataSource = self - cv.register(YoutubeCell.self, forCellWithReuseIdentifier: cellId) - return cv - }() - - lazy var seperatorLineView: UIView = { - let view = UIView() - return view - }() - - func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { - return youtubeItems.count - } - - func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { - let cell = collectionView.dequeueReusableCell(withReuseIdentifier: cellId, for: indexPath) as! YoutubeCell - cell.nameLabel.text = youtubeItems[indexPath.item].title ?? "" - let url = NSURL(string: youtubeItems[indexPath.item].thumbnailUrl ?? "") - cell.imageView.sd_setImage(with: url! as URL, placeholderImage:nil) - return cell - } - - func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets { - return UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 10) - } - - func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat { - return 10 - } - - func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { - return CGSize(width: 180, height: frame.height - 44) - } - - func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - if let youtubeLink = youtubeItems[indexPath.item].youtubeUrl { - self.socialViewController?.openLink(link: youtubeLink) - } - } - - override init(frame: CGRect) { - super.init(frame: frame) - if #available(iOS 13.0, *) { - - } else { - setupTheming() - } - setupLayout() - fetchVideos() - } - - fileprivate func setupLayout(){ - addSubview(titleLabel) - titleLabel.anchorWithConstants(top: topAnchor, left: leftAnchor, bottom: nil, right: rightAnchor, topConstant: 0, leftConstant: 16, bottomConstant: 0, rightConstant: 16) - addSubview(youtubeCollectionView) - youtubeCollectionView.anchorWithConstants(top: titleLabel.bottomAnchor, left: leftAnchor, bottom: bottomAnchor, right: rightAnchor, topConstant: 0, leftConstant: 0, bottomConstant: 0, rightConstant: 0) - addSubview(seperatorLineView) - _ = seperatorLineView.anchor(top: nil, left: leftAnchor, bottom: bottomAnchor, right: rightAnchor, topConstant: 0, leftConstant: 16, bottomConstant: 0, rightConstant: 0, widthConstant: 0, heightConstant: 0.7) - } - - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - @objc func fetchVideos(){ - ref = Database.database().reference() - ref?.child("Blitz").observe(.childAdded, with: { (snapshot) in - var video = BlitzVideo() - let imageName = snapshot.childSnapshot(forPath: "thumbnailUrl").value as? String - if let actualImageName = imageName { - video.thumbnailUrl = actualImageName - } - let name = snapshot.childSnapshot(forPath: "title").value as? String - if let actualName = name { - video.title = actualName - } - let link = snapshot.childSnapshot(forPath: "youtubeUrl").value as? String - if let actualLink = link { - video.youtubeUrl = actualLink - } - self.youtubeItems.insert(video, at: 0) - self.youtubeCollectionView.insertItems(at: [IndexPath(item: 0, section: 0)]) - }) - } -} - -extension BlitzKreigCollectionViewCell: Themed { - func applyTheme(_ theme: AppTheme) { - youtubeCollectionView.backgroundColor = theme.backgroundColor - titleLabel.textColor = theme.titleTextColor - seperatorLineView.backgroundColor = theme.separatorColor - } -} diff --git a/MTTN/Info.plist b/MTTN/Info.plist index 6ff5b07..ccabca1 100755 --- a/MTTN/Info.plist +++ b/MTTN/Info.plist @@ -23,7 +23,7 @@ CFBundleIconFiles - Dark-Icon-App-60x60 + DarkAppIcon GreenAppIcon @@ -38,7 +38,7 @@ CFBundleIconFiles - + AppIcon UIPrerenderedIcon @@ -59,7 +59,7 @@ CFBundleIconFiles - Dark-Icon-App-76x76 + DarkAppIcon GreenAppIcon diff --git a/MTTN/Master/AppDelegate.swift b/MTTN/Master/AppDelegate.swift index a9d7a6c..c341ff6 100755 --- a/MTTN/Master/AppDelegate.swift +++ b/MTTN/Master/AppDelegate.swift @@ -10,7 +10,6 @@ import UIKit import Firebase import FirebaseDatabase import FirebaseMessaging -import FirebaseInstanceID import UserNotifications import SafariServices import DropDown @@ -129,7 +128,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD }) } - func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String) { + func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) { //this function is used to save fcmToken in UserDefaults print("fcmToken: \(fcmToken)") UserDefaults.standard.set(fcmToken, forKey: "fcmToken") @@ -145,7 +144,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. - FBHandler(value: false) +// FBHandler(value: false) } func applicationWillEnterForeground(_ application: UIApplication) { @@ -155,7 +154,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD func applicationDidBecomeActive(_ application: UIApplication) { // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - FBHandler(value: true) +// FBHandler(value: true) } func applicationWillTerminate(_ application: UIApplication) { @@ -163,7 +162,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD } @objc func FBHandler(value: Bool) { - Messaging.messaging().shouldEstablishDirectChannel = value + Messaging.messaging() } func handleApplicationStartingFromNotification(launchOptions: [UIApplication.LaunchOptionsKey: Any]?){ diff --git a/MTTN/Master/Networking.swift b/MTTN/Master/Networking.swift index 840bd1c..8ed3d14 100755 --- a/MTTN/Master/Networking.swift +++ b/MTTN/Master/Networking.swift @@ -37,8 +37,7 @@ struct Networking { var attendance = [Attendance]() var credits = [Credits]() - let url = NSURL(string: "http://139.59.23.178:8000/attendance_again") //"http://68.183.81.48:6969/attendance") // - + let url = NSURL(string: "\(urlString)_again") let session = URLSession.shared let request = NSMutableURLRequest(url: url! as URL) diff --git a/MTTN/Social/Noir Card/NoirSelectCollectionViewCell.swift b/MTTN/Social/Noir Card/NoirSelectCollectionViewCell.swift deleted file mode 100755 index 2b09129..0000000 --- a/MTTN/Social/Noir Card/NoirSelectCollectionViewCell.swift +++ /dev/null @@ -1,176 +0,0 @@ -// -// NoirSelectCollectionViewCell.swift -// MTTN -// -// Created by Naman Jain on 31/05/19. -// Copyright © 2019 Naman Jain. All rights reserved. -// - -import UIKit -import Pastel - -class NoirSelectCollectionViewCell: UICollectionViewCell { - var socialViewController: SocialViewController? - - - var cardNumber: String?{ - didSet{ - guard let number = cardNumber else { return } - numberLabel.text = number - numberLabel.alpha = 1 - titleLabel.alpha = 0 - } - } - - var cardName: String?{ - didSet{ - guard let name = cardName else { return } - nameLabel.text = name - nameLabel.alpha = 1 - titleLabel.alpha = 0 - } - } - - lazy var pastelView: PastelView = { - let view = PastelView() - view.layer.cornerRadius = 15 - view.layer.masksToBounds = true - view.clipsToBounds = true - - // Custom Direction - view.startPastelPoint = .bottomLeft - view.endPastelPoint = .topRight - - - // Custom Duration - view.animationDuration = 1.2 - - // Custom Color - view.setColors([UIColor(red: 0, green: 0, blue: 0, alpha: 1.0), - UIColor(red: 25/255, green: 25/255, blue: 25/255, alpha: 1.0), - UIColor(red: 65/255, green: 65/255, blue: 65/255, alpha: 1.0), - UIColor(red: 45/255, green: 45/255, blue: 45/255, alpha: 1.0), - UIColor(red: 0, green: 0, blue: 0, alpha: 1.0), - UIColor(red: 75/255, green: 75/255, blue: 75/255, alpha: 1.0), - UIColor(red: 0, green: 0, blue: 0, alpha: 1.0), - UIColor(red: 85/255, green: 85/255, blue: 85/255, alpha: 1.0), - UIColor(red: 0, green: 0, blue: 0, alpha: 1.0), - UIColor(red: 65/255, green: 65/255, blue: 65/255, alpha: 1.0), - UIColor(red: 0, green: 0, blue: 0, alpha: 1.0), - UIColor(red: 105/255, green: 105/255, blue: 105/255, alpha: 1.0)]) - view.startAnimation() - return view - }() - - - lazy var titleLabel: UILabel = { - let label = UILabel() - label.text = "TAP TO ACTIVATE NOIR CARD" - label.textColor = #colorLiteral(red: 0.7739099264, green: 0.6036915779, blue: 0.204376936, alpha: 1) - label.textAlignment = .center - label.font = UIFont.boldSystemFont(ofSize: 12) - return label - }() - - lazy var noirSelectLabel: UILabel = { - let label = UILabel() - label.text = "N O I R S E L E C T" - label.textColor = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1) - label.textAlignment = .center - label.font = UIFont.boldSystemFont(ofSize: 15) - return label - }() - - lazy var offersLabel: UILabel = { - let label = UILabel() - label.text = "NOIR SELECT OFFERS" - label.textColor = #colorLiteral(red: 0.7739099264, green: 0.6036915779, blue: 0.204376936, alpha: 1) - label.textAlignment = .center - label.font = UIFont.boldSystemFont(ofSize: 19) - return label - }() - - lazy var nameLabel: UILabel = { - let label = UILabel() - label.text = "NAMAN JAIN" - label.textColor = #colorLiteral(red: 0.7739099264, green: 0.6036915779, blue: 0.204376936, alpha: 1) - label.alpha = 0 - label.font = UIFont.boldSystemFont(ofSize: 19) - return label - }() - - lazy var numberLabel: UILabel = { - let label = UILabel() - label.text = "1709 1808 2701 0903" - label.textColor = #colorLiteral(red: 0.7739099264, green: 0.6036915779, blue: 0.204376936, alpha: 1) - label.alpha = 0 - label.font = UIFont.systemFont(ofSize: 19) - return label - }() - - lazy var validThruLabel: UILabel = { - let label = UILabel() - label.text = "VALID THRU 01/20" - label.textColor = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1) - label.font = UIFont.systemFont(ofSize: 12) - return label - }() - - lazy var infoButton: UIButton = { - let button = UIButton(type: .infoDark) - button.tintColor = .white - button.addTarget(self, action: #selector(showNoirCardsOffers), for: .touchUpInside) - return button - }() - - lazy var seperatorLineView: UIView = { - let view = UIView() - return view - }() - - override init(frame: CGRect) { - super.init(frame: frame) - if #available(iOS 13.0, *) { - seperatorLineView.backgroundColor = .quaternaryLabel - } else { - setupTheming() - } - setupLayout() - } - - fileprivate func setupLayout(){ - addSubview(pastelView) - pastelView.anchorWithConstants(top: topAnchor, left: leftAnchor, bottom: bottomAnchor, right: rightAnchor, topConstant: 0, leftConstant: 10, bottomConstant: 16, rightConstant: 10) - addSubview(noirSelectLabel) - noirSelectLabel.anchorWithConstants(top: pastelView.topAnchor, left: pastelView.leftAnchor, bottom: nil, right: pastelView.rightAnchor, topConstant: 16, leftConstant: 16, bottomConstant: 16, rightConstant: 16) - addSubview(nameLabel) - nameLabel.anchorWithConstants(top: noirSelectLabel.bottomAnchor, left: pastelView.leftAnchor, bottom: nil, right: pastelView.rightAnchor, topConstant: 40, leftConstant: 16, bottomConstant: 16, rightConstant: 16) - addSubview(numberLabel) - numberLabel.anchorWithConstants(top: nameLabel.bottomAnchor, left: pastelView.leftAnchor, bottom: nil, right: pastelView.rightAnchor, topConstant: 4, leftConstant: 16, bottomConstant: 16, rightConstant: 16) -// addSubview(validThruLabel) -// validThruLabel.anchorWithConstants(top: nil, left: pastelView.leftAnchor, bottom: pastelView.bottomAnchor, right: pastelView.rightAnchor, topConstant: 4, leftConstant: 16, bottomConstant: 16, rightConstant: 16) - addSubview(infoButton) - _ = infoButton.anchor(top: nil, left: nil, bottom: pastelView.bottomAnchor, right: pastelView.rightAnchor, topConstant: 0, leftConstant: 0, bottomConstant: 4, rightConstant: 4, widthConstant: 30, heightConstant: 30) - addSubview(titleLabel) - titleLabel.anchorWithConstants(top: pastelView.topAnchor, left: pastelView.leftAnchor, bottom: pastelView.bottomAnchor, right: pastelView.rightAnchor, topConstant: 16, leftConstant: 16, bottomConstant: 16, rightConstant: 16) - - addSubview(seperatorLineView) - _ = seperatorLineView.anchor(top: nil, left: leftAnchor, bottom: bottomAnchor, right: rightAnchor, topConstant: 0, leftConstant: 16, bottomConstant: 0, rightConstant: 0, widthConstant: 0, heightConstant: 0.7) - } - - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - - @objc func showNoirCardsOffers(){ - - } -} - -extension NoirSelectCollectionViewCell: Themed { - func applyTheme(_ theme: AppTheme) { - seperatorLineView.backgroundColor = theme.separatorColor - } -} - diff --git a/MTTN/Wordpress/Controller/WordpressFeedViewController.swift b/MTTN/Wordpress/Controller/WordpressFeedViewController.swift index b825bf8..05ce8d4 100755 --- a/MTTN/Wordpress/Controller/WordpressFeedViewController.swift +++ b/MTTN/Wordpress/Controller/WordpressFeedViewController.swift @@ -507,7 +507,10 @@ extension WordpressFeedViewController : UITableViewDelegate , UITableViewDataSou let cell = tableView.dequeueReusableCell(withIdentifier: "WordpressFeedTableViewCellId", for: indexPath) as! WordpressFeedTableViewCell cell.postTitle.text = posts[indexPath.row].title if let imgURL = posts[indexPath.row].imgURL { - let url = NSURL(string: imgURL) + var url = NSURL(string: imgURL) + if(url == nil){ + url = NSURL(string: "https://firebasestorage.googleapis.com/v0/b/mttn-475ad.appspot.com/o/default-image.jpeg?alt=media&token=0e70c765-790a-402d-a165-d6fba0093667") + } cell.postImage.sd_setImage(with: url! as URL, placeholderImage:nil) } cell.dateLabel.text = posts[indexPath.row].date diff --git a/Podfile.lock b/Podfile.lock index 6641b7e..074219c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -3,110 +3,130 @@ PODS: - CBFlashyTabBarController (0.8.3) - Disk (0.6.4) - DropDown (2.3.13) - - Firebase/Auth (6.34.0): + - Firebase/Auth (8.12.1): - Firebase/CoreOnly - - FirebaseAuth (~> 6.9.2) - - Firebase/Core (6.34.0): + - FirebaseAuth (~> 8.12.0) + - Firebase/Core (8.12.1): - Firebase/CoreOnly - - FirebaseAnalytics (= 6.9.0) - - Firebase/CoreOnly (6.34.0): - - FirebaseCore (= 6.10.4) - - Firebase/Database (6.34.0): + - FirebaseAnalytics (~> 8.12.0) + - Firebase/CoreOnly (8.12.1): + - FirebaseCore (= 8.12.1) + - Firebase/Database (8.12.1): - Firebase/CoreOnly - - FirebaseDatabase (~> 6.6.0) - - Firebase/Messaging (6.34.0): + - FirebaseDatabase (~> 8.12.0) + - Firebase/Messaging (8.12.1): - Firebase/CoreOnly - - FirebaseMessaging (~> 4.7.1) - - FirebaseAnalytics (6.9.0): - - FirebaseCore (~> 6.10) - - FirebaseInstallations (~> 1.7) - - GoogleAppMeasurement (= 6.9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 6.7) - - GoogleUtilities/MethodSwizzler (~> 6.7) - - GoogleUtilities/Network (~> 6.7) - - "GoogleUtilities/NSData+zlib (~> 6.7)" - - nanopb (~> 1.30906.0) - - FirebaseAuth (6.9.2): - - FirebaseCore (~> 6.10) - - GoogleUtilities/AppDelegateSwizzler (~> 6.7) - - GoogleUtilities/Environment (~> 6.7) - - GTMSessionFetcher/Core (~> 1.1) - - FirebaseCore (6.10.4): - - FirebaseCoreDiagnostics (~> 1.6) - - GoogleUtilities/Environment (~> 6.7) - - GoogleUtilities/Logger (~> 6.7) - - FirebaseCoreDiagnostics (1.7.0): - - GoogleDataTransport (~> 7.4) - - GoogleUtilities/Environment (~> 6.7) - - GoogleUtilities/Logger (~> 6.7) - - nanopb (~> 1.30906.0) - - FirebaseDatabase (6.6.0): - - FirebaseCore (~> 6.10) + - FirebaseMessaging (~> 8.12.0) + - FirebaseAnalytics (8.12.0): + - FirebaseAnalytics/AdIdSupport (= 8.12.0) + - FirebaseCore (~> 8.0) + - FirebaseInstallations (~> 8.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - nanopb (~> 2.30908.0) + - FirebaseAnalytics/AdIdSupport (8.12.0): + - FirebaseCore (~> 8.0) + - FirebaseInstallations (~> 8.0) + - GoogleAppMeasurement (= 8.12.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - nanopb (~> 2.30908.0) + - FirebaseAuth (8.12.0): + - FirebaseCore (~> 8.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/Environment (~> 7.7) + - GTMSessionFetcher/Core (~> 1.5) + - FirebaseCore (8.12.1): + - FirebaseCoreDiagnostics (~> 8.0) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Logger (~> 7.7) + - FirebaseCoreDiagnostics (8.12.0): + - GoogleDataTransport (~> 9.1) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Logger (~> 7.7) + - nanopb (~> 2.30908.0) + - FirebaseDatabase (8.12.0): + - FirebaseCore (~> 8.0) - leveldb-library (~> 1.22) - - FirebaseInstallations (1.7.0): - - FirebaseCore (~> 6.10) - - GoogleUtilities/Environment (~> 6.7) - - GoogleUtilities/UserDefaults (~> 6.7) - - PromisesObjC (~> 1.2) - - FirebaseInstanceID (4.8.0): - - FirebaseCore (~> 6.10) - - FirebaseInstallations (~> 1.6) - - GoogleUtilities/Environment (~> 6.7) - - GoogleUtilities/UserDefaults (~> 6.7) - - FirebaseMessaging (4.7.1): - - FirebaseCore (~> 6.10) - - FirebaseInstanceID (~> 4.7) - - GoogleUtilities/AppDelegateSwizzler (~> 6.7) - - GoogleUtilities/Environment (~> 6.7) - - GoogleUtilities/Reachability (~> 6.7) - - GoogleUtilities/UserDefaults (~> 6.7) - - Protobuf (>= 3.9.2, ~> 3.9) - - FittedSheets (2.2.0) - - GoogleAppMeasurement (6.9.0): - - GoogleUtilities/AppDelegateSwizzler (~> 6.7) - - GoogleUtilities/MethodSwizzler (~> 6.7) - - GoogleUtilities/Network (~> 6.7) - - "GoogleUtilities/NSData+zlib (~> 6.7)" - - nanopb (~> 1.30906.0) - - GoogleDataTransport (7.5.1): - - nanopb (~> 1.30906.0) - - GoogleUtilities/AppDelegateSwizzler (6.7.2): + - FirebaseInstallations (8.12.0): + - FirebaseCore (~> 8.0) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/UserDefaults (~> 7.7) + - PromisesObjC (< 3.0, >= 1.2) + - FirebaseMessaging (8.12.0): + - FirebaseCore (~> 8.0) + - FirebaseInstallations (~> 8.0) + - GoogleDataTransport (~> 9.1) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Reachability (~> 7.7) + - GoogleUtilities/UserDefaults (~> 7.7) + - nanopb (~> 2.30908.0) + - FittedSheets (2.4.2) + - GoogleAppMeasurement (8.12.0): + - GoogleAppMeasurement/AdIdSupport (= 8.12.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - nanopb (~> 2.30908.0) + - GoogleAppMeasurement/AdIdSupport (8.12.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 8.12.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - nanopb (~> 2.30908.0) + - GoogleAppMeasurement/WithoutAdIdSupport (8.12.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - nanopb (~> 2.30908.0) + - GoogleDataTransport (9.1.2): + - GoogleUtilities/Environment (~> 7.2) + - nanopb (~> 2.30908.0) + - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/AppDelegateSwizzler (7.7.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (6.7.2): - - PromisesObjC (~> 1.2) - - GoogleUtilities/Logger (6.7.2): + - GoogleUtilities/Environment (7.7.0): + - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/Logger (7.7.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (6.7.2): + - GoogleUtilities/MethodSwizzler (7.7.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (6.7.2): + - GoogleUtilities/Network (7.7.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (6.7.2)" - - GoogleUtilities/Reachability (6.7.2): + - "GoogleUtilities/NSData+zlib (7.7.0)" + - GoogleUtilities/Reachability (7.7.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (6.7.2): + - GoogleUtilities/UserDefaults (7.7.0): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (1.4.0) - - leveldb-library (1.22) - - nanopb (1.30906.0): - - nanopb/decode (= 1.30906.0) - - nanopb/encode (= 1.30906.0) - - nanopb/decode (1.30906.0) - - nanopb/encode (1.30906.0) + - GTMSessionFetcher/Core (1.7.0) + - leveldb-library (1.22.1) + - nanopb (2.30908.0): + - nanopb/decode (= 2.30908.0) + - nanopb/encode (= 2.30908.0) + - nanopb/decode (2.30908.0) + - nanopb/encode (2.30908.0) - Pastel (0.6.0) - - PromisesObjC (1.2.11) - - Protobuf (3.13.0) + - PromisesObjC (2.0.0) - RNCryptor (5.1.0) - - SDWebImage (5.9.3): - - SDWebImage/Core (= 5.9.3) - - SDWebImage/Core (5.9.3) + - SDWebImage (5.12.3): + - SDWebImage/Core (= 5.12.3) + - SDWebImage/Core (5.12.3) - ShimmerSwift (2.1.1) - - SwiftMessages (8.0.2): - - SwiftMessages/App (= 8.0.2) - - SwiftMessages/App (8.0.2) + - SwiftMessages (9.0.6): + - SwiftMessages/App (= 9.0.6) + - SwiftMessages/App (9.0.6) DEPENDENCIES: - Alamofire (~> 4.0) @@ -136,7 +156,6 @@ SPEC REPOS: - FirebaseCoreDiagnostics - FirebaseDatabase - FirebaseInstallations - - FirebaseInstanceID - FirebaseMessaging - FittedSheets - GoogleAppMeasurement @@ -147,7 +166,6 @@ SPEC REPOS: - nanopb - Pastel - PromisesObjC - - Protobuf - RNCryptor - SDWebImage - ShimmerSwift @@ -168,30 +186,28 @@ SPEC CHECKSUMS: CBFlashyTabBarController: bc6b11dd4cbc9b54785c8944156e2f4d4f03b088 Disk: dcee5c2e98fb72f9a924cde8da8435b08244a80e DropDown: bf260fd688978138019ad7d94f63a2362dad85ba - Firebase: c23a36d9e4cdf7877dfcba8dd0c58add66358999 - FirebaseAnalytics: 3bb096873ee0d7fa4b6c70f5e9166b6da413cc7f - FirebaseAuth: c92d49ada7948d1a23466e3db17bc4c2039dddc3 - FirebaseCore: d3a978a3cfa3240bf7e4ba7d137fdf5b22b628ec - FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1 - FirebaseDatabase: 13a865a4b85897462b930eb683bda8f52583713f - FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2 - FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1 - FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a - FittedSheets: 51021a5caab6c2fbc35e1be8b5c57177edfa0326 - GoogleAppMeasurement: a6a3a066369828db64eda428cb2856dc1cdc7c4e - GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833 - GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3 - GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10 - leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7 - nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc + Firebase: 580d09e8edafc3073ebf09c03fd42e4d80d35fe9 + FirebaseAnalytics: bd10d7706ba8d6e01ea2816f8fe9e9b881cb0918 + FirebaseAuth: 5250d7bdba35e57cc34ec7ddc525f82b2757f2a0 + FirebaseCore: 8138de860a90ca7eec5e324da5788fb0ebf1d93c + FirebaseCoreDiagnostics: 3b40dfadef5b90433a60ae01f01e90fe87aa76aa + FirebaseDatabase: f130b3d45b2a7a0b86059734d5bd67353df8d32f + FirebaseInstallations: 25764cf322e77f99449395870a65b2bef88e1545 + FirebaseMessaging: 23db8bf05585e929ada8af0f0968933c25252808 + FittedSheets: 661408776eb4ff514a31da75b3600bd7222b2b3d + GoogleAppMeasurement: ae033c3aad67e68294369373056b4d74cc8ae0d6 + GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 + GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 + GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 + leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729 + nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 Pastel: 814f081efbe2859c37e65ee44f396e6e5be88619 - PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f - Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748 + PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 RNCryptor: a369134686cd2ad391323cc856b62e591193ba79 - SDWebImage: a31ee8e90a97303529e03fb0c333eae0eacb88e9 + SDWebImage: 53179a2dba77246efa8a9b85f5c5b21f8f43e38f ShimmerSwift: f7ed2daf9c246de8299dfd9e12c6ab465cba9842 - SwiftMessages: 633304165351b8e3dcbb81a71f8efcd86f9c1669 + SwiftMessages: f0c7ef4705a570ad6c5e208b611f4333e660ed92 PODFILE CHECKSUM: 9837b270d8f7d60338cc334f926fcab17e7d1f9e -COCOAPODS: 1.10.0 +COCOAPODS: 1.11.2