Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: removed step 4 from ui of username registration. #421

Merged
merged 2 commits into from
May 29, 2020
Merged

fix: removed step 4 from ui of username registration. #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8982189
Removed step 4 from UI of username registration
desamtralized May 29, 2020
46a8829
fixing step strings
desamtralized May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions wallet/res/values/strings-extra.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,9 @@
<string name="username_being_created">Your username %s is being created on the Dash Network</string>
<string name="processing_let_me_know">Let me know when it\'s done</string>
<string name="processing_home_title">Upgrading to Evolution</string>
<string name="processing_home_step_1" tools:ignore="TypographyFractions">(1/4) Processing Payment</string>
<string name="processing_home_step_2">(2/4) Creating ID</string>
<string name="processing_home_step_3" tools:ignore="TypographyFractions">(3/4) Registering Username</string>
<string name="processing_home_step_4">(4/4) Creating DashPay Profile</string>
<string name="processing_home_step_1" tools:ignore="TypographyFractions">(1/3) Processing Payment</string>
<string name="processing_home_step_2">(2/3) Creating ID</string>
<string name="processing_home_step_3" tools:ignore="TypographyFractions">(3/3) Registering Username</string>
<string name="processing_done_title">Hello %s,</string>
<string name="processing_done_subtitle">Your Evolution account is ready to use</string>
<string name="processing_error_title">Error Upgrading</string>
Expand Down
15 changes: 6 additions & 9 deletions wallet/src/de/schildbach/wallet/ui/dashpay/ProcessingIdentityViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,29 +48,26 @@ class ProcessingIdentityViewHolder(itemView: View) : RecyclerView.ViewHolder(ite
CreationState.CREDIT_FUNDING_TX_SENT,
CreationState.CREDIT_FUNDING_TX_CONFIRMED -> {
itemView.progress.visibility = View.VISIBLE
itemView.progress.progress = 20
itemView.progress.progress = 25
itemView.subtitle.setText(R.string.processing_home_step_1)
}
CreationState.IDENTITY_REGISTERING,
CreationState.IDENTITY_REGISTERED -> {
itemView.progress.progress = 40
itemView.progress.progress = 50
itemView.subtitle.setText(R.string.processing_home_step_2)
}
CreationState.PREORDER_REGISTERING,
CreationState.PREORDER_REGISTERED,
CreationState.USERNAME_REGISTERING,
CreationState.USERNAME_REGISTERED -> {
itemView.progress.progress = 60
CreationState.USERNAME_REGISTERED,
CreationState.DASHPAY_PROFILE_CREATING,
CreationState.DASHPAY_PROFILE_CREATED -> {
itemView.progress.progress = 75
itemView.subtitle.setText(
if (blockchainIdentityData.creationStateErrorMessage != null) R.string.processing_username_unavailable_subtitle
else R.string.processing_home_step_3
)
}
CreationState.DASHPAY_PROFILE_CREATING,
CreationState.DASHPAY_PROFILE_CREATED -> {
itemView.progress.progress = 80
itemView.subtitle.setText(R.string.processing_home_step_4)
}
CreationState.DONE -> {
itemView.icon.visibility = View.GONE
itemView.forward_arrow.visibility = View.VISIBLE
Expand Down