Skip to content

Commit

Permalink
working
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rawa
Rawa committed Jul 23, 2024
1 parent b74015d commit d285960
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 94 deletions.
39 changes: 19 additions & 20 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListExtensions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,33 @@ fun List<RelayItem.Location.Country>.findByGeoLocationId(geoLocationId: GeoLocat
fun List<RelayItem.Location.Country>.findByGeoLocationId(geoLocationId: GeoLocationId.City) =
flatMap { it.cities }.firstOrNull { it.id == geoLocationId }

fun List<RelayItem.Location.Country>.newFilterOnSearch(searchTerm: String): Pair<Set<GeoLocationId>, List<RelayItem.Location.Country>> {
fun List<RelayItem.Location.Country>.newFilterOnSearch(
searchTerm: String
): Pair<Set<GeoLocationId>, List<RelayItem.Location.Country>> {
val matchesIds =
withDescendants().filter { it.name.contains(searchTerm, ignoreCase = true) }.map { it.id }

val expansionSet = matchesIds.flatMap { it.parents() }.toSet()
Logger.d("Expansion Set: $expansionSet")

val filteredCountryList = filter { it.id in expansionSet || it.id in matchesIds }
.map {
it.copy(
val filteredCountryList = mapNotNull { country ->
if (country.id in matchesIds) {
country
} else if (country.id in expansionSet) {
country.copy(
cities =
it.cities
.filter {
it.id in expansionSet ||
it.id in matchesIds ||
it.id.country in matchesIds
}
.map {
it.copy(
relays =
it.relays.filter {
it.id in expansionSet ||
it.id in matchesIds ||
it.id.city in matchesIds ||
it.id.country in matchesIds
})
})
country.cities.mapNotNull { city ->
if (city.id in matchesIds) {
city
} else if (city.id in expansionSet) {
city.copy(
relays = city.relays.filter { relay -> relay.id in matchesIds })
} else null
})
} else {
null
}
}
return expansionSet to filteredCountryList
}

Expand Down
159 changes: 85 additions & 74 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import arrow.core.raise.either
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.flow.update
Expand Down Expand Up @@ -45,7 +47,7 @@ class SelectLocationViewModel(
customListsRelayItemUseCase: CustomListsRelayItemUseCase,
private val customListsRepository: CustomListsRepository,
private val customListActionUseCase: CustomListActionUseCase,
filteredRelayListUseCase: FilteredRelayListUseCase,
private val filteredRelayListUseCase: FilteredRelayListUseCase,
private val relayListRepository: RelayListRepository
) : ViewModel() {
private val _searchTerm = MutableStateFlow(EMPTY_SEARCH_TERM)
Expand All @@ -62,18 +64,31 @@ class SelectLocationViewModel(
}

private val _expandedItems = MutableStateFlow(initialExpand())
private val _searchExpandedItems = MutableStateFlow(setOf<String>())
private val _searchCollapsedItems = MutableStateFlow(setOf<String>())

fun searchRelayListLocations() =
kotlinx.coroutines.flow
.combine(
_searchTerm,
filteredRelayListUseCase(),
) { searchTerm, relayCountries ->
val isSearching = searchTerm.length >= MIN_SEARCH_LENGTH
if (isSearching) {
val (exp, filteredRelayCountries) = relayCountries.newFilterOnSearch(searchTerm)
exp.map { it.expandKey() }.toSet() to filteredRelayCountries
} else {
initialExpand() to relayCountries
}
}
.onEach { _expandedItems.value = it.first }
.map { it.second }

@Suppress("DestructuringDeclarationWithTooManyEntries")
val uiState =
combine(
filteredRelayListUseCase(),
searchRelayListLocations(),
customListsRelayItemUseCase(),
relayListRepository.selectedLocation,
_expandedItems,
_searchExpandedItems,
_searchCollapsedItems,
_searchTerm,
relayListFilterRepository.selectedOwnership,
availableProvidersUseCase(),
Expand All @@ -83,8 +98,6 @@ class SelectLocationViewModel(
customLists,
selectedItem,
expandedItems,
searchExpandedItems,
searchCollapsedItems,
searchTerm,
selectedOwnership,
allProviders,
Expand All @@ -102,17 +115,6 @@ class SelectLocationViewModel(
.size
}

val isSearching = searchTerm.length >= MIN_SEARCH_LENGTH
val (expansionList, relayCountries1) =
if (isSearching) {
val (exp, filteredRelayCountries) =
relayCountries.newFilterOnSearch(searchTerm)
(searchExpandedItems + exp.map { it.expandKey() } - searchCollapsedItems) to
filteredRelayCountries
} else {
expandedItems to relayCountries
}

val filteredCustomLists =
customLists
.filterOnSearchTerm(searchTerm)
Expand All @@ -127,11 +129,18 @@ class SelectLocationViewModel(
selectedProvidersCount = selectedProvidersCount,
relayListItems =
createRelayListItems(
isSearching,
selectedItem.getOrNull(),
filteredCustomLists,
relayCountries1,
expansionList),
searchTerm.length >= MIN_SEARCH_LENGTH,
selectedItem.getOrNull(),
filteredCustomLists,
relayCountries,
expandedItems)
.let {
if (it.isEmpty()) {
listOf(RelayListItem.LocationsEmptyText(searchTerm))
} else {
it
}
},
customLists = customLists,
selectedItem = selectRelayItemId,
)
Expand All @@ -151,40 +160,57 @@ class SelectLocationViewModel(
customLists: List<RelayItem.CustomList>,
countries: List<RelayItem.Location.Country>,
expandedkeys: Set<String>
): List<RelayListItem> {
): List<RelayListItem> =
createCustomListRelayListItems(isSearching, selectedItem, customLists, expandedkeys) +
createLocationRelayListItems(isSearching, selectedItem, countries, expandedkeys)

val customListItems: List<RelayListItem> =
if (isSearching && customLists.isEmpty()) emptyList()
else {
listOf(CustomListHeader) +
customLists.flatMap { customList ->
val expanded = customList.id.expandKey() in expandedkeys
val item =
listOf(
RelayListItem.CustomListItem(
customList,
isSelected = selectedItem == customList.id,
expanded))

if (expanded) {
item +
customList.locations.flatMap {
createCustomListEntry(
parent = customList.id, item = it, 1, expandedkeys)
}
} else {
item
}
fun createCustomListRelayListItems(
isSearching: Boolean,
selectedItem: RelayItemId?,
customLists: List<RelayItem.CustomList>,
expandedkeys: Set<String>
): List<RelayListItem> {
return if (isSearching && customLists.isEmpty()) emptyList()
else {
val customListItems =
customLists.flatMap { customList ->
val expanded = customList.id.expandKey() in expandedkeys
val item =
listOf(
RelayListItem.CustomListItem(
customList, isSelected = selectedItem == customList.id, expanded))

if (expanded) {
item +
customList.locations.flatMap {
createCustomListEntry(
parent = customList.id, item = it, 1, expandedkeys)
}
} else {
item
}
}
val relayLocations: List<RelayListItem> =
countries.flatMap { country ->
createGeoLocationEntry(country, selectedItem, expandedkeys = expandedkeys)
}
}
listOf(CustomListHeader) +
customListItems +
RelayListItem.CustomListFooter(customListItems.isNotEmpty())
}
}

return customListItems + listOf(
RelayListItem.CustomListFooter(customListItems.isNotEmpty()),
RelayListItem.LocationHeader) + relayLocations
fun createLocationRelayListItems(
isSearching: Boolean,
selectedItem: RelayItemId?,
countries: List<RelayItem.Location.Country>,
expandedkeys: Set<String>
): List<RelayListItem> {
return if (isSearching && countries.isEmpty()) {
emptyList()
} else {
val relayLocations: List<RelayListItem> =
countries.flatMap { country ->
createGeoLocationEntry(country, selectedItem, expandedkeys = expandedkeys)
}
listOf(RelayListItem.LocationHeader) + relayLocations
}
}

fun createCustomListEntry(
Expand Down Expand Up @@ -273,33 +299,18 @@ class SelectLocationViewModel(
}

fun onToggleExpand(item: RelayItemId, parent: CustomListId? = null, expand: Boolean) {
if (_searchTerm.value.length >= MIN_SEARCH_LENGTH) {
_expandedItems.update {
val key = item.expandKey(parent)
if (expand) {
_searchExpandedItems.update { it + key }
_searchCollapsedItems.update { it - key }
it + key
} else {
_searchExpandedItems.update { it - key }
_searchCollapsedItems.update { it + key }
}
} else {
_expandedItems.update {
val key = item.expandKey(parent)
if (expand) {
it + key
} else {
it - key
}
it - key
}
}
}

fun onSearchTermInput(searchTerm: String) {
viewModelScope.launch {
_searchExpandedItems.update { setOf() }
_searchCollapsedItems.update { setOf() }
_searchTerm.emit(searchTerm)
}
viewModelScope.launch { _searchTerm.emit(searchTerm) }
}

private fun filterSelectedProvidersByOwnership(
Expand Down

0 comments on commit d285960

Please sign in to comment.