From 260c50b83a8022c6ab7fb7f652d6e99f4a374390 Mon Sep 17 00:00:00 2001
From: Jonatan Rhodin <jonatan.rhodin@mullvad.net>
Date: Mon, 18 Nov 2024 09:51:28 +0100
Subject: [PATCH] Fixes based on feedback

---
 .../mullvad/mullvadvpn/compose/cell/FilterRow.kt |  2 +-
 .../screen/location/SelectLocationScreen.kt      | 16 ++++++++++------
 .../resource/src/main/res/values-da/strings.xml  |  1 -
 .../resource/src/main/res/values-de/strings.xml  |  1 -
 .../resource/src/main/res/values-es/strings.xml  |  1 -
 .../resource/src/main/res/values-fi/strings.xml  |  1 -
 .../resource/src/main/res/values-fr/strings.xml  |  1 -
 .../resource/src/main/res/values-it/strings.xml  |  1 -
 .../resource/src/main/res/values-ja/strings.xml  |  1 -
 .../resource/src/main/res/values-ko/strings.xml  |  1 -
 .../resource/src/main/res/values-my/strings.xml  |  1 -
 .../resource/src/main/res/values-nb/strings.xml  |  1 -
 .../resource/src/main/res/values-nl/strings.xml  |  1 -
 .../resource/src/main/res/values-pl/strings.xml  |  1 -
 .../resource/src/main/res/values-pt/strings.xml  |  1 -
 .../resource/src/main/res/values-ru/strings.xml  |  1 -
 .../resource/src/main/res/values-sv/strings.xml  |  1 -
 .../resource/src/main/res/values-th/strings.xml  |  1 -
 .../resource/src/main/res/values-tr/strings.xml  |  1 -
 .../src/main/res/values-zh-rCN/strings.xml       |  1 -
 .../src/main/res/values-zh-rTW/strings.xml       |  1 -
 .../lib/resource/src/main/res/values/strings.xml |  3 +--
 .../packages/mullvad-vpn/locales/messages.pot    |  2 +-
 23 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/FilterRow.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/FilterRow.kt
index c744beae564b..ab708e77d19f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/FilterRow.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/FilterRow.kt
@@ -50,7 +50,7 @@ fun FilterRow(
     ) {
         if (showTitle) {
             Text(
-                text = stringResource(id = R.string.filtered),
+                text = stringResource(id = R.string.filters),
                 color = MaterialTheme.colorScheme.onPrimary,
                 style = MaterialTheme.typography.labelMedium,
             )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt
index 337798122c08..5ad5eb1507b2 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt
@@ -1,6 +1,7 @@
 package net.mullvad.mullvadvpn.compose.screen.location
 
 import android.annotation.SuppressLint
+import androidx.compose.animation.AnimatedContent
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -261,12 +262,15 @@ fun SelectLocationScreen(
         )
 
         Column(modifier = modifier.background(backgroundColor).fillMaxSize()) {
-            if (state.filterChips.isNotEmpty()) {
-                FilterRow(
-                    filters = state.filterChips,
-                    onRemoveOwnershipFilter = removeOwnershipFilter,
-                    onRemoveProviderFilter = removeProviderFilter,
-                )
+            AnimatedContent(targetState = state.filterChips, label = "Select location top bar") {
+                filterChips ->
+                if (filterChips.isNotEmpty()) {
+                    FilterRow(
+                        filters = filterChips,
+                        onRemoveOwnershipFilter = removeOwnershipFilter,
+                        onRemoveProviderFilter = removeProviderFilter,
+                    )
+                }
             }
 
             if (state.multihopEnabled) {
diff --git a/android/lib/resource/src/main/res/values-da/strings.xml b/android/lib/resource/src/main/res/values-da/strings.xml
index ae4ba53470fa..88c135c30464 100644
--- a/android/lib/resource/src/main/res/values-da/strings.xml
+++ b/android/lib/resource/src/main/res/values-da/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Server IP tilsidesættelse</string>
     <string name="feature_udp_2_tcp">Tilsløring</string>
     <string name="filter">Filter</string>
-    <string name="filtered">Filtreret:</string>
     <string name="foreground_notification_channel_description">Viser den aktuelle VPN-tunnelstatus</string>
     <string name="foreground_notification_channel_name">VPN-tunnelstatus</string>
     <string name="go_to_login">Gå til login</string>
diff --git a/android/lib/resource/src/main/res/values-de/strings.xml b/android/lib/resource/src/main/res/values-de/strings.xml
index 816f453b14fc..fdaceb289916 100644
--- a/android/lib/resource/src/main/res/values-de/strings.xml
+++ b/android/lib/resource/src/main/res/values-de/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Server-IP überschreiben</string>
     <string name="feature_udp_2_tcp">Verschleierung</string>
     <string name="filter">Filter</string>
-    <string name="filtered">Gefiltert:</string>
     <string name="foreground_notification_channel_description">Zeigt den aktuellen Status des VPN-Tunnels an</string>
     <string name="foreground_notification_channel_name">Status des VPN-Tunnels</string>
     <string name="go_to_login">Zur Anmeldung</string>
diff --git a/android/lib/resource/src/main/res/values-es/strings.xml b/android/lib/resource/src/main/res/values-es/strings.xml
index a0358aed46eb..fb5981905b5c 100644
--- a/android/lib/resource/src/main/res/values-es/strings.xml
+++ b/android/lib/resource/src/main/res/values-es/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Anulación de IP de servidor</string>
     <string name="feature_udp_2_tcp">Ofuscación</string>
     <string name="filter">Filtrar</string>
-    <string name="filtered">Filtros aplicados:</string>
     <string name="foreground_notification_channel_description">Muestra el estado actual del túnel VPN</string>
     <string name="foreground_notification_channel_name">Estado del túnel VPN</string>
     <string name="go_to_login">Iniciar sesión</string>
diff --git a/android/lib/resource/src/main/res/values-fi/strings.xml b/android/lib/resource/src/main/res/values-fi/strings.xml
index 419a2161eba1..38e2a76a8d5d 100644
--- a/android/lib/resource/src/main/res/values-fi/strings.xml
+++ b/android/lib/resource/src/main/res/values-fi/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Palvelimen IP-osoitteen ohitus</string>
     <string name="feature_udp_2_tcp">Hämäysteknologia</string>
     <string name="filter">Suodatin</string>
-    <string name="filtered">Suodatettu:</string>
     <string name="foreground_notification_channel_description">Näyttää VPN-tunnelin nykyisen tilan</string>
     <string name="foreground_notification_channel_name">VPN-tunnelin tila</string>
     <string name="go_to_login">Siirry kirjautumiseen</string>
diff --git a/android/lib/resource/src/main/res/values-fr/strings.xml b/android/lib/resource/src/main/res/values-fr/strings.xml
index f2979cf38b79..cd70ac2701bd 100644
--- a/android/lib/resource/src/main/res/values-fr/strings.xml
+++ b/android/lib/resource/src/main/res/values-fr/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Substitution d\'IP de serveur</string>
     <string name="feature_udp_2_tcp">Dissimulation</string>
     <string name="filter">Filtrer</string>
-    <string name="filtered">Filtré :</string>
     <string name="foreground_notification_channel_description">Affiche l\'état actuel du tunnel VPN</string>
     <string name="foreground_notification_channel_name">État du tunnel VPN</string>
     <string name="go_to_login">Aller à la connexion</string>
diff --git a/android/lib/resource/src/main/res/values-it/strings.xml b/android/lib/resource/src/main/res/values-it/strings.xml
index 2b71d3f0fbf6..70a08dbf7c1b 100644
--- a/android/lib/resource/src/main/res/values-it/strings.xml
+++ b/android/lib/resource/src/main/res/values-it/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Sovrascritture IP server</string>
     <string name="feature_udp_2_tcp">Offuscamento</string>
     <string name="filter">Filtra</string>
-    <string name="filtered">Filtrato:</string>
     <string name="foreground_notification_channel_description">Mostra lo stato attuale del tunnel VPN</string>
     <string name="foreground_notification_channel_name">Stato del tunnel VPN</string>
     <string name="go_to_login">Vai al login</string>
diff --git a/android/lib/resource/src/main/res/values-ja/strings.xml b/android/lib/resource/src/main/res/values-ja/strings.xml
index 5f7212100f9e..2fb24ebe8e87 100644
--- a/android/lib/resource/src/main/res/values-ja/strings.xml
+++ b/android/lib/resource/src/main/res/values-ja/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">サーバーIPのオーバーライド</string>
     <string name="feature_udp_2_tcp">難読化</string>
     <string name="filter">絞り込み</string>
-    <string name="filtered">絞り込み結果:</string>
     <string name="foreground_notification_channel_description">現在のVPNトンネルのステータスを表示します</string>
     <string name="foreground_notification_channel_name">VPNトンネルのステータス</string>
     <string name="go_to_login">ログインに進む</string>
diff --git a/android/lib/resource/src/main/res/values-ko/strings.xml b/android/lib/resource/src/main/res/values-ko/strings.xml
index 0a615b3afcaa..f8727aabbc34 100644
--- a/android/lib/resource/src/main/res/values-ko/strings.xml
+++ b/android/lib/resource/src/main/res/values-ko/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">서버 IP 재정의</string>
     <string name="feature_udp_2_tcp">난독 처리</string>
     <string name="filter">필터</string>
-    <string name="filtered">필터링됨:</string>
     <string name="foreground_notification_channel_description">현재 VPN 터널 상태 표시</string>
     <string name="foreground_notification_channel_name">VPN 터널 상태</string>
     <string name="go_to_login">로그인하기</string>
diff --git a/android/lib/resource/src/main/res/values-my/strings.xml b/android/lib/resource/src/main/res/values-my/strings.xml
index c9ca31d1593c..5c9cd497f23a 100644
--- a/android/lib/resource/src/main/res/values-my/strings.xml
+++ b/android/lib/resource/src/main/res/values-my/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">ဆာဗာ IP ကျော်လွန် ပယ်ဖျက်မှု</string>
     <string name="feature_udp_2_tcp">Obfuscation</string>
     <string name="filter">စစ်ထုတ်မှု</string>
-    <string name="filtered">စစ်ထုတ်ထားသော-</string>
     <string name="foreground_notification_channel_description">လက်ရှိ VPN Tunnel အခြေအနေကို ပြသပေးပါသည်</string>
     <string name="foreground_notification_channel_name">VPN Tunnel အခြေအနေ</string>
     <string name="go_to_login">ဝင်ရောက်ရန် သွားပါ</string>
diff --git a/android/lib/resource/src/main/res/values-nb/strings.xml b/android/lib/resource/src/main/res/values-nb/strings.xml
index 6f9ee6600bb0..bef18f462924 100644
--- a/android/lib/resource/src/main/res/values-nb/strings.xml
+++ b/android/lib/resource/src/main/res/values-nb/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Overstyring av server-IP</string>
     <string name="feature_udp_2_tcp">Tilsløring</string>
     <string name="filter">Filter</string>
-    <string name="filtered">Filtrert:</string>
     <string name="foreground_notification_channel_description">Viser gjeldende VPN-tunnelstatus</string>
     <string name="foreground_notification_channel_name">VPN-tunnelstatus</string>
     <string name="go_to_login">Gå til pålogging</string>
diff --git a/android/lib/resource/src/main/res/values-nl/strings.xml b/android/lib/resource/src/main/res/values-nl/strings.xml
index 9865bcdbec39..e965388f4024 100644
--- a/android/lib/resource/src/main/res/values-nl/strings.xml
+++ b/android/lib/resource/src/main/res/values-nl/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Overschrijving van server-IP-adressen</string>
     <string name="feature_udp_2_tcp">Obfuscatie</string>
     <string name="filter">Filter</string>
-    <string name="filtered">Gefilterd:</string>
     <string name="foreground_notification_channel_description">Toont de huidige status van de VPN-tunnel</string>
     <string name="foreground_notification_channel_name">Status VPN-tunnel</string>
     <string name="go_to_login">Ga naar aanmelden</string>
diff --git a/android/lib/resource/src/main/res/values-pl/strings.xml b/android/lib/resource/src/main/res/values-pl/strings.xml
index 079d6b8f01e2..9fd1e9de55aa 100644
--- a/android/lib/resource/src/main/res/values-pl/strings.xml
+++ b/android/lib/resource/src/main/res/values-pl/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Zastąpienie adresu IP serwera</string>
     <string name="feature_udp_2_tcp">Zaciemnianie</string>
     <string name="filter">Filtruj</string>
-    <string name="filtered">Odfiltrowane:</string>
     <string name="foreground_notification_channel_description">Pokazuje bieżący status tunelu VPN</string>
     <string name="foreground_notification_channel_name">Status tunelu VPN</string>
     <string name="go_to_login">Przejdź do logowania</string>
diff --git a/android/lib/resource/src/main/res/values-pt/strings.xml b/android/lib/resource/src/main/res/values-pt/strings.xml
index 52ce6d90eb3a..34175af58247 100644
--- a/android/lib/resource/src/main/res/values-pt/strings.xml
+++ b/android/lib/resource/src/main/res/values-pt/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Substituição de IP de servidor</string>
     <string name="feature_udp_2_tcp">Ofuscação</string>
     <string name="filter">Filtrar</string>
-    <string name="filtered">Filtrado:</string>
     <string name="foreground_notification_channel_description">Indica o estado atual do túnel VPN</string>
     <string name="foreground_notification_channel_name">Estado do túnel VPN</string>
     <string name="go_to_login">Ir para a ligação</string>
diff --git a/android/lib/resource/src/main/res/values-ru/strings.xml b/android/lib/resource/src/main/res/values-ru/strings.xml
index 9afb206f425d..4d7e03a9684b 100644
--- a/android/lib/resource/src/main/res/values-ru/strings.xml
+++ b/android/lib/resource/src/main/res/values-ru/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Переопределение IP-адреса сервера</string>
     <string name="feature_udp_2_tcp">Обфускация</string>
     <string name="filter">Фильтр</string>
-    <string name="filtered">Фильтр:</string>
     <string name="foreground_notification_channel_description">Показывает текущее состояние VPN-туннеля</string>
     <string name="foreground_notification_channel_name">Состояние туннеля VPN</string>
     <string name="go_to_login">Войти</string>
diff --git a/android/lib/resource/src/main/res/values-sv/strings.xml b/android/lib/resource/src/main/res/values-sv/strings.xml
index b4f5d576e1c4..a1f0557de748 100644
--- a/android/lib/resource/src/main/res/values-sv/strings.xml
+++ b/android/lib/resource/src/main/res/values-sv/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Åsidosättning av server-IP</string>
     <string name="feature_udp_2_tcp">Obfuskering</string>
     <string name="filter">Filtrera</string>
-    <string name="filtered">Filtrerat:</string>
     <string name="foreground_notification_channel_description">Visar nuvarande status för VPN-tunnel</string>
     <string name="foreground_notification_channel_name">VPN-tunnelstatus</string>
     <string name="go_to_login">Gå till inloggning</string>
diff --git a/android/lib/resource/src/main/res/values-th/strings.xml b/android/lib/resource/src/main/res/values-th/strings.xml
index 6c805bbbf951..9664d0a91788 100644
--- a/android/lib/resource/src/main/res/values-th/strings.xml
+++ b/android/lib/resource/src/main/res/values-th/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">โอเวอร์ไรด์ IP เซิร์ฟเวอร์</string>
     <string name="feature_udp_2_tcp">การทำให้ข้อมูลยุ่งเหยิง</string>
     <string name="filter">ตัวกรอง</string>
-    <string name="filtered">กรอง:</string>
     <string name="foreground_notification_channel_description">แสดงสถานะอุโมงค์ VPN ในปัจจุบัน</string>
     <string name="foreground_notification_channel_name">สถานะอุโมงค์ VPN</string>
     <string name="go_to_login">ไปเข้าสู่ระบบ</string>
diff --git a/android/lib/resource/src/main/res/values-tr/strings.xml b/android/lib/resource/src/main/res/values-tr/strings.xml
index e5ee28a97ef5..cdb01b9d2f13 100644
--- a/android/lib/resource/src/main/res/values-tr/strings.xml
+++ b/android/lib/resource/src/main/res/values-tr/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">Sunucu IP\'sini geçersiz kılma</string>
     <string name="feature_udp_2_tcp">Gizleme</string>
     <string name="filter">Filtrele</string>
-    <string name="filtered">Filtrelendi:</string>
     <string name="foreground_notification_channel_description">Mevcut VPN tünelinin durumunu gösterir</string>
     <string name="foreground_notification_channel_name">VPN tüneli durumu</string>
     <string name="go_to_login">Giriş sayfasına git</string>
diff --git a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml
index 1a420824b75e..39306a64aef6 100644
--- a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml
+++ b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">服务器 IP 覆盖</string>
     <string name="feature_udp_2_tcp">混淆</string>
     <string name="filter">筛选</string>
-    <string name="filtered">已筛选：</string>
     <string name="foreground_notification_channel_description">显示当前的 VPN 隧道状态</string>
     <string name="foreground_notification_channel_name">VPN 隧道状态</string>
     <string name="go_to_login">前往登录</string>
diff --git a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml
index 9711aaffd71d..8be3c88b5931 100644
--- a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml
+++ b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml
@@ -154,7 +154,6 @@
     <string name="feature_server_ip_override">伺服器 IP 覆寫</string>
     <string name="feature_udp_2_tcp">混淆</string>
     <string name="filter">篩選</string>
-    <string name="filtered">已篩選：</string>
     <string name="foreground_notification_channel_description">顯示目前的 VPN 通道狀態</string>
     <string name="foreground_notification_channel_name">VPN 通道狀態</string>
     <string name="go_to_login">前往登入</string>
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index 601d983da95d..4625fb3b5f08 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -56,7 +56,6 @@
     <string name="owned">Owned</string>
     <string name="rented">Rented</string>
     <string name="number_of_providers">Providers: %d</string>
-    <string name="filtered">Filtered:</string>
     <string name="mullvad_owned_only">Mullvad owned only</string>
     <string name="all_providers">All providers</string>
     <string name="rented_only">Rented only</string>
@@ -406,6 +405,6 @@
     <string name="x_entry">%s (Entry)</string>
     <string name="x_exit">%s (Exit)</string>
     <string name="search_results">Search results</string>
-    <string name="filters">Filters</string>
+    <string name="filters">Filters:</string>
     <string name="search_query_empty">Type at least 2 characters to start searching.</string>
 </resources>
diff --git a/desktop/packages/mullvad-vpn/locales/messages.pot b/desktop/packages/mullvad-vpn/locales/messages.pot
index a371a75cbe57..2b9bdee08167 100644
--- a/desktop/packages/mullvad-vpn/locales/messages.pot
+++ b/desktop/packages/mullvad-vpn/locales/messages.pot
@@ -2452,7 +2452,7 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-msgid "Filters"
+msgid "Filters:"
 msgstr ""
 
 msgid "Go to VPN settings"