feat: My account, account page, introduce VoicesTextButton's customColor

input-output-hk · Sep 24, 2024 · 0d8f0ce · 0d8f0ce
1 parent 072e1f7
commit 0d8f0ce
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/catalyst_voices/lib/pages/account/account_page.dart b/catalyst_voices/lib/pages/account/account_page.dart
@@ -3,6 +3,7 @@ import 'package:catalyst_voices/widgets/buttons/voices_text_button.dart';
 import 'package:catalyst_voices_assets/catalyst_voices_assets.dart';
 import 'package:catalyst_voices_brands/catalyst_voices_brands.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 
 final class AccountPage extends StatelessWidget {
   const AccountPage({super.key});
@@ -77,10 +78,13 @@ class _KeychainCard extends StatelessWidget {
                   style: Theme.of(context).textTheme.titleLarge,
                 ),
               ),
-              VoicesTextButton(
+              VoicesTextButton.customColor(
                 leading: VoicesAssets.icons.x.buildIcon(),
-                child: Text('Remove Keychain'),
+                color: Theme.of(context).colors.iconsError,
                 onTap: () {},
+                child: Text(
+                  'Remove Keychain',
+                ),
               ),
             ],
           ),
@@ -160,7 +164,9 @@ class _Header extends StatelessWidget {
             top: 16,
             left: 8,
             child: VoicesIconButton.filled(
-              onTap: () {},
+              onTap: () {
+                GoRouter.of(context).pop();
+              },
               style: ButtonStyle(
                 backgroundColor: WidgetStateProperty.all(
                   Theme.of(context).colors.elevationsOnSurfaceNeutralLv1White,

diff --git a/catalyst_voices/lib/widgets/buttons/voices_text_button.dart b/catalyst_voices/lib/widgets/buttons/voices_text_button.dart
@@ -2,7 +2,7 @@ import 'package:catalyst_voices/widgets/buttons/voices_button_affix_decoration.d
 import 'package:catalyst_voices_brands/catalyst_voices_brands.dart';
 import 'package:flutter/material.dart';
 
-enum _Variant { primary, neutral, secondary }
+enum _Variant { primary, neutral, secondary, customColor }
 
 /// A button that combines a `TextButton` with optional leading and trailing
 /// elements.
@@ -22,13 +22,17 @@ class VoicesTextButton extends StatelessWidget {
   /// The main content of the button.
   final Widget child;
 
+  /// The foreground color of the button.
+  final Color? color;
+
   final _Variant _variant;
 
   const VoicesTextButton({
     super.key,
     this.onTap,
     this.leading,
     this.trailing,
+    this.color,
     required this.child,
   }) : _variant = _Variant.primary;
 
@@ -37,6 +41,7 @@ class VoicesTextButton extends StatelessWidget {
     this.onTap,
     this.leading,
     this.trailing,
+    this.color,
     required this.child,
   }) : _variant = _Variant.neutral;
 
@@ -45,9 +50,19 @@ class VoicesTextButton extends StatelessWidget {
     this.onTap,
     this.leading,
     this.trailing,
+    this.color,
     required this.child,
   }) : _variant = _Variant.secondary;
 
+  const VoicesTextButton.customColor({
+    super.key,
+    this.onTap,
+    this.leading,
+    this.trailing,
+    required this.color,
+    required this.child,
+  }) : _variant = _Variant.customColor;
+
   @override
   Widget build(BuildContext context) {
     return TextButton(
@@ -75,6 +90,9 @@ class VoicesTextButton extends StatelessWidget {
       _Variant.secondary => TextButton.styleFrom(
           foregroundColor: Theme.of(context).colorScheme.secondary,
         ),
+      _Variant.customColor => TextButton.styleFrom(
+          foregroundColor: color,
+        ),
     };
   }
 }