lib/main.dart

@@ -1,8 +1,94 @@
+// ignore_for_file: avoid_print
+
+import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
+import 'package:music_web_player/ui/music_player.dart';
+import 'package:music_web_player/api.dart';
 import 'package:music_web_player/config.dart';
-import 'package:music_web_player/ui/player_app.dart';
 
 void main() {
   loadConfig();
   runApp(const PlayerApp());
 }
+
+class PlayerApp extends StatelessWidget {
+  const PlayerApp({Key? key}) : super(key: key);
+
+  // This widget is the root of your application.
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      title: 'Music player',
+      debugShowCheckedModeBanner: false,
+      theme: ThemeData(
+        primarySwatch: Colors.green,
+        brightness: Brightness.dark,
+      ),
+      home: const AppHome(),
+    );
+  }
+}
+
+class AppHome extends StatefulWidget {
+  const AppHome({Key? key}) : super(key: key);
+
+  @override
+  State<AppHome> createState() => _AppHomeState();
+}
+
+class _AppHomeState extends State<AppHome> {
+  var error = false;
+  List<MusicEntry>? musics;
+
+  Future<void> load() async {
+    try {
+      setState(() => error = false);
+      musics = await API.getList();
+      setState(() {});
+    } catch (e, s) {
+      print("$e $s");
+      setState(() => error = true);
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    load();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(body: buildBody(context));
+  }
+
+  Widget buildBody(BuildContext context) {
+    if (error) {
+      return Center(
+          child: IntrinsicHeight(
+        child: Column(
+          children: [
+            const Icon(FluentIcons.warning_24_regular, size: 50),
+            const SizedBox(height: 50),
+            const Text("Failed to load musics list!"),
+            const SizedBox(height: 50),
+            ElevatedButton(
+              onPressed: load,
+              child: Text("Try again".toUpperCase()),
+            ),
+          ],
+        ),
+      ));
+    }
+
+    if (musics == null) {
+      return const Center(child: CircularProgressIndicator());
+    }
+
+    if (musics!.isEmpty) {
+      return const Center(child: Text("Musics list is empty!"));
+    }
+
+    return MusicPlayer(musicsList: musics!);
+  }
+}

lib/ui/cover_image.dart

@@ -10,7 +10,6 @@ class CoverImage extends StatelessWidget {
   final double? height;
   final BoxFit? fit;
   final Icon? icon;
-  final Color? backgroundColor;
 
   const CoverImage({
     Key? key,
@@ -19,7 +18,6 @@ class CoverImage extends StatelessWidget {
     this.height,
     this.icon,
     this.fit,
-    this.backgroundColor,
   }) : super(key: key);
 
   @override
@@ -39,7 +37,7 @@ class CoverImage extends StatelessWidget {
   }
 
   Widget _loadingWidget(double? progress) => Container(
-        color: backgroundColor ?? Colors.black,
+        color: Colors.black,
         width: width,
         height: height,
         child: Center(

lib/ui/music_player.dart

@@ -1,8 +1,6 @@
 import 'dart:math';
 import 'dart:ui';
 
-import 'package:fluent_ui/fluent_ui.dart' as fluent;
-import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:music_web_player/api.dart';
 import 'package:music_web_player/ui/cover_image.dart';
@@ -61,77 +59,13 @@ class _MusicPlayerState extends State<MusicPlayer> {
             ),
           )),
 
-          _buildCenter(),
+          _buildFront(),
         ],
       ),
     );
   }
 
-  Widget _buildCenter() {
-    return fluent.Center(
-      child: Container(
-        width: 250,
-        child: Column(
-          mainAxisAlignment: fluent.MainAxisAlignment.center,
-          crossAxisAlignment: fluent.CrossAxisAlignment.center,
-          children: [
-            Material(
-              borderRadius: const BorderRadius.all(
-                Radius.circular(18.0),
-              ),
-              clipBehavior: Clip.hardEdge,
-              child: CoverImage(
-                width: 250,
-                height: 250,
-                music: currMusic,
-                fit: BoxFit.cover,
-                backgroundColor: Colors.black12,
-                icon: const Icon(FluentIcons.music_note_2_24_regular, size: 90),
-              ),
-            ),
-            const SizedBox(height: 40),
-            Text(currMusic.title, style: const TextStyle(fontSize: 22)),
-            const SizedBox(height: 20),
-            Text(currMusic.artist),
-            const fluent.SizedBox(height: 40),
-            fluent.Slider(
-              max: 100,
-              value: 10,
-              onChanged: (v) => {},
-              // Label is the text displayed above the slider when the user is interacting with it.
-              label: 'hey',
-            ),
-            const fluent.SizedBox(height: 40),
-            fluent.Row(
-              children: [
-                IconButton(
-                  icon: const PlayerIcon(fluent.FluentIcons.previous),
-                  onPressed: () => {},
-                ),
-                const Spacer(),
-                IconButton(
-                  icon: const PlayerIcon(fluent.FluentIcons.play),
-                  onPressed: () => {},
-                ),
-                const Spacer(),
-                IconButton(
-                  icon: const PlayerIcon(fluent.FluentIcons.next),
-                  onPressed: () => {},
-                ),
-              ],
-            )
-          ],
-        ),
-      ),
-    );
+  Widget _buildFront() {
+    return Text(currMusic.artist + " - " + currMusic.title);
   }
 }
