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

app/src/main/java/kr/co/zumo/app/lifeplus/view/animation/Loading.java

@@ -71,11 +71,16 @@ public class Loading {
       FrameLayout frameLayout = activity.findViewById(android.R.id.content);
       LayoutInflater inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
       view = inflater.inflate(R.layout.dialog_loading, null);
+      FrameLayout layoutContainer = view.findViewById(R.id.container_loading);
+
 
       /**
-       * navigationBar 있는 경우 하단 마진 추가함
+       * navigationBar 있는 경우 하단 마진 추가, 콘텐츠를 클릭할 때마다 색 반전 방지
        */
-      frameLayout.setPadding(0, 0, 0, ResourceUtil.getNavBarHeight());
+
+      FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) layoutContainer.getLayoutParams();
+      layoutParams.setMargins(0, 0, 0, ResourceUtil.getNavBarHeight());
+      layoutContainer.setLayoutParams(layoutParams);
 
       view.setClickable(true);
       view.setAlpha(0f);

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/Tutorial.java

@@ -125,9 +125,11 @@ public class Tutorial {
     ConstraintLayout bubble1 = view.findViewById(R.id.tutorial_listicle_cover1);
     ConstraintLayout bubble2 = view.findViewById(R.id.tutorial_listicle_cover2);
 
-    //내비게이션바 있을 경우 하단 말풍선에 내비게이션바 높이만큼 패딩추가
+    //내비게이션바 있을 경우 하단 말풍선에 내비게이션
+    // 바 높이만큼 패딩추가
     ScreenUtil.setPaddingBottomNavigationBarHeight(bubble2);
 
+
     bubble1.setLayerType(View.LAYER_TYPE_HARDWARE, null);
 
     ObjectAnimator firstTutorial = fadeOut(bubble1);

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

@@ -258,7 +258,6 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
       case Event.TUTORIAL:
         if (false == model.isTutorialListicleDone() && model.getItemCount() > 2) {
           view.showTutorialListicle();
-          model.setTutorialListicleDone();
         }
         break;
       case Event.CLICK_HTML:
@@ -290,7 +289,6 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
         // fixme 로깅 관련 정보(컴퍼니/프로덕트)가 없어서 임시로 url
         firebaseAnalyticsHelper.logPurchase(ResourceUtil.getString(R.string.fa_screen_contents), url, url);
         flushLog();
-        // todo tool tip 표시 필요
         Log.e("APP#  ContentsPresenter | onEventInternal", "|" + url);
         shipToWeb(url, ScreenID.WEB_PURCHASE);
         go(ScreenID.WEB_PURCHASE);
@@ -482,6 +480,7 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
      */
     if (model.getContentsType().equals(ContentsItemBean.TYPE_LISTICLE) && model.getCurrentPageIndex() == 1 && false == model.isTutorialListicleDone() && model.getItemCount() > 2) {
       view.showTutorialListicleDetail();
+      model.setTutorialListicleDone();
     }
 
     /**

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

@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<FrameLayout
   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:id="@+id/container_loading"
   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"
-  tools:background="@color/C000000">
+  tools:background="@color/C000000"
+  >
 
-  <ImageView
-    android:id="@+id/image_loading"
-    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"
-    tools:srcCompat="@drawable/icon_loading"/>
-</android.support.constraint.ConstraintLayout>
+  <FrameLayout
+    android:id="@+id/container_loading"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/CB3FFFFFF"
+    tools:layout_marginBottom="50dp">
+
+
+    <ImageView
+      android:id="@+id/image_loading"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      tools:srcCompat="@drawable/icon_loading"/>
+
+  </FrameLayout>
+</FrameLayout>