mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 13:38:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix / missing tint for recovery icon

Browse source
This commit is contained in:
Valere 2020-07-11 17:29:15 +02:00
commit 36b17e9b8c
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
View file

@ -185,7 +185,6 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment()
AlertDialog.Builder(it) AlertDialog.Builder(it)
.setTitle(R.string.dialog_title_error) .setTitle(R.string.dialog_title_error)
.setMessage(errorFormatter.toHumanReadable(throwable)) .setMessage(errorFormatter.toHumanReadable(throwable))
} }
}, },
{ {

16
vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt
View file

@ -23,6 +23,7 @@ import android.content.Intent
import android.widget.Button import android.widget.Button
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.PreferenceCategory 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.keys.KeysImporter
import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
import im.vector.riotx.features.crypto.recover.BootstrapBottomSheet import im.vector.riotx.features.crypto.recover.BootstrapBottomSheet
import im.vector.riotx.features.themes.ThemeUtils
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
import javax.inject.Inject import javax.inject.Inject
@ -214,16 +216,10 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
refreshXSigningStatus() refreshXSigningStatus()
// secureBackupResetPreference?.let { pref -> secureBackupPreference.icon = activity?.let {
// val destructiveColor = ContextCompat.getColor(requireContext(), R.color.riotx_destructive_accent) ThemeUtils.tintDrawable(it,
// pref.title = span { ContextCompat.getDrawable(it, R.drawable.ic_secure_backup)!!, R.attr.vctr_settings_icon_tint_color)
// 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)
// }
// }
} }
// Todo this should be refactored and use same state as 4S section // Todo this should be refactored and use same state as 4S section

2
vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
View file

@ -43,6 +43,7 @@
app:actionDescription="@string/bottom_sheet_setup_secure_backup_security_key_subtitle" app:actionDescription="@string/bottom_sheet_setup_secure_backup_security_key_subtitle"
app:actionTitle="@string/bottom_sheet_setup_secure_backup_security_key_title" app:actionTitle="@string/bottom_sheet_setup_secure_backup_security_key_title"
app:leftIcon="@drawable/ic_security_key_24dp" app:leftIcon="@drawable/ic_security_key_24dp"
app:tint="?attr/riotx_text_primary"
app:rightIcon="@drawable/ic_arrow_right" app:rightIcon="@drawable/ic_arrow_right"
tools:visibility="visible" /> tools:visibility="visible" />
@ -63,6 +64,7 @@
app:actionDescription="@string/bottom_sheet_setup_secure_backup_security_phrase_subtitle" app:actionDescription="@string/bottom_sheet_setup_secure_backup_security_phrase_subtitle"
app:actionTitle="@string/bottom_sheet_setup_secure_backup_security_phrase_title" app:actionTitle="@string/bottom_sheet_setup_secure_backup_security_phrase_title"
app:leftIcon="@drawable/ic_security_phrase_24dp" app:leftIcon="@drawable/ic_security_phrase_24dp"
app:tint="?attr/riotx_text_primary"
app:rightIcon="@drawable/ic_arrow_right" app:rightIcon="@drawable/ic_arrow_right"
tools:visibility="visible" /> tools:visibility="visible" />