feat(progress-indicator): fix merge conflicts

Author: nouha06

ouds_theme_contract/lib/theme/tokens/components/ouds_progressIndicatorMono_tokens.dart

@@ -17,6 +17,5 @@ import 'package:flutter/material.dart';
 
 abstract class OudsProgressIndicatorMonoTokens {
   late Color colorContentIndicator;
-  late Color colorContentTrackDark;
-  late Color colorContentTrackLight;
+  late Color colorContentTrack;
 }

ouds_theme_orange/lib/components/orange_progressIndicatorMono_tokens.dart

@@ -18,15 +18,20 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart';
 import 'package:ouds_theme_contract/ouds_tokens_provider.dart';
 import 'package:ouds_theme_contract/theme/tokens/components/ouds_progressIndicatorMono_tokens.dart';
 
-class OrangeProgressIndicatorMonoTokens extends OudsProgressIndicatorMonoTokens {
+class OrangeProgressIndicatorMonoTokens
+    extends OudsProgressIndicatorMonoTokens {
   final OudsProvidersTokens providersTokens;
 
   OrangeProgressIndicatorMonoTokens(this.providersTokens);
 
   @override
-  Color get colorContentIndicator => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryNeutralEmphasizedBlack, providersTokens.colorScheme.repositoryNeutralMutedWhite);
+  Color get colorContentIndicator => providersTokens.colorScheme.lightDark(
+    providersTokens.colorScheme.repositoryNeutralEmphasizedBlack,
+    providersTokens.colorScheme.repositoryNeutralMutedWhite,
+  );
   @override
-  Color get colorContentTrackDark => ColorRawTokens.colorFunctionalGrayDark480;
-  @override
-  Color get colorContentTrackLight => ColorRawTokens.colorFunctionalGrayLight400;
+  Color get colorContentTrack => providersTokens.colorScheme.lightDark(
+    ColorRawTokens.colorFunctionalGrayLight400,
+    ColorRawTokens.colorFunctionalGrayDark480,
+  );
 }

ouds_theme_orange_compact/lib/components/orangeCompact_progressIndicatorMono_tokens.dart

@@ -18,15 +18,20 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart';
 import 'package:ouds_theme_contract/ouds_tokens_provider.dart';
 import 'package:ouds_theme_contract/theme/tokens/components/ouds_progressIndicatorMono_tokens.dart';
 
-class OrangeCompactProgressIndicatorMonoTokens extends OudsProgressIndicatorMonoTokens {
+class OrangeCompactProgressIndicatorMonoTokens
+    extends OudsProgressIndicatorMonoTokens {
   final OudsProvidersTokens providersTokens;
 
   OrangeCompactProgressIndicatorMonoTokens(this.providersTokens);
 
   @override
-  Color get colorContentIndicator => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryNeutralEmphasizedBlack, providersTokens.colorScheme.repositoryNeutralMutedWhite);
+  Color get colorContentIndicator => providersTokens.colorScheme.lightDark(
+    providersTokens.colorScheme.repositoryNeutralEmphasizedBlack,
+    providersTokens.colorScheme.repositoryNeutralMutedWhite,
+  );
   @override
-  Color get colorContentTrackDark => ColorRawTokens.colorFunctionalGrayDark480;
-  @override
-  Color get colorContentTrackLight => ColorRawTokens.colorFunctionalGrayLight400;
+  Color get colorContentTrack => providersTokens.colorScheme.lightDark(
+    ColorRawTokens.colorFunctionalGrayLight400,
+    ColorRawTokens.colorFunctionalGrayDark480,
+  );
 }

ouds_theme_sosh/lib/components/sosh_progressIndicatorMono_tokens.dart

@@ -24,9 +24,13 @@ class SoshProgressIndicatorMonoTokens extends OudsProgressIndicatorMonoTokens {
   SoshProgressIndicatorMonoTokens(this.providersTokens);
 
   @override
-  Color get colorContentIndicator => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryNeutralEmphasizedBlack, providersTokens.colorScheme.repositoryNeutralMutedWhite);
+  Color get colorContentIndicator => providersTokens.colorScheme.lightDark(
+    providersTokens.colorScheme.repositoryNeutralEmphasizedBlack,
+    providersTokens.colorScheme.repositoryNeutralMutedWhite,
+  );
   @override
-  Color get colorContentTrackDark => ColorRawTokens.colorFunctionalGrayDark480;
-  @override
-  Color get colorContentTrackLight => ColorRawTokens.colorFunctionalGrayLight400;
+  Color get colorContentTrack => providersTokens.colorScheme.lightDark(
+    ColorRawTokens.colorFunctionalGrayLight400,
+    ColorRawTokens.colorFunctionalGrayDark480,
+  );
 }

ouds_theme_wireframe/lib/components/wireframe_progressIndicatorMono_tokens.dart

@@ -18,15 +18,20 @@ import 'package:ouds_theme_contract/ouds_tokens_provider.dart';
 import 'package:ouds_theme_contract/theme/tokens/components/ouds_progressIndicatorMono_tokens.dart';
 import 'package:ouds_theme_wireframe/raw/wireframe_color_raw_tokens.dart';
 
-class WireframeProgressIndicatorMonoTokens extends OudsProgressIndicatorMonoTokens {
+class WireframeProgressIndicatorMonoTokens
+    extends OudsProgressIndicatorMonoTokens {
   final OudsProvidersTokens providersTokens;
 
   WireframeProgressIndicatorMonoTokens(this.providersTokens);
 
   @override
-  Color get colorContentIndicator => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryNeutralEmphasizedBlack, providersTokens.colorScheme.repositoryNeutralMutedWhite);
+  Color get colorContentIndicator => providersTokens.colorScheme.lightDark(
+    providersTokens.colorScheme.repositoryNeutralEmphasizedBlack,
+    providersTokens.colorScheme.repositoryNeutralMutedWhite,
+  );
   @override
-  Color get colorContentTrackDark => WireframeColorRawTokens.colorFunctionalGrayDark480;
-  @override
-  Color get colorContentTrackLight => WireframeColorRawTokens.colorFunctionalGrayLight320;
+  Color get colorContentTrack => providersTokens.colorScheme.lightDark(
+    WireframeColorRawTokens.colorFunctionalGrayLight320,
+    WireframeColorRawTokens.colorFunctionalGrayDark480,
+  );
 }