Skip to content

Commit

Permalink
feat: Add light colors for Catalyst brand.
Browse files Browse the repository at this point in the history
  • Loading branch information
coire1 committed May 8, 2024
1 parent f4ad3b5 commit 61c5b95
Show file tree
Hide file tree
Showing 8 changed files with 151 additions and 39 deletions.
2 changes: 1 addition & 1 deletion catalyst_voices/lib/pages/coming_soon/description.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ComingSoonDescription extends StatelessWidget {
height: 66,
child: DefaultTextStyle(
style: GoogleFonts.notoSans(
textStyle: const TextStyle(color: VoicesColors.blueText),
textStyle: const TextStyle(color: VoicesColors.lightTextOnPrimary),
fontSize: 16,
fontWeight: FontWeight.w400,
),
Expand Down
2 changes: 1 addition & 1 deletion catalyst_voices/lib/pages/coming_soon/logo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ComingSoonLogo extends StatelessWidget {
child: Text(
l10n.comingSoonSubtitle,
style: GoogleFonts.notoSans(
textStyle: const TextStyle(color: VoicesColors.blue),
textStyle: const TextStyle(color: VoicesColors.lightPrimary),
fontSize: 19,
fontWeight: FontWeight.w500,
),
Expand Down
4 changes: 2 additions & 2 deletions catalyst_voices/lib/pages/coming_soon/title.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class ComingSoonTitle extends StatelessWidget {
children: [
DefaultTextStyle(
style: GoogleFonts.poppins(
textStyle: const TextStyle(color: VoicesColors.blue),
textStyle: const TextStyle(color: VoicesColors.lightPrimary),
fontSize: 53,
height: 1.15,
fontWeight: FontWeight.w700,
Expand All @@ -35,7 +35,7 @@ class ComingSoonTitle extends StatelessWidget {
),
DefaultTextStyle(
style: GoogleFonts.poppins(
textStyle: const TextStyle(color: VoicesColors.blue),
textStyle: const TextStyle(color: VoicesColors.lightPrimary),
fontSize: 53,
height: 1.15,
fontWeight: FontWeight.w700,
Expand Down
2 changes: 1 addition & 1 deletion catalyst_voices/lib/pages/home/home_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ final class HomePage extends StatelessWidget {
Text(
context.l10n.homeScreenText,
style: const TextStyle(
color: VoicesColors.purpleGradientStart,
color: VoicesColors.lightPrimary,
fontFamily: VoicesFonts.sFPro,
fontSize: 32,
),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="white">#FFFFFF</color>
<color name="dark_background ">#000000</color>
<color name="purple">#512DA8</color>
<color name="purple_gradient_start">#673AB7</color>
<color name="purple_gradient_stop">#512DA8</color>
<color name="dark_card">#222126</color>
<color name="green">#7CAE7A</color>
<color name="red">#B02E0C</color>
<color name="today">#565656</color>
<color name="blue">#1235C7</color>
<color name="blue_text">#506288</color>
<color name="light_text_primary">#212A3D</color>
<color name="light_text_on_primary">#506288</color>
<color name="light_text_on_primary_container">#FFFFFF</color>
<color name="light_text_disabled">#61212A3D</color>
<color name="light_primary">#123CD3</color>
<color name="light_on_primary">#FFFFFF</color>
<color name="light_primary_container">#A1B4F7</color>
<color name="light_on_primary_container">#081B5E</color>
<color name="light_secondary">#C014EB</color>
<color name="light_on_secondary">#FFFFFF</color>
<color name="light_secondary_container">#E6A1F7</color>
<color name="light_on_secondary_container">#4D085E</color>
<color name="light_outline">#D9DEE8</color>
<color name="light_outline_variant">#61BFC8D9</color>
<color name="light_error">#CC0000</color>
<color name="light_on_error">#FFFFFF</color>
<color name="light_error_container">#FFD1D1</color>
<color name="light_on_error_container">#700000</color>
<color name="light_success">#218230</color>
<color name="light_on_success">#FFFFFF</color>
<color name="light_success_container">#CEF3D4</color>
<color name="light_on_success_container">#13491B</color>
<color name="light_warning">#E76309</color>
<color name="light_on_warning">#FFFFFF</color>
<color name="light_warning_container">#FDE1CE</color>
<color name="light_on_warning_container">#582603</color>
<color name="light_on_surface_neutral_08">#14212A3D</color>
<color name="light_on_surface_neutral_012">#1F212A3D</color>
<color name="light_on_surface_neutral_016">#29212A3D</color>
<color name="light_on_surface_primary_container">#A1B4F7</color>
<color name="light_on_surface_primary_08">#14123CD3</color>
<color name="light_on_surface_primary_012">#1F123CD3</color>
<color name="light_on_surface_primary_016">#29123CD3</color>
<color name="light_on_surface_secondary_08">#14C014EB</color>
<color name="light_on_surface_secondary_012">#1FC014EB</color>
<color name="light_on_surface_secondary_016">#29C014EB</color>
<color name="light_on_surface_error_08">#14CC0000</color>
<color name="light_on_surface_error_012">#1FCC0000</color>
<color name="light_on_surface_error_016">#29CC0000</color>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ final class Example extends StatelessWidget {
const Text(
'Catalyst Assets',
style: TextStyle(
color: VoicesColors.purpleGradientStart,
color: VoicesColors.lightPrimary,
fontFamily: VoicesFonts.sFPro,
fontSize: 32,
),
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void main() {
// the color of the widgets we are testing and they are the colors
// we will check against to ensure correct rendering.
final fallbackColor = ThemeData(useMaterial3: true).primaryColor;
const catalystColor = VoicesColors.blue;
const catalystColor = VoicesColors.lightPrimary;

testWidgets('Default Catalyst theme is applied', (tester) async {
await tester.pumpWidget(
Expand Down

0 comments on commit 61c5b95

Please sign in to comment.