Commit fc7f5f3
committed
Merge branch 'main' into sync-develop-main-1.2.0
# Conflicts:
# .github/workflows/build.yml
# NOTICE.txt
# README.md
# app/CHANGELOG.md
# app/lib/l10n/gen/ouds_flutter_app_localizations.dart
# app/lib/l10n/gen/ouds_flutter_app_localizations_ar.dart
# app/lib/l10n/gen/ouds_flutter_app_localizations_en.dart
# app/lib/l10n/ouds_flutter_ar.arb
# app/lib/l10n/ouds_flutter_en.arb
# app/lib/main.dart
# app/lib/main_app_bar.dart
# app/lib/ui/about/about_screen.dart
# app/lib/ui/about/detail/about_file_screen.dart
# app/lib/ui/components/badge/badge_code_generator.dart
# app/lib/ui/components/badge/badge_customization_utils.dart
# app/lib/ui/components/badge/badge_demo_screen.dart
# app/lib/ui/components/button/button_demo_screen.dart
# app/lib/ui/components/checkbox/checkbox_demo_screen.dart
# app/lib/ui/components/checkbox/checkbox_item_demo_screen.dart
# app/lib/ui/components/chip/chip_filter_demo_sreen.dart
# app/lib/ui/components/chip/chip_suggestion_demo_screen.dart
# app/lib/ui/components/components.dart
# app/lib/ui/components/components_screen.dart
# app/lib/ui/components/divider/divider_demo_screen.dart
# app/lib/ui/components/form_input/form_fields_customization.dart
# app/lib/ui/components/form_input/password_input/password_input_demo_screen.dart
# app/lib/ui/components/form_input/phone_number/phone_number_input_demo_screen.dart
# app/lib/ui/components/form_input/text_input/text_input_demo_screen.dart
# app/lib/ui/components/link/link_demo_screen.dart
# app/lib/ui/components/navigation/navigation_bar_customization_utils.dart
# app/lib/ui/components/navigation/navigation_bar_demo_screen.dart
# app/lib/ui/components/pin_code_input/pin_code_input_customization.dart
# app/lib/ui/components/pin_code_input/pin_code_input_demo_screen.dart
# app/lib/ui/components/radio_button/radio_button_demo_screen.dart
# app/lib/ui/components/radio_button/radio_button_item_demo_screen.dart
# app/lib/ui/components/switch/switch_demo_screen.dart
# app/lib/ui/components/switch/switch_item_demo_screen.dart
# app/lib/ui/components/tag/input_tag_demo_screen.dart
# app/lib/ui/components/tag/tag_code_generator.dart
# app/lib/ui/components/tag/tag_customization.dart
# app/lib/ui/components/tag/tag_customization_utils.dart
# app/lib/ui/components/tag/tag_demo_screen.dart
# app/lib/ui/theme/theme_controller.dart
# app/lib/ui/theme/theme_selector.dart
# app/lib/ui/tokens/border/border_screen.dart
# app/lib/ui/tokens/token_screen.dart
# app/lib/ui/tokens/tokens.dart
# app/lib/ui/utilities/app_assets.dart
# app/lib/ui/utilities/component_screen_header.dart
# app/lib/ui/utilities/customizable/customizable_chips.dart
# app/lib/ui/utilities/customizable/customizable_textfield.dart
# app/lib/ui/utilities/customizable/customizable_widget_state.dart
# app/lib/ui/utilities/reference_design_version_component.dart
# app/lib/ui/utilities/sheets_bottom/ouds_sheets_bottom.dart
# app/pubspec.yaml
# ouds_core/CHANGELOG.md
# ouds_core/README.md
# ouds_core/lib/components/badge/internal/ouds_badge_status_modifier.dart
# ouds_core/lib/components/badge/ouds_badge.dart
# ouds_core/lib/components/button/ouds_button.dart
# ouds_core/lib/components/checkbox/ouds_checkbox.dart
# ouds_core/lib/components/checkbox/ouds_checkbox_item.dart
# ouds_core/lib/components/chip/ouds_filter_chip.dart
# ouds_core/lib/components/chip/ouds_suggestion_chip.dart
# ouds_core/lib/components/divider/ouds_divider.dart
# ouds_core/lib/components/form_input/ouds_phone_number_input.dart
# ouds_core/lib/components/form_input/ouds_text_input.dart
# ouds_core/lib/components/form_input/password_input/ouds_password_input.dart
# ouds_core/lib/components/link/ouds_link.dart
# ouds_core/lib/components/navigation/ouds_navigation_bar.dart
# ouds_core/lib/components/navigation/ouds_navigation_bar_item.dart
# ouds_core/lib/components/navigation/ouds_tab_bar.dart
# ouds_core/lib/components/pin_code_input/ouds_pin_code_input.dart
# ouds_core/lib/components/radio_button/ouds_radio_button.dart
# ouds_core/lib/components/radio_button/ouds_radio_button_item.dart
# ouds_core/lib/components/switch/ouds_switch.dart
# ouds_core/lib/components/switch/ouds_switch_item.dart
# ouds_core/lib/components/tag/internal/ouds_tag_border_modifier.dart
# ouds_core/lib/components/tag/internal/ouds_tag_status_modifier.dart
# ouds_core/lib/components/tag/internal/ouds_tag_text_style_modifier.dart
# ouds_core/lib/components/tag/ouds_input_tag.dart
# ouds_core/lib/components/tag/ouds_tag.dart
# ouds_core/lib/components/utilities/app_assets.dart
# ouds_core/lib/l10n/gen/ouds_localizations.dart
# ouds_core/lib/l10n/gen/ouds_localizations_ar.dart
# ouds_core/lib/l10n/gen/ouds_localizations_en.dart
# ouds_core/lib/l10n/ouds_flutter_ar.arb
# ouds_core/lib/l10n/ouds_flutter_en.arb
# ouds_core/lib/theme/ouds_theme_tweak.dart
# ouds_core/pubspec.yaml
# ouds_global_raw_tokens/CHANGELOG.md
# ouds_global_raw_tokens/README.md
# ouds_global_raw_tokens/pubspec.yaml
# ouds_theme_contract/CHANGELOG.md
# ouds_theme_contract/README.md
# ouds_theme_contract/lib/config/component/ouds_tag_config.dart
# ouds_theme_contract/lib/config/ouds_theme_config_model.dart
# ouds_theme_contract/pubspec.yaml
# ouds_theme_orange/CHANGELOG.md
# ouds_theme_orange/README.md
# ouds_theme_orange/lib/orange_font_helper.dart
# ouds_theme_orange/lib/orange_font_provider.dart
# ouds_theme_orange/lib/orange_font_service.dart
# ouds_theme_orange/lib/orange_theme.dart
# ouds_theme_orange/pubspec.yaml
# ouds_theme_orange_compact/CHANGELOG.md
# ouds_theme_orange_compact/README.md
# ouds_theme_orange_compact/lib/orange_compact_theme.dart
# ouds_theme_orange_compact/pubspec.yaml
# ouds_theme_sosh/CHANGELOG.md
# ouds_theme_sosh/README.md
# ouds_theme_sosh/pubspec.yaml
# ouds_theme_wireframe/CHANGELOG.md
# ouds_theme_wireframe/README.md
# ouds_theme_wireframe/pubspec.yaml66 files changed
Lines changed: 996 additions & 1 deletion
File tree
- app
- assets
- orange/functional/status-and-indicators
- sosh/functional/status-and-indicators
- wireframe/functional/status-and-indicators
- lib/ui/utilities
- ouds_core
- assets
- lib/components/utilities
- ouds_theme_contract/lib
- theme/tokens/components
- ouds_theme_orange_compact/lib
- ouds_theme_orange
- assets
- component/alert
- settings-and-tools
- lib/components
- ouds_theme_sosh
- assets
- component/alert
- settings-and-tools
- lib/components
- ouds_theme_wireframe/assets
- component
- alert
- button
- link
- settings-and-tools
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 3 additions & 0 deletions
Loading
Loading
Lines changed: 3 additions & 0 deletions
Loading
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
Loading
Loading
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
131 | 131 | | |
132 | 132 | | |
133 | 133 | | |
134 | | - | |
| 134 | + | |
Lines changed: 33 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
Loading
0 commit comments