From a7135ac097d7f869ced57f23638e9c3b4f0b71f2 Mon Sep 17 00:00:00 2001
From: CPstudy <guide94@naver.com>
Date: Fri, 3 Aug 2018 11:09:05 +0900
Subject: [PATCH] Change Animation

---
 .../java/com/guk2zzada/sandwich/Sandwich.java | 17 ++--
 .../src/main/res/layout/layout_sandwich.xml   | 88 ++++++++++---------
 2 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/sandwich/src/main/java/com/guk2zzada/sandwich/Sandwich.java b/sandwich/src/main/java/com/guk2zzada/sandwich/Sandwich.java
index ae1267d..de071a6 100644
--- a/sandwich/src/main/java/com/guk2zzada/sandwich/Sandwich.java
+++ b/sandwich/src/main/java/com/guk2zzada/sandwich/Sandwich.java
@@ -80,7 +80,6 @@ public static Sandwich makeText(Context context, String message, @Duration int d
     }
 
     public void show() {
-        final FrameLayout layoutRoot = mLayout.findViewById(R.id.layoutRoot);
         final RelativeLayout layoutFront = mLayout.findViewById(R.id.layoutFront);
         final RelativeLayout layoutBack = mLayout.findViewById(R.id.layoutBack);
         //final ImageView imgBack = mLayout.findViewById(R.id.imgBack);
@@ -96,10 +95,8 @@ public void show() {
         txtText2.setText(mMessage);
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
-            layoutFront.setBackgroundDrawable(drawable);
             layoutBack.setBackgroundDrawable(drawable);
         } else {
-            layoutFront.setBackground(drawable);
             layoutBack.setBackground(drawable);
         }
 
@@ -108,31 +105,37 @@ public void show() {
             @Override
             public void onGlobalLayout() {
                 int height = layoutBack.getHeight();
-                layoutFront.setTranslationY(-height);
 
-                final ObjectAnimator scaleBounceX = ObjectAnimator.ofFloat(layoutRoot, View.SCALE_X, 0.5f, 1.0f);
+                final ObjectAnimator alphaInvisible = ObjectAnimator.ofFloat(layoutFront, View.ALPHA, 1.0f, 0.0f);
+                alphaInvisible.setDuration(0);
+
+                final ObjectAnimator alphaVisible = ObjectAnimator.ofFloat(layoutFront, View.ALPHA, 0.0f, 1.0f);
+                alphaVisible.setDuration(0);
+
+                final ObjectAnimator scaleBounceX = ObjectAnimator.ofFloat(layoutBack, View.SCALE_X, 0.5f, 1.0f);
                 scaleBounceX.setInterpolator(new BounceInterpolator());
                 scaleBounceX.setDuration(DURATION_ICON);
 
-                final ObjectAnimator scaleBounceY = ObjectAnimator.ofFloat(layoutRoot, View.SCALE_Y, 0.5f, 1.0f);
+                final ObjectAnimator scaleBounceY = ObjectAnimator.ofFloat(layoutBack, View.SCALE_Y, 0.5f, 1.0f);
                 scaleBounceY.setInterpolator(new BounceInterpolator());
                 scaleBounceY.setDuration(DURATION_ICON);
 
                 final ObjectAnimator slideUp = ObjectAnimator.ofFloat(layoutFront, View.TRANSLATION_Y, -height, 0);
                 slideUp.setDuration(DURATION_BOX);
-                slideUp.setInterpolator(new DecelerateInterpolator());
 
                 scaleBounceX.addListener(new AnimatorListenerAdapter() {
 
                     @Override
                     public void onAnimationEnd(Animator animation) {
                         super.onAnimationEnd(animation);
+                        alphaVisible.start();
                         slideUp.start();
                     }
                 });
 
                 AnimatorSet animatorSet = new AnimatorSet();
                 animatorSet.playTogether(
+                        alphaInvisible,
                         scaleBounceX,
                         scaleBounceY
                 );
diff --git a/sandwich/src/main/res/layout/layout_sandwich.xml b/sandwich/src/main/res/layout/layout_sandwich.xml
index be50cd9..3813697 100644
--- a/sandwich/src/main/res/layout/layout_sandwich.xml
+++ b/sandwich/src/main/res/layout/layout_sandwich.xml
@@ -2,58 +2,60 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layoutRoot"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:clipChildren="false">
+    android:layout_height="match_parent">
 
-    <RelativeLayout
-        android:id="@+id/layoutBack"
+    <FrameLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_margin="@dimen/sandwichMarginDefault"
-        android:background="@drawable/bg_sandwich_iconbox"
-        android:clipToPadding="false"
-        android:clipChildren="false">
+        android:layout_margin="@dimen/sandwichMarginDefault">
 
-        <TextView
-            android:id="@+id/txtText"
+        <RelativeLayout
+            android:id="@+id/layoutBack"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/sandwichMarginTiny"
-            android:padding="@dimen/sandwichMarginSmall"
-            android:background="@drawable/bg_sandwich_textbox"
-            android:text="이것은 샌드위치입니다."
-            android:textSize="@dimen/sandwichTextSize"/>
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/layoutFront"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="@dimen/sandwichMarginDefault"
-        android:clipToPadding="false"
-        android:clipChildren="false">
-
-        <ImageView
-            android:id="@+id/imgIcon"
-            android:layout_width="@dimen/sandwichIconSize"
-            android:layout_height="@dimen/sandwichIconSize"
-            android:layout_centerInParent="true"
-            android:src="@drawable/icon_sandwich_message"/>
-
-        <TextView
-            android:id="@+id/txtText2"
+            android:layout_gravity="center"
+            android:background="@drawable/bg_sandwich_iconbox">
+
+            <ImageView
+                android:id="@+id/imgIcon"
+                android:layout_width="@dimen/sandwichIconSize"
+                android:layout_height="@dimen/sandwichIconSize"
+                android:layout_centerInParent="true"
+                android:src="@drawable/icon_sandwich_message"/>
+
+            <TextView
+                android:id="@+id/txtText2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/sandwichMarginTiny"
+                android:padding="@dimen/sandwichMarginSmall"
+                android:background="@drawable/bg_sandwich_textbox"
+                android:text="이것은 샌드위치입니다."
+                android:textSize="@dimen/sandwichTextSize"
+                android:visibility="invisible"/>
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/layoutFront"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/sandwichMarginTiny"
-            android:padding="@dimen/sandwichMarginSmall"
-            android:background="@drawable/bg_sandwich_textbox"
-            android:text="이것은 샌드위치입니다."
-            android:textSize="@dimen/sandwichTextSize"/>
+            android:layout_gravity="center">
+
+            <TextView
+                android:id="@+id/txtText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/sandwichMarginTiny"
+                android:padding="@dimen/sandwichMarginSmall"
+                android:background="@drawable/bg_sandwich_textbox"
+                android:text="이것은 샌드위치입니다."
+                android:textSize="@dimen/sandwichTextSize"/>
+
+        </RelativeLayout>
+
 
-    </RelativeLayout>
+    </FrameLayout>
 
 </FrameLayout>