Merge branch '5162_wodring_style' into 'main'

5162 wording style, 4907 fix toast widget not resizable, 5179 hide icon

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

9 files changed, 16 insertions, 13 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c91f330..cbb4ccc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,11 +50,11 @@
             </intent-filter>
         </receiver>
 
-        <activity android:name=".main.MainActivity">
+        <activity android:name=".main.MainActivity"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.INFO"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt b/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt
index 070d053..443683a 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt
@@ -54,12 +54,11 @@ fun render(
 ) {
     val views = RemoteViews(context.packageName, R.layout.widget)
     views.apply {
-        setOnClickPendingIntent(
-            R.id.settings_btn,
-            PendingIntent.getActivity(
-                context, 0, Intent(context, MainActivity::class.java), FLAG_UPDATE_CURRENT
-            )
+        val openPIntent = PendingIntent.getActivity(
+            context, 0, Intent(context, MainActivity::class.java), FLAG_UPDATE_CURRENT
         )
+        setOnClickPendingIntent(R.id.settings_btn, openPIntent)
+        setOnClickPendingIntent(R.id.widget_container, openPIntent)
 
         setImageViewResource(
             R.id.state_icon,
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 83932b1..53ec617 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -79,6 +79,7 @@
                         android:textSize="12sp"
                         android:textColor="@color/secondary_text"
                         android:layout_marginBottom="8dp"
+                        android:textAllCaps="true"
                         />
                     <TextView
                         android:id="@+id/state_trackers"
@@ -104,6 +105,7 @@
                         android:textSize="12sp"
                         android:textColor="@color/secondary_text"
                         android:layout_marginBottom="8dp"
+                        android:textAllCaps="true"
                         />
                     <TextView
                         android:id="@+id/state_geolocation"
@@ -129,6 +131,7 @@
                         android:textSize="12sp"
                         android:textColor="@color/secondary_text"
                         android:layout_marginBottom="8dp"
+                        android:textAllCaps="true"
                         />
                     <TextView
                         android:id="@+id/state_ip_address"
diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml
index 6930429..dc3ac16 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -21,6 +21,7 @@
     android:layout_width="match_parent"
     android:orientation="vertical"
     android:background="@drawable/bg_widget"
+    android:id="@+id/widget_container"
     >
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ff69296..cad9836 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -24,7 +24,7 @@
     <string name="dashboard_internet_activity_privacy_subtitle_on">Echte IP-Adresse versteckt</string>
     <string name="ipscrambling_title">Verwalte meine Internet-Adressen</string>
     <string name="dashboard_state_title_on">Dein Online-Datenschutz ist gewährleistet</string>
-    <string name="dashboard_title">Datenschutz im Überblick</string>
+    <string name="dashboard_title">@string/app_name</string>
     <string name="dashboard_internet_activity_privacy_subtitle_off">Echte IP-Adresse aufgedeckt</string>
     <string name="dashboard_state_geolocation_off">Aufgedeckt</string>
     <string name="dashboard_state_ipaddress_off">Aufgedeckt</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2ab63c2..6bd8dc8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="dashboard_title">Privacidad rápida</string>
+    <string name="dashboard_title">@string/app_name</string>
     <string name="dashboard_state_trackers_label">Rastreadores:</string>
     <string name="dashboard_state_trackers_off">Vulnerable</string>
     <string name="dashboard_state_trackers_on">Denegado</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d4baef6..47970a1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -31,7 +31,7 @@
     <string name="ipscrambling_any_location">Pays aléatoire</string>
     <string name="ipscrambling_select_app">Appliquer ce paramètre à toutes les applications sélectionnées :</string>
     <string name="app_name">Centre de Confidentialité</string>
-    <string name="dashboard_title">Confidentialité Rapide</string>
+    <string name="dashboard_title">@string/app_name</string>
     <string name="dashboard_graph_trackers_legend">%s pisteurs vous ont profilé au cours des dernières 24 heures</string>
     <string name="dashboard_am_i_tracked_title">Gérer les pisteurs d\'applications</string>
     <string name="dashboard_am_i_tracked_subtitle">%1$d pisteurs d\'apps, %2$d pisteurs actifs</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7826bcb..bb61330 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="dashboard_title">Privacy rapida</string>
+    <string name="dashboard_title">@string/app_name</string>
     <string name="dashboard_state_title_off">La tua privacy online non è protetta</string>
     <string name="dashboard_state_trackers_label">Trackers:</string>
     <string name="dashboard_state_trackers_off">Vulnerabile</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9655487..ce7709c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
     <string name="graph_empty_message">Congratulations! No trackers are profiling you.</string>
 
     <!-- Dashboard -->
-    <string name="dashboard_title">Quick Privacy</string>
+    <string name="dashboard_title">@string/app_name</string>
     <string name="dashboard_state_title_on">Your online privacy is protected</string>
     <string name="dashboard_state_title_off">Your online privacy is unprotected</string>
     <string name="dashboard_state_trackers_label">Trackers:</string>