Merge pull request #623 from NYPL-Simplified/v2.0.2

V2.0.2

Author: aferditamuriqi

Simplified.xcodeproj/project.pbxproj

@@ -27,6 +27,7 @@
 		03B092301E78871A00AD338D /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03B0922F1E78871A00AD338D /* MediaPlayer.framework */; };
 		03CE00EA1E0C436400C91489 /* libePub3-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03CE00E91E0C436400C91489 /* libePub3-iOS.a */; };
 		03DE7BE91DBF0DE400E89064 /* UpdateCheckShim.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DC8D9DD1D09F9B4007DD125 /* UpdateCheckShim.swift */; };
+		03E5F42D1EA5BCE400DFFC3A /* NYPLTOC.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 03E5F42A1EA5BCE400DFFC3A /* NYPLTOC.storyboard */; };
 		03F94CCF1DD627AA00CE8F4F /* Accounts.json in Resources */ = {isa = PBXBuildFile; fileRef = 03F94CCE1DD627AA00CE8F4F /* Accounts.json */; };
 		03F94CD11DD6288C00CE8F4F /* Accounts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03F94CD01DD6288C00CE8F4F /* Accounts.swift */; };
 		081387571BC574DA003DEA6A /* UILabel+NYPLAppearanceAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 081387561BC574DA003DEA6A /* UILabel+NYPLAppearanceAdditions.m */; };
@@ -174,6 +175,7 @@
 		E15AF04E809009612AA10D16 /* libPods-SimplyETests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEEC686A5C71AFACFAC2A884 /* libPods-SimplyETests.a */; };
 		E6202A021DD4E6F300C99553 /* NYPLSettingsAccountDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E6202A011DD4E6F300C99553 /* NYPLSettingsAccountDetailViewController.m */; };
 		E6202A041DD52B8600C99553 /* NYPLWelcomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6202A031DD52B8600C99553 /* NYPLWelcomeScreen.swift */; };
+		E63F2C6C1EAA81B3002B6373 /* ExtendedNavBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E63F2C6B1EAA81B3002B6373 /* ExtendedNavBarView.swift */; };
 		E671FF7D1E3A7068002AB13F /* NYPLNetworkQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = E671FF7C1E3A7068002AB13F /* NYPLNetworkQueue.swift */; };
 		E694040A1E4A789800E566ED /* NYPLReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E69404091E4A789800E566ED /* NYPLReachabilityManager.m */; };
 		E6B1F4FB1DD20EA900D73CA1 /* NYPLSettingsAccountsList.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6B1F4FA1DD20EA900D73CA1 /* NYPLSettingsAccountsList.swift */; };
