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

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APISearchPopularTageModule.java

@@ -9,7 +9,7 @@ import kr.co.zumo.app.lifeplus.bean.api.SearchPopularTagResultBean;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 
 /**
- * APISearchPopularTageModule
+ * APISearchPopularTagModule
  * <pre>
  * </pre>
  *
@@ -18,7 +18,7 @@ import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
  * @history 민효동   [2019. 1. 11.]   [최초 작성]
  * @since 2019. 1. 11.
  */
-public class APISearchPopularTageModule extends LifeplusAPIModule<RequestBean, SearchPopularTagResultBean> {
+public class APISearchPopularTagModule extends LifeplusAPIModule<RequestBean, SearchPopularTagResultBean> {
   @Override
   protected Single<SearchPopularTagResultBean> getAPI(RequestBean requestBean) {
     return new LifeplusAPIRepository().getPopularTag(requestBean);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/ISearchView.java

@@ -5,7 +5,6 @@ package kr.co.zumo.app.lifeplus.view.screen.search;
 
 import java.util.List;
 
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.bean.api.TagBean;
 import kr.co.zumo.app.lifeplus.view.IView;
 
@@ -31,7 +30,7 @@ public interface ISearchView extends IView {
 
   void drawAutoCompletionTag(List<TagBean> tagBeans);
 
-  void drawResultContents(List<LifeplusContentsBean> tagBeans);
+//  void drawResultContents(List<LifeplusContentsBean> tagBeans);
 
   void setVisibleLatestTag(boolean isVisible);
 
@@ -39,5 +38,5 @@ public interface ISearchView extends IView {
 
   void setVisibleAutoCompletionTag(boolean isVisible);
 
-  void setVisibleContents(boolean isVisible);
+//  void setVisibleContents(boolean isVisible);
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchFragment.java

@@ -22,7 +22,6 @@ import android.widget.TextView;
 import java.util.List;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.bean.api.TagBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
@@ -49,11 +48,9 @@ public class SearchFragment extends FragmentBase<SearchPresenter> implements ISe
   private View containerLatestTag;
   private View containerPopularTag;
   private View containerAutoCompletion;
-  private View containerResultContents;
   private RecyclerView recyclerViewLatestTag;
   private RecyclerView recyclerViewPopularTag;
   private RecyclerView recyclerViewAutoCompletion;
-  private RecyclerView recyclerViewResultContents;
 
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -80,16 +77,13 @@ public class SearchFragment extends FragmentBase<SearchPresenter> implements ISe
     containerLatestTag = findViewById(R.id.container_latest_search_tag);
     containerPopularTag = findViewById(R.id.container_popular_tag);
     containerAutoCompletion = findViewById(R.id.container_auto_completion);
-    containerResultContents = findViewById(R.id.container_result_contents);
     recyclerViewLatestTag = findViewById(R.id.recycler_view_latest_tage);
     recyclerViewPopularTag = findViewById(R.id.recycler_view_popular_tag);
     recyclerViewAutoCompletion = findViewById(R.id.recycler_view_auto_completion);
-    recyclerViewResultContents = findViewById(R.id.recycler_view_result_contents);
 
     recyclerViewLatestTag.setLayoutManager(new LinearLayoutManager(getContext()));
     recyclerViewPopularTag.setLayoutManager(new LinearLayoutManager(getContext()));
     recyclerViewAutoCompletion.setLayoutManager(new LinearLayoutManager(getContext()));
-    recyclerViewResultContents.setLayoutManager(new LinearLayoutManager(getContext()));
 
     editSearch.addTextChangedListener(new TextWatcher() {
       @Override
@@ -207,11 +201,6 @@ public class SearchFragment extends FragmentBase<SearchPresenter> implements ISe
     }
   }
 
-  @Override
-  public void drawResultContents(List<LifeplusContentsBean> tagBeans) {
-    Log.i("APP# SearchFragment | drawResultContents", "|" + " result.size(): " + tagBeans.size());
-  }
-
   @Override
   public void setVisibleLatestTag(boolean isVisible) {
     containerLatestTag.setVisibility(isVisible ? View.VISIBLE : View.GONE);
@@ -227,8 +216,4 @@ public class SearchFragment extends FragmentBase<SearchPresenter> implements ISe
     containerAutoCompletion.setVisibility(isVisible ? View.VISIBLE : View.GONE);
   }
 
-  @Override
-  public void setVisibleContents(boolean isVisible) {
-    containerResultContents.setVisibility(isVisible ? View.VISIBLE : View.GONE);
-  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchModel.java

@@ -26,7 +26,7 @@ import kr.co.zumo.app.lifeplus.model.module.APIError;
 import kr.co.zumo.app.lifeplus.model.module.APIModuleSimpleListener;
 import kr.co.zumo.app.lifeplus.model.module.APISearchAutoCompletionModule;
 import kr.co.zumo.app.lifeplus.model.module.APISearchModule;
-import kr.co.zumo.app.lifeplus.model.module.APISearchPopularTageModule;
+import kr.co.zumo.app.lifeplus.model.module.APISearchPopularTagModule;
 import kr.co.zumo.app.lifeplus.view.Event;
 
 /**
@@ -129,7 +129,7 @@ public class SearchModel extends Model {
   }
 
   protected void loadPopular() {
-    disposablePopular = new APISearchPopularTageModule().call(new RequestBean(), new APIModuleSimpleListener<SearchPopularTagResultBean>(waiterCaller) {
+    disposablePopular = new APISearchPopularTagModule().call(new RequestBean(), new APIModuleSimpleListener<SearchPopularTagResultBean>(waiterCaller) {
       @Override
       public void onApiSuccess(SearchPopularTagResultBean resultBean) {
         popularTagBeans = resultBean.getData();

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchPresenter.java

@@ -9,7 +9,6 @@ import android.util.Log;
 
 import java.util.List;
 
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.bean.api.TagBean;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
@@ -46,6 +45,7 @@ public class SearchPresenter extends Presenter<SearchModel, ISearchView> {
   private void renderLatest() {
     List<TagBean> list = model.getLatestTagBeans();
     if (null != list && list.size() > 0) {
+      view.setVisibleAutoCompletionTag(false);
       view.setVisibleLatestTag(true);
       view.drawLatestTag(list);
     }
@@ -57,9 +57,13 @@ public class SearchPresenter extends Presenter<SearchModel, ISearchView> {
   private void renderPopular() {
     List<TagBean> list = model.getPopularTagBeans();
     if (null != list && list.size() > 0) {
+      view.setVisibleAutoCompletionTag(false);
       view.setVisiblePopularTag(true);
       view.drawPopularTag(list);
     }
+    else {
+      view.setVisiblePopularTag(false);
+    }
   }
 
   private void renderAutoCompletion() {
@@ -67,23 +71,11 @@ public class SearchPresenter extends Presenter<SearchModel, ISearchView> {
     if (null != list && list.size() > 0) {
       view.setVisibleLatestTag(false);
       view.setVisiblePopularTag(false);
-      view.setVisibleContents(false);
       view.setVisibleAutoCompletionTag(true);
       view.drawAutoCompletionTag(list);
     }
   }
 
-  private void renderResultContents() {
-    List<LifeplusContentsBean> list = model.getResultContentsBeans();
-    if (null != list && list.size() > 0) {
-      view.setVisibleLatestTag(false);
-      view.setVisiblePopularTag(false);
-      view.setVisibleAutoCompletionTag(false);
-      view.setVisibleContents(true);
-      view.drawResultContents(list);
-    }
-  }
-
   @Override
   protected void createViewInternal() {
 
@@ -174,7 +166,6 @@ public class SearchPresenter extends Presenter<SearchModel, ISearchView> {
     view.setVisibleLatestTag(false);
     view.setVisiblePopularTag(false);
     view.setVisibleAutoCompletionTag(false);
-    view.setVisibleContents(false);
 
     doubleCheckerPopular.checkFirst();
     doubleCheckerLatest.checkFirst();
@@ -194,9 +185,6 @@ public class SearchPresenter extends Presenter<SearchModel, ISearchView> {
           // 자동 완성 결과
           renderAutoCompletion();
         }
-        else if (event.getInteger() == Event.TAG_SEARCH) {
-          renderResultContents();
-        }
         break;
       case Event.ERROR:
         showErrorDialog(event.getString());
@@ -222,11 +210,16 @@ public class SearchPresenter extends Presenter<SearchModel, ISearchView> {
     - 텍스트가 입력되면 guide hash 보통 굵기, 빈칸이면 볼드 처리
      */
     view.setBoldGuideHash(len == 0);
+    if(len == 0) {
+      renderLatest();
+      renderPopular();
+    }
 
     // 이전 태그와 다를 때 자동 완성 로딩
     String prevTag = model.getTag();
     model.setTag(s.toString());
-    if (model.getTag().equals(prevTag) == false) {
+    String tag = model.getTag();
+    if (null != tag && tag.length() > 0 && model.getTag().equals(prevTag) == false) {
       model.loadAutoCompletion();
     }
   }

app/src/main/res/layout/fragment_search.xml

@@ -152,17 +152,4 @@
       android:layout_height="match_parent"/>
   </android.support.constraint.ConstraintLayout>
 
-  <android.support.constraint.ConstraintLayout
-    android:id="@+id/container_result_contents"
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintTop_toBottomOf="@id/container_top"
-    tools:visibility="gone">
-
-    <android.support.v7.widget.RecyclerView
-      android:id="@+id/recycler_view_result_contents"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"/>
-  </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>