diff options
author | Andrew Dolgov <[email protected]> | 2015-11-30 09:41:09 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-11-30 09:41:09 +0300 |
commit | 0d870bf61c2719d58cf77a93fd4d30932b68763c (patch) | |
tree | 552eee068a8b0adb0a97ac798c422d13843e8b66 | |
parent | afa8203b5efb687d94c823df8667c6c25b88dbfb (diff) |
set transitions to video player views like master -> detail
4 files changed, 25 insertions, 2 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index cd0b00a1..06db6351 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="385" - android:versionName="1.157" > + android:versionCode="386" + android:versionName="1.158" > <uses-sdk android:minSdkVersion="16" diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index cfc8e058..90f432b4 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -1253,6 +1253,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, intent.putExtra("title", article.title); startActivity(intent); + m_activity.overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left); + } else { m_activity.openUri(Uri.parse(article.flavorStreamUri)); } @@ -1264,6 +1266,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, intent.putExtra("title", article.title); startActivity(intent); + m_activity.overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left); } else { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java index 480ad530..4b89905b 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java @@ -278,4 +278,14 @@ public class VideoPlayerActivity extends CommonActivity { surfaceView.setLayoutParams(lp);
}
+ @Override
+ public void onPause() {
+ super.onPause();
+
+ if (isFinishing()) {
+ overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
+ }
+
+ }
+
}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java index 565b5fb9..fc26e38e 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java @@ -146,4 +146,14 @@ public class YoutubePlayerActivity extends CommonActivity implements YouTubePlay toast(result.toString()); } + + @Override + public void onPause() { + super.onPause(); + + if (isFinishing()) { + overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right); + } + + } } |