Make settings use scaffold snackbar instead

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

@@ -11,24 +11,25 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.AnimatedIconButton
-import net.mullvad.mullvadvpn.lib.common.util.SdkUtils
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.ui.extension.copyToClipboard
 
 @Preview
 @Composable
 private fun PreviewCopyableObfuscationView() {
-    AppTheme { CopyableObfuscationView("1111222233334444", modifier = Modifier.fillMaxWidth()) }
+    AppTheme { CopyableObfuscationView("1111222233334444", {}, modifier = Modifier.fillMaxWidth()) }
 }
 
 @Composable
-fun CopyableObfuscationView(content: String, modifier: Modifier = Modifier) {
+fun CopyableObfuscationView(
+    content: String,
+    onCopyClicked: (String) -> Unit,
+    modifier: Modifier = Modifier
+) {
     var obfuscationEnabled by remember { mutableStateOf(true) }
 
     Row(verticalAlignment = CenterVertically, modifier = modifier) {
@@ -45,19 +46,7 @@ fun CopyableObfuscationView(content: String, modifier: Modifier = Modifier) {
             onClick = { obfuscationEnabled = !obfuscationEnabled }
         )
 
-        val context = LocalContext.current
-        val copy = {
-            context.copyToClipboard(
-                content = content,
-                clipboardLabel = context.getString(R.string.mullvad_account_number)
-            )
-            SdkUtils.showCopyToastIfNeeded(
-                context,
-                context.getString(R.string.copied_mullvad_account_number)
-            )
-        }
-
-        CopyAnimatedIconButton(onClick = copy)
+        CopyAnimatedIconButton(onClick = { onCopyClicked(content) })
     }
 }
 

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

@@ -111,6 +111,7 @@ fun ScaffoldWithMediumTopBar(
     actions: @Composable RowScope.() -> Unit = {},
     lazyListState: LazyListState = rememberLazyListState(),
     scrollbarColor: Color = MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaScrollbar),
+    snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
     content: @Composable (modifier: Modifier, lazyListState: LazyListState) -> Unit
 ) {
 
@@ -128,6 +129,12 @@ fun ScaffoldWithMediumTopBar(
                 scrollBehavior = if (canScroll) scrollBehavior else null
             )
         },
+        snackbarHost = {
+            SnackbarHost(
+                snackbarHostState,
+                snackbar = { snackbarData -> MullvadSnackbar(snackbarData = snackbarData) }
+            )
+        },
         content = {
             content(
                 Modifier.fillMaxSize()

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

@@ -2,6 +2,7 @@
 
 package net.mullvad.mullvadvpn.compose.screen
 
+import android.os.Build
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -14,6 +15,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -24,16 +26,19 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.popUpTo
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.NavGraphs
 import net.mullvad.mullvadvpn.compose.button.ExternalButton
@@ -94,6 +99,7 @@ fun Account(navigator: DestinationsNavigator) {
                 popUpTo(NavGraphs.root) { inclusive = true }
             }
         },
+        onCopyAccountNumber = vm::onCopyAccountNumber,
         onBackClick = { navigator.navigateUp() }
     )
 }
