Snackbar on each dashboard and trackers

12 files changed, 103 insertions, 80 deletions

diff --git a/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt b/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt
index 0a06708..727d00d 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt
@@ -119,7 +119,7 @@ class DependencyContainer(val app: Application) {
     }
 
     val trackersViewModelFactory by lazy {
-        TrackersViewModelFactory(trackersStatisticsUseCase)
+        TrackersViewModelFactory(getQuickPrivacyStateUseCase, trackersStatisticsUseCase)
     }
 
     val appTrackersViewModelFactory by lazy {
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStateUseCase.kt b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStateUseCase.kt
index 5263559..3319eb0 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStateUseCase.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStateUseCase.kt
@@ -79,6 +79,10 @@ class TrackersStateUseCase(
     }
 
     fun toggleAppWhitelist(appUid: Int, isWhitelisted: Boolean) {
+        if (!localStateRepository.isQuickPrivacyEnabled) {
+            localStateRepository.setShowQuickPrivacyDisabledMessage(true)
+        }
+
         if (appUid == appListsRepository.dummySystemApp.uid) {
             appListsRepository.getHiddenSystemApps().forEach {
                 blockTrackersPrivacyModule.setWhiteListed(it.uid, isWhitelisted)
@@ -89,6 +93,9 @@ class TrackersStateUseCase(
     }
 
     fun blockTracker(appUid: Int, tracker: Tracker, isBlocked: Boolean) {
+        if (!localStateRepository.isQuickPrivacyEnabled) {
+            localStateRepository.setShowQuickPrivacyDisabledMessage(true)
+        }
         if (appUid == appListsRepository.dummySystemApp.uid) {
             appListsRepository.getHiddenSystemApps().forEach {
                 blockTrackersPrivacyModule.setWhiteListed(tracker, it.uid, !isBlocked)
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
index 7270c32..3ed3168 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
@@ -57,7 +57,8 @@ class DashboardFeature(
         val trackersCount: Int? = null,
         val allowedTrackersCount: Int? = null,
         val dayStatistics: List<Pair<Int, Int>>? = null,
-        val dayLabels: List<String>? = null
+        val dayLabels: List<String>? = null,
+        val showQuickPrivacyDisabledMessage: Boolean = false
     )
 
     sealed class SingleEvent {
@@ -77,6 +78,7 @@ class DashboardFeature(
         object ShowAppsPermissions : Action()
         object ShowTrackers : Action()
         object FetchStatistics : Action()
+        object CloseQuickPrivacyDisabledMessage : Action()
     }
 
     sealed class Effect {
@@ -99,6 +101,7 @@ class DashboardFeature(
         object NewStatisticsAvailablesEffect : Effect()
         object FirstIPTrackerActivationEffect : Effect()
         data class LocationHiddenUpdatedEffect(val isLocationHidden: Boolean) : Effect()
+        data class ShowQuickPrivacyDisabledMessageEffect(val show: Boolean) : Effect()
     }
 
     companion object {
@@ -129,7 +132,7 @@ class DashboardFeature(
                             isLocationHidden = effect.isLocationHidden
                         )
                         is Effect.UpdateLocationModeEffect -> state.copy(locationMode = effect.mode)
-
+                        is Effect.ShowQuickPrivacyDisabledMessageEffect -> state.copy(showQuickPrivacyDisabledMessage = effect.show)
                         else -> state
                     }
                 },
@@ -161,7 +164,10 @@ class DashboardFeature(
                             },
                             getPrivacyStateUseCase.locationMode.map {
                                 Effect.UpdateLocationModeEffect(it)
-                            }
+                            },
+                            getPrivacyStateUseCase.showQuickPrivacyDisabledMessage.map {
+                                Effect.ShowQuickPrivacyDisabledMessageEffect(it)
+                            },
                         )
                         Action.ShowFakeMyLocationAction -> flowOf(Effect.OpenFakeMyLocationEffect)
                         Action.ShowAppsPermissions -> flowOf(Effect.OpenAppsPermissionsEffect)
@@ -183,6 +189,10 @@ class DashboardFeature(
                                             )
                                         }
                                 }
+                        is Action.CloseQuickPrivacyDisabledMessage -> {
+                            getPrivacyStateUseCase.resetQuickPrivacyDisabledMessage()
+                            flowOf(Effect.NoEffect)
+                        }
                     }
                 },
                 singleEventProducer = { _, _, effect ->
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
index ea470a2..32549c9 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
@@ -26,15 +26,17 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat.getColor
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.add
 import androidx.fragment.app.commit
+import androidx.fragment.app.replace
 import androidx.lifecycle.lifecycleScope
+import com.google.android.material.snackbar.Snackbar
 import foundation.e.flowmvi.MVIView
 import foundation.e.privacycentralapp.DependencyContainer
 import foundation.e.privacycentralapp.PrivacyCentralApplication
 import foundation.e.privacycentralapp.R
 import foundation.e.privacycentralapp.common.GraphHolder
 import foundation.e.privacycentralapp.common.NavToolbarFragment
+import foundation.e.privacycentralapp.common.initQuickPrivacySnackbar
 import foundation.e.privacycentralapp.databinding.FragmentDashboardBinding
 import foundation.e.privacycentralapp.domain.entities.LocationMode
 import foundation.e.privacycentralapp.domain.entities.QuickPrivacyState
@@ -65,6 +67,8 @@ class DashboardFragment :
     private lateinit var graphHolder: GraphHolder
     private lateinit var binding: FragmentDashboardBinding
 
+    private var qpDisabledSnackbar: Snackbar? = null
+
     private var updateUIJob: Job? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -79,14 +83,14 @@ class DashboardFragment :
                 when (event) {
                     is DashboardFeature.SingleEvent.NavigateToLocationSingleEvent -> {
                         requireActivity().supportFragmentManager.commit {
-                            add<FakeLocationFragment>(R.id.container)
+                            replace<FakeLocationFragment>(R.id.container)
                             setReorderingAllowed(true)
                             addToBackStack("dashboard")
                         }
                     }
                     is DashboardFeature.SingleEvent.NavigateToInternetActivityPrivacySingleEvent -> {
                         requireActivity().supportFragmentManager.commit {
-                            add<InternetPrivacyFragment>(R.id.container)
+                            replace<InternetPrivacyFragment>(R.id.container)
                             setReorderingAllowed(true)
                             addToBackStack("dashboard")
                         }
@@ -97,7 +101,7 @@ class DashboardFragment :
                     }
                     DashboardFeature.SingleEvent.NavigateToTrackersSingleEvent -> {
                         requireActivity().supportFragmentManager.commit {
-                            add<TrackersFragment>(R.id.container)
+                            replace<TrackersFragment>(R.id.container)
                             setReorderingAllowed(true)
                             addToBackStack("dashboard")
                         }
@@ -138,6 +142,10 @@ class DashboardFragment :
         binding.amITracked.container.setOnClickListener {
             viewModel.submitAction(DashboardFeature.Action.ShowTrackers)
         }
+
+        qpDisabledSnackbar = initQuickPrivacySnackbar(binding.root) {
+            viewModel.submitAction(DashboardFeature.Action.CloseQuickPrivacyDisabledMessage)
+        }
     }
 
     override fun onResume() {
@@ -149,6 +157,8 @@ class DashboardFragment :
             }
         }
 
+        render(viewModel.dashboardFeature.state.value)
+
         viewModel.submitAction(DashboardFeature.Action.FetchStatistics)
     }
 
@@ -162,6 +172,9 @@ class DashboardFragment :
     }
 
     override fun render(state: State) {
+        if (state.showQuickPrivacyDisabledMessage) qpDisabledSnackbar?.show()
+        else qpDisabledSnackbar?.dismiss()
+
         binding.stateLabel.text = getString(
             when (state.quickPrivacyState) {
                 QuickPrivacyState.DISABLED -> R.string.dashboard_state_title_off
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
index a606e49..34ddfbe 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
@@ -24,6 +24,7 @@ import foundation.e.flowmvi.SingleEventProducer
 import foundation.e.flowmvi.feature.BaseFeature
 import foundation.e.privacycentralapp.domain.entities.AppWithCounts
 import foundation.e.privacycentralapp.domain.entities.TrackersPeriodicStatistics
+import foundation.e.privacycentralapp.domain.usecases.GetQuickPrivacyStateUseCase
 import foundation.e.privacycentralapp.domain.usecases.TrackersStatisticsUseCase
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.flow
@@ -51,6 +52,7 @@ class TrackersFeature(
         val monthStatistics: TrackersPeriodicStatistics? = null,
         val yearStatistics: TrackersPeriodicStatistics? = null,
         val apps: List<AppWithCounts>? = null,
+        val showQuickPrivacyDisabledMessage: Boolean = false
     )
 
     sealed class SingleEvent {
@@ -63,9 +65,11 @@ class TrackersFeature(
         object InitAction : Action()
         data class ClickAppAction(val packageName: String) : Action()
         object FetchStatistics : Action()
+        object CloseQuickPrivacyDisabledMessage : Action()
     }
 
     sealed class Effect {
+        object NoEffect : Effect()
         data class TrackersStatisticsLoadedEffect(
             val dayStatistics: TrackersPeriodicStatistics? = null,
             val monthStatistics: TrackersPeriodicStatistics? = null,
@@ -75,14 +79,15 @@ class TrackersFeature(
             val apps: List<AppWithCounts>
         ) : Effect()
         data class OpenAppDetailsEffect(val appDesc: AppWithCounts) : Effect()
-        object QuickPrivacyDisabledWarningEffect : Effect()
         data class ErrorEffect(val message: String) : Effect()
         object NewStatisticsAvailablesEffect : Effect()
+        data class ShowQuickPrivacyDisabledMessageEffect(val show: Boolean) : Effect()
     }
 
     companion object {
         fun create(
             initialState: State = State(),
+            getQuickPrivacyStateUseCase: GetQuickPrivacyStateUseCase,
             coroutineScope: CoroutineScope,
             trackersStatisticsUseCase: TrackersStatisticsUseCase
         ) = TrackersFeature(
@@ -97,6 +102,7 @@ class TrackersFeature(
                     is Effect.AvailableAppsListEffect -> state.copy(apps = effect.apps)
 
                     is Effect.ErrorEffect -> state
+                    is Effect.ShowQuickPrivacyDisabledMessageEffect -> state.copy(showQuickPrivacyDisabledMessage = effect.show)
                     else -> state
                 }
             },
@@ -106,7 +112,10 @@ class TrackersFeature(
                         flowOf(Effect.NewStatisticsAvailablesEffect),
                         trackersStatisticsUseCase.listenUpdates().map {
                             Effect.NewStatisticsAvailablesEffect
-                        }
+                        },
+                        getQuickPrivacyStateUseCase.showQuickPrivacyDisabledMessage.map {
+                            Effect.ShowQuickPrivacyDisabledMessageEffect(it)
+                        },
                     )
 
                     is Action.ClickAppAction -> flowOf(
@@ -131,13 +140,16 @@ class TrackersFeature(
                             Effect.AvailableAppsListEffect(it)
                         }
                     )
+                    is Action.CloseQuickPrivacyDisabledMessage -> {
+                        getQuickPrivacyStateUseCase.resetQuickPrivacyDisabledMessage()
+                        flowOf(Effect.NoEffect)
+                    }
                 }
             },
             singleEventProducer = { _, _, effect ->
                 when (effect) {
                     is Effect.ErrorEffect -> SingleEvent.ErrorEvent(effect.message)
                     is Effect.OpenAppDetailsEffect -> SingleEvent.OpenAppDetailsEvent(effect.appDesc)
-                    is Effect.QuickPrivacyDisabledWarningEffect -> SingleEvent.ErrorEvent("Enabled Quick Privacy to use functionalities")
                     is Effect.NewStatisticsAvailablesEffect -> SingleEvent.NewStatisticsAvailableSingleEvent
                     else -> null
                 }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
index 893f4ba..21a90bc 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
@@ -26,6 +26,7 @@ import androidx.fragment.app.replace
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.snackbar.Snackbar
 import foundation.e.flowmvi.MVIView
 import foundation.e.privacycentralapp.DependencyContainer
 import foundation.e.privacycentralapp.PrivacyCentralApplication
@@ -33,6 +34,7 @@ import foundation.e.privacycentralapp.R
 import foundation.e.privacycentralapp.common.AppsAdapter
 import foundation.e.privacycentralapp.common.GraphHolder
 import foundation.e.privacycentralapp.common.NavToolbarFragment
+import foundation.e.privacycentralapp.common.initQuickPrivacySnackbar
 import foundation.e.privacycentralapp.databinding.FragmentTrackersBinding
 import foundation.e.privacycentralapp.databinding.TrackersItemGraphBinding
 import foundation.e.privacycentralapp.domain.entities.TrackersPeriodicStatistics
@@ -57,6 +59,7 @@ class TrackersFragment :
     private lateinit var dayGraphHolder: GraphHolder
     private lateinit var monthGraphHolder: GraphHolder
     private lateinit var yearGraphHolder: GraphHolder
+    private var qpDisabledSnackbar: Snackbar? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -111,6 +114,10 @@ class TrackersFragment :
                 )
             }
         }
+
+        qpDisabledSnackbar = initQuickPrivacySnackbar(binding.root) {
+            viewModel.submitAction(TrackersFeature.Action.CloseQuickPrivacyDisabledMessage)
+        }
     }
 
     override fun onResume() {
@@ -121,6 +128,9 @@ class TrackersFragment :
     override fun getTitle() = getString(R.string.trackers_title)
 
     override fun render(state: TrackersFeature.State) {
+        if (state.showQuickPrivacyDisabledMessage) qpDisabledSnackbar?.show()
+        else qpDisabledSnackbar?.dismiss()
+
         state.dayStatistics?.let { renderGraph(it, dayGraphHolder, binding.graphDay) }
         state.monthStatistics?.let { renderGraph(it, monthGraphHolder, binding.graphMonth) }
         state.yearStatistics?.let { renderGraph(it, yearGraphHolder, binding.graphYear) }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
index c2a1822..4140381 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
@@ -20,12 +20,14 @@ package foundation.e.privacycentralapp.features.trackers
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import foundation.e.privacycentralapp.common.Factory
+import foundation.e.privacycentralapp.domain.usecases.GetQuickPrivacyStateUseCase
 import foundation.e.privacycentralapp.domain.usecases.TrackersStatisticsUseCase
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 
 class TrackersViewModel(
+    private val getQuickPrivacyStateUseCase: GetQuickPrivacyStateUseCase,
     private val trackersStatisticsUseCase: TrackersStatisticsUseCase
 ) : ViewModel() {
 
@@ -35,7 +37,7 @@ class TrackersViewModel(
     val trackersFeature: TrackersFeature by lazy {
         TrackersFeature.create(
             coroutineScope = viewModelScope,
-
+            getQuickPrivacyStateUseCase = getQuickPrivacyStateUseCase,
             trackersStatisticsUseCase = trackersStatisticsUseCase
         )
     }
@@ -48,10 +50,14 @@ class TrackersViewModel(
 }
 
 class TrackersViewModelFactory(
+    private val getQuickPrivacyStateUseCase: GetQuickPrivacyStateUseCase,
     private val trackersStatisticsUseCase: TrackersStatisticsUseCase
 ) :
     Factory<TrackersViewModel> {
     override fun create(): TrackersViewModel {
-        return TrackersViewModel(trackersStatisticsUseCase)
+        return TrackersViewModel(
+            getQuickPrivacyStateUseCase,
+            trackersStatisticsUseCase
+        )
     }
 }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFeature.kt
index c1eef47..ad82337 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFeature.kt
@@ -55,7 +55,8 @@ class AppTrackersFeature(
         val isBlockingActivated: Boolean = false,
         val trackers: List<Tracker>? = null,
         val whitelist: List<String>? = null,
-        val isQuickPrivacyEnabled: Boolean = false
+        val isQuickPrivacyEnabled: Boolean = false,
+        val showQuickPrivacyDisabledMessage: Boolean = false
     ) {
         fun getTrackersStatus(): List<Pair<Tracker, Boolean>>? {
             if (trackers != null && whitelist != null) {
@@ -83,6 +84,7 @@ class AppTrackersFeature(
         data class ToggleTrackerAction(val tracker: Tracker, val isBlocked: Boolean) : Action()
         data class ClickTracker(val tracker: Tracker) : Action()
         object FetchStatistics : Action()
+        object CloseQuickPrivacyDisabledMessage : Action()
     }
 
     sealed class Effect {
@@ -94,8 +96,8 @@ class AppTrackersFeature(
         data class TrackersWhitelistUpdateEffect(val whitelist: List<String>) : Effect()
         object NewStatisticsAvailablesEffect : Effect()
         data class QuickPrivacyUpdatedEffect(val enabled: Boolean) : Effect()
-        object QuickPrivacyDisabledWarningEffect : Effect()
         data class OpenUrlEffect(val url: Uri) : Effect()
+        data class ShowQuickPrivacyDisabledMessageEffect(val show: Boolean) : Effect()
     }
 
     companion object {
@@ -121,6 +123,7 @@ class AppTrackersFeature(
                         state.copy(whitelist = effect.whitelist)
                     is Effect.QuickPrivacyUpdatedEffect ->
                         state.copy(isQuickPrivacyEnabled = effect.enabled)
+                    is Effect.ShowQuickPrivacyDisabledMessageEffect -> state.copy(showQuickPrivacyDisabledMessage = effect.show)
                     is Effect.ErrorEffect -> state
                     else -> state
                 }
@@ -155,14 +158,15 @@ class AppTrackersFeature(
                                     },
                                     getQuickPrivacyStateUseCase.quickPrivacyEnabledFlow.map {
                                         Effect.QuickPrivacyUpdatedEffect(it)
-                                    }
+                                    },
+                                    getQuickPrivacyStateUseCase.showQuickPrivacyDisabledMessage.map {
+                                        Effect.ShowQuickPrivacyDisabledMessageEffect(it)
+                                    },
                                 )
                             } ?: flowOf(Effect.ErrorEffect(R.string.apptrackers_error_no_app))
 
                     is Action.BlockAllToggleAction ->
-                        if (!state.isQuickPrivacyEnabled) {
-                            flowOf(Effect.QuickPrivacyDisabledWarningEffect)
-                        } else state.appDesc?.uid?.let { appUid ->
+                        state.appDesc?.uid?.let { appUid ->
                             flow {
                                 trackersStateUseCase.toggleAppWhitelist(appUid, !action.isBlocked)
 
@@ -174,9 +178,7 @@ class AppTrackersFeature(
                             }
                         } ?: run { flowOf(Effect.ErrorEffect("No appDesc.")) }
                     is Action.ToggleTrackerAction -> {
-                        if (!state.isQuickPrivacyEnabled) {
-                            flowOf(Effect.QuickPrivacyDisabledWarningEffect)
-                        } else if (state.isBlockingActivated) {
+                        if (state.isBlockingActivated) {
                             state.appDesc?.uid?.let { appUid ->
                                 flow {
                                     trackersStateUseCase.blockTracker(
@@ -210,15 +212,16 @@ class AppTrackersFeature(
                                 trackers = trackersStatisticsUseCase.getTrackers(it)
                             )
                         } ?: Effect.ErrorEffect("No appDesc.")
-
                     )
+                    is Action.CloseQuickPrivacyDisabledMessage -> {
+                        getQuickPrivacyStateUseCase.resetQuickPrivacyDisabledMessage()
+                        flowOf(Effect.NoEffect)
+                    }
                 }
             },
             singleEventProducer = { _, _, effect ->
                 when (effect) {
                     is Effect.ErrorEffect -> SingleEvent.ErrorEvent(effect.message)
-                    is Effect.QuickPrivacyDisabledWarningEffect ->
-                        SingleEvent.ErrorEvent(R.string.apptrackers_error_quickprivacy_disabled)
                     is Effect.NewStatisticsAvailablesEffect ->
                         SingleEvent.NewStatisticsAvailableSingleEvent
                     is Effect.OpenUrlEffect ->
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFragment.kt
index d6edee6..7e606af 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFragment.kt
@@ -27,11 +27,13 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.snackbar.Snackbar
 import foundation.e.flowmvi.MVIView
 import foundation.e.privacycentralapp.DependencyContainer
 import foundation.e.privacycentralapp.PrivacyCentralApplication
 import foundation.e.privacycentralapp.R
 import foundation.e.privacycentralapp.common.NavToolbarFragment
+import foundation.e.privacycentralapp.common.initQuickPrivacySnackbar
 import foundation.e.privacycentralapp.databinding.ApptrackersFragmentBinding
 import foundation.e.privacycentralapp.extensions.toText
 import foundation.e.privacycentralapp.extensions.viewModelProviderFactoryOf
@@ -65,6 +67,8 @@ class AppTrackersFragment :
 
     private lateinit var binding: ApptrackersFragmentBinding
 
+    private var qpDisabledSnackbar: Snackbar? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         lifecycleScope.launchWhenStarted {
@@ -109,10 +113,6 @@ class AppTrackersFragment :
             viewModel.submitAction(Action.BlockAllToggleAction(binding.blockAllToggle.isChecked))
         }
 
-        binding.blockAllToggleClicker.setOnClickListener {
-            viewModel.submitAction(Action.BlockAllToggleAction(false))
-        }
-
         binding.trackers.apply {
             layoutManager = LinearLayoutManager(requireContext())
             setHasFixedSize(true)
@@ -124,6 +124,10 @@ class AppTrackersFragment :
                 onClickTitle = { viewModel.submitAction(Action.ClickTracker(it)) }
             )
         }
+
+        qpDisabledSnackbar = initQuickPrivacySnackbar(binding.root) {
+            viewModel.submitAction(Action.CloseQuickPrivacyDisabledMessage)
+        }
     }
 
     override fun onResume() {
@@ -132,6 +136,9 @@ class AppTrackersFragment :
     }
 
     override fun render(state: State) {
+        if (state.showQuickPrivacyDisabledMessage) qpDisabledSnackbar?.show()
+        else qpDisabledSnackbar?.dismiss()
+
         binding.trackersCountSummary.text = if (state.getTrackersCount() == 0) ""
         else getString(
             R.string.apptrackers_trackers_count_summary,
@@ -140,8 +147,6 @@ class AppTrackersFragment :
         )
 
         binding.blockAllToggle.isChecked = state.isBlockingActivated
-        binding.blockAllToggle.isEnabled = state.isQuickPrivacyEnabled
-        binding.blockAllToggleClicker.isVisible = !state.isQuickPrivacyEnabled
 
         binding.trackersListTitle.isVisible = state.isBlockingActivated
 
@@ -151,7 +156,7 @@ class AppTrackersFragment :
             binding.trackers.post {
                 (binding.trackers.adapter as ToggleTrackersAdapter?)?.updateDataSet(
                     trackersStatus,
-                    state.isBlockingActivated && state.isQuickPrivacyEnabled
+                    state.isBlockingActivated
                 )
             }
             binding.noTrackersYet.isVisible = false
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt
index b9beccf..02a274a 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt
@@ -25,7 +25,6 @@ import android.view.ViewGroup
 import android.widget.Switch
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import foundation.e.privacycentralapp.R
 import foundation.e.privacymodules.trackers.Tracker
@@ -46,7 +45,6 @@ class ToggleTrackersAdapter(
         val title: TextView = view.findViewById(R.id.title)
 
         val toggle: Switch = view.findViewById(R.id.toggle)
-        val toggleOverlay: View = view.findViewById(R.id.toggle_clicker)
 
         fun bind(item: Pair<Tracker, Boolean>, isEnabled: Boolean) {
             val text = item.first.label
@@ -62,14 +60,10 @@ class ToggleTrackersAdapter(
 
             toggle.isChecked = item.second
             toggle.isEnabled = isEnabled
-            toggleOverlay.isVisible = !isEnabled
 
             toggle.setOnClickListener {
                 onToggleSwitch(item.first, toggle.isChecked)
             }
-            toggleOverlay.setOnClickListener {
-                onToggleSwitch(item.first, false)
-            }
 
             title.setOnClickListener { onClickTitle(item.first) }
         }
diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml
index 3eb9168..e6e226f 100644
--- a/app/src/main/res/layout/apptrackers_fragment.xml
+++ b/app/src/main/res/layout/apptrackers_fragment.xml
@@ -60,31 +60,12 @@
                 android:layout_weight="1"
                 android:text="@string/apptrackers_block_all_toggle"
                 />
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <Switch
+                android:id="@+id/block_all_toggle"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-
-                <Switch
-                    android:id="@+id/block_all_toggle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="24dp"
-                    android:checked="true"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    />
-                <View
-                    android:id="@+id/block_all_toggle_clicker"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    android:clickable="true"
-                    />
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                android:layout_height="24dp"
+                android:checked="true"
+                />
         </LinearLayout>
         <View
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml b/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml
index 20e0bdc..8cf7b2e 100644
--- a/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml
+++ b/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml
@@ -21,28 +21,10 @@
         tools:text="Body sensor"
         />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
         <Switch
             android:id="@+id/toggle"
             android:layout_width="wrap_content"
             android:layout_height="24dp"
             android:checked="true"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             />
-        <View
-            android:id="@+id/toggle_clicker"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:clickable="true"
-            />
-    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.appcompat.widget.LinearLayoutCompat>