feat(cat-voices): new overlay and dropshadow colors (#1526)

* chore: make VoicesColorScheme properties not nullable * Dialog barrier and shadow colors --------- Co-authored-by: Oleksandr Prokhorenko <[email protected]>
input-output-hk · Jan 16, 2025 · 45f8b63 · 45f8b63
1 parent 56454b6
commit 45f8b63
Show file tree

Hide file tree

Showing 37 changed files with 278 additions and 239 deletions.
diff --git a/catalyst_voices/apps/voices/lib/common/ext/space_ext.dart b/catalyst_voices/apps/voices/lib/common/ext/space_ext.dart
@@ -41,19 +41,19 @@ extension SpaceExt on Space {
 
   Color backgroundColor(BuildContext context) => switch (this) {
         Space.discovery =>
-          Theme.of(context).colors.iconsSecondary!.withOpacity(0.16),
+          Theme.of(context).colors.iconsSecondary.withOpacity(0.16),
         Space.workspace => Theme.of(context).colorScheme.primaryContainer,
-        Space.voting => Theme.of(context).colors.warningContainer!,
+        Space.voting => Theme.of(context).colors.warningContainer,
         Space.fundedProjects =>
-          Theme.of(context).colors.iconsSecondary!.withOpacity(0.16),
-        Space.treasury => Theme.of(context).colors.successContainer!,
+          Theme.of(context).colors.iconsSecondary.withOpacity(0.16),
+        Space.treasury => Theme.of(context).colors.successContainer,
       };
 
   Color foregroundColor(BuildContext context) => switch (this) {
-        Space.discovery => Theme.of(context).colors.iconsSecondary!,
+        Space.discovery => Theme.of(context).colors.iconsSecondary,
         Space.workspace => Theme.of(context).colorScheme.primary,
-        Space.voting => Theme.of(context).colors.iconsWarning!,
-        Space.fundedProjects => Theme.of(context).colors.iconsSecondary!,
-        Space.treasury => Theme.of(context).colors.iconsSuccess!,
+        Space.voting => Theme.of(context).colors.iconsWarning,
+        Space.fundedProjects => Theme.of(context).colors.iconsSecondary,
+        Space.treasury => Theme.of(context).colors.iconsSuccess,
       };
 }
diff --git a/catalyst_voices/apps/voices/lib/pages/account/account_page.dart b/catalyst_voices/apps/voices/lib/pages/account/account_page.dart
@@ -120,7 +120,7 @@ class _KeychainCard extends StatelessWidget {
           Radius.circular(16),
         ),
         border: Border.all(
-          color: Theme.of(context).colors.outlineBorderVariant!,
+          color: Theme.of(context).colors.outlineBorderVariant,
           width: 1,
         ),
         color: Theme.of(context).colors.elevationsOnSurfaceNeutralLv1White,

diff --git a/catalyst_voices/apps/voices/lib/pages/campaign/admin_tools/campaign_admin_tools_dialog.dart b/catalyst_voices/apps/voices/lib/pages/campaign/admin_tools/campaign_admin_tools_dialog.dart
@@ -163,7 +163,7 @@ class CampaignAdminToolsDialog extends StatelessWidget {
         color: Theme.of(context).colors.elevationsOnSurfaceNeutralLv1White,
         borderRadius: BorderRadius.circular(16),
         border: Border.all(
-          color: Theme.of(context).colors.onSurfaceNeutral012!,
+          color: Theme.of(context).colors.onSurfaceNeutral012,
           width: 1,
         ),
       ),

diff --git a/catalyst_voices/apps/voices/lib/pages/campaign/details/widgets/campaign_management.dart b/catalyst_voices/apps/voices/lib/pages/campaign/details/widgets/campaign_management.dart
@@ -82,7 +82,7 @@ class _CampaignStatusIndicator extends StatelessWidget {
         decoration: BoxDecoration(
           color: currentStatus == campaignStatus
               ? theme.colors.success
-              : theme.colors.onSurfaceNeutral012?.withOpacity(.12),
+              : theme.colors.onSurfaceNeutral012.withOpacity(.12),
           borderRadius: BorderRadius.circular(8),
         ),
         child: Padding(

diff --git a/catalyst_voices/apps/voices/lib/pages/discovery/discovery_page.dart b/catalyst_voices/apps/voices/lib/pages/discovery/discovery_page.dart
@@ -112,7 +112,7 @@ class _Segment extends StatelessWidget {
       child: Container(
         decoration: BoxDecoration(
           color: theme.colors.elevationsOnSurfaceNeutralLv1White,
-          border: Border.all(color: theme.colors.outlineBorderVariant!),
+          border: Border.all(color: theme.colors.outlineBorderVariant),
           borderRadius: BorderRadius.circular(12),
         ),
         padding: const EdgeInsets.all(16),

diff --git a/catalyst_voices/apps/voices/lib/pages/overall_spaces/brands_navigation.dart b/catalyst_voices/apps/voices/lib/pages/overall_spaces/brands_navigation.dart
@@ -166,7 +166,7 @@ final class _BackgroundColor implements WidgetStateProperty<Color?> {
   @override
   Color? resolve(Set<WidgetState> states) {
     if (states.contains(WidgetState.selected)) {
-      return colors.onSurfacePrimaryContainer?.withOpacity(0.12);
+      return colors.onSurfacePrimaryContainer.withOpacity(0.12);
     }
 
     return Colors.transparent;
@@ -181,7 +181,7 @@ final class _ForegroundColor implements WidgetStateProperty<Color?> {
   @override
   Color? resolve(Set<WidgetState> states) {
     if (states.contains(WidgetState.disabled)) {
-      return colors.textOnPrimaryLevel0?.withOpacity(0.3);
+      return colors.textOnPrimaryLevel0.withOpacity(0.3);
     }
 
     return colors.textOnPrimaryLevel0;

diff --git a/...yst_voices/apps/voices/lib/pages/registration/upload_seed_phrase_confirmation_dialog.dart b/...yst_voices/apps/voices/lib/pages/registration/upload_seed_phrase_confirmation_dialog.dart
@@ -34,7 +34,7 @@ class UploadSeedPhraseConfirmationDialog extends StatelessWidget {
           color: Theme.of(context).colors.iconsError,
         ),
         border: Border.all(
-          color: Theme.of(context).colors.iconsError!,
+          color: Theme.of(context).colors.iconsError,
           width: 3,
         ),
       ),

diff --git a/catalyst_voices/apps/voices/lib/pages/registration/wallet_link/account_role_dialog.dart b/catalyst_voices/apps/voices/lib/pages/registration/wallet_link/account_role_dialog.dart
@@ -134,7 +134,7 @@ class _InfoContainer extends StatelessWidget {
           color: Theme.of(context).colors.elevationsOnSurfaceNeutralLv1White,
           borderRadius: BorderRadius.circular(10),
           border: Border.all(
-            color: Theme.of(context).colors.outlineBorderVariant!,
+            color: Theme.of(context).colors.outlineBorderVariant,
           ),
         ),
         child: child,

diff --git a/...t_voices/apps/voices/lib/pages/registration/wallet_link/stage/rbac_transaction_panel.dart b/...t_voices/apps/voices/lib/pages/registration/wallet_link/stage/rbac_transaction_panel.dart
@@ -166,7 +166,7 @@ class _Summary extends StatelessWidget {
         borderRadius: BorderRadius.circular(8),
         border: Border.all(
           width: 1.5,
-          color: Theme.of(context).colors.outlineBorderVariant!,
+          color: Theme.of(context).colors.outlineBorderVariant,
         ),
       ),
       child: Column(

diff --git a/catalyst_voices/apps/voices/lib/pages/registration/widgets/exit_confirm_dialog.dart b/catalyst_voices/apps/voices/lib/pages/registration/widgets/exit_confirm_dialog.dart
@@ -80,7 +80,7 @@ class _WarningIcon extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final color = theme.colors.iconsError!;
+    final color = theme.colors.iconsError;
 
     return VoicesAvatar(
       border: Border.all(

diff --git a/catalyst_voices/apps/voices/lib/pages/registration/widgets/wallet_summary.dart b/catalyst_voices/apps/voices/lib/pages/registration/widgets/wallet_summary.dart
@@ -27,7 +27,7 @@ class WalletSummary extends StatelessWidget {
         borderRadius: BorderRadius.circular(8),
         border: Border.all(
           width: 1.5,
-          color: Theme.of(context).colors.outlineBorderVariant!,
+          color: Theme.of(context).colors.outlineBorderVariant,
         ),
       ),
       child: Column(

diff --git a/catalyst_voices/apps/voices/lib/widgets/buttons/voices_icon_button.dart b/catalyst_voices/apps/voices/lib/widgets/buttons/voices_icon_button.dart
@@ -93,10 +93,10 @@ class VoicesIconButton extends StatelessWidget {
           side: WidgetStateProperty.resolveWith(
             (states) {
               if (states.contains(WidgetState.disabled)) {
-                return BorderSide(color: colors.onSurfaceNeutral012!);
+                return BorderSide(color: colors.onSurfaceNeutral012);
               }
 
-              return BorderSide(color: colors.outlineBorderVariant!);
+              return BorderSide(color: colors.outlineBorderVariant);
             },
           ),
         ),

diff --git a/catalyst_voices/apps/voices/lib/widgets/cards/campaign_stage_card.dart b/catalyst_voices/apps/voices/lib/widgets/cards/campaign_stage_card.dart
@@ -22,7 +22,7 @@ class CampaignStageCard extends StatelessWidget {
       decoration: BoxDecoration(
         color: theme.colors.elevationsOnSurfaceNeutralLv1White,
         border: Border.all(
-          color: theme.colors.outlineBorderVariant!,
+          color: theme.colors.outlineBorderVariant,
         ),
         borderRadius: BorderRadius.circular(20),
       ),

diff --git a/catalyst_voices/apps/voices/lib/widgets/cards/funded_proposal_card.dart b/catalyst_voices/apps/voices/lib/widgets/cards/funded_proposal_card.dart
@@ -195,7 +195,7 @@ class _FundsAndComments extends StatelessWidget {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
       decoration: BoxDecoration(
-        color: Theme.of(context).colors.success?.withOpacity(0.08),
+        color: Theme.of(context).colors.success.withOpacity(0.08),
         borderRadius: BorderRadius.circular(8),
       ),
       child: Row(

diff --git a/catalyst_voices/apps/voices/lib/widgets/cards/role_chooser_card.dart b/catalyst_voices/apps/voices/lib/widgets/cards/role_chooser_card.dart
@@ -54,7 +54,7 @@ class RoleChooserCard extends StatelessWidget {
           ? null
           : BoxDecoration(
               border: Border.all(
-                color: Theme.of(context).colors.outlineBorderVariant!,
+                color: Theme.of(context).colors.outlineBorderVariant,
                 width: 1,
               ),
               borderRadius: BorderRadius.circular(8),

diff --git a/catalyst_voices/apps/voices/lib/widgets/chips/voices_chip.dart b/catalyst_voices/apps/voices/lib/widgets/chips/voices_chip.dart
@@ -70,7 +70,7 @@ class VoicesChip extends StatelessWidget {
         border: backgroundColor != null
             ? null
             : Border.all(
-                color: Theme.of(context).colors.outlineBorderVariant!,
+                color: Theme.of(context).colors.outlineBorderVariant,
               ),
         borderRadius: borderRadius,
       ),

diff --git a/catalyst_voices/apps/voices/lib/widgets/containers/roles_summary_container.dart b/catalyst_voices/apps/voices/lib/widgets/containers/roles_summary_container.dart
@@ -26,7 +26,7 @@ class RolesSummaryContainer extends StatelessWidget {
     return DecoratedBox(
       decoration: BoxDecoration(
         border: Border.all(
-          color: Theme.of(context).colors.outlineBorderVariant!,
+          color: Theme.of(context).colors.outlineBorderVariant,
           width: 1.5,
         ),
         borderRadius: BorderRadius.circular(8),

diff --git a/catalyst_voices/apps/voices/lib/widgets/containers/workspace_text_tile_container.dart b/catalyst_voices/apps/voices/lib/widgets/containers/workspace_text_tile_container.dart
@@ -33,7 +33,7 @@ class WorkspaceTextTileContainer extends StatelessWidget {
         ),
         boxShadow: [
           BoxShadow(
-            color: Theme.of(context).colors.elevationsOnSurfaceNeutralLv0!,
+            color: Theme.of(context).colors.elevationsOnSurfaceNeutralLv0,
             offset: const Offset(0, 1),
             blurRadius: 4,
           ),

diff --git a/catalyst_voices/apps/voices/lib/widgets/dropdown/voices_dropdown.dart b/catalyst_voices/apps/voices/lib/widgets/dropdown/voices_dropdown.dart
@@ -127,7 +127,7 @@ class SingleSelectDropdown<T> extends StatelessWidget {
 
   OutlineInputBorder _border(BuildContext context) => OutlineInputBorder(
         borderSide: BorderSide(
-          color: Theme.of(context).colors.outlineBorderVariant!,
+          color: Theme.of(context).colors.outlineBorderVariant,
         ),
       );
 }
diff --git a/catalyst_voices/apps/voices/lib/widgets/indicators/voices_indicator.dart b/catalyst_voices/apps/voices/lib/widgets/indicators/voices_indicator.dart
@@ -9,9 +9,9 @@ enum VoicesIndicatorType {
 
   Color _iconColor(BuildContext context) {
     return switch (this) {
-      VoicesIndicatorType.normal => Theme.of(context).colors.iconsForeground!,
-      VoicesIndicatorType.error => Theme.of(context).colors.iconsError!,
-      VoicesIndicatorType.success => Theme.of(context).colors.iconsSuccess!,
+      VoicesIndicatorType.normal => Theme.of(context).colors.iconsForeground,
+      VoicesIndicatorType.error => Theme.of(context).colors.iconsError,
+      VoicesIndicatorType.success => Theme.of(context).colors.iconsSuccess,
     };
   }
 }
@@ -38,7 +38,7 @@ class VoicesIndicator extends StatelessWidget {
       padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 16),
       decoration: BoxDecoration(
         border: Border.all(
-          color: theme.colors.outlineBorderVariant!,
+          color: theme.colors.outlineBorderVariant,
           width: 1,
         ),
         borderRadius: BorderRadius.circular(8),

diff --git a/catalyst_voices/apps/voices/lib/widgets/modals/voices_desktop_dialog.dart b/catalyst_voices/apps/voices/lib/widgets/modals/voices_desktop_dialog.dart
@@ -122,7 +122,7 @@ class _VoicesDesktopDialog extends StatelessWidget {
           ? RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(12),
               side: BorderSide(
-                color: Theme.of(context).colors.outlineBorderVariant!,
+                color: Theme.of(context).colors.outlineBorderVariant,
               ),
             )
           : Theme.of(context).dialogTheme.shape,

diff --git a/catalyst_voices/apps/voices/lib/widgets/modals/voices_upload_file_dialog.dart b/catalyst_voices/apps/voices/lib/widgets/modals/voices_upload_file_dialog.dart
@@ -174,7 +174,7 @@ class _InfoContainer extends StatelessWidget {
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(12),
         border: Border.all(
-          color: Theme.of(context).colors.iconsPrimary!,
+          color: Theme.of(context).colors.iconsPrimary,
         ),
       ),
       child: Row(
@@ -243,7 +243,7 @@ class _UploadContainerState extends State<_UploadContainer> {
           borderType: BorderType.RRect,
           radius: const Radius.circular(12),
           dashPattern: const [8, 6],
-          color: Theme.of(context).colors.iconsPrimary!,
+          color: Theme.of(context).colors.iconsPrimary,
           child: Stack(
             children: [
               // We allow drag&drop only on web
@@ -303,7 +303,7 @@ class _UploadContainerState extends State<_UploadContainer> {
                         decoration: BoxDecoration(
                           shape: BoxShape.circle,
                           border: Border.all(
-                            color: Theme.of(context).colors.iconsPrimary!,
+                            color: Theme.of(context).colors.iconsPrimary,
                             width: 3,
                           ),
                         ),

diff --git a/catalyst_voices/apps/voices/lib/widgets/pickers/voices_time_picker.dart b/catalyst_voices/apps/voices/lib/widgets/pickers/voices_time_picker.dart
@@ -119,7 +119,7 @@ class _TimeText extends StatelessWidget {
         child: ColoredBox(
           color: !isSelected
               ? Colors.transparent
-              : Theme.of(context).colors.onSurfaceNeutral08!,
+              : Theme.of(context).colors.onSurfaceNeutral08,
           child: Padding(
             key: key,
             padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),

diff --git a/catalyst_voices/apps/voices/lib/widgets/text_field/seed_phrase_field.dart b/catalyst_voices/apps/voices/lib/widgets/text_field/seed_phrase_field.dart
@@ -92,7 +92,7 @@ class _SeedPhraseFieldState extends State<SeedPhraseField> {
       child: DecoratedBox(
         decoration: BoxDecoration(
           border: Border.all(
-            color: theme.colors.outlineBorder!,
+            color: theme.colors.outlineBorder,
             width: 1.5,
           ),
           borderRadius: BorderRadius.circular(12),

diff --git a/catalyst_voices/apps/voices/lib/widgets/text_field/voices_date_time_text_field.dart b/catalyst_voices/apps/voices/lib/widgets/text_field/voices_date_time_text_field.dart
@@ -38,7 +38,7 @@ class VoicesDateTimeTextField extends StatelessWidget {
 
     final borderSide = !dimBorder
         ? BorderSide(
-            color: theme.colors.outlineBorderVariant!,
+            color: theme.colors.outlineBorderVariant,
             width: 0.75,
           )
         : BorderSide(

diff --git a/catalyst_voices/apps/voices/lib/widgets/text_field/voices_text_field.dart b/catalyst_voices/apps/voices/lib/widgets/text_field/voices_text_field.dart
@@ -467,9 +467,9 @@ class _VoicesTextFieldState extends State<VoicesTextField> {
       case VoicesTextFieldStatus.none:
         return orDefault;
       case VoicesTextFieldStatus.success:
-        return Theme.of(context).colors.success!;
+        return Theme.of(context).colors.success;
       case VoicesTextFieldStatus.warning:
-        return Theme.of(context).colors.warning!;
+        return Theme.of(context).colors.warning;
       case VoicesTextFieldStatus.error:
         return Theme.of(context).colorScheme.error;
     }

diff --git a/catalyst_voices/apps/voices/lib/widgets/tiles/selectable_tile.dart b/catalyst_voices/apps/voices/lib/widgets/tiles/selectable_tile.dart
@@ -23,7 +23,7 @@ class SelectableTile extends StatelessWidget {
         borderRadius: _borderRadius(isSelected),
         boxShadow: [
           BoxShadow(
-            color: Theme.of(context).colors.elevationsOnSurfaceNeutralLv0!,
+            color: Theme.of(context).colors.elevationsOnSurfaceNeutralLv0,
             offset: const Offset(0, 1),
             blurRadius: 4,
           ),

diff --git a/catalyst_voices/apps/voices/lib/widgets/toggles/voices_checkbox.dart b/catalyst_voices/apps/voices/lib/widgets/toggles/voices_checkbox.dart
@@ -59,7 +59,7 @@ class VoicesCheckbox extends StatelessWidget {
             side: isDisabled
                 ? BorderSide(
                     width: 2,
-                    color: Theme.of(context).colors.onSurfaceNeutral012!,
+                    color: Theme.of(context).colors.onSurfaceNeutral012,
                   )
                 : null,
           ),