v2.31 — Login, Einstellungen & Cloud Sync Redesign
- Login-Screen im Melo-Design (Schwarz+Rot) mit Baka-Auth JWT
- AuthService fuer Token-Management ueber baka-net.de/auth
- Registrierungs-Modus + 'Ohne Login fortfahren'
- Navidrome-Credentials optional im Login aufklappbar
- SettingsScreen ersetzt AlertDialog
- BottomNav navigiert statt Dialog zu triggern
- Cloud Sync, Server verbinden, Diagnosedaten, App-Info, Abmelden
- CloudEinstellungen-Dialog entfernt, alles in CloudScreen konsolidiert
- Hardcode login('Baka','') entfernt → AuthService.benutzer
- Gradient-Statuskarte, animierte Segment-Intervall-Auswahl
- JWT Authorization statt Klartext-Passwort
- AppConfig: API-Key defaultValue entfernt (kein Fallback-Leak)
- Build crasht ohne --dart-define MELO_API_KEY
Build: split APK (arm64 19.6M, armeabi 17.1M, x86_64 21.1M)
This commit is contained in:
Dustin
+370
-225
@@ -1,21 +1,16 @@
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:path/path.dart' as p;
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
import 'package:just_audio/just_audio.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import '../utils/farb_theme.dart';
|
||||
import '../services/cloud_service.dart';
|
||||
import '../services/auth_service.dart';
|
||||
import '../services/melo_logger.dart';
|
||||
import '../models/song.dart';
|
||||
import '../database/db_helper.dart';
|
||||
import '../services/id3_reader.dart';
|
||||
|
||||
class CloudScreen extends StatefulWidget {
|
||||
final CloudService cloud;
|
||||
final VoidCallback onSongsChanged;
|
||||
const CloudScreen({super.key, required this.cloud, required this.onSongsChanged});
|
||||
const CloudScreen({super.key, required this.cloud});
|
||||
|
||||
@override
|
||||
State<CloudScreen> createState() => _CloudScreenState();
|
||||
@@ -25,193 +20,144 @@ class _CloudScreenState extends State<CloudScreen> {
|
||||
int _serverCount = 0;
|
||||
bool _ladt = false;
|
||||
String? _status;
|
||||
bool _statusOk = false;
|
||||
bool _autoSync = true;
|
||||
int _syncIntervall = 6;
|
||||
String _aktuellerDownload = '';
|
||||
int _downloadFortschritt = 0;
|
||||
int _downloadGesamt = 0;
|
||||
Timer? _syncTimer;
|
||||
String _letzterSync = 'Nie';
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_verbindeCloud();
|
||||
_ladeStatus();
|
||||
_ladeSettings();
|
||||
}
|
||||
|
||||
Future<void> _ladeStatus() async {
|
||||
final p = await SharedPreferences.getInstance();
|
||||
final nutzer = p.getString('melo_nutzer') ?? '';
|
||||
await widget.cloud.restoreLogin();
|
||||
if (nutzer.isEmpty || !widget.cloud.istAngemeldet) {
|
||||
if (mounted) setState(() { _serverCount = 0; _status = 'Nicht angemeldet'; });
|
||||
return;
|
||||
@override
|
||||
void dispose() {
|
||||
_syncTimer?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
Future<void> _verbindeCloud() async {
|
||||
final user = AuthService().benutzer;
|
||||
if (user.isNotEmpty) {
|
||||
await widget.cloud.login(user);
|
||||
}
|
||||
final st = await widget.cloud.status();
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_serverCount = st?['total'] ?? 0;
|
||||
_status = st != null ? 'Verbunden ($nutzer)' : 'Keine Verbindung';
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _ladeSettings() async {
|
||||
final p = await SharedPreferences.getInstance();
|
||||
if (mounted) setState(() {
|
||||
_autoSync = p.getBool('cloud_auto') ?? true;
|
||||
_syncIntervall = p.getInt('cloud_interval') ?? 6;
|
||||
final letzter = p.getString('cloud_last_sync');
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_autoSync = p.getBool('cloud_auto') ?? true;
|
||||
_syncIntervall = p.getInt('cloud_interval') ?? 6;
|
||||
_letzterSync = letzter ?? 'Nie';
|
||||
});
|
||||
}
|
||||
_starteAutoSync();
|
||||
}
|
||||
|
||||
void _starteAutoSync() {
|
||||
_syncTimer?.cancel();
|
||||
if (!_autoSync || _syncIntervall == 0) return;
|
||||
_syncTimer = Timer.periodic(
|
||||
Duration(hours: _syncIntervall),
|
||||
(_) => _autoSyncDurchfuehren(),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _autoSyncDurchfuehren() async {
|
||||
await _download();
|
||||
final p = await SharedPreferences.getInstance();
|
||||
final now = DateTime.now();
|
||||
final zeit = '${now.hour.toString().padLeft(2, '0')}:${now.minute.toString().padLeft(2, '0')}';
|
||||
await p.setString('cloud_last_sync', zeit);
|
||||
if (mounted) setState(() => _letzterSync = zeit);
|
||||
}
|
||||
|
||||
Future<void> _ladeStatus() async {
|
||||
final st = await widget.cloud.status();
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_serverCount = st?['total'] ?? 0;
|
||||
_status = st != null ? 'Verbunden' : 'Keine Verbindung';
|
||||
_statusOk = st != null;
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _upload() async {
|
||||
setState(() => _ladt = true);
|
||||
_setzeStatus('Suche lokale Songs...');
|
||||
final dir = Directory('${(await getApplicationDocumentsDirectory()).path}/music');
|
||||
if (!await dir.exists()) {
|
||||
setState(() { _ladt = false; _status = 'Keine lokalen Songs'; });
|
||||
setState(() { _ladt = false; _setzeStatus('Keine lokalen Songs', ok: false); });
|
||||
return;
|
||||
}
|
||||
final files = dir.listSync().whereType<File>().where((f) =>
|
||||
f.path.endsWith('.mp3') || f.path.endsWith('.m4a'));
|
||||
int count = 0;
|
||||
for (final f in files) {
|
||||
_setzeStatus('Upload: ${f.path.split('/').last}...');
|
||||
final sid = await widget.cloud.upload(f.path, f.path.split('/').last);
|
||||
if (sid != null) count++;
|
||||
}
|
||||
await _ladeStatus();
|
||||
if (mounted) {
|
||||
setState(() { _ladt = false; _status = '$count Songs hochgeladen'; });
|
||||
setState(() { _ladt = false; });
|
||||
_setzeStatus('$count Songs hochgeladen', ok: count > 0);
|
||||
MeloLogger().aktion('cloud_upload', {'count': count});
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _download() async {
|
||||
setState(() {
|
||||
_ladt = true;
|
||||
_status = null;
|
||||
_aktuellerDownload = 'Lade Liste...';
|
||||
_downloadFortschritt = 0;
|
||||
_downloadGesamt = 0;
|
||||
});
|
||||
|
||||
// Auf Android: Music/Melo (getExternalStorageDirectory)
|
||||
// Auf iOS: Documents/music (Sandbox, sichtbar in Dateien-App)
|
||||
String basePath;
|
||||
if (Platform.isIOS) {
|
||||
basePath = '${(await getApplicationDocumentsDirectory()).path}/music';
|
||||
} else {
|
||||
// Wenn voller Speicherzugriff: Downloads/Melo (sichtbar)
|
||||
final p = await SharedPreferences.getInstance();
|
||||
if (p.getBool('manage_storage') == true) {
|
||||
final d = await getDownloadsDirectory();
|
||||
basePath = d != null ? '${d.path}/Melo' : '${(await getApplicationDocumentsDirectory()).path}/music';
|
||||
} else {
|
||||
final ext = await getExternalStorageDirectory();
|
||||
basePath = ext != null ? '${ext.path}/Melo' : '${(await getApplicationDocumentsDirectory()).path}/music';
|
||||
}
|
||||
}
|
||||
final dir = Directory(basePath);
|
||||
setState(() => _ladt = true);
|
||||
_setzeStatus('Vergleiche mit Server...');
|
||||
final dir = Directory('${(await getApplicationDocumentsDirectory()).path}/music');
|
||||
if (!await dir.exists()) await dir.create(recursive: true);
|
||||
|
||||
final localFiles = dir.listSync().whereType<File>()
|
||||
.map((f) => f.path.split('/').last).toSet();
|
||||
final serverSongs = await widget.cloud.listSongs();
|
||||
|
||||
// Filter: nur neue Songs
|
||||
final neue = serverSongs.where((s) {
|
||||
final title = s['title'].toString();
|
||||
return !localFiles.contains(title);
|
||||
}).toList();
|
||||
|
||||
if (neue.isEmpty) {
|
||||
if (mounted) setState(() { _ladt = false; _status = 'Alle Songs bereits lokal'; });
|
||||
return;
|
||||
}
|
||||
|
||||
setState(() => _downloadGesamt = neue.length);
|
||||
final db = DbHelper();
|
||||
|
||||
for (int i = 0; i < neue.length; i++) {
|
||||
final song = neue[i];
|
||||
int downloaded = 0;
|
||||
for (final song in serverSongs) {
|
||||
final title = song['title'].toString();
|
||||
if (localFiles.contains(title)) continue;
|
||||
_setzeStatus('Download: $title...');
|
||||
final sid = song['id'].toString();
|
||||
|
||||
// Dateinamen säubern (p.basename verhindert Pfad-Traversal via Titel)
|
||||
final safeTitle = p.basename(title).replaceAll(RegExp(r'[^\w\s\.-]'), '_').trim();
|
||||
final dateiName = safeTitle.endsWith('.mp3') || safeTitle.endsWith('.m4a')
|
||||
? safeTitle : '$safeTitle.mp3';
|
||||
final dest = '${dir.path}/$dateiName';
|
||||
|
||||
if (mounted) setState(() {
|
||||
_aktuellerDownload = title;
|
||||
_downloadFortschritt = i + 1;
|
||||
});
|
||||
|
||||
final ok = await widget.cloud.download(sid, dest);
|
||||
if (ok) {
|
||||
// Dauer auslesen
|
||||
int dauer = 0;
|
||||
try {
|
||||
final ap = AudioPlayer();
|
||||
await ap.setFilePath(dest).timeout(const Duration(milliseconds: 2000));
|
||||
dauer = ap.duration?.inSeconds ?? 0;
|
||||
await ap.dispose();
|
||||
} catch (_) {}
|
||||
|
||||
// ID3-Metadaten & Cover aus der heruntergeladenen Datei extrahieren
|
||||
final id3 = Id3Reader.lesen(dest);
|
||||
String? coverPfad;
|
||||
if (id3['cover'] != null && id3['cover'] is List<int>) {
|
||||
try {
|
||||
final coversDir = Directory('${(await getApplicationDocumentsDirectory()).path}/covers');
|
||||
if (!await coversDir.exists()) await coversDir.create(recursive: true);
|
||||
final coverFile = File('${coversDir.path}/cloud_$sid.jpg');
|
||||
await coverFile.writeAsBytes(id3['cover'] as List<int>);
|
||||
coverPfad = coverFile.path;
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
try {
|
||||
await db.songEinfuegen(Song(
|
||||
titel: (id3['titel'] as String).isNotEmpty
|
||||
? id3['titel']
|
||||
: title.replaceAll('.mp3', '').replaceAll('.m4a', ''),
|
||||
kuenstler: (id3['kuenstler'] as String).isNotEmpty
|
||||
? id3['kuenstler']
|
||||
: 'Melo Cloud',
|
||||
album: id3['album'] ?? '',
|
||||
dauerSekunden: dauer,
|
||||
dateiPfad: dest,
|
||||
coverPfad: coverPfad,
|
||||
downloadQuelle: 'cloud',
|
||||
istHeruntergeladen: true,
|
||||
));
|
||||
} catch (_) {}
|
||||
}
|
||||
final dest = '${dir.path}/$title';
|
||||
if (await widget.cloud.download(sid, dest)) downloaded++;
|
||||
}
|
||||
|
||||
await _ladeStatus();
|
||||
widget.onSongsChanged(); // Musik-Tab aktualisieren
|
||||
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_ladt = false;
|
||||
_aktuellerDownload = '';
|
||||
_status = '${_downloadGesamt} Songs heruntergeladen';
|
||||
});
|
||||
MeloLogger().aktion('cloud_download', {'count': _downloadGesamt});
|
||||
setState(() { _ladt = false; });
|
||||
_setzeStatus('$downloaded Songs heruntergeladen', ok: true);
|
||||
MeloLogger().aktion('cloud_download', {'count': downloaded});
|
||||
}
|
||||
}
|
||||
|
||||
void _setzeStatus(String msg, {bool ok = false}) {
|
||||
if (mounted) setState(() { _status = msg; _statusOk = ok; });
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
backgroundColor: MeloTheme.schwarz,
|
||||
appBar: AppBar(
|
||||
backgroundColor: MeloTheme.dunkel1,
|
||||
title: const Row(children: [
|
||||
Text('☁️', style: TextStyle(fontSize: 20)),
|
||||
SizedBox(width: 8),
|
||||
Text('Cloud Sync', style: TextStyle(color: Colors.white, fontSize: 18)),
|
||||
]),
|
||||
leading: IconButton(
|
||||
icon: const Icon(Icons.arrow_back, color: Colors.white, size: 22),
|
||||
onPressed: () => Navigator.pop(context),
|
||||
),
|
||||
title: const Row(
|
||||
children: [
|
||||
Text('☁️', style: TextStyle(fontSize: 20)),
|
||||
SizedBox(width: 8),
|
||||
Text('Cloud Sync', style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600)),
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
IconButton(
|
||||
icon: const Icon(Icons.refresh, color: Colors.grey, size: 20),
|
||||
@@ -219,14 +165,118 @@ class _CloudScreenState extends State<CloudScreen> {
|
||||
),
|
||||
],
|
||||
),
|
||||
body: Padding(
|
||||
body: SingleChildScrollView(
|
||||
padding: const EdgeInsets.all(20),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// Status-Karte
|
||||
// ─── Status-Karte ───
|
||||
_statusKarte(),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
// ─── Upload / Download Buttons ───
|
||||
Row(
|
||||
children: [
|
||||
Expanded(child: _aktionsButton(
|
||||
icon: Icons.upload_rounded,
|
||||
label: 'Upload',
|
||||
beschreibung: 'Lokale Songs → Server',
|
||||
onTap: _upload,
|
||||
)),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(child: _aktionsButton(
|
||||
icon: Icons.download_rounded,
|
||||
label: 'Download',
|
||||
beschreibung: 'Server → Lokal',
|
||||
onTap: _download,
|
||||
)),
|
||||
],
|
||||
),
|
||||
|
||||
// Lade-Indikator
|
||||
if (_ladt)
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(top: 16),
|
||||
child: Center(child: CircularProgressIndicator(color: MeloTheme.rot)),
|
||||
),
|
||||
|
||||
// Status-Text
|
||||
if (_status != null && !_ladt)
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 12),
|
||||
child: Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
|
||||
decoration: BoxDecoration(
|
||||
color: _statusOk ? const Color(0xFF0D3B1E) : const Color(0xFF3B0D0D),
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
_statusOk ? Icons.check_circle : Icons.info_outline,
|
||||
size: 16,
|
||||
color: _statusOk ? const Color(0xFF4CAF50) : const Color(0xFFEF5350),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
_status!,
|
||||
style: TextStyle(
|
||||
color: _statusOk ? const Color(0xFFA5D6A7) : const Color(0xFFEF9A9A),
|
||||
fontSize: 13,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// ─── Sync-Einstellungen ───
|
||||
_sektionsHeader('⚙ Sync-Einstellungen'),
|
||||
const SizedBox(height: 8),
|
||||
|
||||
// Auto-Sync Toggle
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
border: Border.all(color: MeloTheme.dunkel2),
|
||||
),
|
||||
child: SwitchListTile(
|
||||
title: const Text('Auto-Sync', style: TextStyle(color: Colors.white, fontSize: 14)),
|
||||
subtitle: Text(
|
||||
_autoSync ? 'Automatisch synchronisieren' : 'Nur manuell',
|
||||
style: const TextStyle(color: MeloTheme.textSekundaer, fontSize: 12),
|
||||
),
|
||||
value: _autoSync,
|
||||
activeColor: MeloTheme.rot,
|
||||
secondary: const Icon(Icons.sync, color: MeloTheme.rot, size: 22),
|
||||
onChanged: (v) async {
|
||||
setState(() => _autoSync = v);
|
||||
(await SharedPreferences.getInstance()).setBool('cloud_auto', v);
|
||||
_starteAutoSync();
|
||||
},
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
// Sync-Intervall – schöne Segmented Buttons
|
||||
const Text(
|
||||
'Intervall',
|
||||
style: TextStyle(color: MeloTheme.textSekundaer, fontSize: 12, fontWeight: FontWeight.w500),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
_intervallAuswahl(),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
// Letzter Sync
|
||||
Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(16),
|
||||
padding: const EdgeInsets.all(14),
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
@@ -234,102 +284,197 @@ class _CloudScreenState extends State<CloudScreen> {
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(Icons.storage, color: MeloTheme.rot, size: 28),
|
||||
const SizedBox(width: 12),
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text('$_serverCount Songs auf Server',
|
||||
style: const TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w600)),
|
||||
Text(_status ?? 'Lädt...',
|
||||
style: const TextStyle(color: Colors.grey, fontSize: 12)),
|
||||
],
|
||||
const Icon(Icons.history, color: MeloTheme.textSekundaer, size: 18),
|
||||
const SizedBox(width: 10),
|
||||
const Text('Letzter Sync: ', style: TextStyle(color: MeloTheme.textSekundaer, fontSize: 13)),
|
||||
Text(
|
||||
_letzterSync,
|
||||
style: const TextStyle(color: Colors.white, fontSize: 13, fontWeight: FontWeight.w500),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
// Upload / Download
|
||||
Row(
|
||||
children: [
|
||||
Expanded(child: _btn(Icons.upload, 'Upload', _upload)),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(child: _btn(Icons.download, 'Download', _download)),
|
||||
],
|
||||
),
|
||||
// Download-Fortschritt
|
||||
if (_ladt && _aktuellerDownload.isNotEmpty) ...[
|
||||
const SizedBox(height: 12),
|
||||
LinearProgressIndicator(
|
||||
value: _downloadGesamt > 0 ? _downloadFortschritt / _downloadGesamt : null,
|
||||
backgroundColor: MeloTheme.dunkel2,
|
||||
valueColor: const AlwaysStoppedAnimation(MeloTheme.rot),
|
||||
),
|
||||
const SizedBox(height: 6),
|
||||
Text(
|
||||
'$_downloadFortschritt/$_downloadGesamt: $_aktuellerDownload',
|
||||
style: const TextStyle(color: Colors.grey, fontSize: 12),
|
||||
maxLines: 2, overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
],
|
||||
if (_status != null && !_ladt)
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 8),
|
||||
child: Text(_status!, style: const TextStyle(color: Colors.grey, fontSize: 13)),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
// Sync-Einstellungen
|
||||
const Divider(color: MeloTheme.dunkel2),
|
||||
const Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text('⚙ Sync-Einstellungen', style: TextStyle(color: Colors.grey, fontSize: 11)),
|
||||
),
|
||||
SwitchListTile(
|
||||
dense: true,
|
||||
title: const Text('Auto-Sync', style: TextStyle(color: Colors.white, fontSize: 13)),
|
||||
value: _autoSync,
|
||||
activeColor: MeloTheme.rot,
|
||||
onChanged: (v) async {
|
||||
setState(() => _autoSync = v);
|
||||
(await SharedPreferences.getInstance()).setBool('cloud_auto', v);
|
||||
},
|
||||
),
|
||||
Row(
|
||||
children: ['Manuell', 'Alle 3h', 'Alle 6h', 'Alle 12h'].asMap().entries.map((e) {
|
||||
final vals = [0, 3, 6, 12];
|
||||
return Expanded(
|
||||
child: ChoiceChip(
|
||||
label: Text(e.value, style: TextStyle(fontSize: 10, color: _syncIntervall == vals[e.key] ? Colors.white : Colors.grey)),
|
||||
selected: _syncIntervall == vals[e.key],
|
||||
selectedColor: MeloTheme.rot,
|
||||
backgroundColor: MeloTheme.dunkel2,
|
||||
onSelected: (v) async {
|
||||
setState(() => _syncIntervall = vals[e.key]);
|
||||
(await SharedPreferences.getInstance()).setInt('cloud_interval', vals[e.key]);
|
||||
},
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _btn(IconData icon, String label, VoidCallback onTap) {
|
||||
return ElevatedButton.icon(
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: MeloTheme.dunkel1,
|
||||
padding: const EdgeInsets.symmetric(vertical: 14),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
side: const BorderSide(color: MeloTheme.dunkel2),
|
||||
Widget _statusKarte() {
|
||||
return Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(20),
|
||||
decoration: BoxDecoration(
|
||||
gradient: const LinearGradient(
|
||||
colors: [Color(0xFF1A0000), Color(0xFF0D0D0D)],
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(18),
|
||||
border: Border.all(color: MeloTheme.rot.withValues(alpha: 0.3)),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 48,
|
||||
height: 48,
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.rot.withValues(alpha: 0.15),
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
),
|
||||
child: const Icon(Icons.storage_rounded, color: MeloTheme.rot, size: 24),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
'$_serverCount',
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 28,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
const Text(
|
||||
'Songs auf dem Server',
|
||||
style: TextStyle(color: MeloTheme.textSekundaer, fontSize: 13),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
// Verbindungsstatus-Indikator
|
||||
Container(
|
||||
width: 12,
|
||||
height: 12,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: _statusOk ? const Color(0xFF4CAF50) : const Color(0xFFEF5350),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: (_statusOk ? const Color(0xFF4CAF50) : const Color(0xFFEF5350)).withValues(alpha: 0.5),
|
||||
blurRadius: 8,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _aktionsButton({
|
||||
required IconData icon,
|
||||
required String label,
|
||||
required String beschreibung,
|
||||
required VoidCallback onTap,
|
||||
}) {
|
||||
return Material(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
child: InkWell(
|
||||
onTap: _ladt ? null : onTap,
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 16),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
border: Border.all(color: MeloTheme.dunkel2),
|
||||
),
|
||||
child: Column(
|
||||
children: [
|
||||
Icon(icon, color: MeloTheme.rot, size: 28),
|
||||
const SizedBox(height: 8),
|
||||
Text(label, style: const TextStyle(color: Colors.white, fontSize: 15, fontWeight: FontWeight.w600)),
|
||||
const SizedBox(height: 4),
|
||||
Text(beschreibung,
|
||||
textAlign: TextAlign.center,
|
||||
style: const TextStyle(color: MeloTheme.textSekundaer, fontSize: 11)),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
onPressed: _ladt ? null : onTap,
|
||||
icon: Icon(icon, size: 18, color: MeloTheme.rot),
|
||||
label: Text(label, style: const TextStyle(color: Colors.white, fontSize: 14)),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _intervallAuswahl() {
|
||||
final optionen = [
|
||||
_IntervallOption('Manuell', 0, Icons.block),
|
||||
_IntervallOption('3 Std', 3, Icons.timer),
|
||||
_IntervallOption('6 Std', 6, Icons.timer),
|
||||
_IntervallOption('12 Std', 12, Icons.timer),
|
||||
];
|
||||
|
||||
return Row(
|
||||
children: optionen.map((opt) {
|
||||
final istAktiv = _syncIntervall == opt.wert;
|
||||
return Expanded(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.only(
|
||||
right: opt != optionen.last ? 8 : 0,
|
||||
),
|
||||
child: GestureDetector(
|
||||
onTap: () async {
|
||||
setState(() => _syncIntervall = opt.wert);
|
||||
(await SharedPreferences.getInstance()).setInt('cloud_interval', opt.wert);
|
||||
_starteAutoSync();
|
||||
},
|
||||
child: AnimatedContainer(
|
||||
duration: const Duration(milliseconds: 250),
|
||||
padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 6),
|
||||
decoration: BoxDecoration(
|
||||
color: istAktiv ? MeloTheme.rot : MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: istAktiv ? MeloTheme.rot : MeloTheme.dunkel2,
|
||||
),
|
||||
),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(
|
||||
opt.icon,
|
||||
size: 16,
|
||||
color: istAktiv ? Colors.white : MeloTheme.textSekundaer,
|
||||
),
|
||||
const SizedBox(height: 6),
|
||||
Text(
|
||||
opt.label,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: istAktiv ? Colors.white : MeloTheme.textSekundaer,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _sektionsHeader(String titel) {
|
||||
return Text(
|
||||
titel,
|
||||
style: const TextStyle(
|
||||
color: MeloTheme.textSekundaer,
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: 1.2,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _IntervallOption {
|
||||
final String label;
|
||||
final int wert;
|
||||
final IconData icon;
|
||||
const _IntervallOption(this.label, this.wert, this.icon);
|
||||
}
|
||||
|
||||
+421
-134
@@ -2,9 +2,15 @@ import 'dart:io';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'package:just_audio/just_audio.dart';
|
||||
import '../services/download_service.dart';
|
||||
import '../services/cloud_service.dart';
|
||||
import '../models/song.dart';
|
||||
import '../database/db_helper.dart';
|
||||
import '../utils/farb_theme.dart';
|
||||
import '../services/melo_logger.dart';
|
||||
import '../config/app_config.dart';
|
||||
import '../widgets/melo_loader.dart';
|
||||
|
||||
class DownloadScreen extends StatefulWidget {
|
||||
final DownloadService downloader;
|
||||
@@ -20,58 +26,114 @@ class DownloadScreen extends StatefulWidget {
|
||||
State<DownloadScreen> createState() => _DownloadScreenState();
|
||||
}
|
||||
|
||||
class _DownloadScreenState extends State<DownloadScreen> {
|
||||
class _DownloadScreenState extends State<DownloadScreen> with WidgetsBindingObserver {
|
||||
final _urlController = TextEditingController();
|
||||
final _cloud = CloudService();
|
||||
final _previewPlayer = AudioPlayer();
|
||||
bool _ladt = false;
|
||||
List<Map<String, dynamic>> _globalSongs = [];
|
||||
String? _previewSid;
|
||||
String? _fehler;
|
||||
String? _erfolg;
|
||||
String _speicherOrt = 'Intern (Documents/music)';
|
||||
String _speicherOrt = 'App-intern (Music/)';
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
WidgetsBinding.instance.removeObserver(this);
|
||||
_previewPlayer.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||
if (state == AppLifecycleState.paused || state == AppLifecycleState.inactive) {
|
||||
_stopPreview();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _ladeGlobalListe() async {
|
||||
final songs = await _cloud.globalList();
|
||||
if (mounted) setState(() => _globalSongs = songs.cast<Map<String, dynamic>>());
|
||||
}
|
||||
|
||||
Future<void> _addFromRegistry(String sid, String title) async {
|
||||
setState(() => _ladt = true);
|
||||
try {
|
||||
final dir = Directory('${(await getApplicationDocumentsDirectory()).path}/music');
|
||||
if (!await dir.exists()) await dir.create(recursive: true);
|
||||
final dest = '${dir.path}/cloud_$sid.mp3';
|
||||
final ok = await _cloud.download(sid, dest);
|
||||
if (ok && mounted) {
|
||||
final song = Song(
|
||||
titel: title.isNotEmpty ? title : 'Cloud-Song $sid',
|
||||
kuenstler: 'Melo Registry',
|
||||
dauerSekunden: 0,
|
||||
dateiPfad: dest,
|
||||
downloadQuelle: 'cloud',
|
||||
istHeruntergeladen: true,
|
||||
);
|
||||
await DbHelper().songEinfuegen(song);
|
||||
setState(() => _erfolg = 'Song "$title" hinzugefügt!');
|
||||
widget.onSongsChanged();
|
||||
await _ladeGlobalListe();
|
||||
}
|
||||
} catch (e) {
|
||||
setState(() => _fehler = 'Fehler beim Hinzufügen');
|
||||
MeloLogger().fehler('add_from_registry', e);
|
||||
}
|
||||
if (mounted) setState(() => _ladt = false);
|
||||
}
|
||||
|
||||
Future<void> _startPreview(String sid) async {
|
||||
if (_previewSid == sid && _previewPlayer.playing) {
|
||||
await _stopPreview();
|
||||
return;
|
||||
}
|
||||
_previewSid = sid;
|
||||
try {
|
||||
final url = '${AppConfig.cloudUrl}/api/cloud/stream/$sid';
|
||||
await _previewPlayer.setUrl(url);
|
||||
await _previewPlayer.seek(const Duration(seconds: 11));
|
||||
await _previewPlayer.play();
|
||||
Future.delayed(const Duration(seconds: 10), () {
|
||||
if (_previewSid == sid) _stopPreview();
|
||||
});
|
||||
} catch (e) {
|
||||
MeloLogger().fehler('preview', e);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _stopPreview() async {
|
||||
_previewSid = null;
|
||||
await _previewPlayer.stop();
|
||||
}
|
||||
bool _speichertInDownloads = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance.addObserver(this);
|
||||
_ladeSpeicherPfad();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_urlController.dispose();
|
||||
super.dispose();
|
||||
_ladeGlobalListe();
|
||||
}
|
||||
|
||||
Future<void> _ladeSpeicherPfad() async {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
final pfad = prefs.getString('speicher_pfad');
|
||||
if (pfad != null && pfad.isNotEmpty) {
|
||||
widget.downloader.setzeSpeicherPfad(pfad);
|
||||
setState(() => _speicherOrt = pfad.split('/').last);
|
||||
} else {
|
||||
final pf = await _standardPfad();
|
||||
widget.downloader.setzeSpeicherPfad(pf);
|
||||
final inDownloads = prefs.getBool('download_in_downloads') ?? false;
|
||||
if (inDownloads) {
|
||||
final dir = await getDownloadsDirectory();
|
||||
if (dir != null) {
|
||||
final pfad = '${dir.path}/Melo';
|
||||
widget.downloader.setzeSpeicherPfad(pfad);
|
||||
setState(() {
|
||||
_speichertInDownloads = true;
|
||||
_speicherOrt = '⬇ Downloads/Melo';
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<String> _standardPfad() async {
|
||||
if (Platform.isIOS) return '${(await getApplicationDocumentsDirectory()).path}/music';
|
||||
final p = await SharedPreferences.getInstance();
|
||||
if (p.getBool('manage_storage') == true) {
|
||||
final d = await getDownloadsDirectory();
|
||||
if (d != null) return '${d.path}/Melo';
|
||||
}
|
||||
final ext = await getExternalStorageDirectory();
|
||||
return ext != null ? '${ext.path}/Melo' : '${(await getApplicationDocumentsDirectory()).path}/music';
|
||||
}
|
||||
|
||||
Future<void> _ordnerDialog() async {
|
||||
if (Platform.isIOS) {
|
||||
final appDir = await getApplicationDocumentsDirectory();
|
||||
final pfad = '${appDir.path}/music';
|
||||
widget.downloader.setzeSpeicherPfad(pfad);
|
||||
setState(() => _speicherOrt = '📁 App-intern');
|
||||
return;
|
||||
}
|
||||
|
||||
// Android: Ordner wählen via Text-Eingabe oder vordefinierte Optionen
|
||||
final auswahl = await showDialog<String>(
|
||||
context: context,
|
||||
builder: (ctx) => AlertDialog(
|
||||
@@ -80,88 +142,96 @@ class _DownloadScreenState extends State<DownloadScreen> {
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
_optionTile(ctx, '📁 Intern (App-Ordner)', 'intern', icon: Icons.phone_android),
|
||||
const Divider(color: MeloTheme.dunkel2),
|
||||
_optionTile(ctx, '⬇ Downloads/Melo', 'downloads', icon: Icons.download),
|
||||
const Divider(color: MeloTheme.dunkel2),
|
||||
_optionTile(ctx, '📂 Eigener Pfad...', 'custom', icon: Icons.folder_open),
|
||||
_optionTile(ctx, '📁 App-intern (Music/)', 'intern',
|
||||
icon: Icons.phone_android),
|
||||
if (!Platform.isIOS) ...[
|
||||
const Divider(color: MeloTheme.dunkel2),
|
||||
_optionTile(ctx, '⬇ Downloads/Melo', 'downloads',
|
||||
icon: Icons.download),
|
||||
const Divider(color: MeloTheme.dunkel2),
|
||||
_optionTile(ctx, '💾 SD-Karte / Extern', 'extern',
|
||||
icon: Icons.sd_storage),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
if (auswahl == null || !mounted) return;
|
||||
|
||||
String pfad;
|
||||
if (auswahl == 'custom') {
|
||||
final ctrl = TextEditingController();
|
||||
final p = await showDialog<String>(
|
||||
context: context,
|
||||
builder: (ctx) => AlertDialog(
|
||||
backgroundColor: MeloTheme.dunkel1,
|
||||
title: const Text('Pfad eingeben', style: TextStyle(color: Colors.white, fontSize: 15)),
|
||||
content: TextField(
|
||||
controller: ctrl, autofocus: true,
|
||||
style: const TextStyle(color: Colors.white),
|
||||
decoration: InputDecoration(
|
||||
hintText: '/storage/emulated/0/Music/Melo',
|
||||
hintStyle: const TextStyle(color: Colors.grey),
|
||||
border: const OutlineInputBorder(),
|
||||
prefixIcon: const Icon(Icons.folder, color: Colors.grey),
|
||||
),
|
||||
),
|
||||
actions: [
|
||||
TextButton(onPressed: () => Navigator.pop(ctx), child: const Text('Abbrechen')),
|
||||
TextButton(onPressed: () => Navigator.pop(ctx, ctrl.text.trim()), child: const Text('OK', style: TextStyle(color: MeloTheme.rot))),
|
||||
],
|
||||
),
|
||||
);
|
||||
if (p == null || p.isEmpty) return;
|
||||
pfad = p;
|
||||
} else if (auswahl == 'intern') {
|
||||
pfad = await _standardPfad();
|
||||
} else {
|
||||
final d = await getDownloadsDirectory();
|
||||
pfad = d != null ? '${d.path}/Melo' : await _standardPfad();
|
||||
}
|
||||
|
||||
await Directory(pfad).create(recursive: true);
|
||||
widget.downloader.setzeSpeicherPfad(pfad);
|
||||
if (auswahl == null) return;
|
||||
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
await prefs.setString('speicher_pfad', pfad);
|
||||
|
||||
setState(() => _speicherOrt = pfad.split('/').last);
|
||||
if (auswahl == 'downloads') {
|
||||
final dir = await getDownloadsDirectory();
|
||||
if (dir != null) {
|
||||
final pfad = '${dir.path}/Melo';
|
||||
await prefs.setBool('download_in_downloads', true);
|
||||
widget.downloader.setzeSpeicherPfad(pfad);
|
||||
setState(() {
|
||||
_speichertInDownloads = true;
|
||||
_speicherOrt = '⬇ Downloads/Melo';
|
||||
});
|
||||
}
|
||||
} else if (auswahl == 'extern') {
|
||||
final dirs = await getExternalStorageDirectories();
|
||||
if (dirs != null && dirs.isNotEmpty) {
|
||||
final pfad = '${dirs.first.path}/Melo';
|
||||
await prefs.setBool('download_in_downloads', false);
|
||||
widget.downloader.setzeSpeicherPfad(pfad);
|
||||
setState(() {
|
||||
_speichertInDownloads = false;
|
||||
_speicherOrt = '💾 ${dirs.first.path.split('/').last}/Melo';
|
||||
});
|
||||
} else {
|
||||
if (mounted) setState(() => _fehler = 'Kein externer Speicher gefunden');
|
||||
}
|
||||
} else {
|
||||
await prefs.setBool('download_in_downloads', false);
|
||||
widget.downloader.setzeSpeicherPfad('');
|
||||
setState(() {
|
||||
_speichertInDownloads = false;
|
||||
_speicherOrt = '📁 App-intern (Music/)';
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Widget _optionTile(BuildContext ctx, String label, String wert, {IconData? icon}) {
|
||||
Widget _optionTile(BuildContext ctx, String label, String wert,
|
||||
{required IconData icon}) {
|
||||
return ListTile(
|
||||
leading: Icon(icon ?? Icons.folder, color: MeloTheme.rot, size: 20),
|
||||
title: Text(label, style: const TextStyle(color: Colors.white, fontSize: 13)),
|
||||
leading: Icon(icon, color: MeloTheme.rot, size: 20),
|
||||
title: Text(label,
|
||||
style: const TextStyle(color: Colors.white, fontSize: 13)),
|
||||
onTap: () => Navigator.pop(ctx, wert),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _startDownload() async {
|
||||
final url = _urlController.text.trim();
|
||||
if (url.isEmpty) return;
|
||||
void _starteDownload() async {
|
||||
final input = _urlController.text.trim();
|
||||
if (input.isEmpty) {
|
||||
setState(() => _fehler = 'Bitte eine YouTube-URL einfügen');
|
||||
return;
|
||||
}
|
||||
|
||||
setState(() { _ladt = true; _fehler = null; _erfolg = null; });
|
||||
MeloLogger().aktion('download_start', {'url': input.substring(0, 40)});
|
||||
|
||||
try {
|
||||
final song = await widget.downloader.downloadVonUrl(url);
|
||||
if (!mounted) return;
|
||||
if (song != null) {
|
||||
setState(() { _ladt = false; _erfolg = '✅ "${song.titel}" heruntergeladen!'; });
|
||||
widget.onSongsChanged();
|
||||
} else {
|
||||
setState(() { _ladt = false; _fehler = widget.downloader.fehler ?? '❌ Download fehlgeschlagen'; });
|
||||
}
|
||||
} catch (e) {
|
||||
MeloLogger().fehler('download', e);
|
||||
if (mounted) setState(() { _ladt = false; _fehler = 'Fehler: $e'; });
|
||||
final anzahl = await widget.downloader.downloadBatch(input);
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_ladt = false;
|
||||
if (anzahl > 0) {
|
||||
_erfolg = '✅ $anzahl Song${anzahl > 1 ? 's' : ''} gespeichert';
|
||||
} else {
|
||||
_fehler = widget.downloader.fehler ?? 'Download fehlgeschlagen';
|
||||
}
|
||||
});
|
||||
widget.onSongsChanged();
|
||||
}
|
||||
}
|
||||
|
||||
void _abbrechen() {
|
||||
widget.downloader.abbrechen();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
@@ -169,54 +239,271 @@ class _DownloadScreenState extends State<DownloadScreen> {
|
||||
appBar: AppBar(
|
||||
backgroundColor: MeloTheme.dunkel1,
|
||||
title: const Row(children: [
|
||||
Icon(Icons.add_circle, color: MeloTheme.rot, size: 20),
|
||||
Icon(Icons.download, color: MeloTheme.rot, size: 20),
|
||||
SizedBox(width: 8),
|
||||
Text('Lied +', style: TextStyle(color: Colors.white, fontSize: 18)),
|
||||
]),
|
||||
actions: [
|
||||
if (_erfolg != null || _fehler != null)
|
||||
IconButton(
|
||||
icon: const Icon(Icons.refresh, color: Colors.grey, size: 20),
|
||||
onPressed: () => setState(() { _fehler = null; _erfolg = null; _urlController.clear(); }),
|
||||
),
|
||||
],
|
||||
),
|
||||
body: Padding(
|
||||
padding: const EdgeInsets.all(20),
|
||||
child: Column(children: [
|
||||
GestureDetector(
|
||||
onTap: _ladt ? null : _ordnerDialog,
|
||||
child: Container(
|
||||
width: double.infinity, padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(color: MeloTheme.dunkel1, borderRadius: BorderRadius.circular(12), border: Border.all(color: MeloTheme.dunkel2)),
|
||||
child: Row(children: [
|
||||
const Icon(Icons.folder, color: MeloTheme.rot, size: 18), const SizedBox(width: 8),
|
||||
Expanded(child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
|
||||
const Text('Speicherort', style: TextStyle(color: Colors.grey, fontSize: 11)),
|
||||
Text(_speicherOrt, style: const TextStyle(color: Colors.white, fontSize: 13)),
|
||||
])),
|
||||
const Icon(Icons.chevron_right, color: Colors.grey, size: 18),
|
||||
child: Column(
|
||||
children: [
|
||||
// ─── Globale Registry (Lied +) ───
|
||||
if (_globalSongs.isNotEmpty) ...[
|
||||
Row(children: [
|
||||
const Icon(Icons.public, color: MeloTheme.rot, size: 16),
|
||||
const SizedBox(width: 6),
|
||||
Text('Globale Songs (${_globalSongs.length})',
|
||||
style: const TextStyle(color: Colors.white70, fontSize: 13, fontWeight: FontWeight.w600)),
|
||||
const Spacer(),
|
||||
GestureDetector(
|
||||
onTap: _ladeGlobalListe,
|
||||
child: const Icon(Icons.refresh, color: Colors.grey, size: 16),
|
||||
),
|
||||
]),
|
||||
const SizedBox(height: 8),
|
||||
SizedBox(
|
||||
height: 100,
|
||||
child: ListView.builder(
|
||||
scrollDirection: Axis.horizontal,
|
||||
itemCount: _globalSongs.length,
|
||||
itemBuilder: (_, i) {
|
||||
final s = _globalSongs[i];
|
||||
final sid = s['id']?.toString() ?? '';
|
||||
final title = s['title']?.toString() ?? '?';
|
||||
final isPreviewing = _previewSid == sid;
|
||||
return Container(
|
||||
width: 140,
|
||||
margin: const EdgeInsets.only(right: 8),
|
||||
decoration: BoxDecoration(
|
||||
color: isPreviewing ? const Color(0xFF2A0000) : MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
border: Border.all(color: isPreviewing ? MeloTheme.rot : MeloTheme.dunkel2),
|
||||
),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Text(title, style: TextStyle(fontSize: 11, color: Colors.white, fontWeight: FontWeight.w500),
|
||||
maxLines: 2, overflow: TextOverflow.ellipsis, textAlign: TextAlign.center),
|
||||
const SizedBox(height: 4),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
GestureDetector(
|
||||
onTap: () => _startPreview(sid),
|
||||
child: Icon(isPreviewing ? Icons.stop : Icons.play_arrow,
|
||||
color: isPreviewing ? Colors.white : MeloTheme.rot, size: 20),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
GestureDetector(
|
||||
onTap: () => _addFromRegistry(sid, title),
|
||||
child: const Icon(Icons.add_circle_outline, color: Colors.grey, size: 18),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
const Divider(color: MeloTheme.dunkel2),
|
||||
],
|
||||
// ─── Zielordner ───
|
||||
GestureDetector(
|
||||
onTap: _ladt ? null : _ordnerDialog,
|
||||
child: Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(color: MeloTheme.dunkel2),
|
||||
),
|
||||
child: Row(children: [
|
||||
const Icon(Icons.folder, color: MeloTheme.rot, size: 18),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Text('Speicherort', style: TextStyle(color: Colors.grey, fontSize: 11)),
|
||||
Text(_speicherOrt, style: const TextStyle(color: Colors.white, fontSize: 13)),
|
||||
],
|
||||
),
|
||||
),
|
||||
const Icon(Icons.chevron_right, color: Colors.grey, size: 18),
|
||||
]),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
TextField(
|
||||
controller: _urlController, style: const TextStyle(color: Colors.white),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'YouTube / SoundCloud URL...', hintStyle: const TextStyle(color: Colors.grey),
|
||||
filled: true, fillColor: MeloTheme.dunkel1,
|
||||
border: OutlineInputBorder(borderRadius: BorderRadius.circular(12), borderSide: const BorderSide(color: MeloTheme.dunkel2)),
|
||||
prefixIcon: const Icon(Icons.link, color: Colors.grey),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
// ─── Eingabefeld ───
|
||||
TextField(
|
||||
controller: _urlController,
|
||||
enabled: !_ladt,
|
||||
maxLines: 3,
|
||||
style: const TextStyle(color: Colors.white, fontSize: 14),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'YouTube-URL hier einfügen...\n\nMehrere URLs: eine pro Zeile\nPlaylists werden erkannt 🎯',
|
||||
hintStyle: const TextStyle(color: Colors.grey, fontSize: 13),
|
||||
border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
|
||||
filled: true,
|
||||
fillColor: MeloTheme.dunkel1,
|
||||
contentPadding: const EdgeInsets.all(16),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
SizedBox(
|
||||
width: double.infinity,
|
||||
child: ElevatedButton.icon(
|
||||
style: ElevatedButton.styleFrom(backgroundColor: MeloTheme.rot, padding: const EdgeInsets.symmetric(vertical: 14), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12))),
|
||||
onPressed: _ladt ? null : _startDownload,
|
||||
icon: _ladt ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)) : const Icon(Icons.download, color: Colors.white),
|
||||
label: Text(_ladt ? 'Lädt...' : 'Download', style: const TextStyle(color: Colors.white, fontSize: 15)),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
// ─── Animierte Ladeanzeige (während Download) ───
|
||||
if (_ladt) ...[
|
||||
MeloLoader(
|
||||
titel: widget.downloader.aktuellerTitel ?? 'Lade herunter...',
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
|
||||
// ─── Download-Button ───
|
||||
SizedBox(
|
||||
width: double.infinity,
|
||||
height: 48,
|
||||
child: ElevatedButton.icon(
|
||||
onPressed: _ladt ? null : _starteDownload,
|
||||
icon: _ladt
|
||||
? const SizedBox(width: 20, height: 20,
|
||||
child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white))
|
||||
: const Icon(Icons.download, size: 20),
|
||||
label: Text(_ladt ? 'Lädt...' : '⬇ Download'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: MeloTheme.rot,
|
||||
foregroundColor: Colors.white,
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
if (_fehler != null) Padding(padding: const EdgeInsets.only(top: 8), child: Text(_fehler!, style: const TextStyle(color: Colors.red, fontSize: 13))),
|
||||
if (_erfolg != null) Padding(padding: const EdgeInsets.only(top: 8), child: Text(_erfolg!, style: const TextStyle(color: Colors.green, fontSize: 13))),
|
||||
]),
|
||||
if (_ladt) ...[
|
||||
const SizedBox(height: 8),
|
||||
SizedBox(
|
||||
width: double.infinity,
|
||||
height: 40,
|
||||
child: ElevatedButton.icon(
|
||||
onPressed: _abbrechen,
|
||||
icon: const Icon(Icons.cancel, size: 18),
|
||||
label: const Text('Abbrechen'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: Colors.red.shade800,
|
||||
foregroundColor: Colors.white,
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// ─── Fortschritt ───
|
||||
if (_ladt)
|
||||
ListenableBuilder(
|
||||
listenable: widget.downloader,
|
||||
builder: (context, _) {
|
||||
final fortschritt = widget.downloader.fortschritt;
|
||||
|
||||
if (fortschritt <= 0) return const SizedBox.shrink();
|
||||
return Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Column(children: [
|
||||
LinearProgressIndicator(
|
||||
value: fortschritt,
|
||||
color: MeloTheme.rot,
|
||||
backgroundColor: MeloTheme.dunkel2),
|
||||
const SizedBox(height: 4),
|
||||
Text('${(fortschritt * 100).toStringAsFixed(0)}%',
|
||||
style: const TextStyle(color: Colors.grey, fontSize: 11)),
|
||||
]),
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
// ─── Erfolg ───
|
||||
if (_erfolg != null)
|
||||
Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(color: Colors.green.withValues(alpha: 0.3)),
|
||||
),
|
||||
child: Row(children: [
|
||||
const Icon(Icons.check_circle, color: Colors.green, size: 24),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(child: Text(_erfolg!, style: const TextStyle(color: Colors.green, fontSize: 13))),
|
||||
]),
|
||||
),
|
||||
|
||||
// ─── Fehler ───
|
||||
if (_fehler != null)
|
||||
Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(color: Colors.red.withValues(alpha: 0.3)),
|
||||
),
|
||||
child: Row(children: [
|
||||
const Icon(Icons.error_outline, color: Colors.red, size: 24),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(child: Text(_fehler!, style: const TextStyle(color: Colors.red, fontSize: 13))),
|
||||
]),
|
||||
),
|
||||
|
||||
const Spacer(),
|
||||
|
||||
// ─── Tipps ───
|
||||
Container(
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Text('💡 Tipps', style: TextStyle(color: Colors.grey, fontSize: 12, fontWeight: FontWeight.w600)),
|
||||
const SizedBox(height: 6),
|
||||
_tipp('Einzel-URL: youtube.com/watch?v=...'),
|
||||
_tipp('Playlist: youtube.com/playlist?list=...'),
|
||||
_tipp('Mehrere: eine URL pro Zeile'),
|
||||
_tipp('Cooldown: 5s zwischen Downloads ⏱'),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _tipp(String text) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(bottom: 4),
|
||||
child: Row(children: [
|
||||
const Text('• ', style: TextStyle(color: MeloTheme.rot, fontSize: 12)),
|
||||
Expanded(child: Text(text, style: const TextStyle(color: Colors.grey, fontSize: 11))),
|
||||
]),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
+69
-433
@@ -1,28 +1,21 @@
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
import 'package:flutter/material.dart';
|
||||
import '../database/db_helper.dart';
|
||||
import 'dart:async';
|
||||
import '../viewmodels/melo_home_viewmodel.dart';
|
||||
import '../models/song.dart';
|
||||
import '../models/playlist.dart';
|
||||
import '../utils/farb_theme.dart';
|
||||
import '../utils/user_effekte.dart';
|
||||
import '../services/cloud_service.dart';
|
||||
import '../services/favoriten_service.dart';
|
||||
import '../widgets/mini_player.dart';
|
||||
import '../widgets/melo_header.dart';
|
||||
import '../widgets/statistik_card.dart';
|
||||
import '../widgets/recent_widget.dart';
|
||||
import '../widgets/tag_stats_widget.dart';
|
||||
import '../widgets/tag_leiste.dart';
|
||||
import '../widgets/song_tile.dart';
|
||||
import '../widgets/navidrome_browser.dart';
|
||||
import '../widgets/playlist_sheet.dart';
|
||||
import 'download_screen.dart';
|
||||
import 'cloud_screen.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'package:permission_handler/permission_handler.dart';
|
||||
import '../widgets/cloud_einstellungen.dart';
|
||||
import 'settings_screen.dart';
|
||||
import '../services/cloud_service.dart';
|
||||
import '../services/auth_service.dart';
|
||||
import '../config/app_config.dart';
|
||||
|
||||
class MeloHome extends StatefulWidget {
|
||||
@@ -37,221 +30,12 @@ class _MeloHomeState extends State<MeloHome> {
|
||||
final CloudService _cloud = CloudService();
|
||||
int _aktiverTab = 0;
|
||||
|
||||
String _nutzer = 'Baka'; // Aktueller Nutzer
|
||||
final Future<int> _favoritenZahl = FavoritenService().anzahlFavoriten();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_ladeNutzer();
|
||||
_vm.addListener(() => setState(() {}));
|
||||
_vm.ladeSongs();
|
||||
}
|
||||
|
||||
Future<void> _ladeNutzer() async {
|
||||
final p = await SharedPreferences.getInstance();
|
||||
final n = p.getString('melo_nutzer') ?? '';
|
||||
if (n.isNotEmpty && mounted) {
|
||||
setState(() => _nutzer = n);
|
||||
_vm.setzeNutzer(n);
|
||||
}
|
||||
// Erster Start? → einmalig Modus wählen (Cloud oder nur lokal) – Login ist freiwillig
|
||||
if (!p.containsKey('melo_modus')) {
|
||||
await _zeigeModusWahl();
|
||||
return;
|
||||
}
|
||||
// Login-Effekt beim App-Start: nur wenn ein Token vorhanden ist (eingeloggt)
|
||||
final ok = await CloudService().restoreLogin();
|
||||
if (ok && mounted) {
|
||||
UserEffekt.anwenden(_nutzer);
|
||||
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
|
||||
content: Text(UserEffekt.fuer(_nutzer).begruessung),
|
||||
duration: const Duration(seconds: 3),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
/// Einmalige Auswahl beim ersten App-Start: Cloud-Sync oder nur lokal.
|
||||
Future<void> _zeigeModusWahl() async {
|
||||
if (!mounted) return;
|
||||
final cloud = await showDialog<bool>(
|
||||
context: context,
|
||||
barrierDismissible: false,
|
||||
builder: (ctx) => AlertDialog(
|
||||
backgroundColor: MeloTheme.dunkel1,
|
||||
title: const Text('👋 Willkommen bei Melo!',
|
||||
style: TextStyle(color: Colors.white, fontSize: 16)),
|
||||
content: const Text(
|
||||
'Wie möchtest du Melo nutzen?',
|
||||
style: TextStyle(color: Colors.white, fontSize: 14),
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(ctx, false),
|
||||
child: const Text('📱 Nur lokal',
|
||||
style: TextStyle(color: Colors.white)),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(ctx, true),
|
||||
child: const Text('☁️ Cloud (empfohlen)',
|
||||
style: TextStyle(color: MeloTheme.rot, fontWeight: FontWeight.bold)),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
final p = await SharedPreferences.getInstance();
|
||||
await p.setString('melo_modus', cloud == true ? 'cloud' : 'lokal');
|
||||
// Cloud gewählt → direkt zum Login-Dialog (Name + Passwort)
|
||||
if (cloud == true && mounted) {
|
||||
_nutzerWechseln();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _zeigeProfil() async {
|
||||
final p = await SharedPreferences.getInstance();
|
||||
final modus = p.getString('melo_modus') ?? 'cloud';
|
||||
// Cloud-Count VOR dem Dialog auflösen (sonst stünde "Instance of Future" da)
|
||||
final cloudCount = await _cloud.status();
|
||||
if (!mounted) return;
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (ctx) => AlertDialog(
|
||||
backgroundColor: MeloTheme.dunkel1,
|
||||
title: Row(children: [
|
||||
const Icon(Icons.person, color: MeloTheme.rot, size: 22),
|
||||
const SizedBox(width: 8),
|
||||
Text(_nutzer, style: const TextStyle(color: Colors.white, fontSize: 17)),
|
||||
]),
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
_profilZeile(Icons.music_note, 'Lieder auf Gerät', '${_vm.songs.length}'),
|
||||
_profilZeile(Icons.cloud, 'Cloud-Server', '${cloudCount?['total'] ?? 0}'),
|
||||
const Divider(color: MeloTheme.dunkel2),
|
||||
// Später von "nur lokal" auf Cloud wechseln – jederzeit möglich
|
||||
if (modus == 'lokal') ...[
|
||||
ListTile(
|
||||
leading: const Icon(Icons.cloud_upload, color: Colors.blueAccent, size: 18),
|
||||
title: const Text('☁️ Cloud aktivieren',
|
||||
style: TextStyle(color: Colors.white, fontSize: 13)),
|
||||
subtitle: const Text('Musik sichern & geräteübergreifend nutzen',
|
||||
style: TextStyle(color: Colors.grey, fontSize: 11)),
|
||||
onTap: () async {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
await prefs.setString('melo_modus', 'cloud');
|
||||
if (ctx.mounted) Navigator.pop(ctx);
|
||||
_nutzerWechseln();
|
||||
},
|
||||
),
|
||||
const Divider(color: MeloTheme.dunkel2),
|
||||
],
|
||||
ListTile(
|
||||
leading: const Icon(Icons.swap_horiz, color: Colors.grey, size: 18),
|
||||
title: const Text('Nutzer wechseln', style: TextStyle(color: Colors.white, fontSize: 13)),
|
||||
onTap: () {
|
||||
Navigator.pop(ctx);
|
||||
_nutzerWechseln();
|
||||
},
|
||||
),
|
||||
ListTile(
|
||||
leading: const Icon(Icons.logout, color: Colors.red, size: 18),
|
||||
title: const Text('Abmelden', style: TextStyle(color: Colors.red, fontSize: 13)),
|
||||
onTap: () async {
|
||||
// Token wirklich löschen, sonst wäre man gar nicht abgemeldet
|
||||
await CloudService().logout();
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
await prefs.remove('melo_nutzer');
|
||||
if (ctx.mounted) Navigator.pop(ctx);
|
||||
if (mounted) setState(() => _nutzer = '');
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _profilZeile(IconData icon, String label, String wert) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 6),
|
||||
child: Row(children: [
|
||||
Icon(icon, color: MeloTheme.rot, size: 16),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(child: Text(label, style: const TextStyle(color: Colors.grey, fontSize: 12))),
|
||||
Text(wert, style: const TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w600)),
|
||||
]),
|
||||
);
|
||||
}
|
||||
|
||||
void _nutzerWechseln() {
|
||||
final ctrl = TextEditingController(text: _nutzer);
|
||||
final pwCtrl = TextEditingController();
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (ctx) => AlertDialog(
|
||||
backgroundColor: MeloTheme.dunkel1,
|
||||
title: const Text('👤 Anmelden', style: TextStyle(color: Colors.white, fontSize: 15)),
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
TextField(
|
||||
controller: ctrl,
|
||||
autofocus: true,
|
||||
style: const TextStyle(color: Colors.white),
|
||||
decoration: const InputDecoration(
|
||||
hintText: 'Nutzername...',
|
||||
hintStyle: TextStyle(color: Colors.grey),
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
TextField(
|
||||
controller: pwCtrl,
|
||||
obscureText: true,
|
||||
style: const TextStyle(color: Colors.white),
|
||||
decoration: const InputDecoration(
|
||||
hintText: 'Passwort...',
|
||||
hintStyle: TextStyle(color: Colors.grey),
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
TextButton(onPressed: () => Navigator.pop(ctx), child: const Text('Abbrechen')),
|
||||
TextButton(
|
||||
onPressed: () async {
|
||||
final name = ctrl.text.trim();
|
||||
final pass = pwCtrl.text;
|
||||
if (name.isEmpty || pass.isEmpty) return;
|
||||
final ok = await _vm.cloud.login(name, pass);
|
||||
if (!ctx.mounted) return;
|
||||
Navigator.pop(ctx);
|
||||
if (ok) {
|
||||
final p = await SharedPreferences.getInstance();
|
||||
await p.setString('melo_nutzer', name);
|
||||
if (mounted) setState(() => _nutzer = name);
|
||||
_vm.setzeNutzer(name);
|
||||
// Login-Effekt: Akzentfarbe + Sound + Begrüßung pro Person
|
||||
UserEffekt.anwenden(name);
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
|
||||
content: Text(UserEffekt.fuer(name).begruessung),
|
||||
duration: const Duration(seconds: 3)));
|
||||
}
|
||||
} else {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
|
||||
content: Text('❌ Login fehlgeschlagen – Name oder Passwort falsch')));
|
||||
}
|
||||
}
|
||||
},
|
||||
child: const Text('OK', style: TextStyle(color: MeloTheme.rot)),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
@override
|
||||
void dispose() {
|
||||
_vm.dispose();
|
||||
@@ -448,29 +232,6 @@ class _MeloHomeState extends State<MeloHome> {
|
||||
);
|
||||
}
|
||||
|
||||
void _songLoeschen(Song song) async {
|
||||
if (song.id != null) {
|
||||
final db = DbHelper();
|
||||
await db.loeschSong(song.id!);
|
||||
if (song.dateiPfad.isNotEmpty) {
|
||||
try { await File(song.dateiPfad).delete(); } catch (_) {}
|
||||
}
|
||||
_vm.ladeSongs();
|
||||
}
|
||||
}
|
||||
|
||||
void _zeigePlaylists() {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
backgroundColor: MeloTheme.schwarz,
|
||||
isScrollControlled: true,
|
||||
builder: (_) => SizedBox(
|
||||
height: MediaQuery.of(context).size.height * 0.7,
|
||||
child: PlaylistSheet(vm: _vm),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void _zeigeAddToPlaylist(Song song) async {
|
||||
final playlists = await _vm.playlists.allePlaylists();
|
||||
if (!mounted || playlists.isEmpty) {
|
||||
@@ -529,8 +290,8 @@ class _MeloHomeState extends State<MeloHome> {
|
||||
);
|
||||
}
|
||||
|
||||
final gesamtMB = _vm.songs.isEmpty ? '0.0'
|
||||
: (_vm.songs.fold(0, (int s, Song song) => s + song.groesseBytes) / 1048576).toStringAsFixed(1);
|
||||
final gesamtMB = _vm.songs.isEmpty ? '0'
|
||||
: (_vm.songs.fold(0, (int s, Song song) => s + song.groesseBytes) / 1048576).toStringAsFixed(0);
|
||||
final gesamtMin = _vm.songs.isEmpty ? 0
|
||||
: (_vm.songs.fold(0, (int s, Song song) => s + song.dauerSekunden) / 60).round();
|
||||
|
||||
@@ -542,23 +303,31 @@ class _MeloHomeState extends State<MeloHome> {
|
||||
downloader: _vm.downloader,
|
||||
onSongsChanged: _vm.ladeSongs,
|
||||
)
|
||||
: _aktiverTab == 3
|
||||
? CloudScreen(cloud: _cloud, onSongsChanged: _vm.ladeSongs)
|
||||
: _aktiverTab == 4
|
||||
? CloudScreen(cloud: _cloud)
|
||||
: Column(
|
||||
children: [
|
||||
MeloHeader(onDownload: _zeigeDownloadDialog, onSearch: _zeigeSuche, onServer: _zeigeProfil, onSettings: _zeigeEinstellungen),
|
||||
if (_vm.zeigeBotschaft) _botschaftBanner(),
|
||||
_tagBereich(),
|
||||
FutureBuilder<int>(
|
||||
future: _favoritenZahl,
|
||||
builder: (context, snap) => StatistikCard(
|
||||
anzahlSongs: _vm.songs.length,
|
||||
gesamtMB: gesamtMB,
|
||||
gesamtMin: gesamtMin,
|
||||
anzahlFavoriten: snap.data ?? 0,
|
||||
),
|
||||
MeloHeader(onDownload: _zeigeDownloadDialog, onSearch: _zeigeSuche, onServer: _zeigeServerBrowser),
|
||||
// ─── EIN/AUS: RecentWidget (Zuletzt gehört) ───
|
||||
// Entferne die Kommentarzeichen um RecentWidget zu aktivieren:
|
||||
// RecentWidget(songs: _vm.letzteSongs, onPlay: _vm.spieleSong),
|
||||
StatistikCard(
|
||||
anzahlSongs: _vm.songs.length,
|
||||
gesamtMB: gesamtMB,
|
||||
gesamtMin: gesamtMin,
|
||||
anzahlFavoriten: _vm.favoritenIds.length,
|
||||
),
|
||||
RecentWidget(songs: _vm.letzteSongs, onPlay: _vm.spieleSong),
|
||||
// ─── EIN/AUS: Hidden Message "Seit 2008" ───
|
||||
// Entferne die Kommentarzeichen um die Botschaft zu aktivieren:
|
||||
if (_vm.zeigeBotschaft) _botschaftBanner(),
|
||||
TagLeiste(
|
||||
tags: _vm.tags,
|
||||
aktiveTags: _vm.aktiveTags,
|
||||
onTagToggled: _vm.toggleTag,
|
||||
),
|
||||
// ─── EIN/AUS: TagStatsWidget (Tag-Counts) ───
|
||||
// Entferne die Kommentarzeichen um TagStatsWidget zu aktivieren:
|
||||
// TagStatsWidget(tagCounts: _vm.tagCounts),
|
||||
Expanded(child: _songListe()),
|
||||
const MiniPlayer(),
|
||||
const SizedBox(height: 8),
|
||||
@@ -607,9 +376,7 @@ class _MeloHomeState extends State<MeloHome> {
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: songs.isEmpty
|
||||
? _emptyStateWidget()
|
||||
: ListView.builder(
|
||||
child: ListView.builder(
|
||||
padding: const EdgeInsets.fromLTRB(20, 4, 20, 4),
|
||||
itemCount: songs.length,
|
||||
itemBuilder: (_, i) => SongTile(
|
||||
@@ -619,7 +386,6 @@ class _MeloHomeState extends State<MeloHome> {
|
||||
onPlay: _vm.spieleSong,
|
||||
onMetadataChanged: _vm.ladeSongs,
|
||||
onAddToPlaylist: _zeigeAddToPlaylist,
|
||||
onDelete: _songLoeschen,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -627,85 +393,26 @@ class _MeloHomeState extends State<MeloHome> {
|
||||
);
|
||||
}
|
||||
|
||||
void _zeigeEinstellungen() {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (ctx) => AlertDialog(
|
||||
backgroundColor: MeloTheme.dunkel1,
|
||||
title: const Text('⚙ Einstellungen', style: TextStyle(color: Colors.white, fontSize: 16)),
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// Stats
|
||||
Container(
|
||||
padding: const EdgeInsets.all(12),
|
||||
margin: const EdgeInsets.only(bottom: 12),
|
||||
decoration: BoxDecoration(color: MeloTheme.dunkel2, borderRadius: BorderRadius.circular(10)),
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.spaceAround, children: [
|
||||
_statWert('${_vm.songs.length}', 'Songs'),
|
||||
_statWert('${(_vm.songs.fold(0, (int s, Song song) => s + song.groesseBytes) / 1048576).toStringAsFixed(1)} MB', 'Größe'),
|
||||
_statWert('${(_vm.songs.fold(0, (int s, Song song) => s + song.dauerSekunden) / 60).round()} Min', 'Dauer'),
|
||||
_statWert('${_vm.favoritenIds.length}', '❤️'),
|
||||
]),
|
||||
),
|
||||
ListTile(
|
||||
leading: const Icon(Icons.favorite, color: MeloTheme.rot),
|
||||
title: const Text('Favoriten', style: TextStyle(color: Colors.white)),
|
||||
subtitle: const Text('Deine Lieblingssongs', style: TextStyle(color: Colors.grey, fontSize: 12)),
|
||||
onTap: () {
|
||||
Navigator.pop(ctx);
|
||||
_vm.aktiveTags = {'★ Favoriten'};
|
||||
},
|
||||
),
|
||||
ListTile(
|
||||
leading: const Icon(Icons.cloud, color: MeloTheme.rot),
|
||||
title: const Text('Cloud Sync', style: TextStyle(color: Colors.white)),
|
||||
subtitle: const Text('Auto-Sync & Einstellungen', style: TextStyle(color: Colors.grey, fontSize: 12)),
|
||||
onTap: () {
|
||||
Navigator.pop(ctx);
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (_) => const CloudEinstellungen(),
|
||||
);
|
||||
},
|
||||
),
|
||||
ListTile(
|
||||
leading: const Icon(Icons.dns, color: MeloTheme.rot),
|
||||
title: const Text('Server verbinden', style: TextStyle(color: Colors.white)),
|
||||
subtitle: const Text('Navidrome / Musik-Server', style: TextStyle(color: Colors.grey, fontSize: 12)),
|
||||
onTap: () { Navigator.pop(ctx); _zeigeServerBrowser(); },
|
||||
),
|
||||
ListTile(
|
||||
leading: const Icon(Icons.person, color: MeloTheme.rot),
|
||||
title: const Text('Profil', style: TextStyle(color: Colors.white)),
|
||||
subtitle: Text(_nutzer.isEmpty ? 'Nicht angemeldet' : _nutzer, style: const TextStyle(color: Colors.grey, fontSize: 12)),
|
||||
onTap: () { Navigator.pop(ctx); _zeigeProfil(); },
|
||||
),
|
||||
SwitchListTile(
|
||||
title: const Text('Diagnosedaten senden', style: TextStyle(color: Colors.white, fontSize: 13)),
|
||||
subtitle: const Text('Absturz-Logs & Nutzungsdaten', style: TextStyle(color: Colors.grey, fontSize: 11)),
|
||||
value: AppConfig.sendeDiagnosedaten,
|
||||
activeColor: MeloTheme.rot,
|
||||
onChanged: (v) {
|
||||
AppConfig.sendeDiagnosedaten = v;
|
||||
},
|
||||
),
|
||||
if (Platform.isAndroid)
|
||||
ListTile(
|
||||
leading: const Icon(Icons.folder_open, color: MeloTheme.rot),
|
||||
title: const Text('Voller Speicherzugriff', style: TextStyle(color: Colors.white)),
|
||||
subtitle: const Text('Zum Speichern in Downloads/Music', style: TextStyle(color: Colors.grey, fontSize: 12)),
|
||||
onTap: () async {
|
||||
final status = await Permission.manageExternalStorage.request();
|
||||
if (status.isGranted) {
|
||||
await SharedPreferences.getInstance().then((p) => p.setBool('manage_storage', true));
|
||||
}
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Future<void> _oeffneEinstellungen() async {
|
||||
final result = await Navigator.push<String>(
|
||||
context,
|
||||
MaterialPageRoute(builder: (_) => const SettingsScreen()),
|
||||
);
|
||||
if (!mounted || result == null) return;
|
||||
|
||||
switch (result) {
|
||||
case 'server':
|
||||
_zeigeServerBrowser();
|
||||
break;
|
||||
case 'logout':
|
||||
await AuthService().logout();
|
||||
if (mounted) {
|
||||
Navigator.of(context).pushReplacement(
|
||||
MaterialPageRoute(builder: (_) => const MeloHome()),
|
||||
);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Widget _bottomNav() {
|
||||
@@ -718,21 +425,28 @@ class _MeloHomeState extends State<MeloHome> {
|
||||
backgroundColor: MeloTheme.schwarz,
|
||||
selectedItemColor: MeloTheme.rot,
|
||||
unselectedItemColor: MeloTheme.textSekundaer,
|
||||
currentIndex: _aktiverTab.clamp(0, 3),
|
||||
currentIndex: _aktiverTab,
|
||||
onTap: (i) {
|
||||
if (i == 5) {
|
||||
// Einstellungen als Screen öffnen
|
||||
_oeffneEinstellungen();
|
||||
return;
|
||||
}
|
||||
setState(() => _aktiverTab = i);
|
||||
// Zurück zu Musik → Filter zurücksetzen wenn Favoriten aktiv
|
||||
if (i == 0 && _vm.aktiveTags.contains('★ Favoriten')) {
|
||||
_vm.aktiveTags.clear();
|
||||
} else if (i == 2) {
|
||||
// Playlisten öffnen
|
||||
_zeigePlaylists();
|
||||
} else if (i == 3) {
|
||||
_vm.aktiveTags = {'★ Favoriten'};
|
||||
}
|
||||
},
|
||||
items: const [
|
||||
BottomNavigationBarItem(icon: Icon(Icons.music_note, size: 22), label: 'Musik'),
|
||||
BottomNavigationBarItem(icon: Icon(Icons.add_circle, size: 22), label: 'Lied +'),
|
||||
BottomNavigationBarItem(icon: Icon(Icons.queue_music, size: 22), label: 'Playlisten'),
|
||||
BottomNavigationBarItem(icon: Icon(Icons.label, size: 22), label: 'Tags'),
|
||||
BottomNavigationBarItem(icon: Icon(Icons.favorite, size: 22), label: 'Favoriten'),
|
||||
BottomNavigationBarItem(icon: Icon(Icons.cloud, size: 22), label: 'Cloud'),
|
||||
BottomNavigationBarItem(icon: Icon(Icons.settings, size: 22), label: 'Einstellungen'),
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -769,8 +483,15 @@ class _MeloHomeState extends State<MeloHome> {
|
||||
const Text('💌', style: TextStyle(fontSize: 20)),
|
||||
const SizedBox(width: 10),
|
||||
Expanded(
|
||||
child: Text(_vm.nutzerBotschaft ?? '🎵 Danke fürs Zuhören!',
|
||||
style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w600, color: Colors.white)),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: const [
|
||||
Text('Seit 2008',
|
||||
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w700, color: Colors.white)),
|
||||
Text('Danke, dass du immer da bist ♥',
|
||||
style: TextStyle(fontSize: 11, color: MeloTheme.textSekundaer)),
|
||||
],
|
||||
),
|
||||
),
|
||||
GestureDetector(
|
||||
onTap: _vm.botschaftAusblenden,
|
||||
@@ -781,89 +502,4 @@ class _MeloHomeState extends State<MeloHome> {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Leerer Zustand – wenn keine Songs in der Bibliothek sind
|
||||
Widget _emptyStateWidget() {
|
||||
return Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(32),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(Icons.library_music_outlined, size: 56, color: MeloTheme.rot.withValues(alpha: 0.5)),
|
||||
const SizedBox(height: 16),
|
||||
const Text('Noch keine Songs in Melo',
|
||||
style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w600)),
|
||||
const SizedBox(height: 8),
|
||||
const Text('Füge Songs über "Lied +" hinzu, verbinde deinen Server oder starte einen lokalen Scan.',
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(color: MeloTheme.textSekundaer, fontSize: 12, height: 1.4)),
|
||||
const SizedBox(height: 20),
|
||||
ElevatedButton.icon(
|
||||
onPressed: _scanMusik,
|
||||
icon: const Icon(Icons.search, size: 16),
|
||||
label: const Text('Jetzt Musik scannen'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: MeloTheme.dunkel1,
|
||||
foregroundColor: Colors.white,
|
||||
side: const BorderSide(color: MeloTheme.dunkel2),
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _tagBereich() {
|
||||
return AnimatedSize(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
child: Column(
|
||||
children: [
|
||||
// Toggle-Kopf: Tag-Leiste ein-/ausklappen (war vorher unerreichbar!)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 20),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(Icons.label_outline,
|
||||
size: 14, color: MeloTheme.textSekundaer),
|
||||
const SizedBox(width: 6),
|
||||
Text('Tags & Filter',
|
||||
style: const TextStyle(
|
||||
color: MeloTheme.textSekundaer, fontSize: 12)),
|
||||
const Spacer(),
|
||||
IconButton(
|
||||
visualDensity: VisualDensity.compact,
|
||||
icon: Icon(
|
||||
_tagsOffen ? Icons.expand_less : Icons.expand_more,
|
||||
size: 18,
|
||||
color: MeloTheme.textSekundaer),
|
||||
onPressed: () => setState(() => _tagsOffen = !_tagsOffen),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (_tagsOffen) ...[
|
||||
TagLeiste(
|
||||
tags: _vm.tags,
|
||||
aktiveTags: _vm.aktiveTags,
|
||||
onTagToggled: _vm.toggleTag,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
TagStatsWidget(tagCounts: _vm.tagCounts),
|
||||
],
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _statWert(String wert, String label) {
|
||||
return Column(children: [
|
||||
Text(wert, style: const TextStyle(color: Colors.white, fontSize: 15, fontWeight: FontWeight.w700)),
|
||||
Text(label, style: const TextStyle(color: Colors.grey, fontSize: 10)),
|
||||
]);
|
||||
}
|
||||
|
||||
bool _tagsOffen = false;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,640 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import '../services/auth_service.dart';
|
||||
import '../services/navidrome_service.dart';
|
||||
import '../utils/farb_theme.dart';
|
||||
import 'home_screen.dart';
|
||||
|
||||
/// Melo Login-Screen – Schwarz+Rot Design
|
||||
/// Baka-Auth + Navidrome-Credentials
|
||||
class LoginScreen extends StatefulWidget {
|
||||
const LoginScreen({super.key});
|
||||
|
||||
@override
|
||||
State<LoginScreen> createState() => _LoginScreenState();
|
||||
}
|
||||
|
||||
class _LoginScreenState extends State<LoginScreen>
|
||||
with SingleTickerProviderStateMixin {
|
||||
final AuthService _auth = AuthService();
|
||||
final NavidromeService _navidrome = NavidromeService();
|
||||
|
||||
final _userCtrl = TextEditingController();
|
||||
final _passCtrl = TextEditingController();
|
||||
final _urlCtrl = TextEditingController();
|
||||
final _navUserCtrl = TextEditingController();
|
||||
final _navPassCtrl = TextEditingController();
|
||||
|
||||
bool _ladt = false;
|
||||
String? _status;
|
||||
bool _statusOk = false;
|
||||
bool _zeigeNavidrome = false;
|
||||
bool _zeigeRegistrierung = false;
|
||||
bool _passSichtbar = false;
|
||||
bool _navPassSichtbar = false;
|
||||
bool _regPassSichtbar = false;
|
||||
|
||||
// Registrierungs-Felder
|
||||
final _regEmailCtrl = TextEditingController();
|
||||
final _regUserCtrl = TextEditingController();
|
||||
final _regPassCtrl = TextEditingController();
|
||||
|
||||
late final AnimationController _animCtrl;
|
||||
late final Animation<double> _fadeAnim;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_animCtrl = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(milliseconds: 800),
|
||||
);
|
||||
_fadeAnim = CurvedAnimation(parent: _animCtrl, curve: Curves.easeOut);
|
||||
_animCtrl.forward();
|
||||
_ladeGespeicherteDaten();
|
||||
}
|
||||
|
||||
Future<void> _ladeGespeicherteDaten() async {
|
||||
await _navidrome.ladeGespeicherteZugangsdaten();
|
||||
// Navidrome-Daten für Anzeige vorbereiten
|
||||
if (_navidrome.istVerbunden) {
|
||||
setState(() {
|
||||
_zeigeNavidrome = true;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_userCtrl.dispose();
|
||||
_passCtrl.dispose();
|
||||
_urlCtrl.dispose();
|
||||
_navUserCtrl.dispose();
|
||||
_navPassCtrl.dispose();
|
||||
_regEmailCtrl.dispose();
|
||||
_regUserCtrl.dispose();
|
||||
_regPassCtrl.dispose();
|
||||
_animCtrl.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _setzeStatus(String msg, {bool ok = false}) {
|
||||
setState(() {
|
||||
_status = msg;
|
||||
_statusOk = ok;
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _login() async {
|
||||
final user = _userCtrl.text.trim();
|
||||
final pass = _passCtrl.text.trim();
|
||||
|
||||
if (user.isEmpty || pass.isEmpty) {
|
||||
_setzeStatus('Bitte Benutzername und Passwort eingeben');
|
||||
return;
|
||||
}
|
||||
|
||||
setState(() => _ladt = true);
|
||||
_setzeStatus('Verbinde mit Baka-Auth...');
|
||||
|
||||
final result = await _auth.login(user, pass);
|
||||
|
||||
if (!mounted) return;
|
||||
|
||||
if (result.erfolg) {
|
||||
_setzeStatus('✅ Login erfolgreich!', ok: true);
|
||||
// Navidrome-Credentials speichern falls eingegeben
|
||||
if (_zeigeNavidrome) {
|
||||
final url = _urlCtrl.text.trim();
|
||||
final nUser = _navUserCtrl.text.trim();
|
||||
final nPass = _navPassCtrl.text.trim();
|
||||
if (url.isNotEmpty && nUser.isNotEmpty && nPass.isNotEmpty) {
|
||||
await _navidrome.speichereZugangsdaten(url, nUser, nPass);
|
||||
}
|
||||
}
|
||||
// Kurz warten, dann navigieren
|
||||
await Future.delayed(const Duration(milliseconds: 600));
|
||||
if (mounted) {
|
||||
Navigator.of(context).pushReplacement(
|
||||
MaterialPageRoute(builder: (_) => const MeloHome()),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
_setzeStatus('❌ ${result.fehler ?? "Login fehlgeschlagen"}');
|
||||
setState(() => _ladt = false);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _registrieren() async {
|
||||
final user = _regUserCtrl.text.trim();
|
||||
final pass = _regPassCtrl.text.trim();
|
||||
final email = _regEmailCtrl.text.trim();
|
||||
|
||||
if (user.isEmpty || pass.isEmpty) {
|
||||
_setzeStatus('Bitte alle Felder ausfüllen');
|
||||
return;
|
||||
}
|
||||
|
||||
setState(() => _ladt = true);
|
||||
_setzeStatus('Registriere...');
|
||||
|
||||
final result = await _auth.registrieren(user, pass, email);
|
||||
|
||||
if (!mounted) return;
|
||||
|
||||
if (result.erfolg) {
|
||||
_setzeStatus('✅ Registrierung erfolgreich!', ok: true);
|
||||
await Future.delayed(const Duration(milliseconds: 600));
|
||||
if (mounted) {
|
||||
Navigator.of(context).pushReplacement(
|
||||
MaterialPageRoute(builder: (_) => const MeloHome()),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
_setzeStatus('❌ ${result.fehler ?? "Registrierung fehlgeschlagen"}');
|
||||
setState(() => _ladt = false);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
backgroundColor: MeloTheme.schwarz,
|
||||
body: SafeArea(
|
||||
child: Center(
|
||||
child: SingleChildScrollView(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 28, vertical: 24),
|
||||
child: FadeTransition(
|
||||
opacity: _fadeAnim,
|
||||
child: _zeigeRegistrierung ? _buildRegister() : _buildLogin(),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildLogin() {
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// ─── Logo ───
|
||||
_logoBereich(),
|
||||
const SizedBox(height: 36),
|
||||
|
||||
// ─── Login-Karte ───
|
||||
Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(24),
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(color: MeloTheme.dunkel2),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: MeloTheme.rot.withValues(alpha: 0.15),
|
||||
blurRadius: 30,
|
||||
offset: const Offset(0, 8),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Text(
|
||||
'Anmelden',
|
||||
style: TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
const Text(
|
||||
'Mit deinem Baka-Account',
|
||||
style: TextStyle(color: MeloTheme.textSekundaer, fontSize: 13),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// Benutzername
|
||||
_eingabeFeld(
|
||||
controller: _userCtrl,
|
||||
label: 'Benutzername',
|
||||
icon: Icons.person_outline,
|
||||
onSubmitted: (_) => _login(),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// Passwort
|
||||
_eingabeFeld(
|
||||
controller: _passCtrl,
|
||||
label: 'Passwort',
|
||||
icon: Icons.lock_outline,
|
||||
istPasswort: true,
|
||||
passSichtbar: _passSichtbar,
|
||||
onPasswortToggle: () => setState(() => _passSichtbar = !_passSichtbar),
|
||||
onSubmitted: (_) => _login(),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// Login Button
|
||||
SizedBox(
|
||||
width: double.infinity,
|
||||
height: 50,
|
||||
child: ElevatedButton(
|
||||
onPressed: _ladt ? null : _login,
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: MeloTheme.rot,
|
||||
disabledBackgroundColor: MeloTheme.dunkel2,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
),
|
||||
elevation: 0,
|
||||
),
|
||||
child: _ladt
|
||||
? const SizedBox(
|
||||
width: 22,
|
||||
height: 22,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2.5,
|
||||
color: Colors.white,
|
||||
),
|
||||
)
|
||||
: const Text(
|
||||
'Anmelden',
|
||||
style: TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// Status
|
||||
if (_status != null) ...[
|
||||
const SizedBox(height: 16),
|
||||
_statusWidget(),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
// ─── Navidrome (optional) ───
|
||||
_navidromeBereich(),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
// ─── Registrieren Link ───
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
const Text(
|
||||
'Noch keinen Account? ',
|
||||
style: TextStyle(color: MeloTheme.textSekundaer, fontSize: 13),
|
||||
),
|
||||
GestureDetector(
|
||||
onTap: () => setState(() => _zeigeRegistrierung = true),
|
||||
child: const Text(
|
||||
'Registrieren',
|
||||
style: TextStyle(
|
||||
color: MeloTheme.rot,
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
// ─── Offline-Modus ───
|
||||
const SizedBox(height: 16),
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
Navigator.of(context).pushReplacement(
|
||||
MaterialPageRoute(builder: (_) => const MeloHome()),
|
||||
);
|
||||
},
|
||||
child: const Text(
|
||||
'Ohne Login fortfahren',
|
||||
style: TextStyle(color: MeloTheme.textSekundaer, fontSize: 12),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildRegister() {
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
_logoBereich(klein: true),
|
||||
const SizedBox(height: 28),
|
||||
|
||||
Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(24),
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(color: MeloTheme.dunkel2),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Text(
|
||||
'Registrieren',
|
||||
style: TextStyle(color: Colors.white, fontSize: 20, fontWeight: FontWeight.w700),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
_eingabeFeld(
|
||||
controller: _regUserCtrl,
|
||||
label: 'Benutzername',
|
||||
icon: Icons.person_outline,
|
||||
),
|
||||
const SizedBox(height: 14),
|
||||
_eingabeFeld(
|
||||
controller: _regEmailCtrl,
|
||||
label: 'E-Mail (optional)',
|
||||
icon: Icons.email_outlined,
|
||||
keyboardType: TextInputType.emailAddress,
|
||||
),
|
||||
const SizedBox(height: 14),
|
||||
_eingabeFeld(
|
||||
controller: _regPassCtrl,
|
||||
label: 'Passwort',
|
||||
icon: Icons.lock_outline,
|
||||
istPasswort: true,
|
||||
passSichtbar: _regPassSichtbar,
|
||||
onPasswortToggle: () => setState(() => _regPassSichtbar = !_regPassSichtbar),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
|
||||
SizedBox(
|
||||
width: double.infinity,
|
||||
height: 50,
|
||||
child: ElevatedButton(
|
||||
onPressed: _ladt ? null : _registrieren,
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: MeloTheme.rot,
|
||||
disabledBackgroundColor: MeloTheme.dunkel2,
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14)),
|
||||
elevation: 0,
|
||||
),
|
||||
child: _ladt
|
||||
? const SizedBox(
|
||||
width: 22, height: 22,
|
||||
child: CircularProgressIndicator(strokeWidth: 2.5, color: Colors.white),
|
||||
)
|
||||
: const Text('Registrieren',
|
||||
style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w600)),
|
||||
),
|
||||
),
|
||||
|
||||
if (_status != null) ...[
|
||||
const SizedBox(height: 16),
|
||||
_statusWidget(),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
setState(() {
|
||||
_zeigeRegistrierung = false;
|
||||
_status = null;
|
||||
});
|
||||
},
|
||||
child: const Text(
|
||||
'← Zurück zum Login',
|
||||
style: TextStyle(color: MeloTheme.rot, fontSize: 13, fontWeight: FontWeight.w600),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
Widget _logoBereich({bool klein = false}) {
|
||||
return Column(
|
||||
children: [
|
||||
// Icon
|
||||
Container(
|
||||
width: klein ? 64 : 80,
|
||||
height: klein ? 64 : 80,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
gradient: const LinearGradient(
|
||||
colors: [Color(0xFFCC0000), Color(0xFF660000)],
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: MeloTheme.rot.withValues(alpha: 0.4),
|
||||
blurRadius: 24,
|
||||
offset: const Offset(0, 6),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: const Center(
|
||||
child: Text(
|
||||
'♪',
|
||||
style: TextStyle(fontSize: 36, color: Colors.white, fontWeight: FontWeight.w300),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
const Text(
|
||||
'MELO',
|
||||
style: TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 32,
|
||||
fontWeight: FontWeight.w800,
|
||||
letterSpacing: 6,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
'Musik. Für immer.',
|
||||
style: TextStyle(
|
||||
color: MeloTheme.rot.withValues(alpha: 0.8),
|
||||
fontSize: 13,
|
||||
letterSpacing: 2,
|
||||
fontWeight: FontWeight.w400,
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
Widget _navidromeBereich() {
|
||||
return Column(
|
||||
children: [
|
||||
// Toggle
|
||||
GestureDetector(
|
||||
onTap: () => setState(() => _zeigeNavidrome = !_zeigeNavidrome),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(color: MeloTheme.dunkel2),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(
|
||||
_zeigeNavidrome ? Icons.dns : Icons.dns_outlined,
|
||||
color: _zeigeNavidrome ? MeloTheme.rot : MeloTheme.textSekundaer,
|
||||
size: 18,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Text(
|
||||
'🌐 Navidrome Server',
|
||||
style: TextStyle(
|
||||
color: _zeigeNavidrome ? Colors.white : MeloTheme.textSekundaer,
|
||||
fontSize: 13,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
Icon(
|
||||
_zeigeNavidrome ? Icons.keyboard_arrow_up : Icons.keyboard_arrow_down,
|
||||
color: MeloTheme.textSekundaer,
|
||||
size: 16,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// Erweiterte Navidrome-Felder
|
||||
if (_zeigeNavidrome) ...[
|
||||
const SizedBox(height: 12),
|
||||
Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
border: Border.all(color: MeloTheme.dunkel2),
|
||||
),
|
||||
child: Column(
|
||||
children: [
|
||||
_eingabeFeld(
|
||||
controller: _urlCtrl,
|
||||
label: 'Server-URL',
|
||||
icon: Icons.link,
|
||||
hint: 'https://musik.baka-net.de',
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
_eingabeFeld(
|
||||
controller: _navUserCtrl,
|
||||
label: 'Navidrome Benutzer',
|
||||
icon: Icons.person_outline,
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
_eingabeFeld(
|
||||
controller: _navPassCtrl,
|
||||
label: 'Navidrome Passwort',
|
||||
icon: Icons.lock_outline,
|
||||
istPasswort: true,
|
||||
passSichtbar: _navPassSichtbar,
|
||||
onPasswortToggle: () => setState(() => _navPassSichtbar = !_navPassSichtbar),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
Widget _statusWidget() {
|
||||
return Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
|
||||
decoration: BoxDecoration(
|
||||
color: _statusOk
|
||||
? const Color(0xFF0D3B1E)
|
||||
: const Color(0xFF3B0D0D),
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
border: Border.all(
|
||||
color: _statusOk ? const Color(0xFF2E7D32) : const Color(0xFF7D2E2E),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
_statusOk ? Icons.check_circle : Icons.error_outline,
|
||||
size: 16,
|
||||
color: _statusOk ? const Color(0xFF4CAF50) : const Color(0xFFEF5350),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
_status!,
|
||||
style: TextStyle(
|
||||
color: _statusOk ? const Color(0xFFA5D6A7) : const Color(0xFFEF9A9A),
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _eingabeFeld({
|
||||
required TextEditingController controller,
|
||||
required String label,
|
||||
required IconData icon,
|
||||
bool istPasswort = false,
|
||||
bool passSichtbar = false,
|
||||
VoidCallback? onPasswortToggle,
|
||||
String? hint,
|
||||
TextInputType keyboardType = TextInputType.text,
|
||||
ValueChanged<String>? onSubmitted,
|
||||
}) {
|
||||
return TextField(
|
||||
controller: controller,
|
||||
obscureText: istPasswort && !passSichtbar,
|
||||
keyboardType: keyboardType,
|
||||
style: const TextStyle(color: Colors.white, fontSize: 15),
|
||||
onSubmitted: onSubmitted,
|
||||
decoration: InputDecoration(
|
||||
labelText: label,
|
||||
hintText: hint,
|
||||
hintStyle: const TextStyle(color: Color(0xFF444444), fontSize: 13),
|
||||
labelStyle: const TextStyle(color: MeloTheme.textSekundaer, fontSize: 13),
|
||||
prefixIcon: Icon(icon, color: MeloTheme.textSekundaer, size: 20),
|
||||
filled: true,
|
||||
fillColor: MeloTheme.dunkel2,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: const BorderSide(color: MeloTheme.rot, width: 1.5),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: const BorderSide(color: MeloTheme.dunkel2),
|
||||
),
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
|
||||
suffixIcon: istPasswort
|
||||
? IconButton(
|
||||
icon: Icon(
|
||||
passSichtbar ? Icons.visibility : Icons.visibility_off,
|
||||
size: 18,
|
||||
color: MeloTheme.textSekundaer,
|
||||
),
|
||||
onPressed: onPasswortToggle,
|
||||
)
|
||||
: null,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,231 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import '../config/app_config.dart';
|
||||
import '../utils/farb_theme.dart';
|
||||
import 'cloud_screen.dart';
|
||||
import '../services/cloud_service.dart';
|
||||
|
||||
/// Vollwertiger Einstellungen-Screen – kein Popup mehr
|
||||
class SettingsScreen extends StatefulWidget {
|
||||
const SettingsScreen({super.key});
|
||||
|
||||
@override
|
||||
State<SettingsScreen> createState() => _SettingsScreenState();
|
||||
}
|
||||
|
||||
class _SettingsScreenState extends State<SettingsScreen> {
|
||||
bool _diagnose = AppConfig.sendeDiagnosedaten;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
backgroundColor: MeloTheme.schwarz,
|
||||
appBar: AppBar(
|
||||
backgroundColor: MeloTheme.dunkel1,
|
||||
leading: IconButton(
|
||||
icon: const Icon(Icons.arrow_back, color: Colors.white, size: 22),
|
||||
onPressed: () => Navigator.pop(context),
|
||||
),
|
||||
title: const Row(
|
||||
children: [
|
||||
Icon(Icons.settings, color: MeloTheme.rot, size: 20),
|
||||
SizedBox(width: 10),
|
||||
Text(
|
||||
'Einstellungen',
|
||||
style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
body: ListView(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
children: [
|
||||
// ─── Sektion: Verbindung ───
|
||||
_sektionHeader('Verbindung'),
|
||||
_einstellungsKachel(
|
||||
icon: Icons.cloud_outlined,
|
||||
titel: 'Cloud Sync',
|
||||
untertitel: 'Auto-Sync, Upload & Download',
|
||||
onTap: () {
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (_) => CloudScreen(cloud: CloudService()),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
_einstellungsKachel(
|
||||
icon: Icons.dns_outlined,
|
||||
titel: 'Server verbinden',
|
||||
untertitel: 'Navidrome Musik-Server',
|
||||
onTap: () {
|
||||
// Signal zum Öffnen des Server-Browsers
|
||||
Navigator.pop(context, 'server');
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
|
||||
// ─── Sektion: Daten ───
|
||||
_sektionHeader('Daten & Privatsphäre'),
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
border: Border.all(color: MeloTheme.dunkel2),
|
||||
),
|
||||
child: SwitchListTile(
|
||||
title: const Text(
|
||||
'Diagnosedaten senden',
|
||||
style: TextStyle(color: Colors.white, fontSize: 14),
|
||||
),
|
||||
subtitle: const Text(
|
||||
'Absturz-Logs & anonyme Nutzungsdaten',
|
||||
style: TextStyle(color: MeloTheme.textSekundaer, fontSize: 12),
|
||||
),
|
||||
value: _diagnose,
|
||||
activeColor: MeloTheme.rot,
|
||||
onChanged: (v) {
|
||||
setState(() => _diagnose = v);
|
||||
AppConfig.sendeDiagnosedaten = v;
|
||||
},
|
||||
secondary: const Icon(Icons.bug_report_outlined, color: MeloTheme.rot, size: 22),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
|
||||
// ─── Sektion: Info ───
|
||||
_sektionHeader('Info'),
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
border: Border.all(color: MeloTheme.dunkel2),
|
||||
),
|
||||
child: Column(
|
||||
children: [
|
||||
_infoZeile('Version', '2.31'),
|
||||
const Divider(color: MeloTheme.dunkel2, height: 1),
|
||||
_infoZeile('Theme', 'Schwarz + Rot'),
|
||||
const Divider(color: MeloTheme.dunkel2, height: 1),
|
||||
_infoZeile('Auth', AppConfig.authUrl),
|
||||
const Divider(color: MeloTheme.dunkel2, height: 1),
|
||||
_infoZeile('Cloud', AppConfig.cloudUrl),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// ─── Abmelden ───
|
||||
SizedBox(
|
||||
width: double.infinity,
|
||||
height: 48,
|
||||
child: OutlinedButton.icon(
|
||||
onPressed: () {
|
||||
Navigator.pop(context, 'logout');
|
||||
},
|
||||
icon: const Icon(Icons.logout, size: 18),
|
||||
label: const Text('Abmelden', style: TextStyle(fontSize: 14)),
|
||||
style: OutlinedButton.styleFrom(
|
||||
foregroundColor: MeloTheme.rot,
|
||||
side: const BorderSide(color: MeloTheme.rot),
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14)),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _sektionHeader(String titel) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.fromLTRB(4, 16, 4, 8),
|
||||
child: Text(
|
||||
titel,
|
||||
style: const TextStyle(
|
||||
color: MeloTheme.textSekundaer,
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: 1.2,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _einstellungsKachel({
|
||||
required IconData icon,
|
||||
required String titel,
|
||||
required String untertitel,
|
||||
required VoidCallback onTap,
|
||||
}) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(bottom: 8),
|
||||
child: Material(
|
||||
color: MeloTheme.dunkel1,
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
child: InkWell(
|
||||
onTap: onTap,
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
border: Border.all(color: MeloTheme.dunkel2),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 40,
|
||||
height: 40,
|
||||
decoration: BoxDecoration(
|
||||
color: MeloTheme.dunkel2,
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
child: Icon(icon, color: MeloTheme.rot, size: 20),
|
||||
),
|
||||
const SizedBox(width: 14),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
titel,
|
||||
style: const TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w500),
|
||||
),
|
||||
const SizedBox(height: 2),
|
||||
Text(
|
||||
untertitel,
|
||||
style: const TextStyle(color: MeloTheme.textSekundaer, fontSize: 12),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const Icon(Icons.chevron_right, color: MeloTheme.textSekundaer, size: 20),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _infoZeile(String label, String wert) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
label,
|
||||
style: const TextStyle(color: MeloTheme.textSekundaer, fontSize: 13),
|
||||
),
|
||||
const Spacer(),
|
||||
Text(
|
||||
wert,
|
||||
style: const TextStyle(color: Colors.white70, fontSize: 13),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user