Merge pull request #1632 from NYPL-Simplified/deprecation

Deprecation

Author: milliesavalia

.gitmodules

@@ -28,3 +28,6 @@
 [submodule "NYPLAudiobookToolkit"]
 	path = NYPLAudiobookToolkit
 	url = https://github.com/NYPL-Simplified/NYPLAudiobookToolkit.git
+[submodule "availability"]
+	path = availability
+	url = https://github.com/go-darwin/availability

NYPLAEToolkit

@@ -1030,6 +1030,9 @@
 		8C835DD5234D0B900050A18D /* NYPLFacetBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C835DD4234D0B900050A18D /* NYPLFacetBarView.swift */; };
 		8CC26F832370C1DF0000D8E1 /* Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC26F822370C1DF0000D8E1 /* Account.swift */; };
 		8CE9C471237F84820072E964 /* NYPLBookDetailsProblemDocumentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CE9C470237F84820072E964 /* NYPLBookDetailsProblemDocumentViewController.swift */; };
+		95F0AA4B2E091D99007AA753 /* DeprecationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95F0AA4A2E091D99007AA753 /* DeprecationView.swift */; };
+		95F0AA4C2E091D99007AA753 /* DeprecationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95F0AA4A2E091D99007AA753 /* DeprecationView.swift */; };
+		95F0AA4D2E091D99007AA753 /* DeprecationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95F0AA4A2E091D99007AA753 /* DeprecationView.swift */; };
 		A4276F481B00046300CA7194 /* NYPLMyBooksDownloadInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = A4276F471B00046300CA7194 /* NYPLMyBooksDownloadInfo.m */; };
 		A42E0DF11B3F5A490095EBAE /* NYPLRemoteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A42E0DF01B3F5A490095EBAE /* NYPLRemoteViewController.m */; };
 		A42E0DF41B40F4E00095EBAE /* NYPLCatalogFeedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A42E0DF31B40F4E00095EBAE /* NYPLCatalogFeedViewController.m */; };
@@ -1708,6 +1711,7 @@
 		8C835DD4234D0B900050A18D /* NYPLFacetBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NYPLFacetBarView.swift; sourceTree = "<group>"; };
 		8CC26F822370C1DF0000D8E1 /* Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Account.swift; sourceTree = "<group>"; };
 		8CE9C470237F84820072E964 /* NYPLBookDetailsProblemDocumentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NYPLBookDetailsProblemDocumentViewController.swift; sourceTree = "<group>"; };
+		95F0AA4A2E091D99007AA753 /* DeprecationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeprecationView.swift; sourceTree = "<group>"; };
 		A4276F461B00046300CA7194 /* NYPLMyBooksDownloadInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NYPLMyBooksDownloadInfo.h; sourceTree = "<group>"; };
 		A4276F471B00046300CA7194 /* NYPLMyBooksDownloadInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NYPLMyBooksDownloadInfo.m; sourceTree = "<group>"; };
 		A42E0DEF1B3F5A490095EBAE /* NYPLRemoteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NYPLRemoteViewController.h; sourceTree = "<group>"; };
@@ -2906,6 +2910,7 @@
 				11B20E6C19D9F6DD00877A23 /* NYPLReloadView.h */,
 				11B20E6D19D9F6DD00877A23 /* NYPLReloadView.m */,
 				17E81F07261522B3001003C2 /* NYPLRoundedButton.swift */,
+				95F0AA4A2E091D99007AA753 /* DeprecationView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -3763,6 +3768,7 @@
 				2126FE6625C089110095C45C /* ReaderFormatModule.swift in Sources */,
 				7321485C28651E4B000DF0F0 /* NYPLSignInModalFactory.swift in Sources */,
 				73EB0A8725821DF4006BC997 /* NYPLCatalogGroupedFeedViewController.m in Sources */,
+				95F0AA4B2E091D99007AA753 /* DeprecationView.swift in Sources */,
 				73EB0A8825821DF4006BC997 /* NYPLBackgroundExecutor.swift in Sources */,
 				73D8D27F25A68D4300DF5F69 /* NYPLBookmarkR2Location.swift in Sources */,
 				73EB0A8925821DF4006BC997 /* NYPLProblemDocument.swift in Sources */,
