mirror-github-minimalbible/MinimalBible
1
0
Fork 0
mirror of https://github.com/MinimalBible/MinimalBible synced 2024-12-22 14:48:23 -05:00
Code Issues Releases Wiki Activity

Remove a static field

Browse Source 
Because dependency injection
This commit is contained in:
Bradlee Speice 2014-07-07 23:13:25 -04:00
parent d6951fcc9f
commit a15e78978b
4 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/bspeice/minimalbible/activity/downloader/DownloadActivity.java
View File

@ -12,7 +12,12 @@ import org.bspeice.minimalbible.MinimalBible;
import org.bspeice.minimalbible.R;
import org.bspeice.minimalbible.activity.BaseActivity;
import org.bspeice.minimalbible.activity.BaseNavigationDrawerFragment;
import org.bspeice.minimalbible.activity.downloader.manager.DownloadManager;
import org.crosswire.jsword.book.BookCategory;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import dagger.ObjectGraph;
@ -32,6 +37,9 @@ public class DownloadActivity extends BaseActivity implements
*/
private CharSequence mTitle;
@Inject @Named("ValidCategories")
List<BookCategory> validCategories;
private ObjectGraph daObjectGraph;
/**
@ -42,6 +50,7 @@ public class DownloadActivity extends BaseActivity implements
daObjectGraph = MinimalBible.get(this)
.plus(new DownloadActivityModules(this));
}
daObjectGraph.inject(this);
}
@Override
@ -53,6 +62,7 @@ public class DownloadActivity extends BaseActivity implements
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
buildObjGraph();
setContentView(R.layout.activity_download);
mNavigationDrawerFragment = (DownloadNavDrawerFragment) getSupportFragmentManager()
@ -72,7 +82,7 @@ public class DownloadActivity extends BaseActivity implements
fragmentManager
.beginTransaction()
.replace(R.id.container,
BookListFragment.newInstance(DownloadManager.VALID_CATEGORIES[position])).commit();
BookListFragment.newInstance(validCategories.get(position))).commit();
}
public void onSectionAttached(String category) {

21
app/src/main/java/org/bspeice/minimalbible/activity/downloader/DownloadActivityModules.java
View File

@ -4,7 +4,13 @@ import org.bspeice.minimalbible.MinimalBibleModules;
import org.bspeice.minimalbible.activity.downloader.manager.BookDownloadManager;
import org.bspeice.minimalbible.activity.downloader.manager.BookDownloadThread;
import org.bspeice.minimalbible.activity.downloader.manager.RefreshManager;
import org.crosswire.jsword.book.BookCategory;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Named;
import javax.inject.Qualifier;
import javax.inject.Singleton;
import dagger.Module;
@ -20,7 +26,9 @@ import de.devland.esperandro.Esperandro;
BookItemHolder.class,
BookDownloadManager.class,
BookDownloadThread.class,
RefreshManager.class
RefreshManager.class,
DownloadNavDrawerFragment.class,
DownloadActivity.class
},
addsTo = MinimalBibleModules.class
)
@ -45,4 +53,15 @@ public class DownloadActivityModules {
BookDownloadManager provideBookDownloadManager() {
return new BookDownloadManager(activity);
}
@Provides @Singleton
@Named("ValidCategories")
List<BookCategory> provideValidCategories() {
return new ArrayList<BookCategory>() {{
add(BookCategory.BIBLE);
add(BookCategory.COMMENTARY);
add(BookCategory.DICTIONARY);
add(BookCategory.MAPS);
}};
}
}

26
app/src/main/java/org/bspeice/minimalbible/activity/downloader/DownloadNavDrawerFragment.java
View File

@ -10,13 +10,24 @@ import android.widget.ListView;
import org.bspeice.minimalbible.R;
import org.bspeice.minimalbible.activity.BaseNavigationDrawerFragment;
import org.bspeice.minimalbible.activity.downloader.manager.DownloadManager;
import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.book.BookCategory;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
public class DownloadNavDrawerFragment extends BaseNavigationDrawerFragment {
@Inject @Named("ValidCategories")
List<BookCategory> validCategories;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
((DownloadActivity)getActivity()).inject(this);
mDrawerListView = (ListView) inflater.inflate(
R.layout.fragment_navigation_drawer, container, false);
mDrawerListView
@ -27,15 +38,10 @@ public class DownloadNavDrawerFragment extends BaseNavigationDrawerFragment {
selectItem(position);
}
});
String[] sCategories = new String[DownloadManager.VALID_CATEGORIES.length];
for (int i = 0; i < DownloadManager.VALID_CATEGORIES.length; i++) {
sCategories[i] = DownloadManager.VALID_CATEGORIES[i].toString();
}
mDrawerListView.setAdapter(new ArrayAdapter<String>(getActionBar()
mDrawerListView.setAdapter(new ArrayAdapter<BookCategory>(getActionBar()
.getThemedContext(), android.R.layout.simple_list_item_1,
android.R.id.text1, sCategories));
android.R.id.text1, validCategories));
mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
return mDrawerListView;
}

14
app/src/main/java/org/bspeice/minimalbible/activity/downloader/manager/DownloadManager.java
View File

@ -1,14 +0,0 @@
package org.bspeice.minimalbible.activity.downloader.manager;
import org.crosswire.jsword.book.BookCategory;
// TODO: Listen to BookInstall events?
public class DownloadManager {
private final String TAG = "DownloadManager";
// TODO: Inject this, don't have any static references
public static final BookCategory[] VALID_CATEGORIES = { BookCategory.BIBLE,
BookCategory.COMMENTARY, BookCategory.DICTIONARY,
BookCategory.MAPS };
}