update to v1.6

TonnyL · Oct 21, 2016 · d02e305 · d02e305
1 parent 7c81c6c
commit d02e305
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 25 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         applicationId "com.marktony.zhuanlan"
         minSdkVersion 14
         targetSdkVersion 24
-        versionCode 6
-        versionName "V1.5"
+        versionCode 7
+        versionName "V1.6"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/marktony/zhuanlan/ui/UserDefineIdsFragment.java b/app/src/main/java/com/marktony/zhuanlan/ui/UserDefineIdsFragment.java
@@ -200,9 +200,6 @@ public void OnClick(View v, int position) {
 
                                         });
 
-                                        tvUserDefine.setVisibility(View.GONE);
-
-                                        adapter.notifyItemInserted(zhuanlanList.size() - 1);
                                         // 具体的删除操作在touch helper中完成
 
                                         ItemTouchHelper helper = new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
@@ -219,6 +216,11 @@ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
                                         helper.attachToRecyclerView(recyclerView);
 
 
+
+                                        tvUserDefine.setVisibility(View.GONE);
+
+                                        adapter.notifyItemInserted(zhuanlanList.size() - 1);
+
                                     } else {
                                         Snackbar.make(fab, R.string.added,Snackbar.LENGTH_SHORT).show();
                                     }
@@ -252,6 +254,9 @@ public void onErrorResponse(VolleyError volleyError) {
         refreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
+                if (list.size() != 0) {
+                    list.clear();
+                }
                 requestData();
             }
         });
@@ -285,10 +290,6 @@ public void onStop() {
 
     private void requestData() {
 
-        if (list.size() != 0) {
-            list.clear();
-        }
-
         for (int i = 0; i < list.size(); i++) {
 
             final int finalI = i;
@@ -313,6 +314,20 @@ public void OnClick(View v, int position) {
                                     startActivity(intent);
                                 }
                             });
+
+                            ItemTouchHelper helper = new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
+                                @Override
+                                public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+                                    return false;
+                                }
+
+                                @Override
+                                public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+                                    adapter.remove(viewHolder.getLayoutPosition());
+                                }
+                            });
+                            helper.attachToRecyclerView(recyclerView);
+
                         } else {
                             adapter.notifyItemInserted(zhuanlanList.size() - 1);
                         }
@@ -324,18 +339,6 @@ public void run() {
                             }
                         });
 
-                        ItemTouchHelper helper = new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
-                            @Override
-                            public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
-                                return false;
-                            }
-
-                            @Override
-                            public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
-                                adapter.remove(viewHolder.getLayoutPosition());
-                            }
-                        });
-                        helper.attachToRecyclerView(recyclerView);
                     }
 
                 }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -51,7 +51,7 @@
     <string name="mail_account">mailto:marktonymengyi@gmail.com</string>
     <string name="no_market_app">没有安装市场类App</string>
     <string name="donate_account">marktonymengyi@gmail.com</string>
-    <string name="version">版本:V1.5</string>
+    <string name="version">版本:V1.6</string>
     <string name="rate">为知乎专栏App评分</string>
     <string name="rate_description">如果你喜欢知乎专栏App,那么请在商店中为它评分吧</string>
     <string name="author">作者</string>