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

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/LoadingDialog.java

@@ -3,7 +3,15 @@
  */
 package kr.co.zumo.app.lifeplus.view.dialog;
 
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
+import android.view.WindowManager;
 
 import kr.co.zumo.app.R;
 
@@ -19,11 +27,18 @@ import kr.co.zumo.app.R;
  */
 public class LoadingDialog extends DialogBase {
 
+
   @Override
   protected void onActivityCreatedInternal() {
     Window window = getDialog().getWindow();
-    window.setBackgroundDrawableResource(R.color.C66FFFFFF);
+    window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+    window.setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
+  }
 
-    setCancelable(false);
+  @Nullable
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return inflater.inflate(R.layout.dialog_loading, container, false);
   }
+
 }

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

@@ -113,7 +113,7 @@ public class FirstCategoryMainFragment extends CategoryMainFragment<FirstCategor
       presenter.onEvent(event);
     });
 
-    recyclerView.setPadding(ResourceUtil.dpToPx(21), 0, ResourceUtil.dpToPx(21), 0);
+    recyclerView.setPadding(ResourceUtil.dpToPx(21), 0, ResourceUtil.dpToPx(21), ResourceUtil.dpToPx(21));
     recyclerView.addItemDecoration(new GridItemDecoration(getActivity(), ResourceUtil.dpToPx(4), ResourceUtil.dpToPx(4), ResourceUtil.dpToPx(4), ResourceUtil.dpToPx(4)));
     recyclerView.setAdapter(adapter);
 

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

@@ -110,7 +110,7 @@ public class SecondCategoryMainFragment extends CategoryMainFragment<SecondCateg
       presenter.onEvent(event);
     });
 
-    recyclerView.setPadding(ResourceUtil.dpToPx(25), 0, ResourceUtil.dpToPx(25), 0);
+    recyclerView.setPadding(ResourceUtil.dpToPx(25), 0, ResourceUtil.dpToPx(25), ResourceUtil.dpToPx(25));
     recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
     recyclerView.setAdapter(adapter);
 

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

@@ -100,7 +100,7 @@ public class ThirdCategoryMainFragment extends CategoryMainFragment<ThirdCategor
     adapter = new ThirdCategoryMainAdapter(getActivity(), bannerBeans, contents, event -> {
       presenter.onEvent(event);
     });
-    recyclerView.setPadding(ResourceUtil.dpToPx(25), 0, ResourceUtil.dpToPx(25), 0);
+    recyclerView.setPadding(ResourceUtil.dpToPx(25), 0, ResourceUtil.dpToPx(25), ResourceUtil.dpToPx(25));
     GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 2);
     gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
       @Override

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

@@ -104,7 +104,7 @@ public class FourthCategoryMainFragment extends CategoryMainFragment<FourthCateg
       presenter.onEvent(event);
     });
     LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false);
-    recyclerView.setPadding(ResourceUtil.dpToPx(25), 0, ResourceUtil.dpToPx(25), 0);
+    recyclerView.setPadding(ResourceUtil.dpToPx(25), 0, ResourceUtil.dpToPx(25), ResourceUtil.dpToPx(25));
     recyclerView.setLayoutManager(linearLayoutManager);
     recyclerView.setAdapter(adapter);
   }

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

@@ -87,7 +87,7 @@ public class FifthCategoryMainFragment extends CategoryMainFragment<FifthCategor
       presenter.onEvent(event);
     });
     LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false);
-    recyclerView.setPadding(ResourceUtil.dpToPx(25), 0, ResourceUtil.dpToPx(25), 0);
+    recyclerView.setPadding(ResourceUtil.dpToPx(25), 0, ResourceUtil.dpToPx(25), ResourceUtil.dpToPx(25));
     recyclerView.setLayoutManager(linearLayoutManager);
     recyclerView.setAdapter(fifthCategoryMainAdapter);
 

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

@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="175"
+    android:viewportHeight="175">
+  <path
+      android:pathData="M78.674,48.58m-47.536,0a47.536,47.536 0,1 1,95.072 0a47.536,47.536 0,1 1,-95.072 0"
+      android:fillColor="#F27824"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M28.82,22.707m-17.391,0a17.391,17.391 0,1 1,34.782 0a17.391,17.391 0,1 1,-34.782 0"
+      android:fillColor="#F6A973"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M32.449,40.127a17.325,17.325 77,0 1,-12.068 -2.407c-8.146,-5.09 -10.623,-15.82 -5.533,-23.965 5.09,-8.146 15.82,-10.623 23.966,-5.533a17.31,17.31 77,0 1,6.406 7.102c15.269,-15.68 39.904,-19.179 59.221,-7.108 22.264,13.912 29.035,43.238 15.123,65.503 -13.912,22.264 -43.239,29.035 -65.503,15.123 -16.968,-10.603 -24.937,-30.157 -21.611,-48.715z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="102.754"
+          android:startX="142.89093"
+          android:endY="-13.281371"
+          android:endX="-14.348452"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFF8D8D"/>
+        <item android:offset="1" android:color="#FFFF9423"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M153.638,-6.609m-17.391,0a17.391,17.391 0,1 1,34.782 0a17.391,17.391 0,1 1,-34.782 0"
+      android:fillColor="#F2AF81"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M6.391,163.826m-17.391,0a17.391,17.391 0,1 1,34.782 0a17.391,17.391 0,1 1,-34.782 0"
+      android:fillColor="#F2AF81"
+      android:fillType="evenOdd"/>
+</vector>

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

@@ -0,0 +1,24 @@
+<?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"
+  android:background="@color/CB3FFFFFF"
+  app:layout_constraintBottom_toBottomOf="parent"
+  app:layout_constraintEnd_toEndOf="parent"
+  app:layout_constraintStart_toStartOf="parent"
+  app:layout_constraintTop_toTopOf="parent">
+
+  <ImageView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHorizontal_bias="0.49"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="0.51"
+    app:srcCompat="@drawable/icon_loading"/>
+</android.support.constraint.ConstraintLayout>

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

@@ -9,6 +9,7 @@
   <color name="C4DFFFFFF">#4DFFFFFF</color> <!-- 30%-->
   <color name="C66FFFFFF">#66FFFFFF</color> <!-- 40%-->
   <color name="C80FFFFFF">#80FFFFFF</color> <!-- 50% -->
+  <color name="CB3FFFFFF">#B3FFFFFF</color> <!-- 70% -->
   <color name="CCCFFFFFF">#CCFFFFFF</color> <!-- 80%-->
   <color name="CF2FFFFFF">#F2FFFFFF</color> <!-- 95% -->