From 700069d8ed679fe31cbf80671da365f75283e176 Mon Sep 17 00:00:00 2001 From: Pauline Auvray Date: Tue, 18 Jul 2023 14:40:15 +0200 Subject: [PATCH 1/2] [#580] Display ChipFilter screen on filter chip variant click --- .../java/com/orange/ods/app/ui/components/Component.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/orange/ods/app/ui/components/Component.kt b/app/src/main/java/com/orange/ods/app/ui/components/Component.kt index e4d27a974..39573a034 100644 --- a/app/src/main/java/com/orange/ods/app/ui/components/Component.kt +++ b/app/src/main/java/com/orange/ods/app/ui/components/Component.kt @@ -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 @@ -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( From 1f3c6c9141fc9490761b4abee73ce6b5ea6a9ecb Mon Sep 17 00:00:00 2001 From: Pauline Auvray Date: Tue, 18 Jul 2023 14:40:27 +0200 Subject: [PATCH 2/2] [#580] Update changelog --- changelog.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changelog.md b/changelog.md index ea01ea21c..d237c32bb 100644 --- a/changelog.md +++ b/changelog.md @@ -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