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

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

@@ -0,0 +1,7 @@
+<vector android:height="57dp" android:viewportHeight="228"
+    android:viewportWidth="228" android:width="57dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M159.491,133.347a54.348,54.348 0,0 0,3.439 -19.093c0,-30.085 -24.389,-54.473 -54.474,-54.473 -30.085,0 -54.474,24.388 -54.474,54.473 0,30.085 24.39,54.474 54.474,54.474 13.68,0 26.56,-5.058 36.5,-14.037l14.535,-21.344z"
+        android:strokeColor="#D6D6D6" android:strokeWidth="6"/>
+    <path android:fillColor="#D6D6D6" android:fillType="evenOdd" android:pathData="M142.374,155.003l4.242,-4.243 37.253,37.253 -4.242,4.243zM105.982,90.78h6v29.69h-6L105.982,90.78zM105.982,127.502h6v9.375h-6v-9.375z"/>
+</vector>

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

@@ -2,12 +2,44 @@
 <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">
 
 
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_my_faq_none"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:visibility="gone"
+    >
+
+    <ImageView
+      android:id="@+id/image_view_search_none"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="165dp"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:srcCompat="@drawable/icon_search_none"
+      />
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:gravity="center_horizontal"
+      android:lineSpacingExtra="6sp"
+      android:text="@string/faq_none"
+      android:textColor="@color/CC5C5C5"
+      android:textSize="14sp"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/image_view_search_none"
+      />
+  </android.support.constraint.ConstraintLayout>
+
   <android.support.v7.widget.RecyclerView
-    app:layout_constraintTop_toTopOf="parent"
     android:id="@+id/expandable_list_view_my_faq"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -16,30 +48,41 @@
     android:layout_marginRight="25dp"
     android:layout_marginBottom="10dp"
     android:divider="@color/CFFFFFF"
-    android:dividerHeight="50dp">
+    android:dividerHeight="50dp"
+    app:layout_constraintTop_toTopOf="parent">
 
   </android.support.v7.widget.RecyclerView>
 
-  <ImageView
-    android:layout_width="3dp"
-    android:layout_height="3dp"
-    android:layout_marginEnd="4dp"
-    android:src="@drawable/rectangle_c999999"
-    app:layout_constraintBottom_toBottomOf="@+id/text_view_my_faq_notice"
-    app:layout_constraintEnd_toStartOf="@+id/text_view_my_faq_notice"
-    app:layout_constraintTop_toTopOf="@+id/text_view_my_faq_notice"
-    app:layout_constraintVertical_bias="0.281"/>
-  <TextView
-    android:layout_marginStart="32dp"
-    android:id="@+id/text_view_my_faq_notice"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_my_faq_notice"
+    android:layout_width="match_parent"
+
+    android:layout_height="34dp"
     android:layout_marginBottom="41dp"
-    android:lineSpacingExtra="4sp"
-    android:text="@string/faq_notice"
-    android:textColor="@color/C999999"
-    android:textSize="12sp"
     app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    />
+    app:layout_constraintStart_toStartOf="parent">
+
+    <ImageView
+      android:id="@+id/image_view_rectangle"
+      android:layout_width="3dp"
+      android:layout_height="3dp"
+      android:layout_marginStart="25dp"
+      android:layout_marginTop="5dp"
+      android:src="@drawable/rectangle_c999999"
+      app:layout_constraintEnd_toStartOf="@+id/text_view_my_faq_notice"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"/>
+
+    <TextView
+      android:id="@+id/text_view_my_faq_notice"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="4sp"
+      android:layout_marginStart="4dp"
+      android:text="@string/faq_notice"
+      android:textColor="@color/C999999"
+      android:textSize="12sp"
+      app:layout_constraintStart_toEndOf="@+id/image_view_rectangle"
+      />
+  </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>

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

@@ -15,7 +15,8 @@
   <string name="complete">완료</string>
   <string name="faq">자주 찾는 질문</string>
   <string name="my_faq">문의내역</string>
-  <string name="member_confirm">"<u>회원확인</u>"</string>
+  <string name="member_confirm"><u>회원확인</u></string>
+  <string name="faq_none">문의하신 내용이 없습니다.</string>
   <string name="faq_notice">답변알림이 오지 않을 경우 <u>여기</u>를 눌러 알림수신을\n허용해주세요.</string>
 
   <string name="lifeplus_email">&lifeplus_email;</string>