added new tragets... fixed some issues.

This commit is contained in:
2025-12-24 11:25:56 +01:00
parent b727e65d14
commit f3dc1e7654
21 changed files with 2408 additions and 1732 deletions
+415 -348
View File
@@ -76,6 +76,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
'assets/targets/Target22.jpg',
'assets/targets/Target23.jpg',
'assets/targets/Target24.jpg',
'assets/targets/Target25.jpg',
'assets/targets/Target26.jpg',
'assets/targets/Target27.jpg',
'assets/targets/Target28.jpg',
'assets/targets/Target29.jpg',
'assets/targets/Target30.jpg',
];
@override
@@ -374,9 +380,7 @@ String _getTargetDisplayName(String targetPath) {
const SizedBox(height: 8),
_buildLanguageSelector(),
const SizedBox(height: 16),
_buildBulletColorSelector(),
const SizedBox(height: 16),
_buildTargetSelector(),
_buildAppearanceSelector(),
const SizedBox(height: 16),
_buildCameraList(),
@@ -397,13 +401,6 @@ String _getTargetDisplayName(String targetPath) {
decoration: BoxDecoration(
color: Colors.grey[300],
borderRadius: BorderRadius.circular(12),
boxShadow: [
BoxShadow(
color: Colors.grey.withValues(alpha: 0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -477,177 +474,161 @@ String _getTargetDisplayName(String targetPath) {
);
}
Widget _buildBulletColorSelector() {
return Container(
margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 0),
decoration: BoxDecoration(
color: Colors.grey[300],
borderRadius: BorderRadius.circular(12),
boxShadow: [
BoxShadow(
color: Colors.grey.withValues(alpha: 0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Header
Container(
width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
decoration: BoxDecoration(
color: Colors.grey[900],
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(12),
topRight: Radius.circular(12),
),
),
child: Row(
children: [
Container(
width: 4,
height: 16,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(2),
),
),
const SizedBox(width: 12),
Text(
_t("Select Bullet Color"),
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
],
),
),
// Content
GestureDetector(
onTap: _showBulletColorPopup,
child: Container(
Widget _buildAppearanceSelector() {
return Container(
margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 0),
decoration: BoxDecoration(
color: Colors.grey[300],
borderRadius: BorderRadius.circular(12),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Header
Container(
width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
decoration: BoxDecoration(
color: Colors.grey[300],
color: Colors.grey[900],
borderRadius: const BorderRadius.only(
bottomLeft: Radius.circular(12),
bottomRight: Radius.circular(12),
topLeft: Radius.circular(12),
topRight: Radius.circular(12),
),
),
child: Row(
children: [
Container(
width: 16,
width: 4,
height: 16,
margin: const EdgeInsets.only(right: 12),
decoration: BoxDecoration(
color: _getColorFromName(_selectedBulletColor),
shape: BoxShape.circle,
border: Border.all(color: Colors.black26),
color: Colors.white,
borderRadius: BorderRadius.circular(2),
),
),
Expanded(
child: Text(
_t(_selectedBulletColor),
style: const TextStyle(color: Colors.black87, fontSize: 14),
const SizedBox(width: 12),
Text(
_t("Appearance"),
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
const Icon(Icons.chevron_right, color: Colors.black54),
],
),
),
),
],
),
);
}
Widget _buildTargetSelector() {
return Container(
margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 0),
decoration: BoxDecoration(
color: Colors.grey[300],
borderRadius: BorderRadius.circular(12),
boxShadow: [
BoxShadow(
color: Colors.grey.withValues(alpha: 0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Header
Container(
width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
decoration: BoxDecoration(
color: Colors.grey[900],
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(12),
topRight: Radius.circular(12),
),
),
child: Row(
children: [
Container(
width: 4,
height: 16,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(2),
// Content
GestureDetector(
onTap: _showAppearancePopup,
child: Container(
width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
decoration: BoxDecoration(
color: Colors.grey[300],
borderRadius: const BorderRadius.only(
bottomLeft: Radius.circular(12),
bottomRight: Radius.circular(12),
),
),
const SizedBox(width: 12),
Text(
_t("Select Target"),
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
],
),
),
// Content
GestureDetector(
onTap: _showTargetPopup,
child: Container(
width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
decoration: BoxDecoration(
color: Colors.grey[300],
borderRadius: const BorderRadius.only(
bottomLeft: Radius.circular(12),
bottomRight: Radius.circular(12),
),
),
child: Row(
children: [
Expanded(
child: Text(
_getTargetDisplayName(_selectedTarget),
style: const TextStyle(color: Colors.black87, fontSize: 14),
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]);
},
),
),
),
const Icon(Icons.chevron_right, color: Colors.black54),
],
const SizedBox(width: 16),
// Details section
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
_t("Bullet:"),
style: const TextStyle(
color: Colors.black54,
fontSize: 12,
fontWeight: FontWeight.w600,
),
),
const SizedBox(width: 8),
Container(
width: 16,
height: 16,
decoration: BoxDecoration(
color: _getColorFromName(_selectedBulletColor),
shape: BoxShape.circle,
border: Border.all(color: Colors.black26, width: 1),
),
),
const SizedBox(width: 6),
Expanded(
child: Text(
_selectedBulletColor,
style: const TextStyle(
color: Colors.black87,
fontSize: 12,
fontWeight: FontWeight.w500,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
),
const SizedBox(height: 8),
Row(
children: [
Text(
_t("Target:"),
style: const TextStyle(
color: Colors.black54,
fontSize: 12,
fontWeight: FontWeight.w600,
),
),
const SizedBox(width: 8),
Expanded(
child: Text(
_getTargetDisplayName(_selectedTarget),
style: const TextStyle(
color: Colors.black87,
fontSize: 12,
fontWeight: FontWeight.w500,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
),
],
),
),
const SizedBox(width: 8),
Icon(Icons.chevron_right, color: Colors.black54),
],
),
),
),
),
],
),
);
}
],
),
);
}
void _showLanguagePopup() {
showDialog(
@@ -725,192 +706,285 @@ void _showLanguagePopup() {
);
}
void _showBulletColorPopup() {
showDialog(
context: context,
builder: (context) {
return Dialog(
backgroundColor: Colors.grey[900],
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
child: Padding(
padding: const EdgeInsets.all(24),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(
_t("Select Bullet Color"),
style: const TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.white,
void _showAppearancePopup() {
String previewBulletColor = _selectedBulletColor;
String previewTarget = _selectedTarget;
int selectedTab = 0; // 0 for Bullet, 1 for Target
showDialog(
context: context,
builder: (context) {
return StatefulBuilder(
builder: (context, innerSetState) {
return Dialog(
backgroundColor: Colors.grey[900],
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
insetPadding: const EdgeInsets.all(24),
child: SizedBox(
height: 700,
width: 400,
child: Padding(
padding: const EdgeInsets.all(24),
child: Column(
children: [
Text(
_t("Appearance Settings"),
style: const TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
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),
),
],
),
),
),
const SizedBox(height: 24),
// Tab Buttons and Content as one unit
Expanded(
child: Container(
decoration: BoxDecoration(
color: Colors.grey[800],
borderRadius: BorderRadius.circular(8),
),
child: Column(
children: [
// Selection Buttons (Tabs)
Row(
children: [
Expanded(
child: ElevatedButton(
onPressed: () => innerSetState(() => selectedTab = 0),
style: ElevatedButton.styleFrom(
backgroundColor: selectedTab == 0
? _getColorFromName(previewBulletColor)
: Colors.grey[700],
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 12),
shape: RoundedRectangleBorder(
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(8),
),
),
),
child: Text(
_t("Bullet"),
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
),
),
),
),
Expanded(
child: ElevatedButton(
onPressed: () => innerSetState(() => selectedTab = 1),
style: ElevatedButton.styleFrom(
backgroundColor: selectedTab == 1
? _getColorFromName(previewBulletColor)
: Colors.grey[700],
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 12),
shape: RoundedRectangleBorder(
borderRadius: const BorderRadius.only(
topRight: Radius.circular(8),
),
),
),
child: Text(
_t("Target"),
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
),
),
),
),
],
),
// Tab Content
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: selectedTab == 0
? Center(
child: Wrap(
spacing: 20,
runSpacing: 20,
alignment: WrapAlignment.center,
children: _bulletColors.map((colorName) {
final color = _getColorFromName(colorName);
final isSelected = colorName == previewBulletColor;
return GestureDetector(
onTap: () => innerSetState(() => previewBulletColor = colorName),
child: Container(
width: 62,
height: 62,
decoration: BoxDecoration(
color: color,
shape: BoxShape.circle,
border: Border.all(
color: isSelected ? Colors.white : Colors.white24,
width: isSelected ? 4 : 2,
),
),
),
);
}).toList(),
),
)
: Column(
mainAxisSize: MainAxisSize.min,
children: _availableTargets.map((targetPath) {
final isSelected = targetPath == previewTarget;
final displayName = _getTargetDisplayName(targetPath);
return Padding(
padding: const EdgeInsets.only(bottom: 8.0),
child: SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: () => innerSetState(() => previewTarget = targetPath),
style: ElevatedButton.styleFrom(
backgroundColor: isSelected ? _getColorFromName(previewBulletColor) : Colors.grey[700],
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 12),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
),
child: Text(
displayName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(fontSize: 12),
),
),
),
);
}).toList(),
),
),
),
],
),
),
),
const SizedBox(height: 16),
// Action Buttons
Row(
children: [
Expanded(
child: ElevatedButton(
onPressed: () async {
await _saveBulletColor(previewBulletColor);
await _saveSelectedTarget(previewTarget);
if (context.mounted) {
Navigator.of(context).pop();
}
},
style: ElevatedButton.styleFrom(
backgroundColor: _getColorFromName(previewBulletColor),
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 12),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
),
child: Text(_t("Apply")),
),
),
const SizedBox(width: 12),
Expanded(
child: TextButton(
onPressed: () => Navigator.of(context).pop(),
child: Text(_t("Cancel"), style: const TextStyle(color: Colors.white70)),
),
),
],
),
],
),
),
),
const SizedBox(height: 20),
Wrap(
spacing: 12,
runSpacing: 12,
children: _bulletColors.map((colorName) {
final color = _getColorFromName(colorName);
final isSelected = colorName == _selectedBulletColor;
);
},
);
},
);
}
return GestureDetector(
onTap: () async {
await _saveBulletColor(colorName);
if (context.mounted) {
Navigator.of(context).pop();
}
},
child: Container(
width: 48,
height: 48,
decoration: BoxDecoration(
color: color,
shape: BoxShape.circle,
border: Border.all(
color: isSelected ? Colors.white : Colors.white24,
width: isSelected ? 3 : 1,
),
),
),
);
}).toList(),
),
const SizedBox(height: 20),
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: Text(_t("Cancel"), style: const TextStyle(color: Colors.white70)),
),
],
),
Widget _buildPreviewBullet(String bulletColor) {
const double bulletOpacity = 0.8;
return Container(
width: 14,
height: 14,
decoration: BoxDecoration(
color: _getColorFromName(bulletColor).withValues(alpha: bulletOpacity),
shape: BoxShape.circle,
border: Border.all(
color: Colors.black,
width: 1,
),
);
},
);
}
void _showTargetPopup() {
String previewTarget = _selectedTarget;
showDialog(
context: context,
builder: (context) {
return StatefulBuilder(
builder: (context, innerSetState) {
return Dialog(
backgroundColor: Colors.grey[900],
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
child: Padding(
padding: const EdgeInsets.all(24),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(
_t("Select Target"),
style: const TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
const SizedBox(height: 20),
// Image Preview
Container(
width: 200,
height: 200,
decoration: BoxDecoration(
border: Border.all(color: Colors.white24),
borderRadius: BorderRadius.circular(8),
),
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),
),
);
},
),
),
const SizedBox(height: 20),
// Target List
SizedBox(
width: double.maxFinite,
height: 300,
child: ListView(
children: _availableTargets.map((targetPath) {
final isSelected = targetPath == previewTarget;
final displayName = _getTargetDisplayName(targetPath);
return Padding(
padding: const EdgeInsets.only(bottom: 12.0),
child: SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: () {
innerSetState(() => previewTarget = targetPath);
},
style: ElevatedButton.styleFrom(
backgroundColor: isSelected
? _getColorFromName(_selectedBulletColor)
: Colors.grey[800],
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 14),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
),
child: Text(displayName),
),
),
);
}).toList(),
),
),
const SizedBox(height: 12),
// Action Buttons
Row(
children: [
Expanded(
child: ElevatedButton(
onPressed: () async {
await _saveSelectedTarget(previewTarget);
if (context.mounted) {
Navigator.of(context).pop();
}
},
style: ElevatedButton.styleFrom(
backgroundColor: _getColorFromName(_selectedBulletColor),
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 14),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
),
child: Text(_t("Apply")),
),
),
const SizedBox(width: 12),
Expanded(
child: TextButton(
onPressed: () => Navigator.of(context).pop(),
child: Text(_t("Cancel"), style: const TextStyle(color: Colors.white70)),
),
),
],
),
],
),
),
);
},
);
},
);
}
),
);
}
Widget _buildCameraList() {
return Container(
@@ -918,13 +992,6 @@ void _showTargetPopup() {
decoration: BoxDecoration(
color: Colors.grey[300],
borderRadius: BorderRadius.circular(12),
boxShadow: [
BoxShadow(
color: Colors.grey.withValues(alpha: 0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,