|
@@ -34,8 +34,10 @@ import androidx.compose.material.icons.filled.NetworkCell
|
|
import androidx.compose.material.icons.filled.Wifi
|
|
import androidx.compose.material.icons.filled.Wifi
|
|
import androidx.compose.material3.MaterialTheme
|
|
import androidx.compose.material3.MaterialTheme
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.runtime.Composable
|
|
|
|
+import androidx.compose.runtime.LaunchedEffect
|
|
import androidx.compose.runtime.MutableState
|
|
import androidx.compose.runtime.MutableState
|
|
import androidx.compose.runtime.getValue
|
|
import androidx.compose.runtime.getValue
|
|
|
|
+import androidx.compose.runtime.livedata.observeAsState
|
|
import androidx.compose.runtime.mutableStateOf
|
|
import androidx.compose.runtime.mutableStateOf
|
|
import androidx.compose.runtime.remember
|
|
import androidx.compose.runtime.remember
|
|
import androidx.compose.runtime.saveable.rememberSaveable
|
|
import androidx.compose.runtime.saveable.rememberSaveable
|
|
@@ -55,6 +57,7 @@ import androidx.compose.ui.res.colorResource
|
|
import androidx.compose.ui.res.painterResource
|
|
import androidx.compose.ui.res.painterResource
|
|
import androidx.compose.ui.text.style.TextOverflow
|
|
import androidx.compose.ui.text.style.TextOverflow
|
|
import androidx.compose.ui.unit.dp
|
|
import androidx.compose.ui.unit.dp
|
|
|
|
+import androidx.lifecycle.viewmodel.compose.viewModel
|
|
import androidx.navigation.NavHostController
|
|
import androidx.navigation.NavHostController
|
|
import com.vpn.fastestvpnservice.R
|
|
import com.vpn.fastestvpnservice.R
|
|
import com.vpn.fastestvpnservice.beans.toChangeServer
|
|
import com.vpn.fastestvpnservice.beans.toChangeServer
|
|
@@ -65,6 +68,7 @@ import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.onServer
|
|
import com.vpn.fastestvpnservice.screens.serverListViewModelSplash
|
|
import com.vpn.fastestvpnservice.screens.serverListViewModelSplash
|
|
import com.vpn.fastestvpnservice.sealedClass.Screen
|
|
import com.vpn.fastestvpnservice.sealedClass.Screen
|
|
import com.vpn.fastestvpnservice.utils.Utils
|
|
import com.vpn.fastestvpnservice.utils.Utils
|
|
|
|
+import com.vpn.fastestvpnservice.viewmodels.SettingsViewModel
|
|
|
|
|
|
var selectedSmart: MutableState<String> = mutableStateOf("")
|
|
var selectedSmart: MutableState<String> = mutableStateOf("")
|
|
|
|
|
|
@@ -75,6 +79,15 @@ fun AutoConnectScreen(navHostController: NavHostController) {
|
|
selectedSmart.value = basePreferenceHelper.getSmartList()
|
|
selectedSmart.value = basePreferenceHelper.getSmartList()
|
|
var isAdded by rememberSaveable { mutableStateOf(false) }
|
|
var isAdded by rememberSaveable { mutableStateOf(false) }
|
|
var isAddedWifi by rememberSaveable { mutableStateOf(false) }
|
|
var isAddedWifi by rememberSaveable { mutableStateOf(false) }
|
|
|
|
+ val settingsViewModel = viewModel() {
|
|
|
|
+ SettingsViewModel(context = context)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ LaunchedEffect(key1 = Unit) {
|
|
|
|
+ settingsViewModel.getConnectedWifi()
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ val connectedWifiSsid = settingsViewModel.liveDataConnectedWifi.observeAsState().value
|
|
|
|
|
|
Box(
|
|
Box(
|
|
modifier = Modifier
|
|
modifier = Modifier
|
|
@@ -299,7 +312,7 @@ fun AutoConnectScreen(navHostController: NavHostController) {
|
|
color = Color.Transparent
|
|
color = Color.Transparent
|
|
) {
|
|
) {
|
|
Text(
|
|
Text(
|
|
- text = "Wifi",
|
|
|
|
|
|
+ text = connectedWifiSsid ?: "",
|
|
style = MaterialTheme.typography.labelMedium,
|
|
style = MaterialTheme.typography.labelMedium,
|
|
color = colorResource(id = R.color.gray_icon),
|
|
color = colorResource(id = R.color.gray_icon),
|
|
maxLines = 1,
|
|
maxLines = 1,
|