diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt index 124bef2e28..28711115c3 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt @@ -185,7 +185,6 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment() AlertDialog.Builder(it) .setTitle(R.string.dialog_title_error) .setMessage(errorFormatter.toHumanReadable(throwable)) - } }, { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt index d8f8546e2d..9d71c1712e 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt @@ -23,6 +23,7 @@ import android.content.Intent import android.widget.Button import android.widget.TextView import androidx.appcompat.app.AlertDialog +import androidx.core.content.ContextCompat import androidx.core.view.isVisible import androidx.preference.Preference import androidx.preference.PreferenceCategory @@ -51,6 +52,7 @@ import im.vector.riotx.features.crypto.keys.KeysExporter import im.vector.riotx.features.crypto.keys.KeysImporter import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity import im.vector.riotx.features.crypto.recover.BootstrapBottomSheet +import im.vector.riotx.features.themes.ThemeUtils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import javax.inject.Inject @@ -214,16 +216,10 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor( refreshXSigningStatus() -// secureBackupResetPreference?.let { pref -> -// val destructiveColor = ContextCompat.getColor(requireContext(), R.color.riotx_destructive_accent) -// pref.title = span { -// text = getString(R.string.keys_backup_restore_setup_recovery_key) -// textColor = destructiveColor -// } -// pref.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_delete)?.let { -// ThemeUtils.tintDrawableWithColor(it, destructiveColor) -// } -// } + secureBackupPreference.icon = activity?.let { + ThemeUtils.tintDrawable(it, + ContextCompat.getDrawable(it, R.drawable.ic_secure_backup)!!, R.attr.vctr_settings_icon_tint_color) + } } // Todo this should be refactored and use same state as 4S section diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml index a7405cb73a..ffe1e4680c 100644 --- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml +++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml @@ -43,6 +43,7 @@ app:actionDescription="@string/bottom_sheet_setup_secure_backup_security_key_subtitle" app:actionTitle="@string/bottom_sheet_setup_secure_backup_security_key_title" app:leftIcon="@drawable/ic_security_key_24dp" + app:tint="?attr/riotx_text_primary" app:rightIcon="@drawable/ic_arrow_right" tools:visibility="visible" /> @@ -63,6 +64,7 @@ app:actionDescription="@string/bottom_sheet_setup_secure_backup_security_phrase_subtitle" app:actionTitle="@string/bottom_sheet_setup_secure_backup_security_phrase_title" app:leftIcon="@drawable/ic_security_phrase_24dp" + app:tint="?attr/riotx_text_primary" app:rightIcon="@drawable/ic_arrow_right" tools:visibility="visible" />