Redesigned Practices

main
joschy2002 2025-05-28 08:41:57 +02:00
parent 2dfbb37e6b
commit d706f8e9a2
3 changed files with 191 additions and 134 deletions

View File

@ -33,19 +33,27 @@ class FavoritesTab extends StatelessWidget {
return const Center(child: Text('Keine Favoriten gefunden')); return const Center(child: Text('Keine Favoriten gefunden'));
} }
return ListView.builder( return GridView.builder(
padding: const EdgeInsets.all(8),
gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
maxCrossAxisExtent: 300,
childAspectRatio: 0.75,
crossAxisSpacing: 10,
mainAxisSpacing: 10,
),
itemCount: favorites.length, itemCount: favorites.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
return FutureBuilder<DocumentSnapshot>( return FutureBuilder<DocumentSnapshot>(
future: FirebaseFirestore.instance.collection('Training').doc(favorites[index]).get(), future: FirebaseFirestore.instance.collection('Training').doc(favorites[index]).get(),
builder: (context, trainingSnapshot) { builder: (context, trainingSnapshot) {
if (!trainingSnapshot.hasData || !trainingSnapshot.data!.exists) { if (!trainingSnapshot.hasData || !trainingSnapshot.data!.exists) {
return const ListTile(title: Text('Training nicht gefunden')); return const SizedBox.shrink();
} }
final trainingData = trainingSnapshot.data!.data() as Map<String, dynamic>; final trainingData = trainingSnapshot.data!.data() as Map<String, dynamic>;
return Card( return Card(
margin: const EdgeInsets.all(8.0), child: Stack(
child: InkWell( children: [
InkWell(
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
@ -54,37 +62,57 @@ class FavoritesTab extends StatelessWidget {
), ),
); );
}, },
child: Padding( child: Column(
padding: const EdgeInsets.all(16.0), crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Expanded(
child: Container(
color: Colors.grey[200],
child: const Center(
child: Icon(Icons.fitness_center, size: 50),
),
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
trainingData['title'] ?? 'Unbekannt', trainingData['title'] ?? 'Unbekannt',
style: const TextStyle( style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 16,
), ),
maxLines: 2,
overflow: TextOverflow.ellipsis,
), ),
const SizedBox(height: 8), const SizedBox(height: 4),
Row(
children: [
const Icon(Icons.star, color: Colors.amber, size: 16),
const SizedBox(width: 4),
Text( Text(
trainingData['description'] ?? 'Keine Beschreibung', (trainingData['rating overall'] ?? 0.0).toStringAsFixed(1),
style: TextStyle(color: Colors.grey[600]), style: const TextStyle(fontSize: 12),
), ),
const SizedBox(height: 8), ],
),
const SizedBox(height: 4),
Text( Text(
'Dauer: ${trainingData['duration'] ?? '-'} Minuten', 'Dauer: ${trainingData['duration'] ?? '-'} Minuten',
style: TextStyle(color: Colors.grey[600]), style: const TextStyle(fontSize: 12, color: Colors.grey),
), ),
const SizedBox(height: 8), ],
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'Level: ${trainingData['year'] ?? '-'}',
style: TextStyle(color: Colors.grey[600]),
), ),
IconButton( ),
],
),
),
Positioned(
top: 4,
right: 4,
child: IconButton(
icon: const Icon(Icons.favorite, color: Colors.red), icon: const Icon(Icons.favorite, color: Colors.red),
onPressed: () async { onPressed: () async {
await FirebaseFirestore.instance.collection('User').doc(user.uid).update({ await FirebaseFirestore.instance.collection('User').doc(user.uid).update({
@ -92,12 +120,9 @@ class FavoritesTab extends StatelessWidget {
}); });
}, },
), ),
],
), ),
], ],
), ),
),
),
); );
}, },
); );

View File

@ -299,10 +299,11 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
], ],
), ),
SizedBox( Padding(
height: 70, padding: const EdgeInsets.symmetric(vertical: 8.0),
child: ListView( child: SingleChildScrollView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
child: Row(
children: [ children: [
_buildFavoriteCircle('Aufwärmen & Mobilisation', Icons.directions_run, categoryColors['Aufwärmen & Mobilisation']!), _buildFavoriteCircle('Aufwärmen & Mobilisation', Icons.directions_run, categoryColors['Aufwärmen & Mobilisation']!),
_buildFavoriteCircle('Wurf- & Torabschluss', Icons.sports_handball, categoryColors['Wurf- & Torabschluss']!), _buildFavoriteCircle('Wurf- & Torabschluss', Icons.sports_handball, categoryColors['Wurf- & Torabschluss']!),
@ -313,6 +314,7 @@ class _HomeScreenState extends State<HomeScreen> {
], ],
), ),
), ),
),
const SizedBox(height: 24), const SizedBox(height: 24),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -352,10 +354,19 @@ class _HomeScreenState extends State<HomeScreen> {
CircleAvatar( CircleAvatar(
radius: 24, radius: 24,
backgroundColor: color.withOpacity(0.2), backgroundColor: color.withOpacity(0.2),
child: Icon(icon, color: color, size: 28), child: Icon(icon, color: color, size: 26),
), ),
const SizedBox(height: 4), const SizedBox(height: 4),
Text(label, style: const TextStyle(fontSize: 12)), SizedBox(
width: 60,
child: Text(
label,
style: const TextStyle(fontSize: 12),
textAlign: TextAlign.center,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
),
], ],
), ),
); );

View File

@ -199,8 +199,8 @@ class _SearchTabState extends State<SearchTab> {
return GridView.builder( return GridView.builder(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
crossAxisCount: 2, maxCrossAxisExtent: 300,
childAspectRatio: 0.75, childAspectRatio: 0.75,
crossAxisSpacing: 10, crossAxisSpacing: 10,
mainAxisSpacing: 10, mainAxisSpacing: 10,
@ -213,7 +213,9 @@ class _SearchTabState extends State<SearchTab> {
final isDisabled = widget.selectMode && duration > (widget.remainingTime ?? 0); final isDisabled = widget.selectMode && duration > (widget.remainingTime ?? 0);
return Card( return Card(
child: InkWell( child: Stack(
children: [
InkWell(
onTap: isDisabled onTap: isDisabled
? null ? null
: () { : () {
@ -259,14 +261,20 @@ class _SearchTabState extends State<SearchTab> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
const SizedBox(height: 4), const SizedBox(height: 4),
Row(
children: [
const Icon(Icons.star, color: Colors.amber, size: 16),
const SizedBox(width: 4),
Text( Text(
'${data['description']?.toString() ?? ''}\nDauer: $duration Minuten', (data['rating overall'] ?? 0.0).toStringAsFixed(1),
style: TextStyle( style: const TextStyle(fontSize: 12),
color: Colors.grey[600],
fontSize: 12,
), ),
maxLines: 3, ],
overflow: TextOverflow.ellipsis, ),
const SizedBox(height: 4),
Text(
'Dauer: ${duration} Minuten',
style: const TextStyle(fontSize: 12, color: Colors.grey),
), ),
if (isDisabled) if (isDisabled)
const Padding( const Padding(
@ -285,6 +293,19 @@ class _SearchTabState extends State<SearchTab> {
], ],
), ),
), ),
Positioned(
top: 4,
right: 4,
child: IconButton(
icon: Icon(
_favorites.contains(doc.id) ? Icons.favorite : Icons.favorite_border,
color: _favorites.contains(doc.id) ? Colors.red : Colors.grey,
),
onPressed: () => _toggleFavorite(doc.id, _favorites.contains(doc.id)),
),
),
],
),
); );
}, },
); );