diff --git a/sojorn_app/lib/screens/compose/video_editor_screen.dart b/sojorn_app/lib/screens/compose/video_editor_screen.dart index ad240bc..53f2af6 100644 --- a/sojorn_app/lib/screens/compose/video_editor_screen.dart +++ b/sojorn_app/lib/screens/compose/video_editor_screen.dart @@ -414,9 +414,9 @@ class _sojornVideoEditorState extends State { // For web or bytes, show placeholder if (kIsWeb || widget.videoBytes != null) { return Scaffold( - backgroundColor: SojornColors.matteBlack, + backgroundColor: _matteBlack, appBar: AppBar( - backgroundColor: SojornColors.matteBlack, + backgroundColor: _matteBlack, foregroundColor: SojornColors.basicWhite, leading: IconButton( tooltip: 'Cancel', @@ -427,7 +427,7 @@ class _sojornVideoEditorState extends State { TextButton( onPressed: _isExporting ? null : _saveWithoutEditing, style: TextButton.styleFrom( - foregroundColor: SojornColors.brightNavy, + foregroundColor: _brightNavy, ), child: _isExporting ? const SizedBox( @@ -450,7 +450,7 @@ class _sojornVideoEditorState extends State { Icon( Icons.video_library, size: 64, - color: SojornColors.brightNavy, + color: _brightNavy, ), const SizedBox(height: 24), Padding( @@ -484,7 +484,7 @@ class _sojornVideoEditorState extends State { label: Text( _isExporting ? 'Processing...' : 'Continue with Video'), style: ElevatedButton.styleFrom( - backgroundColor: SojornColors.brightNavy, + backgroundColor: _brightNavy, foregroundColor: SojornColors.basicWhite, padding: const EdgeInsets.symmetric( horizontal: 32, @@ -501,13 +501,13 @@ class _sojornVideoEditorState extends State { // Show loading state if (_isLoading) { return Scaffold( - backgroundColor: SojornColors.matteBlack, + backgroundColor: _matteBlack, body: Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ CircularProgressIndicator( - color: SojornColors.brightNavy, + color: _brightNavy, ), const SizedBox(height: 16), const Text( @@ -523,7 +523,7 @@ class _sojornVideoEditorState extends State { // Show error state if initialization failed if (!_isInitialized) { return Scaffold( - backgroundColor: SojornColors.matteBlack, + backgroundColor: _matteBlack, appBar: AppBar( backgroundColor: _matteBlack, foregroundColor: SojornColors.basicWhite, diff --git a/sojorn_app/lib/screens/profile/viewable_profile_screen.dart b/sojorn_app/lib/screens/profile/viewable_profile_screen.dart index 2fd3e61..bcb5c8f 100644 --- a/sojorn_app/lib/screens/profile/viewable_profile_screen.dart +++ b/sojorn_app/lib/screens/profile/viewable_profile_screen.dart @@ -12,6 +12,7 @@ import '../../models/trust_tier.dart'; import '../../providers/api_provider.dart'; import '../../theme/app_theme.dart'; import '../../theme/tokens.dart'; +import 'package:google_fonts/google_fonts.dart'; import '../../utils/country_flag.dart'; import '../../utils/url_launcher_helper.dart'; import '../../widgets/sojorn_post_card.dart'; @@ -1699,11 +1700,11 @@ class _StatItem extends StatelessWidget { Text( value, style: AppTheme.headlineSmall.copyWith( - color: SojornColors.white, + color: SojornColors.basicWhite, fontSize: 16, shadows: [ Shadow( - color: SojornColors.shadow, + color: const Color(0x4D000000), blurRadius: 4, ), ], @@ -1715,7 +1716,7 @@ class _StatItem extends StatelessWidget { fontSize: 10, shadows: [ Shadow( - color: SojornColors.shadow, + color: const Color(0x4D000000), blurRadius: 2, ), ], diff --git a/sojorn_app/lib/screens/quips/create/quip_preview_screen.dart b/sojorn_app/lib/screens/quips/create/quip_preview_screen.dart index 75280be..66c0a55 100644 --- a/sojorn_app/lib/screens/quips/create/quip_preview_screen.dart +++ b/sojorn_app/lib/screens/quips/create/quip_preview_screen.dart @@ -87,7 +87,7 @@ class _QuipPreviewScreenState extends State { controller: textController, autofocus: true, style: const TextStyle(color: SojornColors.basicWhite, fontSize: 24), - decoration: const InputDecoration( + decoration: InputDecoration( border: InputBorder.none, hintText: 'Type here...', hintStyle: TextStyle(color: SojornColors.basicWhite.withValues(alpha: 0.54)), diff --git a/sojorn_app/lib/theme/tokens.dart b/sojorn_app/lib/theme/tokens.dart index 33a6330..b0b0ba0 100644 --- a/sojorn_app/lib/theme/tokens.dart +++ b/sojorn_app/lib/theme/tokens.dart @@ -13,6 +13,7 @@ class SojornColors { static const Color basicQueenPink = Color(0xFFE5C0DD); static const Color basicQueenPinkLight = Color(0xFFF9F2F7); static const Color basicWhite = Color(0xFFFFFFFF); + static const Color basicBlack = Color(0xFF000000); // ── Pop theme palette ──────────────────────────────── static const Color popNavyBlue = Color(0xFF000383); diff --git a/sojorn_app/lib/widgets/video_player_with_comments.dart b/sojorn_app/lib/widgets/video_player_with_comments.dart index 13d1cb8..5f80e8b 100644 --- a/sojorn_app/lib/widgets/video_player_with_comments.dart +++ b/sojorn_app/lib/widgets/video_player_with_comments.dart @@ -205,7 +205,7 @@ class _VideoPlayerWithCommentsState extends State { child: VideoProgressIndicator( _videoController!, allowScrubbing: true, - colors: const VideoProgressColors( + colors: VideoProgressColors( playedColor: SojornColors.basicWhite, backgroundColor: SojornColors.basicWhite.withValues(alpha: 0.24), bufferedColor: SojornColors.basicWhite.withValues(alpha: 0.38),