spotify integration works
This commit is contained in:
parent
f70fe3cdd1
commit
025eee7644
11 changed files with 1637 additions and 717 deletions
5
CHALLENGE_2/sleepysound/.gitignore
vendored
5
CHALLENGE_2/sleepysound/.gitignore
vendored
|
@ -1,3 +1,8 @@
|
||||||
|
# API Secret Spotify
|
||||||
|
SPOTIFY_SECRET.dart
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Miscellaneous
|
# Miscellaneous
|
||||||
*.class
|
*.class
|
||||||
*.log
|
*.log
|
||||||
|
|
133
CHALLENGE_2/sleepysound/README_SPOTIFY.md
Normal file
133
CHALLENGE_2/sleepysound/README_SPOTIFY.md
Normal file
|
@ -0,0 +1,133 @@
|
||||||
|
# 🎵 SleepySound - Spotify Integration Setup
|
||||||
|
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
|
The app now loads Spotify credentials from `lib/services/SPOTIFY_SECRET.dart`. You have two options:
|
||||||
|
|
||||||
|
### Option 1: Demo Mode (Works Immediately)
|
||||||
|
- The app works perfectly with realistic demo data
|
||||||
|
- No setup required - just run the app!
|
||||||
|
- All features work: search, voting, queue management
|
||||||
|
|
||||||
|
### Option 2: Real Spotify Integration
|
||||||
|
|
||||||
|
1. **Get Spotify API Credentials:**
|
||||||
|
- Go to [Spotify Developer Dashboard](https://developer.spotify.com/dashboard)
|
||||||
|
- Create a new app called "SleepySound"
|
||||||
|
- Copy your Client ID and Client Secret
|
||||||
|
|
||||||
|
2. **Update the Secret File:**
|
||||||
|
```dart
|
||||||
|
// In lib/services/SPOTIFY_SECRET.dart
|
||||||
|
class SpotifyCredentials {
|
||||||
|
static const String clientId = 'your_actual_client_id_here';
|
||||||
|
static const String clientSecret = 'your_actual_client_secret_here';
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
3. **Run the App:**
|
||||||
|
- The app automatically detects valid credentials
|
||||||
|
- Real Spotify search will be enabled
|
||||||
|
- You'll see "🎵 Spotify" instead of "🎮 Demo" in the UI
|
||||||
|
|
||||||
|
## How It Works
|
||||||
|
|
||||||
|
### 🔄 Automatic Credential Detection
|
||||||
|
```dart
|
||||||
|
// The service automatically checks for valid credentials
|
||||||
|
bool get _hasValidCredentials =>
|
||||||
|
_clientId != 'YOUR_SPOTIFY_CLIENT_ID' &&
|
||||||
|
_clientSecret != 'YOUR_SPOTIFY_CLIENT_SECRET';
|
||||||
|
```
|
||||||
|
|
||||||
|
### 🎮 Graceful Fallback
|
||||||
|
- **Invalid/Missing Credentials** → Demo data
|
||||||
|
- **Valid Credentials** → Real Spotify API
|
||||||
|
- **API Errors** → Falls back to demo data
|
||||||
|
|
||||||
|
### 🎯 Visual Indicators
|
||||||
|
- **"🎵 Spotify"** badge = Real API active
|
||||||
|
- **"🎮 Demo"** badge = Using demo data
|
||||||
|
- Console logs show configuration status
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
### ✅ Working Now (Demo Mode)
|
||||||
|
- Song search with realistic results
|
||||||
|
- Upvote/downvote queue management
|
||||||
|
- Real-time queue reordering
|
||||||
|
- Album artwork simulation
|
||||||
|
- Location-based group features
|
||||||
|
|
||||||
|
### ✅ Enhanced with Real Spotify
|
||||||
|
- Actual Spotify track search
|
||||||
|
- Real album artwork
|
||||||
|
- Accurate track metadata
|
||||||
|
- External Spotify links
|
||||||
|
- Preview URLs (where available)
|
||||||
|
|
||||||
|
## Security Notes
|
||||||
|
|
||||||
|
⚠️ **Important:** Never commit real credentials to version control!
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Add this to .gitignore
|
||||||
|
lib/services/SPOTIFY_SECRET.dart
|
||||||
|
```
|
||||||
|
|
||||||
|
For production apps:
|
||||||
|
- Use environment variables
|
||||||
|
- Use secure credential storage
|
||||||
|
- Implement proper OAuth flows
|
||||||
|
|
||||||
|
## File Structure
|
||||||
|
|
||||||
|
```
|
||||||
|
lib/
|
||||||
|
├── services/
|
||||||
|
│ ├── spotify_service.dart # Main Spotify API service
|
||||||
|
│ └── SPOTIFY_SECRET.dart # Your credentials (gitignored)
|
||||||
|
├── models/
|
||||||
|
│ └── spotify_track.dart # Spotify data models
|
||||||
|
└── pages/
|
||||||
|
├── voting_page.dart # Search & voting interface
|
||||||
|
├── now_playing_page.dart # Current queue display
|
||||||
|
└── group_page.dart # Location & group features
|
||||||
|
```
|
||||||
|
|
||||||
|
## API Integration Details
|
||||||
|
|
||||||
|
### Client Credentials Flow
|
||||||
|
- Used for public track search (no user login required)
|
||||||
|
- Perfect for the collaborative jukebox use case
|
||||||
|
- Handles token refresh automatically
|
||||||
|
|
||||||
|
### Search Functionality
|
||||||
|
```dart
|
||||||
|
// Real Spotify search
|
||||||
|
final tracks = await _spotifyService.searchTracks('summer vibes', limit: 10);
|
||||||
|
|
||||||
|
// Automatic fallback to demo data if API unavailable
|
||||||
|
```
|
||||||
|
|
||||||
|
### Error Handling
|
||||||
|
- Network errors → Demo data
|
||||||
|
- Invalid credentials → Demo data
|
||||||
|
- Rate limiting → Demo data
|
||||||
|
- Token expiration → Automatic refresh
|
||||||
|
|
||||||
|
## Challenge Requirements ✅
|
||||||
|
|
||||||
|
- ✅ **Music streaming API integration** - Spotify Web API
|
||||||
|
- ✅ **Track metadata retrieval** - Full track info + artwork
|
||||||
|
- ✅ **Demo-ready functionality** - Works without setup
|
||||||
|
- ✅ **Real-world usability** - Graceful fallbacks
|
||||||
|
|
||||||
|
## Development Tips
|
||||||
|
|
||||||
|
1. **Start with Demo Mode** - Get familiar with the app
|
||||||
|
2. **Add Real Credentials** - See the enhanced experience
|
||||||
|
3. **Test Both Modes** - Ensure fallbacks work
|
||||||
|
4. **Check Console Logs** - See API status messages
|
||||||
|
|
||||||
|
Enjoy building your collaborative music experience! 🎶
|
|
@ -1,7 +1,9 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
import 'pages/now_playing_page.dart';
|
import 'pages/now_playing_page.dart';
|
||||||
import 'pages/voting_page.dart';
|
import 'pages/voting_page.dart';
|
||||||
import 'pages/group_page.dart';
|
import 'pages/group_page.dart';
|
||||||
|
import 'services/music_queue_service.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
runApp(const MyApp());
|
runApp(const MyApp());
|
||||||
|
@ -13,28 +15,31 @@ class MyApp extends StatelessWidget {
|
||||||
// This widget is the root of your application.
|
// This widget is the root of your application.
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return MaterialApp(
|
return ChangeNotifierProvider(
|
||||||
title: 'SleepySound',
|
create: (context) => MusicQueueService(),
|
||||||
theme: ThemeData(
|
child: MaterialApp(
|
||||||
useMaterial3: true,
|
title: 'SleepySound',
|
||||||
brightness: Brightness.dark,
|
theme: ThemeData(
|
||||||
colorScheme: ColorScheme.fromSeed(
|
useMaterial3: true,
|
||||||
seedColor: const Color(0xFF6366F1),
|
|
||||||
brightness: Brightness.dark,
|
brightness: Brightness.dark,
|
||||||
|
colorScheme: ColorScheme.fromSeed(
|
||||||
|
seedColor: const Color(0xFF6366F1),
|
||||||
|
brightness: Brightness.dark,
|
||||||
|
),
|
||||||
|
scaffoldBackgroundColor: const Color(0xFF121212),
|
||||||
|
appBarTheme: const AppBarTheme(
|
||||||
|
backgroundColor: Color(0xFF1E1E1E),
|
||||||
|
foregroundColor: Colors.white,
|
||||||
|
),
|
||||||
|
bottomNavigationBarTheme: const BottomNavigationBarThemeData(
|
||||||
|
backgroundColor: Color(0xFF1E1E1E),
|
||||||
|
selectedItemColor: Color(0xFF6366F1),
|
||||||
|
unselectedItemColor: Colors.grey,
|
||||||
|
type: BottomNavigationBarType.fixed,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
scaffoldBackgroundColor: const Color(0xFF121212),
|
home: const MyHomePage(title: 'Now Playing'),
|
||||||
appBarTheme: const AppBarTheme(
|
|
||||||
backgroundColor: Color(0xFF1E1E1E),
|
|
||||||
foregroundColor: Colors.white,
|
|
||||||
),
|
|
||||||
bottomNavigationBarTheme: const BottomNavigationBarThemeData(
|
|
||||||
backgroundColor: Color(0xFF1E1E1E),
|
|
||||||
selectedItemColor: Color(0xFF6366F1),
|
|
||||||
unselectedItemColor: Colors.grey,
|
|
||||||
type: BottomNavigationBarType.fixed,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
home: const MyHomePage(title: 'Now Playing'),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
import '../services/music_queue_service.dart';
|
||||||
|
|
||||||
class GroupPage extends StatefulWidget {
|
class GroupPage extends StatefulWidget {
|
||||||
const GroupPage({super.key});
|
const GroupPage({super.key});
|
||||||
|
|
|
@ -1,271 +1,201 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
import '../services/music_queue_service.dart';
|
||||||
|
import '../models/spotify_track.dart';
|
||||||
|
|
||||||
class NowPlayingPage extends StatefulWidget {
|
class NowPlayingPage extends StatelessWidget {
|
||||||
const NowPlayingPage({super.key});
|
const NowPlayingPage({super.key});
|
||||||
|
|
||||||
@override
|
|
||||||
State<NowPlayingPage> createState() => _NowPlayingPageState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _NowPlayingPageState extends State<NowPlayingPage> {
|
|
||||||
// Mock data for demonstration
|
|
||||||
bool isPlaying = false;
|
|
||||||
String currentSong = "Summer Vibes";
|
|
||||||
String currentArtist = "Chill Collective";
|
|
||||||
double progress = 0.3; // 30% through song
|
|
||||||
|
|
||||||
List<Map<String, String>> upcomingQueue = [
|
|
||||||
{"title": "Ocean Breeze", "artist": "Lofi Dreams", "votes": "12", "position": "1", "imageUrl": "https://i.scdn.co/image/ocean"},
|
|
||||||
{"title": "Sunset Melody", "artist": "Acoustic Soul", "votes": "8", "position": "2", "imageUrl": "https://i.scdn.co/image/sunset"},
|
|
||||||
{"title": "Peaceful Waters", "artist": "Nature Sounds", "votes": "5", "position": "3", "imageUrl": "https://i.scdn.co/image/water"},
|
|
||||||
{"title": "Summer Nights", "artist": "Chill Vibes", "votes": "3", "position": "4", "imageUrl": "https://i.scdn.co/image/night"},
|
|
||||||
];
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Container(
|
return Consumer<MusicQueueService>(
|
||||||
color: const Color(0xFF121212),
|
builder: (context, queueService, child) {
|
||||||
child: Padding(
|
final currentTrack = queueService.currentTrack;
|
||||||
padding: const EdgeInsets.all(20.0),
|
final queue = queueService.queue;
|
||||||
child: Column(
|
|
||||||
children: [
|
return Scaffold(
|
||||||
// Current Playing Section
|
backgroundColor: const Color(0xFF121212),
|
||||||
Expanded(
|
body: SafeArea(
|
||||||
flex: 2,
|
child: SingleChildScrollView(
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
|
||||||
children: [
|
children: [
|
||||||
// Album Art Placeholder
|
// Now Playing Header
|
||||||
Container(
|
Container(
|
||||||
width: 200,
|
padding: const EdgeInsets.all(20),
|
||||||
height: 200,
|
child: const Text(
|
||||||
decoration: BoxDecoration(
|
'Now Playing',
|
||||||
color: const Color(0xFF6366F1).withOpacity(0.2),
|
style: TextStyle(
|
||||||
borderRadius: BorderRadius.circular(20),
|
fontSize: 24,
|
||||||
border: Border.all(color: const Color(0xFF6366F1), width: 2),
|
fontWeight: FontWeight.bold,
|
||||||
),
|
color: Colors.white,
|
||||||
child: const Icon(
|
),
|
||||||
Icons.music_note,
|
|
||||||
size: 80,
|
|
||||||
color: Color(0xFF6366F1),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 20),
|
|
||||||
|
|
||||||
// Song Info
|
// Current Track Display
|
||||||
Text(
|
Container(
|
||||||
currentSong,
|
height: MediaQuery.of(context).size.height * 0.5,
|
||||||
style: const TextStyle(
|
margin: const EdgeInsets.all(20),
|
||||||
fontSize: 24,
|
child: currentTrack != null
|
||||||
fontWeight: FontWeight.bold,
|
? _buildCurrentTrackCard(context, currentTrack, queueService)
|
||||||
color: Colors.white,
|
: _buildNoTrackCard(),
|
||||||
),
|
|
||||||
textAlign: TextAlign.center,
|
|
||||||
),
|
),
|
||||||
const SizedBox(height: 8),
|
|
||||||
Text(
|
|
||||||
currentArtist,
|
|
||||||
style: const TextStyle(
|
|
||||||
fontSize: 18,
|
|
||||||
color: Colors.grey,
|
|
||||||
),
|
|
||||||
textAlign: TextAlign.center,
|
|
||||||
),
|
|
||||||
const SizedBox(height: 20),
|
|
||||||
|
|
||||||
// Progress Bar
|
// Playback Controls
|
||||||
Padding(
|
Container(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 20),
|
padding: const EdgeInsets.all(20),
|
||||||
|
child: _buildPlaybackControls(queueService),
|
||||||
|
),
|
||||||
|
|
||||||
|
// Queue Preview
|
||||||
|
Container(
|
||||||
|
height: MediaQuery.of(context).size.height * 0.3,
|
||||||
|
margin: const EdgeInsets.symmetric(horizontal: 20),
|
||||||
child: Column(
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
LinearProgressIndicator(
|
const Padding(
|
||||||
value: progress,
|
padding: EdgeInsets.only(bottom: 10),
|
||||||
backgroundColor: Colors.grey[800],
|
child: Text(
|
||||||
valueColor: const AlwaysStoppedAnimation<Color>(Color(0xFF6366F1)),
|
'Up Next',
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 18,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 8),
|
Expanded(
|
||||||
Row(
|
child: queue.isEmpty
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
? const Center(
|
||||||
children: [
|
child: Text(
|
||||||
Text(
|
'No songs in queue\nGo to Voting to add some!',
|
||||||
"${(progress * 3.5).toInt()}:${((progress * 3.5 % 1) * 60).toInt().toString().padLeft(2, '0')}",
|
textAlign: TextAlign.center,
|
||||||
style: const TextStyle(color: Colors.grey, fontSize: 12),
|
style: TextStyle(
|
||||||
),
|
color: Colors.grey,
|
||||||
const Text(
|
fontSize: 16,
|
||||||
"3:30",
|
),
|
||||||
style: TextStyle(color: Colors.grey, fontSize: 12),
|
),
|
||||||
),
|
)
|
||||||
],
|
: ListView.builder(
|
||||||
|
itemCount: queue.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
return _buildQueueItem(queue[index], index + 1);
|
||||||
|
},
|
||||||
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
const SizedBox(height: 20), // Extra padding at bottom
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Queue Section
|
Widget _buildCurrentTrackCard(BuildContext context, SpotifyTrack currentTrack, MusicQueueService queueService) {
|
||||||
Expanded(
|
return Card(
|
||||||
flex: 1,
|
color: const Color(0xFF1E1E1E),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(20),
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
// Album Art
|
||||||
|
Container(
|
||||||
|
width: 160,
|
||||||
|
height: 160,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
color: const Color(0xFF2A2A2A),
|
||||||
|
),
|
||||||
|
child: currentTrack.album.images.isNotEmpty
|
||||||
|
? ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
child: Image.network(
|
||||||
|
currentTrack.album.images.first.url,
|
||||||
|
fit: BoxFit.cover,
|
||||||
|
errorBuilder: (context, error, stackTrace) {
|
||||||
|
return const Icon(
|
||||||
|
Icons.music_note,
|
||||||
|
size: 80,
|
||||||
|
color: Colors.grey,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: const Icon(
|
||||||
|
Icons.music_note,
|
||||||
|
size: 80,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 15),
|
||||||
|
|
||||||
|
// Track Info
|
||||||
|
Text(
|
||||||
|
currentTrack.name,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 18,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
Text(
|
||||||
|
currentTrack.artists.map((a) => a.name).join(', '),
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 14,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
Text(
|
||||||
|
currentTrack.album.name,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 12,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
|
||||||
|
// Progress Bar
|
||||||
|
const SizedBox(height: 15),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 20),
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
children: [
|
||||||
|
LinearProgressIndicator(
|
||||||
|
value: queueService.progress,
|
||||||
|
backgroundColor: Colors.grey[800],
|
||||||
|
valueColor: const AlwaysStoppedAnimation<Color>(Color(0xFF6366F1)),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
Row(
|
Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
children: [
|
children: [
|
||||||
const Text(
|
Text(
|
||||||
"Up Next",
|
_formatDuration((queueService.progress * currentTrack.durationMs / 1000).round()),
|
||||||
style: TextStyle(
|
style: const TextStyle(color: Colors.grey, fontSize: 12),
|
||||||
fontSize: 20,
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
color: Colors.white,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
Row(
|
Text(
|
||||||
children: [
|
currentTrack.duration,
|
||||||
Container(
|
style: const TextStyle(color: Colors.grey, fontSize: 12),
|
||||||
width: 8,
|
|
||||||
height: 8,
|
|
||||||
decoration: const BoxDecoration(
|
|
||||||
color: Color(0xFF22C55E),
|
|
||||||
shape: BoxShape.circle,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 6),
|
|
||||||
const Text(
|
|
||||||
"Live Queue",
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 12,
|
|
||||||
color: Color(0xFF22C55E),
|
|
||||||
fontWeight: FontWeight.w500,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
const SizedBox(height: 15),
|
|
||||||
Expanded(
|
|
||||||
child: ListView.builder(
|
|
||||||
itemCount: upcomingQueue.length,
|
|
||||||
itemBuilder: (context, index) {
|
|
||||||
final song = upcomingQueue[index];
|
|
||||||
return Container(
|
|
||||||
margin: const EdgeInsets.only(bottom: 10),
|
|
||||||
padding: const EdgeInsets.all(12),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: const Color(0xFF1E1E1E),
|
|
||||||
borderRadius: BorderRadius.circular(10),
|
|
||||||
),
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
// Queue Position
|
|
||||||
Container(
|
|
||||||
width: 24,
|
|
||||||
height: 24,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: index < 2
|
|
||||||
? const Color(0xFF6366F1)
|
|
||||||
: const Color(0xFF6366F1).withOpacity(0.3),
|
|
||||||
shape: BoxShape.circle,
|
|
||||||
),
|
|
||||||
child: Center(
|
|
||||||
child: Text(
|
|
||||||
'${index + 1}',
|
|
||||||
style: TextStyle(
|
|
||||||
color: index < 2 ? Colors.white : Colors.grey,
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
fontSize: 10,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 8),
|
|
||||||
|
|
||||||
Container(
|
|
||||||
width: 40,
|
|
||||||
height: 40,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: const Color(0xFF6366F1).withOpacity(0.2),
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
),
|
|
||||||
child: song["imageUrl"] != null && song["imageUrl"]!.isNotEmpty
|
|
||||||
? ClipRRect(
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
child: Image.network(
|
|
||||||
song["imageUrl"]!,
|
|
||||||
width: 40,
|
|
||||||
height: 40,
|
|
||||||
fit: BoxFit.cover,
|
|
||||||
errorBuilder: (context, error, stackTrace) {
|
|
||||||
return const Icon(
|
|
||||||
Icons.music_note,
|
|
||||||
color: Color(0xFF6366F1),
|
|
||||||
size: 20,
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: const Icon(
|
|
||||||
Icons.music_note,
|
|
||||||
color: Color(0xFF6366F1),
|
|
||||||
size: 20,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 12),
|
|
||||||
Expanded(
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Text(
|
|
||||||
song["title"]!,
|
|
||||||
style: const TextStyle(
|
|
||||||
color: Colors.white,
|
|
||||||
fontWeight: FontWeight.w500,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Text(
|
|
||||||
song["artist"]!,
|
|
||||||
style: const TextStyle(
|
|
||||||
color: Colors.grey,
|
|
||||||
fontSize: 12,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Container(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: const Color(0xFF6366F1).withOpacity(0.2),
|
|
||||||
borderRadius: BorderRadius.circular(12),
|
|
||||||
),
|
|
||||||
child: Row(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
const Icon(
|
|
||||||
Icons.thumb_up,
|
|
||||||
color: Color(0xFF6366F1),
|
|
||||||
size: 12,
|
|
||||||
),
|
|
||||||
const SizedBox(width: 4),
|
|
||||||
Text(
|
|
||||||
song["votes"]!,
|
|
||||||
style: const TextStyle(
|
|
||||||
color: Color(0xFF6366F1),
|
|
||||||
fontSize: 12,
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
@ -274,4 +204,114 @@ class _NowPlayingPageState extends State<NowPlayingPage> {
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Widget _buildNoTrackCard() {
|
||||||
|
return Card(
|
||||||
|
color: const Color(0xFF1E1E1E),
|
||||||
|
child: const Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.music_off,
|
||||||
|
size: 80,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
SizedBox(height: 20),
|
||||||
|
Text(
|
||||||
|
'No track playing',
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 20,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
Text(
|
||||||
|
'Add some songs from the Voting tab!',
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 16,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildPlaybackControls(MusicQueueService queueService) {
|
||||||
|
return Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||||
|
children: [
|
||||||
|
// Previous (disabled for now)
|
||||||
|
IconButton(
|
||||||
|
onPressed: null,
|
||||||
|
icon: const Icon(Icons.skip_previous),
|
||||||
|
iconSize: 40,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
|
||||||
|
// Play/Pause
|
||||||
|
IconButton(
|
||||||
|
onPressed: queueService.togglePlayPause,
|
||||||
|
icon: Icon(queueService.isPlaying ? Icons.pause_circle_filled : Icons.play_circle_filled),
|
||||||
|
iconSize: 60,
|
||||||
|
color: const Color(0xFF6366F1),
|
||||||
|
),
|
||||||
|
|
||||||
|
// Next
|
||||||
|
IconButton(
|
||||||
|
onPressed: queueService.queue.isNotEmpty ? queueService.skipTrack : null,
|
||||||
|
icon: const Icon(Icons.skip_next),
|
||||||
|
iconSize: 40,
|
||||||
|
color: queueService.queue.isNotEmpty ? Colors.white : Colors.grey,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildQueueItem(QueueItem item, int position) {
|
||||||
|
return Card(
|
||||||
|
color: const Color(0xFF1E1E1E),
|
||||||
|
margin: const EdgeInsets.only(bottom: 8),
|
||||||
|
child: ListTile(
|
||||||
|
leading: CircleAvatar(
|
||||||
|
backgroundColor: const Color(0xFF6366F1),
|
||||||
|
child: Text(
|
||||||
|
'$position',
|
||||||
|
style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
title: Text(
|
||||||
|
item.track.name,
|
||||||
|
style: const TextStyle(color: Colors.white, fontSize: 14),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
subtitle: Text(
|
||||||
|
item.track.artists.map((a) => a.name).join(', '),
|
||||||
|
style: const TextStyle(color: Colors.grey, fontSize: 12),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
trailing: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(Icons.thumb_up, color: Colors.green, size: 16),
|
||||||
|
const SizedBox(width: 4),
|
||||||
|
Text(
|
||||||
|
'${item.votes}',
|
||||||
|
style: const TextStyle(color: Colors.green, fontSize: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
String _formatDuration(int seconds) {
|
||||||
|
int minutes = seconds ~/ 60;
|
||||||
|
int remainingSeconds = seconds % 60;
|
||||||
|
return '${minutes}:${remainingSeconds.toString().padLeft(2, '0')}';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import '../services/spotify_service.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
import '../services/music_queue_service.dart';
|
||||||
import '../models/spotify_track.dart';
|
import '../models/spotify_track.dart';
|
||||||
|
|
||||||
class VotingPage extends StatefulWidget {
|
class VotingPage extends StatefulWidget {
|
||||||
|
@ -11,492 +12,358 @@ class VotingPage extends StatefulWidget {
|
||||||
|
|
||||||
class _VotingPageState extends State<VotingPage> {
|
class _VotingPageState extends State<VotingPage> {
|
||||||
final TextEditingController _searchController = TextEditingController();
|
final TextEditingController _searchController = TextEditingController();
|
||||||
final SpotifyService _spotifyService = SpotifyService();
|
List<SpotifyTrack> _searchResults = [];
|
||||||
|
bool _isLoading = false;
|
||||||
|
String _statusMessage = '';
|
||||||
|
|
||||||
List<Map<String, dynamic>> suggestedSongs = [
|
@override
|
||||||
{
|
void initState() {
|
||||||
"id": "1",
|
super.initState();
|
||||||
"title": "Ocean Breeze",
|
_loadInitialQueue();
|
||||||
"artist": "Lofi Dreams",
|
}
|
||||||
"votes": 12,
|
|
||||||
"userVoted": false,
|
|
||||||
"duration": "3:45",
|
|
||||||
"imageUrl": "https://i.scdn.co/image/ocean"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "2",
|
|
||||||
"title": "Sunset Melody",
|
|
||||||
"artist": "Acoustic Soul",
|
|
||||||
"votes": 8,
|
|
||||||
"userVoted": true,
|
|
||||||
"duration": "4:12",
|
|
||||||
"imageUrl": "https://i.scdn.co/image/sunset"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "3",
|
|
||||||
"title": "Peaceful Waters",
|
|
||||||
"artist": "Nature Sounds",
|
|
||||||
"votes": 5,
|
|
||||||
"userVoted": false,
|
|
||||||
"duration": "3:20",
|
|
||||||
"imageUrl": "https://i.scdn.co/image/water"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "4",
|
|
||||||
"title": "Summer Nights",
|
|
||||||
"artist": "Chill Vibes",
|
|
||||||
"votes": 3,
|
|
||||||
"userVoted": false,
|
|
||||||
"duration": "3:55",
|
|
||||||
"imageUrl": "https://i.scdn.co/image/night"
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
List<SpotifyTrack> searchResults = [];
|
Future<void> _loadInitialQueue() async {
|
||||||
bool isSearching = false;
|
final queueService = Provider.of<MusicQueueService>(context, listen: false);
|
||||||
|
await queueService.initializeQueue();
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> _searchSpotify(String query) async {
|
Future<void> _searchSpotify(String query) async {
|
||||||
if (query.isEmpty) {
|
if (query.isEmpty) return;
|
||||||
setState(() {
|
|
||||||
searchResults = [];
|
|
||||||
isSearching = false;
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setState(() {
|
setState(() {
|
||||||
isSearching = true;
|
_isLoading = true;
|
||||||
|
_statusMessage = 'Searching for "$query"...';
|
||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final tracks = await _spotifyService.searchTracks(query, limit: 10);
|
final queueService = Provider.of<MusicQueueService>(context, listen: false);
|
||||||
|
final results = await queueService.searchTracks(query);
|
||||||
|
|
||||||
setState(() {
|
setState(() {
|
||||||
searchResults = tracks;
|
_searchResults = results;
|
||||||
isSearching = false;
|
_isLoading = false;
|
||||||
|
_statusMessage = results.isEmpty
|
||||||
|
? 'No tracks found for "$query"'
|
||||||
|
: 'Found ${results.length} tracks';
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
print('Error searching Spotify: $e');
|
|
||||||
setState(() {
|
setState(() {
|
||||||
searchResults = [];
|
_isLoading = false;
|
||||||
isSearching = false;
|
_statusMessage = 'Search failed: ${e.toString()}';
|
||||||
|
_searchResults = [];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void _upvote(int index) {
|
|
||||||
setState(() {
|
|
||||||
suggestedSongs[index]["votes"]++;
|
|
||||||
if (!suggestedSongs[index]["userVoted"]) {
|
|
||||||
suggestedSongs[index]["userVoted"] = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sort by votes to update queue order
|
|
||||||
suggestedSongs.sort((a, b) => b["votes"].compareTo(a["votes"]));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
void _downvote(int index) {
|
|
||||||
setState(() {
|
|
||||||
if (suggestedSongs[index]["votes"] > 0) {
|
|
||||||
suggestedSongs[index]["votes"]--;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sort by votes to update queue order
|
|
||||||
suggestedSongs.sort((a, b) => b["votes"].compareTo(a["votes"]));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
void _addToQueue(SpotifyTrack track) {
|
void _addToQueue(SpotifyTrack track) {
|
||||||
setState(() {
|
final queueService = Provider.of<MusicQueueService>(context, listen: false);
|
||||||
suggestedSongs.insert(0, {
|
queueService.addToQueue(track);
|
||||||
"id": track.id,
|
|
||||||
"title": track.name,
|
|
||||||
"artist": track.artistNames,
|
|
||||||
"votes": 1,
|
|
||||||
"userVoted": true,
|
|
||||||
"duration": track.duration,
|
|
||||||
"imageUrl": track.imageUrl,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// Show confirmation
|
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
SnackBar(
|
SnackBar(
|
||||||
content: Text('Added "${track.name}" to queue!'),
|
content: Text('Added "${track.name}" to queue'),
|
||||||
backgroundColor: const Color(0xFF6366F1),
|
|
||||||
duration: const Duration(seconds: 2),
|
duration: const Duration(seconds: 2),
|
||||||
|
backgroundColor: const Color(0xFF6366F1),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
// Clear search
|
|
||||||
_searchController.clear();
|
|
||||||
setState(() {
|
|
||||||
searchResults = [];
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Container(
|
return Consumer<MusicQueueService>(
|
||||||
color: const Color(0xFF121212),
|
builder: (context, queueService, child) {
|
||||||
child: Padding(
|
return Scaffold(
|
||||||
padding: const EdgeInsets.all(20.0),
|
backgroundColor: const Color(0xFF121212),
|
||||||
child: Column(
|
body: SafeArea(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
child: Column(
|
||||||
children: [
|
|
||||||
// Search Section
|
|
||||||
const Text(
|
|
||||||
'Suggest a Song',
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 24,
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
color: Colors.white,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 15),
|
|
||||||
|
|
||||||
// Search Bar
|
|
||||||
Container(
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: const Color(0xFF1E1E1E),
|
|
||||||
borderRadius: BorderRadius.circular(12),
|
|
||||||
),
|
|
||||||
child: TextField(
|
|
||||||
controller: _searchController,
|
|
||||||
style: const TextStyle(color: Colors.white),
|
|
||||||
decoration: const InputDecoration(
|
|
||||||
hintText: 'Search for songs, artists...',
|
|
||||||
hintStyle: TextStyle(color: Colors.grey),
|
|
||||||
prefixIcon: Icon(Icons.search, color: Color(0xFF6366F1)),
|
|
||||||
border: InputBorder.none,
|
|
||||||
contentPadding: EdgeInsets.all(16),
|
|
||||||
),
|
|
||||||
onChanged: (value) {
|
|
||||||
// Search Spotify when user types
|
|
||||||
_searchSpotify(value);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
|
|
||||||
// Search Results (shown when typing)
|
|
||||||
if (_searchController.text.isNotEmpty || searchResults.isNotEmpty) ...[
|
|
||||||
const SizedBox(height: 15),
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
const Text(
|
|
||||||
'Search Results',
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 18,
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
color: Colors.white,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
if (isSearching) ...[
|
|
||||||
const SizedBox(width: 10),
|
|
||||||
const SizedBox(
|
|
||||||
width: 16,
|
|
||||||
height: 16,
|
|
||||||
child: CircularProgressIndicator(
|
|
||||||
strokeWidth: 2,
|
|
||||||
valueColor: AlwaysStoppedAnimation<Color>(Color(0xFF6366F1)),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
],
|
|
||||||
),
|
|
||||||
const SizedBox(height: 10),
|
|
||||||
Container(
|
|
||||||
height: 200,
|
|
||||||
child: searchResults.isEmpty && !isSearching
|
|
||||||
? const Center(
|
|
||||||
child: Text(
|
|
||||||
'No tracks found',
|
|
||||||
style: TextStyle(color: Colors.grey),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: ListView.builder(
|
|
||||||
itemCount: searchResults.length,
|
|
||||||
itemBuilder: (context, index) {
|
|
||||||
final track = searchResults[index];
|
|
||||||
return Container(
|
|
||||||
margin: const EdgeInsets.only(bottom: 8),
|
|
||||||
padding: const EdgeInsets.all(12),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: const Color(0xFF1E1E1E),
|
|
||||||
borderRadius: BorderRadius.circular(10),
|
|
||||||
),
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
Container(
|
|
||||||
width: 40,
|
|
||||||
height: 40,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: const Color(0xFF6366F1).withOpacity(0.2),
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
),
|
|
||||||
child: track.imageUrl.isNotEmpty
|
|
||||||
? ClipRRect(
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
child: Image.network(
|
|
||||||
track.imageUrl,
|
|
||||||
width: 40,
|
|
||||||
height: 40,
|
|
||||||
fit: BoxFit.cover,
|
|
||||||
errorBuilder: (context, error, stackTrace) {
|
|
||||||
return const Icon(
|
|
||||||
Icons.music_note,
|
|
||||||
color: Color(0xFF6366F1),
|
|
||||||
size: 20,
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: const Icon(
|
|
||||||
Icons.music_note,
|
|
||||||
color: Color(0xFF6366F1),
|
|
||||||
size: 20,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 12),
|
|
||||||
Expanded(
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Text(
|
|
||||||
track.name,
|
|
||||||
style: const TextStyle(
|
|
||||||
color: Colors.white,
|
|
||||||
fontWeight: FontWeight.w500,
|
|
||||||
),
|
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
),
|
|
||||||
Text(
|
|
||||||
"${track.artistNames} • ${track.duration}",
|
|
||||||
style: const TextStyle(
|
|
||||||
color: Colors.grey,
|
|
||||||
fontSize: 12,
|
|
||||||
),
|
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
ElevatedButton(
|
|
||||||
onPressed: () => _addToQueue(track),
|
|
||||||
style: ElevatedButton.styleFrom(
|
|
||||||
backgroundColor: const Color(0xFF6366F1),
|
|
||||||
foregroundColor: Colors.white,
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
|
||||||
minimumSize: const Size(60, 30),
|
|
||||||
),
|
|
||||||
child: const Text(
|
|
||||||
'Add',
|
|
||||||
style: TextStyle(fontSize: 12),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
|
|
||||||
const SizedBox(height: 20),
|
|
||||||
|
|
||||||
// Voting Queue Section
|
|
||||||
Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
children: [
|
children: [
|
||||||
const Text(
|
// Header with Search
|
||||||
'Community Queue',
|
Container(
|
||||||
style: TextStyle(
|
padding: const EdgeInsets.all(20),
|
||||||
fontSize: 20,
|
child: Column(
|
||||||
fontWeight: FontWeight.bold,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
color: Colors.white,
|
children: [
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
const Text(
|
||||||
|
'Voting',
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 24,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// Status indicator
|
||||||
|
Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: const Color(0xFF6366F1).withOpacity(0.2),
|
||||||
|
borderRadius: BorderRadius.circular(20),
|
||||||
|
border: Border.all(
|
||||||
|
color: const Color(0xFF6366F1),
|
||||||
|
width: 1,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: const Text(
|
||||||
|
'🎵 Spotify',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Color(0xFF6366F1),
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 20),
|
||||||
|
|
||||||
|
// Search Bar
|
||||||
|
TextField(
|
||||||
|
controller: _searchController,
|
||||||
|
style: const TextStyle(color: Colors.white),
|
||||||
|
decoration: InputDecoration(
|
||||||
|
hintText: 'Search for songs, artists, albums...',
|
||||||
|
hintStyle: const TextStyle(color: Colors.grey),
|
||||||
|
prefixIcon: const Icon(Icons.search, color: Colors.grey),
|
||||||
|
suffixIcon: _isLoading
|
||||||
|
? const Padding(
|
||||||
|
padding: EdgeInsets.all(12),
|
||||||
|
child: SizedBox(
|
||||||
|
width: 20,
|
||||||
|
height: 20,
|
||||||
|
child: CircularProgressIndicator(
|
||||||
|
strokeWidth: 2,
|
||||||
|
valueColor: AlwaysStoppedAnimation<Color>(Color(0xFF6366F1)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: null,
|
||||||
|
filled: true,
|
||||||
|
fillColor: const Color(0xFF1E1E1E),
|
||||||
|
border: OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
borderSide: BorderSide.none,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onSubmitted: _searchSpotify,
|
||||||
|
),
|
||||||
|
|
||||||
|
// Status Message
|
||||||
|
if (_statusMessage.isNotEmpty)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 8),
|
||||||
|
child: Text(
|
||||||
|
_statusMessage,
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 14,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Container(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
|
// Search Results and Queue
|
||||||
decoration: BoxDecoration(
|
Expanded(
|
||||||
color: const Color(0xFF6366F1).withOpacity(0.2),
|
child: DefaultTabController(
|
||||||
borderRadius: BorderRadius.circular(8),
|
length: 2,
|
||||||
),
|
child: Column(
|
||||||
child: const Text(
|
children: [
|
||||||
'↑↓ Vote to reorder',
|
const TabBar(
|
||||||
style: TextStyle(
|
labelColor: Color(0xFF6366F1),
|
||||||
color: Color(0xFF6366F1),
|
unselectedLabelColor: Colors.grey,
|
||||||
fontSize: 11,
|
indicatorColor: Color(0xFF6366F1),
|
||||||
fontWeight: FontWeight.w500,
|
tabs: [
|
||||||
|
Tab(text: 'Search Results'),
|
||||||
|
Tab(text: 'Queue'),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: TabBarView(
|
||||||
|
children: [
|
||||||
|
// Search Results Tab
|
||||||
|
_buildSearchResults(),
|
||||||
|
// Queue Tab
|
||||||
|
_buildQueueView(queueService),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
const SizedBox(height: 15),
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Queue List
|
Widget _buildSearchResults() {
|
||||||
|
if (_searchResults.isEmpty && !_isLoading) {
|
||||||
|
return const Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.search,
|
||||||
|
size: 80,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
SizedBox(height: 20),
|
||||||
|
Text(
|
||||||
|
'Search for songs to add to the queue',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 16,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ListView.builder(
|
||||||
|
padding: const EdgeInsets.all(20),
|
||||||
|
itemCount: _searchResults.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final track = _searchResults[index];
|
||||||
|
return _buildTrackCard(track);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildQueueView(MusicQueueService queueService) {
|
||||||
|
final queue = queueService.queue;
|
||||||
|
|
||||||
|
if (queue.isEmpty) {
|
||||||
|
return const Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.queue_music,
|
||||||
|
size: 80,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
SizedBox(height: 20),
|
||||||
|
Text(
|
||||||
|
'Queue is empty',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 18,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
Text(
|
||||||
|
'Search and add songs to get started!',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 16,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ListView.builder(
|
||||||
|
padding: const EdgeInsets.all(20),
|
||||||
|
itemCount: queue.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final queueItem = queue[index];
|
||||||
|
return _buildQueueItemCard(queueItem, index, queueService);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildTrackCard(SpotifyTrack track) {
|
||||||
|
return Card(
|
||||||
|
color: const Color(0xFF1E1E1E),
|
||||||
|
margin: const EdgeInsets.only(bottom: 12),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(12),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
// Album Art
|
||||||
|
Container(
|
||||||
|
width: 60,
|
||||||
|
height: 60,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
color: const Color(0xFF2A2A2A),
|
||||||
|
),
|
||||||
|
child: track.album.images.isNotEmpty
|
||||||
|
? ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
child: Image.network(
|
||||||
|
track.album.images.first.url,
|
||||||
|
fit: BoxFit.cover,
|
||||||
|
errorBuilder: (context, error, stackTrace) {
|
||||||
|
return const Icon(
|
||||||
|
Icons.music_note,
|
||||||
|
color: Colors.grey,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: const Icon(
|
||||||
|
Icons.music_note,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
|
||||||
|
// Track Info
|
||||||
Expanded(
|
Expanded(
|
||||||
child: ListView.builder(
|
child: Column(
|
||||||
itemCount: suggestedSongs.length,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
itemBuilder: (context, index) {
|
children: [
|
||||||
final song = suggestedSongs[index];
|
Text(
|
||||||
return Container(
|
track.name,
|
||||||
margin: const EdgeInsets.only(bottom: 10),
|
style: const TextStyle(
|
||||||
padding: const EdgeInsets.all(15),
|
color: Colors.white,
|
||||||
decoration: BoxDecoration(
|
fontWeight: FontWeight.bold,
|
||||||
color: const Color(0xFF1E1E1E),
|
fontSize: 16,
|
||||||
borderRadius: BorderRadius.circular(12),
|
|
||||||
border: song["userVoted"]
|
|
||||||
? Border.all(color: const Color(0xFF6366F1), width: 1)
|
|
||||||
: null,
|
|
||||||
),
|
),
|
||||||
child: Row(
|
maxLines: 1,
|
||||||
children: [
|
overflow: TextOverflow.ellipsis,
|
||||||
// Queue Position
|
),
|
||||||
Container(
|
const SizedBox(height: 4),
|
||||||
width: 30,
|
Text(
|
||||||
height: 30,
|
track.artists.map((a) => a.name).join(', '),
|
||||||
decoration: BoxDecoration(
|
style: const TextStyle(
|
||||||
color: index < 3
|
color: Colors.grey,
|
||||||
? const Color(0xFF6366F1)
|
fontSize: 14,
|
||||||
: const Color(0xFF6366F1).withOpacity(0.3),
|
|
||||||
shape: BoxShape.circle,
|
|
||||||
),
|
|
||||||
child: Center(
|
|
||||||
child: Text(
|
|
||||||
'${index + 1}',
|
|
||||||
style: TextStyle(
|
|
||||||
color: index < 3 ? Colors.white : Colors.grey,
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
fontSize: 12,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 12),
|
|
||||||
|
|
||||||
// Album Art
|
|
||||||
Container(
|
|
||||||
width: 50,
|
|
||||||
height: 50,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: const Color(0xFF6366F1).withOpacity(0.2),
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
),
|
|
||||||
child: song["imageUrl"] != null && song["imageUrl"].isNotEmpty
|
|
||||||
? ClipRRect(
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
child: Image.network(
|
|
||||||
song["imageUrl"],
|
|
||||||
width: 50,
|
|
||||||
height: 50,
|
|
||||||
fit: BoxFit.cover,
|
|
||||||
errorBuilder: (context, error, stackTrace) {
|
|
||||||
return const Icon(
|
|
||||||
Icons.music_note,
|
|
||||||
color: Color(0xFF6366F1),
|
|
||||||
size: 24,
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: const Icon(
|
|
||||||
Icons.music_note,
|
|
||||||
color: Color(0xFF6366F1),
|
|
||||||
size: 24,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 15),
|
|
||||||
|
|
||||||
// Song Info
|
|
||||||
Expanded(
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Text(
|
|
||||||
song["title"],
|
|
||||||
style: const TextStyle(
|
|
||||||
color: Colors.white,
|
|
||||||
fontWeight: FontWeight.w600,
|
|
||||||
fontSize: 16,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 4),
|
|
||||||
Text(
|
|
||||||
"${song["artist"]} • ${song["duration"]}",
|
|
||||||
style: const TextStyle(
|
|
||||||
color: Colors.grey,
|
|
||||||
fontSize: 14,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
|
|
||||||
// Vote Buttons
|
|
||||||
Column(
|
|
||||||
children: [
|
|
||||||
// Upvote Button
|
|
||||||
GestureDetector(
|
|
||||||
onTap: () => _upvote(index),
|
|
||||||
child: Container(
|
|
||||||
padding: const EdgeInsets.all(8),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: const Color(0xFF22C55E).withOpacity(0.2),
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
),
|
|
||||||
child: const Icon(
|
|
||||||
Icons.keyboard_arrow_up,
|
|
||||||
color: Color(0xFF22C55E),
|
|
||||||
size: 20,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
|
|
||||||
// Vote Count
|
|
||||||
Container(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: const Color(0xFF6366F1).withOpacity(0.2),
|
|
||||||
borderRadius: BorderRadius.circular(12),
|
|
||||||
),
|
|
||||||
child: Text(
|
|
||||||
'${song["votes"]}',
|
|
||||||
style: const TextStyle(
|
|
||||||
color: Color(0xFF6366F1),
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
fontSize: 14,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
|
|
||||||
// Downvote Button
|
|
||||||
GestureDetector(
|
|
||||||
onTap: () => _downvote(index),
|
|
||||||
child: Container(
|
|
||||||
padding: const EdgeInsets.all(8),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: const Color(0xFFEF4444).withOpacity(0.2),
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
),
|
|
||||||
child: const Icon(
|
|
||||||
Icons.keyboard_arrow_down,
|
|
||||||
color: Color(0xFFEF4444),
|
|
||||||
size: 20,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
);
|
maxLines: 1,
|
||||||
},
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Text(
|
||||||
|
track.album.name,
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
// Add Button
|
||||||
|
IconButton(
|
||||||
|
onPressed: () => _addToQueue(track),
|
||||||
|
icon: const Icon(
|
||||||
|
Icons.add_circle,
|
||||||
|
color: Color(0xFF6366F1),
|
||||||
|
size: 32,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
@ -505,9 +372,120 @@ class _VotingPageState extends State<VotingPage> {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
Widget _buildQueueItemCard(QueueItem queueItem, int index, MusicQueueService queueService) {
|
||||||
void dispose() {
|
return Card(
|
||||||
_searchController.dispose();
|
color: const Color(0xFF1E1E1E),
|
||||||
super.dispose();
|
margin: const EdgeInsets.only(bottom: 12),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(12),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
// Position
|
||||||
|
CircleAvatar(
|
||||||
|
backgroundColor: const Color(0xFF6366F1),
|
||||||
|
radius: 16,
|
||||||
|
child: Text(
|
||||||
|
'${index + 1}',
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
|
||||||
|
// Album Art
|
||||||
|
Container(
|
||||||
|
width: 50,
|
||||||
|
height: 50,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
color: const Color(0xFF2A2A2A),
|
||||||
|
),
|
||||||
|
child: queueItem.track.album.images.isNotEmpty
|
||||||
|
? ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
child: Image.network(
|
||||||
|
queueItem.track.album.images.first.url,
|
||||||
|
fit: BoxFit.cover,
|
||||||
|
errorBuilder: (context, error, stackTrace) {
|
||||||
|
return const Icon(
|
||||||
|
Icons.music_note,
|
||||||
|
color: Colors.grey,
|
||||||
|
size: 20,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: const Icon(
|
||||||
|
Icons.music_note,
|
||||||
|
color: Colors.grey,
|
||||||
|
size: 20,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
|
||||||
|
// Track Info
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
queueItem.track.name,
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontSize: 14,
|
||||||
|
),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 2),
|
||||||
|
Text(
|
||||||
|
queueItem.track.artists.map((a) => a.name).join(', '),
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
// Voting Buttons
|
||||||
|
Column(
|
||||||
|
children: [
|
||||||
|
IconButton(
|
||||||
|
onPressed: () => queueService.upvote(index),
|
||||||
|
icon: const Icon(
|
||||||
|
Icons.keyboard_arrow_up,
|
||||||
|
color: Colors.green,
|
||||||
|
size: 28,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
'${queueItem.votes}',
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
onPressed: () => queueService.downvote(index),
|
||||||
|
icon: const Icon(
|
||||||
|
Icons.keyboard_arrow_down,
|
||||||
|
color: Colors.red,
|
||||||
|
size: 28,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
491
CHALLENGE_2/sleepysound/lib/pages/voting_page_new.dart
Normal file
491
CHALLENGE_2/sleepysound/lib/pages/voting_page_new.dart
Normal file
|
@ -0,0 +1,491 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
import '../services/music_queue_service.dart';
|
||||||
|
import '../models/spotify_track.dart';
|
||||||
|
|
||||||
|
class VotingPage extends StatefulWidget {
|
||||||
|
const VotingPage({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<VotingPage> createState() => _VotingPageState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _VotingPageState extends State<VotingPage> {
|
||||||
|
final TextEditingController _searchController = TextEditingController();
|
||||||
|
List<SpotifyTrack> _searchResults = [];
|
||||||
|
bool _isLoading = false;
|
||||||
|
String _statusMessage = '';
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_loadInitialQueue();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _loadInitialQueue() async {
|
||||||
|
final queueService = Provider.of<MusicQueueService>(context, listen: false);
|
||||||
|
await queueService.initializeQueue();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _searchSpotify(String query) async {
|
||||||
|
if (query.isEmpty) return;
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
_isLoading = true;
|
||||||
|
_statusMessage = 'Searching for "$query"...';
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
final queueService = Provider.of<MusicQueueService>(context, listen: false);
|
||||||
|
final results = await queueService.searchTracks(query);
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
_searchResults = results;
|
||||||
|
_isLoading = false;
|
||||||
|
_statusMessage = results.isEmpty
|
||||||
|
? 'No tracks found for "$query"'
|
||||||
|
: 'Found ${results.length} tracks';
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
setState(() {
|
||||||
|
_isLoading = false;
|
||||||
|
_statusMessage = 'Search failed: ${e.toString()}';
|
||||||
|
_searchResults = [];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _addToQueue(SpotifyTrack track) {
|
||||||
|
final queueService = Provider.of<MusicQueueService>(context, listen: false);
|
||||||
|
queueService.addToQueue(track);
|
||||||
|
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Text('Added "${track.name}" to queue'),
|
||||||
|
duration: const Duration(seconds: 2),
|
||||||
|
backgroundColor: const Color(0xFF6366F1),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Consumer<MusicQueueService>(
|
||||||
|
builder: (context, queueService, child) {
|
||||||
|
return Scaffold(
|
||||||
|
backgroundColor: const Color(0xFF121212),
|
||||||
|
body: SafeArea(
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
// Header with Search
|
||||||
|
Container(
|
||||||
|
padding: const EdgeInsets.all(20),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
const Text(
|
||||||
|
'Voting',
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 24,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// Status indicator
|
||||||
|
Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: const Color(0xFF6366F1).withOpacity(0.2),
|
||||||
|
borderRadius: BorderRadius.circular(20),
|
||||||
|
border: Border.all(
|
||||||
|
color: const Color(0xFF6366F1),
|
||||||
|
width: 1,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: const Text(
|
||||||
|
'🎵 Spotify',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Color(0xFF6366F1),
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 20),
|
||||||
|
|
||||||
|
// Search Bar
|
||||||
|
TextField(
|
||||||
|
controller: _searchController,
|
||||||
|
style: const TextStyle(color: Colors.white),
|
||||||
|
decoration: InputDecoration(
|
||||||
|
hintText: 'Search for songs, artists, albums...',
|
||||||
|
hintStyle: const TextStyle(color: Colors.grey),
|
||||||
|
prefixIcon: const Icon(Icons.search, color: Colors.grey),
|
||||||
|
suffixIcon: _isLoading
|
||||||
|
? const Padding(
|
||||||
|
padding: EdgeInsets.all(12),
|
||||||
|
child: SizedBox(
|
||||||
|
width: 20,
|
||||||
|
height: 20,
|
||||||
|
child: CircularProgressIndicator(
|
||||||
|
strokeWidth: 2,
|
||||||
|
valueColor: AlwaysStoppedAnimation<Color>(Color(0xFF6366F1)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: null,
|
||||||
|
filled: true,
|
||||||
|
fillColor: const Color(0xFF1E1E1E),
|
||||||
|
border: OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
borderSide: BorderSide.none,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onSubmitted: _searchSpotify,
|
||||||
|
),
|
||||||
|
|
||||||
|
// Status Message
|
||||||
|
if (_statusMessage.isNotEmpty)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 8),
|
||||||
|
child: Text(
|
||||||
|
_statusMessage,
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 14,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
// Search Results and Queue
|
||||||
|
Expanded(
|
||||||
|
child: DefaultTabController(
|
||||||
|
length: 2,
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
const TabBar(
|
||||||
|
labelColor: Color(0xFF6366F1),
|
||||||
|
unselectedLabelColor: Colors.grey,
|
||||||
|
indicatorColor: Color(0xFF6366F1),
|
||||||
|
tabs: [
|
||||||
|
Tab(text: 'Search Results'),
|
||||||
|
Tab(text: 'Queue'),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: TabBarView(
|
||||||
|
children: [
|
||||||
|
// Search Results Tab
|
||||||
|
_buildSearchResults(),
|
||||||
|
// Queue Tab
|
||||||
|
_buildQueueView(queueService),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildSearchResults() {
|
||||||
|
if (_searchResults.isEmpty && !_isLoading) {
|
||||||
|
return const Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.search,
|
||||||
|
size: 80,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
SizedBox(height: 20),
|
||||||
|
Text(
|
||||||
|
'Search for songs to add to the queue',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 16,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ListView.builder(
|
||||||
|
padding: const EdgeInsets.all(20),
|
||||||
|
itemCount: _searchResults.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final track = _searchResults[index];
|
||||||
|
return _buildTrackCard(track);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildQueueView(MusicQueueService queueService) {
|
||||||
|
final queue = queueService.queue;
|
||||||
|
|
||||||
|
if (queue.isEmpty) {
|
||||||
|
return const Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.queue_music,
|
||||||
|
size: 80,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
SizedBox(height: 20),
|
||||||
|
Text(
|
||||||
|
'Queue is empty',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 18,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
Text(
|
||||||
|
'Search and add songs to get started!',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 16,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ListView.builder(
|
||||||
|
padding: const EdgeInsets.all(20),
|
||||||
|
itemCount: queue.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final queueItem = queue[index];
|
||||||
|
return _buildQueueItemCard(queueItem, index, queueService);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildTrackCard(SpotifyTrack track) {
|
||||||
|
return Card(
|
||||||
|
color: const Color(0xFF1E1E1E),
|
||||||
|
margin: const EdgeInsets.only(bottom: 12),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(12),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
// Album Art
|
||||||
|
Container(
|
||||||
|
width: 60,
|
||||||
|
height: 60,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
color: const Color(0xFF2A2A2A),
|
||||||
|
),
|
||||||
|
child: track.album.images.isNotEmpty
|
||||||
|
? ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
child: Image.network(
|
||||||
|
track.album.images.first.url,
|
||||||
|
fit: BoxFit.cover,
|
||||||
|
errorBuilder: (context, error, stackTrace) {
|
||||||
|
return const Icon(
|
||||||
|
Icons.music_note,
|
||||||
|
color: Colors.grey,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: const Icon(
|
||||||
|
Icons.music_note,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
|
||||||
|
// Track Info
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
track.name,
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontSize: 16,
|
||||||
|
),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Text(
|
||||||
|
track.artists.map((a) => a.name).join(', '),
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 14,
|
||||||
|
),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Text(
|
||||||
|
track.album.name,
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
// Add Button
|
||||||
|
IconButton(
|
||||||
|
onPressed: () => _addToQueue(track),
|
||||||
|
icon: const Icon(
|
||||||
|
Icons.add_circle,
|
||||||
|
color: Color(0xFF6366F1),
|
||||||
|
size: 32,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildQueueItemCard(QueueItem queueItem, int index, MusicQueueService queueService) {
|
||||||
|
return Card(
|
||||||
|
color: const Color(0xFF1E1E1E),
|
||||||
|
margin: const EdgeInsets.only(bottom: 12),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(12),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
// Position
|
||||||
|
CircleAvatar(
|
||||||
|
backgroundColor: const Color(0xFF6366F1),
|
||||||
|
radius: 16,
|
||||||
|
child: Text(
|
||||||
|
'${index + 1}',
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
|
||||||
|
// Album Art
|
||||||
|
Container(
|
||||||
|
width: 50,
|
||||||
|
height: 50,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
color: const Color(0xFF2A2A2A),
|
||||||
|
),
|
||||||
|
child: queueItem.track.album.images.isNotEmpty
|
||||||
|
? ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
child: Image.network(
|
||||||
|
queueItem.track.album.images.first.url,
|
||||||
|
fit: BoxFit.cover,
|
||||||
|
errorBuilder: (context, error, stackTrace) {
|
||||||
|
return const Icon(
|
||||||
|
Icons.music_note,
|
||||||
|
color: Colors.grey,
|
||||||
|
size: 20,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: const Icon(
|
||||||
|
Icons.music_note,
|
||||||
|
color: Colors.grey,
|
||||||
|
size: 20,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
|
||||||
|
// Track Info
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
queueItem.track.name,
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontSize: 14,
|
||||||
|
),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 2),
|
||||||
|
Text(
|
||||||
|
queueItem.track.artists.map((a) => a.name).join(', '),
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
// Voting Buttons
|
||||||
|
Column(
|
||||||
|
children: [
|
||||||
|
IconButton(
|
||||||
|
onPressed: () => queueService.upvote(index),
|
||||||
|
icon: const Icon(
|
||||||
|
Icons.keyboard_arrow_up,
|
||||||
|
color: Colors.green,
|
||||||
|
size: 28,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
'${queueItem.votes}',
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
onPressed: () => queueService.downvote(index),
|
||||||
|
icon: const Icon(
|
||||||
|
Icons.keyboard_arrow_down,
|
||||||
|
color: Colors.red,
|
||||||
|
size: 28,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
204
CHALLENGE_2/sleepysound/lib/services/music_queue_service.dart
Normal file
204
CHALLENGE_2/sleepysound/lib/services/music_queue_service.dart
Normal file
|
@ -0,0 +1,204 @@
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import '../models/spotify_track.dart';
|
||||||
|
import '../services/spotify_service.dart';
|
||||||
|
|
||||||
|
class QueueItem {
|
||||||
|
final SpotifyTrack track;
|
||||||
|
int votes;
|
||||||
|
bool userVoted;
|
||||||
|
final DateTime addedAt;
|
||||||
|
|
||||||
|
QueueItem({
|
||||||
|
required this.track,
|
||||||
|
this.votes = 1,
|
||||||
|
this.userVoted = true,
|
||||||
|
DateTime? addedAt,
|
||||||
|
}) : addedAt = addedAt ?? DateTime.now();
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => {
|
||||||
|
'id': track.id,
|
||||||
|
'title': track.name,
|
||||||
|
'artist': track.artistNames,
|
||||||
|
'votes': votes,
|
||||||
|
'userVoted': userVoted,
|
||||||
|
'duration': track.duration,
|
||||||
|
'imageUrl': track.imageUrl,
|
||||||
|
'addedAt': addedAt.toIso8601String(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
class MusicQueueService extends ChangeNotifier {
|
||||||
|
static final MusicQueueService _instance = MusicQueueService._internal();
|
||||||
|
factory MusicQueueService() => _instance;
|
||||||
|
MusicQueueService._internal();
|
||||||
|
|
||||||
|
final SpotifyService _spotifyService = SpotifyService();
|
||||||
|
|
||||||
|
// Current playing track
|
||||||
|
SpotifyTrack? _currentTrack;
|
||||||
|
bool _isPlaying = false;
|
||||||
|
double _progress = 0.0;
|
||||||
|
|
||||||
|
// Queue management
|
||||||
|
final List<QueueItem> _queue = [];
|
||||||
|
|
||||||
|
// Recently played
|
||||||
|
final List<SpotifyTrack> _recentlyPlayed = [];
|
||||||
|
|
||||||
|
// Getters
|
||||||
|
SpotifyTrack? get currentTrack => _currentTrack;
|
||||||
|
bool get isPlaying => _isPlaying;
|
||||||
|
double get progress => _progress;
|
||||||
|
List<QueueItem> get queue => List.unmodifiable(_queue);
|
||||||
|
List<SpotifyTrack> get recentlyPlayed => List.unmodifiable(_recentlyPlayed);
|
||||||
|
|
||||||
|
// Queue operations
|
||||||
|
void addToQueue(SpotifyTrack track) {
|
||||||
|
// Check if track is already in queue
|
||||||
|
final existingIndex = _queue.indexWhere((item) => item.track.id == track.id);
|
||||||
|
|
||||||
|
if (existingIndex != -1) {
|
||||||
|
// If track exists, upvote it
|
||||||
|
upvote(existingIndex);
|
||||||
|
} else {
|
||||||
|
// Add new track to queue
|
||||||
|
final queueItem = QueueItem(track: track);
|
||||||
|
_queue.add(queueItem);
|
||||||
|
_sortQueue();
|
||||||
|
notifyListeners();
|
||||||
|
print('Added "${track.name}" by ${track.artistNames} to queue');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void upvote(int index) {
|
||||||
|
if (index >= 0 && index < _queue.length) {
|
||||||
|
_queue[index].votes++;
|
||||||
|
if (!_queue[index].userVoted) {
|
||||||
|
_queue[index].userVoted = true;
|
||||||
|
}
|
||||||
|
_sortQueue();
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void downvote(int index) {
|
||||||
|
if (index >= 0 && index < _queue.length) {
|
||||||
|
if (_queue[index].votes > 0) {
|
||||||
|
_queue[index].votes--;
|
||||||
|
}
|
||||||
|
_sortQueue();
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _sortQueue() {
|
||||||
|
_queue.sort((a, b) {
|
||||||
|
// First sort by votes (descending)
|
||||||
|
final voteComparison = b.votes.compareTo(a.votes);
|
||||||
|
if (voteComparison != 0) return voteComparison;
|
||||||
|
|
||||||
|
// If votes are equal, sort by time added (ascending - first come first serve)
|
||||||
|
return a.addedAt.compareTo(b.addedAt);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Playback simulation
|
||||||
|
void playNext() {
|
||||||
|
if (_queue.isNotEmpty) {
|
||||||
|
final nextItem = _queue.removeAt(0);
|
||||||
|
_currentTrack = nextItem.track;
|
||||||
|
_isPlaying = true;
|
||||||
|
_progress = 0.0;
|
||||||
|
|
||||||
|
// Add to recently played
|
||||||
|
_recentlyPlayed.insert(0, nextItem.track);
|
||||||
|
if (_recentlyPlayed.length > 10) {
|
||||||
|
_recentlyPlayed.removeLast();
|
||||||
|
}
|
||||||
|
|
||||||
|
notifyListeners();
|
||||||
|
print('Now playing: ${_currentTrack!.name} by ${_currentTrack!.artistNames}');
|
||||||
|
|
||||||
|
// Simulate track progress
|
||||||
|
_simulatePlayback();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void togglePlayPause() {
|
||||||
|
_isPlaying = !_isPlaying;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
void skipTrack() {
|
||||||
|
playNext();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _simulatePlayback() {
|
||||||
|
if (_currentTrack == null) return;
|
||||||
|
|
||||||
|
// Simulate track progress over time
|
||||||
|
Future.delayed(const Duration(seconds: 1), () {
|
||||||
|
if (_isPlaying && _currentTrack != null) {
|
||||||
|
_progress += 1.0 / (_currentTrack!.durationMs / 1000);
|
||||||
|
if (_progress >= 1.0) {
|
||||||
|
// Track finished, play next
|
||||||
|
playNext();
|
||||||
|
} else {
|
||||||
|
notifyListeners();
|
||||||
|
_simulatePlayback();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize with some popular tracks
|
||||||
|
Future<void> initializeQueue() async {
|
||||||
|
if (_queue.isEmpty && _currentTrack == null) {
|
||||||
|
try {
|
||||||
|
final popularTracks = await _spotifyService.getPopularTracks();
|
||||||
|
for (final track in popularTracks.take(4)) {
|
||||||
|
final queueItem = QueueItem(
|
||||||
|
track: track,
|
||||||
|
votes: 10 - popularTracks.indexOf(track) * 2, // Decreasing votes
|
||||||
|
userVoted: false,
|
||||||
|
);
|
||||||
|
_queue.add(queueItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start playing the first track
|
||||||
|
if (_queue.isNotEmpty) {
|
||||||
|
playNext();
|
||||||
|
}
|
||||||
|
|
||||||
|
notifyListeners();
|
||||||
|
} catch (e) {
|
||||||
|
print('Error initializing queue: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Search functionality
|
||||||
|
Future<List<SpotifyTrack>> searchTracks(String query) async {
|
||||||
|
return await _spotifyService.searchTracks(query, limit: 20);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get queue as JSON for display
|
||||||
|
List<Map<String, dynamic>> get queueAsJson {
|
||||||
|
return _queue.map((item) => item.toJson()).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get current track info for display
|
||||||
|
Map<String, dynamic>? get currentTrackInfo {
|
||||||
|
if (_currentTrack == null) return null;
|
||||||
|
|
||||||
|
return {
|
||||||
|
'title': _currentTrack!.name,
|
||||||
|
'artist': _currentTrack!.artistNames,
|
||||||
|
'album': _currentTrack!.album.name,
|
||||||
|
'imageUrl': _currentTrack!.imageUrl,
|
||||||
|
'duration': _currentTrack!.duration,
|
||||||
|
'progress': _progress,
|
||||||
|
'isPlaying': _isPlaying,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,20 +1,48 @@
|
||||||
|
// Spotify API Credentials
|
||||||
|
//
|
||||||
|
// SETUP INSTRUCTIONS:
|
||||||
|
// 1. Go to https://developer.spotify.com/dashboard
|
||||||
|
// 2. Log in with your Spotify account
|
||||||
|
// 3. Create a new app called "SleepySound"
|
||||||
|
// 4. Copy your Client ID and Client Secret below
|
||||||
|
// 5. Save this file
|
||||||
|
//
|
||||||
|
// SECURITY NOTE: Never commit real credentials to version control!
|
||||||
|
// For production, use environment variables or secure storage.
|
||||||
|
|
||||||
|
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
import '../models/spotify_track.dart';
|
import '../models/spotify_track.dart';
|
||||||
|
import 'SPOTIFY_SECRET.dart';
|
||||||
|
|
||||||
class SpotifyService {
|
class SpotifyService {
|
||||||
static const String _clientId = 'YOUR_SPOTIFY_CLIENT_ID'; // You'll need to get this from Spotify Developer Console
|
// Load credentials from the secret file
|
||||||
static const String _clientSecret = 'YOUR_SPOTIFY_CLIENT_SECRET'; // You'll need to get this from Spotify Developer Console
|
static String get _clientId => SpotifyCredentials.clientId;
|
||||||
|
static String get _clientSecret => SpotifyCredentials.clientSecret;
|
||||||
static const String _baseUrl = 'https://api.spotify.com/v1';
|
static const String _baseUrl = 'https://api.spotify.com/v1';
|
||||||
static const String _authUrl = 'https://accounts.spotify.com/api/token';
|
static const String _authUrl = 'https://accounts.spotify.com/api/token';
|
||||||
|
|
||||||
String? _accessToken;
|
String? _accessToken;
|
||||||
|
|
||||||
|
// Check if valid credentials are provided
|
||||||
|
bool get _hasValidCredentials =>
|
||||||
|
_clientId != 'YOUR_SPOTIFY_CLIENT_ID' &&
|
||||||
|
_clientSecret != 'YOUR_SPOTIFY_CLIENT_SECRET' &&
|
||||||
|
_clientId.isNotEmpty &&
|
||||||
|
_clientSecret.isNotEmpty;
|
||||||
|
|
||||||
// For demo purposes, we'll use Client Credentials flow (no user login required)
|
// For demo purposes, we'll use Client Credentials flow (no user login required)
|
||||||
// In a real app, you'd want to implement Authorization Code flow for user-specific features
|
// In a real app, you'd want to implement Authorization Code flow for user-specific features
|
||||||
|
|
||||||
Future<void> _getAccessToken() async {
|
Future<void> _getAccessToken() async {
|
||||||
|
// Check if we have valid credentials first
|
||||||
|
if (!_hasValidCredentials) {
|
||||||
|
print('No valid Spotify credentials found. Using demo data.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final response = await http.post(
|
final response = await http.post(
|
||||||
Uri.parse(_authUrl),
|
Uri.parse(_authUrl),
|
||||||
|
@ -44,6 +72,11 @@ class SpotifyService {
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _ensureValidToken() async {
|
Future<void> _ensureValidToken() async {
|
||||||
|
// If no valid credentials, skip token generation
|
||||||
|
if (!_hasValidCredentials) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (_accessToken == null) {
|
if (_accessToken == null) {
|
||||||
// Try to load from shared preferences first
|
// Try to load from shared preferences first
|
||||||
final prefs = await SharedPreferences.getInstance();
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
@ -59,8 +92,9 @@ class SpotifyService {
|
||||||
try {
|
try {
|
||||||
await _ensureValidToken();
|
await _ensureValidToken();
|
||||||
|
|
||||||
if (_accessToken == null) {
|
// If no valid credentials or token, use demo data
|
||||||
// Return demo data if no token available
|
if (!_hasValidCredentials || _accessToken == null) {
|
||||||
|
print('Using demo data for search: $query');
|
||||||
return _getDemoTracks(query);
|
return _getDemoTracks(query);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,6 +109,7 @@ class SpotifyService {
|
||||||
if (response.statusCode == 200) {
|
if (response.statusCode == 200) {
|
||||||
final data = json.decode(response.body);
|
final data = json.decode(response.body);
|
||||||
final searchResponse = SpotifySearchResponse.fromJson(data);
|
final searchResponse = SpotifySearchResponse.fromJson(data);
|
||||||
|
print('Found ${searchResponse.tracks.items.length} tracks from Spotify API');
|
||||||
return searchResponse.tracks.items;
|
return searchResponse.tracks.items;
|
||||||
} else if (response.statusCode == 401) {
|
} else if (response.statusCode == 401) {
|
||||||
// Token expired, get a new one
|
// Token expired, get a new one
|
||||||
|
@ -96,7 +131,8 @@ class SpotifyService {
|
||||||
try {
|
try {
|
||||||
await _ensureValidToken();
|
await _ensureValidToken();
|
||||||
|
|
||||||
if (_accessToken == null) {
|
if (!_hasValidCredentials || _accessToken == null) {
|
||||||
|
print('Using demo popular tracks');
|
||||||
return _getDemoPopularTracks();
|
return _getDemoPopularTracks();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -170,12 +206,19 @@ class SpotifyService {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Method to initialize with your Spotify credentials
|
// Method to check if Spotify API is properly configured
|
||||||
static void setCredentials(String clientId, String clientSecret) {
|
static bool get isConfigured =>
|
||||||
// In a real app, you'd store these securely
|
SpotifyCredentials.clientId != 'YOUR_SPOTIFY_CLIENT_ID' &&
|
||||||
// For demo purposes, we'll use the demo data
|
SpotifyCredentials.clientSecret != 'YOUR_SPOTIFY_CLIENT_SECRET' &&
|
||||||
print('Spotify credentials would be set here in a real app');
|
SpotifyCredentials.clientId.isNotEmpty &&
|
||||||
print('Client ID: $clientId');
|
SpotifyCredentials.clientSecret.isNotEmpty;
|
||||||
print('For demo purposes, using mock data instead');
|
|
||||||
|
// Method to get configuration status for UI display
|
||||||
|
static String get configurationStatus {
|
||||||
|
if (isConfigured) {
|
||||||
|
return 'Spotify API configured ✓';
|
||||||
|
} else {
|
||||||
|
return 'Using demo data (Spotify not configured)';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -384,6 +384,14 @@ packages:
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.0.0"
|
version: "2.0.0"
|
||||||
|
nested:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: nested
|
||||||
|
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "1.0.0"
|
||||||
package_config:
|
package_config:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -448,6 +456,14 @@ packages:
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.5.1"
|
version: "1.5.1"
|
||||||
|
provider:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: provider
|
||||||
|
sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "6.1.5"
|
||||||
pub_semver:
|
pub_semver:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
@ -50,6 +50,9 @@ dependencies:
|
||||||
# Web view for authentication
|
# Web view for authentication
|
||||||
webview_flutter: ^4.4.2
|
webview_flutter: ^4.4.2
|
||||||
|
|
||||||
|
# State management
|
||||||
|
provider: ^6.1.1
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue