From 7d3ca038763ef309958a5205535e6203de74a622 Mon Sep 17 00:00:00 2001
From: Bradlee Speice <bspeice.nc@gmail.com>
Date: Sat, 13 Jun 2015 20:44:41 -0400
Subject: [PATCH] Add back all the imports. Frustrating that IntelliJ decided
 to strip those out...

---
 app/app.iml                                              | 1 +
 .../activity/downloader/manager/RefreshManager.kt        | 7 +++----
 .../minimalbible/activity/search/SearchProvider.kt       | 6 ++++++
 .../bspeice/minimalbible/activity/viewer/BibleMenu.kt    | 9 +++++++++
 .../service/format/osisparser/handler/TagHandler.kt      | 2 ++
 jsword-minimalbible                                      | 2 +-
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 71001f9..f4d9606 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -138,5 +138,6 @@
     <orderEntry type="library" exported="" name="commons-net-3.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="awaitility-1.6.3" level="project" />
     <orderEntry type="library" exported="" name="jdom2-2.0.5" level="project" />
+    <orderEntry type="module" module-name="jsword-minimalbible" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/bspeice/minimalbible/activity/downloader/manager/RefreshManager.kt b/app/src/main/kotlin/org/bspeice/minimalbible/activity/downloader/manager/RefreshManager.kt
index 35561c7..46851a2 100644
--- a/app/src/main/kotlin/org/bspeice/minimalbible/activity/downloader/manager/RefreshManager.kt
+++ b/app/src/main/kotlin/org/bspeice/minimalbible/activity/downloader/manager/RefreshManager.kt
@@ -1,6 +1,9 @@
 package org.bspeice.minimalbible.activity.downloader.manager
 
+import android.net.ConnectivityManager
 import org.bspeice.minimalbible.activity.downloader.DownloadPrefs
+import org.crosswire.jsword.book.Book
+import org.crosswire.jsword.book.install.Installer
 import rx.Observable
 import rx.schedulers.Schedulers
 import java.util.Calendar
@@ -36,10 +39,6 @@ class RefreshManager(val installers: Collection<Installer>,
                     // Lists -> Single list
                     .flatMap { Observable.from(it) }
 
-    val flatModulesSorted = flatModules.toSortedList { book1, book2 ->
-        BookComparators.getInitialComparator().compare(book1, book2)
-    }
-
     fun doReload(downloadEnabled: Boolean, lastUpdated: Long,
                  networkState: Int? = ConnectivityManager.TYPE_DUMMY): Boolean =
             if (!downloadEnabled || networkState != ConnectivityManager.TYPE_WIFI)
diff --git a/app/src/main/kotlin/org/bspeice/minimalbible/activity/search/SearchProvider.kt b/app/src/main/kotlin/org/bspeice/minimalbible/activity/search/SearchProvider.kt
index b186057..618c380 100644
--- a/app/src/main/kotlin/org/bspeice/minimalbible/activity/search/SearchProvider.kt
+++ b/app/src/main/kotlin/org/bspeice/minimalbible/activity/search/SearchProvider.kt
@@ -1,5 +1,11 @@
 package org.bspeice.minimalbible.activity.search
 
+import android.util.Log
+import org.crosswire.jsword.book.Book
+import org.crosswire.jsword.index.IndexManager
+import org.crosswire.jsword.index.search.SearchType
+import org.crosswire.jsword.passage.Verse
+
 /**
  * This is the entry point for handling the actual bible search. Likely will support
  * an "advanced" search in the future, but for now, basicTextSearch is what you get.
diff --git a/app/src/main/kotlin/org/bspeice/minimalbible/activity/viewer/BibleMenu.kt b/app/src/main/kotlin/org/bspeice/minimalbible/activity/viewer/BibleMenu.kt
index a96f572..6f93fe7 100644
--- a/app/src/main/kotlin/org/bspeice/minimalbible/activity/viewer/BibleMenu.kt
+++ b/app/src/main/kotlin/org/bspeice/minimalbible/activity/viewer/BibleMenu.kt
@@ -1,6 +1,15 @@
 package org.bspeice.minimalbible.activity.viewer
 
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ExpandableListView
+import android.widget.LinearLayout
+import android.widget.TextView
 import org.bspeice.minimalbible.R
+import org.crosswire.jsword.book.Book
+import org.crosswire.jsword.versification.BibleBook
 import rx.subjects.PublishSubject
 
 class BibleMenu(val ctx: Context, val attrs: AttributeSet) : LinearLayout(ctx, attrs) {
diff --git a/app/src/main/kotlin/org/bspeice/minimalbible/service/format/osisparser/handler/TagHandler.kt b/app/src/main/kotlin/org/bspeice/minimalbible/service/format/osisparser/handler/TagHandler.kt
index 5d11e7d..60c7846 100644
--- a/app/src/main/kotlin/org/bspeice/minimalbible/service/format/osisparser/handler/TagHandler.kt
+++ b/app/src/main/kotlin/org/bspeice/minimalbible/service/format/osisparser/handler/TagHandler.kt
@@ -1,5 +1,7 @@
 package org.bspeice.minimalbible.service.format.osisparser.handler
 
+import android.text.SpannableStringBuilder
+import android.text.style.CharacterStyle
 import org.bspeice.minimalbible.service.format.osisparser.VerseContent
 import org.xml.sax.Attributes
 
diff --git a/jsword-minimalbible b/jsword-minimalbible
index 601af59..93dfa15 160000
--- a/jsword-minimalbible
+++ b/jsword-minimalbible
@@ -1 +1 @@
-Subproject commit 601af59763e574f6b320c8d9207741229bba5956
+Subproject commit 93dfa15fa55ba9a33765937f22d0b0fe0a64945e