Use EventBus

This commit is contained in:
inorichi
2015-10-18 01:22:05 +02:00
parent 1802dd04e4
commit a52e33b628
6 changed files with 70 additions and 84 deletions
@@ -23,27 +23,20 @@ import nucleus.factory.RequiresPresenter;
@RequiresPresenter(MangaDetailPresenter.class)
public class MangaDetailActivity extends BaseActivity<MangaDetailPresenter> {
@Bind(R.id.toolbar)
Toolbar toolbar;
@Bind(R.id.tabs)
TabLayout tabs;
@Bind(R.id.viewpager)
ViewPager view_pager;
@Bind(R.id.toolbar) Toolbar toolbar;
@Bind(R.id.tabs) TabLayout tabs;
@Bind(R.id.viewpager) ViewPager view_pager;
private MangaDetailAdapter adapter;
private long manga_id;
private boolean is_online = false;
private boolean is_online;
public final static String MANGA_ID = "manga_id";
public final static String MANGA_TITLE = "manga_title";
public final static String MANGA_ONLINE = "manga_online";
public static Intent newIntent(Context context, Manga manga) {
Intent intent = new Intent(context, MangaDetailActivity.class);
intent.putExtra(MANGA_ID, manga.id);
intent.putExtra(MANGA_TITLE, manga.title);
return intent;
}
@@ -58,9 +51,6 @@ public class MangaDetailActivity extends BaseActivity<MangaDetailPresenter> {
Intent intent = getIntent();
String manga_title = intent.getStringExtra(MANGA_TITLE);
setToolbarTitle(manga_title);
manga_id = intent.getLongExtra(MANGA_ID, -1);
is_online = intent.getBooleanExtra(MANGA_ONLINE, false);
@@ -90,9 +80,8 @@ public class MangaDetailActivity extends BaseActivity<MangaDetailPresenter> {
return manga_id;
}
public void onMangaNext(Manga manga) {
((MangaChaptersFragment) adapter.getItem(MangaDetailAdapter.CHAPTERS_FRAGMENT))
.onMangaNext(manga);
public void setManga(Manga manga) {
setToolbarTitle(manga.title);
}
class MangaDetailAdapter extends FragmentPagerAdapter {
@@ -124,9 +113,9 @@ public class MangaDetailActivity extends BaseActivity<MangaDetailPresenter> {
public Fragment getItem(int position) {
switch (position) {
case INFO_FRAGMENT:
return MangaInfoFragment.newInstance(manga_id);
return MangaInfoFragment.newInstance();
case CHAPTERS_FRAGMENT:
return MangaChaptersFragment.newInstance(manga_id);
return MangaChaptersFragment.newInstance();
default:
return null;
@@ -17,12 +17,9 @@ import butterknife.Bind;
import butterknife.ButterKnife;
import eu.kanade.mangafeed.R;
import eu.kanade.mangafeed.data.models.Chapter;
import eu.kanade.mangafeed.data.models.Manga;
import eu.kanade.mangafeed.presenter.MangaChaptersPresenter;
import eu.kanade.mangafeed.ui.activity.MangaDetailActivity;
import eu.kanade.mangafeed.ui.adapter.ChapterListHolder;
import nucleus.factory.RequiresPresenter;
import timber.log.Timber;
import uk.co.ribot.easyadapter.EasyRecyclerAdapter;
@RequiresPresenter(MangaChaptersPresenter.class)
@@ -30,24 +27,16 @@ public class MangaChaptersFragment extends BaseFragment<MangaChaptersPresenter>
@Bind(R.id.chapter_list) RecyclerView chapters;
private long manga_id;
private Manga manga;
private EasyRecyclerAdapter<Chapter> adapter;
public static Fragment newInstance(long manga_id) {
MangaChaptersFragment fragment = new MangaChaptersFragment();
Bundle args = new Bundle();
args.putLong(MangaDetailActivity.MANGA_ID, manga_id);
fragment.setArguments(args);
return fragment;
public static Fragment newInstance() {
return new MangaChaptersFragment();
}
@Override
public void onCreate(Bundle savedState) {
super.onCreate(savedState);
setHasOptionsMenu(true);
manga_id = getArguments().getLong(MangaDetailActivity.MANGA_ID);
}
@Override
@@ -73,7 +62,7 @@ public class MangaChaptersFragment extends BaseFragment<MangaChaptersPresenter>
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_refresh:
getPresenter().refreshChapters(manga);
getPresenter().refreshChapters();
break;
}
return super.onOptionsItemSelected(item);
@@ -84,19 +73,8 @@ public class MangaChaptersFragment extends BaseFragment<MangaChaptersPresenter>
chapters.setAdapter(adapter);
}
public long getMangaId() {
return manga_id;
}
public Manga getManga() {
return manga;
}
public void onNextChapters(List<Chapter> chapters) {
adapter.setItems(chapters);
}
public void onMangaNext(Manga manga) {
this.manga = manga;
}
}
@@ -15,7 +15,6 @@ import butterknife.ButterKnife;
import eu.kanade.mangafeed.R;
import eu.kanade.mangafeed.data.models.Manga;
import eu.kanade.mangafeed.presenter.MangaInfoPresenter;
import eu.kanade.mangafeed.ui.activity.MangaDetailActivity;
import nucleus.factory.RequiresPresenter;
@RequiresPresenter(MangaInfoPresenter.class)
@@ -29,20 +28,13 @@ public class MangaInfoFragment extends BaseFragment<MangaInfoPresenter> {
@Bind(R.id.manga_summary) TextView mDescription;
@Bind(R.id.manga_cover) ImageView mCover;
private long manga_id;
public static MangaInfoFragment newInstance(long manga_id) {
MangaInfoFragment fragment = new MangaInfoFragment();
Bundle args = new Bundle();
args.putLong(MangaDetailActivity.MANGA_ID, manga_id);
fragment.setArguments(args);
return fragment;
public static MangaInfoFragment newInstance() {
return new MangaInfoFragment();
}
@Override
public void onCreate(Bundle savedState) {
super.onCreate(savedState);
manga_id = getArguments().getLong(MangaDetailActivity.MANGA_ID);
}
@Override
@@ -55,10 +47,6 @@ public class MangaInfoFragment extends BaseFragment<MangaInfoPresenter> {
return view;
}
public long getMangaId() {
return manga_id;
}
public void setMangaInfo(Manga manga) {
mArtist.setText(manga.artist);
mAuthor.setText(manga.author);