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

app/src/main/AndroidManifest.xml

@@ -132,7 +132,7 @@
       android:windowSoftInputMode="adjustResize">
     </activity>
     <activity
-      android:name=".lifeplus.activity.FAQActivity"
+      android:name=".lifeplus.activity.InquiryActivity"
       android:screenOrientation="portrait"
       android:windowSoftInputMode="adjustResize">
     </activity>

app/src/main/java/kr/co/zumo/app/lifeplus/activity/FAQActivity.java

@@ -14,11 +14,12 @@ import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
  * @history 하세미   [2018-12-10]   [최초 작성]
  * @since 2018-12-10
  */
-public class FAQActivity extends ActivityBaseScreen {
+public class InquiryActivity extends ActivityBaseScreen {
 
   @Override
   protected void render() {
-    launchScreen(ScreenID.FAQ);
+    //문의내역 쓰기 액티비티변경
+    launchScreen(ScreenID.INQUIRY_WRITE);
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/ScreenID.java

@@ -48,7 +48,7 @@ public class ScreenID {
   public static final int MY_COIN_DETAIL = 25;
   public static final int MY_BUCKET_LIST = 27;
   public static final int ADD_MY_BUCKET = 28;
-  public static final int FAQ_WRITE = 29;
+  public static final int INQUIRY_WRITE = 29;
   public static final int BUCKET_DETAIL_WITH_TAG = 1030;
   public static final int FIRST_CATEGORY = 31;
   public static final int SECOND_CATEGORY = 32;
@@ -122,7 +122,7 @@ public class ScreenID {
 //    PIN_RESET_AUTH_FROM_ALREADY_MEMBER, PIN_RESET_INPUT_FROM_MEMBER_BLOCK, MY_MAIN, MY_MAIN_GUEST,
     SIGN_UP_START, SIGN_UP_MOBILE_AUTHORIZATION, SIGN_UP_ALREADY_MEMBER, SIGN_UP_NEED_FOR_30DAYS, SIGN_UP_PIN, SIGN_UP_AGREE,
     SIGN_UP_COMPLETED, SIGN_UP_UNDER_14_YEARS, REST_MEMBER_START, REST_MEMBER_ACTIVE_COMPLETED, MEMBER_BLOCK, SIGN_UP_START_FROM_ON_BOARDING,
-    BUCKET_BEST, MY_COIN_DETAIL, MY_BUCKET_LIST, ADD_MY_BUCKET, FAQ_WRITE, BUCKET_DETAIL_WITH_TAG, FIRST_CATEGORY, SECOND_CATEGORY, THIRD_CATEGORY,
+    BUCKET_BEST, MY_COIN_DETAIL, MY_BUCKET_LIST, ADD_MY_BUCKET, INQUIRY_WRITE, BUCKET_DETAIL_WITH_TAG, FIRST_CATEGORY, SECOND_CATEGORY, THIRD_CATEGORY,
     FOURTH_CATEGORY, FIFTH_CATEGORY, NOTIFICATION, SETTING_CODE, BOOK_MARK_DEFAULT, BOOK_MARK_LIST, MY_COIN_MAIN, MY_COIN_EXTINCT, MY_PURCHASE_HISTORY,
     LIFE_PLUS_INTRODUCTION, LIFE_PLUS_X, SETTING_MEMBER_INFO, COUPON_MALL, ALL_MENU_GUEST, SETTING_MEMBER_QUIT_INFO, MY_FAQ, SETTING_MEMBER_QUIT_REQUEST,
     SETTING_MEMBER_QUIT_FINISH, SETTING_TERMS, SETTING_MEMBER_QUIT_FAIL, MAIN_PIN_UNLOCK, PIN_RESET_AUTH, PIN_RESET_INPUT, PIN_RESET_AUTH_FROM_SETTING,

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/ActivityScreen.java

@@ -25,7 +25,7 @@ import kr.co.zumo.app.lifeplus.activity.EventParticipationActivity;
 import kr.co.zumo.app.lifeplus.activity.EventRecommendActivity;
 import kr.co.zumo.app.lifeplus.activity.EventRecordActivity;
 import kr.co.zumo.app.lifeplus.activity.EventWinnerActivity;
-import kr.co.zumo.app.lifeplus.activity.FAQActivity;
+import kr.co.zumo.app.lifeplus.activity.InquiryActivity;
 import kr.co.zumo.app.lifeplus.activity.IntroductionActivity;
 import kr.co.zumo.app.lifeplus.activity.MapActivity;
 import kr.co.zumo.app.lifeplus.activity.MyEventActivity;
@@ -116,7 +116,7 @@ public class ActivityScreen extends Screen {
         break;
 
       case ScreenID.FAQ:
-        intent = new Intent(activity, FAQActivity.class);
+        intent = new Intent(activity, InquiryActivity.class);
         break;
 
       case ScreenID.EVENT_DETAIL:

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

@@ -556,7 +556,7 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
           @Override
           public void onNegativeResult(ConfirmDialog dialog, Event event) {
             dialog.dispose();
-            go(ScreenID.FAQ_WRITE);
+            go(ScreenID.INQUIRY_WRITE);
           }
 
           @Override

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

@@ -167,7 +167,7 @@ public class BasicFragmentFactory extends FragmentFactory {
       case ScreenID.FAQ:
         fragment = new FAQFragment();
         break;
-      case ScreenID.FAQ_WRITE:
+      case ScreenID.INQUIRY_WRITE:
         fragment = new FAQWriteFragment();
         break;
       case ScreenID.MY_FAQ:

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

@@ -95,7 +95,7 @@ public class MyFAQPresenter extends Presenter<MyFAQModel, IMyFaqView> {
 
   @Override
   public void onActionButtonClick() {
-    go(ScreenID.FAQ_WRITE);
+    go(ScreenID.INQUIRY_WRITE);
   }
 
   @Override

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

@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
-  <ScrollView
+  <android.support.v4.widget.NestedScrollView
     android:layout_width="match_parent"
     android:layout_height="0dp"
     android:layout_marginBottom="42dp"
@@ -97,9 +97,9 @@
           android:layout_marginTop="3dp"
           android:layout_marginBottom="14dp"
           android:lineSpacingExtra="6sp"
+          android:textAlignment="center"
           android:textColor="@color/C666666"
           android:textSize="14sp"
-          android:textAlignment="center"
           tools:text="- 일시 : 2018년 5월 27일(일) 04:00~07:00 점검 시간동안 해당 메뉴를\n 이용할 수 없는 점 양해부탁드립니다. 점검 시간동안 해당 메뉴를\n 이용할 수 없는 점 양해부탁드립니다."
           />
 
@@ -159,7 +159,7 @@
 
     </android.support.constraint.ConstraintLayout>
 
-  </ScrollView>
+  </android.support.v4.widget.NestedScrollView>
 
   <android.support.constraint.ConstraintLayout
     android:id="@+id/layout_two_button"