finsh blacklist

xiaojieonly · Dec 24, 2020 · 95a4a9f · 95a4a9f
1 parent ca21778
commit 95a4a9f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 27 deletions.
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/BlackListActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/BlackListActivity.java
@@ -68,7 +68,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         mFilterList = new FilterList();
 
-        mRecyclerView = (EasyRecyclerView) ViewUtils.$$(this, R.id.recycler_view);
+        mRecyclerView = (EasyRecyclerView) ViewUtils.$$(this, R.id.recycler_view1);
         TextView tip = (TextView) ViewUtils.$$(this, R.id.tip);
         mViewTransition = new ViewTransition(mRecyclerView, tip);
 
@@ -94,7 +94,7 @@ private void updateView(boolean animation) {
 
         if (null == mFilterList || 0 == mFilterList.size()) {
             mViewTransition.showView(1, animation);
-        } else {
+        }else {
             mViewTransition.showView(0, animation);
         }
     }
@@ -208,6 +208,7 @@ public void onClick(View v) {
             blackList.badgayname = text;
             blackList.add_time = TimeUtils.getTimeNow();
             blackList.angrywith = "/手动添加/";
+            blackList.mode=1;
 
             mFilterList.add(blackList);
 
@@ -283,20 +284,18 @@ private class FilterAdapter extends RecyclerView.Adapter<FilterHolder> {
         public int getItemViewType(int position) {
             if (null == mFilterList) {
                 return TYPE_ITEM;
-            }else {
-                return TYPE_HEADER;
             }
 
-//            if (mFilterList.get(position).mode == FilterList.MODE_HEADER) {
-//                return TYPE_HEADER;
-//            } else {
-//                return TYPE_ITEM;
-//            }
+            if (mFilterList.get(position).mode == FilterList.MODE_HEADER) {
+                return TYPE_HEADER;
+            } else {
+                return TYPE_ITEM;
+            }
         }
 
         @Override
         public FilterHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            int layoutId;
+            int layoutId ;
             switch (viewType) {
                 default:
                 case TYPE_ITEM:
@@ -323,16 +322,16 @@ public void onBindViewHolder(FilterHolder holder, int position) {
                 return;
             }
             BlackList blackList = mFilterList.get(position);
-            holder.text.setText(blackList.badgayname);
-            holder.text.setPaintFlags(holder.text.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
-//            if (FilterList.MODE_HEADER == blackList.mode) {
-//                holder.text.setText(blackList.badgayname);
-//            } else {
-//                holder.text.setText(blackList.badgayname);
-//                // add a delete line if the filter is disabled
-//                holder.text.setPaintFlags(holder.text.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
-//
-//            }
+//            holder.text.setText(blackList.badgayname);
+//            holder.text.setPaintFlags(holder.text.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
+            if (FilterList.MODE_HEADER == blackList.mode) {
+                holder.text.setText(blackList.badgayname);
+            } else {
+                holder.text.setText(blackList.badgayname);
+                // add a delete line if the filter is disabled
+                holder.text.setPaintFlags(holder.text.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
+
+            }
 //            Filter filter = mFilterList.get(position);
 //            if (FilterList.MODE_HEADER == filter.mode) {
 //                holder.text.setText(filter.text);
@@ -358,7 +357,7 @@ private class FilterList {
         public static final int MODE_HEADER = -1;
 
 
-        private final List<BlackList> mTitleBlackList;
+        private List<BlackList> mTitleBlackList;
 
         private BlackList mTitleHeader;
 
@@ -377,7 +376,7 @@ public int size() {
         private BlackList getTitleHeader() {
             if (null == mTitleHeader) {
                 mTitleHeader = new BlackList();
-//                mTitleHeader.mode = MODE_HEADER;
+                mTitleHeader.mode = MODE_HEADER;
                 mTitleHeader.badgayname = getString(R.string.blacklist_id);
             }
             return mTitleHeader;
@@ -403,10 +402,12 @@ public BlackList get(int index) {
 
         public void add(BlackList blackList) {
             EhDB.insertBlackList(blackList);
+            mTitleBlackList.add(blackList);
         }
 
         public void delete(BlackList blackList) {
             EhDB.deleteBlackList(blackList);
+            mTitleBlackList.remove(blackList);
         }
 
 //        public void trigger(Filter filter) {

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
@@ -436,7 +436,8 @@ public void onClick(DialogInterface dialog, int which) {
                             case R.id.join_blacklist:
                                 EhDB.insertBlackList(BlackListUtils.parseBlacklist(comment));
                                 mCommentList.DeleteComment(position);
-                                mRecyclerView.invalidate();
+                                mAdapter.notifyDataSetChanged();
+                                updateView(true);
                                 break;
                         }
                     }

diff --git a/app/src/main/java/com/hippo/util/BlackListUtils.java b/app/src/main/java/com/hippo/util/BlackListUtils.java
@@ -9,6 +9,7 @@ public static BlackList parseBlacklist(GalleryComment comment){
 
         blackList.badgayname = comment.user;
         blackList.angrywith = comment.comment;
+        blackList.mode = 1;
         blackList.add_time = TimeUtils.getTimeNow();
 
         return  blackList;

diff --git a/app/src/main/res/layout/activity_blacklist.xml b/app/src/main/res/layout/activity_blacklist.xml
@@ -21,7 +21,7 @@
     android:layout_height="match_parent">
 
     <com.hippo.easyrecyclerview.EasyRecyclerView
-        android:id="@+id/recycler_view"
+        android:id="@+id/recycler_view1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="@dimen/keyline_margin"/>

diff --git a/app/src/main/res/layout/dialog_add_blacklist.xml b/app/src/main/res/layout/dialog_add_blacklist.xml
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="16dp"
-        android:hint="@string/blacklist_reason_text">
+        android:hint="@string/blacklist_text">
 
         <com.hippo.widget.HackyTextInputEditText
             android:id="@+id/reason_text"

diff --git a/daogenerator/src/main/java/com/hippo/ehviewer/daogenerator/EhDaoGenerator.java b/daogenerator/src/main/java/com/hippo/ehviewer/daogenerator/EhDaoGenerator.java
@@ -83,7 +83,7 @@ private static void addBlackList(Schema schema) {
         entity.addStringProperty("reason");
         entity.addStringProperty("angrywith");
         entity.addStringProperty("add_time");
-
+        entity.addIntProperty("mode");
     }
 
 
@@ -96,7 +96,7 @@ private static void adjustBlackList() throws Exception {
         javaClass.getField("reason").setPublic();
         javaClass.getField("angrywith").setPublic();
         javaClass.getField("add_time").setPublic();
-
+        javaClass.getField("mode").setPublic();
         javaClass.addMethod("\t@Override\n" +
                 "\tpublic String toString() {\n" +
                 "\t\treturn badgayname;\n" +