diff --git a/android_common/.gitignore b/android_common/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/android_common/.gitignore @@ -0,0 +1 @@ +/build diff --git a/android_common/build.gradle b/android_common/build.gradle new file mode 100644 index 0000000..df9bc04 --- /dev/null +++ b/android_common/build.gradle @@ -0,0 +1,31 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 25 + buildToolsVersion "25.0.2" + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:25.3.1' + testCompile 'junit:junit:4.12' +} diff --git a/android_common/proguard-rules.pro b/android_common/proguard-rules.pro new file mode 100644 index 0000000..9fe7e2e --- /dev/null +++ b/android_common/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in D:\Develop\SDK/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/android_common/src/androidTest/java/com/pinger/common/ExampleInstrumentedTest.java b/android_common/src/androidTest/java/com/pinger/common/ExampleInstrumentedTest.java new file mode 100644 index 0000000..0cbc788 --- /dev/null +++ b/android_common/src/androidTest/java/com/pinger/common/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.pinger.common; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.pinger.common.test", appContext.getPackageName()); + } +} diff --git a/android_common/src/main/AndroidManifest.xml b/android_common/src/main/AndroidManifest.xml new file mode 100644 index 0000000..3df1894 --- /dev/null +++ b/android_common/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/android_common/src/main/java/com/pinger/common/app/BaseApplication.java b/android_common/src/main/java/com/pinger/common/app/BaseApplication.java new file mode 100644 index 0000000..b9594e1 --- /dev/null +++ b/android_common/src/main/java/com/pinger/common/app/BaseApplication.java @@ -0,0 +1,18 @@ +package com.pinger.common.app; + +import android.app.Application; + +import com.pinger.common.utils.UiUtil; + +/** + * @author Pinger + * @since 2017年5月5日 0005 下午 5:37 + */ +public class BaseApplication extends Application { + + @Override + public void onCreate() { + super.onCreate(); + UiUtil.init(getApplicationContext()); + } +} diff --git a/android_common/src/main/java/com/pinger/common/utils/UiUtil.java b/android_common/src/main/java/com/pinger/common/utils/UiUtil.java new file mode 100644 index 0000000..17f6782 --- /dev/null +++ b/android_common/src/main/java/com/pinger/common/utils/UiUtil.java @@ -0,0 +1,24 @@ +package com.pinger.common.utils; + +import android.content.Context; + +/** + * @author Pinger + * @since 2017年4月7日 0007 下午 2:15 + * 与Ui相关的操作都放在这里,并且封装全局唯一的Context + */ +public class UiUtil { + + private static Context mContext; + + public static void init(Context context) { + mContext = context; + } + + /** + * 返回一个全局唯一的Context + */ + public synchronized static Context getContext() { + return mContext; + } +} diff --git a/android_common/src/main/res/values/strings.xml b/android_common/src/main/res/values/strings.xml new file mode 100644 index 0000000..973f4ee --- /dev/null +++ b/android_common/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + android_common + diff --git a/android_common/src/test/java/com/pinger/common/ExampleUnitTest.java b/android_common/src/test/java/com/pinger/common/ExampleUnitTest.java new file mode 100644 index 0000000..8b4c42a --- /dev/null +++ b/android_common/src/test/java/com/pinger/common/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.pinger.common; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/android_transition/build.gradle b/android_transition/build.gradle index 026a78d..c21e82c 100644 --- a/android_transition/build.gradle +++ b/android_transition/build.gradle @@ -20,6 +20,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + dataBinding { + enabled = true + } } dependencies { @@ -30,4 +34,5 @@ dependencies { compile 'com.android.support:appcompat-v7:25.1.1' compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7' testCompile 'junit:junit:4.12' + compile 'com.android.support:recyclerview-v7:25.1.1' } diff --git a/android_transition/src/main/AndroidManifest.xml b/android_transition/src/main/AndroidManifest.xml index 4584499..549ab5d 100644 --- a/android_transition/src/main/AndroidManifest.xml +++ b/android_transition/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/MaterialAnimations"> @@ -16,8 +16,31 @@ - - + + + + + + + + + + + \ No newline at end of file diff --git a/android_transition/src/main/java/com/pinger/transition/AnimationsActivity1.java b/android_transition/src/main/java/com/pinger/transition/AnimationsActivity1.java new file mode 100644 index 0000000..f62fdf9 --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/AnimationsActivity1.java @@ -0,0 +1,99 @@ +package com.pinger.transition; + +import android.content.Intent; +import android.databinding.DataBindingUtil; +import android.os.Bundle; +import android.transition.Fade; +import android.transition.TransitionManager; +import android.view.Gravity; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.LinearLayout; + +import com.pinger.transition.databinding.ActivityAnimations1Binding; + + +public class AnimationsActivity1 extends BaseDetailActivity { + private ImageView square; + private ViewGroup viewRoot; + private boolean sizeChanged; + private int savedWidth; + private boolean positionChanged; + private Sample sample; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + bindData(); + setupWindowAnimations(); + setupLayout(); + setupToolbar(); + } + + private void setupWindowAnimations() { + getWindow().setReenterTransition(new Fade()); + } + + private void bindData() { + ActivityAnimations1Binding binding = DataBindingUtil.setContentView(this, R.layout.activity_animations1); + sample = (Sample) getIntent().getExtras().getSerializable(EXTRA_SAMPLE); + binding.setAnimationsSample(sample); + } + + private void setupLayout() { + square = (ImageView) findViewById(R.id.square_green); + viewRoot = (ViewGroup) findViewById(R.id.sample3_root); + findViewById(R.id.sample3_button1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + changeLayout(); + } + }); + findViewById(R.id.sample3_button2).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + changePosition(); + } + }); + + findViewById(R.id.sample3_button3).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent i = new Intent(AnimationsActivity1.this, AnimationsActivity2.class); + i.putExtra(EXTRA_SAMPLE, sample); + transitionTo(i); + } + }); + } + + private void changeLayout() { + TransitionManager.beginDelayedTransition(viewRoot); + + ViewGroup.LayoutParams params = square.getLayoutParams(); + if (sizeChanged) { + params.width = savedWidth; + } else { + savedWidth = params.width; + params.width = 200; + } + sizeChanged = !sizeChanged; + square.setLayoutParams(params); + } + + private void changePosition() { + TransitionManager.beginDelayedTransition(viewRoot); + + LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) square.getLayoutParams(); + if (positionChanged) { + lp.gravity = Gravity.CENTER; + } else { + lp.gravity = Gravity.LEFT; + } + positionChanged = !positionChanged; + square.setLayoutParams(lp); + } + + + +} diff --git a/android_transition/src/main/java/com/pinger/transition/AnimationsActivity2.java b/android_transition/src/main/java/com/pinger/transition/AnimationsActivity2.java new file mode 100644 index 0000000..07edd09 --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/AnimationsActivity2.java @@ -0,0 +1,146 @@ +package com.pinger.transition; + +import android.databinding.DataBindingUtil; +import android.os.Bundle; +import android.transition.ChangeBounds; +import android.transition.Scene; +import android.transition.Transition; +import android.transition.TransitionInflater; +import android.transition.TransitionManager; +import android.view.View; +import android.view.ViewGroup; + + +import com.pinger.transition.databinding.ActivityAnimations2Binding; + +import java.util.ArrayList; +import java.util.List; + +public class AnimationsActivity2 extends BaseDetailActivity { + + private static final int DELAY = 100; + private Scene scene0; + private Scene scene1; + private Scene scene2; + private Scene scene3; + private Scene scene4; + private final List viewsToAnimate = new ArrayList(); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + bindData(); + setupLayout(); + setupToolbar(); + setupWindowAnimations(); + } + + private void bindData() { + ActivityAnimations2Binding binding = DataBindingUtil.setContentView( + this, R.layout.activity_animations2); + Sample sample = (Sample) getIntent().getExtras().getSerializable(EXTRA_SAMPLE); + binding.setAnimationsSample(sample); + } + + private void setupWindowAnimations() { + getWindow().setEnterTransition(TransitionInflater.from(this).inflateTransition( + R.transition.slide_from_bottom)); + getWindow().getEnterTransition().addListener(new Transition.TransitionListener() { + @Override + public void onTransitionStart(Transition transition) { + } + + @Override + public void onTransitionCancel(Transition transition) { + } + + @Override + public void onTransitionPause(Transition transition) { + } + + @Override + public void onTransitionResume(Transition transition) { + } + + @Override + public void onTransitionEnd(Transition transition) { + getWindow().getEnterTransition().removeListener(this); + TransitionManager.go(scene0); + } + }); + } + + private void setupLayout() { + final ViewGroup activityRoot = (ViewGroup) findViewById(R.id.buttons_group); + ViewGroup sceneRoot = (ViewGroup) findViewById(R.id.scene_root); + + scene0 = Scene.getSceneForLayout(sceneRoot, R.layout.activity_animations_scene0, this); + scene0.setEnterAction(new Runnable() { + @Override + public void run() { + for (int i = 0; i < viewsToAnimate.size(); i++) { + View child = viewsToAnimate.get(i); + child.animate() + .setStartDelay(i * DELAY) + .scaleX(1) + .scaleY(1); + + } + } + }); + scene0.setExitAction(new Runnable() { + @Override + public void run() { + TransitionManager.beginDelayedTransition(activityRoot); + View title = scene0.getSceneRoot().findViewById(R.id.scene0_title); + title.setScaleX(0); + title.setScaleY(0); + } + }); + + + scene1 = Scene.getSceneForLayout(sceneRoot, R.layout.activity_animations_scene1, this); + scene2 = Scene.getSceneForLayout(sceneRoot, R.layout.activity_animations_scene2, this); + scene3 = Scene.getSceneForLayout(sceneRoot, R.layout.activity_animations_scene3, this); + scene4 = Scene.getSceneForLayout(sceneRoot, R.layout.activity_animations_scene4, this); + + View button1 = findViewById(R.id.sample3_button1); + button1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + TransitionManager.go(scene1, new ChangeBounds()); + } + }); + View button2 = findViewById(R.id.sample3_button2); + button2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + TransitionManager.go(scene2, TransitionInflater.from(AnimationsActivity2.this). + inflateTransition(R.transition.slide_and_changebounds)); + } + }); + + View button3 = findViewById(R.id.sample3_button3); + button3.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + TransitionManager.go(scene3, TransitionInflater.from(AnimationsActivity2.this). + inflateTransition(R.transition.slide_and_changebounds_sequential)); + } + }); + + View button4 = findViewById(R.id.sample3_button4); + button4.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + TransitionManager.go(scene4, TransitionInflater.from(AnimationsActivity2.this). + inflateTransition(R.transition.slide_and_changebounds_sequential_with_interpolators)); + } + }); + + viewsToAnimate.add(button1); + viewsToAnimate.add(button2); + viewsToAnimate.add(button3); + viewsToAnimate.add(button4); + } +} diff --git a/android_transition/src/main/java/com/pinger/transition/BaseDetailActivity.java b/android_transition/src/main/java/com/pinger/transition/BaseDetailActivity.java new file mode 100644 index 0000000..db45d4b --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/BaseDetailActivity.java @@ -0,0 +1,37 @@ +package com.pinger.transition; + +import android.content.Intent; +import android.support.v4.app.ActivityOptionsCompat; +import android.support.v4.util.Pair; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.View; + +/** + * Created by lgvalle on 12/09/15. + */ +public class BaseDetailActivity extends AppCompatActivity { + static final String EXTRA_SAMPLE = "sample"; + static final String EXTRA_TYPE = "type"; + static final int TYPE_PROGRAMMATICALLY = 0; + static final int TYPE_XML = 1; + + void setupToolbar() { + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setDisplayShowTitleEnabled(false); + } + + @Override + public boolean onSupportNavigateUp() { + onBackPressed(); + return true; + } + + @SuppressWarnings("unchecked") void transitionTo(Intent i) { + final Pair[] pairs = TransitionHelper.createSafeTransitionParticipants(this, true); + ActivityOptionsCompat transitionActivityOptions = ActivityOptionsCompat.makeSceneTransitionAnimation(this, pairs); + startActivity(i, transitionActivityOptions.toBundle()); + } +} diff --git a/android_transition/src/main/java/com/pinger/transition/MainActivity.java b/android_transition/src/main/java/com/pinger/transition/MainActivity.java index 1bd27d8..d6d357d 100644 --- a/android_transition/src/main/java/com/pinger/transition/MainActivity.java +++ b/android_transition/src/main/java/com/pinger/transition/MainActivity.java @@ -1,36 +1,59 @@ package com.pinger.transition; -import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.ActivityOptionsCompat; -import android.support.v4.util.Pair; +import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; -import android.view.View; -import android.widget.ImageView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.Toolbar; +import android.transition.Slide; +import android.view.Gravity; -public class MainActivity extends AppCompatActivity { +import java.util.Arrays; +import java.util.List; - private ImageView mImageView1; - private ImageView mImageView2; +public class MainActivity extends AppCompatActivity { + private List samples; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - mImageView1 = (ImageView) findViewById(R.id.image1); - mImageView2 = (ImageView) findViewById(R.id.image2); + setupWindowAnimations(); + setupSamples(); + setupToolbar(); + setupLayout(); } - public void start(View view) { - // 单个动画跳转 - //startActivity(new Intent(this,SecondActivity.class), ActivityOptionsCompat.makeSceneTransitionAnimation(this,mImageView1,"shareImage1").toBundle()); + private void setupWindowAnimations() { + // Re-enter transition is executed when returning to this activity + Slide slideTransition = new Slide(); + slideTransition.setSlideEdge(Gravity.LEFT); + slideTransition.setDuration(getResources().getInteger(R.integer.anim_duration_long)); + getWindow().setReenterTransition(slideTransition); + getWindow().setExitTransition(slideTransition); + } + private void setupSamples() { + samples = Arrays.asList( + new Sample(ContextCompat.getColor(this, R.color.sample_red), "Transitions"), + new Sample(ContextCompat.getColor(this, R.color.sample_blue), "Shared Elements"), + new Sample(ContextCompat.getColor(this, R.color.sample_green), "View animations"), + new Sample(ContextCompat.getColor(this, R.color.sample_yellow), "Circular Reveal Animation") + ); + } - // 多个动画跳转 - startActivity(new Intent(MainActivity.this, SecondActivity.class), - ActivityOptionsCompat.makeSceneTransitionAnimation(MainActivity.this, - Pair.create((View) mImageView1, "shareImage1"), - Pair.create((View) mImageView2, "shareImage2")).toBundle()); + private void setupToolbar() { + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + getSupportActionBar().setDisplayShowTitleEnabled(false); + } + private void setupLayout() { + RecyclerView recyclerView = (RecyclerView) findViewById(R.id.sample_list); + recyclerView.setHasFixedSize(true); + recyclerView.setLayoutManager(new LinearLayoutManager(this)); + SamplesRecyclerAdapter samplesRecyclerAdapter = new SamplesRecyclerAdapter(this, samples); + recyclerView.setAdapter(samplesRecyclerAdapter); } } diff --git a/android_transition/src/main/java/com/pinger/transition/RevealActivity.java b/android_transition/src/main/java/com/pinger/transition/RevealActivity.java new file mode 100644 index 0000000..a6c46de --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/RevealActivity.java @@ -0,0 +1,291 @@ +package com.pinger.transition; + +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.databinding.DataBindingUtil; +import android.os.Bundle; +import android.support.annotation.ColorRes; +import android.support.v4.content.ContextCompat; +import android.support.v7.widget.Toolbar; +import android.transition.Fade; +import android.transition.Transition; +import android.transition.TransitionInflater; +import android.transition.TransitionManager; +import android.view.MotionEvent; +import android.view.View; +import android.view.ViewAnimationUtils; +import android.view.ViewGroup; +import android.view.animation.AccelerateDecelerateInterpolator; +import android.view.animation.AccelerateInterpolator; +import android.view.animation.AnimationUtils; +import android.view.animation.Interpolator; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.pinger.transition.databinding.ActivityRevealBinding; + + +public class RevealActivity extends BaseDetailActivity implements View.OnTouchListener { + private static final int DELAY = 100; + private RelativeLayout bgViewGroup; + private Toolbar toolbar; + private Interpolator interpolator; + private TextView body; + private View btnRed; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + bindData(); + setupWindowAnimations(); + setupLayout(); + setupToolbar(); + } + + private void bindData() { + ActivityRevealBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_reveal); + Sample sample = (Sample) getIntent().getExtras().getSerializable(EXTRA_SAMPLE); + binding.setReveal1Sample(sample); + } + + private void setupWindowAnimations() { + interpolator = AnimationUtils.loadInterpolator(this, android.R.interpolator.linear_out_slow_in); + setupEnterAnimations(); + setupExitAnimations(); + } + + private void setupEnterAnimations() { + Transition transition = TransitionInflater.from(this).inflateTransition(R.transition.changebounds_with_arcmotion); + getWindow().setSharedElementEnterTransition(transition); + transition.addListener(new Transition.TransitionListener() { + @Override + public void onTransitionStart(Transition transition) { + } + + @Override + public void onTransitionEnd(Transition transition) { + // Removing listener here is very important because shared element transition is executed again backwards on exit. If we don't remove the listener this code will be triggered again. + transition.removeListener(this); + hideTarget(); + animateRevealShow(toolbar); + animateButtonsIn(); + } + + @Override + public void onTransitionCancel(Transition transition) { + } + + @Override + public void onTransitionPause(Transition transition) { + } + + @Override + public void onTransitionResume(Transition transition) { + } + }); + } + + private void setupExitAnimations() { + Fade returnTransition = new Fade(); + getWindow().setReturnTransition(returnTransition); + returnTransition.setDuration(getResources().getInteger(R.integer.anim_duration_medium)); + returnTransition.setStartDelay(getResources().getInteger(R.integer.anim_duration_medium)); + returnTransition.addListener(new Transition.TransitionListener() { + @Override + public void onTransitionStart(Transition transition) { + transition.removeListener(this); + animateButtonsOut(); + animateRevealHide(bgViewGroup); + } + + @Override + public void onTransitionEnd(Transition transition) { + } + + @Override + public void onTransitionCancel(Transition transition) { + } + + @Override + public void onTransitionPause(Transition transition) { + } + + @Override + public void onTransitionResume(Transition transition) { + } + }); + } + + private void setupLayout() { + bgViewGroup = (RelativeLayout) findViewById(R.id.reveal_root); + toolbar = (Toolbar) findViewById(R.id.toolbar); + body = ((TextView) findViewById(R.id.sample_body)); + View btnGreen = findViewById(R.id.square_green); + btnGreen.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + revealGreen(); + } + }); + btnRed = findViewById(R.id.square_red); + btnRed.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + revealRed(); + } + }); + View btnBlue = findViewById(R.id.square_blue); + btnBlue.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + revealBlue(); + } + }); + findViewById(R.id.square_yellow).setOnTouchListener(this); + } + + private void revealBlue() { + animateButtonsOut(); + Animator anim = animateRevealColorFromCoordinates(bgViewGroup, R.color.sample_blue, bgViewGroup.getWidth() / 2, 0); + anim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + animateButtonsIn(); + } + }); + body.setText(R.string.reveal_body4); + body.setTextColor(ContextCompat.getColor(this, R.color.theme_blue_background)); + } + + private void revealRed() { + final ViewGroup.LayoutParams originalParams = btnRed.getLayoutParams(); + Transition transition = TransitionInflater.from(this).inflateTransition(R.transition.changebounds_with_arcmotion); + transition.addListener(new Transition.TransitionListener() { + @Override + public void onTransitionStart(Transition transition) { + } + + @Override + public void onTransitionEnd(Transition transition) { + animateRevealColor(bgViewGroup, R.color.sample_red); + body.setText(R.string.reveal_body3); + body.setTextColor(ContextCompat.getColor(RevealActivity.this, R.color.theme_red_background)); + btnRed.setLayoutParams(originalParams); + } + + @Override + public void onTransitionCancel(Transition transition) { + } + + @Override + public void onTransitionPause(Transition transition) { + + } + + @Override + public void onTransitionResume(Transition transition) { + + } + }); + TransitionManager.beginDelayedTransition(bgViewGroup, transition); + RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT); + layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT); + btnRed.setLayoutParams(layoutParams); + } + + private void revealYellow(float x, float y) { + animateRevealColorFromCoordinates(bgViewGroup, R.color.sample_yellow, (int) x, (int) y); + body.setText(R.string.reveal_body1); + body.setTextColor(ContextCompat.getColor(this, R.color.theme_yellow_background)); + } + + private void revealGreen() { + animateRevealColor(bgViewGroup, R.color.sample_green); + body.setText(R.string.reveal_body2); + body.setTextColor(ContextCompat.getColor(this, R.color.theme_green_background)); + } + + private void hideTarget() { + findViewById(R.id.shared_target).setVisibility(View.GONE); + } + + private void animateButtonsIn() { + for (int i = 0; i < bgViewGroup.getChildCount(); i++) { + View child = bgViewGroup.getChildAt(i); + child.animate() + .setStartDelay(100 + i * DELAY) + .setInterpolator(interpolator) + .alpha(1) + .scaleX(1) + .scaleY(1); + } + } + + private void animateButtonsOut() { + for (int i = 0; i < bgViewGroup.getChildCount(); i++) { + View child = bgViewGroup.getChildAt(i); + child.animate() + .setStartDelay(i) + .setInterpolator(interpolator) + .alpha(0) + .scaleX(0f) + .scaleY(0f); + } + } + + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) { + if (view.getId() == R.id.square_yellow) { + revealYellow(motionEvent.getRawX(), motionEvent.getRawY()); + } + } + return false; + } + + private void animateRevealShow(View viewRoot) { + int cx = (viewRoot.getLeft() + viewRoot.getRight()) / 2; + int cy = (viewRoot.getTop() + viewRoot.getBottom()) / 2; + int finalRadius = Math.max(viewRoot.getWidth(), viewRoot.getHeight()); + + Animator anim = ViewAnimationUtils.createCircularReveal(viewRoot, cx, cy, 0, finalRadius); + viewRoot.setVisibility(View.VISIBLE); + anim.setDuration(getResources().getInteger(R.integer.anim_duration_long)); + anim.setInterpolator(new AccelerateInterpolator()); + anim.start(); + } + + private void animateRevealColor(ViewGroup viewRoot, @ColorRes int color) { + int cx = (viewRoot.getLeft() + viewRoot.getRight()) / 2; + int cy = (viewRoot.getTop() + viewRoot.getBottom()) / 2; + animateRevealColorFromCoordinates(viewRoot, color, cx, cy); + } + + private Animator animateRevealColorFromCoordinates(ViewGroup viewRoot, @ColorRes int color, int x, int y) { + float finalRadius = (float) Math.hypot(viewRoot.getWidth(), viewRoot.getHeight()); + + Animator anim = ViewAnimationUtils.createCircularReveal(viewRoot, x, y, 0, finalRadius); + viewRoot.setBackgroundColor(ContextCompat.getColor(this, color)); + anim.setDuration(getResources().getInteger(R.integer.anim_duration_long)); + anim.setInterpolator(new AccelerateDecelerateInterpolator()); + anim.start(); + return anim; + } + + private void animateRevealHide(final View viewRoot) { + int cx = (viewRoot.getLeft() + viewRoot.getRight()) / 2; + int cy = (viewRoot.getTop() + viewRoot.getBottom()) / 2; + int initialRadius = viewRoot.getWidth(); + + Animator anim = ViewAnimationUtils.createCircularReveal(viewRoot, cx, cy, initialRadius, 0); + anim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + viewRoot.setVisibility(View.INVISIBLE); + } + }); + anim.setDuration(getResources().getInteger(R.integer.anim_duration_medium)); + anim.start(); + } +} diff --git a/android_transition/src/main/java/com/pinger/transition/Sample.java b/android_transition/src/main/java/com/pinger/transition/Sample.java new file mode 100644 index 0000000..18dcf78 --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/Sample.java @@ -0,0 +1,38 @@ +package com.pinger.transition; + +import android.databinding.BindingAdapter; +import android.support.annotation.ColorRes; +import android.support.v4.graphics.drawable.DrawableCompat; +import android.widget.ImageView; + +import java.io.Serializable; + +/** + * Created by lgvalle on 04/09/15. + */ +public class Sample implements Serializable { + + final int color; + private final String name; + + public Sample(@ColorRes int color, String name) { + this.color = color; + this.name = name; + } + + @BindingAdapter("bind:colorTint") + public static void setColorTint(ImageView view, @ColorRes int color) { + DrawableCompat.setTint(view.getDrawable(), color); + //view.setColorFilter(color, PorterDuff.Mode.SRC_IN); + } + + public String getName() { + return name; + } + + public int getColor() { + return color; + } + + +} diff --git a/android_transition/src/main/java/com/pinger/transition/SamplesRecyclerAdapter.java b/android_transition/src/main/java/com/pinger/transition/SamplesRecyclerAdapter.java new file mode 100644 index 0000000..88e0126 --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/SamplesRecyclerAdapter.java @@ -0,0 +1,99 @@ +package com.pinger.transition; + +import android.app.Activity; +import android.content.Intent; +import android.databinding.DataBindingUtil; +import android.support.v4.app.ActivityOptionsCompat; +import android.support.v4.util.Pair; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + + +import com.pinger.transition.databinding.RowSampleBinding; + +import java.util.List; + +public class SamplesRecyclerAdapter extends RecyclerView.Adapter { + private final Activity activity; + private final List samples; + + public SamplesRecyclerAdapter(Activity activity, List samples) { + this.activity = activity; + this.samples = samples; + } + + @Override + public SamplesViewHolder onCreateViewHolder(ViewGroup parent, int position) { + RowSampleBinding binding = RowSampleBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false); + return new SamplesViewHolder(binding.getRoot()); + } + + @Override + public void onBindViewHolder(final SamplesViewHolder viewHolder, final int position) { + final Sample sample = samples.get(viewHolder.getAdapterPosition()); + viewHolder.binding.setSample(sample); + viewHolder.binding.sampleLayout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + switch (viewHolder.getAdapterPosition()) { + case 0: + transitionToActivity(TransitionActivity1.class, sample); + break; + case 1: + transitionToActivity(SharedElementActivity.class, viewHolder, sample); + break; + case 2: + transitionToActivity(AnimationsActivity1.class, sample); + break; + case 3: + transitionToActivity(RevealActivity.class, viewHolder, sample, R.string.transition_reveal1); + break; + } + } + }); + } + + private void transitionToActivity(Class target, Sample sample) { + final Pair[] pairs = TransitionHelper.createSafeTransitionParticipants(activity, true); + startActivity(target, pairs, sample); + } + + + private void transitionToActivity(Class target, SamplesViewHolder viewHolder, Sample sample, int transitionName) { + final Pair[] pairs = TransitionHelper.createSafeTransitionParticipants(activity, false, + new Pair(viewHolder.binding.sampleIcon, activity.getString(transitionName))); + startActivity(target, pairs, sample); + } + + private void transitionToActivity(Class target, SamplesViewHolder viewHolder, Sample sample) { + final Pair[] pairs = TransitionHelper.createSafeTransitionParticipants(activity, false, + new Pair(viewHolder.binding.sampleIcon, activity.getString(R.string.square_blue_name)), + new Pair(viewHolder.binding.sampleName, activity.getString(R.string.sample_blue_title))); + startActivity(target, pairs, sample); + } + + private void startActivity(Class target, Pair[] pairs, Sample sample) { + Intent i = new Intent(activity, target); + ActivityOptionsCompat transitionActivityOptions = ActivityOptionsCompat.makeSceneTransitionAnimation(activity, pairs); + i.putExtra("sample", sample); + activity.startActivity(i, transitionActivityOptions.toBundle()); + } + + @Override + public int getItemCount() { + return samples.size(); + } + + + public class SamplesViewHolder extends RecyclerView.ViewHolder { + final RowSampleBinding binding; + + public SamplesViewHolder(View rootView) { + super(rootView); + binding = DataBindingUtil.bind(rootView); + + } + } +} diff --git a/android_transition/src/main/java/com/pinger/transition/SecondActivity.java b/android_transition/src/main/java/com/pinger/transition/SecondActivity.java deleted file mode 100644 index efc70dd..0000000 --- a/android_transition/src/main/java/com/pinger/transition/SecondActivity.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pinger.transition; - -import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; - -public class SecondActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_second); - } -} diff --git a/android_transition/src/main/java/com/pinger/transition/SharedElementActivity.java b/android_transition/src/main/java/com/pinger/transition/SharedElementActivity.java new file mode 100644 index 0000000..cc4caf5 --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/SharedElementActivity.java @@ -0,0 +1,49 @@ +package com.pinger.transition; + +import android.databinding.DataBindingUtil; +import android.os.Bundle; +import android.transition.ChangeBounds; +import android.transition.Slide; +import android.view.Gravity; + +import com.pinger.transition.databinding.ActivitySharedelementBinding; + + +public class SharedElementActivity extends BaseDetailActivity { + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Sample sample = (Sample) getIntent().getExtras().getSerializable(EXTRA_SAMPLE); + bindData(sample); + setupWindowAnimations(); + setupLayout(sample); + setupToolbar(); + } + + private void bindData(Sample sample) { + ActivitySharedelementBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_sharedelement); + binding.setSharedSample(sample); + } + + private void setupWindowAnimations() { + // We are not interested in defining a new Enter Transition. Instead we change default transition duration + getWindow().getEnterTransition().setDuration(getResources().getInteger(R.integer.anim_duration_long)); + } + + private void setupLayout(Sample sample) { + // Transition for fragment1 + Slide slideTransition = new Slide(Gravity.LEFT); + slideTransition.setDuration(getResources().getInteger(R.integer.anim_duration_long)); + // Create fragment and define some of it transitions + SharedElementFragment1 sharedElementFragment1 = SharedElementFragment1.newInstance(sample); + sharedElementFragment1.setReenterTransition(slideTransition); + sharedElementFragment1.setExitTransition(slideTransition); + sharedElementFragment1.setSharedElementEnterTransition(new ChangeBounds()); + + getSupportFragmentManager().beginTransaction() + .replace(R.id.sample2_content, sharedElementFragment1) + .commit(); + } +} diff --git a/android_transition/src/main/java/com/pinger/transition/SharedElementFragment1.java b/android_transition/src/main/java/com/pinger/transition/SharedElementFragment1.java new file mode 100644 index 0000000..38af818 --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/SharedElementFragment1.java @@ -0,0 +1,77 @@ +package com.pinger.transition; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.graphics.drawable.DrawableCompat; +import android.transition.ChangeBounds; +import android.transition.Slide; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; + +/** + * Created by lgvalle on 05/09/15. + */ +public class SharedElementFragment1 extends Fragment { + + private static final String EXTRA_SAMPLE = "sample"; + + public static SharedElementFragment1 newInstance(Sample sample) { + + Bundle args = new Bundle(); + + args.putSerializable(EXTRA_SAMPLE, sample); + SharedElementFragment1 fragment = new SharedElementFragment1(); + fragment.setArguments(args); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.activity_sharedelement_fragment1, container, false); + final Sample sample = (Sample) getArguments().getSerializable(EXTRA_SAMPLE); + + final ImageView squareBlue = (ImageView) view.findViewById(R.id.square_blue); + DrawableCompat.setTint(squareBlue.getDrawable(), sample.color); + + view.findViewById(R.id.sample2_button1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + addNextFragment(sample, squareBlue, false); + } + }); + + view.findViewById(R.id.sample2_button2).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + addNextFragment(sample, squareBlue, true); + } + }); + + return view; + } + + private void addNextFragment(Sample sample, ImageView squareBlue, boolean overlap) { + SharedElementFragment2 sharedElementFragment2 = SharedElementFragment2.newInstance(sample); + + Slide slideTransition = new Slide(Gravity.RIGHT); + slideTransition.setDuration(getResources().getInteger(R.integer.anim_duration_medium)); + + ChangeBounds changeBoundsTransition = new ChangeBounds(); + changeBoundsTransition.setDuration(getResources().getInteger(R.integer.anim_duration_medium)); + + sharedElementFragment2.setEnterTransition(slideTransition); + sharedElementFragment2.setAllowEnterTransitionOverlap(overlap); + sharedElementFragment2.setAllowReturnTransitionOverlap(overlap); + sharedElementFragment2.setSharedElementEnterTransition(changeBoundsTransition); + + getFragmentManager().beginTransaction() + .replace(R.id.sample2_content, sharedElementFragment2) + .addToBackStack(null) + .addSharedElement(squareBlue, getString(R.string.square_blue_name)) + .commit(); + } + +} diff --git a/android_transition/src/main/java/com/pinger/transition/SharedElementFragment2.java b/android_transition/src/main/java/com/pinger/transition/SharedElementFragment2.java new file mode 100644 index 0000000..9c0c1c9 --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/SharedElementFragment2.java @@ -0,0 +1,33 @@ +package com.pinger.transition; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.graphics.drawable.DrawableCompat; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; + +public class SharedElementFragment2 extends Fragment { + private static final String EXTRA_SAMPLE = "sample"; + + public static SharedElementFragment2 newInstance(Sample sample) { + Bundle args = new Bundle(); + args.putSerializable(EXTRA_SAMPLE, sample); + SharedElementFragment2 fragment = new SharedElementFragment2(); + fragment.setArguments(args); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.activity_sharedelement_fragment2, container, false); + Sample sample = (Sample) getArguments().getSerializable(EXTRA_SAMPLE); + + ImageView squareBlue = (ImageView) view.findViewById(R.id.square_blue); + DrawableCompat.setTint(squareBlue.getDrawable(), sample.color); + + return view; + } + +} diff --git a/android_transition/src/main/java/com/pinger/transition/TransitionActivity1.java b/android_transition/src/main/java/com/pinger/transition/TransitionActivity1.java new file mode 100644 index 0000000..1925645 --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/TransitionActivity1.java @@ -0,0 +1,113 @@ +package com.pinger.transition; + +import android.content.Intent; +import android.databinding.DataBindingUtil; +import android.os.Bundle; +import android.transition.Fade; +import android.transition.Slide; +import android.transition.Visibility; +import android.view.View; + +import com.pinger.transition.databinding.ActivityTransition1Binding; + + +public class TransitionActivity1 extends BaseDetailActivity { + private Sample sample; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + bindData(); + setupWindowAnimations(); + setupLayout(); + setupToolbar(); + } + + private void bindData() { + ActivityTransition1Binding binding = DataBindingUtil.setContentView(this, R.layout.activity_transition1); + sample = (Sample) getIntent().getExtras().getSerializable(EXTRA_SAMPLE); + binding.setTransition1Sample(sample); + } + + private void setupWindowAnimations() { + Visibility enterTransition = buildEnterTransition(); + getWindow().setEnterTransition(enterTransition); + } + + + private void setupLayout() { + findViewById(R.id.sample1_button1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent i = new Intent(TransitionActivity1.this, TransitionActivity2.class); + i.putExtra(EXTRA_SAMPLE, sample); + i.putExtra(EXTRA_TYPE, TYPE_PROGRAMMATICALLY); + transitionTo(i); + } + }); + + findViewById(R.id.sample1_button2).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent i = new Intent(TransitionActivity1.this, TransitionActivity2.class); + i.putExtra(EXTRA_SAMPLE, sample); + i.putExtra(EXTRA_TYPE, TYPE_XML); + transitionTo(i); + } + }); + + findViewById(R.id.sample1_button3).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent i = new Intent(TransitionActivity1.this, TransitionActivity3.class); + i.putExtra(EXTRA_SAMPLE, sample); + i.putExtra(EXTRA_TYPE, TYPE_PROGRAMMATICALLY); + transitionTo(i); + } + }); + + findViewById(R.id.sample1_button4).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent i = new Intent(TransitionActivity1.this, TransitionActivity3.class); + i.putExtra(EXTRA_SAMPLE, sample); + i.putExtra(EXTRA_TYPE, TYPE_XML); + transitionTo(i); + } + }); + + findViewById(R.id.sample1_button5).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Visibility returnTransition = buildReturnTransition(); + getWindow().setReturnTransition(returnTransition); + + finishAfterTransition(); + } + }); + findViewById(R.id.sample1_button6).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + /** + * If no return transition is defined Android will use reversed enter transition + * In this case, return transition will be a reversed Slide (defined in buildEnterTransition) + */ + finishAfterTransition(); + } + }); + } + + private Visibility buildEnterTransition() { + Fade enterTransition = new Fade(); + enterTransition.setDuration(getResources().getInteger(R.integer.anim_duration_long)); + // This view will not be affected by enter transition animation + enterTransition.excludeTarget(R.id.square_red, true); + return enterTransition; + } + + private Visibility buildReturnTransition() { + Visibility enterTransition = new Slide(); + enterTransition.setDuration(getResources().getInteger(R.integer.anim_duration_long)); + return enterTransition; + } +} diff --git a/android_transition/src/main/java/com/pinger/transition/TransitionActivity2.java b/android_transition/src/main/java/com/pinger/transition/TransitionActivity2.java new file mode 100644 index 0000000..6ab852b --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/TransitionActivity2.java @@ -0,0 +1,59 @@ +package com.pinger.transition; + +import android.databinding.DataBindingUtil; +import android.os.Bundle; +import android.transition.Explode; +import android.transition.Transition; +import android.transition.TransitionInflater; +import android.view.View; + +import com.pinger.transition.databinding.ActivityTransition2Binding; + + +public class TransitionActivity2 extends BaseDetailActivity { + + private int type; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + bindData(); + setupWindowAnimations(); + setupLayout(); + setupToolbar(); + } + + private void bindData() { + ActivityTransition2Binding binding = DataBindingUtil.setContentView(this, R.layout.activity_transition2); + Sample sample = (Sample) getIntent().getExtras().getSerializable(EXTRA_SAMPLE); + type = getIntent().getExtras().getInt(EXTRA_TYPE); + binding.setTransition2Sample(sample); + } + + private void setupWindowAnimations() { + Transition transition; + + if (type == TYPE_PROGRAMMATICALLY) { + transition = buildEnterTransition(); + } else { + transition = TransitionInflater.from(this).inflateTransition(R.transition.explode); + } + getWindow().setEnterTransition(transition); + } + + private void setupLayout() { + findViewById(R.id.exit_button).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finishAfterTransition(); + } + }); + } + + private Transition buildEnterTransition() { + Explode enterTransition = new Explode(); + enterTransition.setDuration(getResources().getInteger(R.integer.anim_duration_long)); + return enterTransition; + } + +} diff --git a/android_transition/src/main/java/com/pinger/transition/TransitionActivity3.java b/android_transition/src/main/java/com/pinger/transition/TransitionActivity3.java new file mode 100644 index 0000000..f2e56f2 --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/TransitionActivity3.java @@ -0,0 +1,62 @@ +package com.pinger.transition; + +import android.databinding.DataBindingUtil; +import android.os.Bundle; +import android.transition.Slide; +import android.transition.Transition; +import android.transition.TransitionInflater; +import android.transition.Visibility; +import android.view.Gravity; +import android.view.View; + +import com.pinger.transition.databinding.ActivityTransition3Binding; + + +public class TransitionActivity3 extends BaseDetailActivity { + + private int type; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + bindData(); + setupWindowAnimations(); + setupLayout(); + setupToolbar(); + } + + private void bindData() { + ActivityTransition3Binding binding = DataBindingUtil.setContentView(this, R.layout.activity_transition3); + Sample sample = (Sample) getIntent().getExtras().getSerializable(EXTRA_SAMPLE); + type = getIntent().getExtras().getInt(EXTRA_TYPE); + binding.setTransition3Sample(sample); + } + + private void setupWindowAnimations() { + Transition transition; + + if (type == TYPE_PROGRAMMATICALLY) { + transition = buildEnterTransition(); + } else { + transition = TransitionInflater.from(this).inflateTransition(R.transition.slide_from_bottom); + } + getWindow().setEnterTransition(transition); + } + + private void setupLayout() { + findViewById(R.id.exit_button).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finishAfterTransition(); + } + }); + } + + private Visibility buildEnterTransition() { + Slide enterTransition = new Slide(); + enterTransition.setDuration(getResources().getInteger(R.integer.anim_duration_long)); + enterTransition.setSlideEdge(Gravity.RIGHT); + return enterTransition; + } + +} diff --git a/android_transition/src/main/java/com/pinger/transition/TransitionHelper.java b/android_transition/src/main/java/com/pinger/transition/TransitionHelper.java new file mode 100644 index 0000000..ca4d97a --- /dev/null +++ b/android_transition/src/main/java/com/pinger/transition/TransitionHelper.java @@ -0,0 +1,73 @@ +/* + * Copyright 2015 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.pinger.transition; + +import android.app.Activity; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.util.Pair; +import android.view.View; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Helper class for creating content transitions used with {@link android.app.ActivityOptions}. + */ +class TransitionHelper { + + /** + * Create the transition participants required during a activity transition while + * avoiding glitches with the system UI. + * + * @param activity The activity used as start for the transition. + * @param includeStatusBar If false, the status bar will not be added as the transition + * participant. + * @return All transition participants. + */ + public static Pair[] createSafeTransitionParticipants(@NonNull Activity activity, + boolean includeStatusBar, @Nullable Pair... otherParticipants) { + // Avoid system UI glitches as described here: + // https://plus.google.com/+AlexLockwood/posts/RPtwZ5nNebb + View decor = activity.getWindow().getDecorView(); + View statusBar = null; + if (includeStatusBar) { + statusBar = decor.findViewById(android.R.id.statusBarBackground); + } + View navBar = decor.findViewById(android.R.id.navigationBarBackground); + + // Create pair of transition participants. + List participants = new ArrayList(3); + addNonNullViewToTransitionParticipants(statusBar, participants); + addNonNullViewToTransitionParticipants(navBar, participants); + // only add transition participants if there's at least one none-null element + if (otherParticipants != null && !(otherParticipants.length == 1 + && otherParticipants[0] == null)) { + participants.addAll(Arrays.asList(otherParticipants)); + } + return participants.toArray(new Pair[participants.size()]); + } + + private static void addNonNullViewToTransitionParticipants(View view, List participants) { + if (view == null) { + return; + } + participants.add(new Pair(view, view.getTransitionName())); + } + +} diff --git a/android_transition/src/main/res/drawable/circle_24dp.xml b/android_transition/src/main/res/drawable/circle_24dp.xml new file mode 100644 index 0000000..d92150a --- /dev/null +++ b/android_transition/src/main/res/drawable/circle_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/android_transition/src/main/res/drawable/square.xml b/android_transition/src/main/res/drawable/square.xml new file mode 100644 index 0000000..ec66c24 --- /dev/null +++ b/android_transition/src/main/res/drawable/square.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/android_transition/src/main/res/layout/activity_animations1.xml b/android_transition/src/main/res/layout/activity_animations1.xml new file mode 100644 index 0000000..7078c87 --- /dev/null +++ b/android_transition/src/main/res/layout/activity_animations1.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +