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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsModel.java

@@ -255,6 +255,10 @@ public class ContentsModel extends ContentsBaseModel {
     return contentsDetailListBean.hasSeries();
   }
 
+  public boolean isCardContents() {
+    return getContentsType().equals(ContentsDetailBean.TYPE_CARD);
+  }
+
   public int getItemCount() {
     return contentsDetailListBean.getItemCount();
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsPresenter.java

@@ -347,7 +347,10 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
      */
 
     if (model.isSeriesPage()) {
+      view.setVisibleDotDotDot(false);
       view.setVisiblePageUi(false);
+    }
+    else if (model.isCardContents()) {
       view.setVisibleDotDotDot(false);
     }
     else {
@@ -366,6 +369,8 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
       });
 
     }
+
+
   }
 
   private void showMoreInfoPopup(int index) {

app/src/main/res/values/strings.xml

@@ -32,11 +32,11 @@
   <string name="complete">완료</string>
   <string name="faq">자주 찾는 질문</string>
   <string name="my_faq">문의내역</string>
-  <string name="member_confirm">회원확인</string>
-  <string name="member_confirm_underline"><u>회원확인</u></string>
+  <string name="member_confirm">회원가입</string>
+  <string name="member_confirm_underline"><u>회원가입</u></string>
   <string name="faq_none">문의하신 내용이 없습니다.</string>
   <string name="faq_notice">답변알림이 오지 않을 경우 <u>여기</u>를 눌러\n알림수신을 허용해주세요.</string>
-  <string name="faq_guest_guide">서비스 이용을 위해서 Lifeplus 회원 확인이 필요합니다.</string>
+  <string name="faq_guest_guide">서비스 이용을 위해서 Lifeplus 회원 가입이 필요합니다.</string>
 
   <string name="lifeplus_email">&lifeplus_email;</string>
 
@@ -256,8 +256,8 @@
   <string name="code_copy">코드복사</string>
 
   <string name="setting_menu1">기본 설정</string>
-  <string name="setting_menu1_user_confirm"><u>회원확인</u></string>
-  <string name="setting_menu1_user_confirm_please">회원확인을 진행해주세요.</string>
+  <string name="setting_menu1_user_confirm"><u>회원가입</u></string>
+  <string name="setting_menu1_user_confirm_please">회원가입을 진행해주세요.</string>
   <string name="setting_menu1_user_info"><u>회원정보 관리</u></string>
   <string name="setting_menu1_user_info_title">회원정보 관리</string>
   <string name="setting_menu2">코드 관리</string>
@@ -679,7 +679,7 @@
 
   <string name="with_shown_contents">함께 본 콘텐츠</string>
   <string name="with_shown_contents_detail">이 콘텐츠를 북마크한 분들이\n다음 콘텐츠도 보셨습니다</string>
-  <string name="best_bucket_guest_guide">서비스 이용을 위해서 Lifeplus app 회원 확인이 필요합니다.</string>
+  <string name="best_bucket_guest_guide">서비스 이용을 위해서 Lifeplus app 회원 가입이 필요합니다.</string>
   <string name="best_bucket_delete_guide">선택된 버킷리스트가 삭제됩니다.</string>
 
   <string name="inside">실내</string>