johrpan/musicus_mobile
1
0
Fork 0
mirror of https://github.com/johrpan/musicus_mobile.git synced 2025-10-26 10:47:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

mobile: Update to new client API

Browse source 
The settings screen was refactored too.
This commit is contained in:
Elias Projahn 2020-05-01 17:48:23 +02:00
parent 4f7a99d2a1
commit 820ff7eadb
11 changed files with 286 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mobile/lib/app.dart
View file

@ -58,7 +58,7 @@ class App extends StatelessWidget {
leading: const Icon(Icons.folder_open),
title: Text('Choose path'),
onTap: () {
backend.chooseMusicLibraryUri();
backend.settings.chooseMusicLibraryUri();
},
),
],

71
mobile/lib/backend.dart
View file

@ -1,7 +1,6 @@
import 'dart:io';
import 'dart:isolate';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:moor/isolate.dart';
import 'package:moor/moor.dart';
@ -10,11 +9,10 @@ import 'package:musicus_client/musicus_client.dart';
import 'package:musicus_database/musicus_database.dart';
import 'package:path/path.dart' as p;
import 'package:path_provider/path_provider.dart' as pp;
import 'package:rxdart/rxdart.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'music_library.dart';
import 'player.dart';
import 'settings.dart';
// The following code was taken from
// https://moor.simonbinder.eu/docs/advanced-features/isolates/ and just
@ -82,22 +80,15 @@ class Backend extends StatefulWidget {
}
class BackendState extends State<Backend> {
static const defaultUrl = 'https://musicus.johrpan.de/api';
static const _platform = MethodChannel('de.johrpan.musicus/platform');
final player = Player();
final settings = Settings();
BackendStatus status = BackendStatus.loading;
Database db;
final musicusServerUrl = BehaviorSubject<String>();
MusicusClient client;
String musicLibraryUri;
MusicLibrary ml;
MoorIsolate _moorIsolate;
SharedPreferences _shPref;
@override
void initState() {
@ -119,28 +110,26 @@ class BackendState extends State<Backend> {
player.setup();
db = Database.connect(dbConnection);
_shPref = await SharedPreferences.getInstance();
var url = _shPref.getString('musicusServerUrl');
await settings.load();
if (url == null) {
url = defaultUrl;
await _shPref.setString('musicusServerUrl', url);
}
musicusServerUrl.add(url);
client = MusicusClient(url);
_updateMusicLibrary(settings.musicLibraryUri.value);
settings.musicLibraryUri.listen((uri) {
_updateMusicLibrary(uri);
});
musicLibraryUri = _shPref.getString('musicLibraryUri');
_loadMusicLibrary();
_updateClient(settings.server.value);
settings.server.listen((serverSettings) {
_updateClient(serverSettings);
});
}
Future<void> _loadMusicLibrary() async {
if (musicLibraryUri == null) {
Future<void> _updateMusicLibrary(String uri) async {
if (uri == null) {
setState(() {
status = BackendStatus.setup;
});
} else {
ml = MusicLibrary(musicLibraryUri);
ml = MusicLibrary(uri);
await ml.load();
setState(() {
status = BackendStatus.ready;
@ -148,32 +137,12 @@ class BackendState extends State<Backend> {
}
}
Future<void> chooseMusicLibraryUri() async {
final uri = await _platform.invokeMethod<String>('openTree');
if (uri != null) {
musicLibraryUri = uri;
await _shPref.setString('musicLibraryUri', uri);
setState(() {
status = BackendStatus.loading;
});
await _loadMusicLibrary();
}
}
Future<void> setMusicusServer(String serverUrl) async {
final url = serverUrl.isNotEmpty ? serverUrl : defaultUrl;
await _shPref.setString('musicusServerUrl', url);
if (client != null) {
client.dispose();
}
if (url != null) {
client = MusicusClient(url);
}
musicusServerUrl.add(url);
Future<void> _updateClient(ServerSettings serverSettings) async {
client = MusicusClient(
host: serverSettings.host,
port: serverSettings.port,
basePath: serverSettings.basePath,
);
}
@override

4
mobile/lib/screens/home.dart
View file

@ -49,8 +49,8 @@ class HomeScreen extends StatelessWidget {
),
],
),
body: StreamBuilder<List<Person>>(
stream: backend.db.allPersons().watch(),
body: FutureBuilder<List<Person>>(
future: backend.db.getPersons(),
builder: (context, snapshot) {
if (snapshot.hasData) {
return ListView.builder(

7
mobile/lib/screens/person.dart
View file

@ -37,14 +37,15 @@ class PersonScreen extends StatelessWidget {
),
],
),
body: StreamBuilder<List<Work>>(
stream: backend.db.worksByComposer(person.id).watch(),
body: FutureBuilder<List<WorkInfo>>(
future: backend.db.getWorks(person.id),
builder: (context, snapshot) {
if (snapshot.hasData) {
return ListView.builder(
itemCount: snapshot.data.length,
itemBuilder: (context, index) {
final work = snapshot.data[index];
final work = snapshot.data[index].work;
return ListTile(
title: Text(work.title),
onTap: () async {

110
mobile/lib/screens/server_settings.dart Normal file
View file

@ -0,0 +1,110 @@
import 'dart:async';
import 'package:flutter/material.dart';
import '../backend.dart';
import '../settings.dart';
class ServerSettingsScreen extends StatefulWidget {
@override
_ServerSettingsScreenState createState() => _ServerSettingsScreenState();
}
class _ServerSettingsScreenState extends State<ServerSettingsScreen> {
final hostController = TextEditingController();
final portController = TextEditingController();
final basePathController = TextEditingController();
BackendState backend;
StreamSubscription<ServerSettings> serverSubscription;
@override
void didChangeDependencies() {
super.didChangeDependencies();
backend = Backend.of(context);
if (serverSubscription != null) {
serverSubscription.cancel();
}
_settingsChanged(backend.settings.server.value);
serverSubscription = backend.settings.server.listen((settings) {
_settingsChanged(settings);
});
}
void _settingsChanged(ServerSettings settings) {
hostController.text = settings.host;
portController.text = settings.port.toString();
basePathController.text = settings.basePath;
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text('Server settings'),
actions: <Widget>[
IconButton(
icon: const Icon(Icons.restore),
tooltip: 'Reset to default',
onPressed: () {
backend.settings.resetServerSettings();
},
),
FlatButton(
onPressed: () async {
await backend.settings.setServerSettings(ServerSettings(
host: hostController.text,
port: int.parse(portController.text),
basePath: basePathController.text,
));
Navigator.pop(context);
},
child: Text('DONE'),
),
],
),
body: ListView(
children: <Widget>[
Padding(
padding: const EdgeInsets.all(16.0),
child: TextField(
controller: hostController,
decoration: InputDecoration(
labelText: 'Host',
),
),
),
Padding(
padding: const EdgeInsets.all(16.0),
child: TextField(
controller: portController,
keyboardType: TextInputType.number,
decoration: InputDecoration(
labelText: 'Port',
),
),
),
Padding(
padding: const EdgeInsets.all(16.0),
child: TextField(
controller: basePathController,
decoration: InputDecoration(
labelText: 'API path',
),
),
),
],
),
);
}
@override
void dispose() {
super.dispose();
serverSubscription.cancel();
}
}

88
mobile/lib/screens/settings.dart
View file

@ -1,11 +1,15 @@
import 'package:flutter/material.dart';
import '../backend.dart';
import '../settings.dart';
import 'server_settings.dart';
class SettingsScreen extends StatelessWidget {
@override
Widget build(BuildContext context) {
final backend = Backend.of(context);
final settings = backend.settings;
return Scaffold(
appBar: AppBar(
@ -13,60 +17,42 @@ class SettingsScreen extends StatelessWidget {
),
body: ListView(
children: <Widget>[
ListTile(
leading: Icon(Icons.library_music),
title: Text('Music library path'),
subtitle: Text(backend.musicLibraryUri),
onTap: () {
backend.chooseMusicLibraryUri();
},
),
StreamBuilder<String>(
stream: backend.musicusServerUrl,
builder: (context, snapshot) {
return ListTile(
leading: Icon(Icons.router),
title: Text('Musicus server'),
subtitle: Text(snapshot.data ?? 'Set server URL'),
onTap: () {
showDialog(
context: context,
builder: (context) {
final controller = TextEditingController();
stream: settings.musicLibraryUri,
builder: (context, snapshot) {
return ListTile(
title: Text('Music library path'),
subtitle: Text(snapshot.data ?? 'Choose folder'),
isThreeLine: snapshot.hasData,
onTap: () {
settings.chooseMusicLibraryUri();
},
);
}),
StreamBuilder<ServerSettings>(
stream: settings.server,
builder: (context, snapshot) {
final s = snapshot.data;
if (snapshot.data != null) {
controller.text = snapshot.data;
}
return ListTile(
title: Text('Musicus server'),
subtitle: Text(
s != null ? '${s.host}:${s.port}${s.basePath}' : '...'),
trailing: const Icon(Icons.chevron_right),
onTap: () async {
final ServerSettings result = await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ServerSettingsScreen(),
),
);
return AlertDialog(
title: Text('Musicus server'),
content: TextField(
controller: controller,
decoration: InputDecoration(
labelText: 'Server URL',
),
),
actions: <Widget>[
FlatButton(
onPressed: () {
backend.setMusicusServer(controller.text);
Navigator.pop(context);
},
child: Text('SET'),
),
FlatButton(
onPressed: () {
Navigator.pop(context);
},
child: Text('CANCEL'),
),
],
);
});
},
);
}
),
if (result != null) {
settings.setServerSettings(result);
}
},
);
}),
],
),
);

22
mobile/lib/screens/work.dart
View file

@ -36,33 +36,25 @@ class WorkScreen extends StatelessWidget {
),
],
),
body: StreamBuilder<List<Recording>>(
stream: backend.db.recordingsByWork(workInfo.work.id).watch(),
body: FutureBuilder<List<RecordingInfo>>(
future: backend.db.getRecordings(workInfo.work.id),
builder: (context, snapshot) {
if (snapshot.hasData) {
return ListView.builder(
itemCount: snapshot.data.length,
itemBuilder: (context, index) {
final recording = snapshot.data[index];
final recordingInfo = snapshot.data[index];
final recording = recordingInfo.recording;
return ListTile(
title: FutureBuilder<RecordingInfo>(
future: backend.db.getRecordingInfo(recording),
builder: (context, snapshot) {
if (snapshot.hasData) {
return PerformancesText(
performanceInfos: snapshot.data.performances,
);
} else {
return Text('...');
}
}
title: PerformancesText(
performanceInfos: recordingInfo.performances,
),
onTap: () async {
final tracks = backend.ml.tracks[recording.id];
tracks.sort(
(t1, t2) => t1.track.index.compareTo(t2.track.index));
backend.player.addTracks(backend.ml.tracks[recording.id]);
},
);

3
mobile/lib/selectors/files.dart
View file

@ -131,7 +131,8 @@ class _FilesSelectorState extends State<FilesSelector> {
});
final newChildren = await Platform.getChildren(
backend.musicLibraryUri, history.isNotEmpty ? history.last.id : null);
backend.settings.musicLibraryUri.value,
history.isNotEmpty ? history.last.id : null);
newChildren.sort((d1, d2) {
if (d1.isDirectory != d2.isDirectory) {

102
mobile/lib/settings.dart Normal file
View file

@ -0,0 +1,102 @@
import 'package:flutter/services.dart';
import 'package:meta/meta.dart';
import 'package:rxdart/rxdart.dart';
import 'package:shared_preferences/shared_preferences.dart';
/// Settings concerning the Musicus server to connect to.
///
/// We don't support setting a scheme here, because there may be password being
/// submitted in the future, so we default to HTTPS.
class ServerSettings {
static const defaultHost = 'musicus.johrpan.de';
static const defaultPort = 1833;
static const defaultBasePath = '/api';
/// Host to connect to, e.g. 'musicus.johrpan.de';
final String host;
/// Port to connect to.
final int port;
/// Path to the API.
///
/// This should be null, if the API is at the root of the host.
final String basePath;
ServerSettings({
@required this.host,
@required this.port,
@required this.basePath,
});
}
/// Manager for all settings that are persisted.
class Settings {
static const defaultHost = 'musicus.johrpan.de';
static const defaultPort = 443;
static const defaultBasePath = '/api';
static const _platform = MethodChannel('de.johrpan.musicus/platform');
/// The tree storage access framework tree URI of the music library.
final musicLibraryUri = BehaviorSubject<String>();
/// Musicus server to connect to.
final server = BehaviorSubject<ServerSettings>();
SharedPreferences _shPref;
/// Initialize the settings.
Future<void> load() async {
_shPref = await SharedPreferences.getInstance();
final uri = _shPref.getString('musicLibraryUri');
if (uri != null) {
musicLibraryUri.add(uri);
}
final host = _shPref.getString('serverHost') ?? defaultHost;
final port = _shPref.getInt('serverPort') ?? defaultPort;
final basePath = _shPref.getString('serverBasePath') ?? defaultBasePath;
server.add(ServerSettings(
host: host,
port: port,
basePath: basePath,
));
}
/// Open the system picker to select a new music library URI.
Future<void> chooseMusicLibraryUri() async {
final uri = await _platform.invokeMethod<String>('openTree');
if (uri != null) {
musicLibraryUri.add(uri);
await _shPref.setString('musicLibraryUri', uri);
}
}
/// Change the Musicus server settings.
Future<void> setServerSettings(ServerSettings settings) async {
await _shPref.setString('serverHost', settings.host);
await _shPref.setInt('serverPort', settings.port);
await _shPref.setString('serverBasePath', settings.basePath);
server.add(settings);
}
/// Reset the server settings to their defaults.
Future<void> resetServerSettings() async {
await setServerSettings(ServerSettings(
host: defaultHost,
port: defaultPort,
basePath: defaultBasePath,
));
}
/// Tidy up.
void dispose() {
musicLibraryUri.close();
server.close();
}
}

39
mobile/lib/widgets/works_by_composer.dart
View file

@ -1,39 +0,0 @@
import 'package:flutter/material.dart';
import 'package:musicus_database/musicus_database.dart';
import '../backend.dart';
class WorksByComposer extends StatelessWidget {
final int personId;
final void Function(Work work) onTap;
WorksByComposer({
this.personId,
this.onTap,
});
@override
Widget build(BuildContext context) {
final backend = Backend.of(context);
return StreamBuilder<List<Work>>(
stream: backend.db.worksByComposer(personId).watch(),
builder: (context, snapshot) {
if (snapshot.hasData) {
return ListView.builder(
itemCount: snapshot.data.length,
itemBuilder: (context, index) {
final work = snapshot.data[index];
return ListTile(
title: Text(work.title),
onTap: () => onTap(work),
);
},
);
} else {
return Container();
}
},
);
}
}