diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt index 7497caeeb9..7275136382 100644 --- a/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt +++ b/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt @@ -68,7 +68,7 @@ class ExportKeysDialog { passwordVisible = !passwordVisible passPhrase1EditText.showPassword(passwordVisible) passPhrase2EditText.showPassword(passwordVisible) - showPassword.setImageResource(if (passwordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black) + showPassword.setImageResource(if (passwordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye) } val exportDialog = builder.show() diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt index a05c9dec05..3f1582563c 100644 --- a/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt +++ b/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt @@ -49,7 +49,7 @@ class PromptPasswordDialog { showPassword.setOnClickListener { passwordVisible = !passwordVisible passwordEditText.showPassword(passwordVisible) - showPassword.setImageResource(if (passwordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black) + showPassword.setImageResource(if (passwordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye) } AlertDialog.Builder(activity) diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt index e334603b74..b302b57433 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt @@ -74,7 +74,7 @@ class KeysBackupRestoreFromPassphraseFragment @Inject constructor() : VectorBase viewModel.showPasswordMode.observe(viewLifecycleOwner, Observer { val shouldBeVisible = it ?: false mPassphraseTextEdit.showPassword(shouldBeVisible) - mPassphraseReveal.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black) + mPassphraseReveal.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye) }) mPassphraseTextEdit.setOnEditorActionListener { _, actionId, _ -> diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt index a3306677fe..e6cf53206f 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt @@ -139,7 +139,7 @@ class KeysBackupSetupStep2Fragment @Inject constructor() : VectorBaseFragment() val shouldBeVisible = it ?: false mPassphraseTextEdit.showPassword(shouldBeVisible) mPassphraseConfirmTextEdit.showPassword(shouldBeVisible) - mPassphraseReveal.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black) + mPassphraseReveal.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye) }) viewModel.confirmPassphraseError.observe(viewLifecycleOwner, Observer { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt index 95d8579a9b..c14b452a60 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt @@ -97,6 +97,6 @@ class SharedSecuredStoragePassphraseFragment @Inject constructor( override fun invalidate() = withState(sharedViewModel) { state -> val shouldBeVisible = state.passphraseVisible ssss_passphrase_enter_edittext.showPassword(shouldBeVisible) - ssss_view_show_password.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black) + ssss_view_show_password.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye) } } diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt index fd7d269e01..dca8cd4227 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt @@ -101,7 +101,7 @@ class BootstrapAccountPasswordFragment @Inject constructor( if (state.step is BootstrapStep.AccountPassword) { val isPasswordVisible = state.step.isPasswordVisible bootstrapAccountPasswordEditText.showPassword(isPasswordVisible, updateCursor = false) - ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black) + ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye) } } } diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt index e37f2763ab..bed3b96a5d 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt @@ -103,7 +103,7 @@ class BootstrapConfirmPassphraseFragment @Inject constructor() : VectorBaseFragm if (state.step is BootstrapStep.ConfirmPassphrase) { val isPasswordVisible = state.step.isPasswordVisible ssss_passphrase_enter_edittext.showPassword(isPasswordVisible, updateCursor = false) - ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black) + ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye) } } } diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt index aad6ed2aa0..b7bd38a5eb 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt @@ -97,7 +97,7 @@ class BootstrapEnterPassphraseFragment @Inject constructor() : VectorBaseFragmen if (state.step is BootstrapStep.SetupPassphrase) { val isPasswordVisible = state.step.isPasswordVisible ssss_passphrase_enter_edittext.showPassword(isPasswordVisible, updateCursor = false) - ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black) + ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye) state.passphraseStrength.invoke()?.let { strength -> val score = strength.score diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt index 141edb2c58..053ffee1f4 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt @@ -129,7 +129,7 @@ class BootstrapMigrateBackupFragment @Inject constructor( if (state.step is BootstrapStep.GetBackupSecretPassForMigration) { val isPasswordVisible = state.step.isPasswordVisible bootstrapMigrateEditText.showPassword(isPasswordVisible, updateCursor = false) - bootstrapMigrateShowPassword.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black) + bootstrapMigrateShowPassword.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye) } bootstrapDescriptionText.text = getString(R.string.bootstrap_migration_enter_backup_password) diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt index 3f9cbe443a..b7de44aa24 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt @@ -221,10 +221,10 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() { passwordField.showPassword(passwordShown) if (passwordShown) { - passwordReveal.setImageResource(R.drawable.ic_eye_closed_black) + passwordReveal.setImageResource(R.drawable.ic_eye_closed) passwordReveal.contentDescription = getString(R.string.a11y_hide_password) } else { - passwordReveal.setImageResource(R.drawable.ic_eye_black) + passwordReveal.setImageResource(R.drawable.ic_eye) passwordReveal.contentDescription = getString(R.string.a11y_show_password) } } diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt index d90cfc77e5..ba3c8e1123 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt @@ -124,10 +124,10 @@ class LoginResetPasswordFragment @Inject constructor() : AbstractLoginFragment() passwordField.showPassword(passwordShown) if (passwordShown) { - passwordReveal.setImageResource(R.drawable.ic_eye_closed_black) + passwordReveal.setImageResource(R.drawable.ic_eye_closed) passwordReveal.contentDescription = getString(R.string.a11y_hide_password) } else { - passwordReveal.setImageResource(R.drawable.ic_eye_black) + passwordReveal.setImageResource(R.drawable.ic_eye) passwordReveal.contentDescription = getString(R.string.a11y_show_password) } } diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt index dcf7f618db..209cedda2c 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt @@ -817,7 +817,7 @@ private fun showEmailValidationDialog(pid: ThreePid) { newPasswordText.showPassword(passwordShown) confirmNewPasswordText.showPassword(passwordShown) - showPassword.setImageResource(if (passwordShown) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black) + showPassword.setImageResource(if (passwordShown) R.drawable.ic_eye_closed else R.drawable.ic_eye) } val dialog = AlertDialog.Builder(activity) diff --git a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt index 447f1086be..eb0adf1f17 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt @@ -114,6 +114,6 @@ class DeactivateAccountFragment @Inject constructor( override fun invalidate() = withState(viewModel) { state -> deactivateAccountPassword.showPassword(state.passwordShown) - deactivateAccountPasswordReveal.setImageResource(if (state.passwordShown) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black) + deactivateAccountPasswordReveal.setImageResource(if (state.passwordShown) R.drawable.ic_eye_closed else R.drawable.ic_eye) } } diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt b/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt index 6f7f45098d..17eee6b378 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt @@ -78,10 +78,10 @@ abstract class LoginPasswordFormItem : VectorEpoxyModel + + + + + + + + diff --git a/vector/src/main/res/drawable/ic_eye.xml b/vector/src/main/res/drawable/ic_eye.xml new file mode 100644 index 0000000000..976a023268 --- /dev/null +++ b/vector/src/main/res/drawable/ic_eye.xml @@ -0,0 +1,10 @@ + + + diff --git a/vector/src/main/res/drawable/ic_eye_closed.xml b/vector/src/main/res/drawable/ic_eye_closed.xml new file mode 100644 index 0000000000..5d13f0615d --- /dev/null +++ b/vector/src/main/res/drawable/ic_eye_closed.xml @@ -0,0 +1,7 @@ + + + + diff --git a/vector/src/main/res/drawable/ic_fab_add_chat.xml b/vector/src/main/res/drawable/ic_fab_add_chat.xml index 3e1b9a0eb1..b823134db0 100644 --- a/vector/src/main/res/drawable/ic_fab_add_chat.xml +++ b/vector/src/main/res/drawable/ic_fab_add_chat.xml @@ -1,21 +1,9 @@ - - - + + + + diff --git a/vector/src/main/res/drawable/ic_login_splash_lock.xml b/vector/src/main/res/drawable/ic_login_splash_lock.xml index 26470cefce..2b0a912ac7 100644 --- a/vector/src/main/res/drawable/ic_login_splash_lock.xml +++ b/vector/src/main/res/drawable/ic_login_splash_lock.xml @@ -1,22 +1,14 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M3.0001,12.8C3.0001,11.1431 4.3432,9.8 6.0001,9.8H18.0001C19.6569,9.8 21.0001,11.1431 21.0001,12.8V19.8C21.0001,21.4569 19.6569,22.8 18.0001,22.8H6.0001C4.3432,22.8 3.0001,21.4569 3.0001,19.8V12.8Z" + android:fillColor="#ffffff"/> + android:strokeColor="#ffffff"/> diff --git a/vector/src/main/res/drawable/ic_login_splash_message_circle.xml b/vector/src/main/res/drawable/ic_login_splash_message_circle.xml index 81b5e9476a..8f2c6f7f39 100644 --- a/vector/src/main/res/drawable/ic_login_splash_message_circle.xml +++ b/vector/src/main/res/drawable/ic_login_splash_message_circle.xml @@ -1,14 +1,5 @@ - - + + diff --git a/vector/src/main/res/drawable/ic_login_splash_sliders.xml b/vector/src/main/res/drawable/ic_login_splash_sliders.xml index b7c850eea7..eb4c8fd3a4 100644 --- a/vector/src/main/res/drawable/ic_login_splash_sliders.xml +++ b/vector/src/main/res/drawable/ic_login_splash_sliders.xml @@ -1,14 +1,10 @@ + android:viewportHeight="24"> + android:pathData="M8,4C3.5817,4 0,7.5817 0,12C0,16.4183 3.5817,20 8,20H16C20.4183,20 24,16.4183 24,12C24,7.5817 20.4183,4 16,4H8ZM13,12C13,14.7614 10.7614,17 8,17C5.2386,17 3,14.7614 3,12C3,9.2386 5.2386,7 8,7C10.7614,7 13,9.2386 13,12Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> diff --git a/vector/src/main/res/drawable/ic_shield_black.xml b/vector/src/main/res/drawable/ic_shield_black.xml index a87a84547a..cb354f54ff 100644 --- a/vector/src/main/res/drawable/ic_shield_black.xml +++ b/vector/src/main/res/drawable/ic_shield_black.xml @@ -9,6 +9,5 @@ android:strokeLineJoin="round" android:fillColor="#2E2F32" android:fillType="evenOdd" - android:strokeColor="#ffffff" android:strokeLineCap="round"/> diff --git a/vector/src/main/res/drawable/ic_shield_custom.xml b/vector/src/main/res/drawable/ic_shield_custom.xml index cb5e98c033..f359ce64e9 100644 --- a/vector/src/main/res/drawable/ic_shield_custom.xml +++ b/vector/src/main/res/drawable/ic_shield_custom.xml @@ -9,6 +9,5 @@ android:strokeLineJoin="round" android:fillColor="#03B381" android:fillType="evenOdd" - android:strokeColor="#ffffff" android:strokeLineCap="round"/> diff --git a/vector/src/main/res/drawable/ic_shield_trusted.xml b/vector/src/main/res/drawable/ic_shield_trusted.xml index 56f0aa0b63..334f15d3f8 100644 --- a/vector/src/main/res/drawable/ic_shield_trusted.xml +++ b/vector/src/main/res/drawable/ic_shield_trusted.xml @@ -9,7 +9,6 @@ android:strokeLineJoin="round" android:fillColor="#03B381" android:fillType="evenOdd" - android:strokeColor="#ffffff" android:strokeLineCap="round"/> diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml index 67c6f68551..f0c9438f1a 100644 --- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml +++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml @@ -28,7 +28,7 @@ android:layout_marginTop="8dp" android:background="?attr/selectableItemBackground" android:scaleType="center" - android:src="@drawable/ic_eye_black" + android:src="@drawable/ic_eye" android:tint="?attr/colorAccent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/exportDialogTil" diff --git a/vector/src/main/res/layout/dialog_prompt_password.xml b/vector/src/main/res/layout/dialog_prompt_password.xml index 1382caa729..3fa5f4a867 100644 --- a/vector/src/main/res/layout/dialog_prompt_password.xml +++ b/vector/src/main/res/layout/dialog_prompt_password.xml @@ -58,7 +58,7 @@ android:layout_marginTop="8dp" android:background="?attr/selectableItemBackground" android:scaleType="center" - android:src="@drawable/ic_eye_black" + android:src="@drawable/ic_eye" android:tint="?attr/colorAccent" tools:contentDescription="@string/a11y_show_password" /> diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml index c26723637b..a0d4960f72 100644 --- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml +++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml @@ -50,7 +50,7 @@ android:layout_marginTop="8dp" android:background="?attr/selectableItemBackground" android:scaleType="center" - android:src="@drawable/ic_eye_black" + android:src="@drawable/ic_eye" android:tint="?colorAccent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/bootstrapAccountPasswordTil" diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml index 41a95cbd03..f63a223091 100644 --- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml +++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml @@ -70,7 +70,7 @@ android:layout_marginTop="8dp" android:background="?attr/selectableItemBackground" android:scaleType="center" - android:src="@drawable/ic_eye_black" + android:src="@drawable/ic_eye" android:tint="?colorAccent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/ssss_passphrase_enter_til" diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml index ac1b70d2c9..720dd80901 100644 --- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml +++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml @@ -70,7 +70,7 @@ android:layout_marginTop="8dp" android:background="?attr/selectableItemBackground" android:scaleType="center" - android:src="@drawable/ic_eye_black" + android:src="@drawable/ic_eye" android:tint="?colorAccent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/bootstrapRecoveryKeyEnterTil" diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml index 1bf04ba81e..978921ecc9 100644 --- a/vector/src/main/res/layout/fragment_deactivate_account.xml +++ b/vector/src/main/res/layout/fragment_deactivate_account.xml @@ -86,7 +86,7 @@ android:layout_marginTop="8dp" android:background="?attr/selectableItemBackground" android:scaleType="center" - android:src="@drawable/ic_eye_black" + android:src="@drawable/ic_eye" android:tint="?attr/colorAccent" tools:contentDescription="@string/a11y_show_password" /> diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml index 648687cf4f..fe1e6efe78 100644 --- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml +++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml @@ -68,7 +68,7 @@ android:layout_marginTop="8dp" android:background="?attr/selectableItemBackground" android:scaleType="center" - android:src="@drawable/ic_eye_black" + android:src="@drawable/ic_eye" android:tint="?colorAccent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/keys_backup_passphrase_enter_til" diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml index a0e0ec00b1..eb70487220 100644 --- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml +++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml @@ -76,7 +76,7 @@ android:layout_marginTop="8dp" android:background="?attr/selectableItemBackground" android:scaleType="center" - android:src="@drawable/ic_eye_black" + android:src="@drawable/ic_eye" android:tint="?attr/colorAccent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/keys_backup_passphrase_enter_til" diff --git a/vector/src/main/res/layout/fragment_loading.xml b/vector/src/main/res/layout/fragment_loading.xml index b6b3d2c589..7a6a791edf 100644 --- a/vector/src/main/res/layout/fragment_loading.xml +++ b/vector/src/main/res/layout/fragment_loading.xml @@ -7,8 +7,8 @@ diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml index 506afbe519..e50c823ff1 100644 --- a/vector/src/main/res/layout/fragment_login_reset_password.xml +++ b/vector/src/main/res/layout/fragment_login_reset_password.xml @@ -90,7 +90,7 @@ android:layout_marginTop="8dp" android:background="?attr/selectableItemBackground" android:scaleType="center" - android:src="@drawable/ic_eye_black" + android:src="@drawable/ic_eye" android:tint="?attr/colorAccent" tools:contentDescription="@string/a11y_show_password" /> diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml index f6d4e9636b..a57f3c487c 100644 --- a/vector/src/main/res/layout/fragment_login_splash.xml +++ b/vector/src/main/res/layout/fragment_login_splash.xml @@ -24,31 +24,28 @@ android:layout_height="64dp" android:src="@drawable/element_logo_green" android:transitionName="loginLogoTransition" - app:layout_constraintBottom_toTopOf="@+id/brandTextView" + app:layout_constraintBottom_toTopOf="@+id/logoType" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" /> - + android:src="@drawable/element_logotype" + android:tint="?colorAccent" + android:layout_marginTop="8dp"/> + app:layout_constraintTop_toBottomOf="@+id/logoType" /> @@ -91,7 +88,7 @@ android:layout_marginStart="2dp" android:importantForAccessibility="no" android:src="@drawable/ic_login_splash_lock" - android:tint="?vctr_notice_secondary" + android:tint="?riotx_text_secondary" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/loginSplashText2" /> @@ -115,7 +112,7 @@ android:layout_height="wrap_content" android:importantForAccessibility="no" android:src="@drawable/ic_login_splash_sliders" - android:tint="?vctr_notice_secondary" + android:tint="?riotx_text_secondary" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/loginSplashText3" /> diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml index 7ac0ffbdcd..005de93cf6 100644 --- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml +++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml @@ -83,7 +83,7 @@ android:layout_marginTop="8dp" android:background="?attr/selectableItemBackground" android:scaleType="center" - android:src="@drawable/ic_eye_black" + android:src="@drawable/ic_eye" android:tint="?colorAccent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/ssss_passphrase_enter_til" diff --git a/vector/src/main/res/layout/item_login_password_form.xml b/vector/src/main/res/layout/item_login_password_form.xml index 614a727d2a..759da76a0d 100644 --- a/vector/src/main/res/layout/item_login_password_form.xml +++ b/vector/src/main/res/layout/item_login_password_form.xml @@ -43,7 +43,7 @@ android:layout_marginTop="8dp" android:background="?attr/selectableItemBackground" android:scaleType="center" - android:src="@drawable/ic_eye_black" + android:src="@drawable/ic_eye" android:tint="?attr/colorAccent" tools:contentDescription="@string/a11y_show_password" /> diff --git a/vector/src/main/res/values/styles_login.xml b/vector/src/main/res/values/styles_login.xml index 4c47bee32d..f1f067f623 100644 --- a/vector/src/main/res/values/styles_login.xml +++ b/vector/src/main/res/values/styles_login.xml @@ -26,7 +26,7 @@