Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkAdapter.java

@@ -1,6 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
-import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -33,12 +32,10 @@ public class DefaultBookMarkAdapter extends RecyclerView.Adapter<DefaultBookMark
 
   private IEventListener listener;
   private List<BookmarkBean> defaultBookmarkBeans;
-  private Context context;
 
-  public DefaultBookMarkAdapter(Context context, List<BookmarkBean> defaultBookmarkBeans, IEventListener listener) {
+  public DefaultBookMarkAdapter(List<BookmarkBean> defaultBookmarkBeans, IEventListener listener) {
     this.listener = listener;
     this.defaultBookmarkBeans = defaultBookmarkBeans;
-    this.context = context;
   }
 
   @NonNull

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkFragment.java

@@ -80,7 +80,7 @@ public class DefaultBookMarkFragment extends FragmentBase<DefaultBookMarkPresent
 
   @Override
   public void drawContents(List<BookmarkBean> bookmarkBeans) {
-    DefaultBookMarkAdapter defaultBookMarkAdapter = new DefaultBookMarkAdapter(getActivity(), bookmarkBeans, new IEventListener() {
+    DefaultBookMarkAdapter defaultBookMarkAdapter = new DefaultBookMarkAdapter(bookmarkBeans, new IEventListener() {
       @Override
       public void onEvent(Event event) {
         presenter.onEvent(event);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkModel.java

@@ -30,9 +30,13 @@ public class DefaultBookMarkModel extends Model {
   @Override
   protected void createViewInternal() {
   }
+
   @Override
   protected void destroyInternal() {
-
+    if (null != disposableDefaultBookmarkList) {
+      disposableDefaultBookmarkList.dispose();
+      disposableDefaultBookmarkList = null;
+    }
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkTextViewHolder.java

@@ -1,9 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
 import android.view.View;
-import android.widget.TextView;
-
-import kr.co.zumo.app.R;
 
 /**
  * DefaultBookMarkTextViewHolder
@@ -16,11 +13,9 @@ import kr.co.zumo.app.R;
  * @since 2018-10-26
  */
 public class DefaultBookMarkTextViewHolder extends DefaultBookMarkView {
-  private TextView textViewBookMarkRecommend;
 
   public DefaultBookMarkTextViewHolder(View itemView) {
     super(itemView);
-    itemView.findViewById(R.id.text_view_book_mark_recommend);
   }
 
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkTitleViewHolder.java

@@ -19,7 +19,6 @@ import kr.co.zumo.app.lifeplus.view.IEventListener;
  */
 public class DefaultBookMarkTitleViewHolder extends DefaultBookMarkView {
 
-  private TextView textViewBookMarkTitle;
   private TextView textViewBookHashTag1;
   private TextView textViewBookHashTag2;
   private TextView textViewBookHashTag3;
@@ -28,7 +27,6 @@ public class DefaultBookMarkTitleViewHolder extends DefaultBookMarkView {
 
   public DefaultBookMarkTitleViewHolder(View itemView) {
     super(itemView);
-    textViewBookMarkTitle = itemView.findViewById(R.id.text_view_book_mark_title);
     textViewBookHashTag1 = itemView.findViewById(R.id.text_view_category_0);
     textViewBookHashTag2 = itemView.findViewById(R.id.text_view_category_1);
     textViewBookHashTag3 = itemView.findViewById(R.id.text_view_category_2);