diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 453f8ae..21c88e0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,6 +37,13 @@ + + + diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java new file mode 100644 index 0000000..71489e5 --- /dev/null +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java @@ -0,0 +1,46 @@ +package cy.agorise.crystalwallet.activities; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.widget.TextView; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnClick; +import cy.agorise.crystalwallet.R; + +/** + * Created by xd on 1/9/18. + * + */ + +public class AccountsActivity extends Activity{ + + @BindView(R.id.tvSettings) + TextView tvSettings; + + @BindView(R.id.tvClose) + TextView tvClose; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_accounts); + ButterKnife.bind(this); + + } + + @OnClick(R.id.tvSettings) + public void onTvSettingsClick(){ + onBackPressed(); + Intent intent = new Intent(this, SettingsActivity.class); + startActivity(intent); + } + + @OnClick(R.id.tvClose) + public void cancel(){ + onBackPressed(); + } +} 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 1ee48f5..7bfb357 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java @@ -1,5 +1,6 @@ package cy.agorise.crystalwallet.activities; +import android.app.ActivityOptions; import android.content.Intent; import android.content.res.Resources; import android.graphics.drawable.AnimationDrawable; @@ -177,7 +178,7 @@ public class BoardActivity extends AppCompatActivity { */ @OnClick(R.id.toolbar_user_img) public void accounts() { - FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); + /*FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); Fragment prev = getSupportFragmentManager().findFragmentByTag("AccountsDialog"); if (prev != null) { ft.remove(prev); @@ -186,7 +187,13 @@ public class BoardActivity extends AppCompatActivity { // Create and show the dialog. AccountsFragment newFragment = AccountsFragment.newInstance(this.cryptoNetAccountId); - newFragment.show(ft, "AccountsDialog"); + newFragment.show(ft, "AccountsDialog");*/ + Intent intent = new Intent(new Intent(this, AccountsActivity.class)); + + ActivityOptions options = ActivityOptions + .makeSceneTransitionAnimation(this, userImage, "gravatarTransition"); + startActivity(intent, options.toBundle()); + //startActivity(intent); } /* diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml new file mode 100644 index 0000000..f1d7d36 --- /dev/null +++ b/app/src/main/res/layout/activity_accounts.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml index 31aa573..47c1b7c 100644 --- a/app/src/main/res/layout/board.xml +++ b/app/src/main/res/layout/board.xml @@ -65,6 +65,7 @@ android:layout_height="?attr/actionBarSize" android:layout_marginEnd="32dp" android:src="@drawable/ken_code_gravatar" + android:transitionName="gravatarTransition" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/transition/change_image_transform.xml b/app/src/main/res/transition/change_image_transform.xml new file mode 100644 index 0000000..c56e8c5 --- /dev/null +++ b/app/src/main/res/transition/change_image_transform.xml @@ -0,0 +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 be0ebc8..3eb5f25 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -34,6 +34,14 @@ @font/opensans + +