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

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/recommend/RecommendContentsView.java

@@ -130,7 +130,7 @@ public class RecommendContentsView extends ConstraintLayout {
   public void draw(Context context, List<? extends LifeplusContentsBean> withItemList, IEventListener listener) {
     List<? extends LifeplusContentsBean> withItemList1 = withItemList;
 
-    customIndicator.setIndicator(recyclerViewRecommendContents, R.color.C19000000, R.color.C000000, event -> {
+    customIndicator.setIndicator(recyclerViewRecommendContents, R.color.C000000, R.color.C19000000, event -> {
       Log.e("APP#  RecommendContentsView | onEvent", "|" + event.getIndex());
       recyclerViewRecommendContents.smoothScrollToPosition(event.getIndex());
     });

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

@@ -374,8 +374,6 @@ public class MainCategoryContentsImageView extends MainCategoryContentsView {
 //          int imageLoadedHeight = resource.getHeight(); //this is the bitmap's height
 //          Log.i("APP# MainCategoryContentsImageView | init", "| maskWidth: " + maskWidth + ", maskHeight: " + maskHeight);
 //          Log.i("APP# MainCategoryContentsImageView | init", "| imageWidth: " + imageLoadedWidth + ", imageHeight: " + imageLoadedHeight);
-
-          imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
           imageWidth = overrideWidth;
           imageHeight = overrideHeight;
           onScrolledForImage();

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

@@ -9,10 +9,9 @@
   <android.support.v4.view.ViewPager
     android:id="@+id/recycler_view_event"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="468dp"
     android:layout_marginTop="14dp"
     android:layout_marginBottom="88dp"
-    app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"