diff --git a/briar-android/res/layout/fragment_reblog_dialog.xml b/briar-android/res/layout/fragment_reblog.xml similarity index 100% rename from briar-android/res/layout/fragment_reblog_dialog.xml rename to briar-android/res/layout/fragment_reblog.xml index 28b59e7b9..b17143b35 100644 --- a/briar-android/res/layout/fragment_reblog_dialog.xml +++ b/briar-android/res/layout/fragment_reblog.xml @@ -11,6 +11,12 @@ android:layout_height="wrap_content" android:padding="@dimen/margin_small"> + + - - = LOLLIPOP) { + setTransition(); + } + Intent intent = getIntent(); byte[] groupId = intent.getByteArrayExtra(GROUP_ID); if (groupId == null) @@ -70,4 +79,14 @@ public class ReblogActivity extends BriarActivity implements public void onFragmentCreated(String tag) { } + + @TargetApi(LOLLIPOP) + private void setTransition() { + Transition fade = new Fade(); + fade.excludeTarget(android.R.id.statusBarBackground, true); + fade.excludeTarget(R.id.action_bar_container, true); + fade.excludeTarget(android.R.id.navigationBarBackground, true); + getWindow().setExitTransition(fade); + getWindow().setEnterTransition(fade); + } } diff --git a/briar-android/src/org/briarproject/android/blogs/ReblogFragment.java b/briar-android/src/org/briarproject/android/blogs/ReblogFragment.java index 367dd7041..119290bb2 100644 --- a/briar-android/src/org/briarproject/android/blogs/ReblogFragment.java +++ b/briar-android/src/org/briarproject/android/blogs/ReblogFragment.java @@ -85,9 +85,10 @@ public class ReblogFragment extends BaseFragment { blogId = new GroupId(args.getByteArray(GROUP_ID)); postId = new MessageId(args.getByteArray(POST_ID)); - View v = inflater.inflate(R.layout.fragment_reblog_dialog, container, + View v = inflater.inflate(R.layout.fragment_reblog, container, false); ui = new ViewHolder(v); + ui.post.setTransitionName(postId); showProgressBar(); return v; @@ -137,7 +138,6 @@ public class ReblogFragment extends BaseFragment { ui.scrollView.post(new Runnable() { @Override public void run() { - //ui.scrollView.scrollTo(0, ui.scrollView.getBottom()); ui.scrollView.fullScroll(FOCUS_DOWN); } }); @@ -166,14 +166,12 @@ public class ReblogFragment extends BaseFragment { private void showProgressBar() { ui.progressBar.setVisibility(VISIBLE); - ui.post.setVisibility(GONE); ui.input.setVisibility(GONE); ui.publish.setVisibility(GONE); } private void hideProgressBar() { ui.progressBar.setVisibility(INVISIBLE); - ui.post.setVisibility(VISIBLE); ui.input.setVisibility(VISIBLE); ui.publish.setVisibility(VISIBLE); }