Merge pull request #353 from Quantus-Network/feat/improve-send-screen-again

Update send screen

Author: dewabisma

mobile-app/lib/features/components/button.dart

@@ -1,5 +1,6 @@
 import 'dart:ui';
 import 'package:flutter/material.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/features/styles/app_colors_theme.dart';
 import 'package:resonance_network_wallet/features/styles/app_text_theme.dart';
 
@@ -43,6 +44,7 @@ class Button extends StatelessWidget {
     final bool disabled = onPressed == null || isLoading || isDisabled;
 
     final effectiveTextStyle = textStyle ?? context.themeText.smallTitle!;
+    final disabledBtnColor = context.themeColors.buttonDisabled.useOpacity(0.6);
 
     final buttonContent = Center(
       child: isLoading
@@ -56,7 +58,7 @@ class Button extends StatelessWidget {
               child: Text(
                 label,
                 style: disabled
-                    ? effectiveTextStyle.copyWith(color: context.themeColors.textMuted)
+                    ? effectiveTextStyle.copyWith(color: Colors.black)
                     : effectiveTextStyle.copyWith(color: _getTitleColor(context, variant)),
               ),
             ),
@@ -70,7 +72,7 @@ class Button extends StatelessWidget {
           width: width,
           padding: padding,
           decoration: ShapeDecoration(
-            color: disabled ? context.themeColors.buttonDisabled : null,
+            color: disabled ? disabledBtnColor : null,
             gradient: !disabled
                 ? LinearGradient(
                     begin: const Alignment(0.00, -1.00),
@@ -98,7 +100,7 @@ class Button extends StatelessWidget {
           width: width,
           padding: padding,
           decoration: ShapeDecoration(
-            color: disabled ? context.themeColors.buttonDisabled : context.themeColors.buttonNeutral,
+            color: disabled ? disabledBtnColor : context.themeColors.buttonNeutral,
             shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(buttonRadius)),
           ),
           child: buttonContent,
@@ -114,7 +116,7 @@ class Button extends StatelessWidget {
               width: width,
               padding: padding,
               decoration: ShapeDecoration(
-                color: disabled ? context.themeColors.buttonDisabled : context.themeColors.buttonGlass,
+                color: disabled ? disabledBtnColor : context.themeColors.buttonGlass,
                 shape: RoundedRectangleBorder(
                   side: disabled ? BorderSide.none : BorderSide(color: context.themeColors.buttonNeutral),
                   borderRadius: BorderRadius.circular(buttonRadius),
@@ -131,7 +133,7 @@ class Button extends StatelessWidget {
           width: width,
           padding: padding,
           decoration: ShapeDecoration(
-            color: disabled ? context.themeColors.buttonDisabled : context.themeColors.buttonDanger,
+            color: disabled ? disabledBtnColor : context.themeColors.buttonDanger,
             shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(buttonRadius)),
           ),
           child: buttonContent,
@@ -143,7 +145,7 @@ class Button extends StatelessWidget {
           width: width,
           padding: padding,
           decoration: ShapeDecoration(
-            color: disabled ? context.themeColors.buttonDisabled : context.themeColors.buttonSuccess,
+            color: disabled ? disabledBtnColor : context.themeColors.buttonSuccess,
             shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(buttonRadius)),
           ),
           child: buttonContent,
@@ -159,7 +161,7 @@ class Button extends StatelessWidget {
               width: width,
               padding: padding,
               decoration: ShapeDecoration(
-                color: disabled ? context.themeColors.buttonDisabled : context.themeColors.buttonGlass,
+                color: disabled ? disabledBtnColor : context.themeColors.buttonGlass,
                 shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(buttonRadius)),
               ),
               child: buttonContent,

mobile-app/lib/features/main/screens/send/send_screen.dart

@@ -10,7 +10,6 @@ import 'package:resonance_network_wallet/features/components/custom_text_field.d
 import 'package:resonance_network_wallet/features/components/scaffold_base.dart';
 import 'package:resonance_network_wallet/features/components/segmented_control.dart';
 import 'package:resonance_network_wallet/features/components/snackbar_helper.dart';
-import 'package:resonance_network_wallet/features/components/sphere.dart';
 import 'package:resonance_network_wallet/features/components/wallet_app_bar.dart';
 import 'package:resonance_network_wallet/features/main/screens/send/qr_scanner_screen.dart';
 import 'package:resonance_network_wallet/features/main/screens/send/recent_addresses.dart';
@@ -454,10 +453,6 @@ class SendScreenState extends ConsumerState<SendScreen> {
   @override
   Widget build(BuildContext context) {
     return ScaffoldBase(
-      decorations: [
-        const Positioned(top: 120, left: -30, child: Sphere(variant: 1, size: 144.23)),
-        Positioned(top: context.containerHalfHeight, right: -40, child: const Sphere(variant: 2, size: 194)),
-      ],
       appBar: WalletAppBar(title: 'Send'),
       child: Consumer(
         builder: (context, ref, child) {