javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Bugfixes in download manager and other minor changes

Browse Source
This commit is contained in:
inorichi
2015-11-06 20:22:01 +01:00
parent d3a32da62c
commit 17c60644dd
10 changed files with 205 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/mangafeed/ui/fragment/LibraryFragment.java
+4 -8
View File
@@ -21,7 +21,6 @@ import eu.kanade.mangafeed.R;
import eu.kanade.mangafeed.data.models.Manga;
import eu.kanade.mangafeed.data.services.LibraryUpdateService;
import eu.kanade.mangafeed.presenter.LibraryPresenter;
import eu.kanade.mangafeed.ui.activity.MainActivity;
import eu.kanade.mangafeed.ui.activity.MangaDetailActivity;
import eu.kanade.mangafeed.ui.adapter.LibraryAdapter;
import eu.kanade.mangafeed.ui.fragment.base.BaseRxFragment;
@@ -31,7 +30,6 @@ import nucleus.factory.RequiresPresenter;
public class LibraryFragment extends BaseRxFragment<LibraryPresenter> {
@Bind(R.id.gridView) GridView grid;
private MainActivity activity;
private LibraryAdapter adapter;
public static LibraryFragment newInstance() {
@@ -45,8 +43,6 @@ public class LibraryFragment extends BaseRxFragment<LibraryPresenter> {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
activity = (MainActivity)getActivity();
}
@Override
@@ -54,7 +50,7 @@ public class LibraryFragment extends BaseRxFragment<LibraryPresenter> {
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_library, container, false);
activity.setToolbarTitle(getString(R.string.library_title));
setToolbarTitle(getString(R.string.library_title));
ButterKnife.bind(this, view);
createAdapter();
@@ -73,9 +69,9 @@ public class LibraryFragment extends BaseRxFragment<LibraryPresenter> {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_refresh:
if (!LibraryUpdateService.isRunning(activity)) {
Intent intent = LibraryUpdateService.getStartIntent(activity);
activity.startService(intent);
if (!LibraryUpdateService.isRunning(getActivity())) {
Intent intent = LibraryUpdateService.getStartIntent(getActivity());
getActivity().startService(intent);
}
return true;
app/src/main/java/eu/kanade/mangafeed/ui/fragment/MangaChaptersFragment.java
+1 -2
View File
@@ -131,8 +131,7 @@ public class MangaChaptersFragment extends BaseRxFragment<MangaChaptersPresenter
getPresenter().markChaptersRead(getSelectedChapters(), false);
return true;
case R.id.action_download:
Intent intent = DownloadService.getStartIntent(getActivity());
getActivity().startService(intent);
DownloadService.start(getActivity());
getPresenter().downloadChapters(getSelectedChapters());
closeActionMode();
return true;
app/src/main/java/eu/kanade/mangafeed/ui/fragment/SourceFragment.java
+2 -8
View File
@@ -26,19 +26,12 @@ public class SourceFragment extends BaseRxFragment<SourcePresenter> {
@Bind(R.id.catalogue_list) ListView source_list;
private MainActivity activity;
private EasyAdapter<Source> adapter;
public static SourceFragment newInstance() {
return new SourceFragment();
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
activity = (MainActivity)getActivity();
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
@@ -56,6 +49,7 @@ public class SourceFragment extends BaseRxFragment<SourcePresenter> {
@OnItemClick(R.id.catalogue_list)
public void onSourceClick(int position) {
Source source = adapter.getItem(position);
MainActivity activity = (MainActivity) getActivity();
if (getPresenter().isValidSource(source)) {
CatalogueFragment fragment = CatalogueFragment.newInstance(source.getSourceId());
@@ -66,7 +60,7 @@ public class SourceFragment extends BaseRxFragment<SourcePresenter> {
}
private void createAdapter() {
adapter = new EasyAdapter<>(activity, SourceHolder.class);
adapter = new EasyAdapter<>(getActivity(), SourceHolder.class);
source_list.setAdapter(adapter);
}
app/src/main/java/eu/kanade/mangafeed/ui/fragment/base/BaseFragment.java
+6 -2
View File
@@ -7,11 +7,15 @@ import eu.kanade.mangafeed.ui.activity.base.BaseActivity;
public class BaseFragment extends Fragment {
public void setToolbarTitle(String title) {
((BaseActivity)getActivity()).setToolbarTitle(title);
getBaseActivity().setToolbarTitle(title);
}
public void setToolbarTitle(int resourceId) {
((BaseActivity)getActivity()).setToolbarTitle(getString(resourceId));
getBaseActivity().setToolbarTitle(getString(resourceId));
}
public BaseActivity getBaseActivity() {
return (BaseActivity) getActivity();
}
}