-
-class PlayerIcon extends StatelessWidget {
-  final IconData icon;
-
-  const PlayerIcon(this.icon, {Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) => Icon(icon, size: 35);
-}

lib/ui/player_app.dart

@@ -1,97 +0,0 @@
-// ignore_for_file: avoid_print
-
-import 'package:fluent_ui/fluent_ui.dart' as fluent;
-import 'package:fluentui_system_icons/fluentui_system_icons.dart';
-import 'package:flutter/material.dart';
-import 'package:music_web_player/api.dart';
-import 'package:music_web_player/ui/music_player.dart';
-
-class PlayerApp extends StatelessWidget {
-  const PlayerApp({Key? key}) : super(key: key);
-
-  // This widget is the root of your application.
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'Music player',
-      debugShowCheckedModeBanner: false,
-      theme: ThemeData(
-        primarySwatch: Colors.green,
-        brightness: Brightness.dark,
-      ),
-      home: fluent.FluentTheme(
-        child: const AppHome(),
-        data: fluent.ThemeData(
-            iconTheme: const IconThemeData(color: Colors.white)),
-      ),
-    );
-  }
-}
-
-class AppHome extends StatefulWidget {
-  const AppHome({Key? key}) : super(key: key);
-
-  @override
-  State<AppHome> createState() => _AppHomeState();
-}
-
-class _AppHomeState extends State<AppHome> {
-  var error = false;
-  List<MusicEntry>? musics;
-
-  Future<void> load() async {
-    try {
-      setState(() => error = false);
-      musics = await API.getList();
-      setState(() {});
-    } catch (e, s) {
-      print("$e $s");
-      setState(() => error = true);
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    load();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(body: buildBody(context));
-  }
-
-  Widget buildBody(BuildContext context) {
-    if (error) {
-      return Center(
-          child: IntrinsicHeight(
-        child: Column(
-          children: [
-            const Icon(
-              FluentIcons.warning_24_regular,
-              size: 50,
-              color: Colors.white,
-            ),
-            const SizedBox(height: 50),
-            const Text("Failed to load musics list!"),
-            const SizedBox(height: 50),
-            fluent.FilledButton(
-              onPressed: load,
-              child: Text("Try again".toUpperCase()),
-            ),
-          ],
-        ),
-      ));
-    }
-
-    if (musics == null) {
-      return const Center(child: fluent.ProgressRing());
-    }
-
-    if (musics!.isEmpty) {
-      return const Center(child: Text("Musics list is empty!"));
-    }
-
-    return MusicPlayer(musicsList: musics!);
-  }
-}

pubspec.lock

@@ -106,13 +106,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.2"
-  fluent_ui:
-    dependency: "direct main"
-    description:
-      name: fluent_ui
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.9.1"
   fluentui_system_icons:
     dependency: "direct main"
     description:
@@ -165,13 +158,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.0"
-  intl:
-    dependency: transitive
-    description:
-      name: intl
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.17.0"
   lints:
     dependency: transitive
     description:
@@ -291,13 +277,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.2.4"
-  recase:
-    dependency: transitive
-    description:
-      name: recase
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.0.0"
   rxdart:
     dependency: transitive
     description:
@@ -305,13 +284,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.27.3"
-  scroll_pos:
-    dependency: transitive
-    description:
-      name: scroll_pos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.0"
   sky_engine:
     dependency: transitive
     description: flutter

pubspec.yaml

@@ -38,8 +38,7 @@ dependencies:
   # HTTP client
   dio: ^4.0.4
 
-  # Fluent ui
-  fluent_ui: ^3.9.1
+  # Fluent icons
   fluentui_system_icons: ^1.1.162
 
   # Image processing

test/widget_test.dart

@@ -7,7 +7,8 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:music_web_player/ui/player_app.dart';
+
+import 'package:music_web_player/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {