Skip to content

Commit 9121be7

Browse files
AhmedAmineZrAhmedAmineZr
committed
Merge branch 'develop' into tokenator-update-tokens-20260505120328
# Conflicts: # ouds_theme_contract/lib/theme/scheme/responsive/ouds_size_scheme.dart
2 parents 9f93946 + 7c73f0a commit 9121be7

65 files changed

Lines changed: 4144 additions & 956 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NOTICE.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ ouds_theme_orange/assets/component/tag/close.svg
120120
ouds_theme_orange/assets/functional/social-and-engagement/heart-empty.svg
121121
ouds_theme_orange/assets/functional/settings-and-tools/hide.svg
122122
ouds_theme_orange/assets/functional/navigation/menu.svg
123+
ouds_theme_orange/assets/component/bullet-list/bullet-level-0.svg
123124

124125

125126
ouds_theme_orange/fonts/Roboto-Black.ttf
@@ -165,6 +166,7 @@ ouds_theme_orange_compact/assets/functional/actions/copy.svg
165166
ouds_theme_orange_compact/assets/functional/social-and-engagement/heart-empty.svg
166167
ouds_theme_orange_compact/assets/functional/settings-and-tools/hide.svg
167168
ouds_theme_orange_compact/assets/functional/navigation/menu.svg
169+
ouds_theme_orange_compact/assets/component/bullet-list/bullet-level-0.svg
168170

169171
ouds_theme_orange_compact/fonts/Roboto-Black.ttf
170172
ouds_theme_orange_compact/fonts/Roboto-Bold.ttf
@@ -208,6 +210,7 @@ ouds_theme_sosh/assets/component/tag/close.svg
208210
ouds_theme_sosh/assets/functional/social-and-engagement/heart-empty.svg
209211
ouds_theme_sosh/assets/functional/settings-and-tools/hide.svg
210212
ouds_theme_sosh/assets/functional/navigation/menu.svg
213+
ouds_theme_sosh/assets/component/bullet-list/bullet-level-0.svg
211214

212215
ouds_theme_sosh/fonts/Sosh-Black.ttf
213216
ouds_theme_sosh/fonts/Sosh-Bold.ttf

