diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-03-21 13:17:16 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-03-21 13:17:16 +0100 |
| commit | 0f58351bed614746d2d326007e8255d23b1f0893 (patch) | |
| tree | 6ff93224c9d7ebd80c6df42180bcb10d093d9ded /android | |
| parent | cb13f3a9e30bc3c321b2710ebe5299723c51cea6 (diff) | |
| parent | 10b3a631a691d5565e6d43ed5210f8fed3a2427b (diff) | |
| download | mullvadvpn-0f58351bed614746d2d326007e8255d23b1f0893.tar.xz mullvadvpn-0f58351bed614746d2d326007e8255d23b1f0893.zip | |
Merge branch 'remove-see-full-changelog-button-from-whats-new-view-droid-1816'
Diffstat (limited to 'android')
25 files changed, 4 insertions, 91 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogScreenTest.kt index 968f16eb29..4494dadeb9 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogScreenTest.kt @@ -24,18 +24,8 @@ class ChangelogScreenTest { MockKAnnotations.init(this) } - private fun ComposeContext.initScreen( - state: ChangelogUiState, - onSeeFullChangelog: () -> Unit = {}, - onBackClick: () -> Unit = {}, - ) { - setContentWithTheme { - ChangelogScreen( - state = state, - onSeeFullChangelog = onSeeFullChangelog, - onBackClick = onBackClick, - ) - } + private fun ComposeContext.initScreen(state: ChangelogUiState, onBackClick: () -> Unit = {}) { + setContentWithTheme { ChangelogScreen(state = state, onBackClick = onBackClick) } } @Test diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/extensions/UriHandlerExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/extensions/UriHandlerExtensions.kt index 3e0ae8f898..a642dc72fe 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/extensions/UriHandlerExtensions.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/extensions/UriHandlerExtensions.kt @@ -17,12 +17,6 @@ fun UriHandler.createOpenAccountPageHook(): (WebsiteAuthToken?) -> Unit { } } -@Composable -fun UriHandler.createOpenFullChangeLogHook(): () -> Unit { - val changelogUrl = stringResource(id = R.string.changelog_url) - return { safeOpenUri(changelogUrl) } -} - fun UriHandler.createUriHook(uri: String): () -> Unit = { safeOpenUri(uri) } private fun UriHandler.safeOpenUri(uri: String) { diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogScreen.kt index 53bf2113a6..61ef8f8611 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogScreen.kt @@ -1,7 +1,6 @@ package net.mullvad.mullvadvpn.compose.screen import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth @@ -9,15 +8,11 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.OpenInNew -import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview @@ -26,18 +21,14 @@ import androidx.navigation.NavController import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootGraph import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.compose.button.PrimaryButton import net.mullvad.mullvadvpn.compose.component.NavigateBackIconButton import net.mullvad.mullvadvpn.compose.component.NavigateCloseIconButton import net.mullvad.mullvadvpn.compose.component.ScaffoldWithMediumTopBar import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar -import net.mullvad.mullvadvpn.compose.extensions.createOpenFullChangeLogHook import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition -import net.mullvad.mullvadvpn.compose.util.CollectSideEffectWithLifecycle import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.lib.theme.Dimens import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar -import net.mullvad.mullvadvpn.viewmodel.ChangeLogSideEffect import net.mullvad.mullvadvpn.viewmodel.ChangelogUiState import net.mullvad.mullvadvpn.viewmodel.ChangelogViewModel import org.koin.androidx.compose.koinViewModel @@ -52,29 +43,15 @@ fun Changelog(navController: NavController) { val uiState = viewModel.uiState.collectAsStateWithLifecycle() - val openAccountPage = LocalUriHandler.current.createOpenFullChangeLogHook() - CollectSideEffectWithLifecycle(viewModel.uiSideEffect) { - when (it) { - is ChangeLogSideEffect.OpenFullChangelog -> openAccountPage() - } - } LaunchedEffect(Unit) { viewModel.dismissChangelogNotification() } - ChangelogScreen( - uiState.value, - onBackClick = navController::navigateUp, - onSeeFullChangelog = viewModel::onSeeFullChangelog, - ) + ChangelogScreen(uiState.value, onBackClick = navController::navigateUp) } data class ChangelogNavArgs(val isModal: Boolean = false) @Composable -fun ChangelogScreen( - state: ChangelogUiState, - onBackClick: () -> Unit, - onSeeFullChangelog: () -> Unit, -) { +fun ChangelogScreen(state: ChangelogUiState, onBackClick: () -> Unit) { ScaffoldWithMediumTopBar( appBarTitle = stringResource(id = R.string.changelog_title), @@ -114,19 +91,6 @@ fun ChangelogScreen( state.changes.forEach { changeItem -> ChangeListItem(text = changeItem) } } } - Box(modifier = Modifier.padding(Dimens.mediumPadding).fillMaxWidth()) { - PrimaryButton( - onClick = onSeeFullChangelog, - text = stringResource(R.string.see_full_changelog), - trailingIcon = { - Icon( - imageVector = Icons.AutoMirrored.Default.OpenInNew, - contentDescription = null, - tint = MaterialTheme.colorScheme.onSurface, - ) - }, - ) - } } } } @@ -158,7 +122,6 @@ private fun PreviewChangelogDialogWithSingleShortItem() { ChangelogScreen( ChangelogUiState(changes = listOf("Item 1"), version = "1111.1"), onBackClick = {}, - onSeeFullChangelog = {}, ) } } @@ -178,7 +141,6 @@ private fun PreviewChangelogDialogWithTwoLongItems() { version = "1111.1", ), onBackClick = {}, - onSeeFullChangelog = {}, ) } } @@ -205,7 +167,6 @@ private fun PreviewChangelogDialogWithTenShortItems() { version = "1111.1", ), onBackClick = {}, - onSeeFullChangelog = {}, ) } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt index 0feb6ecbd3..e6289399f7 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt @@ -5,10 +5,8 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.ramcosta.composedestinations.generated.destinations.ChangelogDestination -import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.launch import kotlinx.parcelize.Parcelize import net.mullvad.mullvadvpn.lib.model.BuildVersion @@ -20,8 +18,6 @@ class ChangelogViewModel( buildVersion: BuildVersion, ) : ViewModel() { private val navArgs = ChangelogDestination.argsFrom(savedStateHandle) - private val _uiSideEffect = Channel<ChangeLogSideEffect>() - val uiSideEffect = _uiSideEffect.receiveAsFlow() val uiState: StateFlow<ChangelogUiState> = MutableStateFlow( @@ -34,13 +30,6 @@ class ChangelogViewModel( fun dismissChangelogNotification() = viewModelScope.launch { changelogRepository.setDismissNewChangelogNotification() } - - fun onSeeFullChangelog() = - viewModelScope.launch { _uiSideEffect.send(ChangeLogSideEffect.OpenFullChangelog) } -} - -sealed interface ChangeLogSideEffect { - object OpenFullChangelog : ChangeLogSideEffect } @Parcelize 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 b0133734d5..bd5b751c13 100644 --- a/android/lib/resource/src/main/res/values-da/strings.xml +++ b/android/lib/resource/src/main/res/values-da/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">Intet resultat for \"%1$s\". Prøv en anden søgning</string> <string name="search_placeholder">Søg efter...</string> <string name="search_query_empty">Indtast mindst 2 tegn for at starte søgningen.</string> - <string name="see_full_changelog">Se hele ændringsloggen</string> <string name="select_location">Vælg placering</string> <string name="send">Send</string> <string name="send_anyway">Send alligevel</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 e6631aa4e8..91a572d6bd 100644 --- a/android/lib/resource/src/main/res/values-de/strings.xml +++ b/android/lib/resource/src/main/res/values-de/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">Kein Ergebnis für „%1$s“, bitte versuchen Sie einen anderen Suchbegriff</string> <string name="search_placeholder">Suchen nach …</string> <string name="search_query_empty">Geben Sie mindestens 2 Zeichen ein, um die Suche zu starten.</string> - <string name="see_full_changelog">Komplettes Changelog anzeigen</string> <string name="select_location">Ort auswählen</string> <string name="send">Senden</string> <string name="send_anyway">Trotzdem senden</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 4fb2255272..2f81c2615c 100644 --- a/android/lib/resource/src/main/res/values-es/strings.xml +++ b/android/lib/resource/src/main/res/values-es/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">No hay resultados para «%1$s», intente una búsqueda diferente</string> <string name="search_placeholder">Buscar...</string> <string name="search_query_empty">Escriba al menos 2 caracteres para iniciar la búsqueda.</string> - <string name="see_full_changelog">Vea el registro de cambios completo</string> <string name="select_location">Seleccionar ubicación</string> <string name="send">Enviar</string> <string name="send_anyway">Enviar de todos modos</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 10aa23955d..a6a43fc2fd 100644 --- a/android/lib/resource/src/main/res/values-fi/strings.xml +++ b/android/lib/resource/src/main/res/values-fi/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">Haulle \"%1$s\" ei löytynyt tuloksia. Kokeile toista hakua.</string> <string name="search_placeholder">Hae...</string> <string name="search_query_empty">Aloita haku kirjoittamalla vähintään 2 merkkiä.</string> - <string name="see_full_changelog">Avaa koko muutosloki</string> <string name="select_location">Valitse sijainti</string> <string name="send">Lähetä</string> <string name="send_anyway">Lähetä silti</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 ac5240050d..b90574a674 100644 --- a/android/lib/resource/src/main/res/values-fr/strings.xml +++ b/android/lib/resource/src/main/res/values-fr/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">Aucun résultat pour « %1$s ». Veuillez essayer une autre recherche</string> <string name="search_placeholder">Rechercher...</string> <string name="search_query_empty">Saisissez au moins 2 caractères pour commencer la recherche.</string> - <string name="see_full_changelog">Voir le journal des modifications complet</string> <string name="select_location">Sélectionner une localisation</string> <string name="send">Envoyer</string> <string name="send_anyway">Envoyer quand même</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 285d1401d0..038a3c0b45 100644 --- a/android/lib/resource/src/main/res/values-it/strings.xml +++ b/android/lib/resource/src/main/res/values-it/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">Nessun risultato per \"%1$s\", prova una ricerca diversa</string> <string name="search_placeholder">Cerca...</string> <string name="search_query_empty">Digita almeno 2 caratteri per iniziare la ricerca.</string> - <string name="see_full_changelog">Vedi changelog completo</string> <string name="select_location">Seleziona posizione</string> <string name="send">Invia</string> <string name="send_anyway">Invia comunque</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 6373d65be7..ddc42f139b 100644 --- a/android/lib/resource/src/main/res/values-ja/strings.xml +++ b/android/lib/resource/src/main/res/values-ja/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">「%1$s」の結果はありません。別の検索をお試しください。</string> <string name="search_placeholder">検索...</string> <string name="search_query_empty">検索を開始するには2文字以上を入力してください。</string> - <string name="see_full_changelog">すべての変更履歴を見る</string> <string name="select_location">場所を選択する</string> <string name="send">送信</string> <string name="send_anyway">とにかく送信する</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 9118452d17..917e404242 100644 --- a/android/lib/resource/src/main/res/values-ko/strings.xml +++ b/android/lib/resource/src/main/res/values-ko/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">\"%1$s\" 검색 결과가 없습니다. 다른 검색어를 시도하세요</string> <string name="search_placeholder">검색...</string> <string name="search_query_empty">검색을 시작하려면 2자 이상 입력하세요.</string> - <string name="see_full_changelog">전체 변경 로그 확인</string> <string name="select_location">위치 선택</string> <string name="send">전송</string> <string name="send_anyway">그래도 전송</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 f77c6e3042..081ca22bc4 100644 --- a/android/lib/resource/src/main/res/values-my/strings.xml +++ b/android/lib/resource/src/main/res/values-my/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">\"%1$s\" အတွက် ရလဒ်မရှိပါ၊ အခြားရှာဖွေမှုတစ်ခုကို စမ်းလုပ်ကြည့်ပါ</string> <string name="search_placeholder">ရှာရန်...</string> <string name="search_query_empty">စတင်ရှာဖွေရန် အနည်းဆုံး အက္ခရာ 2 လုံး ရိုက်ထည့်ပါ။</string> - <string name="see_full_changelog">ပြောင်းလဲမှုမှတ်တမ်း အပြည့်အစုံကို ကြည့်ရန်</string> <string name="select_location">တည်နေရာ ရွေးရန်</string> <string name="send">ပို့ရန်</string> <string name="send_anyway">မည်သို့ပင်ဖြစ်စေ ပို့ရန်</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 ae868853a0..f007543750 100644 --- a/android/lib/resource/src/main/res/values-nb/strings.xml +++ b/android/lib/resource/src/main/res/values-nb/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">Ingen resultater for «%1$s». Prøv et annet søk</string> <string name="search_placeholder">Søk etter ...</string> <string name="search_query_empty">Skriv minst 2 tegn for å begynne å søke.</string> - <string name="see_full_changelog">Se komplett endringslogg</string> <string name="select_location">Velg plassering</string> <string name="send">Send</string> <string name="send_anyway">Send allikevel</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 18682fee6d..4e243d9710 100644 --- a/android/lib/resource/src/main/res/values-nl/strings.xml +++ b/android/lib/resource/src/main/res/values-nl/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">Geen resultaat voor \"%1$s\", probeer een andere zoekopdracht</string> <string name="search_placeholder">Zoeken naar...</string> <string name="search_query_empty">Voer minimaal 2 tekens in om te beginnen met zoeken.</string> - <string name="see_full_changelog">Volledige changelog weergeven</string> <string name="select_location">Locatie selecteren</string> <string name="send">Verzenden</string> <string name="send_anyway">Toch verzenden</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 6a3973c2c0..972007912d 100644 --- a/android/lib/resource/src/main/res/values-pl/strings.xml +++ b/android/lib/resource/src/main/res/values-pl/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">Brak wyników dla hasła „%1$s”, spróbuj innego wyszukiwania</string> <string name="search_placeholder">Wyszukaj...</string> <string name="search_query_empty">Wpisz co najmniej 2 znaki, aby rozpocząć wyszukiwanie.</string> - <string name="see_full_changelog">Zobacz pełny dziennik zmian</string> <string name="select_location">Wybierz lokalizację</string> <string name="send">Wyślij</string> <string name="send_anyway">Mimo to wyślij</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 8dd3af5694..c20ed95592 100644 --- a/android/lib/resource/src/main/res/values-pt/strings.xml +++ b/android/lib/resource/src/main/res/values-pt/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">Nenhum resultado para \"%1$s\", tente uma pesquisa diferente</string> <string name="search_placeholder">Pesquisar por...</string> <string name="search_query_empty">Digite pelo menos 2 caracteres para iniciar a pesquisa.</string> - <string name="see_full_changelog">Ver registo de alterações completo</string> <string name="select_location">Selecionar localização</string> <string name="send">Enviar</string> <string name="send_anyway">Enviar mesmo assim</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 fcf596e39b..7b572245eb 100644 --- a/android/lib/resource/src/main/res/values-ru/strings.xml +++ b/android/lib/resource/src/main/res/values-ru/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">По запросу «%1$s» ничего не найдено — попробуйте другой запрос</string> <string name="search_placeholder">Поиск...</string> <string name="search_query_empty">Чтобы начать поиск, введите не менее двух символов.</string> - <string name="see_full_changelog">Полная история изменений</string> <string name="select_location">Выбор местоположения</string> <string name="send">Отправить</string> <string name="send_anyway">Все равно отправить</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 7c87bb0ba8..9dc9a86e06 100644 --- a/android/lib/resource/src/main/res/values-sv/strings.xml +++ b/android/lib/resource/src/main/res/values-sv/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">Inga resultat hittades för \"%1$s\", försök med en annan sökning</string> <string name="search_placeholder">Sök efter …</string> <string name="search_query_empty">Ange minst två tecken för att börja söka.</string> - <string name="see_full_changelog">Visa hela ändringsloggen</string> <string name="select_location">Välj plats</string> <string name="send">Skicka</string> <string name="send_anyway">Skicka ändå</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 942e88c8df..a9e2713168 100644 --- a/android/lib/resource/src/main/res/values-th/strings.xml +++ b/android/lib/resource/src/main/res/values-th/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">ไม่พบผลลัพธ์สำหรับ \"%1$s\" โปรดลองใช้คำค้นหาอื่น</string> <string name="search_placeholder">ค้นหา…</string> <string name="search_query_empty">พิมพ์อย่างน้อย 2 ตัวอักษร เพื่อเริ่มการค้นหา</string> - <string name="see_full_changelog">ดูบันทึกการเปลี่ยนแปลงทั้งหมด</string> <string name="select_location">เลือกตำแหน่งที่ตั้ง</string> <string name="send">ส่ง</string> <string name="send_anyway">ส่งต่อไป</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 47bab7b7e0..5b15735784 100644 --- a/android/lib/resource/src/main/res/values-tr/strings.xml +++ b/android/lib/resource/src/main/res/values-tr/strings.xml @@ -302,7 +302,6 @@ <string name="search_location_empty_text">\"%1$s\" için sonuç yok, lütfen farklı bir arama yapın</string> <string name="search_placeholder">Ara...</string> <string name="search_query_empty">Arama yapmak için en az 2 karakter girin.</string> - <string name="see_full_changelog">Değişiklik günlüğünün tamamını göster</string> <string name="select_location">Konum seçin</string> <string name="send">Gönder</string> <string name="send_anyway">Yine de gönder</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 7d347d165d..0b048c71b2 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 @@ -302,7 +302,6 @@ <string name="search_location_empty_text">“%1$s”无结果,请尝试其他搜索</string> <string name="search_placeholder">搜索…</string> <string name="search_query_empty">至少输入 2 个字符以开始搜索。</string> - <string name="see_full_changelog">查看完整的更新日志</string> <string name="select_location">选择位置</string> <string name="send">发送</string> <string name="send_anyway">仍然发送</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 31caba1244..f85f492b27 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 @@ -302,7 +302,6 @@ <string name="search_location_empty_text">找不到「%1$s」的結果,請使改用其他搜尋條件。</string> <string name="search_placeholder">搜尋…</string> <string name="search_query_empty">至少輸入 2 個字元以開始搜尋。</string> - <string name="see_full_changelog">查看完整變更日誌</string> <string name="select_location">選擇位置</string> <string name="send">傳送</string> <string name="send_anyway">仍要傳送</string> diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml index f77a34367e..8e4da6fc6e 100644 --- a/android/lib/resource/src/main/res/values/strings.xml +++ b/android/lib/resource/src/main/res/values/strings.xml @@ -406,7 +406,6 @@ <string name="open_feature_settings">Open %1$s settings</string> <string name="search">Search</string> <string name="obfuscation_info_shadowsocks_batteryusage">Attention: Shadowsocks can increase battery consumption depending on data usage, such as streaming a video.</string> - <string name="see_full_changelog">See full changelog</string> <string name="changelog_empty">No changelog was added for this version</string> <string name="wg_port_subtitle">Set %s obfuscation to \"Automatic\" or \"Off\" below to activate this setting.</string> <string name="device_ip_version_title">Device IP version</string> diff --git a/android/lib/resource/src/main/res/values/strings_non_translatable.xml b/android/lib/resource/src/main/res/values/strings_non_translatable.xml index f04cabd78e..837740aa47 100644 --- a/android/lib/resource/src/main/res/values/strings_non_translatable.xml +++ b/android/lib/resource/src/main/res/values/strings_non_translatable.xml @@ -6,7 +6,6 @@ <string name="market_uri" translatable="false">market://details?id=%s</string> <string name="faqs_and_guides_url" translatable="false">https://mullvad.net/help/tag/mullvad-app/</string> <string name="privacy_policy_url" translatable="false">https://mullvad.net/help/privacy-policy/</string> - <string name="changelog_url" translatable="false">https://github.com/mullvad/mullvadvpn-app/blob/main/android/CHANGELOG.md</string> <string name="lockdown_url" translatable="false">https://mullvad.net/l/android-lockdown</string> <string name="split_tunneling" translatable="false">Split tunneling</string> <string name="wireguard" translatable="false">WireGuard</string> |
