Refactor player controller and update UI

ahvvad · Dec 24, 2024 · 421f60a · 421f60a
1 parent 463f91d
commit 421f60a
Show file tree

Hide file tree

Showing 11 changed files with 264 additions and 174 deletions.
diff --git a/assets/Launcher.png b/assets/Launcher.png
diff --git a/assets/splash.png b/assets/splash.png
diff --git a/lib/controllers/dialog_contact.dart b/lib/controllers/dialog_contact.dart
@@ -6,10 +6,13 @@ import '../consts/colors.dart';
 import '../consts/text_style.dart';
 
 class DialogHelper {
-  static void showLinkDialog({required String url}) {
+  static void showLinkDialog({
+    required String url,
+    required String title,
+  }) {
     Get.defaultDialog(
       title: "Open Link",
-      middleText: "Click the button to contact the developer.",
+      middleText: title,
       backgroundColor: whiteColor,
       titleStyle: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
       middleTextStyle: const TextStyle(fontSize: 14),

diff --git a/lib/controllers/player_controller.dart b/lib/controllers/player_controller.dart
@@ -18,38 +18,39 @@ class PlayerController extends GetxController {
   var max = 0.0.obs;
   var value = 0.0.obs;
 
-  late List<SongModel> data;
+  var isLoading = true.obs;
+  List<SongModel> data = [];
 
   @override
   void onInit() {
     super.onInit();
     checkPermission();
     loadSongs();
-
     audioPlayer.positionStream.listen((position) {
       if (audioPlayer.duration != null && position >= audioPlayer.duration!) {
-        _playNextSong();
+        playNextSong();
       }
     });
   }
 
-  loadSongs() async {
+  Future<void> loadSongs() async {
     var perm = await Permission.storage.request();
     if (perm.isGranted) {
       var songs = await audioQuery.querySongs();
-      data = songs;
+      data = songs.isNotEmpty ? songs : [];
     } else {
       print("Permission denied!");
     }
+    isLoading(false); 
   }
 
-  _playNextSong() {
-    if (playIndex.value < data.length - 1) {
-      playSong(data[playIndex.value + 1].uri, playIndex.value + 1);
-    } else {
-      playSong(data[0].uri, 0);
-    }
-  }
+  // _playNextSong() {
+  //   if (playIndex.value < data.length - 1) {
+  //     playSong(data[playIndex.value + 1].uri, playIndex.value + 1);
+  //   } else {
+  //     playSong(data[0].uri, 0);
+  //   }
+  // }
 
   updatePosition() {
     audioPlayer.durationStream.listen((d) {
@@ -90,10 +91,36 @@ class PlayerController extends GetxController {
     }
   }
 
+  void playNextSong() {
+  if (playIndex.value < data.length - 1) {
+    playSong(data[playIndex.value + 1].uri, playIndex.value + 1);
+  } else {
+    playSong(data[0].uri, 0);
+  }
+}
+
+void playPreviousSong() {
+  if (playIndex.value > 0) {
+    playSong(data[playIndex.value - 1].uri, playIndex.value - 1);
+  } else {
+    playSong(data[data.length - 1].uri, data.length - 1);
+  }
+}
+
+
+  pauseOrResume() {
+    if (audioPlayer.playing) {
+      audioPlayer.pause();
+      isPlaying(false);
+    } else {
+      audioPlayer.play();
+      isPlaying(true);
+    }
+  }
+
   checkPermission() async {
     var perm = await Permission.storage.request();
-    if (perm.isGranted) {
-    } else {
+    if (!perm.isGranted) {
       checkPermission();
     }
   }

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'pages/albums_screen.dart';
 import 'pages/home.dart';
-import 'pages/playlist_screen.dart';
 import 'widgets/drawer.dart';
 
 void main() {
@@ -34,4 +32,4 @@ class MyApp extends StatelessWidget {
       ),
     );
   }
-}
+}
diff --git a/lib/pages/albums_screen.dart b/lib/pages/albums_screen.dart
@@ -38,9 +38,9 @@ class _AlbumsScreenState extends State<AlbumsScreen> {
         ),
         child: Scaffold(
           appBar: appBar(),
-          floatingActionButton: FloatBotton(controller: controller),
-          floatingActionButtonLocation:
-              FloatingActionButtonLocation.centerFloat,
+          // floatingActionButton: FloatBotton(controller: controller),
+          // floatingActionButtonLocation:
+          //     FloatingActionButtonLocation.centerFloat,
           backgroundColor: Colors.transparent,
           body: Column(
             children: <Widget>[