From f228e8265ef0805feb7605feb4801c4079cf2a55 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Mon, 5 May 2014 01:10:42 -0400 Subject: [PATCH] Start switch to new Android Annotation format --- .../downloader/BookListFragment.java | 147 +++++++----------- .../downloader/DownloadActivity.java | 2 +- .../downloader/DownloadManager.java | 9 +- 3 files changed, 65 insertions(+), 93 deletions(-) diff --git a/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/BookListFragment.java b/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/BookListFragment.java index 1693590..ca8f6b0 100644 --- a/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/BookListFragment.java +++ b/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/BookListFragment.java @@ -1,73 +1,55 @@ package org.bspeice.minimalbible.activities.downloader; -import java.util.List; - -import org.bspeice.minimalbible.MinimalBibleConstants; -import org.bspeice.minimalbible.R; -import org.crosswire.jsword.book.Book; -import org.crosswire.jsword.book.BookCategory; -import org.crosswire.jsword.book.BookFilter; -import org.crosswire.jsword.book.BookFilters; - -import de.greenrobot.event.EventBus; - -import android.app.Activity; import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; -import android.os.Bundle; import android.support.v4.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; +import android.util.Log; import android.widget.TextView; import android.widget.Toast; +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EFragment; +import org.androidannotations.annotations.FragmentArg; +import org.androidannotations.annotations.Trace; +import org.androidannotations.annotations.ViewById; +import org.bspeice.minimalbible.MinimalBibleConstants; +import org.bspeice.minimalbible.R; +import org.crosswire.jsword.book.Book; +import org.crosswire.jsword.book.BookCategory; +import org.crosswire.jsword.book.BookFilter; +import org.crosswire.jsword.book.FilterUtil; + +import java.util.List; + /** * A placeholder fragment containing a simple view. */ +@EFragment(R.layout.fragment_download) public class BookListFragment extends Fragment { /** * The fragment argument representing the section number for this fragment. */ - private static final String ARG_BOOK_CATEGORY = "book_category"; + private final String TAG = "BookListFragment"; + + @FragmentArg + BookCategory bookCategory; + + @ViewById(R.id.section_label) protected TextView tv; + private ProgressDialog refreshDialog; - /** - * Returns a new instance of this fragment for the given section number. - */ - public static BookListFragment newInstance(BookCategory c) { - BookListFragment fragment = new BookListFragment(); - Bundle args = new Bundle(); - args.putString(ARG_BOOK_CATEGORY, c.toString()); - fragment.setArguments(args); - return fragment; - } - - public BookListFragment() { - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View rootView = inflater.inflate(R.layout.fragment_download, container, - false); - tv = (TextView) rootView.findViewById(R.id.section_label); - tv.setText(getArguments().getString(ARG_BOOK_CATEGORY)); - displayModules(); - return rootView; - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - ((DownloadActivity) activity).onSectionAttached(getArguments() - .getString(ARG_BOOK_CATEGORY)); - } + @Trace + @AfterViews + public void updateName() { + ((DownloadActivity) getActivity()).onSectionAttached(bookCategory.toString()); + tv.setText(bookCategory.toString()); + displayModules(); + } public void displayModules() { SharedPreferences prefs = getActivity() @@ -91,55 +73,42 @@ public class BookListFragment extends Fragment { } private void refreshModules() { - BookCategory bc = BookCategory.fromString(getArguments().getString( - ARG_BOOK_CATEGORY)); - BookFilter f; - // We wouldn't need this switch if BookFilters.BookCategoryFilter were - // public... - switch (bc) { - case BIBLE: - f = BookFilters.getBibles(); - break; - case COMMENTARY: - f = BookFilters.getCommentaries(); - break; - case DAILY_DEVOTIONS: - f = BookFilters.getDailyDevotionals(); - break; - case DICTIONARY: - f = BookFilters.getDictionaries(); - break; - case GENERAL_BOOK: - f = BookFilters.getGeneralBooks(); - break; - case GLOSSARY: - f = BookFilters.getGlossaries(); - break; - case MAPS: - f = BookFilters.getMaps(); - break; - default: - // DownloadManager takes care of accepting a null value - f = null; - break; - } DownloadManager dm = DownloadManager.getInstance(); - EventBus downloadBus = dm.getDownloadBus(); - downloadBus.registerSticky(this); - - refreshDialog = new ProgressDialog(getActivity()); - refreshDialog.setMessage("Refreshing available modules..."); - refreshDialog.setCancelable(false); - refreshDialog.show(); + EventBookList bookList = dm.getDownloadBus().getStickyEvent(EventBookList.class); + if (bookList == null) { + dm.getDownloadBus().registerSticky(this); + refreshDialog = new ProgressDialog(getActivity()); + refreshDialog.setMessage("Refreshing available modules..."); + refreshDialog.setCancelable(false); + refreshDialog.show(); + } else { + displayBooks(bookList.getBookList()); + } } - + + /* + Used by GreenRobot for notifying us that the book refresh is complete + */ + @SuppressWarnings("unused") public void onEventMainThread(EventBookList event) { if (refreshDialog != null) { refreshDialog.cancel(); } - tv.setText(event.getBookList().get(0).getName()); + displayBooks(event.getBookList()); } + public void displayBooks(List bookList) { + try { + BookFilter f = FilterUtil.filterFromCategory(bookCategory); + List filteredBooks = FilterUtil.applyFilter(bookList, f); + tv.setText(filteredBooks.get(0).getName()); + } catch (FilterUtil.InvalidFilterCategoryMappingException e) { + // To be honest, there should be no reason you end up here. + Log.e(TAG, e.getMessage()); + } + + } + private class DownloadDialogListener implements DialogInterface.OnClickListener { @Override diff --git a/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/DownloadActivity.java b/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/DownloadActivity.java index 8789b59..128c599 100644 --- a/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/DownloadActivity.java +++ b/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/DownloadActivity.java @@ -47,7 +47,7 @@ public class DownloadActivity extends BaseActivity implements fragmentManager .beginTransaction() .replace(R.id.container, - BookListFragment.newInstance(DownloadManager.VALID_CATEGORIES[position])).commit(); + BookListFragment_.builder().bookCategory(DownloadManager.VALID_CATEGORIES[position]).build()).commit(); } public void onSectionAttached(String category) { diff --git a/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/DownloadManager.java b/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/DownloadManager.java index e6fc180..c96a20c 100644 --- a/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/DownloadManager.java +++ b/MinimalBible/src/org/bspeice/minimalbible/activities/downloader/DownloadManager.java @@ -1,13 +1,16 @@ package org.bspeice.minimalbible.activities.downloader; -import java.util.Map; +import android.util.Log; import org.bspeice.minimalbible.MinimalBible; import org.crosswire.jsword.book.BookCategory; +import org.crosswire.jsword.book.BookFilter; +import org.crosswire.jsword.book.BookFilters; import org.crosswire.jsword.book.install.InstallManager; import org.crosswire.jsword.book.install.Installer; -import android.util.Log; +import java.util.Map; + import de.greenrobot.event.EventBus; public class DownloadManager { @@ -18,7 +21,7 @@ public class DownloadManager { public static final BookCategory[] VALID_CATEGORIES = { BookCategory.BIBLE, BookCategory.COMMENTARY, BookCategory.DICTIONARY, - BookCategory.IMAGES, BookCategory.MAPS }; + BookCategory.MAPS }; public static DownloadManager getInstance() { if (instance == null) {