Allow to create/remove categories. Some refactoring.

app/src/main/java/eu/kanade/mangafeed/ui/library/LibraryCategoryFragment.java

@@ -14,15 +14,11 @@ import com.f2prateek.rx.preferences.Preference;
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import butterknife.Bind;
 import butterknife.ButterKnife;
-import eu.kanade.mangafeed.App;
 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.preference.PreferencesHelper;
 import eu.kanade.mangafeed.event.LibraryMangasEvent;
 import eu.kanade.mangafeed.ui.base.activity.BaseActivity;
 import eu.kanade.mangafeed.ui.base.adapter.FlexibleViewHolder;
@@ -37,8 +33,6 @@ import rx.Subscription;
 public class LibraryCategoryFragment extends BaseFragment implements
         ActionMode.Callback, FlexibleViewHolder.OnListItemClickListener {
 
-    @Inject PreferencesHelper preferences;
-
     @Bind(R.id.library_mangas) AutofitRecyclerView recycler;
 
     @State Category category;
@@ -47,20 +41,12 @@ public class LibraryCategoryFragment extends BaseFragment implements
 
     private Subscription numColumnsSubscription;
 
-    private static final int INVALID_POSITION = -1;
-
     public static LibraryCategoryFragment newInstance(Category category) {
         LibraryCategoryFragment fragment = new LibraryCategoryFragment();
         fragment.category = category;
         return fragment;
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        App.get(getActivity()).getComponent().inject(this);
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
         // Inflate the layout for this fragment
@@ -75,8 +61,8 @@ public class LibraryCategoryFragment extends BaseFragment implements
 
         Preference<Integer> columnsPref = getResources().getConfiguration()
                 .orientation == Configuration.ORIENTATION_PORTRAIT ?
-                preferences.portraitColumns() :
-                preferences.landscapeColumns();
+                getLibraryPresenter().preferences.portraitColumns() :
+                getLibraryPresenter().preferences.landscapeColumns();
 
         numColumnsSubscription = columnsPref.asObservable()
                 .subscribe(recycler::setSpanCount);
@@ -110,6 +96,7 @@ public class LibraryCategoryFragment extends BaseFragment implements
 
     @EventBusHook
     public void onEventMainThread(LibraryMangasEvent event) {
+        destroyActionModeIfNeeded();
         setMangas(event.getMangas().get(category.id));
     }
 
@@ -128,7 +115,7 @@ public class LibraryCategoryFragment extends BaseFragment implements
 
     @Override
     public boolean onListItemClick(int position) {
-        if (actionMode != null && position != INVALID_POSITION) {
+        if (actionMode != null && position != -1) {
             toggleSelection(position);
             return true;
         } else {
@@ -145,6 +132,22 @@ public class LibraryCategoryFragment extends BaseFragment implements
         toggleSelection(position);
     }
 
+    private void toggleSelection(int position) {
+        adapter.toggleSelection(position, false);
+
+        int count = adapter.getSelectedItemCount();
+        if (count == 0) {
+            actionMode.finish();
+        } else {
+            setContextTitle(count);
+            actionMode.invalidate();
+        }
+    }
+
+    private void setContextTitle(int count) {
+        actionMode.setTitle(getString(R.string.label_selected, count));
+    }
+
     @Override
     public boolean onCreateActionMode(ActionMode mode, Menu menu) {
         mode.getMenuInflater().inflate(R.menu.library_selection, menu);
@@ -169,19 +172,17 @@ public class LibraryCategoryFragment extends BaseFragment implements
         actionMode = null;
     }
 
-    private void toggleSelection(int position) {
-        adapter.toggleSelection(position, false);
-
-        int count = adapter.getSelectedItemCount();
-        if (count == 0) {
+    public void destroyActionModeIfNeeded() {
+        if (actionMode != null) {
             actionMode.finish();
-        } else {
-            setContextTitle(count);
-            actionMode.invalidate();
         }
     }
 
-    private void setContextTitle(int count) {
-        actionMode.setTitle(getString(R.string.selected_chapters_title, count));
+    private LibraryFragment getLibraryFragment() {
+        return (LibraryFragment) getParentFragment();
+    }
+
+    private LibraryPresenter getLibraryPresenter() {
+        return getLibraryFragment().getPresenter();
     }
 }

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -21,6 +22,7 @@ import eu.kanade.mangafeed.R;
 import eu.kanade.mangafeed.data.database.models.Category;
 import eu.kanade.mangafeed.data.sync.LibraryUpdateService;
 import eu.kanade.mangafeed.ui.base.fragment.BaseRxFragment;
+import eu.kanade.mangafeed.ui.library.category.CategoryFragment;
 import eu.kanade.mangafeed.ui.main.MainActivity;
 import nucleus.factory.RequiresPresenter;
 
@@ -82,12 +84,20 @@ public class LibraryFragment extends BaseRxFragment<LibraryPresenter> {
                     getActivity().startService(intent);
                 }
 
+                return true;
+            case R.id.action_edit_categories:
+                onEditCategories();
                 return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
+    private void onEditCategories() {
+        Fragment fragment = CategoryFragment.newInstance();
+        ((MainActivity) getActivity()).pushFragment(fragment);
+    }
+
     public void onNextCategories(List<Category> categories) {
         List<Category> actualCategories = new ArrayList<>();
 

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

@@ -11,21 +11,25 @@ import javax.inject.Inject;
 import de.greenrobot.event.EventBus;
 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;
 import eu.kanade.mangafeed.event.LibraryMangasEvent;
 import eu.kanade.mangafeed.ui.base.presenter.BasePresenter;
 import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
 public class LibraryPresenter extends BasePresenter<LibraryFragment> {
 
     @Inject DatabaseHelper db;
-    @Inject PreferencesHelper prefs;
+    @Inject PreferencesHelper preferences;
     @Inject CoverCache coverCache;
     @Inject SourceManager sourceManager;
 
+    protected List<Category> categories;
+
     private static final int GET_CATEGORIES = 1;
 
     @Override
@@ -33,7 +37,7 @@ public class LibraryPresenter extends BasePresenter<LibraryFragment> {
         super.onCreate(savedState);
 
         restartableLatestCache(GET_CATEGORIES,
-                () -> db.getCategories().createObservable(),
+                this::getCategoriesObservable,
                 LibraryFragment::onNextCategories);
 
         start(GET_CATEGORIES);
@@ -41,9 +45,16 @@ public class LibraryPresenter extends BasePresenter<LibraryFragment> {
         add(getLibraryMangasObservable()
                 .subscribe(mangas ->
                         EventBus.getDefault().postSticky(new LibraryMangasEvent(mangas))));
+
     }
 
-    public Observable<Map<Integer, List<Manga>>> getLibraryMangasObservable() {
+    public Observable<List<Category>> getCategoriesObservable() {
+        return db.getCategories().createObservable()
+                .doOnNext(categories -> this.categories = categories)
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    private Observable<Map<Integer, List<Manga>>> getLibraryMangasObservable() {
         return db.getLibraryMangas().createObservable()
                 .flatMap(mangas -> Observable.from(mangas)
                         .groupBy(manga -> manga.category)

app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryAdapter.java

@@ -0,0 +1,60 @@
+package eu.kanade.mangafeed.ui.library.category;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.amulyakhare.textdrawable.util.ColorGenerator;
+
+import java.util.List;
+
+import eu.davidea.flexibleadapter.FlexibleAdapter;
+import eu.kanade.mangafeed.R;
+import eu.kanade.mangafeed.data.database.models.Category;
+
+public class CategoryAdapter extends FlexibleAdapter<CategoryHolder, Category> {
+    
+    private CategoryFragment fragment;
+    private ColorGenerator generator;
+
+    public CategoryAdapter(CategoryFragment fragment) {
+        this.fragment = fragment;
+        setHasStableIds(true);
+        generator = ColorGenerator.DEFAULT;
+    }
+
+    public void setItems(List<Category> items) {
+        mItems = items;
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return mItems.get(position).id;
+    }
+
+    @Override
+    public void updateDataSet(String param) {
+        
+    }
+
+    @Override
+    public CategoryHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(fragment.getActivity());
+        View v = inflater.inflate(R.layout.item_edit_categories, parent, false);
+        return new CategoryHolder(v, this, fragment);
+    }
+
+    @Override
+    public void onBindViewHolder(CategoryHolder holder, int position) {
+        final Category category = getItem(position);
+        holder.onSetValues(category, generator);
+
+        //When user scrolls this bind the correct selection status
+        holder.itemView.setActivated(isSelected(position));
+    }
+
+    public ColorGenerator getColorGenerator() {
+        return generator;
+    }
+}

app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryFragment.java

@@ -0,0 +1,150 @@
+package eu.kanade.mangafeed.ui.library.category;
+
+import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.v4.content.res.ResourcesCompat;
+import android.support.v7.view.ActionMode;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.afollestad.materialdialogs.MaterialDialog;
+
+import java.util.List;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import eu.kanade.mangafeed.R;
+import eu.kanade.mangafeed.data.database.models.Category;
+import eu.kanade.mangafeed.ui.base.activity.BaseActivity;
+import eu.kanade.mangafeed.ui.base.adapter.FlexibleViewHolder;
+import eu.kanade.mangafeed.ui.base.fragment.BaseRxFragment;
+import eu.kanade.mangafeed.ui.decoration.DividerItemDecoration;
+import eu.kanade.mangafeed.ui.library.LibraryCategoryAdapter;
+import nucleus.factory.RequiresPresenter;
+import rx.Observable;
+
+@RequiresPresenter(CategoryPresenter.class)
+public class CategoryFragment extends BaseRxFragment<CategoryPresenter>
+        implements ActionMode.Callback, FlexibleViewHolder.OnListItemClickListener {
+
+    @Bind(R.id.categories_list) RecyclerView recycler;
+    @Bind(R.id.fab) FloatingActionButton fab;
+
+    private CategoryAdapter adapter;
+    private ActionMode actionMode;
+
+    public static CategoryFragment newInstance() {
+        return new CategoryFragment();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
+        View view = inflater.inflate(R.layout.fragment_edit_categories, container, false);
+        ButterKnife.bind(this, view);
+
+        setToolbarTitle(R.string.action_edit_categories);
+
+        adapter = new CategoryAdapter(this);
+        recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+        recycler.setHasFixedSize(true);
+        recycler.setAdapter(adapter);
+        recycler.addItemDecoration(new DividerItemDecoration(
+                ResourcesCompat.getDrawable(getResources(), R.drawable.line_divider, null)));
+
+        fab.setOnClickListener(v -> {
+            new MaterialDialog.Builder(getActivity())
+                    .title(R.string.action_add_category)
+                    .input(R.string.name, 0, false, (dialog, input) -> {
+                        getPresenter().createCategory(input.toString());
+                    }).show();
+        });
+
+        return view;
+    }
+
+    public void setCategories(List<Category> categories) {
+        destroyActionModeIfNeeded();
+        adapter.setItems(categories);
+    }
+
+    private List<Category> getSelectedCategories() {
+        // Create a blocking copy of the selected categories
+        return Observable.from(adapter.getSelectedItems())
+                .map(adapter::getItem).toList().toBlocking().single();
+    }
+
+    @Override
+    public boolean onListItemClick(int position) {
+        if (actionMode != null && position != -1) {
+            toggleSelection(position);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public void onListItemLongClick(int position) {
+        if (actionMode == null)
+            actionMode = ((BaseActivity) getActivity()).startSupportActionMode(this);
+
+        toggleSelection(position);
+    }
+
+    private void toggleSelection(int position) {
+        adapter.toggleSelection(position, false);
+
+        int count = adapter.getSelectedItemCount();
+        if (count == 0) {
+            actionMode.finish();
+        } else {
+            setContextTitle(count);
+            actionMode.invalidate();
+        }
+    }
+
+    private void setContextTitle(int count) {
+        actionMode.setTitle(getString(R.string.label_selected, count));
+    }
+
+    @Override
+    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+        mode.getMenuInflater().inflate(R.menu.category_selection, menu);
+        adapter.setMode(LibraryCategoryAdapter.MODE_MULTI);
+        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().deleteCategories(getSelectedCategories());
+                return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void onDestroyActionMode(ActionMode mode) {
+        adapter.setMode(LibraryCategoryAdapter.MODE_SINGLE);
+        adapter.clearSelection();
+        actionMode = null;
+    }
+
+    public void destroyActionModeIfNeeded() {
+        if (actionMode != null) {
+            actionMode.finish();
+        }
+    }
+
+}

app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryHolder.java

@@ -0,0 +1,45 @@
+package eu.kanade.mangafeed.ui.library.category;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.amulyakhare.textdrawable.TextDrawable;
+import com.amulyakhare.textdrawable.util.ColorGenerator;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import eu.kanade.mangafeed.R;
+import eu.kanade.mangafeed.data.database.models.Category;
+import eu.kanade.mangafeed.ui.base.adapter.FlexibleViewHolder;
+
+public class CategoryHolder extends FlexibleViewHolder {
+
+    private View view;
+
+    @Bind(R.id.image) ImageView image;
+    @Bind(R.id.title) TextView title;
+
+    public CategoryHolder(View view, CategoryAdapter adapter, OnListItemClickListener listener) {
+        super(view, adapter, listener);
+        ButterKnife.bind(this, view);
+        this.view = view;
+    }
+
+    public void onSetValues(Category category, ColorGenerator generator) {
+        title.setText(category.name);
+        image.setImageDrawable(getRound(category.name.substring(0, 1), generator));
+    }
+
+    private TextDrawable getRound(String text, ColorGenerator generator) {
+        return TextDrawable.builder().buildRound(text, generator.getColor(text));
+    }
+
+    @OnClick(R.id.image)
+    void onImageClick() {
+        // Simulate long click on this view to enter selection mode
+        onLongClick(view);
+    }
+
+}

app/src/main/java/eu/kanade/mangafeed/ui/library/category/CategoryPresenter.java

@@ -0,0 +1,39 @@
+package eu.kanade.mangafeed.ui.library.category;
+
+import android.os.Bundle;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import eu.kanade.mangafeed.data.database.DatabaseHelper;
+import eu.kanade.mangafeed.data.database.models.Category;
+import eu.kanade.mangafeed.ui.base.presenter.BasePresenter;
+import rx.android.schedulers.AndroidSchedulers;
+
+public class CategoryPresenter extends BasePresenter<CategoryFragment> {
+
+    @Inject DatabaseHelper db;
+
+    private static final int GET_CATEGORIES = 1;
+
+    @Override
+    protected void onCreate(Bundle savedState) {
+        super.onCreate(savedState);
+
+        restartableLatestCache(GET_CATEGORIES,
+                () -> db.getCategories().createObservable()
+                        .observeOn(AndroidSchedulers.mainThread()),
+                CategoryFragment::setCategories);
+
+        start(GET_CATEGORIES);
+    }
+
+    public void createCategory(String name) {
+        db.insertCategory(Category.create(name)).createObservable().subscribe();
+    }
+
+    public void deleteCategories(List<Category> categories) {
+        db.deleteCategories(categories).createObservable().subscribe();
+    }
+}