diff --git a/firka/lib/ui/model/style.dart b/firka/lib/ui/model/style.dart index f02eb70b..e8da7f96 100644 --- a/firka/lib/ui/model/style.dart +++ b/firka/lib/ui/model/style.dart @@ -53,6 +53,10 @@ class FirkaColors { Color textSecondary; Color textTertiary; + Color textPrimaryLight; + Color textSecondaryLight; + Color textTertiaryLight; + Color card; Color cardTranslucent; @@ -89,6 +93,9 @@ class FirkaColors { required this.textPrimary, required this.textSecondary, required this.textTertiary, + required this.textPrimaryLight, + required this.textSecondaryLight, + required this.textTertiaryLight, required this.card, required this.cardTranslucent, required this.buttonSecondaryFill, @@ -208,6 +215,9 @@ final FirkaStyle lightStyle = FirkaStyle( textPrimary: Color(0xFF394C0A), textSecondary: Color(0xCC394C0A), textTertiary: Color(0x80394C0A), + textPrimaryLight: Color(0xFF394C0A), + textSecondaryLight: Color(0xCC394C0A), + textTertiaryLight: Color(0x80394C0A), card: Color(0xFFF3FBDE), cardTranslucent: Color(0x80F3FBDE), buttonSecondaryFill: Color(0xFFFEFFFD), @@ -243,6 +253,9 @@ final FirkaStyle darkStyle = FirkaStyle( textPrimary: Color(0xFFEAF7CC), textSecondary: Color(0xB3EAF7CC), textTertiary: Color(0x80EAF7CC), + textPrimaryLight: Color(0xFF394C0A), + textSecondaryLight: Color(0xCC394C0A), + textTertiaryLight: Color(0x80394C0A), card: Color(0xFF141905), cardTranslucent: Color(0x80141905), buttonSecondaryFill: Color(0xFF20290B), diff --git a/firka/lib/ui/phone/screens/home/beta_screen.dart b/firka/lib/ui/phone/screens/home/beta_screen.dart index 99696003..e320bae7 100644 --- a/firka/lib/ui/phone/screens/home/beta_screen.dart +++ b/firka/lib/ui/phone/screens/home/beta_screen.dart @@ -76,9 +76,9 @@ class _BetaScreenState extends FirkaState { text: widget.data.l10n.cancel, bgColor: appStyle.colors.buttonSecondaryFill, fontStyle: appStyle.fonts.B_14R - .apply(color: appStyle.colors.textPrimary), - icon: - Icon(Icons.close, color: appStyle.colors.textPrimary), + .apply(color: appStyle.colors.textPrimaryLight), + icon: Icon(Icons.close, + color: appStyle.colors.textPrimaryLight), ), onTap: () { exit(0); @@ -93,9 +93,9 @@ class _BetaScreenState extends FirkaState { ? appStyle.colors.accent : appStyle.colors.secondary, fontStyle: appStyle.fonts.B_14R - .apply(color: appStyle.colors.textPrimary), - icon: - Icon(Icons.check, color: appStyle.colors.textPrimary), + .apply(color: appStyle.colors.textPrimaryLight), + icon: Icon(Icons.check, + color: appStyle.colors.textPrimaryLight), ), onTap: () async { if (counter != 0) return; diff --git a/firka/lib/ui/phone/screens/login/login_screen.dart b/firka/lib/ui/phone/screens/login/login_screen.dart index bb3bb031..0f45199b 100644 --- a/firka/lib/ui/phone/screens/login/login_screen.dart +++ b/firka/lib/ui/phone/screens/login/login_screen.dart @@ -373,7 +373,7 @@ class _LoginScreenState extends FirkaState { widget.data.l10n.loginBtn, textAlign: TextAlign.center, style: appStyle.fonts.H_16px.copyWith( - color: appStyle.colors.textPrimary, + color: appStyle.colors.textPrimaryLight, fontVariations: [FontVariation("wght", 800)]), ), ), diff --git a/firka/lib/ui/phone/screens/settings/settings_screen.dart b/firka/lib/ui/phone/screens/settings/settings_screen.dart index 8cb05e2b..624b01e4 100644 --- a/firka/lib/ui/phone/screens/settings/settings_screen.dart +++ b/firka/lib/ui/phone/screens/settings/settings_screen.dart @@ -464,7 +464,7 @@ class _SettingsScreenState extends FirkaState { text: widget.data.l10n.save, bgColor: appStyle.colors.accent, fontStyle: appStyle.fonts.B_14R - .apply(color: appStyle.colors.textSecondary)), + .apply(color: appStyle.colors.textSecondaryLight)), onTap: () async { if (settingAppIcon) return; settingAppIcon = true;