Skip to content

Commit bf71b92

Browse files
committed
Adjust layouts slightly for extreme font sizes
Affects: https://ebce-lyrasis.atlassian.net/browse/PP-3379
1 parent 36e6065 commit bf71b92

2 files changed

Lines changed: 28 additions & 15 deletions

File tree

palace-ui/src/main/res/layout/book_detail2.xml

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,14 @@
220220
<Button
221221
android:id="@+id/bookD2ToolbarItemButton"
222222
style="@style/Palace.Button.Contained.Medium"
223-
android:layout_width="128dp"
223+
android:layout_width="176dp"
224224
android:layout_height="48dp"
225225
android:layout_marginEnd="32dp"
226226
android:layout_marginBottom="16dp"
227-
android:text="@string/catalogGet"
227+
android:autoSizeMinTextSize="14sp"
228+
android:autoSizeTextType="uniform"
229+
android:ellipsize="end"
230+
android:text="@string/catalogDownload"
228231
app:layout_constraintBottom_toBottomOf="parent"
229232
app:layout_constraintEnd_toEndOf="parent"
230233
app:strokeColor="@android:color/white"
@@ -333,19 +336,27 @@
333336
<Button
334337
android:id="@+id/book2DOverlayButton0"
335338
style="@style/Palace.Button.Contained.Medium"
336-
android:layout_width="128dp"
339+
android:layout_width="160dp"
337340
android:layout_height="wrap_content"
338-
android:text="@string/catalogGet" />
341+
android:autoSizeMinTextSize="14sp"
342+
android:autoSizeTextType="uniform"
343+
android:ellipsize="end"
344+
android:maxLines="1"
345+
android:text="@string/catalogDownload" />
339346

340347
<View
341-
android:layout_width="8dp"
342-
android:layout_height="8dp" />
348+
android:layout_width="16dp"
349+
android:layout_height="16dp" />
343350

344351
<Button
345352
android:id="@+id/book2DOverlayButton1"
346353
style="@style/Palace.Button.Outlined.Medium"
347-
android:layout_width="128dp"
354+
android:layout_width="160dp"
348355
android:layout_height="wrap_content"
356+
android:autoSizeMinTextSize="14sp"
357+
android:autoSizeTextType="uniform"
358+
android:ellipsize="end"
359+
android:maxLines="1"
349360
android:text="@string/catalogPreview" />
350361
</LinearLayout>
351362

@@ -356,22 +367,24 @@
356367
android:layout_width="match_parent"
357368
android:layout_height="match_parent"
358369
android:background="#7f000000"
359-
android:elevation="10dp" />
370+
android:elevation="10dp"
371+
tools:visibility="gone" />
360372

361373
<!-- Bottom sheet. -->
362374
<androidx.constraintlayout.widget.ConstraintLayout
363-
android:elevation="20dp"
364375
android:layout_width="match_parent"
365-
android:layout_height="match_parent">
376+
android:layout_height="match_parent"
377+
android:elevation="20dp">
366378

367379
<org.librarysimplified.ui.bottomsheet.PalaceBottomSheet
368380
android:id="@+id/book2DBottomSheet"
381+
android:layout_width="0dp"
382+
android:layout_height="wrap_content"
369383
app:layout_constraintBottom_toBottomOf="parent"
370-
app:layout_constraintStart_toStartOf="parent"
371384
app:layout_constraintEnd_toEndOf="parent"
372-
android:layout_width="0dp"
373-
android:layout_height="wrap_content">
374-
<include layout="@layout/book_detail2_drawer_content"/>
385+
app:layout_constraintStart_toStartOf="parent">
386+
387+
<include layout="@layout/book_detail2_drawer_content" />
375388
</org.librarysimplified.ui.bottomsheet.PalaceBottomSheet>
376389
</androidx.constraintlayout.widget.ConstraintLayout>
377390

palace-ui/src/main/res/values/dimensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<dimen name="catalogBookDetailCoverHeight">240dp</dimen>
99
<dimen name="catalogBookDetailCoverWidth">160dp</dimen>
1010

11-
<dimen name="catalogBookDetailScrollMarginTopMax">192dp</dimen>
11+
<dimen name="catalogBookDetailScrollMarginTopMax">256dp</dimen>
1212
<dimen name="catalogBookDetailScrollMarginTopMin">32dp</dimen>
1313

1414
<dimen name="catalogBookDetailButtonsHeight">64dp</dimen>

0 commit comments

Comments
 (0)