Skip to content

Commit

Permalink
chore: Change name for VoicesColorScheme.
Browse files Browse the repository at this point in the history
  • Loading branch information
@coire1
coire1 committed May 9, 2024
1 parent 3981421 commit 3d641a7
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 64 deletions.
42 changes: 21 additions & 21 deletions catalyst_voices/packages/catalyst_voices_brands/lib/src/themes/catalyst.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,103 +6,103 @@ import 'package:google_fonts/google_fonts.dart';

ThemeData _buildThemeData(
ColorScheme colorScheme,
ExtendedColorScheme extendedColorScheme,
VoicesColorScheme voicesColorScheme,
) {
return ThemeData(
textTheme: TextTheme(
displayLarge: GoogleFonts.notoSans(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 57,
letterSpacing: -1.14,
fontWeight: FontWeight.w700,
height: -0.02,
),
displayMedium: GoogleFonts.poppins(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 45,
fontWeight: FontWeight.w700,
height: 0.03,
),
displaySmall: GoogleFonts.poppins(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 36,
fontWeight: FontWeight.w700,
height: 0.03,
),
headlineLarge: GoogleFonts.poppins(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 32,
fontWeight: FontWeight.w700,
height: 0.04,
),
headlineMedium: GoogleFonts.poppins(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 28,
fontWeight: FontWeight.w700,
height: 0.05,
),
headlineSmall: GoogleFonts.poppins(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 24,
fontWeight: FontWeight.w700,
height: 0.06,
),
titleLarge: GoogleFonts.poppins(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 22,
fontWeight: FontWeight.w700,
letterSpacing: 0.66,
),
titleMedium: GoogleFonts.poppins(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 16,
fontWeight: FontWeight.w700,
height: 0.09,
letterSpacing: 0.48,
),
titleSmall: GoogleFonts.poppins(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 14,
fontWeight: FontWeight.w700,
height: 0.10,
letterSpacing: 0.42,
),
bodyLarge: GoogleFonts.notoSans(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 16,
fontWeight: FontWeight.w500,
height: 0.09,
letterSpacing: 0.08,
),
bodyMedium: GoogleFonts.notoSans(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 14,
fontWeight: FontWeight.w500,
height: 0.10,
letterSpacing: 0.04,
),
bodySmall: GoogleFonts.notoSans(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 12,
fontWeight: FontWeight.w500,
height: 0.11,
letterSpacing: 0.05,
),
labelLarge: GoogleFonts.notoSans(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 14,
fontWeight: FontWeight.w500,
height: 0.10,
letterSpacing: 0.10,
),
labelMedium: GoogleFonts.notoSans(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 12,
fontWeight: FontWeight.w500,
height: 0.11,
),
labelSmall: GoogleFonts.notoSans(
color: extendedColorScheme.textPrimary,
color: voicesColorScheme.textPrimary,
fontSize: 11,
fontWeight: FontWeight.w500,
height: 0.13,
Expand All @@ -111,7 +111,7 @@ ThemeData _buildThemeData(
),
colorScheme: colorScheme,
extensions: <ThemeExtension<dynamic>>[
extendedColorScheme,
voicesColorScheme,
],
);
}
Expand All @@ -131,7 +131,7 @@ const ColorScheme lightColorScheme = ColorScheme.light(
outlineVariant: VoicesColors.lightOutlineVariant,
);

const ExtendedColorScheme lightExtendedColorScheme = ExtendedColorScheme(
const VoicesColorScheme lightVoicesColorScheme = VoicesColorScheme(
textPrimary: VoicesColors.lightTextPrimary,
textOnPrimary: VoicesColors.lightTextOnPrimary,
textOnPrimaryContainer: VoicesColors.lightTextOnPrimaryContainer,
Expand Down Expand Up @@ -182,7 +182,7 @@ const ColorScheme darkColorScheme = ColorScheme.dark(
outlineVariant: VoicesColors.darkOutlineVariant,
);

const ExtendedColorScheme darkExtendedColorScheme = ExtendedColorScheme(
const VoicesColorScheme darkVoicesColorScheme = VoicesColorScheme(
textPrimary: VoicesColors.darkTextPrimary,
textOnPrimary: VoicesColors.darkTextOnPrimary,
textOnPrimaryContainer: VoicesColors.darkTextOnPrimaryContainer,
Expand Down Expand Up @@ -221,11 +221,11 @@ const ExtendedColorScheme darkExtendedColorScheme = ExtendedColorScheme(
/// [ThemeData] for the `catalyst` brand.
final ThemeData catalyst = _buildThemeData(
lightColorScheme,
lightExtendedColorScheme,
lightVoicesColorScheme,
);

/// Dark [ThemeData] for the `catalyst` brand.
final ThemeData darkCatalyst = _buildThemeData(
darkColorScheme,
darkExtendedColorScheme,
darkVoicesColorScheme,
);
86 changes: 43 additions & 43 deletions catalyst_voices/packages/catalyst_voices_brands/lib/src/themes/extended_color_scheme.dart
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,42 @@
import 'package:flutter/material.dart';

@immutable
class ExtendedColorScheme extends ThemeExtension<ExtendedColorScheme> {
const ExtendedColorScheme({
class VoicesColorScheme extends ThemeExtension<VoicesColorScheme> {
final Color? textPrimary;
final Color? textOnPrimary;
final Color? textOnPrimaryContainer;
final Color? textDisabled;
final Color? success;
final Color? onSuccess;
final Color? successContainer;
final Color? onSuccessContainer;
final Color? warning;
final Color? onWarning;
final Color? warningContainer;
final Color? onWarningContainer;
final Color? onSurfaceNeutral08;
final Color? onSurfaceNeutral012;
final Color? onSurfaceNeutral016;
final Color? onSurfacePrimaryContainer;
final Color? onSurfacePrimary08;
final Color? onSurfacePrimary012;
final Color? onSurfacePrimary016;
final Color? onSurfaceSecondary08;
final Color? onSurfaceSecondary012;
final Color? onSurfaceSecondary016;
final Color? onSurfaceError08;
final Color? onSurfaceError012;
final Color? onSurfaceError016;
final Color? iconsForeground;
final Color? iconsBackground;
final Color? iconsDisabled;
final Color? iconsPrimary;
final Color? iconsSecondary;
final Color? iconsSuccess;
final Color? iconsWarning;
final Color? iconsError;

const VoicesColorScheme({
required this.textPrimary,
required this.textOnPrimary,
required this.textOnPrimaryContainer,
Expand Down Expand Up @@ -38,42 +72,8 @@ class ExtendedColorScheme extends ThemeExtension<ExtendedColorScheme> {
required this.iconsError,
});

final Color? textPrimary;
final Color? textOnPrimary;
final Color? textOnPrimaryContainer;
final Color? textDisabled;
final Color? success;
final Color? onSuccess;
final Color? successContainer;
final Color? onSuccessContainer;
final Color? warning;
final Color? onWarning;
final Color? warningContainer;
final Color? onWarningContainer;
final Color? onSurfaceNeutral08;
final Color? onSurfaceNeutral012;
final Color? onSurfaceNeutral016;
final Color? onSurfacePrimaryContainer;
final Color? onSurfacePrimary08;
final Color? onSurfacePrimary012;
final Color? onSurfacePrimary016;
final Color? onSurfaceSecondary08;
final Color? onSurfaceSecondary012;
final Color? onSurfaceSecondary016;
final Color? onSurfaceError08;
final Color? onSurfaceError012;
final Color? onSurfaceError016;
final Color? iconsForeground;
final Color? iconsBackground;
final Color? iconsDisabled;
final Color? iconsPrimary;
final Color? iconsSecondary;
final Color? iconsSuccess;
final Color? iconsWarning;
final Color? iconsError;

@override
ThemeExtension<ExtendedColorScheme> copyWith({
ThemeExtension<VoicesColorScheme> copyWith({
Color? textPrimary,
Color? textOnPrimary,
Color? textOnPrimaryContainer,
Expand Down Expand Up @@ -108,7 +108,7 @@ class ExtendedColorScheme extends ThemeExtension<ExtendedColorScheme> {
Color? iconsWarning,
Color? iconsError,
}) {
return ExtendedColorScheme(
return VoicesColorScheme(
textPrimary: textPrimary ?? this.textPrimary,
textOnPrimary: textOnPrimary ?? this.textOnPrimary,
textOnPrimaryContainer:
Expand Down Expand Up @@ -150,14 +150,14 @@ class ExtendedColorScheme extends ThemeExtension<ExtendedColorScheme> {
}

@override
ExtendedColorScheme lerp(
ThemeExtension<ExtendedColorScheme>? other,
VoicesColorScheme lerp(
ThemeExtension<VoicesColorScheme>? other,
double t,
) {
if (other is! ExtendedColorScheme) {
if (other is! VoicesColorScheme) {
return this;
}
return ExtendedColorScheme(
return VoicesColorScheme(
textPrimary: Color.lerp(textPrimary, other.textPrimary, t),
textOnPrimary: Color.lerp(textOnPrimary, other.textOnPrimary, t),
textOnPrimaryContainer:
Expand Down Expand Up @@ -214,6 +214,6 @@ class ExtendedColorScheme extends ThemeExtension<ExtendedColorScheme> {
}

extension ExtendedColorsExtension on ThemeData {
ExtendedColorScheme get colors => extension<ExtendedColorScheme>()!;
VoicesColorScheme get colors => extension<VoicesColorScheme>()!;
Color get linksPrimary => primaryColor;
}

0 comments on commit 3d641a7

Please sign in to comment.