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

More changes to MangaDetailActivity and its fragments

Browse Source
This commit is contained in:
inorichi
2015-10-17 21:31:10 +02:00
parent c13d747665
commit 1802dd04e4
11 changed files with 249 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/mangafeed/ui/activity/MangaDetailActivity.java
+50 -38
View File
@@ -32,6 +32,7 @@ public class MangaDetailActivity extends BaseActivity<MangaDetailPresenter> {
@Bind(R.id.viewpager)
ViewPager view_pager;
private MangaDetailAdapter adapter;
private long manga_id;
private boolean is_online = false;
@@ -73,59 +74,70 @@ public class MangaDetailActivity extends BaseActivity<MangaDetailPresenter> {
}
private void setupViewPager() {
view_pager.setAdapter(new MangaDetailAdapter(
adapter = new MangaDetailAdapter(
getSupportFragmentManager(),
getActivity(),
manga_id));
manga_id);
view_pager.setAdapter(adapter);
tabs.setupWithViewPager(view_pager);
if (!is_online)
view_pager.setCurrentItem(MangaDetailAdapter.CHAPTERS_FRAGMENT);
}
}
class MangaDetailAdapter extends FragmentPagerAdapter {
final int PAGE_COUNT = 2;
private String tab_titles[];
private Context context;
private long manga_id;
final static int INFO_FRAGMENT = 0;
final static int CHAPTERS_FRAGMENT = 1;
public MangaDetailAdapter(FragmentManager fm, Context context, long manga_id) {
super(fm);
this.context = context;
tab_titles = new String[]{
context.getString(R.string.manga_detail_tab),
context.getString(R.string.manga_chapters_tab)
};
this.manga_id = manga_id;
public long getMangaId() {
return manga_id;
}
@Override
public int getCount() {
return PAGE_COUNT;
public void onMangaNext(Manga manga) {
((MangaChaptersFragment) adapter.getItem(MangaDetailAdapter.CHAPTERS_FRAGMENT))
.onMangaNext(manga);
}
@Override
public Fragment getItem(int position) {
switch (position) {
case INFO_FRAGMENT:
return MangaInfoFragment.newInstance(manga_id);
case CHAPTERS_FRAGMENT:
return MangaChaptersFragment.newInstance(manga_id);
class MangaDetailAdapter extends FragmentPagerAdapter {
default: return null;
final int PAGE_COUNT = 2;
private String tab_titles[];
private Context context;
private long manga_id;
final static int INFO_FRAGMENT = 0;
final static int CHAPTERS_FRAGMENT = 1;
public MangaDetailAdapter(FragmentManager fm, Context context, long manga_id) {
super(fm);
this.context = context;
tab_titles = new String[]{
context.getString(R.string.manga_detail_tab),
context.getString(R.string.manga_chapters_tab)
};
this.manga_id = manga_id;
}
@Override
public int getCount() {
return PAGE_COUNT;
}
@Override
public Fragment getItem(int position) {
switch (position) {
case INFO_FRAGMENT:
return MangaInfoFragment.newInstance(manga_id);
case CHAPTERS_FRAGMENT:
return MangaChaptersFragment.newInstance(manga_id);
default:
return null;
}
}
@Override
public CharSequence getPageTitle(int position) {
// Generate title based on item position
return tab_titles[position];
}
}
@Override
public CharSequence getPageTitle(int position) {
// Generate title based on item position
return tab_titles[position];
}
}
app/src/main/java/eu/kanade/mangafeed/ui/fragment/LibraryFragment.java
+12 -14
View File
@@ -14,6 +14,7 @@ import android.widget.GridView;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnItemClick;
import eu.kanade.mangafeed.R;
import eu.kanade.mangafeed.data.models.Manga;
import eu.kanade.mangafeed.presenter.LibraryPresenter;
@@ -53,7 +54,7 @@ public class LibraryFragment extends BaseFragment<LibraryPresenter> {
ButterKnife.bind(this, view);
createAdapter();
setMangaClickListener();
setMangaLongClickListener();
return view;
}
@@ -80,7 +81,7 @@ public class LibraryFragment extends BaseFragment<LibraryPresenter> {
});
}
public void createAdapter() {
private void createAdapter() {
adapter = new LibraryAdapter<>(getActivity());
grid.setAdapter(adapter);
}
@@ -89,11 +90,16 @@ public class LibraryFragment extends BaseFragment<LibraryPresenter> {
return adapter;
}
public void setMangaClickListener() {
grid.setOnItemClickListener(
(parent, view, position, id) ->
onMangaClick(position)
@OnItemClick(R.id.gridView)
protected void onMangaClick(int position) {
Intent intent = MangaDetailActivity.newIntent(
getActivity(),
adapter.getItem(position)
);
getActivity().startActivity(intent);
}
private void setMangaLongClickListener() {
grid.setMultiChoiceModeListener(new GridView.MultiChoiceModeListener() {
@Override
public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
@@ -131,12 +137,4 @@ public class LibraryFragment extends BaseFragment<LibraryPresenter> {
});
}
private void onMangaClick(int position) {
Intent intent = MangaDetailActivity.newIntent(
getActivity(),
adapter.getItem(position)
);
getActivity().startActivity(intent);
}
}
app/src/main/java/eu/kanade/mangafeed/ui/fragment/MangaChaptersFragment.java
+59
View File
@@ -2,20 +2,37 @@ package eu.kanade.mangafeed.ui.fragment;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import java.util.List;
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)
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();
@@ -28,6 +45,8 @@ public class MangaChaptersFragment extends BaseFragment<MangaChaptersPresenter>
@Override
public void onCreate(Bundle savedState) {
super.onCreate(savedState);
setHasOptionsMenu(true);
manga_id = getArguments().getLong(MangaDetailActivity.MANGA_ID);
}
@@ -38,6 +57,46 @@ public class MangaChaptersFragment extends BaseFragment<MangaChaptersPresenter>
View view = inflater.inflate(R.layout.fragment_manga_chapters, container, false);
ButterKnife.bind(this, view);
chapters.setLayoutManager(new LinearLayoutManager(getActivity()));
createAdapter();
return view;
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.chapters, menu);
super.onCreateOptionsMenu(menu, inflater);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_refresh:
getPresenter().refreshChapters(manga);
break;
}
return super.onOptionsItemSelected(item);
}
private void createAdapter() {
adapter = new EasyRecyclerAdapter<>(getActivity(), ChapterListHolder.class);
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;
}
}