fix shared element transition on API level 21 devices. update version…

…code to 3 versionName 0.86beta
lewismcgeary · Jul 20, 2015 · da605aa · da605aa
1 parent 75f1e28
commit da605aa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -70,6 +70,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/percent/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
@@ -89,6 +90,7 @@
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="sqliteassethelper-2.0.1" level="project" />
+    <orderEntry type="library" exported="" name="percent-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.gmail.appytalkteam.appytalkcore"
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 2
-        versionName "0.85beta"
+        versionCode 3
+        versionName "0.86beta"
     }
     buildTypes {
         release {
@@ -22,6 +22,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:percent:22.2.0'
+    compile 'com.android.support:support-v4:22.2.0'
     compile 'com.readystatesoftware.sqliteasset:sqliteassethelper:+'
 
 }
diff --git a/app/src/main/java/com/gmail/appytalkteam/appytalkcore/QuizActivity.java b/app/src/main/java/com/gmail/appytalkteam/appytalkcore/QuizActivity.java
@@ -19,6 +19,7 @@
 import android.support.v4.view.ViewCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.transition.ChangeBounds;
+import android.transition.ChangeImageTransform;
 import android.transition.Slide;
 import android.transition.TransitionSet;
 import android.view.Surface;
@@ -229,6 +230,7 @@ private void transitionToQuestionOutro(View view, Word correctAnswer){
             TransitionSet imageTransition = new TransitionSet();
             imageTransition.setDuration(600);
             imageTransition.addTransition(new ChangeBounds());
+            imageTransition.addTransition(new ChangeImageTransform());
             questionOutroFragment.setSharedElementEnterTransition(imageTransition);
         }
         FragmentManager fragmentManager = getFragmentManager();