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

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

@@ -4,6 +4,7 @@ import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +12,7 @@ import android.view.Window;
 import android.view.WindowManager;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 
 /**
@@ -40,6 +42,11 @@ public class TooltipDialog extends DialogBase<ICustomDialogListener<TooltipDialo
     window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
     window.setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
 
+    int statusBarHeight = ResourceUtil.getStatusBarHeight();
+    ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) getView().findViewById(R.id.over_view_dialog).getLayoutParams();
+    layoutParams.topMargin = layoutParams.topMargin + statusBarHeight;
+
+
     getView().findViewById(R.id.over_view_dialog).setOnClickListener(view -> {
       if (null != getCustomListener()) {
         getCustomListener().onDialogResult(TooltipDialog.this, new Event.Builder(Event.OVER_VIEW).build());

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout
-  android:id="@+id/layout_background"
   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/layout_background"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   >
@@ -12,8 +12,8 @@
     android:id="@+id/over_view_dialog"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_marginTop="45dp"
     android:layout_marginEnd="4dp"
-    android:layout_marginTop="43dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent">
 

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

@@ -42,7 +42,7 @@
       <android.support.v7.widget.Toolbar
         android:id="@+id/flexible.example.toolbar"
         android:layout_width="match_parent"
-        android:layout_height="22dp"
+        android:layout_height="24dp"
         android:background="@null"
         android:visibility="invisible"
         app:elevation="0dp"