diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionDetailsView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionDetailsView.kt index 40a8b5640f..b7f8c7d548 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionDetailsView.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionDetailsView.kt @@ -8,10 +8,8 @@ import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup import androidx.annotation.VisibleForTesting -import androidx.core.content.ContextCompat.getColor import androidx.core.view.isVisible import mozilla.components.browser.icons.BrowserIcons -import mozilla.components.support.ktx.android.content.getDrawableWithTint import org.mozilla.fenix.R import org.mozilla.fenix.databinding.ConnectionDetailsWebsiteInfoBinding import org.mozilla.fenix.ext.loadIntoView @@ -53,11 +51,8 @@ class ConnectionDetailsView( } private fun bindSecurityInfo(uiValues: WebsiteSecurityUiValues) { - val tint = getColor(provideContext(), uiValues.iconTintRes) binding.securityInfo.setText(uiValues.securityInfoRes) - binding.securityInfoIcon.setImageDrawable( - provideContext().getDrawableWithTint(uiValues.iconRes, tint) - ) + binding.securityInfoIcon.setImageResource(uiValues.iconRes) } @VisibleForTesting diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt index bebea72360..dcd9430bd1 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt @@ -5,7 +5,6 @@ package org.mozilla.fenix.settings.quicksettings import android.content.Context -import androidx.annotation.ColorRes import androidx.annotation.DrawableRes import androidx.annotation.StringRes import mozilla.components.concept.engine.permission.SitePermissions @@ -69,18 +68,15 @@ data class WebsiteInfoState( enum class WebsiteSecurityUiValues( @StringRes val securityInfoRes: Int, - @DrawableRes val iconRes: Int, - @ColorRes val iconTintRes: Int + @DrawableRes val iconRes: Int ) { SECURE( R.string.quick_settings_sheet_secure_connection, - R.drawable.mozac_ic_lock, - R.color.photonGreen50 + R.drawable.ic_lock ), INSECURE( R.string.quick_settings_sheet_insecure_connection, - R.drawable.mozac_ic_broken_lock, - R.color.photonRed50 + R.drawable.ic_broken_lock ) } diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt index 7152e3a2b9..7d92c8f3c9 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt @@ -8,9 +8,7 @@ import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup import androidx.annotation.VisibleForTesting -import androidx.core.content.ContextCompat.getColor import mozilla.components.browser.icons.BrowserIcons -import mozilla.components.support.ktx.android.content.getDrawableWithTint import mozilla.components.support.ktx.kotlin.tryGetHostFromUrl import org.mozilla.fenix.databinding.QuicksettingsWebsiteInfoBinding import org.mozilla.fenix.ext.components @@ -50,13 +48,9 @@ class WebsiteInfoView( } private fun bindSecurityInfo(uiValues: WebsiteSecurityUiValues) { - val tint = getColor(provideContext(), uiValues.iconTintRes) binding.securityInfo.setText(uiValues.securityInfoRes) bindConnectionDetailsListener() - - binding.securityInfoIcon.setImageDrawable( - provideContext().getDrawableWithTint(uiValues.iconRes, tint) - ) + binding.securityInfoIcon.setImageResource(uiValues.iconRes) } @VisibleForTesting diff --git a/app/src/main/res/drawable/ic_broken_lock.xml b/app/src/main/res/drawable/ic_broken_lock.xml new file mode 100644 index 0000000000..dc9ec5a9f4 --- /dev/null +++ b/app/src/main/res/drawable/ic_broken_lock.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000000..8b2fe6870c --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,13 @@ + + + + +