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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/entry/EventDetailEntryPresenter.java

@@ -197,7 +197,7 @@ public class EventDetailEntryPresenter extends EventDetailPresenter<EventDetailE
     //참여형 이벤트일 때 페이지 번호 노출
     int len = model.getEventPageList().size();
     if (index > 0 && index < len - 1) {
-      view.setPageNumber(index + " / " + len);
+      view.setPageNumber(index + " / " + (len - 1)); //커버를 뺀 페이지가 총 페이지수
     }
     else {
       view.setPageNumber("");

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/notification/NotiPresenter.java

@@ -159,7 +159,8 @@ public class NotiPresenter extends Presenter<NotiModel, INotiView> {
   private void renderActionButton(int index) {
     // 소식 탭일 경우
     if (index == 1) {
-      view.setActionButtonVisible(true);
+      //view.setActionButtonVisible(true);
+      view.setActionButtonVisible(model.getPushBeans().size() > 0);
       view.setActionButtonEnabled(model.getPushBeans().size() > 0);
     }
     else {

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

@@ -54,10 +54,10 @@ public class SearchResultCategoryHolder extends RecyclerView.ViewHolder {
           .CATEGORY_3:
           tagRes = R.string.search_category3;
           break;
-        case CategoryID
-          .CATEGORY_4:
-          tagRes = R.string.book_mark_category4;
-          break;
+//        case CategoryID
+//          .CATEGORY_4:
+//          tagRes = R.string.book_mark_category4;
+//          break;
         case CategoryID
           .CATEGORY_5:
           tagRes = R.string.book_mark_category5;