|
@@ -52,6 +52,7 @@ import androidx.navigation.NavHostController
|
|
|
import com.vpn.fastestvpnservice.R
|
|
|
import com.vpn.fastestvpnservice.beans.Server
|
|
|
import com.vpn.fastestvpnservice.beans.toChangeServer
|
|
|
+import com.vpn.fastestvpnservice.constants.AppEnum
|
|
|
import com.vpn.fastestvpnservice.constants.smartConnect
|
|
|
import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
|
|
|
import com.vpn.fastestvpnservice.navigation.isFirstItemFocused
|
|
@@ -94,6 +95,14 @@ fun ServerItemTV(
|
|
|
// else Utils.getDrawableGray(context, server.iso)
|
|
|
|
|
|
val icon = Utils.getDrawable(context, server.iso)
|
|
|
+ var isFreeAccount: Boolean = false
|
|
|
+ basePreferenceHelper.getProduct()?.identifier?.let {
|
|
|
+ isFreeAccount = if (it == AppEnum.FREE.key) {
|
|
|
+ true
|
|
|
+ } else {
|
|
|
+ false
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
if (isServerClicked) {
|
|
|
Log.d("ServerCallbacks", "isServerClicked $isServerClicked")
|
|
@@ -144,7 +153,7 @@ fun ServerItemTV(
|
|
|
indication = null,
|
|
|
interactionSource = remember { MutableInteractionSource() }
|
|
|
) {
|
|
|
- if (server.enable == 1) {
|
|
|
+ if (!isFreeAccount) {
|
|
|
if (toChangeServer.value) {
|
|
|
basePreferenceHelper.saveSmartList(smartConnect[2])
|
|
|
basePreferenceHelper.setSmartServerObject(server)
|
|
@@ -174,7 +183,7 @@ fun ServerItemTV(
|
|
|
|
|
|
|
|
|
Text(
|
|
|
- text = "${server.server_name}",
|
|
|
+ text = "${server.server_name} ${server.enable}",
|
|
|
style = MaterialTheme.typography.labelMedium,
|
|
|
color = MaterialTheme.colorScheme.primary,
|
|
|
modifier = Modifier
|
|
@@ -267,6 +276,14 @@ fun SearchServerItemTV(
|
|
|
// else Utils.getDrawableGray(context, server.iso)
|
|
|
|
|
|
val icon = Utils.getDrawable(context, server.iso)
|
|
|
+ var isFreeAccount: Boolean = false
|
|
|
+ basePreferenceHelper.getProduct()?.identifier?.let {
|
|
|
+ isFreeAccount = if (it == AppEnum.FREE.key) {
|
|
|
+ true
|
|
|
+ } else {
|
|
|
+ false
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
Row(
|
|
|
verticalAlignment = Alignment.Top,
|
|
@@ -282,18 +299,19 @@ fun SearchServerItemTV(
|
|
|
indication = null,
|
|
|
interactionSource = remember { MutableInteractionSource() }
|
|
|
) {
|
|
|
- if (server.enable == 1) {
|
|
|
+ if (!isFreeAccount) {
|
|
|
basePreferenceHelper.saveSmartList(smartConnect[2])
|
|
|
basePreferenceHelper.setSmartServerObject(server)
|
|
|
navHostController.popBackStack()
|
|
|
// isFavServerClicked = true
|
|
|
- } else {
|
|
|
+ }
|
|
|
+// else {
|
|
|
// basePreferenceHelper.setSubscriptionServerObject(server)
|
|
|
// Screen.Subscription.isTrue = true
|
|
|
// navHostController.navigate(
|
|
|
// Screen.Subscription.route
|
|
|
// )
|
|
|
- }
|
|
|
+// }
|
|
|
}
|
|
|
) {
|
|
|
if (icon != 0) {
|
|
@@ -418,6 +436,14 @@ fun FavoriteServerItemTV(
|
|
|
// else Utils.getDrawableGray(context, server.iso)
|
|
|
|
|
|
val icon = Utils.getDrawable(context, server.iso)
|
|
|
+ var isFreeAccount: Boolean = false
|
|
|
+ basePreferenceHelper.getProduct()?.identifier?.let {
|
|
|
+ isFreeAccount = if (it == AppEnum.FREE.key) {
|
|
|
+ true
|
|
|
+ } else {
|
|
|
+ false
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
Row(
|
|
|
verticalAlignment = Alignment.Top,
|
|
@@ -433,15 +459,16 @@ fun FavoriteServerItemTV(
|
|
|
indication = null,
|
|
|
interactionSource = remember { MutableInteractionSource() }
|
|
|
) {
|
|
|
- if (server.enable == 1) {
|
|
|
+ if (!isFreeAccount) {
|
|
|
isFavServerClicked = true
|
|
|
- } else {
|
|
|
+ }
|
|
|
+// else {
|
|
|
// basePreferenceHelper.setSubscriptionServerObject(server)
|
|
|
// Screen.Subscription.isTrue = true
|
|
|
// navHostController.navigate(
|
|
|
// Screen.Subscription.route
|
|
|
// )
|
|
|
- }
|
|
|
+// }
|
|
|
}
|
|
|
) {
|
|
|
// var ping by rememberSaveable { mutableIntStateOf(0) }
|