diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-02-06 14:36:04 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-02-06 14:36:04 +0100 |
| commit | 32f552330021d165b79ef043df8ee8d0979372da (patch) | |
| tree | 9d22beefe2a483641e42127cc6d842be41da8714 /android/lib | |
| parent | d5ff4cd33db419e07ef44dfcb253a3c1927022c8 (diff) | |
| parent | a3e51910f4d270366b2bc7e4de6d82f88e5ae874 (diff) | |
| download | mullvadvpn-32f552330021d165b79ef043df8ee8d0979372da.tar.xz mullvadvpn-32f552330021d165b79ef043df8ee8d0979372da.zip | |
Merge branch 'disable-wg-port-when-obfuscation-is-used-droid-1482'
Diffstat (limited to 'android/lib')
| -rw-r--r-- | android/lib/resource/src/main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml index 6af8e233ba..567c7fde99 100644 --- a/android/lib/resource/src/main/res/values/strings.xml +++ b/android/lib/resource/src/main/res/values/strings.xml @@ -408,4 +408,5 @@ <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> </resources> diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt index 6a5da5c18d..51b4f5efb8 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt @@ -16,10 +16,9 @@ data class Dimensions( val cellFooterTopPadding: Dp = 6.dp, val cellHeight: Dp = 56.dp, val cellHeightTwoRows: Dp = 72.dp, - val cellLabelVerticalPadding: Dp = 14.dp, val cellStartPadding: Dp = 14.dp, val cellTopPadding: Dp = 6.dp, - val cellVerticalSpacing: Dp = 14.dp, + val cellVerticalSpacing: Dp = 24.dp, val chipSpace: Dp = 8.dp, val chipVerticalPadding: Dp = 4.dp, val circularProgressBarLargeSize: Dp = 44.dp, |