Skip to content

Commit 6bc2eba

Browse files
committed
removed minor bugs
1 parent 6567e95 commit 6bc2eba

File tree

6 files changed

+35
-16
lines changed

6 files changed

+35
-16
lines changed

lib/controllers/main_controller.dart

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class MainController extends ChangeNotifier {
1919
),
2020
),
2121
];
22-
22+
bool isNext = true;
2323
AssetsAudioPlayer player = AssetsAudioPlayer.withId('Playing audio');
2424

2525
final List<StreamSubscription> _subscriptions = [];
@@ -56,6 +56,7 @@ class MainController extends ChangeNotifier {
5656
"cover": myAudio.metas.image!.path,
5757
"track": myAudio.path,
5858
"id": myAudio.metas.id,
59+
"created": DateTime.now().toString(),
5960
});
6061
}));
6162

@@ -65,6 +66,7 @@ class MainController extends ChangeNotifier {
6566
return false;
6667
}));
6768
final recentSongs = getRecentlyPlayed();
69+
recentSongs.sort((a, b) => a["created"].compareTo(b["created"]));
6870
if (recentSongs.isNotEmpty) {
6971
audios.removeAt(0);
7072
}
@@ -103,10 +105,15 @@ class MainController extends ChangeNotifier {
103105
}
104106

105107
void playSong(List<Audio> newPlaylist, int initial) async {
106-
await player.stop();
107-
audios = newPlaylist;
108-
await openPlayer(newlist: newPlaylist, initial: initial);
109-
await player.play();
108+
if (isNext) {
109+
isNext = false;
110+
await player.pause();
111+
await player.stop();
112+
audios = newPlaylist;
113+
await openPlayer(newlist: newPlaylist, initial: initial);
114+
await player.play();
115+
isNext = true;
116+
}
110117
}
111118

112119
void changeIndex(int newIndex, int oldIndex) {

lib/screens/bottom_nav_bar/bottom_nav_bar.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class TabNavigator extends StatelessWidget {
137137
return Navigator(
138138
key: navigatorKey,
139139
onGenerateRoute: (routeSettings) {
140-
return MaterialPageRoute(builder: (context) => child);
140+
return CupertinoPageRoute(builder: (context) => child);
141141
},
142142
);
143143
}

lib/screens/current_playing/current_playing_song.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class CurrentPlayingSong extends StatelessWidget {
3838
alignment: Alignment.center,
3939
),
4040
BackdropFilter(
41-
filter: ImageFilter.blur(sigmaX: 150, sigmaY: 150),
41+
filter: ImageFilter.blur(sigmaX: 200, sigmaY: 200),
4242
child: Container(
4343
color: Colors.black38,
4444
child: Padding(
@@ -130,7 +130,7 @@ class CurrentPlayingSong extends StatelessWidget {
130130
const LoadingImage(
131131
icon: Icon(
132132
LineIcons.compactDisc,
133-
size: 80,
133+
size: 120,
134134
),
135135
),
136136
fit: BoxFit.cover,

lib/screens/recently_played/recently_played_songs.dart

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class RecentlyPlayedSongs extends StatelessWidget {
6161
),
6262
),
6363
title: Text(
64-
"Recently Played Songs",
64+
"Recently Played",
6565
style: Theme.of(context).textTheme.headline4,
6666
),
6767
),
@@ -71,21 +71,32 @@ class RecentlyPlayedSongs extends StatelessWidget {
7171
valueListenable: Hive.box('RecentlyPlayed').listenable(),
7272
builder: (context, box, child) {
7373
if (box.isEmpty) {
74-
return const Text("no liked songs");
74+
return const SizedBox(
75+
height: 300,
76+
child: Center(
77+
child: Text(
78+
"You don't have any Recently played songs",
79+
style: TextStyle(
80+
color: Colors.white,
81+
fontSize: 16,
82+
),
83+
),
84+
),
85+
);
7586
}
87+
7688
return ListView.builder(
7789
shrinkWrap: true,
7890
physics: const NeverScrollableScrollPhysics(),
7991
itemBuilder: (context, i) {
8092
final info = Hive.box('RecentlyPlayed').getAt(i);
8193
data.add(info);
82-
8394
return Dismissible(
8495
key: Key(info['songname'].toString()),
85-
onDismissed: (direction) {
86-
box.deleteAt(i);
96+
onDismissed: (direction) async {
97+
await box.deleteAt(i);
8798
context.showSnackBar(
88-
message: "Removed from liked songs.");
99+
message: "Removed from recent songs.");
89100
},
90101
direction: DismissDirection.endToStart,
91102
background: Container(
@@ -100,6 +111,8 @@ class RecentlyPlayedSongs extends StatelessWidget {
100111
),
101112
child: ListTile(
102113
onTap: () {
114+
data.sort(
115+
(a, b) => a["created"].compareTo(b["created"]));
103116
con.playSong(con.converLocalSongToAudio(data), i);
104117
},
105118
leading: ClipRRect(

lib/utils/bottom_nav_bar_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class CustomCupertinoTabBar extends StatelessWidget
9797
Widget result = DecoratedBox(
9898
decoration: BoxDecoration(
9999
border: resolvedBorder,
100-
color: backgroundColor,
100+
color: Colors.black,
101101
),
102102
child: Column(
103103
mainAxisAlignment: MainAxisAlignment.end,

lib/utils/bottom_play_widget.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class PlayWidget extends StatelessWidget {
4040
boxShadow: kElevationToShadow[9],
4141
),
4242
child: ClipRRect(
43-
borderRadius: BorderRadius.circular(6.0),
4443
child: Stack(
4544
children: [
4645
CachedNetworkImage(

0 commit comments

Comments
 (0)