From 7a9c4c00128524125508632f8430fa935e9c12b9 Mon Sep 17 00:00:00 2001 From: dtvv Date: Tue, 31 Jul 2018 14:13:19 -0500 Subject: [PATCH] -Toast after copy to clipboard in backupseed window -Integrate https://github.com/afollestad/material-dialogs in androide app by gradle -Change the loading dialog in the registration window for the new one material -In the registration window in the PIN sections, i fixed the max length validation to 32 in both Fields --- app/build.gradle | 1 + .../crystalwallet/activities/BackupSeedActivity.java | 6 ++++-- .../crystalwallet/activities/CreateSeedActivity.java | 10 ++++++---- app/src/main/res/layout/create_seed.xml | 2 ++ app/src/main/res/values/strings.xml | 4 ++++ 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 07cd688..838217e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,6 +44,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) //testCompile 'com.android.support.test:runner:1.0.1' + implementation 'com.afollestad.material-dialogs:core:0.9.6.0' //DTVV Thrusday 31 July 2018 implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:support-v4:27.1.1' implementation 'com.android.support:design:27.1.1' 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 f7677c0..9454077 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java @@ -15,6 +15,7 @@ import android.view.Display; import android.widget.Button; import android.widget.EditText; import android.widget.TextView; +import android.widget.Toast; import butterknife.BindView; import butterknife.ButterKnife; @@ -39,8 +40,8 @@ public class BackupSeedActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.backup_seed); - /* Note: Test porpouses - final TextView textView = findViewById(R.id.backup_seed_view_textview_brainkey); + //Note: Test porpouses + /*final TextView textView = findViewById(R.id.backup_seed_view_textview_brainkey); textView.setText("sakk902909321o p3k21kldsa0'dsa90'e930eidakdñsakdñlsakdi90i03 2i90idopsasakk902909321op3k21 kldsa0'dsa90'e930eid akdñsakdñlsakdi90i032i90idopsa"); */ @@ -87,5 +88,6 @@ public class BackupSeedActivity extends AppCompatActivity { /* * Success message * */ + Toast.makeText(this.getBaseContext(),getResources().getString(R.string.window_seed_toast_clipboard), Toast.LENGTH_SHORT).show(); } } diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.java index bb1f7a9..a09fd50 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.java @@ -11,12 +11,15 @@ import android.text.Editable; import android.view.ViewGroup; import android.widget.Button; +import com.afollestad.materialdialogs.MaterialDialog; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; import butterknife.OnTextChanged; import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.dialogs.ProgressCreatingAccountDialog; +import cy.agorise.crystalwallet.dialogs.material.CreatingAccountMaterialDialog; import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequestListener; import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequests; import cy.agorise.crystalwallet.requestmanagers.ValidateCreateBitsharesAccountRequest; @@ -143,18 +146,17 @@ public class CreateSeedActivity extends AppCompatActivity implements UIValidator //DTVV: Friday 27 July 2018 //Makes dialog to tell the user that the account is been created - final ProgressCreatingAccountDialog progressCreatingAccountDialog = new ProgressCreatingAccountDialog(CreateSeedActivity.this); - progressCreatingAccountDialog.show(); + final CreatingAccountMaterialDialog creatingAccountMaterialDialog = new CreatingAccountMaterialDialog(this); CreateSeedActivity.this.runOnUiThread(new Runnable() { @Override public void run() { - progressCreatingAccountDialog.show(); + creatingAccountMaterialDialog.show(); } }); request.setListener(new CryptoNetInfoRequestListener() { @Override public void onCarryOut() { - progressCreatingAccountDialog.dismiss(); + creatingAccountMaterialDialog.dismiss(); if (request.getStatus().equals(ValidateCreateBitsharesAccountRequest.StatusCode.SUCCEEDED)) { GrapheneAccount accountSeed = request.getAccount(); Intent intent = new Intent(getApplicationContext(), BackupSeedActivity.class); diff --git a/app/src/main/res/layout/create_seed.xml b/app/src/main/res/layout/create_seed.xml index d7eecca..9ae2b09 100644 --- a/app/src/main/res/layout/create_seed.xml +++ b/app/src/main/res/layout/create_seed.xml @@ -23,6 +23,7 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aff0b55..ee34712 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -33,7 +33,11 @@ Choose File Please wait until Balances are loading + + Creating New Account ... + Backup brainkey + Brainkey copied to clipboard! Copy IMPORTANT: Print this out, or write it down. Anyone with access to your recovery key will have access to funds within this wallet