contac and calendar update

This commit is contained in:
2025-11-08 12:26:18 +01:00
parent 05044691b6
commit 8359b8c49e
13 changed files with 1037 additions and 532 deletions
+67 -69
View File
@@ -633,7 +633,7 @@ Widget _buildFolderRow(String folderName) {
_folderTypes[folderName] == true
? '🏆 $folderName'
: folderName,
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: _bulletColor),
),
],
),
@@ -795,53 +795,42 @@ Widget _buildTargetsList(String folderName) {
child: Row(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Target info section
// Target info section - Clickable
Expanded(
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
child: Row(
children: [
Expanded(
child: Text(
fileName,
child: InkWell(
onTap: () => _openFilePreview(file),
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
child: Row(
children: [
Expanded(
child: Text(
fileName,
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
color: Colors.black87,
),
),
),
const SizedBox(width: 8),
const Icon(
Icons.emoji_events,
color: Colors.amber,
size: 14,
),
const SizedBox(width: 4),
Text(
"$score",
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
fontSize: 13,
fontWeight: FontWeight.w600,
color: Colors.black87,
),
),
),
const SizedBox(width: 8),
const Icon(
Icons.emoji_events,
color: Colors.amber,
size: 14,
),
const SizedBox(width: 4),
Text(
"$score",
style: const TextStyle(
fontSize: 13,
fontWeight: FontWeight.w600,
color: Colors.black87,
),
),
],
),
),
),
// Preview button
InkWell(
onTap: () => _openFilePreview(file),
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
decoration: BoxDecoration(
color: _bulletColor.withValues(alpha: 0.15),
border: Border(
left: BorderSide(color: Colors.grey[300]!, width: 1),
],
),
),
child: Icon(Icons.visibility, color: _bulletColor, size: 18),
),
),
// Delete button
@@ -881,35 +870,44 @@ Widget build(BuildContext context) {
return Scaffold(
body: Column(
children: [
// 🔽 Filter dropdown at the top
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
child: GestureDetector(
onTap: () => _showFolderFilterPopup(context),
child: Container(
width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
decoration: BoxDecoration(
color: Colors.grey[300], // Same as folder background
borderRadius: BorderRadius.circular(12),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
_folderFilter == 'all'
? _t('Showing: 📂 All folders')
: _folderFilter == 'tournament'
? _t('Showing: 🏆 Tournament folders')
: _t('Showing: 🎯 Training folders'),
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
// 🔽 Filter dropdown at the top (styled like tab bar)
Container(
padding: const EdgeInsets.all(6),
decoration: BoxDecoration(
color: Colors.grey[900],
border: Border(
bottom: BorderSide(color: Colors.grey[800]!, width: 1),
),
),
const Icon(Icons.filter_list),
],
),
),
),
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
child: GestureDetector(
onTap: () => _showFolderFilterPopup(context),
child: Container(
width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
_folderFilter == 'all'
? _t('Showing: 📂 All folders')
: _folderFilter == 'tournament'
? _t('Showing: 🏆 Tournament folders')
: _t('Showing: 🎯 Training folders'),
style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.black),
),
Icon(Icons.filter_list, color: Colors.black87, size: 18),
],
),
),
),
),
),
// 📁 Folder list or empty state
Expanded(
child: _groupedFiles.isEmpty
+738 -99
View File
@@ -1,10 +1,28 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:intl/intl.dart';
import 'package:intl/date_symbol_data_local.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:url_launcher/url_launcher.dart';
import '../services/google_calendar_service.dart';
import '../utils/translations.dart';
class Contact {
final String firstName;
final String lastName;
final String phone;
final String email;
Contact({
required this.firstName,
required this.lastName,
required this.phone,
required this.email,
});
String get fullName => '$firstName $lastName';
}
enum EventType {
regular, // Dežurstvo and other regular events
competition, // Liga and Tekmovanje (League and Competition events)
@@ -25,6 +43,27 @@ class _CalendarScreenState extends State<CalendarScreen> {
String? _errorMessage;
String _bulletColor = 'Blue';
String _selectedLanguage = 'English';
bool _showContacts = false;
bool _showDebugPreview = true;
// Members contact list
final List<Contact> _contacts = [
Contact(firstName: 'Domen', lastName: 'Pleterski', phone: '051227764', email: 'info@bl3k.com'),
Contact(firstName: 'Ivan', lastName: 'Tandler', phone: '040471258', email: 'ivan.tandler@gmail.com'),
Contact(firstName: 'Jože', lastName: 'Verhnjak', phone: '041443463', email: 'joze.verhnjak@gmail.com'),
Contact(firstName: 'Branko', lastName: 'Pokeržnik', phone: '041291001', email: 'branko.pokerznik@gmail.com'),
Contact(firstName: 'Franc', lastName: 'Žigart', phone: '041439597', email: 'franc.zigart@gmail.com'),
Contact(firstName: 'Janez', lastName: 'Božič', phone: '041551704', email: 'janbozic@gmail.com'),
Contact(firstName: 'Mitja', lastName: 'Čeh', phone: '070550383', email: 'mekabara@gmail.com'),
Contact(firstName: 'Rado', lastName: 'Keter', phone: '041324529', email: 'rado.keter@gmail.com'),
Contact(firstName: 'Karli', lastName: 'Proje', phone: '040424951', email: 'karl.project@gmail.com'),
Contact(firstName: 'Jan', lastName: 'Pleterski', phone: '041842063', email: 'jan.pleterski1997@gmail.com'),
Contact(firstName: 'Silvo', lastName: 'Poročnik', phone: '040860618', email: 'skobar.silvo@gmail.com'),
Contact(firstName: 'Dušan', lastName: 'Onuk', phone: '070448303', email: 'dusan.onuk@gmail.com'),
Contact(firstName: 'Matjaž', lastName: 'Pleterski', phone: '041603859', email: 'matjaz.pleterski@gmail.com'),
Contact(firstName: 'Marko', lastName: 'Blimen', phone: '031610857', email: 'blimenmarko@gmail.com'),
Contact(firstName: 'Doris', lastName: 'Fesel', phone: '070373987', email: 'doris.fesel@gmail.com'),
];
@override
void initState() {
@@ -46,6 +85,12 @@ class _CalendarScreenState extends State<CalendarScreen> {
});
}
void _toggleDebugPreview() {
setState(() {
_showDebugPreview = !_showDebugPreview;
});
}
@override
void dispose() {
_calendarService.dispose();
@@ -113,8 +158,8 @@ class _CalendarScreenState extends State<CalendarScreen> {
return true;
}
EventType _getEventType(CalendarEvent event) {
if (event.summary == null) return EventType.regular;
EventType? _getEventType(CalendarEvent event) {
if (event.summary == null) return null;
final summary = event.summary!.toLowerCase();
@@ -122,9 +167,12 @@ class _CalendarScreenState extends State<CalendarScreen> {
return EventType.competition;
} else if (summary.contains('sestanek')) {
return EventType.sestanek;
} else if (summary.contains('dežurstvo')) {
return EventType.regular;
}
return EventType.regular;
// No matching keywords - skip this event
return null;
}
Future<void> _loadEvents() async {
@@ -143,10 +191,13 @@ class _CalendarScreenState extends State<CalendarScreen> {
final now = DateTime.now();
final today = DateTime(now.year, now.month, now.day);
// Filter: valid events AND events from today onwards
// Filter: valid events AND matching keywords AND events from today onwards
final filteredEvents = events.where((event) {
if (!_isValidEvent(event)) return false;
// Check if event has a matching keyword type
if (_getEventType(event) == null) return false;
// Only include events that are today or in the future
if (event.startTime != null) {
final eventDate = DateTime(
@@ -183,10 +234,448 @@ class _CalendarScreenState extends State<CalendarScreen> {
}
}
Future<void> _makePhoneCall(String phoneNumber) async {
final Uri launchUri = Uri(
scheme: 'tel',
path: phoneNumber,
);
try {
await launchUrl(launchUri);
} catch (e) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('${_t('Could not launch phone call: ')}$e')),
);
}
}
}
String _capitalize(String text) {
return text.split(' ').map((word) {
if (word.isEmpty) return word;
return word[0].toUpperCase() + word.substring(1).toLowerCase();
}).join(' ');
}
void _copyToClipboard(String text, String label) {
Clipboard.setData(ClipboardData(text: text));
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('$label ${_t('copied to clipboard')}'),
duration: const Duration(seconds: 2),
),
);
}
void _showContactPopup(BuildContext context, Contact contact) {
final accentColor = _getAccentColor();
showModalBottomSheet(
context: context,
backgroundColor: Colors.grey[900],
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
),
builder: (context) {
return RepaintBoundary(
child: Container(
padding: const EdgeInsets.all(20),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Header with contact name
Padding(
padding: const EdgeInsets.only(bottom: 20),
child: Row(
children: [
Container(
width: 50,
height: 50,
decoration: BoxDecoration(
color: accentColor,
borderRadius: BorderRadius.circular(10),
),
child: Center(
child: Text(
contact.firstName[0].toUpperCase(),
style: const TextStyle(
color: Colors.white,
fontSize: 24,
fontWeight: FontWeight.bold,
),
),
),
),
const SizedBox(width: 16),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_capitalize(contact.fullName),
style: const TextStyle(
color: Colors.white,
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
],
),
),
],
),
),
// Phone number row
Container(
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 12),
decoration: BoxDecoration(
color: Colors.grey[850],
borderRadius: BorderRadius.circular(10),
),
child: Row(
children: [
Icon(Icons.phone, color: accentColor, size: 20),
const SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_t('Phone'),
style: const TextStyle(
color: Colors.grey,
fontSize: 11,
),
),
Text(
contact.phone,
style: const TextStyle(
color: Colors.white,
fontSize: 14,
fontWeight: FontWeight.w600,
),
),
],
),
),
Container(
decoration: BoxDecoration(
color: accentColor,
borderRadius: BorderRadius.circular(8),
),
child: Material(
color: Colors.transparent,
child: InkWell(
onTap: () {
_copyToClipboard(contact.phone, 'Phone number');
Navigator.pop(context);
},
borderRadius: BorderRadius.circular(8),
child: const Padding(
padding: EdgeInsets.all(8),
child: Icon(
Icons.content_copy,
color: Colors.white,
size: 18,
),
),
),
),
),
],
),
),
const SizedBox(height: 12),
// Email row
Container(
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 12),
decoration: BoxDecoration(
color: Colors.grey[850],
borderRadius: BorderRadius.circular(10),
),
child: Row(
children: [
Icon(Icons.email, color: accentColor, size: 20),
const SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_t('Email'),
style: const TextStyle(
color: Colors.grey,
fontSize: 11,
),
),
Text(
contact.email.toLowerCase(),
style: const TextStyle(
color: Colors.white,
fontSize: 14,
fontWeight: FontWeight.w600,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
],
),
),
Container(
decoration: BoxDecoration(
color: accentColor,
borderRadius: BorderRadius.circular(8),
),
child: Material(
color: Colors.transparent,
child: InkWell(
onTap: () {
_copyToClipboard(contact.email, 'Email address');
Navigator.pop(context);
},
borderRadius: BorderRadius.circular(8),
child: const Padding(
padding: EdgeInsets.all(8),
child: Icon(
Icons.content_copy,
color: Colors.white,
size: 18,
),
),
),
),
),
],
),
),
],
),
),
);
},
);
}
Widget _buildContactsList() {
final accentColor = _getAccentColor();
return ListView.builder(
itemCount: _contacts.length,
padding: const EdgeInsets.all(8),
itemBuilder: (context, index) {
final contact = _contacts[index];
return GestureDetector(
onTap: () => _makePhoneCall(contact.phone),
onLongPress: () => _showContactPopup(context, contact),
child: Container(
margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 8),
decoration: BoxDecoration(
color: Colors.grey[300],
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: Colors.grey.withValues(alpha: 0.08),
blurRadius: 2,
offset: const Offset(0, 1),
),
],
),
child: Stack(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Colored header bar (like event cards)
Container(
width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 6),
decoration: BoxDecoration(
color: accentColor.withValues(alpha: 0.2),
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(10),
topRight: Radius.circular(10),
),
),
child: Row(
children: [
// Small colored indicator
Container(
width: 3,
height: 12,
decoration: BoxDecoration(
color: accentColor,
borderRadius: BorderRadius.circular(2),
),
),
const SizedBox(width: 7),
// Contact name
Expanded(
child: Text(
_capitalize(contact.fullName),
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
color: accentColor,
),
),
),
],
),
),
// Main content with phone and email info
Padding(
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 6),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Icon(Icons.phone, size: 14, color: accentColor),
const SizedBox(width: 6),
Text(
contact.phone,
style: const TextStyle(
fontSize: 12,
color: Colors.black87,
fontWeight: FontWeight.w500,
),
),
],
),
const SizedBox(height: 4),
Row(
children: [
Icon(Icons.email, size: 14, color: accentColor),
const SizedBox(width: 6),
Expanded(
child: Text(
contact.email.toLowerCase(),
style: const TextStyle(
fontSize: 12,
color: Colors.black87,
fontWeight: FontWeight.w500,
),
overflow: TextOverflow.ellipsis,
),
),
],
),
],
),
),
],
),
// Phone button on the right (wider now)
Positioned(
right: 0,
top: 0,
bottom: 0,
child: Container(
width: 80,
decoration: BoxDecoration(
color: accentColor,
borderRadius: const BorderRadius.only(
topRight: Radius.circular(10),
bottomRight: Radius.circular(10),
),
),
child: Material(
color: Colors.transparent,
child: InkWell(
onTap: () => _makePhoneCall(contact.phone),
borderRadius: const BorderRadius.only(
topRight: Radius.circular(10),
bottomRight: Radius.circular(10),
),
child: Center(
child: Icon(
Icons.call,
color: Colors.white,
size: 22,
),
),
),
),
),
),
],
),
),
);
},
);
}
@override
Widget build(BuildContext context) {
final accentColor = _getAccentColor();
// Debug preview - disabled by default, set _showDebugPreview = true to enable
if (_showDebugPreview) {
return Scaffold(
backgroundColor: Colors.white,
appBar: AppBar(
backgroundColor: Colors.grey[900],
centerTitle: true,
title: const Text(
'Debug Preview',
style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
),
leading: IconButton(
icon: const Icon(Icons.close, color: Colors.white),
onPressed: _toggleDebugPreview,
),
),
body: ListView(
padding: const EdgeInsets.all(16),
children: [
const SizedBox(height: 8),
// Regular event
Text(
'Regular Event (Dežurstvo)',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
color: Colors.grey[600],
),
),
const SizedBox(height: 8),
_buildSampleEventCard(accentColor, EventType.regular),
const SizedBox(height: 24),
// Competition event
Text(
'Competition Event (Tekmovanje)',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
color: Colors.grey[600],
),
),
const SizedBox(height: 8),
_buildSampleEventCard(accentColor, EventType.competition),
const SizedBox(height: 24),
// Meeting event
Text(
'Meeting Event (Sestanek)',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
color: Colors.grey[600],
),
),
const SizedBox(height: 8),
_buildSampleEventCard(accentColor, EventType.sestanek),
const SizedBox(height: 24),
],
),
);
}
if (_isLoading && _events.isEmpty) {
return Scaffold(
body: Center(
@@ -229,60 +718,190 @@ class _CalendarScreenState extends State<CalendarScreen> {
return Scaffold(
backgroundColor: Colors.white,
body: RefreshIndicator(
onRefresh: _loadEvents,
color: accentColor,
child: _events.isEmpty
? ListView(
children: [
const SizedBox(height: 24),
Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.event_available, size: 64, color: Colors.grey[400]),
const SizedBox(height: 16),
Text(
_t('No upcoming events'),
style: const TextStyle(fontSize: 16, color: Colors.grey),
),
const SizedBox(height: 8),
Text(
_t('Pull down to refresh'),
style: TextStyle(fontSize: 14, color: Colors.grey[400]),
),
],
),
),
const SizedBox(height: 32),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Text(
_t('Example Event Preview'),
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Colors.grey[700],
),
textAlign: TextAlign.center,
),
),
const SizedBox(height: 16),
_buildSampleEventCard(accentColor, EventType.regular),
const SizedBox(height: 8),
_buildSampleEventCard(accentColor, EventType.competition),
const SizedBox(height: 8),
_buildSampleEventCard(accentColor, EventType.sestanek),
],
)
: ListView.builder(
itemCount: _events.length,
padding: const EdgeInsets.all(8),
itemBuilder: (context, index) {
final event = _events[index];
return _buildEventCard(event, accentColor);
},
body: Column(
children: [
// Tab buttons
Container(
padding: const EdgeInsets.all(6),
decoration: BoxDecoration(
color: Colors.grey[900],
border: Border(
bottom: BorderSide(color: Colors.grey[800]!, width: 1),
),
),
child: Row(
children: [
Expanded(
child: GestureDetector(
onTap: () {
setState(() {
_showContacts = false;
});
},
child: Container(
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 8),
decoration: BoxDecoration(
color: !_showContacts ? Colors.white : Colors.transparent,
borderRadius: BorderRadius.circular(10),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.calendar_month,
color: !_showContacts ? Colors.black : Colors.grey[400],
size: 18,
),
const SizedBox(width: 6),
Text(
_t('Calendar'),
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: !_showContacts ? Colors.black : Colors.grey[400],
),
),
],
),
),
),
),
const SizedBox(width: 6),
Expanded(
child: GestureDetector(
onTap: () {
setState(() {
_showContacts = true;
});
},
child: Container(
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 8),
decoration: BoxDecoration(
color: _showContacts ? Colors.white : Colors.transparent,
borderRadius: BorderRadius.circular(10),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.people,
color: _showContacts ? Colors.black : Colors.grey[400],
size: 18,
),
const SizedBox(width: 6),
Text(
_t('Contacts'),
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: _showContacts ? Colors.black : Colors.grey[400],
),
),
],
),
),
),
),
if (_showDebugPreview) ...[
const SizedBox(width: 6),
GestureDetector(
onTap: _toggleDebugPreview,
child: Container(
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 12),
decoration: BoxDecoration(
color: Colors.grey[800],
borderRadius: BorderRadius.circular(10),
border: Border.all(color: Colors.amber, width: 1),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.bug_report,
color: Colors.amber,
size: 16,
),
const SizedBox(width: 4),
const Text(
'Debug',
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: Colors.amber,
),
),
],
),
),
),
],
],
),
),
// Body content
Expanded(
child: _showContacts
? _buildContactsList()
: RefreshIndicator(
onRefresh: _loadEvents,
color: accentColor,
child: _events.isEmpty
? ListView(
children: [
const SizedBox(height: 24),
Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.event_available, size: 64, color: Colors.grey[400]),
const SizedBox(height: 16),
Text(
_t('No upcoming events'),
style: const TextStyle(fontSize: 16, color: Colors.grey),
),
const SizedBox(height: 8),
Text(
_t('Pull down to refresh'),
style: TextStyle(fontSize: 14, color: Colors.grey[400]),
),
],
),
),
const SizedBox(height: 32),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Text(
_t('Example Event Preview'),
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Colors.grey[700],
),
textAlign: TextAlign.center,
),
),
const SizedBox(height: 16),
_buildSampleEventCard(accentColor, EventType.regular),
const SizedBox(height: 8),
_buildSampleEventCard(accentColor, EventType.competition),
const SizedBox(height: 8),
_buildSampleEventCard(accentColor, EventType.sestanek),
],
)
: ListView.builder(
itemCount: _events.length,
padding: const EdgeInsets.all(8),
itemBuilder: (context, index) {
final event = _events[index];
return _buildEventCard(event, accentColor);
},
),
),
),
],
),
);
}
@@ -297,31 +916,46 @@ class _CalendarScreenState extends State<CalendarScreen> {
switch (eventType) {
case EventType.competition:
cardAccentColor = Colors.green;
cardAccentColor = Colors.orange;
eventIcon = Icons.emoji_events;
title = _selectedLanguage == 'Slovenian' ? 'Liga / Tekmovanje' : 'League / Competition';
title = _t('League / Competition');
time = '09:00 - 18:00';
break;
case EventType.sestanek:
cardAccentColor = Colors.purple;
cardAccentColor = Colors.red;
eventIcon = Icons.groups;
title = _selectedLanguage == 'Slovenian' ? 'Sestanek ekipe' : 'Team Meeting';
title = _t('Team Meeting');
time = '18:00 - 19:00';
break;
case EventType.regular:
cardAccentColor = Colors.blue;
eventIcon = Icons.event;
title = _selectedLanguage == 'Slovenian' ? 'Dežurstvo' : 'Duty Shift';
title = _t('Duty Shift');
time = '14:00 - 16:00';
break;
}
return Container(
margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 16),
decoration: BoxDecoration(
color: backgroundColor,
borderRadius: BorderRadius.circular(12),
),
return RepaintBoundary(
child: Container(
margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 16),
decoration: BoxDecoration(
color: backgroundColor,
borderRadius: BorderRadius.circular(12),
boxShadow: [
// Card glow effect for today's events
BoxShadow(
color: cardAccentColor.withValues(alpha: 0.3),
blurRadius: 16,
offset: const Offset(0, 4),
),
// Subtle inner shadow
BoxShadow(
color: Colors.grey.withValues(alpha: 0.1),
blurRadius: 4,
offset: const Offset(0, 2),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -363,13 +997,6 @@ class _CalendarScreenState extends State<CalendarScreen> {
decoration: BoxDecoration(
color: cardAccentColor,
borderRadius: BorderRadius.circular(12),
boxShadow: [
BoxShadow(
color: cardAccentColor.withValues(alpha: 0.3),
blurRadius: 4,
offset: const Offset(0, 2),
),
],
),
child: Row(
mainAxisSize: MainAxisSize.min,
@@ -378,10 +1005,10 @@ class _CalendarScreenState extends State<CalendarScreen> {
const SizedBox(width: 4),
Text(
eventType == EventType.competition
? (_selectedLanguage == 'Slovenian' ? 'TEKMOVANJE' : 'COMPETITION')
? _t('TEKMOVANJE')
: eventType == EventType.sestanek
? (_selectedLanguage == 'Slovenian' ? 'SESTANEK' : 'MEETING')
: (_selectedLanguage == 'Slovenian' ? 'DEŽURSTVO' : 'DUTY'),
? _t('SESTANEK')
: _t('DEŽURSTVO'),
style: const TextStyle(
fontSize: 10,
fontWeight: FontWeight.bold,
@@ -429,9 +1056,7 @@ class _CalendarScreenState extends State<CalendarScreen> {
// Location
_buildDetailRowInline(
icon: Icons.location_on,
value: _selectedLanguage == 'Slovenian'
? 'Strelišče Ljubljana'
: 'Shooting Range',
value: _t('Strelišče Ljubljana'),
accentColor: cardAccentColor,
),
],
@@ -439,6 +1064,7 @@ class _CalendarScreenState extends State<CalendarScreen> {
),
],
),
),
);
}
@@ -454,12 +1080,12 @@ class _CalendarScreenState extends State<CalendarScreen> {
switch (eventType) {
case EventType.competition:
cardAccentColor = Colors.green;
cardAccentColor = Colors.orange;
backgroundColor = Colors.grey[300]!;
eventIcon = Icons.emoji_events; // Trophy icon for competitions
break;
case EventType.sestanek:
cardAccentColor = Colors.purple;
cardAccentColor = Colors.red;
backgroundColor = Colors.grey[300]!;
eventIcon = Icons.groups; // People icon for meetings
break;
@@ -468,6 +1094,9 @@ class _CalendarScreenState extends State<CalendarScreen> {
backgroundColor = Colors.grey[300]!;
eventIcon = Icons.event;
break;
case null:
// This case should never happen due to filtering, but required by compiler
return const SizedBox();
}
// Format the date for display
@@ -495,12 +1124,28 @@ class _CalendarScreenState extends State<CalendarScreen> {
}
}
return Container(
margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 16),
decoration: BoxDecoration(
color: backgroundColor,
borderRadius: BorderRadius.circular(12),
),
return RepaintBoundary(
child: Container(
margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 16),
decoration: BoxDecoration(
color: backgroundColor,
borderRadius: BorderRadius.circular(12),
boxShadow: [
// Card glow effect (stronger for today's events)
if (isToday)
BoxShadow(
color: cardAccentColor.withValues(alpha: 0.3),
blurRadius: 16,
offset: const Offset(0, 4),
),
// Subtle inner shadow
BoxShadow(
color: Colors.grey.withValues(alpha: 0.1),
blurRadius: 4,
offset: const Offset(0, 2),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -544,13 +1189,6 @@ class _CalendarScreenState extends State<CalendarScreen> {
decoration: BoxDecoration(
color: cardAccentColor,
borderRadius: BorderRadius.circular(12),
boxShadow: [
BoxShadow(
color: cardAccentColor.withValues(alpha: 0.3),
blurRadius: 4,
offset: const Offset(0, 2),
),
],
),
child: Row(
mainAxisSize: MainAxisSize.min,
@@ -559,10 +1197,10 @@ class _CalendarScreenState extends State<CalendarScreen> {
const SizedBox(width: 4),
Text(
eventType == EventType.competition
? (_selectedLanguage == 'Slovenian' ? 'TEKMOVANJE' : 'COMPETITION')
? _t('TEKMOVANJE')
: eventType == EventType.sestanek
? (_selectedLanguage == 'Slovenian' ? 'SESTANEK' : 'MEETING')
: (_selectedLanguage == 'Slovenian' ? 'DEŽURSTVO' : 'DUTY'),
? _t('SESTANEK')
: _t('DEŽURSTVO'),
style: const TextStyle(
fontSize: 10,
fontWeight: FontWeight.bold,
@@ -630,6 +1268,7 @@ class _CalendarScreenState extends State<CalendarScreen> {
),
],
),
),
);
}
+102 -100
View File
@@ -178,121 +178,123 @@ Future<void> _saveLanguage(String language) async {
showDialog(
context: context,
builder: (context) {
return Dialog(
backgroundColor: Colors.grey[900],
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
child: Padding(
padding: const EdgeInsets.all(24.0),
child: StatefulBuilder(
builder: (context, setState) {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"${_t('Camera')} ${index + 1}",
style: const TextStyle(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 16),
SizedBox(
width: double.infinity,
child: TextField(
controller: controller,
style: const TextStyle(color: Colors.white),
return RepaintBoundary(
child: Dialog(
backgroundColor: Colors.grey[900],
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
child: Padding(
padding: const EdgeInsets.all(24.0),
child: StatefulBuilder(
builder: (context, setState) {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"${_t('Camera')} ${index + 1}",
style: const TextStyle(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
decoration: InputDecoration(
filled: true,
fillColor: Colors.grey[800],
hintText: _t("Enter Camera IP"),
hintStyle: const TextStyle(color: Colors.white54),
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide.none,
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(color: _getColorFromName(_selectedBulletColor)),
),
const SizedBox(height: 16),
SizedBox(
width: double.infinity,
child: TextField(
controller: controller,
style: const TextStyle(color: Colors.white),
textAlign: TextAlign.center,
decoration: InputDecoration(
filled: true,
fillColor: Colors.grey[800],
hintText: _t("Enter Camera IP"),
hintStyle: const TextStyle(color: Colors.white54),
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide.none,
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(color: _getColorFromName(_selectedBulletColor)),
),
),
),
),
),
const SizedBox(height: 24),
const SizedBox(height: 24),
// Save Button
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: () async {
String newIP = controller.text.trim();
if (newIP.isNotEmpty) {
await _saveCameraIP(index, newIP);
// Save Button
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: () async {
String newIP = controller.text.trim();
if (newIP.isNotEmpty) {
await _saveCameraIP(index, newIP);
if (context.mounted) {
Navigator.pop(context);
}
}
},
style: ElevatedButton.styleFrom(
backgroundColor: _getColorFromName(_selectedBulletColor),
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 14),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
),
child: Text(_t("Save")),
),
),
const SizedBox(height: 12),
// Reset Button
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: () async {
await _clearCameraIP(index);
if (context.mounted) {
Navigator.pop(context);
}
}
},
style: ElevatedButton.styleFrom(
backgroundColor: _getColorFromName(_selectedBulletColor),
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 14),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
},
style: ElevatedButton.styleFrom(
backgroundColor: Colors.grey[700],
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 14),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
),
child: Text(_t("Reset to Default")),
),
child: Text(_t("Save")),
),
),
const SizedBox(height: 12),
const SizedBox(height: 12),
// Reset Button
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: () async {
await _clearCameraIP(index);
if (context.mounted) {
Navigator.pop(context);
}
},
style: ElevatedButton.styleFrom(
backgroundColor: Colors.grey[700],
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 14),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
// Cancel Button
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: () => Navigator.pop(context),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.grey[800],
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 14),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
),
child: Text(_t("Cancel")),
),
child: Text(_t("Reset to Default")),
),
),
const SizedBox(height: 12),
// Cancel Button
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: () => Navigator.pop(context),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.grey[800],
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 14),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
),
child: Text(_t("Cancel")),
),
),
],
);
},
],
);
},
),
),
),
);