DataHearth/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Incomplete changes

Browse Source
This commit is contained in:
inorichi 2015-12-25 17:50:31 +01:00
parent 2aa36ed702
commit e3bc13630d
11 changed files with 241 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java
View File

@ -39,6 +39,7 @@ import eu.kanade.mangafeed.data.database.models.MangaSyncStorIOSQLitePutResolver
import eu.kanade.mangafeed.data.database.resolvers.LibraryMangaGetResolver;
import eu.kanade.mangafeed.data.database.tables.CategoryTable;
import eu.kanade.mangafeed.data.database.tables.ChapterTable;
import eu.kanade.mangafeed.data.database.tables.MangaCategoryTable;
import eu.kanade.mangafeed.data.database.tables.MangaSyncTable;
import eu.kanade.mangafeed.data.database.tables.MangaTable;
import eu.kanade.mangafeed.data.mangasync.base.MangaSyncService;
@ -98,7 +99,7 @@ public class DatabaseHelper {
.listOfObjects(Manga.class)
.withQuery(RawQuery.builder()
.query(LibraryMangaGetResolver.QUERY)
.observesTables(MangaTable.TABLE, ChapterTable.TABLE, CategoryTable.TABLE)
.observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE)
.build())
.withGetResolver(LibraryMangaGetResolver.INSTANCE)
.prepare();

2
app/src/main/java/eu/kanade/mangafeed/data/database/models/Category.java
View File

