patch small issue with trad and theme
This commit is contained in:
@@ -8,12 +8,18 @@ class PokemonDetailTop extends StatelessWidget {
|
||||
final Pokemon pokemon;
|
||||
final bool isShiny;
|
||||
final VoidCallback onToggleShiny;
|
||||
final Color primaryColor;
|
||||
final Color primaryDark;
|
||||
final Color surfaceColor;
|
||||
|
||||
const PokemonDetailTop({
|
||||
super.key,
|
||||
required this.pokemon,
|
||||
required this.isShiny,
|
||||
required this.onToggleShiny,
|
||||
required this.primaryColor,
|
||||
required this.primaryDark,
|
||||
required this.surfaceColor,
|
||||
});
|
||||
|
||||
@override
|
||||
@@ -21,9 +27,9 @@ class PokemonDetailTop extends StatelessWidget {
|
||||
return Container(
|
||||
margin: const EdgeInsets.symmetric(horizontal: 16),
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFF1B2333),
|
||||
color: surfaceColor,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
border: Border.all(color: const Color(0xFF1B2333), width: 8),
|
||||
border: Border.all(color: surfaceColor, width: 8),
|
||||
),
|
||||
child: Container(
|
||||
color: const Color(0xFF90A4AE),
|
||||
@@ -32,7 +38,7 @@ class PokemonDetailTop extends StatelessWidget {
|
||||
children: [
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
|
||||
color: const Color(0xFF1B2333),
|
||||
color: surfaceColor,
|
||||
child: Text(
|
||||
"NO. ${pokemon.id.toString().padLeft(3, '0')}",
|
||||
style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
|
||||
@@ -60,7 +66,11 @@ class PokemonDetailTop extends StatelessWidget {
|
||||
Expanded(
|
||||
child: Text(
|
||||
pokemon.formatedName.toUpperCase(),
|
||||
style: const TextStyle(color: Colors.white, fontSize: 22, fontWeight: FontWeight.bold, letterSpacing: 2),
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 22,
|
||||
fontWeight: FontWeight.bold,
|
||||
letterSpacing: 2),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -1,19 +1,35 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../../../domain/entities/pokemon.dart';
|
||||
import '../../../l10n/app_localizations.dart';
|
||||
import '../../providers/locale_provider.dart';
|
||||
|
||||
/// Écran inférieur du détail : stats de base, description et éléments décoratifs.
|
||||
class PokemonStatsPanel extends StatelessWidget {
|
||||
/// Écran inférieur du détail : stats de base, description localisée et éléments décoratifs.
|
||||
class PokemonStatsPanel extends ConsumerWidget {
|
||||
final Pokemon pokemon;
|
||||
const PokemonStatsPanel({super.key, required this.pokemon});
|
||||
final Color surfaceColor;
|
||||
final String? descriptionOverride;
|
||||
|
||||
const PokemonStatsPanel({
|
||||
super.key,
|
||||
required this.pokemon,
|
||||
required this.surfaceColor,
|
||||
this.descriptionOverride,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final l = AppLocalizations.of(context)!;
|
||||
ref.watch(localeProvider); // watch locale so widget rebuilds on language change
|
||||
final description = descriptionOverride ?? pokemon.description;
|
||||
|
||||
return Container(
|
||||
margin: const EdgeInsets.symmetric(horizontal: 16),
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(color: const Color(0xFF1B2333), borderRadius: BorderRadius.circular(8)),
|
||||
decoration: BoxDecoration(
|
||||
color: surfaceColor,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Container(
|
||||
color: const Color(0xFFC8D1D8),
|
||||
padding: const EdgeInsets.all(16),
|
||||
@@ -23,12 +39,20 @@ class PokemonStatsPanel extends StatelessWidget {
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(l.baseStats, style: const TextStyle(fontSize: 24, fontWeight: FontWeight.bold, letterSpacing: 2)),
|
||||
Text("MODEL: DS-01", style: TextStyle(fontSize: 12, color: Colors.grey[700], fontWeight: FontWeight.bold)),
|
||||
Text(l.baseStats,
|
||||
style: const TextStyle(
|
||||
fontSize: 24,
|
||||
fontWeight: FontWeight.bold,
|
||||
letterSpacing: 2)),
|
||||
Text("MODEL: DS-01",
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: Colors.grey[700],
|
||||
fontWeight: FontWeight.bold)),
|
||||
],
|
||||
),
|
||||
const Divider(color: Colors.black38, thickness: 2, height: 20),
|
||||
_StatBar(label: "HP", value: pokemon.hp, color: const Color(0xFFE53935)),
|
||||
_StatBar(label: "HP", value: pokemon.hp, color: const Color(0xFFE53935)),
|
||||
_StatBar(label: "ATK", value: pokemon.atk, color: const Color(0xFFFB8C00)),
|
||||
_StatBar(label: "DEF", value: pokemon.def, color: const Color(0xFFFDD835)),
|
||||
_StatBar(label: "SPD", value: pokemon.spd, color: const Color(0xFF1E88E5)),
|
||||
@@ -36,16 +60,19 @@ class PokemonStatsPanel extends StatelessWidget {
|
||||
Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(color: const Color(0xFFE2EBF0), border: Border.all(color: Colors.grey[400]!)),
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFE2EBF0),
|
||||
border: Border.all(color: Colors.grey[400]!),
|
||||
),
|
||||
child: Text(
|
||||
pokemon.description != null && pokemon.description!.isNotEmpty
|
||||
? '"${pokemon.description!}"'
|
||||
description != null && description.isNotEmpty
|
||||
? '"$description"'
|
||||
: '"${l.noDescription}"',
|
||||
style: const TextStyle(fontSize: 16, height: 1.5),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
const _DecorativeLights(),
|
||||
_DecorativeLights(accentColor: surfaceColor),
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -53,7 +80,6 @@ class PokemonStatsPanel extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
/// Barre d'une statistique (libellé, jauge proportionnelle, valeur).
|
||||
class _StatBar extends StatelessWidget {
|
||||
final String label;
|
||||
final int value;
|
||||
@@ -62,20 +88,27 @@ class _StatBar extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final ratio = (value / 255).clamp(0.0, 1.0); // stat de base max supposée = 255
|
||||
final ratio = (value / 255).clamp(0.0, 1.0);
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 8.0),
|
||||
child: Row(
|
||||
children: [
|
||||
SizedBox(width: 50, child: Text(label, style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18))),
|
||||
SizedBox(
|
||||
width: 50,
|
||||
child: Text(label,
|
||||
style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18))),
|
||||
Expanded(
|
||||
child: Container(
|
||||
height: 14,
|
||||
decoration: BoxDecoration(color: Colors.grey[400]),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(flex: (ratio * 100).toInt(), child: Container(color: color)),
|
||||
Expanded(flex: 100 - (ratio * 100).toInt(), child: Container()),
|
||||
Expanded(
|
||||
flex: (ratio * 100).toInt(),
|
||||
child: Container(color: color)),
|
||||
Expanded(
|
||||
flex: 100 - (ratio * 100).toInt(),
|
||||
child: Container()),
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -84,7 +117,8 @@ class _StatBar extends StatelessWidget {
|
||||
SizedBox(
|
||||
width: 40,
|
||||
child: Text(value.toString(),
|
||||
style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18), textAlign: TextAlign.right),
|
||||
style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
|
||||
textAlign: TextAlign.right),
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -92,21 +126,26 @@ class _StatBar extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
/// Petites diodes décoratives en bas du panneau (purement cosmétiques).
|
||||
class _DecorativeLights extends StatelessWidget {
|
||||
const _DecorativeLights();
|
||||
final Color accentColor;
|
||||
const _DecorativeLights({required this.accentColor});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final dark = HSLColor.fromColor(accentColor)
|
||||
.withLightness(
|
||||
(HSLColor.fromColor(accentColor).lightness - 0.1).clamp(0.0, 1.0))
|
||||
.toColor();
|
||||
|
||||
return Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 24,
|
||||
height: 24,
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFF1E88E5),
|
||||
color: accentColor,
|
||||
shape: BoxShape.circle,
|
||||
border: Border.all(color: const Color(0xFF1565C0), width: 2),
|
||||
border: Border.all(color: dark, width: 2),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
@@ -122,9 +161,19 @@ class _DecorativeLights extends StatelessWidget {
|
||||
const Spacer(),
|
||||
Row(
|
||||
children: [
|
||||
Container(height: 6, width: 30, decoration: BoxDecoration(color: Colors.grey[500], borderRadius: BorderRadius.circular(3))),
|
||||
Container(
|
||||
height: 6,
|
||||
width: 30,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.grey[500],
|
||||
borderRadius: BorderRadius.circular(3))),
|
||||
const SizedBox(width: 4),
|
||||
Container(height: 6, width: 30, decoration: BoxDecoration(color: Colors.grey[500], borderRadius: BorderRadius.circular(3))),
|
||||
Container(
|
||||
height: 6,
|
||||
width: 30,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.grey[500],
|
||||
borderRadius: BorderRadius.circular(3))),
|
||||
],
|
||||
),
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user