Merge branch 'hotfix/5.231.1'

Author: CDRussell

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt

@@ -152,9 +152,15 @@ class TabSwitcherAdapter(
             is TabSwitcherViewHolder.TrackerAnimationInfoPanelViewHolder -> {
                 val trackerAnimationInfoPanel = list[position] as TabSwitcherItem.TrackerAnimationInfoPanel
 
+                val stringRes = if (trackerAnimationInfoPanel.trackerCount == 1) {
+                    R.string.trackerBlockedInTheLast7days
+                } else {
+                    R.string.trackersBlockedInTheLast7days
+                }
+
                 trackerCountAnimator.animateTrackersBlockedCountView(
                     context = holder.binding.root.context,
-                    stringRes = R.string.trackersBlockedInTheLast7days,
+                    stringRes = stringRes,
                     totalTrackerCount = trackerAnimationInfoPanel.trackerCount,
                     trackerTextView = holder.binding.infoPanelText,
                 )

app/src/main/res/values/donottranslate.xml

@@ -54,4 +54,6 @@
     <!-- Skip Onboarding (not user-facing) -->
     <string name="skipOnboarding">Skip Onboarding</string>"
 
+    <!-- Trackers blocked animation-->
+    <string name="trackerBlockedInTheLast7days" instruction="Placeholder is 1 tracker blocked" >&lt;b&gt;%1$s tracker blocked &lt;/b&gt; in the last 7 days</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -118,7 +118,7 @@
     <string name="tabSwitcherGridViewMenu">Grid view</string>
 
     <!--Tab Switcher Animation-->
-    <string name="trackersBlockedInTheLast7days" instruction="Placeholder is the number of trackers blocked">&lt;b&gt;%1$s trackers blocked &lt;/b&gt; in the last 7 days</string>
+    <string name="trackersBlockedInTheLast7days" instruction="Placeholder is the number of trackers blocked > 1">&lt;b&gt;%1$s trackers blocked &lt;/b&gt; in the last 7 days</string>
     <string name="trackersBlocked" instruction="Placeholder is the number of trackers blocked">&lt;b&gt;%1$s trackers blocked &lt;/b&gt;</string>
     <string name="inTheLast7Days">in the last 7 days</string>
 

app/version/version.properties

@@ -1 +1 @@
-VERSION=5.231.0
+VERSION=5.231.1

versions.properties

@@ -39,7 +39,7 @@ version.androidx.biometric=1.1.0
 
 version.androidx.core-splashscreen=1.0.1
 
-version.androidx.datastore=1.1.1
+version.androidx.datastore=1.1.4
 
 version.androidx.localbroadcastmanager=1.1.0