summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorGuillaume Jacquart <guillaume.jacquart@hoodbrains.com>2022-07-28 06:04:22 +0000
committerGuillaume Jacquart <guillaume.jacquart@hoodbrains.com>2022-07-28 06:04:22 +0000
commitb4d35c1c12120503e74d7ae99edd94302673acf6 (patch)
treef87e29f670323b7173e5e3875112271c8835a5d3 /app/src/main/res
parent3ca73e64ddd25c7c20eca2e4e0db77032db848c0 (diff)
#5444 Fix CPU consumption - remove flow-mvi dependency
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/fragment_trackers.xml137
-rw-r--r--app/src/main/res/values-es/strings.xml2
2 files changed, 69 insertions, 70 deletions
diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml
index 9828215..b6d5b7b 100644
--- a/app/src/main/res/layout/fragment_trackers.xml
+++ b/app/src/main/res/layout/fragment_trackers.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/background"
android:layout_height="match_parent"
android:layout_width="match_parent"
>
-
<include layout="@layout/topbar" />
<androidx.core.widget.NestedScrollView
@@ -15,73 +15,74 @@
android:layout_width="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
>
- <LinearLayout
- android:layout_height="match_parent"
+
+<LinearLayout
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ >
+ <LinearLayout
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:id="@+id/trackers_info"
+ android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:orientation="vertical"
- >
- <LinearLayout
- android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:orientation="vertical"
- >
- <TextView
- android:id="@+id/trackers_info"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:paddingTop="16dp"
- android:paddingHorizontal="16dp"
- android:lineSpacingExtra="5sp"
- android:text="@string/trackers_info"
- />
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/graph_subtitle"
- android:textColor="@color/secondary_text"
- android:textSize="14sp"
- android:paddingTop="24dp"
- android:paddingHorizontal="16dp"
- />
+ android:paddingTop="16dp"
+ android:paddingHorizontal="16dp"
+ android:lineSpacingExtra="5sp"
+ android:text="@string/trackers_info"
+ />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/graph_subtitle"
+ android:textColor="@color/secondary_text"
+ android:textSize="14sp"
+ android:paddingTop="24dp"
+ android:paddingHorizontal="16dp"
+ />
+
+ <include layout="@layout/trackers_item_graph"
+ android:id="@+id/graph_day"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:period="@{@string/trackers_period_day}"
+ />
+ <include layout="@layout/trackers_item_graph"
+ android:id="@+id/graph_month"
+ android:layout_marginTop="16dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:period="@{@string/trackers_period_month}"
+ />
+ <include layout="@layout/trackers_item_graph"
+ android:id="@+id/graph_year"
+ android:layout_marginTop="16dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:period="@{@string/trackers_period_year}"
+ />
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginTop="32dp"
+ android:paddingTop="16dp"
+ android:paddingHorizontal="16dp"
+ android:text="@string/trackers_applist_title"
+ />
+ </LinearLayout>
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/apps"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="16dp"
+ android:paddingBottom="32dp"
+ />
+</LinearLayout>
- <include layout="@layout/trackers_item_graph"
- android:id="@+id/graph_day"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:period="@{@string/trackers_period_day}"
- />
- <include layout="@layout/trackers_item_graph"
- android:id="@+id/graph_month"
- android:layout_marginTop="16dp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:period="@{@string/trackers_period_month}"
- />
- <include layout="@layout/trackers_item_graph"
- android:id="@+id/graph_year"
- android:layout_marginTop="16dp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:period="@{@string/trackers_period_year}"
- />
- <TextView
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:layout_marginTop="32dp"
- android:paddingTop="16dp"
- android:paddingHorizontal="16dp"
- android:text="@string/trackers_applist_title"
- />
- </LinearLayout>
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/apps"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:paddingTop="16dp"
- android:paddingBottom="32dp"
- tools:listitem="@layout/trackers_item_app"
- />
- </LinearLayout>
- </androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</layout> \ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 980c41a..6216e07 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -30,7 +30,6 @@
<string name="dashboard_state_title_off">Tu privacidad en linea está desprotegida</string>
<string name="dashboard_apps_permissions_subtitle">Gestiona tus permisos</string>
<string name="apptrackers_error_quickprivacy_disabled">Habilitar la \"Privacidad rápida\" para poder activar/desactivar los rastreadores.</string>
- <string name="apptrackers_trackers_count_summary">%1$d rastreadores bloqueados de %2$d rastreadores detectados</string>
<string name="quick_protection_info">La \"Protección rápida\" habilita estos ajustes cuando está activada</string>
<string name="learn_more">Más información</string>
<string name="add_location">Añadir ubicación</string>
@@ -61,7 +60,6 @@
<string name="trackers_graph_hours_period_format">HH:mm</string>
<string name="trackers_graph_days_period_format">EEE d \'de\' MMMM</string>
<string name="trackers_graph_months_period_format">MMMM yyyy</string>
- <string name="trackers_app_trackers_counts">%1$d rastreadores bloqueados de %2$d</string>
<string name="apptrackers_block_all_toggle">Rastreadores bloqueados</string>
<string name="apptrackers_no_trackers_yet_block_off">Todavía no se ha detectado ningún rastreador. Si se detectan nuevos rastreadores se actualizarán aquí.</string>
<string name="ipscrambling_error_quickprivacy_disabled">Habilitada la \"Privacidad rápida\" para utilizar las funcionalidades</string>