‎app/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66
## [Unreleased](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.2.0...develop)
77
### Added
8+
- [DemoApp][Library] Create component - `Alert message` ([#670](https://github.com/Orange-OpenSource/ouds-flutter/issues/670))
9+
- [DemoApp][Library] Create component - `Inline alert` ([#485](https://github.com/Orange-OpenSource/ouds-flutter/issues/485))
810
- [Library] `Filter chip` Apply high contrast theme to filter chip (selected) ([#494](https://github.com/Orange-OpenSource/ouds-flutter/issues/494))
911

1012
### Changed

‎app/lib/l10n/gen/ouds_flutter_app_localizations.dart‎

Lines changed: 84 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,12 @@ abstract class AppLocalizations {
277277
/// **'Rounded corner text inputs'**
278278
String get app_themeSettingsDialog_roundedCornerTextInputs_label;
279279

280+
/// No description provided for @app_themeSettingsDialog_roundedCornerAlertMessage_label.
281+
///
282+
/// In en, this message translates to:
283+
/// **'Rounded corner alert message'**
284+
String get app_themeSettingsDialog_roundedCornerAlertMessage_label;
285+
280286
/// No description provided for @app_tokens_viewCodeExample_label.
281287
///
282288
/// In en, this message translates to:
@@ -601,6 +607,84 @@ abstract class AppLocalizations {
601607
/// **'Trailing action count'**
602608
String get app_components_common_trailingActionCount_label;
603609

610+
/// No description provided for @app_components_common_description_tech.
611+
///
612+
/// In en, this message translates to:
613+
/// **'Description'**
614+
String get app_components_common_description_tech;
615+
616+
/// No description provided for @app_components_alert_tech.
617+
///
618+
/// In en, this message translates to:
619+
/// **'Alert'**
620+
String get app_components_alert_tech;
621+
622+
/// No description provided for @app_components_alert_description_text.
623+
///
624+
/// In en, this message translates to:
625+
/// **'Alert components are UI elements that display information, system feedback or status changes.'**
626+
String get app_components_alert_description_text;
627+
628+
/// No description provided for @app_components_alert_alertMessage_tech.
629+
///
630+
/// In en, this message translates to:
631+
/// **'Alert message'**
632+
String get app_components_alert_alertMessage_tech;
633+
634+
/// No description provided for @app_components_alert_alertMessage_description_text.
635+
///
636+
/// In en, this message translates to:
637+
/// **'Alert message is a UI element that displays system feedback, status changes or required action; throughout detailed, prominent, persistent and actionable communication.'**
638+
String get app_components_alert_alertMessage_description_text;
639+
640+
/// No description provided for @app_components_alert_alertMessage_closeButton_tech.
641+
///
642+
/// In en, this message translates to:
643+
/// **'Close button'**
644+
String get app_components_alert_alertMessage_closeButton_tech;
645+
646+
/// No description provided for @app_components_alert_alertMessage_statusIcon_tech.
647+
///
648+
/// In en, this message translates to:
649+
/// **'Status icon'**
650+
String get app_components_alert_alertMessage_statusIcon_tech;
651+
652+
/// No description provided for @app_components_alert_alertMessage_actionLink_tech.
653+
///
654+
/// In en, this message translates to:
655+
/// **'Action'**
656+
String get app_components_alert_alertMessage_actionLink_tech;
657+
658+
/// No description provided for @app_components_alert_alertMessage_actionLayout_tech.
659+
///
660+
/// In en, this message translates to:
661+
/// **'Action layout'**
662+
String get app_components_alert_alertMessage_actionLayout_tech;
663+
664+
/// No description provided for @app_components_alert_alertMessage_bulletList_tech.
665+
///
666+
/// In en, this message translates to:
667+
/// **'Bullet list'**
668+
String get app_components_alert_alertMessage_bulletList_tech;
669+
670+
/// No description provided for @app_components_alert_alertMessage_bullet_tech.
671+
///
672+
/// In en, this message translates to:
673+
/// **'Bullet {bulletNumber}'**
674+
String app_components_alert_alertMessage_bullet_tech(int bulletNumber);
675+
676+
/// No description provided for @app_components_alert_inlineAlert_tech.
677+
///
678+
/// In en, this message translates to:
679+
/// **'Inline alert'**
680+
String get app_components_alert_inlineAlert_tech;
681+
682+
/// No description provided for @app_components_alert_inlineAlert_description_text.
683+
///
684+
/// In en, this message translates to:
685+
/// **'Inline alert is a lightweight UI element, placed in the content flow, that displays information, system feedback, status changes throughout short, prominent, persistent and non actionable communication.'**
686+
String get app_components_alert_inlineAlert_description_text;
687+
604688
/// No description provided for @app_components_button_label.
605689
///
606690
/// In en, this message translates to:
@@ -655,12 +739,6 @@ abstract class AppLocalizations {
655739
/// **'Indeterminate checkbox item'**
656740
String get app_components_checkbox_indeterminateCheckboxItem_label;
657741

658-
/// No description provided for @app_components_controlItem_description_label.
659-
///
660-
/// In en, this message translates to:
661-
/// **'Description'**
662-
String get app_components_controlItem_description_label;
663-
664742
/// No description provided for @app_components_controlItem_icon_label.
665743
///
666744
/// In en, this message translates to:

‎app/lib/l10n/gen/ouds_flutter_app_localizations_ar.dart‎

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ class AppLocalizationsAr extends AppLocalizations {
101101
String get app_themeSettingsDialog_roundedCornerTextInputs_label =>
102102
'حقول إدخال نص بزوايا مستديرة';
103103

104+
@override
105+
String get app_themeSettingsDialog_roundedCornerAlertMessage_label =>
106+
'رسالة تنبيه بزوايا مستديرة';
107+
104108
@override
105109
String get app_tokens_viewCodeExample_label => 'عرض مثال على كود الرمز';
106110

@@ -271,6 +275,52 @@ class AppLocalizationsAr extends AppLocalizations {
271275
String get app_components_common_trailingActionCount_label =>
272276
'Trailing action count';
273277

278+
@override
279+
String get app_components_common_description_tech => 'Description';
280+
281+
@override
282+
String get app_components_alert_tech => 'Alert';
283+
284+
@override
285+
String get app_components_alert_description_text =>
286+
'مكونات alerte هي عناصر واجهة المستخدم التي تعرض معلومات، ردود فعل النظام أو تغييرات الحالة.';
287+
288+
@override
289+
String get app_components_alert_alertMessage_tech => 'Alert message';
290+
291+
@override
292+
String get app_components_alert_alertMessage_description_text =>
293+
'Alert message (أو رسالة التحذير) هي عنصر من عناصر واجهة المستخدم التي تعرض معلومات النظام، تغييرات الحالة أو إجراء مطلوب؛ وذلك من خلال تواصل مفصل، مرئي، مستمر وقابل للاستخدام.';
294+
295+
@override
296+
String get app_components_alert_alertMessage_closeButton_tech =>
297+
'Close button';
298+
299+
@override
300+
String get app_components_alert_alertMessage_statusIcon_tech => 'Status icon';
301+
302+
@override
303+
String get app_components_alert_alertMessage_actionLink_tech => 'Action';
304+
305+
@override
306+
String get app_components_alert_alertMessage_actionLayout_tech =>
307+
'Action layout';
308+
309+
@override
310+
String get app_components_alert_alertMessage_bulletList_tech => 'Bullet list';
311+
312+
@override
313+
String app_components_alert_alertMessage_bullet_tech(int bulletNumber) {
314+
return 'Bullet $bulletNumber';
315+
}
316+
317+
@override
318+
String get app_components_alert_inlineAlert_tech => 'Inline alert';
319+
320+
@override
321+
String get app_components_alert_inlineAlert_description_text =>
322+
'Inline alert هو عنصر واجهة مستخدم خفيف الوزن، يتم وضعه داخل تدفّق المحتوى، ويُستخدم لعرض المعلومات أو ملاحظات النظام أو تغيّرات الحالة، من خلال رسائل قصيرة وواضحة وبارزة ومستمرّة، وغير قابلة لاتخاذ إجراء.';
323+
274324
@override
275325
String get app_components_button_label => 'Button';
276326

@@ -302,9 +352,6 @@ class AppLocalizationsAr extends AppLocalizations {
302352
String get app_components_checkbox_indeterminateCheckboxItem_label =>
303353
'Indeterminate checkbox item';
304354

305-
@override
306-
String get app_components_controlItem_description_label => 'Description';
307-
308355
@override
309356
String get app_components_controlItem_icon_label => 'Icon';
310357

‎app/lib/l10n/gen/ouds_flutter_app_localizations_en.dart‎

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ class AppLocalizationsEn extends AppLocalizations {
101101
String get app_themeSettingsDialog_roundedCornerTextInputs_label =>
102102
'Rounded corner text inputs';
103103

104+
@override
105+
String get app_themeSettingsDialog_roundedCornerAlertMessage_label =>
106+
'Rounded corner alert message';
107+
104108
@override
105109
String get app_tokens_viewCodeExample_label => 'View token code example';
106110

@@ -271,6 +275,52 @@ class AppLocalizationsEn extends AppLocalizations {
271275
String get app_components_common_trailingActionCount_label =>
272276
'Trailing action count';
273277

278+
@override
279+
String get app_components_common_description_tech => 'Description';
280+
281+
@override
282+
String get app_components_alert_tech => 'Alert';
283+
284+
@override
285+
String get app_components_alert_description_text =>
286+
'Alert components are UI elements that display information, system feedback or status changes.';
287+
288+
@override
289+
String get app_components_alert_alertMessage_tech => 'Alert message';
290+
291+
@override
292+
String get app_components_alert_alertMessage_description_text =>
293+
'Alert message is a UI element that displays system feedback, status changes or required action; throughout detailed, prominent, persistent and actionable communication.';
294+
295+
@override
296+
String get app_components_alert_alertMessage_closeButton_tech =>
297+
'Close button';
298+
299+
@override
300+
String get app_components_alert_alertMessage_statusIcon_tech => 'Status icon';
301+
302+
@override
303+
String get app_components_alert_alertMessage_actionLink_tech => 'Action';
304+
305+
@override
306+
String get app_components_alert_alertMessage_actionLayout_tech =>
307+
'Action layout';
308+
309+
@override
310+
String get app_components_alert_alertMessage_bulletList_tech => 'Bullet list';
311+
312+
@override
313+
String app_components_alert_alertMessage_bullet_tech(int bulletNumber) {
314+
return 'Bullet $bulletNumber';
315+
}
316+
317+
@override
318+
String get app_components_alert_inlineAlert_tech => 'Inline alert';
319+
320+
@override
321+
String get app_components_alert_inlineAlert_description_text =>
322+
'Inline alert is a lightweight UI element, placed in the content flow, that displays information, system feedback, status changes throughout short, prominent, persistent and non actionable communication.';
323+
274324
@override
275325
String get app_components_button_label => 'Button';
276326

@@ -302,9 +352,6 @@ class AppLocalizationsEn extends AppLocalizations {
302352
String get app_components_checkbox_indeterminateCheckboxItem_label =>
303353
'Indeterminate checkbox item';
304354

305-
@override
306-
String get app_components_controlItem_description_label => 'Description';
307-
308355
@override
309356
String get app_components_controlItem_icon_label => 'Icon';
310357

‎app/lib/l10n/gen/ouds_flutter_app_localizations_fr.dart‎

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class AppLocalizationsFr extends AppLocalizations {
5555
'Veuillez sélectionner une puce en naviguant parmi les options';
5656

5757
@override
58-
String get app_common_selected_label => 'Selected';
58+
String get app_common_selected_label => 'Sélectionné';
5959

6060
@override
6161
String get app_topBar_theme_button_a11y => 'Changer le thème';
@@ -102,6 +102,10 @@ class AppLocalizationsFr extends AppLocalizations {
102102
String get app_themeSettingsDialog_roundedCornerTextInputs_label =>
103103
'Text Inputs avec coins arrondis';
104104

105+
@override
106+
String get app_themeSettingsDialog_roundedCornerAlertMessage_label =>
107+
'Message d’alerte à coins arrondis';
108+
105109
@override
106110
String get app_tokens_viewCodeExample_label =>
107111
'Voir l\'exemple de code du token';
@@ -273,6 +277,52 @@ class AppLocalizationsFr extends AppLocalizations {
273277
String get app_components_common_trailingActionCount_label =>
274278
'Trailing action count';
275279

280+
@override
281+
String get app_components_common_description_tech => 'Description';
282+
283+
@override
284+
String get app_components_alert_tech => 'Alert';
285+
286+
@override
287+
String get app_components_alert_description_text =>
288+
'Les composants d\'alerte sont des éléments d\'interface utilisateur qui affichent des informations, des retours système ou des changements d\'état.';
289+
290+
@override
291+
String get app_components_alert_alertMessage_tech => 'Alert message';
292+
293+
@override
294+
String get app_components_alert_alertMessage_description_text =>
295+
'Un Alert message (ou message d\'alerte) est un élément d\'interface utilisateur qui affiche des informations système, des changements d\'état ou une action requise; le tout grâce à une communication détaillée, visible, persistante et exploitable.';
296+
297+
@override
298+
String get app_components_alert_alertMessage_closeButton_tech =>
299+
'Close button';
300+
301+
@override
302+
String get app_components_alert_alertMessage_statusIcon_tech => 'Status icon';
303+
304+
@override
305+
String get app_components_alert_alertMessage_actionLink_tech => 'Action';
306+
307+
@override
308+
String get app_components_alert_alertMessage_actionLayout_tech =>
309+
'Action layout';
310+
311+
@override
312+
String get app_components_alert_alertMessage_bulletList_tech => 'Bullet list';
313+
314+
@override
315+
String app_components_alert_alertMessage_bullet_tech(int bulletNumber) {
316+
return 'Bullet $bulletNumber';
317+
}
318+
319+
@override
320+
String get app_components_alert_inlineAlert_tech => 'Inline alert';
321+
322+
@override
323+
String get app_components_alert_inlineAlert_description_text =>
324+
'Une Inline alert est un élément d\'interface utilisateur léger, placé dans le flux de contenu, qui affiche des informations, des commentaires système et des changements d\'état au moyen d\'une communication courte, visible, persistante et non exploitable.';
325+
276326
@override
277327
String get app_components_button_label => 'Button';
278328

@@ -304,9 +354,6 @@ class AppLocalizationsFr extends AppLocalizations {
304354
String get app_components_checkbox_indeterminateCheckboxItem_label =>
305355
'Indeterminate checkbox item';
306356

307-
@override
308-
String get app_components_controlItem_description_label => 'Description';
309-
310357
@override
311358
String get app_components_controlItem_icon_label => 'Icon';
312359

‎app/lib/l10n/ouds_flutter_ar.arb‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"app_themeSettingsDialog_label": "تغيير إعدادات السمة",
3737
"app_themeSettingsDialog_roundedCornerButtons_label" :"زر بزوايا مستديرة",
3838
"app_themeSettingsDialog_roundedCornerTextInputs_label" :"حقول إدخال نص بزوايا مستديرة",
39+
"app_themeSettingsDialog_roundedCornerAlertMessage_label" :"رسالة تنبيه بزوايا مستديرة",
3940

4041
"@_tokens": {},
4142
"app_tokens_viewCodeExample_label": "عرض مثال على كود الرمز",
@@ -60,6 +61,11 @@
6061
"app_components_common_textInputClearIcon_a11y": "مسح المدخلات",
6162
"app_components_common_action_a11y": "إجراء",
6263

64+
"@_components_alert": {},
65+
"app_components_alert_description_text": "مكونات alerte هي عناصر واجهة المستخدم التي تعرض معلومات، ردود فعل النظام أو تغييرات الحالة.",
66+
"app_components_alert_alertMessage_description_text": "Alert message (أو رسالة التحذير) هي عنصر من عناصر واجهة المستخدم التي تعرض معلومات النظام، تغييرات الحالة أو إجراء مطلوب؛ وذلك من خلال تواصل مفصل، مرئي، مستمر وقابل للاستخدام.",
67+
"app_components_alert_inlineAlert_description_text": "Inline alert هو عنصر واجهة مستخدم خفيف الوزن، يتم وضعه داخل تدفّق المحتوى، ويُستخدم لعرض المعلومات أو ملاحظات النظام أو تغيّرات الحالة، من خلال رسائل قصيرة وواضحة وبارزة ومستمرّة، وغير قابلة لاتخاذ إجراء.",
68+
6369
"@_components_button": {},
6470
"app_components_button_description_text": "Button هو عنصر واجهة مستخدم يُستخدم لتحفيز إجراء أو حدث، ويستخدم لبدء المهام أو تأكيد إجراء معين.",
6571

0 commit comments

Comments
 (0)