From 69026054cdba49c7e5f521eda291e46ae5425333 Mon Sep 17 00:00:00 2001 From: str4d Date: Thu, 28 Apr 2016 10:38:12 +0000 Subject: [PATCH 1/2] Add bulb to scene transition, make transitionName unique for each contact --- .../res/layout/contact_avatar_status.xml | 5 ++- .../res/layout/list_item_contact.xml | 9 +++--- .../contact/BaseContactListAdapter.java | 5 +++ .../android/contact/ContactListAdapter.java | 5 +++ .../android/contact/ContactListFragment.java | 31 +++++++++++++------ .../android/contact/ConversationActivity.java | 5 +++ .../android/util/BriarRecyclerView.java | 5 +++ 7 files changed, 47 insertions(+), 18 deletions(-) diff --git a/briar-android/res/layout/contact_avatar_status.xml b/briar-android/res/layout/contact_avatar_status.xml index 2ceb59547..5c3415c91 100644 --- a/briar-android/res/layout/contact_avatar_status.xml +++ b/briar-android/res/layout/contact_avatar_status.xml @@ -11,7 +11,6 @@ android:id="@+id/contactAvatar" android:layout_width="30dp" android:layout_height="30dp" - android:transitionName="avatar" app:civ_border_color="@color/action_bar_text" app:civ_border_width="@dimen/avatar_border_width" tools:src="@drawable/ic_launcher"/> @@ -22,7 +21,7 @@ android:layout_height="15dp" android:layout_gravity="bottom|right" android:scaleType="fitCenter" - tools:src="@drawable/contact_online" - tools:ignore="ContentDescription"/> + tools:ignore="ContentDescription" + tools:src="@drawable/contact_online"/> \ No newline at end of file diff --git a/briar-android/res/layout/list_item_contact.xml b/briar-android/res/layout/list_item_contact.xml index 3a937d784..e50fc03a8 100644 --- a/briar-android/res/layout/list_item_contact.xml +++ b/briar-android/res/layout/list_item_contact.xml @@ -10,9 +10,9 @@ @@ -33,13 +32,13 @@ android:id="@+id/textViews" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical" android:layout_centerVertical="true" android:layout_marginLeft="@dimen/listitem_horizontal_margin" android:layout_marginStart="@dimen/listitem_horizontal_margin" + android:layout_toEndOf="@+id/avatarView" android:layout_toLeftOf="@+id/bulbView" android:layout_toRightOf="@+id/avatarView" - android:layout_toEndOf="@+id/avatarView"> + android:orientation="vertical"> { @@ -62,6 +64,9 @@ public class ContactListAdapter } else { ui.bulb.setImageResource(R.drawable.contact_disconnected); } + + ViewCompat.setTransitionName(ui.bulb, + "bulb" + StringUtils.toHexString(item.getGroupId().getBytes())); } protected static class ContactHolder diff --git a/briar-android/src/org/briarproject/android/contact/ContactListFragment.java b/briar-android/src/org/briarproject/android/contact/ContactListFragment.java index d01e6571d..1e527a7ad 100644 --- a/briar-android/src/org/briarproject/android/contact/ContactListFragment.java +++ b/briar-android/src/org/briarproject/android/contact/ContactListFragment.java @@ -5,7 +5,10 @@ import android.os.Build; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.design.widget.FloatingActionButton; +import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityOptionsCompat; +import android.support.v4.util.Pair; +import android.support.v4.view.ViewCompat; import android.support.v7.widget.LinearLayoutManager; import android.view.LayoutInflater; import android.view.View; @@ -107,16 +110,24 @@ public class ContactListFragment extends BaseFragment implements EventListener { ConversationActivity.class); i.putExtra(GROUP_ID, groupId.getBytes()); - if (Build.VERSION.SDK_INT >= 16) { - ActivityOptionsCompat options = - ActivityOptionsCompat. - makeSceneTransitionAnimation( - getActivity(), - view, "avatar"); - getActivity().startActivity(i, options.toBundle()); - } else { - startActivity(i); - } + ContactListAdapter.ContactHolder holder = + (ContactListAdapter.ContactHolder) list + .getRecyclerView() + .findViewHolderForAdapterPosition( + adapter.findItemPosition(item)); + Pair avatar = + Pair.create((View) holder.avatar, ViewCompat + .getTransitionName(holder.avatar)); + Pair bulb = + Pair.create((View) holder.bulb, ViewCompat + .getTransitionName(holder.bulb)); + ActivityOptionsCompat options = + ActivityOptionsCompat + .makeSceneTransitionAnimation( + getActivity(), avatar, + bulb); + ActivityCompat.startActivity(getActivity(), i, + options.toBundle()); } }; diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java index 676273700..fc35a6530 100644 --- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java +++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java @@ -6,6 +6,7 @@ import android.os.Bundle; import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityOptionsCompat; import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewCompat; import android.support.v7.app.ActionBar; import android.support.v7.app.AlertDialog; import android.support.v7.widget.LinearLayoutManager; @@ -156,6 +157,10 @@ public class ConversationActivity extends BriarActivity ab.setDisplayShowTitleEnabled(false); } + String hexGroupId = StringUtils.toHexString(b); + ViewCompat.setTransitionName(toolbarAvatar, "avatar" + hexGroupId); + ViewCompat.setTransitionName(toolbarStatus, "bulb" + hexGroupId); + adapter = new ConversationAdapter(this, this); list = (BriarRecyclerView) findViewById(R.id.conversationView); list.setLayoutManager(new LinearLayoutManager(this)); diff --git a/briar-android/src/org/briarproject/android/util/BriarRecyclerView.java b/briar-android/src/org/briarproject/android/util/BriarRecyclerView.java index 2c61d475d..dfc3c4c4f 100644 --- a/briar-android/src/org/briarproject/android/util/BriarRecyclerView.java +++ b/briar-android/src/org/briarproject/android/util/BriarRecyclerView.java @@ -131,4 +131,9 @@ public class BriarRecyclerView extends FrameLayout { if (recyclerView == null) initViews(); recyclerView.scrollToPosition(position); } + + public RecyclerView getRecyclerView() { + return this.recyclerView; + } + } From 6e545d0100e162b8aad3d135435746609a8a344c Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 13 May 2016 17:25:14 -0300 Subject: [PATCH 2/2] disable exit transition until we have a fix for it --- .../android/contact/ContactListFragment.java | 8 +++----- .../android/contact/ConversationActivity.java | 9 ++++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/briar-android/src/org/briarproject/android/contact/ContactListFragment.java b/briar-android/src/org/briarproject/android/contact/ContactListFragment.java index 1e527a7ad..d70f7d439 100644 --- a/briar-android/src/org/briarproject/android/contact/ContactListFragment.java +++ b/briar-android/src/org/briarproject/android/contact/ContactListFragment.java @@ -1,7 +1,6 @@ package org.briarproject.android.contact; import android.content.Intent; -import android.os.Build; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.design.widget.FloatingActionButton; @@ -51,6 +50,7 @@ import java.util.logging.Logger; import javax.inject.Inject; +import static android.support.v4.app.ActivityOptionsCompat.makeSceneTransitionAnimation; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static org.briarproject.android.BriarActivity.GROUP_ID; @@ -122,10 +122,8 @@ public class ContactListFragment extends BaseFragment implements EventListener { Pair.create((View) holder.bulb, ViewCompat .getTransitionName(holder.bulb)); ActivityOptionsCompat options = - ActivityOptionsCompat - .makeSceneTransitionAnimation( - getActivity(), avatar, - bulb); + makeSceneTransitionAnimation(getActivity(), + avatar, bulb); ActivityCompat.startActivity(getActivity(), i, options.toBundle()); } diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java index fc35a6530..2c8e3b5df 100644 --- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java +++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java @@ -212,7 +212,7 @@ public class ConversationActivity extends BriarActivity // Handle presses on the action bar items switch (item.getItemId()) { case android.R.id.home: - supportFinishAfterTransition(); + onBackPressed(); return true; case R.id.action_introduction: if (contactId == null) return false; @@ -232,6 +232,13 @@ public class ConversationActivity extends BriarActivity } } + @Override + public void onBackPressed() { + // FIXME disabled exit transition, because it doesn't work for some reason + //supportFinishAfterTransition(); + finish(); + } + private void loadData() { runOnDbThread(new Runnable() { @Override