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

- Removed the label "0.003€" from the balance item header

Browse source 
- Changed the label "cancel" to "ok" in the backup seed page
- The user can't get back once he/she entered the backup seed page
- When the "ok" button is pressed in the backup seed page, the user gets to the balance page (and not the creation seed page)
This commit is contained in:
Javier Varona 2018-09-18 22:25:07 -04:00
parent e601b90a63
commit 59b6e63297
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,10 @@ public class BackupSeedActivity extends AppCompatActivity {
@OnClick(R.id.btnCancel) @OnClick(R.id.btnCancel)
public void btnOkClick(){ public void btnOkClick(){
finish(); Intent intent = new Intent(this, BoardActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(intent);
//finish();
} }
/* /*

1
app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt
View file

@ -181,6 +181,7 @@ class CreateSeedActivity : CustomActivity() {
if (request.status == ValidateCreateBitsharesAccountRequest.StatusCode.SUCCEEDED) { if (request.status == ValidateCreateBitsharesAccountRequest.StatusCode.SUCCEEDED) {
val accountSeed = request.account val accountSeed = request.account
val intent = Intent(applicationContext, BackupSeedActivity::class.java) 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("SEED_ID", accountSeed.id)
startActivity(intent) startActivity(intent)
} else { } else {

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

@ -67,9 +67,9 @@
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="35dp" android:layout_marginTop="35dp"
android:layout_toLeftOf="@+id/btnCopy" android:layout_toLeftOf="@+id/btnCopy"
android:text="@string/cancel" android:background="?android:attr/selectableItemBackground"
android:textColor="#0099ff" android:text="@string/ok"
android:background="?android:attr/selectableItemBackground"/> android:textColor="#0099ff" />
<Button <Button
android:id="@+id/btnCopy" android:id="@+id/btnCopy"

3
app/src/main/res/layout/balance_list_item.xml
View file

@ -44,8 +44,7 @@
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_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true" />
android:text="0.003€" />
<Button <Button
android:id="@+id/btnSendFromThisAccount" android:id="@+id/btnSendFromThisAccount"