From 0302c4ccf25acb3bb3e6db01836f62db68c59180 Mon Sep 17 00:00:00 2001
From: Mark Raynsford <code@io7m.com>
Date: Wed, 20 Sep 2023 14:23:10 +0000
Subject: [PATCH 1/4] Set a maximum width for covers

This sets a maximum width for covers in lanes and book detail pages.

Affects: https://ebce-lyrasis.atlassian.net/browse/PP-443
---
 .../src/main/res/layout/book_detail.xml       |  1 +
 .../src/main/res/layout/feed_lane_item.xml    | 42 ++++++++++---------
 .../src/main/res/values/dimensions.xml        |  3 ++
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/simplified-ui-catalog/src/main/res/layout/book_detail.xml b/simplified-ui-catalog/src/main/res/layout/book_detail.xml
index 5b272c50c..efaff39cf 100644
--- a/simplified-ui-catalog/src/main/res/layout/book_detail.xml
+++ b/simplified-ui-catalog/src/main/res/layout/book_detail.xml
@@ -32,6 +32,7 @@
                     android:id="@+id/bookDetailCoverImage"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:maxWidth="@dimen/catalogBookDetailCoverMaximumWidth"
                     android:adjustViewBounds="true"
                     android:contentDescription="@null"
                     android:scaleType="fitXY"
diff --git a/simplified-ui-catalog/src/main/res/layout/feed_lane_item.xml b/simplified-ui-catalog/src/main/res/layout/feed_lane_item.xml
index 53c5070c4..841443be0 100644
--- a/simplified-ui-catalog/src/main/res/layout/feed_lane_item.xml
+++ b/simplified-ui-catalog/src/main/res/layout/feed_lane_item.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
-  android:clipChildren="false"
-  android:clipToPadding="false"
-  android:orientation="vertical">
 
-  <androidx.cardview.widget.CardView
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
-    android:layout_height="@dimen/cover_thumbnail_height"
-    app:cardCornerRadius="@dimen/cover_corner_radius"
-    app:cardElevation="2dp">
+    android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:orientation="vertical">
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/cover_thumbnail_height"
+        app:cardCornerRadius="@dimen/cover_corner_radius"
+        app:cardElevation="2dp">
 
-    <ImageView
-      android:id="@+id/coverImage"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:adjustViewBounds="true"
-      android:contentDescription="@null"
-      android:scaleType="fitXY"
-      app:srcCompat="@drawable/cover_loading" />
-  </androidx.cardview.widget.CardView>
+        <ImageView
+            android:id="@+id/coverImage"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:adjustViewBounds="true"
+            android:contentDescription="@null"
+            android:maxWidth="@dimen/catalogLaneCoverMaximumWidth"
+            android:scaleType="fitXY"
+            app:srcCompat="@drawable/cover_loading" />
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/simplified-ui-catalog/src/main/res/values/dimensions.xml b/simplified-ui-catalog/src/main/res/values/dimensions.xml
index 1bfc7b519..91e1c5d06 100644
--- a/simplified-ui-catalog/src/main/res/values/dimensions.xml
+++ b/simplified-ui-catalog/src/main/res/values/dimensions.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <resources>
+  <dimen name="catalogLaneCoverMaximumWidth">96dp</dimen>
+  <dimen name="catalogBookDetailCoverMaximumWidth">128dp</dimen>
+
   <dimen name="catalogBookDetailStatusHeight">64dp</dimen>
   <dimen name="catalogBookDetailButtonsHeight">64dp</dimen>
   <dimen name="catalogFeedCoversSpace">8dp</dimen>

From 159a9a50ec150ac98ce321e54131a6c971548165 Mon Sep 17 00:00:00 2001
From: Mark Raynsford <code@io7m.com>
Date: Wed, 20 Sep 2023 14:24:06 +0000
Subject: [PATCH 2/4] Update changelog.

---
 README-CHANGES.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/README-CHANGES.xml b/README-CHANGES.xml
