Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
.DS_Store
/build
/captures
*.properties
.idea/
gradle/*.*
gradle/

1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

23 changes: 0 additions & 23 deletions .idea/compiler.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/encodings.xml

This file was deleted.

18 changes: 0 additions & 18 deletions .idea/gradle.xml

This file was deleted.

60 changes: 0 additions & 60 deletions .idea/misc.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/modules.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/scopes/scope_settings.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/vcs.xml

This file was deleted.

15 changes: 0 additions & 15 deletions TransitionExample.iml

This file was deleted.

75 changes: 0 additions & 75 deletions TransitionExample/TransitionExample-TransitionExample.iml

This file was deleted.

25 changes: 17 additions & 8 deletions TransitionExample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
apply plugin: 'android'
apply plugin: 'com.android.application'

android {
compileSdkVersion 19
buildToolsVersion "19.0.1"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}

compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION

defaultConfig {
minSdkVersion 19
targetSdkVersion 19
versionCode 1
versionName "1.0"
multiDexEnabled = true
applicationId project.APP_APPLICATIONID
minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
versionCode Integer.parseInt(project.APP_VERSIONCODE)
versionName project.APP_VERSIONNAME
}
buildTypes {
release {
runProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:transition:24.2.0'
}
Original file line number Diff line number Diff line change
@@ -1,63 +1,47 @@
package com.bignerdranch.android.transitionexample;

import android.app.Activity;
import android.os.Bundle;
import android.transition.Scene;
import android.transition.TransitionInflater;
import android.transition.TransitionManager;
import android.view.Menu;
import android.view.MenuItem;
import android.support.transition.ChangeBounds;
import android.support.transition.Fade;
import android.support.transition.Scene;
import android.support.transition.TransitionManager;
import android.support.transition.TransitionSet;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.view.ViewGroup;

public class TransitionActivity extends Activity {
private TransitionManager mTransitionManager;
private Scene mScene1;
private Scene mScene2;

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

if (savedInstanceState == null) {
getFragmentManager().beginTransaction()
.add(R.id.container, new TransitionFragment())
.commit();
}
ViewGroup container = (ViewGroup)findViewById(R.id.container);
TransitionInflater transitionInflater = TransitionInflater.from(this);
mTransitionManager = transitionInflater.inflateTransitionManager(R.transition.transition_manager, container);
mScene1 = Scene.getSceneForLayout(container, R.layout.fragment_transition_scene_1, this);
mScene2 = Scene.getSceneForLayout(container, R.layout.fragment_transition_scene_2, this);
}

public void goToScene1(View view) {
mTransitionManager.transitionTo(mScene1);
}

public void goToScene2(View view) {
mTransitionManager.transitionTo(mScene2);
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {

// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.transition, menu);
return true;
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
if (id == R.id.action_settings) {
return true;
}
return super.onOptionsItemSelected(item);
}
public class TransitionActivity extends AppCompatActivity {
private TransitionManager mTransitionManager;
private Scene mScene1;
private Scene mScene2;

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

if (savedInstanceState == null) {
getSupportFragmentManager().beginTransaction()
.add(R.id.container, new TransitionFragment())
.commit();
}
ViewGroup container = (ViewGroup) findViewById(R.id.container);
mScene1 = Scene.getSceneForLayout(container, R.layout.fragment_transition_scene_1, this);
mScene2 = Scene.getSceneForLayout(container, R.layout.fragment_transition_scene_2, this);
mTransitionManager = new TransitionManager();
TransitionSet transitionSet = new TransitionSet();
transitionSet.setOrdering(TransitionSet.ORDERING_TOGETHER);
transitionSet.addTransition(new Fade()).addTransition(new ChangeBounds());
mTransitionManager.setTransition(mScene1, mScene2, transitionSet);

}

public void goToScene1(View view) {
mTransitionManager.transitionTo(mScene1);
}

public void goToScene2(View view) {
mTransitionManager.transitionTo(mScene2);
}

}
Loading