@@ -244,6 +246,7 @@
 		03B0922D1E7886ED00AD338D /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
 		03B0922F1E78871A00AD338D /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
 		03CE00E91E0C436400C91489 /* libePub3-iOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libePub3-iOS.a"; path = "readium-sdk/Platform/Apple/build/Release-iphoneos/libePub3-iOS.a"; sourceTree = "<group>"; };
+		03E5F42A1EA5BCE400DFFC3A /* NYPLTOC.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NYPLTOC.storyboard; sourceTree = "<group>"; };
 		03F94CCE1DD627AA00CE8F4F /* Accounts.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Accounts.json; sourceTree = "<group>"; };
 		03F94CD01DD6288C00CE8F4F /* Accounts.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Accounts.swift; sourceTree = "<group>"; };
 		080ADCBE1C04C26100C0575F /* libCHRTextFieldFormatter.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libCHRTextFieldFormatter.a; path = "Pods/../build/Debug-iphoneos/libCHRTextFieldFormatter.a"; sourceTree = "<group>"; };
@@ -536,6 +539,7 @@
 		E6202A001DD4E6F300C99553 /* NYPLSettingsAccountDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NYPLSettingsAccountDetailViewController.h; sourceTree = "<group>"; };
 		E6202A011DD4E6F300C99553 /* NYPLSettingsAccountDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NYPLSettingsAccountDetailViewController.m; sourceTree = "<group>"; };
 		E6202A031DD52B8600C99553 /* NYPLWelcomeScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NYPLWelcomeScreen.swift; sourceTree = "<group>"; };
+		E63F2C6B1EAA81B3002B6373 /* ExtendedNavBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExtendedNavBarView.swift; sourceTree = "<group>"; };
 		E66AE32F1DC0FCFC00124AE2 /* NYPLCirculationAnalytics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NYPLCirculationAnalytics.swift; sourceTree = "<group>"; };
 		E671FF7C1E3A7068002AB13F /* NYPLNetworkQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NYPLNetworkQueue.swift; sourceTree = "<group>"; };
 		E69404081E4A789800E566ED /* NYPLReachabilityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NYPLReachabilityManager.h; sourceTree = "<group>"; };
@@ -774,6 +778,8 @@
 		119504051994061E009FB788 /* Reader */ = {
 			isa = PBXGroup;
 			children = (
+				E63F2C6B1EAA81B3002B6373 /* ExtendedNavBarView.swift */,
+				03E5F42A1EA5BCE400DFFC3A /* NYPLTOC.storyboard */,
 				113137E51A48DAB90082954E /* NYPLReaderReadiumView.h */,
 				113137E61A48DAB90082954E /* NYPLReaderReadiumView.m */,
 				5A5B90191B946FAD002C53E9 /* NYPLReaderContainerDelegate.h */,
@@ -1316,6 +1322,7 @@
 				A823D823192BABA400B55DE2 /* Images.xcassets in Resources */,
 				5A6929101B95ACD100FB4C10 /* sdk.css in Resources */,
 				84B7A3471B84E8FE00584FB2 /* OpenDyslexic3-Bold.ttf in Resources */,
+				03E5F42D1EA5BCE400DFFC3A /* NYPLTOC.storyboard in Resources */,
 				5A6929251B95C93B00FB4C10 /* readium-shared-js_all.js.map in Resources */,
 				030713661E749D5600DDE3FA /* CodabarLarge.ttf in Resources */,
 				11C113D219F842BE005B3F63 /* host_app_feedback.js in Resources */,
@@ -1553,6 +1560,7 @@
 				112C684F19EF003300106973 /* NYPLCatalogFacetGroup.m in Sources */,
 				085D31DF1BE3CD3C007F7672 /* NSURLRequest+NYPLURLRequestAdditions.m in Sources */,
 				11548C0B1939136C009DBF2E /* NYPLRootTabBarController.m in Sources */,
+				E63F2C6C1EAA81B3002B6373 /* ExtendedNavBarView.swift in Sources */,
 				118A0B1B19915BDF00792DDE /* NYPLCatalogSearchViewController.m in Sources */,
 				A4E254FA1B0E610900193FE4 /* NYPLBasicAuth.m in Sources */,
 				1188F3E11A1ECC4B006B2F36 /* NYPLReaderSettings.m in Sources */,

Simplified/ExtendedNavBarView.swift

@@ -0,0 +1,33 @@
+/*
+ Copyright (C) 2016 Apple Inc. All Rights Reserved.
+ See LICENSE.txt for this sample’s licensing information
+ 
+ Abstract:
+ A UIView subclass that draws a gray hairline along its bottom
+  border, similar to a navigation bar.  This view is used as the navigation
+  bar extension view in the Extended Navigation Bar example.
+ */
+
+import UIKit
+
+class ExtendedNavBarView: UIView {
+    
+    /**
+     *  Called when the view is about to be displayed.  May be called more than
+     *  once.
+     */
+    override func willMove(toWindow newWindow: UIWindow?) {
+        super.willMove(toWindow: newWindow)
+        
+        // Use the layer shadow to draw a one pixel hairline under this view.
+        layer.shadowOffset = CGSize(width: 0, height: CGFloat(1) / UIScreen.main.scale)
+        layer.shadowRadius = 0
+        
+        // UINavigationBar's hairline is adaptive, its properties change with
+        // the contents it overlies.  You may need to experiment with these
+        // values to best match your content.
+        layer.shadowColor = #colorLiteral(red: 0, green: 0, blue: 0, alpha: 1).cgColor
+        layer.shadowOpacity = 0.25
+    }
+    
+}

Simplified/NYPLAccountSignInViewController.m

@@ -288,8 +288,7 @@ - (void)tableView:(__attribute__((unused)) UITableView *)tableView
            requestTimeoutInterval:20.0
            completionHandler:^(NSString *const username, NSString *const PIN, BOOL const userInitiated) {
              if (userInitiated) {
-               // If SettingsAccount has been presented modally, dismiss both
-               // the CardCreator and the modal window.
+               // Dismiss CardCreator & SignInVC when user finishes Credential Review
                [weakSelf dismissViewControllerAnimated:YES completion:nil];
                [weakSelf dismissViewControllerAnimated:YES completion:nil];
              } else {
@@ -741,6 +740,7 @@ - (void)validateCredentials
        if (statusCode == 401) {
          NSError *error401 = [[NSError alloc] initWithDomain:NSURLErrorDomain code:NSURLErrorCancelled userInfo:nil];
          [self showLoginAlertWithError:error401];
+         return;
        }
        [self showLoginAlertWithError:error];
 

Simplified/NYPLBookCoverRegistry.m

@@ -47,8 +47,8 @@ - (instancetype)init
   configuration.HTTPCookieStorage = nil;
   configuration.HTTPMaximumConnectionsPerHost = 8;
   configuration.HTTPShouldUsePipelining = YES;
-  configuration.timeoutIntervalForRequest = 5.0;
-  configuration.timeoutIntervalForResource = 20.0;
+  configuration.timeoutIntervalForRequest = 15.0;
+  configuration.timeoutIntervalForResource = 30.0;
   configuration.URLCache.diskCapacity = 1024 * 1024 * diskCacheInMegabytes;
   configuration.URLCache.memoryCapacity = 1024 * 1024 * memoryCacheInMegabytes;
   configuration.URLCredentialStorage = nil;

Simplified/NYPLCatalogNavigationController.m

@@ -102,8 +102,8 @@ - (void)switchLibrary
 #if defined(FEATURE_DRM_CONNECTOR)
       if([NYPLADEPT sharedInstance].workflowsInProgress) {
         [self presentViewController:[NYPLAlertController
-                                     alertWithTitle:@"SettingsAccountViewControllerCannotLogOutTitle"
-                                     message:@"SettingsAccountViewControllerCannotLogOutMessage"]
+                                     alertWithTitle:@"PleaseWait"
+                                     message:@"PleaseWaitMessage"]
                            animated:YES
                          completion:nil];
       } else {

Simplified/NYPLCatalogSearchViewController.m

@@ -9,6 +9,7 @@
 #import "NYPLOpenSearchDescription.h"
 #import "NYPLReloadView.h"
 #import "UIView+NYPLViewAdditions.h"
+#import <PureLayout/PureLayout.h>
 
 #import "NYPLCatalogSearchViewController.h"
 
@@ -17,6 +18,7 @@ @interface NYPLCatalogSearchViewController ()
    UISearchBarDelegate>
 
 @property (nonatomic) UIActivityIndicatorView *activityIndicatorView;
+@property (nonatomic) UILabel *activityIndicatorLabel;
 @property (nonatomic) NYPLCatalogUngroupedFeed *category;
 @property (nonatomic) UILabel *noResultsLabel;
 @property (nonatomic) NYPLReloadView *reloadView;
@@ -57,6 +59,14 @@ - (void)viewDidLoad
   self.activityIndicatorView.hidden = YES;
   [self.view addSubview:self.activityIndicatorView];
 
+  self.activityIndicatorLabel = [[UILabel alloc] init];
+  self.activityIndicatorLabel.font = [UIFont systemFontOfSize:14.0];
+  self.activityIndicatorLabel.text = NSLocalizedString(@"ActivitySlowLoadMessage", @"Message explaining that the download is still going");
+  self.activityIndicatorLabel.hidden = YES;
+  [self.view addSubview:self.activityIndicatorLabel];
+  [self.activityIndicatorLabel autoAlignAxis:ALAxisVertical toSameAxisOfView:self.activityIndicatorView];
+  [self.activityIndicatorLabel autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.activityIndicatorView withOffset:8.0];
+  
   self.searchBar = [[UISearchBar alloc] init];
   self.searchBar.delegate = self;
   self.searchBar.placeholder = self.searchDescription.humanReadableDescription;
@@ -107,6 +117,19 @@ - (void)viewWillDisappear:(BOOL)animated
   [self.searchBar resignFirstResponder];
 }
 
+- (void)addActivityIndicatorLabel:(NSTimer*)timer
+{
+  if (!self.activityIndicatorView.isHidden) {
+    [UIView transitionWithView:self.activityIndicatorLabel
+                      duration:0.5
+                       options:UIViewAnimationOptionTransitionCrossDissolve
+                    animations:^{
+                      self.activityIndicatorLabel.hidden = NO;
+                    } completion:nil];
+  }
+  [timer invalidate];
+}
+
 #pragma mark UICollectionViewDataSource
 
 - (NSInteger)collectionView:(__attribute__((unused)) UICollectionView *)collectionView
@@ -162,6 +185,11 @@ - (void)searchBarSearchButtonClicked:(__attribute__((unused)) UISearchBar *)sear
   self.reloadView.hidden = YES;
   self.activityIndicatorView.hidden = NO;
   [self.activityIndicatorView startAnimating];
+
+  self.activityIndicatorLabel.hidden = YES;
+  [NSTimer scheduledTimerWithTimeInterval: 10.0 target: self
+                                 selector: @selector(addActivityIndicatorLabel:) userInfo: nil repeats: NO];
+  
   self.searchBar.userInteractionEnabled = NO;
   self.searchBar.alpha = 0.5;
   [self.searchBar resignFirstResponder];
@@ -196,6 +224,7 @@ - (void)updateUIAfterSearchSuccess:(BOOL)success
 {
   self.activityIndicatorView.hidden = YES;
   [self.activityIndicatorView stopAnimating];
+  self.activityIndicatorLabel.hidden = YES;
   self.searchBar.userInteractionEnabled = YES;
   self.searchBar.alpha = 1.0;
 

Simplified/NYPLReaderReadiumView.m

@@ -811,7 +811,7 @@ - (void)calculateBookLength
         [spineItemDict setObject:title forKey:@"tocElementTitle"];
       }
       else {
-        [spineItemDict setObject:NSLocalizedString(@"chapter", nil) forKey:@"tocElementTitle"];
+        [spineItemDict setObject:NSLocalizedString(@"ReaderViewControllerCurrentChapter", nil) forKey:@"tocElementTitle"];
       }
 
       [bookDicts setObject:spineItemDict forKey:spineItem.idref];
@@ -893,8 +893,14 @@ - (void)pollReadyState
   dispatch_time_t const dispatchTime =
     dispatch_time(DISPATCH_TIME_NOW, (int64_t)(readyStateCheckIntervalInSeconds * NSEC_PER_SEC));
 
+  // A weak reference is needed here so that the main queue does not retain
+  // `NYPLReaderReadiumView` indefinitely. After the reference to `weakSelf`
+  // becomes nil, the block passed to `dispatch_after` will be called one
+  // final time and will not be rescheduled (because `pollReadyState` will
+  // be sent to nil).
+  __weak NYPLReaderReadiumView *const weakSelf = self;
   dispatch_after(dispatchTime, dispatch_get_main_queue(), ^{
-    [self pollReadyState];
+    [weakSelf pollReadyState];
   });
 }
 

Simplified/NYPLReaderSettings.h

@@ -63,7 +63,7 @@ BOOL NYPLReaderSettingsIncreasedFontSize(NYPLReaderSettingsFontSize input,
 @property (nonatomic) NYPLReaderSettingsFontSize fontSize;
 @property (nonatomic) NYPLReaderSettingsMediaOverlaysEnableClick mediaOverlaysEnableClick;
 @property (nonatomic, readonly) UIColor *foregroundColor;
-@property (nonatomic) id currentReaderReadiumView;
+@property (nonatomic, weak) id currentReaderReadiumView;
 
 - (void) toggleMediaOverlayPlayback;
 

Simplified/NYPLReaderTOCCell.h

@@ -1,20 +1,6 @@
-// TODO: This class pulls the current color scheme from NYPLReaderSettings. This may or may not be
-// an appropriate way of handling color schemes. If the color scheme changes, all tables containing
-// a NYPLReaderTOCCell must be reloaded.
-
 @interface NYPLReaderTOCCell : UITableViewCell
 
-@property (nonatomic) NSUInteger nestingLevel;
-@property (nonatomic) NSString *title;
-
-+ (id)new NS_UNAVAILABLE;
-- (id)init NS_UNAVAILABLE;
-- (id)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE;
-- (id)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
-- (id)initWithStyle:(UITableViewCellStyle)style
-    reuseIdentifier:(NSString *)reuseIdentifier NS_UNAVAILABLE;
-
-// designated initializer
-- (instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier;
+@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *leadingEdgeConstraint;
 
 @end

Simplified/NYPLReaderTOCCell.m

@@ -1,58 +1,5 @@
-#import "NYPLReaderSettings.h"
-
 #import "NYPLReaderTOCCell.h"
 
-@interface NYPLReaderTOCCell ()
-
-@property (nonatomic) UILabel *titleLabel;
-
-@end
-
 @implementation NYPLReaderTOCCell
 
-#pragma mark UITableViewCell
-
-- (instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier
-{
-  self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier];
-  if(!self) return nil;
-  
-  self.titleLabel = [[UILabel alloc] init];
-  [self.contentView addSubview:self.titleLabel];
-  
-  self.backgroundColor = [NYPLReaderSettings sharedSettings].backgroundColor;
-  self.titleLabel.textColor = [NYPLReaderSettings sharedSettings].foregroundColor;
-
-  return self;
-}
-
-#pragma mark UIView
-
-- (void)layoutSubviews
-{
-  CGRect frame = self.contentView.bounds;
-  frame.origin.x = self.nestingLevel * 20 + 10;
-  frame.size.width -= self.nestingLevel * 20 + 20;
-  self.titleLabel.frame = frame;
-}
-
-#pragma mark -
-
-- (void)setNestingLevel:(NSUInteger)nestingLevel
-{
-  _nestingLevel = nestingLevel;
-  
-  [self setNeedsLayout];
-}
-
-- (NSString *)title
-{
-  return self.titleLabel.text;
-}
-
-- (void)setTitle:(NSString *const)title
-{
-  self.titleLabel.text = title;
-}
-
 @end