mirror of
https://github.com/MinimalBible/MinimalBible-Legacy
synced 2024-12-22 06:38:28 -05:00
Add lots of Lint fixes
This commit is contained in:
parent
dda5c79299
commit
04fe4d13b4
@ -17,7 +17,7 @@ public class BaseFragment extends Fragment {
|
|||||||
* @param context The {@link android.app.Activity} we are displaying in
|
* @param context The {@link android.app.Activity} we are displaying in
|
||||||
* @param view The {@link android.view.View} we need to calculate the offset for.
|
* @param view The {@link android.view.View} we need to calculate the offset for.
|
||||||
*/
|
*/
|
||||||
public static void setInsets(Activity context, View view) {
|
protected static void setInsets(Activity context, View view) {
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
|
||||||
SystemBarTintManager tintManager = new SystemBarTintManager(context);
|
SystemBarTintManager tintManager = new SystemBarTintManager(context);
|
||||||
SystemBarTintManager.SystemBarConfig config = tintManager.getConfig();
|
SystemBarTintManager.SystemBarConfig config = tintManager.getConfig();
|
||||||
|
@ -3,7 +3,6 @@ package org.bspeice.minimalbible.activities.downloader;
|
|||||||
import org.bspeice.minimalbible.MinimalBible;
|
import org.bspeice.minimalbible.MinimalBible;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.BookDownloadManager;
|
import org.bspeice.minimalbible.activities.downloader.manager.BookDownloadManager;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.BookDownloadThread;
|
import org.bspeice.minimalbible.activities.downloader.manager.BookDownloadThread;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.InstalledManager;
|
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.RefreshManager;
|
import org.bspeice.minimalbible.activities.downloader.manager.RefreshManager;
|
||||||
|
|
||||||
import dagger.Module;
|
import dagger.Module;
|
||||||
|
@ -38,8 +38,8 @@ public class BookItemHolder {
|
|||||||
@Inject BookDownloadManager bookDownloadManager;
|
@Inject BookDownloadManager bookDownloadManager;
|
||||||
@Inject InstalledManager installedManager;
|
@Inject InstalledManager installedManager;
|
||||||
|
|
||||||
Book b;
|
private final Book b;
|
||||||
Subscription subscription;
|
private Subscription subscription;
|
||||||
|
|
||||||
public BookItemHolder(View v, Book b) {
|
public BookItemHolder(View v, Book b) {
|
||||||
ButterKnife.inject(this, v);
|
ButterKnife.inject(this, v);
|
||||||
@ -59,8 +59,8 @@ public class BookItemHolder {
|
|||||||
//TODO: Refactor
|
//TODO: Refactor
|
||||||
subscription = bookDownloadManager.getDownloadEvents()
|
subscription = bookDownloadManager.getDownloadEvents()
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.filter((event) -> event.getB().getInitials() == b.getInitials())
|
.filter((event) -> event.getB().getInitials().equals(b.getInitials()))
|
||||||
.subscribe((event) -> displayProgress((int)event.toCircular()));
|
.subscribe((event) -> displayProgress((int) event.toCircular()));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void displayInstalled() {
|
private void displayInstalled() {
|
||||||
|
@ -15,9 +15,9 @@ import java.util.List;
|
|||||||
* Adapter to inflate list_download_items.xml
|
* Adapter to inflate list_download_items.xml
|
||||||
*/
|
*/
|
||||||
public class BookListAdapter extends BaseAdapter implements AbsListView.RecyclerListener {
|
public class BookListAdapter extends BaseAdapter implements AbsListView.RecyclerListener {
|
||||||
private List<Book> bookList;
|
private final List<Book> bookList;
|
||||||
|
|
||||||
private LayoutInflater inflater;
|
private final LayoutInflater inflater;
|
||||||
|
|
||||||
public BookListAdapter(LayoutInflater inflater, List<Book> bookList) {
|
public BookListAdapter(LayoutInflater inflater, List<Book> bookList) {
|
||||||
this.bookList = bookList;
|
this.bookList = bookList;
|
||||||
|
@ -5,8 +5,6 @@ import android.app.AlertDialog;
|
|||||||
import android.app.ProgressDialog;
|
import android.app.ProgressDialog;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Looper;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
@ -17,15 +15,8 @@ import org.bspeice.minimalbible.MinimalBible;
|
|||||||
import org.bspeice.minimalbible.R;
|
import org.bspeice.minimalbible.R;
|
||||||
import org.bspeice.minimalbible.activities.BaseFragment;
|
import org.bspeice.minimalbible.activities.BaseFragment;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.RefreshManager;
|
import org.bspeice.minimalbible.activities.downloader.manager.RefreshManager;
|
||||||
import org.crosswire.jsword.book.Book;
|
|
||||||
import org.crosswire.jsword.book.BookCategory;
|
import org.crosswire.jsword.book.BookCategory;
|
||||||
import org.crosswire.jsword.book.BookComparators;
|
import org.crosswire.jsword.book.BookComparators;
|
||||||
import org.crosswire.jsword.book.BookFilter;
|
|
||||||
import org.crosswire.jsword.book.FilterUtil;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
@ -96,7 +87,7 @@ public class BookListFragment extends BaseFragment {
|
|||||||
* Trigger the functionality to display a list of modules. Prompts user if downloading
|
* Trigger the functionality to display a list of modules. Prompts user if downloading
|
||||||
* from the internet is allowable.
|
* from the internet is allowable.
|
||||||
*/
|
*/
|
||||||
public void displayModules() {
|
private void displayModules() {
|
||||||
boolean dialogDisplayed = downloadPrefs.hasShownDownloadDialog();
|
boolean dialogDisplayed = downloadPrefs.hasShownDownloadDialog();
|
||||||
|
|
||||||
if (!dialogDisplayed) {
|
if (!dialogDisplayed) {
|
||||||
@ -131,7 +122,7 @@ public class BookListFragment extends BaseFragment {
|
|||||||
// First flatten the Map to its lists
|
// First flatten the Map to its lists
|
||||||
.flatMap((books) -> Observable.from(books.values()))
|
.flatMap((books) -> Observable.from(books.values()))
|
||||||
// Then flatten the lists
|
// Then flatten the lists
|
||||||
.flatMap((books) -> Observable.from(books))
|
.flatMap(Observable::from)
|
||||||
.filter((book) -> book.getBookCategory() ==
|
.filter((book) -> book.getBookCategory() ==
|
||||||
BookCategory.fromString(getArguments().getString(ARG_BOOK_CATEGORY)))
|
BookCategory.fromString(getArguments().getString(ARG_BOOK_CATEGORY)))
|
||||||
// Repack all the books
|
// Repack all the books
|
||||||
|
@ -1,18 +1,17 @@
|
|||||||
package org.bspeice.minimalbible.activities.downloader;
|
package org.bspeice.minimalbible.activities.downloader;
|
||||||
|
|
||||||
import org.bspeice.minimalbible.R;
|
|
||||||
import org.bspeice.minimalbible.activities.BaseActivity;
|
|
||||||
import org.bspeice.minimalbible.activities.BaseNavigationDrawerFragment;
|
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.DownloadManager;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.app.Fragment;
|
|
||||||
import android.support.v4.app.FragmentManager;
|
import android.support.v4.app.FragmentManager;
|
||||||
import android.support.v4.widget.DrawerLayout;
|
import android.support.v4.widget.DrawerLayout;
|
||||||
import android.support.v7.app.ActionBar;
|
import android.support.v7.app.ActionBar;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
|
||||||
|
import org.bspeice.minimalbible.R;
|
||||||
|
import org.bspeice.minimalbible.activities.BaseActivity;
|
||||||
|
import org.bspeice.minimalbible.activities.BaseNavigationDrawerFragment;
|
||||||
|
import org.bspeice.minimalbible.activities.downloader.manager.DownloadManager;
|
||||||
|
|
||||||
public class DownloadActivity extends BaseActivity implements
|
public class DownloadActivity extends BaseActivity implements
|
||||||
BaseNavigationDrawerFragment.NavigationDrawerCallbacks {
|
BaseNavigationDrawerFragment.NavigationDrawerCallbacks {
|
||||||
|
|
||||||
|
@ -32,14 +32,14 @@ public class BookDownloadManager implements WorkListener, BooksListener {
|
|||||||
/**
|
/**
|
||||||
* Mapping of Job ID to the EventBus we should trigger progress on
|
* Mapping of Job ID to the EventBus we should trigger progress on
|
||||||
*/
|
*/
|
||||||
private Map<String, Book> bookMappings;
|
private final Map<String, Book> bookMappings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Cached copy of downloads in progress so views displaying this info can get it quickly.
|
* Cached copy of downloads in progress so views displaying this info can get it quickly.
|
||||||
*/
|
*/
|
||||||
private Map<Book, DLProgressEvent> inProgressDownloads;
|
private final Map<Book, DLProgressEvent> inProgressDownloads;
|
||||||
|
|
||||||
private PublishSubject<DLProgressEvent> downloadEvents = PublishSubject.create();
|
private final PublishSubject<DLProgressEvent> downloadEvents = PublishSubject.create();
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
Provider<BookDownloadThread> dlThreadProvider;
|
Provider<BookDownloadThread> dlThreadProvider;
|
||||||
|
@ -5,7 +5,6 @@ import android.util.Log;
|
|||||||
import org.bspeice.minimalbible.MinimalBible;
|
import org.bspeice.minimalbible.MinimalBible;
|
||||||
import org.crosswire.jsword.book.Book;
|
import org.crosswire.jsword.book.Book;
|
||||||
import org.crosswire.jsword.book.install.InstallException;
|
import org.crosswire.jsword.book.install.InstallException;
|
||||||
import org.crosswire.jsword.book.install.Installer;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
@ -6,8 +6,8 @@ import org.crosswire.jsword.book.Book;
|
|||||||
* Used for notifying that a book's download progress is ongoing
|
* Used for notifying that a book's download progress is ongoing
|
||||||
*/
|
*/
|
||||||
public class DLProgressEvent {
|
public class DLProgressEvent {
|
||||||
private int progress;
|
private final int progress;
|
||||||
private Book b;
|
private final Book b;
|
||||||
|
|
||||||
public static final int PROGRESS_COMPLETE = 100;
|
public static final int PROGRESS_COMPLETE = 100;
|
||||||
public static final int PROGRESS_BEGINNING = 0;
|
public static final int PROGRESS_BEGINNING = 0;
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
package org.bspeice.minimalbible.activities.downloader.manager;
|
package org.bspeice.minimalbible.activities.downloader.manager;
|
||||||
|
|
||||||
import android.os.Handler;
|
|
||||||
import android.os.HandlerThread;
|
|
||||||
|
|
||||||
import org.bspeice.minimalbible.MinimalBible;
|
import org.bspeice.minimalbible.MinimalBible;
|
||||||
import org.crosswire.jsword.book.Book;
|
import org.crosswire.jsword.book.Book;
|
||||||
import org.crosswire.jsword.book.install.Installer;
|
import org.crosswire.jsword.book.install.Installer;
|
||||||
@ -17,8 +14,6 @@ import javax.inject.Inject;
|
|||||||
import javax.inject.Singleton;
|
import javax.inject.Singleton;
|
||||||
|
|
||||||
import rx.Observable;
|
import rx.Observable;
|
||||||
import rx.android.schedulers.AndroidSchedulers;
|
|
||||||
import rx.android.schedulers.HandlerThreadScheduler;
|
|
||||||
import rx.schedulers.Schedulers;
|
import rx.schedulers.Schedulers;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -4,11 +4,8 @@ import android.test.InstrumentationTestCase;
|
|||||||
|
|
||||||
import org.bspeice.minimalbible.MinimalBible;
|
import org.bspeice.minimalbible.MinimalBible;
|
||||||
import org.bspeice.minimalbible.MinimalBibleModules;
|
import org.bspeice.minimalbible.MinimalBibleModules;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.BookDownloadThread;
|
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.DLProgressEvent;
|
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.DownloadManager;
|
import org.bspeice.minimalbible.activities.downloader.manager.DownloadManager;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.InstalledManager;
|
import org.bspeice.minimalbible.activities.downloader.manager.InstalledManager;
|
||||||
import org.bspeice.minimalbible.activities.downloader.manager.RefreshManager;
|
|
||||||
import org.crosswire.jsword.book.Book;
|
import org.crosswire.jsword.book.Book;
|
||||||
import org.crosswire.jsword.book.BookException;
|
import org.crosswire.jsword.book.BookException;
|
||||||
import org.crosswire.jsword.book.Books;
|
import org.crosswire.jsword.book.Books;
|
||||||
@ -16,16 +13,14 @@ import org.crosswire.jsword.book.install.Installer;
|
|||||||
import org.crosswire.jsword.passage.NoSuchKeyException;
|
import org.crosswire.jsword.passage.NoSuchKeyException;
|
||||||
|
|
||||||
import java.util.concurrent.Callable;
|
import java.util.concurrent.Callable;
|
||||||
import java.util.concurrent.CountDownLatch;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.inject.Provider;
|
|
||||||
|
|
||||||
import dagger.Module;
|
import dagger.Module;
|
||||||
import dagger.ObjectGraph;
|
import dagger.ObjectGraph;
|
||||||
|
|
||||||
import static com.jayway.awaitility.Awaitility.*;
|
import static com.jayway.awaitility.Awaitility.await;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tests for the Download activity
|
* Tests for the Download activity
|
||||||
@ -38,8 +33,6 @@ public class DownloadActivityTest extends InstrumentationTestCase {
|
|||||||
|
|
||||||
@Inject DownloadManager dm;
|
@Inject DownloadManager dm;
|
||||||
@Inject InstalledManager im;
|
@Inject InstalledManager im;
|
||||||
@Inject Provider<BookDownloadThread> bookDownloadThreadProvider;
|
|
||||||
@Inject RefreshManager rm;
|
|
||||||
|
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
MinimalBible application = MinimalBible.getApplication();
|
MinimalBible application = MinimalBible.getApplication();
|
||||||
@ -95,12 +88,7 @@ public class DownloadActivityTest extends InstrumentationTestCase {
|
|||||||
// Install a book
|
// Install a book
|
||||||
Installer i = (Installer) dm.getInstallers().values().toArray()[0];
|
Installer i = (Installer) dm.getInstallers().values().toArray()[0];
|
||||||
final Book testBook = i.getBooks().get(0);
|
final Book testBook = i.getBooks().get(0);
|
||||||
await().atMost(30, TimeUnit.SECONDS).until(new Callable<Boolean>() {
|
await().atMost(30, TimeUnit.SECONDS).until(() -> Books.installed().getBooks().contains(testBook));
|
||||||
@Override
|
|
||||||
public Boolean call() throws Exception {
|
|
||||||
return Books.installed().getBooks().contains(testBook);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Validate that we can actually do something with the book
|
// Validate that we can actually do something with the book
|
||||||
// TODO: Validate that the book exists on the filesystem too
|
// TODO: Validate that the book exists on the filesystem too
|
||||||
|
Loading…
Reference in New Issue
Block a user