diff --git a/NOTICE.txt b/NOTICE.txt index bc5e8624f..8d4484df3 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -62,17 +62,17 @@ ouds-flutter/app/assets/sosh/functional/social-and-engagement/heart-empty.svg ouds-flutter/app/assets/wireframe/functional/social-and-engagement/heart-empty.svg # Functional - Status and indicators -ouds-flutter/app/assets/orange/functional/status-and-indicators/info.svg -ouds-flutter/app/assets/sosh/functional/status-and-indicators/info.svg -ouds-flutter/app/assets/wireframe/functional/status-and-indicators/info.svg +ouds-flutter/app/assets/orange/functional/status-and-indicators/info-fill.svg +ouds-flutter/app/assets/sosh/functional/status-and-indicators/info-fill.svg +ouds-flutter/app/assets/wireframe/functional/status-and-indicators/info-fill.svg ## OUDS / Themes / Orange ouds_theme_orange/assets/ic_bullet_rounded.svg ouds_theme_orange/assets/communication/accessibility/accessibility-vision.svg ouds_theme_orange/assets/communication/security-and-safety/lock.svg -ouds_theme_orange/assets/component/alert/important.svg -ouds_theme_orange/assets/component/alert/information.svg -ouds_theme_orange/assets/component/alert/success.svg +ouds_theme_orange/assets/component/alert/important-fill.svg +ouds_theme_orange/assets/component/alert/info-fill.svg +ouds_theme_orange/assets/component/alert/tick-confirmation-fill.svg ouds_theme_orange/assets/component/alert/warning.svg ouds_theme_orange/assets/component/alert/warning-external-shape.svg ouds_theme_orange/assets/component/alert/warning-internal-shape.svg @@ -97,7 +97,7 @@ ouds_theme_orange/assets/component/switch/selected-switch.svg ouds_theme_orange/assets/component/tag/close.svg ouds_theme_orange/assets/functional/actions/copy.svg ouds_theme_orange/assets/functional/social-and-engagement/heart-empty.svg -ouds_theme_orange/assets/settings-and-tools/hide.svg +ouds_theme_orange/assets/functional/settings-and-tools/hide.svg ouds_theme_sosh/fonts/Roboto-Black.ttf @@ -116,9 +116,9 @@ ouds_theme_sosh/fonts/SF-Pro-Display-Black-Thin.ttf ouds_theme_sosh/assets/ic_bullet_rounded.svg ouds_theme_orange/assets/communication/accessibility/accessibility-vision.svg ouds_theme_sosh/assets/communication/security-and-safety/lock.svg -ouds_theme_sosh/assets/component/alert/important.svg -ouds_theme_sosh/assets/component/alert/information.svg -ouds_theme_sosh/assets/component/alert/success.svg +ouds_theme_sosh/assets/component/alert/important-fill.svg +ouds_theme_sosh/assets/component/alert/info-fill.svg +ouds_theme_sosh/assets/component/alert/tick-confirmation-fill.svg ouds_theme_sosh/assets/component/alert/warning.svg ouds_theme_sosh/assets/component/alert/warning-external-shape.svg ouds_theme_sosh/assets/component/alert/warning-internal-shape.svg @@ -142,7 +142,7 @@ ouds_theme_sosh/assets/component/radio-button/radio-button-selected.svg ouds_theme_sosh/assets/component/switch/selected-switch.svg ouds_theme_sosh/assets/component/tag/close.svg ouds_theme_sosh/assets/functional/social-and-engagement/heart-empty.svg -ouds_theme_sosh/assets/settings-and-tools/hide.svg +ouds_theme_sosh/assets/functional/settings-and-tools/hide.svg ouds_theme_sosh/fonts/Sosh-Black.ttf ouds_theme_sosh/fonts/Sosh-Bold.ttf @@ -154,9 +154,9 @@ ouds_theme_sosh/fonts/Sosh-Thin.ttf ouds_theme_wireframe/assets/ic_bullet_rounded.svg ouds_theme_orange/assets/communication/accessibility/accessibility-vision.svg ouds_theme_wireframe/assets/communication/security-and-safety/lock.svg -ouds_theme_wireframe/assets/component/alert/important.svg -ouds_theme_wireframe/assets/component/alert/information.svg -ouds_theme_wireframe/assets/component/alert/success.svg +ouds_theme_wireframe/assets/component/alert/important-fill.svg +ouds_theme_wireframe/assets/component/alert/info-fill.svg +ouds_theme_wireframe/assets/component/alert/tick-confirmation-fill.svg ouds_theme_wireframe/assets/component/alert/warning.svg ouds_theme_wireframe/assets/component/alert/warning-external-shape.svg ouds_theme_wireframe/assets/component/alert/warning-internal-shape.svg @@ -180,7 +180,7 @@ ouds_theme_wireframe/assets/component/radio-button/radio-button-selected.svg ouds_theme_wireframe/assets/component/switch/selected-switch.svg ouds_theme_wireframe/assets/component/tag/close.svg ouds_theme_wireframe/assets/functional/social-and-engagement/heart-empty.svg -ouds_theme_wireframe/assets/settings-and-tools/hide.svg +ouds_theme_wireframe/assets/functional/settings-and-tools/hide.svg ouds_theme_wireframe/fonts/ShantellSans-Bold.ttf ouds_theme_wireframe/fonts/ShantellSans-BoldItalic.ttf diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md index 2e3fc9695..46bca49b6 100644 --- a/app/CHANGELOG.md +++ b/app/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [DemoApp][Library] Use OUDS Icons V1.4 ([#515](https://github.com/Orange-OpenSource/ouds-flutter/issues/#515)) - [Library] Update homepage documentation ([#135](https://github.com/Orange-OpenSource/ouds-flutter/issues/#135)) - [Library] Integration of System library v2.3.0, component changelog v1.11 ([#513](https://github.com/Orange-OpenSource/ouds-flutter/issues/#513)) diff --git a/app/assets/orange/functional/social-and-engagement/heart-empty.svg b/app/assets/orange/functional/social-and-engagement/heart-empty.svg index 8a8aaf020..d05290605 100644 --- a/app/assets/orange/functional/social-and-engagement/heart-empty.svg +++ b/app/assets/orange/functional/social-and-engagement/heart-empty.svg @@ -1,3 +1,3 @@ - + diff --git a/app/assets/orange/functional/status-and-indicators/info-fill.svg b/app/assets/orange/functional/status-and-indicators/info-fill.svg new file mode 100644 index 000000000..1c6d9c3b3 --- /dev/null +++ b/app/assets/orange/functional/status-and-indicators/info-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/orange/functional/status-and-indicators/info.svg b/app/assets/orange/functional/status-and-indicators/info.svg deleted file mode 100644 index 344681d07..000000000 --- a/app/assets/orange/functional/status-and-indicators/info.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/app/assets/sosh/functional/social-and-engagement/heart-empty.svg b/app/assets/sosh/functional/social-and-engagement/heart-empty.svg index d80db4bf4..02cfc41a9 100644 --- a/app/assets/sosh/functional/social-and-engagement/heart-empty.svg +++ b/app/assets/sosh/functional/social-and-engagement/heart-empty.svg @@ -1,4 +1,4 @@ - - + + diff --git a/app/assets/sosh/functional/status-and-indicators/info.svg b/app/assets/sosh/functional/status-and-indicators/info-fill.svg similarity index 100% rename from app/assets/sosh/functional/status-and-indicators/info.svg rename to app/assets/sosh/functional/status-and-indicators/info-fill.svg diff --git a/app/assets/wireframe/functional/status-and-indicators/info.svg b/app/assets/wireframe/functional/status-and-indicators/info-fill.svg similarity index 100% rename from app/assets/wireframe/functional/status-and-indicators/info.svg rename to app/assets/wireframe/functional/status-and-indicators/info-fill.svg diff --git a/app/lib/ui/utilities/app_assets.dart b/app/lib/ui/utilities/app_assets.dart index d04cf8f42..7b2da47d3 100644 --- a/app/lib/ui/utilities/app_assets.dart +++ b/app/lib/ui/utilities/app_assets.dart @@ -53,7 +53,7 @@ class _Icons { String functionalSettingsAndToolsUiLightMode(ThemeController themeController) => '${themeController.getAssetsPath(themeController)}functional/settings-and-tools/ui-light-mode.svg'; String functionalSettingsAndToolsUiDarkMode(ThemeController themeController) => '${themeController.getAssetsPath(themeController)}functional/settings-and-tools/ui-dark-mode.svg'; String functionalSettingsAndToolsThemeSystem(ThemeController themeController) => '${themeController.getAssetsPath(themeController)}functional/settings-and-tools/theme-system.svg'; - String functionalStatusAndIndicatorsInfo(ThemeController themeController) => '${themeController.getAssetsPath(themeController)}functional/status-and-indicators/info.svg'; + String functionalStatusAndIndicatorsInfo(ThemeController themeController) => '${themeController.getAssetsPath(themeController)}functional/status-and-indicators/info-fill.svg'; String designTheme(ThemeController themeController) => '${themeController.getAssetsPath(themeController)}communication/design/theme.svg'; String designComponentAtom(ThemeController themeController) => '${themeController.getAssetsPath(themeController)}communication/design/component-atom.svg'; String designToken(ThemeController themeController) => '${themeController.getAssetsPath(themeController)}communication/design/design-token.svg'; diff --git a/ouds_core/CHANGELOG.md b/ouds_core/CHANGELOG.md index 9fe2b14ad..224e2f701 100644 --- a/ouds_core/CHANGELOG.md +++ b/ouds_core/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] Use OUDS Icons V1.4 ([#515](https://github.com/Orange-OpenSource/ouds-flutter/issues/#515)) - [Library] Update homepage documentation ([#135](https://github.com/Orange-OpenSource/ouds-flutter/issues/#135)) ### Fixed diff --git a/ouds_core/lib/components/badge/internal/ouds_badge_status_modifier.dart b/ouds_core/lib/components/badge/internal/ouds_badge_status_modifier.dart index 43cd97a57..57dead640 100644 --- a/ouds_core/lib/components/badge/internal/ouds_badge_status_modifier.dart +++ b/ouds_core/lib/components/badge/internal/ouds_badge_status_modifier.dart @@ -15,9 +15,9 @@ library; import 'package:flutter/material.dart'; -import 'package:ouds_theme_contract/ouds_theme.dart'; -import 'package:ouds_core/components/utilities/app_assets.dart'; import 'package:ouds_core/components/badge/ouds_badge.dart'; +import 'package:ouds_core/components/utilities/app_assets.dart'; +import 'package:ouds_theme_contract/ouds_theme.dart'; /// Modifier class to handle color logic based on badge status. class OudsBadgeStatusModifier { @@ -29,8 +29,8 @@ class OudsBadgeStatusModifier { Color getStatusColor(OudsBadgeStatus state, bool isEnabled) { final theme = OudsTheme.of(context).colorScheme(context); - if(!isEnabled){ - return theme.actionDisabled; + if (!isEnabled) { + return theme.actionDisabled; } switch (state) { case OudsBadgeStatus.neutral: @@ -52,7 +52,7 @@ class OudsBadgeStatusModifier { Color getStatusTextAndIconColor(OudsBadgeStatus state, bool isEnabled) { final theme = OudsTheme.of(context).colorScheme(context); - if(!isEnabled){ + if (!isEnabled) { return theme.contentOnActionDisabled; } @@ -76,13 +76,13 @@ class OudsBadgeStatusModifier { String? getStatusIcon(OudsBadgeStatus state) { switch (state) { case OudsBadgeStatus.positive: - return AppAssets.icons.componentAlertSuccess; + return AppAssets.icons.componentAlertTickConfirmationFill; case OudsBadgeStatus.info: - return AppAssets.icons.componentAlertInformation; + return AppAssets.icons.componentAlertInformationFill; case OudsBadgeStatus.warning: return AppAssets.icons.componentAlertWarningExternalShape; case OudsBadgeStatus.negative: - return AppAssets.icons.componentAlertImportant; + return AppAssets.icons.componentAlertImportantFill; case OudsBadgeStatus.neutral: case OudsBadgeStatus.accent: return null; diff --git a/ouds_core/lib/components/control/ouds_control_item.dart b/ouds_core/lib/components/control/ouds_control_item.dart index 9c84a57a6..d536bdae3 100644 --- a/ouds_core/lib/components/control/ouds_control_item.dart +++ b/ouds_core/lib/components/control/ouds_control_item.dart @@ -331,7 +331,7 @@ class OudsControlItemState extends State { padding: EdgeInsets.symmetric(horizontal: OudsTheme.of(context).componentsTokens(context).controlItem.spacePaddingInlineErrorIcon), child: SvgPicture.asset( excludeFromSemantics: true, - AppAssets.icons.componentAlertImportant, + AppAssets.icons.componentAlertImportantFill, package: OudsTheme.of(context).packageName, colorFilter: ColorFilter.mode( OudsControlTickModifier(context).getIconErrorColor(controlItemState), @@ -370,7 +370,7 @@ class OudsControlItemState extends State { padding: EdgeInsets.symmetric(horizontal: OudsTheme.of(context).componentsTokens(context).controlItem.spacePaddingInlineErrorIcon), child: SvgPicture.asset( excludeFromSemantics: true, - AppAssets.icons.componentAlertImportant, + AppAssets.icons.componentAlertImportantFill, package: OudsTheme.of(context).packageName, colorFilter: ColorFilter.mode( OudsControlTickModifier(context).getIconErrorColor(controlItemState), diff --git a/ouds_core/lib/components/form_input/ouds_text_input.dart b/ouds_core/lib/components/form_input/ouds_text_input.dart index 0fff7491a..17c37d1a0 100644 --- a/ouds_core/lib/components/form_input/ouds_text_input.dart +++ b/ouds_core/lib/components/form_input/ouds_text_input.dart @@ -243,8 +243,8 @@ class _OudsTextInputState extends State { final statusLabel = !isEnabled ? l10n?.core_common_disable_a11y ?? "" : isReadOnly - ? l10n?.core_common_disable_a11y ?? "" - : ""; + ? l10n?.core_common_disable_a11y ?? "" + : ""; // Build Semantics value final semanticsValue = [ @@ -255,10 +255,7 @@ class _OudsTextInputState extends State { suffixText, helperText, statusLabel, - ] - .where((s) => s != null && s.isNotEmpty) - .join(", "); - + ].where((s) => s != null && s.isNotEmpty).join(", "); return Semantics( label: semanticsValue, @@ -600,7 +597,7 @@ class _OudsTextInputState extends State { if (widget.decoration.errorText != null) ...[ SvgPicture.asset( excludeFromSemantics: true, - AppAssets.icons.componentAlertImportant, + AppAssets.icons.componentAlertImportantFill, package: theme.packageName, width: theme.componentsTokens(context).button.sizeIconOnly, height: theme.componentsTokens(context).button.sizeIconOnly, @@ -634,7 +631,7 @@ class _OudsTextInputState extends State { ), child: SvgPicture.asset( excludeFromSemantics: true, - AppAssets.icons.componentAlertImportant, + AppAssets.icons.componentAlertImportantFill, package: theme.packageName, width: theme.componentsTokens(context).button.sizeIconOnly, height: theme.componentsTokens(context).button.sizeIconOnly, diff --git a/ouds_core/lib/components/form_input/password_input/ouds_password_input.dart b/ouds_core/lib/components/form_input/password_input/ouds_password_input.dart index ee1256992..4c4da7422 100644 --- a/ouds_core/lib/components/form_input/password_input/ouds_password_input.dart +++ b/ouds_core/lib/components/form_input/password_input/ouds_password_input.dart @@ -543,7 +543,7 @@ class _OudsPasswordInputState extends State { if (widget.decoration.errorText != null) ...[ SvgPicture.asset( excludeFromSemantics: true, - AppAssets.icons.componentAlertImportant, + AppAssets.icons.componentAlertImportantFill, package: theme.packageName, width: theme.componentsTokens(context).button.sizeIconOnly, height: theme.componentsTokens(context).button.sizeIconOnly, diff --git a/ouds_core/lib/components/tag/internal/ouds_tag_status_modifier.dart b/ouds_core/lib/components/tag/internal/ouds_tag_status_modifier.dart index f9f37df38..81f7b8ceb 100644 --- a/ouds_core/lib/components/tag/internal/ouds_tag_status_modifier.dart +++ b/ouds_core/lib/components/tag/internal/ouds_tag_status_modifier.dart @@ -105,13 +105,13 @@ class OudsTagStatusModifier { String? getStatusIcon(OudsTagStatus state) { switch (state) { case OudsTagStatus.positive: - return AppAssets.icons.componentAlertSuccess; + return AppAssets.icons.componentAlertTickConfirmationFill; case OudsTagStatus.info: - return AppAssets.icons.componentAlertInformation; + return AppAssets.icons.componentAlertInformationFill; case OudsTagStatus.warning: return AppAssets.icons.componentAlertWarningExternalShape; case OudsTagStatus.negative: - return AppAssets.icons.componentAlertImportant; + return AppAssets.icons.componentAlertImportantFill; case OudsTagStatus.neutral: case OudsTagStatus.accent: return null; diff --git a/ouds_core/lib/components/utilities/app_assets.dart b/ouds_core/lib/components/utilities/app_assets.dart index 4c7a11a72..e5aad10be 100644 --- a/ouds_core/lib/components/utilities/app_assets.dart +++ b/ouds_core/lib/components/utilities/app_assets.dart @@ -30,9 +30,9 @@ class _Icons { _Icons(); final String roundedBullet = 'assets/ic_bullet_rounded.svg'; - final String componentAlertSuccess = 'assets/component/alert/success.svg'; - final String componentAlertImportant = 'assets/component/alert/important.svg'; - final String componentAlertInformation = 'assets/component/alert/information.svg'; + final String componentAlertTickConfirmationFill = 'assets/component/alert/tick-confirmation-fill.svg'; + final String componentAlertImportantFill = 'assets/component/alert/important-fill.svg'; + final String componentAlertInformationFill = 'assets/component/alert/info-fill.svg'; final String componentAlertWarning = 'assets/component/alert/warning.svg'; final String componentAlertWarningExternalShape = 'assets/component/alert/warning-external-shape.svg'; final String componentAlertWarningInternalShape = 'assets/component/alert/warning-internal-shape.svg'; @@ -48,7 +48,7 @@ class _Icons { final String componentTagClose = 'assets/component/tag/close.svg'; final String accessibilityAccessibilityVision = 'assets/communication/accessibility/accessibility-vision.svg'; - final String settingsAndToolsHide = 'assets/settings-and-tools/hide.svg'; + final String settingsAndToolsHide = 'assets/functional/settings-and-tools/hide.svg'; final String communicationSecurityAndSafetyLock = 'assets/communication/security-and-safety/lock.svg'; final String functionalSocialAndEngagementHeartEmpty = 'assets/functional/social-and-engagement/heart-empty.svg'; } diff --git a/ouds_theme_orange/CHANGELOG.md b/ouds_theme_orange/CHANGELOG.md index c6c1951f3..d79224f3a 100644 --- a/ouds_theme_orange/CHANGELOG.md +++ b/ouds_theme_orange/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] Use OUDS Icons V1.4 ([#515](https://github.com/Orange-OpenSource/ouds-flutter/issues/#515)) - [Library] Integration of System library v2.3.0, component changelog v1.11 ([#513](https://github.com/Orange-OpenSource/ouds-flutter/issues/#513)) ### Fixed diff --git a/ouds_theme_orange/assets/component/alert/important-fill.svg b/ouds_theme_orange/assets/component/alert/important-fill.svg new file mode 100644 index 000000000..0b8fe44fc --- /dev/null +++ b/ouds_theme_orange/assets/component/alert/important-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/ouds_theme_orange/assets/component/alert/important.svg b/ouds_theme_orange/assets/component/alert/important.svg deleted file mode 100644 index 1a9f6d644..000000000 --- a/ouds_theme_orange/assets/component/alert/important.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ouds_theme_orange/assets/component/alert/info-fill.svg b/ouds_theme_orange/assets/component/alert/info-fill.svg new file mode 100644 index 000000000..35e45d3b1 --- /dev/null +++ b/ouds_theme_orange/assets/component/alert/info-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/ouds_theme_orange/assets/component/alert/information.svg b/ouds_theme_orange/assets/component/alert/information.svg deleted file mode 100644 index 8195254cc..000000000 --- a/ouds_theme_orange/assets/component/alert/information.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ouds_theme_orange/assets/component/alert/success.svg b/ouds_theme_orange/assets/component/alert/success.svg deleted file mode 100644 index c4ded47d5..000000000 --- a/ouds_theme_orange/assets/component/alert/success.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ouds_theme_orange/assets/component/alert/tick-confirmation-fill.svg b/ouds_theme_orange/assets/component/alert/tick-confirmation-fill.svg new file mode 100644 index 000000000..47ec55f7c --- /dev/null +++ b/ouds_theme_orange/assets/component/alert/tick-confirmation-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/ouds_theme_orange/assets/component/alert/warning-external-shape.svg b/ouds_theme_orange/assets/component/alert/warning-external-shape.svg index e2ab3ff43..4139ad92c 100644 --- a/ouds_theme_orange/assets/component/alert/warning-external-shape.svg +++ b/ouds_theme_orange/assets/component/alert/warning-external-shape.svg @@ -1,3 +1,3 @@ - - + + diff --git a/ouds_theme_orange/assets/component/alert/warning-internal-shape.svg b/ouds_theme_orange/assets/component/alert/warning-internal-shape.svg index bb12497e3..2413797ed 100644 --- a/ouds_theme_orange/assets/component/alert/warning-internal-shape.svg +++ b/ouds_theme_orange/assets/component/alert/warning-internal-shape.svg @@ -1,3 +1,3 @@ - - + + diff --git a/ouds_theme_orange/assets/component/alert/warning.svg b/ouds_theme_orange/assets/component/alert/warning.svg index c733f6a28..b58238d3a 100644 --- a/ouds_theme_orange/assets/component/alert/warning.svg +++ b/ouds_theme_orange/assets/component/alert/warning.svg @@ -1,11 +1,11 @@ - + - - + + - + diff --git a/ouds_theme_orange/assets/settings-and-tools/hide.svg b/ouds_theme_orange/assets/functional/settings-and-tools/hide.svg similarity index 100% rename from ouds_theme_orange/assets/settings-and-tools/hide.svg rename to ouds_theme_orange/assets/functional/settings-and-tools/hide.svg diff --git a/ouds_theme_orange/assets/functional/social-and-engagement/heart-empty.svg b/ouds_theme_orange/assets/functional/social-and-engagement/heart-empty.svg index 8a8aaf020..d05290605 100644 --- a/ouds_theme_orange/assets/functional/social-and-engagement/heart-empty.svg +++ b/ouds_theme_orange/assets/functional/social-and-engagement/heart-empty.svg @@ -1,3 +1,3 @@ - + diff --git a/ouds_theme_orange/pubspec.yaml b/ouds_theme_orange/pubspec.yaml index 0634ad392..d513f172d 100644 --- a/ouds_theme_orange/pubspec.yaml +++ b/ouds_theme_orange/pubspec.yaml @@ -46,7 +46,6 @@ flutter: # To add assets to your package, add an assets section, like this: assets: - assets/ - - assets/settings-and-tools/ - assets/component/alert/ - assets/component/checkbox/ - assets/component/button/ @@ -58,6 +57,7 @@ flutter: - assets/communication/accessibility/ - assets/communication/security-and-safety/ - assets/functional/social-and-engagement/ + - assets/functional/settings-and-tools/ # - images/a_dot_ham.jpeg # # For details regarding assets in packages, see diff --git a/ouds_theme_sosh/CHANGELOG.md b/ouds_theme_sosh/CHANGELOG.md index d1aa4d923..85673638e 100644 --- a/ouds_theme_sosh/CHANGELOG.md +++ b/ouds_theme_sosh/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] Use OUDS Icons V1.4 ([#515](https://github.com/Orange-OpenSource/ouds-flutter/issues/#515)) - [Library] Integration of System library v2.3.0, component changelog v1.11 ([#513](https://github.com/Orange-OpenSource/ouds-flutter/issues/#513)) ### Fixed diff --git a/ouds_theme_sosh/assets/component/alert/important-fill.svg b/ouds_theme_sosh/assets/component/alert/important-fill.svg new file mode 100644 index 000000000..e968e0042 --- /dev/null +++ b/ouds_theme_sosh/assets/component/alert/important-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/ouds_theme_sosh/assets/component/alert/important.svg b/ouds_theme_sosh/assets/component/alert/important.svg deleted file mode 100644 index 876acfe39..000000000 --- a/ouds_theme_sosh/assets/component/alert/important.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ouds_theme_sosh/assets/component/alert/info-fill.svg b/ouds_theme_sosh/assets/component/alert/info-fill.svg new file mode 100644 index 000000000..79c8ee58e --- /dev/null +++ b/ouds_theme_sosh/assets/component/alert/info-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/ouds_theme_sosh/assets/component/alert/information.svg b/ouds_theme_sosh/assets/component/alert/information.svg deleted file mode 100644 index 6b2b6dc49..000000000 --- a/ouds_theme_sosh/assets/component/alert/information.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ouds_theme_sosh/assets/component/alert/success.svg b/ouds_theme_sosh/assets/component/alert/success.svg deleted file mode 100644 index d3a4da2df..000000000 --- a/ouds_theme_sosh/assets/component/alert/success.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ouds_theme_sosh/assets/component/alert/tick-confirmation-fill.svg b/ouds_theme_sosh/assets/component/alert/tick-confirmation-fill.svg new file mode 100644 index 000000000..c538bd69a --- /dev/null +++ b/ouds_theme_sosh/assets/component/alert/tick-confirmation-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/ouds_theme_sosh/assets/component/alert/warning-external-shape.svg b/ouds_theme_sosh/assets/component/alert/warning-external-shape.svg index 3318ea757..ea3bd40fd 100644 --- a/ouds_theme_sosh/assets/component/alert/warning-external-shape.svg +++ b/ouds_theme_sosh/assets/component/alert/warning-external-shape.svg @@ -1,3 +1,3 @@ - + diff --git a/ouds_theme_sosh/assets/component/alert/warning-internal-shape.svg b/ouds_theme_sosh/assets/component/alert/warning-internal-shape.svg index 53f33cf9f..4c7060473 100644 --- a/ouds_theme_sosh/assets/component/alert/warning-internal-shape.svg +++ b/ouds_theme_sosh/assets/component/alert/warning-internal-shape.svg @@ -1,3 +1,3 @@ - + diff --git a/ouds_theme_sosh/assets/component/alert/warning.svg b/ouds_theme_sosh/assets/component/alert/warning.svg index 8a03970e1..2bc873149 100644 --- a/ouds_theme_sosh/assets/component/alert/warning.svg +++ b/ouds_theme_sosh/assets/component/alert/warning.svg @@ -1,6 +1,6 @@ - + diff --git a/ouds_theme_sosh/assets/component/radio-button/radio-button-selected.svg b/ouds_theme_sosh/assets/component/radio-button/radio-button-selected.svg index 07753a972..65aaa65fd 100644 --- a/ouds_theme_sosh/assets/component/radio-button/radio-button-selected.svg +++ b/ouds_theme_sosh/assets/component/radio-button/radio-button-selected.svg @@ -1,6 +1,6 @@ - + diff --git a/ouds_theme_sosh/assets/settings-and-tools/hide.svg b/ouds_theme_sosh/assets/functional/settings-and-tools/hide.svg similarity index 100% rename from ouds_theme_sosh/assets/settings-and-tools/hide.svg rename to ouds_theme_sosh/assets/functional/settings-and-tools/hide.svg diff --git a/ouds_theme_sosh/assets/functional/social-and-engagement/heart-empty.svg b/ouds_theme_sosh/assets/functional/social-and-engagement/heart-empty.svg index d80db4bf4..02cfc41a9 100644 --- a/ouds_theme_sosh/assets/functional/social-and-engagement/heart-empty.svg +++ b/ouds_theme_sosh/assets/functional/social-and-engagement/heart-empty.svg @@ -1,4 +1,4 @@ - - + + diff --git a/ouds_theme_sosh/pubspec.yaml b/ouds_theme_sosh/pubspec.yaml index bc3c50b30..a07d62b14 100644 --- a/ouds_theme_sosh/pubspec.yaml +++ b/ouds_theme_sosh/pubspec.yaml @@ -40,7 +40,6 @@ flutter: # To add assets to your package, add an assets section, like this: assets: - assets/ - - assets/settings-and-tools/ - assets/component/alert/ - assets/component/checkbox/ - assets/component/button/ @@ -52,6 +51,7 @@ flutter: - assets/communication/accessibility/ - assets/communication/security-and-safety/ - assets/functional/social-and-engagement/ + - assets/functional/settings-and-tools/ # - images/a_dot_ham.jpeg # # For details regarding assets in packages, see diff --git a/ouds_theme_wireframe/CHANGELOG.md b/ouds_theme_wireframe/CHANGELOG.md index 281251af3..05ca44c35 100644 --- a/ouds_theme_wireframe/CHANGELOG.md +++ b/ouds_theme_wireframe/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] Use OUDS Icons V1.4 ([#515](https://github.com/Orange-OpenSource/ouds-flutter/issues/#515)) - [Library] Integration of System library v2.3.0, component changelog v1.11 ([#513](https://github.com/Orange-OpenSource/ouds-flutter/issues/#513)) ### Fixed diff --git a/ouds_theme_wireframe/assets/component/alert/important-fill.svg b/ouds_theme_wireframe/assets/component/alert/important-fill.svg new file mode 100644 index 000000000..5e38bf105 --- /dev/null +++ b/ouds_theme_wireframe/assets/component/alert/important-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/ouds_theme_wireframe/assets/component/alert/important.svg b/ouds_theme_wireframe/assets/component/alert/important.svg deleted file mode 100644 index 63e45cfe4..000000000 --- a/ouds_theme_wireframe/assets/component/alert/important.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ouds_theme_wireframe/assets/component/alert/info-fill.svg b/ouds_theme_wireframe/assets/component/alert/info-fill.svg new file mode 100644 index 000000000..21c72e769 --- /dev/null +++ b/ouds_theme_wireframe/assets/component/alert/info-fill.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ouds_theme_wireframe/assets/component/alert/information.svg b/ouds_theme_wireframe/assets/component/alert/information.svg deleted file mode 100644 index be20f9810..000000000 --- a/ouds_theme_wireframe/assets/component/alert/information.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ouds_theme_wireframe/assets/component/alert/success.svg b/ouds_theme_wireframe/assets/component/alert/success.svg deleted file mode 100644 index 94b8189aa..000000000 --- a/ouds_theme_wireframe/assets/component/alert/success.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ouds_theme_wireframe/assets/component/alert/tick-confirmation-fill.svg b/ouds_theme_wireframe/assets/component/alert/tick-confirmation-fill.svg new file mode 100644 index 000000000..1ef5e7fc8 --- /dev/null +++ b/ouds_theme_wireframe/assets/component/alert/tick-confirmation-fill.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ouds_theme_wireframe/assets/component/alert/warning-external-shape.svg b/ouds_theme_wireframe/assets/component/alert/warning-external-shape.svg index fa6b62442..e7055de69 100644 --- a/ouds_theme_wireframe/assets/component/alert/warning-external-shape.svg +++ b/ouds_theme_wireframe/assets/component/alert/warning-external-shape.svg @@ -1,4 +1,4 @@ - - + + diff --git a/ouds_theme_wireframe/assets/component/alert/warning-internal-shape.svg b/ouds_theme_wireframe/assets/component/alert/warning-internal-shape.svg index 9024c0f1e..bbbe4c9e6 100644 --- a/ouds_theme_wireframe/assets/component/alert/warning-internal-shape.svg +++ b/ouds_theme_wireframe/assets/component/alert/warning-internal-shape.svg @@ -1,3 +1,3 @@ - + diff --git a/ouds_theme_wireframe/assets/component/alert/warning.svg b/ouds_theme_wireframe/assets/component/alert/warning.svg index ce61d5c9d..5875cfb57 100644 --- a/ouds_theme_wireframe/assets/component/alert/warning.svg +++ b/ouds_theme_wireframe/assets/component/alert/warning.svg @@ -1,6 +1,6 @@ - + diff --git a/ouds_theme_wireframe/assets/component/link/previous.svg b/ouds_theme_wireframe/assets/component/link/previuos.svg similarity index 100% rename from ouds_theme_wireframe/assets/component/link/previous.svg rename to ouds_theme_wireframe/assets/component/link/previuos.svg diff --git a/ouds_theme_wireframe/assets/settings-and-tools/hide.svg b/ouds_theme_wireframe/assets/functional/settings-and-tools/hide.svg similarity index 100% rename from ouds_theme_wireframe/assets/settings-and-tools/hide.svg rename to ouds_theme_wireframe/assets/functional/settings-and-tools/hide.svg diff --git a/ouds_theme_wireframe/pubspec.yaml b/ouds_theme_wireframe/pubspec.yaml index 3e763063d..6a2efecb6 100644 --- a/ouds_theme_wireframe/pubspec.yaml +++ b/ouds_theme_wireframe/pubspec.yaml @@ -44,7 +44,6 @@ flutter: # To add assets to your package, add an assets section, like this: assets: - assets/ - - assets/settings-and-tools/ - assets/component/alert/ - assets/component/checkbox/ - assets/component/button/ @@ -56,6 +55,8 @@ flutter: - assets/communication/accessibility/ - assets/communication/security-and-safety/ - assets/functional/social-and-engagement/ + - assets/functional/settings-and-tools/ + # - images/a_dot_ham.jpeg # # For details regarding assets in packages, see