diff --git a/Clover/app/src/main/java/org/floens/chan/core/database/DatabaseManager.java b/Clover/app/src/main/java/org/floens/chan/core/database/DatabaseManager.java index 60149818..85e780dc 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/database/DatabaseManager.java +++ b/Clover/app/src/main/java/org/floens/chan/core/database/DatabaseManager.java @@ -25,6 +25,7 @@ import com.j256.ormlite.stmt.QueryBuilder; import com.j256.ormlite.table.TableUtils; import org.floens.chan.core.model.Board; +import org.floens.chan.core.model.Filter; import org.floens.chan.core.model.History; import org.floens.chan.core.model.Loadable; import org.floens.chan.core.model.Pin; @@ -68,6 +69,8 @@ public class DatabaseManager { private final Object historyLock = new Object(); private final HashMap historyByLoadable = new HashMap<>(); + private final List filters = new ArrayList<>(); + public DatabaseManager(Context context) { helper = new DatabaseHelper(context); initialize(); @@ -281,6 +284,18 @@ public class DatabaseManager { return list; } + public void addFilter(Filter filter) { + filters.add(filter); + } + + public void removeFilter(Filter filter) { + filters.remove(filter); + } + + public List getFilters() { + return filters; + } + /** * Create or updates these boards in the boards table. * diff --git a/Clover/app/src/main/java/org/floens/chan/core/manager/FilterEngine.java b/Clover/app/src/main/java/org/floens/chan/core/manager/FilterEngine.java new file mode 100644 index 00000000..758c7073 --- /dev/null +++ b/Clover/app/src/main/java/org/floens/chan/core/manager/FilterEngine.java @@ -0,0 +1,47 @@ +package org.floens.chan.core.manager; + +import org.floens.chan.core.model.Filter; + +import java.util.ArrayList; +import java.util.List; + +public class FilterEngine { + public enum FilterType { + TRIPCODE(0), + NAME(1), + COMMENT(2), + ID(3), + SUBJECT(4), + FILENAME(5); + + public final int id; + + FilterType(int id) { + this.id = id; + } + + public static FilterType forId(int id) { + for (FilterType type : values()) { + if (type.id == id) { + return type; + } + } + return null; + } + } + + private static final FilterEngine instance = new FilterEngine(); + + public static FilterEngine getInstance() { + return instance; + } + + private List filters = new ArrayList<>(); + + public FilterEngine() { + + } + + public void add(Filter filter) { + } +} diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/Filter.java b/Clover/app/src/main/java/org/floens/chan/core/model/Filter.java new file mode 100644 index 00000000..bf5e1f06 --- /dev/null +++ b/Clover/app/src/main/java/org/floens/chan/core/model/Filter.java @@ -0,0 +1,15 @@ +package org.floens.chan.core.model; + +public class Filter { + public int id; + + public boolean enabled = true; + + public int type; + + public String pattern; + + public String boards; + + public boolean hide = true; +} diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java index f814ab44..a1c6769f 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java @@ -68,7 +68,7 @@ public class BoardEditController extends Controller implements SwipeListener.Cal private RecyclerView recyclerView; private BoardEditAdapter adapter; - private FloatingActionButton done; + private FloatingActionButton add; private List boards; @@ -90,8 +90,8 @@ public class BoardEditController extends Controller implements SwipeListener.Cal view = inflateRes(R.layout.controller_board_edit); recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view); recyclerView.setHasFixedSize(true); - done = (FloatingActionButton) view.findViewById(R.id.done); - done.setOnClickListener(this); + add = (FloatingActionButton) view.findViewById(R.id.add); + add.setOnClickListener(this); boards = boardManager.getSavedBoards(); @@ -131,7 +131,7 @@ public class BoardEditController extends Controller implements SwipeListener.Cal @Override public void onClick(View v) { - if (v == done) { + if (v == add) { showAddBoardDialog(); } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java new file mode 100644 index 00000000..b7105c3b --- /dev/null +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java @@ -0,0 +1,230 @@ +/* + * Clover - 4chan browser https://github.com/Floens/Clover/ + * Copyright (C) 2014 Floens + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.floens.chan.ui.controller; + +import android.content.Context; +import android.content.DialogInterface; +import android.support.design.widget.FloatingActionButton; +import android.support.v7.app.AlertDialog; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import org.floens.chan.Chan; +import org.floens.chan.R; +import org.floens.chan.controller.Controller; +import org.floens.chan.core.database.DatabaseManager; +import org.floens.chan.core.model.Filter; +import org.floens.chan.ui.layout.FilterLayout; +import org.floens.chan.ui.toolbar.ToolbarMenu; +import org.floens.chan.ui.toolbar.ToolbarMenuItem; +import org.floens.chan.ui.view.FloatingMenuItem; + +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +import static org.floens.chan.ui.theme.ThemeHelper.theme; + +public class FiltersController extends Controller implements ToolbarMenuItem.ToolbarMenuItemCallback, RootNavigationController.ToolbarSearchCallback, View.OnClickListener { + private static final int SEARCH_ID = 1; + private static final int CLEAR_ID = 101; + + private DatabaseManager databaseManager; + private RecyclerView recyclerView; + private FloatingActionButton add; + private FilterAdapter adapter; + + public FiltersController(Context context) { + super(context); + } + + @Override + public void onCreate() { + super.onCreate(); + + databaseManager = Chan.getDatabaseManager(); + + navigationItem.title = string(R.string.filters_screen); + navigationItem.menu = new ToolbarMenu(context); + navigationItem.menu.addItem(new ToolbarMenuItem(context, this, SEARCH_ID, R.drawable.ic_search_white_24dp)); + + view = inflateRes(R.layout.controller_filters); + + recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view); + recyclerView.setHasFixedSize(true); + recyclerView.setLayoutManager(new LinearLayoutManager(context)); + + add = (FloatingActionButton) view.findViewById(R.id.add); + add.setOnClickListener(this); + + adapter = new FilterAdapter(); + recyclerView.setAdapter(adapter); + adapter.load(); + } + + @Override + public void onClick(View v) { + if (v == add) { + showFilterDialog(new Filter()); + } + } + + @Override + public void onMenuItemClicked(ToolbarMenuItem item) { + if ((Integer) item.getId() == SEARCH_ID) { + navigationController.showSearch(); + } + } + + @Override + public void onSubMenuItemClicked(ToolbarMenuItem parent, FloatingMenuItem item) { + } + + private void showFilterDialog(Filter filter) { + final FilterLayout filterLayout = (FilterLayout) LayoutInflater.from(context).inflate(R.layout.layout_filter, null); + + new AlertDialog.Builder(context) + .setView(filterLayout) + .setPositiveButton(R.string.save, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + filterLayout.save(); + adapter.load(); + } + }) + .show(); + + filterLayout.setFilter(filter); + } + + private void deleteFilter(Filter filter) { + databaseManager.removeFilter(filter); + adapter.load(); + //TODO: undo + } + + @Override + public void onSearchVisibilityChanged(boolean visible) { + if (!visible) { + adapter.search(null); + } + } + + @Override + public void onSearchEntered(String entered) { + adapter.search(entered); + } + + private class FilterAdapter extends RecyclerView.Adapter { + private List sourceList = new ArrayList<>(); + private List displayList = new ArrayList<>(); + private String searchQuery; + + public FilterAdapter() { + setHasStableIds(true); + } + + @Override + public FilterCell onCreateViewHolder(ViewGroup parent, int viewType) { + return new FilterCell(LayoutInflater.from(parent.getContext()).inflate(R.layout.cell_filter, parent, false)); + } + + @Override + public void onBindViewHolder(FilterCell holder, int position) { + Filter filter = displayList.get(position); + holder.text.setText(filter.pattern); + holder.subtext.setText(String.valueOf(filter.type)); + } + + @Override + public int getItemCount() { + return displayList.size(); + } + + @Override + public long getItemId(int position) { + return displayList.get(position).id; + } + + public void search(String query) { + this.searchQuery = query; + filter(); + } + + private void load() { + sourceList.clear(); + sourceList.addAll(databaseManager.getFilters()); + + filter(); + } + + private void filter() { + displayList.clear(); + if (!TextUtils.isEmpty(searchQuery)) { + String query = searchQuery.toLowerCase(Locale.ENGLISH); + for (Filter filter : sourceList) { + displayList.add(filter); + } + } else { + displayList.addAll(sourceList); + } + + notifyDataSetChanged(); + } + } + + private class FilterCell extends RecyclerView.ViewHolder implements View.OnClickListener { + private TextView text; + private TextView subtext; + private ImageView delete; + + public FilterCell(View itemView) { + super(itemView); + + text = (TextView) itemView.findViewById(R.id.text); + subtext = (TextView) itemView.findViewById(R.id.subtext); + delete = (ImageView) itemView.findViewById(R.id.delete); + + theme().clearDrawable.apply(delete); + + delete.setOnClickListener(this); + + itemView.setOnClickListener(this); + } + + @Override + public void onClick(View v) { + int position = getAdapterPosition(); + if (position >= 0 && position < adapter.getItemCount()) { + Filter filter = adapter.displayList.get(position); + if (v == itemView) { + showFilterDialog(filter); + } else if (v == delete) { + deleteFilter(filter); + } + } + + } + } +} diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java index bb583f07..a4ae464c 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java @@ -159,6 +159,12 @@ public class MainSettingsController extends SettingsController implements Toolba // Browsing group SettingsGroup browsing = new SettingsGroup(s(R.string.settings_group_browsing)); + browsing.add(new LinkSettingView(this, s(R.string.filters_screen), null, new View.OnClickListener() { + @Override + public void onClick(View v) { + navigationController.pushController(new FiltersController(context)); + } + })); browsing.add(new BooleanSettingView(this, ChanSettings.openLinkConfirmation, s(R.string.setting_open_link_confirmation), null)); browsing.add(new BooleanSettingView(this, ChanSettings.autoRefreshThread, s(R.string.setting_auto_refresh_thread), null)); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java index 001fb0f7..6af83585 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java @@ -120,7 +120,7 @@ public class ThemeSettingsController extends Controller implements View.OnClickL themeHelper = ThemeHelper.getInstance(); pager = (ViewPager) view.findViewById(R.id.pager); - done = (FloatingActionButton) view.findViewById(R.id.done); + done = (FloatingActionButton) view.findViewById(R.id.add); done.setOnClickListener(this); adapter = new Adapter(); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/drawable/DropdownArrowDrawable.java b/Clover/app/src/main/java/org/floens/chan/ui/drawable/DropdownArrowDrawable.java index 49a5f1cb..c3acf5f8 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/drawable/DropdownArrowDrawable.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/drawable/DropdownArrowDrawable.java @@ -47,10 +47,10 @@ public class DropdownArrowDrawable extends Drawable { @Override public void draw(Canvas canvas) { path.rewind(); - path.moveTo(0, height / 2); - path.lineTo(width, height / 2); - path.lineTo(width / 2, height); - path.lineTo(0, height / 2); + path.moveTo(0, height / 4); + path.lineTo(width, height / 4); + path.lineTo(width / 2, (int) (height * 3f / 4f)); + path.lineTo(0, height / 4); path.close(); canvas.save(); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/FilterLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/FilterLayout.java new file mode 100644 index 00000000..63e68acd --- /dev/null +++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/FilterLayout.java @@ -0,0 +1,122 @@ +package org.floens.chan.ui.layout; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.Gravity; +import android.view.View; +import android.widget.CheckBox; +import android.widget.LinearLayout; +import android.widget.TextView; + +import org.floens.chan.Chan; +import org.floens.chan.R; +import org.floens.chan.core.manager.FilterEngine; +import org.floens.chan.core.model.Filter; +import org.floens.chan.ui.drawable.DropdownArrowDrawable; +import org.floens.chan.ui.view.FloatingMenu; +import org.floens.chan.ui.view.FloatingMenuItem; + +import java.util.ArrayList; +import java.util.List; + +import static org.floens.chan.utils.AndroidUtils.dp; +import static org.floens.chan.utils.AndroidUtils.getAttrColor; +import static org.floens.chan.utils.AndroidUtils.getString; + +public class FilterLayout extends LinearLayout implements View.OnClickListener, FloatingMenu.FloatingMenuCallback { + private TextView typeText; + private TextView boards; + private TextView pattern; + private CheckBox hide; + + private Filter filter; + + public FilterLayout(Context context) { + super(context); + } + + public FilterLayout(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public FilterLayout(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + + typeText = (TextView) findViewById(R.id.type); + boards = (TextView) findViewById(R.id.boards); + pattern = (TextView) findViewById(R.id.pattern); + hide = (CheckBox) findViewById(R.id.hide); + typeText.setOnClickListener(this); + typeText.setCompoundDrawablesWithIntrinsicBounds(null, null, new DropdownArrowDrawable(dp(12), dp(12), true, + getAttrColor(getContext(), R.attr.dropdown_dark_color), getAttrColor(getContext(), R.attr.dropdown_dark_pressed_color)), null); + } + + public void setFilter(Filter filter) { + this.filter = filter; + pattern.setText(filter.pattern); + boards.setText(filter.boards); + hide.setChecked(filter.hide); + + typeText.setText(filterTypeName(FilterEngine.FilterType.forId(filter.type))); + } + + public void save() { + filter.pattern = pattern.getText().toString(); + filter.boards = boards.getText().toString(); + filter.hide = hide.isChecked(); + + Chan.getDatabaseManager().addFilter(filter); + } + + @Override + public void onClick(View v) { + if (v == typeText) { + List menuItems = new ArrayList<>(2); + + for (FilterEngine.FilterType filterType : FilterEngine.FilterType.values()) { + menuItems.add(new FloatingMenuItem(filterType, filterTypeName(filterType))); + } + + FloatingMenu menu = new FloatingMenu(v.getContext()); + menu.setAnchor(v, Gravity.LEFT, -dp(5), -dp(5)); + menu.setPopupWidth(dp(150)); + menu.setCallback(this); + menu.setItems(menuItems); + menu.show(); + } + } + + @Override + public void onFloatingMenuItemClicked(FloatingMenu menu, FloatingMenuItem item) { + FilterEngine.FilterType type = (FilterEngine.FilterType) item.getId(); + typeText.setText(filterTypeName(type)); + filter.type = type.id; + } + + @Override + public void onFloatingMenuDismissed(FloatingMenu menu) { + } + + private String filterTypeName(FilterEngine.FilterType type) { + switch (type) { + case TRIPCODE: + return getString(R.string.filter_tripcode); + case NAME: + return getString(R.string.filter_name); + case COMMENT: + return getString(R.string.filter_comment); + case ID: + return getString(R.string.filter_id); + case SUBJECT: + return getString(R.string.filter_subject); + case FILENAME: + return getString(R.string.filter_filename); + } + return null; + } +} diff --git a/Clover/app/src/main/res/layout/cell_filter.xml b/Clover/app/src/main/res/layout/cell_filter.xml new file mode 100644 index 00000000..03f70217 --- /dev/null +++ b/Clover/app/src/main/res/layout/cell_filter.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Clover/app/src/main/res/layout/cell_history.xml b/Clover/app/src/main/res/layout/cell_history.xml index 08c29766..40f3d38d 100644 --- a/Clover/app/src/main/res/layout/cell_history.xml +++ b/Clover/app/src/main/res/layout/cell_history.xml @@ -84,9 +84,6 @@ along with this program. If not, see . android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="1dp" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" android:background="?attr/divider_color" /> diff --git a/Clover/app/src/main/res/layout/controller_board_edit.xml b/Clover/app/src/main/res/layout/controller_board_edit.xml index 95bf7069..6fa9b930 100644 --- a/Clover/app/src/main/res/layout/controller_board_edit.xml +++ b/Clover/app/src/main/res/layout/controller_board_edit.xml @@ -30,7 +30,7 @@ along with this program. If not, see . android:scrollbars="vertical" /> + + + + + + + diff --git a/Clover/app/src/main/res/layout/controller_theme.xml b/Clover/app/src/main/res/layout/controller_theme.xml index 45e3310d..79279c93 100644 --- a/Clover/app/src/main/res/layout/controller_theme.xml +++ b/Clover/app/src/main/res/layout/controller_theme.xml @@ -45,7 +45,7 @@ along with this program. If not, see . + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml index 59870d99..b2b1143a 100644 --- a/Clover/app/src/main/res/values/strings.xml +++ b/Clover/app/src/main/res/values/strings.xml @@ -26,6 +26,7 @@ along with this program. If not, see . Exit Delete Undo + Save %d minute @@ -116,6 +117,18 @@ along with this program. If not, see . The board with code %1$s is not known. Sort A-Z + Enabled + Pattern + Boards + Hide + + Tripcode + Name + Comment + ID + Subject + Filename + Clear history Clear history? Clear @@ -190,6 +203,8 @@ along with this program. If not, see . History + Filters + Settings General Boards