Improve PDF reader labelling

Affects: https://ebce-lyrasis.atlassian.net/browse/PP-4021

Author: io7m

palace-viewer-pdf-pdfjs/src/main/java/org/librarysimplified/viewer/pdf/pdfjs/PdfReaderActivity.kt

@@ -79,6 +79,11 @@ class PdfReaderActivity : AppCompatActivity() {
   private val profilesController =
     this.services.requireService(ProfilesControllerType::class.java)
 
+  private lateinit var toolbarTOC: View
+  private lateinit var toolbarSettings: View
+  private lateinit var toolbarBack: View
+  private lateinit var toolbarText: TextView
+  private lateinit var toolbar: ViewGroup
   private lateinit var account: AccountType
   private lateinit var accountId: AccountID
   private lateinit var bookFormat: BookFormat.BookFormatPDF
@@ -91,7 +96,8 @@ class PdfReaderActivity : AppCompatActivity() {
 
   private var backgroundThread: ExecutorService? = null
   private var pdfServer: PdfServer? = null
-  private var isSidebarOpen = false
+  private var isSidebarOpen = true
+  private var isSettingsOpen: Boolean = false
   private var documentPageIndex: Int = 0
 
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -199,28 +205,28 @@ class PdfReaderActivity : AppCompatActivity() {
   private fun createToolbar(
     title: String
   ) {
-    val toolbar =
-      this.findViewById<ViewGroup>(R.id.pdfToolbar)
-    val toolbarText =
-      toolbar.findViewById<TextView>(R.id.pdfToolbarText)
-    val toolbarBack =
-      toolbar.findViewById<View>(R.id.pdfToolbarLogoTouch)
-    val toolbarSettings =
-      toolbar.findViewById<View>(R.id.pdfToolbarSettingsIconTouch)
-    val toolbarTOC =
-      toolbar.findViewById<View>(R.id.pdfToolbarTOCIconTouch)
-
-    toolbarBack.setOnClickListener {
+    this.toolbar =
+      this.findViewById(R.id.pdfToolbar)
+    this.toolbarText =
+      this.toolbar.findViewById(R.id.pdfToolbarText)
+    this.toolbarBack =
+      this.toolbar.findViewById(R.id.pdfToolbarLogoTouch)
+    this.toolbarSettings =
+      this.toolbar.findViewById(R.id.pdfToolbarSettingsIconTouch)
+    this.toolbarTOC =
+      this.toolbar.findViewById(R.id.pdfToolbarTOCIconTouch)
+
+    this.toolbarBack.setOnClickListener {
       this.finish()
     }
-    toolbarSettings.setOnClickListener {
+    this.toolbarSettings.setOnClickListener {
       this.onReaderMenuSettingsSelected()
     }
-    toolbarTOC.setOnClickListener {
+    this.toolbarTOC.setOnClickListener {
       this.onReaderMenuTOCSelected()
     }
-    toolbarText.text = title
-    toolbarBack.requestFocus()
+    this.toolbarText.text = title
+    this.toolbarBack.requestFocus()
   }
 
   private fun createWebView() {
@@ -314,20 +320,44 @@ class PdfReaderActivity : AppCompatActivity() {
   }
 
   private fun toggleSidebar() {
-    if (::webView.isInitialized) {
+    if (this::webView.isInitialized) {
       this.webView.evaluateJavascript("toggleSidebar()") { result ->
         this.isSidebarOpen = (result == "true")
+        this.setSidebarButtonContentDescription()
       }
     }
   }
 
+  private fun setSidebarButtonContentDescription() {
+    if (this.isSidebarOpen) {
+      this.toolbarTOC.contentDescription =
+        this.resources.getString(R.string.accessibility_toc_close)
+    } else {
+      this.toolbarTOC.contentDescription =
+        this.resources.getString(R.string.accessibility_toc_open)
+    }
+  }
+
   private fun onReaderMenuSettingsSelected(): Boolean {
-    if (::webView.isInitialized) {
-      this.webView.evaluateJavascript("toggleSecondaryToolbar()", null)
+    if (this::webView.isInitialized) {
+      this.webView.evaluateJavascript("toggleSecondaryToolbar()") { result ->
+        this.isSettingsOpen = (result == "true")
+        this.setSettingsButtonContentDescription()
+      }
     }
     return true
   }
 
+  private fun setSettingsButtonContentDescription() {
+    if (this.isSettingsOpen) {
+      this.toolbarTOC.contentDescription =
+        this.resources.getString(R.string.accessibility_settings_close)
+    } else {
+      this.toolbarTOC.contentDescription =
+        this.resources.getString(R.string.accessibility_settings_open)
+    }
+  }
+
   override fun onDestroy() {
     try {
       this.pdfServer?.stop()

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

@@ -58,7 +58,7 @@
             android:layout_height="64dp"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:contentDescription="@string/accessibility_toc"
+            android:contentDescription="@string/accessibility_toc_close"
             android:focusable="true"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/pdfToolbarSettingsIconTouch"
@@ -81,7 +81,7 @@
             android:layout_height="64dp"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:contentDescription="@string/accessibility_settings"
+            android:contentDescription="@string/accessibility_settings_open"
             android:focusable="true"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

palace-viewer-pdf-pdfjs/src/main/res/values/strings.xml

@@ -3,8 +3,10 @@
 <resources>
     <string name="Dismiss">Dismiss</string>
     <string name="accessibility_back">Close book and go back.</string>
-    <string name="accessibility_settings">Open the settings menu</string>
-    <string name="accessibility_toc">Open the table of contents and bookmarks screen.</string>
+    <string name="accessibility_settings_close">Close the settings menu</string>
+    <string name="accessibility_settings_open">Open the settings menu</string>
+    <string name="accessibility_toc_open">Open the table of contents and bookmarks screen</string>
+    <string name="accessibility_toc_close">Close the table of contents and bookmarks screen</string>
     <string name="content_description_back">Back</string>
     <string name="settings_title">Settings</string>
     <string name="table_of_contents_empty_message">No Table of Contents available for this work</string>