Adjust surfaces colors

TalaoDAO · Jun 5, 2024 · 3d87a25 · 3d87a25
1 parent d78ef5d
commit 3d87a25
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 25 deletions.
diff --git a/lib/app/shared/widget/base/background_card.dart b/lib/app/shared/widget/base/background_card.dart
@@ -26,7 +26,7 @@ class BackgroundCard extends StatelessWidget {
       height: height,
       width: width,
       decoration: BoxDecoration(
-        color: color ?? Theme.of(context).colorScheme.surface,
+        color: color ?? Theme.of(context).colorScheme.surfaceBright,
         borderRadius: const BorderRadius.all(Radius.circular(15)),
       ),
       child: child,

diff --git a/lib/dashboard/crypto_account_switcher/crypto_bottom_sheet/view/crypto_bottom_sheet_view.dart b/lib/dashboard/crypto_account_switcher/crypto_bottom_sheet/view/crypto_bottom_sheet_view.dart
@@ -95,7 +95,7 @@ class _CryptoBottomSheetPageState extends State<CryptoBottomSheetPage> {
           backgroundColor: Colors.transparent,
           body: DecoratedBox(
             decoration: BoxDecoration(
-              color: Theme.of(context).colorScheme.surface,
+              color: Theme.of(context).colorScheme.surfaceDim,
               boxShadow: [
                 BoxShadow(
                   color: Theme.of(context).colorScheme.inversePrimary,

diff --git a/lib/dashboard/drawer/src/widgets/drawer_category_item.dart b/lib/dashboard/drawer/src/widgets/drawer_category_item.dart
@@ -25,7 +25,7 @@ class DrawerCategoryItem extends StatelessWidget {
       child: Container(
         padding: padding,
         decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surface,
+          color: Theme.of(context).colorScheme.surfaceBright,
           borderRadius: const BorderRadius.all(
             Radius.circular(Sizes.normalRadius),
           ),

diff --git a/lib/dashboard/drawer/src/widgets/drawer_item.dart b/lib/dashboard/drawer/src/widgets/drawer_item.dart
@@ -26,7 +26,7 @@ class DrawerItem extends StatelessWidget {
         padding: const EdgeInsets.all(Sizes.spaceNormal),
         margin: const EdgeInsets.all(Sizes.spaceXSmall),
         decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surface,
+          color: Theme.of(context).colorScheme.surfaceBright,
           borderRadius: const BorderRadius.all(
             Radius.circular(
               Sizes.normalRadius,

diff --git a/lib/dashboard/home/tab_bar/tab_controller/widgets/tab_bar.dart b/lib/dashboard/home/tab_bar/tab_controller/widgets/tab_bar.dart
@@ -28,22 +28,21 @@ class MyTab extends StatelessWidget {
           vertical: Sizes.spaceSmall,
         ),
         decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(Sizes.normalRadius),
-          gradient: isSelected
-              ? LinearGradient(
-                  colors: [
-                    AppTheme.darkThemeData.colorScheme.primary,
-                    AppTheme.darkThemeData.colorScheme.secondary,
-                  ],
-                  begin: Alignment.bottomLeft,
-                  end: Alignment.topRight,
-                  stops: const [0.3, 1.0],
-                )
-              : null,
-          color: isSelected
-              ? null
-              : AppTheme.darkThemeData.colorScheme.secondaryContainer,
-        ),
+            borderRadius: BorderRadius.circular(Sizes.normalRadius),
+            gradient: isSelected
+                ? LinearGradient(
+                    colors: [
+                      AppTheme.darkThemeData.colorScheme.primary,
+                      AppTheme.darkThemeData.colorScheme.secondary,
+                    ],
+                    begin: Alignment.bottomLeft,
+                    end: Alignment.topRight,
+                    stops: const [0.3, 1.0],
+                  )
+                : null,
+            color: isSelected
+                ? null
+                : AppTheme.darkThemeData.colorScheme.tertiary),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.center,

diff --git a/lib/theme/app_theme/app_theme.dart b/lib/theme/app_theme/app_theme.dart
@@ -10,21 +10,21 @@ abstract class AppTheme {
 
   /// An accent color used for less prominent components in the UI, such as
   /// filter chips, while expanding the opportunity for color expression.
-  static Color darkSecondary = const Color(0xff00A1FF);
+  static Color darkSecondary = const Color(0xff18ACFF);
 
   /// A color that's clearly legible when drawn on secondary
   static Color darkOnSecondary = const Color(0xffFFFFFF);
 
   /// A color used as a contrasting accent that can balance primary
   /// and secondary colors or bring heightened attention to an element,
   /// such as an input field.
-  static Color darkTertiary = const Color(0xffFFFFFF);
+  static Color darkTertiary = const Color(0xFF280164);
 
   /// A color that's clearly legible when drawn on tertiary.
   static Color darkOnTertiary = const Color(0xffD1CCE3);
 
   /// The background color for widgets like Card.
-  static Color darkSurface = const Color(0xff1A182D);
+  static Color darkSurface = const Color(0xff0B0514);
 
   /// A color that's clearly legible when drawn on surface.
   static Color darkOnSurface = const Color(0xffEDEAF5);
@@ -55,17 +55,19 @@ abstract class AppTheme {
         dividerColor: dividerColor,
         highlightColor: highlightColor,
         colorScheme: ColorScheme(
-          primary: darkPrimary,
+          primary: const Color(0xff6600FF),
           onPrimary: darkOnPrimary,
           secondary: darkSecondary,
           onSecondary: darkOnSecondary,
           tertiary: darkTertiary,
           onTertiary: darkOnTertiary,
-          surface: darkSurface,
+          surface: const Color(0xff0B0514),
           onSurface: darkOnSurface,
           error: darkError,
           onError: darkOnError,
           shadow: darkShadow,
+          surfaceBright: const Color(0xff232630),
+          surfaceDim: const Color(0xff271C38),
           brightness: Brightness.dark,
         ),
         textTheme: TextTheme(