wip create auto screen

Co-Authored-By: Boban Sijuk <49131853+Boki91@users.noreply.github.com>

Author: MaryamShaghaghi

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AutoConnectCarousel.kt

@@ -46,10 +46,12 @@ fun PreviewAutoConnectCarousel() {
     AppTheme { AutoConnectCarousel() }
 }
 
+private const val CAROUSEL_PAGE_SIZE = 3
+
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun AutoConnectCarousel() {
-    val pagerState = rememberPagerState(pageCount = { 3 })
+    val pagerState = rememberPagerState(pageCount = { CAROUSEL_PAGE_SIZE })
     HorizontalPager(state = pagerState, modifier = Modifier.fillMaxSize()) { page ->
         val scope = rememberCoroutineScope()
         ConstraintLayout(
@@ -70,14 +72,16 @@ fun AutoConnectCarousel() {
                         end.linkTo(parent.end)
                         bottom.linkTo(imageRef.top)
                     },
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.onSecondary,
                 text =
                     HtmlCompat.fromHtml(
                             stringResource(
                                 id =
                                     when (page) {
-                                        0 -> R.string.carousel_slide_1_text_1
-                                        1 -> R.string.carousel_slide_2_text_1
-                                        else -> R.string.carousel_slide_3_text_1
+                                        0 -> R.string.auto_connect_carousel_first_slide_top_text
+                                        1 -> R.string.auto_connect_carousel_second_slide_top_text
+                                        else -> R.string.auto_connect_carousel_third_slide_top_text
                                     }
                             ),
                             HtmlCompat.FROM_HTML_MODE_COMPACT
@@ -86,7 +90,7 @@ fun AutoConnectCarousel() {
                             boldSpanStyle =
                                 SpanStyle(
                                     fontWeight = FontWeight.ExtraBold,
-                                    color = MaterialTheme.colorScheme.onSecondary
+                                    color = MaterialTheme.colorScheme.onPrimary
                                 )
                         )
             )
@@ -129,7 +133,7 @@ fun AutoConnectCarousel() {
                 contentDescription = null,
             )
 
-            if (page != 2) {
+            if (page < CAROUSEL_PAGE_SIZE) {
                 IconButton(
                     modifier =
                         Modifier.constrainAs(nextButtonRef) {
@@ -156,14 +160,17 @@ fun AutoConnectCarousel() {
                         end.linkTo(parent.end)
                         start.linkTo(parent.start)
                     },
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.onSecondary,
                 text =
                     HtmlCompat.fromHtml(
                             stringResource(
                                 id =
                                     when (page) {
-                                        0 -> R.string.carousel_slide_1_text_2
-                                        1 -> R.string.carousel_slide_2_text_2
-                                        else -> R.string.carousel_slide_3_text_2
+                                        0 -> R.string.auto_connect_carousel_first_slide_bottom_text
+                                        1 -> R.string.auto_connect_carousel_second_slide_bottom_text
+                                        else ->
+                                            R.string.auto_connect_carousel_third_slide_bottom_text
                                     }
                             ),
                             HtmlCompat.FROM_HTML_MODE_COMPACT
@@ -172,7 +179,7 @@ fun AutoConnectCarousel() {
                             boldSpanStyle =
                                 SpanStyle(
                                     fontWeight = FontWeight.ExtraBold,
-                                    color = MaterialTheme.colorScheme.onSecondary
+                                    color = MaterialTheme.colorScheme.onPrimary
                                 )
                         )
             )
@@ -183,6 +190,7 @@ fun AutoConnectCarousel() {
                     .padding(top = Dimens.topPadding)
                     .constrainAs(pageIndicatorRef) {
                         top.linkTo(lowerTextRef.bottom)
+
                         end.linkTo(parent.end)
                         start.linkTo(parent.start)
                     },
@@ -191,7 +199,8 @@ fun AutoConnectCarousel() {
             ) {
                 repeat(pagerState.pageCount) { iteration ->
                     val color =
-                        if (pagerState.currentPage == iteration) Color.LightGray else Color.DarkGray
+                        if (pagerState.currentPage == iteration) MaterialTheme.colorScheme.onPrimary
+                        else MaterialTheme.colorScheme.primary
                     Box(
                         modifier =
                             Modifier.padding(Dimens.indicatorPadding)

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt

@@ -1,7 +1,5 @@
 package net.mullvad.mullvadvpn.compose.screen
 
-import android.content.ActivityNotFoundException
-import android.widget.Toast
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
@@ -33,13 +31,7 @@ fun AutoConnectAndLockdownModeScreen(
         appBarTitle = stringResource(id = R.string.auto_connect_and_lockdown_mode_two_lines),
         navigationIcon = { NavigateBackIconButton(onBackClick) },
         buttonTitle = stringResource(id = R.string.go_to_vpn_settings),
-        onButtonClick = {
-            try {
-                context.openVpnSettings()
-            } catch (e: ActivityNotFoundException) {
-                Toast.makeText(context, R.string.settings_vpn, Toast.LENGTH_SHORT).show()
-            }
-        },
+        onButtonClick = { context.openVpnSettings() },
         content = { modifier -> AutoConnectCarousel() }
     )
 }

android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ContextExtensions.kt

@@ -46,3 +46,6 @@ fun Context.openVpnSettings() {
     val intent = Intent("android.settings.VPN_SETTINGS")
     startActivity(intent)
 }
+
+fun Context.vpnSettingsAvailable(): Boolean =
+    Intent("android.net.vpn.SETTINGS").resolveActivity(packageManager) != null