240403/runvisionpro_app
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uso correto de app_colors.dart

Browse Source
This commit is contained in:
240405
2026-03-05 16:56:25 +00:00
parent 85b00f6763
commit 05f54e6a37
5 changed files with 102 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
lib/bluetooth_screen.dart
View File

@@ -3,6 +3,7 @@ import 'package:flutter_blue_plus/flutter_blue_plus.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'dart:async'; import 'dart:async';
import 'constants/app_colors.dart'; import 'constants/app_colors.dart';
import 'constants/app_strings.dart';
class BluetoothScreen extends StatefulWidget { class BluetoothScreen extends StatefulWidget {
const BluetoothScreen({super.key}); const BluetoothScreen({super.key});
@@ -21,18 +22,16 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
void initState() { void initState() {
super.initState(); super.initState();
// Ouvir os resultados da busca e ordenar
_scanResultsSubscription = FlutterBluePlus.scanResults.listen((results) { _scanResultsSubscription = FlutterBluePlus.scanResults.listen((results) {
if (mounted) { if (mounted) {
// Criar uma cópia da lista e ordenar
List<ScanResult> sortedResults = List.from(results); List<ScanResult> sortedResults = List.from(results);
sortedResults.sort((a, b) { sortedResults.sort((a, b) {
bool aHasName = _hasRealName(a); bool aHasName = _hasRealName(a);
bool bHasName = _hasRealName(b); bool bHasName = _hasRealName(b);
if (aHasName && !bHasName) return -1; // 'a' vem primeiro if (aHasName && !bHasName) return -1;
if (!aHasName && bHasName) return 1; // 'b' vem primeiro if (!aHasName && bHasName) return 1;
return 0; // Mantém a ordem original entre iguais return 0;
}); });
setState(() { setState(() {
@@ -41,7 +40,6 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
} }
}); });
// Ouvir o estado da busca
_isScanningSubscription = FlutterBluePlus.isScanning.listen((state) { _isScanningSubscription = FlutterBluePlus.isScanning.listen((state) {
if (mounted) { if (mounted) {
setState(() { setState(() {
@@ -51,7 +49,6 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
}); });
} }
// Função auxiliar para verificar se tem nome real
bool _hasRealName(ScanResult r) { bool _hasRealName(ScanResult r) {
return r.advertisementData.advName.isNotEmpty || r.device.platformName.isNotEmpty; return r.advertisementData.advName.isNotEmpty || r.device.platformName.isNotEmpty;
} }
@@ -83,15 +80,15 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
Future.delayed(const Duration(seconds: 8), () { Future.delayed(const Duration(seconds: 8), () {
if (mounted && _scanResults.isEmpty && _isScanning) { if (mounted && _scanResults.isEmpty && _isScanning) {
_showSnackBar("Nenhum dispositivo encontrado.", AppColors.coral); _showSnackBar(AppStrings.noDevicesFound, AppColors.coral);
} }
}); });
} catch (e) { } catch (e) {
_showSnackBar("Erro ao iniciar busca: $e", Colors.red); _showSnackBar("${AppStrings.scanError}$e", AppColors.error);
} }
} else { } else {
_showSnackBar("Permissões negadas.", AppColors.coral); _showSnackBar(AppStrings.permissionsDenied, AppColors.coral);
} }
} }
@@ -99,22 +96,21 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
try { try {
await FlutterBluePlus.stopScan(); await FlutterBluePlus.stopScan();
} catch (e) { } catch (e) {
_showSnackBar("Erro ao parar busca: $e", Colors.red); _showSnackBar("${AppStrings.stopScanError}$e", AppColors.error);
} }
} }
Future<void> connectToDevice(BluetoothDevice device) async { Future<void> connectToDevice(BluetoothDevice device) async {
try { try {
String name = device.platformName.isNotEmpty ? device.platformName : "Dispositivo"; String name = device.platformName.isNotEmpty ? device.platformName : AppStrings.defaultDeviceName;
_showSnackBar("Conectando a $name...", Colors.white70); _showSnackBar("${AppStrings.connectingTo}$name...", AppColors.white.withValues(alpha: 0.7));
await device.connect(); await device.connect();
_showSnackBar("Conectado com sucesso!", Colors.green); _showSnackBar(AppStrings.connectedSuccess, AppColors.success);
} catch (e) { } catch (e) {
_showSnackBar("Falha ao conectar: $e", Colors.red); _showSnackBar("${AppStrings.connectFail}$e", AppColors.error);
} }
} }
// Lógica para capturar o nome
String _getDeviceName(ScanResult r) { String _getDeviceName(ScanResult r) {
if (r.advertisementData.advName.isNotEmpty) { if (r.advertisementData.advName.isNotEmpty) {
return r.advertisementData.advName; return r.advertisementData.advName;
@@ -122,7 +118,7 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
return r.device.platformName; return r.device.platformName;
} else { } else {
String id = r.device.remoteId.toString(); String id = r.device.remoteId.toString();
return "Disp. [${id.length > 5 ? id.substring(id.length - 5) : id}]"; return "${AppStrings.deviceIdPrefix}${id.length > 5 ? id.substring(id.length - 5) : id}]";
} }
} }
@@ -142,9 +138,9 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: const Text('Bluetooth', style: TextStyle(fontWeight: FontWeight.bold)), title: const Text(AppStrings.bluetoothTitle, style: TextStyle(fontWeight: FontWeight.bold)),
centerTitle: true, centerTitle: true,
backgroundColor: Colors.transparent, backgroundColor: AppColors.transparent,
elevation: 0, elevation: 0,
foregroundColor: AppColors.white, foregroundColor: AppColors.white,
), ),
@@ -156,7 +152,7 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
begin: Alignment.topCenter, begin: Alignment.topCenter,
end: Alignment.bottomCenter, end: Alignment.bottomCenter,
colors: [ colors: [
AppColors.coral.withOpacity(0.1), AppColors.coral.withValues(alpha: 0.1),
AppColors.background, AppColors.background,
], ],
), ),
@@ -173,8 +169,8 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: _isScanning color: _isScanning
? AppColors.coral.withOpacity(0.1) ? AppColors.coral.withValues(alpha: 0.1)
: AppColors.backgroundGrey.withOpacity(0.3), : AppColors.backgroundGrey.withValues(alpha: 0.3),
border: Border.all( border: Border.all(
color: _isScanning ? AppColors.coral : AppColors.backgroundGrey, color: _isScanning ? AppColors.coral : AppColors.backgroundGrey,
width: 2, width: 2,
@@ -183,7 +179,7 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
child: Icon( child: Icon(
_isScanning ? Icons.bluetooth_searching : Icons.bluetooth, _isScanning ? Icons.bluetooth_searching : Icons.bluetooth,
size: 60, size: 60,
color: _isScanning ? AppColors.coral : AppColors.white.withOpacity(0.7), color: _isScanning ? AppColors.coral : AppColors.white.withValues(alpha: 0.7),
), ),
), ),
const SizedBox(height: 30), const SizedBox(height: 30),
@@ -217,7 +213,7 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
), ),
), ),
Text( Text(
_isScanning ? 'PARAR BUSCA' : 'BUSCAR AGORA', _isScanning ? AppStrings.stopSearch : AppStrings.startSearch,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@@ -239,7 +235,7 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
child: Row( child: Row(
children: [ children: [
Text( Text(
_isScanning ? "Procurando..." : "Dispositivos próximos", _isScanning ? AppStrings.searching : AppStrings.nearbyDevices,
style: const TextStyle( style: const TextStyle(
color: AppColors.white, color: AppColors.white,
fontSize: 14, fontSize: 14,
@@ -251,11 +247,11 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
Container( Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2), padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.coral.withOpacity(0.2), color: AppColors.coral.withValues(alpha: 0.2),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
child: const Text( child: const Text(
"ATIVO", AppStrings.active,
style: TextStyle(color: AppColors.coral, fontSize: 10, fontWeight: FontWeight.bold), style: TextStyle(color: AppColors.coral, fontSize: 10, fontWeight: FontWeight.bold),
), ),
), ),
@@ -270,11 +266,11 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Icon(Icons.bluetooth_disabled, size: 40, color: AppColors.white.withOpacity(0.1)), Icon(Icons.bluetooth_disabled, size: 40, color: AppColors.white.withValues(alpha: 0.1)),
const SizedBox(height: 16), const SizedBox(height: 16),
Text( Text(
"Inicie a busca para conectar", AppStrings.startSearchInstruction,
style: TextStyle(color: AppColors.white.withOpacity(0.3)), style: TextStyle(color: AppColors.white.withValues(alpha: 0.3)),
), ),
], ],
), ),
@@ -285,35 +281,35 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
final r = _scanResults[index]; final r = _scanResults[index];
final name = _getDeviceName(r); final name = _getDeviceName(r);
final isUnknown = name.startsWith("Disp. ["); final isUnknown = name.startsWith(AppStrings.deviceIdPrefix);
return Container( return Container(
margin: const EdgeInsets.symmetric(horizontal: 20, vertical: 6), margin: const EdgeInsets.symmetric(horizontal: 20, vertical: 6),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.backgroundGrey.withOpacity(0.2), color: AppColors.backgroundGrey.withValues(alpha: 0.2),
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
), ),
child: ListTile( child: ListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4), contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: AppColors.backgroundGrey.withOpacity(0.3), backgroundColor: AppColors.backgroundGrey.withValues(alpha: 0.3),
child: Icon( child: Icon(
isUnknown ? Icons.devices_other : Icons.bluetooth, isUnknown ? Icons.devices_other : Icons.bluetooth,
color: isUnknown ? AppColors.white.withOpacity(0.4) : AppColors.white, color: isUnknown ? AppColors.white.withValues(alpha: 0.4) : AppColors.white,
size: 20 size: 20
), ),
), ),
title: Text( title: Text(
name, name,
style: TextStyle( style: TextStyle(
color: isUnknown ? AppColors.white.withOpacity(0.5) : AppColors.white, color: isUnknown ? AppColors.white.withValues(alpha: 0.5) : AppColors.white,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 15, fontSize: 15,
), ),
), ),
subtitle: Text( subtitle: Text(
r.device.remoteId.toString(), r.device.remoteId.toString(),
style: TextStyle(color: AppColors.white.withOpacity(0.3), fontSize: 11), style: TextStyle(color: AppColors.white.withValues(alpha: 0.3), fontSize: 11),
), ),
trailing: ElevatedButton( trailing: ElevatedButton(
onPressed: () => connectToDevice(r.device), onPressed: () => connectToDevice(r.device),
@@ -324,7 +320,7 @@ class _BluetoothScreenState extends State<BluetoothScreen> {
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
elevation: 0, elevation: 0,
), ),
child: const Text("CONECTAR", style: TextStyle(fontSize: 11, fontWeight: FontWeight.bold)), child: const Text(AppStrings.connect, style: TextStyle(fontSize: 11, fontWeight: FontWeight.bold)),
), ),
), ),
); );

