Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

580 - ODS-Component - Chips Filter - The screen displayed for filter chips demo is not the good one #581

Merged
merged 2 commits into from
Jul 21, 2023
Merged

580 - ODS-Component - Chips Filter - The screen displayed for filter chips demo is not the good one #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
700069d
[#580] Display ChipFilter screen on filter chip variant click
paulinea Jul 18, 2023
1f3c6c9
[#580] Update changelog
paulinea Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/src/main/java/com/orange/ods/app/ui/components/Component.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import com.orange.ods.app.ui.components.buttons.icons.ComponentButtonsIcons
import com.orange.ods.app.ui.components.cards.ComponentCard
import com.orange.ods.app.ui.components.checkboxes.ComponentCheckboxes
import com.orange.ods.app.ui.components.chips.Chip
import com.orange.ods.app.ui.components.chips.ChipFilter
import com.orange.ods.app.ui.components.dialogs.ComponentDialog
import com.orange.ods.app.ui.components.floatingactionbuttons.ComponentFloatingActionButton
import com.orange.ods.app.ui.components.imageitem.ComponentImageItem
Expand Down Expand Up @@ -139,7 +140,12 @@ sealed class Component(
R.drawable.il_chips_small,
R.string.component_chips_description,
listOf(Variant.ChipAction, Variant.ChipChoice, Variant.ChipInput, Variant.ChipFilter),
demoScreen = { variant, _ -> if (variant != null) Chip(variant = variant) }
demoScreen = { variant, _ ->
when {
variant == Variant.ChipFilter -> ChipFilter()
variant != null -> Chip(variant = variant)
}
}
)

object Dialogs : Component(
Expand Down
6 changes: 6 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes done in ODS library will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased](https://github.com/Orange-OpenSource/ods-android/compare/0.14.0...develop)

### Fixed

- [\App\] Screen displayed on filter chip variant click was not the good one ([#580](https://github.com/Orange-OpenSource/ods-android/issues/580))

## [0.14.0](https://github.com/Orange-OpenSource/ods-android/compare/0.13.0...0.14.0) - 2023-07-12

### Added
Expand Down