From de1bc4809fe93679e89b944e0feb9771e6d3a8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 23 Aug 2022 00:08:39 +0200
Subject: [PATCH] Fix ads translations (#1951)

---
 .github/workflows/deploy-store.yml              |  1 +
 app/src/main/res/layout/dialog_ads_consent.xml  | 12 ++++++------
 app/src/main/res/values/strings.xml             |  7 +++++++
 app/src/play/res/xml/scheme_preferences_ads.xml |  8 ++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml
index cfb0fb523..3ce618ca7 100644
--- a/.github/workflows/deploy-store.yml
+++ b/.github/workflows/deploy-store.yml
@@ -38,6 +38,7 @@ jobs:
           ANDROID_PUBLISHER_CREDENTIALS: ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}
           ADMOB_PROJECT_ID: ${{ secrets.ADMOB_PROJECT_ID }}
           SINGLE_SUPPORT_AD_ID: ${{ secrets.SINGLE_SUPPORT_AD_ID }}
+          DASHBOARD_TILE_AD_ID: ${{ secrets.DASHBOARD_TILE_AD_ID }}
           SET_BUILD_TIMESTAMP: ${{ secrets.SET_BUILD_TIMESTAMP }}
         run: ./gradlew publishPlayReleaseApps -PenableFirebase --stacktrace;
 
diff --git a/app/src/main/res/layout/dialog_ads_consent.xml b/app/src/main/res/layout/dialog_ads_consent.xml
index 395101627..816074783 100644
--- a/app/src/main/res/layout/dialog_ads_consent.xml
+++ b/app/src/main/res/layout/dialog_ads_consent.xml
@@ -15,7 +15,7 @@
         android:insetRight="0dp"
         android:insetBottom="0dp"
         android:padding="0dp"
-        android:text="Privacy Policy"
+        android:text="@string/pref_ads_privacy_policy"
         android:textAllCaps="false"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -26,9 +26,9 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="17dp"
         android:layout_marginTop="8dp"
-        android:text="I am over 18 years old"
+        android:text="@string/pref_ads_over_18_years_old"
         android:textColor="?android:textColorSecondary"
-        android:textSize="14dp"
+        android:textSize="14sp"
         app:layout_constraintTop_toBottomOf="@id/ads_consent_privacy" />
 
     <com.google.android.material.button.MaterialButton
@@ -42,7 +42,7 @@
         android:insetTop="0dp"
         android:insetRight="0dp"
         android:insetBottom="0dp"
-        android:text="Yes, personalized ads"
+        android:text="@string/pref_ads_option_personalized"
         app:layout_constraintTop_toBottomOf="@id/ads_consent_over" />
 
     <com.google.android.material.button.MaterialButton
@@ -56,7 +56,7 @@
         android:insetTop="0dp"
         android:insetRight="0dp"
         android:insetBottom="0dp"
-        android:text="Yes, non-personalized ads"
+        android:text="@string/pref_ads_option_non_personalized"
         app:layout_constraintBottom_toTopOf="@id/ads_consent_cancel"
         app:layout_constraintTop_toBottomOf="@id/ads_consent_personalised"
         app:layout_constraintVertical_bias="0" />
@@ -73,7 +73,7 @@
         android:insetTop="0dp"
         android:insetRight="0dp"
         android:insetBottom="0dp"
-        android:text="Cancel"
+        android:text="@android:string/cancel"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintVertical_bias="0" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2eee4cce4..bcd498036 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -714,6 +714,10 @@
     <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
 
     <string name="pref_ads_support_category_name">Support</string>
+    <string name="pref_ads_agreements">Privacy Policy</string>
+    <string name="pref_ads_privacy_policy">Agreements</string>
+    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
+    <string name="pref_ads_show_in_app">Show ads in app</string>
     <string name="pref_ads_support">Watch single ad to support project</string>
     <string name="pref_ads_privacy_title">Consent to data processing</string>
     <string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
@@ -725,6 +729,9 @@
     <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
     <string name="pref_ads_summary_personalized">Personalized ads</string>
     <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
+    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
+    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
+    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
 
     <string name="pref_settings_advanced_title">Advanced</string>
     <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
diff --git a/app/src/play/res/xml/scheme_preferences_ads.xml b/app/src/play/res/xml/scheme_preferences_ads.xml
index d5e93a355..4165561a7 100644
--- a/app/src/play/res/xml/scheme_preferences_ads.xml
+++ b/app/src/play/res/xml/scheme_preferences_ads.xml
@@ -2,18 +2,18 @@
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         app:iconSpaceReserved="false"
-        app:title="Agreements">
+        app:title="@string/pref_ads_agreements">
         <Preference
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_ads_privacy_policy"
             app:singleLineTitle="false"
-            app:title="Privacy Policy" />
+            app:title="@string/pref_ads_privacy_policy" />
         <CheckBoxPreference
             app:defaultValue="@bool/pref_default_ads_consent_data_processing"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_ads_consent_data_processing"
             app:singleLineTitle="false"
-            app:title="Consent to processing of data related to ads" />
+            app:title="@string/pref_ads_consent" />
     </PreferenceCategory>
     <PreferenceCategory
         app:iconSpaceReserved="false"
@@ -24,7 +24,7 @@
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_ads_enabled"
             app:singleLineTitle="false"
-            app:title="Show ads in app" />
+            app:title="@string/pref_ads_show_in_app" />
         <Preference
             app:dependency="@string/pref_key_ads_consent_data_processing"
             app:iconSpaceReserved="false"