Skip to content

Commit

Permalink
Merge pull request #581 from Orange-OpenSource/580-ods-component-chip…
Browse files Browse the repository at this point in the history
…s-filter-the-screen-displayed-for-filter-chips-demo-is-not-the-good-one

580 - ODS-Component - Chips Filter - The screen displayed for filter chips demo is not the good one
  • Loading branch information
florentmaitre authored Jul 21, 2023
2 parents 2f621eb + 1f3c6c9 commit c35c8ec
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
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
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

0 comments on commit c35c8ec

Please sign in to comment.