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

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

@@ -53,6 +53,10 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
   protected ImageView imageViewBookmark2;
   protected TextView textViewBookmark1;
   protected TextView textViewBookmark2;
+
+  protected ConstraintLayout layoutBookmark1;
+  protected ConstraintLayout layoutBookmark2;
+
   protected ConstraintLayout layoutLikeBookmark1;
   protected ConstraintLayout layoutLikeBookmark2;
 
@@ -86,6 +90,9 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     textViewBookmarkCount = findViewById(R.id.text_view_book_mark);
     textViewBookmarkRecommend = findViewById(R.id.text_view_book_mark_recommend);
 
+    layoutBookmark1 = findViewById(R.id.fifth_layout);
+    layoutBookmark2 = findViewById(R.id.sixth_layout);
+
     textViewBookmark1 = findViewById(R.id.text_view_book_mark1);
     textViewBookmark2 = findViewById(R.id.text_view_book_mark2);
 
@@ -170,6 +177,8 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
 
     if (size > 0) {
       // #1
+      layoutBookmark1.setVisibility(View.VISIBLE);
+      layoutBookmark2.setVisibility(View.GONE);
       layoutLikeBookmark1.setVisibility(View.VISIBLE);
       textViewBookmark1.setText(bookmarkBeans.get(0).getTitle());
       Glide.with(imageViewBookmark1).load(bookmarkBeans.get(0).getImageUrl()).into(imageViewBookmark1);
@@ -187,6 +196,8 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
 
     if (size > 1) {
       // #2
+      layoutBookmark1.setVisibility(View.VISIBLE);
+      layoutBookmark2.setVisibility(View.VISIBLE);
       layoutLikeBookmark2.setVisibility(View.VISIBLE);
       textViewBookmark2.setText(bookmarkBeans.get(1).getTitle());
       Glide.with(imageViewBookmark2).load(bookmarkBeans.get(1).getImageUrl()).into(imageViewBookmark2);
@@ -230,6 +241,8 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     textViewBookmarkRecommend.setVisibility(View.VISIBLE);
 
     if (defaultBookmarkBeans.size() == 1) {
+      layoutBookmark1.setVisibility(View.VISIBLE);
+      layoutBookmark2.setVisibility(View.GONE);
       layoutLikeBookmark1.setVisibility(View.GONE);
       textViewBookmark1.setText(defaultBookmarkBeans.get(0).getTitle());
       Glide.with(imageViewBookmark1).load(defaultBookmarkBeans.get(0).getImageUrl()).into(imageViewBookmark1);
@@ -239,6 +252,8 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
 
     }
     else {
+      layoutBookmark1.setVisibility(View.VISIBLE);
+      layoutBookmark2.setVisibility(View.VISIBLE);
       textViewBookmark1.setText(defaultBookmarkBeans.get(0).getTitle());
       layoutLikeBookmark1.setVisibility(View.GONE);
       Glide.with(imageViewBookmark1).load(defaultBookmarkBeans.get(0).getImageUrl()).into(imageViewBookmark1);

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

@@ -5,6 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  tools:layout_marginTop="-300dp"
   android:orientation="vertical">
 
   <android.support.constraint.ConstraintLayout
@@ -360,6 +361,8 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="13dp"
+      android:visibility="gone"
+      tools:visibility="visible"
       app:layout_constraintTop_toBottomOf="@+id/fourth_layout">
 
       <ImageView
@@ -444,6 +447,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="25dp"
+      android:visibility="gone"
       app:layout_constraintTop_toBottomOf="@+id/fifth_layout">
 
       <ImageView