@@ -4024,6 +4030,7 @@
 				7359DCB527E92462001C4254 /* NYPLSignInBusinessLogic+OAuthClientCredentials.swift in Sources */,
 				73FCA2C625005BA4001B0C5D /* NYPLReloadView.m in Sources */,
 				1747335C2853B1190090B1F3 /* NYPLSettingsDeleteServerDataViewController.swift in Sources */,
+				95F0AA4C2E091D99007AA753 /* DeprecationView.swift in Sources */,
 				73FCA2C925005BA4001B0C5D /* NYPLCatalogGroupedFeedViewController.m in Sources */,
 				73FCA2CA25005BA4001B0C5D /* NYPLBackgroundExecutor.swift in Sources */,
 				73CB8CC9285012D700603BA1 /* OELoginNavHeader.swift in Sources */,
@@ -4327,6 +4334,7 @@
 				11E0208D197F05D9009DEA93 /* UIFont+NYPLSystemFontOverride.m in Sources */,
 				03690E291EB2B44300F75D5F /* NYPLReadiumBookmark.swift in Sources */,
 				E683953B217663B100371072 /* NYPLFacetViewDefaultDataSource.swift in Sources */,
+				95F0AA4D2E091D99007AA753 /* DeprecationView.swift in Sources */,
 				174733662857A6950090B1F3 /* NYPLSettingsDeleteLibraryCardViewController.swift in Sources */,
 				73B5DFDC26052A1800225C12 /* NYPLBookButtonsState.m in Sources */,
 				E6207B652118973800864143 /* NYPLAppTheme.swift in Sources */,
@@ -4721,7 +4729,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.9.5;
+				MARKETING_VERSION = 3.9.7;
 				PRODUCT_BUNDLE_IDENTIFIER = org.nypl.labs.SimplyE;
 				PRODUCT_MODULE_NAME = SimplyE;
 				PROVISIONING_PROFILE = "2e185b6c-271e-4b02-a05e-860b8c3831f6";
@@ -4768,7 +4776,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.9.5;
+				MARKETING_VERSION = 3.9.7;
 				PRODUCT_BUNDLE_IDENTIFIER = org.nypl.labs.SimplyE;
 				PRODUCT_MODULE_NAME = SimplyE;
 				PROVISIONING_PROFILE = "b3d9154d-70e1-48d6-a0c5-869431277a5c";
@@ -5020,8 +5028,11 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
 				CODE_SIGN_ENTITLEMENTS = Simplified/SimplyE.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CURRENT_PROJECT_VERSION = 0;
 				DEVELOPMENT_TEAM = 7262U6ST2R;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 7262U6ST2R;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Simplified/AppInfrastructure/Simplified-Prefix.pch";
@@ -5040,14 +5051,15 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.9.6;
+				MARKETING_VERSION = 3.9.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ld_classic",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.nypl.labs.SimplyE;
 				PROVISIONING_PROFILE = "2e185b6c-271e-4b02-a05e-860b8c3831f6";
 				PROVISIONING_PROFILE_SPECIFIER = "SimplyE Development";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "SimplyE Dev";
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG SIMPLYE FEATURE_DRM_CONNECTOR FEATURE_CRASH_REPORTING FEATURE_OVERDRIVE_AUTH FEATURE_AUDIOBOOKS AXIS";
 				SWIFT_OBJC_BRIDGING_HEADER = "Simplified/AppInfrastructure/SimplyE-Bridging-Header.h";
@@ -5074,8 +5086,11 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
 				CODE_SIGN_ENTITLEMENTS = Simplified/SimplyE.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CURRENT_PROJECT_VERSION = 0;
 				DEVELOPMENT_TEAM = 7262U6ST2R;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 7262U6ST2R;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Simplified/AppInfrastructure/Simplified-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5093,14 +5108,15 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.9.6;
+				MARKETING_VERSION = 3.9.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ld_classic",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.nypl.labs.SimplyE;
 				PROVISIONING_PROFILE = "b3d9154d-70e1-48d6-a0c5-869431277a5c";
 				PROVISIONING_PROFILE_SPECIFIER = "SimplyE Distribution";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "SimplyE Dev";
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "SIMPLYE FEATURE_DRM_CONNECTOR FEATURE_CRASH_REPORTING FEATURE_OVERDRIVE_AUTH FEATURE_AUDIOBOOKS AXIS";
 				SWIFT_OBJC_BRIDGING_HEADER = "Simplified/AppInfrastructure/SimplyE-Bridging-Header.h";