index 2c9806deb..c19ca9dfb 100644
--- a/README-CHANGES.xml
+++ b/README-CHANGES.xml
@@ -298,7 +298,7 @@
         <c:change date="2023-08-12T00:00:00+00:00" summary="Fixed crash when time tracking is not enabled."/>
       </c:changes>
     </c:release>
-    <c:release date="2023-09-20T12:49:37+00:00" is-open="true" ticket-system="org.nypl.jira" version="1.6.0">
+    <c:release date="2023-09-20T14:23:59+00:00" is-open="true" ticket-system="org.nypl.jira" version="1.6.0">
       <c:changes>
         <c:change date="2023-08-24T00:00:00+00:00" summary="Updated Kotlin version to 1.9.0"/>
         <c:change date="2023-08-28T00:00:00+00:00" summary="Fixed crash when opening an audiobook with a null manifest."/>
@@ -315,7 +315,12 @@
             <c:ticket id="PP-418"/>
           </c:tickets>
         </c:change>
-        <c:change date="2023-09-20T12:49:37+00:00" summary="Changed BasicToken login request method to POST."/>
+        <c:change date="2023-09-20T00:00:00+00:00" summary="Changed BasicToken login request method to POST."/>
+        <c:change date="2023-09-20T14:23:59+00:00" summary="Very wide covers have their widths restricted to avoid breaking the UI.">
+          <c:tickets>
+            <c:ticket id="PP-443"/>
+          </c:tickets>
+        </c:change>
       </c:changes>
     </c:release>
   </c:releases>

From adcf578f4cee0a94388714fa21af526d5e638c2e Mon Sep 17 00:00:00 2001
From: Mark Raynsford <code@io7m.com>
Date: Wed, 20 Sep 2023 15:19:22 +0000
Subject: [PATCH 3/4] Remove lane book cover parent view.

---
 .../src/main/res/layout/feed_lane_item.xml    | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/simplified-ui-catalog/src/main/res/layout/feed_lane_item.xml b/simplified-ui-catalog/src/main/res/layout/feed_lane_item.xml
index 841443be0..859aabc52 100644
--- a/simplified-ui-catalog/src/main/res/layout/feed_lane_item.xml
+++ b/simplified-ui-catalog/src/main/res/layout/feed_lane_item.xml
@@ -1,27 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    android:orientation="vertical">
+    android:layout_height="@dimen/cover_thumbnail_height"
+    app:cardCornerRadius="@dimen/cover_corner_radius"
+    app:cardElevation="2dp">
 
-    <androidx.cardview.widget.CardView
+    <ImageView
+        android:id="@+id/coverImage"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/cover_thumbnail_height"
-        app:cardCornerRadius="@dimen/cover_corner_radius"
-        app:cardElevation="2dp">
-
-        <ImageView
-            android:id="@+id/coverImage"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:adjustViewBounds="true"
-            android:contentDescription="@null"
-            android:maxWidth="@dimen/catalogLaneCoverMaximumWidth"
-            android:scaleType="fitXY"
-            app:srcCompat="@drawable/cover_loading" />
-    </androidx.cardview.widget.CardView>
-</LinearLayout>
+        android:layout_height="match_parent"
+        android:adjustViewBounds="true"
+        android:contentDescription="@null"
+        android:maxWidth="@dimen/catalogLaneCoverMaximumWidth"
+        android:scaleType="fitXY"
+        app:srcCompat="@drawable/cover_loading" />
+</androidx.cardview.widget.CardView>

From 3c83f3cb851052de670d7714bc77673d6345bd01 Mon Sep 17 00:00:00 2001
From: Mark Raynsford <code@io7m.com>
Date: Wed, 20 Sep 2023 15:50:22 +0000
Subject: [PATCH 4/4] Point at newest platform version.

---
 org.thepalaceproject.android.platform | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.thepalaceproject.android.platform b/org.thepalaceproject.android.platform
index 22218fad5..e85e0480c 160000
--- a/org.thepalaceproject.android.platform
+++ b/org.thepalaceproject.android.platform
@@ -1 +1 @@
-Subproject commit 22218fad5588b45832d7e9718baee9e23dbee9d5
+Subproject commit e85e0480c7159dd6ef6fa047e15b30cfa1375677