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

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/Presenter.java

@@ -245,6 +245,7 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
         }
         break;
       case Event.BOOKMARK:
+
         if (SuperModel.getInstance().isJoined()) {
           model.loadMyBookMarkCount(evt -> {
             if (evt.getInteger() == 0) {

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

@@ -150,7 +150,9 @@ public abstract class CategoryFilterPresenter<M extends CategoryFilterModel, V e
 
   private void loadFilteringContents() {
     model.loadFilteringContents(filterDialog, event -> {
-      filterDialog.setContentsCount(event.getInteger());
+      if (null != filterDialog) {
+        filterDialog.setContentsCount(event.getInteger());
+      }
     });
   }
 

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

@@ -8,7 +8,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
-import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import kr.co.zumo.app.R;
@@ -35,7 +34,6 @@ public class FAQWriteFragment extends FragmentBase<FAQWritePresenter> implements
   private View layoutNotice;
   private SwitchCompat switchPushOnOff;
   private View viewRegistration;
-  private RadioGroup radioGroupCategory;
 
   @Nullable
   @Override
@@ -50,7 +48,6 @@ public class FAQWriteFragment extends FragmentBase<FAQWritePresenter> implements
     textDeviceInfo = findViewById(R.id.text_device_info);
     layoutNotice = findViewById(R.id.layout_notice);
     viewRegistration = findViewById(R.id.button_registration);
-    radioGroupCategory = findViewById(R.id.radio_group_category);
 
     editContents.addTextChangedListener(new SimpleTextWatcher() {
       @Override
@@ -76,15 +73,6 @@ public class FAQWriteFragment extends FragmentBase<FAQWritePresenter> implements
       presenter.onEvent(new Event.Builder(Event.CANCEL).build());
     });
 
-    int len = radioGroupCategory.getChildCount();
-    for (int i = 0; i < len; ++i) {
-      (radioGroupCategory.getChildAt(i)).setOnClickListener(v -> {
-        int selectIndex = radioGroupCategory.indexOfChild(v);
-        presenter.onViewCategoryChecked(selectIndex);
-      });
-    }
-
-
   }
 
   @Override

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

@@ -142,9 +142,9 @@ public class FAQWritePresenter extends Presenter<FAQWriteModel, IFAQWriteView> {
    *
    * @param index
    */
-  public void onViewCategoryChecked(int index) {
+/*  public void onViewCategoryChecked(int index) {
     model.setCategory(index);
-  }
+  }*/
 
   /**
    * 문의 글 입력

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

@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-  >
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
 
   <item android:drawable="@android:color/white"/>
 
   <item>
-    <bitmap android:src="@drawable/bi_splash"
-            android:gravity="center"/>
+    <bitmap
+      android:gravity="center"
+      android:src="@drawable/bi_splash"/>
   </item>
+
+  <item android:bottom="45dp">
+    <bitmap
+      android:gravity="bottom|center"
+      android:src="@drawable/logo_lifeplus"/>
+  </item>
+
+
 </layer-list>

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

@@ -159,20 +159,25 @@
       </LinearLayout>
     </android.support.design.widget.AppBarLayout>
 
-
-    <android.support.v7.widget.RecyclerView
-      android:id="@+id/recycler_view_event_list_detail"
+    <LinearLayout
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="17dp"
-      android:clipToPadding="false"
-      android:paddingStart="25dp"
-      android:paddingTop="2dp"
-      android:paddingEnd="25dp"
-      android:paddingBottom="25dp"
-      app:layout_behavior="@string/appbar_scrolling_view_behavior"
-      />
+      android:layout_height="match_parent"
+      android:orientation="vertical"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
+      <android.support.v7.widget.RecyclerView
+        android:id="@+id/recycler_view_event_list_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="17dp"
+        android:clipToPadding="false"
+        android:paddingStart="25dp"
+        android:paddingTop="2dp"
+        android:paddingEnd="25dp"
+        android:paddingBottom="25dp"
+
+        />
+    </LinearLayout>
   </android.support.design.widget.CoordinatorLayout>
 
   <android.support.constraint.ConstraintLayout

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

@@ -13,7 +13,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <LinearLayout
+    <!--<LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginStart="25dp"
@@ -97,12 +97,13 @@
           />
       </RadioGroup>
 
-    </LinearLayout>
+    </LinearLayout>-->
 
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="0dp"
       android:layout_marginStart="25dp"
+      android:layout_marginTop="21dp"
       android:layout_marginEnd="25dp"
       android:layout_weight="1"
       android:background="@drawable/rectangle_border_ce5e5e5_corner_2"
@@ -136,7 +137,7 @@
           android:layout_marginEnd="56dp"
           android:layout_marginBottom="10dp"
           android:gravity="center"
-          android:textColor="@color/CF27824"
+          android:textColor="@color/CFF0053"
           android:textSize="12sp"
           tools:text="51"/>