ThePalaceProject
diff --git a/‎Palace.xcodeproj/project.pbxproj‎
Lines changed: 12 additions & 12 deletions b/‎Palace.xcodeproj/project.pbxproj‎
Lines changed: 12 additions & 12 deletions
diff --git a/‎Palace/Book/Models/TPPBook.swift‎
Lines changed: 20 additions & 23 deletions b/‎Palace/Book/Models/TPPBook.swift‎
Lines changed: 20 additions & 23 deletions
diff --git a/‎Palace/Book/UI/BookDetail/BookDetailView.swift‎
Lines changed: 1 addition & 1 deletion b/‎Palace/Book/UI/BookDetail/BookDetailView.swift‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Palace/Book/UI/BookDetail/BookDetailViewModel.swift‎
Lines changed: 5 additions & 11 deletions b/‎Palace/Book/UI/BookDetail/BookDetailViewModel.swift‎
Lines changed: 5 additions & 11 deletions
diff --git a/‎Palace/Book/UI/BookDetail/HTMLTextView.swift‎
Lines changed: 1 addition & 3 deletions b/‎Palace/Book/UI/BookDetail/HTMLTextView.swift‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎Palace/Book/UI/BookDetail/HalfSheetview.swift‎
Lines changed: 13 additions & 10 deletions b/‎Palace/Book/UI/BookDetail/HalfSheetview.swift‎
Lines changed: 13 additions & 10 deletions
diff --git a/‎Palace/Book/UI/TPPBookNormalCell.m‎
Lines changed: 35 additions & 2 deletions b/‎Palace/Book/UI/TPPBookNormalCell.m‎
Lines changed: 35 additions & 2 deletions
diff --git a/‎Palace/Catalog/TPPCatalogSearchViewController.m‎
Lines changed: 15 additions & 1 deletion b/‎Palace/Catalog/TPPCatalogSearchViewController.m‎
Lines changed: 15 additions & 1 deletion
diff --git a/‎Palace/ErrorHandling/ProblemReportEmail.swift‎
Lines changed: 3 additions & 1 deletion b/‎Palace/ErrorHandling/ProblemReportEmail.swift‎
Lines changed: 3 additions & 1 deletion
@@ -5696,7 +5696,7 @@
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 340;
+				CURRENT_PROJECT_VERSION = 343;
 				DEVELOPMENT_TEAM = 88CBA74T8K;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -5718,7 +5718,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PRODUCT_MODULE_NAME = Palace;
 				PRODUCT_NAME = "Palace-noDRM";
@@ -5755,7 +5755,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
 				CODE_SIGN_ENTITLEMENTS = Palace/SimplyE.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 340;
+				CURRENT_PROJECT_VERSION = 343;
 				DEVELOPMENT_TEAM = 88CBA74T8K;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -5777,7 +5777,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PRODUCT_MODULE_NAME = Palace;
 				PRODUCT_NAME = "Palace-noDRM";
@@ -5939,7 +5939,7 @@
 				CODE_SIGN_ENTITLEMENTS = Palace/PalaceDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 340;
+				CURRENT_PROJECT_VERSION = 343;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5965,7 +5965,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Ad Hoc";
@@ -6001,7 +6001,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 340;
+				CURRENT_PROJECT_VERSION = 343;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -6028,7 +6028,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "App Store";
@@ -6063,7 +6063,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 340;
+				CURRENT_PROJECT_VERSION = 343;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -6089,7 +6089,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PRODUCT_NAME = Palace;
 				PROVISIONING_PROFILE_SPECIFIER = "Ad Hoc 2";
@@ -6124,7 +6124,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
 				CODE_SIGN_ENTITLEMENTS = Palace/SimplyE.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 340;
+				CURRENT_PROJECT_VERSION = 343;
 				DEVELOPMENT_TEAM = 88CBA74T8K;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
 				ENABLE_BITCODE = NO;
@@ -6150,7 +6150,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
 				PRODUCT_NAME = Palace;
 				PROVISIONING_PROFILE_SPECIFIER = "App Store";
 
@@ -397,19 +397,7 @@ public class TPPBook: NSObject, ObservableObject {
     return date
   }
 
