diff options
Diffstat (limited to 'android/lib')
18 files changed, 29 insertions, 0 deletions
diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ContextExtensions.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ContextExtensions.kt index b983e3538d..8ef70dad92 100644 --- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ContextExtensions.kt +++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ContextExtensions.kt @@ -41,3 +41,8 @@ fun Context.openLink(uri: Uri) { val intent = Intent(Intent.ACTION_VIEW, uri) startActivity(intent) } + +fun Context.openVpnSettings() { + val intent = Intent("android.settings.VPN_SETTINGS") + startActivity(intent) +} diff --git a/android/lib/resource/src/main/res/drawable-hdpi/carousel_slide_1_cogwheel.png b/android/lib/resource/src/main/res/drawable-hdpi/carousel_slide_1_cogwheel.png Binary files differnew file mode 100644 index 0000000000..b1f4ec3d93 --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-hdpi/carousel_slide_1_cogwheel.png diff --git a/android/lib/resource/src/main/res/drawable-hdpi/carousel_slide_2_always_on.png b/android/lib/resource/src/main/res/drawable-hdpi/carousel_slide_2_always_on.png Binary files differnew file mode 100644 index 0000000000..3a9a10a160 --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-hdpi/carousel_slide_2_always_on.png diff --git a/android/lib/resource/src/main/res/drawable-hdpi/carousel_slide_3_block_connections.png b/android/lib/resource/src/main/res/drawable-hdpi/carousel_slide_3_block_connections.png Binary files differnew file mode 100644 index 0000000000..1a31c0a64b --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-hdpi/carousel_slide_3_block_connections.png diff --git a/android/lib/resource/src/main/res/drawable-mdpi/carousel_slide_1_cogwheel.png b/android/lib/resource/src/main/res/drawable-mdpi/carousel_slide_1_cogwheel.png Binary files differnew file mode 100644 index 0000000000..e82ed3d283 --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-mdpi/carousel_slide_1_cogwheel.png diff --git a/android/lib/resource/src/main/res/drawable-mdpi/carousel_slide_2_always_on.png b/android/lib/resource/src/main/res/drawable-mdpi/carousel_slide_2_always_on.png Binary files differnew file mode 100644 index 0000000000..8f4a886dd2 --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-mdpi/carousel_slide_2_always_on.png diff --git a/android/lib/resource/src/main/res/drawable-mdpi/carousel_slide_3_block_connections.png b/android/lib/resource/src/main/res/drawable-mdpi/carousel_slide_3_block_connections.png Binary files differnew file mode 100644 index 0000000000..88a1cc405e --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-mdpi/carousel_slide_3_block_connections.png diff --git a/android/lib/resource/src/main/res/drawable-xhdpi/carousel_slide_1_cogwheel.png b/android/lib/resource/src/main/res/drawable-xhdpi/carousel_slide_1_cogwheel.png Binary files differnew file mode 100644 index 0000000000..8c7c25dc1f --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-xhdpi/carousel_slide_1_cogwheel.png diff --git a/android/lib/resource/src/main/res/drawable-xhdpi/carousel_slide_2_always_on.png b/android/lib/resource/src/main/res/drawable-xhdpi/carousel_slide_2_always_on.png Binary files differnew file mode 100644 index 0000000000..3cad85b537 --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-xhdpi/carousel_slide_2_always_on.png diff --git a/android/lib/resource/src/main/res/drawable-xhdpi/carousel_slide_3_block_connections.png b/android/lib/resource/src/main/res/drawable-xhdpi/carousel_slide_3_block_connections.png Binary files differnew file mode 100644 index 0000000000..58b0d740d0 --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-xhdpi/carousel_slide_3_block_connections.png diff --git a/android/lib/resource/src/main/res/drawable-xxhdpi/carousel_slide_1_cogwheel.png b/android/lib/resource/src/main/res/drawable-xxhdpi/carousel_slide_1_cogwheel.png Binary files differnew file mode 100644 index 0000000000..5f04ff4c7f --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-xxhdpi/carousel_slide_1_cogwheel.png diff --git a/android/lib/resource/src/main/res/drawable-xxhdpi/carousel_slide_2_always_on.png b/android/lib/resource/src/main/res/drawable-xxhdpi/carousel_slide_2_always_on.png Binary files differnew file mode 100644 index 0000000000..04e6f371b8 --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-xxhdpi/carousel_slide_2_always_on.png diff --git a/android/lib/resource/src/main/res/drawable-xxhdpi/carousel_slide_3_block_connections.png b/android/lib/resource/src/main/res/drawable-xxhdpi/carousel_slide_3_block_connections.png Binary files differnew file mode 100644 index 0000000000..8753492ea1 --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-xxhdpi/carousel_slide_3_block_connections.png diff --git a/android/lib/resource/src/main/res/drawable-xxxhdpi/carousel_slide_1_cogwheel.png b/android/lib/resource/src/main/res/drawable-xxxhdpi/carousel_slide_1_cogwheel.png Binary files differnew file mode 100644 index 0000000000..0a0fac8055 --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-xxxhdpi/carousel_slide_1_cogwheel.png diff --git a/android/lib/resource/src/main/res/drawable-xxxhdpi/carousel_slide_2_always_on.png b/android/lib/resource/src/main/res/drawable-xxxhdpi/carousel_slide_2_always_on.png Binary files differnew file mode 100644 index 0000000000..4e80ea46c5 --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-xxxhdpi/carousel_slide_2_always_on.png diff --git a/android/lib/resource/src/main/res/drawable-xxxhdpi/carousel_slide_3_block_connections.png b/android/lib/resource/src/main/res/drawable-xxxhdpi/carousel_slide_3_block_connections.png Binary files differnew file mode 100644 index 0000000000..5a47ba9a9b --- /dev/null +++ b/android/lib/resource/src/main/res/drawable-xxxhdpi/carousel_slide_3_block_connections.png diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml index 1c19dab826..b163c9f612 100644 --- a/android/lib/resource/src/main/res/values/strings.xml +++ b/android/lib/resource/src/main/res/values/strings.xml @@ -73,6 +73,26 @@ <string name="local_network_sharing">Local network sharing</string> <string name="allow_lan_footer">Allows access to other devices on the same network for sharing, printing etc.</string> <string name="auto_connect">Auto-connect</string> + <string name="auto_connect_and_lockdown_mode">Auto-connect & Lockdown mode</string> + <string name="auto_connect_and_lockdown_mode_two_lines">Auto-connect & \nLockdown mode</string> + <string name="auto_connect_and_lockdown_mode_footer">Makes sure the device is always on the VPN tunnel.</string> + <string name="go_to_vpn_settings">Go to VPN settings</string> + <string name="vpn_settings_not_found">There is no VPN settings on your device</string> + <string name="auto_connect_carousel_first_slide_top_text">The Auto-connect and Lockdown mode settings can be found in the Android system settings, follow this guide to enable one or both.</string> + <string name="auto_connect_carousel_first_slide_bottom_text"> + <![CDATA[1. After clicking on the <b>Go to VPN settings</b> button below, click on the cogwheel next to the <b>Mullvad VPN</b> name.]]> + </string> + <string name="auto_connect_carousel_second_slide_top_text">Auto-connect is called Always-on VPN in the Android system settings and it makes sure you are constantly connected to the VPN tunnel and auto connects after restart.</string> + <string name="auto_connect_carousel_second_slide_bottom_text"> + <![CDATA[2. To enable Auto-connect, click on the toggle next to <b>Always-on VPN</b>.]]> + </string> + <string name="auto_connect_carousel_third_slide_top_text"> + <![CDATA[The Lockdown mode blocks all internet access if the VPN tunnel is manually disconnected. <br/><b>Warning: This setting blocks split apps and the Local Network Sharing feature</b>.]]> + </string> + <string name="auto_connect_carousel_third_slide_bottom_text"> + <![CDATA[3. To enable Lockdown mode, click on the toggle next to <b>Block connections without VPN</b>.]]> + </string> + <string name="auto_connect_footer">Automatically connect to a server when the app launches.</string> <string name="wireguard_mtu">WireGuard MTU</string> <string name="wireguard_mtu_footer">Set WireGuard MTU value. Valid range: %1$d - %2$d.</string> 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 2e412d864e..ef6b04146e 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 @@ -9,6 +9,7 @@ data class Dimensions( val addIconSize: Dp = 24.dp, val backButtonSideMargin: Dp = 30.dp, val bigIconSize: Dp = 44.dp, + val bottomPadding: Dp = 4.dp, val buttonHeight: Dp = 44.dp, val buttonSpacing: Dp = 12.dp, val buttonVerticalPadding: Dp = 8.dp, @@ -41,6 +42,8 @@ data class Dimensions( val iconFailSuccessTopMargin: Dp = 30.dp, val iconHeight: Dp = 44.dp, val indentedCellStartPadding: Dp = 38.dp, + val indicatorPadding: Dp = 2.dp, + val indicatorSize: Dp = 6.dp, val infoButtonVerticalPadding: Dp = 13.dp, val largePadding: Dp = 32.dp, val listIconSize: Dp = 24.dp, @@ -76,6 +79,7 @@ data class Dimensions( val switchIconSize: Dp = 24.dp, val titleIconSize: Dp = 48.dp, val topBarHeight: Dp = 64.dp, + val topPadding: Dp = 20.dp, val verticalDividerPadding: Dp = 12.dp, val verticalSpace: Dp = 20.dp, val verticalSpacer: Dp = 1.dp, |
