From ff535eea1ca14eb0c69973fcc094b1eb485bea65 Mon Sep 17 00:00:00 2001 From: Pauline Auvray Date: Wed, 4 Oct 2023 10:12:43 +0200 Subject: [PATCH] [#647] Update buttons names --- .../java/com/orange/ods/app/ui/components/Component.kt | 8 ++++---- app/src/main/res/values/strings.xml | 2 +- changelog.md | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) 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 807eb32ed..44c3b897a 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 @@ -290,10 +290,10 @@ sealed class Variant( object AppBarsTopRegular : Variant(R.string.component_app_bars_top_regular, OdsComposable.OdsTopAppBar.name) object AppBarsTopLarge : Variant(R.string.component_app_bars_top_large, OdsComposable.OdsLargeTopAppBar.name, true) - object ButtonsPrimary : Variant(R.string.component_buttons_highest_emphasis, "${OdsComposable.OdsButton.name} with ${OdsButtonStyle.Primary.name}") - object ButtonsDefault : Variant(R.string.component_buttons_high_emphasis, "${OdsComposable.OdsButton.name} with ${OdsButtonStyle.Default.name}") - object ButtonsOutlined : Variant(R.string.component_buttons_medium_emphasis, OdsComposable.OdsOutlinedButton.name) - object ButtonsText : Variant(R.string.component_buttons_low_emphasis, OdsComposable.OdsTextButton.name) + object ButtonsPrimary : Variant(R.string.component_buttons_high_emphasis, "${OdsComposable.OdsButton.name} with ${OdsButtonStyle.Primary.name}") + object ButtonsDefault : Variant(R.string.component_buttons_medium_emphasis, "${OdsComposable.OdsButton.name} with ${OdsButtonStyle.Default.name}") + object ButtonsOutlined : Variant(R.string.component_buttons_low_emphasis, OdsComposable.OdsOutlinedButton.name) + object ButtonsText : Variant(R.string.component_buttons_lowest_emphasis, OdsComposable.OdsTextButton.name) object ButtonsTextToggleGroup : Variant(R.string.component_button_text_toggle_group, OdsComposable.OdsTextToggleButtonsRow.name) object ButtonsFunctional : Variant(R.string.component_buttons_functional, "${OdsComposable.OdsButton.name} with a functional style") diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 911ed8786..725c99f68 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -141,10 +141,10 @@ Buttons A button allows a user to perform an action or to navigate to another page. It contains a text label and a supporting icon can be displayed. - Highest emphasis buttons High emphasis buttons Medium emphasis buttons Low emphasis buttons + Lowest emphasis buttons Functional buttons Same items weight diff --git a/changelog.md b/changelog.md index 31dcc46ce..fe03cc24c 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.15.1...develop) + +### Changed + +- \[App\] Change buttons name ([#647](https://github.com/Orange-OpenSource/ods-android/issues/647)) + ## [0.15.1](https://github.com/Orange-OpenSource/ods-android/compare/0.15.0...0.15.1) - 2023-09-28 ### Changed