Skip to content

Commit 73d94e5

Browse files
committed
Add missing PDF reader labels
Affects: https://ebce-lyrasis.atlassian.net/browse/PP-4021
1 parent f33672e commit 73d94e5

4 files changed

Lines changed: 33 additions & 33 deletions

File tree

palace-viewer-pdf-pdfjs/src/main/res/layout/pdfjs_reader.xml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,22 @@
2020
android:layout_height="64dp"
2121
android:background="?attr/selectableItemBackground"
2222
android:clickable="true"
23+
android:contentDescription="@string/accessibility_back"
24+
android:focusable="true"
2325
app:layout_constraintBottom_toBottomOf="parent"
2426
app:layout_constraintStart_toStartOf="parent"
2527
app:layout_constraintTop_toTopOf="parent">
2628

2729
<ImageView
28-
app:tint="@color/PalacePrimaryForegroundColor"
2930
android:id="@+id/pdfToolbarLogo"
3031
android:layout_width="24dp"
3132
android:layout_height="24dp"
3233
android:layout_gravity="center"
33-
android:src="@drawable/arrow_left" />
34+
android:clickable="false"
35+
android:focusable="false"
36+
android:importantForAccessibility="no"
37+
android:src="@drawable/arrow_left"
38+
app:tint="@color/PalacePrimaryForegroundColor" />
3439
</FrameLayout>
3540

3641
<TextView
@@ -53,6 +58,8 @@
5358
android:layout_height="64dp"
5459
android:background="?attr/selectableItemBackground"
5560
android:clickable="true"
61+
android:contentDescription="@string/accessibility_toc"
62+
android:focusable="true"
5663
app:layout_constraintBottom_toBottomOf="parent"
5764
app:layout_constraintEnd_toStartOf="@id/pdfToolbarSettingsIconTouch"
5865
app:layout_constraintTop_toTopOf="parent">
@@ -62,6 +69,9 @@
6269
android:layout_width="24dp"
6370
android:layout_height="24dp"
6471
android:layout_gravity="center"
72+
android:clickable="false"
73+
android:focusable="false"
74+
android:importantForAccessibility="no"
6575
android:src="@drawable/pdf_toc" />
6676
</FrameLayout>
6777

@@ -71,6 +81,8 @@
7181
android:layout_height="64dp"
7282
android:background="?attr/selectableItemBackground"
7383
android:clickable="true"
84+
android:contentDescription="@string/accessibility_settings"
85+
android:focusable="true"
7486
app:layout_constraintBottom_toBottomOf="parent"
7587
app:layout_constraintEnd_toEndOf="parent"
7688
app:layout_constraintTop_toTopOf="parent">
@@ -80,6 +92,9 @@
8092
android:layout_width="24dp"
8193
android:layout_height="24dp"
8294
android:layout_gravity="center"
95+
android:clickable="false"
96+
android:focusable="false"
97+
android:importantForAccessibility="no"
8398
android:src="@drawable/pdf_settings" />
8499
</FrameLayout>
85100

@@ -98,6 +113,9 @@
98113
android:layout_width="128dp"
99114
android:layout_height="32dp"
100115
android:layout_gravity="center"
116+
android:clickable="false"
117+
android:focusable="false"
118+
android:importantForAccessibility="no"
101119
android:indeterminate="true" />
102120

103121
</FrameLayout>

palace-viewer-pdf-pdfjs/src/main/res/menu/pdf_reader_menu.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22

33
<resources>
4-
<string name="Dismiss">Dismiss</string>
5-
6-
<string name="accessibility_table_of_contents">Open the table of contents</string>
7-
<string name="table_of_contents_title">Table of Contents</string>
8-
<string name="table_of_contents_empty_message">No Table of Contents available for this work</string>
9-
<string name="accessibility_settings">Open the settings menu</string>
10-
<string name="settings_title">Settings</string>
11-
<string name="content_description_back">Back</string>
12-
13-
<string name="viewer_position_title">Sync Reading Position</string>
14-
<string name="viewer_position_message">Do you want to move to the page on which you left off?</string>
15-
<string name="viewer_position_move">Move</string>
16-
<string name="viewer_position_stay">Stay</string>
4+
<string name="Dismiss">Dismiss</string>
5+
<string name="accessibility_back">Close book and go back.</string>
6+
<string name="accessibility_settings">Open the settings menu</string>
7+
<string name="accessibility_toc">Open the table of contents and bookmarks screen.</string>
8+
<string name="content_description_back">Back</string>
9+
<string name="settings_title">Settings</string>
10+
<string name="table_of_contents_empty_message">No Table of Contents available for this work</string>
11+
<string name="table_of_contents_title">Table of Contents</string>
12+
<string name="viewer_position_message">Do you want to move to the page on which you left off?</string>
13+
<string name="viewer_position_move">Move</string>
14+
<string name="viewer_position_stay">Stay</string>
15+
<string name="viewer_position_title">Sync Reading Position</string>
1716
</resources>

0 commit comments

Comments
 (0)