From 743627cd516efd1f77fc3d756c54f4241453b56d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 26 Nov 2011 12:29:19 +0300 Subject: implement basic view animations --- AndroidManifest.xml | 4 ++-- res/anim/slide_left.xml | 20 ++++++++++++++++++++ res/anim/slide_right.xml | 20 ++++++++++++++++++++ src/org/fox/ttrss/MainActivity.java | 6 ++++++ 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 res/anim/slide_left.xml create mode 100644 res/anim/slide_right.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cb69d038..4892cd90 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="7" + android:versionName="0.1.6"> diff --git a/res/anim/slide_left.xml b/res/anim/slide_left.xml new file mode 100644 index 00000000..80caa7d7 --- /dev/null +++ b/res/anim/slide_left.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/res/anim/slide_right.xml b/res/anim/slide_right.xml new file mode 100644 index 00000000..a5617eae --- /dev/null +++ b/res/anim/slide_right.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index b7a8f967..e6c7fd42 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -18,6 +18,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.view.animation.AnimationUtils; import android.widget.LinearLayout; import android.widget.TextView; @@ -253,8 +254,11 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe if (m_smallScreenMode) { if (m_selectedArticle != null) { + findViewById(R.id.main).setAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_right)); closeArticle(); } else if (m_activeFeed != null) { + findViewById(R.id.main).setAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_right)); + findViewById(R.id.headlines_fragment).setVisibility(View.GONE); findViewById(R.id.feeds_fragment).setVisibility(View.VISIBLE); @@ -524,6 +528,8 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe ft.commit(); if (m_smallScreenMode) { + findViewById(R.id.main).setAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_left)); + findViewById(R.id.headlines_fragment).setVisibility(View.GONE); findViewById(R.id.article_fragment).setVisibility(View.VISIBLE); } else { -- cgit v1.2.3