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

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/contents/CustomListicleImageViewAdapter.java

@@ -75,7 +75,7 @@ public class CustomListicleImageViewAdapter extends RecyclerView.Adapter<CustomL
 
   @Override
   public int getItemCount() {
-    if (null != contentsDetailImageBeans) {
+    if (null != contentsDetailImageBeans && contentsDetailImageBeans.size() > 0) {
       return (contentsDetailImageBeans.size() == 1) ? 1 : Integer.MAX_VALUE;
     }
     else {

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/contents/series/CustomContentsSeriesView.java

@@ -6,6 +6,7 @@ package kr.co.zumo.app.lifeplus.view.custom.contents.series;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
@@ -20,6 +21,7 @@ import java.util.List;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.SeriesItemBean;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.screen.contents.series.ContentsSeriesAdapter;
 
@@ -36,6 +38,7 @@ import kr.co.zumo.app.lifeplus.view.screen.contents.series.ContentsSeriesAdapter
 public class CustomContentsSeriesView extends FrameLayout {
 
   private RecyclerView recyclerView;
+  private TextView textViewLogo;
   private TextView textViewTitle;
   private TextView textViewSubTitle;
   private ContentsSeriesAdapter adapter;
@@ -61,6 +64,7 @@ public class CustomContentsSeriesView extends FrameLayout {
     LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     inflater.inflate(R.layout.custom_contents_series, this);
 
+    textViewLogo = findViewById(R.id.text_view_logo);
     textViewSubTitle = findViewById(R.id.text_view_sub_title);
     textViewTitle = findViewById(R.id.text_view_title);
     imageBackground = findViewById(R.id.image_view_series);
@@ -81,6 +85,11 @@ public class CustomContentsSeriesView extends FrameLayout {
       .asBitmap().load(url).into(imageBackground);
   }
 
+  public void setSeriesTitleSpacingInFullScreen(){
+    ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams)textViewLogo.getLayoutParams();
+    layoutParams.setMargins(0, ResourceUtil.dpToPx(52), 0,0);
+  }
+
   public void draw(List<SeriesItemBean> list, IEventListener listener) {
     LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 

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

@@ -42,7 +42,7 @@ public class ContentsOverviewFragment extends FragmentBase<ContentsOverviewPrese
   private ImageView buttonBookmark;
   private ImageView imageShare;
   private ImageView imageLiked;
-  private ImageView imagBookmark;
+  private ImageView imageBookmark;
 
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -66,7 +66,7 @@ public class ContentsOverviewFragment extends FragmentBase<ContentsOverviewPrese
     buttonBookmark = findViewById(R.id.circle_2);
     imageShare = findViewById(R.id.icon_share);
     imageLiked = findViewById(R.id.icon_like);
-    imagBookmark = findViewById(R.id.icon_bookmark);
+    imageBookmark = findViewById(R.id.icon_bookmark);
 
     buttonShare.setOnClickListener(v -> {
       presenter.onEvent(new Event.Builder(Event.SHARE).build());
@@ -145,10 +145,10 @@ public class ContentsOverviewFragment extends FragmentBase<ContentsOverviewPrese
   @Override
   public void setBookmarked(boolean isChecked) {
     if (isChecked) {
-      imagBookmark.setImageResource(R.drawable.icon_header_bookmark_wh_on);
+      imageBookmark.setImageResource(R.drawable.icon_header_bookmark_wh_on);
     }
     else {
-      imagBookmark.setImageResource(R.drawable.icon_header_bookmark_off_over_view);
+      imageBookmark.setImageResource(R.drawable.icon_header_bookmark_off_over_view);
     }
 
   }

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

@@ -33,6 +33,8 @@ public class ContentsSeriesHolder extends ContentsHolder<SeriesListBean> {
     seriesView.setSeriesBackgroundUrl(seriesInfo.getImageUrl());
     seriesView.setSeriesTitle(seriesInfo.getTitle());
     seriesView.setSeriesSubTitle(seriesInfo.getSubTitle());
+    //풀스크린일때 간격 조정
+    seriesView.setSeriesTitleSpacingInFullScreen();
 
     seriesView.draw(bean.getSeriesItemList(), event -> {
       listener.onEvent(event);

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

@@ -41,6 +41,7 @@ public class MyCoinDetailFragment extends FragmentBase<MyCoinDetailPresenter> im
   private ConstraintLayout layoutFilterContents;
   private RelativeLayout filterDivider;
   private View viewDivider;
+  private View viewWhiteDivider;
   private ImageView imageViewCoinInformationDialog;
   private List<MyCoinBean> myCoinBeanList;
   private TextView textViewExtinctCoin;
@@ -61,6 +62,7 @@ public class MyCoinDetailFragment extends FragmentBase<MyCoinDetailPresenter> im
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     layoutFilterContents = findViewById(R.id.layout_filter_contents);
     viewDivider = findViewById(R.id.view_divider);
+    viewWhiteDivider = findViewById(R.id.divider_white);
     filterDivider = findViewById(R.id.filter_divider);
     imageViewCoinInformationDialog = findViewById(R.id.image_view_coin_information_pop_up);
 
@@ -143,8 +145,9 @@ public class MyCoinDetailFragment extends FragmentBase<MyCoinDetailPresenter> im
   @Override
   public void doClickFilter() {
     clickFlag = !clickFlag;
-    viewDivider.setVisibility(clickFlag? View.GONE : View.VISIBLE);
-    layoutFilterContents.setVisibility(clickFlag? View.VISIBLE : View.GONE);
+    viewDivider.setVisibility(clickFlag ? View.GONE : View.VISIBLE);
+    viewWhiteDivider.setVisibility(clickFlag ? View.GONE : View.VISIBLE);
+    layoutFilterContents.setVisibility(clickFlag ? View.VISIBLE : View.GONE);
 
   }
 }

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

@@ -30,7 +30,7 @@
       />
 
     <TextView
-      android:id="@+id/textView10"
+      android:id="@+id/text_view_logo"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:background="@color/CFFFFFF"
@@ -56,17 +56,17 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="12dp"
-      android:maxLines="1"
       android:ellipsize="end"
-      android:maxWidth="150dp"
       android:lineSpacingExtra="7sp"
+      android:maxWidth="150dp"
+      android:maxLines="1"
       android:textColor="@color/CFFFFFF"
       android:textSize="12sp"
       app:layout_constraintBottom_toTopOf="@+id/text_view_title"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintHorizontal_bias="0.5"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/textView10"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_logo"
       tools:text="세상 모든 無취미인을 위한ddddddddddddddddddddddddddddddddddddddddddddddddd"/>
 
     <TextView
@@ -76,8 +76,8 @@
       android:layout_marginTop="4dp"
       android:ellipsize="end"
       android:lineSpacingExtra="6sp"
-      android:maxLines="1"
       android:maxWidth="250dp"
+      android:maxLines="1"
       android:textColor="@color/CFFFFFF"
       android:textSize="19sp"
       app:layout_constraintBottom_toBottomOf="parent"

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

@@ -70,6 +70,7 @@
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:descendantFocusability="blocksDescendants"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
 

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

@@ -71,6 +71,7 @@
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:descendantFocusability="blocksDescendants"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <android.support.v7.widget.RecyclerView

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

@@ -235,7 +235,7 @@
 
 
     <View
-      android:id="@+id/space"
+      android:id="@+id/divider_white"
       android:layout_width="match_parent"
       android:layout_height="3dp"
       android:background="@color/CFFFFFF"