From 692a39d16e71e18fa315029776188de4c14dfce8 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
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" >
         </activity>
         <activity android:name=".activities.AccountsActivity"
-            android:theme="@style/AppTheme.Transparent"
+            android:theme="@style/ActivityDialog"
             android:parentActivityName=".activities.BoardActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
index f0b0aa8..10e001e 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.widget.TextView;
 
 import butterknife.BindView;
@@ -16,7 +17,7 @@ import cy.agorise.crystalwallet.R;
  *
  */
 
-public class AccountsActivity extends Activity {
+public class AccountsActivity extends AppCompatActivity {
 
     @BindView(R.id.tvSettings)
     TextView tvSettings;
diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 6ae880b..38a7678 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -7,16 +7,14 @@ import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.TabLayout;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.util.Pair;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.util.Pair;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
@@ -73,6 +71,9 @@ public class BoardActivity  extends AppCompatActivity {
     @BindView(R.id.lightning)
     public ImageView lightning;
 
+    @BindView(R.id.triangle)
+    public ImageView triangle;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -179,25 +180,21 @@ public class BoardActivity  extends AppCompatActivity {
      */
     @OnClick(R.id.toolbar_user_img)
     public void accounts() {
-        /*FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        Fragment prev = getSupportFragmentManager().findFragmentByTag("AccountsDialog");
-        if (prev != null) {
-            ft.remove(prev);
-        }
-        ft.addToBackStack(null);
-
-        // Create and show the dialog.
-        AccountsFragment newFragment = AccountsFragment.newInstance(this.cryptoNetAccountId);
-        newFragment.show(ft, "AccountsDialog");*/
         Intent intent = new Intent(this, AccountsActivity.class);
 
-        Pair p1 = Pair.create(userImage, "gravatarTransition");
-        Pair p2 = Pair.create(lightning, "lightningTransition");
+        // SharedElementTransition is only available from API level 21
+        if (android.os.Build.VERSION.SDK_INT >= 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 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false">
     <scale
-        android:interpolator="@android:anim/bounce_interpolator"
+        android:interpolator="@android:anim/anticipate_overshoot_interpolator"
         android:fromXScale="1.0"
         android:toXScale="1.0"
         android:fromYScale="0.0"
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
index 0cd3176..8777d9f 100644
--- a/app/src/main/res/layout/activity_accounts.xml
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -40,6 +40,7 @@
         <ImageView
             android:layout_width="24dp"
             android:layout_height="45dp"
+            android:transitionName="lightningTransition"
             app:layout_constraintBottom_toBottomOf="@id/user_img"
             app:layout_constraintStart_toStartOf="@id/user_img"
             app:srcCompat="@drawable/ic_lightning_24dp" />
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"/>
 
                     <ImageView
+                        android:id="@+id/triangle"
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         app:srcCompat="@drawable/ic_arrow_24dp"
+                        android:transitionName="triangleTransition"
                         android:contentDescription="@string/small_triangle_icon"
                         app:layout_constraintEnd_toEndOf="@id/toolbar_user_img"
                         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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
-    <changeImageTransform
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:duration="400"/>
+    <changeImageTransform/>
 </transitionSet>
\ 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 @@
         <!-- enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
 
-        <!-- specify shared element transitions -->
+        <!-- specify shared element transitions
         <item name="android:windowSharedElementEnterTransition">
             @transition/change_image_transform</item>
         <item name="android:windowSharedElementExitTransition">
-            @transition/change_image_transform</item>
+            @transition/change_image_transform</item> -->
 
     </style>
 
-    <style name="AppTheme.Transparent" parent="AppTheme">
+    <style name="ActivityDialog" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
-        <item name="windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:backgroundDimEnabled">true</item>
     </style>
@@ -93,11 +92,6 @@
         <item name="android:windowExitAnimation">@anim/receive_transaction_out</item>
     </style>
 
-    <style name="AccountsTheme" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="android:windowBackground">@color/transparent</item>
-        <item name="android:windowAnimationStyle">@style/AccountsAnimation.Window</item>
-    </style>
-
     <style name="AccountsAnimation.Window" parent="@android:style/Animation.Activity">
         <item name="android:windowEnterAnimation">@anim/accounts_in</item>
         <item name="android:windowExitAnimation">@anim/accounts_out</item>