浏览代码

hide filter icon when searching on serverlist screen

Khubaib 11 月之前
父节点
当前提交
9bd774145f

+ 2 - 2
.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-06-03T15:23:28.987469254Z">
+        <DropdownSelection timestamp="2024-06-07T09:28:22.011908881Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=1C051FDF60048Z" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/home/ubuntu/.android/avd/Small_Phone_API_27.avd" />
             </handle>
           </Target>
         </DropdownSelection>

+ 10 - 26
app/src/main/java/com/vpn/fastestvpnservice/screens/ServerListScreen.kt

@@ -683,24 +683,6 @@ fun ColumnScope.ShowAllLocationsList(
         }
     }
 }
-
-fun CalculatePing(server: Server, onPingResult: (Int) -> Unit) {
-    Ping.onAddress(server.ip as String).setTimeOutMillis(1000).doPing(
-        object : Ping.PingListener{
-            override fun onResult(pingResult: PingResult?) {
-                android.os.Handler(Looper.getMainLooper()).post {
-                    val ping = pingResult?.timeTaken?.toInt()!!
-                    onPingResult(ping)
-                    Log.d("test_ping", "ping[0] = $ping")
-                    Log.d("test_ping_stream", "calculatePing: ${ping}")
-                }
-            }
-            override fun onError(e: java.lang.Exception?) {}
-            override fun onFinished(pingStats: PingStats?) {}
-        }
-    )
-}
-
 @Composable
 fun ColumnScope.ShowHeaderItem(
     serverTitle: String,
@@ -832,14 +814,16 @@ fun ColumnScope.ShowSearchBar(
             )
         },
         trailingIcon = {
-            IconButton(onClick = { isFilter = true }) {
-                Icon(
-                    painter = painterResource(id = R.drawable.filter3x),
-                    contentDescription = "Search Icon",
-                    tint = MaterialTheme.colorScheme.primary,
-                    modifier = Modifier
-                        .size(24.dp)
-                )
+            if (!isActive) {
+                IconButton(onClick = { isFilter = true }) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.filter3x),
+                        contentDescription = "Search Icon",
+                        tint = MaterialTheme.colorScheme.primary,
+                        modifier = Modifier
+                            .size(24.dp)
+                    )
+                }
             }
         },
         colors = SearchBarDefaults.colors(

+ 0 - 19
app/src/main/java/com/vpn/fastestvpnservice/viewmodels/SearchListViewModel.kt

@@ -2,37 +2,18 @@ package com.vpn.fastestvpnservice.viewmodels
 
 import android.content.Context
 import android.util.Log
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import com.vpn.fastestvpnservice.beans.Server
-import com.vpn.fastestvpnservice.beans.ServerData
 import com.vpn.fastestvpnservice.beans.ServerResponse
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
-import com.vpn.fastestvpnservice.retrofit.RetrofitNetworkHandling
-import com.vpn.fastestvpnservice.retrofit.WebServiceFactory
-import com.vpn.fastestvpnservice.screens.CalculatePing
 import com.vpn.fastestvpnservice.screens.serverListViewModelSplash
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.launch
-import retrofit2.Call
 
 class SearchListViewModel constructor(
     context: Context,

+ 0 - 1
app/src/main/java/com/vpn/fastestvpnservice/viewmodels/ServerListViewModel.kt

@@ -21,7 +21,6 @@ import com.vpn.fastestvpnservice.beans.ServerResponse
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import com.vpn.fastestvpnservice.retrofit.RetrofitNetworkHandling
 import com.vpn.fastestvpnservice.retrofit.WebServiceFactory
-import com.vpn.fastestvpnservice.screens.CalculatePing
 import com.vpn.fastestvpnservice.screens.isAlphabetList
 import com.vpn.fastestvpnservice.screens.recommendedListFinalGlobal
 import com.vpn.fastestvpnservice.screens.recommendedListGlobal