From 5a0d132f27e74545801985ec9e6cc13ca18640fc Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sun, 26 Dec 2021 22:21:38 +1000
Subject: [PATCH 01/37] Save the last search term and added a button to clear
 text

---
 .../net/bible/android/view/activity/search/Search.kt |  6 ++++++
 app/src/main/res/layout/search.xml                   | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/Search.kt b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
index edf074fd6b..9a7f37486e 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/Search.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
@@ -25,6 +25,7 @@ import android.util.Log
 import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
+import android.widget.Button
 import android.widget.RadioButton
 import android.widget.RadioGroup
 
@@ -136,6 +137,8 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
             if (StringUtils.isNotEmpty(text)) {
                 binding.searchText.setText(text)
             }
+        } else {
+            binding.searchText.setText(CommonUtils.settings.getString("search_text", ""))
         }
 
         val wordsRadioGroup = findViewById<View>(R.id.wordsGroup) as RadioGroup
@@ -169,6 +172,8 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         }
         currentBookRadioButton.text = currentBookName
 
+        binding.textClear.setOnClickListener({binding.searchText.setText("")})
+
         Log.i(TAG, "Finished displaying Search view")
     }
 
@@ -204,6 +209,7 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         var text = binding.searchText.text.toString()
         if (!StringUtils.isEmpty(text)) {
 
+            CommonUtils.settings.setString("search_text", text)
             // update current intent so search is restored if we return here via history/back
             // the current intent is saved by HistoryManager
             intent.putExtra(SEARCH_TEXT_SAVE, text)
diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml
index 48963f68ae..a87ada12f8 100644
--- a/app/src/main/res/layout/search.xml
+++ b/app/src/main/res/layout/search.xml
@@ -5,6 +5,7 @@
 -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -95,4 +96,15 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent" />
+
+	<Button
+		android:id="@+id/textClear"
+		android:layout_width="35dp"
+		android:layout_height="35dp"
+		android:layout_marginStart="-35dp"
+		android:layout_marginBottom="-35dp"
+		android:text="X"
+		android:textSize="12sp"
+		app:layout_constraintBottom_toTopOf="@+id/searchText"
+		app:layout_constraintStart_toEndOf="@+id/searchText" />
 </androidx.constraintlayout.widget.ConstraintLayout>

From 8376a937cdbf6dfd918b00b29e7fe70b93db01b2 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Thu, 30 Dec 2021 19:00:47 +1000
Subject: [PATCH 02/37] Added option to disable search text recall

---
 .../android/view/activity/search/Search.kt    |   7 +-
 app/src/main/res/layout/search.xml            | 152 +++++++++++-------
 app/src/main/res/values/strings.xml           |   2 +
 3 files changed, 106 insertions(+), 55 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/Search.kt b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
index 9a7f37486e..c541c66c2b 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/Search.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
@@ -130,6 +130,10 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         //    false
         //})
 
+        binding.rememberSearchText.setOnClickListener {
+            CommonUtils.settings.setBoolean("search_remember_search_text", binding.rememberSearchText.isChecked)
+        }
+
         // pre-load search string if passed in
         val extras = intent.extras
         if (extras != null) {
@@ -138,7 +142,8 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
                 binding.searchText.setText(text)
             }
         } else {
-            binding.searchText.setText(CommonUtils.settings.getString("search_text", ""))
+            binding.rememberSearchText.isChecked = CommonUtils.settings.getBoolean("search_remember_search_text", false)
+            if (binding.rememberSearchText.isChecked) binding.searchText.setText(CommonUtils.settings.getString("search_text", ""))
         }
 
         val wordsRadioGroup = findViewById<View>(R.id.wordsGroup) as RadioGroup
diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml
index a87ada12f8..89552b861d 100644
--- a/app/src/main/res/layout/search.xml
+++ b/app/src/main/res/layout/search.xml
@@ -25,65 +25,109 @@
 		app:layout_constraintTop_toBottomOf="@id/searchText"
 		app:layout_constraintBottom_toTopOf="@id/submit"
 		>
-	
-		<!-- horizontal container to force each pair of controls to use half of screen each -->
-		<LinearLayout android:id="@+id/centreAreaContainer"
-			android:orientation="horizontal"
+
+		<LinearLayout android:id="@+id/rowAreaContainer"
+			android:orientation="vertical"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			>
-		
-			<RadioGroup android:id="@+id/bibleSectionGroup"
-				android:layout_height="wrap_content"
-				android:layout_width="0dip"
-				android:layout_weight="1"
-				android:padding="5dip">
-				<TextView android:id="@+id/sectionGroupPrompt"
-					android:text="@string/search_bible_section_group_prompt"
-					android:layout_height="wrap_content"
-					android:layout_width="wrap_content"/>
-				<RadioButton android:id="@+id/searchAllBible"
-					android:text="@string/search_all_bible"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:checked="true"/>
-				<RadioButton android:id="@+id/searchOldTestament"
-					android:text="@string/search_old_testament"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"/>
-				<RadioButton android:id="@+id/searchNewTestament"
-					android:text="@string/search_new_testament"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"/>
-				<RadioButton android:id="@+id/searchCurrentBook"
-					android:text="@string/search_current_book"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"/>
-			</RadioGroup>
+			android:layout_height="wrap_content">
+
+			<LinearLayout
+				android:id="@+id/centreAreaContainer1"
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				>
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_weight="1">
+
+					<CheckBox
+						android:id="@+id/includeAllEndings"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="0.1"
+						android:text="@string/search_include_all_endings"
+						android:visibility="invisible" />
+				</LinearLayout>
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_weight="1">
 
-			<RadioGroup android:id="@+id/wordsGroup"
+					<CheckBox
+						android:id="@+id/rememberSearchText"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:text="@string/search_remember_search_text" />
+
+				</LinearLayout>
+
+			</LinearLayout>
+			<!-- horizontal container to force each pair of controls to use half of screen each -->
+
+			<LinearLayout android:id="@+id/centreAreaContainer"
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_width="0dip"
-				android:layout_weight="1"
-				android:padding="5dip">
-				<TextView
-					android:text="@string/search_words_group_prompt"
+				>
+
+				<RadioGroup android:id="@+id/bibleSectionGroup"
 					android:layout_height="wrap_content"
-					android:layout_width="wrap_content"/>
-				<RadioButton android:id="@+id/allWords"
-					android:layout_width="wrap_content"
-					android:text="@string/search_all_words"
+					android:layout_width="0dip"
+					android:layout_weight="1"
+					android:padding="5dip">
+
+					<TextView android:id="@+id/sectionGroupPrompt"
+						android:text="@string/search_bible_section_group_prompt"
+						android:layout_height="wrap_content"
+						android:layout_width="wrap_content"/>
+					<RadioButton android:id="@+id/searchAllBible"
+						android:text="@string/search_all_bible"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:checked="true"/>
+					<RadioButton android:id="@+id/searchOldTestament"
+						android:text="@string/search_old_testament"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"/>
+					<RadioButton android:id="@+id/searchNewTestament"
+						android:text="@string/search_new_testament"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"/>
+					<RadioButton android:id="@+id/searchCurrentBook"
+						android:text="@string/search_current_book"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"/>
+				</RadioGroup>
+
+				<RadioGroup android:id="@+id/wordsGroup"
 					android:layout_height="wrap_content"
-					android:checked="true"/>
-				<RadioButton android:id="@+id/anyWord"
-					android:layout_width="wrap_content"
-					android:text="@string/search_any_word"
-					android:layout_height="wrap_content"/>
-				<RadioButton android:id="@+id/phrase"
-					android:layout_width="wrap_content"
-					android:text="@string/search_phrase"
-					android:layout_height="wrap_content"/>
-			</RadioGroup>
+					android:layout_width="0dip"
+					android:layout_weight="1"
+					android:padding="5dip">
+
+					<TextView
+						android:text="@string/search_words_group_prompt"
+						android:layout_height="wrap_content"
+						android:layout_width="wrap_content"/>
+					<RadioButton android:id="@+id/allWords"
+						android:layout_width="wrap_content"
+						android:text="@string/search_all_words"
+						android:layout_height="wrap_content"
+						android:checked="true"/>
+					<RadioButton android:id="@+id/anyWord"
+						android:layout_width="wrap_content"
+						android:text="@string/search_any_word"
+						android:layout_height="wrap_content"/>
+					<RadioButton android:id="@+id/phrase"
+						android:layout_width="wrap_content"
+						android:text="@string/search_phrase"
+						android:layout_height="wrap_content"/>
+				</RadioGroup>
+			</LinearLayout>
 		</LinearLayout>
 	</ScrollView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a8e218f267..f4b2661717 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,6 +66,8 @@
     <string name="search_old_testament">Old Testament</string>
     <string name="search_current_book">Current book</string>
     <string name="error_executing_search">Invalid search query</string>
+    <string name="search_remember_search_text">Remember search text</string>
+    <string name="search_include_all_endings">All endings</string>
 
     <!-- Preferences -->
     <string name="prefs_show_verseno_title">Chapter &amp; verse numbers</string>

From 1b1195f14253a2980b1dbf81eacc6d76e5ffe44b Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Thu, 30 Dec 2021 22:44:04 +1000
Subject: [PATCH 03/37] Added fuzzy search

---
 .../android/control/search/SearchControl.kt   |  20 +++-
 .../android/view/activity/search/Search.kt    |  68 ++++++++++-
 app/src/main/res/layout/search.xml            | 106 +++++++++++++++++-
 app/src/main/res/values/strings.xml           |   6 +-
 4 files changed, 187 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/net/bible/android/control/search/SearchControl.kt b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
index 5a343da122..5f4d61463f 100644
--- a/app/src/main/java/net/bible/android/control/search/SearchControl.kt
+++ b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
@@ -99,10 +99,26 @@ class SearchControl @Inject constructor(
             "-"
         }
 
-    fun decorateSearchString(searchString: String, searchType: SearchType, bibleSection: SearchBibleSection, currentBookName: String?): String {
-        val cleanSearchString = cleanSearchString(searchString)
+    fun decorateSearchString(searchString: String, searchType: SearchType, bibleSection: SearchBibleSection, currentBookName: String?,
+                             includeAllEndings: Boolean=false, fuzzySearchAccuracy: Double? = 1.0): String {
+        var cleanSearchString = cleanSearchString(searchString)
         var decorated: String
 
+        if (includeAllEndings) {
+            var newSearchString =""
+            val wordArray: List<String> = cleanSearchString.split(" ")
+            wordArray.forEach {newSearchString += it + "* "}
+            cleanSearchString = newSearchString.trim()
+        }
+
+        if (!includeAllEndings && fuzzySearchAccuracy != null) {
+            var newSearchString =""
+            val wordArray: List<String> = cleanSearchString.split(" ")
+            var fuzzySearchAccuracyAdjusted = if (fuzzySearchAccuracy.equals(1)) 0.99 else fuzzySearchAccuracy
+            wordArray.forEach {newSearchString += it + "~%.2f ".format(fuzzySearchAccuracyAdjusted)}
+            cleanSearchString = newSearchString.trim()
+        }
+
         // add search type (all/any/phrase) to search string
         decorated = searchType.decorate(cleanSearchString)
 
diff --git a/app/src/main/java/net/bible/android/view/activity/search/Search.kt b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
index c541c66c2b..26e65ac333 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/Search.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
@@ -28,6 +28,7 @@ import android.view.inputmethod.EditorInfo
 import android.widget.Button
 import android.widget.RadioButton
 import android.widget.RadioGroup
+import android.widget.SeekBar
 
 import net.bible.android.activity.R
 import net.bible.android.activity.databinding.SearchBinding
@@ -64,6 +65,17 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
 
     /** get all, any, phrase query limitation
      */
+    private var fuzzySearchAccuracySelection: Int = 5
+        get() {
+            return field
+        }
+        set(value) {
+            CommonUtils.settings.setInt("search_fuzzy_accuracy", value)
+            binding.fuzzySearch.text = getString(R.string.search_fuzzy, "(~" + (value * 10).toString() + "%)")
+            binding.fuzzySearchAccuracy.setProgress(value)
+            field = value
+        }
+
     private val searchType: SearchType
         get() {
             return when (wordsRadioSelection) {
@@ -133,6 +145,39 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         binding.rememberSearchText.setOnClickListener {
             CommonUtils.settings.setBoolean("search_remember_search_text", binding.rememberSearchText.isChecked)
         }
+        binding.includeAllEndings.setOnClickListener {
+            CommonUtils.settings.setBoolean("search_include_all_endings", binding.includeAllEndings.isChecked)
+            enableSearchControls()
+        }
+        binding.fuzzySearch.setOnClickListener {
+            CommonUtils.settings.setBoolean("search_fuzzy", binding.fuzzySearch.isChecked)
+            enableSearchControls()
+        }
+
+        binding.fuzzySearchAccuracy.setOnSeekBarChangeListener(object: SeekBar.OnSeekBarChangeListener {
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+//                val newProgress = Math.round(progress.toDouble() / STEP).toInt() * STEP
+//                binding.fuzzySearchAccuracy.setProgress(progress)
+                fuzzySearchAccuracySelection = progress
+            }
+            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
+            override fun onStopTrackingTouch(seekBar: SeekBar?) {}
+        })
+
+        binding.includeAllEndings.isChecked = CommonUtils.settings.getBoolean("search_include_all_endings", false)
+        binding.rememberSearchText.isChecked = CommonUtils.settings.getBoolean("search_remember_search_text", false)
+
+        binding.wordsGroup.check(CommonUtils.settings.getInt("search_words_group_prompt", 0))
+        wordsRadioSelection = binding.wordsGroup.checkedRadioButtonId
+
+        binding.bibleSectionGroup.check(CommonUtils.settings.getInt("search_bible_section_group_prompt", 0))
+        sectionRadioSelection = binding.bibleSectionGroup.checkedRadioButtonId
+
+        // SeekBar Range
+
+        binding.fuzzySearch.isChecked = CommonUtils.settings.getBoolean("search_fuzzy", false)
+        fuzzySearchAccuracySelection = CommonUtils.settings.getInt("search_fuzzy_accuracy", 5)
+
 
         // pre-load search string if passed in
         val extras = intent.extras
@@ -142,12 +187,14 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
                 binding.searchText.setText(text)
             }
         } else {
-            binding.rememberSearchText.isChecked = CommonUtils.settings.getBoolean("search_remember_search_text", false)
             if (binding.rememberSearchText.isChecked) binding.searchText.setText(CommonUtils.settings.getString("search_text", ""))
         }
 
-        val wordsRadioGroup = findViewById<View>(R.id.wordsGroup) as RadioGroup
-        wordsRadioGroup.setOnCheckedChangeListener { group, checkedId -> wordsRadioSelection = checkedId }
+       val wordsRadioGroup = findViewById<View>(R.id.wordsGroup) as RadioGroup
+        wordsRadioGroup.setOnCheckedChangeListener { group, checkedId ->
+            wordsRadioSelection = checkedId
+            CommonUtils.settings.setInt("search_words_group_prompt", checkedId)
+        }
         if (extras != null) {
             val wordsSelection = extras.getInt(WORDS_SELECTION_SAVE, -1)
             if (wordsSelection != -1) {
@@ -156,7 +203,10 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         }
 
         val sectionRadioGroup = findViewById<View>(R.id.bibleSectionGroup) as RadioGroup
-        sectionRadioGroup.setOnCheckedChangeListener { group, checkedId -> sectionRadioSelection = checkedId }
+        sectionRadioGroup.setOnCheckedChangeListener { group, checkedId ->
+            sectionRadioSelection = checkedId
+            CommonUtils.settings.setInt("search_bible_section_group_prompt", checkedId)
+        }
         if (extras != null) {
             val sectionSelection = extras.getInt(SECTION_SELECTION_SAVE, -1)
             if (sectionSelection != -1) {
@@ -178,10 +228,16 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         currentBookRadioButton.text = currentBookName
 
         binding.textClear.setOnClickListener({binding.searchText.setText("")})
+        enableSearchControls()
 
         Log.i(TAG, "Finished displaying Search view")
     }
 
+    fun enableSearchControls() {
+        binding.fuzzySearch.isEnabled = !binding.includeAllEndings.isChecked
+        binding.fuzzySearchAccuracy.isEnabled = (!binding.includeAllEndings.isChecked && binding.fuzzySearch.isChecked)
+
+    }
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when(item.itemId) {
             R.id.rebuildIndex -> {
@@ -201,7 +257,6 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         binding.searchText.requestFocus()
     }
 
-
     fun onRebuildIndex(v: View?) {
         startActivity(Intent(this, SearchIndex::class.java))
         finish()
@@ -240,7 +295,8 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
     }
 
     private fun decorateSearchString(searchString: String): String {
-        return searchControl.decorateSearchString(searchString, searchType, bibleSection, currentBookName)
+        val fuzzyAccuarcy = if (binding.fuzzySearch.isChecked) fuzzySearchAccuracySelection.toDouble()/10 else null
+        return searchControl.decorateSearchString(searchString, searchType, bibleSection, currentBookName, binding.includeAllEndings.isChecked, fuzzyAccuarcy)
     }
 
     companion object {
diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml
index 89552b861d..3c890486aa 100644
--- a/app/src/main/res/layout/search.xml
+++ b/app/src/main/res/layout/search.xml
@@ -48,7 +48,7 @@
 						android:layout_height="wrap_content"
 						android:layout_weight="0.1"
 						android:text="@string/search_include_all_endings"
-						android:visibility="invisible" />
+						android:visibility="visible" />
 				</LinearLayout>
 
 				<LinearLayout
@@ -88,19 +88,25 @@
 						android:text="@string/search_all_bible"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
+						android:layout_marginLeft="15dip"
 						android:checked="true"/>
 					<RadioButton android:id="@+id/searchOldTestament"
 						android:text="@string/search_old_testament"
 						android:layout_width="wrap_content"
+						android:layout_marginLeft="15dip"
 						android:layout_height="wrap_content"/>
 					<RadioButton android:id="@+id/searchNewTestament"
 						android:text="@string/search_new_testament"
 						android:layout_width="wrap_content"
+						android:layout_marginLeft="15dip"
 						android:layout_height="wrap_content"/>
-					<RadioButton android:id="@+id/searchCurrentBook"
-						android:text="@string/search_current_book"
+
+					<RadioButton
+						android:id="@+id/searchCurrentBook"
 						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"/>
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="15dip"
+						android:text="@string/search_current_book" />
 				</RadioGroup>
 
 				<RadioGroup android:id="@+id/wordsGroup"
@@ -117,17 +123,109 @@
 						android:layout_width="wrap_content"
 						android:text="@string/search_all_words"
 						android:layout_height="wrap_content"
+						android:layout_marginLeft="15dip"
 						android:checked="true"/>
 					<RadioButton android:id="@+id/anyWord"
 						android:layout_width="wrap_content"
 						android:text="@string/search_any_word"
+						android:layout_marginLeft="15dip"
 						android:layout_height="wrap_content"/>
 					<RadioButton android:id="@+id/phrase"
 						android:layout_width="wrap_content"
 						android:text="@string/search_phrase"
+						android:layout_marginLeft="15dip"
 						android:layout_height="wrap_content"/>
 				</RadioGroup>
 			</LinearLayout>
+			<LinearLayout
+				android:id="@+id/centreAreaContainer3"
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				>
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_weight="1"
+					android:orientation="vertical">
+
+					<CheckBox
+						android:id="@+id/fuzzySearch"
+						android:layout_width="match_parent"
+						android:layout_height="60dip"
+						android:layout_weight="1"
+						android:text="@string/search_fuzzy"
+						android:visibility="visible" />
+					<LinearLayout
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:orientation="horizontal"
+						android:layout_weight="1">
+
+						<TextView
+							android:id="@+id/editTextTextPersonName"
+							android:layout_width="140dip"
+							android:layout_height="wrap_content"
+							android:layout_weight="1"
+							android:layout_marginLeft="25dip"
+							android:ems="10"
+							android:inputType="textPersonName"
+							android:text="@string/accuracy" />
+
+						<SeekBar
+							android:id="@+id/fuzzySearchAccuracy"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:min="1"
+							android:max="10"
+							android:stepSize="1"
+							android:layout_weight="1" />
+					</LinearLayout>
+				</LinearLayout>
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_weight="1"
+					android:orientation="vertical">
+
+					<CheckBox
+						android:id="@+id/proximitySearch"
+						android:layout_width="match_parent"
+						android:layout_height="60dip"
+						android:layout_weight="1"
+						android:text="@string/proximity"
+						android:visibility="visible" />
+					<LinearLayout
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:orientation="horizontal"
+						android:layout_weight="1">
+
+						<TextView
+							android:id="@+id/proximityWordsLabel"
+							android:layout_width="140dip"
+							android:layout_height="wrap_content"
+							android:layout_weight="1"
+							android:layout_marginLeft="25dip"
+							android:ems="10"
+							android:inputType="textPersonName"
+							android:text="@string/words" />
+
+						<SeekBar
+							android:id="@+id/proximityWords"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:min="1"
+							android:max="10"
+							android:stepSize="1"
+							android:layout_weight="1" />
+					</LinearLayout>
+				</LinearLayout>
+
+			</LinearLayout>
+
+
 		</LinearLayout>
 	</ScrollView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f4b2661717..7acc01cf60 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,8 +66,12 @@
     <string name="search_old_testament">Old Testament</string>
     <string name="search_current_book">Current book</string>
     <string name="error_executing_search">Invalid search query</string>
-    <string name="search_remember_search_text">Remember search text</string>
+    <string name="search_remember_search_text">Remember search</string>
     <string name="search_include_all_endings">All endings</string>
+    <string name="search_fuzzy">Fuzzy Search %s</string>
+    <string name="proximity">Proximity %s</string>
+    <string name="words">Words</string>
+    <string name="accuracy">Accuracy</string>
 
     <!-- Preferences -->
     <string name="prefs_show_verseno_title">Chapter &amp; verse numbers</string>

From 8f12d36821d112c08a1469da6ca8bbfbfc29a452 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Fri, 31 Dec 2021 15:54:58 +1000
Subject: [PATCH 04/37] .

---
 .../android/control/search/SearchControl.kt   |   5 +-
 .../android/view/activity/search/Search.kt    |  30 +++-
 app/src/main/res/layout/search.xml            | 133 ++++++++++--------
 app/src/main/res/values/strings.xml           |   2 +-
 4 files changed, 108 insertions(+), 62 deletions(-)

diff --git a/app/src/main/java/net/bible/android/control/search/SearchControl.kt b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
index 5f4d61463f..0d5e7e7682 100644
--- a/app/src/main/java/net/bible/android/control/search/SearchControl.kt
+++ b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
@@ -100,7 +100,7 @@ class SearchControl @Inject constructor(
         }
 
     fun decorateSearchString(searchString: String, searchType: SearchType, bibleSection: SearchBibleSection, currentBookName: String?,
-                             includeAllEndings: Boolean=false, fuzzySearchAccuracy: Double? = 1.0): String {
+                             includeAllEndings: Boolean=false, fuzzySearchAccuracy: Double? = null, proximityWords: Int? = null): String {
         var cleanSearchString = cleanSearchString(searchString)
         var decorated: String
 
@@ -119,6 +119,9 @@ class SearchControl @Inject constructor(
             cleanSearchString = newSearchString.trim()
         }
 
+        if (proximityWords != null) {
+            cleanSearchString = "\"" + cleanSearchString + "\"~" + proximityWords
+        }
         // add search type (all/any/phrase) to search string
         decorated = searchType.decorate(cleanSearchString)
 
diff --git a/app/src/main/java/net/bible/android/view/activity/search/Search.kt b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
index 26e65ac333..2df47286bf 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/Search.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
@@ -21,6 +21,8 @@ package net.bible.android.view.activity.search
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.util.Log
 import android.view.MenuItem
 import android.view.View
@@ -29,6 +31,7 @@ import android.widget.Button
 import android.widget.RadioButton
 import android.widget.RadioGroup
 import android.widget.SeekBar
+import androidx.core.widget.doOnTextChanged
 
 import net.bible.android.activity.R
 import net.bible.android.activity.databinding.SearchBinding
@@ -76,6 +79,17 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
             field = value
         }
 
+    private var proximitySearchWordsSelection: Int = 10
+        get() {
+            return field
+        }
+        set(value) {
+            CommonUtils.settings.setInt("search_proximity_words", value)
+//            binding.proximityWordsLabel.text = getString(R.string.proximity, "(" + (value).toString() + ")")
+            binding.proximtyWordNumber.setText(value.toString())
+            field = value
+        }
+
     private val searchType: SearchType
         get() {
             return when (wordsRadioSelection) {
@@ -153,11 +167,15 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
             CommonUtils.settings.setBoolean("search_fuzzy", binding.fuzzySearch.isChecked)
             enableSearchControls()
         }
+        binding.proximitySearch.setOnClickListener {
+            CommonUtils.settings.setBoolean("search_proximity", binding.proximitySearch.isChecked)
+            enableSearchControls()
+        }
+        binding.proximityButtonAdd.setOnClickListener {proximitySearchWordsSelection = binding.proximtyWordNumber.text.toString().toInt() + 1}
+        binding.proximityButtonSubtract.setOnClickListener {proximitySearchWordsSelection = binding.proximtyWordNumber.text.toString().toInt() - 1}
 
         binding.fuzzySearchAccuracy.setOnSeekBarChangeListener(object: SeekBar.OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-//                val newProgress = Math.round(progress.toDouble() / STEP).toInt() * STEP
-//                binding.fuzzySearchAccuracy.setProgress(progress)
                 fuzzySearchAccuracySelection = progress
             }
             override fun onStartTrackingTouch(seekBar: SeekBar?) {}
@@ -167,6 +185,9 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         binding.includeAllEndings.isChecked = CommonUtils.settings.getBoolean("search_include_all_endings", false)
         binding.rememberSearchText.isChecked = CommonUtils.settings.getBoolean("search_remember_search_text", false)
 
+        binding.proximitySearch.isChecked = CommonUtils.settings.getBoolean("search_proximity",false)
+        proximitySearchWordsSelection = CommonUtils.settings.getInt("search_proximity_words", 10)
+
         binding.wordsGroup.check(CommonUtils.settings.getInt("search_words_group_prompt", 0))
         wordsRadioSelection = binding.wordsGroup.checkedRadioButtonId
 
@@ -295,8 +316,9 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
     }
 
     private fun decorateSearchString(searchString: String): String {
-        val fuzzyAccuarcy = if (binding.fuzzySearch.isChecked) fuzzySearchAccuracySelection.toDouble()/10 else null
-        return searchControl.decorateSearchString(searchString, searchType, bibleSection, currentBookName, binding.includeAllEndings.isChecked, fuzzyAccuarcy)
+        val fuzzyAccuracy = if (binding.fuzzySearch.isChecked) fuzzySearchAccuracySelection.toDouble()/10 else null
+        val proximityWords = if (binding.proximitySearch.isChecked) proximitySearchWordsSelection else null
+        return searchControl.decorateSearchString(searchString, searchType, bibleSection, currentBookName, binding.includeAllEndings.isChecked, fuzzyAccuracy, proximityWords)
     }
 
     companion object {
diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml
index 3c890486aa..90a1994fac 100644
--- a/app/src/main/res/layout/search.xml
+++ b/app/src/main/res/layout/search.xml
@@ -31,43 +31,6 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content">
 
-			<LinearLayout
-				android:id="@+id/centreAreaContainer1"
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				>
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_weight="1">
-
-					<CheckBox
-						android:id="@+id/includeAllEndings"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="0.1"
-						android:text="@string/search_include_all_endings"
-						android:visibility="visible" />
-				</LinearLayout>
-
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_weight="1">
-
-					<CheckBox
-						android:id="@+id/rememberSearchText"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:text="@string/search_remember_search_text" />
-
-				</LinearLayout>
-
-			</LinearLayout>
-			<!-- horizontal container to force each pair of controls to use half of screen each -->
-
 			<LinearLayout android:id="@+id/centreAreaContainer"
 				android:orientation="horizontal"
 				android:layout_width="match_parent"
@@ -137,6 +100,42 @@
 						android:layout_height="wrap_content"/>
 				</RadioGroup>
 			</LinearLayout>
+			<LinearLayout
+				android:id="@+id/centreAreaContainer1"
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				>
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_weight="1">
+
+					<CheckBox
+						android:id="@+id/includeAllEndings"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="0.1"
+						android:text="@string/search_include_all_endings"
+						android:visibility="visible" />
+				</LinearLayout>
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_weight="1">
+
+					<CheckBox
+						android:id="@+id/rememberSearchText"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:text="@string/search_remember_search_text" />
+
+				</LinearLayout>
+
+			</LinearLayout>
+			<!-- horizontal container to force each pair of controls to use half of screen each -->
 			<LinearLayout
 				android:id="@+id/centreAreaContainer3"
 				android:orientation="horizontal"
@@ -147,6 +146,7 @@
 					android:layout_width="match_parent"
 					android:layout_height="match_parent"
 					android:layout_weight="1"
+					android:paddingTop="5dip"
 					android:orientation="vertical">
 
 					<CheckBox
@@ -156,18 +156,20 @@
 						android:layout_weight="1"
 						android:text="@string/search_fuzzy"
 						android:visibility="visible" />
+
 					<LinearLayout
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
+						android:layout_weight="1"
 						android:orientation="horizontal"
-						android:layout_weight="1">
+						android:paddingTop="17dip">
 
 						<TextView
 							android:id="@+id/editTextTextPersonName"
 							android:layout_width="140dip"
 							android:layout_height="wrap_content"
-							android:layout_weight="1"
 							android:layout_marginLeft="25dip"
+							android:layout_weight="1"
 							android:ems="10"
 							android:inputType="textPersonName"
 							android:text="@string/accuracy" />
@@ -176,56 +178,75 @@
 							android:id="@+id/fuzzySearchAccuracy"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:min="1"
+							android:layout_weight="1"
 							android:max="10"
-							android:stepSize="1"
-							android:layout_weight="1" />
+							android:min="3"
+							android:stepSize="0.5" />
 					</LinearLayout>
 				</LinearLayout>
 
 				<LinearLayout
 					android:layout_width="match_parent"
-					android:layout_height="match_parent"
+					android:layout_height="80dp"
 					android:layout_weight="1"
-					android:orientation="vertical">
+					android:orientation="vertical"
+					android:paddingTop="5dip">
 
 					<CheckBox
 						android:id="@+id/proximitySearch"
 						android:layout_width="match_parent"
 						android:layout_height="60dip"
+						android:layout_marginBottom="0dip"
 						android:layout_weight="1"
 						android:text="@string/proximity"
 						android:visibility="visible" />
+
 					<LinearLayout
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
-						android:orientation="horizontal"
-						android:layout_weight="1">
+						android:layout_weight="1"
+						android:orientation="horizontal">
 
 						<TextView
 							android:id="@+id/proximityWordsLabel"
-							android:layout_width="140dip"
+							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:layout_weight="1"
 							android:layout_marginLeft="25dip"
+							android:layout_weight="99"
 							android:ems="10"
 							android:inputType="textPersonName"
 							android:text="@string/words" />
 
-						<SeekBar
-							android:id="@+id/proximityWords"
-							android:layout_width="match_parent"
+						<Button
+							android:id="@+id/proximityButtonSubtract"
+							android:layout_width="35dp"
+							android:layout_height="35dp"
+							android:layout_weight="1"
+							android:text="-" />
+
+						<EditText
+							android:id="@+id/proximtyWordNumber"
+							android:layout_width="170dp"
 							android:layout_height="wrap_content"
-							android:min="1"
-							android:max="10"
-							android:stepSize="1"
-							android:layout_weight="1" />
+							android:layout_weight="99"
+							android:ems="10"
+							android:gravity="center_horizontal|center_vertical"
+							android:inputType="number"
+							android:numeric="integer" />
+
+						<Button
+							android:id="@+id/proximityButtonAdd"
+							android:layout_width="35dp"
+							android:layout_height="35dp"
+							android:layout_weight="1"
+							android:text="+" />
+
+
 					</LinearLayout>
 				</LinearLayout>
 
 			</LinearLayout>
 
-
 		</LinearLayout>
 	</ScrollView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7acc01cf60..07fae9d371 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -69,7 +69,7 @@
     <string name="search_remember_search_text">Remember search</string>
     <string name="search_include_all_endings">All endings</string>
     <string name="search_fuzzy">Fuzzy Search %s</string>
-    <string name="proximity">Proximity %s</string>
+    <string name="proximity">Proximity</string>
     <string name="words">Words</string>
     <string name="accuracy">Accuracy</string>
 

From 856333a3fe4334367fc14b4431af9f19993d98d6 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Fri, 31 Dec 2021 17:18:48 +1000
Subject: [PATCH 05/37] Improved enabling of controls under different scenarios

---
 .../android/control/search/SearchControl.kt   |  2 +-
 .../android/view/activity/search/Search.kt    | 30 +++++++++++++++----
 app/src/main/res/layout/search.xml            |  4 +++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/net/bible/android/control/search/SearchControl.kt b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
index 0d5e7e7682..cf249ab8fa 100644
--- a/app/src/main/java/net/bible/android/control/search/SearchControl.kt
+++ b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
@@ -114,7 +114,7 @@ class SearchControl @Inject constructor(
         if (!includeAllEndings && fuzzySearchAccuracy != null) {
             var newSearchString =""
             val wordArray: List<String> = cleanSearchString.split(" ")
-            var fuzzySearchAccuracyAdjusted = if (fuzzySearchAccuracy.equals(1)) 0.99 else fuzzySearchAccuracy
+            var fuzzySearchAccuracyAdjusted = if (fuzzySearchAccuracy.equals(1.0)) 0.99 else fuzzySearchAccuracy
             wordArray.forEach {newSearchString += it + "~%.2f ".format(fuzzySearchAccuracyAdjusted)}
             cleanSearchString = newSearchString.trim()
         }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/Search.kt b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
index 2df47286bf..4bd71a9ce2 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/Search.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
@@ -28,6 +28,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.Button
+import android.widget.LinearLayout
 import android.widget.RadioButton
 import android.widget.RadioGroup
 import android.widget.SeekBar
@@ -164,11 +165,11 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
             enableSearchControls()
         }
         binding.fuzzySearch.setOnClickListener {
-            CommonUtils.settings.setBoolean("search_fuzzy", binding.fuzzySearch.isChecked)
+            if (binding.fuzzySearch.isChecked) binding.proximitySearch.isChecked = false
             enableSearchControls()
         }
         binding.proximitySearch.setOnClickListener {
-            CommonUtils.settings.setBoolean("search_proximity", binding.proximitySearch.isChecked)
+            if (binding.proximitySearch.isChecked) binding.fuzzySearch.isChecked = false
             enableSearchControls()
         }
         binding.proximityButtonAdd.setOnClickListener {proximitySearchWordsSelection = binding.proximtyWordNumber.text.toString().toInt() + 1}
@@ -215,6 +216,7 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         wordsRadioGroup.setOnCheckedChangeListener { group, checkedId ->
             wordsRadioSelection = checkedId
             CommonUtils.settings.setInt("search_words_group_prompt", checkedId)
+            enableSearchControls()
         }
         if (extras != null) {
             val wordsSelection = extras.getInt(WORDS_SELECTION_SAVE, -1)
@@ -255,8 +257,24 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
     }
 
     fun enableSearchControls() {
-        binding.fuzzySearch.isEnabled = !binding.includeAllEndings.isChecked
-        binding.fuzzySearchAccuracy.isEnabled = (!binding.includeAllEndings.isChecked && binding.fuzzySearch.isChecked)
+        
+        CommonUtils.settings.setBoolean("search_fuzzy", binding.fuzzySearch.isChecked)
+        CommonUtils.settings.setBoolean("search_proximity", binding.proximitySearch.isChecked)
+
+        enableLayout(binding.fuzzySearchLayout, binding.allWords.id == wordsRadioSelection)
+        enableLayout(binding.fuzzySearchDetailsLayout, binding.fuzzySearch.isChecked && binding.fuzzySearch.isEnabled)
+
+        enableLayout(binding.proximityLayout, (!binding.includeAllEndings.isChecked && binding.allWords.id == wordsRadioSelection))
+        enableLayout(binding.proximityDetailsLayout, binding.proximitySearch.isChecked && binding.proximitySearch.isEnabled)
+    }
+
+    fun enableLayout(layout: LinearLayout, isEnabled: Boolean) {
+        for (i in 0 until layout.childCount) {
+            val view: View = layout.getChildAt(i)
+            if (view is LinearLayout) {enableLayout(view,isEnabled)}
+            view.isEnabled = isEnabled
+        }
+        layout.isEnabled = isEnabled
 
     }
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -316,8 +334,8 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
     }
 
     private fun decorateSearchString(searchString: String): String {
-        val fuzzyAccuracy = if (binding.fuzzySearch.isChecked) fuzzySearchAccuracySelection.toDouble()/10 else null
-        val proximityWords = if (binding.proximitySearch.isChecked) proximitySearchWordsSelection else null
+        val fuzzyAccuracy = if (binding.fuzzySearch.isChecked && binding.fuzzySearch.isEnabled) fuzzySearchAccuracySelection.toDouble()/10 else null
+        val proximityWords = if (binding.proximitySearch.isChecked && binding.proximitySearch.isEnabled) proximitySearchWordsSelection else null
         return searchControl.decorateSearchString(searchString, searchType, bibleSection, currentBookName, binding.includeAllEndings.isChecked, fuzzyAccuracy, proximityWords)
     }
 
diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml
index 90a1994fac..e09cc24cbb 100644
--- a/app/src/main/res/layout/search.xml
+++ b/app/src/main/res/layout/search.xml
@@ -143,6 +143,7 @@
 				android:layout_height="match_parent"
 				>
 				<LinearLayout
+					android:id="@+id/fuzzySearchLayout"
 					android:layout_width="match_parent"
 					android:layout_height="match_parent"
 					android:layout_weight="1"
@@ -158,6 +159,7 @@
 						android:visibility="visible" />
 
 					<LinearLayout
+						android:id="@+id/fuzzySearchDetailsLayout"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
 						android:layout_weight="1"
@@ -186,6 +188,7 @@
 				</LinearLayout>
 
 				<LinearLayout
+					android:id="@+id/proximityLayout"
 					android:layout_width="match_parent"
 					android:layout_height="80dp"
 					android:layout_weight="1"
@@ -202,6 +205,7 @@
 						android:visibility="visible" />
 
 					<LinearLayout
+						android:id="@+id/proximityDetailsLayout"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
 						android:layout_weight="1"

From c799b523adb7f3a5c9b3e975012fe8818055ca97 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 1 Jan 2022 21:04:43 +1000
Subject: [PATCH 06/37] Rearranged the form and added Strongs search option

---
 .../android/control/search/SearchControl.kt   |  25 +-
 .../android/view/activity/search/Search.kt    | 182 +++++++----
 .../bible/service/history/KeyHistoryItem.kt   |   2 +-
 app/src/main/res/layout/search.xml            | 298 ++++++++++++------
 app/src/main/res/values/strings.xml           |   8 +-
 5 files changed, 341 insertions(+), 174 deletions(-)

diff --git a/app/src/main/java/net/bible/android/control/search/SearchControl.kt b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
index cf249ab8fa..225f5b8b24 100644
--- a/app/src/main/java/net/bible/android/control/search/SearchControl.kt
+++ b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
@@ -100,28 +100,31 @@ class SearchControl @Inject constructor(
         }
 
     fun decorateSearchString(searchString: String, searchType: SearchType, bibleSection: SearchBibleSection, currentBookName: String?,
-                             includeAllEndings: Boolean=false, fuzzySearchAccuracy: Double? = null, proximityWords: Int? = null): String {
+                             includeAllEndings: Boolean=false, fuzzySearchAccuracy: Double? = null, proximityWords: Int? = null,
+                             strongs: Char? = null): String {
         var cleanSearchString = cleanSearchString(searchString)
         var decorated: String
 
-        if (includeAllEndings) {
+        if (includeAllEndings || strongs != null || fuzzySearchAccuracy != null) {
             var newSearchString =""
             val wordArray: List<String> = cleanSearchString.split(" ")
-            wordArray.forEach {newSearchString += it + "* "}
-            cleanSearchString = newSearchString.trim()
-        }
-
-        if (!includeAllEndings && fuzzySearchAccuracy != null) {
-            var newSearchString =""
-            val wordArray: List<String> = cleanSearchString.split(" ")
-            var fuzzySearchAccuracyAdjusted = if (fuzzySearchAccuracy.equals(1.0)) 0.99 else fuzzySearchAccuracy
-            wordArray.forEach {newSearchString += it + "~%.2f ".format(fuzzySearchAccuracyAdjusted)}
+            wordArray.forEach {
+                var decoratedWord = it
+                if (includeAllEndings) decoratedWord += "* "
+                if (strongs != null) decoratedWord = "strong:$strongs$decoratedWord "
+                if (fuzzySearchAccuracy != null) {
+                    val fuzzySearchAccuracyAdjusted = if (fuzzySearchAccuracy.equals(1.0)) 0.99 else fuzzySearchAccuracy
+                    decoratedWord += "~%.2f ".format(fuzzySearchAccuracyAdjusted)
+                }
+                newSearchString += decoratedWord
+            }
             cleanSearchString = newSearchString.trim()
         }
 
         if (proximityWords != null) {
             cleanSearchString = "\"" + cleanSearchString + "\"~" + proximityWords
         }
+
         // add search type (all/any/phrase) to search string
         decorated = searchType.decorate(cleanSearchString)
 
diff --git a/app/src/main/java/net/bible/android/view/activity/search/Search.kt b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
index 4bd71a9ce2..8acd37305d 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/Search.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
@@ -27,12 +27,10 @@ import android.util.Log
 import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
-import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.RadioButton
 import android.widget.RadioGroup
 import android.widget.SeekBar
-import androidx.core.widget.doOnTextChanged
 
 import net.bible.android.activity.R
 import net.bible.android.activity.databinding.SearchBinding
@@ -69,25 +67,28 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
 
     /** get all, any, phrase query limitation
      */
+
     private var fuzzySearchAccuracySelection: Int = 5
-        get() {
-            return field
-        }
         set(value) {
-            CommonUtils.settings.setInt("search_fuzzy_accuracy", value)
             binding.fuzzySearch.text = getString(R.string.search_fuzzy, "(~" + (value * 10).toString() + "%)")
             binding.fuzzySearchAccuracy.setProgress(value)
+            binding.decoratedSearchString.text = decorateSearchString(binding.searchText.text.toString())
             field = value
         }
 
+    // I don't know how to do this properly. I want to update the value of proximityWordNumber whenever it is needed (buttons, text, initialising)
+    // But part of the update is to set the text value itself. But this gets into an infinite loop of course when called when the text value is updated.
+    // So i have broken it into two parts. One updates everything and one does not update the text field.
     private var proximitySearchWordsSelection: Int = 10
-        get() {
-            return field
+        set(value) {
+            binding.proximityWordNumber.setText(value.toString())
+            proximitySearchWordsSelectionFinal = value
+            binding.decoratedSearchString.text = decorateSearchString(binding.searchText.text.toString())
+            field = value
         }
+    private var proximitySearchWordsSelectionFinal: Int = 10
         set(value) {
-            CommonUtils.settings.setInt("search_proximity_words", value)
-//            binding.proximityWordsLabel.text = getString(R.string.proximity, "(" + (value).toString() + ")")
-            binding.proximtyWordNumber.setText(value.toString())
+            binding.proximitySearch.text = getString(R.string.search_proximity, "(${value.toString()} ${getString(R.string.words)})")
             field = value
         }
 
@@ -103,7 +104,6 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
                 }
             }
         }
-
     /** get OT, NT, or all query limitation
      *
      * @return
@@ -132,11 +132,19 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         CommonUtils.settings.setLong("search-last-used", System.currentTimeMillis())
         buildActivityComponent().inject(this)
 
+        // set text for current bible book on appropriate radio button
+        val currentBookRadioButton = findViewById<View>(R.id.searchCurrentBook) as RadioButton
+
+        // set current book to default and allow override if saved - implies returning via Back button
+        currentBookName = searchControl.currentBookName
+
         if (!searchControl.validateIndex(documentToSearch)) {
             Dialogs.instance.showErrorMsg(R.string.error_occurred) { finish() }
         }
 
         title = getString(R.string.search_in, documentToSearch!!.abbreviation)
+
+        // Add all listeners
         binding.searchText.setOnEditorActionListener {v, actionId, event ->
             return@setOnEditorActionListener when (actionId) {
                 EditorInfo.IME_ACTION_SEARCH -> {
@@ -145,36 +153,45 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
                 }
                 else -> false
         }}
-
-        binding.submit.setOnClickListener { onSearch() }
-        //searchText.setOnKeyListener(OnKeyListener { v, keyCode, event ->
-        //    // If the event is a key-down event on the "enter" button
-        //    if (event.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER) {
-        //        // Perform action on key press
-        //        onSearch(null)
-        //        return@OnKeyListener true
-        //    }
-        //    false
-        //})
-
-        binding.rememberSearchText.setOnClickListener {
-            CommonUtils.settings.setBoolean("search_remember_search_text", binding.rememberSearchText.isChecked)
+        binding.searchText.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {}
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                binding.decoratedSearchString.text = decorateSearchString(binding.searchText.text.toString())
+            }
+        })
+        val sectionRadioGroup = findViewById<View>(R.id.bibleSectionGroup) as RadioGroup
+        sectionRadioGroup.setOnCheckedChangeListener { group, checkedId ->
+            sectionRadioSelection = checkedId
+            CommonUtils.settings.setInt("search_bible_section_group_prompt", checkedId)
+            enableSearchControls()
+        }
+        val wordsRadioGroup = findViewById<View>(R.id.wordsGroup) as RadioGroup
+        wordsRadioGroup.setOnCheckedChangeListener { group, checkedId ->
+            wordsRadioSelection = checkedId
+            CommonUtils.settings.setInt("search_words_group_prompt", checkedId)
+            enableSearchControls()
         }
         binding.includeAllEndings.setOnClickListener {
             CommonUtils.settings.setBoolean("search_include_all_endings", binding.includeAllEndings.isChecked)
+            if (binding.includeAllEndings.isChecked) {
+                binding.proximitySearch.isChecked = false
+                binding.strongsSearch.isChecked = false
+                binding.fuzzySearch.isChecked = false
+            }
             enableSearchControls()
         }
-        binding.fuzzySearch.setOnClickListener {
-            if (binding.fuzzySearch.isChecked) binding.proximitySearch.isChecked = false
-            enableSearchControls()
+        binding.rememberSearchText.setOnClickListener {
+            CommonUtils.settings.setBoolean("search_remember_search_text", binding.rememberSearchText.isChecked)
         }
-        binding.proximitySearch.setOnClickListener {
-            if (binding.proximitySearch.isChecked) binding.fuzzySearch.isChecked = false
+        binding.fuzzySearch.setOnClickListener {
+            if (binding.fuzzySearch.isChecked) {
+                binding.proximitySearch.isChecked = false
+                binding.strongsSearch.isChecked = false
+                binding.includeAllEndings.isChecked = false
+            }
             enableSearchControls()
         }
-        binding.proximityButtonAdd.setOnClickListener {proximitySearchWordsSelection = binding.proximtyWordNumber.text.toString().toInt() + 1}
-        binding.proximityButtonSubtract.setOnClickListener {proximitySearchWordsSelection = binding.proximtyWordNumber.text.toString().toInt() - 1}
-
         binding.fuzzySearchAccuracy.setOnSeekBarChangeListener(object: SeekBar.OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
                 fuzzySearchAccuracySelection = progress
@@ -183,6 +200,54 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
             override fun onStopTrackingTouch(seekBar: SeekBar?) {}
         })
 
+        binding.proximitySearch.setOnClickListener {
+            if (binding.proximitySearch.isChecked) {
+                binding.fuzzySearch.isChecked = false
+                binding.strongsSearch.isChecked = false
+                binding.includeAllEndings.isChecked = false
+            }
+            enableSearchControls()
+        }
+        binding.proximityButtonAdd.setOnClickListener {proximitySearchWordsSelection = binding.proximityWordNumber.text.toString().toInt() + 1}
+        binding.proximityButtonSubtract.setOnClickListener {proximitySearchWordsSelection = binding.proximityWordNumber.text.toString().toInt() - 1}
+        binding.proximityWordNumber.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {}
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {proximitySearchWordsSelectionFinal = s.toString().toInt()}
+        })
+
+        binding.strongsSearch.setOnClickListener {
+            if (binding.strongsSearch.isChecked) {
+                binding.includeAllEndings.isChecked = false
+                binding.fuzzySearch.isChecked = false
+                binding.proximitySearch.isChecked = false
+            }
+            enableSearchControls()
+        }
+        binding.greekOrHebrewGroup.setOnCheckedChangeListener { group, checkedId ->
+            CommonUtils.settings.setInt("search_greek_or_hebrew", checkedId)
+            enableSearchControls()
+        }
+        binding.decoratedTextShow.setOnCheckedChangeListener { group, checkedId ->
+            // I would like to show the actual text that is being used for the search somewhere.
+            // I think it would be good to show it on the list screen. Could also show it here.
+
+            CommonUtils.settings.setBoolean("search_show_decorated_text", checkedId)
+            enableSearchControls()
+        }
+
+        binding.submit.setOnClickListener { onSearch() }
+        //searchText.setOnKeyListener(OnKeyListener { v, keyCode, event ->
+        //    // If the event is a key-down event on the "enter" button
+        //    if (event.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER) {
+        //        // Perform action on key press
+        //        onSearch(null)
+        //        return@OnKeyListener true
+        //    }
+        //    false
+        //})
+
+        // Initialise controls
         binding.includeAllEndings.isChecked = CommonUtils.settings.getBoolean("search_include_all_endings", false)
         binding.rememberSearchText.isChecked = CommonUtils.settings.getBoolean("search_remember_search_text", false)
 
@@ -195,11 +260,13 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         binding.bibleSectionGroup.check(CommonUtils.settings.getInt("search_bible_section_group_prompt", 0))
         sectionRadioSelection = binding.bibleSectionGroup.checkedRadioButtonId
 
-        // SeekBar Range
-
         binding.fuzzySearch.isChecked = CommonUtils.settings.getBoolean("search_fuzzy", false)
         fuzzySearchAccuracySelection = CommonUtils.settings.getInt("search_fuzzy_accuracy", 5)
 
+        binding.strongsSearch.isChecked = CommonUtils.settings.getBoolean("search_strongs",false)
+        binding.greekOrHebrewGroup.check(CommonUtils.settings.getInt("search_greek_or_hebrew",0))
+
+        binding.decoratedTextShow.isChecked = CommonUtils.settings.getBoolean("search_show_decorated_text",false)
 
         // pre-load search string if passed in
         val extras = intent.extras
@@ -212,12 +279,6 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
             if (binding.rememberSearchText.isChecked) binding.searchText.setText(CommonUtils.settings.getString("search_text", ""))
         }
 
-       val wordsRadioGroup = findViewById<View>(R.id.wordsGroup) as RadioGroup
-        wordsRadioGroup.setOnCheckedChangeListener { group, checkedId ->
-            wordsRadioSelection = checkedId
-            CommonUtils.settings.setInt("search_words_group_prompt", checkedId)
-            enableSearchControls()
-        }
         if (extras != null) {
             val wordsSelection = extras.getInt(WORDS_SELECTION_SAVE, -1)
             if (wordsSelection != -1) {
@@ -225,11 +286,6 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
             }
         }
 
-        val sectionRadioGroup = findViewById<View>(R.id.bibleSectionGroup) as RadioGroup
-        sectionRadioGroup.setOnCheckedChangeListener { group, checkedId ->
-            sectionRadioSelection = checkedId
-            CommonUtils.settings.setInt("search_bible_section_group_prompt", checkedId)
-        }
         if (extras != null) {
             val sectionSelection = extras.getInt(SECTION_SELECTION_SAVE, -1)
             if (sectionSelection != -1) {
@@ -237,11 +293,6 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
             }
         }
 
-        // set text for current bible book on appropriate radio button
-        val currentBookRadioButton = findViewById<View>(R.id.searchCurrentBook) as RadioButton
-
-        // set current book to default and allow override if saved - implies returning via Back button
-        currentBookName = searchControl.currentBookName
         if (extras != null) {
             val currentBibleBookSaved = extras.getString(CURRENT_BIBLE_BOOK_SAVE)
             if (currentBibleBookSaved != null) {
@@ -258,14 +309,21 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
 
     fun enableSearchControls() {
         
-        CommonUtils.settings.setBoolean("search_fuzzy", binding.fuzzySearch.isChecked)
-        CommonUtils.settings.setBoolean("search_proximity", binding.proximitySearch.isChecked)
+        // Set control visibility
+        binding.fuzzySearchDetailsLayout.visibility = if (binding.fuzzySearch.isChecked) View.VISIBLE else View.GONE
+        binding.proximityDetailsLayout.visibility = if (binding.proximitySearch.isChecked) View.VISIBLE else View.GONE
+        binding.strongsDetailLayout.visibility = if (binding.strongsSearch.isChecked) View.VISIBLE else View.GONE
+        binding.decoratedSearchDetailLayout.visibility = if (binding.decoratedTextShow.isChecked) View.VISIBLE else View.GONE
 
         enableLayout(binding.fuzzySearchLayout, binding.allWords.id == wordsRadioSelection)
         enableLayout(binding.fuzzySearchDetailsLayout, binding.fuzzySearch.isChecked && binding.fuzzySearch.isEnabled)
 
-        enableLayout(binding.proximityLayout, (!binding.includeAllEndings.isChecked && binding.allWords.id == wordsRadioSelection))
-        enableLayout(binding.proximityDetailsLayout, binding.proximitySearch.isChecked && binding.proximitySearch.isEnabled)
+        enableLayout(binding.strongsDetailLayout, (binding.strongsSearch.isChecked && binding.strongsSearch.isEnabled))
+
+        binding.searchOldTestament.isEnabled = !binding.strongsSearch.isChecked || (binding.strongsSearch.isEnabled && binding.strongsSearch.isChecked && binding.searchHebrew.isChecked)
+        binding.searchNewTestament.isEnabled = !binding.strongsSearch.isChecked || (binding.strongsSearch.isEnabled && binding.strongsSearch.isChecked && binding.searchGreek.isChecked)
+
+        binding.decoratedSearchString.text = decorateSearchString(binding.searchText.text.toString())
     }
 
     fun enableLayout(layout: LinearLayout, isEnabled: Boolean) {
@@ -309,6 +367,12 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
         if (!StringUtils.isEmpty(text)) {
 
             CommonUtils.settings.setString("search_text", text)
+            CommonUtils.settings.setBoolean("search_fuzzy", binding.fuzzySearch.isChecked)
+            CommonUtils.settings.setInt("search_fuzzy_accuracy", fuzzySearchAccuracySelection)
+            CommonUtils.settings.setBoolean("search_proximity", binding.proximitySearch.isChecked)
+            CommonUtils.settings.setInt("search_proximity_words", proximitySearchWordsSelectionFinal)
+            CommonUtils.settings.setBoolean("search_strongs", binding.strongsSearch.isChecked)
+
             // update current intent so search is restored if we return here via history/back
             // the current intent is saved by HistoryManager
             intent.putExtra(SEARCH_TEXT_SAVE, text)
@@ -335,8 +399,10 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
 
     private fun decorateSearchString(searchString: String): String {
         val fuzzyAccuracy = if (binding.fuzzySearch.isChecked && binding.fuzzySearch.isEnabled) fuzzySearchAccuracySelection.toDouble()/10 else null
-        val proximityWords = if (binding.proximitySearch.isChecked && binding.proximitySearch.isEnabled) proximitySearchWordsSelection else null
-        return searchControl.decorateSearchString(searchString, searchType, bibleSection, currentBookName, binding.includeAllEndings.isChecked, fuzzyAccuracy, proximityWords)
+        val proximityWords = if (binding.proximitySearch.isChecked && binding.proximitySearch.isEnabled) proximitySearchWordsSelectionFinal else null
+        val strongs = if (binding.strongsSearch.isChecked && binding.strongsSearch.isEnabled) {if (binding.searchGreek.isChecked) 'G' else 'H'} else null
+
+        return searchControl.decorateSearchString(searchString, searchType, bibleSection, currentBookName, binding.includeAllEndings.isChecked, fuzzyAccuracy, proximityWords, strongs)
     }
 
     companion object {
diff --git a/app/src/main/java/net/bible/service/history/KeyHistoryItem.kt b/app/src/main/java/net/bible/service/history/KeyHistoryItem.kt
index 79a1f7ff1f..8f9527c15e 100644
--- a/app/src/main/java/net/bible/service/history/KeyHistoryItem.kt
+++ b/app/src/main/java/net/bible/service/history/KeyHistoryItem.kt
@@ -45,7 +45,7 @@ class KeyHistoryItem(
             val desc = StringBuilder()
             try {
                 val verseDesc = CommonUtils.getKeyDescription(key)
-                desc.append(verseDesc).append(" ").append(document.abbreviation)
+                 desc.append(verseDesc).append(" ").append(document.abbreviation)
             } catch (e: Exception) {
                 Log.e(TAG, "Error getting description", e)
             }
diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml
index e09cc24cbb..213c2a2e75 100644
--- a/app/src/main/res/layout/search.xml
+++ b/app/src/main/res/layout/search.xml
@@ -27,133 +27,73 @@
 		>
 
 		<LinearLayout android:id="@+id/rowAreaContainer"
-			android:orientation="vertical"
+			android:orientation="horizontal"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
+			android:layout_height="wrap_content"
+			android:layout_weight="1">
 
-			<LinearLayout android:id="@+id/centreAreaContainer"
-				android:orientation="horizontal"
+			<LinearLayout
+				android:id="@+id/column1Layout"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
+				android:orientation="vertical"
+				android:layout_weight="1"
 				>
 
-				<RadioGroup android:id="@+id/bibleSectionGroup"
+				<RadioGroup
+					android:id="@+id/bibleSectionGroup"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_width="0dip"
 					android:layout_weight="1"
 					android:padding="5dip">
 
-					<TextView android:id="@+id/sectionGroupPrompt"
-						android:text="@string/search_bible_section_group_prompt"
-						android:layout_height="wrap_content"
-						android:layout_width="wrap_content"/>
-					<RadioButton android:id="@+id/searchAllBible"
-						android:text="@string/search_all_bible"
+					<TextView
+						android:id="@+id/sectionGroupPrompt"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_marginLeft="15dip"
-						android:checked="true"/>
-					<RadioButton android:id="@+id/searchOldTestament"
-						android:text="@string/search_old_testament"
-						android:layout_width="wrap_content"
-						android:layout_marginLeft="15dip"
-						android:layout_height="wrap_content"/>
-					<RadioButton android:id="@+id/searchNewTestament"
-						android:text="@string/search_new_testament"
-						android:layout_width="wrap_content"
-						android:layout_marginLeft="15dip"
-						android:layout_height="wrap_content"/>
+						android:text="@string/search_bible_section_group_prompt" />
 
 					<RadioButton
-						android:id="@+id/searchCurrentBook"
+						android:id="@+id/searchAllBible"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_marginLeft="15dip"
-						android:text="@string/search_current_book" />
-				</RadioGroup>
+						android:checked="true"
+						android:text="@string/search_all_bible" />
 
-				<RadioGroup android:id="@+id/wordsGroup"
-					android:layout_height="wrap_content"
-					android:layout_width="0dip"
-					android:layout_weight="1"
-					android:padding="5dip">
-
-					<TextView
-						android:text="@string/search_words_group_prompt"
-						android:layout_height="wrap_content"
-						android:layout_width="wrap_content"/>
-					<RadioButton android:id="@+id/allWords"
+					<RadioButton
+						android:id="@+id/searchOldTestament"
 						android:layout_width="wrap_content"
-						android:text="@string/search_all_words"
 						android:layout_height="wrap_content"
 						android:layout_marginLeft="15dip"
-						android:checked="true"/>
-					<RadioButton android:id="@+id/anyWord"
-						android:layout_width="wrap_content"
-						android:text="@string/search_any_word"
-						android:layout_marginLeft="15dip"
-						android:layout_height="wrap_content"/>
-					<RadioButton android:id="@+id/phrase"
-						android:layout_width="wrap_content"
-						android:text="@string/search_phrase"
-						android:layout_marginLeft="15dip"
-						android:layout_height="wrap_content"/>
-				</RadioGroup>
-			</LinearLayout>
-			<LinearLayout
-				android:id="@+id/centreAreaContainer1"
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				>
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_weight="1">
+						android:text="@string/search_old_testament" />
 
-					<CheckBox
-						android:id="@+id/includeAllEndings"
-						android:layout_width="match_parent"
+					<RadioButton
+						android:id="@+id/searchNewTestament"
+						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_weight="0.1"
-						android:text="@string/search_include_all_endings"
-						android:visibility="visible" />
-				</LinearLayout>
-
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_weight="1">
+						android:layout_marginLeft="15dip"
+						android:text="@string/search_new_testament" />
 
-					<CheckBox
-						android:id="@+id/rememberSearchText"
+					<RadioButton
+						android:id="@+id/searchCurrentBook"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:text="@string/search_remember_search_text" />
-
-				</LinearLayout>
+						android:layout_marginLeft="15dip"
+						android:text="@string/search_current_book" />
+				</RadioGroup>
 
-			</LinearLayout>
-			<!-- horizontal container to force each pair of controls to use half of screen each -->
-			<LinearLayout
-				android:id="@+id/centreAreaContainer3"
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				>
 				<LinearLayout
 					android:id="@+id/fuzzySearchLayout"
 					android:layout_width="match_parent"
 					android:layout_height="match_parent"
 					android:layout_weight="1"
-					android:paddingTop="5dip"
 					android:orientation="vertical">
 
 					<CheckBox
 						android:id="@+id/fuzzySearch"
 						android:layout_width="match_parent"
-						android:layout_height="60dip"
+						android:layout_height="wrap_content"
 						android:layout_weight="1"
 						android:text="@string/search_fuzzy"
 						android:visibility="visible" />
@@ -161,10 +101,11 @@
 					<LinearLayout
 						android:id="@+id/fuzzySearchDetailsLayout"
 						android:layout_width="match_parent"
-						android:layout_height="match_parent"
+						android:layout_height="wrap_content"
 						android:layout_weight="1"
 						android:orientation="horizontal"
-						android:paddingTop="17dip">
+						android:visibility="visible"
+						android:paddingTop="0dip">
 
 						<TextView
 							android:id="@+id/editTextTextPersonName"
@@ -190,26 +131,25 @@
 				<LinearLayout
 					android:id="@+id/proximityLayout"
 					android:layout_width="match_parent"
-					android:layout_height="80dp"
+					android:layout_height="match_parent"
 					android:layout_weight="1"
-					android:orientation="vertical"
-					android:paddingTop="5dip">
+					android:orientation="vertical">
 
 					<CheckBox
 						android:id="@+id/proximitySearch"
 						android:layout_width="match_parent"
-						android:layout_height="60dip"
-						android:layout_marginBottom="0dip"
+						android:layout_height="wrap_content"
 						android:layout_weight="1"
-						android:text="@string/proximity"
+						android:text="@string/search_proximity"
 						android:visibility="visible" />
 
 					<LinearLayout
 						android:id="@+id/proximityDetailsLayout"
 						android:layout_width="match_parent"
-						android:layout_height="match_parent"
+						android:layout_height="wrap_content"
 						android:layout_weight="1"
-						android:orientation="horizontal">
+						android:orientation="horizontal"
+						android:visibility="visible">
 
 						<TextView
 							android:id="@+id/proximityWordsLabel"
@@ -229,11 +169,10 @@
 							android:text="-" />
 
 						<EditText
-							android:id="@+id/proximtyWordNumber"
+							android:id="@+id/proximityWordNumber"
 							android:layout_width="170dp"
 							android:layout_height="wrap_content"
 							android:layout_weight="99"
-							android:ems="10"
 							android:gravity="center_horizontal|center_vertical"
 							android:inputType="number"
 							android:numeric="integer" />
@@ -244,14 +183,169 @@
 							android:layout_height="35dp"
 							android:layout_weight="1"
 							android:text="+" />
+					</LinearLayout>
+
+				</LinearLayout>
+				<LinearLayout
+					android:id="@+id/strongsLayout"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_weight="1"
+					android:orientation="vertical">
+
+					<CheckBox
+						android:id="@+id/strongsSearch"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:text="@string/search_strongs"
+						android:visibility="visible" />
 
+					<LinearLayout
+						android:id="@+id/strongsDetailLayout"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:visibility="visible"
+						android:orientation="horizontal">
+
+						<RadioGroup
+							android:id="@+id/greekOrHebrewGroup"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_weight="1">
+
+
+							<RadioButton
+								android:id="@+id/searchHebrew"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_marginLeft="15dip"
+								android:checked="true"
+								android:layout_weight="1"
+								android:text="@string/hebrew" />
+
+							<RadioButton
+								android:id="@+id/searchGreek"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_marginLeft="15dip"
+								android:layout_weight="1"
+								android:text="@string/greek" />
+
+						</RadioGroup>
+					</LinearLayout>
+				</LinearLayout>
+
+
+			</LinearLayout>
+
+			<LinearLayout android:id="@+id/column2Layout"
+				android:orientation="vertical"
+				android:layout_width="match_parent"
+				android:layout_weight="1"
+				android:layout_height="wrap_content">
+
+				<RadioGroup android:id="@+id/wordsGroup"
+					android:layout_height="wrap_content"
+					android:layout_width="match_parent"
+					android:layout_weight="1"
+					android:padding="5dip">
+
+					<TextView
+						android:text="@string/search_words_group_prompt"
+						android:layout_height="wrap_content"
+						android:layout_width="wrap_content"/>
+					<RadioButton android:id="@+id/allWords"
+						android:layout_width="wrap_content"
+						android:text="@string/search_all_words"
+						android:layout_height="wrap_content"
+						android:layout_marginLeft="15dip"
+						android:checked="true"/>
+					<RadioButton android:id="@+id/anyWord"
+						android:layout_width="wrap_content"
+						android:text="@string/search_any_word"
+						android:layout_marginLeft="15dip"
+						android:layout_height="wrap_content"/>
+					<RadioButton android:id="@+id/phrase"
+						android:layout_width="wrap_content"
+						android:text="@string/search_phrase"
+						android:layout_marginLeft="15dip"
+						android:layout_height="wrap_content"/>
+					<RadioButton android:id="@+id/placeholder1"
+						android:layout_width="wrap_content"
+						android:text="@string/search_phrase"
+						android:layout_marginLeft="15dip"
+						android:visibility="invisible"
+						android:layout_height="wrap_content"/>
+				</RadioGroup>
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_weight="1">
+
+					<CheckBox
+						android:id="@+id/includeAllEndings"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="0.1"
+						android:text="@string/search_include_all_endings"
+						android:visibility="visible" />
+				</LinearLayout>
 
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_weight="1">
+
+					<CheckBox
+						android:id="@+id/rememberSearchText"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:text="@string/search_remember_search_text" />
+
+				</LinearLayout>
+
+				<LinearLayout
+					android:id="@+id/decoratedSearchLayout"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:orientation="vertical"
+					android:visibility="visible">
+
+					<CheckBox
+						android:id="@+id/decoratedTextShow"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:text="@string/search_showDecoratedText"
+						android:visibility="visible" />
+
+					<LinearLayout
+
+						android:id="@+id/decoratedSearchDetailLayout"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:orientation="horizontal"
+						android:visibility="visible">
+
+						<TextView
+							android:id="@+id/decoratedSearchString"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_marginLeft="20dp"
+							android:text="decorated search text" />
 					</LinearLayout>
 				</LinearLayout>
 
+
 			</LinearLayout>
 
 		</LinearLayout>
+
 	</ScrollView>
 
 	<Button
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 07fae9d371..b288d21586 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -69,9 +69,13 @@
     <string name="search_remember_search_text">Remember search</string>
     <string name="search_include_all_endings">All endings</string>
     <string name="search_fuzzy">Fuzzy Search %s</string>
-    <string name="proximity">Proximity</string>
-    <string name="words">Words</string>
+    <string name="search_strongs">Strongs Number Search</string>
+    <string name="search_showDecoratedText">Show raw search text</string>
+    <string name="search_proximity">Proximity %s</string>
+    <string name="words">words</string>
     <string name="accuracy">Accuracy</string>
+    <string name="greek">Greek</string>
+    <string name="hebrew">Hebrew</string>
 
     <!-- Preferences -->
     <string name="prefs_show_verseno_title">Chapter &amp; verse numbers</string>

From 429825f423bec7907485604c2874f232c154987f Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Mon, 10 Jan 2022 20:26:57 +1000
Subject: [PATCH 07/37] Initial

---
 app/src/main/AndroidManifest.xml              |   5 +
 .../view/activity/ActivityComponent.kt        |   2 +
 .../view/activity/search/MySearchResults.kt   | 270 ++++++++++++++++++
 .../android/view/activity/search/Search.kt    |   3 +-
 .../activity/search/SearchResultsAdapter.java | 248 ++++++++++++++++
 .../activity/search/SearchResultsFragments.kt | 223 +++++++++++++++
 .../layout/search_results_layout_activity.xml |  29 ++
 .../res/layout/search_results_list_row.xml    |  50 ++++
 .../res/layout/search_results_simple_list.xml |  11 +
 .../search_results_statistics_fragment.xml    |  14 +
 .../layout/search_results_verse_fragment.xml  |  26 ++
 app/src/main/res/values/strings.xml           |   4 +
 12 files changed, 884 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
 create mode 100644 app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
 create mode 100644 app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
 create mode 100644 app/src/main/res/layout/search_results_layout_activity.xml
 create mode 100644 app/src/main/res/layout/search_results_list_row.xml
 create mode 100644 app/src/main/res/layout/search_results_simple_list.xml
 create mode 100644 app/src/main/res/layout/search_results_statistics_fragment.xml
 create mode 100644 app/src/main/res/layout/search_results_verse_fragment.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 11e7f34a76..729d82e6e2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -97,6 +97,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize|locale"
             android:label="@string/search"
             />
+        <activity
+            android:name="net.bible.android.view.activity.search.MySearchResults"
+            android:configChanges="keyboardHidden|orientation|screenSize|locale"
+            android:label="@string/search"
+            />
         <activity
             android:name="net.bible.android.view.activity.search.SearchIndex"
             android:configChanges="keyboardHidden|orientation|screenSize|locale"
diff --git a/app/src/main/java/net/bible/android/view/activity/ActivityComponent.kt b/app/src/main/java/net/bible/android/view/activity/ActivityComponent.kt
index 4da989b3c2..1a01340487 100644
--- a/app/src/main/java/net/bible/android/view/activity/ActivityComponent.kt
+++ b/app/src/main/java/net/bible/android/view/activity/ActivityComponent.kt
@@ -34,6 +34,7 @@ import net.bible.android.view.activity.page.Selection
 import net.bible.android.view.activity.readingplan.DailyReading
 import net.bible.android.view.activity.readingplan.DailyReadingList
 import net.bible.android.view.activity.readingplan.ReadingPlanSelectorList
+import net.bible.android.view.activity.search.MySearchResults
 import net.bible.android.view.activity.search.Search
 import net.bible.android.view.activity.search.SearchIndex
 import net.bible.android.view.activity.search.SearchIndexProgressStatus
@@ -94,6 +95,7 @@ interface ActivityComponent {
     fun inject(w: SpeakTransportWidget)
     fun inject(search: Search)
     fun inject(searchResults: SearchResults)
+    fun inject(mySearchResults: MySearchResults)
     fun inject(history: History)
 
     // Services
diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
new file mode 100644
index 0000000000..c436434129
--- /dev/null
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -0,0 +1,270 @@
+package net.bible.android.view.activity.search
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.os.Bundle
+import android.os.Parcel
+import android.os.Parcelable
+import android.util.Log
+import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.ListAdapter
+import android.widget.ListView
+import android.widget.Toast
+import com.google.android.material.tabs.TabLayout
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
+import androidx.viewpager.widget.ViewPager
+import androidx.appcompat.app.AppCompatActivity
+import ir.smartdevelop.eram.showcaseview.PlaceholderFragment
+import ir.smartdevelop.eram.showcaseview.SearchResultsFragment
+import ir.smartdevelop.eram.showcaseview.SearchStatisticsFragment
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import net.bible.android.activity.databinding.SearchResultsLayoutActivityBinding
+import java.util.ArrayList
+import net.bible.android.activity.R
+import net.bible.android.activity.databinding.ListBinding
+import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
+import net.bible.android.control.search.SearchControl
+import net.bible.android.control.search.SearchResultsDto
+import net.bible.android.view.activity.base.Dialogs
+import net.bible.android.view.activity.search.searchresultsactionbar.SearchResultsActionBarManager
+import net.bible.service.common.CommonUtils.buildActivityComponent
+import net.bible.service.sword.SwordContentFacade
+import org.apache.commons.lang3.StringUtils
+import org.crosswire.jsword.passage.Key
+import javax.inject.Inject
+
+private val TAB_TITLES = arrayOf(
+    R.string.results,
+    R.string.statistics
+)
+private val arrayList = ArrayList<SearchResultsData>()
+
+
+class SearchResultsData : Parcelable {
+    @JvmField
+    var id: Int?
+    @JvmField
+    var osisKey: String?
+    @JvmField
+    var reference: String?
+    @JvmField
+    var translation: String?
+    @JvmField
+    var verse: String?
+
+    constructor(Id: Int?, OsisKey: String?, Reference: String?, Translation: String?, Verse: String?) {
+        id = Id;
+        osisKey = OsisKey
+        reference = Reference
+        translation = Translation
+        verse = Verse
+    }
+
+    protected constructor(`in`: Parcel) {
+        id = `in`.readInt()
+        osisKey = `in`.readString()
+        reference = `in`.readString()
+        translation = `in`.readString()
+        verse = `in`.readString()
+    }
+
+    override fun describeContents(): Int {
+        return this.hashCode()
+    }
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(reference)
+        dest.writeString(translation)
+        dest.writeString(verse)
+    }
+
+    companion object CREATOR : Parcelable.Creator<SearchResultsData> {
+        override fun createFromParcel(parcel: Parcel): SearchResultsData {
+            return SearchResultsData(parcel)
+        }
+
+        override fun newArray(size: Int): Array<SearchResultsData?> {
+            return arrayOfNulls(size)
+        }
+    }
+}
+
+class MySearchResults : AppCompatActivity() {
+//    private lateinit var binding: ListBinding
+    private lateinit var binding: SearchResultsLayoutActivityBinding
+    private var mSearchResultsHolder: SearchResultsDto? = null
+    private var mCurrentlyDisplayedSearchResults: List<Key> = ArrayList()
+    private var mKeyArrayAdapter: ArrayAdapter<Key>? = null
+    private var isScriptureResultsCurrentlyShown = true
+    @Inject lateinit var searchResultsActionBarManager: SearchResultsActionBarManager
+    @Inject lateinit var searchControl: SearchControl
+    @Inject lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
+    /** Called when the activity is first created.  */
+    @SuppressLint("MissingSuperCall")
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+
+        super.onCreate(savedInstanceState)
+        Log.i(TAG, "Displaying Search results view")
+
+        binding = SearchResultsLayoutActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        buildActivityComponent().inject(this)
+
+        val bundle = Bundle()
+        bundle.putString("edttext", "From Activity")
+
+        val fragobj = SearchResultsFragment()
+        fragobj.setArguments(bundle)
+
+        val sectionsPagerAdapter = SearchResultsPagerAdapter(this, supportFragmentManager, searchControl)
+        val viewPager: ViewPager = binding.viewPager
+        viewPager.adapter = sectionsPagerAdapter
+        val tabs: TabLayout = binding.tabs
+        tabs.setupWithViewPager(viewPager)
+
+//        searchResultsActionBarManager.registerScriptureToggleClickListener(scriptureToggleClickListener)
+//        setActionBarManager(searchResultsActionBarManager)
+//        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        isScriptureResultsCurrentlyShown = searchControl.isCurrentlyShowingScripture
+//        binding.closeButton.setOnClickListener {
+//            finish()
+//        }
+//        GlobalScope.launch {
+//            prepareResults()
+//        }
+        prepareResults()
+
+    }
+
+    private fun prepareResults() {
+//        withContext(Dispatchers.Main) {
+//            binding.loadingIndicator.visibility = View.VISIBLE
+//            binding.empty.visibility = View.GONE
+//        }
+        if (fetchSearchResults()) { // initialise adapters before result population - easier when updating due to later Scripture toggle
+//            withContext(Dispatchers.Main) {
+//                mKeyArrayAdapter = SearchItemAdapter(this@MySearchResults, SearchResults.LIST_ITEM_TYPE, mCurrentlyDisplayedSearchResults, searchControl)
+//                listAdapter = mKeyArrayAdapter as ListAdapter
+                populateViewResultsAdapter()
+//            }
+        }
+//        withContext(Dispatchers.Main) {
+//            binding.loadingIndicator.visibility = View.GONE
+//            if(listAdapter?.isEmpty == true) {
+//                binding.empty.visibility = View.VISIBLE
+//            }
+//        }
+    }
+
+    private  fun fetchSearchResults(): Boolean {
+        Log.i(TAG, "Preparing search results")
+        var isOk: Boolean
+        try { // get search string - passed in using extras so extras cannot be null
+            val extras = intent.extras
+            val searchText = extras!!.getString(SearchControl.SEARCH_TEXT)
+            var searchDocument = extras.getString(SearchControl.SEARCH_DOCUMENT)
+            if (StringUtils.isEmpty(searchDocument)) {
+                searchDocument = activeWindowPageManagerProvider.activeWindowPageManager.currentPage.currentDocument!!.initials
+            }
+            mSearchResultsHolder = searchControl.getSearchResults(searchDocument, searchText)
+            // tell user how many results were returned
+            val msg: String
+            msg = if (mCurrentlyDisplayedSearchResults.size >= SearchControl.MAX_SEARCH_RESULTS) {
+                getString(R.string.search_showing_first, SearchControl.MAX_SEARCH_RESULTS)
+            } else {
+                getString(R.string.search_result_count, mSearchResultsHolder!!.size())
+            }
+//            withContext(Dispatchers.Main) {
+                Toast.makeText(this@MySearchResults, msg, Toast.LENGTH_SHORT).show()
+//            }
+            isOk = true
+        } catch (e: Exception) {
+            Log.e(TAG, "Error processing search query", e)
+            isOk = false
+            Dialogs.instance.showErrorMsg(R.string.error_executing_search) { onBackPressed() }
+        }
+        return isOk
+    }
+
+    /**
+     * Move search results into view Adapter
+     */
+    private fun populateViewResultsAdapter() {
+        mCurrentlyDisplayedSearchResults = if (isScriptureResultsCurrentlyShown) {
+            mSearchResultsHolder!!.mainSearchResults
+        } else {
+            mSearchResultsHolder!!.otherSearchResults
+        }
+        // addAll is only supported in Api 11+
+//        mKeyArrayAdapter!!.clear()
+//        for (key in mCurrentlyDisplayedSearchResults) {
+//            mKeyArrayAdapter!!.add(key)
+//        }
+
+        arrayList!!.clear()
+        for (key in mCurrentlyDisplayedSearchResults) {
+            var text = searchControl.getSearchResultVerseText(key)
+            arrayList.add(SearchResultsData(1,key.osisRef.toString() , key.osisID.toString(),"KJV",text))
+        }
+    }
+    companion object {
+        private const val TAG = " MySearchResults"
+        private const val LIST_ITEM_TYPE = android.R.layout.simple_list_item_2
+    }
+
+}
+
+//class SearchResultsListActivity : AppCompatActivity() {
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//
+//        val arrayList = ArrayList<SearchResultsData>()
+//        val customAdapter = SearchResultsAdapter(this, arrayList, searchControl)
+//        val list = findViewById<ListView>(R.id.list)
+//        list.adapter = customAdapter
+//    }
+//}
+
+class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManager, searchControl: SearchControl) :
+    FragmentPagerAdapter(fm) {
+    val searchControl = searchControl
+
+    override fun getItem(position: Int): Fragment {
+        // getItem is called to instantiate the fragment for the given page.
+        // Return a PlaceholderFragment (defined as a static inner class below).
+        var frag: Fragment
+        when (position) {
+            0 -> {
+                frag = SearchResultsFragment.newInstance(1)
+                val bundle = Bundle()
+                bundle.putString("edttext", "From Activity")
+                bundle.putParcelableArrayList("mylist", arrayList)
+//                val fragobj = SearchResultsFragment()
+                frag.setArguments(bundle)
+                frag.setEmployee(searchControl)
+
+            }
+            1-> frag = SearchStatisticsFragment.newInstance("a","b")
+            else -> frag = PlaceholderFragment.newInstance(1)
+        }
+
+        return frag
+    }
+
+    override fun getPageTitle(position: Int): CharSequence? {
+        return context.resources.getString(TAB_TITLES[position])
+    }
+
+    override fun getCount(): Int {
+        // Show 2 total pages.
+        return 2
+    }
+}
diff --git a/app/src/main/java/net/bible/android/view/activity/search/Search.kt b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
index 8acd37305d..4da1f87f3b 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/Search.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
@@ -385,7 +385,8 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
 
             // specify search string and doc in new Intent;
             // if doc is not specifed a, possibly invalid, doc may be used when returning to search via history list e.g. search bible, select dict, history list, search results
-            val intent = Intent(this, SearchResults::class.java)
+//            val intent = Intent(this, SearchResults::class.java)
+            val intent = Intent(this, MySearchResults::class.java)
             intent.putExtra(SearchControl.SEARCH_TEXT, text)
             val currentDocInitials = documentToSearch?.initials
             intent.putExtra(SearchControl.SEARCH_DOCUMENT, currentDocInitials)
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
new file mode 100644
index 0000000000..9dc8eb49b2
--- /dev/null
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
@@ -0,0 +1,248 @@
+package net.bible.android.view.activity.search;
+
+import android.content.Context;
+import android.database.DataSetObserver;
+import android.graphics.Typeface;
+import android.text.Html;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListAdapter;
+import android.widget.TextView;
+import android.widget.Toast;
+import net.bible.android.activity.R;
+import net.bible.android.control.search.SearchControl;
+import net.bible.service.sword.SwordDocumentFacade;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import net.bible.android.view.activity.base.ActivityBase;
+
+import org.crosswire.jsword.book.Book;
+import org.crosswire.jsword.book.Books;
+import org.crosswire.jsword.passage.Key;
+import org.crosswire.jsword.passage.NoSuchKeyException;
+import org.jdom2.Element;
+import org.jdom2.Text;
+
+
+public class SearchResultsAdapter implements ListAdapter {
+
+	private ArrayList<SearchResultsData> arrayList;
+	private Context context;
+	private SearchControl searchControl;
+
+	public SearchResultsAdapter(Context context, ArrayList<SearchResultsData> arrayList, SearchControl searchControl) {
+		this.arrayList=arrayList;
+		this.context=context;
+		this.searchControl = searchControl;
+	}
+	@Override
+	public boolean areAllItemsEnabled() {
+		return false;
+	}
+	@Override
+	public boolean isEnabled(int position) {
+		return true;
+	}
+	@Override
+	public void registerDataSetObserver(DataSetObserver observer) {
+	}
+	@Override
+	public void unregisterDataSetObserver(DataSetObserver observer) {
+	}
+	@Override
+	public int getCount() {
+		return arrayList.size();
+	}
+	@Override
+	public Object getItem(int position) {
+		return position;
+	}
+
+	public Object getItemAtPosition(int position) {
+		return position;
+	}
+	@Override
+	public long getItemId(int position) {
+		return position;
+	}
+	@Override
+	public boolean hasStableIds() {
+		return false;
+	}
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		SearchResultsData subjectData=arrayList.get(position);
+		if(convertView==null) {
+			LayoutInflater layoutInflater = LayoutInflater.from(context);
+			convertView=layoutInflater.inflate(R.layout.search_results_list_row, null);
+			convertView.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+				}
+			});
+
+			TextView reference=convertView.findViewById(R.id.reference);
+			reference.setText(subjectData.reference);
+
+			TextView translation=convertView.findViewById(R.id.translation);
+			translation.setText(subjectData.translation);
+
+			// Get the text of the verse
+			Book book = Books.installed().getBook("KJV");
+			try {
+				Key key = book.getKey(subjectData.osisKey);
+				Element verseTextElement = searchControl.getSearchResultVerseElement(key);
+				SpannableString verseTextHtml = highlightSearchText(SearchControl.originalSearchString, verseTextElement);
+
+				TextView verse=convertView.findViewById(R.id.verse);
+				verse.setText(verseTextHtml);
+				verse.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						// This works but may stop if i have android:descendantFocusability="blocksDescendants" working
+						Toast.makeText(v.getContext() , "Clicked verse control " + position + " " + subjectData.id ,Toast.LENGTH_SHORT).show();
+
+					}});
+			} catch (NoSuchKeyException e) {
+				e.printStackTrace();
+			}
+
+		}
+		return convertView;
+	}
+	@Override
+	public int getItemViewType(int position) {
+		return position;
+	}
+	@Override
+	public int getViewTypeCount() {
+		return arrayList.size();
+	}
+	@Override
+	public boolean isEmpty() {
+		return false;
+	}
+
+	private String processElementChildren(Element parentElement, String searchTerms, String verseString, Boolean isBold) {
+		// Recursive method to walk the verse element tree ignoring tags like 'note' that should not be shown in the search results
+		// and including tags like 'w' that should be included. This routine is needed only to do searches on lemma attributes. That
+		// is why bolding only occurs in that part of the code.
+		for (Object o : parentElement.getContent()) {
+			if (o instanceof Element) {
+				Element el = (Element) o;
+				List<String> elementsToExclude = Arrays.asList("note","reference");
+				List<String> elementsToInclude = Arrays.asList("w","transChange","divineName","seg");
+				if (elementsToInclude.contains(el.getName())) {
+					try {
+						String lemma = el.getAttributeValue("lemma");
+						isBold = (lemma != null && Pattern.compile(searchTerms, Pattern.CASE_INSENSITIVE).matcher(lemma.trim()).find());
+					} catch (Exception e) {
+						isBold = false;
+					}
+					// Only leaf nodes should have their text appended. If a node has child tags, the text will be passed as one of the children .
+					if (el.getChildren().isEmpty()) verseString += buildElementText(el.getText(),isBold);
+				}
+				if (!el.getChildren().isEmpty() && !elementsToExclude.contains(el.getName())) {verseString = processElementChildren(el, searchTerms, verseString, isBold);};
+			} else if (o instanceof Text) {
+				Text t = (Text) o;
+				verseString += buildElementText(t.getText(),false);
+			} else {
+				verseString += buildElementText(o.toString(),false);
+			}
+		}
+		return verseString;
+	}
+
+	private String buildElementText(String elementText, Boolean isBold) {
+		if (isBold) {
+			return String.format("<b>%s</b>",elementText);
+		} else {
+			return elementText;
+		}
+	}
+
+	private SpannableString highlightSearchText(String searchTerms, Element textElement) {
+
+		SpannableString spannableText = null;
+		try {
+			String verseString = "";
+			searchTerms = prepareSearchTerms(searchTerms);
+
+			List<Element> verses = textElement.getChildren("verse");
+			for (Element verse : verses) {
+				verseString += processElementChildren(verse, searchTerms, "", false);
+			}
+			spannableText = new SpannableString(Html.fromHtml(verseString));
+			Matcher m = null;
+			String[] splitSearchArray = splitSearchTerms(searchTerms);
+			for (String searchWord : splitSearchArray) {
+				searchWord = prepareSearchWord(searchWord);
+				if (searchWord.length() > 0) {
+					m = Pattern.compile(searchWord, Pattern.CASE_INSENSITIVE).matcher(spannableText);
+					while (m.find()) {
+						spannableText.setSpan(new android.text.style.StyleSpan(Typeface.BOLD), m.start(), m.end(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+					}
+				}
+			}
+		}
+		catch (Exception e) {
+			Log.w("SEARCH", e.getMessage());
+		}
+		finally {
+			return spannableText;
+		}
+	}
+
+	public static class testSearch {
+		String searchTerms;
+		String testType;
+		public testSearch(String searchTerms) {
+			this.searchTerms = searchTerms;
+			this.testType = testType;
+		}
+		public String PrepareSearchTerms() {return prepareSearchTerms(searchTerms);}
+		public String[] SplitSearchTerms() {return splitSearchTerms(searchTerms);}
+		public String PrepareSearchWord() {return prepareSearchWord(searchTerms);}
+	}
+
+	private static String prepareSearchTerms(String searchTerms) {
+		// Replaces strong:g00123 with REGEX strong:g*123. This is needed because the search term submitted by the 'Find all occcurrences includes extra zeros
+		// The capitalisation is not important since we do a case insensitive search
+		if (searchTerms.contains("strong:")) {
+			searchTerms = searchTerms.replaceAll("strong:g0*", "strong:g0*");
+			searchTerms = searchTerms.replaceAll("strong:h0*", "strong:h0*");
+		}
+		return searchTerms;
+	}
+
+	private static String[] splitSearchTerms(String searchTerms) {
+		// Split the search terms on space characters that are not enclosed in double quotes
+		// Eg: 'moses "burning bush"' -> "moses" and "burning bush"
+		return searchTerms.split("\\s+(?=(?:\"(?:\\\\\"|[^\"])+\"|[^\"])+$)");
+	}
+
+	private static String prepareSearchWord(String searchWord) {
+		// Need to clean up the search word itself before trying to find the searchWord in the text
+		// Eg: '+"burning bush"' -> 'burning bush'
+		searchWord = searchWord.replace("\"", "");  // Remove quotes which indicate phrase searches
+		searchWord = searchWord.replace("+", "");	// Remove + which indicates AND searches
+		searchWord = searchWord.replace("?", "\\p{L}");  // Handles any letter from any language
+		if (searchWord.length() > 0) {
+			if (Objects.equals(searchWord.substring(searchWord.length() - 1), "*")) {
+				searchWord = searchWord.replace("*", "");
+			} else {
+				searchWord = searchWord.replace("*", "\b");  // Match on a word boundary
+			}
+		}
+		return searchWord;
+	}
+}
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
new file mode 100644
index 0000000000..4a2f52288d
--- /dev/null
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -0,0 +1,223 @@
+package ir.smartdevelop.eram.showcaseview
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import android.widget.ListView
+import android.widget.Toast
+import androidx.lifecycle.*
+import net.bible.android.activity.databinding.SearchResultsVerseFragmentBinding
+import net.bible.android.view.activity.search.SearchResultsAdapter
+import net.bible.android.view.activity.search.SearchResultsData
+import net.bible.android.activity.R
+import net.bible.android.control.search.SearchControl
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+/**
+ * A placeholder fragment containing a simple view.
+ */
+
+class PageViewModel : ViewModel() {
+
+    private val _index = MutableLiveData<Int>()
+    val text: LiveData<String> = Transformations.map(_index) {
+        "Hello world from section: $it"
+    }
+
+    fun setIndex(index: Int) {
+        _index.value = index
+    }
+}
+
+class SearchResultsFragment : Fragment() {
+
+    private lateinit var pageViewModel: PageViewModel
+    private var _binding: SearchResultsVerseFragmentBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
+    var searchControl: SearchControl? = null
+
+    fun setEmployee(myEmp: SearchControl?) {
+        this.searchControl = myEmp
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        pageViewModel = ViewModelProvider(
+            this,
+            ViewModelProvider.NewInstanceFactory()
+        ).get(PageViewModel::class.java).apply {
+            setIndex(arguments?.getInt(ARG_SECTION_NUMBER) ?: 1)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+
+        _binding = SearchResultsVerseFragmentBinding.inflate(inflater, container, false)
+        val root = binding.root
+
+        pageViewModel.text.observe(viewLifecycleOwner, Observer {
+            val strtext = requireArguments().getString("edttext")
+            val arr: ArrayList<SearchResultsData> = requireArguments().getParcelableArrayList("mylist")!!
+
+            val customAdapter = SearchResultsAdapter(activity, arr, searchControl)
+
+            val list: ListView = binding.searchResultsList
+            list.adapter = customAdapter
+            list.descendantFocusability = ViewGroup.FOCUS_BEFORE_DESCENDANTS;
+            list.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+            list.isVerticalScrollBarEnabled = false
+
+            list.setOnItemClickListener { parent, view, position, id ->
+                val element = customAdapter.getItemAtPosition(position) // The item that was clicked
+                Toast.makeText(list.context, "Hi",Toast.LENGTH_LONG)
+//                val intent = Intent(this, BookDetailActivity::class.java)
+//                startActivity(intent)
+            }
+
+
+
+
+
+        })
+        return root
+
+
+    }
+
+    companion object {
+        /**
+         * The fragment argument representing the section number for this
+         * fragment.
+         */
+        private const val ARG_SECTION_NUMBER = "section_number"
+
+        /**
+         * Returns a new instance of this fragment for the given section
+         * number.
+         */
+        @JvmStatic
+        fun newInstance(sectionNumber: Int): SearchResultsFragment {
+            return SearchResultsFragment().apply {
+                arguments = Bundle().apply {
+                    putInt(ARG_SECTION_NUMBER, sectionNumber)
+                }
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+}
+
+class SearchStatisticsFragment : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.search_results_statistics_fragment, container, false)
+    }
+
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment SearchStatisticsFragment.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            SearchStatisticsFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+}
+class PlaceholderFragment : Fragment() {
+
+    private lateinit var pageViewModel: PageViewModel
+    private var _binding: SearchResultsVerseFragmentBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        pageViewModel = ViewModelProvider(
+            this,
+            ViewModelProvider.NewInstanceFactory()
+        ).get(PageViewModel::class.java).apply {
+            setIndex(arguments?.getInt(ARG_SECTION_NUMBER) ?: 1)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+
+        _binding = SearchResultsVerseFragmentBinding.inflate(inflater, container, false)
+        val root = binding.root
+
+        return root
+    }
+
+    companion object {
+        /**
+         * The fragment argument representing the section number for this
+         * fragment.
+         */
+        private const val ARG_SECTION_NUMBER = "section_number"
+
+        /**
+         * Returns a new instance of this fragment for the given section
+         * number.
+         */
+        @JvmStatic
+        fun newInstance(sectionNumber: Int): PlaceholderFragment {
+            return PlaceholderFragment().apply {
+                arguments = Bundle().apply {
+                    putInt(ARG_SECTION_NUMBER, sectionNumber)
+                }
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/res/layout/search_results_layout_activity.xml b/app/src/main/res/layout/search_results_layout_activity.xml
new file mode 100644
index 0000000000..01e72b4f63
--- /dev/null
+++ b/app/src/main/res/layout/search_results_layout_activity.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+
+	>
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="#64CCFB">
+
+		<com.google.android.material.tabs.TabLayout
+			android:id="@+id/tabs"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content" />
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<androidx.viewpager.widget.ViewPager
+		android:id="@+id/view_pager"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:paddingLeft="10dp"
+		android:paddingRight="10dp"
+		app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/search_results_list_row.xml b/app/src/main/res/layout/search_results_list_row.xml
new file mode 100644
index 0000000000..e75d612692
--- /dev/null
+++ b/app/src/main/res/layout/search_results_list_row.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:layout_weight="1"
+	android:focusable="false"
+	android:clickable="false"
+	android:descendantFocusability="blocksDescendants">
+	android:padding="5dip">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:layout_weight="1"
+		android:descendantFocusability="blocksDescendants">
+		android:padding="0dip">
+
+		<TextView
+			android:id="@+id/reference"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Reference"
+			android:textSize="15dip"
+			android:textStyle="" />
+
+		<TextView
+			android:id="@+id/translation"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:gravity="right"
+			android:paddingLeft="10dp"
+			android:text="Translation"
+			android:textSize="10dip"
+			android:typeface="sans" />
+	</LinearLayout>
+
+	<TextView
+		android:id="@+id/verse"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:focusable="false"
+		android:clickable="false"
+		android:focusableInTouchMode="false"
+		android:text="TextView" />
+
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/search_results_simple_list.xml b/app/src/main/res/layout/search_results_simple_list.xml
new file mode 100644
index 0000000000..7602a578cf
--- /dev/null
+++ b/app/src/main/res/layout/search_results_simple_list.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<ListView
+		android:id="@+id/list"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/search_results_statistics_fragment.xml b/app/src/main/res/layout/search_results_statistics_fragment.xml
new file mode 100644
index 0000000000..5e86b1b61a
--- /dev/null
+++ b/app/src/main/res/layout/search_results_statistics_fragment.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/blue_A200">
+
+	<!-- TODO: Update blank fragment layout -->
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:text="@string/about_version_history" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/search_results_verse_fragment.xml b/app/src/main/res/layout/search_results_verse_fragment.xml
new file mode 100644
index 0000000000..7d8ed9ec73
--- /dev/null
+++ b/app/src/main/res/layout/search_results_verse_fragment.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/searchListConstraintLayout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:descendantFocusability="blocksDescendants"
+	>
+
+	<ListView
+		android:descendantFocusability="blocksDescendants"
+		android:id="@+id/searchResultsList"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="#25020202"
+		android:dividerHeight="1dp"
+		android:footerDividersEnabled="true"
+		android:headerDividersEnabled="true"
+		app:layout_constraintEnd_toEndOf="parent"
+		>
+
+
+	</ListView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b288d21586..645256337a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -72,10 +72,14 @@
     <string name="search_strongs">Strongs Number Search</string>
     <string name="search_showDecoratedText">Show raw search text</string>
     <string name="search_proximity">Proximity %s</string>
+    <string name="search_results">Search Results</string>
+    <string name="search_statistics">Search Statistics</string>
     <string name="words">words</string>
     <string name="accuracy">Accuracy</string>
     <string name="greek">Greek</string>
     <string name="hebrew">Hebrew</string>
+    <string name="results">Results</string>
+    <string name="statistics">Statistics</string>
 
     <!-- Preferences -->
     <string name="prefs_show_verseno_title">Chapter &amp; verse numbers</string>

From 42fa53971aae3b12bb23aad294d560b1c48a35b7 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Mon, 10 Jan 2022 23:07:18 +1000
Subject: [PATCH 08/37] Opens to selected verse

---
 .../view/activity/search/MySearchResults.kt   | 24 +++++----
 .../activity/search/SearchResultsAdapter.java | 30 +++++------
 .../activity/search/SearchResultsFragments.kt | 50 ++++++++++++++++++-
 .../res/layout/search_results_list_row.xml    |  9 +++-
 .../res/layout/search_results_simple_list.xml | 11 ----
 5 files changed, 86 insertions(+), 38 deletions(-)
 delete mode 100644 app/src/main/res/layout/search_results_simple_list.xml

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index c436434129..0616a32abc 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -2,6 +2,7 @@ package net.bible.android.view.activity.search
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.os.Parcel
 import android.os.Parcelable
@@ -17,9 +18,6 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.viewpager.widget.ViewPager
 import androidx.appcompat.app.AppCompatActivity
-import ir.smartdevelop.eram.showcaseview.PlaceholderFragment
-import ir.smartdevelop.eram.showcaseview.SearchResultsFragment
-import ir.smartdevelop.eram.showcaseview.SearchStatisticsFragment
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -27,14 +25,12 @@ import kotlinx.coroutines.withContext
 import net.bible.android.activity.databinding.SearchResultsLayoutActivityBinding
 import java.util.ArrayList
 import net.bible.android.activity.R
-import net.bible.android.activity.databinding.ListBinding
 import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
 import net.bible.android.control.search.SearchControl
 import net.bible.android.control.search.SearchResultsDto
 import net.bible.android.view.activity.base.Dialogs
 import net.bible.android.view.activity.search.searchresultsactionbar.SearchResultsActionBarManager
 import net.bible.service.common.CommonUtils.buildActivityComponent
-import net.bible.service.sword.SwordContentFacade
 import org.apache.commons.lang3.StringUtils
 import org.crosswire.jsword.passage.Key
 import javax.inject.Inject
@@ -44,7 +40,7 @@ private val TAB_TITLES = arrayOf(
     R.string.statistics
 )
 private val arrayList = ArrayList<SearchResultsData>()
-
+private var mCurrentlyDisplayedSearchResults: List<Key> = ArrayList()
 
 class SearchResultsData : Parcelable {
     @JvmField
@@ -99,7 +95,6 @@ class MySearchResults : AppCompatActivity() {
 //    private lateinit var binding: ListBinding
     private lateinit var binding: SearchResultsLayoutActivityBinding
     private var mSearchResultsHolder: SearchResultsDto? = null
-    private var mCurrentlyDisplayedSearchResults: List<Key> = ArrayList()
     private var mKeyArrayAdapter: ArrayAdapter<Key>? = null
     private var isScriptureResultsCurrentlyShown = true
     @Inject lateinit var searchResultsActionBarManager: SearchResultsActionBarManager
@@ -124,7 +119,7 @@ class MySearchResults : AppCompatActivity() {
         val fragobj = SearchResultsFragment()
         fragobj.setArguments(bundle)
 
-        val sectionsPagerAdapter = SearchResultsPagerAdapter(this, supportFragmentManager, searchControl)
+        val sectionsPagerAdapter = SearchResultsPagerAdapter(this, supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent)
         val viewPager: ViewPager = binding.viewPager
         viewPager.adapter = sectionsPagerAdapter
         val tabs: TabLayout = binding.tabs
@@ -211,6 +206,7 @@ class MySearchResults : AppCompatActivity() {
 
         arrayList!!.clear()
         for (key in mCurrentlyDisplayedSearchResults) {
+//            mKeyArrayAdapter!!.add(key)
             var text = searchControl.getSearchResultVerseText(key)
             arrayList.add(SearchResultsData(1,key.osisRef.toString() , key.osisID.toString(),"KJV",text))
         }
@@ -233,9 +229,15 @@ class MySearchResults : AppCompatActivity() {
 //    }
 //}
 
-class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManager, searchControl: SearchControl) :
+class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManager,
+                                searchControl: SearchControl,
+                                activeWindowPageManagerProvider: ActiveWindowPageManagerProvider,
+                                intent: Intent
+) :
     FragmentPagerAdapter(fm) {
     val searchControl = searchControl
+    val activeWindowPageManagerProvider = activeWindowPageManagerProvider
+    val intent = intent
 
     override fun getItem(position: Int): Fragment {
         // getItem is called to instantiate the fragment for the given page.
@@ -250,7 +252,9 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
 //                val fragobj = SearchResultsFragment()
                 frag.setArguments(bundle)
                 frag.setEmployee(searchControl)
-
+                frag.setCurrentlyDisplayedSearchResults(mCurrentlyDisplayedSearchResults)
+                frag.setActiveWindowPageManagerProvider(activeWindowPageManagerProvider)
+                frag.setIntent(intent)
             }
             1-> frag = SearchStatisticsFragment.newInstance("a","b")
             else -> frag = PlaceholderFragment.newInstance(1)
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
index 9dc8eb49b2..fef2ae2b7d 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
@@ -10,6 +10,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -33,7 +35,7 @@
 import org.jdom2.Text;
 
 
-public class SearchResultsAdapter implements ListAdapter {
+public class SearchResultsAdapter extends BaseAdapter {
 
 	private ArrayList<SearchResultsData> arrayList;
 	private Context context;
@@ -44,6 +46,7 @@ public SearchResultsAdapter(Context context, ArrayList<SearchResultsData> arrayL
 		this.context=context;
 		this.searchControl = searchControl;
 	}
+
 	@Override
 	public boolean areAllItemsEnabled() {
 		return false;
@@ -84,11 +87,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		if(convertView==null) {
 			LayoutInflater layoutInflater = LayoutInflater.from(context);
 			convertView=layoutInflater.inflate(R.layout.search_results_list_row, null);
-			convertView.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-				}
-			});
+//			convertView.setOnClickListener(new View.OnClickListener() {
+//				@Override
+//				public void onClick(View v) {
+//				}
+//			});
 
 			TextView reference=convertView.findViewById(R.id.reference);
 			reference.setText(subjectData.reference);
@@ -105,17 +108,16 @@ public void onClick(View v) {
 
 				TextView verse=convertView.findViewById(R.id.verse);
 				verse.setText(verseTextHtml);
-				verse.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						// This works but may stop if i have android:descendantFocusability="blocksDescendants" working
-						Toast.makeText(v.getContext() , "Clicked verse control " + position + " " + subjectData.id ,Toast.LENGTH_SHORT).show();
-
-					}});
+//				verse.setOnClickListener(new View.OnClickListener() {
+//					@Override
+//					public void onClick(View v) {
+//						// This works but may stop if i have android:descendantFocusability="blocksDescendants" working
+//						Toast.makeText(v.getContext() , "Clicked verse control " + position + " " + subjectData.id ,Toast.LENGTH_SHORT).show();
+//
+//					}});
 			} catch (NoSuchKeyException e) {
 				e.printStackTrace();
 			}
-
 		}
 		return convertView;
 	}
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index 4a2f52288d..73de321267 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -1,9 +1,14 @@
-package ir.smartdevelop.eram.showcaseview
+package net.bible.android.view.activity.search
 
+import android.app.Activity
+import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
 import android.widget.ListView
 import android.widget.Toast
@@ -13,6 +18,12 @@ import net.bible.android.view.activity.search.SearchResultsAdapter
 import net.bible.android.view.activity.search.SearchResultsData
 import net.bible.android.activity.R
 import net.bible.android.control.search.SearchControl
+import net.bible.android.view.activity.base.Dialogs
+import net.bible.android.view.activity.page.MainBibleActivity
+import org.apache.commons.lang3.StringUtils
+import org.crosswire.jsword.passage.Key
+import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
+import net.bible.service.sword.SwordDocumentFacade
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -38,16 +49,28 @@ class SearchResultsFragment : Fragment() {
 
     private lateinit var pageViewModel: PageViewModel
     private var _binding: SearchResultsVerseFragmentBinding? = null
+    private lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
 
     // This property is only valid between onCreateView and
     // onDestroyView.
     private val binding get() = _binding!!
+    private var mCurrentlyDisplayedSearchResults: List<Key> = java.util.ArrayList()
+    private lateinit var intent: Intent
 
     var searchControl: SearchControl? = null
 
     fun setEmployee(myEmp: SearchControl?) {
         this.searchControl = myEmp
     }
+    fun setCurrentlyDisplayedSearchResults(results: List<Key>) {
+        this.mCurrentlyDisplayedSearchResults = results
+    }
+    fun setActiveWindowPageManagerProvider(x: ActiveWindowPageManagerProvider) {
+        this.activeWindowPageManagerProvider = x
+    }
+    fun setIntent(x: Intent){
+        this.intent = x
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -82,6 +105,12 @@ class SearchResultsFragment : Fragment() {
             list.setOnItemClickListener { parent, view, position, id ->
                 val element = customAdapter.getItemAtPosition(position) // The item that was clicked
                 Toast.makeText(list.context, "Hi",Toast.LENGTH_LONG)
+                try { // no need to call HistoryManager.addHistoryItem() here because PassageChangeMediator will tell HistoryManager a change is about to occur
+                    verseSelected(mCurrentlyDisplayedSearchResults[position])
+                } catch (e: Exception) {
+                    Log.e("blah", "Selection error", e)
+                    Dialogs.instance.showErrorMsg(R.string.error_occurred, e)
+                }
 //                val intent = Intent(this, BookDetailActivity::class.java)
 //                startActivity(intent)
             }
@@ -96,6 +125,25 @@ class SearchResultsFragment : Fragment() {
 
     }
 
+    private fun verseSelected(key: Key?) {
+        Log.i("SearchResults.TAG", "chose:$key")
+        if (key != null) { // which doc do we show
+
+            var targetDocInitials = intent.extras!!.getString(SearchControl.TARGET_DOCUMENT)
+            if (StringUtils.isEmpty(targetDocInitials)) {
+                targetDocInitials = activeWindowPageManagerProvider.activeWindowPageManager.currentPage.currentDocument!!.initials
+            }
+            val swordDocumentFacade = SwordDocumentFacade()
+            val targetBook = swordDocumentFacade.getDocumentByInitials(targetDocInitials)
+            activeWindowPageManagerProvider.activeWindowPageManager.setCurrentDocumentAndKey(targetBook, key)
+            // this also calls finish() on this Activity.  If a user re-selects from HistoryList then a new Activity is created
+            val intent = Intent(this.context, MainBibleActivity::class.java).apply {
+                addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
+            }
+            startActivity(intent)
+        }
+    }
+
     companion object {
         /**
          * The fragment argument representing the section number for this
diff --git a/app/src/main/res/layout/search_results_list_row.xml b/app/src/main/res/layout/search_results_list_row.xml
index e75d612692..55e6012b98 100644
--- a/app/src/main/res/layout/search_results_list_row.xml
+++ b/app/src/main/res/layout/search_results_list_row.xml
@@ -14,7 +14,9 @@
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		android:layout_weight="1"
-		android:descendantFocusability="blocksDescendants">
+		android:descendantFocusability="blocksDescendants"
+		android:focusable="false"
+		android:focusableInTouchMode="false"
 		android:padding="0dip">
 
 		<TextView
@@ -23,6 +25,8 @@
 			android:layout_height="wrap_content"
 			android:text="Reference"
 			android:textSize="15dip"
+			android:focusable="false"
+			android:focusableInTouchMode="false"
 			android:textStyle="" />
 
 		<TextView
@@ -33,6 +37,8 @@
 			android:paddingLeft="10dp"
 			android:text="Translation"
 			android:textSize="10dip"
+			android:focusable="false"
+			android:focusableInTouchMode="false"
 			android:typeface="sans" />
 	</LinearLayout>
 
@@ -42,7 +48,6 @@
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
 		android:focusable="false"
-		android:clickable="false"
 		android:focusableInTouchMode="false"
 		android:text="TextView" />
 
diff --git a/app/src/main/res/layout/search_results_simple_list.xml b/app/src/main/res/layout/search_results_simple_list.xml
deleted file mode 100644
index 7602a578cf..0000000000
--- a/app/src/main/res/layout/search_results_simple_list.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<ListView
-		android:id="@+id/list"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent" />
-</LinearLayout>

From 07e674c308004d1192772dccc20e5d7aae20ec44 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Wed, 12 Jan 2022 19:01:45 +1000
Subject: [PATCH 09/37] Buttons displayed using Flow method

Don't really like this display though.
---
 .../navigation/GridChoosePassageBook.kt       |  56 ++---
 .../view/activity/search/MySearchResults.kt   | 136 +++++++----
 .../activity/search/SearchResultsAdapter.java |  49 ++--
 .../activity/search/SearchResultsFragments.kt | 219 +++++++++---------
 .../search_result_statistics_button.xml       |  37 +++
 .../layout/search_results_layout_activity.xml |  25 +-
 .../res/layout/search_results_list_row.xml    |   8 +-
 .../search_results_statistics_fragment.xml    |  37 ++-
 .../layout/search_results_statistics_row.xml  |  45 ++++
 .../layout/search_results_verse_fragment.xml  |   7 +-
 app/src/main/res/values/ids.xml               |   4 +
 11 files changed, 386 insertions(+), 237 deletions(-)
 create mode 100644 app/src/main/res/drawable/search_result_statistics_button.xml
 create mode 100644 app/src/main/res/layout/search_results_statistics_row.xml
 create mode 100644 app/src/main/res/values/ids.xml

diff --git a/app/src/main/java/net/bible/android/view/activity/navigation/GridChoosePassageBook.kt b/app/src/main/java/net/bible/android/view/activity/navigation/GridChoosePassageBook.kt
index e679e499df..c6bf6573b8 100644
--- a/app/src/main/java/net/bible/android/view/activity/navigation/GridChoosePassageBook.kt
+++ b/app/src/main/java/net/bible/android/view/activity/navigation/GridChoosePassageBook.kt
@@ -251,33 +251,6 @@ class GridChoosePassageBook : CustomTitlebarActivityBase(R.menu.choose_passage_b
         return shortenedName.toString()
     }
 
-    private fun getBookTextColor(bookNo: Int): Int {
-        // colour and grouping taken from http://en.wikipedia.org/wiki/Books_of_the_Bible
-        return when {
-            bookNo <= BibleBook.DEUT.ordinal -> // Pentateuch - books of Moses
-                PENTATEUCH_COLOR
-            bookNo <= BibleBook.ESTH.ordinal -> // History
-                HISTORY_COLOR
-            bookNo <= BibleBook.SONG.ordinal -> // Wisdom
-                WISDOM_COLOR
-            bookNo <= BibleBook.DAN.ordinal -> // Major prophets
-                MAJOR_PROPHETS_COLOR
-            bookNo <= BibleBook.MAL.ordinal -> // Minor prophets
-                MINOR_PROPHETS_COLOR
-            bookNo <= BibleBook.JOHN.ordinal -> // Gospels
-                GOSPEL_COLOR
-            bookNo <= BibleBook.ACTS.ordinal -> // Acts
-                ACTS_COLOR
-            bookNo <= BibleBook.PHLM.ordinal -> // Pauline epistles
-                PAULINE_COLOR
-            bookNo <= BibleBook.JUDE.ordinal -> // General epistles
-                GENERAL_EPISTLES_COLOR
-            bookNo <= BibleBook.JUDE.ordinal -> // Revelation
-                REVELATION_COLOR
-            else -> OTHER_COLOR
-        }
-    }
-
     companion object {
 
         const val BOOK_NO = "BOOK_NO"
@@ -298,7 +271,34 @@ class GridChoosePassageBook : CustomTitlebarActivityBase(R.menu.choose_passage_b
         private val REVELATION_COLOR = Color.rgb(0xFE, 0x33, 0xFF)
         private val OTHER_COLOR = ACTS_COLOR
 
-        public const val BOOK_GRID_FLOW_PREFS = "book_grid_ltr"
+        const val BOOK_GRID_FLOW_PREFS = "book_grid_ltr"
         private const val TAG = "GridChoosePassageBook"
+
+        fun getBookTextColor(bookNo: Int): Int {
+            // colour and grouping taken from http://en.wikipedia.org/wiki/Books_of_the_Bible
+            return when {
+                bookNo <= BibleBook.DEUT.ordinal -> // Pentateuch - books of Moses
+                    PENTATEUCH_COLOR
+                bookNo <= BibleBook.ESTH.ordinal -> // History
+                    HISTORY_COLOR
+                bookNo <= BibleBook.SONG.ordinal -> // Wisdom
+                    WISDOM_COLOR
+                bookNo <= BibleBook.DAN.ordinal -> // Major prophets
+                    MAJOR_PROPHETS_COLOR
+                bookNo <= BibleBook.MAL.ordinal -> // Minor prophets
+                    MINOR_PROPHETS_COLOR
+                bookNo <= BibleBook.JOHN.ordinal -> // Gospels
+                    GOSPEL_COLOR
+                bookNo <= BibleBook.ACTS.ordinal -> // Acts
+                    ACTS_COLOR
+                bookNo <= BibleBook.PHLM.ordinal -> // Pauline epistles
+                    PAULINE_COLOR
+                bookNo <= BibleBook.JUDE.ordinal -> // General epistles
+                    GENERAL_EPISTLES_COLOR
+                bookNo <= BibleBook.JUDE.ordinal -> // Revelation
+                    REVELATION_COLOR
+                else -> OTHER_COLOR
+            }
+        }
     }
 }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 0616a32abc..185bb3f27a 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -8,39 +8,42 @@ import android.os.Parcel
 import android.os.Parcelable
 import android.util.Log
 import android.view.View
-import android.widget.ArrayAdapter
-import android.widget.ListAdapter
-import android.widget.ListView
 import android.widget.Toast
 import com.google.android.material.tabs.TabLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.viewpager.widget.ViewPager
-import androidx.appcompat.app.AppCompatActivity
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import net.bible.android.activity.databinding.SearchResultsLayoutActivityBinding
 import java.util.ArrayList
 import net.bible.android.activity.R
+import net.bible.android.control.navigation.NavigationControl
 import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
 import net.bible.android.control.search.SearchControl
 import net.bible.android.control.search.SearchResultsDto
+import net.bible.android.view.activity.base.CustomTitlebarActivityBase
 import net.bible.android.view.activity.base.Dialogs
 import net.bible.android.view.activity.search.searchresultsactionbar.SearchResultsActionBarManager
-import net.bible.service.common.CommonUtils.buildActivityComponent
 import org.apache.commons.lang3.StringUtils
 import org.crosswire.jsword.passage.Key
+import org.crosswire.jsword.passage.Verse
 import javax.inject.Inject
+import org.crosswire.jsword.versification.BibleBook
+import org.crosswire.jsword.versification.Versification
+
+
 
 private val TAB_TITLES = arrayOf(
     R.string.results,
     R.string.statistics
 )
-private val arrayList = ArrayList<SearchResultsData>()
+private val mSearchArrayAdapter = ArrayList<SearchResultsData>()
 private var mCurrentlyDisplayedSearchResults: List<Key> = ArrayList()
+private val bookStatistics = mutableListOf<BookStat>()
+
+class BookStat(val book: String, var count: Int, val bookInitials: String, val bookOrdinal:Int, val listIndex:Int) {
+    override fun toString(): String = "$book: $count"
+}
 
 class SearchResultsData : Parcelable {
     @JvmField
@@ -53,6 +56,7 @@ class SearchResultsData : Parcelable {
     var translation: String?
     @JvmField
     var verse: String?
+    /* What I really want to do is make the 'Key' parcelable but I don't know how to do that. So instead I have to send the properties I need and get the key later on */
 
     constructor(Id: Int?, OsisKey: String?, Reference: String?, Translation: String?, Verse: String?) {
         id = Id;
@@ -75,6 +79,8 @@ class SearchResultsData : Parcelable {
     }
 
     override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeInt(id!!)
+        dest.writeString(osisKey)
         dest.writeString(reference)
         dest.writeString(translation)
         dest.writeString(verse)
@@ -91,21 +97,28 @@ class SearchResultsData : Parcelable {
     }
 }
 
-class MySearchResults : AppCompatActivity() {
+class MySearchResults : CustomTitlebarActivityBase() {
 //    private lateinit var binding: ListBinding
     private lateinit var binding: SearchResultsLayoutActivityBinding
     private var mSearchResultsHolder: SearchResultsDto? = null
-    private var mKeyArrayAdapter: ArrayAdapter<Key>? = null
+
+    /*  mKeyArrayAdapter is replaced by mSearchArrayAdapter */
+//    private var mKeyArrayAdapter: ArrayAdapter<Key>? = null
+
+    @Inject lateinit var navigationControl: NavigationControl
     private var isScriptureResultsCurrentlyShown = true
     @Inject lateinit var searchResultsActionBarManager: SearchResultsActionBarManager
     @Inject lateinit var searchControl: SearchControl
     @Inject lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
     /** Called when the activity is first created.  */
-    @SuppressLint("MissingSuperCall")
 
+    private val versification: Versification
+        get() = navigationControl.versification
+
+    @SuppressLint("MissingSuperCall")
     override fun onCreate(savedInstanceState: Bundle?) {
 
-        super.onCreate(savedInstanceState)
+        super.onCreate(savedInstanceState, true)
         Log.i(TAG, "Displaying Search results view")
 
         binding = SearchResultsLayoutActivityBinding.inflate(layoutInflater)
@@ -125,24 +138,32 @@ class MySearchResults : AppCompatActivity() {
         val tabs: TabLayout = binding.tabs
         tabs.setupWithViewPager(viewPager)
 
-//        searchResultsActionBarManager.registerScriptureToggleClickListener(scriptureToggleClickListener)
-//        setActionBarManager(searchResultsActionBarManager)
-//        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        searchResultsActionBarManager.registerScriptureToggleClickListener(scriptureToggleClickListener)
+        setActionBarManager(searchResultsActionBarManager)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
         isScriptureResultsCurrentlyShown = searchControl.isCurrentlyShowingScripture
+
+/*      I don't  have a close button so I don't see why this is necessary */
 //        binding.closeButton.setOnClickListener {
 //            finish()
 //        }
+
+/*      The GlobalScope code almost works fine. Only trouble is that the search results are delayed by one search.
+        That is, the first time the search is done no results are shown. The second time, the results from the previous
+        search are shown and so on. I believe it is because the Fragment manager is not hooked into the scope so it is
+        processed immediately and doesn't  wait for the code inside the scope to complete. But i don't know how to fix
+        that problem.
+*/
 //        GlobalScope.launch {
-//            prepareResults()
+            prepareResults()
 //        }
-        prepareResults()
-
     }
 
+//    private suspend fun prepareResults() {
     private fun prepareResults() {
 //        withContext(Dispatchers.Main) {
-//            binding.loadingIndicator.visibility = View.VISIBLE
-//            binding.empty.visibility = View.GONE
+            binding.loadingIndicator.visibility = View.VISIBLE
+            binding.empty.visibility = View.GONE
 //        }
         if (fetchSearchResults()) { // initialise adapters before result population - easier when updating due to later Scripture toggle
 //            withContext(Dispatchers.Main) {
@@ -152,14 +173,15 @@ class MySearchResults : AppCompatActivity() {
 //            }
         }
 //        withContext(Dispatchers.Main) {
-//            binding.loadingIndicator.visibility = View.GONE
+            binding.loadingIndicator.visibility = View.GONE
 //            if(listAdapter?.isEmpty == true) {
 //                binding.empty.visibility = View.VISIBLE
 //            }
 //        }
     }
 
-    private  fun fetchSearchResults(): Boolean {
+//    private suspend fun fetchSearchResults(): Boolean = withContext(Dispatchers.IO) {
+    private fun fetchSearchResults(): Boolean {
         Log.i(TAG, "Preparing search results")
         var isOk: Boolean
         try { // get search string - passed in using extras so extras cannot be null
@@ -186,31 +208,53 @@ class MySearchResults : AppCompatActivity() {
             isOk = false
             Dialogs.instance.showErrorMsg(R.string.error_executing_search) { onBackPressed() }
         }
-        return isOk
+//    return@withContext isOk
+    return isOk
     }
 
     /**
      * Move search results into view Adapter
      */
     private fun populateViewResultsAdapter() {
+
         mCurrentlyDisplayedSearchResults = if (isScriptureResultsCurrentlyShown) {
             mSearchResultsHolder!!.mainSearchResults
         } else {
             mSearchResultsHolder!!.otherSearchResults
         }
-        // addAll is only supported in Api 11+
-//        mKeyArrayAdapter!!.clear()
-//        for (key in mCurrentlyDisplayedSearchResults) {
-//            mKeyArrayAdapter!!.add(key)
-//        }
+        val extras = intent.extras
+        var searchDocument = extras!!.getString(SearchControl.SEARCH_DOCUMENT)
 
-        arrayList!!.clear()
+        mSearchArrayAdapter!!.clear()
+        bookStatistics.clear()
+        var listIndex = 0
         for (key in mCurrentlyDisplayedSearchResults) {
-//            mKeyArrayAdapter!!.add(key)
             var text = searchControl.getSearchResultVerseText(key)
-            arrayList.add(SearchResultsData(1,key.osisRef.toString() , key.osisID.toString(),"KJV",text))
+            mSearchArrayAdapter.add(SearchResultsData(1, key.osisID.toString(), key.name,searchDocument, text))
+
+            // Get the text of the verse
+            val bookOrdinal = ((key as Verse).book as BibleBook).ordinal
+            var mBibleBook = BibleBook.values()[bookOrdinal]
+            var bookNameLong = versification.getLongName(mBibleBook)  // key.rootName
+            val bookStat = bookStatistics.firstOrNull{it.book == bookNameLong}
+            if (bookStat == null) {
+                bookStatistics.add(BookStat(bookNameLong, 1, bookNameLong, bookOrdinal, listIndex))
+            } else {
+                bookStatistics.first{it.book == bookNameLong}.count += 1
+            }
+            listIndex += 1
         }
     }
+    /**
+     * Handle scripture/Appendix toggle
+     */
+    private val scriptureToggleClickListener = View.OnClickListener {
+        isScriptureResultsCurrentlyShown = !isScriptureResultsCurrentlyShown
+        populateViewResultsAdapter()
+//        mKeyArrayAdapter!!.notifyDataSetChanged()
+        searchResultsActionBarManager.setScriptureShown(isScriptureResultsCurrentlyShown)
+    }
+
     companion object {
         private const val TAG = " MySearchResults"
         private const val LIST_ITEM_TYPE = android.R.layout.simple_list_item_2
@@ -218,16 +262,6 @@ class MySearchResults : AppCompatActivity() {
 
 }
 
-//class SearchResultsListActivity : AppCompatActivity() {
-//    override fun onCreate(savedInstanceState: Bundle?) {
-//        super.onCreate(savedInstanceState)
-//
-//        val arrayList = ArrayList<SearchResultsData>()
-//        val customAdapter = SearchResultsAdapter(this, arrayList, searchControl)
-//        val list = findViewById<ListView>(R.id.list)
-//        list.adapter = customAdapter
-//    }
-//}
 
 class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManager,
                                 searchControl: SearchControl,
@@ -248,15 +282,17 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
                 frag = SearchResultsFragment.newInstance(1)
                 val bundle = Bundle()
                 bundle.putString("edttext", "From Activity")
-                bundle.putParcelableArrayList("mylist", arrayList)
-//                val fragobj = SearchResultsFragment()
+                bundle.putParcelableArrayList("mylist", mSearchArrayAdapter)
                 frag.setArguments(bundle)
-                frag.setEmployee(searchControl)
-                frag.setCurrentlyDisplayedSearchResults(mCurrentlyDisplayedSearchResults)
-                frag.setActiveWindowPageManagerProvider(activeWindowPageManagerProvider)
-                frag.setIntent(intent)
+                frag.searchControl = searchControl
+                frag.mCurrentlyDisplayedSearchResults = mCurrentlyDisplayedSearchResults
+                frag.activeWindowPageManagerProvider = activeWindowPageManagerProvider
+                frag.intent = intent
+            }
+            1-> {
+                frag = SearchStatisticsFragment()
+                frag.bookStatistics = bookStatistics
             }
-            1-> frag = SearchStatisticsFragment.newInstance("a","b")
             else -> frag = PlaceholderFragment.newInstance(1)
         }
 
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
index fef2ae2b7d..e656a7ca49 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
@@ -11,6 +11,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.ListAdapter;
 import android.widget.TextView;
@@ -35,15 +36,18 @@
 import org.jdom2.Text;
 
 
-public class SearchResultsAdapter extends BaseAdapter {
+public class SearchResultsAdapter extends ArrayAdapter<SearchResultsData> {
 
+	private int resource;
 	private ArrayList<SearchResultsData> arrayList;
 	private Context context;
 	private SearchControl searchControl;
 
-	public SearchResultsAdapter(Context context, ArrayList<SearchResultsData> arrayList, SearchControl searchControl) {
+	public SearchResultsAdapter(Context _context, int _resource, ArrayList<SearchResultsData> arrayList, SearchControl searchControl) {
+		super(_context, _resource, arrayList);
+		this.resource = _resource;
 		this.arrayList=arrayList;
-		this.context=context;
+		this.context=_context;
 		this.searchControl = searchControl;
 	}
 
@@ -65,10 +69,10 @@ public void unregisterDataSetObserver(DataSetObserver observer) {
 	public int getCount() {
 		return arrayList.size();
 	}
-	@Override
-	public Object getItem(int position) {
-		return position;
-	}
+//	@Override
+//	public Object getItem(int position) {
+//		return position;
+//	}
 
 	public Object getItemAtPosition(int position) {
 		return position;
@@ -83,38 +87,28 @@ public boolean hasStableIds() {
 	}
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
-		SearchResultsData subjectData=arrayList.get(position);
+		SearchResultsData resultData=arrayList.get(position);
 		if(convertView==null) {
-			LayoutInflater layoutInflater = LayoutInflater.from(context);
-			convertView=layoutInflater.inflate(R.layout.search_results_list_row, null);
-//			convertView.setOnClickListener(new View.OnClickListener() {
-//				@Override
-//				public void onClick(View v) {
-//				}
-//			});
+
+			LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			convertView=inflater.inflate(R.layout.search_results_list_row, null);
 
 			TextView reference=convertView.findViewById(R.id.reference);
-			reference.setText(subjectData.reference);
+			reference.setText(resultData.reference);
 
 			TextView translation=convertView.findViewById(R.id.translation);
-			translation.setText(subjectData.translation);
+			translation.setText(resultData.translation);
 
 			// Get the text of the verse
-			Book book = Books.installed().getBook("KJV");
+			Book book = Books.installed().getBook(resultData.translation);
 			try {
-				Key key = book.getKey(subjectData.osisKey);
+				Key key = book.getKey(resultData.osisKey);
 				Element verseTextElement = searchControl.getSearchResultVerseElement(key);
 				SpannableString verseTextHtml = highlightSearchText(SearchControl.originalSearchString, verseTextElement);
 
 				TextView verse=convertView.findViewById(R.id.verse);
 				verse.setText(verseTextHtml);
-//				verse.setOnClickListener(new View.OnClickListener() {
-//					@Override
-//					public void onClick(View v) {
-//						// This works but may stop if i have android:descendantFocusability="blocksDescendants" working
-//						Toast.makeText(v.getContext() , "Clicked verse control " + position + " " + subjectData.id ,Toast.LENGTH_SHORT).show();
-//
-//					}});
+
 			} catch (NoSuchKeyException e) {
 				e.printStackTrace();
 			}
@@ -127,7 +121,8 @@ public int getItemViewType(int position) {
 	}
 	@Override
 	public int getViewTypeCount() {
-		return arrayList.size();
+		if(getCount()<1) return 1;
+		return getCount();
 	}
 	@Override
 	public boolean isEmpty() {
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index 73de321267..ce5af2e0c9 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -1,29 +1,39 @@
 package net.bible.android.view.activity.search
 
-import android.app.Activity
 import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.LinearLayout
 import androidx.fragment.app.Fragment
 import android.widget.ListView
+import android.widget.TabHost
+import android.widget.TextView
 import android.widget.Toast
-import androidx.lifecycle.*
+import androidx.appcompat.widget.LinearLayoutCompat
+import androidx.constraintlayout.helper.widget.Flow
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.setPadding
+import androidx.viewpager.widget.ViewPager
+import com.google.android.material.tabs.TabLayout
 import net.bible.android.activity.databinding.SearchResultsVerseFragmentBinding
-import net.bible.android.view.activity.search.SearchResultsAdapter
-import net.bible.android.view.activity.search.SearchResultsData
 import net.bible.android.activity.R
+import net.bible.android.activity.databinding.SearchResultsLayoutActivityBinding
+import net.bible.android.activity.databinding.SearchResultsStatisticsFragmentBinding
 import net.bible.android.control.search.SearchControl
 import net.bible.android.view.activity.base.Dialogs
 import net.bible.android.view.activity.page.MainBibleActivity
 import org.apache.commons.lang3.StringUtils
 import org.crosswire.jsword.passage.Key
 import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
+import net.bible.android.view.activity.navigation.GridChoosePassageBook.Companion.getBookTextColor
 import net.bible.service.sword.SwordDocumentFacade
+import net.bible.service.common.CommonUtils
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -33,53 +43,18 @@ private const val ARG_PARAM2 = "param2"
  * A placeholder fragment containing a simple view.
  */
 
-class PageViewModel : ViewModel() {
-
-    private val _index = MutableLiveData<Int>()
-    val text: LiveData<String> = Transformations.map(_index) {
-        "Hello world from section: $it"
-    }
-
-    fun setIndex(index: Int) {
-        _index.value = index
-    }
-}
-
 class SearchResultsFragment : Fragment() {
 
-    private lateinit var pageViewModel: PageViewModel
     private var _binding: SearchResultsVerseFragmentBinding? = null
-    private lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
-
-    // This property is only valid between onCreateView and
-    // onDestroyView.
     private val binding get() = _binding!!
-    private var mCurrentlyDisplayedSearchResults: List<Key> = java.util.ArrayList()
-    private lateinit var intent: Intent
 
+    var mCurrentlyDisplayedSearchResults: List<Key> = java.util.ArrayList()
     var searchControl: SearchControl? = null
-
-    fun setEmployee(myEmp: SearchControl?) {
-        this.searchControl = myEmp
-    }
-    fun setCurrentlyDisplayedSearchResults(results: List<Key>) {
-        this.mCurrentlyDisplayedSearchResults = results
-    }
-    fun setActiveWindowPageManagerProvider(x: ActiveWindowPageManagerProvider) {
-        this.activeWindowPageManagerProvider = x
-    }
-    fun setIntent(x: Intent){
-        this.intent = x
-    }
+    lateinit var intent: Intent
+    lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        pageViewModel = ViewModelProvider(
-            this,
-            ViewModelProvider.NewInstanceFactory()
-        ).get(PageViewModel::class.java).apply {
-            setIndex(arguments?.getInt(ARG_SECTION_NUMBER) ?: 1)
-        }
     }
 
     override fun onCreateView(
@@ -90,39 +65,27 @@ class SearchResultsFragment : Fragment() {
         _binding = SearchResultsVerseFragmentBinding.inflate(inflater, container, false)
         val root = binding.root
 
-        pageViewModel.text.observe(viewLifecycleOwner, Observer {
-            val strtext = requireArguments().getString("edttext")
-            val arr: ArrayList<SearchResultsData> = requireArguments().getParcelableArrayList("mylist")!!
-
-            val customAdapter = SearchResultsAdapter(activity, arr, searchControl)
-
-            val list: ListView = binding.searchResultsList
-            list.adapter = customAdapter
-            list.descendantFocusability = ViewGroup.FOCUS_BEFORE_DESCENDANTS;
-            list.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
-            list.isVerticalScrollBarEnabled = false
-
-            list.setOnItemClickListener { parent, view, position, id ->
-                val element = customAdapter.getItemAtPosition(position) // The item that was clicked
-                Toast.makeText(list.context, "Hi",Toast.LENGTH_LONG)
-                try { // no need to call HistoryManager.addHistoryItem() here because PassageChangeMediator will tell HistoryManager a change is about to occur
-                    verseSelected(mCurrentlyDisplayedSearchResults[position])
-                } catch (e: Exception) {
-                    Log.e("blah", "Selection error", e)
-                    Dialogs.instance.showErrorMsg(R.string.error_occurred, e)
-                }
-//                val intent = Intent(this, BookDetailActivity::class.java)
-//                startActivity(intent)
-            }
-
+        val strtext = requireArguments().getString("edttext")
+        val arr: ArrayList<SearchResultsData> = requireArguments().getParcelableArrayList("mylist")!!
 
+        val customAdapter = SearchResultsAdapter(activity, android.R.layout.simple_list_item_2, arr, searchControl)
 
+        val resultList: ListView = binding.searchResultsList
+        resultList.adapter = customAdapter
+        resultList.descendantFocusability = ViewGroup.FOCUS_BEFORE_DESCENDANTS;
+        resultList.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+        resultList.isVerticalScrollBarEnabled = false
 
-
-        })
+        resultList.setOnItemClickListener { parent, view, position, id ->
+            Toast.makeText(resultList.context, "Hi",Toast.LENGTH_LONG)
+            try { // no need to call HistoryManager.addHistoryItem() here because PassageChangeMediator will tell HistoryManager a change is about to occur
+                verseSelected(mCurrentlyDisplayedSearchResults[position])
+            } catch (e: Exception) {
+                Log.e("blah", "Selection error", e)
+                Dialogs.instance.showErrorMsg(R.string.error_occurred, e)
+            }
+        }
         return root
-
-
     }
 
     private fun verseSelected(key: Key?) {
@@ -158,9 +121,9 @@ class SearchResultsFragment : Fragment() {
         @JvmStatic
         fun newInstance(sectionNumber: Int): SearchResultsFragment {
             return SearchResultsFragment().apply {
-                arguments = Bundle().apply {
-                    putInt(ARG_SECTION_NUMBER, sectionNumber)
-                }
+//                arguments = Bundle().apply {
+//                    putInt(ARG_SECTION_NUMBER, sectionNumber)
+//                }
             }
         }
     }
@@ -169,53 +132,89 @@ class SearchResultsFragment : Fragment() {
         super.onDestroyView()
         _binding = null
     }
-
 }
 
 class SearchStatisticsFragment : Fragment() {
-    // TODO: Rename and change types of parameters
-    private var param1: String? = null
-    private var param2: String? = null
+    private var _binding: SearchResultsStatisticsFragmentBinding? = null
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let {
-            param1 = it.getString(ARG_PARAM1)
-            param2 = it.getString(ARG_PARAM2)
-        }
-    }
+    private val binding get() = _binding!!
+    var bookStatistics = mutableListOf<BookStat>()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.search_results_statistics_fragment, container, false)
-    }
+        _binding = SearchResultsStatisticsFragmentBinding.inflate(inflater, container, false)
+        val root = binding.root
 
-    companion object {
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         *
-         * @param param1 Parameter 1.
-         * @param param2 Parameter 2.
-         * @return A new instance of fragment SearchStatisticsFragment.
-         */
-        // TODO: Rename and change types and number of parameters
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-            SearchStatisticsFragment().apply {
-                arguments = Bundle().apply {
-                    putString(ARG_PARAM1, param1)
-                    putString(ARG_PARAM2, param2)
-                }
+        val buttonLayout: ConstraintLayout = _binding!!.buttonLayout
+        val flowContainer: Flow = _binding!!.flowContainer
+
+        var buttonIds = intArrayOf()
+
+        bookStatistics.map {
+            val newButton = Button(flowContainer.context)
+            newButton.setLayoutParams(LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT))
+            newButton.setText("${it.book} = ${it.count}")
+            newButton.id = View.generateViewId()
+            newButton.isAllCaps = false
+            newButton.tag = it.listIndex
+//            newButton.setPadding(20)
+//            val drawable = resources.getDrawable(R.drawable.search_result_statistics_button)
+//            val gd = GradientDrawable(
+//                GradientDrawable.Orientation.TOP_BOTTOM, intArrayOf(R.color.accent_day, R.color.blue_100, R.color.red)
+//            )
+//            gd.setCornerRadius(0f)
+////            newButton.setBackgroundResource(R.drawable.search_result_statistics_button)
+//            newButton.setBackground(gd)
+
+//            newButton.setBackgroundResource(R.drawable.search_result_statistics_button)
+
+            newButton.setOnClickListener {
+                val tabhost = requireActivity().findViewById<View>(R.id.tabs) as TabLayout
+                tabhost.getTabAt(0)!!.select()
+//                tabs.getTabAt(1)?.select()
+////                viewPager.currentItem = 0
+                val resultLis = requireActivity().findViewById<View>(R.id.searchResultsList) as ListView
+//                resultLis.smoothScrollToPosition(it.tag as Int);
+//                val position: Int = resultLis.getPositionForView(tabhost)
+//                resultLis.setSelection(position+1)
+                resultLis.smoothScrollToPosition(it.tag as Int);
+                Toast.makeText(buttonLayout.context, newButton.text, Toast.LENGTH_LONG)
             }
+            buttonLayout.addView(newButton)
+            buttonIds += newButton.id
+        }
+        flowContainer.referencedIds = buttonIds
+
+        return root
     }
+
+//    companion object {
+//        /**
+//         * Use this factory method to create a new instance of
+//         * this fragment using the provided parameters.
+//         *
+//         * @param param1 Parameter 1.
+//         * @param param2 Parameter 2.
+//         * @return A new instance of fragment SearchStatisticsFragment.
+//         */
+//        // TODO: Rename and change types and number of parameters
+//        @JvmStatic
+//        fun newInstance() =
+//            SearchStatisticsFragment().apply {
+//                arguments = Bundle().apply {
+////                    putString(ARG_PARAM1, param1)
+////                    putString(ARG_PARAM2, param2)
+//                }
+//            }
+//    }
 }
+
 class PlaceholderFragment : Fragment() {
 
-    private lateinit var pageViewModel: PageViewModel
+//    private lateinit var pageViewModel: PageViewModel
     private var _binding: SearchResultsVerseFragmentBinding? = null
 
     // This property is only valid between onCreateView and
@@ -224,12 +223,6 @@ class PlaceholderFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        pageViewModel = ViewModelProvider(
-            this,
-            ViewModelProvider.NewInstanceFactory()
-        ).get(PageViewModel::class.java).apply {
-            setIndex(arguments?.getInt(ARG_SECTION_NUMBER) ?: 1)
-        }
     }
 
     override fun onCreateView(
diff --git a/app/src/main/res/drawable/search_result_statistics_button.xml b/app/src/main/res/drawable/search_result_statistics_button.xml
new file mode 100644
index 0000000000..5cbde3849c
--- /dev/null
+++ b/app/src/main/res/drawable/search_result_statistics_button.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2020 Martin Denham, Tuomas Airaksinen and the And Bible contributors.
+  ~
+  ~ This file is part of And Bible (http://github.com/AndBible/and-bible).
+  ~
+  ~ And Bible is free software: you can redistribute it and/or modify it under the
+  ~ terms of the GNU General Public License as published by the Free Software Foundation,
+  ~ either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ And Bible is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along with And Bible.
+  ~ If not, see http://www.gnu.org/licenses/.
+  ~
+  -->
+
+
+
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:topRightRadius="36dp" android:bottomRightRadius="36dp" android:topLeftRadius="16dp" android:bottomLeftRadius="16dp"/>
+    <solid
+        android:color="@android:color/holo_red_light"/>
+    <gradient
+        android:id="@+id/gradient"
+        android:startColor="@color/white"
+        android:centerColor="@color/white"
+        android:endColor="#ff23729a"
+        android:centerY="90%"
+        android:angle="-90" />
+</shape>
+
+
+
+
diff --git a/app/src/main/res/layout/search_results_layout_activity.xml b/app/src/main/res/layout/search_results_layout_activity.xml
index 01e72b4f63..c9bdc764bc 100644
--- a/app/src/main/res/layout/search_results_layout_activity.xml
+++ b/app/src/main/res/layout/search_results_layout_activity.xml
@@ -4,26 +4,39 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-
 	>
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="#64CCFB">
+		android:layout_height="50dp"
+		android:theme="@style/AppTheme"
+		>
 
 		<com.google.android.material.tabs.TabLayout
 			android:id="@+id/tabs"
+			app:tabTextColor="@color/white"
+			app:tabSelectedTextColor="@color/white"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content" />
 	</com.google.android.material.appbar.AppBarLayout>
-
+	<ProgressBar
+		android:id="@+id/loadingIndicator"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:visibility="gone"
+		/>
+	<TextView
+		android:id="@+id/empty"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:textAppearance="?attr/textAppearanceListItem"
+		android:gravity="center_horizontal"
+		android:paddingTop="16dip"
+		android:text="@string/empty_list"/>
 	<androidx.viewpager.widget.ViewPager
 		android:id="@+id/view_pager"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:paddingLeft="10dp"
-		android:paddingRight="10dp"
 		app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/search_results_list_row.xml b/app/src/main/res/layout/search_results_list_row.xml
index 55e6012b98..33e31d91d1 100644
--- a/app/src/main/res/layout/search_results_list_row.xml
+++ b/app/src/main/res/layout/search_results_list_row.xml
@@ -7,7 +7,7 @@
 	android:focusable="false"
 	android:clickable="false"
 	android:descendantFocusability="blocksDescendants">
-	android:padding="5dip">
+	android:padding="0dip">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -27,6 +27,7 @@
 			android:textSize="15dip"
 			android:focusable="false"
 			android:focusableInTouchMode="false"
+			android:paddingLeft="10dp"
 			android:textStyle="" />
 
 		<TextView
@@ -35,6 +36,7 @@
 			android:layout_height="match_parent"
 			android:gravity="right"
 			android:paddingLeft="10dp"
+			android:paddingRight="5dp"
 			android:text="Translation"
 			android:textSize="10dip"
 			android:focusable="false"
@@ -49,6 +51,10 @@
 		android:layout_weight="1"
 		android:focusable="false"
 		android:focusableInTouchMode="false"
+		android:textSize="13dip"
+		android:paddingLeft="15dp"
+		android:paddingRight="5dp"
+		android:paddingBottom="3dp"
 		android:text="TextView" />
 
 
diff --git a/app/src/main/res/layout/search_results_statistics_fragment.xml b/app/src/main/res/layout/search_results_statistics_fragment.xml
index 5e86b1b61a..7cf5a84c7a 100644
--- a/app/src/main/res/layout/search_results_statistics_fragment.xml
+++ b/app/src/main/res/layout/search_results_statistics_fragment.xml
@@ -1,14 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="wrap_content"
+	android:layout_height="match_parent"
+	android:fillViewport="true">
+
+<androidx.constraintlayout.widget.ConstraintLayout
+	android:id="@+id/buttonLayout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="@color/blue_A200">
+	android:orientation="vertical">
+
+	<androidx.constraintlayout.helper.widget.Flow
+		android:id="@+id/flowContainer"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		app:constraint_referenced_ids=""
+		app:flow_horizontalGap="4dp"
+		app:flow_horizontalStyle="packed"
+		app:flow_horizontalBias="0"
+		app:flow_verticalBias="1"
+		app:flow_verticalGap="4dp"
+		app:flow_wrapMode="chain"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.51"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
+
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
 
-	<!-- TODO: Update blank fragment layout -->
-	<TextView
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:text="@string/about_version_history" />
 
-</FrameLayout>
diff --git a/app/src/main/res/layout/search_results_statistics_row.xml b/app/src/main/res/layout/search_results_statistics_row.xml
new file mode 100644
index 0000000000..fffcf548b8
--- /dev/null
+++ b/app/src/main/res/layout/search_results_statistics_row.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		>
+
+		<Button
+			android:id="@+id/button3"
+			android:layout_width="170dp"
+			android:layout_height="wrap_content"
+			android:text="Song of Solomon"
+			app:layout_anchor="@+id/button2"
+			app:layout_anchorGravity="end|top" />
+
+		<TextView
+			android:id="@+id/textView"
+			android:layout_width="30dp"
+			android:layout_height="wrap_content"
+			android:text="345"
+			android:textAlignment="center"
+			android:textSize="16sp"
+			android:textStyle="bold" />
+
+		<ProgressBar
+			android:id="@+id/loadingIndicator"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:progressDrawable="@color/accent_night"
+			android:style="@style/Widget.AppCompat.ProgressBar"
+			android:visibility="visible" />
+
+
+	</LinearLayout>
+
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/search_results_verse_fragment.xml b/app/src/main/res/layout/search_results_verse_fragment.xml
index 7d8ed9ec73..8940dac28f 100644
--- a/app/src/main/res/layout/search_results_verse_fragment.xml
+++ b/app/src/main/res/layout/search_results_verse_fragment.xml
@@ -9,16 +9,15 @@
 	>
 
 	<ListView
-		android:descendantFocusability="blocksDescendants"
 		android:id="@+id/searchResultsList"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:divider="#25020202"
+		android:descendantFocusability="blocksDescendants"
+		android:divider="@color/blue_grey_50"
 		android:dividerHeight="1dp"
 		android:footerDividersEnabled="true"
 		android:headerDividersEnabled="true"
-		app:layout_constraintEnd_toEndOf="parent"
-		>
+		app:layout_constraintEnd_toEndOf="parent">
 
 
 	</ListView>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
new file mode 100644
index 0000000000..80bb66b3ca
--- /dev/null
+++ b/app/src/main/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="flowContainer" type="id" />
+</resources>

From 210ca692266ec2c2dd2cf039152da563f0c8a60a Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Thu, 13 Jan 2022 13:39:08 +1000
Subject: [PATCH 10/37] Mostly working with progress bars

---
 .../view/activity/search/MySearchResults.kt   |  23 ++--
 .../activity/search/SearchResultsFragments.kt | 104 ++++++++++--------
 .../search_results_statistics_fragment.xml    |  29 ++---
 .../layout/search_results_statistics_row.xml  |  34 ++++--
 app/src/main/res/values/strings.xml           |   4 +-
 5 files changed, 110 insertions(+), 84 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 185bb3f27a..eb0996de01 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -30,18 +30,25 @@ import org.crosswire.jsword.passage.Verse
 import javax.inject.Inject
 import org.crosswire.jsword.versification.BibleBook
 import org.crosswire.jsword.versification.Versification
+import net.bible.android.view.activity.navigation.GridChoosePassageBook.Companion.getBookTextColor
+import net.bible.service.common.CommonUtils
+import net.bible.service.common.CommonUtils.resources
 
 
-
-private val TAB_TITLES = arrayOf(
-    R.string.results,
-    R.string.statistics
+private var TAB_TITLES = arrayOf(
+    resources.getString(R.string.results_count),
+    resources.getString(R.string.by_book),
+    resources.getString(R.string.by_word)
 )
 private val mSearchArrayAdapter = ArrayList<SearchResultsData>()
 private var mCurrentlyDisplayedSearchResults: List<Key> = ArrayList()
 private val bookStatistics = mutableListOf<BookStat>()
 
-class BookStat(val book: String, var count: Int, val bookInitials: String, val bookOrdinal:Int, val listIndex:Int) {
+class BookStat(val book: String, var count: Int,
+               val bookInitials: String,
+               val bookOrdinal:Int,
+               val listIndex:Int,
+                val color: Int) {
     override fun toString(): String = "$book: $count"
 }
 
@@ -238,12 +245,13 @@ class MySearchResults : CustomTitlebarActivityBase() {
             var bookNameLong = versification.getLongName(mBibleBook)  // key.rootName
             val bookStat = bookStatistics.firstOrNull{it.book == bookNameLong}
             if (bookStat == null) {
-                bookStatistics.add(BookStat(bookNameLong, 1, bookNameLong, bookOrdinal, listIndex))
+                bookStatistics.add(BookStat(bookNameLong, 1, bookNameLong, bookOrdinal, listIndex, getBookTextColor(bookOrdinal) ))
             } else {
                 bookStatistics.first{it.book == bookNameLong}.count += 1
             }
             listIndex += 1
         }
+        TAB_TITLES[0] = resources.getString(R.string.results_count, listIndex)
     }
     /**
      * Handle scripture/Appendix toggle
@@ -262,7 +270,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
 }
 
-
 class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManager,
                                 searchControl: SearchControl,
                                 activeWindowPageManagerProvider: ActiveWindowPageManagerProvider,
@@ -300,7 +307,7 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
     }
 
     override fun getPageTitle(position: Int): CharSequence? {
-        return context.resources.getString(TAB_TITLES[position])
+        return TAB_TITLES[position]
     }
 
     override fun getCount(): Int {
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index ce5af2e0c9..482eea8d33 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -1,39 +1,31 @@
 package net.bible.android.view.activity.search
 
 import android.content.Intent
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.GradientDrawable
+import android.content.res.ColorStateList
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
-import android.widget.LinearLayout
 import androidx.fragment.app.Fragment
 import android.widget.ListView
-import android.widget.TabHost
+import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
-import androidx.appcompat.widget.LinearLayoutCompat
-import androidx.constraintlayout.helper.widget.Flow
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.setPadding
-import androidx.viewpager.widget.ViewPager
 import com.google.android.material.tabs.TabLayout
 import net.bible.android.activity.databinding.SearchResultsVerseFragmentBinding
 import net.bible.android.activity.R
-import net.bible.android.activity.databinding.SearchResultsLayoutActivityBinding
 import net.bible.android.activity.databinding.SearchResultsStatisticsFragmentBinding
+import net.bible.android.activity.databinding.SearchResultsStatisticsRowBinding
 import net.bible.android.control.search.SearchControl
 import net.bible.android.view.activity.base.Dialogs
 import net.bible.android.view.activity.page.MainBibleActivity
 import org.apache.commons.lang3.StringUtils
 import org.crosswire.jsword.passage.Key
 import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
-import net.bible.android.view.activity.navigation.GridChoosePassageBook.Companion.getBookTextColor
 import net.bible.service.sword.SwordDocumentFacade
-import net.bible.service.common.CommonUtils
+
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -146,47 +138,73 @@ class SearchStatisticsFragment : Fragment() {
     ): View? {
         // Inflate the layout for this fragment
         _binding = SearchResultsStatisticsFragmentBinding.inflate(inflater, container, false)
+        var rowBinding = SearchResultsStatisticsRowBinding.inflate(inflater, container, false)
         val root = binding.root
 
-        val buttonLayout: ConstraintLayout = _binding!!.buttonLayout
-        val flowContainer: Flow = _binding!!.flowContainer
+        val statisticsLayout = binding.statisticsLayout
 
         var buttonIds = intArrayOf()
 
+        val maxCount: Int = bookStatistics.maxOfOrNull { it.count } ?: 0
         bookStatistics.map {
-            val newButton = Button(flowContainer.context)
-            newButton.setLayoutParams(LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT))
-            newButton.setText("${it.book} = ${it.count}")
-            newButton.id = View.generateViewId()
-            newButton.isAllCaps = false
-            newButton.tag = it.listIndex
-//            newButton.setPadding(20)
-//            val drawable = resources.getDrawable(R.drawable.search_result_statistics_button)
-//            val gd = GradientDrawable(
-//                GradientDrawable.Orientation.TOP_BOTTOM, intArrayOf(R.color.accent_day, R.color.blue_100, R.color.red)
-//            )
-//            gd.setCornerRadius(0f)
-////            newButton.setBackgroundResource(R.drawable.search_result_statistics_button)
-//            newButton.setBackground(gd)
-
-//            newButton.setBackgroundResource(R.drawable.search_result_statistics_button)
-
-            newButton.setOnClickListener {
+
+            val to_add: View = inflater.inflate(
+                R.layout.search_results_statistics_row,
+                statisticsLayout, false
+            )
+            var button = to_add.findViewById<Button>(R.id.searchStatisticsBookButton)
+            button.setText(it.book)
+            var text = to_add.findViewById<TextView>(R.id.searchStatisticsBookCount)
+            text.setText("${it.count}")
+            var progressBar = to_add.findViewById<ProgressBar>(R.id.searchStatisticsBookCountProgress)
+            progressBar.max = maxCount
+            progressBar.progress = it.count
+            progressBar.setProgressTintList(ColorStateList.valueOf(it.color))
+            to_add.visibility = View.VISIBLE
+            statisticsLayout.addView(to_add)
+
+            button.tag = it.listIndex
+            button.setOnClickListener {
                 val tabhost = requireActivity().findViewById<View>(R.id.tabs) as TabLayout
                 tabhost.getTabAt(0)!!.select()
-//                tabs.getTabAt(1)?.select()
-////                viewPager.currentItem = 0
-                val resultLis = requireActivity().findViewById<View>(R.id.searchResultsList) as ListView
-//                resultLis.smoothScrollToPosition(it.tag as Int);
-//                val position: Int = resultLis.getPositionForView(tabhost)
-//                resultLis.setSelection(position+1)
-                resultLis.smoothScrollToPosition(it.tag as Int);
-                Toast.makeText(buttonLayout.context, newButton.text, Toast.LENGTH_LONG)
+                val resultList = requireActivity().findViewById<View>(R.id.searchResultsList) as ListView
+                resultList.setSelection(it.tag as Int);
             }
-            buttonLayout.addView(newButton)
-            buttonIds += newButton.id
+//            to_add.invalidate()
+            to_add.requestLayout()
+//            statisticsLayout.invalidate()
+//        statisticsLayout.requestLayout()
+
+//            val text = to_add.findViewById<View>(R.id.text) as TextView
+//            text.setText(options.get(i))
+//            text.setTypeface(FontSelector.getBold(activity))
+
+//
+//            val newButton = Button(flowContainer.context)
+//            newButton.setLayoutParams(LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT))
+//            newButton.setText("${it.book} = ${it.count}")
+//            newButton.id = View.generateViewId()
+//            newButton.isAllCaps = false
+//            newButton.tag = it.listIndex
+
+
+
+//            newButton.setOnClickListener {
+//                val tabhost = requireActivity().findViewById<View>(R.id.tabs) as TabLayout
+//                tabhost.getTabAt(0)!!.select()
+////                tabs.getTabAt(1)?.select()
+//////                viewPager.currentItem = 0
+//                val resultLis = requireActivity().findViewById<View>(R.id.searchResultsList) as ListView
+////                resultLis.smoothScrollToPosition(it.tag as Int);
+////                val position: Int = resultLis.getPositionForView(tabhost)
+////                resultLis.setSelection(position+1)
+//                resultLis.smoothScrollToPosition(it.tag as Int);
+//                Toast.makeText(buttonLayout.context, newButton.text, Toast.LENGTH_LONG)
+//            }
+//            buttonLayout.addView(newButton)
+//            buttonIds += newButton.id
         }
-        flowContainer.referencedIds = buttonIds
+//        flowContainer.referencedIds = buttonIds
 
         return root
     }
diff --git a/app/src/main/res/layout/search_results_statistics_fragment.xml b/app/src/main/res/layout/search_results_statistics_fragment.xml
index 7cf5a84c7a..d6e124d247 100644
--- a/app/src/main/res/layout/search_results_statistics_fragment.xml
+++ b/app/src/main/res/layout/search_results_statistics_fragment.xml
@@ -6,30 +6,15 @@
 	android:layout_height="match_parent"
 	android:fillViewport="true">
 
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/buttonLayout"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
-
-	<androidx.constraintlayout.helper.widget.Flow
-		android:id="@+id/flowContainer"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		app:constraint_referenced_ids=""
-		app:flow_horizontalGap="4dp"
-		app:flow_horizontalStyle="packed"
-		app:flow_horizontalBias="0"
-		app:flow_verticalBias="1"
-		app:flow_verticalGap="4dp"
-		app:flow_wrapMode="chain"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.51"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
+	<LinearLayout
+		android:id="@+id/statisticsLayout"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical"
+		>
 
+	</LinearLayout>
 
-	</androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
 
 
diff --git a/app/src/main/res/layout/search_results_statistics_row.xml b/app/src/main/res/layout/search_results_statistics_row.xml
index fffcf548b8..c3aa00f027 100644
--- a/app/src/main/res/layout/search_results_statistics_row.xml
+++ b/app/src/main/res/layout/search_results_statistics_row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -10,18 +10,20 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
-		>
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
 
 		<Button
-			android:id="@+id/button3"
+			android:id="@+id/searchStatisticsBookButton"
 			android:layout_width="170dp"
-			android:layout_height="wrap_content"
+			android:layout_height="36dp"
 			android:text="Song of Solomon"
+			android:textSize="12dp"
 			app:layout_anchor="@+id/button2"
 			app:layout_anchorGravity="end|top" />
 
 		<TextView
-			android:id="@+id/textView"
+			android:id="@+id/searchStatisticsBookCount"
 			android:layout_width="30dp"
 			android:layout_height="wrap_content"
 			android:text="345"
@@ -30,16 +32,28 @@
 			android:textStyle="bold" />
 
 		<ProgressBar
-			android:id="@+id/loadingIndicator"
+			android:id="@+id/searchStatisticsBookCountProgress"
+			style="?android:attr/progressBarStyleHorizontal"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
+			android:layout_height="10dp"
+			android:layout_centerInParent="true"
+			android:layout_marginLeft="5dp"
+			android:layout_marginTop="13dp"
+			android:layout_marginRight="10dp"
 			android:layout_weight="1"
-			android:progressDrawable="@color/accent_night"
-			android:style="@style/Widget.AppCompat.ProgressBar"
+			android:indeterminate="false"
+			android:max="100"
+			android:min="0"
+			android:progress="45"
+			android:progressBackgroundTint="@color/transparent"
+			android:progressTint="@color/red"
+			android:scaleY="4"
 			android:visibility="visible" />
 
 
 	</LinearLayout>
 
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 645256337a..dbda7467d4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -78,8 +78,10 @@
     <string name="accuracy">Accuracy</string>
     <string name="greek">Greek</string>
     <string name="hebrew">Hebrew</string>
-    <string name="results">Results</string>
+    <string name="results_count">Results: %s</string>
     <string name="statistics">Statistics</string>
+    <string name="by_book">By Book</string>
+    <string name="by_word">By Word</string>
 
     <!-- Preferences -->
     <string name="prefs_show_verseno_title">Chapter &amp; verse numbers</string>

From 2966e8bc7602f18385b504d088e57ee85f260ae2 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Fri, 14 Jan 2022 13:15:42 +1000
Subject: [PATCH 11/37] Implemented Word Stats

---
 .../bible/android/control/link/LinkControl.kt |   3 +-
 .../view/activity/search/MySearchResults.kt   |  61 +++++-
 .../view/activity/search/SearchHighlight.kt   | 140 ++++++++++++++
 .../activity/search/SearchResultsAdapter.java | 175 ++---------------
 .../activity/search/SearchResultsFragments.kt | 179 +++++++++---------
 .../layout/search_results_statistics_row.xml  |   2 +-
 .../search_results_word_statistics_row.xml    |  58 ++++++
 7 files changed, 366 insertions(+), 252 deletions(-)
 create mode 100644 app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
 create mode 100644 app/src/main/res/layout/search_results_word_statistics_row.xml

diff --git a/app/src/main/java/net/bible/android/control/link/LinkControl.kt b/app/src/main/java/net/bible/android/control/link/LinkControl.kt
index 5910fbcd6e..21e8a473b8 100644
--- a/app/src/main/java/net/bible/android/control/link/LinkControl.kt
+++ b/app/src/main/java/net/bible/android/control/link/LinkControl.kt
@@ -31,6 +31,7 @@ import net.bible.android.control.search.SearchControl.SearchBibleSection
 import net.bible.android.view.activity.base.CurrentActivityHolder
 import net.bible.android.view.activity.base.Dialogs
 import net.bible.android.view.activity.page.BibleView
+import net.bible.android.view.activity.search.MySearchResults
 import net.bible.android.view.activity.search.SearchIndex
 import net.bible.android.view.activity.search.SearchResults
 import net.bible.service.common.CommonUtils.settings
@@ -237,7 +238,7 @@ class LinkControl @Inject constructor(
         intent = if (needToDownloadIndex) {
             Intent(activity, SearchIndex::class.java)
         } else { //If an indexed Strong's module is in place then do the search - the normal situation
-            Intent(activity, SearchResults::class.java)
+            Intent(activity, MySearchResults::class.java)
         }
         intent.putExtras(searchParams)
         activity.startActivity(intent)
diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index eb0996de01..000a621452 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -3,12 +3,15 @@ package net.bible.android.view.activity.search
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
+import android.graphics.Typeface
 import android.os.Bundle
 import android.os.Parcel
 import android.os.Parcelable
+import android.text.style.StyleSpan
 import android.util.Log
 import android.view.View
 import android.widget.Toast
+import androidx.core.text.toHtml
 import com.google.android.material.tabs.TabLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
@@ -31,10 +34,8 @@ import javax.inject.Inject
 import org.crosswire.jsword.versification.BibleBook
 import org.crosswire.jsword.versification.Versification
 import net.bible.android.view.activity.navigation.GridChoosePassageBook.Companion.getBookTextColor
-import net.bible.service.common.CommonUtils
 import net.bible.service.common.CommonUtils.resources
 
-
 private var TAB_TITLES = arrayOf(
     resources.getString(R.string.results_count),
     resources.getString(R.string.by_book),
@@ -43,6 +44,7 @@ private var TAB_TITLES = arrayOf(
 private val mSearchArrayAdapter = ArrayList<SearchResultsData>()
 private var mCurrentlyDisplayedSearchResults: List<Key> = ArrayList()
 private val bookStatistics = mutableListOf<BookStat>()
+private val wordStatistics = mutableListOf<WordStat>()
 
 class BookStat(val book: String, var count: Int,
                val bookInitials: String,
@@ -51,6 +53,13 @@ class BookStat(val book: String, var count: Int,
                 val color: Int) {
     override fun toString(): String = "$book: $count"
 }
+class WordStat(val word: String,
+               var verseIndexes: IntArray,
+               val originalWord: String) {
+    override fun toString(): String = "$originalWord: ${verseIndexes.count()}"
+}
+
+private var wordHits: ArrayList<Pair<String, ArrayList<Int>>> = arrayListOf()
 
 class SearchResultsData : Parcelable {
     @JvmField
@@ -63,14 +72,18 @@ class SearchResultsData : Parcelable {
     var translation: String?
     @JvmField
     var verse: String?
+    @JvmField
+    var verseHtml: String?  // I would prefer to pass a spannable string but i dont know how to make it parcelable
+
     /* What I really want to do is make the 'Key' parcelable but I don't know how to do that. So instead I have to send the properties I need and get the key later on */
 
-    constructor(Id: Int?, OsisKey: String?, Reference: String?, Translation: String?, Verse: String?) {
+    constructor(Id: Int?, OsisKey: String?, Reference: String?, Translation: String?, Verse: String?, VerseHtml: String?) {
         id = Id;
         osisKey = OsisKey
         reference = Reference
         translation = Translation
         verse = Verse
+        verseHtml = VerseHtml
     }
 
     protected constructor(`in`: Parcel) {
@@ -79,6 +92,7 @@ class SearchResultsData : Parcelable {
         reference = `in`.readString()
         translation = `in`.readString()
         verse = `in`.readString()
+        verseHtml = `in`.readString()
     }
 
     override fun describeContents(): Int {
@@ -91,6 +105,8 @@ class SearchResultsData : Parcelable {
         dest.writeString(reference)
         dest.writeString(translation)
         dest.writeString(verse)
+        dest.writeString(verseHtml)
+
     }
 
     companion object CREATOR : Parcelable.Creator<SearchResultsData> {
@@ -234,10 +250,10 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
         mSearchArrayAdapter!!.clear()
         bookStatistics.clear()
+        wordStatistics.clear()
+
         var listIndex = 0
         for (key in mCurrentlyDisplayedSearchResults) {
-            var text = searchControl.getSearchResultVerseText(key)
-            mSearchArrayAdapter.add(SearchResultsData(1, key.osisID.toString(), key.name,searchDocument, text))
 
             // Get the text of the verse
             val bookOrdinal = ((key as Verse).book as BibleBook).ordinal
@@ -249,9 +265,34 @@ class MySearchResults : CustomTitlebarActivityBase() {
             } else {
                 bookStatistics.first{it.book == bookNameLong}.count += 1
             }
+
+            val verseTextElement = searchControl.getSearchResultVerseElement(key)
+            val verseTextSpannable = SearchHighlight.getSpannableText(SearchControl.originalSearchString, verseTextElement)
+
+            mSearchArrayAdapter.add(SearchResultsData(1, key.osisID.toString(), key.name,searchDocument, "text", verseTextSpannable!!.toHtml()))
+
+            var ss: Array<StyleSpan> = verseTextSpannable!!.getSpans(0, verseTextSpannable?.length, StyleSpan::class.java)
+
+            for (i in ss.indices) {
+                if (ss[i].getStyle() === Typeface.BOLD) {
+                    val start = verseTextSpannable.getSpanStart(ss[i])
+                    val end = verseTextSpannable.getSpanEnd(ss[i])
+
+                    var wordArray = CharArray(end-start)
+                    verseTextSpannable.getChars(start, end, wordArray, 0)
+                    val originalWord = wordArray.joinToString("")
+                    val word = originalWord.lowercase()
+                    val wordStat = wordStatistics.firstOrNull{it.word == word}
+                    if (wordStat == null) {
+                        wordStatistics.add(WordStat(word, intArrayOf(listIndex), originalWord))
+                    } else {
+                        wordStatistics.first{it.word == word}.verseIndexes += listIndex
+                    }
+                }
+            }
             listIndex += 1
         }
-        TAB_TITLES[0] = resources.getString(R.string.results_count, listIndex)
+        TAB_TITLES[0] = resources.getString(R.string.results_count, listIndex.toString())
     }
     /**
      * Handle scripture/Appendix toggle
@@ -297,9 +338,13 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
                 frag.intent = intent
             }
             1-> {
-                frag = SearchStatisticsFragment()
+                frag = SearchBookStatisticsFragment()
                 frag.bookStatistics = bookStatistics
             }
+            2-> {
+                frag = SearchWordStatisticsFragment()
+                frag.wordStatistics = wordStatistics
+            }
             else -> frag = PlaceholderFragment.newInstance(1)
         }
 
@@ -312,6 +357,6 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
 
     override fun getCount(): Int {
         // Show 2 total pages.
-        return 2
+        return 3
     }
 }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
new file mode 100644
index 0000000000..3797fd132a
--- /dev/null
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
@@ -0,0 +1,140 @@
+package net.bible.android.view.activity.search
+
+import android.graphics.Typeface
+import android.text.Html
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.StyleSpan
+import android.util.Log
+import org.jdom2.Element
+import org.jdom2.Text
+import java.lang.Exception
+import java.util.*
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
+class SearchHighlight {
+
+    companion object {
+        fun getSpannableText(searchTerms: String, textElement: Element): SpannableString? {
+            var searchTerms = searchTerms
+            var spannableText: SpannableString? = null
+            try {
+                var verseString: String? = ""
+                searchTerms = prepareSearchTerms(searchTerms)
+                val verses = textElement.getChildren("verse")
+                for (verse in verses) {
+                    verseString += processElementChildren(verse, searchTerms, "", false)
+                }
+                spannableText = SpannableString(Html.fromHtml(verseString))
+                var m: Matcher? = null
+                val splitSearchArray = splitSearchTerms(searchTerms)
+                for (originalSearchWord in splitSearchArray) {
+                    var searchWord = prepareSearchWord(originalSearchWord)
+                    searchWord = if (originalSearchWord.contains("*")) {
+                        "\\b$searchWord[\\w\\'\\-]*\\b" // Match whole words including with hyphons and apostrophes
+                    } else {
+                        "\\b$searchWord\\b"
+                    }
+                    if (searchWord.length > 0) {
+                        m = Pattern.compile(searchWord, Pattern.CASE_INSENSITIVE).matcher(spannableText)
+                        while (m.find()) {
+                            spannableText.setSpan(
+                                StyleSpan(Typeface.BOLD),
+                                m.start(),
+                                m.end(),
+                                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                            )
+                        }
+                    }
+                }
+            } catch (e: Exception) {
+                Log.w("SEARCH", e.message!!)
+            } finally {
+                return spannableText
+            }
+        }
+
+        private fun processElementChildren(
+            parentElement: Element,
+            searchTerms: String,
+            verseString: String?,
+            isBold: Boolean
+        ): String? {
+            // Recursive method to walk the verse element tree ignoring tags like 'note' that should not be shown in the search results
+            // and including tags like 'w' that should be included. This routine is needed only to do searches on lemma attributes. That
+            // is why bolding only occurs in that part of the code.
+            var verseString = verseString
+            var isBold = isBold
+            for (o in parentElement.content) {
+                if (o is Element) {
+                    val el = o
+                    val elementsToExclude = Arrays.asList("note", "reference")
+                    val elementsToInclude = Arrays.asList("w", "transChange", "divineName", "seg")
+                    if (elementsToInclude.contains(el.name)) {
+                        isBold = try {
+                            val lemma = el.getAttributeValue("lemma")
+                            lemma != null && Pattern.compile(searchTerms, Pattern.CASE_INSENSITIVE)
+                                .matcher(lemma.trim { it <= ' ' }).find()
+                        } catch (e: Exception) {
+                            false
+                        }
+                        // Only leaf nodes should have their text appended. If a node has child tags, the text will be passed as one of the children .
+                        if (el.children.isEmpty()) verseString += buildElementText(el.text, isBold)
+                    }
+                    if (!el.children.isEmpty() && !elementsToExclude.contains(el.name)) {
+                        verseString = processElementChildren(el, searchTerms, verseString, isBold)
+                    }
+                } else if (o is Text) {
+                    verseString += buildElementText(o.text, false)
+                } else {
+                    verseString += buildElementText(o.toString(), false)
+                }
+            }
+            return verseString
+        }
+
+        private fun buildElementText(elementText: String, isBold: Boolean): String? {
+            return if (isBold) {
+                String.format("<b>%s</b>", elementText)
+            } else {
+                elementText
+            }
+        }
+
+
+        private fun prepareSearchTerms(searchTerms: String): String {
+            // Replaces strong:g00123 with REGEX strong:g*123. This is needed because the search term submitted by the 'Find all occcurrences includes extra zeros
+            // The capitalisation is not important since we do a case insensitive search
+            var searchTerms = searchTerms
+            if (searchTerms.contains("strong:")) {
+                searchTerms = searchTerms.replace("strong:g0*".toRegex(), "strong:g0*")
+                searchTerms = searchTerms.replace("strong:h0*".toRegex(), "strong:h0*")
+            }
+            return searchTerms
+        }
+
+        private fun splitSearchTerms(searchTerms: String): Array<String> {
+            // Split the search terms on space characters that are not enclosed in double quotes
+            // Eg: 'moses "burning bush"' -> "moses" and "burning bush"
+            return searchTerms.split("\\s+(?=(?:\"(?:\\\\\"|[^\"])+\"|[^\"])+$)".toRegex()).toTypedArray()
+        }
+
+        private fun prepareSearchWord(searchWord: String): String {
+            // Need to clean up the search word itself before trying to find the searchWord in the text
+            // Eg: '+"burning bush"' -> 'burning bush'
+            var searchWord = searchWord
+            searchWord = searchWord.replace("\"", "") // Remove quotes which indicate phrase searches
+            searchWord = searchWord.replace("+", "") // Remove + which indicates AND searches
+            searchWord = searchWord.replace("?", "\\p{L}") // Handles any letter from any language
+            if (searchWord.length > 0) {
+                searchWord = if (searchWord.substring(searchWord.length - 1) == "*") {
+                    searchWord.replace("*", "")
+                } else {
+                    searchWord.replace("*", "\b") // Match on a word boundary
+                }
+            }
+            return searchWord
+        }
+    }
+}
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
index e656a7ca49..ca00d4b342 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
@@ -10,15 +10,12 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.BaseAdapter;
-import android.widget.ListAdapter;
 import android.widget.TextView;
-import android.widget.Toast;
+
 import net.bible.android.activity.R;
 import net.bible.android.control.search.SearchControl;
-import net.bible.service.sword.SwordDocumentFacade;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -26,8 +23,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import net.bible.android.view.activity.base.ActivityBase;
-
 import org.crosswire.jsword.book.Book;
 import org.crosswire.jsword.book.Books;
 import org.crosswire.jsword.passage.Key;
@@ -35,7 +30,6 @@
 import org.jdom2.Element;
 import org.jdom2.Text;
 
-
 public class SearchResultsAdapter extends ArrayAdapter<SearchResultsData> {
 
 	private int resource;
@@ -51,40 +45,6 @@ public SearchResultsAdapter(Context _context, int _resource, ArrayList<SearchRes
 		this.searchControl = searchControl;
 	}
 
-	@Override
-	public boolean areAllItemsEnabled() {
-		return false;
-	}
-	@Override
-	public boolean isEnabled(int position) {
-		return true;
-	}
-	@Override
-	public void registerDataSetObserver(DataSetObserver observer) {
-	}
-	@Override
-	public void unregisterDataSetObserver(DataSetObserver observer) {
-	}
-	@Override
-	public int getCount() {
-		return arrayList.size();
-	}
-//	@Override
-//	public Object getItem(int position) {
-//		return position;
-//	}
-
-	public Object getItemAtPosition(int position) {
-		return position;
-	}
-	@Override
-	public long getItemId(int position) {
-		return position;
-	}
-	@Override
-	public boolean hasStableIds() {
-		return false;
-	}
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 		SearchResultsData resultData=arrayList.get(position);
@@ -104,7 +64,16 @@ public View getView(int position, View convertView, ViewGroup parent) {
 			try {
 				Key key = book.getKey(resultData.osisKey);
 				Element verseTextElement = searchControl.getSearchResultVerseElement(key);
-				SpannableString verseTextHtml = highlightSearchText(SearchControl.originalSearchString, verseTextElement);
+
+				String verseHtml = resultData.verseHtml.trim();
+
+				// The 'toHtml' method wraps the string in <p> which puts a large margin at the bottom of the verse. Need to remove this.
+				try{
+					verseHtml= replaceString(verseHtml,"<p dir=\"ltr\">", "");
+					verseHtml= replaceString(verseHtml,"</p>", "");
+				}catch (Exception e) {}
+
+				SpannableString verseTextHtml =  new SpannableString(Html.fromHtml(verseHtml));
 
 				TextView verse=convertView.findViewById(R.id.verse);
 				verse.setText(verseTextHtml);
@@ -115,6 +84,14 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		}
 		return convertView;
 	}
+
+	private String replaceString(String initialString, String first, String second)
+	{
+		StringBuilder b = new StringBuilder(initialString);
+		b.replace(initialString.lastIndexOf(first), initialString.lastIndexOf(first)+first.length(),second );
+		return b.toString();
+	}
+
 	@Override
 	public int getItemViewType(int position) {
 		return position;
@@ -129,117 +106,5 @@ public boolean isEmpty() {
 		return false;
 	}
 
-	private String processElementChildren(Element parentElement, String searchTerms, String verseString, Boolean isBold) {
-		// Recursive method to walk the verse element tree ignoring tags like 'note' that should not be shown in the search results
-		// and including tags like 'w' that should be included. This routine is needed only to do searches on lemma attributes. That
-		// is why bolding only occurs in that part of the code.
-		for (Object o : parentElement.getContent()) {
-			if (o instanceof Element) {
-				Element el = (Element) o;
-				List<String> elementsToExclude = Arrays.asList("note","reference");
-				List<String> elementsToInclude = Arrays.asList("w","transChange","divineName","seg");
-				if (elementsToInclude.contains(el.getName())) {
-					try {
-						String lemma = el.getAttributeValue("lemma");
-						isBold = (lemma != null && Pattern.compile(searchTerms, Pattern.CASE_INSENSITIVE).matcher(lemma.trim()).find());
-					} catch (Exception e) {
-						isBold = false;
-					}
-					// Only leaf nodes should have their text appended. If a node has child tags, the text will be passed as one of the children .
-					if (el.getChildren().isEmpty()) verseString += buildElementText(el.getText(),isBold);
-				}
-				if (!el.getChildren().isEmpty() && !elementsToExclude.contains(el.getName())) {verseString = processElementChildren(el, searchTerms, verseString, isBold);};
-			} else if (o instanceof Text) {
-				Text t = (Text) o;
-				verseString += buildElementText(t.getText(),false);
-			} else {
-				verseString += buildElementText(o.toString(),false);
-			}
-		}
-		return verseString;
-	}
-
-	private String buildElementText(String elementText, Boolean isBold) {
-		if (isBold) {
-			return String.format("<b>%s</b>",elementText);
-		} else {
-			return elementText;
-		}
-	}
-
-	private SpannableString highlightSearchText(String searchTerms, Element textElement) {
-
-		SpannableString spannableText = null;
-		try {
-			String verseString = "";
-			searchTerms = prepareSearchTerms(searchTerms);
-
-			List<Element> verses = textElement.getChildren("verse");
-			for (Element verse : verses) {
-				verseString += processElementChildren(verse, searchTerms, "", false);
-			}
-			spannableText = new SpannableString(Html.fromHtml(verseString));
-			Matcher m = null;
-			String[] splitSearchArray = splitSearchTerms(searchTerms);
-			for (String searchWord : splitSearchArray) {
-				searchWord = prepareSearchWord(searchWord);
-				if (searchWord.length() > 0) {
-					m = Pattern.compile(searchWord, Pattern.CASE_INSENSITIVE).matcher(spannableText);
-					while (m.find()) {
-						spannableText.setSpan(new android.text.style.StyleSpan(Typeface.BOLD), m.start(), m.end(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-					}
-				}
-			}
-		}
-		catch (Exception e) {
-			Log.w("SEARCH", e.getMessage());
-		}
-		finally {
-			return spannableText;
-		}
-	}
-
-	public static class testSearch {
-		String searchTerms;
-		String testType;
-		public testSearch(String searchTerms) {
-			this.searchTerms = searchTerms;
-			this.testType = testType;
-		}
-		public String PrepareSearchTerms() {return prepareSearchTerms(searchTerms);}
-		public String[] SplitSearchTerms() {return splitSearchTerms(searchTerms);}
-		public String PrepareSearchWord() {return prepareSearchWord(searchTerms);}
-	}
-
-	private static String prepareSearchTerms(String searchTerms) {
-		// Replaces strong:g00123 with REGEX strong:g*123. This is needed because the search term submitted by the 'Find all occcurrences includes extra zeros
-		// The capitalisation is not important since we do a case insensitive search
-		if (searchTerms.contains("strong:")) {
-			searchTerms = searchTerms.replaceAll("strong:g0*", "strong:g0*");
-			searchTerms = searchTerms.replaceAll("strong:h0*", "strong:h0*");
-		}
-		return searchTerms;
-	}
-
-	private static String[] splitSearchTerms(String searchTerms) {
-		// Split the search terms on space characters that are not enclosed in double quotes
-		// Eg: 'moses "burning bush"' -> "moses" and "burning bush"
-		return searchTerms.split("\\s+(?=(?:\"(?:\\\\\"|[^\"])+\"|[^\"])+$)");
-	}
 
-	private static String prepareSearchWord(String searchWord) {
-		// Need to clean up the search word itself before trying to find the searchWord in the text
-		// Eg: '+"burning bush"' -> 'burning bush'
-		searchWord = searchWord.replace("\"", "");  // Remove quotes which indicate phrase searches
-		searchWord = searchWord.replace("+", "");	// Remove + which indicates AND searches
-		searchWord = searchWord.replace("?", "\\p{L}");  // Handles any letter from any language
-		if (searchWord.length() > 0) {
-			if (Objects.equals(searchWord.substring(searchWord.length() - 1), "*")) {
-				searchWord = searchWord.replace("*", "");
-			} else {
-				searchWord = searchWord.replace("*", "\b");  // Match on a word boundary
-			}
-		}
-		return searchWord;
-	}
 }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index 482eea8d33..4a1e4c7204 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -8,6 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
 import android.widget.ListView
 import android.widget.ProgressBar
@@ -26,14 +27,56 @@ import org.crosswire.jsword.passage.Key
 import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
 import net.bible.service.sword.SwordDocumentFacade
 
+class PlaceholderFragment: Fragment() {
 
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-/**
- * A placeholder fragment containing a simple view.
- */
+    //    private lateinit var pageViewModel: PageViewModel
+    private var _binding: SearchResultsVerseFragmentBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+
+        _binding = SearchResultsVerseFragmentBinding.inflate(inflater, container, false)
+        val root = binding.root
+
+        return root
+    }
+
+    companion object {
+        /**
+         * The fragment argument representing the section number for this
+         * fragment.
+         */
+        private const val ARG_SECTION_NUMBER = "section_number"
+
+        /**
+         * Returns a new instance of this fragment for the given section
+         * number.
+         */
+        @JvmStatic
+        fun newInstance(sectionNumber: Int): PlaceholderFragment {
+            return PlaceholderFragment().apply {
+                arguments = Bundle().apply {
+                    putInt(ARG_SECTION_NUMBER, sectionNumber)
+                }
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
 
 class SearchResultsFragment : Fragment() {
 
@@ -126,7 +169,7 @@ class SearchResultsFragment : Fragment() {
     }
 }
 
-class SearchStatisticsFragment : Fragment() {
+class SearchBookStatisticsFragment : Fragment() {
     private var _binding: SearchResultsStatisticsFragmentBinding? = null
 
     private val binding get() = _binding!!
@@ -148,20 +191,23 @@ class SearchStatisticsFragment : Fragment() {
         val maxCount: Int = bookStatistics.maxOfOrNull { it.count } ?: 0
         bookStatistics.map {
 
-            val to_add: View = inflater.inflate(
+            val statsRow: View = inflater.inflate(
                 R.layout.search_results_statistics_row,
                 statisticsLayout, false
             )
-            var button = to_add.findViewById<Button>(R.id.searchStatisticsBookButton)
-            button.setText(it.book)
-            var text = to_add.findViewById<TextView>(R.id.searchStatisticsBookCount)
-            text.setText("${it.count}")
-            var progressBar = to_add.findViewById<ProgressBar>(R.id.searchStatisticsBookCountProgress)
+            var button = statsRow.findViewById<Button>(R.id.searchStatisticsBookButton)
+            button.text = it.book
+            var text = statsRow.findViewById<TextView>(R.id.searchStatisticsBookCount)
+            text.text = "${it.count}"
+            var progressBar = statsRow.findViewById<ProgressBar>(R.id.searchStatisticsBookCountProgress)
             progressBar.max = maxCount
             progressBar.progress = it.count
-            progressBar.setProgressTintList(ColorStateList.valueOf(it.color))
-            to_add.visibility = View.VISIBLE
-            statisticsLayout.addView(to_add)
+            progressBar.progressTintList = ColorStateList.valueOf(it.color)
+            statsRow.visibility = View.VISIBLE
+
+            statisticsLayout.addView(statsRow,
+                FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 90)
+            )
 
             button.tag = it.listIndex
             button.setOnClickListener {
@@ -170,41 +216,7 @@ class SearchStatisticsFragment : Fragment() {
                 val resultList = requireActivity().findViewById<View>(R.id.searchResultsList) as ListView
                 resultList.setSelection(it.tag as Int);
             }
-//            to_add.invalidate()
-            to_add.requestLayout()
-//            statisticsLayout.invalidate()
-//        statisticsLayout.requestLayout()
-
-//            val text = to_add.findViewById<View>(R.id.text) as TextView
-//            text.setText(options.get(i))
-//            text.setTypeface(FontSelector.getBold(activity))
-
-//
-//            val newButton = Button(flowContainer.context)
-//            newButton.setLayoutParams(LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT))
-//            newButton.setText("${it.book} = ${it.count}")
-//            newButton.id = View.generateViewId()
-//            newButton.isAllCaps = false
-//            newButton.tag = it.listIndex
-
-
-
-//            newButton.setOnClickListener {
-//                val tabhost = requireActivity().findViewById<View>(R.id.tabs) as TabLayout
-//                tabhost.getTabAt(0)!!.select()
-////                tabs.getTabAt(1)?.select()
-//////                viewPager.currentItem = 0
-//                val resultLis = requireActivity().findViewById<View>(R.id.searchResultsList) as ListView
-////                resultLis.smoothScrollToPosition(it.tag as Int);
-////                val position: Int = resultLis.getPositionForView(tabhost)
-////                resultLis.setSelection(position+1)
-//                resultLis.smoothScrollToPosition(it.tag as Int);
-//                Toast.makeText(buttonLayout.context, newButton.text, Toast.LENGTH_LONG)
-//            }
-//            buttonLayout.addView(newButton)
-//            buttonIds += newButton.id
         }
-//        flowContainer.referencedIds = buttonIds
 
         return root
     }
@@ -230,53 +242,46 @@ class SearchStatisticsFragment : Fragment() {
 //    }
 }
 
-class PlaceholderFragment : Fragment() {
-
-//    private lateinit var pageViewModel: PageViewModel
-    private var _binding: SearchResultsVerseFragmentBinding? = null
+class SearchWordStatisticsFragment : Fragment() {
+    private var _binding: SearchResultsStatisticsFragmentBinding? = null
 
-    // This property is only valid between onCreateView and
-    // onDestroyView.
     private val binding get() = _binding!!
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
+    var wordStatistics = mutableListOf<WordStat>()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-
-        _binding = SearchResultsVerseFragmentBinding.inflate(inflater, container, false)
+        // Inflate the layout for this fragment
+        _binding = SearchResultsStatisticsFragmentBinding.inflate(inflater, container, false)
         val root = binding.root
 
-        return root
-    }
+        val statisticsLayout = binding.statisticsLayout
+        val sortedWordStatistics = wordStatistics.sortedBy { it.word }
+        val maxCount: Int = sortedWordStatistics.maxOfOrNull { it.verseIndexes.count() } ?: 0
+        sortedWordStatistics.map {
 
-    companion object {
-        /**
-         * The fragment argument representing the section number for this
-         * fragment.
-         */
-        private const val ARG_SECTION_NUMBER = "section_number"
+            val statsRow: View = inflater.inflate(
+                R.layout.search_results_word_statistics_row,
+                statisticsLayout, false
+            )
+            var button = statsRow.findViewById<Button>(R.id.searchStatisticsWordButton)
+            button.setText(it.originalWord)
+            var text = statsRow.findViewById<TextView>(R.id.searchStatisticsWordCount)
+            text.setText("${it.verseIndexes.count()}")
+            var progressBar = statsRow.findViewById<ProgressBar>(R.id.searchStatisticsWordCountProgress)
+            progressBar.max = maxCount
+            progressBar.progress = it.verseIndexes.count()
+            statsRow.visibility = View.VISIBLE
+            statsRow.invalidate()
+            statsRow.requestLayout()
+            statisticsLayout.addView(statsRow,
+//                FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 90)
+                FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
 
-        /**
-         * Returns a new instance of this fragment for the given section
-         * number.
-         */
-        @JvmStatic
-        fun newInstance(sectionNumber: Int): PlaceholderFragment {
-            return PlaceholderFragment().apply {
-                arguments = Bundle().apply {
-                    putInt(ARG_SECTION_NUMBER, sectionNumber)
-                }
-            }
+            )
         }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+        return root
     }
 }
+
diff --git a/app/src/main/res/layout/search_results_statistics_row.xml b/app/src/main/res/layout/search_results_statistics_row.xml
index c3aa00f027..2880b966c2 100644
--- a/app/src/main/res/layout/search_results_statistics_row.xml
+++ b/app/src/main/res/layout/search_results_statistics_row.xml
@@ -8,7 +8,7 @@
 
 	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="35dp"
 		android:orientation="horizontal"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/search_results_word_statistics_row.xml b/app/src/main/res/layout/search_results_word_statistics_row.xml
new file mode 100644
index 0000000000..f8e25a1070
--- /dev/null
+++ b/app/src/main/res/layout/search_results_word_statistics_row.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		app:layout_constraintHeight="40dp"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
+
+		<Button
+			android:id="@+id/searchStatisticsWordButton"
+			android:layout_width="170dp"
+			android:layout_height="wrap_content"
+			android:text="the word which is very long and might not wrap"
+			android:textAllCaps="false"
+			android:textSize="12dp"
+			app:layout_anchor="@+id/button2"
+			app:layout_anchorGravity="end|top" />
+
+		<TextView
+			android:id="@+id/searchStatisticsWordCount"
+			android:layout_width="30dp"
+			android:layout_height="wrap_content"
+			android:text="45"
+			android:textAlignment="center"
+			android:textSize="16sp"
+			android:textStyle="bold" />
+
+		<ProgressBar
+			android:id="@+id/searchStatisticsWordCountProgress"
+			style="?android:attr/progressBarStyleHorizontal"
+			android:layout_width="match_parent"
+			android:layout_height="10dp"
+			android:layout_centerInParent="true"
+			android:layout_marginLeft="5dp"
+			android:layout_marginTop="13dp"
+			android:layout_marginRight="10dp"
+			android:layout_weight="1"
+			android:indeterminate="false"
+			android:max="100"
+			android:min="0"
+			android:progress="45"
+			android:progressBackgroundTint="@color/transparent"
+			android:progressTint="@color/sync_on_green"
+			android:scaleY="4"
+			android:visibility="visible" />
+
+
+	</LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

From 1764f3b77e4f79ba613fe80b832551ce832eec34 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 15 Jan 2022 22:05:13 +1000
Subject: [PATCH 12/37] Implemented filtering by word

---
 .../navigation/GridChoosePassageBook.kt       |  4 +-
 .../view/activity/search/MySearchResults.kt   |  9 +-
 .../activity/search/SearchResultsAdapter.java |  5 +-
 .../activity/search/SearchResultsFragments.kt | 85 +++++++++++++++----
 .../search_results_statistics_fragment.xml    | 14 ++-
 5 files changed, 88 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/navigation/GridChoosePassageBook.kt b/app/src/main/java/net/bible/android/view/activity/navigation/GridChoosePassageBook.kt
index c6bf6573b8..05de134ab7 100644
--- a/app/src/main/java/net/bible/android/view/activity/navigation/GridChoosePassageBook.kt
+++ b/app/src/main/java/net/bible/android/view/activity/navigation/GridChoosePassageBook.kt
@@ -263,10 +263,10 @@ class GridChoosePassageBook : CustomTitlebarActivityBase(R.menu.choose_passage_b
         private val HISTORY_COLOR = Color.rgb(0xFE, 0xCC, 0x9B)
         private val WISDOM_COLOR = Color.rgb(0x99, 0xFF, 0x99)
         private val MAJOR_PROPHETS_COLOR = Color.rgb(0xFF, 0x99, 0xFF)
-        private val MINOR_PROPHETS_COLOR = Color.rgb(0xFF, 0xFE, 0xCD)
+        private val MINOR_PROPHETS_COLOR = Color.rgb(0xE6, 0xE5, 0xB8)
         private val GOSPEL_COLOR = Color.rgb(0xFF, 0x97, 0x03)
         private val ACTS_COLOR = Color.rgb(0x00, 0x99, 0xFF)
-        private val PAULINE_COLOR = Color.rgb(0xFF, 0xFF, 0x31)
+        private val PAULINE_COLOR = Color.rgb(0xF5, 0xf5, 0x21)
         private val GENERAL_EPISTLES_COLOR = Color.rgb(0x67, 0xCC, 0x66) // changed 99 to CC to make a little clearer on dark background
         private val REVELATION_COLOR = Color.rgb(0xFE, 0x33, 0xFF)
         private val OTHER_COLOR = ACTS_COLOR
diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 000a621452..58ad9b3c67 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -63,7 +63,7 @@ private var wordHits: ArrayList<Pair<String, ArrayList<Int>>> = arrayListOf()
 
 class SearchResultsData : Parcelable {
     @JvmField
-    var id: Int?
+    var id: Int?  // Holds the original index in the results. Used for selection and filtering.
     @JvmField
     var osisKey: String?
     @JvmField
@@ -216,8 +216,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
             }
             mSearchResultsHolder = searchControl.getSearchResults(searchDocument, searchText)
             // tell user how many results were returned
-            val msg: String
-            msg = if (mCurrentlyDisplayedSearchResults.size >= SearchControl.MAX_SEARCH_RESULTS) {
+            val msg:String = if (mCurrentlyDisplayedSearchResults.size >= SearchControl.MAX_SEARCH_RESULTS) {
                 getString(R.string.search_showing_first, SearchControl.MAX_SEARCH_RESULTS)
             } else {
                 getString(R.string.search_result_count, mSearchResultsHolder!!.size())
@@ -269,7 +268,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
             val verseTextElement = searchControl.getSearchResultVerseElement(key)
             val verseTextSpannable = SearchHighlight.getSpannableText(SearchControl.originalSearchString, verseTextElement)
 
-            mSearchArrayAdapter.add(SearchResultsData(1, key.osisID.toString(), key.name,searchDocument, "text", verseTextSpannable!!.toHtml()))
+            mSearchArrayAdapter.add(SearchResultsData(listIndex, key.osisID.toString(), key.name,searchDocument, "text", verseTextSpannable!!.toHtml()))
 
             var ss: Array<StyleSpan> = verseTextSpannable!!.getSpans(0, verseTextSpannable?.length, StyleSpan::class.java)
 
@@ -333,7 +332,7 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
                 bundle.putParcelableArrayList("mylist", mSearchArrayAdapter)
                 frag.setArguments(bundle)
                 frag.searchControl = searchControl
-                frag.mCurrentlyDisplayedSearchResults = mCurrentlyDisplayedSearchResults
+                frag.mVerseSearchResults = mCurrentlyDisplayedSearchResults
                 frag.activeWindowPageManagerProvider = activeWindowPageManagerProvider
                 frag.intent = intent
             }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
index ca00d4b342..0d216c3699 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
@@ -35,14 +35,12 @@ public class SearchResultsAdapter extends ArrayAdapter<SearchResultsData> {
 	private int resource;
 	private ArrayList<SearchResultsData> arrayList;
 	private Context context;
-	private SearchControl searchControl;
 
-	public SearchResultsAdapter(Context _context, int _resource, ArrayList<SearchResultsData> arrayList, SearchControl searchControl) {
+	public SearchResultsAdapter(Context _context, int _resource, ArrayList<SearchResultsData> arrayList) {
 		super(_context, _resource, arrayList);
 		this.resource = _resource;
 		this.arrayList=arrayList;
 		this.context=_context;
-		this.searchControl = searchControl;
 	}
 
 	@Override
@@ -63,7 +61,6 @@ public View getView(int position, View convertView, ViewGroup parent) {
 			Book book = Books.installed().getBook(resultData.translation);
 			try {
 				Key key = book.getKey(resultData.osisKey);
-				Element verseTextElement = searchControl.getSearchResultVerseElement(key);
 
 				String verseHtml = resultData.verseHtml.trim();
 
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index 4a1e4c7204..1b04d349c7 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -1,5 +1,7 @@
 package net.bible.android.view.activity.search
 
+import android.app.Activity
+import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.os.Bundle
@@ -12,8 +14,10 @@ import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
 import android.widget.ListView
 import android.widget.ProgressBar
+import android.widget.ScrollView
 import android.widget.TextView
 import android.widget.Toast
+import androidx.core.view.allViews
 import com.google.android.material.tabs.TabLayout
 import net.bible.android.activity.databinding.SearchResultsVerseFragmentBinding
 import net.bible.android.activity.R
@@ -25,8 +29,13 @@ import net.bible.android.view.activity.page.MainBibleActivity
 import org.apache.commons.lang3.StringUtils
 import org.crosswire.jsword.passage.Key
 import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
+import net.bible.service.common.CommonUtils
 import net.bible.service.sword.SwordDocumentFacade
 
+private lateinit var searchResultsArray: ArrayList<SearchResultsData>
+private lateinit var displayedResultsArray: ArrayList<SearchResultsData>
+private var isSearchResultsFiltered = false
+
 class PlaceholderFragment: Fragment() {
 
     //    private lateinit var pageViewModel: PageViewModel
@@ -78,12 +87,20 @@ class PlaceholderFragment: Fragment() {
     }
 }
 
+private fun setResultsAdapter(resultsArray:ArrayList<SearchResultsData>, activity: Activity): SearchResultsAdapter {
+    displayedResultsArray = resultsArray
+    val tabhost = activity.findViewById<View>(R.id.tabs) as TabLayout
+    tabhost.getTabAt(0)!!.text = CommonUtils.resources.getString(R.string.results_count, displayedResultsArray.count().toString())
+    return SearchResultsAdapter(activity, android.R.layout.simple_list_item_2,
+        displayedResultsArray as java.util.ArrayList<SearchResultsData>?
+    )
+}
 class SearchResultsFragment : Fragment() {
 
     private var _binding: SearchResultsVerseFragmentBinding? = null
     private val binding get() = _binding!!
 
-    var mCurrentlyDisplayedSearchResults: List<Key> = java.util.ArrayList()
+    var mVerseSearchResults: List<Key> = java.util.ArrayList()
     var searchControl: SearchControl? = null
     lateinit var intent: Intent
     lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
@@ -92,6 +109,7 @@ class SearchResultsFragment : Fragment() {
         super.onCreate(savedInstanceState)
     }
 
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -100,13 +118,12 @@ class SearchResultsFragment : Fragment() {
         _binding = SearchResultsVerseFragmentBinding.inflate(inflater, container, false)
         val root = binding.root
 
-        val strtext = requireArguments().getString("edttext")
-        val arr: ArrayList<SearchResultsData> = requireArguments().getParcelableArrayList("mylist")!!
+        searchResultsArray = requireArguments().getParcelableArrayList("mylist")!!
 
-        val customAdapter = SearchResultsAdapter(activity, android.R.layout.simple_list_item_2, arr, searchControl)
+//        val customAdapter = SearchResultsAdapter(activity, android.R.layout.simple_list_item_2, searchResultsArray)
 
         val resultList: ListView = binding.searchResultsList
-        resultList.adapter = customAdapter
+        resultList.adapter = setResultsAdapter(searchResultsArray, requireActivity())
         resultList.descendantFocusability = ViewGroup.FOCUS_BEFORE_DESCENDANTS;
         resultList.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
         resultList.isVerticalScrollBarEnabled = false
@@ -114,7 +131,7 @@ class SearchResultsFragment : Fragment() {
         resultList.setOnItemClickListener { parent, view, position, id ->
             Toast.makeText(resultList.context, "Hi",Toast.LENGTH_LONG)
             try { // no need to call HistoryManager.addHistoryItem() here because PassageChangeMediator will tell HistoryManager a change is about to occur
-                verseSelected(mCurrentlyDisplayedSearchResults[position])
+                verseSelected(mVerseSearchResults[displayedResultsArray[position].id!!])
             } catch (e: Exception) {
                 Log.e("blah", "Selection error", e)
                 Dialogs.instance.showErrorMsg(R.string.error_occurred, e)
@@ -185,8 +202,7 @@ class SearchBookStatisticsFragment : Fragment() {
         val root = binding.root
 
         val statisticsLayout = binding.statisticsLayout
-
-        var buttonIds = intArrayOf()
+        binding.showKeyWordOnly.visibility = View.GONE
 
         val maxCount: Int = bookStatistics.maxOfOrNull { it.count } ?: 0
         bookStatistics.map {
@@ -211,9 +227,14 @@ class SearchBookStatisticsFragment : Fragment() {
 
             button.tag = it.listIndex
             button.setOnClickListener {
+
                 val tabhost = requireActivity().findViewById<View>(R.id.tabs) as TabLayout
                 tabhost.getTabAt(0)!!.select()
                 val resultList = requireActivity().findViewById<View>(R.id.searchResultsList) as ListView
+                if (isSearchResultsFiltered) {
+                    resultList.adapter = setResultsAdapter(searchResultsArray, requireActivity())
+                    isSearchResultsFiltered = false
+                }
                 resultList.setSelection(it.tag as Int);
             }
         }
@@ -246,17 +267,29 @@ class SearchWordStatisticsFragment : Fragment() {
     private var _binding: SearchResultsStatisticsFragmentBinding? = null
 
     private val binding get() = _binding!!
+    private lateinit var inflater: LayoutInflater
+
     var wordStatistics = mutableListOf<WordStat>()
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        _binding = SearchResultsStatisticsFragmentBinding.inflate(inflater, container, false)
-        val root = binding.root
+    class CustomOnClickListener(val resultIndexes: IntArray, val activity:Activity) : View.OnClickListener {
+        override fun onClick(v: View?) {
+            isSearchResultsFiltered = true
+            val tabhost = activity.findViewById<View>(R.id.tabs) as TabLayout
+            tabhost.getTabAt(0)!!.select()
+
+            val filteredSearchResults = searchResultsArray.filter { resultIndexes.contains(it.id!!) } as ArrayList<SearchResultsData>
+            val resultList = activity.findViewById<View>(R.id.searchResultsList) as ListView
+            resultList.adapter = setResultsAdapter(filteredSearchResults, activity)
+        }
+    }
 
+    private fun ConstructButtonList() {
+
+        var showKeyWordsCheckBox = activity?.findViewById<Button>(R.id.show_key_word_only)
         val statisticsLayout = binding.statisticsLayout
+
+//        if (statisticsLayout.allViews.count() > 2) statisticsLayout.removeViews(3,statisticsLayout.allViews.count()-3)
+        statisticsLayout.removeAllViews()
         val sortedWordStatistics = wordStatistics.sortedBy { it.word }
         val maxCount: Int = sortedWordStatistics.maxOfOrNull { it.verseIndexes.count() } ?: 0
         sortedWordStatistics.map {
@@ -276,11 +309,29 @@ class SearchWordStatisticsFragment : Fragment() {
             statsRow.invalidate()
             statsRow.requestLayout()
             statisticsLayout.addView(statsRow,
-//                FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 90)
                 FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-
             )
+
+            button.setOnClickListener(CustomOnClickListener(it.verseIndexes, requireActivity()))
+        }
+
+    }
+    override fun onCreateView(
+        theInflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+
+        inflater = theInflater
+        _binding = SearchResultsStatisticsFragmentBinding.inflate(inflater, container, false)
+        val root = binding.root
+
+        ConstructButtonList()
+
+        var showKeyWordsCheckBox = binding.showKeyWordOnly
+        showKeyWordsCheckBox.setOnClickListener {
+            ConstructButtonList()
         }
+
         return root
     }
 }
diff --git a/app/src/main/res/layout/search_results_statistics_fragment.xml b/app/src/main/res/layout/search_results_statistics_fragment.xml
index d6e124d247..ccef451613 100644
--- a/app/src/main/res/layout/search_results_statistics_fragment.xml
+++ b/app/src/main/res/layout/search_results_statistics_fragment.xml
@@ -7,11 +7,23 @@
 	android:fillViewport="true">
 
 	<LinearLayout
-		android:id="@+id/statisticsLayout"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:orientation="vertical"
 		>
+		<CheckBox
+			android:id="@+id/show_key_word_only"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Show key words only"
+			/>
+		<LinearLayout
+			android:id="@+id/statisticsLayout"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="vertical"
+			>
+		</LinearLayout>
 
 	</LinearLayout>
 

From 3f1a7c6da17a10364d29846155eb5595a1c79937 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 22 Jan 2022 20:34:53 +1000
Subject: [PATCH 13/37] Ensure that strongs number match on a word boundary

---
 .../android/view/activity/search/SearchHighlight.kt | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
index 3797fd132a..d175525451 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
@@ -104,12 +104,13 @@ class SearchHighlight {
 
 
         private fun prepareSearchTerms(searchTerms: String): String {
-            // Replaces strong:g00123 with REGEX strong:g*123. This is needed because the search term submitted by the 'Find all occcurrences includes extra zeros
+            // Replaces strong:g00123 or strong:g123 with REGEX strong:g0*123. This is needed because the search term submitted by the 'Find all occcurrences includes extra zeros
             // The capitalisation is not important since we do a case insensitive search
             var searchTerms = searchTerms
             if (searchTerms.contains("strong:")) {
-                searchTerms = searchTerms.replace("strong:g0*".toRegex(), "strong:g0*")
-                searchTerms = searchTerms.replace("strong:h0*".toRegex(), "strong:h0*")
+                searchTerms = searchTerms.replace("strong:g0*".toRegex(RegexOption.IGNORE_CASE), "strong:g0*")
+                searchTerms = searchTerms.replace("strong:h0*".toRegex(RegexOption.IGNORE_CASE), "strong:h0*")
+                searchTerms += "\\b"  // search on a word boundary (eg find strong:g0123 not strong:g01234567
             }
             return searchTerms
         }
@@ -124,9 +125,9 @@ class SearchHighlight {
             // Need to clean up the search word itself before trying to find the searchWord in the text
             // Eg: '+"burning bush"' -> 'burning bush'
             var searchWord = searchWord
-            searchWord = searchWord.replace("\"", "") // Remove quotes which indicate phrase searches
-            searchWord = searchWord.replace("+", "") // Remove + which indicates AND searches
-            searchWord = searchWord.replace("?", "\\p{L}") // Handles any letter from any language
+            searchWord = searchWord.replace("\"", "")       // Remove quotes which indicate phrase searches
+            searchWord = searchWord.replace("+", "")        // Remove + which indicates AND searches
+            searchWord = searchWord.replace("?", "\\p{L}")  // Handles any letter from any language
             if (searchWord.length > 0) {
                 searchWord = if (searchWord.substring(searchWord.length - 1) == "*") {
                     searchWord.replace("*", "")

From 68bd008af7f5ffe3322ad426204aa1d345fef45c Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 22 Jan 2022 20:35:11 +1000
Subject: [PATCH 14/37] Added verse count string

---
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dbda7467d4..c07beffe92 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -79,6 +79,7 @@
     <string name="greek">Greek</string>
     <string name="hebrew">Hebrew</string>
     <string name="results_count">Results: %s</string>
+    <string name="verse_count">Verse: %s</string>
     <string name="statistics">Statistics</string>
     <string name="by_book">By Book</string>
     <string name="by_word">By Word</string>

From fd394901c0ade5973935902cd0eea35ebc6dd60a Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sun, 23 Jan 2022 00:36:24 +1000
Subject: [PATCH 15/37] Fixed highlighting of strongs words combining spans of
 adjacent words

---
 .../view/activity/search/MySearchResults.kt   |  2 +-
 .../view/activity/search/SearchHighlight.kt   | 72 ++++++++++++++-----
 .../activity/search/SearchResultsFragments.kt |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 4 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 58ad9b3c67..c72d37f559 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -37,7 +37,7 @@ import net.bible.android.view.activity.navigation.GridChoosePassageBook.Companio
 import net.bible.service.common.CommonUtils.resources
 
 private var TAB_TITLES = arrayOf(
-    resources.getString(R.string.results_count),
+    resources.getString(R.string.verse_count),
     resources.getString(R.string.by_book),
     resources.getString(R.string.by_word)
 )
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
index d175525451..69e000dfd3 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
@@ -8,6 +8,7 @@ import android.text.style.StyleSpan
 import android.util.Log
 import org.jdom2.Element
 import org.jdom2.Text
+import org.jdom2.output.XMLOutputter
 import java.lang.Exception
 import java.util.*
 import java.util.regex.Matcher
@@ -20,21 +21,51 @@ class SearchHighlight {
             var searchTerms = searchTerms
             var spannableText: SpannableString? = null
             try {
+                // TODO: Strongs searches are handled differently to normal searches and so cannot be combined either with a normal search term or other strongs searches. This should be done better.
+
+                // Part 1: Highlight any strongs words. The raw verse text is returned with <b> added for the strongs words. We always need to process this just to get the plaintext
                 var verseString: String? = ""
-                searchTerms = prepareSearchTerms(searchTerms)
+                searchTerms = prepareStrongsSearchTerm(searchTerms)
                 val verses = textElement.getChildren("verse")
                 for (verse in verses) {
+                    Log.e("AGR", XMLOutputter().outputString(verse))
                     verseString += processElementChildren(verse, searchTerms, "", false)
                 }
-                spannableText = SpannableString(Html.fromHtml(verseString))
+
+                // Check for highlighted consecutive words and merge them into a single highlighted phrase. Some translations will indicate multiple
+                // consecutive lemma spans with the same strongs number when in fact all spans represent the single original language word.
+                // This messes with the search statistics as it uses the bolded words to tally search hits by word.
+                var verseStringLength = 0;
+                while (verseStringLength != verseString?.length )
+                {
+                    verseStringLength = verseString!!.length
+                    // This pattern matches two consecutive <b> tag spans separate only by white space and replaces them with a single <b> tag.
+                    val match = Regex("(<b[^<>]*>)([^<>]*?)(<\\/b>)(\\s+)\\1([\\s\\S]*?)\\3",RegexOption.IGNORE_CASE).find((verseString))
+                    if (match != null) {
+                        val matches = match.groupValues
+                        verseString = verseString.replace(
+                            matches[0],
+                            "${matches[1]}${matches[2]}${matches[4]}${matches[5]}${matches[3]}"
+                        )
+                    }
+                }
+
+                spannableText = SpannableString(Html.fromHtml(verseString))  // We started with an XML verse which got turned into a string with <b> tags which is now turned into a spannable
+
+                // Part 2: Find and highlight the normal (non-strongs) words or phrases in the PLAIN text verse
                 var m: Matcher? = null
                 val splitSearchArray = splitSearchTerms(searchTerms)
                 for (originalSearchWord in splitSearchArray) {
-                    var searchWord = prepareSearchWord(originalSearchWord)
-                    searchWord = if (originalSearchWord.contains("*")) {
-                        "\\b$searchWord[\\w\\'\\-]*\\b" // Match whole words including with hyphons and apostrophes
+                    var isStrongsSearch = originalSearchWord.contains("strong:")
+                    var searchWord =""
+                    if (isStrongsSearch) {
+                        searchWord = prepareSearchWord(originalSearchWord)
                     } else {
-                        "\\b$searchWord\\b"
+                        searchWord = if (!isStrongsSearch and originalSearchWord.contains("*")) {
+                            "\\b$searchWord[\\w\\'\\-]*\\b" // Match whole words including with hyphons and apostrophes
+                        } else {
+                            "\\b$searchWord\\b"
+                        }
                     }
                     if (searchWord.length > 0) {
                         m = Pattern.compile(searchWord, Pattern.CASE_INSENSITIVE).matcher(spannableText)
@@ -57,7 +88,7 @@ class SearchHighlight {
 
         private fun processElementChildren(
             parentElement: Element,
-            searchTerms: String,
+            strongsSearchTerm: String,
             verseString: String?,
             isBold: Boolean
         ): String? {
@@ -74,7 +105,7 @@ class SearchHighlight {
                     if (elementsToInclude.contains(el.name)) {
                         isBold = try {
                             val lemma = el.getAttributeValue("lemma")
-                            lemma != null && Pattern.compile(searchTerms, Pattern.CASE_INSENSITIVE)
+                            lemma != null && Pattern.compile(strongsSearchTerm, Pattern.CASE_INSENSITIVE)
                                 .matcher(lemma.trim { it <= ' ' }).find()
                         } catch (e: Exception) {
                             false
@@ -83,7 +114,7 @@ class SearchHighlight {
                         if (el.children.isEmpty()) verseString += buildElementText(el.text, isBold)
                     }
                     if (!el.children.isEmpty() && !elementsToExclude.contains(el.name)) {
-                        verseString = processElementChildren(el, searchTerms, verseString, isBold)
+                        verseString = processElementChildren(el, strongsSearchTerm, verseString, isBold)
                     }
                 } else if (o is Text) {
                     verseString += buildElementText(o.text, false)
@@ -102,16 +133,15 @@ class SearchHighlight {
             }
         }
 
-
-        private fun prepareSearchTerms(searchTerms: String): String {
+        private fun prepareStrongsSearchTerm(_searchTerms: String): String {
             // Replaces strong:g00123 or strong:g123 with REGEX strong:g0*123. This is needed because the search term submitted by the 'Find all occcurrences includes extra zeros
             // The capitalisation is not important since we do a case insensitive search
-            var searchTerms = searchTerms
-            if (searchTerms.contains("strong:")) {
-                searchTerms = searchTerms.replace("strong:g0*".toRegex(RegexOption.IGNORE_CASE), "strong:g0*")
-                searchTerms = searchTerms.replace("strong:h0*".toRegex(RegexOption.IGNORE_CASE), "strong:h0*")
-                searchTerms += "\\b"  // search on a word boundary (eg find strong:g0123 not strong:g01234567
-            }
+            var searchTerms = _searchTerms
+            searchTerms = searchTerms.replace("strong:g0*".toRegex(RegexOption.IGNORE_CASE), "strong:g0*")
+            searchTerms = searchTerms.replace("strong:h0*".toRegex(RegexOption.IGNORE_CASE), "strong:h0*")
+            searchTerms = searchTerms.replace("+", "")        // Remove + which indicates AND searches
+            searchTerms += "\\b"  // search on a word boundary (eg find strong:g0123 not strong:g01234567
+
             return searchTerms
         }
 
@@ -122,7 +152,7 @@ class SearchHighlight {
         }
 
         private fun prepareSearchWord(searchWord: String): String {
-            // Need to clean up the search word itself before trying to find the searchWord in the text
+            // Need to clean up the search word itself before trying to find the searchWord in the text. Routine is called for each part of the search term
             // Eg: '+"burning bush"' -> 'burning bush'
             var searchWord = searchWord
             searchWord = searchWord.replace("\"", "")       // Remove quotes which indicate phrase searches
@@ -130,9 +160,13 @@ class SearchHighlight {
             searchWord = searchWord.replace("?", "\\p{L}")  // Handles any letter from any language
             if (searchWord.length > 0) {
                 searchWord = if (searchWord.substring(searchWord.length - 1) == "*") {
+                    // The last character in the search is a * so remove it since the default sword search assumes a wildcard search
                     searchWord.replace("*", "")
                 } else {
-                    searchWord.replace("*", "\b") // Match on a word boundary
+                    // A * found inside a search term should probably be ignored.
+                    // It can happen normally as part of a strongs search since the regex expression uses a * to find any number of leading 0s.
+                    searchWord.replace("*", "\b") // Match on a word boundary - I am not sure why this was needed.
+
                 }
             }
             return searchWord
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index 1b04d349c7..f1ab79fb65 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -90,7 +90,7 @@ class PlaceholderFragment: Fragment() {
 private fun setResultsAdapter(resultsArray:ArrayList<SearchResultsData>, activity: Activity): SearchResultsAdapter {
     displayedResultsArray = resultsArray
     val tabhost = activity.findViewById<View>(R.id.tabs) as TabLayout
-    tabhost.getTabAt(0)!!.text = CommonUtils.resources.getString(R.string.results_count, displayedResultsArray.count().toString())
+    tabhost.getTabAt(0)!!.text = CommonUtils.resources.getString(R.string.verse_count, displayedResultsArray.count().toString())
     return SearchResultsAdapter(activity, android.R.layout.simple_list_item_2,
         displayedResultsArray as java.util.ArrayList<SearchResultsData>?
     )
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c07beffe92..b5074cca50 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -79,7 +79,7 @@
     <string name="greek">Greek</string>
     <string name="hebrew">Hebrew</string>
     <string name="results_count">Results: %s</string>
-    <string name="verse_count">Verse: %s</string>
+    <string name="verse_count">Verses: %s</string>
     <string name="statistics">Statistics</string>
     <string name="by_book">By Book</string>
     <string name="by_word">By Word</string>

From d899246b5c5a1a3655ce96aca24136beece18d51 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sun, 23 Jan 2022 01:25:50 +1000
Subject: [PATCH 16/37] Undid some code changes that  broke normal highlighting

---
 .../view/activity/search/SearchHighlight.kt   | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
index 69e000dfd3..749d793da8 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
@@ -22,50 +22,52 @@ class SearchHighlight {
             var spannableText: SpannableString? = null
             try {
                 // TODO: Strongs searches are handled differently to normal searches and so cannot be combined either with a normal search term or other strongs searches. This should be done better.
+                var isStrongsSearch = searchTerms.contains("strong:")
 
                 // Part 1: Highlight any strongs words. The raw verse text is returned with <b> added for the strongs words. We always need to process this just to get the plaintext
                 var verseString: String? = ""
                 searchTerms = prepareStrongsSearchTerm(searchTerms)
                 val verses = textElement.getChildren("verse")
+                val strongsSearchTerms = searchTerms + "\\b"  // search on a word boundary (eg find strong:g0123 not strong:g01234567
+
                 for (verse in verses) {
-                    Log.e("AGR", XMLOutputter().outputString(verse))
-                    verseString += processElementChildren(verse, searchTerms, "", false)
+//                    Log.e("AGR", XMLOutputter().outputString(verse))
+                    verseString += processElementChildren(verse, strongsSearchTerms, "", false)
                 }
 
-                // Check for highlighted consecutive words and merge them into a single highlighted phrase. Some translations will indicate multiple
-                // consecutive lemma spans with the same strongs number when in fact all spans represent the single original language word.
-                // This messes with the search statistics as it uses the bolded words to tally search hits by word.
-                var verseStringLength = 0;
-                while (verseStringLength != verseString?.length )
-                {
-                    verseStringLength = verseString!!.length
-                    // This pattern matches two consecutive <b> tag spans separate only by white space and replaces them with a single <b> tag.
-                    val match = Regex("(<b[^<>]*>)([^<>]*?)(<\\/b>)(\\s+)\\1([\\s\\S]*?)\\3",RegexOption.IGNORE_CASE).find((verseString))
-                    if (match != null) {
-                        val matches = match.groupValues
-                        verseString = verseString.replace(
-                            matches[0],
-                            "${matches[1]}${matches[2]}${matches[4]}${matches[5]}${matches[3]}"
-                        )
+                if (isStrongsSearch) {
+                    // Check for highlighted consecutive words and merge them into a single highlighted phrase. Some translations will indicate multiple
+                    // consecutive lemma spans with the same strongs number when in fact all spans represent the single original language word.
+                    // This messes with the search statistics as it uses the bolded words to tally search hits by word.
+
+                    var verseStringLength = 0;
+                    while (verseStringLength != verseString?.length) {
+                        verseStringLength = verseString!!.length
+                        // This pattern matches two consecutive <b> tag spans separate only by white space and replaces them with a single <b> tag.
+                        val match =
+                            Regex("(<b[^<>]*>)([^<>]*?)(<\\/b>)(\\s+)\\1([\\s\\S]*?)\\3", RegexOption.IGNORE_CASE).find(
+                                (verseString)
+                            )
+                        if (match != null) {
+                            val matches = match.groupValues
+                            verseString = verseString.replace(
+                                matches[0],
+                                "${matches[1]}${matches[2]}${matches[4]}${matches[5]}${matches[3]}"
+                            )
+                        }
                     }
                 }
-
                 spannableText = SpannableString(Html.fromHtml(verseString))  // We started with an XML verse which got turned into a string with <b> tags which is now turned into a spannable
 
                 // Part 2: Find and highlight the normal (non-strongs) words or phrases in the PLAIN text verse
                 var m: Matcher? = null
                 val splitSearchArray = splitSearchTerms(searchTerms)
                 for (originalSearchWord in splitSearchArray) {
-                    var isStrongsSearch = originalSearchWord.contains("strong:")
-                    var searchWord =""
-                    if (isStrongsSearch) {
-                        searchWord = prepareSearchWord(originalSearchWord)
-                    } else {
-                        searchWord = if (!isStrongsSearch and originalSearchWord.contains("*")) {
-                            "\\b$searchWord[\\w\\'\\-]*\\b" // Match whole words including with hyphons and apostrophes
+                    var searchWord = prepareSearchWord(originalSearchWord)
+                    searchWord = if (originalSearchWord.contains("*")) {
+                        "\\b$searchWord[\\w\\'\\-]*\\b" // Match whole words including with hyphons and apostrophes
                         } else {
                             "\\b$searchWord\\b"
-                        }
                     }
                     if (searchWord.length > 0) {
                         m = Pattern.compile(searchWord, Pattern.CASE_INSENSITIVE).matcher(spannableText)
@@ -140,7 +142,6 @@ class SearchHighlight {
             searchTerms = searchTerms.replace("strong:g0*".toRegex(RegexOption.IGNORE_CASE), "strong:g0*")
             searchTerms = searchTerms.replace("strong:h0*".toRegex(RegexOption.IGNORE_CASE), "strong:h0*")
             searchTerms = searchTerms.replace("+", "")        // Remove + which indicates AND searches
-            searchTerms += "\\b"  // search on a word boundary (eg find strong:g0123 not strong:g01234567
 
             return searchTerms
         }

From 92c32dddaa00ac3579fb331a2b45915a994ec78e Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Tue, 25 Jan 2022 18:08:09 +1000
Subject: [PATCH 17/37] Renamed Files

---
 .../activity/search/SearchResultsAdapter.java | 14 +--------
 .../activity/search/SearchResultsFragments.kt | 31 +++++++++----------
 ...search_results_statistics_fragment_by.xml} |  0
 ...rch_results_statistics_fragment_verse.xml} |  0
 ...search_results_statistics_row_by_book.xml} |  0
 ...search_results_statistics_row_by_word.xml} |  0
 ...> search_results_statistics_row_verse.xml} |  0
 7 files changed, 15 insertions(+), 30 deletions(-)
 rename app/src/main/res/layout/{search_results_statistics_fragment.xml => search_results_statistics_fragment_by.xml} (100%)
 rename app/src/main/res/layout/{search_results_verse_fragment.xml => search_results_statistics_fragment_verse.xml} (100%)
 rename app/src/main/res/layout/{search_results_statistics_row.xml => search_results_statistics_row_by_book.xml} (100%)
 rename app/src/main/res/layout/{search_results_word_statistics_row.xml => search_results_statistics_row_by_word.xml} (100%)
 rename app/src/main/res/layout/{search_results_list_row.xml => search_results_statistics_row_verse.xml} (100%)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
index 0d216c3699..c937cdf511 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
@@ -1,12 +1,8 @@
 package net.bible.android.view.activity.search;
 
 import android.content.Context;
-import android.database.DataSetObserver;
-import android.graphics.Typeface;
 import android.text.Html;
-import android.text.Spannable;
 import android.text.SpannableString;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,21 +10,13 @@
 import android.widget.TextView;
 
 import net.bible.android.activity.R;
-import net.bible.android.control.search.SearchControl;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.crosswire.jsword.book.Book;
 import org.crosswire.jsword.book.Books;
 import org.crosswire.jsword.passage.Key;
 import org.crosswire.jsword.passage.NoSuchKeyException;
-import org.jdom2.Element;
-import org.jdom2.Text;
 
 public class SearchResultsAdapter extends ArrayAdapter<SearchResultsData> {
 
@@ -49,7 +37,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		if(convertView==null) {
 
 			LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			convertView=inflater.inflate(R.layout.search_results_list_row, null);
+			convertView=inflater.inflate(R.layout.search_results_statistics_row_verse, null);
 
 			TextView reference=convertView.findViewById(R.id.reference);
 			reference.setText(resultData.reference);
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index f1ab79fb65..be5cf08aec 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -1,7 +1,6 @@
 package net.bible.android.view.activity.search
 
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.os.Bundle
@@ -14,15 +13,13 @@ import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
 import android.widget.ListView
 import android.widget.ProgressBar
-import android.widget.ScrollView
 import android.widget.TextView
 import android.widget.Toast
-import androidx.core.view.allViews
 import com.google.android.material.tabs.TabLayout
-import net.bible.android.activity.databinding.SearchResultsVerseFragmentBinding
+import net.bible.android.activity.databinding.SearchResultsStatisticsFragmentVerseBinding
 import net.bible.android.activity.R
-import net.bible.android.activity.databinding.SearchResultsStatisticsFragmentBinding
-import net.bible.android.activity.databinding.SearchResultsStatisticsRowBinding
+import net.bible.android.activity.databinding.SearchResultsStatisticsFragmentByBinding
+import net.bible.android.activity.databinding.SearchResultsStatisticsRowByBookBinding
 import net.bible.android.control.search.SearchControl
 import net.bible.android.view.activity.base.Dialogs
 import net.bible.android.view.activity.page.MainBibleActivity
@@ -39,7 +36,7 @@ private var isSearchResultsFiltered = false
 class PlaceholderFragment: Fragment() {
 
     //    private lateinit var pageViewModel: PageViewModel
-    private var _binding: SearchResultsVerseFragmentBinding? = null
+    private var _binding: SearchResultsStatisticsFragmentVerseBinding? = null
 
     // This property is only valid between onCreateView and
     // onDestroyView.
@@ -54,7 +51,7 @@ class PlaceholderFragment: Fragment() {
         savedInstanceState: Bundle?
     ): View? {
 
-        _binding = SearchResultsVerseFragmentBinding.inflate(inflater, container, false)
+        _binding = SearchResultsStatisticsFragmentVerseBinding.inflate(inflater, container, false)
         val root = binding.root
 
         return root
@@ -97,7 +94,7 @@ private fun setResultsAdapter(resultsArray:ArrayList<SearchResultsData>, activit
 }
 class SearchResultsFragment : Fragment() {
 
-    private var _binding: SearchResultsVerseFragmentBinding? = null
+    private var _binding: SearchResultsStatisticsFragmentVerseBinding? = null
     private val binding get() = _binding!!
 
     var mVerseSearchResults: List<Key> = java.util.ArrayList()
@@ -115,7 +112,7 @@ class SearchResultsFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
 
-        _binding = SearchResultsVerseFragmentBinding.inflate(inflater, container, false)
+        _binding = SearchResultsStatisticsFragmentVerseBinding.inflate(inflater, container, false)
         val root = binding.root
 
         searchResultsArray = requireArguments().getParcelableArrayList("mylist")!!
@@ -187,7 +184,7 @@ class SearchResultsFragment : Fragment() {
 }
 
 class SearchBookStatisticsFragment : Fragment() {
-    private var _binding: SearchResultsStatisticsFragmentBinding? = null
+    private var _binding: SearchResultsStatisticsFragmentByBinding? = null
 
     private val binding get() = _binding!!
     var bookStatistics = mutableListOf<BookStat>()
@@ -197,8 +194,8 @@ class SearchBookStatisticsFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment
-        _binding = SearchResultsStatisticsFragmentBinding.inflate(inflater, container, false)
-        var rowBinding = SearchResultsStatisticsRowBinding.inflate(inflater, container, false)
+        _binding = SearchResultsStatisticsFragmentByBinding.inflate(inflater, container, false)
+        var rowBinding = SearchResultsStatisticsRowByBookBinding.inflate(inflater, container, false)
         val root = binding.root
 
         val statisticsLayout = binding.statisticsLayout
@@ -208,7 +205,7 @@ class SearchBookStatisticsFragment : Fragment() {
         bookStatistics.map {
 
             val statsRow: View = inflater.inflate(
-                R.layout.search_results_statistics_row,
+                R.layout.search_results_statistics_row_by_book,
                 statisticsLayout, false
             )
             var button = statsRow.findViewById<Button>(R.id.searchStatisticsBookButton)
@@ -264,7 +261,7 @@ class SearchBookStatisticsFragment : Fragment() {
 }
 
 class SearchWordStatisticsFragment : Fragment() {
-    private var _binding: SearchResultsStatisticsFragmentBinding? = null
+    private var _binding: SearchResultsStatisticsFragmentByBinding? = null
 
     private val binding get() = _binding!!
     private lateinit var inflater: LayoutInflater
@@ -295,7 +292,7 @@ class SearchWordStatisticsFragment : Fragment() {
         sortedWordStatistics.map {
 
             val statsRow: View = inflater.inflate(
-                R.layout.search_results_word_statistics_row,
+                R.layout.search_results_statistics_row_by_word,
                 statisticsLayout, false
             )
             var button = statsRow.findViewById<Button>(R.id.searchStatisticsWordButton)
@@ -322,7 +319,7 @@ class SearchWordStatisticsFragment : Fragment() {
     ): View? {
 
         inflater = theInflater
-        _binding = SearchResultsStatisticsFragmentBinding.inflate(inflater, container, false)
+        _binding = SearchResultsStatisticsFragmentByBinding.inflate(inflater, container, false)
         val root = binding.root
 
         ConstructButtonList()
diff --git a/app/src/main/res/layout/search_results_statistics_fragment.xml b/app/src/main/res/layout/search_results_statistics_fragment_by.xml
similarity index 100%
rename from app/src/main/res/layout/search_results_statistics_fragment.xml
rename to app/src/main/res/layout/search_results_statistics_fragment_by.xml
diff --git a/app/src/main/res/layout/search_results_verse_fragment.xml b/app/src/main/res/layout/search_results_statistics_fragment_verse.xml
similarity index 100%
rename from app/src/main/res/layout/search_results_verse_fragment.xml
rename to app/src/main/res/layout/search_results_statistics_fragment_verse.xml
diff --git a/app/src/main/res/layout/search_results_statistics_row.xml b/app/src/main/res/layout/search_results_statistics_row_by_book.xml
similarity index 100%
rename from app/src/main/res/layout/search_results_statistics_row.xml
rename to app/src/main/res/layout/search_results_statistics_row_by_book.xml
diff --git a/app/src/main/res/layout/search_results_word_statistics_row.xml b/app/src/main/res/layout/search_results_statistics_row_by_word.xml
similarity index 100%
rename from app/src/main/res/layout/search_results_word_statistics_row.xml
rename to app/src/main/res/layout/search_results_statistics_row_by_word.xml
diff --git a/app/src/main/res/layout/search_results_list_row.xml b/app/src/main/res/layout/search_results_statistics_row_verse.xml
similarity index 100%
rename from app/src/main/res/layout/search_results_list_row.xml
rename to app/src/main/res/layout/search_results_statistics_row_verse.xml

From faea5dea08aaf7d412fa2771f0ee974b23309b32 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Tue, 25 Jan 2022 21:56:43 +1000
Subject: [PATCH 18/37] Fixed the clearing of the activity when it drops out of
 view.

---
 .../view/activity/search/MySearchResults.kt   | 10 +--
 .../activity/search/SearchResultsFragments.kt | 63 +++++--------------
 ...vity.xml => search_results_statistics.xml} |  0
 .../search_results_statistics_row_by_book.xml |  6 +-
 .../search_results_statistics_row_by_word.xml |  6 +-
 5 files changed, 33 insertions(+), 52 deletions(-)
 rename app/src/main/res/layout/{search_results_layout_activity.xml => search_results_statistics.xml} (100%)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index c72d37f559..6581069a4b 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -17,7 +17,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.viewpager.widget.ViewPager
-import net.bible.android.activity.databinding.SearchResultsLayoutActivityBinding
+import net.bible.android.activity.databinding.SearchResultsStatisticsBinding
 import java.util.ArrayList
 import net.bible.android.activity.R
 import net.bible.android.control.navigation.NavigationControl
@@ -36,6 +36,7 @@ import org.crosswire.jsword.versification.Versification
 import net.bible.android.view.activity.navigation.GridChoosePassageBook.Companion.getBookTextColor
 import net.bible.service.common.CommonUtils.resources
 
+
 private var TAB_TITLES = arrayOf(
     resources.getString(R.string.verse_count),
     resources.getString(R.string.by_book),
@@ -122,7 +123,7 @@ class SearchResultsData : Parcelable {
 
 class MySearchResults : CustomTitlebarActivityBase() {
 //    private lateinit var binding: ListBinding
-    private lateinit var binding: SearchResultsLayoutActivityBinding
+    private lateinit var binding: SearchResultsStatisticsBinding
     private var mSearchResultsHolder: SearchResultsDto? = null
 
     /*  mKeyArrayAdapter is replaced by mSearchArrayAdapter */
@@ -144,7 +145,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
         super.onCreate(savedInstanceState, true)
         Log.i(TAG, "Displaying Search results view")
 
-        binding = SearchResultsLayoutActivityBinding.inflate(layoutInflater)
+        binding = SearchResultsStatisticsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
         buildActivityComponent().inject(this)
@@ -158,6 +159,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
         val sectionsPagerAdapter = SearchResultsPagerAdapter(this, supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent)
         val viewPager: ViewPager = binding.viewPager
         viewPager.adapter = sectionsPagerAdapter
+        viewPager.offscreenPageLimit = 2
         val tabs: TabLayout = binding.tabs
         tabs.setupWithViewPager(viewPager)
 
@@ -326,7 +328,7 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
         var frag: Fragment
         when (position) {
             0 -> {
-                frag = SearchResultsFragment.newInstance(1)
+                frag = SearchResultsFragment()
                 val bundle = Bundle()
                 bundle.putString("edttext", "From Activity")
                 bundle.putParcelableArrayList("mylist", mSearchArrayAdapter)
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index be5cf08aec..3a3688ead7 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -156,27 +156,6 @@ class SearchResultsFragment : Fragment() {
         }
     }
 
-    companion object {
-        /**
-         * The fragment argument representing the section number for this
-         * fragment.
-         */
-        private const val ARG_SECTION_NUMBER = "section_number"
-
-        /**
-         * Returns a new instance of this fragment for the given section
-         * number.
-         */
-        @JvmStatic
-        fun newInstance(sectionNumber: Int): SearchResultsFragment {
-            return SearchResultsFragment().apply {
-//                arguments = Bundle().apply {
-//                    putInt(ARG_SECTION_NUMBER, sectionNumber)
-//                }
-            }
-        }
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
@@ -195,7 +174,7 @@ class SearchBookStatisticsFragment : Fragment() {
     ): View? {
         // Inflate the layout for this fragment
         _binding = SearchResultsStatisticsFragmentByBinding.inflate(inflater, container, false)
-        var rowBinding = SearchResultsStatisticsRowByBookBinding.inflate(inflater, container, false)
+//        var rowBinding = SearchResultsStatisticsRowByBookBinding.inflate(inflater, container, false)
         val root = binding.root
 
         val statisticsLayout = binding.statisticsLayout
@@ -239,25 +218,10 @@ class SearchBookStatisticsFragment : Fragment() {
         return root
     }
 
-//    companion object {
-//        /**
-//         * Use this factory method to create a new instance of
-//         * this fragment using the provided parameters.
-//         *
-//         * @param param1 Parameter 1.
-//         * @param param2 Parameter 2.
-//         * @return A new instance of fragment SearchStatisticsFragment.
-//         */
-//        // TODO: Rename and change types and number of parameters
-//        @JvmStatic
-//        fun newInstance() =
-//            SearchStatisticsFragment().apply {
-//                arguments = Bundle().apply {
-////                    putString(ARG_PARAM1, param1)
-////                    putString(ARG_PARAM2, param2)
-//                }
-//            }
-//    }
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }
 
 class SearchWordStatisticsFragment : Fragment() {
@@ -267,6 +231,7 @@ class SearchWordStatisticsFragment : Fragment() {
     private lateinit var inflater: LayoutInflater
 
     var wordStatistics = mutableListOf<WordStat>()
+    private lateinit var statsRow: View
 
     class CustomOnClickListener(val resultIndexes: IntArray, val activity:Activity) : View.OnClickListener {
         override fun onClick(v: View?) {
@@ -302,8 +267,8 @@ class SearchWordStatisticsFragment : Fragment() {
             var progressBar = statsRow.findViewById<ProgressBar>(R.id.searchStatisticsWordCountProgress)
             progressBar.max = maxCount
             progressBar.progress = it.verseIndexes.count()
-            statsRow.visibility = View.VISIBLE
-            statsRow.invalidate()
+//            statsRow.visibility = View.VISIBLE
+//            statsRow.invalidate()
             statsRow.requestLayout()
             statisticsLayout.addView(statsRow,
                 FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
@@ -313,6 +278,10 @@ class SearchWordStatisticsFragment : Fragment() {
         }
 
     }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
     override fun onCreateView(
         theInflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -320,16 +289,18 @@ class SearchWordStatisticsFragment : Fragment() {
 
         inflater = theInflater
         _binding = SearchResultsStatisticsFragmentByBinding.inflate(inflater, container, false)
-        val root = binding.root
-
         ConstructButtonList()
 
         var showKeyWordsCheckBox = binding.showKeyWordOnly
         showKeyWordsCheckBox.setOnClickListener {
             ConstructButtonList()
         }
+        return binding.root
+    }
 
-        return root
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
     }
 }
 
diff --git a/app/src/main/res/layout/search_results_layout_activity.xml b/app/src/main/res/layout/search_results_statistics.xml
similarity index 100%
rename from app/src/main/res/layout/search_results_layout_activity.xml
rename to app/src/main/res/layout/search_results_statistics.xml
diff --git a/app/src/main/res/layout/search_results_statistics_row_by_book.xml b/app/src/main/res/layout/search_results_statistics_row_by_book.xml
index 2880b966c2..11c4eb9f86 100644
--- a/app/src/main/res/layout/search_results_statistics_row_by_book.xml
+++ b/app/src/main/res/layout/search_results_statistics_row_by_book.xml
@@ -15,6 +15,10 @@
 
 		<Button
 			android:id="@+id/searchStatisticsBookButton"
+			android:autoSizeTextType="uniform"
+			android:autoSizeMinTextSize="9dp"
+			android:autoSizeMaxTextSize="15dp"
+			android:autoSizeStepGranularity="1dp"
 			android:layout_width="170dp"
 			android:layout_height="36dp"
 			android:text="Song of Solomon"
@@ -24,7 +28,7 @@
 
 		<TextView
 			android:id="@+id/searchStatisticsBookCount"
-			android:layout_width="30dp"
+			android:layout_width="40dp"
 			android:layout_height="wrap_content"
 			android:text="345"
 			android:textAlignment="center"
diff --git a/app/src/main/res/layout/search_results_statistics_row_by_word.xml b/app/src/main/res/layout/search_results_statistics_row_by_word.xml
index f8e25a1070..8b9cc31b8f 100644
--- a/app/src/main/res/layout/search_results_statistics_row_by_word.xml
+++ b/app/src/main/res/layout/search_results_statistics_row_by_word.xml
@@ -16,6 +16,10 @@
 
 		<Button
 			android:id="@+id/searchStatisticsWordButton"
+			android:autoSizeTextType="uniform"
+			android:autoSizeMinTextSize="9dp"
+			android:autoSizeMaxTextSize="15dp"
+			android:autoSizeStepGranularity="1dp"
 			android:layout_width="170dp"
 			android:layout_height="wrap_content"
 			android:text="the word which is very long and might not wrap"
@@ -26,7 +30,7 @@
 
 		<TextView
 			android:id="@+id/searchStatisticsWordCount"
-			android:layout_width="30dp"
+			android:layout_width="40dp"
 			android:layout_height="wrap_content"
 			android:text="45"
 			android:textAlignment="center"

From 72176197d45cd9bd8d8b937582f700fb06817803 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Tue, 25 Jan 2022 21:58:00 +1000
Subject: [PATCH 19/37] Update MySearchResults.kt

---
 .../net/bible/android/view/activity/search/MySearchResults.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 6581069a4b..e7d341f663 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -159,7 +159,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
         val sectionsPagerAdapter = SearchResultsPagerAdapter(this, supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent)
         val viewPager: ViewPager = binding.viewPager
         viewPager.adapter = sectionsPagerAdapter
-        viewPager.offscreenPageLimit = 2
+        viewPager.offscreenPageLimit = 2    // The progressbar on the 3rd tab goes to zero when the view is lost. So just keep it in memory and all is fine. It is not a big view so i think it is ok.
         val tabs: TabLayout = binding.tabs
         tabs.setupWithViewPager(viewPager)
 

From 61333bb91240f392be3b6f670142f1fb3c08250f Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Thu, 27 Jan 2022 19:29:14 +1000
Subject: [PATCH 20/37] .

---
 .../view/activity/search/MySearchResults.kt   | 60 ++++++++++---------
 .../activity/search/SearchResultsFragments.kt | 13 ++--
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index e7d341f663..75a6cda078 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -10,6 +10,7 @@ import android.os.Parcelable
 import android.text.style.StyleSpan
 import android.util.Log
 import android.view.View
+import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.core.text.toHtml
 import com.google.android.material.tabs.TabLayout
@@ -17,6 +18,10 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.viewpager.widget.ViewPager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import net.bible.android.activity.databinding.SearchResultsStatisticsBinding
 import java.util.ArrayList
 import net.bible.android.activity.R
@@ -42,7 +47,7 @@ private var TAB_TITLES = arrayOf(
     resources.getString(R.string.by_book),
     resources.getString(R.string.by_word)
 )
-private val mSearchArrayAdapter = ArrayList<SearchResultsData>()
+val mSearchResultsArray = ArrayList<SearchResultsData>()
 private var mCurrentlyDisplayedSearchResults: List<Key> = ArrayList()
 private val bookStatistics = mutableListOf<BookStat>()
 private val wordStatistics = mutableListOf<WordStat>()
@@ -126,7 +131,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
     private lateinit var binding: SearchResultsStatisticsBinding
     private var mSearchResultsHolder: SearchResultsDto? = null
 
-    /*  mKeyArrayAdapter is replaced by mSearchArrayAdapter */
+    /*  mKeyArrayAdapter is replaced by mSearchResultsArray */
 //    private var mKeyArrayAdapter: ArrayAdapter<Key>? = null
 
     @Inject lateinit var navigationControl: NavigationControl
@@ -179,34 +184,34 @@ class MySearchResults : CustomTitlebarActivityBase() {
         processed immediately and doesn't  wait for the code inside the scope to complete. But i don't know how to fix
         that problem.
 */
-//        GlobalScope.launch {
+        GlobalScope.launch {
             prepareResults()
-//        }
+        }
     }
 
-//    private suspend fun prepareResults() {
-    private fun prepareResults() {
-//        withContext(Dispatchers.Main) {
+    private suspend fun prepareResults() {
+//    private fun prepareResults() {
+        withContext(Dispatchers.Main) {
             binding.loadingIndicator.visibility = View.VISIBLE
             binding.empty.visibility = View.GONE
-//        }
+        }
         if (fetchSearchResults()) { // initialise adapters before result population - easier when updating due to later Scripture toggle
-//            withContext(Dispatchers.Main) {
+            withContext(Dispatchers.Main) {
 //                mKeyArrayAdapter = SearchItemAdapter(this@MySearchResults, SearchResults.LIST_ITEM_TYPE, mCurrentlyDisplayedSearchResults, searchControl)
 //                listAdapter = mKeyArrayAdapter as ListAdapter
                 populateViewResultsAdapter()
-//            }
+            }
         }
-//        withContext(Dispatchers.Main) {
+        withContext(Dispatchers.Main) {
             binding.loadingIndicator.visibility = View.GONE
 //            if(listAdapter?.isEmpty == true) {
 //                binding.empty.visibility = View.VISIBLE
 //            }
-//        }
+        }
     }
 
-//    private suspend fun fetchSearchResults(): Boolean = withContext(Dispatchers.IO) {
-    private fun fetchSearchResults(): Boolean {
+    private suspend fun fetchSearchResults(): Boolean = withContext(Dispatchers.IO) {
+//    private fun fetchSearchResults(): Boolean {
         Log.i(TAG, "Preparing search results")
         var isOk: Boolean
         try { // get search string - passed in using extras so extras cannot be null
@@ -223,17 +228,17 @@ class MySearchResults : CustomTitlebarActivityBase() {
             } else {
                 getString(R.string.search_result_count, mSearchResultsHolder!!.size())
             }
-//            withContext(Dispatchers.Main) {
+            withContext(Dispatchers.Main) {
                 Toast.makeText(this@MySearchResults, msg, Toast.LENGTH_SHORT).show()
-//            }
+            }
             isOk = true
         } catch (e: Exception) {
             Log.e(TAG, "Error processing search query", e)
             isOk = false
             Dialogs.instance.showErrorMsg(R.string.error_executing_search) { onBackPressed() }
         }
-//    return@withContext isOk
-    return isOk
+    return@withContext isOk
+//    return isOk
     }
 
     /**
@@ -249,14 +254,19 @@ class MySearchResults : CustomTitlebarActivityBase() {
         val extras = intent.extras
         var searchDocument = extras!!.getString(SearchControl.SEARCH_DOCUMENT)
 
-        mSearchArrayAdapter!!.clear()
+        mSearchResultsArray!!.clear()
         bookStatistics.clear()
         wordStatistics.clear()
 
         var listIndex = 0
         for (key in mCurrentlyDisplayedSearchResults) {
 
-            // Get the text of the verse
+            // Add verse to results array
+            val verseTextElement = searchControl.getSearchResultVerseElement(key)
+            val verseTextSpannable = SearchHighlight.getSpannableText(SearchControl.originalSearchString, verseTextElement)
+            mSearchResultsArray.add(SearchResultsData(listIndex, key.osisID.toString(), key.name,searchDocument, "text", verseTextSpannable!!.toHtml()))
+
+            // Add book to the book statistics array
             val bookOrdinal = ((key as Verse).book as BibleBook).ordinal
             var mBibleBook = BibleBook.values()[bookOrdinal]
             var bookNameLong = versification.getLongName(mBibleBook)  // key.rootName
@@ -267,13 +277,8 @@ class MySearchResults : CustomTitlebarActivityBase() {
                 bookStatistics.first{it.book == bookNameLong}.count += 1
             }
 
-            val verseTextElement = searchControl.getSearchResultVerseElement(key)
-            val verseTextSpannable = SearchHighlight.getSpannableText(SearchControl.originalSearchString, verseTextElement)
-
-            mSearchArrayAdapter.add(SearchResultsData(listIndex, key.osisID.toString(), key.name,searchDocument, "text", verseTextSpannable!!.toHtml()))
-
+            // Add words in this verse to word statistics array
             var ss: Array<StyleSpan> = verseTextSpannable!!.getSpans(0, verseTextSpannable?.length, StyleSpan::class.java)
-
             for (i in ss.indices) {
                 if (ss[i].getStyle() === Typeface.BOLD) {
                     val start = verseTextSpannable.getSpanStart(ss[i])
@@ -293,6 +298,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
             }
             listIndex += 1
         }
+        adapter.notifyDataSetChanged()
         TAB_TITLES[0] = resources.getString(R.string.results_count, listIndex.toString())
     }
     /**
@@ -331,7 +337,7 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
                 frag = SearchResultsFragment()
                 val bundle = Bundle()
                 bundle.putString("edttext", "From Activity")
-                bundle.putParcelableArrayList("mylist", mSearchArrayAdapter)
+                bundle.putParcelableArrayList("VerseResultList", mSearchResultsArray)
                 frag.setArguments(bundle)
                 frag.searchControl = searchControl
                 frag.mVerseSearchResults = mCurrentlyDisplayedSearchResults
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index 3a3688ead7..bb542280b8 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -8,6 +8,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
 import android.widget.Button
 import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
@@ -28,7 +29,9 @@ import org.crosswire.jsword.passage.Key
 import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
 import net.bible.service.common.CommonUtils
 import net.bible.service.sword.SwordDocumentFacade
+import org.crosswire.common.util.Language
 
+lateinit var adapter: ArrayAdapter<SearchResultsData>
 private lateinit var searchResultsArray: ArrayList<SearchResultsData>
 private lateinit var displayedResultsArray: ArrayList<SearchResultsData>
 private var isSearchResultsFiltered = false
@@ -94,6 +97,7 @@ private fun setResultsAdapter(resultsArray:ArrayList<SearchResultsData>, activit
 }
 class SearchResultsFragment : Fragment() {
 
+//    private lateinit var langArrayAdapter: ArrayAdapter<SearchResultsData>
     private var _binding: SearchResultsStatisticsFragmentVerseBinding? = null
     private val binding get() = _binding!!
 
@@ -106,7 +110,6 @@ class SearchResultsFragment : Fragment() {
         super.onCreate(savedInstanceState)
     }
 
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -115,12 +118,14 @@ class SearchResultsFragment : Fragment() {
         _binding = SearchResultsStatisticsFragmentVerseBinding.inflate(inflater, container, false)
         val root = binding.root
 
-        searchResultsArray = requireArguments().getParcelableArrayList("mylist")!!
-
+//        searchResultsArray = requireArguments().getParcelableArrayList("VerseResultList")!!
+//        searchResultsArray = mSearchResultsArray
 //        val customAdapter = SearchResultsAdapter(activity, android.R.layout.simple_list_item_2, searchResultsArray)
 
         val resultList: ListView = binding.searchResultsList
-        resultList.adapter = setResultsAdapter(searchResultsArray, requireActivity())
+
+        adapter = setResultsAdapter(mSearchResultsArray, requireActivity())
+        resultList.adapter = adapter
         resultList.descendantFocusability = ViewGroup.FOCUS_BEFORE_DESCENDANTS;
         resultList.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
         resultList.isVerticalScrollBarEnabled = false

From 2bc8c70888deb9dd0c9567d8924c07c05c8c10df Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Thu, 27 Jan 2022 21:00:47 +1000
Subject: [PATCH 21/37] Results display finally keeps up to date

---
 .../view/activity/search/MySearchResults.kt   | 24 +++++++------------
 .../activity/search/SearchResultsFragments.kt |  6 +----
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 75a6cda078..752c71c37f 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -47,7 +47,6 @@ private var TAB_TITLES = arrayOf(
     resources.getString(R.string.by_book),
     resources.getString(R.string.by_word)
 )
-val mSearchResultsArray = ArrayList<SearchResultsData>()
 private var mCurrentlyDisplayedSearchResults: List<Key> = ArrayList()
 private val bookStatistics = mutableListOf<BookStat>()
 private val wordStatistics = mutableListOf<WordStat>()
@@ -127,12 +126,10 @@ class SearchResultsData : Parcelable {
 }
 
 class MySearchResults : CustomTitlebarActivityBase() {
-//    private lateinit var binding: ListBinding
     private lateinit var binding: SearchResultsStatisticsBinding
     private var mSearchResultsHolder: SearchResultsDto? = null
 
-    /*  mKeyArrayAdapter is replaced by mSearchResultsArray */
-//    private var mKeyArrayAdapter: ArrayAdapter<Key>? = null
+    val mSearchResultsArray = ArrayList<SearchResultsData>()
 
     @Inject lateinit var navigationControl: NavigationControl
     private var isScriptureResultsCurrentlyShown = true
@@ -158,10 +155,10 @@ class MySearchResults : CustomTitlebarActivityBase() {
         val bundle = Bundle()
         bundle.putString("edttext", "From Activity")
 
-        val fragobj = SearchResultsFragment()
-        fragobj.setArguments(bundle)
+//        val fragobj = SearchResultsFragment(mSearchResultsArray)
+//        fragobj.setArguments(bundle)
 
-        val sectionsPagerAdapter = SearchResultsPagerAdapter(this, supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent)
+        val sectionsPagerAdapter = SearchResultsPagerAdapter(this, supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent, mSearchResultsArray)
         val viewPager: ViewPager = binding.viewPager
         viewPager.adapter = sectionsPagerAdapter
         viewPager.offscreenPageLimit = 2    // The progressbar on the 3rd tab goes to zero when the view is lost. So just keep it in memory and all is fine. It is not a big view so i think it is ok.
@@ -178,12 +175,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
 //            finish()
 //        }
 
-/*      The GlobalScope code almost works fine. Only trouble is that the search results are delayed by one search.
-        That is, the first time the search is done no results are shown. The second time, the results from the previous
-        search are shown and so on. I believe it is because the Fragment manager is not hooked into the scope so it is
-        processed immediately and doesn't  wait for the code inside the scope to complete. But i don't know how to fix
-        that problem.
-*/
+
         GlobalScope.launch {
             prepareResults()
         }
@@ -238,7 +230,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
             Dialogs.instance.showErrorMsg(R.string.error_executing_search) { onBackPressed() }
         }
     return@withContext isOk
-//    return isOk
     }
 
     /**
@@ -321,7 +312,8 @@ class MySearchResults : CustomTitlebarActivityBase() {
 class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManager,
                                 searchControl: SearchControl,
                                 activeWindowPageManagerProvider: ActiveWindowPageManagerProvider,
-                                intent: Intent
+                                intent: Intent,
+                                val mSearchResultsArray:ArrayList<SearchResultsData>
 ) :
     FragmentPagerAdapter(fm) {
     val searchControl = searchControl
@@ -334,7 +326,7 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
         var frag: Fragment
         when (position) {
             0 -> {
-                frag = SearchResultsFragment()
+                frag = SearchResultsFragment(mSearchResultsArray)
                 val bundle = Bundle()
                 bundle.putString("edttext", "From Activity")
                 bundle.putParcelableArrayList("VerseResultList", mSearchResultsArray)
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index bb542280b8..e08d80b04a 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -95,7 +95,7 @@ private fun setResultsAdapter(resultsArray:ArrayList<SearchResultsData>, activit
         displayedResultsArray as java.util.ArrayList<SearchResultsData>?
     )
 }
-class SearchResultsFragment : Fragment() {
+class SearchResultsFragment(val mSearchResultsArray:ArrayList<SearchResultsData>) : Fragment() {
 
 //    private lateinit var langArrayAdapter: ArrayAdapter<SearchResultsData>
     private var _binding: SearchResultsStatisticsFragmentVerseBinding? = null
@@ -118,10 +118,6 @@ class SearchResultsFragment : Fragment() {
         _binding = SearchResultsStatisticsFragmentVerseBinding.inflate(inflater, container, false)
         val root = binding.root
 
-//        searchResultsArray = requireArguments().getParcelableArrayList("VerseResultList")!!
-//        searchResultsArray = mSearchResultsArray
-//        val customAdapter = SearchResultsAdapter(activity, android.R.layout.simple_list_item_2, searchResultsArray)
-
         val resultList: ListView = binding.searchResultsList
 
         adapter = setResultsAdapter(mSearchResultsArray, requireActivity())

From 1401604c1063b5a6e2b1323e094b08207727d43a Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 29 Jan 2022 18:26:20 +1000
Subject: [PATCH 22/37] Refreshes the book fragment 'correctly'

It is not a good approach because it is generating the statistics twice.
---
 .../view/activity/search/MySearchResults.kt   | 24 +++++++++++++++----
 .../activity/search/SearchResultsFragments.kt |  1 +
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 752c71c37f..909ee925d7 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -17,6 +17,8 @@ import com.google.android.material.tabs.TabLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
+import androidx.fragment.app.FragmentTransaction
+import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -48,7 +50,7 @@ private var TAB_TITLES = arrayOf(
     resources.getString(R.string.by_word)
 )
 private var mCurrentlyDisplayedSearchResults: List<Key> = ArrayList()
-private val bookStatistics = mutableListOf<BookStat>()
+//private val bookStatistics = mutableListOf<BookStat>()
 private val wordStatistics = mutableListOf<WordStat>()
 
 class BookStat(val book: String, var count: Int,
@@ -128,8 +130,9 @@ class SearchResultsData : Parcelable {
 class MySearchResults : CustomTitlebarActivityBase() {
     private lateinit var binding: SearchResultsStatisticsBinding
     private var mSearchResultsHolder: SearchResultsDto? = null
-
+    private lateinit var sectionsPagerAdapter: SearchResultsPagerAdapter
     val mSearchResultsArray = ArrayList<SearchResultsData>()
+    private val bookStatistics = mutableListOf<BookStat>()
 
     @Inject lateinit var navigationControl: NavigationControl
     private var isScriptureResultsCurrentlyShown = true
@@ -158,7 +161,9 @@ class MySearchResults : CustomTitlebarActivityBase() {
 //        val fragobj = SearchResultsFragment(mSearchResultsArray)
 //        fragobj.setArguments(bundle)
 
-        val sectionsPagerAdapter = SearchResultsPagerAdapter(this, supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent, mSearchResultsArray)
+        sectionsPagerAdapter = SearchResultsPagerAdapter(this,
+                                                                supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent,
+                                                                mSearchResultsArray, bookStatistics)
         val viewPager: ViewPager = binding.viewPager
         viewPager.adapter = sectionsPagerAdapter
         viewPager.offscreenPageLimit = 2    // The progressbar on the 3rd tab goes to zero when the view is lost. So just keep it in memory and all is fine. It is not a big view so i think it is ok.
@@ -290,6 +295,10 @@ class MySearchResults : CustomTitlebarActivityBase() {
             listIndex += 1
         }
         adapter.notifyDataSetChanged()
+
+        sectionsPagerAdapter.getItem(1)
+        sectionsPagerAdapter.notifyDataSetChanged()
+
         TAB_TITLES[0] = resources.getString(R.string.results_count, listIndex.toString())
     }
     /**
@@ -313,12 +322,14 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
                                 searchControl: SearchControl,
                                 activeWindowPageManagerProvider: ActiveWindowPageManagerProvider,
                                 intent: Intent,
-                                val mSearchResultsArray:ArrayList<SearchResultsData>
+                                val mSearchResultsArray:ArrayList<SearchResultsData>,
+                                val bookStatistics: MutableList<BookStat>
 ) :
     FragmentPagerAdapter(fm) {
     val searchControl = searchControl
     val activeWindowPageManagerProvider = activeWindowPageManagerProvider
     val intent = intent
+    lateinit var bookStatisticsFrag: Fragment
 
     override fun getItem(position: Int): Fragment {
         // getItem is called to instantiate the fragment for the given page.
@@ -339,6 +350,7 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
             1-> {
                 frag = SearchBookStatisticsFragment()
                 frag.bookStatistics = bookStatistics
+                bookStatisticsFrag = frag
             }
             2-> {
                 frag = SearchWordStatisticsFragment()
@@ -350,6 +362,9 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
         return frag
     }
 
+    override fun getItemPosition(`object`: Any): Int {
+        return POSITION_NONE
+    }
     override fun getPageTitle(position: Int): CharSequence? {
         return TAB_TITLES[position]
     }
@@ -358,4 +373,5 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
         // Show 2 total pages.
         return 3
     }
+
 }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index e08d80b04a..daa183d599 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -90,6 +90,7 @@ class PlaceholderFragment: Fragment() {
 private fun setResultsAdapter(resultsArray:ArrayList<SearchResultsData>, activity: Activity): SearchResultsAdapter {
     displayedResultsArray = resultsArray
     val tabhost = activity.findViewById<View>(R.id.tabs) as TabLayout
+    // TODO: Shift  the next line somewhere
     tabhost.getTabAt(0)!!.text = CommonUtils.resources.getString(R.string.verse_count, displayedResultsArray.count().toString())
     return SearchResultsAdapter(activity, android.R.layout.simple_list_item_2,
         displayedResultsArray as java.util.ArrayList<SearchResultsData>?

From 5b0b4789aa581e42d93a8f930fa7ea830c66bb32 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 29 Jan 2022 22:06:57 +1000
Subject: [PATCH 23/37] Mostly working now. Need to sort out performance still

---
 .../view/activity/search/MySearchResults.kt   | 96 ++++++++++---------
 .../activity/search/SearchResultsAdapter.java | 10 ++
 .../activity/search/SearchResultsFragments.kt | 49 +++++-----
 .../search_results_statistics_row_verse.xml   |  2 +-
 app/src/main/res/values/strings.xml           |  2 +
 5 files changed, 87 insertions(+), 72 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 909ee925d7..101277f741 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -9,16 +9,14 @@ import android.os.Parcel
 import android.os.Parcelable
 import android.text.style.StyleSpan
 import android.util.Log
+import android.view.MenuItem
 import android.view.View
-import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.core.text.toHtml
 import com.google.android.material.tabs.TabLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
-import androidx.fragment.app.FragmentTransaction
-import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -41,17 +39,19 @@ import javax.inject.Inject
 import org.crosswire.jsword.versification.BibleBook
 import org.crosswire.jsword.versification.Versification
 import net.bible.android.view.activity.navigation.GridChoosePassageBook.Companion.getBookTextColor
+import net.bible.service.common.CommonUtils
 import net.bible.service.common.CommonUtils.resources
 
 
 private var TAB_TITLES = arrayOf(
-    resources.getString(R.string.verse_count),
+    resources.getString(R.string.add_bookmark_whole_verse1),
     resources.getString(R.string.by_book),
     resources.getString(R.string.by_word)
 )
-private var mCurrentlyDisplayedSearchResults: List<Key> = ArrayList()
-//private val bookStatistics = mutableListOf<BookStat>()
-private val wordStatistics = mutableListOf<WordStat>()
+var mCurrentlyDisplayedSearchResults: List<Key> = ArrayList()  // I tried to make this a non-global but i had the same problem as before where the values in the variable was one behind the search. I don't know why!!
+const val verseTabPosition = 0
+private const val bookTabPosition = 1
+private const val wordTabPosition = 2
 
 class BookStat(val book: String, var count: Int,
                val bookInitials: String,
@@ -133,6 +133,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
     private lateinit var sectionsPagerAdapter: SearchResultsPagerAdapter
     val mSearchResultsArray = ArrayList<SearchResultsData>()
     private val bookStatistics = mutableListOf<BookStat>()
+    private val wordStatistics = mutableListOf<WordStat>()
 
     @Inject lateinit var navigationControl: NavigationControl
     private var isScriptureResultsCurrentlyShown = true
@@ -144,6 +145,16 @@ class MySearchResults : CustomTitlebarActivityBase() {
     private val versification: Versification
         get() = navigationControl.versification
 
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
     @SuppressLint("MissingSuperCall")
     override fun onCreate(savedInstanceState: Bundle?) {
 
@@ -158,12 +169,9 @@ class MySearchResults : CustomTitlebarActivityBase() {
         val bundle = Bundle()
         bundle.putString("edttext", "From Activity")
 
-//        val fragobj = SearchResultsFragment(mSearchResultsArray)
-//        fragobj.setArguments(bundle)
-
         sectionsPagerAdapter = SearchResultsPagerAdapter(this,
                                                                 supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent,
-                                                                mSearchResultsArray, bookStatistics)
+                                                                mSearchResultsArray, bookStatistics, wordStatistics)
         val viewPager: ViewPager = binding.viewPager
         viewPager.adapter = sectionsPagerAdapter
         viewPager.offscreenPageLimit = 2    // The progressbar on the 3rd tab goes to zero when the view is lost. So just keep it in memory and all is fine. It is not a big view so i think it is ok.
@@ -175,27 +183,18 @@ class MySearchResults : CustomTitlebarActivityBase() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         isScriptureResultsCurrentlyShown = searchControl.isCurrentlyShowingScripture
 
-/*      I don't  have a close button so I don't see why this is necessary */
-//        binding.closeButton.setOnClickListener {
-//            finish()
-//        }
-
-
         GlobalScope.launch {
             prepareResults()
         }
     }
 
     private suspend fun prepareResults() {
-//    private fun prepareResults() {
         withContext(Dispatchers.Main) {
             binding.loadingIndicator.visibility = View.VISIBLE
             binding.empty.visibility = View.GONE
         }
         if (fetchSearchResults()) { // initialise adapters before result population - easier when updating due to later Scripture toggle
             withContext(Dispatchers.Main) {
-//                mKeyArrayAdapter = SearchItemAdapter(this@MySearchResults, SearchResults.LIST_ITEM_TYPE, mCurrentlyDisplayedSearchResults, searchControl)
-//                listAdapter = mKeyArrayAdapter as ListAdapter
                 populateViewResultsAdapter()
             }
         }
@@ -208,7 +207,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
     }
 
     private suspend fun fetchSearchResults(): Boolean = withContext(Dispatchers.IO) {
-//    private fun fetchSearchResults(): Boolean {
         Log.i(TAG, "Preparing search results")
         var isOk: Boolean
         try { // get search string - passed in using extras so extras cannot be null
@@ -255,6 +253,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
         wordStatistics.clear()
 
         var listIndex = 0
+        var totalWords = 0
         for (key in mCurrentlyDisplayedSearchResults) {
 
             // Add verse to results array
@@ -274,11 +273,12 @@ class MySearchResults : CustomTitlebarActivityBase() {
             }
 
             // Add words in this verse to word statistics array
-            var ss: Array<StyleSpan> = verseTextSpannable!!.getSpans(0, verseTextSpannable?.length, StyleSpan::class.java)
-            for (i in ss.indices) {
-                if (ss[i].getStyle() === Typeface.BOLD) {
-                    val start = verseTextSpannable.getSpanStart(ss[i])
-                    val end = verseTextSpannable.getSpanEnd(ss[i])
+            var verseSpans: Array<StyleSpan> = verseTextSpannable!!.getSpans(0, verseTextSpannable?.length, StyleSpan::class.java)
+            for (i in verseSpans.indices) {
+                if (verseSpans[i].getStyle() === Typeface.BOLD) {
+                    totalWords += 1
+                    val start = verseTextSpannable.getSpanStart(verseSpans[i])
+                    val end = verseTextSpannable.getSpanEnd(verseSpans[i])
 
                     var wordArray = CharArray(end-start)
                     verseTextSpannable.getChars(start, end, wordArray, 0)
@@ -294,12 +294,15 @@ class MySearchResults : CustomTitlebarActivityBase() {
             }
             listIndex += 1
         }
-        adapter.notifyDataSetChanged()
-
-        sectionsPagerAdapter.getItem(1)
+        sectionsPagerAdapter.verseListFrag.arrayAdapter.notifyDataSetChanged()
+        sectionsPagerAdapter.getItem(bookTabPosition)
+        sectionsPagerAdapter.getItem(wordTabPosition)
         sectionsPagerAdapter.notifyDataSetChanged()
 
-        TAB_TITLES[0] = resources.getString(R.string.results_count, listIndex.toString())
+        val tabHost = this.findViewById<View>(R.id.tabs) as TabLayout
+        tabHost.getTabAt(verseTabPosition)!!.text = CommonUtils.resources.getString(R.string.verse_count, mSearchResultsArray.count().toString())  // For some reason the value set in 'setResultsAdapter' get's cleared so I need to do it here as well.
+        tabHost.getTabAt(bookTabPosition)!!.text = CommonUtils.resources.getString(R.string.book_count, bookStatistics.count().toString())
+        tabHost.getTabAt(wordTabPosition)!!.text = CommonUtils.resources.getString(R.string.word_count, totalWords.toString())
     }
     /**
      * Handle scripture/Appendix toggle
@@ -315,7 +318,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
         private const val TAG = " MySearchResults"
         private const val LIST_ITEM_TYPE = android.R.layout.simple_list_item_2
     }
-
 }
 
 class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManager,
@@ -323,55 +325,61 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
                                 activeWindowPageManagerProvider: ActiveWindowPageManagerProvider,
                                 intent: Intent,
                                 val mSearchResultsArray:ArrayList<SearchResultsData>,
-                                val bookStatistics: MutableList<BookStat>
+                                val bookStatistics: MutableList<BookStat>,
+                                val wordStatistics: MutableList<WordStat>
 ) :
     FragmentPagerAdapter(fm) {
     val searchControl = searchControl
     val activeWindowPageManagerProvider = activeWindowPageManagerProvider
     val intent = intent
-    lateinit var bookStatisticsFrag: Fragment
+    lateinit var verseListFrag: SearchResultsFragment
+//    lateinit var bookStatisticsFrag: SearchBookStatisticsFragment
 
     override fun getItem(position: Int): Fragment {
         // getItem is called to instantiate the fragment for the given page.
-        // Return a PlaceholderFragment (defined as a static inner class below).
+        // This initialises the fragment but only if POSITION_NONE is returned from getItemPosition.
+        // This happens naturally when pages are moving in and out of view but not when we try to refresh.
+        // The individual fragment code gets called twice - first with no data to display and then with the correct data.
+        // This is because the page is shown in the GlobalScope in order to allow us to show a progress indicator.
         var frag: Fragment
         when (position) {
-            0 -> {
+            verseTabPosition -> {
                 frag = SearchResultsFragment(mSearchResultsArray)
                 val bundle = Bundle()
                 bundle.putString("edttext", "From Activity")
                 bundle.putParcelableArrayList("VerseResultList", mSearchResultsArray)
                 frag.setArguments(bundle)
                 frag.searchControl = searchControl
-                frag.mVerseSearchResults = mCurrentlyDisplayedSearchResults
                 frag.activeWindowPageManagerProvider = activeWindowPageManagerProvider
                 frag.intent = intent
+                verseListFrag = frag
             }
-            1-> {
+            bookTabPosition-> {
                 frag = SearchBookStatisticsFragment()
                 frag.bookStatistics = bookStatistics
-                bookStatisticsFrag = frag
+                frag.searchResultsArray = mSearchResultsArray
+//                bookStatisticsFrag = frag
             }
             2-> {
                 frag = SearchWordStatisticsFragment()
+                frag.searchResultsArray = mSearchResultsArray
                 frag.wordStatistics = wordStatistics
             }
             else -> frag = PlaceholderFragment.newInstance(1)
         }
-
         return frag
     }
 
     override fun getItemPosition(`object`: Any): Int {
+        // This line is needed to force a refresh of the fragment.
+        // It doesn't seem to affect anything adversely, I think because all tabs remain in memory the whole time.
         return POSITION_NONE
     }
-    override fun getPageTitle(position: Int): CharSequence? {
-        return TAB_TITLES[position]
-    }
+//    override fun getPageTitle(position: Int): CharSequence? {
+//        return TAB_TITLES[position]
+//    }
 
     override fun getCount(): Int {
-        // Show 2 total pages.
         return 3
     }
-
 }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
index c937cdf511..9bec39ee3f 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsAdapter.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.text.Html;
 import android.text.SpannableString;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,9 +32,15 @@ public SearchResultsAdapter(Context _context, int _resource, ArrayList<SearchRes
 		this.context=_context;
 	}
 
+	private void scaleTextView(TextView textView, Float scale) {
+		if (textView.getTag()==null) textView.setTag(Float.valueOf(textView.getTextSize()));
+		textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, (Float) textView.getTag() * scale);
+	}
+
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 		SearchResultsData resultData=arrayList.get(position);
+		Float scaleText = 1.2F; // TODO: I would like to add an application preference that allows the user to set the size of their results list
 		if(convertView==null) {
 
 			LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -41,9 +48,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
 			TextView reference=convertView.findViewById(R.id.reference);
 			reference.setText(resultData.reference);
+			scaleTextView(reference, scaleText);
 
 			TextView translation=convertView.findViewById(R.id.translation);
 			translation.setText(resultData.translation);
+			scaleTextView(translation, scaleText);
 
 			// Get the text of the verse
 			Book book = Books.installed().getBook(resultData.translation);
@@ -62,6 +71,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
 				TextView verse=convertView.findViewById(R.id.verse);
 				verse.setText(verseTextHtml);
+				scaleTextView(verse, scaleText);
 
 			} catch (NoSuchKeyException e) {
 				e.printStackTrace();
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index daa183d599..05979d5215 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -31,8 +31,6 @@ import net.bible.service.common.CommonUtils
 import net.bible.service.sword.SwordDocumentFacade
 import org.crosswire.common.util.Language
 
-lateinit var adapter: ArrayAdapter<SearchResultsData>
-private lateinit var searchResultsArray: ArrayList<SearchResultsData>
 private lateinit var displayedResultsArray: ArrayList<SearchResultsData>
 private var isSearchResultsFiltered = false
 
@@ -88,29 +86,27 @@ class PlaceholderFragment: Fragment() {
 }
 
 private fun setResultsAdapter(resultsArray:ArrayList<SearchResultsData>, activity: Activity): SearchResultsAdapter {
-    displayedResultsArray = resultsArray
+    // This function is called from both the SearchResultsFragment and the SearchWordStatistics (for filtering)
+
+    // The count needs to be set here because it can be changed when filtering the list by word
     val tabhost = activity.findViewById<View>(R.id.tabs) as TabLayout
-    // TODO: Shift  the next line somewhere
-    tabhost.getTabAt(0)!!.text = CommonUtils.resources.getString(R.string.verse_count, displayedResultsArray.count().toString())
+    val verseCount = if(resultsArray.count()==0) "" else resultsArray.count().toString()
+    tabhost.getTabAt(verseTabPosition)!!.text = CommonUtils.resources.getString(R.string.verse_count, verseCount)
+
+    displayedResultsArray = resultsArray
     return SearchResultsAdapter(activity, android.R.layout.simple_list_item_2,
         displayedResultsArray as java.util.ArrayList<SearchResultsData>?
     )
 }
 class SearchResultsFragment(val mSearchResultsArray:ArrayList<SearchResultsData>) : Fragment() {
-
-//    private lateinit var langArrayAdapter: ArrayAdapter<SearchResultsData>
     private var _binding: SearchResultsStatisticsFragmentVerseBinding? = null
     private val binding get() = _binding!!
+    lateinit var arrayAdapter: ArrayAdapter<SearchResultsData>
 
-    var mVerseSearchResults: List<Key> = java.util.ArrayList()
     var searchControl: SearchControl? = null
     lateinit var intent: Intent
     lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -121,8 +117,8 @@ class SearchResultsFragment(val mSearchResultsArray:ArrayList<SearchResultsData>
 
         val resultList: ListView = binding.searchResultsList
 
-        adapter = setResultsAdapter(mSearchResultsArray, requireActivity())
-        resultList.adapter = adapter
+        arrayAdapter = setResultsAdapter(mSearchResultsArray, requireActivity())
+        resultList.adapter = arrayAdapter
         resultList.descendantFocusability = ViewGroup.FOCUS_BEFORE_DESCENDANTS;
         resultList.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
         resultList.isVerticalScrollBarEnabled = false
@@ -130,7 +126,8 @@ class SearchResultsFragment(val mSearchResultsArray:ArrayList<SearchResultsData>
         resultList.setOnItemClickListener { parent, view, position, id ->
             Toast.makeText(resultList.context, "Hi",Toast.LENGTH_LONG)
             try { // no need to call HistoryManager.addHistoryItem() here because PassageChangeMediator will tell HistoryManager a change is about to occur
-                verseSelected(mVerseSearchResults[displayedResultsArray[position].id!!])
+                verseSelected(mCurrentlyDisplayedSearchResults[displayedResultsArray[position].id!!])
+//                verseSelected(mCurrentlyDisplayedSearchResults[displayedResultsArray[position].id!!])
             } catch (e: Exception) {
                 Log.e("blah", "Selection error", e)
                 Dialogs.instance.showErrorMsg(R.string.error_occurred, e)
@@ -169,6 +166,7 @@ class SearchBookStatisticsFragment : Fragment() {
 
     private val binding get() = _binding!!
     var bookStatistics = mutableListOf<BookStat>()
+     lateinit var searchResultsArray: ArrayList<SearchResultsData>
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -226,16 +224,16 @@ class SearchBookStatisticsFragment : Fragment() {
     }
 }
 
-class SearchWordStatisticsFragment : Fragment() {
-    private var _binding: SearchResultsStatisticsFragmentByBinding? = null
+class SearchWordStatisticsFragment() : Fragment() {
+    var wordStatistics = mutableListOf<WordStat>()
+    var searchResultsArray = arrayListOf<SearchResultsData>()
 
+    private var _binding: SearchResultsStatisticsFragmentByBinding? = null
     private val binding get() = _binding!!
     private lateinit var inflater: LayoutInflater
-
-    var wordStatistics = mutableListOf<WordStat>()
     private lateinit var statsRow: View
 
-    class CustomOnClickListener(val resultIndexes: IntArray, val activity:Activity) : View.OnClickListener {
+    class CustomOnClickListener(val resultIndexes: IntArray, val activity:Activity, val searchResultsArray:ArrayList<SearchResultsData>) : View.OnClickListener {
         override fun onClick(v: View?) {
             isSearchResultsFiltered = true
             val tabhost = activity.findViewById<View>(R.id.tabs) as TabLayout
@@ -252,7 +250,6 @@ class SearchWordStatisticsFragment : Fragment() {
         var showKeyWordsCheckBox = activity?.findViewById<Button>(R.id.show_key_word_only)
         val statisticsLayout = binding.statisticsLayout
 
-//        if (statisticsLayout.allViews.count() > 2) statisticsLayout.removeViews(3,statisticsLayout.allViews.count()-3)
         statisticsLayout.removeAllViews()
         val sortedWordStatistics = wordStatistics.sortedBy { it.word }
         val maxCount: Int = sortedWordStatistics.maxOfOrNull { it.verseIndexes.count() } ?: 0
@@ -269,21 +266,19 @@ class SearchWordStatisticsFragment : Fragment() {
             var progressBar = statsRow.findViewById<ProgressBar>(R.id.searchStatisticsWordCountProgress)
             progressBar.max = maxCount
             progressBar.progress = it.verseIndexes.count()
-//            statsRow.visibility = View.VISIBLE
-//            statsRow.invalidate()
             statsRow.requestLayout()
             statisticsLayout.addView(statsRow,
                 FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
             )
 
-            button.setOnClickListener(CustomOnClickListener(it.verseIndexes, requireActivity()))
+            button.setOnClickListener(CustomOnClickListener(it.verseIndexes, requireActivity(), searchResultsArray))
         }
 
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//    }
     override fun onCreateView(
         theInflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
diff --git a/app/src/main/res/layout/search_results_statistics_row_verse.xml b/app/src/main/res/layout/search_results_statistics_row_verse.xml
index 33e31d91d1..26493c4ab5 100644
--- a/app/src/main/res/layout/search_results_statistics_row_verse.xml
+++ b/app/src/main/res/layout/search_results_statistics_row_verse.xml
@@ -24,7 +24,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="Reference"
-			android:textSize="15dip"
+			android:textSize="13dip"
 			android:focusable="false"
 			android:focusableInTouchMode="false"
 			android:paddingLeft="10dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b5074cca50..e6308177fe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -80,6 +80,8 @@
     <string name="hebrew">Hebrew</string>
     <string name="results_count">Results: %s</string>
     <string name="verse_count">Verses: %s</string>
+    <string name="book_count">Books: %s</string>
+    <string name="word_count">Words: %s</string>
     <string name="statistics">Statistics</string>
     <string name="by_book">By Book</string>
     <string name="by_word">By Word</string>

From f10c554c9800d99a1c4d1c63750a838e1dd128f3 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 29 Jan 2022 23:22:34 +1000
Subject: [PATCH 24/37] Add some benchmarking to try to work our what is slow

---
 .../android/control/search/SearchControl.kt   |  2 +-
 .../view/activity/search/MySearchResults.kt   | 39 +++++++++++++++++++
 .../view/activity/search/SearchHighlight.kt   |  4 +-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/bible/android/control/search/SearchControl.kt b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
index 638487d96a..aa3a3db729 100644
--- a/app/src/main/java/net/bible/android/control/search/SearchControl.kt
+++ b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
@@ -280,7 +280,7 @@ class SearchControl @Inject constructor(
         const val TARGET_DOCUMENT = "TargetDocument"
         private const val STRONG_COLON_STRING = LuceneIndex.FIELD_STRONG + ":"
         private const val STRONG_COLON_STRING_PLACE_HOLDER = LuceneIndex.FIELD_STRONG + "COLON"
-        const val MAX_SEARCH_RESULTS = 1000
+        const val MAX_SEARCH_RESULTS = 10000
         private const val TAG = "SearchControl"
     }
 }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 101277f741..eb387cd15e 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -53,6 +53,18 @@ const val verseTabPosition = 0
 private const val bookTabPosition = 1
 private const val wordTabPosition = 2
 
+class MyTimer(val name:String){
+    var startTime = System.nanoTime()
+    var totalTime:Long = 0
+
+    fun start() {startTime = System.nanoTime()}
+    fun stop() {totalTime += System.nanoTime() - startTime}
+    fun log() {
+        Log.e("MyTimer", name + ": " + (totalTime/1000000) + "mS\n")
+    }
+}
+private val totalTime = MyTimer("Total Time")
+
 class BookStat(val book: String, var count: Int,
                val bookInitials: String,
                val bookOrdinal:Int,
@@ -160,6 +172,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
         super.onCreate(savedInstanceState, true)
         Log.i(TAG, "Displaying Search results view")
+        totalTime.start()
 
         binding = SearchResultsStatisticsBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -238,8 +251,15 @@ class MySearchResults : CustomTitlebarActivityBase() {
     /**
      * Move search results into view Adapter
      */
+
     private fun populateViewResultsAdapter() {
 
+        val populateViewResultsAdapterTimer = MyTimer("populateViewResultsAdapterTimer Time")
+        val verseTextElementTimer = MyTimer("verseTextElement")
+        val verseTextSpannableTimer = MyTimer("SearchHighlight")
+        val bookStatsTimer = MyTimer("Book Stats")
+        val wordStatsTimer = MyTimer("Word Stats")
+
         mCurrentlyDisplayedSearchResults = if (isScriptureResultsCurrentlyShown) {
             mSearchResultsHolder!!.mainSearchResults
         } else {
@@ -257,11 +277,18 @@ class MySearchResults : CustomTitlebarActivityBase() {
         for (key in mCurrentlyDisplayedSearchResults) {
 
             // Add verse to results array
+            verseTextElementTimer.start()
             val verseTextElement = searchControl.getSearchResultVerseElement(key)
+            verseTextElementTimer.stop()
+
+            verseTextSpannableTimer.start()
             val verseTextSpannable = SearchHighlight.getSpannableText(SearchControl.originalSearchString, verseTextElement)
+            verseTextSpannableTimer.stop()
+
             mSearchResultsArray.add(SearchResultsData(listIndex, key.osisID.toString(), key.name,searchDocument, "text", verseTextSpannable!!.toHtml()))
 
             // Add book to the book statistics array
+            bookStatsTimer.start()
             val bookOrdinal = ((key as Verse).book as BibleBook).ordinal
             var mBibleBook = BibleBook.values()[bookOrdinal]
             var bookNameLong = versification.getLongName(mBibleBook)  // key.rootName
@@ -271,8 +298,10 @@ class MySearchResults : CustomTitlebarActivityBase() {
             } else {
                 bookStatistics.first{it.book == bookNameLong}.count += 1
             }
+            bookStatsTimer.stop()
 
             // Add words in this verse to word statistics array
+            wordStatsTimer.start()
             var verseSpans: Array<StyleSpan> = verseTextSpannable!!.getSpans(0, verseTextSpannable?.length, StyleSpan::class.java)
             for (i in verseSpans.indices) {
                 if (verseSpans[i].getStyle() === Typeface.BOLD) {
@@ -292,6 +321,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
                     }
                 }
             }
+            wordStatsTimer.stop()
             listIndex += 1
         }
         sectionsPagerAdapter.verseListFrag.arrayAdapter.notifyDataSetChanged()
@@ -303,6 +333,15 @@ class MySearchResults : CustomTitlebarActivityBase() {
         tabHost.getTabAt(verseTabPosition)!!.text = CommonUtils.resources.getString(R.string.verse_count, mSearchResultsArray.count().toString())  // For some reason the value set in 'setResultsAdapter' get's cleared so I need to do it here as well.
         tabHost.getTabAt(bookTabPosition)!!.text = CommonUtils.resources.getString(R.string.book_count, bookStatistics.count().toString())
         tabHost.getTabAt(wordTabPosition)!!.text = CommonUtils.resources.getString(R.string.word_count, totalWords.toString())
+
+        populateViewResultsAdapterTimer.stop()
+        populateViewResultsAdapterTimer.log()
+        verseTextElementTimer.log()             // 'God' 514ms
+        verseTextSpannableTimer.log()           // 'God' 866ms
+        bookStatsTimer.log()                    // Negligible
+        wordStatsTimer.log()
+        totalTime.stop()
+        totalTime.log()
     }
     /**
      * Handle scripture/Appendix toggle
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
index 749d793da8..c68f594888 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
@@ -39,8 +39,8 @@ class SearchHighlight {
                     // Check for highlighted consecutive words and merge them into a single highlighted phrase. Some translations will indicate multiple
                     // consecutive lemma spans with the same strongs number when in fact all spans represent the single original language word.
                     // This messes with the search statistics as it uses the bolded words to tally search hits by word.
-
-                    var verseStringLength = 0;
+                    // TODO: This is slow! Adds 5secs or so for a search on 'God'
+                    var verseStringLength = 0
                     while (verseStringLength != verseString?.length) {
                         verseStringLength = verseString!!.length
                         // This pattern matches two consecutive <b> tag spans separate only by white space and replaces them with a single <b> tag.

From e3b2f61d6483f284e60a59ef6983a80c540c5aa7 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sun, 6 Feb 2022 01:39:25 +1000
Subject: [PATCH 25/37] Improved performance and added improved highlighting

---
 .../android/control/search/SearchControl.kt   |  26 ++++-
 .../view/activity/search/MySearchResults.kt   |  51 +++++----
 .../android/view/activity/search/Search.kt    |   6 +-
 .../view/activity/search/SearchHighlight.kt   | 107 ++++++++++--------
 .../activity/search/SearchResultsFragments.kt |  63 +++++------
 .../search_results_statistics_row_by_word.xml |   4 +-
 6 files changed, 141 insertions(+), 116 deletions(-)

diff --git a/app/src/main/java/net/bible/android/control/search/SearchControl.kt b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
index e62a2b30ad..8fd21f29c7 100644
--- a/app/src/main/java/net/bible/android/control/search/SearchControl.kt
+++ b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
@@ -26,6 +26,8 @@ import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
 import net.bible.android.control.versification.Scripture
 import net.bible.android.view.activity.search.Search
 import net.bible.android.view.activity.search.SearchIndex
+import net.bible.service.common.CommonUtils.limitTextLength
+import net.bible.service.sword.SwordContentFacade.getPlainText
 import net.bible.service.sword.SwordContentFacade.readOsisFragment
 import net.bible.service.sword.SwordContentFacade.search
 import net.bible.service.sword.SwordDocumentFacade
@@ -55,6 +57,7 @@ class SearchControl @Inject constructor(
     )
 {
     private val isSearchShowingScripture = true
+    var isStrongsSearch: Boolean = false
 
     enum class SearchBibleSection {
         OT, NT, CURRENT_BOOK, ALL
@@ -102,8 +105,7 @@ class SearchControl @Inject constructor(
                              includeAllEndings: Boolean=false, fuzzySearchAccuracy: Double? = null, proximityWords: Int? = null,
                              strongs: Char? = null): String {
         var cleanSearchString = cleanSearchString(searchString)
-        var decorated: String
-
+        isStrongsSearch = (strongs != null)
         if (includeAllEndings || strongs != null || fuzzySearchAccuracy != null) {
             var newSearchString =""
             val wordArray: List<String> = cleanSearchString.split(" ")
@@ -165,6 +167,26 @@ class SearchControl @Inject constructor(
         return searchResults
     }
 
+    fun getSearchResultVerseText(key: Key?): String {
+        // There is similar functionality in BookmarkControl
+        // This is much slower than 'getSearchResultVerseElement' and 'generateSpannableFromVerseElement'. Why?
+        var verseText = ""
+        try {
+            val doc = activeWindowPageManagerProvider.activeWindowPageManager.currentPage.currentDocument
+            val cat = doc!!.bookCategory
+            verseText = if (cat == BookCategory.BIBLE || cat == BookCategory.COMMENTARY) {
+                getPlainText(doc, key)
+            } else {
+                val bible = activeWindowPageManagerProvider.activeWindowPageManager.currentBible.currentDocument!!
+                getPlainText(bible, key)
+            }
+            verseText = limitTextLength(verseText)!!
+        } catch (e: Exception) {
+            Log.e(TAG, "Error getting verse text", e)
+        }
+        return verseText
+    }
+
     fun getSearchResultVerseElement(key: Key?): Element {
         // There is similar functionality in BookmarkControl
         var xmlVerse:Element? = null
diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index eb387cd15e..c8b58ca5ba 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -7,6 +7,7 @@ import android.graphics.Typeface
 import android.os.Bundle
 import android.os.Parcel
 import android.os.Parcelable
+import android.text.SpannableString
 import android.text.style.StyleSpan
 import android.util.Log
 import android.view.MenuItem
@@ -58,12 +59,15 @@ class MyTimer(val name:String){
     var totalTime:Long = 0
 
     fun start() {startTime = System.nanoTime()}
-    fun stop() {totalTime += System.nanoTime() - startTime}
+    fun stop(addToLog: Boolean = false) {
+        totalTime += System.nanoTime() - startTime
+        if (addToLog) log()
+    }
+    fun reset() {totalTime = 0}
     fun log() {
         Log.e("MyTimer", name + ": " + (totalTime/1000000) + "mS\n")
     }
 }
-private val totalTime = MyTimer("Total Time")
 
 class BookStat(val book: String, var count: Int,
                val bookInitials: String,
@@ -154,6 +158,8 @@ class MySearchResults : CustomTitlebarActivityBase() {
     @Inject lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
     /** Called when the activity is first created.  */
 
+    private val totalTime = MyTimer("Total Time")
+
     private val versification: Versification
         get() = navigationControl.versification
 
@@ -172,7 +178,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
         super.onCreate(savedInstanceState, true)
         Log.i(TAG, "Displaying Search results view")
-        totalTime.start()
+        totalTime.reset()
 
         binding = SearchResultsStatisticsBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -223,6 +229,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
         Log.i(TAG, "Preparing search results")
         var isOk: Boolean
         try { // get search string - passed in using extras so extras cannot be null
+            val fetchResultsTimer = MyTimer("fetchResultsTimer")
             val extras = intent.extras
             val searchText = extras!!.getString(SearchControl.SEARCH_TEXT)
             var searchDocument = extras.getString(SearchControl.SEARCH_DOCUMENT)
@@ -240,6 +247,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
                 Toast.makeText(this@MySearchResults, msg, Toast.LENGTH_SHORT).show()
             }
             isOk = true
+            fetchResultsTimer.stop(true)
         } catch (e: Exception) {
             Log.e(TAG, "Error processing search query", e)
             isOk = false
@@ -254,8 +262,8 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
     private fun populateViewResultsAdapter() {
 
-        val populateViewResultsAdapterTimer = MyTimer("populateViewResultsAdapterTimer Time")
-        val verseTextElementTimer = MyTimer("verseTextElement")
+        val populateViewResultsAdapterTimer = MyTimer("populateViewResultsAdapterTimer")
+        val getSearchResultVerseElementTimer = MyTimer("getSearchResultVerseElement")
         val verseTextSpannableTimer = MyTimer("SearchHighlight")
         val bookStatsTimer = MyTimer("Book Stats")
         val wordStatsTimer = MyTimer("Word Stats")
@@ -274,15 +282,17 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
         var listIndex = 0
         var totalWords = 0
+        val searchHighlight = SearchHighlight(SearchControl.originalSearchString)
         for (key in mCurrentlyDisplayedSearchResults) {
-
             // Add verse to results array
-            verseTextElementTimer.start()
+
+            var verseTextSpannable: SpannableString? = null
+            getSearchResultVerseElementTimer.start()
             val verseTextElement = searchControl.getSearchResultVerseElement(key)
-            verseTextElementTimer.stop()
+            getSearchResultVerseElementTimer.stop()
 
             verseTextSpannableTimer.start()
-            val verseTextSpannable = SearchHighlight.getSpannableText(SearchControl.originalSearchString, verseTextElement)
+            verseTextSpannable = searchHighlight.generateSpannableFromVerseElement(verseTextElement)
             verseTextSpannableTimer.stop()
 
             mSearchResultsArray.add(SearchResultsData(listIndex, key.osisID.toString(), key.name,searchDocument, "text", verseTextSpannable!!.toHtml()))
@@ -336,12 +346,11 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
         populateViewResultsAdapterTimer.stop()
         populateViewResultsAdapterTimer.log()
-        verseTextElementTimer.log()             // 'God' 514ms
-        verseTextSpannableTimer.log()           // 'God' 866ms
-        bookStatsTimer.log()                    // Negligible
+        getSearchResultVerseElementTimer.log()
+        verseTextSpannableTimer.log()
+        bookStatsTimer.log()
         wordStatsTimer.log()
-        totalTime.stop()
-        totalTime.log()
+        totalTime.stop(true)
     }
     /**
      * Handle scripture/Appendix toggle
@@ -372,7 +381,6 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
     val activeWindowPageManagerProvider = activeWindowPageManagerProvider
     val intent = intent
     lateinit var verseListFrag: SearchResultsFragment
-//    lateinit var bookStatisticsFrag: SearchBookStatisticsFragment
 
     override fun getItem(position: Int): Fragment {
         // getItem is called to instantiate the fragment for the given page.
@@ -384,10 +392,10 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
         when (position) {
             verseTabPosition -> {
                 frag = SearchResultsFragment(mSearchResultsArray)
-                val bundle = Bundle()
-                bundle.putString("edttext", "From Activity")
-                bundle.putParcelableArrayList("VerseResultList", mSearchResultsArray)
-                frag.setArguments(bundle)
+//                val bundle = Bundle()
+//                bundle.putString("edttext", "From Activity")
+//                bundle.putParcelableArrayList("VerseResultList", mSearchResultsArray)
+//                frag.setArguments(bundle)
                 frag.searchControl = searchControl
                 frag.activeWindowPageManagerProvider = activeWindowPageManagerProvider
                 frag.intent = intent
@@ -408,16 +416,11 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
         }
         return frag
     }
-
     override fun getItemPosition(`object`: Any): Int {
         // This line is needed to force a refresh of the fragment.
         // It doesn't seem to affect anything adversely, I think because all tabs remain in memory the whole time.
         return POSITION_NONE
     }
-//    override fun getPageTitle(position: Int): CharSequence? {
-//        return TAB_TITLES[position]
-//    }
-
     override fun getCount(): Int {
         return 3
     }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/Search.kt b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
index 251e9cf26c..80d8cd9084 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/Search.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/Search.kt
@@ -333,8 +333,8 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
             view.isEnabled = isEnabled
         }
         layout.isEnabled = isEnabled
-
     }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when(item.itemId) {
             R.id.rebuildIndex -> {
@@ -380,12 +380,12 @@ class Search : CustomTitlebarActivityBase(R.menu.search_actionbar_menu) {
             intent.putExtra(SECTION_SELECTION_SAVE, sectionRadioSelection)
             intent.putExtra(CURRENT_BIBLE_BOOK_SAVE, currentBookName)
 
-            text = searchControl.decorateSearchString(text, searchType, bibleSection, currentBookName)
+//            text = searchControl.decorateSearchString(text, searchType, bibleSection, currentBookName)
+            text = decorateSearchString(text)
             Log.i(TAG, "Search text:$text")
 
             // specify search string and doc in new Intent;
             // if doc is not specifed a, possibly invalid, doc may be used when returning to search via history list e.g. search bible, select dict, history list, search results
-//            val intent = Intent(this, SearchResults::class.java)
             val intent = Intent(this, MySearchResults::class.java)
             intent.putExtra(SearchControl.SEARCH_TEXT, text)
             val currentDocInitials = documentToSearch?.initials
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
index c68f594888..49a943c7a0 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
@@ -8,46 +8,56 @@ import android.text.style.StyleSpan
 import android.util.Log
 import org.jdom2.Element
 import org.jdom2.Text
-import org.jdom2.output.XMLOutputter
 import java.lang.Exception
 import java.util.*
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
-class SearchHighlight {
+class SearchHighlight(searchTerms: String) {
 
-    companion object {
-        fun getSpannableText(searchTerms: String, textElement: Element): SpannableString? {
-            var searchTerms = searchTerms
-            var spannableText: SpannableString? = null
+    val isStrongsSearch = searchTerms.contains("strong:")
+    val elementsToExclude: List<String> = listOf("note", "reference")
+    val elementsToInclude: List<String> = listOf("w", "transChange", "divineName", "seg")
+    val consecutiveWordsRegex = Regex("(<b[^<>]*>)([^<>]*?)(<\\/b>)(\\s+)\\1([\\s\\S]*?)\\3", RegexOption.IGNORE_CASE)
+    val strongsSearchPattern: Pattern = Pattern.compile(prepareStrongsSearchTerm(searchTerms) + "\\b", Pattern.CASE_INSENSITIVE)  // search on a word boundary (eg find strong:g0123 not strong:g01234567
+
+    private val preparedSearchWordsPatternList:List<Pattern> = // Build a list of Patterns representing each search word.
+        splitSearchTerms(searchTerms).map {
+            var searchWord = prepareSearchWord(it)
+            searchWord =  if (it.contains("*") or it.contains("~")) {
+                "\\b$searchWord[\\w\\'\\-]*\\b" // Match whole words including with hyphons and apostrophes
+            } else {
+                "\\b$searchWord\\b"
+            }
+            Pattern.compile(searchWord, Pattern.CASE_INSENSITIVE)
+        }
+
+        fun generateSpannableFromVerseElement(verseElement: Element): SpannableString? {
+            /* Takes a verse in Element form and rebuilds the verse in string form.
+             * Interestingly it is faster to get the text in Element form and convert it myself than to call 'getSearchResultVerseText'.
+             * Once the verse is in String format which includes <b> tags for Strongs numbers it is passed to 'generateSpannableFromVerseString'
+             * which does the actual conversion to a spannable.
+            `*/
+            var verseString = ""
             try {
                 // TODO: Strongs searches are handled differently to normal searches and so cannot be combined either with a normal search term or other strongs searches. This should be done better.
-                var isStrongsSearch = searchTerms.contains("strong:")
 
                 // Part 1: Highlight any strongs words. The raw verse text is returned with <b> added for the strongs words. We always need to process this just to get the plaintext
-                var verseString: String? = ""
-                searchTerms = prepareStrongsSearchTerm(searchTerms)
-                val verses = textElement.getChildren("verse")
-                val strongsSearchTerms = searchTerms + "\\b"  // search on a word boundary (eg find strong:g0123 not strong:g01234567
+                val verses = verseElement.getChildren("verse")
 
                 for (verse in verses) {
-//                    Log.e("AGR", XMLOutputter().outputString(verse))
-                    verseString += processElementChildren(verse, strongsSearchTerms, "", false)
+                    verseString += processElementChildren(verse, "", false)
                 }
 
                 if (isStrongsSearch) {
                     // Check for highlighted consecutive words and merge them into a single highlighted phrase. Some translations will indicate multiple
                     // consecutive lemma spans with the same strongs number when in fact all spans represent the single original language word.
                     // This messes with the search statistics as it uses the bolded words to tally search hits by word.
-                    // TODO: This is slow! Adds 5secs or so for a search on 'God'
                     var verseStringLength = 0
                     while (verseStringLength != verseString?.length) {
                         verseStringLength = verseString!!.length
                         // This pattern matches two consecutive <b> tag spans separate only by white space and replaces them with a single <b> tag.
-                        val match =
-                            Regex("(<b[^<>]*>)([^<>]*?)(<\\/b>)(\\s+)\\1([\\s\\S]*?)\\3", RegexOption.IGNORE_CASE).find(
-                                (verseString)
-                            )
+                        val match = consecutiveWordsRegex.find(verseString)
                         if (match != null) {
                             val matches = match.groupValues
                             verseString = verseString.replace(
@@ -57,30 +67,32 @@ class SearchHighlight {
                         }
                     }
                 }
-                spannableText = SpannableString(Html.fromHtml(verseString))  // We started with an XML verse which got turned into a string with <b> tags which is now turned into a spannable
+            } catch (e: Exception) {
+                Log.w("SEARCH", e.message!!)
+            } finally {
+                return generateSpannableFromVerseString(verseString)
+            }
+        }
+
+        fun generateSpannableFromVerseString(verseString:String): SpannableString {
+
+            var spannableText = SpannableString(Html.fromHtml(verseString))  // We started with an XML verse which got turned into a string with <b> tags which is now turned into a spannable
+            try {
 
                 // Part 2: Find and highlight the normal (non-strongs) words or phrases in the PLAIN text verse
                 var m: Matcher? = null
-                val splitSearchArray = splitSearchTerms(searchTerms)
-                for (originalSearchWord in splitSearchArray) {
-                    var searchWord = prepareSearchWord(originalSearchWord)
-                    searchWord = if (originalSearchWord.contains("*")) {
-                        "\\b$searchWord[\\w\\'\\-]*\\b" // Match whole words including with hyphons and apostrophes
-                        } else {
-                            "\\b$searchWord\\b"
-                    }
-                    if (searchWord.length > 0) {
-                        m = Pattern.compile(searchWord, Pattern.CASE_INSENSITIVE).matcher(spannableText)
-                        while (m.find()) {
-                            spannableText.setSpan(
-                                StyleSpan(Typeface.BOLD),
-                                m.start(),
-                                m.end(),
-                                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-                            )
-                        }
+                for (searchPattern in preparedSearchWordsPatternList) {
+                    m = searchPattern.matcher(spannableText)
+                    while (m.find()) {
+                        spannableText.setSpan(
+                            StyleSpan(Typeface.BOLD),
+                            m.start(),
+                            m.end(),
+                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                        )
                     }
                 }
+
             } catch (e: Exception) {
                 Log.w("SEARCH", e.message!!)
             } finally {
@@ -90,7 +102,6 @@ class SearchHighlight {
 
         private fun processElementChildren(
             parentElement: Element,
-            strongsSearchTerm: String,
             verseString: String?,
             isBold: Boolean
         ): String? {
@@ -102,13 +113,14 @@ class SearchHighlight {
             for (o in parentElement.content) {
                 if (o is Element) {
                     val el = o
-                    val elementsToExclude = Arrays.asList("note", "reference")
-                    val elementsToInclude = Arrays.asList("w", "transChange", "divineName", "seg")
                     if (elementsToInclude.contains(el.name)) {
                         isBold = try {
-                            val lemma = el.getAttributeValue("lemma")
-                            lemma != null && Pattern.compile(strongsSearchTerm, Pattern.CASE_INSENSITIVE)
-                                .matcher(lemma.trim { it <= ' ' }).find()
+                            if (isStrongsSearch) {
+                                val lemma = el.getAttributeValue("lemma")
+                                lemma != null && strongsSearchPattern.matcher(lemma.trim { it <= ' ' }).find()
+                            } else {
+                                false
+                            }
                         } catch (e: Exception) {
                             false
                         }
@@ -116,7 +128,7 @@ class SearchHighlight {
                         if (el.children.isEmpty()) verseString += buildElementText(el.text, isBold)
                     }
                     if (!el.children.isEmpty() && !elementsToExclude.contains(el.name)) {
-                        verseString = processElementChildren(el, strongsSearchTerm, verseString, isBold)
+                        verseString = processElementChildren(el, verseString, isBold)
                     }
                 } else if (o is Text) {
                     verseString += buildElementText(o.text, false)
@@ -155,12 +167,13 @@ class SearchHighlight {
         private fun prepareSearchWord(searchWord: String): String {
             // Need to clean up the search word itself before trying to find the searchWord in the text. Routine is called for each part of the search term
             // Eg: '+"burning bush"' -> 'burning bush'
-            var searchWord = searchWord
+            val fuzzySearch = searchWord.indexOf("~")
+            var searchWord = if (fuzzySearch > -1) { searchWord.substring(0,fuzzySearch) } else searchWord
             searchWord = searchWord.replace("\"", "")       // Remove quotes which indicate phrase searches
             searchWord = searchWord.replace("+", "")        // Remove + which indicates AND searches
             searchWord = searchWord.replace("?", "\\p{L}")  // Handles any letter from any language
             if (searchWord.length > 0) {
-                searchWord = if (searchWord.substring(searchWord.length - 1) == "*") {
+                searchWord = if ((searchWord.substring(searchWord.length - 1) == "*") or (fuzzySearch>-1)){
                     // The last character in the search is a * so remove it since the default sword search assumes a wildcard search
                     searchWord.replace("*", "")
                 } else {
@@ -172,5 +185,5 @@ class SearchHighlight {
             }
             return searchWord
         }
-    }
+
 }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index 05979d5215..016c18520b 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -20,7 +20,6 @@ import com.google.android.material.tabs.TabLayout
 import net.bible.android.activity.databinding.SearchResultsStatisticsFragmentVerseBinding
 import net.bible.android.activity.R
 import net.bible.android.activity.databinding.SearchResultsStatisticsFragmentByBinding
-import net.bible.android.activity.databinding.SearchResultsStatisticsRowByBookBinding
 import net.bible.android.control.search.SearchControl
 import net.bible.android.view.activity.base.Dialogs
 import net.bible.android.view.activity.page.MainBibleActivity
@@ -29,24 +28,18 @@ import org.crosswire.jsword.passage.Key
 import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
 import net.bible.service.common.CommonUtils
 import net.bible.service.sword.SwordDocumentFacade
-import org.crosswire.common.util.Language
 
 private lateinit var displayedResultsArray: ArrayList<SearchResultsData>
 private var isSearchResultsFiltered = false
 
 class PlaceholderFragment: Fragment() {
 
-    //    private lateinit var pageViewModel: PageViewModel
     private var _binding: SearchResultsStatisticsFragmentVerseBinding? = null
 
     // This property is only valid between onCreateView and
     // onDestroyView.
     private val binding get() = _binding!!
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -78,7 +71,6 @@ class PlaceholderFragment: Fragment() {
             }
         }
     }
-
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
@@ -87,11 +79,9 @@ class PlaceholderFragment: Fragment() {
 
 private fun setResultsAdapter(resultsArray:ArrayList<SearchResultsData>, activity: Activity): SearchResultsAdapter {
     // This function is called from both the SearchResultsFragment and the SearchWordStatistics (for filtering)
-
-    // The count needs to be set here because it can be changed when filtering the list by word
     val tabhost = activity.findViewById<View>(R.id.tabs) as TabLayout
-    val verseCount = if(resultsArray.count()==0) "" else resultsArray.count().toString()
-    tabhost.getTabAt(verseTabPosition)!!.text = CommonUtils.resources.getString(R.string.verse_count, verseCount)
+    val verseCount = if(resultsArray.count()==0) "..." else resultsArray.count().toString()
+    tabhost.getTabAt(verseTabPosition)!!.text = CommonUtils.resources.getString(R.string.verse_count, verseCount)  // The count needs to be set here because it can be changed when filtering the list by word
 
     displayedResultsArray = resultsArray
     return SearchResultsAdapter(activity, android.R.layout.simple_list_item_2,
@@ -127,7 +117,6 @@ class SearchResultsFragment(val mSearchResultsArray:ArrayList<SearchResultsData>
             Toast.makeText(resultList.context, "Hi",Toast.LENGTH_LONG)
             try { // no need to call HistoryManager.addHistoryItem() here because PassageChangeMediator will tell HistoryManager a change is about to occur
                 verseSelected(mCurrentlyDisplayedSearchResults[displayedResultsArray[position].id!!])
-//                verseSelected(mCurrentlyDisplayedSearchResults[displayedResultsArray[position].id!!])
             } catch (e: Exception) {
                 Log.e("blah", "Selection error", e)
                 Dialogs.instance.showErrorMsg(R.string.error_occurred, e)
@@ -174,7 +163,6 @@ class SearchBookStatisticsFragment : Fragment() {
     ): View? {
         // Inflate the layout for this fragment
         _binding = SearchResultsStatisticsFragmentByBinding.inflate(inflater, container, false)
-//        var rowBinding = SearchResultsStatisticsRowByBookBinding.inflate(inflater, container, false)
         val root = binding.root
 
         val statisticsLayout = binding.statisticsLayout
@@ -214,7 +202,6 @@ class SearchBookStatisticsFragment : Fragment() {
                 resultList.setSelection(it.tag as Int);
             }
         }
-
         return root
     }
 
@@ -244,57 +231,59 @@ class SearchWordStatisticsFragment() : Fragment() {
             resultList.adapter = setResultsAdapter(filteredSearchResults, activity)
         }
     }
+    private fun constructButtonList() {
 
-    private fun ConstructButtonList() {
-
-        var showKeyWordsCheckBox = activity?.findViewById<Button>(R.id.show_key_word_only)
         val statisticsLayout = binding.statisticsLayout
-
-        statisticsLayout.removeAllViews()
         val sortedWordStatistics = wordStatistics.sortedBy { it.word }
         val maxCount: Int = sortedWordStatistics.maxOfOrNull { it.verseIndexes.count() } ?: 0
-        sortedWordStatistics.map {
+        statisticsLayout.removeAllViews()
 
+        // TODO: This works but it kills the progress bars for ALL buttons. Why??????
+//        val statsRow: View = inflater.inflate(
+//            R.layout.search_results_statistics_row_by_word,
+//            statisticsLayout, false
+//        )
+//        val button = statsRow.findViewById<Button>(R.id.searchStatisticsWordButton)
+//        button.text = "ALL"
+//        val text = statsRow.findViewById<TextView>(R.id.searchStatisticsWordCount)
+//        text.text = "${sortedWordStatistics.sumOf {it.verseIndexes.count()}}"
+//        val progressBar = statsRow.findViewById<ProgressBar>(R.id.searchStatisticsWordCountProgress)
+//        progressBar.visibility = View.GONE
+//        statsRow.requestLayout()
+//        statisticsLayout.addView(statsRow, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT))
+//        button.setOnClickListener(CustomOnClickListener(sortedWordStatistics.flatMap { it.verseIndexes.toList() }.toIntArray(), requireActivity(), searchResultsArray))
+
+        sortedWordStatistics.map {
             val statsRow: View = inflater.inflate(
                 R.layout.search_results_statistics_row_by_word,
                 statisticsLayout, false
             )
-            var button = statsRow.findViewById<Button>(R.id.searchStatisticsWordButton)
+            val button = statsRow.findViewById<Button>(R.id.searchStatisticsWordButton)
             button.setText(it.originalWord)
-            var text = statsRow.findViewById<TextView>(R.id.searchStatisticsWordCount)
+            val text = statsRow.findViewById<TextView>(R.id.searchStatisticsWordCount)
             text.setText("${it.verseIndexes.count()}")
-            var progressBar = statsRow.findViewById<ProgressBar>(R.id.searchStatisticsWordCountProgress)
+            val progressBar = statsRow.findViewById<ProgressBar>(R.id.searchStatisticsWordCountProgress)
             progressBar.max = maxCount
             progressBar.progress = it.verseIndexes.count()
             statsRow.requestLayout()
-            statisticsLayout.addView(statsRow,
-                FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-            )
-
+            statisticsLayout.addView(statsRow, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT))
             button.setOnClickListener(CustomOnClickListener(it.verseIndexes, requireActivity(), searchResultsArray))
         }
-
     }
-
-//    override fun onCreate(savedInstanceState: Bundle?) {
-//        super.onCreate(savedInstanceState)
-//    }
     override fun onCreateView(
         theInflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-
         inflater = theInflater
         _binding = SearchResultsStatisticsFragmentByBinding.inflate(inflater, container, false)
-        ConstructButtonList()
+        constructButtonList()
 
         var showKeyWordsCheckBox = binding.showKeyWordOnly
         showKeyWordsCheckBox.setOnClickListener {
-            ConstructButtonList()
+            constructButtonList()
         }
         return binding.root
     }
-
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
diff --git a/app/src/main/res/layout/search_results_statistics_row_by_word.xml b/app/src/main/res/layout/search_results_statistics_row_by_word.xml
index 8b9cc31b8f..25bf6556c2 100644
--- a/app/src/main/res/layout/search_results_statistics_row_by_word.xml
+++ b/app/src/main/res/layout/search_results_statistics_row_by_word.xml
@@ -50,13 +50,11 @@
 			android:indeterminate="false"
 			android:max="100"
 			android:min="0"
-			android:progress="45"
+			android:progress="15"
 			android:progressBackgroundTint="@color/transparent"
 			android:progressTint="@color/sync_on_green"
 			android:scaleY="4"
 			android:visibility="visible" />
-
-
 	</LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

From 267621e498af95c4a6ff0feb5fca4bf5ef8cb5c6 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Mon, 7 Feb 2022 20:13:01 +1000
Subject: [PATCH 26/37] Added some debugging to check times

---
 .../bible/android/control/search/SearchControl.kt   |  2 +-
 .../android/view/activity/search/MySearchResults.kt | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/bible/android/control/search/SearchControl.kt b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
index 8fd21f29c7..59abea6a5a 100644
--- a/app/src/main/java/net/bible/android/control/search/SearchControl.kt
+++ b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
@@ -169,7 +169,7 @@ class SearchControl @Inject constructor(
 
     fun getSearchResultVerseText(key: Key?): String {
         // There is similar functionality in BookmarkControl
-        // This is much slower than 'getSearchResultVerseElement' and 'generateSpannableFromVerseElement'. Why?
+        // This is much slower than 'getSearchResultVerseElement'. Why? In the old version this was VERY fast.
         var verseText = ""
         try {
             val doc = activeWindowPageManagerProvider.activeWindowPageManager.currentPage.currentDocument
diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index c8b58ca5ba..c1b2166e56 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -264,6 +264,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
         val populateViewResultsAdapterTimer = MyTimer("populateViewResultsAdapterTimer")
         val getSearchResultVerseElementTimer = MyTimer("getSearchResultVerseElement")
+        val getSearchResultVerseStringTimer = MyTimer("getSearchResultVerseString")
         val verseTextSpannableTimer = MyTimer("SearchHighlight")
         val bookStatsTimer = MyTimer("Book Stats")
         val wordStatsTimer = MyTimer("Word Stats")
@@ -291,6 +292,15 @@ class MySearchResults : CustomTitlebarActivityBase() {
             val verseTextElement = searchControl.getSearchResultVerseElement(key)
             getSearchResultVerseElementTimer.stop()
 
+//            getSearchResultVerseStringTimer.start()
+            // This takes 3 to 4 times longer than 'getSearchResultVerseElement' which itself takes 3 to 4 times longer than the old search which is almost instant.
+            // I have converted the code to Kotlin. But apart from that it seems the same. I would like to use 'getSearchResultVerseText' for non-Strongs searches
+            // if it is faster because the Element parsing is only necessary for Strongs searches.
+            // Perhaps the performance of 'getSearchResultVerseElement' can be improved if we can work out why 'getSearchResultVerseText' is so slow.
+//            val verseTextString = searchControl.getSearchResultVerseText(key)
+//            getSearchResultVerseStringTimer.stop()
+
+
             verseTextSpannableTimer.start()
             verseTextSpannable = searchHighlight.generateSpannableFromVerseElement(verseTextElement)
             verseTextSpannableTimer.stop()
@@ -342,11 +352,12 @@ class MySearchResults : CustomTitlebarActivityBase() {
         val tabHost = this.findViewById<View>(R.id.tabs) as TabLayout
         tabHost.getTabAt(verseTabPosition)!!.text = CommonUtils.resources.getString(R.string.verse_count, mSearchResultsArray.count().toString())  // For some reason the value set in 'setResultsAdapter' get's cleared so I need to do it here as well.
         tabHost.getTabAt(bookTabPosition)!!.text = CommonUtils.resources.getString(R.string.book_count, bookStatistics.count().toString())
-        tabHost.getTabAt(wordTabPosition)!!.text = CommonUtils.resources.getString(R.string.word_count, totalWords.toString())
+        tabHost.getTabAt(wordTabPosition)!!.text = CommonUtils.resources.getString(R.string.word_count, wordStatistics.count().toString())
 
         populateViewResultsAdapterTimer.stop()
         populateViewResultsAdapterTimer.log()
         getSearchResultVerseElementTimer.log()
+        getSearchResultVerseStringTimer.log()
         verseTextSpannableTimer.log()
         bookStatsTimer.log()
         wordStatsTimer.log()

From 46c8592f3f4a36b8c3cdec25172ae37e80116994 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 9 Apr 2022 02:06:54 +1000
Subject: [PATCH 27/37] Update build.gradle.kts

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 50691d9c96..06159f5f47 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.1")
+        classpath("com.android.tools.build:gradle:7.1.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
         classpath("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")
 

From 4ee12dee4326577d8d63f5e2ab1d586ecdd98192 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Tue, 19 Apr 2022 13:30:18 +0630
Subject: [PATCH 28/37] Highlighting bug and code cleanup.

Fixed highlighting words in a fuzzy or proximity search and code clean up.
---
 .../view/activity/search/SearchHighlight.kt   | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
index 49a943c7a0..a8c5b462f1 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
@@ -9,8 +9,6 @@ import android.util.Log
 import org.jdom2.Element
 import org.jdom2.Text
 import java.lang.Exception
-import java.util.*
-import java.util.regex.Matcher
 import java.util.regex.Pattern
 
 class SearchHighlight(searchTerms: String) {
@@ -25,14 +23,14 @@ class SearchHighlight(searchTerms: String) {
         splitSearchTerms(searchTerms).map {
             var searchWord = prepareSearchWord(it)
             searchWord =  if (it.contains("*") or it.contains("~")) {
-                "\\b$searchWord[\\w\\'\\-]*\\b" // Match whole words including with hyphons and apostrophes
+                "\\b$searchWord[\\w\\'\\-]*\\b" // Match whole words including with hyphens and apostrophes
             } else {
                 "\\b$searchWord\\b"
             }
             Pattern.compile(searchWord, Pattern.CASE_INSENSITIVE)
         }
 
-        fun generateSpannableFromVerseElement(verseElement: Element): SpannableString? {
+        fun generateSpannableFromVerseElement(verseElement: Element): SpannableString {
             /* Takes a verse in Element form and rebuilds the verse in string form.
              * Interestingly it is faster to get the text in Element form and convert it myself than to call 'getSearchResultVerseText'.
              * Once the verse is in String format which includes <b> tags for Strongs numbers it is passed to 'generateSpannableFromVerseString'
@@ -54,8 +52,8 @@ class SearchHighlight(searchTerms: String) {
                     // consecutive lemma spans with the same strongs number when in fact all spans represent the single original language word.
                     // This messes with the search statistics as it uses the bolded words to tally search hits by word.
                     var verseStringLength = 0
-                    while (verseStringLength != verseString?.length) {
-                        verseStringLength = verseString!!.length
+                    while (verseStringLength != verseString.length) {
+                        verseStringLength = verseString.length
                         // This pattern matches two consecutive <b> tag spans separate only by white space and replaces them with a single <b> tag.
                         val match = consecutiveWordsRegex.find(verseString)
                         if (match != null) {
@@ -76,13 +74,12 @@ class SearchHighlight(searchTerms: String) {
 
         fun generateSpannableFromVerseString(verseString:String): SpannableString {
 
-            var spannableText = SpannableString(Html.fromHtml(verseString))  // We started with an XML verse which got turned into a string with <b> tags which is now turned into a spannable
+            val spannableText = SpannableString(Html.fromHtml(verseString))  // We started with an XML verse which got turned into a string with <b> tags which is now turned into a spannable
             try {
 
                 // Part 2: Find and highlight the normal (non-strongs) words or phrases in the PLAIN text verse
-                var m: Matcher? = null
                 for (searchPattern in preparedSearchWordsPatternList) {
-                    m = searchPattern.matcher(spannableText)
+                    val m = searchPattern.matcher(spannableText)
                     while (m.find()) {
                         spannableText.setSpan(
                             StyleSpan(Typeface.BOLD),
@@ -102,17 +99,16 @@ class SearchHighlight(searchTerms: String) {
 
         private fun processElementChildren(
             parentElement: Element,
-            verseString: String?,
-            isBold: Boolean
+            verseStringInitial: String?,
+            isBoldInitial: Boolean
         ): String? {
             // Recursive method to walk the verse element tree ignoring tags like 'note' that should not be shown in the search results
             // and including tags like 'w' that should be included. This routine is needed only to do searches on lemma attributes. That
             // is why bolding only occurs in that part of the code.
-            var verseString = verseString
-            var isBold = isBold
-            for (o in parentElement.content) {
-                if (o is Element) {
-                    val el = o
+            var verseString = verseStringInitial
+            var isBold = isBoldInitial
+            for (el in parentElement.content) {
+                if (el is Element) {
                     if (elementsToInclude.contains(el.name)) {
                         isBold = try {
                             if (isStrongsSearch) {
@@ -127,19 +123,19 @@ class SearchHighlight(searchTerms: String) {
                         // Only leaf nodes should have their text appended. If a node has child tags, the text will be passed as one of the children .
                         if (el.children.isEmpty()) verseString += buildElementText(el.text, isBold)
                     }
-                    if (!el.children.isEmpty() && !elementsToExclude.contains(el.name)) {
+                    if (el.children.isNotEmpty() && !elementsToExclude.contains(el.name)) {
                         verseString = processElementChildren(el, verseString, isBold)
                     }
-                } else if (o is Text) {
-                    verseString += buildElementText(o.text, false)
+                } else if (el is Text) {
+                    verseString += buildElementText(el.text, false)
                 } else {
-                    verseString += buildElementText(o.toString(), false)
+                    verseString += buildElementText(el.toString(), false)
                 }
             }
             return verseString
         }
 
-        private fun buildElementText(elementText: String, isBold: Boolean): String? {
+        private fun buildElementText(elementText: String, isBold: Boolean): String {
             return if (isBold) {
                 String.format("<b>%s</b>", elementText)
             } else {
@@ -148,7 +144,7 @@ class SearchHighlight(searchTerms: String) {
         }
 
         private fun prepareStrongsSearchTerm(_searchTerms: String): String {
-            // Replaces strong:g00123 or strong:g123 with REGEX strong:g0*123. This is needed because the search term submitted by the 'Find all occcurrences includes extra zeros
+            // Replaces strong:g00123 or strong:g123 with REGEX strong:g0*123. This is needed because the search term submitted by the 'Find all occurrences includes extra zeros
             // The capitalisation is not important since we do a case insensitive search
             var searchTerms = _searchTerms
             searchTerms = searchTerms.replace("strong:g0*".toRegex(RegexOption.IGNORE_CASE), "strong:g0*")
@@ -159,31 +155,37 @@ class SearchHighlight(searchTerms: String) {
         }
 
         private fun splitSearchTerms(searchTerms: String): Array<String> {
-            // Split the search terms on space characters that are not enclosed in double quotes
+            // Find the individual words that we are looking for so we can highlight them.
+            // Proximity searches wrap the words in quotes the quotes need to be removed.
+            val fuzzySearch = searchTerms.indexOf("~")
+            val newSearchTerms = if (fuzzySearch > -1) {
+                searchTerms.substring(0,fuzzySearch).replace("\"","")
+            } else searchTerms
+            // Split the search terms on space characters that are not enclosed in double quotes.
             // Eg: 'moses "burning bush"' -> "moses" and "burning bush"
-            return searchTerms.split("\\s+(?=(?:\"(?:\\\\\"|[^\"])+\"|[^\"])+$)".toRegex()).toTypedArray()
+            return newSearchTerms.split("\\s+(?=(?:\"(?:\\\\\"|[^\"])+\"|[^\"])+$)".toRegex()).toTypedArray()
         }
 
         private fun prepareSearchWord(searchWord: String): String {
             // Need to clean up the search word itself before trying to find the searchWord in the text. Routine is called for each part of the search term
             // Eg: '+"burning bush"' -> 'burning bush'
             val fuzzySearch = searchWord.indexOf("~")
-            var searchWord = if (fuzzySearch > -1) { searchWord.substring(0,fuzzySearch) } else searchWord
-            searchWord = searchWord.replace("\"", "")       // Remove quotes which indicate phrase searches
-            searchWord = searchWord.replace("+", "")        // Remove + which indicates AND searches
-            searchWord = searchWord.replace("?", "\\p{L}")  // Handles any letter from any language
-            if (searchWord.length > 0) {
-                searchWord = if ((searchWord.substring(searchWord.length - 1) == "*") or (fuzzySearch>-1)){
+            var newSearchWord = if (fuzzySearch > -1) { searchWord.substring(0,fuzzySearch) } else searchWord
+            newSearchWord = newSearchWord.replace("\"", "")       // Remove quotes which indicate phrase searches
+            newSearchWord = newSearchWord.replace("+", "")        // Remove + which indicates AND searches
+            newSearchWord = newSearchWord.replace("?", "\\p{L}")  // Handles any letter from any language
+            if (newSearchWord.isNotEmpty()) {
+                newSearchWord = if ((newSearchWord.substring(newSearchWord.length - 1) == "*") or (fuzzySearch>-1)){
                     // The last character in the search is a * so remove it since the default sword search assumes a wildcard search
-                    searchWord.replace("*", "")
+                    newSearchWord.replace("*", "")
                 } else {
                     // A * found inside a search term should probably be ignored.
                     // It can happen normally as part of a strongs search since the regex expression uses a * to find any number of leading 0s.
-                    searchWord.replace("*", "\b") // Match on a word boundary - I am not sure why this was needed.
+                    newSearchWord.replace("*", "\b") // Match on a word boundary - I am not sure why this was needed.
 
                 }
             }
-            return searchWord
+            return newSearchWord
         }
 
 }

From 8be372442febd0d59c846d99e8cfb9bd06270fa3 Mon Sep 17 00:00:00 2001
From: Tuomas Airaksinen <tuomas.airaksinen@gmail.com>
Date: Sat, 7 May 2022 11:51:09 +0300
Subject: [PATCH 29/37] First batch of code improvements

---
 .../android/control/search/SearchControl.kt   |  14 +-
 .../view/activity/search/MySearchResults.kt   | 140 ++++++++----------
 2 files changed, 71 insertions(+), 83 deletions(-)

diff --git a/app/src/main/java/net/bible/android/control/search/SearchControl.kt b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
index 59abea6a5a..a56b84525d 100644
--- a/app/src/main/java/net/bible/android/control/search/SearchControl.kt
+++ b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
@@ -105,14 +105,14 @@ class SearchControl @Inject constructor(
                              includeAllEndings: Boolean=false, fuzzySearchAccuracy: Double? = null, proximityWords: Int? = null,
                              strongs: Char? = null): String {
         var cleanSearchString = cleanSearchString(searchString)
-        isStrongsSearch = (strongs != null)
-        if (includeAllEndings || strongs != null || fuzzySearchAccuracy != null) {
-            var newSearchString =""
+        isStrongsSearch = strongs != null
+        if (includeAllEndings || isStrongsSearch || fuzzySearchAccuracy != null) {
+            var newSearchString = ""
             val wordArray: List<String> = cleanSearchString.split(" ")
-            wordArray.forEach {
+            for (it in wordArray) {
                 var decoratedWord = it
                 if (includeAllEndings) decoratedWord += "* "
-                if (strongs != null) decoratedWord = "strong:$strongs$decoratedWord "
+                if (isStrongsSearch) decoratedWord = "strong:$strongs$decoratedWord "
                 if (fuzzySearchAccuracy != null) {
                     val fuzzySearchAccuracyAdjusted = if (fuzzySearchAccuracy.equals(1.0)) 0.99 else fuzzySearchAccuracy
                     decoratedWord += "~%.2f ".format(fuzzySearchAccuracyAdjusted)
@@ -123,11 +123,11 @@ class SearchControl @Inject constructor(
         }
 
         if (proximityWords != null) {
-            cleanSearchString = "\"" + cleanSearchString + "\"~" + proximityWords
+            cleanSearchString = "\"$cleanSearchString\"~$proximityWords"
         }
 
         // add search type (all/any/phrase) to search string
-        var decorated: String = searchType.decorate(cleanSearchString)
+        var decorated = searchType.decorate(cleanSearchString)
         originalSearchString = decorated
 
         // add bible section limitation to search text
diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index c1b2166e56..2f91c09e3f 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -85,37 +85,31 @@ class WordStat(val word: String,
 private var wordHits: ArrayList<Pair<String, ArrayList<Int>>> = arrayListOf()
 
 class SearchResultsData : Parcelable {
-    @JvmField
-    var id: Int?  // Holds the original index in the results. Used for selection and filtering.
-    @JvmField
-    var osisKey: String?
-    @JvmField
-    var reference: String?
-    @JvmField
-    var translation: String?
-    @JvmField
-    var verse: String?
-    @JvmField
-    var verseHtml: String?  // I would prefer to pass a spannable string but i dont know how to make it parcelable
+    @JvmField var id: Int?  // Holds the original index in the results. Used for selection and filtering.
+    @JvmField var osisKey: String?
+    @JvmField var reference: String?
+    @JvmField var translation: String?
+    @JvmField var verse: String?
+    @JvmField var verseHtml: String?  // I would prefer to pass a spannable string but i dont know how to make it parcelable
 
     /* What I really want to do is make the 'Key' parcelable but I don't know how to do that. So instead I have to send the properties I need and get the key later on */
 
-    constructor(Id: Int?, OsisKey: String?, Reference: String?, Translation: String?, Verse: String?, VerseHtml: String?) {
-        id = Id;
-        osisKey = OsisKey
-        reference = Reference
-        translation = Translation
-        verse = Verse
-        verseHtml = VerseHtml
+    constructor(id: Int?, osisKey: String?, reference: String?, translation: String?, verseStr: String?, verseHtml: String?) {
+        this.id = id;
+        this.osisKey = osisKey
+        this.reference = reference
+        this.translation = translation
+        this.verse = verseStr
+        this.verseHtml = verseHtml
     }
 
-    protected constructor(`in`: Parcel) {
-        id = `in`.readInt()
-        osisKey = `in`.readString()
-        reference = `in`.readString()
-        translation = `in`.readString()
-        verse = `in`.readString()
-        verseHtml = `in`.readString()
+    private constructor(p: Parcel) {
+        id = p.readInt()
+        osisKey = p.readString()
+        reference = p.readString()
+        translation = p.readString()
+        verse = p.readString()
+        verseHtml = p.readString()
     }
 
     override fun describeContents(): Int {
@@ -132,7 +126,7 @@ class SearchResultsData : Parcelable {
 
     }
 
-    companion object CREATOR : Parcelable.Creator<SearchResultsData> {
+    companion object CREATOR: Parcelable.Creator<SearchResultsData> {
         override fun createFromParcel(parcel: Parcel): SearchResultsData {
             return SearchResultsData(parcel)
         }
@@ -147,7 +141,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
     private lateinit var binding: SearchResultsStatisticsBinding
     private var mSearchResultsHolder: SearchResultsDto? = null
     private lateinit var sectionsPagerAdapter: SearchResultsPagerAdapter
-    val mSearchResultsArray = ArrayList<SearchResultsData>()
+    private val mSearchResultsArray = ArrayList<SearchResultsData>()
     private val bookStatistics = mutableListOf<BookStat>()
     private val wordStatistics = mutableListOf<WordStat>()
 
@@ -156,12 +150,9 @@ class MySearchResults : CustomTitlebarActivityBase() {
     @Inject lateinit var searchResultsActionBarManager: SearchResultsActionBarManager
     @Inject lateinit var searchControl: SearchControl
     @Inject lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
-    /** Called when the activity is first created.  */
 
     private val totalTime = MyTimer("Total Time")
-
-    private val versification: Versification
-        get() = navigationControl.versification
+    private val versification get() = navigationControl.versification
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
@@ -175,7 +166,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
     @SuppressLint("MissingSuperCall")
     override fun onCreate(savedInstanceState: Bundle?) {
-
         super.onCreate(savedInstanceState, true)
         Log.i(TAG, "Displaying Search results view")
         totalTime.reset()
@@ -189,13 +179,18 @@ class MySearchResults : CustomTitlebarActivityBase() {
         bundle.putString("edttext", "From Activity")
 
         sectionsPagerAdapter = SearchResultsPagerAdapter(this,
-                                                                supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent,
-                                                                mSearchResultsArray, bookStatistics, wordStatistics)
-        val viewPager: ViewPager = binding.viewPager
-        viewPager.adapter = sectionsPagerAdapter
-        viewPager.offscreenPageLimit = 2    // The progressbar on the 3rd tab goes to zero when the view is lost. So just keep it in memory and all is fine. It is not a big view so i think it is ok.
-        val tabs: TabLayout = binding.tabs
-        tabs.setupWithViewPager(viewPager)
+            supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent,
+            mSearchResultsArray, bookStatistics, wordStatistics
+        )
+
+
+        binding.viewPager.run {
+            adapter = sectionsPagerAdapter
+            // The progressbar on the 3rd tab goes to zero when the view is lost.
+            // So just keep it in memory and all is fine. It is not a big view so i think it is ok.
+            offscreenPageLimit = 2
+            binding.tabs.setupWithViewPager(this)
+        }
 
         searchResultsActionBarManager.registerScriptureToggleClickListener(scriptureToggleClickListener)
         setActionBarManager(searchResultsActionBarManager)
@@ -207,22 +202,16 @@ class MySearchResults : CustomTitlebarActivityBase() {
         }
     }
 
-    private suspend fun prepareResults() {
-        withContext(Dispatchers.Main) {
-            binding.loadingIndicator.visibility = View.VISIBLE
-            binding.empty.visibility = View.GONE
-        }
+    private suspend fun prepareResults() = withContext(Dispatchers.Main){
+        binding.loadingIndicator.visibility = View.VISIBLE
+        binding.empty.visibility = View.GONE
         if (fetchSearchResults()) { // initialise adapters before result population - easier when updating due to later Scripture toggle
-            withContext(Dispatchers.Main) {
-                populateViewResultsAdapter()
-            }
-        }
-        withContext(Dispatchers.Main) {
-            binding.loadingIndicator.visibility = View.GONE
-//            if(listAdapter?.isEmpty == true) {
-//                binding.empty.visibility = View.VISIBLE
-//            }
+            populateViewResultsAdapter()
         }
+        binding.loadingIndicator.visibility = View.GONE
+//      if(listAdapter?.isEmpty == true) {
+//          binding.empty.visibility = View.VISIBLE
+//      }
     }
 
     private suspend fun fetchSearchResults(): Boolean = withContext(Dispatchers.IO) {
@@ -230,8 +219,8 @@ class MySearchResults : CustomTitlebarActivityBase() {
         var isOk: Boolean
         try { // get search string - passed in using extras so extras cannot be null
             val fetchResultsTimer = MyTimer("fetchResultsTimer")
-            val extras = intent.extras
-            val searchText = extras!!.getString(SearchControl.SEARCH_TEXT)
+            val extras = intent.extras!!
+            val searchText = extras.getString(SearchControl.SEARCH_TEXT)
             var searchDocument = extras.getString(SearchControl.SEARCH_DOCUMENT)
             if (StringUtils.isEmpty(searchDocument)) {
                 searchDocument = activeWindowPageManagerProvider.activeWindowPageManager.currentPage.currentDocument!!.initials
@@ -253,7 +242,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
             isOk = false
             Dialogs.instance.showErrorMsg(R.string.error_executing_search) { onBackPressed() }
         }
-    return@withContext isOk
+        return@withContext isOk
     }
 
     /**
@@ -261,7 +250,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
      */
 
     private fun populateViewResultsAdapter() {
-
         val populateViewResultsAdapterTimer = MyTimer("populateViewResultsAdapterTimer")
         val getSearchResultVerseElementTimer = MyTimer("getSearchResultVerseElement")
         val getSearchResultVerseStringTimer = MyTimer("getSearchResultVerseString")
@@ -275,9 +263,9 @@ class MySearchResults : CustomTitlebarActivityBase() {
             mSearchResultsHolder!!.otherSearchResults
         }
         val extras = intent.extras
-        var searchDocument = extras!!.getString(SearchControl.SEARCH_DOCUMENT)
+        val searchDocument = extras!!.getString(SearchControl.SEARCH_DOCUMENT)
 
-        mSearchResultsArray!!.clear()
+        mSearchResultsArray.clear()
         bookStatistics.clear()
         wordStatistics.clear()
 
@@ -287,7 +275,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
         for (key in mCurrentlyDisplayedSearchResults) {
             // Add verse to results array
 
-            var verseTextSpannable: SpannableString? = null
+            var verseTextSpannable: SpannableString?
             getSearchResultVerseElementTimer.start()
             val verseTextElement = searchControl.getSearchResultVerseElement(key)
             getSearchResultVerseElementTimer.stop()
@@ -305,39 +293,39 @@ class MySearchResults : CustomTitlebarActivityBase() {
             verseTextSpannable = searchHighlight.generateSpannableFromVerseElement(verseTextElement)
             verseTextSpannableTimer.stop()
 
-            mSearchResultsArray.add(SearchResultsData(listIndex, key.osisID.toString(), key.name,searchDocument, "text", verseTextSpannable!!.toHtml()))
+            mSearchResultsArray.add(SearchResultsData(listIndex, key.osisID.toString(), key.name,searchDocument, "text", verseTextSpannable.toHtml()))
 
             // Add book to the book statistics array
             bookStatsTimer.start()
-            val bookOrdinal = ((key as Verse).book as BibleBook).ordinal
-            var mBibleBook = BibleBook.values()[bookOrdinal]
-            var bookNameLong = versification.getLongName(mBibleBook)  // key.rootName
-            val bookStat = bookStatistics.firstOrNull{it.book == bookNameLong}
+            val mBibleBook = (key as Verse).book
+            val bookOrdinal = mBibleBook.ordinal
+            val bookNameLong = versification.getLongName(mBibleBook)  // key.rootName
+            val bookStat = bookStatistics.firstOrNull { it.book == bookNameLong }
             if (bookStat == null) {
                 bookStatistics.add(BookStat(bookNameLong, 1, bookNameLong, bookOrdinal, listIndex, getBookTextColor(bookOrdinal) ))
             } else {
-                bookStatistics.first{it.book == bookNameLong}.count += 1
+                bookStatistics.first { it.book == bookNameLong }.count += 1
             }
             bookStatsTimer.stop()
 
             // Add words in this verse to word statistics array
             wordStatsTimer.start()
-            var verseSpans: Array<StyleSpan> = verseTextSpannable!!.getSpans(0, verseTextSpannable?.length, StyleSpan::class.java)
+            val verseSpans: Array<StyleSpan> = verseTextSpannable.getSpans(0, verseTextSpannable.length, StyleSpan::class.java)
             for (i in verseSpans.indices) {
-                if (verseSpans[i].getStyle() === Typeface.BOLD) {
+                if (verseSpans[i].style == Typeface.BOLD) {
                     totalWords += 1
                     val start = verseTextSpannable.getSpanStart(verseSpans[i])
                     val end = verseTextSpannable.getSpanEnd(verseSpans[i])
 
-                    var wordArray = CharArray(end-start)
+                    val wordArray = CharArray(end-start)
                     verseTextSpannable.getChars(start, end, wordArray, 0)
                     val originalWord = wordArray.joinToString("")
                     val word = originalWord.lowercase()
-                    val wordStat = wordStatistics.firstOrNull{it.word == word}
+                    val wordStat = wordStatistics.firstOrNull { it.word == word }
                     if (wordStat == null) {
                         wordStatistics.add(WordStat(word, intArrayOf(listIndex), originalWord))
                     } else {
-                        wordStatistics.first{it.word == word}.verseIndexes += listIndex
+                        wordStatistics.first { it.word == word }.verseIndexes += listIndex
                     }
                 }
             }
@@ -383,9 +371,9 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
                                 searchControl: SearchControl,
                                 activeWindowPageManagerProvider: ActiveWindowPageManagerProvider,
                                 intent: Intent,
-                                val mSearchResultsArray:ArrayList<SearchResultsData>,
-                                val bookStatistics: MutableList<BookStat>,
-                                val wordStatistics: MutableList<WordStat>
+                                private val mSearchResultsArray:ArrayList<SearchResultsData>,
+                                private val bookStatistics: MutableList<BookStat>,
+                                private val wordStatistics: MutableList<WordStat>
 ) :
     FragmentPagerAdapter(fm) {
     val searchControl = searchControl
@@ -399,7 +387,7 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
         // This happens naturally when pages are moving in and out of view but not when we try to refresh.
         // The individual fragment code gets called twice - first with no data to display and then with the correct data.
         // This is because the page is shown in the GlobalScope in order to allow us to show a progress indicator.
-        var frag: Fragment
+        val frag: Fragment
         when (position) {
             verseTabPosition -> {
                 frag = SearchResultsFragment(mSearchResultsArray)

From f9230849cf3b98aec07c2ea38976e4dad8ec2f72 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 8 Oct 2022 19:40:16 +0630
Subject: [PATCH 30/37] Fixed due to changes in the master

---
 .../bible/android/view/activity/search/MySearchResults.kt | 8 ++++----
 .../view/activity/search/SearchResultsFragments.kt        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 2f91c09e3f..afb92488a9 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -32,6 +32,7 @@ import net.bible.android.control.search.SearchControl
 import net.bible.android.control.search.SearchResultsDto
 import net.bible.android.view.activity.base.CustomTitlebarActivityBase
 import net.bible.android.view.activity.base.Dialogs
+import net.bible.android.view.activity.navigation.GridChoosePassageBook
 import net.bible.android.view.activity.search.searchresultsactionbar.SearchResultsActionBarManager
 import org.apache.commons.lang3.StringUtils
 import org.crosswire.jsword.passage.Key
@@ -39,7 +40,6 @@ import org.crosswire.jsword.passage.Verse
 import javax.inject.Inject
 import org.crosswire.jsword.versification.BibleBook
 import org.crosswire.jsword.versification.Versification
-import net.bible.android.view.activity.navigation.GridChoosePassageBook.Companion.getBookTextColor
 import net.bible.service.common.CommonUtils
 import net.bible.service.common.CommonUtils.resources
 
@@ -230,7 +230,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
             val msg:String = if (mCurrentlyDisplayedSearchResults.size >= SearchControl.MAX_SEARCH_RESULTS) {
                 getString(R.string.search_showing_first, SearchControl.MAX_SEARCH_RESULTS)
             } else {
-                getString(R.string.search_result_count, mSearchResultsHolder!!.size())
+                getString(R.string.search_result_count, mSearchResultsHolder!!.size)
             }
             withContext(Dispatchers.Main) {
                 Toast.makeText(this@MySearchResults, msg, Toast.LENGTH_SHORT).show()
@@ -240,7 +240,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
         } catch (e: Exception) {
             Log.e(TAG, "Error processing search query", e)
             isOk = false
-            Dialogs.instance.showErrorMsg(R.string.error_executing_search) { onBackPressed() }
+            Dialogs.showErrorMsg(R.string.error_executing_search) { onBackPressed() }
         }
         return@withContext isOk
     }
@@ -302,7 +302,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
             val bookNameLong = versification.getLongName(mBibleBook)  // key.rootName
             val bookStat = bookStatistics.firstOrNull { it.book == bookNameLong }
             if (bookStat == null) {
-                bookStatistics.add(BookStat(bookNameLong, 1, bookNameLong, bookOrdinal, listIndex, getBookTextColor(bookOrdinal) ))
+                bookStatistics.add(BookStat(bookNameLong, 1, bookNameLong, bookOrdinal, listIndex, GridChoosePassageBook.getBookColorAndGroup(bookOrdinal).Color ))
             } else {
                 bookStatistics.first { it.book == bookNameLong }.count += 1
             }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index 016c18520b..e3d0286a25 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -118,8 +118,8 @@ class SearchResultsFragment(val mSearchResultsArray:ArrayList<SearchResultsData>
             try { // no need to call HistoryManager.addHistoryItem() here because PassageChangeMediator will tell HistoryManager a change is about to occur
                 verseSelected(mCurrentlyDisplayedSearchResults[displayedResultsArray[position].id!!])
             } catch (e: Exception) {
-                Log.e("blah", "Selection error", e)
-                Dialogs.instance.showErrorMsg(R.string.error_occurred, e)
+                Log.e("SearchResults", "Selection error", e)
+                Dialogs.showErrorMsg(R.string.error_occurred, e)
             }
         }
         return root

From ceb74e5235a70423bc8a9f43b60038adf9c702ab Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 8 Oct 2022 19:51:31 +0630
Subject: [PATCH 31/37] Update strings.xml

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4ed8ea3151..9ffce849cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -101,7 +101,7 @@
     <string name="greek">Greek</string>
     <string name="hebrew">Hebrew</string>
     <string name="results_count">Results: %s</string>
-    <string name="verse_count">Verses: %s</string>
+    <string name="verse_count">Verses: %s </string>
     <string name="book_count">Books: %s</string>
     <string name="word_count">Words: %s</string>
     <string name="statistics">Statistics</string>

From 20c0e448a4865b8d6a28d5ed620c4eb24e59118d Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 12 Nov 2022 17:49:22 +0630
Subject: [PATCH 32/37] Handle strongs numbers that have a letter appended

---
 .../bible/android/view/activity/search/MySearchResults.kt | 8 +++-----
 .../bible/android/view/activity/search/SearchHighlight.kt | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index afb92488a9..7203e5541d 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -166,7 +166,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
     @SuppressLint("MissingSuperCall")
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState, true)
+        super.onCreate(savedInstanceState)
         Log.i(TAG, "Displaying Search results view")
         totalTime.reset()
 
@@ -271,7 +271,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
         var listIndex = 0
         var totalWords = 0
-        val searchHighlight = SearchHighlight(SearchControl.originalSearchString)
+        val searchHighlight = SearchHighlight(SearchControl.originalSearchString!!)
         for (key in mCurrentlyDisplayedSearchResults) {
             // Add verse to results array
 
@@ -288,10 +288,8 @@ class MySearchResults : CustomTitlebarActivityBase() {
 //            val verseTextString = searchControl.getSearchResultVerseText(key)
 //            getSearchResultVerseStringTimer.stop()
 
-
-            verseTextSpannableTimer.start()
+            // Build a spannable verse highlighting the relevant words.
             verseTextSpannable = searchHighlight.generateSpannableFromVerseElement(verseTextElement)
-            verseTextSpannableTimer.stop()
 
             mSearchResultsArray.add(SearchResultsData(listIndex, key.osisID.toString(), key.name,searchDocument, "text", verseTextSpannable.toHtml()))
 
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
index a8c5b462f1..ac3707619e 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchHighlight.kt
@@ -17,7 +17,7 @@ class SearchHighlight(searchTerms: String) {
     val elementsToExclude: List<String> = listOf("note", "reference")
     val elementsToInclude: List<String> = listOf("w", "transChange", "divineName", "seg")
     val consecutiveWordsRegex = Regex("(<b[^<>]*>)([^<>]*?)(<\\/b>)(\\s+)\\1([\\s\\S]*?)\\3", RegexOption.IGNORE_CASE)
-    val strongsSearchPattern: Pattern = Pattern.compile(prepareStrongsSearchTerm(searchTerms) + "\\b", Pattern.CASE_INSENSITIVE)  // search on a word boundary (eg find strong:g0123 not strong:g01234567
+    val strongsSearchPattern: Pattern = Pattern.compile(prepareStrongsSearchTerm(searchTerms) + "[a-z]?\\b", Pattern.CASE_INSENSITIVE)  // search on a word boundary (eg find strong:g0123 not strong:g01234567
 
     private val preparedSearchWordsPatternList:List<Pattern> = // Build a list of Patterns representing each search word.
         splitSearchTerms(searchTerms).map {

From d7fa48a83e4c8932ced76a3780dfffa47f30bc5e Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 12 Nov 2022 20:41:51 +0630
Subject: [PATCH 33/37] Implemented the 'Show key words only' option

---
 .../view/activity/search/MySearchResults.kt   | 54 +++++++++++++++----
 .../activity/search/SearchResultsFragments.kt | 11 ++--
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 7203e5541d..60ec6432d5 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -78,7 +78,8 @@ class BookStat(val book: String, var count: Int,
 }
 class WordStat(val word: String,
                var verseIndexes: IntArray,
-               val originalWord: String) {
+               val originalWord: String,
+               var tag: Boolean = false) {
     override fun toString(): String = "$originalWord: ${verseIndexes.count()}"
 }
 
@@ -144,6 +145,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
     private val mSearchResultsArray = ArrayList<SearchResultsData>()
     private val bookStatistics = mutableListOf<BookStat>()
     private val wordStatistics = mutableListOf<WordStat>()
+    private val keyWordStatistics = mutableListOf<WordStat>()
 
     @Inject lateinit var navigationControl: NavigationControl
     private var isScriptureResultsCurrentlyShown = true
@@ -180,7 +182,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
         sectionsPagerAdapter = SearchResultsPagerAdapter(this,
             supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent,
-            mSearchResultsArray, bookStatistics, wordStatistics
+            mSearchResultsArray, bookStatistics, wordStatistics, keyWordStatistics
         )
 
 
@@ -254,8 +256,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
         val getSearchResultVerseElementTimer = MyTimer("getSearchResultVerseElement")
         val getSearchResultVerseStringTimer = MyTimer("getSearchResultVerseString")
         val verseTextSpannableTimer = MyTimer("SearchHighlight")
-        val bookStatsTimer = MyTimer("Book Stats")
-        val wordStatsTimer = MyTimer("Word Stats")
 
         mCurrentlyDisplayedSearchResults = if (isScriptureResultsCurrentlyShown) {
             mSearchResultsHolder!!.mainSearchResults
@@ -268,6 +268,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
         mSearchResultsArray.clear()
         bookStatistics.clear()
         wordStatistics.clear()
+        keyWordStatistics.clear()
 
         var listIndex = 0
         var totalWords = 0
@@ -294,7 +295,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
             mSearchResultsArray.add(SearchResultsData(listIndex, key.osisID.toString(), key.name,searchDocument, "text", verseTextSpannable.toHtml()))
 
             // Add book to the book statistics array
-            bookStatsTimer.start()
             val mBibleBook = (key as Verse).book
             val bookOrdinal = mBibleBook.ordinal
             val bookNameLong = versification.getLongName(mBibleBook)  // key.rootName
@@ -304,10 +304,8 @@ class MySearchResults : CustomTitlebarActivityBase() {
             } else {
                 bookStatistics.first { it.book == bookNameLong }.count += 1
             }
-            bookStatsTimer.stop()
 
             // Add words in this verse to word statistics array
-            wordStatsTimer.start()
             val verseSpans: Array<StyleSpan> = verseTextSpannable.getSpans(0, verseTextSpannable.length, StyleSpan::class.java)
             for (i in verseSpans.indices) {
                 if (verseSpans[i].style == Typeface.BOLD) {
@@ -327,9 +325,43 @@ class MySearchResults : CustomTitlebarActivityBase() {
                     }
                 }
             }
-            wordStatsTimer.stop()
             listIndex += 1
         }
+        // Build keyword list
+        val tmpKeyWordStatistics = mutableListOf<WordStat>()
+
+        // Exclude short words (eg 'and', 'or', 'it' etc)
+        wordStatistics.filter{it.originalWord.length<=3 && it.originalWord != "God"}.map {it.tag = true}
+
+        // Find all single words
+        wordStatistics.filter{ !it.tag }.sortedBy { it.originalWord.length }.map {
+            if (" " !in it.originalWord) {
+                it.tag = true  // Don't process this entry again
+                tmpKeyWordStatistics.add(WordStat(it.word, it.verseIndexes, it.originalWord))
+                keyWordStatistics.add(WordStat(it.word, it.verseIndexes, it.originalWord))
+            }
+        }
+
+        // Find phrases that have a single keyword in them
+        keyWordStatistics.map { keyWord ->
+            wordStatistics.filter { !it.tag && it.originalWord.contains(keyWord.originalWord,true) }.map { multiWordStat ->
+                multiWordStat.tag = true  // Exclude the
+                keyWord.verseIndexes += multiWordStat.verseIndexes
+            }
+        }
+        // Find phrases that are in other longer phrases
+        wordStatistics.filter{ !it.tag }.sortedBy { it.originalWord.length }.map { shortPhrase ->
+            wordStatistics.filter { !it.tag && it.originalWord != shortPhrase.originalWord && it.originalWord.contains(shortPhrase.originalWord,true) }
+                .map { longPhrase ->
+                    longPhrase.tag = true
+                    shortPhrase.verseIndexes += longPhrase.verseIndexes
+                }
+        }
+        // Add all the phrases that have not been tagged (excludes single words, long phrases that appear in shorter phrases)
+        wordStatistics.filter{ !it.tag }.map {
+            keyWordStatistics.add(it)
+        }
+
         sectionsPagerAdapter.verseListFrag.arrayAdapter.notifyDataSetChanged()
         sectionsPagerAdapter.getItem(bookTabPosition)
         sectionsPagerAdapter.getItem(wordTabPosition)
@@ -345,8 +377,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
         getSearchResultVerseElementTimer.log()
         getSearchResultVerseStringTimer.log()
         verseTextSpannableTimer.log()
-        bookStatsTimer.log()
-        wordStatsTimer.log()
         totalTime.stop(true)
     }
     /**
@@ -371,7 +401,8 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
                                 intent: Intent,
                                 private val mSearchResultsArray:ArrayList<SearchResultsData>,
                                 private val bookStatistics: MutableList<BookStat>,
-                                private val wordStatistics: MutableList<WordStat>
+                                private val wordStatistics: MutableList<WordStat>,
+                                private val keyWordStatistics: MutableList<WordStat>
 ) :
     FragmentPagerAdapter(fm) {
     val searchControl = searchControl
@@ -408,6 +439,7 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
                 frag = SearchWordStatisticsFragment()
                 frag.searchResultsArray = mSearchResultsArray
                 frag.wordStatistics = wordStatistics
+                frag.keyWordStatistics = keyWordStatistics
             }
             else -> frag = PlaceholderFragment.newInstance(1)
         }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index e3d0286a25..085a94354d 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -213,6 +213,7 @@ class SearchBookStatisticsFragment : Fragment() {
 
 class SearchWordStatisticsFragment() : Fragment() {
     var wordStatistics = mutableListOf<WordStat>()
+    var keyWordStatistics = mutableListOf<WordStat>()
     var searchResultsArray = arrayListOf<SearchResultsData>()
 
     private var _binding: SearchResultsStatisticsFragmentByBinding? = null
@@ -231,10 +232,10 @@ class SearchWordStatisticsFragment() : Fragment() {
             resultList.adapter = setResultsAdapter(filteredSearchResults, activity)
         }
     }
-    private fun constructButtonList() {
+    private fun constructButtonList(keyWordsOnly: Boolean = false) {
 
         val statisticsLayout = binding.statisticsLayout
-        val sortedWordStatistics = wordStatistics.sortedBy { it.word }
+        val sortedWordStatistics = if(keyWordsOnly) keyWordStatistics.sortedBy { it.word } else wordStatistics.sortedBy { it.word }
         val maxCount: Int = sortedWordStatistics.maxOfOrNull { it.verseIndexes.count() } ?: 0
         statisticsLayout.removeAllViews()
 
@@ -276,11 +277,11 @@ class SearchWordStatisticsFragment() : Fragment() {
     ): View? {
         inflater = theInflater
         _binding = SearchResultsStatisticsFragmentByBinding.inflate(inflater, container, false)
-        constructButtonList()
-
         var showKeyWordsCheckBox = binding.showKeyWordOnly
+
+        constructButtonList(showKeyWordsCheckBox.isChecked)
         showKeyWordsCheckBox.setOnClickListener {
-            constructButtonList()
+            constructButtonList(showKeyWordsCheckBox.isChecked)
         }
         return binding.root
     }

From abdd0de74e60100e6135576ec2467c8ca47e4ae2 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 12 Nov 2022 20:58:23 +0630
Subject: [PATCH 34/37] Cleaned the  code

---
 .../view/activity/search/MySearchResults.kt   | 43 ++-----------------
 1 file changed, 3 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 60ec6432d5..7ed6ef7f81 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -26,6 +26,8 @@ import kotlinx.coroutines.withContext
 import net.bible.android.activity.databinding.SearchResultsStatisticsBinding
 import java.util.ArrayList
 import net.bible.android.activity.R
+import net.bible.android.control.event.ABEventBus
+import net.bible.android.control.event.ToastEvent
 import net.bible.android.control.navigation.NavigationControl
 import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
 import net.bible.android.control.search.SearchControl
@@ -54,21 +56,6 @@ const val verseTabPosition = 0
 private const val bookTabPosition = 1
 private const val wordTabPosition = 2
 
-class MyTimer(val name:String){
-    var startTime = System.nanoTime()
-    var totalTime:Long = 0
-
-    fun start() {startTime = System.nanoTime()}
-    fun stop(addToLog: Boolean = false) {
-        totalTime += System.nanoTime() - startTime
-        if (addToLog) log()
-    }
-    fun reset() {totalTime = 0}
-    fun log() {
-        Log.e("MyTimer", name + ": " + (totalTime/1000000) + "mS\n")
-    }
-}
-
 class BookStat(val book: String, var count: Int,
                val bookInitials: String,
                val bookOrdinal:Int,
@@ -153,7 +140,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
     @Inject lateinit var searchControl: SearchControl
     @Inject lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
 
-    private val totalTime = MyTimer("Total Time")
     private val versification get() = navigationControl.versification
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -170,7 +156,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Log.i(TAG, "Displaying Search results view")
-        totalTime.reset()
 
         binding = SearchResultsStatisticsBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -220,7 +205,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
         Log.i(TAG, "Preparing search results")
         var isOk: Boolean
         try { // get search string - passed in using extras so extras cannot be null
-            val fetchResultsTimer = MyTimer("fetchResultsTimer")
             val extras = intent.extras!!
             val searchText = extras.getString(SearchControl.SEARCH_TEXT)
             var searchDocument = extras.getString(SearchControl.SEARCH_DOCUMENT)
@@ -235,10 +219,9 @@ class MySearchResults : CustomTitlebarActivityBase() {
                 getString(R.string.search_result_count, mSearchResultsHolder!!.size)
             }
             withContext(Dispatchers.Main) {
-                Toast.makeText(this@MySearchResults, msg, Toast.LENGTH_SHORT).show()
+                ABEventBus.post(ToastEvent(msg))
             }
             isOk = true
-            fetchResultsTimer.stop(true)
         } catch (e: Exception) {
             Log.e(TAG, "Error processing search query", e)
             isOk = false
@@ -252,10 +235,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
      */
 
     private fun populateViewResultsAdapter() {
-        val populateViewResultsAdapterTimer = MyTimer("populateViewResultsAdapterTimer")
-        val getSearchResultVerseElementTimer = MyTimer("getSearchResultVerseElement")
-        val getSearchResultVerseStringTimer = MyTimer("getSearchResultVerseString")
-        val verseTextSpannableTimer = MyTimer("SearchHighlight")
 
         mCurrentlyDisplayedSearchResults = if (isScriptureResultsCurrentlyShown) {
             mSearchResultsHolder!!.mainSearchResults
@@ -277,17 +256,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
             // Add verse to results array
 
             var verseTextSpannable: SpannableString?
-            getSearchResultVerseElementTimer.start()
             val verseTextElement = searchControl.getSearchResultVerseElement(key)
-            getSearchResultVerseElementTimer.stop()
-
-//            getSearchResultVerseStringTimer.start()
-            // This takes 3 to 4 times longer than 'getSearchResultVerseElement' which itself takes 3 to 4 times longer than the old search which is almost instant.
-            // I have converted the code to Kotlin. But apart from that it seems the same. I would like to use 'getSearchResultVerseText' for non-Strongs searches
-            // if it is faster because the Element parsing is only necessary for Strongs searches.
-            // Perhaps the performance of 'getSearchResultVerseElement' can be improved if we can work out why 'getSearchResultVerseText' is so slow.
-//            val verseTextString = searchControl.getSearchResultVerseText(key)
-//            getSearchResultVerseStringTimer.stop()
 
             // Build a spannable verse highlighting the relevant words.
             verseTextSpannable = searchHighlight.generateSpannableFromVerseElement(verseTextElement)
@@ -372,12 +341,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
         tabHost.getTabAt(bookTabPosition)!!.text = CommonUtils.resources.getString(R.string.book_count, bookStatistics.count().toString())
         tabHost.getTabAt(wordTabPosition)!!.text = CommonUtils.resources.getString(R.string.word_count, wordStatistics.count().toString())
 
-        populateViewResultsAdapterTimer.stop()
-        populateViewResultsAdapterTimer.log()
-        getSearchResultVerseElementTimer.log()
-        getSearchResultVerseStringTimer.log()
-        verseTextSpannableTimer.log()
-        totalTime.stop(true)
     }
     /**
      * Handle scripture/Appendix toggle

From f987dd2d1c613a854190cae46c9e615a26748109 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sun, 13 Nov 2022 21:33:01 +0630
Subject: [PATCH 35/37] Exclude short words at the beginning and one
 punctuation

Still needs work.
---
 .../view/activity/search/MySearchResults.kt   | 43 ++++++++++++-------
 .../activity/search/SearchResultsFragments.kt |  4 +-
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 7ed6ef7f81..c927473bfd 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -63,7 +63,7 @@ class BookStat(val book: String, var count: Int,
                 val color: Int) {
     override fun toString(): String = "$book: $count"
 }
-class WordStat(val word: String,
+class WordStat(var word: String,
                var verseIndexes: IntArray,
                val originalWord: String,
                var tag: Boolean = false) {
@@ -170,7 +170,6 @@ class MySearchResults : CustomTitlebarActivityBase() {
             mSearchResultsArray, bookStatistics, wordStatistics, keyWordStatistics
         )
 
-
         binding.viewPager.run {
             adapter = sectionsPagerAdapter
             // The progressbar on the 3rd tab goes to zero when the view is lost.
@@ -296,38 +295,52 @@ class MySearchResults : CustomTitlebarActivityBase() {
             }
             listIndex += 1
         }
-        // Build keyword list
+        // Initialise keyword lists
         val tmpKeyWordStatistics = mutableListOf<WordStat>()
+        val tmpWordStatistics = wordStatistics.toMutableList()
+//        val wordsToExclude = listOf("and","or")
+
+//        // Cleanup original word list
+//        tmpWordStatistics.filter {"“" in it.originalWord  }.map {
+//            it.word = it.originalWord.replace("“","",true)
+//        }
 
         // Exclude short words (eg 'and', 'or', 'it' etc)
-        wordStatistics.filter{it.originalWord.length<=3 && it.originalWord != "God"}.map {it.tag = true}
+        tmpWordStatistics.filter{it.word.length<=3 && it.word != "God"}.map {it.tag = true}
+
+        // Remove short single words from the beginning of a phrase
+        tmpWordStatistics.filter{it.word.indexOf(" ") > 0 && it.word.indexOf(" ") < 4}.map {
+            it.word = it.word.substring(it.word.indexOf(" ")+1)
+        }
 
         // Find all single words
-        wordStatistics.filter{ !it.tag }.sortedBy { it.originalWord.length }.map {
-            if (" " !in it.originalWord) {
-                it.tag = true  // Don't process this entry again
-                tmpKeyWordStatistics.add(WordStat(it.word, it.verseIndexes, it.originalWord))
-                keyWordStatistics.add(WordStat(it.word, it.verseIndexes, it.originalWord))
+        tmpWordStatistics.filter{ !it.tag }.sortedBy { it.originalWord.length }.map { wordStat ->
+            if (" " !in wordStat.word) {
+                wordStat.tag = true  // Don't process this entry again
+                if (!keyWordStatistics.any { wordStat.word.contains(it.word,true) }) {
+                    tmpKeyWordStatistics.add(WordStat(wordStat.word, wordStat.verseIndexes, wordStat.originalWord))
+                    keyWordStatistics.add(WordStat(wordStat.word, wordStat.verseIndexes, wordStat.word))
+                }
             }
         }
 
-        // Find phrases that have a single keyword in them
-        keyWordStatistics.map { keyWord ->
-            wordStatistics.filter { !it.tag && it.originalWord.contains(keyWord.originalWord,true) }.map { multiWordStat ->
+        // Find phrases that have a single keyword in them. Order is important to exclude words with punctuation (eg "Gather)
+        keyWordStatistics.sortedBy { it.originalWord.length }.map { keyWord ->
+            tmpWordStatistics.filter { !it.tag && it.word.contains(keyWord.word,true) }.map { multiWordStat ->
                 multiWordStat.tag = true  // Exclude the
                 keyWord.verseIndexes += multiWordStat.verseIndexes
             }
         }
         // Find phrases that are in other longer phrases
-        wordStatistics.filter{ !it.tag }.sortedBy { it.originalWord.length }.map { shortPhrase ->
-            wordStatistics.filter { !it.tag && it.originalWord != shortPhrase.originalWord && it.originalWord.contains(shortPhrase.originalWord,true) }
+        tmpWordStatistics.filter{ !it.tag }.sortedBy { it.word.length }.map { shortPhrase ->
+            tmpWordStatistics.filter { !it.tag && it.word != shortPhrase.word && it.word.contains(shortPhrase.word,true) }
                 .map { longPhrase ->
                     longPhrase.tag = true
                     shortPhrase.verseIndexes += longPhrase.verseIndexes
                 }
         }
         // Add all the phrases that have not been tagged (excludes single words, long phrases that appear in shorter phrases)
-        wordStatistics.filter{ !it.tag }.map {
+        tmpWordStatistics.filter{ !it.tag }.map {
             keyWordStatistics.add(it)
         }
 
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index 085a94354d..c043624e16 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -260,9 +260,9 @@ class SearchWordStatisticsFragment() : Fragment() {
                 statisticsLayout, false
             )
             val button = statsRow.findViewById<Button>(R.id.searchStatisticsWordButton)
-            button.setText(it.originalWord)
+            button.text = it.originalWord
             val text = statsRow.findViewById<TextView>(R.id.searchStatisticsWordCount)
-            text.setText("${it.verseIndexes.count()}")
+            text.text = "${it.verseIndexes.count()}"
             val progressBar = statsRow.findViewById<ProgressBar>(R.id.searchStatisticsWordCountProgress)
             progressBar.max = maxCount
             progressBar.progress = it.verseIndexes.count()

From 46589d571570fc8fba56f682c8e8152b6070d7d4 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 19 Nov 2022 21:16:25 +0630
Subject: [PATCH 36/37] Update MySearchResults.kt

---
 .../bible/android/view/activity/search/MySearchResults.kt    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index c927473bfd..57def2f1dd 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -310,11 +310,14 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
         // Remove short single words from the beginning of a phrase
         tmpWordStatistics.filter{it.word.indexOf(" ") > 0 && it.word.indexOf(" ") < 4}.map {
-            it.word = it.word.substring(it.word.indexOf(" ")+1)
+            it.word = it.word.substring(it.word.indexOf(" ")+1).trim()
         }
 
         // Find all single words
         tmpWordStatistics.filter{ !it.tag }.sortedBy { it.originalWord.length }.map { wordStat ->
+            // TODO: I think longer single words that contain shorter single words are being excluded (correctly) but their VerseIndexes are not being included
+            // TODO: Check Greek word Thirsty G1372 
+            // TODO: This IF  should be able to be moved into the filter above
             if (" " !in wordStat.word) {
                 wordStat.tag = true  // Don't process this entry again
                 if (!keyWordStatistics.any { wordStat.word.contains(it.word,true) }) {

From 48aa5a997bf60fdba530fda6f1c24c3debc60aaa Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Fri, 16 Dec 2022 22:48:27 +0630
Subject: [PATCH 37/37] Fixed issues resulting from Tuomas' changes

---
 .../window/ActiveWindowPageManagerProvider.kt |  4 ++++
 .../android/control/search/SearchControl.kt   | 13 +++++++----
 .../view/activity/search/MySearchResults.kt   | 23 ++++++++++++-------
 .../activity/search/SearchResultsFragments.kt | 12 ++++++----
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/net/bible/android/control/page/window/ActiveWindowPageManagerProvider.kt b/app/src/main/java/net/bible/android/control/page/window/ActiveWindowPageManagerProvider.kt
index b780e7afd5..23678c888a 100644
--- a/app/src/main/java/net/bible/android/control/page/window/ActiveWindowPageManagerProvider.kt
+++ b/app/src/main/java/net/bible/android/control/page/window/ActiveWindowPageManagerProvider.kt
@@ -22,3 +22,7 @@ import net.bible.android.control.page.CurrentPageManager
 /**
  * @author Martin Denham [mjdenham at gmail dot com]
  */
+
+//interface ActiveWindowPageManagerProvider {
+//    val activeWindowPageManager: CurrentPageManager
+//}
diff --git a/app/src/main/java/net/bible/android/control/search/SearchControl.kt b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
index 98d2e5339f..612f087664 100644
--- a/app/src/main/java/net/bible/android/control/search/SearchControl.kt
+++ b/app/src/main/java/net/bible/android/control/search/SearchControl.kt
@@ -26,10 +26,14 @@ import net.bible.android.control.versification.Scripture
 import net.bible.android.view.activity.search.Search
 import net.bible.android.view.activity.search.SearchIndex
 import net.bible.android.view.activity.search.SearchResultsDto
+import net.bible.service.common.CommonUtils.limitTextLength
+import net.bible.service.sword.SwordContentFacade.getPlainText
+import net.bible.service.sword.SwordContentFacade.readOsisFragment
 import net.bible.service.sword.SwordContentFacade.search
 import net.bible.service.sword.SwordDocumentFacade
 import org.apache.commons.lang3.StringUtils
 import org.crosswire.jsword.book.Book
+import org.crosswire.jsword.book.BookCategory
 import org.crosswire.jsword.book.BookException
 import org.crosswire.jsword.book.basic.AbstractPassageBook
 import org.crosswire.jsword.book.sword.SwordBook
@@ -38,6 +42,7 @@ import org.crosswire.jsword.index.lucene.LuceneIndex
 import org.crosswire.jsword.index.search.SearchType
 import org.crosswire.jsword.passage.Key
 import org.crosswire.jsword.passage.Verse
+import org.jdom2.Element
 import javax.inject.Inject
 
 /** Support for the document search functionality
@@ -167,12 +172,12 @@ class SearchControl @Inject constructor(
         // This is much slower than 'getSearchResultVerseElement'. Why? In the old version this was VERY fast.
         var verseText = ""
         try {
-            val doc = activeWindowPageManagerProvider.activeWindowPageManager.currentPage.currentDocument
+            val doc = windowControl.activeWindowPageManager.currentPage.currentDocument
             val cat = doc!!.bookCategory
             verseText = if (cat == BookCategory.BIBLE || cat == BookCategory.COMMENTARY) {
                 getPlainText(doc, key)
             } else {
-                val bible = activeWindowPageManagerProvider.activeWindowPageManager.currentBible.currentDocument!!
+                val bible = windowControl.activeWindowPageManager.currentBible.currentDocument!!
                 getPlainText(bible, key)
             }
             verseText = limitTextLength(verseText)!!
@@ -186,12 +191,12 @@ class SearchControl @Inject constructor(
         // There is similar functionality in BookmarkControl
         var xmlVerse:Element? = null
         try {
-            val doc = activeWindowPageManagerProvider.activeWindowPageManager.currentPage.currentDocument
+            val doc = windowControl.activeWindowPageManager.currentPage.currentDocument
             val cat = doc!!.bookCategory
             xmlVerse = if (cat == BookCategory.BIBLE || cat == BookCategory.COMMENTARY) {
                 readOsisFragment(doc, key)
             } else {
-                val bible = activeWindowPageManagerProvider.activeWindowPageManager.currentBible.currentDocument!!
+                val bible = windowControl.activeWindowPageManager.currentBible.currentDocument!!
                 readOsisFragment(bible, key)
             }
         } catch (e: Exception) {
diff --git a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
index 57def2f1dd..003deb3d0c 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/MySearchResults.kt
@@ -12,6 +12,7 @@ import android.text.style.StyleSpan
 import android.util.Log
 import android.view.MenuItem
 import android.view.View
+import android.view.Window
 import android.widget.Toast
 import androidx.core.text.toHtml
 import com.google.android.material.tabs.TabLayout
@@ -28,10 +29,11 @@ import java.util.ArrayList
 import net.bible.android.activity.R
 import net.bible.android.control.event.ABEventBus
 import net.bible.android.control.event.ToastEvent
+import net.bible.android.control.link.LinkControl
 import net.bible.android.control.navigation.NavigationControl
-import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
+import net.bible.android.control.page.window.WindowControl
 import net.bible.android.control.search.SearchControl
-import net.bible.android.control.search.SearchResultsDto
+//import net.bible.android.view.activity.search.SearchResultsDto
 import net.bible.android.view.activity.base.CustomTitlebarActivityBase
 import net.bible.android.view.activity.base.Dialogs
 import net.bible.android.view.activity.navigation.GridChoosePassageBook
@@ -46,6 +48,7 @@ import net.bible.service.common.CommonUtils
 import net.bible.service.common.CommonUtils.resources
 
 
+
 private var TAB_TITLES = arrayOf(
     resources.getString(R.string.add_bookmark_whole_verse1),
     resources.getString(R.string.by_book),
@@ -138,7 +141,8 @@ class MySearchResults : CustomTitlebarActivityBase() {
     private var isScriptureResultsCurrentlyShown = true
     @Inject lateinit var searchResultsActionBarManager: SearchResultsActionBarManager
     @Inject lateinit var searchControl: SearchControl
-    @Inject lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
+    @Inject lateinit var linkControl: LinkControl
+    @Inject lateinit var windowControl: WindowControl
 
     private val versification get() = navigationControl.versification
 
@@ -166,7 +170,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
         bundle.putString("edttext", "From Activity")
 
         sectionsPagerAdapter = SearchResultsPagerAdapter(this,
-            supportFragmentManager, searchControl, activeWindowPageManagerProvider, intent,
+            supportFragmentManager, searchControl, windowControl, intent,
             mSearchResultsArray, bookStatistics, wordStatistics, keyWordStatistics
         )
 
@@ -208,7 +212,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
             val searchText = extras.getString(SearchControl.SEARCH_TEXT)
             var searchDocument = extras.getString(SearchControl.SEARCH_DOCUMENT)
             if (StringUtils.isEmpty(searchDocument)) {
-                searchDocument = activeWindowPageManagerProvider.activeWindowPageManager.currentPage.currentDocument!!.initials
+                searchDocument = windowControl.activeWindowPageManager.currentPage.currentDocument!!.initials
             }
             mSearchResultsHolder = searchControl.getSearchResults(searchDocument, searchText)
             // tell user how many results were returned
@@ -376,7 +380,7 @@ class MySearchResults : CustomTitlebarActivityBase() {
 
 class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManager,
                                 searchControl: SearchControl,
-                                activeWindowPageManagerProvider: ActiveWindowPageManagerProvider,
+                                windowControl: WindowControl,
                                 intent: Intent,
                                 private val mSearchResultsArray:ArrayList<SearchResultsData>,
                                 private val bookStatistics: MutableList<BookStat>,
@@ -385,10 +389,12 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
 ) :
     FragmentPagerAdapter(fm) {
     val searchControl = searchControl
-    val activeWindowPageManagerProvider = activeWindowPageManagerProvider
+    val activeWindowPageManagerProvider = windowControl.activeWindowPageManager
     val intent = intent
+    val windowControl = windowControl
     lateinit var verseListFrag: SearchResultsFragment
 
+
     override fun getItem(position: Int): Fragment {
         // getItem is called to instantiate the fragment for the given page.
         // This initialises the fragment but only if POSITION_NONE is returned from getItemPosition.
@@ -404,7 +410,8 @@ class SearchResultsPagerAdapter(private val context: Context, fm: FragmentManage
 //                bundle.putParcelableArrayList("VerseResultList", mSearchResultsArray)
 //                frag.setArguments(bundle)
                 frag.searchControl = searchControl
-                frag.activeWindowPageManagerProvider = activeWindowPageManagerProvider
+                frag.windowControl = windowControl
+//                frag.activeWindowPageManagerProvider = activeWindowPageManagerProvider
                 frag.intent = intent
                 verseListFrag = frag
             }
diff --git a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
index c043624e16..6dd5e8ce9e 100644
--- a/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
+++ b/app/src/main/java/net/bible/android/view/activity/search/SearchResultsFragments.kt
@@ -25,13 +25,15 @@ import net.bible.android.view.activity.base.Dialogs
 import net.bible.android.view.activity.page.MainBibleActivity
 import org.apache.commons.lang3.StringUtils
 import org.crosswire.jsword.passage.Key
-import net.bible.android.control.page.window.ActiveWindowPageManagerProvider
 import net.bible.service.common.CommonUtils
 import net.bible.service.sword.SwordDocumentFacade
+import net.bible.android.control.page.window.WindowControl
+import javax.inject.Inject
 
 private lateinit var displayedResultsArray: ArrayList<SearchResultsData>
 private var isSearchResultsFiltered = false
 
+
 class PlaceholderFragment: Fragment() {
 
     private var _binding: SearchResultsStatisticsFragmentVerseBinding? = null
@@ -95,7 +97,7 @@ class SearchResultsFragment(val mSearchResultsArray:ArrayList<SearchResultsData>
 
     var searchControl: SearchControl? = null
     lateinit var intent: Intent
-    lateinit var activeWindowPageManagerProvider: ActiveWindowPageManagerProvider
+    lateinit var windowControl: WindowControl
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -128,14 +130,14 @@ class SearchResultsFragment(val mSearchResultsArray:ArrayList<SearchResultsData>
     private fun verseSelected(key: Key?) {
         Log.i("SearchResults.TAG", "chose:$key")
         if (key != null) { // which doc do we show
-
+            searchControl
             var targetDocInitials = intent.extras!!.getString(SearchControl.TARGET_DOCUMENT)
             if (StringUtils.isEmpty(targetDocInitials)) {
-                targetDocInitials = activeWindowPageManagerProvider.activeWindowPageManager.currentPage.currentDocument!!.initials
+                targetDocInitials = windowControl.activeWindowPageManager.currentPage.currentDocument!!.initials
             }
             val swordDocumentFacade = SwordDocumentFacade()
             val targetBook = swordDocumentFacade.getDocumentByInitials(targetDocInitials)
-            activeWindowPageManagerProvider.activeWindowPageManager.setCurrentDocumentAndKey(targetBook, key)
+            windowControl.activeWindowPageManager.setCurrentDocumentAndKey(targetBook, key)
             // this also calls finish() on this Activity.  If a user re-selects from HistoryList then a new Activity is created
             val intent = Intent(this.context, MainBibleActivity::class.java).apply {
                 addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)