Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0

# Conflicts:
#	lib/views/widgets/sound/sound_player.dart

lib/views/widgets/sound/sound_player.dart

@@ -4,6 +4,9 @@ import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/app_style/app_text_style.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
+
+import '../../app_style/colors.dart';
 
 class ASoundPlayer extends StatefulWidget {
   final String audio;
@@ -29,7 +32,7 @@ class _ASoundPlayerState extends State<ASoundPlayer> {
       width: 48,
       height: 48,
       decoration: ShapeDecoration(
-        color: Theme.of(context).cardColor,
+        color: Colors.white,
         shape: RoundedRectangleBorder(
           side: BorderSide(width: 1, color: (context.isDark ? AppColor.neutral20 : AppColor.neutral30)),
           borderRadius: BorderRadius.circular(32),