8
lib/constants/app_colors.dart
View File

@@ -11,4 +11,10 @@ class AppColors {
// Neutral colors // Neutral colors
static const Color backgroundGrey = Color.fromARGB(255, 89, 89, 89); static const Color backgroundGrey = Color.fromARGB(255, 89, 89, 89);
} static const Color black = Colors.black;
// Status colors
static const Color error = Colors.red;
static const Color success = Colors.green;
static const Color transparent = Colors.transparent;
}

19
lib/constants/app_strings.dart
View File

@@ -14,24 +14,33 @@ class AppStrings {
// Bluetooth Screen // Bluetooth Screen
static const String bluetoothTitle = "DISPOSITIVOS"; static const String bluetoothTitle = "DISPOSITIVOS";
static const String bluetoothConnect = "CONECTAR BLUETOOTH"; static const String bluetoothConnect = "CONECTAR BLUETOOTH";
static const String statusSearching = "STATUS: BUSCANDO..."; static const String stopSearch = "PARAR BUSCA";
static const String startSearch = "BUSCAR AGORA";
static const String searching = "STATUS: BUSCANDO...";
static const String statusReady = "STATUS: PRONTO"; static const String statusReady = "STATUS: PRONTO";
static const String statusConnected = "STATUS: CONECTADO"; static const String statusConnected = "STATUS: CONECTADO";
static const String nearbyDevices = "Dispositivos próximos";
static const String active = "ATIVO";
static const String startSearchInstruction = "Inicie a busca para conectar";
static const String connect = "CONECTAR";
static const String noDevicesFound = "Nenhum dispositivo encontrado.";
static const String foundDevices = "Encontrados"; static const String foundDevices = "Encontrados";
static const String oneDevice = "1 Dispositivo"; static const String oneDevice = "1 Dispositivo";
static const String permissionDenied = "Permissões de Bluetooth negadas."; static const String permissionsDenied = "Permissões de Bluetooth negadas.";
static const String turnOnBluetooth = "Ligue o Bluetooth para buscar dispositivos."; static const String turnOnBluetooth = "Ligue o Bluetooth para buscar dispositivos.";
static const String scanError = "Erro ao iniciar scan: "; static const String scanError = "Erro ao iniciar scan: ";
static const String stopScanError = "Erro ao parar scan: "; static const String stopScanError = "Erro ao parar scan: ";
static const String defaultDeviceName = "Dispositivo";
static const String connectingTo = "Conectando a "; static const String connectingTo = "Conectando a ";
static const String connectionSuccess = "Conectado com sucesso!"; static const String connectedSuccess = "Conectado com sucesso!";
static const String connectionError = "Erro ao conectar: "; static const String connectFail = "Falha ao conectar: ";
static const String deviceIdPrefix = "Disp. [";
static const String unknownDevice = "Dispositivo Desconhecido"; static const String unknownDevice = "Dispositivo Desconhecido";
// Map Screen // Map Screen
static const String mapTitleTracking = "TRACKING ATIVO"; static const String mapTitleTracking = "TRACKING ATIVO";
static const String mapTitlePlanning = "PLANEJAR TRAJETO"; static const String mapTitlePlanning = "PLANEJAR TRAJETO";
static const String mapTitleRunning = "TOUHOU VIVA"; static const String mapTitleRunning = "CORRIDA";
static const String mapPace = "RITMO"; static const String mapPace = "RITMO";
static const String mapRoute = "TRAJETO"; static const String mapRoute = "TRAJETO";
static const String kmhUnit = "KM/H"; static const String kmhUnit = "KM/H";

54
lib/main.dart
View File

@@ -55,7 +55,7 @@ class _RunningScreenState extends State<RunningScreen>
shape: BoxShape.circle, shape: BoxShape.circle,
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: AppColors.white.withOpacity(0.05), color: AppColors.white.withValues(alpha: 0.05),
blurRadius: 30, blurRadius: 30,
spreadRadius: 10, spreadRadius: 10,
), ),
@@ -74,7 +74,7 @@ class _RunningScreenState extends State<RunningScreen>
progress: value, progress: value,
strokeWidth: 14, strokeWidth: 14,
progressColor: AppColors.white, progressColor: AppColors.white,
backgroundColor: AppColors.white.withOpacity(0.15), backgroundColor: AppColors.white.withValues(alpha: 0.15),
), ),
); );
}, },
@@ -95,14 +95,14 @@ class _RunningScreenState extends State<RunningScreen>
style: const TextStyle( style: const TextStyle(
fontSize: 42, fontSize: 42,
fontWeight: FontWeight.w900, fontWeight: FontWeight.w900,
color: Colors.white, color: AppColors.white,
letterSpacing: -1, letterSpacing: -1,
), ),
), ),
Text( Text(
AppStrings.complete, AppStrings.complete,
style: TextStyle( style: TextStyle(
color: Colors.white.withOpacity(0.5), color: AppColors.white.withValues(alpha: 0.5),
fontSize: 11, fontSize: 11,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
letterSpacing: 1.5, letterSpacing: 1.5,
@@ -140,9 +140,9 @@ class _RunningScreenState extends State<RunningScreen>
child: Container( child: Container(
padding: const EdgeInsets.symmetric(horizontal: 22, vertical: 10), padding: const EdgeInsets.symmetric(horizontal: 22, vertical: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white.withOpacity(0.08), color: AppColors.white.withValues(alpha: 0.08),
borderRadius: BorderRadius.circular(25), borderRadius: BorderRadius.circular(25),
border: Border.all(color: Colors.white.withOpacity(0.1)), border: Border.all(color: AppColors.white.withValues(alpha: 0.1)),
), ),
child: Text( child: Text(
"${currentDistance.toStringAsFixed(1)} ${AppStrings.kmUnit} | ${targetDistance.toStringAsFixed(1)} ${AppStrings.kmUnit}", "${currentDistance.toStringAsFixed(1)} ${AppStrings.kmUnit} | ${targetDistance.toStringAsFixed(1)} ${AppStrings.kmUnit}",
@@ -169,7 +169,7 @@ class _RunningScreenState extends State<RunningScreen>
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black.withOpacity(0.3), color: AppColors.black.withValues(alpha: 0.3),
blurRadius: 20, blurRadius: 20,
offset: const Offset(0, 10), offset: const Offset(0, 10),
), ),
@@ -186,9 +186,9 @@ class _RunningScreenState extends State<RunningScreen>
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [ children: [
_buildStatItem(Icons.directions_run_rounded, "3219", AppStrings.steps), _buildStatItem(Icons.directions_run_rounded, "3219", AppStrings.steps),
Divider(color: Colors.white.withOpacity(0.1), height: 1), Divider(color: AppColors.white.withValues(alpha: 0.1), height: 1),
_buildStatItem(Icons.favorite_rounded, "98", AppStrings.bpm), _buildStatItem(Icons.favorite_rounded, "98", AppStrings.bpm),
Divider(color: Colors.white.withOpacity(0.1), height: 1), Divider(color: AppColors.white.withValues(alpha: 0.1), height: 1),
_buildStatItem(Icons.local_fire_department_rounded, "480", AppStrings.kcal), _buildStatItem(Icons.local_fire_department_rounded, "480", AppStrings.kcal),
], ],
), ),
@@ -222,8 +222,8 @@ class _RunningScreenState extends State<RunningScreen>
begin: Alignment.topCenter, begin: Alignment.topCenter,
end: Alignment.bottomCenter, end: Alignment.bottomCenter,
colors: [ colors: [
Colors.transparent, AppColors.transparent,
Colors.black.withOpacity(0.4), AppColors.black.withValues(alpha: 0.4),
], ],
), ),
), ),
@@ -234,10 +234,10 @@ class _RunningScreenState extends State<RunningScreen>
child: Container( child: Container(
padding: const EdgeInsets.all(6), padding: const EdgeInsets.all(6),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.background.withOpacity(0.8), color: AppColors.background.withValues(alpha: 0.8),
shape: BoxShape.circle, shape: BoxShape.circle,
), ),
child: const Icon(Icons.fullscreen_rounded, color: Colors.white, size: 20), child: const Icon(Icons.fullscreen_rounded, color: AppColors.white, size: 20),
), ),
), ),
const Positioned( const Positioned(
@@ -246,7 +246,7 @@ class _RunningScreenState extends State<RunningScreen>
child: Text( child: Text(
AppStrings.mapPreview, AppStrings.mapPreview,
style: TextStyle( style: TextStyle(
color: Colors.white, color: AppColors.white,
fontSize: 10, fontSize: 10,
fontWeight: FontWeight.w900, fontWeight: FontWeight.w900,
letterSpacing: 1, letterSpacing: 1,
@@ -274,7 +274,7 @@ class _RunningScreenState extends State<RunningScreen>
child: LinearProgressIndicator( child: LinearProgressIndicator(
value: progress, value: progress,
minHeight: 8, minHeight: 8,
backgroundColor: Colors.white.withOpacity(0.1), backgroundColor: AppColors.white.withValues(alpha: 0.1),
valueColor: const AlwaysStoppedAnimation<Color>(AppColors.white), valueColor: const AlwaysStoppedAnimation<Color>(AppColors.white),
), ),
), ),
@@ -301,18 +301,18 @@ class _RunningScreenState extends State<RunningScreen>
Positioned( Positioned(
top: 60, top: 60,
right: 25, right: 25,
child: _buildSmallActionButton(Icons.bluetooth, Colors.red), child: _buildSmallActionButton(Icons.bluetooth, AppColors.error),
), ),
], ],
), ),
); );
} }
/// Item de estatística com design refinado. /// Item de estatística with design refinado.
Widget _buildStatItem(IconData icon, String value, String label) { Widget _buildStatItem(IconData icon, String value, String label) {
return Row( return Row(
children: [ children: [
Icon(icon, color: AppColors.coral.withOpacity(0.8), size: 22), Icon(icon, color: AppColors.coral.withValues(alpha: 0.8), size: 22),
const SizedBox(width: 12), const SizedBox(width: 12),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@@ -321,7 +321,7 @@ class _RunningScreenState extends State<RunningScreen>
Text( Text(
value, value,
style: const TextStyle( style: const TextStyle(
color: Colors.white, color: AppColors.white,
fontSize: 19, fontSize: 19,
fontWeight: FontWeight.w900, fontWeight: FontWeight.w900,
), ),
@@ -329,7 +329,7 @@ class _RunningScreenState extends State<RunningScreen>
Text( Text(
label, label,
style: TextStyle( style: TextStyle(
color: Colors.white.withOpacity(0.4), color: AppColors.white.withValues(alpha: 0.4),
fontSize: 9, fontSize: 9,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
letterSpacing: 0.5, letterSpacing: 0.5,
@@ -373,9 +373,9 @@ class _RunningScreenState extends State<RunningScreen>
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.backgroundGrey, color: AppColors.backgroundGrey,
borderRadius: BorderRadius.circular(18), borderRadius: BorderRadius.circular(18),
border: Border.all(color: Colors.white.withOpacity(0.05)), border: Border.all(color: AppColors.white.withValues(alpha: 0.05)),
), ),
child: Icon(icon, color: Colors.white.withOpacity(0.9), size: 24), child: Icon(icon, color: AppColors.white.withValues(alpha: 0.9), size: 24),
), ),
if (showBadge) if (showBadge)
Positioned( Positioned(
@@ -411,11 +411,11 @@ class _RunningScreenState extends State<RunningScreen>
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.backgroundGrey, color: AppColors.backgroundGrey,
shape: BoxShape.circle, shape: BoxShape.circle,
border: Border.all(color: Colors.white.withOpacity(0.05)), border: Border.all(color: AppColors.white.withValues(alpha: 0.05)),
), ),
child: Stack( child: Stack(
children: [ children: [
Icon(icon, color: Colors.white, size: 20), Icon(icon, color: AppColors.white, size: 20),
Positioned( Positioned(
right: 0, right: 0,
top: 0, top: 0,
@@ -441,7 +441,7 @@ class MapPainter extends CustomPainter {
@override @override
void paint(Canvas canvas, Size size) { void paint(Canvas canvas, Size size) {
final paintPath = Paint() final paintPath = Paint()
..color = AppColors.coral.withOpacity(0.5) ..color = AppColors.coral.withValues(alpha: 0.5)
..strokeWidth = 3 ..strokeWidth = 3
..style = PaintingStyle.stroke ..style = PaintingStyle.stroke
..strokeCap = StrokeCap.round; ..strokeCap = StrokeCap.round;
@@ -452,7 +452,7 @@ class MapPainter extends CustomPainter {
path.quadraticBezierTo(size.width * 0.7, size.height * 0.1, size.width * 0.9, size.height * 0.3); path.quadraticBezierTo(size.width * 0.7, size.height * 0.1, size.width * 0.9, size.height * 0.3);
final paintRoad = Paint() final paintRoad = Paint()
..color = Colors.white.withOpacity(0.1) ..color = AppColors.white.withValues(alpha: 0.1)
..strokeWidth = 10 ..strokeWidth = 10
..style = PaintingStyle.stroke; ..style = PaintingStyle.stroke;
@@ -465,7 +465,7 @@ class MapPainter extends CustomPainter {
final markerPaint = Paint()..color = AppColors.coral; final markerPaint = Paint()..color = AppColors.coral;
canvas.drawCircle(Offset(size.width * 0.5, size.height * 0.5), 5, markerPaint); canvas.drawCircle(Offset(size.width * 0.5, size.height * 0.5), 5, markerPaint);
canvas.drawCircle(Offset(size.width * 0.5, size.height * 0.5), 8, Paint()..color = AppColors.coral.withOpacity(0.3)); canvas.drawCircle(Offset(size.width * 0.5, size.height * 0.5), 8, Paint()..color = AppColors.coral.withValues(alpha: 0.3));
} }
@override @override

42
lib/screens/bluetooth_connection_screen.dart
View File

@@ -63,8 +63,8 @@ class _BluetoothConnectionScreenState extends State<BluetoothConnectionScreen> {
} else { } else {
if (mounted) { if (mounted) {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
const SnackBar( SnackBar(
content: Text(AppStrings.permissionDenied), content: Text(AppStrings.permissionsDenied),
behavior: SnackBarBehavior.floating, behavior: SnackBarBehavior.floating,
), ),
); );
@@ -80,7 +80,7 @@ class _BluetoothConnectionScreenState extends State<BluetoothConnectionScreen> {
if (await FlutterBluePlus.adapterState.first != BluetoothAdapterState.on) { if (await FlutterBluePlus.adapterState.first != BluetoothAdapterState.on) {
if (mounted) { if (mounted) {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
const SnackBar( SnackBar(
content: Text(AppStrings.turnOnBluetooth), content: Text(AppStrings.turnOnBluetooth),
behavior: SnackBarBehavior.floating, behavior: SnackBarBehavior.floating,
), ),
@@ -135,9 +135,9 @@ class _BluetoothConnectionScreenState extends State<BluetoothConnectionScreen> {
}); });
FlutterBluePlus.stopScan(); FlutterBluePlus.stopScan();
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
const SnackBar( SnackBar(
content: Text(AppStrings.connectionSuccess), content: Text(AppStrings.connectedSuccess),
backgroundColor: Colors.green, backgroundColor: AppColors.success,
behavior: SnackBarBehavior.floating, behavior: SnackBarBehavior.floating,
), ),
); );
@@ -146,8 +146,8 @@ class _BluetoothConnectionScreenState extends State<BluetoothConnectionScreen> {
if (mounted) { if (mounted) {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
content: Text('${AppStrings.connectionError}$e'), content: Text('${AppStrings.connectFail}$e'),
backgroundColor: Colors.red, backgroundColor: AppColors.error,
behavior: SnackBarBehavior.floating, behavior: SnackBarBehavior.floating,
), ),
); );
@@ -198,10 +198,10 @@ class _BluetoothConnectionScreenState extends State<BluetoothConnectionScreen> {
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.backgroundGrey, color: AppColors.backgroundGrey,
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
border: Border.all(color: Colors.white.withOpacity(0.05)), border: Border.all(color: Colors.white.withValues(alpha: 0.05)),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black.withOpacity(0.3), color: Colors.black.withValues(alpha: 0.3),
blurRadius: 20, blurRadius: 20,
offset: const Offset(0, 10), offset: const Offset(0, 10),
), ),
@@ -216,7 +216,7 @@ class _BluetoothConnectionScreenState extends State<BluetoothConnectionScreen> {
Text( Text(
_connectedDevice != null _connectedDevice != null
? AppStrings.statusConnected ? AppStrings.statusConnected
: (_isScanning ? AppStrings.statusSearching : AppStrings.statusReady), : (_isScanning ? AppStrings.searching : AppStrings.statusReady),
style: TextStyle( style: TextStyle(
color: _connectedDevice != null ? Colors.greenAccent : (_isScanning ? AppColors.coral : Colors.white54), color: _connectedDevice != null ? Colors.greenAccent : (_isScanning ? AppColors.coral : Colors.white54),
fontSize: 10, fontSize: 10,
@@ -243,10 +243,10 @@ class _BluetoothConnectionScreenState extends State<BluetoothConnectionScreen> {
child: Container( child: Container(
padding: const EdgeInsets.all(15), padding: const EdgeInsets.all(15),
decoration: BoxDecoration( decoration: BoxDecoration(
color: _isScanning ? Colors.red.withOpacity(0.1) : AppColors.coral.withOpacity(0.1), color: _isScanning ? Colors.red.withValues(alpha: 0.1) : AppColors.coral.withValues(alpha: 0.1),
shape: BoxShape.circle, shape: BoxShape.circle,
border: Border.all( border: Border.all(
color: _isScanning ? Colors.red.withOpacity(0.5) : AppColors.coral.withOpacity(0.5), color: _isScanning ? Colors.red.withValues(alpha: 0.5) : AppColors.coral.withValues(alpha: 0.5),
width: 2, width: 2,
), ),
), ),
@@ -263,10 +263,10 @@ class _BluetoothConnectionScreenState extends State<BluetoothConnectionScreen> {
child: Container( child: Container(
padding: const EdgeInsets.all(15), padding: const EdgeInsets.all(15),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.red.withOpacity(0.1), color: Colors.red.withValues(alpha: 0.1),
shape: BoxShape.circle, shape: BoxShape.circle,
border: Border.all( border: Border.all(
color: Colors.red.withOpacity(0.5), color: Colors.red.withValues(alpha: 0.5),
width: 2, width: 2,
), ),
), ),
@@ -297,21 +297,21 @@ class _BluetoothConnectionScreenState extends State<BluetoothConnectionScreen> {
child: Container( child: Container(
padding: const EdgeInsets.all(20), padding: const EdgeInsets.all(20),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.backgroundGrey.withOpacity(0.4), color: AppColors.backgroundGrey.withValues(alpha: 0.4),
borderRadius: BorderRadius.circular(25), borderRadius: BorderRadius.circular(25),
border: Border.all(color: Colors.white.withOpacity(0.03)), border: Border.all(color: Colors.white.withValues(alpha: 0.03)),
), ),
child: Row( child: Row(
children: [ children: [
Container( Container(
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(12),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.background.withOpacity(0.8), color: AppColors.background.withValues(alpha: 0.8),
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
), ),
child: Icon( child: Icon(
Icons.bluetooth_audio_rounded, Icons.bluetooth_audio_rounded,
color: _connectedDevice != null ? Colors.greenAccent : AppColors.coral.withOpacity(0.8), color: _connectedDevice != null ? Colors.greenAccent : AppColors.coral.withValues(alpha: 0.8),
size: 24 size: 24
), ),
), ),
@@ -357,13 +357,13 @@ class _BluetoothConnectionScreenState extends State<BluetoothConnectionScreen> {
], ],
), ),
if (_isScanning) if (_isScanning)
Positioned( const Positioned(
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0, right: 0,
child: LinearProgressIndicator( child: LinearProgressIndicator(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
valueColor: const AlwaysStoppedAnimation<Color>(AppColors.coral), valueColor: AlwaysStoppedAnimation<Color>(AppColors.coral),
minHeight: 2, minHeight: 2,
), ),
), ),