When you create a new account the cancel button does not have to show, only when you check the brainkey
This commit is contained in:
parent
ad0c14e389
commit
d86fe35a6b
4 changed files with 17 additions and 2 deletions
|
@ -10,6 +10,7 @@ import android.content.Intent;
|
|||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
@ -34,6 +35,7 @@ public class BackupSeedActivity extends AppCompatActivity {
|
|||
@BindView(R.id.btnCopy)
|
||||
Button btnCopy;
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
@ -41,6 +43,15 @@ public class BackupSeedActivity extends AppCompatActivity {
|
|||
|
||||
ButterKnife.bind(this);
|
||||
|
||||
/*
|
||||
* If comes from new account creation hide the cancel button
|
||||
* */
|
||||
Bundle b = getIntent().getExtras();
|
||||
boolean newAccount = b.getBoolean("newAccount");
|
||||
if(newAccount ){
|
||||
btnOk.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
|
||||
long seedId = getIntent().getLongExtra("SEED_ID",-1);
|
||||
|
||||
if (seedId > -1) {
|
||||
|
|
|
@ -200,6 +200,7 @@ class CreateSeedActivity : CustomActivity() {
|
|||
val intent = Intent(applicationContext, BackupSeedActivity::class.java)
|
||||
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
|
||||
intent.putExtra("SEED_ID", accountSeed.id)
|
||||
intent.putExtra("newAccount", true)
|
||||
startActivity(intent)
|
||||
}
|
||||
else if (request.status == ValidateCreateBitsharesAccountRequest.StatusCode.ACCOUNT_EXIST) {
|
||||
|
|
|
@ -2,9 +2,11 @@ package cy.agorise.crystalwallet.activities;
|
|||
|
||||
import android.arch.lifecycle.ViewModelProviders;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.media.MediaPlayer;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.app.ActivityCompat;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentTransaction;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
|
|
|
@ -32,9 +32,10 @@
|
|||
android:textColor="@color/white"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintTop_toBottomOf="@id/tvDescription"
|
||||
app:layout_constraintEnd_toEndOf="@id/tvDescription"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toStartOf="@id/tvDescription"
|
||||
app:layout_constraintEnd_toEndOf="@id/tvDescription"/>
|
||||
app:layout_constraintTop_toBottomOf="@id/tvDescription" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnImportSeed"
|
||||
|
|
Loading…
Reference in a new issue