test: Fixed component tests, still need to fix color tests

example/lib/pages/components/list_item_example.dart

@@ -26,7 +26,7 @@ class _ListItemExampleState extends State<ListItemExample> {
     return ExampleScaffold(
       name: ListItemExample.name,
       child: Container(
-        color: zetaColors.surface.secondary,
+        color: zetaColors.surface.warm,
         child: SingleChildScrollView(
           child: Padding(
             padding: const EdgeInsets.all(16),

lib/src/components/contact_item/contact_item.dart

@@ -45,7 +45,7 @@ class ZetaContactItem extends ZetaStatelessWidget {
         button: true,
         child: SelectionContainer.disabled(
           child: Material(
-            color: colors.surface.primary,
+            color: colors.surface.defaultColor,
             child: DecoratedBox(
               decoration: BoxDecoration(
                 border: enabledDivider ? Border(bottom: BorderSide(color: colors.border.disabled)) : null,

lib/src/components/dialog/dialog.dart

@@ -99,7 +99,7 @@ class _ZetaDialog extends ZetaStatelessWidget {
     return ZetaRoundedScope(
       rounded: context.rounded,
       child: AlertDialog(
-        surfaceTintColor: zeta.colors.surface.primary,
+        surfaceTintColor: zeta.colors.surface.defaultColor,
         shape: RoundedRectangleBorder(borderRadius: Zeta.of(context).radii.large),
         title: icon != null || title != null
             ? Column(

lib/src/components/global_header/global_header.dart

@@ -80,7 +80,7 @@ class _GlobalHeaderState extends State<ZetaGlobalHeader> {
               vertical: Zeta.of(context).spacing.medium,
               horizontal: Zeta.of(context).spacing.large,
             ),
-            decoration: BoxDecoration(color: colors.surface.primary),
+            decoration: BoxDecoration(color: colors.surface.defaultColor),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

lib/src/components/segmented_control/segmented_control.dart

@@ -148,7 +148,7 @@ class _ZetaSegmentedControlState<T> extends State<ZetaSegmentedControl<T>>
                 builder: (BuildContext context, Widget? child) {
                   return _SegmentedControlRenderWidget<T>(
                     highlightedIndex: highlightedIndex,
-                    thumbColor: colors.surface.primary,
+                    thumbColor: colors.surface.defaultColor,
                     thumbScale: _thumbScaleAnimation.value,
                     rounded: rounded,
                     state: this,

lib/src/utils/zeta_provider.dart

@@ -201,6 +201,14 @@ class ZetaProviderState extends State<ZetaProvider> with Diagnosticable, Widgets
 
     // Set the initial light [ThemeData].
     _darkThemeData = widget.initialDarkThemeData;
+
+    if (widget.initialThemeMode != null) {
+      _themeMode = widget.initialThemeMode!;
+    }
+    if (widget.initialContrast != null) {
+      _contrast = widget.initialContrast!;
+      _zetaThemeData = widget.initialZetaThemeData.apply(contrast: _contrast);
+    }
   }
 
   /// Retrieves the theme values from the shared preferences.
@@ -264,49 +272,56 @@ class ZetaProviderState extends State<ZetaProvider> with Diagnosticable, Widgets
 
   @override
   Widget build(BuildContext context) {
+    if (widget.initialContrast != null && widget.initialThemeMode != null) {
+      return _getChild();
+    }
     return FutureBuilder<dynamic>(
       // ignore: discarded_futures
       future: getThemeValuesFromPreferences(),
       builder: (BuildContext context, AsyncSnapshot<dynamic> snapshot) {
         if (snapshot.connectionState == ConnectionState.waiting) {
           return const Center(child: CircularProgressIndicator());
         }
-        if (widget.baseBuilder != _emptyBase) {
-          return _InternalProvider(
-            contrast: _contrast,
-            themeMode: _themeMode,
-            zetaThemeData: _zetaThemeData,
-            rounded: _rounded,
-            platformBrightness: _platformBrightness,
-            widget: widget.baseBuilder(
-              context,
-              generateZetaTheme(
-                brightness: Brightness.light,
-                existingTheme: _lightThemeData,
-                colorScheme: _lightThemeData?.colorScheme ?? _zetaThemeData.colorsLight.toScheme(),
-              ),
-              generateZetaTheme(
-                brightness: Brightness.dark,
-                existingTheme: _darkThemeData,
-                colorScheme: _darkThemeData?.colorScheme ?? _zetaThemeData.colorsDark.toScheme(),
-              ),
-              _themeMode,
-            ),
-          );
-        } else {
-          return _InternalProvider(
-            contrast: _contrast,
-            themeMode: _themeMode,
-            zetaThemeData: _zetaThemeData,
-            rounded: _rounded,
-            platformBrightness: _platformBrightness,
-            widget: widget.builder(context, _zetaThemeData, _themeMode),
-          );
-        }
+        return _getChild();
       },
     );
   }
 
+  Widget _getChild() {
+    if (widget.baseBuilder != _emptyBase) {
+      return _InternalProvider(
+        contrast: _contrast,
+        themeMode: _themeMode,
+        zetaThemeData: _zetaThemeData,
+        rounded: _rounded,
+        platformBrightness: _platformBrightness,
+        widget: widget.baseBuilder(
+          context,
+          generateZetaTheme(
+            brightness: Brightness.light,
+            existingTheme: _lightThemeData,
+            colorScheme: _lightThemeData?.colorScheme ?? _zetaThemeData.colorsLight.toScheme(),
+          ),
+          generateZetaTheme(
+            brightness: Brightness.dark,
+            existingTheme: _darkThemeData,
+            colorScheme: _darkThemeData?.colorScheme ?? _zetaThemeData.colorsDark.toScheme(),
+          ),
+          _themeMode,
+        ),
+      );
+    } else {
+      return _InternalProvider(
+        contrast: _contrast,
+        themeMode: _themeMode,
+        zetaThemeData: _zetaThemeData,
+        rounded: _rounded,
+        platformBrightness: _platformBrightness,
+        widget: widget.builder(context, _zetaThemeData, _themeMode),
+      );
+    }
+  }
+
   @override
   void didUpdateWidget(ZetaProvider oldWidget) {
     super.didUpdateWidget(oldWidget);

test/src/components/accordion/accordion_test.dart

@@ -18,7 +18,7 @@ void main() {
         ),
       ),
     );
-
+    await tester.pumpAndSettle();
     // Verify that the accordion is initially collapsed
     final Finder accordionContent = find.byType(SizeTransition);
     expect(accordionContent, findsOneWidget);

test/src/components/button/button_test.dart

@@ -262,7 +262,7 @@ void main() {
     expect(button.size, ZetaWidgetSize.medium);
     expect(
       filledButton.style?.side?.resolve({WidgetState.focused}),
-      BorderSide(color: ZetaLightPrimitive().blue, width: ZetaBorderTemp.borderWidth),
+      BorderSide(color: ZetaLightPrimitive().blue.shade50, width: ZetaBorderTemp.borderWidth),
     );
   });
   testWidgets('debugFillProperties works correctly', (WidgetTester tester) async {

test/src/components/fabs/fab_test.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: deprecated_member_use_from_same_package
-
 import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
@@ -140,7 +138,7 @@ void main() {
     await gesture.moveTo(tester.getCenter(fabFinder));
     await tester.pumpAndSettle();
 
-    expect(filledButton.style?.backgroundColor?.resolve({WidgetState.hovered}), ZetaColorBase.yellow.shade70);
+    expect(filledButton.style?.backgroundColor?.resolve({WidgetState.hovered}), ZetaLightPrimitive().yellow.shade30);
 
     await gesture.moveTo(Offset.zero);
     await tester.pumpAndSettle();
@@ -149,7 +147,7 @@ void main() {
     await tester.pumpAndSettle();
     expect(
       filledButton.style?.side?.resolve({WidgetState.focused}),
-      BorderSide(color: ZetaColorBase.blue[50]!, width: ZetaBorderTemp.borderWidth),
+      BorderSide(color: ZetaLightPrimitive().blue.shade50, width: ZetaBorderTemp.borderWidth),
     );
   });