-  struct ReservationDetails {
-    var holdPosition: Int = 0
-    var remainingTime: Int = 0
-    var timeUnit: String =  ""
-    var copiesAvailable: Int = 0
-  }
-  
-  struct AvailabilityDetails {
-    var availableSince: String?
-    var availableUntil: String?
-  }
-  
-  func getReservationDetails() -> ReservationDetails {
+  @objc func getReservationDetails() -> ReservationDetails {
     var untilDate: Date?
     var reservationDetails = ReservationDetails()
 
@@ -442,16 +430,8 @@ public class TPPBook: NSObject, ObservableObject {
       let components = calendar.dateComponents([.day], from: now, to: untilDate)
 
       if let days = components.day {
-        if days < 7 {
-          reservationDetails.remainingTime = days
-          reservationDetails.timeUnit = "day\(days == 1 ? "" : "s")"
-        } else if days < 30 {
-          reservationDetails.remainingTime = days / 7
-          reservationDetails.timeUnit = "week\(days == 1 ? "" : "s")"
-        } else {
-          reservationDetails.remainingTime = days / 30
-          reservationDetails.timeUnit = "month\(days == 1 ? "" : "s")"
-        }
+        reservationDetails.remainingTime = days
+        reservationDetails.timeUnit = "day\(days == 1 ? "" : "s")"
       }
     }
 
@@ -596,4 +576,21 @@ extension TPPBook {
   var wrappedCoverImage: UIImage? {
     coverImage
   }
+  
+  @objc public class func ordinalString(for n: Int) -> String {
+    return n.ordinal()
+  }
+}
+
+@objcMembers
+public class ReservationDetails: NSObject {
+  public var holdPosition: Int = 0
+  public var remainingTime: Int = 0
+  public var timeUnit: String = ""
+  public var copiesAvailable: Int = 0
+}
+
+struct AvailabilityDetails {
+  var availableSince: String?
+  var availableUntil: String?
 }
@@ -509,7 +509,7 @@ struct BookDetailView: View {
     switch buttonType {
     case .sample, .audiobookSample:
       viewModel.handleAction(for: buttonType)
-    case .download, .get:
+    case .download, .get, .reserve:
       showHalfSheet.toggle()
       DispatchQueue.main.asyncAfter(deadline: .now() + 0.75) {
         viewModel.handleAction(for: buttonType)
 
@@ -59,7 +59,7 @@ class BookDetailViewModel: ObservableObject {
     self.state = registry.state(for: book.identifier)
 
     bindRegistryState()
-    determineButtonState()
+    buttonState = BookButtonState.stateForAvailability(self.book.defaultAcquisition?.availability) ?? .unsupported
     setupObservers()
     self.downloadProgress = downloadCenter.downloadProgress(for: book.identifier)
   }
@@ -215,7 +215,7 @@ class BookDetailViewModel: ObservableObject {
 
     switch state {
     case .unregistered:
-      newState = .canBorrow
+      newState = BookButtonState.stateForAvailability(book.defaultAcquisition?.availability) ?? .canBorrow
     case .downloadNeeded:
       newState = .downloadNeeded
     case .downloading:
@@ -248,22 +248,16 @@ class BookDetailViewModel: ObservableObject {
 
     switch button {
     case .reserve:
-      registry.setState(.holding, for: book.identifier)
-      removeProcessingButton(button)
+      didSelectDownload(for: book)
 
-    case .remove:
-      registry.setState(.unregistered, for: book.identifier)
+      registry.setState(.holding, for: book.identifier)
       removeProcessingButton(button)
-
-    case .return:
+    case .return, .remove:
       didSelectReturn(for: book) {
         self.removeProcessingButton(button)
       }
 
     case .download, .get, .retry:
-      if buttonState == .canHold {
-        TPPUserNotifications.requestAuthorization()
-      }
       didSelectDownload(for: book)
       removeProcessingButton(button)
 
 
@@ -28,9 +28,7 @@ struct HTMLTextView: View {
       let mutable = NSMutableAttributedString(attributedString: nsAttr)
 
       mutable.enumerateAttribute(.font, in: NSRange(location: 0, length: mutable.length)) { value, range, _ in
-        if value == nil {
-          mutable.addAttribute(.font, value: UIFont.palaceFont(ofSize: 15), range: range)
-        }
+         mutable.addAttribute(.font, value: UIFont.palaceFont(ofSize: 17), range: range)
       }
 
       mutable.addAttribute(.foregroundColor, value: UIColor.label, range: NSRange(location: 0, length: mutable.length))
 
@@ -1,6 +1,7 @@
 import SwiftUI
 
 struct HalfSheetView: View {
+  typealias DisplayStrings = Strings.BookDetailView
   @Environment(\.colorScheme) var colorScheme
 
   @ObservedObject var viewModel: BookDetailViewModel
@@ -80,7 +81,7 @@ private extension HalfSheetView {
     case .downloading, .downloadNeeded:
       borrowingInfoView
     default:
-      if viewModel.buttonState == .canHold {
+      if viewModel.buttonState == .holding {
         holdingInfoView
       } else {
         borrowedInfoView
@@ -91,20 +92,22 @@ private extension HalfSheetView {
   @ViewBuilder
   var holdingInfoView: some View {
     let details = viewModel.book.getReservationDetails()
-    VStack {
-      Text("Approximately \(details.remainingTime) \(details.timeUnit) wait.")
-        .font(.subheadline)
-        .fontWeight(.semibold)
-      Text("You are \(details.holdPosition.ordinal()) in line. \(details.copiesAvailable) \(details.copiesAvailable == 1 ? "copy" : "copies") in use.")
-        .font(.footnote)
-    }
+    Text(
+      String(
+        format: DisplayStrings.holdStatus,
+        details.holdPosition.ordinal(),
+        details.copiesAvailable,
+        details.copiesAvailable == 1 ? DisplayStrings.copy : DisplayStrings.copies
+      )
+    )
+    .font(.footnote)
   }
 
   @ViewBuilder
   var borrowingInfoView: some View {
     if let timeUntil = viewModel.book.getExpirationDate()?.timeUntil() {
       HStack {
-        Text("Borrowing for")
+        Text(DisplayStrings.borrowingFor)
           .font(.subheadline)
           .foregroundColor(.secondary)
         Spacer()
@@ -118,7 +121,7 @@ private extension HalfSheetView {
   var borrowedInfoView: some View {
     if let availableUntil = viewModel.book.getExpirationDate()?.timeUntil() {
       HStack {
-        Text("Borrowed until")
+        Text(DisplayStrings.borrowedFor)
           .font(.subheadline)
           .foregroundColor(.secondary)
         Spacer()
 
@@ -15,6 +15,7 @@ @interface TPPBookNormalCell ()
 @property (nonatomic) UILabel *title;
 @property (nonatomic) UIImageView *unreadImageView;
 @property (nonatomic) UIImageView *contentBadge;
+@property (nonatomic) UILabel *holdingInfoLabel;
 
 @end
 
@@ -97,10 +98,39 @@ - (void)setBook:(TPPBook *const)book
     [self.contentView addSubview:self.buttonsView];
     self.buttonsView.translatesAutoresizingMaskIntoConstraints = NO;
     [self.buttonsView autoPinEdge:ALEdgeLeft toEdge:ALEdgeLeft ofView:self.title];
-    [self.buttonsView autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.cover];
   }
   self.buttonsView.book = book;
-  
+
+  if (!self.holdingInfoLabel) {
+     self.holdingInfoLabel = [[UILabel alloc] init];
+     self.holdingInfoLabel.font = [UIFont palaceFontOfSize:12];
+     self.holdingInfoLabel.textColor = [UIColor secondaryLabelColor];
+     self.holdingInfoLabel.numberOfLines = 0;
+     self.holdingInfoLabel.translatesAutoresizingMaskIntoConstraints = NO;
+     [self.contentView addSubview:self.holdingInfoLabel];
+     [self.holdingInfoLabel autoPinEdge:ALEdgeTop
+                                toEdge:ALEdgeBottom
+                                ofView:self.buttonsView
+                            withOffset:4];
+     [self.holdingInfoLabel autoPinEdge:ALEdgeLeft
+                                toEdge:ALEdgeLeft
+                                ofView:self.title];
+     [self.holdingInfoLabel autoMatchDimension:ALDimensionWidth
+                                   toDimension:ALDimensionWidth
+                                   ofView:self.title];
+    [self.holdingInfoLabel autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.cover];
+   }
+
+   ReservationDetails *details = [book getReservationDetails];
+   NSString *ordinal = [TPPBook ordinalStringFor:details.holdPosition];
+   NSString *copies = details.copiesAvailable == 1 ? @"copy" : @"copies";
+   self.holdingInfoLabel.text = [NSString stringWithFormat:
+     NSLocalizedString(@"You are %@ in line. %ld %@ in use.", nil),
+     ordinal,
+     (long)details.copiesAvailable,
+     copies
+   ];
+    
   if(!self.unreadImageView) {
     self.unreadImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Unread"]];
     self.unreadImageView.image = [self.unreadImageView.image
@@ -157,6 +187,9 @@ - (void)setState:(TPPBookButtonsState const)state
   _state = state;
   self.buttonsView.state = state;
   self.unreadImageView.hidden = (state != TPPBookButtonsStateDownloadSuccessful);
+  BOOL isHolding = (state == TPPBookButtonsStateHolding);
+  self.holdingInfoLabel.hidden = !isHolding;
+
   [self setNeedsLayout];
 }
 
 
@@ -135,6 +135,12 @@ - (void)viewWillLayoutSubviews
   }
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+  [super viewDidAppear:animated];
+  [self.searchBar becomeFirstResponder];
+}
+
 - (void)createAndConfigureFacetBarView
 {
   if (self.facetBarView) {
@@ -297,8 +303,13 @@ - (void)searchBarSearchButtonClicked:(__attribute__((unused)) UISearchBar *)sear
 
 - (void)updateUIAfterSearchSuccess:(BOOL)success
 {
-  [self createAndConfigureFacetBarView];
 
+  if (self.facetBarView == nil) {
+    [self createAndConfigureFacetBarView];
+  } else {
+    [self.facetBarView.entryPointView reloadData];
+  }
+  
   self.collectionView.alpha = 0.0;
   self.searchActivityIndicatorView.hidden = YES;
   [self.searchActivityIndicatorView stopAnimating];
@@ -320,6 +331,9 @@ - (void)updateUIAfterSearchSuccess:(BOOL)success
     self.reloadView.hidden = NO;
   }
 
+  [self.view setNeedsLayout];
+  [self.view layoutIfNeeded];
+
   [UIView animateWithDuration:0.3 animations:^{
     self.searchBar.alpha = 1.0;
     self.facetBarView.alpha = 1.0;
 
@@ -69,7 +69,9 @@ import UIKit
 //    @unknown default:         // for Xcode < 15
 //      idiom = "unspecified"
     }
-    let bodyWithoutBook = "\n\n---\nIdiom: \(idiom)\nHeight: \(nativeHeight)\nOS: \(systemVersion)"
+    
+    let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0"
+    let bodyWithoutBook = "\n\n---\nIdiom: \(idiom)\nPlatform: iOS\nOS: \(systemVersion)\nHeight: \(nativeHeight)\nPalace Version: \(appVersion)\nLibrary: \(AccountsManager.shared.currentAccount?.name ?? "")"
     let body: String
     if let book = book {
       body = bodyWithoutBook + "\nTitle: \(book.title)\nID: \(book.identifier)"
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,7 @@ struct HTMLTextView: View {`
`28`	`28`	`let mutable = NSMutableAttributedString(attributedString: nsAttr)`
`29`	`29`
`30`	`30`	`mutable.enumerateAttribute(.font, in: NSRange(location: 0, length: mutable.length)) { value, range, _ in`
`31`		`- if value == nil {`
`32`		`- mutable.addAttribute(.font, value: UIFont.palaceFont(ofSize: 15), range: range)`
`33`		`- }`
	`31`	`+ mutable.addAttribute(.font, value: UIFont.palaceFont(ofSize: 17), range: range)`
`34`	`32`	`}`
`35`	`33`
`36`	`34`	`mutable.addAttribute(.foregroundColor, value: UIColor.label, range: NSRange(location: 0, length: mutable.length))`