Skip to content

Commit

Permalink
perfect;
Browse files Browse the repository at this point in the history
  • Loading branch information
OCNYang committed Mar 28, 2018
1 parent fe82bfa commit 70c7f85
Show file tree
Hide file tree
Showing 12 changed files with 92 additions and 8 deletions.
1 change: 1 addition & 0 deletions app/build.gradle
Expand Up @@ -33,4 +33,5 @@ dependencies {
implementation project(':property-animation')
implementation project(':ripple-animation')
implementation project(':reveal-animation')
implementation project(':transition-animation')
}
10 changes: 7 additions & 3 deletions app/src/main/AndroidManifest.xml
Expand Up @@ -16,10 +16,14 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="com.ocnyang.rippleanimation.TouchFeedbackActivity"
android:theme="@style/MyRippleAnimationTheme"/>
<activity
android:name="com.ocnyang.rippleanimation.TouchFeedbackActivity"
android:label="Touch Feedback"
android:theme="@style/MyRippleAnimationTheme"/>

<activity android:name="com.ocnyang.revealanimation.RevealEffectActivity">
<activity
android:name="com.ocnyang.revealanimation.RevealEffectActivity"
android:label="Reveal Effect">
</activity>
</application>

Expand Down
Expand Up @@ -15,6 +15,7 @@
import com.ocnyang.propertyanimation.PropertyAnimationActivity;
import com.ocnyang.revealanimation.RevealAnimationActivity;
import com.ocnyang.rippleanimation.TouchFeedbackActivity;
import com.ocnyang.transitionanimation.TransitionAnimationActivity;
import com.ocnyang.viewanimation.ViewAnimationActivity;

/*******************************************************************
Expand Down Expand Up @@ -70,6 +71,7 @@ public void onClick(View v) {
mContext.startActivity(new Intent(mContext, RevealAnimationActivity.class));
break;
case 5:
mContext.startActivity(new Intent(mContext,TransitionAnimationActivity.class));
break;
case 6:
break;
Expand Down
3 changes: 2 additions & 1 deletion drawable-animation/src/main/AndroidManifest.xml
Expand Up @@ -3,7 +3,8 @@
package="com.ocnyang.drawableanimation">

<application>
<activity android:name=".DrawableAnimationActivity">
<activity android:name=".DrawableAnimationActivity"
android:label="@string/module_drawable">
</activity>
</application>

Expand Down
2 changes: 1 addition & 1 deletion drawable-animation/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
<resources>
<string name="module_name">DrawableAnimation</string>
<string name="module_drawable">DrawableAnimation</string>
<string name="do_">Do</string>
<string name="stop">stop</string>
</resources>
Expand Up @@ -4,6 +4,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#FFFFFFFF"
android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
</vector>
3 changes: 3 additions & 0 deletions transition-animation/README.md
@@ -1,5 +1,8 @@
# Ⅵ. Transition Animation / 转场动画 & 共享元素

> 本节暂时未提供 Demo,如果想查看相关代码可以先参考项目 [Material-Animations](https://github.com/lgvalle/Material-Animations) .
Material-Animations 项目的作者虽早已停止维护这个项目,但相关代码还能够参考。我也会尽快补上最新的 Demo。

## 1. 什么是 Transition?

安卓 5.0 中 Activity 和 Fragment 变换是建立在名叫 Transitions 的安卓新特性之上的。这个诞生于 4.4 的 transition 框架
Expand Down
1 change: 1 addition & 0 deletions transition-animation/build.gradle
Expand Up @@ -28,6 +28,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'com.android.support:appcompat-v7:27.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
Expand Down
11 changes: 10 additions & 1 deletion transition-animation/src/main/AndroidManifest.xml
@@ -1,2 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.ocnyang.transitionanimation"/>
package="com.ocnyang.transitionanimation">

<application>
<activity android:name=".TransitionAnimationActivity"
android:label="@string/module_transition">
</activity>
</application>

</manifest>
@@ -0,0 +1,31 @@
package com.ocnyang.transitionanimation;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;

public class TransitionAnimationActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_transition_animation);
initToolbar();
}

private void initToolbar() {
Toolbar toolbar = ((Toolbar) findViewById(R.id.toolbar));
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
int i = item.getItemId();
if (i == android.R.id.home) {
finish();
}
return super.onOptionsItemSelected(item);
}
}
@@ -0,0 +1,30 @@
<?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"
tools:context="com.ocnyang.transitionanimation.TransitionAnimationActivity">

<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:minHeight="?attr/actionBarSize"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>

<TextView
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center"
android:text="@string/tip"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar"/>

</android.support.constraint.ConstraintLayout>
4 changes: 3 additions & 1 deletion transition-animation/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
<resources>
<string name="app_name">Transition Animation</string>
<string name="module_transition">Transition Animation</string>
<string name="tip">本节暂时未提供 Demo,\n如果想查看相关代码可以先参考项目\n [Material-Animations](https://github.com/lgvalle/Material-Animations) \n
Material-Animations 项目的作者虽早已停止维护这个项目,但相关代码还能够参考。\n我也会尽快补上最新的 Demo。</string>
</resources>

0 comments on commit 70c7f85

Please sign in to comment.