NYPLAudiobookToolkit

@@ -83,7 +83,7 @@ class NYPLAnnouncementBusinessLogic {
   - Returns: The alert controller to be presented.
   */
   private func alert(announcements: [Announcement]) -> UIAlertController? {
-    let title = NSLocalizedString("Announcement", comment: "")
+    let title = NSLocalizedString("Important Update", comment: "")
     var currentAlert: UIAlertController? = nil
 
     let alerts = announcements.map {

Simplified.xcodeproj/project.pbxproj

@@ -28,6 +28,10 @@ class NYPLConfiguration: NSObject {
   @objc static var accentColor: UIColor {
     return UIColor(red: 0.0/255.0, green: 144/255.0, blue: 196/255.0, alpha:1.0)
   }
+    
+  @objc static var blueBackgroundColor: UIColor {
+      return UIColor(red: 20/255.0, green: 54/255.0, blue: 97/255.0, alpha:1.0)
+    }
 
   @objc static var readerBackgroundColor: UIColor {
     return UIColor(white: 250/255.0, alpha:1.0)

Simplified/Announcements/NYPLAnnouncementBusinessLogic.swift

@@ -1,6 +1,6 @@
 #ifndef __cplusplus
 
-@import Darwin.Availability;
+//@import Darwin.availability;
 
 #ifndef __IPHONE_3_0
 #warning "This project uses features only available in iOS SDK 3.0 and later."

Simplified/AppInfrastructure/NYPLConfiguration.swift

@@ -34,6 +34,7 @@ @interface NYPLCatalogGroupedFeedViewController ()
 @property (nonatomic) UIRefreshControl *refreshControl;
 @property (nonatomic) NYPLOpenSearchDescription *searchDescription;
 @property (nonatomic) NYPLFacetBarView *facetBarView;
+@property (nonatomic) DeprecationView *deprecationView;
 @property (nonatomic) UITableView *tableView;
 @property (nonatomic) NYPLBook *mostRecentBookSelected;
 @property (nonatomic) int tempBookPosition;
@@ -95,14 +96,20 @@ - (void)viewDidLoad
   [self.tableView addSubview:self.refreshControl];
   [self.view addSubview:self.tableView];
 
-  self.facetBarView = [[NYPLFacetBarView alloc] initWithOrigin:CGPointZero width:self.view.bounds.size.width];
+  self.deprecationView = [[DeprecationView alloc] initWithOrigin:CGPointZero width:self.view.bounds.size.width];
+  [self.view addSubview:self.deprecationView];
+  [self.deprecationView autoPinEdgeToSuperviewEdge:ALEdgeLeading];
+  [self.deprecationView autoPinEdgeToSuperviewEdge:ALEdgeTrailing];
+  [self.deprecationView autoPinEdgeToSuperviewSafeArea:ALEdgeTop];
+    
+  self.facetBarView = [[NYPLFacetBarView alloc] initWithOrigin:CGPointMake(0, self.deprecationView.frame.size.height) width:self.view.bounds.size.width];
   self.facetBarView.entryPointView.delegate = self;
   self.facetBarView.entryPointView.dataSource = self;
 
   [self.view addSubview:self.facetBarView];
   [self.facetBarView autoPinEdgeToSuperviewEdge:ALEdgeLeading];
   [self.facetBarView autoPinEdgeToSuperviewEdge:ALEdgeTrailing];
-  [self.facetBarView autoPinEdgeToSuperviewSafeArea:ALEdgeTop];
+  [self.facetBarView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:_deprecationView];
 
   if(self.feed.openSearchURL) {
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc]
@@ -131,7 +138,7 @@ - (void)didMoveToParentViewController:(UIViewController *)parent
   [super didMoveToParentViewController:parent];
 
   if(parent) {
-    CGFloat top = self.view.safeAreaInsets.top;
+    CGFloat top = self.view.safeAreaInsets.top + self.deprecationView.frame.size.height + kTableViewInsetAdjustmentWithEntryPoints;
     if (self.facetBarView.frame.size.height > 0) {
        top = CGRectGetMaxY(self.facetBarView.frame) + kTableViewInsetAdjustmentWithEntryPoints;
     }