This commit is contained in:
parent
e80b46ced0
commit
09d1dba133
|
@ -92,7 +92,10 @@ class MasterPasswordTipProvider(
|
||||||
|
|
||||||
val passwordErrorText = context.getString(R.string.mp_dialog_error_transfer_saved_logins)
|
val passwordErrorText = context.getString(R.string.mp_dialog_error_transfer_saved_logins)
|
||||||
val migrationContinueButton =
|
val migrationContinueButton =
|
||||||
dialogView.findViewById<MaterialButton>(R.id.migration_continue)
|
dialogView.findViewById<MaterialButton>(R.id.migration_continue).apply {
|
||||||
|
alpha = HALF_OPACITY
|
||||||
|
isEnabled = false
|
||||||
|
}
|
||||||
val passwordView = dialogView.findViewById<TextInputEditText>(R.id.password_field)
|
val passwordView = dialogView.findViewById<TextInputEditText>(R.id.password_field)
|
||||||
val passwordLayout =
|
val passwordLayout =
|
||||||
dialogView.findViewById<TextInputLayout>(R.id.password_text_input_layout)
|
dialogView.findViewById<TextInputLayout>(R.id.password_text_input_layout)
|
||||||
|
@ -179,7 +182,7 @@ class MasterPasswordTipProvider(
|
||||||
dialogView.findViewById<MaterialButton>(R.id.positive_button).apply {
|
dialogView.findViewById<MaterialButton>(R.id.positive_button).apply {
|
||||||
text = context.getString(R.string.mp_dialog_close_transfer)
|
text = context.getString(R.string.mp_dialog_close_transfer)
|
||||||
setOnClickListener {
|
setOnClickListener {
|
||||||
tip?.let { dismissTip(it) }
|
dismissMPTip()
|
||||||
dialog.dismiss()
|
dialog.dismiss()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -212,8 +215,21 @@ class MasterPasswordTipProvider(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun dismissMPTip() {
|
||||||
|
tip?.let {
|
||||||
|
context.metrics.track(Event.TipClosed(it.identifier))
|
||||||
|
|
||||||
|
context.components.settings.preferences
|
||||||
|
.edit()
|
||||||
|
.putBoolean(it.identifier, false)
|
||||||
|
.apply()
|
||||||
|
|
||||||
|
dismissTip(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun showSuccessDialog() {
|
private fun showSuccessDialog() {
|
||||||
tip?.let { dismissTip(it) }
|
dismissMPTip()
|
||||||
|
|
||||||
context.metrics.track(Event.MasterPasswordMigrationSuccess)
|
context.metrics.track(Event.MasterPasswordMigrationSuccess)
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,7 @@
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
android:layout_marginBottom="10dp"
|
android:layout_marginBottom="10dp"
|
||||||
android:background="@null"
|
android:background="@null"
|
||||||
android:contentDescription="@string/saved_login_copy_username"
|
android:contentDescription="@string/saved_login_clear_username"
|
||||||
app:tint="@color/saved_login_clear_edit_text_tint"
|
app:tint="@color/saved_login_clear_edit_text_tint"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@id/inputLayoutUsername"
|
app:layout_constraintTop_toTopOf="@id/inputLayoutUsername"
|
||||||
|
@ -219,7 +219,7 @@
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="30dp"
|
android:layout_height="30dp"
|
||||||
android:background="@null"
|
android:background="@null"
|
||||||
android:contentDescription="@string/saved_logins_copy_password"
|
android:contentDescription="@string/saved_logins_clear_password"
|
||||||
app:tint="@color/saved_login_clear_edit_text_tint"
|
app:tint="@color/saved_login_clear_edit_text_tint"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@id/revealPasswordButton"
|
app:layout_constraintTop_toTopOf="@id/revealPasswordButton"
|
||||||
|
|
|
@ -1344,8 +1344,12 @@
|
||||||
<string name="logins_site_copied">Site copied to clipboard</string>
|
<string name="logins_site_copied">Site copied to clipboard</string>
|
||||||
<!-- Content Description (for screenreaders etc) read for the button to copy a password in logins-->
|
<!-- Content Description (for screenreaders etc) read for the button to copy a password in logins-->
|
||||||
<string name="saved_logins_copy_password">Copy password</string>
|
<string name="saved_logins_copy_password">Copy password</string>
|
||||||
|
<!-- Content Description (for screenreaders etc) read for the button to clear a password while editing a login-->
|
||||||
|
<string name="saved_logins_clear_password">Clear password</string>
|
||||||
<!-- Content Description (for screenreaders etc) read for the button to copy a username in logins -->
|
<!-- Content Description (for screenreaders etc) read for the button to copy a username in logins -->
|
||||||
<string name="saved_login_copy_username">Copy username</string>
|
<string name="saved_login_copy_username">Copy username</string>
|
||||||
|
<!-- Content Description (for screenreaders etc) read for the button to clear a username while editing a login -->
|
||||||
|
<string name="saved_login_clear_username">Clear username</string>
|
||||||
<!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
|
<!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
|
||||||
<string name="saved_login_copy_site">Copy site</string>
|
<string name="saved_login_copy_site">Copy site</string>
|
||||||
<!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
|
<!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->
|
||||||
|
|
Loading…
Reference in New Issue
Block a user