diff --git a/lib/ui/device_checkout_request_screen.dart b/lib/ui/device_checkout_request_screen.dart index ec8e8e2..11257e2 100644 --- a/lib/ui/device_checkout_request_screen.dart +++ b/lib/ui/device_checkout_request_screen.dart @@ -122,6 +122,16 @@ class _DeviceCheckoutRequestScreenState Expanded( child: OutlinedButton.icon( onPressed: _pickStartTime, + style: OutlinedButton.styleFrom( + foregroundColor: + globalProfileTheme.value?.accent ?? + AppPalette.ink, + side: BorderSide( + color: + globalProfileTheme.value?.accent ?? + AppPalette.ink, + ), + ), icon: const Icon(Icons.play_arrow_rounded), label: Text( _startTime == null @@ -134,6 +144,16 @@ class _DeviceCheckoutRequestScreenState Expanded( child: OutlinedButton.icon( onPressed: _pickEndTime, + style: OutlinedButton.styleFrom( + foregroundColor: + globalProfileTheme.value?.accent ?? + AppPalette.ink, + side: BorderSide( + color: + globalProfileTheme.value?.accent ?? + AppPalette.ink, + ), + ), icon: const Icon(Icons.stop_rounded), label: Text( _endTime == null diff --git a/lib/ui/teacher_call_screen.dart b/lib/ui/teacher_call_screen.dart index 221899b..3b82bb6 100644 --- a/lib/ui/teacher_call_screen.dart +++ b/lib/ui/teacher_call_screen.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import '../data/teacher_call_schedule.dart'; import '../function/teacher_call_controller.dart'; import '../theme/app_palette.dart'; +import '../theme/theme_sync.dart'; import 'app_notice.dart'; import 'title_pill.dart'; @@ -30,6 +31,9 @@ class _TeacherCallScreenState extends State { final _customPurposeController = TextEditingController(); bool _useCustomPurpose = false; + // πŸ›οΈ μž₯μ°©ν•œ ν…œν”Œλ¦Ώμ˜ 강쑰색 - μ„ νƒλœ μΉ©/λ²„νŠΌμ²˜λŸΌ "쀑립" μš”μ†Œμ—λ§Œ μ“΄λ‹€. + Color get _accentColor => globalProfileTheme.value?.accent ?? AppPalette.ink; + @override void initState() { super.initState(); @@ -150,7 +154,7 @@ class _TeacherCallScreenState extends State { style: ElevatedButton.styleFrom( backgroundColor: _selectedTeacherId == null ? Colors.grey - : AppPalette.ink, + : _accentColor, foregroundColor: AppPalette.paper, padding: const EdgeInsets.symmetric(vertical: 16), shape: RoundedRectangleBorder( @@ -226,7 +230,7 @@ class _TeacherCallScreenState extends State { width: 4, height: 16, decoration: BoxDecoration( - color: AppPalette.ink, + color: _accentColor, borderRadius: BorderRadius.circular(2), ), ), @@ -318,11 +322,9 @@ class _TeacherCallScreenState extends State { child: Container( padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16), decoration: BoxDecoration( - color: selected ? AppPalette.ink : AppPalette.paper, + color: selected ? _accentColor : AppPalette.paper, borderRadius: BorderRadius.circular(28), - border: Border.all( - color: selected ? AppPalette.ink : AppPalette.sage, - ), + border: Border.all(color: selected ? _accentColor : AppPalette.sage), ), child: Text( label, @@ -376,7 +378,7 @@ class _TeacherCallScreenState extends State { final location = t['location'] ?? 'ꡐ무싀'; final isSelected = _selectedTeacherId == t['teacherId']; final inClass = _controller.isInClassNow(name); - final statusColor = inClass ? AppPalette.warning : AppPalette.ink; + final statusColor = inClass ? AppPalette.warning : _accentColor; return GestureDetector( onTap: () => setState(() { @@ -386,10 +388,10 @@ class _TeacherCallScreenState extends State { child: Container( padding: const EdgeInsets.all(12), decoration: BoxDecoration( - color: isSelected ? AppPalette.ink : AppPalette.paper, + color: isSelected ? _accentColor : AppPalette.paper, borderRadius: BorderRadius.circular(20), border: Border.all( - color: isSelected ? AppPalette.ink : AppPalette.sage, + color: isSelected ? _accentColor : AppPalette.sage, ), boxShadow: [ BoxShadow(