diff --git a/assets/targets/Target11.jpg b/assets/targets/Target11.jpg index bf545e8..7335b34 100644 Binary files a/assets/targets/Target11.jpg and b/assets/targets/Target11.jpg differ diff --git a/assets/targets/Target12.jpg b/assets/targets/Target12.jpg index 19e91ca..ee83fd5 100644 Binary files a/assets/targets/Target12.jpg and b/assets/targets/Target12.jpg differ diff --git a/assets/targets/Target13.jpg b/assets/targets/Target13.jpg index 1c228ba..3a3710a 100644 Binary files a/assets/targets/Target13.jpg and b/assets/targets/Target13.jpg differ diff --git a/assets/targets/Target14.jpg b/assets/targets/Target14.jpg index 71710b6..88bb32e 100644 Binary files a/assets/targets/Target14.jpg and b/assets/targets/Target14.jpg differ diff --git a/assets/targets/Target15.jpg b/assets/targets/Target15.jpg index c4ae48f..8fa6349 100644 Binary files a/assets/targets/Target15.jpg and b/assets/targets/Target15.jpg differ diff --git a/assets/targets/Target16.jpg b/assets/targets/Target16.jpg index 3d1d201..3fd9803 100644 Binary files a/assets/targets/Target16.jpg and b/assets/targets/Target16.jpg differ diff --git a/assets/targets/Target17.jpg b/assets/targets/Target17.jpg index 7498e0d..a2d6ee3 100644 Binary files a/assets/targets/Target17.jpg and b/assets/targets/Target17.jpg differ diff --git a/assets/targets/Target18.jpg b/assets/targets/Target18.jpg index 8f979ab..cb05a45 100644 Binary files a/assets/targets/Target18.jpg and b/assets/targets/Target18.jpg differ diff --git a/assets/targets/Target19.jpg b/assets/targets/Target19.jpg index bc0840d..cdcc65c 100644 Binary files a/assets/targets/Target19.jpg and b/assets/targets/Target19.jpg differ diff --git a/assets/targets/Target20.jpg b/assets/targets/Target20.jpg index dd2b8e3..fd6805a 100644 Binary files a/assets/targets/Target20.jpg and b/assets/targets/Target20.jpg differ diff --git a/assets/targets/Target21.jpg b/assets/targets/Target21.jpg index b16af08..37060e4 100644 Binary files a/assets/targets/Target21.jpg and b/assets/targets/Target21.jpg differ diff --git a/assets/targets/Target22.jpg b/assets/targets/Target22.jpg index 89ae2ba..f6e5d85 100644 Binary files a/assets/targets/Target22.jpg and b/assets/targets/Target22.jpg differ diff --git a/assets/targets/Target23.jpg b/assets/targets/Target23.jpg index ffedb53..0edec6c 100644 Binary files a/assets/targets/Target23.jpg and b/assets/targets/Target23.jpg differ diff --git a/assets/targets/Target24.jpg b/assets/targets/Target24.jpg index 2e319d3..3571434 100644 Binary files a/assets/targets/Target24.jpg and b/assets/targets/Target24.jpg differ diff --git a/assets/targets/Target25.jpg b/assets/targets/Target25.jpg index 7b98032..4c42109 100644 Binary files a/assets/targets/Target25.jpg and b/assets/targets/Target25.jpg differ diff --git a/assets/targets/Target26.jpg b/assets/targets/Target26.jpg index a7f186e..8bb94f3 100644 Binary files a/assets/targets/Target26.jpg and b/assets/targets/Target26.jpg differ diff --git a/assets/targets/Target27.jpg b/assets/targets/Target27.jpg index daa81bf..ec13a03 100644 Binary files a/assets/targets/Target27.jpg and b/assets/targets/Target27.jpg differ diff --git a/assets/targets/Target28.jpg b/assets/targets/Target28.jpg index 47dd120..65c693b 100644 Binary files a/assets/targets/Target28.jpg and b/assets/targets/Target28.jpg differ diff --git a/assets/targets/Target29.jpg b/assets/targets/Target29.jpg index ffe221c..9379857 100644 Binary files a/assets/targets/Target29.jpg and b/assets/targets/Target29.jpg differ diff --git a/assets/targets/Target30.jpg b/assets/targets/Target30.jpg index e806fe8..fc77717 100644 Binary files a/assets/targets/Target30.jpg and b/assets/targets/Target30.jpg differ diff --git a/assets/targets/Target31.jpg b/assets/targets/Target31.jpg new file mode 100644 index 0000000..bccef2b Binary files /dev/null and b/assets/targets/Target31.jpg differ diff --git a/assets/targets/Target32.jpg b/assets/targets/Target32.jpg new file mode 100644 index 0000000..cd085a5 Binary files /dev/null and b/assets/targets/Target32.jpg differ diff --git a/assets/targets/Target33.jpg b/assets/targets/Target33.jpg new file mode 100644 index 0000000..d8706fa Binary files /dev/null and b/assets/targets/Target33.jpg differ diff --git a/assets/targets/Target34.jpg b/assets/targets/Target34.jpg new file mode 100644 index 0000000..7a56e9e Binary files /dev/null and b/assets/targets/Target34.jpg differ diff --git a/assets/targets/Target35.jpg b/assets/targets/Target35.jpg new file mode 100644 index 0000000..486b9bf Binary files /dev/null and b/assets/targets/Target35.jpg differ diff --git a/lib/screens/preview_screen.dart b/lib/screens/preview_screen.dart index ffbc257..ccf4af0 100644 --- a/lib/screens/preview_screen.dart +++ b/lib/screens/preview_screen.dart @@ -301,7 +301,7 @@ class _PreviewScreenState extends State { return const Color(0xFF050608); // Very dark gray case 'assets/targets/Target19.jpg': - return const Color(0xFF09080D); // Dark red + return const Color(0xFFF68527); // Warm orange case 'assets/targets/Target20.jpg': return const Color(0xFFA9D9EF); // Light blue @@ -336,6 +336,21 @@ class _PreviewScreenState extends State { case 'assets/targets/Target30.jpg': return const Color(0xFFFDFDFB); // Off-white + case 'assets/targets/Target31.jpg': + return const Color(0xFFC52736); // Red + + case 'assets/targets/Target32.jpg': + return const Color(0xFFFCF3EE); // Light cream + + case 'assets/targets/Target33.jpg': + return const Color(0xFFFCFCF3); // Very light off-white + + case 'assets/targets/Target34.jpg': + return const Color(0xFFFFFFFD); // Almost white + + case 'assets/targets/Target35.jpg': + return const Color(0xFFFFC5C4); // Light salmon + default: return Colors.grey[900]!; // Fallback to dark gray } diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart index 880ed70..bf00e2b 100644 --- a/lib/screens/settings_screen.dart +++ b/lib/screens/settings_screen.dart @@ -82,6 +82,11 @@ class _SettingsScreenState extends State { 'assets/targets/Target28.jpg', 'assets/targets/Target29.jpg', 'assets/targets/Target30.jpg', + 'assets/targets/Target31.jpg', + 'assets/targets/Target32.jpg', + 'assets/targets/Target33.jpg', + 'assets/targets/Target34.jpg', + 'assets/targets/Target35.jpg', ]; @override @@ -533,20 +538,23 @@ String _getTargetDisplayName(String targetPath) { child: Row( children: [ // Preview box with target - Container( - width: 70, - height: 70, - decoration: BoxDecoration( - border: Border.all(color: Colors.black12), - borderRadius: BorderRadius.circular(8), - color: TargetColors.getBackgroundColor(_selectedTarget), - ), - child: Image.asset( - _selectedTarget, - fit: BoxFit.contain, - errorBuilder: (context, error, stackTrace) { - return Icon(Icons.image_not_supported, color: Colors.grey[400]); - }, + ClipRRect( + borderRadius: BorderRadius.circular(8), + child: Container( + width: 70, + height: 70, + decoration: BoxDecoration( + border: Border.all(color: Colors.black12), + borderRadius: BorderRadius.circular(8), + color: TargetColors.getBackgroundColor(_selectedTarget), + ), + child: Image.asset( + _selectedTarget, + fit: BoxFit.contain, + errorBuilder: (context, error, stackTrace) { + return Icon(Icons.image_not_supported, color: Colors.grey[400]); + }, + ), ), ), const SizedBox(width: 16), @@ -738,65 +746,66 @@ void _showLanguagePopup() { const SizedBox(height: 20), // Preview with multiple bullets on target - ALWAYS ON TOP - ClipRRect( - borderRadius: BorderRadius.circular(12), - child: Container( - width: double.infinity, - height: 280, - decoration: BoxDecoration( - border: Border.all(color: Colors.white24), - color: TargetColors.getBackgroundColor(previewTarget), - ), - child: Stack( - alignment: Alignment.center, - children: [ - Center( - child: Image.asset( - previewTarget, - fit: BoxFit.contain, - errorBuilder: (context, error, stackTrace) { - return Container( - color: Colors.grey[800], - child: const Center( - child: Icon(Icons.image_not_supported, color: Colors.white54), - ), - ); - }, - ), - ), - // Multiple preview bullets scattered around - Positioned( - left: 30, - top: 40, - child: _buildPreviewBullet(previewBulletColor), - ), - Positioned( - right: 25, - top: 50, - child: _buildPreviewBullet(previewBulletColor), - ), - Positioned( - left: 40, - bottom: 30, - child: _buildPreviewBullet(previewBulletColor), - ), - Positioned( - right: 35, - bottom: 40, - child: _buildPreviewBullet(previewBulletColor), - ), - Positioned( - left: 50, - top: 100, - child: _buildPreviewBullet(previewBulletColor), - ), - Positioned( - right: 50, - bottom: 80, - child: _buildPreviewBullet(previewBulletColor), - ), - ], + Container( + width: double.infinity, + height: 280, + decoration: BoxDecoration( + color: TargetColors.getBackgroundColor(previewTarget), + borderRadius: BorderRadius.circular(12), ), + child: ClipRRect( + borderRadius: BorderRadius.circular(12), + child: Stack( + alignment: Alignment.center, + clipBehavior: Clip.hardEdge, + children: [ + Center( + child: Image.asset( + previewTarget, + fit: BoxFit.contain, + errorBuilder: (context, error, stackTrace) { + return Container( + color: Colors.grey[800], + child: const Center( + child: Icon(Icons.image_not_supported, color: Colors.white54), + ), + ); + }, + ), + ), + // Multiple preview bullets scattered around + Positioned( + left: 90, + top: 100, + child: _buildPreviewBullet(previewBulletColor), + ), + Positioned( + right: 90, + top: 110, + child: _buildPreviewBullet(previewBulletColor), + ), + Positioned( + left: 100, + bottom: 90, + child: _buildPreviewBullet(previewBulletColor), + ), + Positioned( + right: 95, + bottom: 100, + child: _buildPreviewBullet(previewBulletColor), + ), + Positioned( + left: 110, + top: 140, + child: _buildPreviewBullet(previewBulletColor), + ), + Positioned( + right: 110, + bottom: 140, + child: _buildPreviewBullet(previewBulletColor), + ), + ], + ), ), ), const SizedBox(height: 24), diff --git a/lib/utils/target_colors.dart b/lib/utils/target_colors.dart index 215d10a..be021e5 100644 --- a/lib/utils/target_colors.dart +++ b/lib/utils/target_colors.dart @@ -21,7 +21,7 @@ class TargetColors { 'assets/targets/Target16.jpg': Color(0xFF000000), // Black 'assets/targets/Target17.jpg': Color(0xFF21304D), // Dark blue 'assets/targets/Target18.jpg': Color(0xFF050608), // Very dark gray - 'assets/targets/Target19.jpg': Color(0xFF09080D), // Dark + 'assets/targets/Target19.jpg': Color(0xFFF68527), // Warm orange 'assets/targets/Target20.jpg': Color(0xFFA9D9EF), // Light blue 'assets/targets/Target21.jpg': Color(0xFFDA6868), // Muted red 'assets/targets/Target22.jpg': Color(0xFFFBFAF6), // Off-white @@ -33,6 +33,11 @@ class TargetColors { 'assets/targets/Target28.jpg': Color(0xFFFFFFFF), // White 'assets/targets/Target29.jpg': Color(0xFF180E27), // Dark purple 'assets/targets/Target30.jpg': Color(0xFFFDFDFB), // Off-white + 'assets/targets/Target31.jpg': Color(0xFFC52736), // Red + 'assets/targets/Target32.jpg': Color(0xFFFCF3EE), // Light cream + 'assets/targets/Target33.jpg': Color(0xFFFCFCF3), // Very light off-white + 'assets/targets/Target34.jpg': Color(0xFFFFFFFD), // Almost white + 'assets/targets/Target35.jpg': Color(0xFFFFC5C4), // Light salmon }; static Color getBackgroundColor(String targetPath) {