Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions app/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions app/assets/orange/functional/status-and-indicators/info.svg

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/lib/ui/utilities/app_assets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
1 change: 1 addition & 0 deletions ouds_core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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:
Expand All @@ -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;
}

Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ouds_core/lib/components/control/ouds_control_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ class OudsControlItemState extends State<OudsControlItem> {
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),
Expand Down Expand Up @@ -370,7 +370,7 @@ class OudsControlItemState extends State<OudsControlItem> {
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),
Expand Down
13 changes: 5 additions & 8 deletions ouds_core/lib/components/form_input/ouds_text_input.dart
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ class _OudsTextInputState extends State<OudsTextField> {
final statusLabel = !isEnabled
? l10n?.core_common_disable_a11y ?? ""
: isReadOnly
? l10n?.core_common_disable_a11y ?? ""
: "";
? l10n?.core_common_disable_a11y ?? ""
: "";

// Build Semantics value
final semanticsValue = [
Expand All @@ -255,10 +255,7 @@ class _OudsTextInputState extends State<OudsTextField> {
suffixText,
helperText,
statusLabel,
]
.where((s) => s != null && s.isNotEmpty)
.join(", ");

].where((s) => s != null && s.isNotEmpty).join(", ");

return Semantics(
label: semanticsValue,
Expand Down Expand Up @@ -600,7 +597,7 @@ class _OudsTextInputState extends State<OudsTextField> {
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,
Expand Down Expand Up @@ -634,7 +631,7 @@ class _OudsTextInputState extends State<OudsTextField> {
),
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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ class _OudsPasswordInputState extends State<OudsPasswordInput> {
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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ouds_core/lib/components/utilities/app_assets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
}
Expand Down
1 change: 1 addition & 0 deletions ouds_theme_orange/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ouds_theme_orange/assets/component/alert/important-fill.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions ouds_theme_orange/assets/component/alert/important.svg

This file was deleted.

Loading
Loading