ganfra
8 months ago
10 changed files with 366 additions and 10 deletions
@ -0,0 +1,40 @@
@@ -0,0 +1,40 @@
|
||||
/* |
||||
* Copyright (c) 2024 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.roomlist.impl.filters |
||||
|
||||
import io.element.android.features.roomlist.impl.R |
||||
|
||||
/** |
||||
* Enum class representing the different filters that can be applied to the room list. |
||||
* Order is important. |
||||
*/ |
||||
enum class RoomListFilter(val stringResource: Int){ |
||||
Rooms(R.string.screen_roomlist_filter_rooms), |
||||
People(R.string.screen_roomlist_filter_people), |
||||
Unread(R.string.screen_roomlist_filter_unreads), |
||||
Favourites(R.string.screen_roomlist_filter_favourites), |
||||
LowPriority(R.string.screen_roomlist_filter_low_priority); |
||||
|
||||
val oppositeFilter: RoomListFilter? |
||||
get() = when (this) { |
||||
Rooms -> People |
||||
People -> Rooms |
||||
Unread -> null |
||||
Favourites -> LowPriority |
||||
LowPriority -> Favourites |
||||
} |
||||
} |
||||
@ -0,0 +1,22 @@
@@ -0,0 +1,22 @@
|
||||
/* |
||||
* Copyright (c) 2024 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.roomlist.impl.filters |
||||
|
||||
sealed interface RoomListFiltersEvents { |
||||
data object ClearSelectedFilters : RoomListFiltersEvents |
||||
data class ToggleFilter(val filter: RoomListFilter) : RoomListFiltersEvents |
||||
} |
||||
@ -0,0 +1,69 @@
@@ -0,0 +1,69 @@
|
||||
/* |
||||
* Copyright (c) 2024 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.roomlist.impl.filters |
||||
|
||||
import androidx.compose.runtime.Composable |
||||
import androidx.compose.runtime.getValue |
||||
import androidx.compose.runtime.mutableStateOf |
||||
import androidx.compose.runtime.saveable.rememberSaveable |
||||
import androidx.compose.runtime.setValue |
||||
import io.element.android.libraries.architecture.Presenter |
||||
import kotlinx.collections.immutable.toPersistentList |
||||
import javax.inject.Inject |
||||
|
||||
class RoomListFiltersPresenter @Inject constructor() : Presenter<RoomListFiltersState> { |
||||
|
||||
@Composable |
||||
override fun present(): RoomListFiltersState { |
||||
var unselectedFilters: Set<RoomListFilter> by rememberSaveable { |
||||
mutableStateOf(RoomListFilter.entries.toSet()) |
||||
} |
||||
var selectedFilters: Set<RoomListFilter> by rememberSaveable { |
||||
mutableStateOf(emptySet()) |
||||
} |
||||
|
||||
fun updateFilters(newSelectedFilters: Set<RoomListFilter>) { |
||||
selectedFilters = newSelectedFilters |
||||
unselectedFilters = RoomListFilter.entries.toSet() - |
||||
selectedFilters - |
||||
selectedFilters.mapNotNull { it.oppositeFilter }.toSet() |
||||
} |
||||
|
||||
fun handleEvents(event: RoomListFiltersEvents) { |
||||
when (event) { |
||||
is RoomListFiltersEvents.ToggleFilter -> { |
||||
val newSelectedFilters = if (selectedFilters.contains(event.filter)) { |
||||
selectedFilters - event.filter |
||||
} else { |
||||
selectedFilters + event.filter |
||||
} |
||||
updateFilters(newSelectedFilters) |
||||
} |
||||
RoomListFiltersEvents.ClearSelectedFilters -> { |
||||
updateFilters(newSelectedFilters = emptySet()) |
||||
} |
||||
} |
||||
} |
||||
|
||||
return RoomListFiltersState( |
||||
unselectedFilters = unselectedFilters.toPersistentList(), |
||||
selectedFilters = selectedFilters.toPersistentList(), |
||||
eventSink = ::handleEvents |
||||
) |
||||
} |
||||
} |
||||
|
||||
@ -0,0 +1,27 @@
@@ -0,0 +1,27 @@
|
||||
/* |
||||
* Copyright (c) 2024 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.roomlist.impl.filters |
||||
|
||||
import kotlinx.collections.immutable.ImmutableList |
||||
|
||||
data class RoomListFiltersState( |
||||
val unselectedFilters: ImmutableList<RoomListFilter>, |
||||
val selectedFilters: ImmutableList<RoomListFilter>, |
||||
val eventSink: (RoomListFiltersEvents) -> Unit, |
||||
) { |
||||
val showClearFilterButton = selectedFilters.isNotEmpty() |
||||
} |
||||
@ -0,0 +1,42 @@
@@ -0,0 +1,42 @@
|
||||
/* |
||||
* Copyright (c) 2024 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.roomlist.impl.filters |
||||
|
||||
import androidx.compose.ui.tooling.preview.PreviewParameterProvider |
||||
import kotlinx.collections.immutable.ImmutableList |
||||
import kotlinx.collections.immutable.persistentListOf |
||||
import kotlinx.collections.immutable.toImmutableList |
||||
|
||||
class RoomListFiltersStateProvider : PreviewParameterProvider<RoomListFiltersState> { |
||||
|
||||
override val values: Sequence<RoomListFiltersState> |
||||
get() = sequenceOf( |
||||
aRoomListFiltersState(), |
||||
aRoomListFiltersState( |
||||
selectedFilters = persistentListOf(RoomListFilter.Rooms, RoomListFilter.Favourites), |
||||
unselectedFilters = persistentListOf(RoomListFilter.Unread), |
||||
) |
||||
) |
||||
} |
||||
|
||||
fun aRoomListFiltersState( |
||||
unselectedFilters: ImmutableList<RoomListFilter> = RoomListFilter.entries.toImmutableList(), |
||||
selectedFilters: ImmutableList<RoomListFilter> = persistentListOf(), |
||||
) = RoomListFiltersState( |
||||
unselectedFilters = unselectedFilters, |
||||
selectedFilters = selectedFilters, |
||||
) {} |
||||
@ -0,0 +1,144 @@
@@ -0,0 +1,144 @@
|
||||
/* |
||||
* Copyright (c) 2024 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.roomlist.impl.filters |
||||
|
||||
import androidx.compose.animation.AnimatedVisibility |
||||
import androidx.compose.foundation.ExperimentalFoundationApi |
||||
import androidx.compose.foundation.background |
||||
import androidx.compose.foundation.layout.Arrangement |
||||
import androidx.compose.foundation.layout.Box |
||||
import androidx.compose.foundation.layout.Row |
||||
import androidx.compose.foundation.layout.padding |
||||
import androidx.compose.foundation.lazy.LazyRow |
||||
import androidx.compose.foundation.lazy.items |
||||
import androidx.compose.foundation.shape.CircleShape |
||||
import androidx.compose.material3.FilterChip |
||||
import androidx.compose.material3.FilterChipDefaults |
||||
import androidx.compose.runtime.Composable |
||||
import androidx.compose.ui.Alignment |
||||
import androidx.compose.ui.Modifier |
||||
import androidx.compose.ui.draw.clip |
||||
import androidx.compose.ui.res.stringResource |
||||
import androidx.compose.ui.tooling.preview.PreviewParameter |
||||
import androidx.compose.ui.unit.dp |
||||
import io.element.android.compound.theme.ElementTheme |
||||
import io.element.android.compound.tokens.generated.CompoundIcons |
||||
import io.element.android.libraries.designsystem.preview.ElementPreview |
||||
import io.element.android.libraries.designsystem.preview.PreviewsDayNight |
||||
import io.element.android.libraries.designsystem.theme.components.Icon |
||||
import io.element.android.libraries.designsystem.theme.components.IconButton |
||||
import io.element.android.libraries.designsystem.theme.components.Text |
||||
|
||||
@OptIn(ExperimentalFoundationApi::class) |
||||
@Composable |
||||
fun RoomListFiltersView( |
||||
state: RoomListFiltersState, |
||||
modifier: Modifier = Modifier |
||||
) { |
||||
|
||||
fun onClearFiltersClicked() { |
||||
state.eventSink(RoomListFiltersEvents.ClearSelectedFilters) |
||||
} |
||||
|
||||
fun onFilterClicked(filter: RoomListFilter) { |
||||
state.eventSink(RoomListFiltersEvents.ToggleFilter(filter)) |
||||
} |
||||
|
||||
val horizontalPadding = if(state.showClearFilterButton) 4.dp else 16.dp |
||||
|
||||
Row(modifier.padding(horizontal = horizontalPadding)) { |
||||
AnimatedVisibility(visible = state.showClearFilterButton) { |
||||
RoomListClearFiltersButton(onClick = ::onClearFiltersClicked) |
||||
} |
||||
LazyRow( |
||||
horizontalArrangement = Arrangement.spacedBy(8.dp), |
||||
) { |
||||
items(state.selectedFilters) { filter -> |
||||
RoomListFilterView( |
||||
roomListFilter = filter, |
||||
selected = true, |
||||
onClick = ::onFilterClicked, |
||||
modifier = Modifier.animateItemPlacement(), |
||||
) |
||||
} |
||||
items(state.unselectedFilters) { filter -> |
||||
RoomListFilterView( |
||||
roomListFilter = filter, |
||||
selected = false, |
||||
onClick = ::onFilterClicked, |
||||
modifier = Modifier.animateItemPlacement(), |
||||
) |
||||
} |
||||
} |
||||
} |
||||
} |
||||
|
||||
@Composable |
||||
private fun RoomListClearFiltersButton( |
||||
onClick: () -> Unit, |
||||
modifier: Modifier = Modifier |
||||
) { |
||||
IconButton( |
||||
modifier = modifier, |
||||
onClick = onClick, |
||||
) { |
||||
Box( |
||||
modifier = Modifier |
||||
.clip(CircleShape) |
||||
.background(ElementTheme.colors.bgActionPrimaryRest) |
||||
) { |
||||
Icon( |
||||
modifier = Modifier.align(Alignment.Center), |
||||
imageVector = CompoundIcons.Close, |
||||
tint = ElementTheme.colors.iconOnSolidPrimary, |
||||
contentDescription = null, |
||||
) |
||||
} |
||||
} |
||||
} |
||||
|
||||
@Composable |
||||
private fun RoomListFilterView( |
||||
roomListFilter: RoomListFilter, |
||||
selected: Boolean, |
||||
onClick: (RoomListFilter) -> Unit, |
||||
modifier: Modifier = Modifier |
||||
) { |
||||
FilterChip( |
||||
selected = selected, |
||||
onClick = { onClick(roomListFilter) }, |
||||
modifier = modifier, |
||||
shape = CircleShape, |
||||
colors = FilterChipDefaults.filterChipColors( |
||||
containerColor = ElementTheme.colors.bgCanvasDefault, |
||||
selectedContainerColor = ElementTheme.colors.bgActionPrimaryRest, |
||||
labelColor = ElementTheme.colors.textPrimary, |
||||
selectedLabelColor = ElementTheme.colors.textOnSolidPrimary, |
||||
), |
||||
label = { |
||||
Text(text = stringResource(id = roomListFilter.stringResource)) |
||||
} |
||||
) |
||||
} |
||||
|
||||
@PreviewsDayNight |
||||
@Composable |
||||
internal fun RoomListFiltersViewPreview(@PreviewParameter(RoomListFiltersStateProvider::class) state: RoomListFiltersState) = ElementPreview { |
||||
RoomListFiltersView( |
||||
state = state, |
||||
) |
||||
} |
||||
Loading…
Reference in new issue