diff options
Diffstat (limited to 'app')
5 files changed, 28 insertions, 10 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 diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml index f037beb..13f58e3 100644 --- a/app/src/main/res/layout/apptrackers_fragment.xml +++ b/app/src/main/res/layout/apptrackers_fragment.xml @@ -63,6 +63,14 @@ android:layout_height="1dp" android:background="@color/grey_divider" /> + <TextView + android:id="@+id/trackers_list_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/apptrackers_trackers_list_title" + android:padding="16dp" + android:visibility="gone" + /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/trackers" android:layout_height="match_parent" diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index c93b985..3197257 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -28,14 +28,15 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:layout_marginBottom="4dp" - android:text="@string/dashboard_state_label_off" + android:text="@string/dashboard_state_subtitle_off" android:textColor="@color/orange_off" android:gravity="center" /> <TextView + android:id="@+id/state_subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/dashboard_change_state_explanations" + android:text="@string/dashboard_state_title_on" android:gravity="center" android:textSize="12sp" android:textColor="@color/grey_text_2" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cce1107..fe92d6d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,9 +3,10 @@ <!-- Dashboard --> <string name="dashboard_title">Quick Privacy</string> - <string name="dashboard_state_label_off">Your online privacy is not protected</string> - <string name="dashboard_state_label_on">Your online privacy is now protected!</string> - <string name="dashboard_change_state_explanations">Tap to enable your privacy preferences</string> + <string name="dashboard_state_subtitle_off">Your online privacy is not protected</string> + <string name="dashboard_state_subtitle_on">Your online privacy is now protected!</string> + <string name="dashboard_state_title_on">Tap to disable your privacy preferences</string> + <string name="dashboard_state_title_off">Tap to enable your privacy preferences</string> <string name="dashboard_state_trackers_label">Trackers:</string> <string name="dashboard_state_trackers_off">Vulnerable</string> <string name="dashboard_state_trackers_on">Denied</string> @@ -19,7 +20,7 @@ <string name="dashboard_graph_period">Last 24 hours</string> <string name="dashboard_graph_trackers_legend">%s Trackers</string> - <string name="dashboard_am_i_tracked_title">Am I tracked?</string> + <string name="dashboard_am_i_tracked_title">Manage trackers</string> <string name="dashboard_am_i_tracked_subtitle">%1$d app trackers, %2$d active trackers</string> <string name="dashboard_apps_permissions_title">Apps Permissions</string> <string name="dashboard_apps_permissions_subtitle">Manage your permissions</string> @@ -37,9 +38,9 @@ <string name="ipscrambling_real_ip_subtitle">I can be tracked by my IP address</string> <string name="ipscrambling_hide_ip_label">Hide IP address</string> <string name="ipscrambling_hide_ip_subtitle">I am anonymous on the internet</string> - <string name="ipscrambling_tor_disclaimer"><b>Note:</b> when active, this setting will slow down your Internet connectivity speed (uses Thor network).</string> + <string name="ipscrambling_tor_disclaimer"><b>Note:</b> when active, this setting will slow down your Internet connectivity speed (uses the Tor network).</string> <string name="ipscrambling_location_label">Force a country of origin:</string> - <string name="ipscrambling_any_location">Any country</string> + <string name="ipscrambling_any_location">Random country</string> <string name="ipscrambling_select_app">Apply this setting to all selected apps:</string> <!-- Location --> @@ -63,6 +64,7 @@ <!-- App Trackers --> <string name="apptrackers_block_all_toggle">Block trackers</string> + <string name="apptrackers_trackers_list_title">Opt for the trackers you want to activate/desactivate.</string> <string name="apptrackers_no_trackers_yet_block_off">No trackers were detected yet. If new trackers are detected they will be updated here.</string> <string name="apptrackers_no_trackers_yet_block_on">No trackers were detected yet. All future trackers will be blocked.</string> |