Basic last.fm integration

lib/expose/expose_service.dart

@@ -7,14 +7,11 @@ class ExposeService {
   ExposeService({
     required FlutterDiscordRPC? discordRPC,
     required LastFMAuthorized? lastFm,
-    required bool lastFmEnabled,
   })  : _discordRPC = discordRPC,
-        _lastFm = lastFm,
-        _lastFmEnabled = lastFmEnabled;
+        _lastFm = lastFm;
 
   final FlutterDiscordRPC? _discordRPC;
   final LastFMAuthorized? _lastFm;
-  final bool _lastFmEnabled;
   final _errorController = StreamController<String?>.broadcast();
   Stream<String?> get discordErrorStream => _errorController.stream;
   Stream<bool> get isDiscordConnectedStream =>
@@ -32,7 +29,7 @@ class ExposeService {
       additionalInfo: additionalInfo,
       imageUrl: imageUrl,
     );
-    if (_lastFmEnabled) {
+    if (_lastFm != null) {
       await _exposeTitleToLastfm(
         title: title,
         artist: artist,

lib/main.dart

@@ -133,14 +133,12 @@ void registerServicesAndViewModels({
         if (sessionKey != null) {
           return ExposeService(
             discordRPC: allowDiscordRPC ? di<FlutterDiscordRPC>() : null,
-            lastFm: di<LastFM>() as LastFMAuthorized,
-            lastFmEnabled: lastFMEnabled,
+            lastFm: lastFMEnabled ? di<LastFM>() as LastFMAuthorized : null,
           );
         } else {
           return ExposeService(
             discordRPC: allowDiscordRPC ? di<FlutterDiscordRPC>() : null,
             lastFm: null,
-            lastFmEnabled: lastFMEnabled,
           );
         }
       },
@@ -162,6 +160,7 @@ void registerServicesAndViewModels({
       () => SettingsService(
         sharedPreferences: di<SharedPreferences>(),
         downloadsDefaultDir: downloadsDefaultDir,
+        lastFm: di<LastFM>(),
       ),
       dispose: (s) async => s.dispose(),
     )

lib/settings/settings_model.dart

@@ -74,6 +74,7 @@ class SettingsModel extends SafeChangeNotifier {
   void setLastFmSecret(String value) => _service.setLastFmSecret(value);
   void setLastFmSessionKey(String value) => _service.setLastFmSessionKey(value);
   void setLastFmUsername(String value) => _service.setLastFmUsername(value);
+  Future<void> setLastFmAuth() async => _service.setLastFmAuth();
 
   bool get useMoreAnimations => _service.useMoreAnimations;
   void setUseMoreAnimations(bool value) => _service.setUseMoreAnimations(value);

lib/settings/settings_service.dart

@@ -1,7 +1,9 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:lastfm/lastfm.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import '../common/data/close_btn_action.dart';
 import '../constants.dart';
@@ -10,11 +12,14 @@ class SettingsService {
   SettingsService({
     required String? downloadsDefaultDir,
     required SharedPreferences sharedPreferences,
+    required LastFM lastFm,
   })  : _preferences = sharedPreferences,
-        _downloadsDefaultDir = downloadsDefaultDir;
+        _downloadsDefaultDir = downloadsDefaultDir,
+        _lastFm = lastFm;
 
   final String? _downloadsDefaultDir;
   final SharedPreferences _preferences;
+  final LastFM _lastFm;
   final _propertiesChangedController = StreamController<bool>.broadcast();
   Stream<bool> get propertiesChanged => _propertiesChangedController.stream;
 
@@ -83,6 +88,17 @@ class SettingsService {
     );
   }
 
+  Future<void> setLastFmAuth() async {
+    final lastfmua = _lastFm as LastFMUnauthorized;
+    launchUrl(
+      Uri.parse(await lastfmua.authorizeDesktop()),
+    );
+    await Future.delayed(const Duration(seconds: 20));
+    final lastfm = await lastfmua.finishAuthorizeDesktop();
+    setLastFmSessionKey(lastfm.sessionKey);
+    setLastFmUsername(lastfm.username);
+  }
+
   bool get enableDiscordRPC => _preferences.getBool(kEnableDiscordRPC) ?? false;
   void setEnableDiscordRPC(bool value) {
     _preferences.setBool(kEnableDiscordRPC, value).then(

lib/settings/view/settings_page.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
-import 'package:lastfm/lastfm.dart';
 import 'package:path/path.dart' as p;
 import 'package:url_launcher/url_launcher.dart';
 import 'package:watch_it/watch_it.dart';
@@ -650,20 +649,10 @@ class _ExposeOnlineSection extends StatelessWidget with WatchItMixin {
                 ),
                 if (lastFmEnabled)
                   ImportantButton(
-                    onPressed: () async {
+                    onPressed: () {
                       if (lastFmApiKeyController.text.isNotEmpty &&
                           lastFmSecretController.text.isNotEmpty) {
-                        final lastfmua = di<LastFM>() as LastFMUnauthorized;
-                        launchUrl(
-                          Uri.parse(await lastfmua.authorizeDesktop()),
-                        );
-                        await Future.delayed(const Duration(seconds: 20));
-                        final lastfm = await lastfmua.finishAuthorizeDesktop();
-                        di<SettingsModel>()
-                            .setLastFmSessionKey(lastfm.sessionKey);
-                        di<SettingsModel>().setLastFmUsername(lastfm.username);
-                        di.unregister<LastFM>();
-                        di.registerFactory<LastFM>(() => lastfm);
+                        di<SettingsModel>().setLastFmAuth();
                       }
                     },
                     child: Text(l10n.save),