agorise/crystal-wallet-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

In the screen of copy seed, user can not continue but now the user can go ahead to board screen

Browse source
This commit is contained in:
dtvv 2018-09-20 20:10:13 -05:00
parent f0d6a935d1
commit a4d23f9f3b
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java
View file

@ -39,11 +39,6 @@ public class BackupSeedActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.backup_seed); 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); ButterKnife.bind(this);
long seedId = getIntent().getLongExtra("SEED_ID",-1); long seedId = getIntent().getLongExtra("SEED_ID",-1);
@ -61,17 +56,22 @@ public class BackupSeedActivity extends AppCompatActivity {
accountSeedViewModel.loadSeed(seedId); accountSeedViewModel.loadSeed(seedId);
} else { } else {
finish(); finish();
} }
} }
@OnClick(R.id.btnCancel) @OnClick(R.id.btnCancel)
public void btnCancelClick(){
Intent intent = new Intent(this, BoardActivity.class);
startActivity(intent);
finish();
}
@OnClick(R.id.btnOK)
public void btnOkClick(){ public void btnOkClick(){
Intent intent = new Intent(this, BoardActivity.class); Intent intent = new Intent(this, BoardActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(intent); startActivity(intent);
//finish(); finish();
} }
/* /*

16
app/src/main/res/layout/backup_seed.xml
View file

@ -44,6 +44,7 @@
android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin"
android:gravity="center" android:gravity="center"
android:text=""
android:background="#00000000" android:background="#00000000"
android:textColor="@color/gray" /> android:textColor="@color/gray" />
@ -68,20 +69,31 @@
android:layout_marginTop="35dp" android:layout_marginTop="35dp"
android:layout_toLeftOf="@+id/btnCopy" android:layout_toLeftOf="@+id/btnCopy"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:text="@string/ok" android:text="@string/cancel"
android:textColor="#0099ff" /> android:textColor="#0099ff" />
<Button <Button
android:id="@+id/btnCopy" android:id="@+id/btnCopy"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_toLeftOf="@+id/btnOK"
android:layout_below="@+id/backup_seed_textview_leyend_backup" android:layout_below="@+id/backup_seed_textview_leyend_backup"
android:layout_marginTop="35dp" android:layout_marginTop="35dp"
android:text="@string/window_seed_copy" android:text="@string/window_seed_copy"
android:textColor="#0099ff" android:textColor="#0099ff"
android:background="?android:attr/selectableItemBackground"/> android:background="?android:attr/selectableItemBackground"/>
<Button
android:id="@+id/btnOK"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@+id/backup_seed_textview_leyend_backup"
android:layout_marginTop="35dp"
android:text="@string/ok"
android:textColor="#0099ff"
android:background="?android:attr/selectableItemBackground"/>
</RelativeLayout> </RelativeLayout>