@ -11,7 +11,7 @@ import eu.kanade.mangafeed.data.database.tables.CategoryTable;
public class Category implements Serializable {
@StorIOSQLiteColumn(name = CategoryTable.COLUMN_ID, key = true)
public Long id;
public Integer id;
@StorIOSQLiteColumn(name = CategoryTable.COLUMN_NAME)
public String name;

2
app/src/main/java/eu/kanade/mangafeed/data/database/models/Manga.java
View File

@ -58,7 +58,7 @@ public class Manga implements Serializable {
public int unread;
public long category;
public int category;
public Manga() {}

2
app/src/main/java/eu/kanade/mangafeed/data/database/models/MangaCategory.java
View File

@ -15,7 +15,7 @@ public class MangaCategory {
public long manga_id;
@StorIOSQLiteColumn(name = MangaCategoryTable.COLUMN_CATEGORY_ID)
public long category_id;
public int category_id;
public MangaCategory() {}

2
app/src/main/java/eu/kanade/mangafeed/data/database/resolvers/LibraryMangaGetResolver.java
View File

@ -53,7 +53,7 @@ public class LibraryMangaGetResolver extends MangaStorIOSQLiteGetResolver {
manga.unread = cursor.getInt(unreadColumn);
int categoryColumn = cursor.getColumnIndex(MangaTable.COLUMN_CATEGORY);
manga.category = cursor.getLong(categoryColumn);
manga.category = cursor.getInt(categoryColumn);
return manga;
}

69
app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryCategoryAdapter.java Normal file
View File

@ -0,0 +1,69 @@
package eu.kanade.mangafeed.ui.library;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import java.util.List;
import java.util.Map;
import eu.kanade.mangafeed.data.database.models.Category;
import eu.kanade.mangafeed.data.database.models.Manga;
import eu.kanade.mangafeed.ui.reader.viewer.common.SmartFragmentStatePagerAdapter;
class LibraryCategoryAdapter extends SmartFragmentStatePagerAdapter {
private LibraryFragment fragment;
private List<Category> categories;
private Map<Integer, List<Manga>> mangas;
public LibraryCategoryAdapter(LibraryFragment fragment, FragmentManager fm) {
super(fm);
this.fragment = fragment;
}
@Override
public Fragment getItem(int position) {
Category category = categories.get(position);
return LibraryCategoryFragment.newInstance(fragment, category,
mangas != null ? mangas.get(category.id) : null);
}
@Override
public int getCount() {
return categories == null ? 0 : categories.size();
}
@Override
public CharSequence getPageTitle(int position) {
return categories.get(position).name;
}
public void setCategories(List<Category> categories) {
this.categories = categories;
notifyDataSetChanged();
}
public void setMangasOnCategories(Map<Integer, List<Manga>> mangas) {
this.mangas = mangas;
for (Map.Entry<Integer, List<Manga>> entry : mangas.entrySet()) {
LibraryCategoryFragment fragment = getFragment(entry.getKey());
if (fragment != null) {
fragment.setMangas(entry.getValue());
}
}
}
@Nullable
public LibraryCategoryFragment getFragment(int categoryId) {
if (categories != null) {
for (int i = 0; i < categories.size(); i++) {
if (categories.get(i).id == categoryId) {
return (LibraryCategoryFragment) getRegisteredFragment(i);
}
}
}
return null;
}
}

75
app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryCategoryFragment.java Normal file
View File

@ -0,0 +1,75 @@
package eu.kanade.mangafeed.ui.library;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.GridView;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnItemClick;
import eu.kanade.mangafeed.R;
import eu.kanade.mangafeed.data.database.models.Category;
import eu.kanade.mangafeed.data.database.models.Manga;
import eu.kanade.mangafeed.ui.base.fragment.BaseFragment;
import eu.kanade.mangafeed.ui.manga.MangaActivity;
public class LibraryCategoryFragment extends BaseFragment {
@Bind(R.id.gridView) GridView grid;
private LibraryFragment parent;
private LibraryAdapter adapter;
private Category category;
private List<Manga> mangas;
public static LibraryCategoryFragment newInstance(LibraryFragment parent, Category category,
List<Manga> mangas) {
LibraryCategoryFragment fragment = new LibraryCategoryFragment();
fragment.initialize(parent, category, mangas);
return fragment;
}
private void initialize(LibraryFragment parent, Category category, List<Manga> mangas) {
this.parent = parent;
this.category = category;
this.mangas = mangas;
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_library_category, container, false);
ButterKnife.bind(this, view);
adapter = new LibraryAdapter(parent);
grid.setAdapter(adapter);
if (mangas != null) {
setMangas(mangas);
}
return view;
}
@OnItemClick(R.id.gridView)
protected void onMangaClick(int position) {
Intent intent = MangaActivity.newIntent(
getActivity(),
adapter.getItem(position)
);
parent.getPresenter().onOpenManga();
getActivity().startActivity(intent);
}
public void setMangas(List<Manga> mangas) {
adapter.setNewItems(mangas);
}
}

106
app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryFragment.java
View File

@ -2,35 +2,34 @@ package eu.kanade.mangafeed.ui.library;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.SearchView;
import android.util.SparseBooleanArray;
import android.view.ActionMode;
import android.support.design.widget.TabLayout;
import android.support.v4.view.ViewPager;
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 android.widget.GridView;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnItemClick;
import eu.kanade.mangafeed.R;
import eu.kanade.mangafeed.data.database.models.Category;
import eu.kanade.mangafeed.data.database.models.Manga;
import eu.kanade.mangafeed.data.sync.LibraryUpdateService;
import eu.kanade.mangafeed.ui.base.fragment.BaseRxFragment;
import eu.kanade.mangafeed.ui.manga.MangaActivity;
import nucleus.factory.RequiresPresenter;
import rx.Observable;
@RequiresPresenter(LibraryPresenter.class)
public class LibraryFragment extends BaseRxFragment<LibraryPresenter> {
@Bind(R.id.gridView) GridView grid;
private LibraryAdapter adapter;
@Bind(R.id.tabs) TabLayout tabs;
@Bind(R.id.view_pager) ViewPager categoriesPager;
private LibraryCategoryAdapter adapter;
public static LibraryFragment newInstance() {
return new LibraryFragment();
@ -50,8 +49,8 @@ public class LibraryFragment extends BaseRxFragment<LibraryPresenter> {
setToolbarTitle(getString(R.string.label_library));
ButterKnife.bind(this, view);
createAdapter();
setMangaLongClickListener();
adapter = new LibraryCategoryAdapter(this, getChildFragmentManager());
categoriesPager.setAdapter(adapter);
return view;
}
@ -59,7 +58,6 @@ public class LibraryFragment extends BaseRxFragment<LibraryPresenter> {
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.library, menu);
initializeSearch(menu);
}
@Override
@ -77,83 +75,21 @@ public class LibraryFragment extends BaseRxFragment<LibraryPresenter> {
return super.onOptionsItemSelected(item);
}
private void initializeSearch(Menu menu) {
final SearchView sv = (SearchView) menu.findItem(R.id.action_search).getActionView();
sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String query) {
return true;
}
@Override
public boolean onQueryTextChange(String newText) {
adapter.getFilter().filter(newText);
return true;
}
});
public void onNextMangas(Map<Integer, List<Manga>> mangas) {
adapter.setMangasOnCategories(mangas);
}
private void createAdapter() {
adapter = new LibraryAdapter(this);
grid.setAdapter(adapter);
}
public void onNextCategories(List<Category> categories) {
List<Category> actualCategories = new ArrayList<>();
public void onNextMangas(List<Manga> mangas) {
adapter.setNewItems(mangas);
}
// TODO should we always add this?
Category defaultCat = Category.create("Default");
defaultCat.id = 0;
actualCategories.add(defaultCat);
@OnItemClick(R.id.gridView)
protected void onMangaClick(int position) {
Intent intent = MangaActivity.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) {
mode.setTitle(getResources().getString(R.string.library_selection_title)
+ ": " + grid.getCheckedItemCount());
}
@Override
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
MenuInflater inflater = mode.getMenuInflater();
inflater.inflate(R.menu.library_selection, menu);
return true;
}
@Override
public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
return false;
}
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
switch (item.getItemId()) {
case R.id.action_delete:
getPresenter().deleteMangas(getSelectedMangas());
mode.finish();
return true;
}
return false;
}
@Override
public void onDestroyActionMode(ActionMode mode) {
}
});
}
private Observable<Manga> getSelectedMangas() {
SparseBooleanArray checkedItems = grid.getCheckedItemPositions();
return Observable.range(0, checkedItems.size())
.map(checkedItems::keyAt)
.map(adapter::getItem);
actualCategories.addAll(categories);
adapter.setCategories(actualCategories);
tabs.setupWithViewPager(categoriesPager);
}
}

