Add filter tag namespace

app/src/main/java/com/hippo/ehviewer/client/EhEngine.java

@@ -218,7 +218,7 @@ public class EhEngine {
             // Filter tag
             for (int i = 0, n = list.size(); i < n; i++) {
                 GalleryInfo info = list.get(i);
-                if (!sEhFilter.filterTag(info)) {
+                if (!sEhFilter.filterTag(info) || !sEhFilter.filterTagNamespace(info)) {
                     list.remove(i);
                     i--;
                     n--;
@@ -616,29 +616,9 @@ public class EhEngine {
             throw e;
         }
 
-        // Filter title
-        for (int i = 0, n = list.size(); i < n; i++) {
-            GalleryInfo info = list.get(i);
-            if (!sEhFilter.filterTitle(info)) {
-                list.remove(i);
-                i--;
-                n--;
-            }
-        }
-
         if (list.size() > 0) {
             // Fill by api
             fillGalleryListByApi(task, okHttpClient, list);
-
-            // Filter uploader and tag
-            for (int i = 0, n = list.size(); i < n; i++) {
-                GalleryInfo info = list.get(i);
-                if (!sEhFilter.filterUploader(info) || !sEhFilter.filterTag(info)) {
-                    list.remove(i);
-                    i--;
-                    n--;
-                }
-            }
         }
 
         return list;

app/src/main/java/com/hippo/ehviewer/client/EhFilter.java

@@ -32,10 +32,12 @@ public final class EhFilter {
     public static final int MODE_TITLE = 0;
     public static final int MODE_UPLOADER = 1;
     public static final int MODE_TAG = 2;
+    public static final int MODE_TAG_NAMESPACE = 3;
 
     private final List<Filter> mTitleFilterList = new ArrayList<>();
     private final List<Filter> mUploaderFilterList = new ArrayList<>();
     private final List<Filter> mTagFilterList = new ArrayList<>();
+    private final List<Filter> mTagNamespaceFilterList = new ArrayList<>();
 
     private static EhFilter sInstance;
 
@@ -62,6 +64,10 @@ public final class EhFilter {
                     filter.text = filter.text.toLowerCase();
                     mTagFilterList.add(filter);
                     break;
+                case MODE_TAG_NAMESPACE:
+                    filter.text = filter.text.toLowerCase();
+                    mTagNamespaceFilterList.add(filter);
+                    break;
                 default:
                     Log.d(TAG, "Unknown mode: " + filter.mode);
                     break;
@@ -81,6 +87,10 @@ public final class EhFilter {
         return mTagFilterList;
     }
 
+    public List<Filter> getTagNamespaceFilterList() {
+        return mTagNamespaceFilterList;
+    }
+
     public synchronized void addFilter(Filter filter) {
         EhDB.addFilter(filter);
 
@@ -93,8 +103,13 @@ public final class EhFilter {
                 mUploaderFilterList.add(filter);
                 break;
             case MODE_TAG:
+                filter.text = filter.text.toLowerCase();
                 mTagFilterList.add(filter);
                 break;
+            case MODE_TAG_NAMESPACE:
+                filter.text = filter.text.toLowerCase();
+                mTagNamespaceFilterList.add(filter);
+                break;
             default:
                 Log.d(TAG, "Unknown mode: " + filter.mode);
                 break;
@@ -114,6 +129,9 @@ public final class EhFilter {
             case MODE_TAG:
                 mTagFilterList.remove(filter);
                 break;
+            case MODE_TAG_NAMESPACE:
+                mTagNamespaceFilterList.remove(filter);
+                break;
             default:
                 Log.d(TAG, "Unknown mode: " + filter.mode);
                 break;
@@ -121,7 +139,7 @@ public final class EhFilter {
     }
 
     public synchronized boolean needCallApi() {
-        return 0 != mTagFilterList.size();
+        return 0 != mTagFilterList.size() || 0 != mTagNamespaceFilterList.size();
     }
 
     public synchronized boolean filterTitle(GalleryInfo info) {
@@ -220,4 +238,39 @@ public final class EhFilter {
 
         return true;
     }
+
+    private boolean matchTagNamespace(String tag, String filter) {
+        if (null == tag || null == filter) {
+            return false;
+        }
+
+        String tagNamespace;
+        int index = tag.indexOf(':');
+        if (index >= 0) {
+            tagNamespace = tag.substring(0, index);
+            return tagNamespace.equals(filter);
+        } else {
+            return false;
+        }
+    }
+
+    public synchronized boolean filterTagNamespace(GalleryInfo info) {
+        if (null == info) {
+            return false;
+        }
+
+        String[] tags = info.simpleTags;
+        List<Filter> filters = mTagNamespaceFilterList;
+        if (null != tags && filters.size() > 0) {
+            for (String tag: tags) {
+                for (int i = 0, n = filters.size(); i < n; i++) {
+                    if (matchTagNamespace(tag, filters.get(i).text)) {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
 }

app/src/main/java/com/hippo/ehviewer/ui/FilterActivity.java

@@ -331,16 +331,19 @@ public class FilterActivity extends ToolbarActivity {
         private final List<Filter> mTitleFilterList;
         private final List<Filter> mUploaderFilterList;
         private final List<Filter> mTagFilterList;
+        private final List<Filter> mTagNamespaceFilterList;
 
         private Filter mTitleHeader;
         private Filter mUploaderHeader;
         private Filter mTagHeader;
+        private Filter mTagNamespaceHeader;
 
         public FilterList() {
             mEhFilter = EhFilter.getInstance();
             mTitleFilterList = mEhFilter.getTitleFilterList();
             mUploaderFilterList = mEhFilter.getUploaderFilterList();
             mTagFilterList = mEhFilter.getTagFilterList();
+            mTagNamespaceFilterList = mEhFilter.getTagNamespaceFilterList();
         }
 
         public int size() {
@@ -351,6 +354,8 @@ public class FilterActivity extends ToolbarActivity {
             count += 0 == size ? 0 : size + 1;
             size = mTagFilterList.size();
             count += 0 == size ? 0 : size + 1;
+            size = mTagNamespaceFilterList.size();
+            count += 0 == size ? 0 : size + 1;
             return count;
         }
 
@@ -381,6 +386,15 @@ public class FilterActivity extends ToolbarActivity {
             return mTagHeader;
         }
 
+        private Filter getTagNamespaceHeader() {
+            if (null == mTagNamespaceHeader) {
+                mTagNamespaceHeader = new Filter();
+                mTagNamespaceHeader.mode = MODE_HEADER;
+                mTagNamespaceHeader.text = getString(R.string.filter_tag_namespace);
+            }
+            return mTagNamespaceHeader;
+        }
+
         public Filter get(int index) {
             int size = mTitleFilterList.size();
             if (0 != size) {
@@ -415,6 +429,17 @@ public class FilterActivity extends ToolbarActivity {
                 }
             }
 
+            size = mTagNamespaceFilterList.size();
+            if (0 != size) {
+                if (index == 0) {
+                    return getTagNamespaceHeader();
+                } else if (index <= size) {
+                    return mTagNamespaceFilterList.get(index - 1);
+                } else {
+                    index -= size + 1;
+                }
+            }
+
             throw new IndexOutOfBoundsException();
         }