@@ -1099,7 +1099,10 @@ class CatalogFeedViewDetails2(
10991099
11001100 this .reconfigureButton0(
11011101 text = R .string.catalogManageHold,
1102- accessibilityTextOverride = this .root.resources.getString(R .string.catalogAccessibilityBookManageHold, status.book.entry.title),
1102+ accessibilityTextOverride = this .root.resources.getString(
1103+ R .string.catalogAccessibilityBookManageHold,
1104+ status.book.entry.title
1105+ ),
11031106 actionInPage = {
11041107 this .openDrawer()
11051108 this .callbacks.onBookRequestRevoke(status.book)
@@ -1187,7 +1190,10 @@ class CatalogFeedViewDetails2(
11871190
11881191 this .reconfigureButton0(
11891192 text = R .string.catalogGet,
1190- accessibilityTextOverride = this .root.resources.getString(R .string.catalogAccessibilityBookBorrow, status.book.entry.title),
1193+ accessibilityTextOverride = this .root.resources.getString(
1194+ R .string.catalogAccessibilityBookBorrow,
1195+ status.book.entry.title
1196+ ),
11911197 actionInPage = {
11921198 this .openDrawer()
11931199 this .callbacks.onBookRequestBorrow(status.toBorrowParameters())
@@ -1210,7 +1216,10 @@ class CatalogFeedViewDetails2(
12101216
12111217 this .reconfigureButton0(
12121218 text = R .string.catalogPlaceHold,
1213- accessibilityTextOverride = this .root.resources.getString(R .string.catalogAccessibilityBookPlaceHold, status.book.entry.title),
1219+ accessibilityTextOverride = this .root.resources.getString(
1220+ R .string.catalogAccessibilityBookPlaceHold,
1221+ status.book.entry.title
1222+ ),
12141223 actionInPage = {
12151224 this .openDrawer()
12161225 this .callbacks.onBookRequestBorrow(status.toBorrowParameters())
@@ -1234,7 +1243,10 @@ class CatalogFeedViewDetails2(
12341243
12351244 this .reconfigureButton0(
12361245 text = R .string.catalogGet,
1237- accessibilityTextOverride = this .root.resources.getString(R .string.catalogAccessibilityBookBorrow, status.book.entry.title),
1246+ accessibilityTextOverride = this .root.resources.getString(
1247+ R .string.catalogAccessibilityBookBorrow,
1248+ status.book.entry.title
1249+ ),
12381250 actionInPage = {
12391251 this .openDrawer()
12401252 this .callbacks.onBookRequestBorrow(status.toBorrowParameters())
@@ -1254,7 +1266,10 @@ class CatalogFeedViewDetails2(
12541266 this .enableButton1Status = true
12551267 this .reconfigureButton1(
12561268 text = R .string.catalogPreview,
1257- accessibilityTextOverride = this .root.resources.getString(R .string.catalogAccessibilityBookPreviewRead, status.book.entry.title),
1269+ accessibilityTextOverride = this .root.resources.getString(
1270+ R .string.catalogAccessibilityBookPreviewRead,
1271+ status.book.entry.title
1272+ ),
12581273 actionInPage = { this .callbacks.onBookRequestPreviewOpen(status.book) },
12591274 actionInBottomSheet = { this .callbacks.onBookRequestPreviewOpen(status.book) }
12601275 )
@@ -1290,7 +1305,7 @@ class CatalogFeedViewDetails2(
12901305 if (format != null ) {
12911306 this .reconfigureButton0(
12921307 text = this .readButtonString(status.book),
1293- accessibilityTextOverride = this .root.resources.getString( R .string.catalogAccessibilityBookRead, status.book.entry.title ),
1308+ accessibilityTextOverride = this .readButtonAccessibilityLabel( status.book),
12941309 actionInPage = { this .callbacks.onBookRequestViewerOpen(status.book, format) },
12951310 actionInBottomSheet = { this .callbacks.onBookRequestViewerOpen(status.book, format) }
12961311 )
@@ -1300,7 +1315,10 @@ class CatalogFeedViewDetails2(
13001315 this .enableButton1Status = true
13011316 this .reconfigureButton1(
13021317 text = R .string.catalogReturn,
1303- accessibilityTextOverride = this .root.resources.getString(R .string.catalogAccessibilityBookRevokeLoan, status.book.entry.title),
1318+ accessibilityTextOverride = this .root.resources.getString(
1319+ R .string.catalogAccessibilityBookRevokeLoan,
1320+ status.book.entry.title
1321+ ),
13041322 actionInPage = {
13051323 this .openDrawer()
13061324 this .callbacks.onBookRequestRevoke(status.book)
@@ -1314,6 +1332,22 @@ class CatalogFeedViewDetails2(
13141332 }
13151333 }
13161334
1335+ private fun readButtonAccessibilityLabel (book : Book ): String {
1336+ return when (book.findPreferredFormat()) {
1337+ is BookFormat .BookFormatAudioBook ->
1338+ this .root.resources.getString(R .string.catalogAccessibilityBookListen, book.entry.title)
1339+
1340+ is BookFormat .BookFormatEPUB ->
1341+ this .root.resources.getString(R .string.catalogAccessibilityBookRead, book.entry.title)
1342+
1343+ is BookFormat .BookFormatPDF ->
1344+ this .root.resources.getString(R .string.catalogAccessibilityBookRead, book.entry.title)
1345+
1346+ null ->
1347+ this .root.resources.getString(R .string.catalogAccessibilityBookRead, book.entry.title)
1348+ }
1349+ }
1350+
13171351 private fun readButtonString (
13181352 book : Book
13191353 ): Int {
@@ -1345,7 +1379,10 @@ class CatalogFeedViewDetails2(
13451379
13461380 this .reconfigureButton0(
13471381 text = R .string.catalogDownload,
1348- accessibilityTextOverride = this .root.resources.getString(R .string.catalogAccessibilityBookDownload, status.book.entry.title),
1382+ accessibilityTextOverride = this .root.resources.getString(
1383+ R .string.catalogAccessibilityBookDownload,
1384+ status.book.entry.title
1385+ ),
13491386 actionInPage = {
13501387 this .openDrawer()
13511388 this .callbacks.onBookRequestBorrow(status.toBorrowParameters())
@@ -1359,7 +1396,10 @@ class CatalogFeedViewDetails2(
13591396 this .enableButton1Status = true
13601397 this .reconfigureButton1(
13611398 text = R .string.catalogReturn,
1362- accessibilityTextOverride = this .root.resources.getString(R .string.catalogAccessibilityBookRevokeLoan, status.book.entry.title),
1399+ accessibilityTextOverride = this .root.resources.getString(
1400+ R .string.catalogAccessibilityBookRevokeLoan,
1401+ status.book.entry.title
1402+ ),
13631403 actionInPage = {
13641404 this .openDrawer()
13651405 this .callbacks.onBookRequestRevoke(status.book)
@@ -1470,7 +1510,10 @@ class CatalogFeedViewDetails2(
14701510
14711511 this .reconfigureButton0(
14721512 text = R .string.catalogCancel,
1473- accessibilityTextOverride = this .root.resources.getString(R .string.catalogAccessibilityBookDownloadCancel, status.book.entry.title),
1513+ accessibilityTextOverride = this .root.resources.getString(
1514+ R .string.catalogAccessibilityBookDownloadCancel,
1515+ status.book.entry.title
1516+ ),
14741517 actionInPage = {
14751518 this .openDrawer()
14761519 this .callbacks.onBookRequestBorrowCancel(status.book)
0 commit comments