mobile: Update to new client API

The settings screen was refactored too.

mobile/lib/app.dart

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

mobile/lib/backend.dart

@@ -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();
+    await settings.load();
-    var url = _shPref.getString('musicusServerUrl');
 
-    if (url == null) {
+    _updateMusicLibrary(settings.musicLibraryUri.value);
-      url = defaultUrl;
+    settings.musicLibraryUri.listen((uri) {
-      await _shPref.setString('musicusServerUrl', url);
+      _updateMusicLibrary(uri);
-    }
+    });
-    musicusServerUrl.add(url);
-    client = MusicusClient(url);
 
-    musicLibraryUri = _shPref.getString('musicLibraryUri');
+    _updateClient(settings.server.value);
-
+    settings.server.listen((serverSettings) {
-    _loadMusicLibrary();
+      _updateClient(serverSettings);
+    });
   }
 
-  Future<void> _loadMusicLibrary() async {
+  Future<void> _updateMusicLibrary(String uri) async {
-    if (musicLibraryUri == null) {
+    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 {
+  Future<void> _updateClient(ServerSettings serverSettings) async {
-    final uri = await _platform.invokeMethod<String>('openTree');
+    client = MusicusClient(
-
+      host: serverSettings.host,
-    if (uri != null) {
+      port: serverSettings.port,
-      musicLibraryUri = uri;
+      basePath: serverSettings.basePath,
-      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);
   }
 
   @override

mobile/lib/screens/home.dart

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

mobile/lib/screens/person.dart

@@ -37,14 +37,15 @@ class PersonScreen extends StatelessWidget {
           ),
         ],
       ),
-      body: StreamBuilder<List<Work>>(
+      body: FutureBuilder<List<WorkInfo>>(
-        stream: backend.db.worksByComposer(person.id).watch(),
+        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 {

mobile/lib/screens/server_settings.dart

@@ -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();
+  }
+}

mobile/lib/screens/settings.dart

@@ -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,
+              stream: settings.musicLibraryUri,
-            builder: (context, snapshot) {
+              builder: (context, snapshot) {
-              return ListTile(
+                return ListTile(
-                leading: Icon(Icons.router),
+                  title: Text('Music library path'),
-                title: Text('Musicus server'),
+                  subtitle: Text(snapshot.data ?? 'Choose folder'),
-                subtitle: Text(snapshot.data ?? 'Set server URL'),
+                  isThreeLine: snapshot.hasData,
-                onTap: () {
+                  onTap: () {
-                  showDialog(
+                    settings.chooseMusicLibraryUri();
-                      context: context,
+                  },
-                      builder: (context) {
+                );
-                        final controller = TextEditingController();
+              }),
+          StreamBuilder<ServerSettings>(
+              stream: settings.server,
+              builder: (context, snapshot) {
+                final s = snapshot.data;
 
-                        if (snapshot.data != null) {
+                return ListTile(
-                          controller.text = snapshot.data;
+                  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(
+                    if (result != null) {
-                          title: Text('Musicus server'),
+                      settings.setServerSettings(result);
-                          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'),
-                            ),
-                          ],
-                        );
-                      });
-                },
-              );
-            }
-          ),
         ],
       ),
     );

mobile/lib/screens/work.dart

@@ -36,33 +36,25 @@ class WorkScreen extends StatelessWidget {
           ),
         ],
       ),
-      body: StreamBuilder<List<Recording>>(
+      body: FutureBuilder<List<RecordingInfo>>(
-        stream: backend.db.recordingsByWork(workInfo.work.id).watch(),
+        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>(
+                  title: PerformancesText(
-                    future: backend.db.getRecordingInfo(recording),
+                    performanceInfos: recordingInfo.performances,
-                    builder: (context, snapshot) {
-                      if (snapshot.hasData) {
-                        return PerformancesText(
-                          performanceInfos: snapshot.data.performances,
-                        );
-                      } else {
-                        return Text('...');
-                      }
-                    }
                   ),
                   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]);
                   },
                 );

mobile/lib/selectors/files.dart

@@ -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) {

mobile/lib/settings.dart

@@ -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();
+  }
+}

mobile/lib/widgets/works_by_composer.dart

@@ -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();
-        }
-      },
-    );
-  }
-}

mobile/pubspec.yaml

@@ -12,6 +12,7 @@ dependencies:
   audio_service:
   flutter:
     sdk: flutter
+  meta:
   moor:
   moor_ffi:
   musicus_client: