diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable/ic_disk.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/apptrackers_fragment.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/layout/apptrackers_item_tracker_toggle.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_dashboard.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 11 |
6 files changed, 25 insertions, 16 deletions
diff --git a/app/src/main/res/drawable/ic_disk.xml b/app/src/main/res/drawable/ic_disk.xml index 92200b1..2600601 100644 --- a/app/src/main/res/drawable/ic_disk.xml +++ b/app/src/main/res/drawable/ic_disk.xml @@ -17,5 +17,5 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> - <solid android:color="@color/purple_chart" /> + <solid android:color="@color/e_blue2" /> </shape>
\ No newline at end of file diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml index 1f3063d..f037beb 100644 --- a/app/src/main/res/layout/apptrackers_fragment.xml +++ b/app/src/main/res/layout/apptrackers_fragment.xml @@ -32,6 +32,7 @@ <androidx.core.widget.NestedScrollView android:layout_height="match_parent" android:layout_width="match_parent" + android:fillViewport="true" app:layout_behavior="@string/appbar_scrolling_view_behavior" > @@ -40,10 +41,11 @@ android:layout_width="match_parent" android:orientation="vertical" > - <!--LinearLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" + android:padding="16dp" android:gravity="center_vertical"> <TextView android:layout_width="0dp" @@ -51,14 +53,19 @@ android:layout_weight="1" android:text="@string/apptrackers_block_all_toggle" /> - <androidx.appcompat.widget.SwitchCompat + <Switch android:id="@+id/block_all_toggle" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - </LinearLayout--> + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="@color/grey_divider" + /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/trackers" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_width="match_parent" android:layout_marginBottom="32dp" tools:listitem="@layout/apptrackers_item_tracker_toggle" @@ -66,9 +73,11 @@ /> <TextView android:id="@+id/no_trackers_yet" + android:padding="32dp" android:layout_width="match_parent" android:layout_height="match_parent" - android:text="@string/apptrackers_no_trackers_yet" + android:gravity="center" + tools:text="@string/apptrackers_no_trackers_yet_block_off" /> </LinearLayout> </androidx.core.widget.NestedScrollView> 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 22678ce..baab3d9 100644 --- a/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml +++ b/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml @@ -17,16 +17,14 @@ android:layout_weight="1" android:maxLines="1" android:ellipsize="end" - android:layout_marginStart="16dp" android:textSize="14sp" tools:text="Body sensor" /> - <androidx.appcompat.widget.SwitchCompat + <Switch android:id="@+id/toggle" android:layout_width="wrap_content" android:layout_height="24dp" - android:layoutDirection="rtl" android:checked="true" /> </androidx.appcompat.widget.LinearLayoutCompat> diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 6976948..c93b985 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -213,7 +213,7 @@ android:text="@string/dashboard_state_ipaddress_off" android:layout_height="88dp" app:icon="@{@drawable/ic_tracked}" app:title="@{@string/dashboard_am_i_tracked_title}" - app:subTitle='@{""}' + app:subTitle='@{@string/trackers_title}' /> <View android:layout_width="match_parent" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 935d0a7..85f0c70 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -21,5 +21,6 @@ <color name="green_on">#169659</color> <color name="green_valid">#2CC766</color> - <color name="purple_chart">#855CF8</color> + + <color name="e_blue2">@lineageos.platform:color/color_default_blue2</color> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 17d5e12..cce1107 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,7 +17,7 @@ <string name="dashboard_state_ipaddress_on">Hidden</string> <string name="dashboard_graph_label">Personal data leakage</string> <string name="dashboard_graph_period">Last 24 hours</string> - <string name="dashboard_graph_trackers_legend">%d Trackers</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_subtitle">%1$d app trackers, %2$d active trackers</string> @@ -53,17 +53,18 @@ <string name="location_input_error">Invalid coordinates</string> <!-- Trackers --> - <string name="trackers_title">Manage and block</string> + <string name="trackers_title">Manage trackers</string> <string name="trackers_info">See tracker usage and which trackers are present in your apps.</string> <string name="trackers_count_label">%d trackers</string> <string name="trackers_period_day">24 hours</string> <string name="trackers_period_month">past month</string> <string name="trackers_period_year">past year</string> - <string name="trackers_applist_title">Block trackers on each app</string> + <string name="trackers_applist_title">Allow or deny trackers in apps</string> <!-- App Trackers --> - <!--string name="apptrackers_block_all_toggle">Activate trackers blocking : </string--> - <string name="apptrackers_no_trackers_yet">Trackers will appear as they are they start tracking you.</string> + <string name="apptrackers_block_all_toggle">Block trackers</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> <!-- --> <string name="quick_protection_info">Quick protection enables these settings when turned on</string> |