From 76247e214a5ce30e8f08e8b703de65a4d51dd6e9 Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Tue, 16 Jan 2018 23:38:04 -0600 Subject: [PATCH] Changed CircleImageView to make transition work --- app/build.gradle | 3 ++- .../cy/agorise/crystalwallet/activities/BoardActivity.java | 3 ++- app/src/main/res/layout/activity_accounts.xml | 2 +- app/src/main/res/layout/board.xml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1355a52..396043c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,9 +53,10 @@ dependencies { compile 'com.jakewharton:butterknife:8.8.1' compile 'com.github.bilthon:graphenej:0.4.6-alpha1' compile 'com.google.zxing:core:3.3.1' - compile 'me.dm7.barcodescanner:zxing:1.9.8'; + compile 'me.dm7.barcodescanner:zxing:1.9.8' compile 'com.squareup.okhttp3:logging-interceptor:3.5.0' + compile 'de.hdodenhof:circleimageview:2.2.0' testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:1.10.19' 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 38a7678..73ac2d4 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java @@ -31,6 +31,7 @@ import cy.agorise.crystalwallet.fragments.ReceiveTransactionFragment; import cy.agorise.crystalwallet.fragments.SendTransactionFragment; import cy.agorise.crystalwallet.fragments.TransactionsFragment; import cy.agorise.crystalwallet.util.CircularImageView; +import de.hdodenhof.circleimageview.CircleImageView; /** * Created by Henry Varona on 7/10/2017. @@ -66,7 +67,7 @@ public class BoardActivity extends AppCompatActivity { public SurfaceView mSurfaceView; @BindView(R.id.toolbar_user_img) - public CircularImageView userImage; + public CircleImageView userImage; @BindView(R.id.lightning) public ImageView lightning; diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml index 8777d9f..f2dc015 100644 --- a/app/src/main/res/layout/activity_accounts.xml +++ b/app/src/main/res/layout/activity_accounts.xml @@ -27,7 +27,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - -