From 692a39d16e71e18fa315029776188de4c14dfce8 Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Tue, 16 Jan 2018 17:26:35 -0600 Subject: [PATCH] Fixed AccountsFragment theme and almost fixed sharedElementTransition --- app/src/main/AndroidManifest.xml | 2 +- .../activities/AccountsActivity.java | 3 +- .../activities/BoardActivity.java | 35 +++++++++---------- .../fragments/AccountsFragment.java | 2 +- app/src/main/res/anim/accounts_in.xml | 2 +- app/src/main/res/layout/activity_accounts.xml | 1 + app/src/main/res/layout/board.xml | 2 ++ .../res/transition/change_image_transform.xml | 4 +-- app/src/main/res/values/styles.xml | 12 ++----- 9 files changed, 28 insertions(+), 35 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 21c88e0..ad92f17 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -38,7 +38,7 @@ android:theme="@style/AppTheme.NoActionBar" > = android.os.Build.VERSION_CODES.LOLLIPOP) { + Pair p1 = Pair.create(userImage, "gravatarTransition"); + Pair p2 = Pair.create(lightning, "lightningTransition"); + Pair p3 = Pair.create(triangle, "triangleTransition"); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation(this, userImage, "gravatarTransition"); - //ActivityCompat.startActivity(this, intent, options.toBundle()); - startActivity(intent); + ActivityOptions options = ActivityOptions + .makeSceneTransitionAnimation(this, p1, p2, p3); + + startActivity(intent, options.toBundle()); + } else { + startActivity(intent); + } } /* diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java index f0e3ae4..130cb2f 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java +++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java @@ -53,7 +53,7 @@ public class AccountsFragment extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AccountsTheme); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); LayoutInflater inflater = getActivity().getLayoutInflater(); View view = inflater.inflate(R.layout.fragment_accounts, null); diff --git a/app/src/main/res/anim/accounts_in.xml b/app/src/main/res/anim/accounts_in.xml index e229b12..95d3c0d 100644 --- a/app/src/main/res/anim/accounts_in.xml +++ b/app/src/main/res/anim/accounts_in.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml index a226a85..12507b1 100644 --- a/app/src/main/res/layout/board.xml +++ b/app/src/main/res/layout/board.xml @@ -81,9 +81,11 @@ app:layout_constraintBottom_toBottomOf="@id/toolbar_user_img"/> diff --git a/app/src/main/res/transition/change_image_transform.xml b/app/src/main/res/transition/change_image_transform.xml index 655608d..459686a 100644 --- a/app/src/main/res/transition/change_image_transform.xml +++ b/app/src/main/res/transition/change_image_transform.xml @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a5ddb74..91f9541 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -35,19 +35,18 @@ true - + - @@ -93,11 +92,6 @@ @anim/receive_transaction_out - -