diff options
| author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-01-26 17:41:25 +0000 |
|---|---|---|
| committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-01-26 17:41:25 +0000 |
| commit | e1c393d9d69c3ae1be3f9e600b29c8edf12635a1 (patch) | |
| tree | 6dead7d096a4d15ef75d8e60f7bc4b346320c70c /app/src/main/java | |
| parent | 10564e2605d03a23fcc1b3728502bd5ffd77cc74 (diff) | |
| parent | e70807ca9ff87e3b3c237af0b47af5b646a9447d (diff) | |
Merge branch 'feature/ui_ux_updates' into 'main'
Feature/ui ux updates
See merge request e/privacy-central/privacycentralapp!10
Diffstat (limited to 'app/src/main/java')
2 files changed, 9 insertions, 2 deletions
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 142ab0c..ae7bbf0 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 @@ -129,8 +129,13 @@ class DashboardFragment : override fun render(state: State) { binding.stateLabel.text = getString( - if (state.isQuickPrivacyEnabled) R.string.dashboard_state_label_on - else R.string.dashboard_state_label_off + if (state.isQuickPrivacyEnabled) R.string.dashboard_state_title_on + else R.string.dashboard_state_title_off + ) + + binding.stateSubtitle.text = getString( + if (state.isQuickPrivacyEnabled) R.string.dashboard_state_subtitle_on + else R.string.dashboard_state_subtitle_off ) binding.togglePrivacyCentral.setImageResource( 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 61f5b58..6b57719 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 @@ -114,6 +114,8 @@ class AppTrackersFragment : override fun render(state: State) { binding.blockAllToggle.isChecked = state.isBlockingActivated + binding.trackersListTitle.isVisible = state.isBlockingActivated + val trackersStatus = state.getTrackersStatus() if (!trackersStatus.isNullOrEmpty()) { binding.trackers.isVisible = true |