mirror of
https://github.com/johrpan/musicus_mobile.git
synced 2025-10-26 10:47:25 +01:00
Move reusable code from mobile to common
This will be useful for a future desktop application.
This commit is contained in:
Elias Projahn
parent
6e1255f26e
commit
711b19c998
40 changed files with 813 additions and 581 deletions
|
|
@ -1,10 +1,8 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:musicus_common/musicus_common.dart';
|
||||
import 'package:musicus_database/musicus_database.dart';
|
||||
|
||||
import '../backend.dart';
|
||||
import '../editors/tracks.dart';
|
||||
import '../icons.dart';
|
||||
import '../widgets/lists.dart';
|
||||
|
||||
import 'person.dart';
|
||||
import 'settings.dart';
|
||||
|
|
@ -19,7 +17,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final backend = Backend.of(context);
|
||||
final backend = MusicusBackend.of(context);
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:musicus_common/musicus_common.dart';
|
||||
import 'package:musicus_database/musicus_database.dart';
|
||||
|
||||
import '../backend.dart';
|
||||
import '../editors/person.dart';
|
||||
import '../widgets/lists.dart';
|
||||
|
||||
import 'work.dart';
|
||||
|
||||
class PersonScreen extends StatefulWidget {
|
||||
|
|
@ -23,7 +20,7 @@ class _PersonScreenState extends State<PersonScreen> {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final backend = Backend.of(context);
|
||||
final backend = MusicusBackend.of(context);
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:musicus_common/musicus_common.dart';
|
||||
import 'package:musicus_database/musicus_database.dart';
|
||||
|
||||
import '../backend.dart';
|
||||
import '../music_library.dart';
|
||||
import '../widgets/play_pause_button.dart';
|
||||
import '../widgets/recording_tile.dart';
|
||||
|
||||
class ProgramScreen extends StatefulWidget {
|
||||
@override
|
||||
|
|
@ -14,7 +12,7 @@ class ProgramScreen extends StatefulWidget {
|
|||
}
|
||||
|
||||
class _ProgramScreenState extends State<ProgramScreen> {
|
||||
BackendState backend;
|
||||
MusicusBackendState backend;
|
||||
|
||||
StreamSubscription<bool> playerActiveSubscription;
|
||||
|
||||
|
|
@ -29,14 +27,14 @@ class _ProgramScreenState extends State<ProgramScreen> {
|
|||
void didChangeDependencies() {
|
||||
super.didChangeDependencies();
|
||||
|
||||
backend = Backend.of(context);
|
||||
backend = MusicusBackend.of(context);
|
||||
|
||||
if (playerActiveSubscription != null) {
|
||||
playerActiveSubscription.cancel();
|
||||
}
|
||||
|
||||
// Close the program screen, if the player is no longer active.
|
||||
playerActiveSubscription = backend.player.active.listen((active) {
|
||||
playerActiveSubscription = backend.playback.active.listen((active) {
|
||||
if (!active) {
|
||||
Navigator.pop(context);
|
||||
}
|
||||
|
|
@ -46,7 +44,7 @@ class _ProgramScreenState extends State<ProgramScreen> {
|
|||
playlistSubscription.cancel();
|
||||
}
|
||||
|
||||
playlistSubscription = backend.player.playlist.listen((playlist) {
|
||||
playlistSubscription = backend.playback.playlist.listen((playlist) {
|
||||
updateProgram(playlist);
|
||||
});
|
||||
|
||||
|
|
@ -54,7 +52,7 @@ class _ProgramScreenState extends State<ProgramScreen> {
|
|||
positionSubscription.cancel();
|
||||
}
|
||||
|
||||
positionSubscription = backend.player.normalizedPosition.listen((pos) {
|
||||
positionSubscription = backend.playback.normalizedPosition.listen((pos) {
|
||||
if (!seeking) {
|
||||
setState(() {
|
||||
position = pos;
|
||||
|
|
@ -154,7 +152,7 @@ class _ProgramScreenState extends State<ProgramScreen> {
|
|||
title: Text('Program'),
|
||||
),
|
||||
body: StreamBuilder<int>(
|
||||
stream: backend.player.currentIndex,
|
||||
stream: backend.playback.currentIndex,
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasData) {
|
||||
return ListView.builder(
|
||||
|
|
@ -181,7 +179,7 @@ class _ProgramScreenState extends State<ProgramScreen> {
|
|||
],
|
||||
),
|
||||
onTap: () {
|
||||
backend.player.skipTo(index);
|
||||
backend.playback.skipTo(index);
|
||||
},
|
||||
onLongPress: () {
|
||||
showDialog(
|
||||
|
|
@ -192,7 +190,7 @@ class _ProgramScreenState extends State<ProgramScreen> {
|
|||
ListTile(
|
||||
title: Text('Remove from playlist'),
|
||||
onTap: () {
|
||||
backend.player.removeTrack(index);
|
||||
backend.playback.removeTrack(index);
|
||||
Navigator.pop(context);
|
||||
},
|
||||
),
|
||||
|
|
@ -220,7 +218,7 @@ class _ProgramScreenState extends State<ProgramScreen> {
|
|||
},
|
||||
onChangeEnd: (pos) {
|
||||
seeking = false;
|
||||
backend.player.seekTo(pos);
|
||||
backend.playback.seekTo(pos);
|
||||
},
|
||||
onChanged: (pos) {
|
||||
setState(() {
|
||||
|
|
@ -233,7 +231,7 @@ class _ProgramScreenState extends State<ProgramScreen> {
|
|||
Padding(
|
||||
padding: const EdgeInsets.only(left: 24.0),
|
||||
child: StreamBuilder<Duration>(
|
||||
stream: backend.player.position,
|
||||
stream: backend.playback.position,
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasData) {
|
||||
return DurationText(snapshot.data);
|
||||
|
|
@ -247,21 +245,21 @@ class _ProgramScreenState extends State<ProgramScreen> {
|
|||
IconButton(
|
||||
icon: const Icon(Icons.skip_previous),
|
||||
onPressed: () {
|
||||
backend.player.skipToPrevious();
|
||||
backend.playback.skipToPrevious();
|
||||
},
|
||||
),
|
||||
PlayPauseButton(),
|
||||
IconButton(
|
||||
icon: const Icon(Icons.skip_next),
|
||||
onPressed: () {
|
||||
backend.player.skipToNext();
|
||||
backend.playback.skipToNext();
|
||||
},
|
||||
),
|
||||
Spacer(),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(right: 20.0),
|
||||
child: StreamBuilder<Duration>(
|
||||
stream: backend.player.duration,
|
||||
stream: backend.playback.duration,
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasData) {
|
||||
return DurationText(snapshot.data);
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../backend.dart';
|
||||
import '../settings.dart';
|
||||
import 'package:musicus_common/musicus_common.dart';
|
||||
|
||||
class ServerSettingsScreen extends StatefulWidget {
|
||||
@override
|
||||
|
|
@ -13,16 +11,16 @@ class ServerSettingsScreen extends StatefulWidget {
|
|||
class _ServerSettingsScreenState extends State<ServerSettingsScreen> {
|
||||
final hostController = TextEditingController();
|
||||
final portController = TextEditingController();
|
||||
final basePathController = TextEditingController();
|
||||
final apiPathController = TextEditingController();
|
||||
|
||||
BackendState backend;
|
||||
StreamSubscription<ServerSettings> serverSubscription;
|
||||
MusicusBackendState backend;
|
||||
StreamSubscription<MusicusServerSettings> serverSubscription;
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
super.didChangeDependencies();
|
||||
|
||||
backend = Backend.of(context);
|
||||
backend = MusicusBackend.of(context);
|
||||
|
||||
if (serverSubscription != null) {
|
||||
serverSubscription.cancel();
|
||||
|
|
@ -34,10 +32,10 @@ class _ServerSettingsScreenState extends State<ServerSettingsScreen> {
|
|||
});
|
||||
}
|
||||
|
||||
void _settingsChanged(ServerSettings settings) {
|
||||
void _settingsChanged(MusicusServerSettings settings) {
|
||||
hostController.text = settings.host;
|
||||
portController.text = settings.port.toString();
|
||||
basePathController.text = settings.basePath;
|
||||
apiPathController.text = settings.apiPath;
|
||||
}
|
||||
|
||||
@override
|
||||
|
|
@ -50,15 +48,15 @@ class _ServerSettingsScreenState extends State<ServerSettingsScreen> {
|
|||
icon: const Icon(Icons.restore),
|
||||
tooltip: 'Reset to default',
|
||||
onPressed: () {
|
||||
backend.settings.resetServerSettings();
|
||||
backend.settings.resetServer();
|
||||
},
|
||||
),
|
||||
FlatButton(
|
||||
onPressed: () async {
|
||||
await backend.settings.setServerSettings(ServerSettings(
|
||||
await backend.settings.setServer(MusicusServerSettings(
|
||||
host: hostController.text,
|
||||
port: int.parse(portController.text),
|
||||
basePath: basePathController.text,
|
||||
apiPath: apiPathController.text,
|
||||
));
|
||||
|
||||
Navigator.pop(context);
|
||||
|
|
@ -91,7 +89,7 @@ class _ServerSettingsScreenState extends State<ServerSettingsScreen> {
|
|||
Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: TextField(
|
||||
controller: basePathController,
|
||||
controller: apiPathController,
|
||||
decoration: InputDecoration(
|
||||
labelText: 'API path',
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../backend.dart';
|
||||
import '../settings.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:musicus_common/musicus_common.dart';
|
||||
|
||||
import 'server_settings.dart';
|
||||
|
||||
class SettingsScreen extends StatelessWidget {
|
||||
static const _platform = MethodChannel('de.johrpan.musicus/platform');
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final backend = Backend.of(context);
|
||||
final backend = MusicusBackend.of(context);
|
||||
final settings = backend.settings;
|
||||
|
||||
return Scaffold(
|
||||
|
|
@ -18,18 +19,23 @@ class SettingsScreen extends StatelessWidget {
|
|||
body: ListView(
|
||||
children: <Widget>[
|
||||
StreamBuilder<String>(
|
||||
stream: settings.musicLibraryUri,
|
||||
stream: settings.musicLibraryPath,
|
||||
builder: (context, snapshot) {
|
||||
return ListTile(
|
||||
title: Text('Music library path'),
|
||||
subtitle: Text(snapshot.data ?? 'Choose folder'),
|
||||
isThreeLine: snapshot.hasData,
|
||||
onTap: () {
|
||||
settings.chooseMusicLibraryUri();
|
||||
onTap: () async {
|
||||
final uri =
|
||||
await _platform.invokeMethod<String>('openTree');
|
||||
|
||||
if (uri != null) {
|
||||
settings.setMusicLibraryPath(uri);
|
||||
}
|
||||
},
|
||||
);
|
||||
}),
|
||||
StreamBuilder<ServerSettings>(
|
||||
StreamBuilder<MusicusServerSettings>(
|
||||
stream: settings.server,
|
||||
builder: (context, snapshot) {
|
||||
final s = snapshot.data;
|
||||
|
|
@ -37,10 +43,10 @@ class SettingsScreen extends StatelessWidget {
|
|||
return ListTile(
|
||||
title: Text('Musicus server'),
|
||||
subtitle: Text(
|
||||
s != null ? '${s.host}:${s.port}${s.basePath}' : '...'),
|
||||
s != null ? '${s.host}:${s.port}${s.apiPath}' : '...'),
|
||||
trailing: const Icon(Icons.chevron_right),
|
||||
onTap: () async {
|
||||
final ServerSettings result = await Navigator.push(
|
||||
final MusicusServerSettings result = await Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (context) => ServerSettingsScreen(),
|
||||
|
|
@ -48,7 +54,7 @@ class SettingsScreen extends StatelessWidget {
|
|||
);
|
||||
|
||||
if (result != null) {
|
||||
settings.setServerSettings(result);
|
||||
settings.setServer(result);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:musicus_common/musicus_common.dart';
|
||||
import 'package:musicus_database/musicus_database.dart';
|
||||
|
||||
import '../backend.dart';
|
||||
import '../editors/work.dart';
|
||||
import '../widgets/texts.dart';
|
||||
import '../widgets/lists.dart';
|
||||
|
||||
class WorkScreen extends StatelessWidget {
|
||||
final WorkInfo workInfo;
|
||||
|
||||
|
|
@ -15,7 +11,7 @@ class WorkScreen extends StatelessWidget {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final backend = Backend.of(context);
|
||||
final backend = MusicusBackend.of(context);
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
|
|
@ -46,11 +42,11 @@ class WorkScreen extends StatelessWidget {
|
|||
performanceInfos: recordingInfo.performances,
|
||||
),
|
||||
onTap: () {
|
||||
final tracks = backend.ml.tracks[recordingInfo.recording.id];
|
||||
final tracks = backend.library.tracks[recordingInfo.recording.id];
|
||||
tracks.sort((t1, t2) => t1.track.index.compareTo(t2.track.index));
|
||||
|
||||
backend.player
|
||||
.addTracks(backend.ml.tracks[recordingInfo.recording.id]);
|
||||
backend.playback
|
||||
.addTracks(backend.library.tracks[recordingInfo.recording.id]);
|
||||
},
|
||||
),
|
||||
),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue