فهرست منبع

Created vpnconnectionutils object on settings screen for TV and used for adblock state when connected

Khubaib 11 ماه پیش
والد
کامیت
c3b55b7a02
2فایلهای تغییر یافته به همراه10 افزوده شده و 10 حذف شده
  1. 1 1
      .idea/deploymentTargetSelector.xml
  2. 9 9
      app/src/main/java/com/vpn/fastestvpnservice/screensTV/SettingsScreenTV.kt

+ 1 - 1
.idea/deploymentTargetSelector.xml

@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-08-08T13:23:58.990445904Z">
+        <DropdownSelection timestamp="2024-08-08T13:38:22.898215760Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="LocalEmulator" identifier="path=/home/ubuntu/.android/avd/Television_1080p_API_31.avd" />

+ 9 - 9
app/src/main/java/com/vpn/fastestvpnservice/screensTV/SettingsScreenTV.kt

@@ -3,11 +3,9 @@ package com.vpn.fastestvpnservice.screensTV
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.util.Log
-import android.widget.Toast
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
@@ -96,7 +94,6 @@ import com.vpn.fastestvpnservice.constants.AppEnum
 import com.vpn.fastestvpnservice.constants.smartConnect
 import com.vpn.fastestvpnservice.customItems.ServerSpecificItem
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
-import com.vpn.fastestvpnservice.navigation.customNavigation
 import com.vpn.fastestvpnservice.navigation.isFirstItemPressed
 import com.vpn.fastestvpnservice.navigation.isSecondItemFocused
 import com.vpn.fastestvpnservice.navigation.isSecondItemPressed
@@ -104,13 +101,11 @@ import com.vpn.fastestvpnservice.navigation.isSettingsScreenPressed
 import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.AddTextSettings
 import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.getAvailableProtocols
 import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.navHostController1
-import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.onServer
-import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.vpnConnectionsUtil
 import com.vpn.fastestvpnservice.screens.searchListViewModelSplash
 import com.vpn.fastestvpnservice.screens.serverListViewModelSplash
 import com.vpn.fastestvpnservice.sealedClass.BottomBarScreen
-import com.vpn.fastestvpnservice.sealedClass.Screen
 import com.vpn.fastestvpnservice.sealedClass.ScreenTV
+import com.vpn.fastestvpnservice.utils.VPNConnectionsUtil
 import com.vpn.fastestvpnservice.utils.isTablet
 import com.vpn.fastestvpnservice.viewmodels.HomeViewModel
 import com.vpn.fastestvpnservice.viewmodels.ServerListViewModel
@@ -128,6 +123,11 @@ fun SettingsTV(navHostController: NavHostController) {
     val focusRequester4 = remember { FocusRequester() }
     val focusRequester5 = remember { FocusRequester() }
     val focusRequesterProtocol = remember { FocusRequester() }
+    val scope = rememberCoroutineScope()
+    val homeViewModel: HomeViewModel = viewModel{
+        HomeViewModel(context, scope)
+    }
+    val vpnConnectionsUtil = VPNConnectionsUtil(context, activityGlobal, homeViewModel)
 
 
     if (isSettingsScreenPressed.value) {
@@ -214,7 +214,8 @@ fun SettingsTV(navHostController: NavHostController) {
                 AddRowSwitchTV(
                     icon = R.drawable.adblock3x,
                     text = "AdBlock",
-                    focusRequester3
+                    focusRequester3,
+                    vpnConnectionsUtil
                 )
 //                AddRowSettingsTV(
 //                    icon = R.drawable.kill_switch3x,
@@ -372,7 +373,7 @@ fun ColumnScope.AddTextSettingsTV(
 }
 
 @Composable
-fun ColumnScope.AddRowSwitchTV(icon: Int, text: String, focusRequester3: FocusRequester) {
+fun ColumnScope.AddRowSwitchTV(icon: Int, text: String, focusRequester3: FocusRequester, vpnConnectionsUtil: VPNConnectionsUtil) {
     val context = LocalContext.current
     val basePreferenceHelper = BasePreferenceHelper(context)
     var isRowFocused by remember { mutableStateOf(false) }
@@ -439,7 +440,6 @@ fun ColumnScope.AddRowSwitchTV(icon: Int, text: String, focusRequester3: FocusRe
         }
         Spacer(modifier = Modifier.weight(1f))
 
-//        val vpnConnectionsUtil = VPNConnectionsUtil(context, act, homeViewModel)
 
         Surface(
             modifier = Modifier