[마이][Common] 로그인/비로그인 케이스 변경사항 반영

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

@@ -55,7 +55,7 @@ public class BookMarkListViewHolder extends BookMarkListView {
       textViewBookMarkTitle.setText(bean.getTwoLineTitle());
 
       if (bean.getSubTitle() != null && StringUtil.isFull(bean.getSubTitle())) {
-        if (bean.getListItemNo().equals(bean.getItemNo())) {
+        if (bean.getListItemNo() != null && bean.getItemNo() != null && bean.getListItemNo().equals(bean.getItemNo())) {
           textViewBookMarkSubTitle.setVisibility(View.GONE);
         }
         else {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinDetailGuestFragment.java

@@ -3,6 +3,7 @@ package kr.co.zumo.app.lifeplus.view.screen.my.coin;
 import android.view.View;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 
 /**
  * MyCoinDetailGuestFragment
@@ -16,12 +17,25 @@ import kr.co.zumo.app.R;
  */
 public class MyCoinDetailGuestFragment extends MyCoinDetailMemberFragment {
 
+  @Override
+  protected void defineActionBar(ActionBarHelper actionBarHelper) {
+    actionBarHelper.begin().title(R.string.my_coin)
+      .menu(actionBar -> presenter.onNavigationClickMenu(actionBar))
+      .search(actionBar -> presenter.onNavigationClickSearch(actionBar))
+      .back(actionBar -> presenter.onNavigationClickBack(actionBar))
+      //.scroll()
+      .show();
+  }
+
   @Override
   public void createMemberOrGuestView() {
     imageViewFilter.setVisibility(View.GONE);
     textPeriod.setVisibility(View.GONE);
-    textViewExtinctCoin.setText(R.string.coin_extinct_guest_title);
+    textViewExtinctCoin.setText(R.string.my_coin);
     textViewExtinctCoin.setOnClickListener(null);
     imageViewExtinctCoinArrow.setVisibility(View.GONE);
+    //당월 소멸예정 코인 클릭
+    textExpiringCoinValue.setOnClickListener(null);
+    imageViewExtinctCoinArrow.setOnClickListener(null);
   }
 }

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

@@ -49,7 +49,6 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
   protected ViewPager viewPagerBestBucketList;
   protected TabLayout tabLayoutBestBucketList;
   protected TextView textViewBookmarkCount;
-  protected TextView textViewBookmarkRecommend;
   protected TextView textCoin;
   protected TextView textCouponCount;
   protected RecyclerView recyclerViewBookmark;
@@ -84,7 +83,6 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     viewPagerBestBucketList = findViewById(R.id.view_pager_best_bucket_list);
     tabLayoutBestBucketList = findViewById(R.id.tab_layout_bucket_list);
     textViewBookmarkCount = findViewById(R.id.text_view_book_mark);
-    textViewBookmarkRecommend = findViewById(R.id.text_view_book_mark_recommend);
     recyclerViewBookmark = findViewById(R.id.recycler_view_book_mark_list);
     layoutMemberHeader = findViewById(R.id.layout_member_header);
     layoutGuestHeader = findViewById(R.id.layout_guest_header);
@@ -175,7 +173,6 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
 
   @Override
   public void setMyBookmarkList(List<BookmarkBean> bookmarkBeans) {
-    textViewBookmarkRecommend.setVisibility(View.GONE);
     drawBookmarkLabel(bookmarkBeans.size());
     drawBookmarkInternal(bookmarkBeans, Event.BOOKMARK);
   }
@@ -253,7 +250,7 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
   @Override
   public void setDefaultBookmarkList(List<BookmarkBean> defaultBookmarkBeans) {
     setDefaultBookmarkLabel();
-    textViewBookmarkRecommend.setVisibility(View.VISIBLE);
+    textViewBookmarkCount.setText(R.string.book_mark_recommend_title);
     drawBookmarkInternal(defaultBookmarkBeans, Event.CONTENTS);
   }
 

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

@@ -243,17 +243,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/icon_detail_arrow"/>
 
-      <TextView
-        android:id="@+id/text_view_become_extinction"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:lineSpacingExtra="4sp"
-        android:text="@string/coin_extinct"
-        android:textColor="@color/C999999"
-        android:textSize="11sp"
-        app:layout_constraintStart_toStartOf="@+id/text_view_guest_coin"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_guest_coin"/>
 
       <TextView
         android:id="@+id/text_view_user_confirm"
@@ -411,22 +400,6 @@
         app:layout_constraintTop_toTopOf="@+id/text_view_book_mark"
         app:srcCompat="@drawable/icon_book_mark_arrow"/>
 
-      <TextView
-        android:id="@+id/text_view_book_mark_recommend"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:gravity="center_horizontal"
-        android:lineSpacingExtra="10sp"
-        android:paddingStart="10dp"
-        android:text="@string/book_mark_recommend_text"
-        android:textColor="@color/C999999"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/text_view_book_mark"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_book_mark"
-        tools:visibility="gone"/>
-
     </android.support.constraint.ConstraintLayout>
 
     <android.support.constraint.ConstraintLayout

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

@@ -665,6 +665,7 @@
   <string name="book_mark_count">북마크 %s</string>
   <string name="bucket_list_count">버킷리스트 %s</string>
   <string name="book_mark_recommend_text">최근 많이 북마크한 콘텐츠 추천</string>
+  <string name="book_mark_recommend_title">최근 많이 북마크한 인기 콘텐츠</string>
 
   <string name="my_purchase_history">MY 구매∙예약</string>