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

app/src/main/res/drawable/splash_background.xml

@@ -7,7 +7,7 @@
 
   <item
       android:gravity="center"
-      android:drawable="@drawable/bi_splash_bk">
+      android:drawable="@drawable/bi_splash">
   </item>
 
 </layer-list>

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <ImageView
+    android:id="@+id/image_view_filter_result_nothing"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:srcCompat="@drawable/icon_category_main_contents_nothing"
+    />
+
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="18dp"
+    android:gravity="center_horizontal"
+    android:lineSpacingExtra="6sp"
+    android:text="@string/filter_result_nothing"
+    android:textColor="@color/CC5C5C5"
+    android:textSize="14sp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/image_view_filter_result_nothing"
+    />
+
+</android.support.constraint.ConstraintLayout>

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

@@ -6,7 +6,7 @@
 
 <kr.co.zumo.app.lifeplus.view.custom.main.banner.MainBannerView
   android:id="@+id/main_banner_view_first_category"
-  android:layout_width="311dp"
+  android:layout_width="match_parent"
   android:layout_height="122dp"/>
 
 </android.support.constraint.ConstraintLayout>

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

@@ -6,7 +6,7 @@
 
   <kr.co.zumo.app.lifeplus.view.custom.main.banner.MainBannerView
     android:id="@+id/main_banner_view_first_category"
-    android:layout_width="311dp"
+    android:layout_width="match_parent"
     android:layout_height="122dp"/>
 
 </android.support.constraint.ConstraintLayout>

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

@@ -6,7 +6,7 @@
 
   <kr.co.zumo.app.lifeplus.view.custom.main.banner.MainBannerView
     android:id="@+id/main_banner_view_first_category"
-    android:layout_width="311dp"
+    android:layout_width="match_parent"
     android:layout_height="122dp"/>
 
 </android.support.constraint.ConstraintLayout>

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

@@ -390,6 +390,8 @@
   <string name="reset_filter">초기화</string>
   <string name="show_contents">48개 콘텐츠 보기</string>
 
+  <string name="filter_result_nothing">콘텐츠를 준비하고 있습니다.
\n다른 필터로 적용해주세요.</string>
+