set background to null when disabled

This was the only way I could stop the ripple. I moved some lines around to make reading a little easier as well
duckduckgo · Jan 27, 2025 · 6b46744 · 6b46744
1 parent b26daca
commit 6b46744
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/...in/java/com/duckduckgo/networkprotection/impl/subscription/settings/ProSettingNetPView.kt b/...in/java/com/duckduckgo/networkprotection/impl/subscription/settings/ProSettingNetPView.kt
@@ -20,12 +20,14 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.FrameLayout
+import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.duckduckgo.anvil.annotations.InjectWith
+import com.duckduckgo.common.ui.view.defaultSelectableItemBackground
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.di.scopes.ViewScope
 import com.duckduckgo.navigation.api.GlobalActivityStarter
@@ -93,13 +95,15 @@ class ProSettingNetPView @JvmOverloads constructor(
                 is Disabled -> {
                     isVisible = true
                     isClickable = false
+                    background = null
                     setClickListener(null)
                     setLeadingIconResource(R.drawable.ic_vpn_grayscale_color_24)
                     setStatus(isOn = false)
                 }
                 is Enabled -> {
                     isVisible = true
                     isClickable = true
+                    background = ContextCompat.getDrawable(context, context.defaultSelectableItemBackground())
                     setClickListener { viewModel.onNetPSettingClicked() }
                     setLeadingIconResource(R.drawable.ic_vpn_color_24)
                     setStatus(isOn = networkProtectionEntryState.isActive)

diff --git a/...ons-impl/src/main/java/com/duckduckgo/subscriptions/impl/settings/views/ItrSettingView.kt b/...ons-impl/src/main/java/com/duckduckgo/subscriptions/impl/settings/views/ItrSettingView.kt
@@ -20,12 +20,14 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.FrameLayout
+import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.duckduckgo.anvil.annotations.InjectWith
+import com.duckduckgo.common.ui.view.defaultSelectableItemBackground
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.common.utils.ConflatedJob
 import com.duckduckgo.common.utils.ViewViewModelFactory
@@ -102,14 +104,16 @@ class ItrSettingView @JvmOverloads constructor(
             when (viewState.itrState) {
                 is ItrState.Enabled -> {
                     isVisible = true
-                    setStatus(isOn = true)
-                    setLeadingIconResource(R.drawable.ic_identity_theft_restoration_color_24)
                     isClickable = true
+                    background = ContextCompat.getDrawable(context, context.defaultSelectableItemBackground())
+                    setStatus(isOn = true)
                     setClickListener { viewModel.onItr() }
+                    setLeadingIconResource(R.drawable.ic_identity_theft_restoration_color_24)
                 }
                 ItrState.Disabled -> {
                     isVisible = true
                     isClickable = false
+                    background = null
                     setStatus(isOn = false)
                     setClickListener(null)
                     setLeadingIconResource(R.drawable.ic_identity_theft_restoration_grayscale_color_24)

diff --git a/...ons-impl/src/main/java/com/duckduckgo/subscriptions/impl/settings/views/PirSettingView.kt b/...ons-impl/src/main/java/com/duckduckgo/subscriptions/impl/settings/views/PirSettingView.kt
@@ -20,12 +20,14 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.FrameLayout
+import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.duckduckgo.anvil.annotations.InjectWith
+import com.duckduckgo.common.ui.view.defaultSelectableItemBackground
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.common.utils.ConflatedJob
 import com.duckduckgo.common.utils.ViewViewModelFactory
@@ -103,16 +105,18 @@ class PirSettingView @JvmOverloads constructor(
             when (viewState.pirState) {
                 is Enabled -> {
                     isVisible = true
+                    isClickable = true
+                    background = ContextCompat.getDrawable(context, context.defaultSelectableItemBackground())
                     setStatus(isOn = true)
+                    setClickListener { viewModel.onPir() }
                     setLeadingIconResource(R.drawable.ic_identity_blocked_pir_color_24)
-                    isClickable = true
-                    binding.pirSettings.setClickListener { viewModel.onPir() }
                 }
                 is Disabled -> {
                     isVisible = true
                     isClickable = false
+                    background = null
                     setStatus(isOn = false)
-                    binding.pirSettings.setClickListener(null)
+                    setClickListener(null)
                     setLeadingIconResource(R.drawable.ic_identity_blocked_pir_grayscale_color_24)
                 }
                 Hidden -> isGone = true