From f73932cc989bac8d4fb0dd2db1e3065d1a729f49 Mon Sep 17 00:00:00 2001 From: Bl3kiiie Date: Wed, 9 Apr 2025 15:37:26 +0200 Subject: [PATCH] color update with small UI changes --- lib/screens/book_screen.dart | 21 ++++------ lib/screens/camera_screen.dart | 13 ++++-- lib/screens/preview_screen.dart | 11 ++++- lib/screens/settings_screen.dart | 70 ++++++++++++++++++-------------- lib/screens/stream_screen.dart | 7 ++++ lib/screens/target_view.dart | 9 +++- 6 files changed, 83 insertions(+), 48 deletions(-) diff --git a/lib/screens/book_screen.dart b/lib/screens/book_screen.dart index b29cd62..dce77b6 100644 --- a/lib/screens/book_screen.dart +++ b/lib/screens/book_screen.dart @@ -77,15 +77,22 @@ Color _getColorFromName(String colorName) { return Colors.lime; case 'mint': return Colors.greenAccent; - case 'sky': + case 'orange': return Colors.orange; case 'violet': return Colors.deepPurpleAccent; + case 'amber': + return Colors.amber; + case 'brown': + return Colors.brown; + case 'grey': + return Colors.grey; default: return Colors.blue; // fallback } } + // Load the target data files from the directory void _loadTargetDataFiles() async { try { @@ -590,15 +597,6 @@ Widget _buildFolderRow(String folderName) { color: isExpanded ? _bulletColor : Colors.transparent, width: 1.5, ), - boxShadow: isExpanded - ? [ - BoxShadow( - color: _bulletColor.withOpacity(0.2), - blurRadius: 6, - offset: const Offset(0, 2), - ), - ] - : [], ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -611,7 +609,6 @@ Widget _buildFolderRow(String folderName) { ? '🏆 $folderName' : folderName, style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w600), - overflow: TextOverflow.ellipsis, ), subtitle: Padding( padding: const EdgeInsets.only(top: 4.0), @@ -626,7 +623,7 @@ Widget _buildFolderRow(String folderName) { IconButton( iconSize: 22, visualDensity: VisualDensity.compact, - icon: const Icon(Icons.my_location, color: Colors.grey), + icon: Icon(Icons.my_location, color: _bulletColor), onPressed: () => _openFolderTargetView(folderName), ), IconButton( diff --git a/lib/screens/camera_screen.dart b/lib/screens/camera_screen.dart index 0e6d54b..8301571 100644 --- a/lib/screens/camera_screen.dart +++ b/lib/screens/camera_screen.dart @@ -61,16 +61,23 @@ Color _getColorFromName(String colorName) { return Colors.lime; case 'mint': return Colors.greenAccent; - case 'sky': - return Colors.lightBlueAccent; + case 'orange': + return Colors.orange; case 'violet': return Colors.deepPurpleAccent; + case 'amber': + return Colors.amber; + case 'brown': + return Colors.brown; + case 'grey': + return Colors.grey; default: - return Colors.blue; + return Colors.blue; // fallback } } + Future _loadBulletCount() async { final prefs = await SharedPreferences.getInstance(); setState(() { diff --git a/lib/screens/preview_screen.dart b/lib/screens/preview_screen.dart index 4a02bc8..eae4750 100644 --- a/lib/screens/preview_screen.dart +++ b/lib/screens/preview_screen.dart @@ -97,15 +97,22 @@ Color _getColorFromName(String colorName) { return Colors.lime; case 'mint': return Colors.greenAccent; - case 'sky': + case 'orange': return Colors.orange; case 'violet': return Colors.deepPurpleAccent; + case 'amber': + return Colors.amber; + case 'brown': + return Colors.brown; + case 'grey': + return Colors.grey; default: return Colors.blue; // fallback } } + Offset _generatePositionForScore(int score, Offset center) { const double bulletRadius = 25; final List rings = [14, 70, 125, 180, 235, 290, 345, 400, 455, 510]; @@ -657,7 +664,7 @@ void _moveBullet(Offset offsetDelta) { ); }, style: ElevatedButton.styleFrom( - backgroundColor: _bulletColor.withOpacity(0.9), + backgroundColor: Colors.grey[800], foregroundColor: Colors.white, elevation: 0, padding: const EdgeInsets.symmetric(vertical: 16), diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart index 8675997..ce23757 100644 --- a/lib/screens/settings_screen.dart +++ b/lib/screens/settings_screen.dart @@ -33,10 +33,14 @@ class _SettingsScreenState extends State { 'Pink', 'Lime', 'Mint', - 'Sky', + 'Orange', 'Violet', + 'Amber', + 'Brown', + 'Grey', ]; + @override void initState() { super.initState(); @@ -46,36 +50,42 @@ class _SettingsScreenState extends State { } - Color _getColorFromName(String colorName) { - switch (colorName.toLowerCase()) { - case 'blue': - return Colors.blue; - case 'green': - return Colors.green; - case 'yellow': - return Colors.yellow; - case 'purple': - return Colors.purple; - case 'cyan': - return Colors.cyan; - case 'teal': - return Colors.teal; - case 'indigo': - return Colors.indigo; - case 'pink': - return Colors.pink; - case 'lime': - return Colors.lime; - case 'mint': - return Colors.greenAccent; - case 'sky': - return Colors.orange; - case 'violet': - return Colors.deepPurpleAccent; - default: - return Colors.blue; // fallback - } + Color _getColorFromName(String colorName) { + switch (colorName.toLowerCase()) { + case 'blue': + return Colors.blue; + case 'green': + return Colors.green; + case 'yellow': + return Colors.yellow; + case 'purple': + return Colors.purple; + case 'cyan': + return Colors.cyan; + case 'teal': + return Colors.teal; + case 'indigo': + return Colors.indigo; + case 'pink': + return Colors.pink; + case 'lime': + return Colors.lime; + case 'mint': + return Colors.greenAccent; + case 'orange': + return Colors.orange; + case 'violet': + return Colors.deepPurpleAccent; + case 'amber': + return Colors.amber; + case 'brown': + return Colors.brown; + case 'grey': + return Colors.grey; + default: + return Colors.blue; // fallback } +} Future _loadBulletColor() async { final prefs = await SharedPreferences.getInstance(); diff --git a/lib/screens/stream_screen.dart b/lib/screens/stream_screen.dart index 51f7c46..24d92fd 100644 --- a/lib/screens/stream_screen.dart +++ b/lib/screens/stream_screen.dart @@ -95,11 +95,18 @@ Color _getColorFromName(String colorName) { return Colors.orange; case 'violet': return Colors.deepPurpleAccent; + case 'amber': + return Colors.amber; + case 'brown': + return Colors.brown; + case 'grey': + return Colors.grey; default: return Colors.blue; // fallback } } + void _setSystemBarStyle() { SystemChrome.setSystemUIOverlayStyle( SystemUiOverlayStyle( diff --git a/lib/screens/target_view.dart b/lib/screens/target_view.dart index e6a40f0..b894ebb 100644 --- a/lib/screens/target_view.dart +++ b/lib/screens/target_view.dart @@ -78,16 +78,23 @@ class _TargetViewScreenState extends State { return Colors.lime; case 'mint': return Colors.greenAccent; - case 'sky': + case 'orange': return Colors.orange; case 'violet': return Colors.deepPurpleAccent; + case 'amber': + return Colors.amber; + case 'brown': + return Colors.brown; + case 'grey': + return Colors.grey; default: return Colors.blue; // fallback } } + Future _loadJsonAndImage() async { try { final byteData = await rootBundle.load(targetAssetPath);