|
@@ -69,6 +69,7 @@ import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
|
|
|
import com.vpn.fastestvpnservice.helpers.UIHelper
|
|
|
import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.onServer
|
|
|
import com.vpn.fastestvpnservice.sealedClass.BottomBarScreen
|
|
|
+import com.vpn.fastestvpnservice.sealedClass.Screen
|
|
|
import com.vpn.fastestvpnservice.utils.Utils
|
|
|
import com.vpn.fastestvpnservice.viewmodels.HomeViewModel
|
|
|
import com.vpn.fastestvpnservice.viewmodels.SearchListViewModel
|
|
@@ -124,8 +125,15 @@ fun ServerItem(server: Server, navHostController: NavHostController, serverPing:
|
|
|
indication = null,
|
|
|
interactionSource = remember { MutableInteractionSource() }
|
|
|
) {
|
|
|
- basePreferenceHelper.setServerObject(server)
|
|
|
- isServerClicked = true
|
|
|
+ if (server.enable == 1) {
|
|
|
+ basePreferenceHelper.setServerObject(server)
|
|
|
+ isServerClicked = true
|
|
|
+ } else {
|
|
|
+ navHostController.navigate(
|
|
|
+ Screen.Subscription.route
|
|
|
+ )
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
) {
|
|
|
var ping by remember { mutableIntStateOf(0) }
|
|
@@ -258,15 +266,13 @@ fun FavoriteServerItem(server: Server, navHostController: NavHostController) {
|
|
|
indication = null,
|
|
|
interactionSource = remember { MutableInteractionSource() }
|
|
|
) {
|
|
|
-// Toast
|
|
|
-// .makeText(
|
|
|
-// context, server.server_name, Toast.LENGTH_SHORT
|
|
|
-// )
|
|
|
-// .show()
|
|
|
-// basePreferenceHelper.setServerObject(server)
|
|
|
- isFavServerClicked = true
|
|
|
-
|
|
|
-// navHostController.popBackStack()
|
|
|
+ if (server.enable == 1) {
|
|
|
+ isFavServerClicked = true
|
|
|
+ } else {
|
|
|
+ navHostController.navigate(
|
|
|
+ Screen.Subscription.route
|
|
|
+ )
|
|
|
+ }
|
|
|
}
|
|
|
) {
|
|
|
var ping by remember { mutableIntStateOf(0) }
|
|
@@ -417,12 +423,20 @@ fun ServerSearchItem(
|
|
|
indication = null,
|
|
|
interactionSource = remember { MutableInteractionSource() }
|
|
|
) {
|
|
|
- basePreferenceHelper.setServerObject(server)
|
|
|
- isSearchServerClicked = isServerCallbackShown
|
|
|
+ if (server.enable == 1) {
|
|
|
+ basePreferenceHelper.setServerObject(server)
|
|
|
+ isSearchServerClicked = isServerCallbackShown
|
|
|
|
|
|
- if (!isServerCallbackShown) {
|
|
|
- onServerDisable()
|
|
|
+ if (!isServerCallbackShown) {
|
|
|
+ onServerDisable()
|
|
|
+ }
|
|
|
}
|
|
|
+ else {
|
|
|
+ navHostController.navigate(
|
|
|
+ Screen.Subscription.route
|
|
|
+ )
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
) {
|
|
|
var ping by remember { mutableIntStateOf(0) }
|
|
@@ -543,8 +557,14 @@ fun ServerSpecificItem(
|
|
|
indication = null,
|
|
|
interactionSource = remember { MutableInteractionSource() }
|
|
|
) {
|
|
|
- basePreferenceHelper.setServerObject(server)
|
|
|
- onServerDisable()
|
|
|
+ if (server.enable == 1) {
|
|
|
+ basePreferenceHelper.setServerObject(server)
|
|
|
+ onServerDisable()
|
|
|
+ } else {
|
|
|
+ navHostController.navigate(
|
|
|
+ Screen.Subscription.route
|
|
|
+ )
|
|
|
+ }
|
|
|
}
|
|
|
) {
|
|
|
val icon = if (server.enable == 1) Utils.getDrawable(context, server.iso)
|