diff options
| author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-09-20 06:43:58 +0000 |
|---|---|---|
| committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-09-20 06:43:58 +0000 |
| commit | 837e4ffac7d9d2c26e474e3c69847fac43e5d577 (patch) | |
| tree | b07b005028af5a682d9b08c5d28c6af74295dd2e /app/src/main/java/foundation/e/privacycentralapp/widget | |
| parent | 6495fe4a88b59648892bf85f8a02eb37d6a01974 (diff) | |
| parent | 0a8527b4947ce40b9864305139afedc59f00ad87 (diff) | |
| download | advanced-privacy-837e4ffac7d9d2c26e474e3c69847fac43e5d577.tar.gz | |
Merge branch '4208-CUSTOM_state_for_trackers' into 'main'
4208 Add CUSTOM state for tracker control.
See merge request e/os/advanced-privacy!90
Diffstat (limited to 'app/src/main/java/foundation/e/privacycentralapp/widget')
| -rw-r--r-- | app/src/main/java/foundation/e/privacycentralapp/widget/Widget.kt | 7 | ||||
| -rw-r--r-- | app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/app/src/main/java/foundation/e/privacycentralapp/widget/Widget.kt b/app/src/main/java/foundation/e/privacycentralapp/widget/Widget.kt index 62e279f..e886cd8 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/widget/Widget.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/widget/Widget.kt @@ -35,7 +35,6 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.debounce import kotlinx.coroutines.flow.flow @@ -84,14 +83,14 @@ class Widget : AppWidgetProvider() { return combine( getPrivacyStateUseCase.quickPrivacyState, - getPrivacyStateUseCase.isTrackersDenied, + getPrivacyStateUseCase.trackerMode, getPrivacyStateUseCase.isLocationHidden, getPrivacyStateUseCase.isIpHidden, - ) { quickPrivacyState, isTrackersDenied, isLocationHidden, isIpHidden -> + ) { quickPrivacyState, trackerMode, isLocationHidden, isIpHidden -> State( quickPrivacyState = quickPrivacyState, - isTrackersDenied = isTrackersDenied, + trackerMode = trackerMode, isLocationHidden = isLocationHidden, isIpHidden = isIpHidden ) diff --git a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt b/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt index fc865c6..27589a8 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt @@ -31,12 +31,13 @@ import foundation.e.privacycentralapp.Widget import foundation.e.privacycentralapp.Widget.Companion.isDarkText import foundation.e.privacycentralapp.domain.entities.QuickPrivacyState import foundation.e.privacycentralapp.common.extensions.dpToPxF +import foundation.e.privacycentralapp.domain.entities.TrackerMode import foundation.e.privacycentralapp.main.MainActivity import foundation.e.privacycentralapp.widget.WidgetCommandReceiver.Companion.ACTION_TOGGLE_PRIVACY data class State( val quickPrivacyState: QuickPrivacyState = QuickPrivacyState.DISABLED, - val isTrackersDenied: Boolean = false, + val trackerMode: TrackerMode = TrackerMode.VULNERABLE, val isLocationHidden: Boolean = false, val isIpHidden: Boolean? = false, val dayStatistics: List<Pair<Int, Int>> = emptyList(), @@ -92,8 +93,11 @@ fun render( setTextViewText( R.id.state_trackers, context.getString( - if (state.isTrackersDenied) R.string.widget_state_trackers_on - else R.string.widget_state_trackers_off + when(state.trackerMode) { + TrackerMode.DENIED -> R.string.widget_state_trackers_on + TrackerMode.VULNERABLE -> R.string.widget_state_trackers_off + TrackerMode.CUSTOM -> R.string.widget_state_trackers_custom + } ) ) |