|
@@ -54,9 +54,13 @@ class SearchListViewModel constructor(
|
|
|
private var _isActive = MutableLiveData<Boolean>(false)
|
|
|
var isActive: LiveData<Boolean> = _isActive
|
|
|
val basePreferenceHelper = BasePreferenceHelper(context)
|
|
|
+
|
|
|
private var _countriesList = MutableLiveData<ArrayList<Server>>(getCountries(""))
|
|
|
var countriesList: LiveData<ArrayList<Server>> = _countriesList
|
|
|
|
|
|
+ private var _countriesListSettings = MutableLiveData<ArrayList<Server>>(getCountries("settings_screen"))
|
|
|
+ var countriesListSettings: LiveData<ArrayList<Server>> = _countriesListSettings
|
|
|
+
|
|
|
fun searchTextChange(text: String) {
|
|
|
// _searchText.value = text
|
|
|
getCountries(text, true)
|
|
@@ -64,10 +68,10 @@ class SearchListViewModel constructor(
|
|
|
}
|
|
|
|
|
|
|
|
|
- suspend fun isActiveChange(state: Boolean) {
|
|
|
+ suspend fun isActiveChange(state: Boolean, isFromSettings: Boolean = false) {
|
|
|
_isActive.value = state
|
|
|
if (_isActive.value == false) {
|
|
|
- searchTextChange("")
|
|
|
+ if (isFromSettings) searchTextChange("settings_screen") else searchTextChange("")
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -110,18 +114,22 @@ class SearchListViewModel constructor(
|
|
|
}
|
|
|
|
|
|
filtersArray = if (text == ""){
|
|
|
-// if (isFromSettings) searchServersList else emptyArray
|
|
|
emptyArray
|
|
|
} else {
|
|
|
if (serversArray.size > 0) {
|
|
|
serversArray
|
|
|
- } else {
|
|
|
+ }
|
|
|
+ else if (text == "settings_screen") {
|
|
|
+ searchServersList
|
|
|
+ }
|
|
|
+ else {
|
|
|
emptyArray
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (isReturn) {
|
|
|
_countriesList.value = filtersArray
|
|
|
+ _countriesListSettings.value = filtersArray
|
|
|
}
|
|
|
|
|
|
Log.d("test_search","GC_" + filtersArray.size.toString())
|