diff options
author | Andrew Dolgov <[email protected]> | 2015-12-01 19:43:23 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-12-01 19:43:23 +0300 |
commit | 52adc297154f759dec7f72a84cf313190064467d (patch) | |
tree | c283fcf927937f2c324006173e7be687a8ccc5f9 | |
parent | 655b3e873e78db8e07792c9847f4298cbe7ec9ab (diff) |
add reveal animation to settings button
3 files changed, 10 insertions, 1 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java index d70ee8c8..3b58b93a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java @@ -3,6 +3,8 @@ package org.fox.ttrss; import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; +import android.support.v4.app.ActivityCompat; +import android.support.v4.app.ActivityOptionsCompat; import android.support.v4.app.Fragment; import android.support.v7.widget.SwitchCompat; import android.util.TypedValue; @@ -51,7 +53,12 @@ public abstract class BaseFeedlistFragment extends Fragment { try { Intent intent = new Intent(getActivity(), PreferencesActivity.class); - startActivityForResult(intent, 0); + + ActivityOptionsCompat options = ActivityOptionsCompat + .makeSceneTransitionAnimation(getActivity(), v, "SETTINGS_REVEAL"); + + ActivityCompat.startActivityForResult(getActivity(), intent, 0, options.toBundle()); + } catch (Exception e) { } diff --git a/org.fox.ttrss/src/main/res/layout/activity_preferences.xml b/org.fox.ttrss/src/main/res/layout/activity_preferences.xml index 431b7da4..bd37a3ce 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_preferences.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_preferences.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:transitionName="SETTINGS_REVEAL" android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml index d2ea0660..d39cdad0 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -28,6 +28,7 @@ android:clickable="true" android:layout_marginBottom="16dp" android:layout_marginRight="12dp" + android:transitionName="SETTINGS_REVEAL" android:background="@drawable/ripple" /> <LinearLayout |