From 302239d1917c5aac2c9dc9f6d72eab1e027d8177 Mon Sep 17 00:00:00 2001 From: sathwikcs <85106054+sathwikcs@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:50:14 +0530 Subject: [PATCH] Network Checker updated in TestRightViewModel --- .../presentation/testRight/TestRightViewModel.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt index 700f7f9..29a4cf4 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt @@ -19,7 +19,6 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.example.hpostesting.data.constant.DataHolder -import com.example.hpostesting.util.NetworkStatusLiveData import com.example.hpostesting.data.constant.Constants import com.example.hpostesting.data.dao.UserDao import com.example.hpostesting.data.model.CalculationVariableForTest @@ -36,6 +35,7 @@ import com.example.hpostesting.domain.SaveRawDataTest import com.example.hpostesting.domain.SickleFindResultCaluculationWithMaxImpl import com.example.hpostesting.domain.TestRightResultCalculation import com.example.hpostesting.util.MyUtils +import com.example.hpostesting.util.NetworkMonitor import com.google.firebase.storage.FirebaseStorage import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch @@ -55,10 +55,10 @@ class TestRightViewModel @Inject constructor( private val saveRawDataTest: SaveRawDataTest, private val repository: DatabaseRepository, private val userDao: UserDao, + networkMonitor: NetworkMonitor, context: Context? ) : ViewModel() { - var isServiceConnected = false val progressBar = MutableLiveData(false) @@ -69,9 +69,8 @@ class TestRightViewModel @Inject constructor( var testDetails = DataHolder.selectedTest - private val _networkStatusLiveData = context?.let { NetworkStatusLiveData(it) } - val networkStatusLiveData: NetworkStatusLiveData? - get() = _networkStatusLiveData + private var _networkStatusLiveData = networkMonitor.isConnected + val networkStatusLiveData = _networkStatusLiveData val allUserData = userDao.getAll() @@ -82,6 +81,11 @@ class TestRightViewModel @Inject constructor( val calculationVariableList = ArrayList() + init { + networkMonitor.startMonitoring() + _networkStatusLiveData = networkMonitor.isConnected + } + fun mapDeviceConstants(string: String) { if (string.isNotEmpty()) { val listOfStrings = string.split(",")