33
app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryPresenter.java
View File

@ -10,6 +10,7 @@ import javax.inject.Inject;
import eu.kanade.mangafeed.data.cache.CoverCache;
import eu.kanade.mangafeed.data.database.DatabaseHelper;
import eu.kanade.mangafeed.data.database.models.Category;
import eu.kanade.mangafeed.data.database.models.Manga;
import eu.kanade.mangafeed.data.preference.PreferencesHelper;
import eu.kanade.mangafeed.data.source.SourceManager;
@ -25,18 +26,31 @@ public class LibraryPresenter extends BasePresenter<LibraryFragment> {
@Inject CoverCache coverCache;
@Inject SourceManager sourceManager;
private static final int GET_MANGAS = 1;
private static final int GET_CATEGORIES = 1;
private static final int GET_MANGAS = 2;
@Override
protected void onCreate(Bundle savedState) {
super.onCreate(savedState);
restartableLatestCache(GET_CATEGORIES,
() -> db.getCategories().createObservable(),
LibraryFragment::onNextCategories);
restartableLatestCache(GET_MANGAS,
() -> db.getLibraryMangas().createObservable()
.observeOn(AndroidSchedulers.mainThread()),
this::getLibraryMangasObservable,
LibraryFragment::onNextMangas);
start(GET_MANGAS);
start(GET_CATEGORIES);
}
@Override
protected void onTakeView(LibraryFragment view) {
super.onTakeView(view);
if (!isSubscribed(GET_MANGAS)) {
start(GET_MANGAS);
}
}
public void deleteMangas(Observable<Manga> selectedMangas) {
@ -48,12 +62,17 @@ public class LibraryPresenter extends BasePresenter<LibraryFragment> {
.subscribe());
}
public Observable<Map<Long, List<Manga>>> getLibraryMangasObservable() {
public Observable<Map<Integer, List<Manga>>> getLibraryMangasObservable() {
return db.getLibraryMangas().createObservable()
.flatMap(mangas -> Observable.from(mangas)
.groupBy(manga -> manga.category)
.flatMap(group -> group.toList().map(list -> new Pair<>(group.getKey(), list)))
.toMap(pair -> pair.first, pair -> pair.second));
.flatMap(group -> group.toList()
.map(list -> Pair.create(group.getKey(), list)))
.toMap(pair -> pair.first, pair -> pair.second))
.observeOn(AndroidSchedulers.mainThread());
}
public void onOpenManga() {
stop(GET_MANGAS);
}
}

41
app/src/main/res/layout/fragment_library.xml
View File

@ -1,13 +1,32 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<GridView
android:id="@+id/gridView"
style="@style/AppTheme.GridView"
android:choiceMode="multipleChoiceModal"
android:columnWidth="140dp"
tools:listitem="@layout/item_catalogue" />
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppTheme.Dark">
</FrameLayout>
<android.support.design.widget.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppTheme.Dark"
app:tabGravity="fill"
android:background="@color/colorPrimary"
app:tabIndicatorColor="@color/white" />
</android.support.design.widget.AppBarLayout>
<android.support.v4.view.ViewPager
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/view_pager">
</android.support.v4.view.ViewPager>
</LinearLayout>

14
app/src/main/res/layout/fragment_library_category.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<GridView
android:id="@+id/gridView"
style="@style/AppTheme.GridView"
android:choiceMode="multipleChoiceModal"
android:columnWidth="140dp"
tools:listitem="@layout/item_catalogue" />
</FrameLayout>