@@ -103,6 +109,7 @@ fun Account(navigator: DestinationsNavigator) {
 fun AccountScreen(
     uiState: AccountUiState,
     uiSideEffect: SharedFlow<AccountViewModel.UiSideEffect>,
+    onCopyAccountNumber: (String) -> Unit = {},
     onRedeemVoucherClick: () -> Unit = {},
     onManageAccountClick: () -> Unit = {},
     onLogoutClick: () -> Unit = {},
@@ -118,14 +125,25 @@ fun AccountScreen(
     }
 
     val context = LocalContext.current
+    val clipboardManager = LocalClipboardManager.current
+    val snackbarHostState = remember { SnackbarHostState() }
+    val copyTextString = stringResource(id = R.string.copied_mullvad_account_number)
     LaunchedEffect(Unit) {
         uiSideEffect.collect { uiSideEffect ->
             when (uiSideEffect) {
                 AccountViewModel.UiSideEffect.NavigateToLogin -> navigateToLogin()
                 is AccountViewModel.UiSideEffect.OpenAccountManagementPageInBrowser ->
                     context.openAccountPageInBrowser(uiSideEffect.token)
+                is AccountViewModel.UiSideEffect.CopyAccountNumber ->
+                    launch {
+                        clipboardManager.setText(AnnotatedString(uiSideEffect.accountNumber))
+
+                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+                            snackbarHostState.currentSnackbarData?.dismiss()
+                            snackbarHostState.showSnackbar(message = copyTextString)
+                        }
+                    }
             }
-            if (uiSideEffect is AccountViewModel.UiSideEffect.OpenAccountManagementPageInBrowser) {}
         }
     }
 
@@ -140,7 +158,7 @@ fun AccountScreen(
         ) {
             DeviceNameRow(deviceName = uiState.deviceName ?: "") { showDeviceNameInfoDialog = true }
 
-            AccountNumberRow(accountNumber = uiState.accountNumber ?: "")
+            AccountNumberRow(accountNumber = uiState.accountNumber ?: "", onCopyAccountNumber)
 
             PaidUntilRow(accountExpiry = uiState.accountExpiry)
 
@@ -192,14 +210,15 @@ private fun DeviceNameRow(deviceName: String, onInfoClick: () -> Unit) {
 }
 
 @Composable
-private fun AccountNumberRow(accountNumber: String) {
+private fun AccountNumberRow(accountNumber: String, onCopyAccountNumber: (String) -> Unit) {
     Column(modifier = Modifier.fillMaxWidth()) {
         Text(
             style = MaterialTheme.typography.labelMedium,
             text = stringResource(id = R.string.account_number),
         )
         CopyableObfuscationView(
             content = accountNumber,
+            onCopyClicked = { onCopyAccountNumber(accountNumber) },
             modifier = Modifier.heightIn(min = Dimens.accountRowMinHeight).fillMaxWidth()
         )
     }

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

@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.compose.screen
 
-import android.widget.Toast
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -11,18 +10,19 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.Divider
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
@@ -36,7 +36,7 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.cell.BaseCell
 import net.mullvad.mullvadvpn.compose.cell.ContentBlockersDisableModeCellSubtitle
@@ -85,6 +85,7 @@ import net.mullvad.mullvadvpn.util.hasValue
 import net.mullvad.mullvadvpn.util.isCustom
 import net.mullvad.mullvadvpn.util.toDisplayCustomPort
 import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem
+import net.mullvad.mullvadvpn.viewmodel.VpnSettingsSideEffect
 import net.mullvad.mullvadvpn.viewmodel.VpnSettingsViewModel
 import org.koin.androidx.compose.koinViewModel
 
@@ -100,6 +101,7 @@ private fun PreviewVpnSettings() {
                     isCustomDnsEnabled = true,
                     customDnsItems = listOf(CustomDnsItem("0.0.0.0", false)),
                 ),
+            sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
             onMtuCellClick = {},
             onSaveMtuClick = {},
             onRestoreMtuClick = {},
@@ -124,7 +126,6 @@ private fun PreviewVpnSettings() {
             onCustomDnsInfoClick = {},
             onDismissInfoClick = {},
             onBackClick = {},
-            toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow(),
             onStopEvent = {},
             onSelectObfuscationSetting = {},
             onObfuscationInfoClick = {},
@@ -147,6 +148,7 @@ fun VpnSettings(navigator: DestinationsNavigator) {
     val state = vm.uiState.collectAsState().value
     VpnSettingsScreen(
         uiState = state,
+        sideEffect = vm.sideEffect,
         onMtuCellClick = vm::onMtuCellClick,
         onSaveMtuClick = vm::onSaveMtuClick,
         onRestoreMtuClick = vm::onRestoreMtuClick,
@@ -172,7 +174,6 @@ fun VpnSettings(navigator: DestinationsNavigator) {
         onDismissInfoClick = vm::onDismissInfoClick,
         onBackClick = navigator::navigateUp,
         onStopEvent = vm::onStopEvent,
-        toastMessagesSharedFlow = vm.toastMessages,
         onSelectObfuscationSetting = vm::onSelectObfuscationSetting,
         onObfuscationInfoClick = vm::onObfuscationInfoClick,
         onSelectQuantumResistanceSetting = vm::onSelectQuantumResistanceSetting,
@@ -190,6 +191,7 @@ fun VpnSettings(navigator: DestinationsNavigator) {
 fun VpnSettingsScreen(
     lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current,
     uiState: VpnSettingsUiState,
+    sideEffect: SharedFlow<VpnSettingsSideEffect>,
     onMtuCellClick: () -> Unit = {},
     onSaveMtuClick: (Int) -> Unit = {},
     onRestoreMtuClick: () -> Unit = {},
@@ -215,7 +217,6 @@ fun VpnSettingsScreen(
     onDismissInfoClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
     onStopEvent: () -> Unit = {},
-    toastMessagesSharedFlow: SharedFlow<String>,
     onSelectObfuscationSetting: (selectedObfuscation: SelectedObfuscation) -> Unit = {},
     onObfuscationInfoClick: () -> Unit = {},
     onSelectQuantumResistanceSetting: (quantumResistant: QuantumResistantState) -> Unit = {},
@@ -228,6 +229,19 @@ fun VpnSettingsScreen(
 ) {
     val savedCustomPort = rememberSaveable { mutableStateOf<Constraint<Port>>(Constraint.Any()) }
 
+    val snackbarHostState = remember { SnackbarHostState() }
+    LaunchedEffect(Unit) {
+        sideEffect.collect {
+            when (it) {
+                is VpnSettingsSideEffect.ShowToast ->
+                    launch {
+                        snackbarHostState.currentSnackbarData?.dismiss()
+                        snackbarHostState.showSnackbar(message = it.message)
+                    }
+            }
+        }
+    }
+
     when (val dialog = uiState.dialog) {
         is VpnSettingsDialog.Mtu -> {
             MtuDialog(
@@ -301,12 +315,6 @@ fun VpnSettingsScreen(
         }
     }
 
-    val context = LocalContext.current
-    LaunchedEffect(Unit) {
-        toastMessagesSharedFlow.distinctUntilChanged().collect { message ->
-            Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
-        }
-    }
     DisposableEffect(lifecycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_STOP) {
@@ -319,6 +327,7 @@ fun VpnSettingsScreen(
     ScaffoldWithMediumTopBar(
         appBarTitle = stringResource(id = R.string.settings_vpn),
         navigationIcon = { NavigateBackIconButton(onBackClick) },
+        snackbarHostState = snackbarHostState
     ) { modifier, lazyListState ->
         LazyColumn(
             modifier = modifier.testTag(LAZY_LIST_TEST_TAG).animateContentSize(),

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModel.kt

@@ -56,10 +56,16 @@ class AccountViewModel(
         viewModelScope.launch { _uiSideEffect.emit(UiSideEffect.NavigateToLogin) }
     }
 
+    fun onCopyAccountNumber(accountNumber: String) {
+        viewModelScope.launch { _uiSideEffect.emit(UiSideEffect.CopyAccountNumber(accountNumber)) }
+    }
+
     sealed class UiSideEffect {
         data object NavigateToLogin : UiSideEffect()
 
         data class OpenAccountManagementPageInBrowser(val token: String) : UiSideEffect()
+
+        data class CopyAccountNumber(val accountNumber: String) : UiSideEffect()
     }
 }
 

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt

@@ -35,6 +35,10 @@ import net.mullvad.mullvadvpn.usecase.RelayListUseCase
 import net.mullvad.mullvadvpn.util.isValidMtu
 import org.apache.commons.validator.routines.InetAddressValidator
 
+sealed interface VpnSettingsSideEffect {
+    data class ShowToast(val message: String): VpnSettingsSideEffect
+}
+
 class VpnSettingsViewModel(
     private val repository: SettingsRepository,
     private val inetAddressValidator: InetAddressValidator,
@@ -44,9 +48,8 @@ class VpnSettingsViewModel(
     private val dispatcher: CoroutineDispatcher = Dispatchers.IO
 ) : ViewModel() {
 
-    private val _toastMessages = MutableSharedFlow<String>(extraBufferCapacity = 1)
-    @Suppress("konsist.ensure public properties use permitted names")
-    val toastMessages = _toastMessages.asSharedFlow()
+    private val _sideEffect = MutableSharedFlow<VpnSettingsSideEffect>(extraBufferCapacity = 1)
+    val sideEffect = _sideEffect.asSharedFlow()
 
     private val dialogState = MutableStateFlow<VpnSettingsDialogState?>(null)
 
@@ -236,6 +239,7 @@ class VpnSettingsViewModel(
         if (isEnabled && vmState.value.customDnsList.isEmpty()) {
             onDnsClick(null)
         }
+        Log.d("VPNSettings", "Toggle dns")
         showApplySettingChangesWarningToast()
     }
 
@@ -431,7 +435,10 @@ class VpnSettingsViewModel(
     }
 
     private fun showApplySettingChangesWarningToast() {
-        _toastMessages.tryEmit(resources.getString(R.string.settings_changes_effect_warning_short))
+        Log.d("VPNSettings", "SHOWING TOAST")
+        viewModelScope.launch {
+            _sideEffect.emit(VpnSettingsSideEffect.ShowToast(resources.getString(R.string.settings_changes_effect_warning_short)))
+        }
     }
 
     companion object {