Merge branch 'update_icon_and_wording' into 'main'

Translate date format for graph tooltips add /e/ dummy system app icon

See merge request e/privacy-central/privacycentralapp!34

7 files changed, 24 insertions, 12 deletions

diff --git a/app/src/main/java/foundation/e/privacycentralapp/data/repositories/AppListsRepository.kt b/app/src/main/java/foundation/e/privacycentralapp/data/repositories/AppListsRepository.kt
index 5d25a82..9242765 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/data/repositories/AppListsRepository.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/data/repositories/AppListsRepository.kt
@@ -40,7 +40,7 @@ class AppListsRepository(
         packageName = "foundation.e.dummysystemapp",
         uid = -1,
         label = context.getString(R.string.dummy_system_app_label),
-        icon = context.getDrawable(lineageos.platform.R.drawable.ic_android)
+        icon = context.getDrawable(R.drawable.ic_e_app_logo)
     )
 
     fun getVisibleApps(): Flow<List<ApplicationDescription>> {
diff --git a/app/src/main/res/drawable/ic_e_app_logo.xml b/app/src/main/res/drawable/ic_e_app_logo.xml
new file mode 100644
index 0000000..a5ef6b4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_e_app_logo.xml
@@ -0,0 +1,12 @@
+<vector android:height="48.623375dp" android:viewportHeight="78"
+    android:viewportWidth="77" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M38.5,77.5C17.2703,77.5 0,60.2297 0,39C0,17.7703 17.2703,0.5 38.5,0.5C59.7297,0.5 77,17.7703 77,39C77,43.0208 73.7426,46.2782 69.7218,46.2782H38.5C34.4792,46.2782 31.2218,43.0208 31.2218,39C31.2218,34.9792 34.4792,31.7218 38.5,31.7218H61.3147C58.2255,22.0661 49.1682,15.0564 38.5,15.0564C25.299,15.0564 14.5564,25.799 14.5564,39C14.5564,52.2042 25.299,62.9436 38.5,62.9436C42.5208,62.9436 45.7782,66.201 45.7782,70.2218C45.7782,74.2426 42.5208,77.5 38.5,77.5Z"/>
+        <path android:fillColor="#F9CF43" android:pathData="M38.5356,38.9288L-13.9449,24.8674L24.4742,-13.5518L38.5356,38.9288Z"/>
+        <path android:fillColor="#EF6955" android:pathData="M91.0162,52.9903L38.5356,38.9288L76.9548,0.5097L91.0162,52.9903Z"/>
+        <path android:fillColor="#193071" android:pathData="M52.597,91.4094L0.1165,77.348L38.5356,38.9288L52.597,91.4094Z"/>
+        <path android:fillColor="#B2D685" android:pathData="M-13.9449,24.8674L38.5356,38.9288L0.1165,77.348L-13.9449,24.8674Z"/>
+        <path android:fillColor="#F49138" android:pathData="M24.4741,-13.5518L76.9547,0.5097L38.5356,38.9288L24.4741,-13.5518Z"/>
+        <path android:fillColor="#020F17" android:pathData="M38.5356,38.9288L91.0162,52.9903L52.5971,91.4094L38.5356,38.9288Z"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7f520ee..ff69296 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -85,8 +85,8 @@
     <string name="trackers_period_year">vergangenes Jahr</string>
     <string name="trackers_applist_title">Verwalte Tracker, die von Apps benutzt werden:</string>
     <string name="trackers_graph_hours_period_format">HH:mm</string>
-    <string name="trackers_graph_days_period_format">d.MMM.EEE</string>
-    <string name="trackers_graph_months_period_format">MMM yyyy</string>
+    <string name="trackers_graph_days_period_format">d\'.\' MMMM EEE</string>
+    <string name="trackers_graph_months_period_format">MMMM yyyy</string>
     <string name="trackers_app_trackers_counts">%1$d von %2$d Tracker blockiert</string>
     <string name="apptrackers_block_all_toggle">Tracker blockieren</string>
     <string name="apptrackers_trackers_list_title">Wähle die Tracker aus, die du aktivieren oder deaktivieren willst.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 406992d..2ab63c2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -60,8 +60,8 @@
     <string name="trackers_period_year">Año pasado</string>
     <string name="trackers_applist_title">Gestionar rastreadores usados en aplicaciones:</string>
     <string name="trackers_graph_hours_period_format">HH:mm</string>
-    <string name="trackers_graph_days_period_format">MMM d - EEE</string>
-    <string name="trackers_graph_months_period_format">MMM yyyy</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>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 25762f3..d4baef6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -43,8 +43,8 @@
     <string name="trackers_period_month">mois précédent</string>
     <string name="trackers_period_year">année précédente</string>
     <string name="trackers_graph_hours_period_format">HH:mm</string>
-    <string name="trackers_graph_days_period_format">MMM d - EEE</string>
-    <string name="trackers_graph_months_period_format">MMM yyyy</string>
+    <string name="trackers_graph_days_period_format">EEE d MMMM</string>
+    <string name="trackers_graph_months_period_format">MMMM yyyy</string>
     <string name="quick_protection_info">L\'activation de \"Protection rapide\" active ces paramètres</string>
     <string name="learn_more">En savoir plus</string>
     <string name="i_am_exposing">J\'expose ma véritable adresse IP</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 04fb5ff..7826bcb 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -45,9 +45,9 @@
     <string name="trackers_period_month">mese scorso</string>
     <string name="trackers_period_year">scorso anno</string>
     <string name="trackers_applist_title">Gestisci i trackers usati nelle app:</string>
-    <string name="trackers_graph_hours_period_format">OO:mm</string>
-    <string name="trackers_graph_days_period_format">MMM g - EEE</string>
-    <string name="trackers_graph_months_period_format">MMM aaaa</string>
+    <string name="trackers_graph_hours_period_format">HH:mm</string>
+    <string name="trackers_graph_days_period_format">EEE d MMMM</string>
+    <string name="trackers_graph_months_period_format">MMMM yyyy</string>
     <string name="trackers_app_trackers_counts">%1$d trackers bloccati su %2$d</string>
     <string name="apptrackers_block_all_toggle">Blocca trackers</string>
     <string name="apptrackers_trackers_list_title">Scelta dei trackers che vuoi attivare/disattivare.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4024175..d6cf817 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,8 +67,8 @@
     <string name="trackers_period_year">past year</string>
     <string name="trackers_applist_title">Manage trackers used in applications:</string>
     <string name="trackers_graph_hours_period_format">HH:mm</string>
-    <string name="trackers_graph_days_period_format">MMM d - EEE</string>
-    <string name="trackers_graph_months_period_format">MMM yyyy</string>
+    <string name="trackers_graph_days_period_format">MMMM d - EEE</string>
+    <string name="trackers_graph_months_period_format">MMMM yyyy</string>
     <string name="trackers_app_trackers_counts">%1$d blocked trackers out of %2$d</string>
 
     <!-- App Trackers -->