Add back all the imports.

Frustrating that IntelliJ decided to strip those out...
master
Bradlee Speice 2015-06-13 20:44:41 -04:00
parent a96fa1dd74
commit 7d3ca03876
6 changed files with 22 additions and 5 deletions

View File

@ -138,5 +138,6 @@
<orderEntry type="library" exported="" name="commons-net-3.3" level="project" /> <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="" scope="TEST" name="awaitility-1.6.3" level="project" />
<orderEntry type="library" exported="" name="jdom2-2.0.5" level="project" /> <orderEntry type="library" exported="" name="jdom2-2.0.5" level="project" />
<orderEntry type="module" module-name="jsword-minimalbible" />
</component> </component>
</module> </module>

View File

@ -1,6 +1,9 @@
package org.bspeice.minimalbible.activity.downloader.manager package org.bspeice.minimalbible.activity.downloader.manager
import android.net.ConnectivityManager
import org.bspeice.minimalbible.activity.downloader.DownloadPrefs 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.Observable
import rx.schedulers.Schedulers import rx.schedulers.Schedulers
import java.util.Calendar import java.util.Calendar
@ -36,10 +39,6 @@ class RefreshManager(val installers: Collection<Installer>,
// Lists -> Single list // Lists -> Single list
.flatMap { Observable.from(it) } .flatMap { Observable.from(it) }
val flatModulesSorted = flatModules.toSortedList { book1, book2 ->
BookComparators.getInitialComparator().compare(book1, book2)
}
fun doReload(downloadEnabled: Boolean, lastUpdated: Long, fun doReload(downloadEnabled: Boolean, lastUpdated: Long,
networkState: Int? = ConnectivityManager.TYPE_DUMMY): Boolean = networkState: Int? = ConnectivityManager.TYPE_DUMMY): Boolean =
if (!downloadEnabled || networkState != ConnectivityManager.TYPE_WIFI) if (!downloadEnabled || networkState != ConnectivityManager.TYPE_WIFI)

View File

@ -1,5 +1,11 @@
package org.bspeice.minimalbible.activity.search 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 * 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. * an "advanced" search in the future, but for now, basicTextSearch is what you get.

View File

@ -1,6 +1,15 @@
package org.bspeice.minimalbible.activity.viewer 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.bspeice.minimalbible.R
import org.crosswire.jsword.book.Book
import org.crosswire.jsword.versification.BibleBook
import rx.subjects.PublishSubject import rx.subjects.PublishSubject
class BibleMenu(val ctx: Context, val attrs: AttributeSet) : LinearLayout(ctx, attrs) { class BibleMenu(val ctx: Context, val attrs: AttributeSet) : LinearLayout(ctx, attrs) {

View File

@ -1,5 +1,7 @@
package org.bspeice.minimalbible.service.format.osisparser.handler 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.bspeice.minimalbible.service.format.osisparser.VerseContent
import org.xml.sax.Attributes import org.xml.sax.Attributes

@ -1 +1 @@
Subproject commit 601af59763e574f6b320c8d9207741229bba5956 Subproject commit 93dfa15fa55ba9a33765937f22d0b0fe0a64945e