mirror-github-minimalbible
/
MinimalBible
mirror of https://github.com/MinimalBible/MinimalBible
1
0
Fork 0
Code Issues Releases Wiki Activity

More skeleton updates to make things look nice

robolectric-error
Bradlee Speice 2014-08-09 20:45:35 -04:00
parent 302ae9d6f4
commit 1df6a13735
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/bspeice/minimalbible/activity/viewer/BookFragment.java
View File

@ -72,7 +72,7 @@ public class BookFragment extends BaseFragment {
false); false);
((Injector)getActivity()).inject(this); ((Injector)getActivity()).inject(this);
// TODO: Defer lookup until after webview created? When exactly is WebView created? // TODO: Defer lookup until after webview created? When exactly is WebView created?
this.lookupService = new VerseLookupService(mBook.get(), this.getActivity()); this.lookupService = new VerseLookupService(mBook.get());
ButterKnife.inject(this, rootView); ButterKnife.inject(this, rootView);
mainContent.getSettings().setJavaScriptEnabled(true); mainContent.getSettings().setJavaScriptEnabled(true);

17
app/src/main/java/org/bspeice/minimalbible/service/book/VerseLookupService.java
View File

@ -1,9 +1,11 @@
package org.bspeice.minimalbible.service.book; package org.bspeice.minimalbible.service.book;
import android.content.Context;
import android.support.v4.util.LruCache; import android.support.v4.util.LruCache;
import org.crosswire.common.xml.SAXEventProvider;
import org.crosswire.jsword.book.Book; import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.book.BookData;
import org.crosswire.jsword.book.BookException;
import org.crosswire.jsword.passage.Verse; import org.crosswire.jsword.passage.Verse;
import rx.functions.Action1; import rx.functions.Action1;
@ -33,7 +35,7 @@ public class VerseLookupService implements Action1<Verse> {
*/ */
private PublishSubject<Verse> listener = PublishSubject.create(); private PublishSubject<Verse> listener = PublishSubject.create();
public VerseLookupService(Book b, Context ctx) { public VerseLookupService(Book b) {
listener.subscribeOn(Schedulers.io()) listener.subscribeOn(Schedulers.io())
.subscribe(this); .subscribe(this);
this.book = b; this.book = b;
@ -66,9 +68,14 @@ public class VerseLookupService implements Action1<Verse> {
* @return * @return
*/ */
public String doVerseLookup(Verse v) { public String doVerseLookup(Verse v) {
//BookData bookData = new BookData(book, v); BookData bookData = new BookData(book, v);
try {
return "Not yet implemented!"; SAXEventProvider provider = bookData.getSAXEventProvider();
return provider.toString();
} catch (BookException e) {
e.printStackTrace();
return "Unable to locate " + v.toString() + "!";
}
} }
/** /**