v2.55 — Echtzeit-Cloud-Sync (SSE) mit 3 Modi: Echtzeit/Manuell/Zeit
This commit is contained in:
Dustin
@@ -7,6 +7,7 @@ import '../services/auth_service.dart';
|
||||
import '../services/cloud_service.dart';
|
||||
import '../services/player_service.dart';
|
||||
import '../services/sync_service.dart';
|
||||
import '../services/realtime_sync_service.dart';
|
||||
import '../database/db_helper.dart';
|
||||
import 'cloud_screen.dart';
|
||||
import 'recap_screen.dart';
|
||||
@@ -25,12 +26,22 @@ class SettingsScreen extends StatefulWidget {
|
||||
|
||||
class _SettingsScreenState extends State<SettingsScreen> {
|
||||
// ─── Einstellungen (aus SharedPreferences geladen) ───
|
||||
int _syncIntervall = 0; // 0 = Aus, sonst Stunden
|
||||
String _syncModus = 'realtime'; // 'realtime' | 'manual' | 'interval'
|
||||
int _cloudIntervallStunden = 48; // 48/72/120/168/336
|
||||
int _sleepDefaultMin = 0; // 0 = Aus
|
||||
double _geschwindigkeit = 1.0;
|
||||
Color _akzent = MeloTheme.akzent;
|
||||
Map<String, int> _speicherInfo = const {'anzahl': 0, 'bytes': 0};
|
||||
|
||||
/// Verfügbare Zeit-Intervalle für Modus 3 (in Stunden).
|
||||
static const _intervallOptionen = {
|
||||
48: '2 Tage',
|
||||
72: '3 Tage',
|
||||
120: '5 Tage',
|
||||
168: '1 Woche',
|
||||
336: '2 Wochen',
|
||||
};
|
||||
|
||||
static const _akzentFarben = [
|
||||
Color(0xFFCC0000), // Rot (Standard)
|
||||
Color(0xFF00B8A9), // Türkis
|
||||
@@ -53,9 +64,27 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
final speed = p.getDouble('playback_speed') ?? 1.0;
|
||||
final akzentHex =
|
||||
p.getString(UserEffekt.akzentKey(AuthService().benutzer));
|
||||
// Sync-Modus laden (mit Migration von altem cloud_interval)
|
||||
final modus = p.getString('sync_modus') ?? 'realtime';
|
||||
int intervallStunden = p.getInt('cloud_interval_stunden') ?? 0;
|
||||
if (intervallStunden <= 0) {
|
||||
// Migration: alter cloud_interval (1/3/6/12h) → 48h default
|
||||
final alt = p.getInt('cloud_interval') ?? 0;
|
||||
if (alt == 1 || alt == 3 || alt == 6 || alt == 12) {
|
||||
intervallStunden = 48;
|
||||
await p.setInt('cloud_interval_stunden', 48);
|
||||
} else {
|
||||
intervallStunden = 48;
|
||||
}
|
||||
}
|
||||
// Prüfe, ob der Modus gültig ist
|
||||
if (!['realtime', 'manual', 'interval'].contains(modus)) {
|
||||
await p.setString('sync_modus', 'realtime');
|
||||
}
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_syncIntervall = p.getInt('cloud_interval') ?? 0;
|
||||
_syncModus = modus;
|
||||
_cloudIntervallStunden = intervallStunden;
|
||||
_sleepDefaultMin = p.getInt('sleep_timer_default_min') ?? 0;
|
||||
_geschwindigkeit = speed;
|
||||
_akzent = UserEffekt.farbeAusHex(akzentHex) ?? MeloTheme.akzent;
|
||||
@@ -72,12 +101,41 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
|
||||
// ─── Setter (persistieren + anwenden) ───
|
||||
|
||||
Future<void> _intervallSetzen(int stunden) async {
|
||||
setState(() => _syncIntervall = stunden);
|
||||
/// Setzt den Sync-Modus und persistiert ihn.
|
||||
/// Startet/stoppt den Realtime-Service bzw. den Timer entsprechend.
|
||||
Future<void> _syncModusSetzen(String modus) async {
|
||||
setState(() => _syncModus = modus);
|
||||
final p = await SharedPreferences.getInstance();
|
||||
await p.setString('sync_modus', modus);
|
||||
|
||||
// Realtime-Service entsprechend starten/stoppen
|
||||
switch (modus) {
|
||||
case 'realtime':
|
||||
// SSE sofort starten
|
||||
final rs = RealtimeSyncService();
|
||||
await rs.starteWennAktiviert();
|
||||
break;
|
||||
case 'manual':
|
||||
// Kein Auto-Sync — Timer stoppen
|
||||
await p.setInt('cloud_interval', 0); // alten Timer deaktivieren
|
||||
await SyncService.starteAutoSyncTimer();
|
||||
break;
|
||||
case 'interval':
|
||||
// Intervall-Timer mit cloud_interval_stunden starten
|
||||
await p.setInt('cloud_interval', _cloudIntervallStunden);
|
||||
await SyncService.starteAutoSyncTimer();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/// Setzt das Cloud-Intervall (nur für Modus 3: interval).
|
||||
Future<void> _intervallSetzen(int stunden) async {
|
||||
setState(() => _cloudIntervallStunden = stunden);
|
||||
final p = await SharedPreferences.getInstance();
|
||||
await p.setInt('cloud_interval_stunden', stunden);
|
||||
// Timer neu starten (der cloud_interval-Wert wird aktualisiert)
|
||||
await p.setInt('cloud_interval', stunden);
|
||||
await p.setBool('cloud_auto', stunden > 0); // Kompatibilität (altes Flag)
|
||||
await SyncService.starteAutoSyncTimer(); // app-weiter Timer neu starten
|
||||
await SyncService.starteAutoSyncTimer();
|
||||
}
|
||||
|
||||
Future<void> _sleepDefaultSetzen(int min) async {
|
||||
@@ -165,20 +223,51 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
|
||||
// ─── Sektion: Wiedergabe & Sync ───
|
||||
_sektionHeader('Wiedergabe & Sync'),
|
||||
// ─── Sektion: Cloud-Sync ───
|
||||
_sektionHeader('Cloud-Sync'),
|
||||
_einstellungsGruppe([
|
||||
_gruppenZeile(
|
||||
label: 'Auto-Sync-Intervall',
|
||||
wert: _syncIntervall == 0 ? 'Aus' : '${_syncIntervall}h',
|
||||
inhalt: Row(children: [
|
||||
_wahlChip('Aus', _syncIntervall == 0, () => _intervallSetzen(0)),
|
||||
_wahlChip('1h', _syncIntervall == 1, () => _intervallSetzen(1)),
|
||||
_wahlChip('3h', _syncIntervall == 3, () => _intervallSetzen(3)),
|
||||
_wahlChip('6h', _syncIntervall == 6, () => _intervallSetzen(6)),
|
||||
_wahlChip('12h', _syncIntervall == 12, () => _intervallSetzen(12)),
|
||||
]),
|
||||
label: 'Sync-Modus',
|
||||
wert: _syncModusText,
|
||||
inhalt: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
_modusRadioTile('⚡ Echtzeit', 'realtime',
|
||||
'Änderungen sofort synchronisieren (Push)'),
|
||||
_modusRadioTile('👆 Manuell', 'manual',
|
||||
'Nur auf Knopfdruck synchronisieren'),
|
||||
_modusRadioTile('🗓️ Zeit-Intervall', 'interval',
|
||||
'Automatisch nach Zeitplan synchronisieren'),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (_syncModus == 'interval') ...[
|
||||
const Divider(color: MeloTheme.dunkel2, height: 1),
|
||||
_gruppenZeile(
|
||||
label: 'Intervall',
|
||||
wert: _intervallOptionen[_cloudIntervallStunden] ?? '${_cloudIntervallStunden}h',
|
||||
inhalt: DropdownButtonFormField<int>(
|
||||
initialValue: _intervallOptionen.containsKey(_cloudIntervallStunden)
|
||||
? _cloudIntervallStunden
|
||||
: 48,
|
||||
dropdownColor: MeloTheme.dunkel1,
|
||||
style: const TextStyle(color: Colors.white, fontSize: 13),
|
||||
decoration: const InputDecoration(
|
||||
contentPadding: EdgeInsets.symmetric(horizontal: 12, vertical: 8),
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
items: _intervallOptionen.entries.map((e) {
|
||||
return DropdownMenuItem<int>(
|
||||
value: e.key,
|
||||
child: Text(e.value),
|
||||
);
|
||||
}).toList(),
|
||||
onChanged: (v) {
|
||||
if (v != null) _intervallSetzen(v);
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
const Divider(color: MeloTheme.dunkel2, height: 1),
|
||||
_gruppenZeile(
|
||||
label: 'Sleep-Timer-Standard',
|
||||
@@ -201,7 +290,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
max: 2.0,
|
||||
divisions: 6,
|
||||
activeColor: MeloTheme.akzent,
|
||||
// Live-Vorschau beim Ziehen, persistieren erst am Ende
|
||||
onChanged: (v) => setState(() => _geschwindigkeit = v),
|
||||
onChangeEnd: _geschwindigkeitSetzen,
|
||||
),
|
||||
@@ -556,4 +644,73 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Anzeigetext für den aktuellen Sync-Modus.
|
||||
String get _syncModusText {
|
||||
switch (_syncModus) {
|
||||
case 'realtime':
|
||||
return '⚡ Echtzeit';
|
||||
case 'manual':
|
||||
return '👆 Manuell';
|
||||
case 'interval':
|
||||
return '🗓️ Zeit';
|
||||
default:
|
||||
return '⚡ Echtzeit';
|
||||
}
|
||||
}
|
||||
|
||||
/// Radio-ähnliches Kachel-Widget für Sync-Modus-Auswahl.
|
||||
Widget _modusRadioTile(String titel, String wert, String beschreibung) {
|
||||
final ausgewaehlt = _syncModus == wert;
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(bottom: 4),
|
||||
child: InkWell(
|
||||
onTap: () => _syncModusSetzen(wert),
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
|
||||
decoration: BoxDecoration(
|
||||
color: ausgewaehlt ? MeloTheme.akzent.withAlpha(25) : Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
border: Border.all(
|
||||
color: ausgewaehlt ? MeloTheme.akzent : MeloTheme.dunkel2,
|
||||
width: ausgewaehlt ? 1.5 : 1,
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
ausgewaehlt ? Icons.radio_button_checked : Icons.radio_button_unchecked,
|
||||
color: ausgewaehlt ? MeloTheme.akzent : MeloTheme.textSekundaer,
|
||||
size: 18,
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
titel,
|
||||
style: TextStyle(
|
||||
color: ausgewaehlt ? Colors.white : MeloTheme.textSekundaer,
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
beschreibung,
|
||||
style: TextStyle(
|
||||
color: ausgewaehlt ? Colors.white70 : MeloTheme.textSekundaer,
|
||||
fontSize: 11,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user