diff --git a/lib/data/teacher_call_schedule.dart b/lib/data/teacher_call_schedule.dart index ff490be..97bb979 100644 --- a/lib/data/teacher_call_schedule.dart +++ b/lib/data/teacher_call_schedule.dart @@ -1,3 +1,5 @@ +import 'package:flutter/material.dart'; + // ๐Ÿ“… ์„ ์ƒ๋‹˜ ํ˜ธ์ถœ ํ™”๋ฉด์—์„œ "์ง€๊ธˆ ์ˆ˜์—… ์ค‘" ๋ฐฐ์ง€๋ฅผ ๋ณด์—ฌ์ฃผ๊ธฐ ์œ„ํ•œ ์‹œ๊ฐ„ํ‘œ ๋ฐ์ดํ„ฐ. // ์›๋ž˜ ๋ณ„๋„ Firebase ํŽ˜์ด์ง€(index.html)์— ์žˆ๋˜ ๋ฐ์ดํ„ฐ๋ฅผ ๊ทธ๋Œ€๋กœ ์˜ฎ๊ธฐ๋ฉด์„œ, // "๊น€์ง€" ์•ฝ์–ด๊ฐ€ ์‹ค์ œ๋กœ๋Š” ์กฐ์‹ ํ˜„ ์„ ์ƒ๋‹˜์„ ๊ฐ€๋ฆฌํ‚ค๋˜ ์˜คํƒ€๋ฅผ "์กฐ์‹ "์œผ๋กœ ๋ฐ”๋กœ์žก์•˜๋‹ค. @@ -101,15 +103,15 @@ List teachersInClassNow(int weekday, String hhmm) { return abbrevs.map((a) => kTeacherAbbrevMap[a]).whereType().toList(); } -const Map kLocationIcons = { - "๊ต๋ฌด์‹ค": "๐Ÿข", - "๊ธ‰์‹์‹ค": "๐Ÿด", - "๊ณผํ•™์‹ค": "๐Ÿงช", - "๋„์„œ๊ด€": "๐Ÿ“–", - "์ถœ์žฅ": "๐Ÿš—", - "์กฐํ‡ด/ํ‡ด๊ทผ": "๐Ÿ ", - "์ƒ๋‹ด์‹ค": "๐Ÿ’ฌ", - "๊ธฐ์ˆ™์‚ฌ": "๐Ÿจ", +const Map kLocationIcons = { + "๊ต๋ฌด์‹ค": Icons.business_rounded, + "๊ธ‰์‹์‹ค": Icons.restaurant_rounded, + "๊ณผํ•™์‹ค": Icons.science_rounded, + "๋„์„œ๊ด€": Icons.menu_book_rounded, + "์ถœ์žฅ": Icons.directions_car_rounded, + "์กฐํ‡ด/ํ‡ด๊ทผ": Icons.home_rounded, + "์ƒ๋‹ด์‹ค": Icons.forum_rounded, + "๊ธฐ์ˆ™์‚ฌ": Icons.hotel_rounded, }; const List kLocationOptions = [ diff --git a/lib/ui/teacher_call_screen.dart b/lib/ui/teacher_call_screen.dart index aee8ecd..ccd8713 100644 --- a/lib/ui/teacher_call_screen.dart +++ b/lib/ui/teacher_call_screen.dart @@ -239,8 +239,13 @@ class _TeacherCallScreenState extends State { ); } + static const List _medalColors = [ + Color(0xFFC9A227), // ๊ธˆ + Color(0xFF9AA0A6), // ์€ + Color(0xFFB07A4B), // ๋™ + ]; + Widget _buildRanking() { - final medals = ['๐Ÿฅ‡', '๐Ÿฅˆ', '๐Ÿฅ‰']; return Container( padding: const EdgeInsets.all(14), decoration: BoxDecoration( @@ -272,7 +277,11 @@ class _TeacherCallScreenState extends State { for (var i = 0; i < _controller.ranking.length; i++) Column( children: [ - Text(medals[i], style: const TextStyle(fontSize: 22)), + Icon( + Icons.emoji_events_rounded, + color: _medalColors[i], + size: 22, + ), Text( _controller.ranking[i]['teacherName'] ?? '', style: const TextStyle(fontWeight: FontWeight.bold), @@ -436,14 +445,26 @@ class _TeacherCallScreenState extends State { ), ), const SizedBox(height: 2), - Text( - '${kLocationIcons[location] ?? '๐Ÿ“'} $location', - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 11, - color: isSelected ? Colors.white70 : Colors.grey[500], - ), + Row( + children: [ + Icon( + kLocationIcons[location] ?? Icons.location_on_rounded, + size: 12, + color: isSelected ? Colors.white70 : Colors.grey[500], + ), + const SizedBox(width: 3), + Expanded( + child: Text( + location, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 11, + color: isSelected ? Colors.white70 : Colors.grey[500], + ), + ), + ), + ], ), ], ), diff --git a/lib/ui/teacher_location_screen.dart b/lib/ui/teacher_location_screen.dart index eec89a9..a7a4763 100644 --- a/lib/ui/teacher_location_screen.dart +++ b/lib/ui/teacher_location_screen.dart @@ -112,13 +112,25 @@ class _TeacherLocationScreenState extends State { ), ), const SizedBox(height: 6), - Text( - '${kLocationIcons[_controller.currentLocation] ?? '๐Ÿ“'} ${_controller.currentLocation}', - style: const TextStyle( - fontWeight: FontWeight.bold, - fontSize: 20, - color: Colors.white, - ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + kLocationIcons[_controller.currentLocation] ?? + Icons.location_on_rounded, + color: Colors.white, + size: 20, + ), + const SizedBox(width: 8), + Text( + _controller.currentLocation, + style: const TextStyle( + fontWeight: FontWeight.bold, + fontSize: 20, + color: Colors.white, + ), + ), + ], ), ], ), @@ -177,9 +189,13 @@ class _TeacherLocationScreenState extends State { : AppPalette.linen, shape: BoxShape.circle, ), - child: Text( - kLocationIcons[loc] ?? '๐Ÿ“', - style: const TextStyle(fontSize: 16), + child: Icon( + kLocationIcons[loc] ?? + Icons.location_on_rounded, + size: 16, + color: isSelected + ? Colors.white + : AppPalette.ink, ), ), const SizedBox(height: 6),