From a4d23f9f3b2e3ab96926c7dd8de602423aaea412 Mon Sep 17 00:00:00 2001 From: dtvv Date: Thu, 20 Sep 2018 20:10:13 -0500 Subject: [PATCH] In the screen of copy seed, user can not continue but now the user can go ahead to board screen --- .../activities/BackupSeedActivity.java | 16 ++++++++-------- app/src/main/res/layout/backup_seed.xml | 16 ++++++++++++++-- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java index db40e29..64cee76 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java @@ -39,11 +39,6 @@ public class BackupSeedActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.backup_seed); - //Note: Test porpouses - /*final TextView textView = findViewById(R.id.tvBrainKey); - textView.setText("sakk902909321o p3k21kldsa0'dsa90'e930eidakdñsakdñlsakdi90i03 2i90idopsasakk902909321op3k21 kldsa0'dsa90'e930eid akdñsakdñlsakdi90i032i90idopsa"); - */ - ButterKnife.bind(this); long seedId = getIntent().getLongExtra("SEED_ID",-1); @@ -61,17 +56,22 @@ public class BackupSeedActivity extends AppCompatActivity { accountSeedViewModel.loadSeed(seedId); } else { - finish(); } } @OnClick(R.id.btnCancel) + public void btnCancelClick(){ + Intent intent = new Intent(this, BoardActivity.class); + startActivity(intent); + finish(); + } + + @OnClick(R.id.btnOK) public void btnOkClick(){ Intent intent = new Intent(this, BoardActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); startActivity(intent); - //finish(); + finish(); } /* diff --git a/app/src/main/res/layout/backup_seed.xml b/app/src/main/res/layout/backup_seed.xml index 511b6b9..bff1e5d 100644 --- a/app/src/main/res/layout/backup_seed.xml +++ b/app/src/main/res/layout/backup_seed.xml @@ -44,6 +44,7 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:gravity="center" + android:text="" android:background="#00000000" android:textColor="@color/gray" /> @@ -68,20 +69,31 @@ android:layout_marginTop="35dp" android:layout_toLeftOf="@+id/btnCopy" android:background="?android:attr/selectableItemBackground" - android:text="@string/ok" + android:text="@string/cancel" android:textColor="#0099ff" />