fix: correct version to 2.0.0 (remove preview suffix)

- Quality picker now shows track name, artist, and cover
- Tap to expand long track titles (icon only shows when truncated)
- Ripple effect follows rounded corners including drag handle
- Update dialog redesigned with Material Expressive 3 style
- Fixed update notification stuck at 100% after download complete
- Ask before download now enabled by default
- Finalizing notification for multi-progress polling

.github/workflows/auto-tag.yml

@@ -0,0 +1,77 @@
+name: Auto Tag on Version Change
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'pubspec.yaml'
+
+jobs:
+  check-version:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2  # Need previous commit to compare
+
+      - name: Get current version
+        id: current
+        run: |
+          VERSION=$(grep '^version:' pubspec.yaml | sed 's/version: //' | cut -d'+' -f1)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Current version: $VERSION"
+
+      - name: Get previous version
+        id: previous
+        run: |
+          git checkout HEAD~1 -- pubspec.yaml 2>/dev/null || echo "version: 0.0.0" > pubspec.yaml.old
+          if [ -f pubspec.yaml.old ]; then
+            VERSION=$(grep '^version:' pubspec.yaml.old | sed 's/version: //' | cut -d'+' -f1)
+          else
+            VERSION=$(grep '^version:' pubspec.yaml | sed 's/version: //' | cut -d'+' -f1)
+          fi
+          git checkout HEAD -- pubspec.yaml
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Previous version: $VERSION"
+
+      - name: Check if version changed
+        id: check
+        run: |
+          CURRENT="${{ steps.current.outputs.version }}"
+          PREVIOUS="${{ steps.previous.outputs.version }}"
+          
+          if [ "$CURRENT" != "$PREVIOUS" ]; then
+            echo "Version changed from $PREVIOUS to $CURRENT"
+            echo "changed=true" >> $GITHUB_OUTPUT
+          else
+            echo "Version unchanged: $CURRENT"
+            echo "changed=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Check if tag exists
+        id: tag_exists
+        if: steps.check.outputs.changed == 'true'
+        run: |
+          TAG="v${{ steps.current.outputs.version }}"
+          if git ls-remote --tags origin | grep -q "refs/tags/$TAG"; then
+            echo "Tag $TAG already exists"
+            echo "exists=true" >> $GITHUB_OUTPUT
+          else
+            echo "Tag $TAG does not exist"
+            echo "exists=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create and push tag
+        if: steps.check.outputs.changed == 'true' && steps.tag_exists.outputs.exists == 'false'
+        run: |
+          TAG="v${{ steps.current.outputs.version }}"
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git tag -a "$TAG" -m "Release $TAG"
+          git push origin "$TAG"
+          echo "Created and pushed tag: $TAG"

.github/workflows/release.yml

@@ -17,14 +17,26 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.version.outputs.version }}
+      is_prerelease: ${{ steps.version.outputs.is_prerelease }}
     steps:
       - name: Get version
         id: version
         run: |
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            echo "version=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
+            VERSION="${{ github.event.inputs.version }}"
           else
-            echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+            VERSION="${GITHUB_REF#refs/tags/}"
+          fi
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          
+          # Check if version contains -preview, -beta, -rc, or -alpha (NOT -hotfix)
+          VERSION_LOWER=$(echo "$VERSION" | tr '[:upper:]' '[:lower:]')
+          if [[ "$VERSION_LOWER" == *"-preview"* ]] || [[ "$VERSION_LOWER" == *"-beta"* ]] || [[ "$VERSION_LOWER" == *"-rc"* ]] || [[ "$VERSION_LOWER" == *"-alpha"* ]]; then
+            echo "is_prerelease=true" >> $GITHUB_OUTPUT
+            echo "Detected pre-release version: $VERSION"
+          else
+            echo "is_prerelease=false" >> $GITHUB_OUTPUT
+            echo "Detected stable version: $VERSION"
           fi
 
   # Android and iOS build in PARALLEL
@@ -316,6 +328,6 @@ jobs:
           body_path: /tmp/release_body.txt
           files: ./release/*
           draft: false
-          prerelease: false
+          prerelease: ${{ needs.get-version.outputs.is_prerelease == 'true' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,168 @@
 # Changelog
 
+## [2.0.0] - 2026-01-03
+
+### Added
+- **Artist Search Results**: Search now shows artists alongside tracks
+  - Horizontal scrollable artist cards with circular avatars
+  - Tap artist to view their discography
+- **Multi-Layer Caching System**: Aggressive caching to minimize API calls
+  - Go backend cache: Artist (10 min), Album (10 min), Search (5 min)
+  - Flutter memory cache: Instant navigation for previously viewed artists/albums
+  - Duplicate search prevention: Same query won't trigger new API call
+- **Real-time Download Status**: Track items show live download progress
+  - Queued: Hourglass icon
+  - Downloading: Circular progress with percentage
+  - Completed: Check icon
+  - Works in Home search, Album, and Playlist screens
+- **Downloaded Track Indicator**: Tracks already in history show check mark
+  - Lazy file verification: Only checks file existence when tapped
+  - Auto-removes from history if file was deleted, allowing re-download
+  - Prevents accidental duplicate downloads
+- **Pre-release Support**: GitHub Actions auto-detects preview/beta/rc/alpha tags
+  - Stable users won't receive update notifications for preview versions
+
+### Changed
+- **Instant Navigation UX**: Navigate to Artist/Album screens immediately
+  - Header (name, cover) shows instantly from available data
+  - Content (albums/tracks) loads in background inside the screen
+  - Second visit to same artist/album is instant from Flutter cache
+- **Search Results UI Redesign**: 
+  - Removed "Download All" button from search results
+  - Added "Songs" section header (matches "Artists" header style)
+  - Track list now in grouped card with rounded corners (like Settings)
+  - Track items with dividers and InkWell ripple effect
+- **Larger UI Elements**: Improved touch targets and visual hierarchy
+  - Recent downloads: Album art 56→100px, section height 80→130px
+  - Artist cards: Avatar 72→88px, container 90→100px
+  - Track items: Album art 48→56px
+- **Optimized Search**: Pressing Enter with same query no longer triggers duplicate search
+- **Smoother Progress Animation**: Progress jumps to 100% after download completes
+  - Embedding (cover, metadata, lyrics) happens in background without blocking UI
+- **Finalizing Status**: Shows "Finalizing" indicator while embedding metadata
+  - Distinct icon (edit_note) with tertiary color
+  - User knows download is complete, just processing metadata
+- **Consistent Download Button Sizes**: All download/status buttons now 44x44px
+- **Better Dynamic Color Contrast**: Improved visibility for cards and chips with dynamic color
+  - Settings cards use overlay colors for better contrast
+  - Theme/view mode chips have visible borders in light mode
+- **Navigation Bar Styling**: Distinct background color from content area
+- **Ask Before Download Default**: Now enabled by default for better UX
+- **Quality Picker Track Info**: Shows track name, artist, and cover in quality picker
+  - Tap to expand long track titles
+  - Expand icon only shows when title is truncated
+  - Ripple effect follows rounded corners including drag handle
+- **Update Dialog Redesign**: Material Expressive 3 style
+  - Icon header with container
+  - Version chips with "Current" and "New" labels
+  - Changelog in rounded card
+  - Download progress with percentage indicator
+  - Cleaner button layout
+
+### Fixed
+- **Artist Profile Images**: Fixed artist images not showing in search results (field name mismatch)
+- **Album Card Overflow**: Fixed 5px overflow in artist discography album cards
+- **Optimized Rebuilds**: Each track item only rebuilds when its own status changes
+  - Uses Riverpod `select()` for granular state watching
+  - Prevents entire list rebuild on progress updates
+- **Update Notification Stuck**: Fixed notification staying at 100% after download complete
+
+## [1.6.3] - 2026-01-03
+
+### Added
+- **Predictive Back Navigation**: Support for Android 14+ predictive back gesture with smooth animations
+- **Separate Detail Screens**: Album, Artist, and Playlist now open as dedicated screens with Material Expressive 3 design
+  - Collapsing header with cover art and gradient overlay
+  - Card-based info section with rounded corners (20px radius)
+  - Tonal download buttons with circular shape
+  - Quality picker bottom sheet with drag handle
+- **Double-Tap to Exit**: Press back twice to exit app when at home screen (replaces exit dialog)
+
+### Changed
+- **Navigation Architecture**: Refactored from state-based to screen-based navigation
+  - Album/Artist/Playlist URLs navigate to dedicated screens via `Navigator.push()`
+  - Enables native predictive back gesture animations
+  - Search results stay on Home tab for quick downloads
+- **Simplified State Management**: Removed `previousState` chain from TrackProvider since Navigator handles back navigation
+
+## [1.6.2] - 2026-01-02
+
+### Added
+- **HTTPS-Only Downloads**: APK downloads and update checks now enforce HTTPS-only connections for security
+
+### Changed
+- **Home Tab Rename**: Renamed "Search" tab to "Home" with home icon
+- **Branding**: Changed idle screen title from "Search Music" to "SpotiFLAC"
+- **About Page Redesign**: New Material Expressive 3 grouped layout with app header, contributors section with GitHub avatars, and organized links
+
+### Fixed
+- **Play Button Flash**: Fixed play button briefly showing red error icon on app start (now uses optimistic rendering)
+
+### Performance
+- **Optimized State Management**: Use `.select()` for Riverpod providers to prevent unnecessary widget rebuilds
+- **List Keys**: Added keys to all list builders for efficient list updates and reordering
+- **Request Cancellation**: Outdated API requests are ignored when new search/fetch is triggered
+- **Debounced URL Fetches**: All network requests now debounced to prevent rapid duplicate calls
+- **Bounded File Cache**: File existence cache now limited to 500 entries to prevent memory leak
+- **Timer Cleanup**: Progress polling timer properly disposed when provider is destroyed
+- **Stream Error Handling**: Share intent stream now has proper error handling
+
+## [1.6.1] - 2026-01-02
+
+### Added
+- **Background Download Service**: Downloads now continue running when app is in background
+  - Foreground service with wake lock prevents Android from killing downloads
+  - Persistent notification shows download progress
+  - No more "connection abort" errors when switching apps
+
+### Fixed
+- **Share Intent App Restart**: Fixed download queue being lost when sharing from Spotify while downloads are in progress
+  - Download queue is now persisted to storage and automatically restored on app restart
+  - Interrupted downloads (marked as "downloading") are reset to "queued" and auto-resumed
+  - Changed launch mode to `singleTask` to reuse existing activity instead of restarting
+  - Added `onNewIntent` handler to properly receive new share intents
+- **Back Button During Loading**: Back button no longer clears state while loading shared URL
+
+### Changed
+- **Kotlin**: Upgraded from 2.2.20 to 2.3.0 for better plugin compatibility
+
+## [1.6.0] - 2026-01-02
+
+### Added
+- **Manual Quality Selection**: New option to choose audio quality before each download
+  - Toggle "Ask Before Download" in Download Settings
+  - When enabled, shows quality picker (Lossless, Hi-Res, Hi-Res Max) before downloading
+  - Works for both single track and batch downloads
+- **Live Search**: Search results appear as you type with 400ms debounce
+  - Animated search bar moves from center to top when typing
+  - Keyboard stays open during transition
+  - Back button navigates through search history (album → artist → idle)
+  - Clear button to reset search
+  - URLs still require manual submit
+- **Search Tab Header**: Added collapsing app bar to centered search view for consistent UI across all tabs
+- **Share Audio File**: Share downloaded tracks to other apps from Track Metadata screen
+
+### Fixed
+- **Update Checker**: Fixed version comparison for versions with suffix (e.g., `1.5.0-hotfix6`)
+  - Users on hotfix versions now properly receive update notifications
+  - Handles `-hotfix`, `-beta`, `-rc` suffixes correctly
+- **Settings Ripple Effect**: Fixed splash/ripple effect to properly clip within rounded card corners
+
+### Changed
+- **Settings UI Redesign**: New Android-style grouped settings with connected cards
+  - Items in same group are connected with rounded card container
+  - Section headers outside cards for clear visual hierarchy
+  - Better contrast with white overlay for dark mode dynamic colors
+- **Larger Tab Titles**: Increased app bar title size (28px) and height (130px) for better visibility
+- **Consistent Header Position**: Fixed Search tab header alignment to match History and Settings tabs
+
+### Improved
+- **Code Quality**: Replaced all `print()` statements with structured logging using `logger` package
+- **Dependencies Updated**:
+  - `share_plus`: 10.1.4 → 12.0.1
+  - `flutter_local_notifications`: 18.0.1 → 19.0.0
+  - `build_runner`: 2.4.15 → 2.10.4
+
 ## [1.5.5] - 2026-01-02
 
 ### Added

README.md

@@ -11,18 +11,10 @@ Get Spotify tracks in true FLAC from Tidal, Qobuz & Amazon Music — no account
 
 </div>
 
+> **Active Development Notice**: This app is under heavy development. New builds may be pushed multiple times daily. If frequent update notifications are annoying, tap "Don't remind" when the update dialog appears, or disable update checks in Settings.
+
 ### [Download](https://github.com/zarzet/SpotiFLAC-Mobile/releases)
 
-## Features
-
-- Download tracks, albums, and playlists from Spotify links
-- True lossless FLAC quality from Tidal, Qobuz & Amazon Music
-- Material Expressive 3 design with dynamic colors
-- High performance rendering with Impeller (Vulkan)
-- Concurrent downloads up to 3 simultaneous
-- Real-time download progress tracking
-- Download notifications
-
 ## Screenshots
 
 <p align="center">
@@ -39,6 +31,8 @@ Get Spotify tracks in true FLAC from Tidal, Qobuz & Amazon Music for Windows, ma
 
 ## Disclaimer
 
+> **iOS Support**: This app is primarily tested on Android. iOS support is experimental and may have bugs — the developer is too poor to afford an iPhone for proper testing. If you encounter issues on iOS, please report them!
+
 This project is for **educational and private use only**. The developer does not condone or encourage copyright infringement.
 
 **SpotiFLAC** is a third-party tool and is not affiliated with, endorsed by, or connected to Spotify, Tidal, Qobuz, Amazon Music, or any other streaming service.

android/app/src/main/AndroidManifest.xml

@@ -12,19 +12,20 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
         android:label="SpotiFLAC"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:requestLegacyExternalStorage="true"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        android:enableOnBackInvokedCallback="true">
 
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:launchMode="singleTop"
-            android:taskAffinity=""
+            android:launchMode="singleTask"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"

android/app/src/main/kotlin/com/zarz/spotiflac/DownloadService.kt

@@ -5,83 +5,211 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.app.Service
+import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.IBinder
+import android.os.PowerManager
 import androidx.core.app.NotificationCompat
 
+/**
+ * Foreground service to keep downloads running when app is in background.
+ * This prevents Android from killing the download process or throttling network.
+ */
 class DownloadService : Service() {
+    
     companion object {
-        const val CHANNEL_ID = "spotiflac_download_channel"
-        const val NOTIFICATION_ID = 1
-        const val ACTION_START = "com.zarz.spotiflac.START_DOWNLOAD"
-        const val ACTION_STOP = "com.zarz.spotiflac.STOP_DOWNLOAD"
+        private const val CHANNEL_ID = "download_channel"
+        private const val NOTIFICATION_ID = 1001
+        private const val WAKELOCK_TAG = "SpotiFLAC:DownloadWakeLock"
+        
+        const val ACTION_START = "com.zarz.spotiflac.action.START_DOWNLOAD"
+        const val ACTION_STOP = "com.zarz.spotiflac.action.STOP_DOWNLOAD"
+        const val ACTION_UPDATE_PROGRESS = "com.zarz.spotiflac.action.UPDATE_PROGRESS"
+        
+        const val EXTRA_TRACK_NAME = "track_name"
+        const val EXTRA_ARTIST_NAME = "artist_name"
+        const val EXTRA_PROGRESS = "progress"
+        const val EXTRA_TOTAL = "total"
+        const val EXTRA_QUEUE_COUNT = "queue_count"
+        
+        private var isRunning = false
+        
+        fun isServiceRunning(): Boolean = isRunning
+        
+        fun start(context: Context, trackName: String = "", artistName: String = "", queueCount: Int = 0) {
+            val intent = Intent(context, DownloadService::class.java).apply {
+                action = ACTION_START
+                putExtra(EXTRA_TRACK_NAME, trackName)
+                putExtra(EXTRA_ARTIST_NAME, artistName)
+                putExtra(EXTRA_QUEUE_COUNT, queueCount)
+            }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                context.startForegroundService(intent)
+            } else {
+                context.startService(intent)
+            }
+        }
+        
+        fun stop(context: Context) {
+            val intent = Intent(context, DownloadService::class.java).apply {
+                action = ACTION_STOP
+            }
+            context.startService(intent)
+        }
+        
+        fun updateProgress(context: Context, trackName: String, artistName: String, progress: Long, total: Long, queueCount: Int) {
+            val intent = Intent(context, DownloadService::class.java).apply {
+                action = ACTION_UPDATE_PROGRESS
+                putExtra(EXTRA_TRACK_NAME, trackName)
+                putExtra(EXTRA_ARTIST_NAME, artistName)
+                putExtra(EXTRA_PROGRESS, progress)
+                putExtra(EXTRA_TOTAL, total)
+                putExtra(EXTRA_QUEUE_COUNT, queueCount)
+            }
+            context.startService(intent)
+        }
     }
-
+    
+    private var wakeLock: PowerManager.WakeLock? = null
+    private var currentTrackName = ""
+    private var currentArtistName = ""
+    private var queueCount = 0
+    
     override fun onCreate() {
         super.onCreate()
         createNotificationChannel()
     }
-
+    
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         when (intent?.action) {
-            ACTION_START -> startForegroundService()
-            ACTION_STOP -> stopSelf()
+            ACTION_START -> {
+                currentTrackName = intent.getStringExtra(EXTRA_TRACK_NAME) ?: ""
+                currentArtistName = intent.getStringExtra(EXTRA_ARTIST_NAME) ?: ""
+                queueCount = intent.getIntExtra(EXTRA_QUEUE_COUNT, 0)
+                startForegroundService()
+            }
+            ACTION_STOP -> {
+                stopForegroundService()
+            }
+            ACTION_UPDATE_PROGRESS -> {
+                currentTrackName = intent.getStringExtra(EXTRA_TRACK_NAME) ?: currentTrackName
+                currentArtistName = intent.getStringExtra(EXTRA_ARTIST_NAME) ?: currentArtistName
+                val progress = intent.getLongExtra(EXTRA_PROGRESS, 0)
+                val total = intent.getLongExtra(EXTRA_TOTAL, 0)
+                queueCount = intent.getIntExtra(EXTRA_QUEUE_COUNT, queueCount)
+                updateNotification(progress, total)
+            }
         }
-        return START_NOT_STICKY
+        return START_STICKY
     }
-
+    
     override fun onBind(intent: Intent?): IBinder? = null
-
+    
     private fun createNotificationChannel() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val channel = NotificationChannel(
                 CHANNEL_ID,
-                "Download Progress",
+                "Download Service",
                 NotificationManager.IMPORTANCE_LOW
             ).apply {
-                description = "Shows download progress for SpotiFLAC"
+                description = "Shows download progress"
                 setShowBadge(false)
             }
             val manager = getSystemService(NotificationManager::class.java)
             manager.createNotificationChannel(channel)
         }
     }
-
+    
     private fun startForegroundService() {
-        val notification = createNotification("Downloading...", 0)
+        isRunning = true
+        
+        // Acquire wake lock to prevent CPU sleep
+        val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
+        wakeLock = powerManager.newWakeLock(
+            PowerManager.PARTIAL_WAKE_LOCK,
+            WAKELOCK_TAG
+        ).apply {
+            acquire(60 * 60 * 1000L) // 1 hour max
+        }
+        
+        val notification = buildNotification(0, 0)
         startForeground(NOTIFICATION_ID, notification)
     }
-
-    fun updateProgress(trackName: String, progress: Int) {
-        val notification = createNotification(trackName, progress)
+    
+    private fun stopForegroundService() {
+        isRunning = false
+        wakeLock?.let {
+            if (it.isHeld) {
+                it.release()
+            }
+        }
+        wakeLock = null
+        stopForeground(STOP_FOREGROUND_REMOVE)
+        stopSelf()
+    }
+    
+    private fun updateNotification(progress: Long, total: Long) {
+        if (!isRunning) return
+        
+        val notification = buildNotification(progress, total)
         val manager = getSystemService(NotificationManager::class.java)
         manager.notify(NOTIFICATION_ID, notification)
     }
-
-    private fun createNotification(title: String, progress: Int): Notification {
-        val intent = Intent(this, MainActivity::class.java)
+    
+    private fun buildNotification(progress: Long, total: Long): Notification {
         val pendingIntent = PendingIntent.getActivity(
-            this, 0, intent,
+            this,
+            0,
+            Intent(this, MainActivity::class.java),
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
-
-        val stopIntent = Intent(this, DownloadService::class.java).apply {
-            action = ACTION_STOP
+        
+        val title = if (queueCount > 1) {
+            "Downloading $queueCount tracks"
+        } else if (currentTrackName.isNotEmpty()) {
+            currentTrackName
+        } else {
+            "Downloading..."
         }
-        val stopPendingIntent = PendingIntent.getService(
-            this, 0, stopIntent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
-
-        return NotificationCompat.Builder(this, CHANNEL_ID)
-            .setContentTitle("SpotiFLAC")
-            .setContentText(title)
+        
+        val text = if (currentArtistName.isNotEmpty() && queueCount <= 1) {
+            currentArtistName
+        } else if (total > 0) {
+            val progressPercent = (progress * 100 / total).toInt()
+            val progressMB = progress / (1024.0 * 1024.0)
+            val totalMB = total / (1024.0 * 1024.0)
+            String.format("%.1f / %.1f MB (%d%%)", progressMB, totalMB, progressPercent)
+        } else {
+            "Preparing download..."
+        }
+        
+        val builder = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setContentTitle(title)
+            .setContentText(text)
             .setSmallIcon(android.R.drawable.stat_sys_download)
-            .setProgress(100, progress, progress == 0)
-            .setOngoing(true)
             .setContentIntent(pendingIntent)
-            .addAction(android.R.drawable.ic_menu_close_clear_cancel, "Cancel", stopPendingIntent)
-            .build()
+            .setOngoing(true)
+            .setOnlyAlertOnce(true)
+            .setPriority(NotificationCompat.PRIORITY_LOW)
+            .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+        
+        if (total > 0) {
+            builder.setProgress(100, (progress * 100 / total).toInt(), false)
+        } else {
+            builder.setProgress(0, 0, true)
+        }
+        
+        return builder.build()
+    }
+    
+    override fun onDestroy() {
+        isRunning = false
+        wakeLock?.let {
+            if (it.isHeld) {
+                it.release()
+            }
+        }
+        super.onDestroy()
     }
 }

android/app/src/main/kotlin/com/zarz/spotiflac/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.zarz.spotiflac
 
+import android.content.Intent
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
@@ -14,6 +15,12 @@ class MainActivity: FlutterActivity() {
     private val CHANNEL = "com.zarz.spotiflac/backend"
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
 
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        // Update the intent so receive_sharing_intent can access the new data
+        setIntent(intent)
+    }
+
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
         
@@ -43,6 +50,15 @@ class MainActivity: FlutterActivity() {
                             }
                             result.success(response)
                         }
+                        "searchSpotifyAll" -> {
+                            val query = call.argument<String>("query") ?: ""
+                            val trackLimit = call.argument<Int>("track_limit") ?: 15
+                            val artistLimit = call.argument<Int>("artist_limit") ?: 3
+                            val response = withContext(Dispatchers.IO) {
+                                Gobackend.searchSpotifyAll(query, trackLimit.toLong(), artistLimit.toLong())
+                            }
+                            result.success(response)
+                        }
                         "checkAvailability" -> {
                             val spotifyId = call.argument<String>("spotify_id") ?: ""
                             val isrc = call.argument<String>("isrc") ?: ""
@@ -160,6 +176,29 @@ class MainActivity: FlutterActivity() {
                             }
                             result.success(null)
                         }
+                        "startDownloadService" -> {
+                            val trackName = call.argument<String>("track_name") ?: ""
+                            val artistName = call.argument<String>("artist_name") ?: ""
+                            val queueCount = call.argument<Int>("queue_count") ?: 0
+                            DownloadService.start(this@MainActivity, trackName, artistName, queueCount)
+                            result.success(null)
+                        }
+                        "stopDownloadService" -> {
+                            DownloadService.stop(this@MainActivity)
+                            result.success(null)
+                        }
+                        "updateDownloadServiceProgress" -> {
+                            val trackName = call.argument<String>("track_name") ?: ""
+                            val artistName = call.argument<String>("artist_name") ?: ""
+                            val progress = call.argument<Long>("progress") ?: 0L
+                            val total = call.argument<Long>("total") ?: 0L
+                            val queueCount = call.argument<Int>("queue_count") ?: 0
+                            DownloadService.updateProgress(this@MainActivity, trackName, artistName, progress, total, queueCount)
+                            result.success(null)
+                        }
+                        "isDownloadServiceRunning" -> {
+                            result.success(DownloadService.isServiceRunning())
+                        }
                         else -> result.notImplemented()
                     }
                 } catch (e: Exception) {

android/settings.gradle.kts

@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
     id("com.android.application") version "8.11.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
 }
 
 include(":app")

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

go_backend/amazon.go

@@ -318,6 +318,13 @@ func downloadFromAmazon(req DownloadRequest) (string, error) {
 		return "", fmt.Errorf("download failed: %w", err)
 	}
 
+	// Set progress to 100% and status to finalizing (before embedding)
+	// This makes the UI show "Finalizing..." while embedding happens
+	if req.ItemID != "" {
+		SetItemProgress(req.ItemID, 1.0, 0, 0)
+		SetItemFinalizing(req.ItemID)
+	}
+
 	// Log track info from DoubleDouble (for debugging)
 	if trackName != "" && artistName != "" {
 		fmt.Printf("[Amazon] DoubleDouble returned: %s - %s\n", artistName, trackName)

go_backend/exports.go

@@ -70,6 +70,26 @@ func SearchSpotify(query string, limit int) (string, error) {
 	return string(jsonBytes), nil
 }
 
+// SearchSpotifyAll searches for tracks and artists on Spotify
+// Returns JSON with tracks and artists arrays
+func SearchSpotifyAll(query string, trackLimit, artistLimit int) (string, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+	defer cancel()
+	
+	client := NewSpotifyMetadataClient()
+	results, err := client.SearchAll(ctx, query, trackLimit, artistLimit)
+	if err != nil {
+		return "", err
+	}
+	
+	jsonBytes, err := json.Marshal(results)
+	if err != nil {
+		return "", err
+	}
+	
+	return string(jsonBytes), nil
+}
+
 // CheckAvailability checks track availability on streaming services
 // Returns JSON with availability info for Tidal, Qobuz, Amazon
 func CheckAvailability(spotifyID, isrc string) (string, error) {

go_backend/progress.go

@@ -13,6 +13,7 @@ type DownloadProgress struct {
 	BytesTotal    int64   `json:"bytes_total"`
 	BytesReceived int64   `json:"bytes_received"`
 	IsDownloading bool    `json:"is_downloading"`
+	Status        string  `json:"status"` // "downloading", "finalizing", "completed"
 }
 
 // ItemProgress represents progress for a single download item
@@ -22,6 +23,7 @@ type ItemProgress struct {
 	BytesReceived int64   `json:"bytes_received"`
 	Progress      float64 `json:"progress"` // 0.0 to 1.0
 	IsDownloading bool    `json:"is_downloading"`
+	Status        string  `json:"status"` // "downloading", "finalizing", "completed"
 }
 
 // MultiProgress holds progress for multiple concurrent downloads
@@ -82,6 +84,7 @@ func StartItemProgress(itemID string) {
 		BytesReceived: 0,
 		Progress:      0,
 		IsDownloading: true,
+		Status:        "downloading",
 	}
 }
 
@@ -119,6 +122,46 @@ func CompleteItemProgress(itemID string) {
 	}
 }
 
+// SetItemProgress sets progress for an item directly (used to force 100% before embedding)
+func SetItemProgress(itemID string, progress float64, bytesReceived, bytesTotal int64) {
+	multiMu.Lock()
+	if item, ok := multiProgress.Items[itemID]; ok {
+		item.Progress = progress
+		if bytesReceived > 0 {
+			item.BytesReceived = bytesReceived
+		}
+		if bytesTotal > 0 {
+			item.BytesTotal = bytesTotal
+		}
+	}
+	multiMu.Unlock()
+	
+	// Also update legacy progress for backward compatibility
+	progressMu.Lock()
+	if progress >= 1.0 {
+		currentProgress.Progress = 100.0
+	} else {
+		currentProgress.Progress = progress * 100.0
+	}
+	progressMu.Unlock()
+}
+
+// SetItemFinalizing marks an item as finalizing (embedding metadata)
+func SetItemFinalizing(itemID string) {
+	multiMu.Lock()
+	if item, ok := multiProgress.Items[itemID]; ok {
+		item.Progress = 1.0
+		item.Status = "finalizing"
+	}
+	multiMu.Unlock()
+	
+	// Also update legacy progress
+	progressMu.Lock()
+	currentProgress.Progress = 100.0
+	currentProgress.Status = "finalizing"
+	progressMu.Unlock()
+}
+
 // RemoveItemProgress removes progress tracking for an item
 func RemoveItemProgress(itemID string) {
 	multiMu.Lock()
@@ -161,6 +204,7 @@ func SetCurrentFile(filename string) {
 	currentProgress.Progress = 0
 	currentProgress.CurrentFile = filename
 	currentProgress.IsDownloading = true
+	currentProgress.Status = "downloading"
 }
 
 // ResetProgress resets the download progress

go_backend/qobuz.go

@@ -385,6 +385,13 @@ func downloadFromQobuz(req DownloadRequest) (string, error) {
 		return "", fmt.Errorf("download failed: %w", err)
 	}
 
+	// Set progress to 100% and status to finalizing (before embedding)
+	// This makes the UI show "Finalizing..." while embedding happens
+	if req.ItemID != "" {
+		SetItemProgress(req.ItemID, 1.0, 0, 0)
+		SetItemFinalizing(req.ItemID)
+	}
+
 	// Embed metadata
 	metadata := Metadata{
 		Title:       req.TrackName,

go_backend/spotify.go

@@ -10,6 +10,7 @@ import (
 	"math/rand"
 	"net/http"
 	"net/url"
+	"os"
 	"strings"
 	"sync"
 	"time"
@@ -23,10 +24,25 @@ const (
 	artistBaseURL       = "https://api.spotify.com/v1/artists/%s"
 	artistAlbumsURL     = "https://api.spotify.com/v1/artists/%s/albums"
 	searchBaseURL       = "https://api.spotify.com/v1/search"
+	
+	// Cache TTL settings
+	artistCacheTTL = 10 * time.Minute
+	searchCacheTTL = 5 * time.Minute
+	albumCacheTTL  = 10 * time.Minute
 )
 
 var errInvalidSpotifyURL = errors.New("invalid or unsupported Spotify URL")
 
+// cacheEntry holds cached data with expiration
+type cacheEntry struct {
+	data      interface{}
+	expiresAt time.Time
+}
+
+func (e *cacheEntry) isExpired() bool {
+	return time.Now().After(e.expiresAt)
+}
+
 // SpotifyMetadataClient handles Spotify API interactions
 type SpotifyMetadataClient struct {
 	httpClient     *http.Client
@@ -34,31 +50,45 @@ type SpotifyMetadataClient struct {
 	clientSecret   string
 	cachedToken    string
 	tokenExpiresAt time.Time
+	tokenMu        sync.Mutex // Protects token cache for concurrent access
 	rng            *rand.Rand
 	rngMu          sync.Mutex
 	userAgent      string
+	
+	// Caches to reduce API calls
+	artistCache map[string]*cacheEntry // key: artistID
+	searchCache map[string]*cacheEntry // key: query+type
+	albumCache  map[string]*cacheEntry // key: albumID
+	cacheMu     sync.RWMutex
 }
 
 // NewSpotifyMetadataClient creates a new Spotify client
 func NewSpotifyMetadataClient() *SpotifyMetadataClient {
 	src := rand.NewSource(time.Now().UnixNano())
 
-	// Decode credentials from base64
-	clientID := ""
-	if decoded, err := base64.StdEncoding.DecodeString("NWY1NzNjOTYyMDQ5NGJhZTg3ODkwYzBmMDhhNjAyOTM="); err == nil {
-		clientID = string(decoded)
+	// Prefer environment variables for credentials (more secure), fall back to built-in
+	clientID := os.Getenv("SPOTIFY_CLIENT_ID")
+	if clientID == "" {
+		if decoded, err := base64.StdEncoding.DecodeString("NWY1NzNjOTYyMDQ5NGJhZTg3ODkwYzBmMDhhNjAyOTM="); err == nil {
+			clientID = string(decoded)
+		}
 	}
 
-	clientSecret := ""
-	if decoded, err := base64.StdEncoding.DecodeString("MjEyNDc2ZDliMGYzNDcyZWFhNzYyZDkwYjE5YjBiYTg="); err == nil {
-		clientSecret = string(decoded)
+	clientSecret := os.Getenv("SPOTIFY_CLIENT_SECRET")
+	if clientSecret == "" {
+		if decoded, err := base64.StdEncoding.DecodeString("MjEyNDc2ZDliMGYzNDcyZWFhNzYyZDkwYjE5YjBiYTg="); err == nil {
+			clientSecret = string(decoded)
+		}
 	}
 
 	c := &SpotifyMetadataClient{
-		httpClient:   &http.Client{Timeout: 15 * time.Second},
+		httpClient:   NewHTTPClientWithTimeout(15 * time.Second), // Use shared transport for connection pooling
 		clientID:     clientID,
 		clientSecret: clientSecret,
 		rng:          rand.New(src),
+		artistCache:  make(map[string]*cacheEntry),
+		searchCache:  make(map[string]*cacheEntry),
+		albumCache:   make(map[string]*cacheEntry),
 	}
 	c.userAgent = c.randomUserAgent()
 	return c
@@ -170,6 +200,21 @@ type SearchResult struct {
 	Total  int             `json:"total"`
 }
 
+// SearchArtistResult represents an artist in search results
+type SearchArtistResult struct {
+	ID         string `json:"id"`
+	Name       string `json:"name"`
+	Images     string `json:"images"`
+	Followers  int    `json:"followers"`
+	Popularity int    `json:"popularity"`
+}
+
+// SearchAllResult represents combined search results for tracks and artists
+type SearchAllResult struct {
+	Tracks  []TrackMetadata      `json:"tracks"`
+	Artists []SearchArtistResult `json:"artists"`
+}
+
 type spotifyURI struct {
 	Type string
 	ID   string
@@ -293,6 +338,98 @@ func (c *SpotifyMetadataClient) SearchTracks(ctx context.Context, query string,
 	return result, nil
 }
 
+// SearchAll searches for tracks and artists on Spotify
+func (c *SpotifyMetadataClient) SearchAll(ctx context.Context, query string, trackLimit, artistLimit int) (*SearchAllResult, error) {
+	// Create cache key
+	cacheKey := fmt.Sprintf("all:%s:%d:%d", query, trackLimit, artistLimit)
+	
+	// Check cache first
+	c.cacheMu.RLock()
+	if entry, ok := c.searchCache[cacheKey]; ok && !entry.isExpired() {
+		c.cacheMu.RUnlock()
+		return entry.data.(*SearchAllResult), nil
+	}
+	c.cacheMu.RUnlock()
+
+	token, err := c.getAccessToken(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	searchURL := fmt.Sprintf("%s?q=%s&type=track,artist&limit=%d", searchBaseURL, url.QueryEscape(query), trackLimit)
+	
+	var response struct {
+		Tracks struct {
+			Items []trackFull `json:"items"`
+		} `json:"tracks"`
+		Artists struct {
+			Items []struct {
+				ID         string  `json:"id"`
+				Name       string  `json:"name"`
+				Images     []image `json:"images"`
+				Followers  struct {
+					Total int `json:"total"`
+				} `json:"followers"`
+				Popularity int `json:"popularity"`
+			} `json:"items"`
+		} `json:"artists"`
+	}
+	
+	if err := c.getJSON(ctx, searchURL, token, &response); err != nil {
+		return nil, err
+	}
+
+	result := &SearchAllResult{
+		Tracks:  make([]TrackMetadata, 0, len(response.Tracks.Items)),
+		Artists: make([]SearchArtistResult, 0, len(response.Artists.Items)),
+	}
+
+	for _, track := range response.Tracks.Items {
+		result.Tracks = append(result.Tracks, TrackMetadata{
+			SpotifyID:   track.ID,
+			Artists:     joinArtists(track.Artists),
+			Name:        track.Name,
+			AlbumName:   track.Album.Name,
+			AlbumArtist: joinArtists(track.Album.Artists),
+			DurationMS:  track.DurationMS,
+			Images:      firstImageURL(track.Album.Images),
+			ReleaseDate: track.Album.ReleaseDate,
+			TrackNumber: track.TrackNumber,
+			TotalTracks: track.Album.TotalTracks,
+			DiscNumber:  track.DiscNumber,
+			ExternalURL: track.ExternalURL.Spotify,
+			ISRC:        track.ExternalID.ISRC,
+		})
+	}
+
+	// Limit artists to artistLimit
+	artistCount := len(response.Artists.Items)
+	if artistCount > artistLimit {
+		artistCount = artistLimit
+	}
+	
+	for i := 0; i < artistCount; i++ {
+		artist := response.Artists.Items[i]
+		result.Artists = append(result.Artists, SearchArtistResult{
+			ID:         artist.ID,
+			Name:       artist.Name,
+			Images:     firstImageURL(artist.Images),
+			Followers:  artist.Followers.Total,
+			Popularity: artist.Popularity,
+		})
+	}
+
+	// Store in cache
+	c.cacheMu.Lock()
+	c.searchCache[cacheKey] = &cacheEntry{
+		data:      result,
+		expiresAt: time.Now().Add(searchCacheTTL),
+	}
+	c.cacheMu.Unlock()
+
+	return result, nil
+}
+
 func (c *SpotifyMetadataClient) fetchTrack(ctx context.Context, trackID, token string) (*TrackResponse, error) {
 	var data trackFull
 	if err := c.getJSON(ctx, fmt.Sprintf(trackBaseURL, trackID), token, &data); err != nil {
@@ -319,6 +456,14 @@ func (c *SpotifyMetadataClient) fetchTrack(ctx context.Context, trackID, token s
 }
 
 func (c *SpotifyMetadataClient) fetchAlbum(ctx context.Context, albumID, token string) (*AlbumResponsePayload, error) {
+	// Check cache first
+	c.cacheMu.RLock()
+	if entry, ok := c.albumCache[albumID]; ok && !entry.isExpired() {
+		c.cacheMu.RUnlock()
+		return entry.data.(*AlbumResponsePayload), nil
+	}
+	c.cacheMu.RUnlock()
+
 	var data struct {
 		Name        string   `json:"name"`
 		ReleaseDate string   `json:"release_date"`
@@ -374,10 +519,20 @@ func (c *SpotifyMetadataClient) fetchAlbum(ctx context.Context, albumID, token s
 		})
 	}
 
-	return &AlbumResponsePayload{
+	result := &AlbumResponsePayload{
 		AlbumInfo: info,
 		TrackList: tracks,
-	}, nil
+	}
+
+	// Store in cache
+	c.cacheMu.Lock()
+	c.albumCache[albumID] = &cacheEntry{
+		data:      result,
+		expiresAt: time.Now().Add(albumCacheTTL),
+	}
+	c.cacheMu.Unlock()
+
+	return result, nil
 }
 
 func (c *SpotifyMetadataClient) fetchPlaylist(ctx context.Context, playlistID, token string) (*PlaylistResponsePayload, error) {
@@ -436,6 +591,14 @@ func (c *SpotifyMetadataClient) fetchPlaylist(ctx context.Context, playlistID, t
 }
 
 func (c *SpotifyMetadataClient) fetchArtist(ctx context.Context, artistID, token string) (*ArtistResponsePayload, error) {
+	// Check cache first
+	c.cacheMu.RLock()
+	if entry, ok := c.artistCache[artistID]; ok && !entry.isExpired() {
+		c.cacheMu.RUnlock()
+		return entry.data.(*ArtistResponsePayload), nil
+	}
+	c.cacheMu.RUnlock()
+
 	// Fetch artist info
 	var artistData struct {
 		ID         string  `json:"id"`
@@ -511,10 +674,20 @@ func (c *SpotifyMetadataClient) fetchArtist(ctx context.Context, artistID, token
 		}
 	}
 
-	return &ArtistResponsePayload{
+	result := &ArtistResponsePayload{
 		ArtistInfo: artistInfo,
 		Albums:     albums,
-	}, nil
+	}
+
+	// Store in cache
+	c.cacheMu.Lock()
+	c.artistCache[artistID] = &cacheEntry{
+		data:      result,
+		expiresAt: time.Now().Add(artistCacheTTL),
+	}
+	c.cacheMu.Unlock()
+
+	return result, nil
 }
 
 func (c *SpotifyMetadataClient) fetchTrackISRC(ctx context.Context, trackID, token string) string {

go_backend/tidal.go

@@ -905,6 +905,13 @@ func downloadFromTidal(req DownloadRequest) (string, error) {
 		return "", fmt.Errorf("download failed: %w", err)
 	}
 
+	// Set progress to 100% and status to finalizing (before embedding)
+	// This makes the UI show "Finalizing..." while embedding happens
+	if req.ItemID != "" {
+		SetItemProgress(req.ItemID, 1.0, 0, 0)
+		SetItemFinalizing(req.ItemID)
+	}
+
 	// Check if file was saved as M4A (DASH stream) instead of FLAC
 	// downloadFromManifest saves DASH streams as .m4a
 	actualOutputPath := outputPath

ios/Runner/AppDelegate.swift

@@ -66,6 +66,15 @@ import Gobackend  // Import Go framework
             if let error = error { throw error }
             return response
             
+        case "searchSpotifyAll":
+            let args = call.arguments as! [String: Any]
+            let query = args["query"] as! String
+            let trackLimit = args["track_limit"] as? Int ?? 15
+            let artistLimit = args["artist_limit"] as? Int ?? 3
+            let response = GobackendSearchSpotifyAll(query, Int(trackLimit), Int(artistLimit), &error)
+            if let error = error { throw error }
+            return response
+            
         case "checkAvailability":
             let args = call.arguments as! [String: Any]
             let spotifyId = args["spotify_id"] as! String

lib/constants/app_info.dart

@@ -1,10 +1,11 @@
 /// App version and info constants
 /// Update version here only - all other files will reference this
 class AppInfo {
-  static const String version = '1.5.5';
-  static const String buildNumber = '22';
+  static const String version = '2.0.0';
+  static const String buildNumber = '30';
   static const String fullVersion = '$version+$buildNumber';
   
+  
   static const String appName = 'SpotiFLAC';
   static const String copyright = '© 2026 SpotiFLAC';
   

lib/models/download_item.dart

@@ -7,6 +7,7 @@ part 'download_item.g.dart';
 enum DownloadStatus {
   queued,
   downloading,
+  finalizing, // Embedding metadata, cover, lyrics
   completed,
   failed,
   skipped,
@@ -22,6 +23,7 @@ class DownloadItem {
   final String? filePath;
   final String? error;
   final DateTime createdAt;
+  final String? qualityOverride; // Override quality for this specific download
 
   const DownloadItem({
     required this.id,
@@ -32,6 +34,7 @@ class DownloadItem {
     this.filePath,
     this.error,
     required this.createdAt,
+    this.qualityOverride,
   });
 
   DownloadItem copyWith({
@@ -43,6 +46,7 @@ class DownloadItem {
     String? filePath,
     String? error,
     DateTime? createdAt,
+    String? qualityOverride,
   }) {
     return DownloadItem(
       id: id ?? this.id,
@@ -53,6 +57,7 @@ class DownloadItem {
       filePath: filePath ?? this.filePath,
       error: error ?? this.error,
       createdAt: createdAt ?? this.createdAt,
+      qualityOverride: qualityOverride ?? this.qualityOverride,
     );
   }
 

lib/models/download_item.g.dart

@@ -17,6 +17,7 @@ DownloadItem _$DownloadItemFromJson(Map<String, dynamic> json) => DownloadItem(
   filePath: json['filePath'] as String?,
   error: json['error'] as String?,
   createdAt: DateTime.parse(json['createdAt'] as String),
+  qualityOverride: json['qualityOverride'] as String?,
 );
 
 Map<String, dynamic> _$DownloadItemToJson(DownloadItem instance) =>
@@ -29,11 +30,13 @@ Map<String, dynamic> _$DownloadItemToJson(DownloadItem instance) =>
       'filePath': instance.filePath,
       'error': instance.error,
       'createdAt': instance.createdAt.toIso8601String(),
+      'qualityOverride': instance.qualityOverride,
     };
 
 const _$DownloadStatusEnumMap = {
   DownloadStatus.queued: 'queued',
   DownloadStatus.downloading: 'downloading',
+  DownloadStatus.finalizing: 'finalizing',
   DownloadStatus.completed: 'completed',
   DownloadStatus.failed: 'failed',
   DownloadStatus.skipped: 'skipped',

lib/models/settings.dart

@@ -18,6 +18,7 @@ class AppSettings {
   final String folderOrganization; // none, artist, album, artist_album
   final bool convertLyricsToRomaji; // Convert Japanese lyrics to romaji
   final String historyViewMode; // list, grid
+  final bool askQualityBeforeDownload; // Show quality picker before each download
 
   const AppSettings({
     this.defaultService = 'tidal',
@@ -34,6 +35,7 @@ class AppSettings {
     this.folderOrganization = 'none', // Default: no folder organization
     this.convertLyricsToRomaji = false, // Default: keep original Japanese
     this.historyViewMode = 'grid', // Default: grid view
+    this.askQualityBeforeDownload = true, // Default: ask quality before download
   });
 
   AppSettings copyWith({
@@ -51,6 +53,7 @@ class AppSettings {
     String? folderOrganization,
     bool? convertLyricsToRomaji,
     String? historyViewMode,
+    bool? askQualityBeforeDownload,
   }) {
     return AppSettings(
       defaultService: defaultService ?? this.defaultService,
@@ -67,6 +70,7 @@ class AppSettings {
       folderOrganization: folderOrganization ?? this.folderOrganization,
       convertLyricsToRomaji: convertLyricsToRomaji ?? this.convertLyricsToRomaji,
       historyViewMode: historyViewMode ?? this.historyViewMode,
+      askQualityBeforeDownload: askQualityBeforeDownload ?? this.askQualityBeforeDownload,
     );
   }
 

lib/models/settings.g.dart

@@ -20,7 +20,8 @@ AppSettings _$AppSettingsFromJson(Map<String, dynamic> json) => AppSettings(
   hasSearchedBefore: json['hasSearchedBefore'] as bool? ?? false,
   folderOrganization: json['folderOrganization'] as String? ?? 'none',
   convertLyricsToRomaji: json['convertLyricsToRomaji'] as bool? ?? false,
-  historyViewMode: json['historyViewMode'] as String? ?? 'list',
+  historyViewMode: json['historyViewMode'] as String? ?? 'grid',
+  askQualityBeforeDownload: json['askQualityBeforeDownload'] as bool? ?? true,
 );
 
 Map<String, dynamic> _$AppSettingsToJson(AppSettings instance) =>
@@ -39,4 +40,5 @@ Map<String, dynamic> _$AppSettingsToJson(AppSettings instance) =>
       'folderOrganization': instance.folderOrganization,
       'convertLyricsToRomaji': instance.convertLyricsToRomaji,
       'historyViewMode': instance.historyViewMode,
+      'askQualityBeforeDownload': instance.askQualityBeforeDownload,
     };

lib/providers/download_queue_provider.dart

@@ -13,6 +13,10 @@ import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/services/ffmpeg_service.dart';
 import 'package:spotiflac_android/services/notification_service.dart';
+import 'package:spotiflac_android/utils/logger.dart';
+
+final _log = AppLogger('DownloadQueue');
+final _historyLog = AppLogger('DownloadHistory');
 
 // Download History Item model
 class DownloadHistoryItem {
@@ -95,8 +99,16 @@ class DownloadHistoryItem {
 // Download History State
 class DownloadHistoryState {
   final List<DownloadHistoryItem> items;
+  final Set<String> _downloadedSpotifyIds; // Cache for O(1) lookup
 
-  const DownloadHistoryState({this.items = const []});
+  DownloadHistoryState({this.items = const []})
+      : _downloadedSpotifyIds = items
+            .where((item) => item.spotifyId != null && item.spotifyId!.isNotEmpty)
+            .map((item) => item.spotifyId!)
+            .toSet();
+
+  /// Check if a track has been downloaded (by Spotify ID)
+  bool isDownloaded(String spotifyId) => _downloadedSpotifyIds.contains(spotifyId);
 
   DownloadHistoryState copyWith({List<DownloadHistoryItem>? items}) {
     return DownloadHistoryState(items: items ?? this.items);
@@ -112,7 +124,7 @@ class DownloadHistoryNotifier extends Notifier<DownloadHistoryState> {
   DownloadHistoryState build() {
     // Load history from storage on init
     _loadFromStorageSync();
-    return const DownloadHistoryState();
+    return DownloadHistoryState();
   }
 
   /// Synchronously schedule load - ensures it runs before any UI renders
@@ -132,12 +144,12 @@ class DownloadHistoryNotifier extends Notifier<DownloadHistoryState> {
         final List<dynamic> jsonList = jsonDecode(jsonStr);
         final items = jsonList.map((e) => DownloadHistoryItem.fromJson(e as Map<String, dynamic>)).toList();
         state = state.copyWith(items: items);
-        print('[DownloadHistory] Loaded ${items.length} items from storage');
+        _historyLog.i('Loaded ${items.length} items from storage');
       } else {
-        print('[DownloadHistory] No history found in storage');
+        _historyLog.d('No history found in storage');
       }
     } catch (e) {
-      print('[DownloadHistory] Failed to load history: $e');
+      _historyLog.e('Failed to load history: $e');
     }
   }
 
@@ -146,9 +158,9 @@ class DownloadHistoryNotifier extends Notifier<DownloadHistoryState> {
       final prefs = await SharedPreferences.getInstance();
       final jsonList = state.items.map((e) => e.toJson()).toList();
       await prefs.setString(_storageKey, jsonEncode(jsonList));
-      print('[DownloadHistory] Saved ${state.items.length} items to storage');
+      _historyLog.d('Saved ${state.items.length} items to storage');
     } catch (e) {
-      print('[DownloadHistory] Failed to save history: $e');
+      _historyLog.e('Failed to save history: $e');
     }
   }
 
@@ -169,8 +181,22 @@ class DownloadHistoryNotifier extends Notifier<DownloadHistoryState> {
     _saveToStorage();
   }
 
+  /// Remove item from history by Spotify ID
+  void removeBySpotifyId(String spotifyId) {
+    state = state.copyWith(
+      items: state.items.where((item) => item.spotifyId != spotifyId).toList(),
+    );
+    _saveToStorage();
+    _historyLog.d('Removed item with spotifyId: $spotifyId');
+  }
+
+  /// Get history item by Spotify ID
+  DownloadHistoryItem? getBySpotifyId(String spotifyId) {
+    return state.items.where((item) => item.spotifyId == spotifyId).firstOrNull;
+  }
+
   void clearHistory() {
-    state = const DownloadHistoryState();
+    state = DownloadHistoryState();
     _saveToStorage();
   }
 }
@@ -238,18 +264,96 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
   Timer? _progressTimer;
   int _downloadCount = 0; // Counter for connection cleanup
   static const _cleanupInterval = 50; // Cleanup every 50 downloads
+  static const _queueStorageKey = 'download_queue'; // Storage key for queue persistence
   final NotificationService _notificationService = NotificationService();
   int _totalQueuedAtStart = 0; // Track total items when queue started
+  bool _isLoaded = false;
 
   @override
   DownloadQueueState build() {
-    // Initialize output directory asynchronously
+    // Cleanup timer when provider is disposed
+    ref.onDispose(() {
+      _progressTimer?.cancel();
+      _progressTimer = null;
+    });
+    
+    // Initialize output directory and load persisted queue asynchronously
     Future.microtask(() async {
       await _initOutputDir();
+      await _loadQueueFromStorage();
     });
     return const DownloadQueueState();
   }
 
+  /// Load persisted queue from storage (for app restart recovery)
+  Future<void> _loadQueueFromStorage() async {
+    if (_isLoaded) return;
+    _isLoaded = true;
+    
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final jsonStr = prefs.getString(_queueStorageKey);
+      if (jsonStr != null && jsonStr.isNotEmpty) {
+        final List<dynamic> jsonList = jsonDecode(jsonStr);
+        final items = jsonList.map((e) => DownloadItem.fromJson(e as Map<String, dynamic>)).toList();
+        
+        // Reset downloading items to queued (they were interrupted)
+        final restoredItems = items.map((item) {
+          if (item.status == DownloadStatus.downloading) {
+            return item.copyWith(status: DownloadStatus.queued, progress: 0);
+          }
+          return item;
+        }).toList();
+        
+        // Only restore queued/downloading items (not completed/failed/skipped)
+        final pendingItems = restoredItems.where((item) => 
+          item.status == DownloadStatus.queued
+        ).toList();
+        
+        if (pendingItems.isNotEmpty) {
+          state = state.copyWith(items: pendingItems);
+          _log.i('Restored ${pendingItems.length} pending items from storage');
+          
+          // Auto-resume queue processing
+          Future.microtask(() => _processQueue());
+        } else {
+          _log.d('No pending items to restore');
+          // Clear storage since nothing to restore
+          await prefs.remove(_queueStorageKey);
+        }
+      } else {
+        _log.d('No queue found in storage');
+      }
+    } catch (e) {
+      _log.e('Failed to load queue from storage: $e');
+    }
+  }
+
+  /// Save current queue to storage (only pending items)
+  Future<void> _saveQueueToStorage() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      
+      // Only persist queued and downloading items
+      final pendingItems = state.items.where((item) => 
+        item.status == DownloadStatus.queued || 
+        item.status == DownloadStatus.downloading
+      ).toList();
+      
+      if (pendingItems.isEmpty) {
+        // Clear storage if no pending items
+        await prefs.remove(_queueStorageKey);
+        _log.d('Cleared queue storage (no pending items)');
+      } else {
+        final jsonList = pendingItems.map((e) => e.toJson()).toList();
+        await prefs.setString(_queueStorageKey, jsonEncode(jsonList));
+        _log.d('Saved ${pendingItems.length} pending items to storage');
+      }
+    } catch (e) {
+      _log.e('Failed to save queue to storage: $e');
+    }
+  }
+
   void _startProgressPolling(String itemId) {
     _progressTimer?.cancel();
     _progressTimer = Timer.periodic(const Duration(milliseconds: 500), (timer) async {
@@ -258,6 +362,22 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         final bytesReceived = progress['bytes_received'] as int? ?? 0;
         final bytesTotal = progress['bytes_total'] as int? ?? 0;
         final isDownloading = progress['is_downloading'] as bool? ?? false;
+        final status = progress['status'] as String? ?? 'downloading';
+        
+        // Check if status is "finalizing" (embedding metadata)
+        if (status == 'finalizing') {
+          updateItemStatus(itemId, DownloadStatus.finalizing, progress: 1.0);
+          
+          // Update notification to show finalizing
+          final currentItem = state.items.where((i) => i.id == itemId).firstOrNull;
+          if (currentItem != null) {
+            _notificationService.showDownloadFinalizing(
+              trackName: currentItem.track.name,
+              artistName: currentItem.track.artistName,
+            );
+          }
+          return;
+        }
         
         if (isDownloading && bytesTotal > 0) {
           final percentage = bytesReceived / bytesTotal;
@@ -272,12 +392,23 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
               progress: bytesReceived,
               total: bytesTotal,
             );
+            
+            // Update foreground service notification (Android)
+            if (Platform.isAndroid) {
+              PlatformBridge.updateDownloadServiceProgress(
+                trackName: currentItem.track.name,
+                artistName: currentItem.track.artistName,
+                progress: bytesReceived,
+                total: bytesTotal,
+                queueCount: state.queuedCount,
+              ).catchError((_) {}); // Ignore errors
+            }
           }
           
           // Log progress
           final mbReceived = bytesReceived / (1024 * 1024);
           final mbTotal = bytesTotal / (1024 * 1024);
-          print('[DownloadQueue] Progress: ${(percentage * 100).toStringAsFixed(1)}% (${mbReceived.toStringAsFixed(2)}/${mbTotal.toStringAsFixed(2)} MB)');
+          _log.d('Progress: ${(percentage * 100).toStringAsFixed(1)}% (${mbReceived.toStringAsFixed(2)}/${mbTotal.toStringAsFixed(2)} MB)');
         }
       } catch (e) {
         // Ignore polling errors
@@ -299,6 +430,22 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
           final bytesReceived = itemProgress['bytes_received'] as int? ?? 0;
           final bytesTotal = itemProgress['bytes_total'] as int? ?? 0;
           final isDownloading = itemProgress['is_downloading'] as bool? ?? false;
+          final status = itemProgress['status'] as String? ?? 'downloading';
+          
+          // Check if status is "finalizing" (embedding metadata)
+          if (status == 'finalizing') {
+            updateItemStatus(itemId, DownloadStatus.finalizing, progress: 1.0);
+            
+            // Update notification to show finalizing
+            final currentItem = state.items.where((i) => i.id == itemId).firstOrNull;
+            if (currentItem != null) {
+              _notificationService.showDownloadFinalizing(
+                trackName: currentItem.track.name,
+                artistName: currentItem.track.artistName,
+              );
+            }
+            continue;
+          }
           
           if (isDownloading && bytesTotal > 0) {
             final percentage = bytesReceived / bytesTotal;
@@ -307,7 +454,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
             // Log progress for each item
             final mbReceived = bytesReceived / (1024 * 1024);
             final mbTotal = bytesTotal / (1024 * 1024);
-            print('[DownloadQueue] Progress [$itemId]: ${(percentage * 100).toStringAsFixed(1)}% (${mbReceived.toStringAsFixed(2)}/${mbTotal.toStringAsFixed(2)} MB)');
+            _log.d('Progress [$itemId]: ${(percentage * 100).toStringAsFixed(1)}% (${mbReceived.toStringAsFixed(2)}/${mbTotal.toStringAsFixed(2)} MB)');
           }
         }
         
@@ -319,7 +466,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
           final bytesTotal = firstProgress['bytes_total'] as int? ?? 0;
           
           // Find the item to get track info
-          final downloadingItems = state.items.where((i) => i.status == DownloadStatus.downloading).toList();
+          final downloadingItems = state.items.where((i) => i.status == DownloadStatus.downloading || i.status == DownloadStatus.finalizing).toList();
           if (downloadingItems.isNotEmpty) {
             _notificationService.showDownloadProgress(
               trackName: '${downloadingItems.length} downloads',
@@ -327,6 +474,17 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
               progress: bytesReceived,
               total: bytesTotal > 0 ? bytesTotal : 1,
             );
+            
+            // Update foreground service notification (Android)
+            if (Platform.isAndroid) {
+              PlatformBridge.updateDownloadServiceProgress(
+                trackName: downloadingItems.first.track.name,
+                artistName: downloadingItems.first.track.artistName,
+                progress: bytesReceived,
+                total: bytesTotal > 0 ? bytesTotal : 1,
+                queueCount: state.queuedCount,
+              ).catchError((_) {}); // Ignore errors
+            }
           }
         }
       } catch (e) {
@@ -424,7 +582,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       final dir = Directory(fullPath);
       if (!await dir.exists()) {
         await dir.create(recursive: true);
-        print('[DownloadQueue] Created folder: $fullPath');
+        _log.d('Created folder: $fullPath');
       }
       return fullPath;
     }
@@ -442,7 +600,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     );
   }
 
-  String addToQueue(Track track, String service) {
+  String addToQueue(Track track, String service, {String? qualityOverride}) {
     // Sync settings before adding to queue
     final settings = ref.read(settingsProvider);
     updateSettings(settings);
@@ -453,9 +611,11 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       track: track,
       service: service,
       createdAt: DateTime.now(),
+      qualityOverride: qualityOverride,
     );
 
     state = state.copyWith(items: [...state.items, item]);
+    _saveQueueToStorage(); // Persist queue
 
     if (!state.isProcessing) {
       // Run in microtask to not block UI
@@ -465,7 +625,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     return id;
   }
 
-  void addMultipleToQueue(List<Track> tracks, String service) {
+  void addMultipleToQueue(List<Track> tracks, String service, {String? qualityOverride}) {
     // Sync settings before adding to queue
     final settings = ref.read(settingsProvider);
     updateSettings(settings);
@@ -477,10 +637,12 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         track: track,
         service: service,
         createdAt: DateTime.now(),
+        qualityOverride: qualityOverride,
       );
     }).toList();
 
     state = state.copyWith(items: [...state.items, ...newItems]);
+    _saveQueueToStorage(); // Persist queue
 
     if (!state.isProcessing) {
       // Run in microtask to not block UI
@@ -502,6 +664,13 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     }).toList();
 
     state = state.copyWith(items: items);
+    
+    // Persist queue when status changes to completed/failed/skipped (item removed from pending)
+    if (status == DownloadStatus.completed || 
+        status == DownloadStatus.failed || 
+        status == DownloadStatus.skipped) {
+      _saveQueueToStorage();
+    }
   }
 
   void updateProgress(String id, double progress) {
@@ -520,10 +689,12 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     ).toList();
 
     state = state.copyWith(items: items);
+    _saveQueueToStorage(); // Persist queue
   }
 
   void clearAll() {
     state = state.copyWith(items: [], isPaused: false);
+    _saveQueueToStorage(); // Clear persisted queue
   }
 
   /// Pause the download queue
@@ -531,7 +702,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     if (state.isProcessing && !state.isPaused) {
       state = state.copyWith(isPaused: true);
       _notificationService.cancelDownloadNotification();
-      print('[DownloadQueue] Queue paused');
+      _log.i('Queue paused');
     }
   }
 
@@ -539,7 +710,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
   void resumeQueue() {
     if (state.isPaused) {
       state = state.copyWith(isPaused: false);
-      print('[DownloadQueue] Queue resumed');
+      _log.i('Queue resumed');
       // If there are still queued items, continue processing
       if (state.queuedCount > 0 && !state.isProcessing) {
         Future.microtask(() => _processQueue());
@@ -565,6 +736,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       return item;
     }).toList();
     state = state.copyWith(items: items);
+    _saveQueueToStorage(); // Persist queue
     
     // Start processing if not already
     if (!state.isProcessing) {
@@ -576,6 +748,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
   void removeItem(String id) {
     final items = state.items.where((item) => item.id != id).toList();
     state = state.copyWith(items: items);
+    _saveQueueToStorage(); // Persist queue
   }
 
   /// Embed metadata and cover to a FLAC file after M4A conversion
@@ -594,14 +767,14 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
           final sink = file.openWrite();
           await response.pipe(sink);
           await sink.close();
-          print('[DownloadQueue] Cover downloaded to: $coverPath');
+          _log.d('Cover downloaded to: $coverPath');
         } else {
-          print('[DownloadQueue] Failed to download cover: HTTP ${response.statusCode}');
+          _log.w('Failed to download cover: HTTP ${response.statusCode}');
           coverPath = null;
         }
         httpClient.close();
       } catch (e) {
-        print('[DownloadQueue] Failed to download cover: $e');
+        _log.e('Failed to download cover: $e');
         coverPath = null;
       }
     }
@@ -621,10 +794,10 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
           // Replace original with temp
           await File(flacPath).delete();
           await File(tempOutput).rename(flacPath);
-          print('[DownloadQueue] Cover embedded via FFmpeg');
+          _log.d('Cover embedded via FFmpeg');
         } else {
           // Try alternative method using metaflac-style embedding
-          print('[DownloadQueue] FFmpeg cover embed failed, trying alternative...');
+          _log.w('FFmpeg cover embed failed, trying alternative...');
           // Clean up temp file if exists
           final tempFile = File(tempOutput);
           if (await tempFile.exists()) {
@@ -638,7 +811,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         } catch (_) {}
       }
     } catch (e) {
-      print('[DownloadQueue] Failed to embed metadata: $e');
+      _log.e('Failed to embed metadata: $e');
     }
   }
 
@@ -646,20 +819,38 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     if (state.isProcessing) return; // Prevent multiple concurrent processing
     
     state = state.copyWith(isProcessing: true);
-    print('[DownloadQueue] Starting queue processing...');
+    _log.i('Starting queue processing...');
 
     // Track total items at start for notification
     _totalQueuedAtStart = state.items.where((i) => i.status == DownloadStatus.queued).length;
 
+    // Start foreground service to keep downloads running in background (Android only)
+    if (Platform.isAndroid && _totalQueuedAtStart > 0) {
+      final firstItem = state.items.firstWhere(
+        (item) => item.status == DownloadStatus.queued,
+        orElse: () => state.items.first,
+      );
+      try {
+        await PlatformBridge.startDownloadService(
+          trackName: firstItem.track.name,
+          artistName: firstItem.track.artistName,
+          queueCount: _totalQueuedAtStart,
+        );
+        _log.d('Foreground service started');
+      } catch (e) {
+        _log.e('Failed to start foreground service: $e');
+      }
+    }
+
     // Ensure output directory is initialized before processing
     if (state.outputDir.isEmpty) {
-      print('[DownloadQueue] Output dir empty, initializing...');
+      _log.d('Output dir empty, initializing...');
       await _initOutputDir();
     }
     
     // If still empty, use fallback
     if (state.outputDir.isEmpty) {
-      print('[DownloadQueue] Using fallback directory...');
+      _log.d('Using fallback directory...');
       final dir = await getApplicationDocumentsDirectory();
       final musicDir = Directory('${dir.path}/SpotiFLAC');
       if (!await musicDir.exists()) {
@@ -668,8 +859,8 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       state = state.copyWith(outputDir: musicDir.path);
     }
     
-    print('[DownloadQueue] Output directory: ${state.outputDir}');
-    print('[DownloadQueue] Concurrent downloads: ${state.concurrentDownloads}');
+    _log.d('Output directory: ${state.outputDir}');
+    _log.d('Concurrent downloads: ${state.concurrentDownloads}');
 
     // Use parallel processing if concurrentDownloads > 1
     if (state.concurrentDownloads > 1) {
@@ -680,13 +871,23 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
 
     _stopProgressPolling();
     
+    // Stop foreground service (Android only)
+    if (Platform.isAndroid) {
+      try {
+        await PlatformBridge.stopDownloadService();
+        _log.d('Foreground service stopped');
+      } catch (e) {
+        _log.e('Failed to stop foreground service: $e');
+      }
+    }
+    
     // Final cleanup after queue finishes
     if (_downloadCount > 0) {
-      print('[DownloadQueue] Final connection cleanup...');
+      _log.d('Final connection cleanup...');
       try {
         await PlatformBridge.cleanupConnections();
       } catch (e) {
-        print('[DownloadQueue] Final cleanup failed: $e');
+        _log.e('Final cleanup failed: $e');
       }
       _downloadCount = 0;
     }
@@ -701,7 +902,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       );
     }
     
-    print('[DownloadQueue] Queue processing finished');
+    _log.i('Queue processing finished');
     state = state.copyWith(isProcessing: false, currentDownload: null);
   }
 
@@ -710,7 +911,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     while (true) {
       // Check if paused
       if (state.isPaused) {
-        print('[DownloadQueue] Queue is paused, waiting...');
+        _log.d('Queue is paused, waiting...');
         await Future.delayed(const Duration(milliseconds: 500));
         continue;
       }
@@ -726,7 +927,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       );
 
       if (nextItem.id.isEmpty) {
-        print('[DownloadQueue] No more items to process');
+        _log.d('No more items to process');
         break;
       }
 
@@ -745,7 +946,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     while (true) {
       // Check if paused - don't start new downloads but let active ones finish
       if (state.isPaused) {
-        print('[DownloadQueue] Queue is paused, waiting for active downloads...');
+        _log.d('Queue is paused, waiting for active downloads...');
         if (activeDownloads.isNotEmpty) {
           await Future.any(activeDownloads.values);
         } else {
@@ -758,7 +959,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       final queuedItems = state.items.where((item) => item.status == DownloadStatus.queued).toList();
       
       if (queuedItems.isEmpty && activeDownloads.isEmpty) {
-        print('[DownloadQueue] No more items to process');
+        _log.d('No more items to process');
         break;
       }
       
@@ -777,7 +978,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         });
         
         activeDownloads[item.id] = future;
-        print('[DownloadQueue] Started parallel download: ${item.track.name} (${activeDownloads.length}/$maxConcurrent active)');
+        _log.d('Started parallel download: ${item.track.name} (${activeDownloads.length}/$maxConcurrent active)');
       }
       
       // Wait for at least one download to complete before checking for more
@@ -794,8 +995,8 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
 
   /// Download a single item (used by both sequential and parallel processing)
   Future<void> _downloadSingleItem(DownloadItem item) async {
-    print('[DownloadQueue] Processing: ${item.track.name} by ${item.track.artistName}');
-    print('[DownloadQueue] Cover URL: ${item.track.coverUrl}');
+    _log.d('Processing: ${item.track.name} by ${item.track.artistName}');
+    _log.d('Cover URL: ${item.track.coverUrl}');
     
     // Only set currentDownload for sequential mode (for progress polling)
     if (state.concurrentDownloads == 1) {
@@ -810,12 +1011,15 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       final settings = ref.read(settingsProvider);
       final outputDir = await _buildOutputDir(item.track, settings.folderOrganization);
       
+      // Use quality override if set, otherwise use default from settings
+      final quality = item.qualityOverride ?? state.audioQuality;
+      
       Map<String, dynamic> result;
 
       if (state.autoFallback) {
-        print('[DownloadQueue] Using auto-fallback mode');
-        print('[DownloadQueue] Quality: ${state.audioQuality}');
-        print('[DownloadQueue] Output dir: $outputDir');
+        _log.d('Using auto-fallback mode');
+        _log.d('Quality: $quality${item.qualityOverride != null ? ' (override)' : ''}');
+        _log.d('Output dir: $outputDir');
         result = await PlatformBridge.downloadWithFallback(
           isrc: item.track.isrc ?? '',
           spotifyId: item.track.id,
@@ -826,7 +1030,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
           coverUrl: item.track.coverUrl,
           outputDir: outputDir,
           filenameFormat: state.filenameFormat,
-          quality: state.audioQuality,
+          quality: quality,
           trackNumber: item.track.trackNumber ?? 1,
           discNumber: item.track.discNumber ?? 1,
           releaseDate: item.track.releaseDate,
@@ -846,7 +1050,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
           coverUrl: item.track.coverUrl,
           outputDir: outputDir,
           filenameFormat: state.filenameFormat,
-          quality: state.audioQuality,
+          quality: quality,
           trackNumber: item.track.trackNumber ?? 1,
           discNumber: item.track.discNumber ?? 1,
           releaseDate: item.track.releaseDate,
@@ -860,31 +1064,31 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         _stopProgressPolling();
       }
       
-      print('[DownloadQueue] Result: $result');
+      _log.d('Result: $result');
       
       if (result['success'] == true) {
         var filePath = result['file_path'] as String?;
-        print('[DownloadQueue] Download success, file: $filePath');
+        _log.i('Download success, file: $filePath');
         
         // Check if file is M4A (DASH stream from Tidal) and needs remuxing to FLAC
         if (filePath != null && filePath.endsWith('.m4a')) {
-          print('[DownloadQueue] Converting M4A to FLAC...');
+          _log.d('Converting M4A to FLAC...');
           updateItemStatus(item.id, DownloadStatus.downloading, progress: 0.9);
           final flacPath = await FFmpegService.convertM4aToFlac(filePath);
           if (flacPath != null) {
             filePath = flacPath;
-            print('[DownloadQueue] Converted to: $flacPath');
+            _log.d('Converted to: $flacPath');
             
             // After conversion, embed metadata and cover to the new FLAC file
-            print('[DownloadQueue] Embedding metadata and cover to converted FLAC...');
+            _log.d('Embedding metadata and cover to converted FLAC...');
             try {
               await _embedMetadataAndCover(
                 flacPath,
                 item.track,
               );
-              print('[DownloadQueue] Metadata and cover embedded successfully');
+              _log.d('Metadata and cover embedded successfully');
             } catch (e) {
-              print('[DownloadQueue] Warning: Failed to embed metadata/cover: $e');
+              _log.w('Warning: Failed to embed metadata/cover: $e');
             }
           }
         }
@@ -923,7 +1127,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
               discNumber: item.track.discNumber,
               duration: item.track.duration,
               releaseDate: item.track.releaseDate,
-              quality: state.audioQuality,
+              quality: quality,
             ),
           );
           
@@ -932,7 +1136,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         }
       } else {
         final errorMsg = result['error'] as String? ?? 'Download failed';
-        print('[DownloadQueue] Download failed: $errorMsg');
+        _log.e('Download failed: $errorMsg');
         updateItemStatus(
           item.id,
           DownloadStatus.failed,
@@ -943,19 +1147,18 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       // Increment download counter and cleanup connections periodically
       _downloadCount++;
       if (_downloadCount % _cleanupInterval == 0) {
-        print('[DownloadQueue] Cleaning up idle connections (after $_downloadCount downloads)...');
+        _log.d('Cleaning up idle connections (after $_downloadCount downloads)...');
         try {
           await PlatformBridge.cleanupConnections();
         } catch (e) {
-          print('[DownloadQueue] Connection cleanup failed: $e');
+          _log.e('Connection cleanup failed: $e');
         }
       }
     } catch (e, stackTrace) {
       if (state.concurrentDownloads == 1) {
         _stopProgressPolling();
       }
-      print('[DownloadQueue] Exception: $e');
-      print('[DownloadQueue] StackTrace: $stackTrace');
+      _log.e('Exception: $e', e, stackTrace);
       updateItemStatus(
         item.id,
         DownloadStatus.failed,

lib/providers/settings_provider.dart

@@ -98,6 +98,11 @@ class SettingsNotifier extends Notifier<AppSettings> {
     state = state.copyWith(historyViewMode: mode);
     _saveSettings();
   }
+
+  void setAskQualityBeforeDownload(bool enabled) {
+    state = state.copyWith(askQualityBeforeDownload: enabled);
+    _saveSettings();
+  }
 }
 
 final settingsProvider = NotifierProvider<SettingsNotifier, AppSettings>(

lib/providers/track_provider.dart

@@ -6,51 +6,60 @@ class TrackState {
   final List<Track> tracks;
   final bool isLoading;
   final String? error;
+  final String? albumId;
   final String? albumName;
   final String? playlistName;
+  final String? artistId;
   final String? artistName;
   final String? coverUrl;
   final List<ArtistAlbum>? artistAlbums; // For artist page
-  final TrackState? previousState; // For back navigation
+  final List<SearchArtist>? searchArtists; // For search results
+  final bool hasSearchText; // For back button handling
 
   const TrackState({
     this.tracks = const [],
     this.isLoading = false,
     this.error,
+    this.albumId,
     this.albumName,
     this.playlistName,
+    this.artistId,
     this.artistName,
     this.coverUrl,
     this.artistAlbums,
-    this.previousState,
+    this.searchArtists,
+    this.hasSearchText = false,
   });
 
-  bool get canGoBack => previousState != null;
-  
-  bool get hasContent => tracks.isNotEmpty || artistAlbums != null;
+  bool get hasContent => tracks.isNotEmpty || artistAlbums != null || (searchArtists != null && searchArtists!.isNotEmpty);
 
   TrackState copyWith({
     List<Track>? tracks,
     bool? isLoading,
     String? error,
+    String? albumId,
     String? albumName,
     String? playlistName,
+    String? artistId,
     String? artistName,
     String? coverUrl,
     List<ArtistAlbum>? artistAlbums,
-    TrackState? previousState,
-    bool clearPreviousState = false,
+    List<SearchArtist>? searchArtists,
+    bool? hasSearchText,
   }) {
     return TrackState(
       tracks: tracks ?? this.tracks,
       isLoading: isLoading ?? this.isLoading,
       error: error,
+      albumId: albumId ?? this.albumId,
       albumName: albumName ?? this.albumName,
       playlistName: playlistName ?? this.playlistName,
+      artistId: artistId ?? this.artistId,
       artistName: artistName ?? this.artistName,
       coverUrl: coverUrl ?? this.coverUrl,
       artistAlbums: artistAlbums ?? this.artistAlbums,
-      previousState: clearPreviousState ? null : (previousState ?? this.previousState),
+      searchArtists: searchArtists ?? this.searchArtists,
+      hasSearchText: hasSearchText ?? this.hasSearchText,
     );
   }
 }
@@ -76,31 +85,49 @@ class ArtistAlbum {
   });
 }
 
+/// Represents an artist in search results
+class SearchArtist {
+  final String id;
+  final String name;
+  final String? imageUrl;
+  final int followers;
+  final int popularity;
+
+  const SearchArtist({
+    required this.id,
+    required this.name,
+    this.imageUrl,
+    required this.followers,
+    required this.popularity,
+  });
+}
+
 class TrackNotifier extends Notifier<TrackState> {
+  /// Request ID to track and cancel outdated requests
+  int _currentRequestId = 0;
+
   @override
   TrackState build() {
     return const TrackState();
   }
 
-  Future<void> fetchFromUrl(String url) async {
-    // Save current state for back navigation (only if we have content or it's empty)
-    final savedState = state.hasContent ? TrackState(
-      tracks: state.tracks,
-      albumName: state.albumName,
-      playlistName: state.playlistName,
-      artistName: state.artistName,
-      coverUrl: state.coverUrl,
-      artistAlbums: state.artistAlbums,
-      previousState: state.previousState,
-    ) : const TrackState(); // Empty state for back to home
+  /// Check if request is still valid (not cancelled by newer request)
+  bool _isRequestValid(int requestId) => requestId == _currentRequestId;
 
-    state = TrackState(isLoading: true, previousState: savedState);
+  Future<void> fetchFromUrl(String url) async {
+    // Increment request ID to cancel any pending requests
+    final requestId = ++_currentRequestId;
+
+    state = const TrackState(isLoading: true);
 
     try {
       final parsed = await PlatformBridge.parseSpotifyUrl(url);
+      if (!_isRequestValid(requestId)) return; // Request cancelled
+      
       final type = parsed['type'] as String;
 
       final metadata = await PlatformBridge.getSpotifyMetadata(url);
+      if (!_isRequestValid(requestId)) return; // Request cancelled
 
       if (type == 'track') {
         final trackData = metadata['track'] as Map<String, dynamic>;
@@ -109,7 +136,6 @@ class TrackNotifier extends Notifier<TrackState> {
           tracks: [track],
           isLoading: false,
           coverUrl: track.coverUrl,
-          previousState: savedState,
         );
       } else if (type == 'album') {
         final albumInfo = metadata['album_info'] as Map<String, dynamic>;
@@ -118,9 +144,9 @@ class TrackNotifier extends Notifier<TrackState> {
         state = TrackState(
           tracks: tracks,
           isLoading: false,
+          albumId: parsed['id'] as String?,
           albumName: albumInfo['name'] as String?,
           coverUrl: albumInfo['images'] as String?,
-          previousState: savedState,
         );
       } else if (type == 'playlist') {
         final playlistInfo = metadata['playlist_info'] as Map<String, dynamic>;
@@ -132,7 +158,6 @@ class TrackNotifier extends Notifier<TrackState> {
           isLoading: false,
           playlistName: owner?['name'] as String?,
           coverUrl: owner?['images'] as String?,
-          previousState: savedState,
         );
       } else if (type == 'artist') {
         final artistInfo = metadata['artist_info'] as Map<String, dynamic>;
@@ -141,42 +166,42 @@ class TrackNotifier extends Notifier<TrackState> {
         state = TrackState(
           tracks: [], // No tracks for artist view
           isLoading: false,
+          artistId: artistInfo['id'] as String?,
           artistName: artistInfo['name'] as String?,
           coverUrl: artistInfo['images'] as String?,
           artistAlbums: albums,
-          previousState: savedState,
         );
       }
     } catch (e) {
-      state = TrackState(isLoading: false, error: e.toString(), previousState: savedState);
+      if (!_isRequestValid(requestId)) return; // Request cancelled
+      state = TrackState(isLoading: false, error: e.toString());
     }
   }
 
   Future<void> search(String query) async {
-    // Save current state for back navigation
-    final savedState = state.hasContent ? TrackState(
-      tracks: state.tracks,
-      albumName: state.albumName,
-      playlistName: state.playlistName,
-      artistName: state.artistName,
-      coverUrl: state.coverUrl,
-      artistAlbums: state.artistAlbums,
-      previousState: state.previousState,
-    ) : const TrackState();
+    // Increment request ID to cancel any pending requests
+    final requestId = ++_currentRequestId;
 
-    state = TrackState(isLoading: true, previousState: savedState);
+    state = const TrackState(isLoading: true);
 
     try {
-      final results = await PlatformBridge.searchSpotify(query, limit: 20);
+      final results = await PlatformBridge.searchSpotifyAll(query, trackLimit: 20, artistLimit: 5);
+      if (!_isRequestValid(requestId)) return; // Request cancelled
+      
       final trackList = results['tracks'] as List<dynamic>? ?? [];
+      final artistList = results['artists'] as List<dynamic>? ?? [];
+      
       final tracks = trackList.map((t) => _parseSearchTrack(t as Map<String, dynamic>)).toList();
+      final artists = artistList.map((a) => _parseSearchArtist(a as Map<String, dynamic>)).toList();
+      
       state = TrackState(
         tracks: tracks,
+        searchArtists: artists,
         isLoading: false,
-        previousState: savedState,
       );
     } catch (e) {
-      state = TrackState(isLoading: false, error: e.toString(), previousState: savedState);
+      if (!_isRequestValid(requestId)) return; // Request cancelled
+      state = TrackState(isLoading: false, error: e.toString());
     }
   }
 
@@ -222,52 +247,9 @@ class TrackNotifier extends Notifier<TrackState> {
     state = const TrackState();
   }
 
-  /// Go back to previous state (if available)
-  bool goBack() {
-    if (state.previousState != null) {
-      state = state.previousState!;
-      return true;
-    }
-    return false;
-  }
-
-  /// Fetch album from artist view - saves current artist state for back navigation
-  Future<void> fetchAlbumFromArtist(String albumId) async {
-    // Save current artist state before fetching album
-    final savedState = TrackState(
-      artistName: state.artistName,
-      coverUrl: state.coverUrl,
-      artistAlbums: state.artistAlbums,
-      previousState: state.previousState, // Keep the chain
-    );
-
-    state = TrackState(
-      isLoading: true,
-      previousState: savedState,
-    );
-
-    try {
-      final url = 'https://open.spotify.com/album/$albumId';
-      final metadata = await PlatformBridge.getSpotifyMetadata(url);
-      
-      final albumInfo = metadata['album_info'] as Map<String, dynamic>;
-      final trackList = metadata['track_list'] as List<dynamic>;
-      final tracks = trackList.map((t) => _parseTrack(t as Map<String, dynamic>)).toList();
-      
-      state = TrackState(
-        tracks: tracks,
-        isLoading: false,
-        albumName: albumInfo['name'] as String?,
-        coverUrl: albumInfo['images'] as String?,
-        previousState: savedState,
-      );
-    } catch (e) {
-      state = TrackState(
-        isLoading: false,
-        error: e.toString(),
-        previousState: savedState,
-      );
-    }
+  /// Set search text state for back button handling
+  void setSearchText(bool hasText) {
+    state = state.copyWith(hasSearchText: hasText);
   }
 
   Track _parseTrack(Map<String, dynamic> data) {
@@ -313,6 +295,16 @@ class TrackNotifier extends Notifier<TrackState> {
       artists: data['artists'] as String? ?? '',
     );
   }
+
+  SearchArtist _parseSearchArtist(Map<String, dynamic> data) {
+    return SearchArtist(
+      id: data['id'] as String? ?? '',
+      name: data['name'] as String? ?? '',
+      imageUrl: data['images'] as String?,
+      followers: data['followers'] as int? ?? 0,
+      popularity: data['popularity'] as int? ?? 0,
+    );
+  }
 }
 
 final trackProvider = NotifierProvider<TrackNotifier, TrackState>(

lib/screens/album_screen.dart

@@ -0,0 +1,591 @@
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:spotiflac_android/models/track.dart';
+import 'package:spotiflac_android/models/download_item.dart';
+import 'package:spotiflac_android/providers/download_queue_provider.dart';
+import 'package:spotiflac_android/providers/settings_provider.dart';
+import 'package:spotiflac_android/services/platform_bridge.dart';
+
+/// Simple in-memory cache for album tracks
+class _AlbumCache {
+  static final Map<String, _CacheEntry> _cache = {};
+  static const Duration _ttl = Duration(minutes: 10);
+
+  static List<Track>? get(String albumId) {
+    final entry = _cache[albumId];
+    if (entry == null) return null;
+    if (DateTime.now().isAfter(entry.expiresAt)) {
+      _cache.remove(albumId);
+      return null;
+    }
+    return entry.tracks;
+  }
+
+  static void set(String albumId, List<Track> tracks) {
+    _cache[albumId] = _CacheEntry(tracks, DateTime.now().add(_ttl));
+  }
+}
+
+class _CacheEntry {
+  final List<Track> tracks;
+  final DateTime expiresAt;
+  _CacheEntry(this.tracks, this.expiresAt);
+}
+
+/// Album detail screen with Material Expressive 3 design
+class AlbumScreen extends ConsumerStatefulWidget {
+  final String albumId;
+  final String albumName;
+  final String? coverUrl;
+  final List<Track>? tracks; // Optional - will fetch if null
+
+  const AlbumScreen({
+    super.key,
+    required this.albumId,
+    required this.albumName,
+    this.coverUrl,
+    this.tracks,
+  });
+
+  @override
+  ConsumerState<AlbumScreen> createState() => _AlbumScreenState();
+}
+
+class _AlbumScreenState extends ConsumerState<AlbumScreen> {
+  List<Track>? _tracks;
+  bool _isLoading = false;
+  String? _error;
+
+  @override
+  void initState() {
+    super.initState();
+    // Priority: widget.tracks > cache > fetch
+    _tracks = widget.tracks ?? _AlbumCache.get(widget.albumId);
+    if (_tracks == null) {
+      _fetchTracks();
+    }
+  }
+
+  Future<void> _fetchTracks() async {
+    setState(() => _isLoading = true);
+    try {
+      final url = 'https://open.spotify.com/album/${widget.albumId}';
+      final metadata = await PlatformBridge.getSpotifyMetadata(url);
+      final trackList = metadata['track_list'] as List<dynamic>;
+      final tracks = trackList.map((t) => _parseTrack(t as Map<String, dynamic>)).toList();
+      
+      // Store in cache
+      _AlbumCache.set(widget.albumId, tracks);
+      
+      if (mounted) {
+        setState(() {
+          _tracks = tracks;
+          _isLoading = false;
+        });
+      }
+    } catch (e) {
+      if (mounted) {
+        setState(() {
+          _error = e.toString();
+          _isLoading = false;
+        });
+      }
+    }
+  }
+
+  Track _parseTrack(Map<String, dynamic> data) {
+    return Track(
+      id: data['spotify_id'] as String? ?? '',
+      name: data['name'] as String? ?? '',
+      artistName: data['artists'] as String? ?? '',
+      albumName: data['album_name'] as String? ?? '',
+      albumArtist: data['album_artist'] as String?,
+      coverUrl: data['images'] as String?,
+      isrc: data['isrc'] as String?,
+      duration: data['duration_ms'] as int? ?? 0,
+      trackNumber: data['track_number'] as int?,
+      discNumber: data['disc_number'] as int?,
+      releaseDate: data['release_date'] as String?,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final tracks = _tracks ?? [];
+
+    return Scaffold(
+      body: CustomScrollView(
+        slivers: [
+          _buildAppBar(context, colorScheme),
+          _buildInfoCard(context, colorScheme),
+          if (_isLoading)
+            const SliverToBoxAdapter(child: Padding(
+              padding: EdgeInsets.all(32),
+              child: Center(child: CircularProgressIndicator()),
+            )),
+          if (_error != null)
+            SliverToBoxAdapter(child: Padding(
+              padding: const EdgeInsets.all(16),
+              child: Text(_error!, style: TextStyle(color: colorScheme.error)),
+            )),
+          if (!_isLoading && _error == null && tracks.isNotEmpty) ...[
+            _buildTrackListHeader(context, colorScheme),
+            _buildTrackList(context, colorScheme, tracks),
+          ],
+          const SliverToBoxAdapter(child: SizedBox(height: 32)),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildAppBar(BuildContext context, ColorScheme colorScheme) {
+    return SliverAppBar(
+      expandedHeight: 280,
+      pinned: true,
+      stretch: true,
+      backgroundColor: colorScheme.surface,
+      surfaceTintColor: Colors.transparent,
+      flexibleSpace: FlexibleSpaceBar(
+        background: Stack(
+          fit: StackFit.expand,
+          children: [
+            if (widget.coverUrl != null)
+              CachedNetworkImage(
+                imageUrl: widget.coverUrl!,
+                fit: BoxFit.cover,
+                color: Colors.black.withValues(alpha: 0.5),
+                colorBlendMode: BlendMode.darken,
+                memCacheWidth: 600,
+              ),
+            Container(
+              decoration: BoxDecoration(
+                gradient: LinearGradient(
+                  begin: Alignment.topCenter,
+                  end: Alignment.bottomCenter,
+                  colors: [
+                    Colors.transparent,
+                    colorScheme.surface.withValues(alpha: 0.8),
+                    colorScheme.surface,
+                  ],
+                  stops: const [0.0, 0.7, 1.0],
+                ),
+              ),
+            ),
+            Center(
+              child: Padding(
+                padding: const EdgeInsets.only(top: 60),
+                child: Container(
+                  width: 140,
+                  height: 140,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(16),
+                    boxShadow: [
+                      BoxShadow(
+                        color: Colors.black.withValues(alpha: 0.3),
+                        blurRadius: 20,
+                        offset: const Offset(0, 10),
+                      ),
+                    ],
+                  ),
+                  child: ClipRRect(
+                    borderRadius: BorderRadius.circular(16),
+                    child: widget.coverUrl != null
+                        ? CachedNetworkImage(imageUrl: widget.coverUrl!, fit: BoxFit.cover, memCacheWidth: 280)
+                        : Container(
+                            color: colorScheme.surfaceContainerHighest,
+                            child: Icon(Icons.album, size: 48, color: colorScheme.onSurfaceVariant),
+                          ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+        stretchModes: const [StretchMode.zoomBackground, StretchMode.blurBackground],
+      ),
+      leading: IconButton(
+        icon: Container(
+          padding: const EdgeInsets.all(8),
+          decoration: BoxDecoration(color: colorScheme.surface.withValues(alpha: 0.8), shape: BoxShape.circle),
+          child: Icon(Icons.arrow_back, color: colorScheme.onSurface),
+        ),
+        onPressed: () => Navigator.pop(context),
+      ),
+    );
+  }
+
+  Widget _buildInfoCard(BuildContext context, ColorScheme colorScheme) {
+    final tracks = _tracks ?? [];
+    return SliverToBoxAdapter(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Card(
+          elevation: 0,
+          color: colorScheme.surfaceContainerLow,
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+          child: Padding(
+            padding: const EdgeInsets.all(20),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  widget.albumName,
+                  style: Theme.of(context).textTheme.headlineSmall?.copyWith(fontWeight: FontWeight.bold, color: colorScheme.onSurface),
+                ),
+                const SizedBox(height: 8),
+                if (tracks.isNotEmpty)
+                  Container(
+                    padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+                    decoration: BoxDecoration(color: colorScheme.secondaryContainer, borderRadius: BorderRadius.circular(20)),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Icon(Icons.music_note, size: 14, color: colorScheme.onSecondaryContainer),
+                        const SizedBox(width: 4),
+                        Text('${tracks.length} tracks', style: TextStyle(color: colorScheme.onSecondaryContainer, fontWeight: FontWeight.w600, fontSize: 12)),
+                      ],
+                    ),
+                  ),
+                if (tracks.isNotEmpty) ...[
+                  const SizedBox(height: 16),
+                  FilledButton.icon(
+                    onPressed: () => _downloadAll(context),
+                    icon: const Icon(Icons.download),
+                    label: Text('Download All (${tracks.length})'),
+                    style: FilledButton.styleFrom(minimumSize: const Size.fromHeight(52), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16))),
+                  ),
+                ],
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTrackListHeader(BuildContext context, ColorScheme colorScheme) {
+    return SliverToBoxAdapter(
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(20, 8, 20, 8),
+        child: Row(
+          children: [
+            Icon(Icons.queue_music, size: 20, color: colorScheme.primary),
+            const SizedBox(width: 8),
+            Text('Tracks', style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600, color: colorScheme.onSurface)),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTrackList(BuildContext context, ColorScheme colorScheme, List<Track> tracks) {
+    return SliverList(
+      delegate: SliverChildBuilderDelegate(
+        (context, index) {
+          final track = tracks[index];
+          return KeyedSubtree(
+            key: ValueKey(track.id),
+            child: _AlbumTrackItem(
+              track: track,
+              onDownload: () => _downloadTrack(context, track),
+            ),
+          );
+        },
+        childCount: tracks.length,
+      ),
+    );
+  }
+
+  void _downloadTrack(BuildContext context, Track track) {
+    final settings = ref.read(settingsProvider);
+    if (settings.askQualityBeforeDownload) {
+      _showQualityPicker(context, (quality) {
+        ref.read(downloadQueueProvider.notifier).addToQueue(track, settings.defaultService, qualityOverride: quality);
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added "${track.name}" to queue')));
+      }, trackName: track.name, artistName: track.artistName, coverUrl: track.coverUrl);
+    } else {
+      ref.read(downloadQueueProvider.notifier).addToQueue(track, settings.defaultService);
+      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added "${track.name}" to queue')));
+    }
+  }
+
+  void _downloadAll(BuildContext context) {
+    final tracks = _tracks;
+    if (tracks == null || tracks.isEmpty) return;
+    final settings = ref.read(settingsProvider);
+    if (settings.askQualityBeforeDownload) {
+      _showQualityPicker(context, (quality) {
+        ref.read(downloadQueueProvider.notifier).addMultipleToQueue(tracks, settings.defaultService, qualityOverride: quality);
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added ${tracks.length} tracks to queue')));
+      }, trackName: '${tracks.length} tracks', artistName: widget.albumName);
+    } else {
+      ref.read(downloadQueueProvider.notifier).addMultipleToQueue(tracks, settings.defaultService);
+      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added ${tracks.length} tracks to queue')));
+    }
+  }
+
+  void _showQualityPicker(BuildContext context, void Function(String quality) onSelect, {String? trackName, String? artistName, String? coverUrl}) {
+    final colorScheme = Theme.of(context).colorScheme;
+    showModalBottomSheet(
+      context: context,
+      backgroundColor: colorScheme.surfaceContainerHigh,
+      shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(28))),
+      builder: (context) => SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (trackName != null) ...[
+              _TrackInfoHeader(trackName: trackName, artistName: artistName, coverUrl: coverUrl),
+              Divider(height: 1, color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
+            ] else ...[
+              const SizedBox(height: 8),
+              Center(child: Container(width: 40, height: 4, decoration: BoxDecoration(color: colorScheme.onSurfaceVariant.withValues(alpha: 0.4), borderRadius: BorderRadius.circular(2)))),
+            ],
+            Padding(
+              padding: const EdgeInsets.fromLTRB(24, 16, 24, 8),
+              child: Text('Select Quality', style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold)),
+            ),
+            _QualityOption(title: 'FLAC Lossless', subtitle: '16-bit / 44.1kHz', icon: Icons.music_note, onTap: () { Navigator.pop(context); onSelect('LOSSLESS'); }),
+            _QualityOption(title: 'Hi-Res FLAC', subtitle: '24-bit / up to 96kHz', icon: Icons.high_quality, onTap: () { Navigator.pop(context); onSelect('HI_RES'); }),
+            _QualityOption(title: 'Hi-Res FLAC Max', subtitle: '24-bit / up to 192kHz', icon: Icons.hd, onTap: () { Navigator.pop(context); onSelect('HI_RES_LOSSLESS'); }),
+            const SizedBox(height: 16),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _QualityOption extends StatelessWidget {
+  final String title;
+  final String subtitle;
+  final IconData icon;
+  final VoidCallback onTap;
+
+  const _QualityOption({required this.title, required this.subtitle, required this.icon, required this.onTap});
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return ListTile(
+      contentPadding: const EdgeInsets.symmetric(horizontal: 24, vertical: 4),
+      leading: Container(padding: const EdgeInsets.all(10), decoration: BoxDecoration(color: colorScheme.primaryContainer, borderRadius: BorderRadius.circular(12)), child: Icon(icon, color: colorScheme.onPrimaryContainer, size: 20)),
+      title: Text(title, style: const TextStyle(fontWeight: FontWeight.w500)),
+      subtitle: Text(subtitle, style: TextStyle(color: colorScheme.onSurfaceVariant)),
+      onTap: onTap,
+    );
+  }
+}
+
+class _TrackInfoHeader extends StatefulWidget {
+  final String trackName;
+  final String? artistName;
+  final String? coverUrl;
+  const _TrackInfoHeader({required this.trackName, this.artistName, this.coverUrl});
+
+  @override
+  State<_TrackInfoHeader> createState() => _TrackInfoHeaderState();
+}
+
+class _TrackInfoHeaderState extends State<_TrackInfoHeader> {
+  bool _expanded = false;
+  bool _isOverflowing = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: _isOverflowing ? () => setState(() => _expanded = !_expanded) : null,
+        borderRadius: const BorderRadius.only(topLeft: Radius.circular(28), topRight: Radius.circular(28)),
+        child: Column(
+          children: [
+            const SizedBox(height: 8),
+            Container(width: 40, height: 4, decoration: BoxDecoration(color: colorScheme.onSurfaceVariant.withValues(alpha: 0.4), borderRadius: BorderRadius.circular(2))),
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 12, 16, 12),
+              child: Row(
+                children: [
+                  ClipRRect(
+                    borderRadius: BorderRadius.circular(8),
+                    child: widget.coverUrl != null
+                        ? Image.network(widget.coverUrl!, width: 56, height: 56, fit: BoxFit.cover,
+                            errorBuilder: (_, e, s) => Container(width: 56, height: 56, color: colorScheme.surfaceContainerHighest, child: Icon(Icons.music_note, color: colorScheme.onSurfaceVariant)))
+                        : Container(width: 56, height: 56, color: colorScheme.surfaceContainerHighest, child: Icon(Icons.music_note, color: colorScheme.onSurfaceVariant)),
+                  ),
+                  const SizedBox(width: 12),
+                  Expanded(
+                    child: LayoutBuilder(
+                      builder: (context, constraints) {
+                        final titleStyle = Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600);
+                        final titleSpan = TextSpan(text: widget.trackName, style: titleStyle);
+                        final titlePainter = TextPainter(text: titleSpan, maxLines: 1, textDirection: TextDirection.ltr)..layout(maxWidth: constraints.maxWidth);
+                        final titleOverflows = titlePainter.didExceedMaxLines;
+                        
+                        WidgetsBinding.instance.addPostFrameCallback((_) {
+                          if (mounted && _isOverflowing != titleOverflows) {
+                            setState(() => _isOverflowing = titleOverflows);
+                          }
+                        });
+                        
+                        return Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              widget.trackName,
+                              style: titleStyle,
+                              maxLines: _expanded ? 10 : 1,
+                              overflow: _expanded ? TextOverflow.visible : TextOverflow.ellipsis,
+                            ),
+                            if (widget.artistName != null) ...[
+                              const SizedBox(height: 2),
+                              Text(
+                                widget.artistName!,
+                                style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant),
+                                maxLines: _expanded ? 3 : 1,
+                                overflow: _expanded ? TextOverflow.visible : TextOverflow.ellipsis,
+                              ),
+                            ],
+                          ],
+                        );
+                      },
+                    ),
+                  ),
+                  if (_isOverflowing || _expanded)
+                    Icon(_expanded ? Icons.expand_less : Icons.expand_more, color: colorScheme.onSurfaceVariant, size: 20),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+/// Separate Consumer widget for each track - only rebuilds when this specific track's status changes
+class _AlbumTrackItem extends ConsumerWidget {
+  final Track track;
+  final VoidCallback onDownload;
+
+  const _AlbumTrackItem({required this.track, required this.onDownload});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final colorScheme = Theme.of(context).colorScheme;
+    
+    // Only watch the specific item for this track
+    final queueItem = ref.watch(downloadQueueProvider.select((state) {
+      return state.items.where((item) => item.track.id == track.id).firstOrNull;
+    }));
+    
+    // Check if track is in history (already downloaded before)
+    final isInHistory = ref.watch(downloadHistoryProvider.select((state) {
+      return state.isDownloaded(track.id);
+    }));
+    
+    final isQueued = queueItem != null;
+    final isDownloading = queueItem?.status == DownloadStatus.downloading;
+    final isFinalizing = queueItem?.status == DownloadStatus.finalizing;
+    final isCompleted = queueItem?.status == DownloadStatus.completed;
+    final progress = queueItem?.progress ?? 0.0;
+    
+    // Show as downloaded if in queue completed OR in history
+    final showAsDownloaded = isCompleted || (!isQueued && isInHistory);
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8),
+      child: Card(
+        elevation: 0,
+        color: Colors.transparent,
+        margin: const EdgeInsets.symmetric(vertical: 2),
+        child: ListTile(
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+          leading: track.coverUrl != null
+              ? ClipRRect(borderRadius: BorderRadius.circular(8), child: CachedNetworkImage(imageUrl: track.coverUrl!, width: 48, height: 48, fit: BoxFit.cover, memCacheWidth: 96))
+              : Container(width: 48, height: 48, decoration: BoxDecoration(color: colorScheme.surfaceContainerHighest, borderRadius: BorderRadius.circular(8)), child: Icon(Icons.music_note, color: colorScheme.onSurfaceVariant)),
+          title: Text(track.name, maxLines: 1, overflow: TextOverflow.ellipsis, style: Theme.of(context).textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w500)),
+          subtitle: Text(track.artistName, maxLines: 1, overflow: TextOverflow.ellipsis, style: TextStyle(color: colorScheme.onSurfaceVariant)),
+          trailing: _buildDownloadButton(context, ref, colorScheme, isQueued: isQueued, isDownloading: isDownloading, isFinalizing: isFinalizing, showAsDownloaded: showAsDownloaded, isInHistory: isInHistory, progress: progress),
+          onTap: () => _handleTap(context, ref, isQueued: isQueued, isInHistory: isInHistory),
+        ),
+      ),
+    );
+  }
+
+  void _handleTap(BuildContext context, WidgetRef ref, {required bool isQueued, required bool isInHistory}) async {
+    if (isQueued) return;
+    
+    if (isInHistory) {
+      final historyItem = ref.read(downloadHistoryProvider.notifier).getBySpotifyId(track.id);
+      if (historyItem != null) {
+        final fileExists = await File(historyItem.filePath).exists();
+        if (fileExists) {
+          if (context.mounted) {
+            ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('"${track.name}" already downloaded')));
+          }
+          return;
+        } else {
+          ref.read(downloadHistoryProvider.notifier).removeBySpotifyId(track.id);
+        }
+      }
+    }
+    
+    onDownload();
+  }
+
+  Widget _buildDownloadButton(BuildContext context, WidgetRef ref, ColorScheme colorScheme, {
+    required bool isQueued,
+    required bool isDownloading,
+    required bool isFinalizing,
+    required bool showAsDownloaded,
+    required bool isInHistory,
+    required double progress,
+  }) {
+    const double size = 44.0;
+    const double iconSize = 20.0;
+    
+    if (showAsDownloaded) {
+      return GestureDetector(
+        onTap: () => _handleTap(context, ref, isQueued: isQueued, isInHistory: isInHistory),
+        child: Container(width: size, height: size, decoration: BoxDecoration(color: colorScheme.primaryContainer, shape: BoxShape.circle), child: Icon(Icons.check, color: colorScheme.onPrimaryContainer, size: iconSize)),
+      );
+    } else if (isFinalizing) {
+      return SizedBox(
+        width: size,
+        height: size,
+        child: Stack(
+          alignment: Alignment.center,
+          children: [
+            CircularProgressIndicator(strokeWidth: 3, color: colorScheme.tertiary, backgroundColor: colorScheme.surfaceContainerHighest),
+            Icon(Icons.edit_note, color: colorScheme.tertiary, size: 16),
+          ],
+        ),
+      );
+    } else if (isDownloading) {
+      return SizedBox(
+        width: size,
+        height: size,
+        child: Stack(
+          alignment: Alignment.center,
+          children: [
+            CircularProgressIndicator(value: progress > 0 ? progress : null, strokeWidth: 3, color: colorScheme.primary, backgroundColor: colorScheme.surfaceContainerHighest),
+            if (progress > 0) Text('${(progress * 100).toInt()}', style: TextStyle(fontSize: 10, fontWeight: FontWeight.bold, color: colorScheme.primary)),
+          ],
+        ),
+      );
+    } else if (isQueued) {
+      return Container(width: size, height: size, decoration: BoxDecoration(color: colorScheme.surfaceContainerHighest, shape: BoxShape.circle), child: Icon(Icons.hourglass_empty, color: colorScheme.onSurfaceVariant, size: iconSize));
+    } else {
+      return GestureDetector(
+        onTap: onDownload,
+        child: Container(width: size, height: size, decoration: BoxDecoration(color: colorScheme.secondaryContainer, shape: BoxShape.circle), child: Icon(Icons.download, color: colorScheme.onSecondaryContainer, size: iconSize)),
+      );
+    }
+  }
+}

lib/screens/artist_screen.dart

@@ -0,0 +1,321 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:spotiflac_android/providers/track_provider.dart';
+import 'package:spotiflac_android/providers/settings_provider.dart';
+import 'package:spotiflac_android/services/platform_bridge.dart';
+import 'package:spotiflac_android/screens/album_screen.dart';
+
+/// Simple in-memory cache for artist discography
+class _ArtistCache {
+  static final Map<String, _CacheEntry> _cache = {};
+  static const Duration _ttl = Duration(minutes: 10);
+
+  static List<ArtistAlbum>? get(String artistId) {
+    final entry = _cache[artistId];
+    if (entry == null) return null;
+    if (DateTime.now().isAfter(entry.expiresAt)) {
+      _cache.remove(artistId);
+      return null;
+    }
+    return entry.albums;
+  }
+
+  static void set(String artistId, List<ArtistAlbum> albums) {
+    _cache[artistId] = _CacheEntry(albums, DateTime.now().add(_ttl));
+  }
+}
+
+class _CacheEntry {
+  final List<ArtistAlbum> albums;
+  final DateTime expiresAt;
+  _CacheEntry(this.albums, this.expiresAt);
+}
+
+/// Artist screen with Material Expressive 3 design - shows discography
+class ArtistScreen extends ConsumerStatefulWidget {
+  final String artistId;
+  final String artistName;
+  final String? coverUrl;
+  final List<ArtistAlbum>? albums; // Optional - will fetch if null
+
+  const ArtistScreen({
+    super.key,
+    required this.artistId,
+    required this.artistName,
+    this.coverUrl,
+    this.albums,
+  });
+
+  @override
+  ConsumerState<ArtistScreen> createState() => _ArtistScreenState();
+}
+
+class _ArtistScreenState extends ConsumerState<ArtistScreen> {
+  bool _isLoadingDiscography = false;
+  List<ArtistAlbum>? _albums;
+  String? _error;
+
+  @override
+  void initState() {
+    super.initState();
+    // Priority: widget.albums > cache > fetch
+    _albums = widget.albums ?? _ArtistCache.get(widget.artistId);
+    if (_albums == null) {
+      _fetchDiscography();
+    }
+  }
+
+  Future<void> _fetchDiscography() async {
+    setState(() => _isLoadingDiscography = true);
+    try {
+      final url = 'https://open.spotify.com/artist/${widget.artistId}';
+      final metadata = await PlatformBridge.getSpotifyMetadata(url);
+      final albumsList = metadata['albums'] as List<dynamic>;
+      final albums = albumsList.map((a) => _parseArtistAlbum(a as Map<String, dynamic>)).toList();
+      
+      // Store in cache
+      _ArtistCache.set(widget.artistId, albums);
+      
+      if (mounted) {
+        setState(() {
+          _albums = albums;
+          _isLoadingDiscography = false;
+        });
+      }
+    } catch (e) {
+      if (mounted) {
+        setState(() {
+          _error = e.toString();
+          _isLoadingDiscography = false;
+        });
+      }
+    }
+  }
+
+  ArtistAlbum _parseArtistAlbum(Map<String, dynamic> data) {
+    return ArtistAlbum(
+      id: data['id'] as String? ?? '',
+      name: data['name'] as String? ?? '',
+      releaseDate: data['release_date'] as String? ?? '',
+      totalTracks: data['total_tracks'] as int? ?? 0,
+      coverUrl: data['images'] as String?,
+      albumType: data['album_type'] as String? ?? 'album',
+      artists: data['artists'] as String? ?? '',
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final albums = _albums ?? [];
+    final albumsOnly = albums.where((a) => a.albumType == 'album').toList();
+    final singles = albums.where((a) => a.albumType == 'single').toList();
+    final compilations = albums.where((a) => a.albumType == 'compilation').toList();
+
+    return Scaffold(
+      body: Stack(
+        children: [
+          CustomScrollView(
+            slivers: [
+              _buildAppBar(context, colorScheme),
+              _buildInfoCard(context, colorScheme),
+              if (_isLoadingDiscography)
+                const SliverToBoxAdapter(child: Padding(
+                  padding: EdgeInsets.all(32),
+                  child: Center(child: CircularProgressIndicator()),
+                )),
+              if (_error != null)
+                SliverToBoxAdapter(child: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Text(_error!, style: TextStyle(color: colorScheme.error)),
+                )),
+              if (!_isLoadingDiscography && _error == null) ...[
+                if (albumsOnly.isNotEmpty) SliverToBoxAdapter(child: _buildAlbumSection('Albums', albumsOnly, colorScheme)),
+                if (singles.isNotEmpty) SliverToBoxAdapter(child: _buildAlbumSection('Singles & EPs', singles, colorScheme)),
+                if (compilations.isNotEmpty) SliverToBoxAdapter(child: _buildAlbumSection('Compilations', compilations, colorScheme)),
+              ],
+              const SliverToBoxAdapter(child: SizedBox(height: 32)),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildAppBar(BuildContext context, ColorScheme colorScheme) {
+    return SliverAppBar(
+      expandedHeight: 280,
+      pinned: true,
+      stretch: true,
+      backgroundColor: colorScheme.surface,
+      surfaceTintColor: Colors.transparent,
+      flexibleSpace: FlexibleSpaceBar(
+        background: Stack(
+          fit: StackFit.expand,
+          children: [
+            if (widget.coverUrl != null)
+              CachedNetworkImage(imageUrl: widget.coverUrl!, fit: BoxFit.cover, color: Colors.black.withValues(alpha: 0.5), colorBlendMode: BlendMode.darken, memCacheWidth: 600),
+            Container(
+              decoration: BoxDecoration(
+                gradient: LinearGradient(
+                  begin: Alignment.topCenter,
+                  end: Alignment.bottomCenter,
+                  colors: [Colors.transparent, colorScheme.surface.withValues(alpha: 0.8), colorScheme.surface],
+                  stops: const [0.0, 0.7, 1.0],
+                ),
+              ),
+            ),
+            Center(
+              child: Padding(
+                padding: const EdgeInsets.only(top: 60),
+                child: Container(
+                  width: 140,
+                  height: 140,
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    boxShadow: [BoxShadow(color: Colors.black.withValues(alpha: 0.3), blurRadius: 20, offset: const Offset(0, 10))],
+                  ),
+                  child: ClipOval(
+                    child: widget.coverUrl != null
+                        ? CachedNetworkImage(imageUrl: widget.coverUrl!, fit: BoxFit.cover, memCacheWidth: 280)
+                        : Container(color: colorScheme.surfaceContainerHighest, child: Icon(Icons.person, size: 48, color: colorScheme.onSurfaceVariant)),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+        stretchModes: const [StretchMode.zoomBackground, StretchMode.blurBackground],
+      ),
+      leading: IconButton(
+        icon: Container(padding: const EdgeInsets.all(8), decoration: BoxDecoration(color: colorScheme.surface.withValues(alpha: 0.8), shape: BoxShape.circle), child: Icon(Icons.arrow_back, color: colorScheme.onSurface)),
+        onPressed: () => Navigator.pop(context),
+      ),
+    );
+  }
+
+  Widget _buildInfoCard(BuildContext context, ColorScheme colorScheme) {
+    return SliverToBoxAdapter(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Card(
+          elevation: 0,
+          color: colorScheme.surfaceContainerLow,
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+          child: Padding(
+            padding: const EdgeInsets.all(20),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(widget.artistName, style: Theme.of(context).textTheme.headlineSmall?.copyWith(fontWeight: FontWeight.bold, color: colorScheme.onSurface)),
+                const SizedBox(height: 8),
+                if (_albums != null)
+                  Container(
+                    padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+                    decoration: BoxDecoration(color: colorScheme.primaryContainer, borderRadius: BorderRadius.circular(20)),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Icon(Icons.album, size: 14, color: colorScheme.onPrimaryContainer),
+                        const SizedBox(width: 4),
+                        Text('${_albums!.length} releases', style: TextStyle(color: colorScheme.onPrimaryContainer, fontWeight: FontWeight.w600, fontSize: 12)),
+                      ],
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildAlbumSection(String title, List<ArtistAlbum> albums, ColorScheme colorScheme) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.fromLTRB(20, 16, 20, 8),
+          child: Row(
+            children: [
+              Icon(Icons.album, size: 20, color: colorScheme.primary),
+              const SizedBox(width: 8),
+              Text('$title (${albums.length})', style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600, color: colorScheme.primary)),
+            ],
+          ),
+        ),
+        SizedBox(
+          height: 210,
+          child: ListView.builder(
+            scrollDirection: Axis.horizontal,
+            padding: const EdgeInsets.symmetric(horizontal: 12),
+            itemCount: albums.length,
+            itemBuilder: (context, index) {
+              final album = albums[index];
+              return KeyedSubtree(key: ValueKey(album.id), child: _buildAlbumCard(album, colorScheme));
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildAlbumCard(ArtistAlbum album, ColorScheme colorScheme) {
+    return GestureDetector(
+      onTap: () => _navigateToAlbum(album),
+      child: Container(
+        width: 140,
+        margin: const EdgeInsets.symmetric(horizontal: 6),
+        child: Card(
+          elevation: 0,
+          color: colorScheme.surfaceContainerLow,
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+          child: Padding(
+            padding: const EdgeInsets.all(8),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                ClipRRect(
+                  borderRadius: BorderRadius.circular(12),
+                  child: album.coverUrl != null
+                      ? CachedNetworkImage(imageUrl: album.coverUrl!, width: 124, height: 124, fit: BoxFit.cover, memCacheWidth: 248)
+                      : Container(width: 124, height: 124, color: colorScheme.surfaceContainerHighest, child: Icon(Icons.album, color: colorScheme.onSurfaceVariant, size: 40)),
+                ),
+                const SizedBox(height: 6),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(album.name, style: Theme.of(context).textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w600), maxLines: 2, overflow: TextOverflow.ellipsis),
+                      const Spacer(),
+                      Text(
+                        '${album.releaseDate.length >= 4 ? album.releaseDate.substring(0, 4) : album.releaseDate} • ${album.totalTracks} tracks',
+                        style: Theme.of(context).textTheme.bodySmall?.copyWith(color: colorScheme.onSurfaceVariant, fontSize: 11),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  void _navigateToAlbum(ArtistAlbum album) {
+    // Navigate immediately with data from artist discography, fetch tracks in AlbumScreen
+    ref.read(settingsProvider.notifier).setHasSearchedBefore();
+    Navigator.push(context, MaterialPageRoute(
+      builder: (context) => AlbumScreen(
+        albumId: album.id,
+        albumName: album.name,
+        coverUrl: album.coverUrl,
+        // tracks: null - will be fetched in AlbumScreen
+      ),
+    ));
+  }
+}

lib/screens/home_screen.dart

@@ -219,7 +219,7 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
                   width: 80,
                   height: 80,
                   fit: BoxFit.cover,
-                  placeholder: (_, __) => Container(
+                  placeholder: (_, _) => Container(
                     width: 80,
                     height: 80,
                     color: colorScheme.surfaceContainerHighest,

lib/screens/main_shell.dart

@@ -11,6 +11,9 @@ import 'package:spotiflac_android/screens/settings/settings_tab.dart';
 import 'package:spotiflac_android/services/share_intent_service.dart';
 import 'package:spotiflac_android/services/update_checker.dart';
 import 'package:spotiflac_android/widgets/update_dialog.dart';
+import 'package:spotiflac_android/utils/logger.dart';
+
+final _log = AppLogger('MainShell');
 
 class MainShell extends ConsumerStatefulWidget {
   const MainShell({super.key});
@@ -24,6 +27,7 @@ class _MainShellState extends ConsumerState<MainShell> {
   late PageController _pageController;
   bool _hasCheckedUpdate = false;
   StreamSubscription<String>? _shareSubscription;
+  DateTime? _lastBackPress; // For double-tap to exit
 
   @override
   void initState() {
@@ -40,15 +44,21 @@ class _MainShellState extends ConsumerState<MainShell> {
     // Check for pending URL that was received before listener was ready
     final pendingUrl = ShareIntentService().consumePendingUrl();
     if (pendingUrl != null) {
-      print('[MainShell] Processing pending shared URL: $pendingUrl');
+      _log.d('Processing pending shared URL: $pendingUrl');
       _handleSharedUrl(pendingUrl);
     }
 
-    // Listen for future shared URLs
-    _shareSubscription = ShareIntentService().sharedUrlStream.listen((url) {
-      print('[MainShell] Received shared URL from stream: $url');
-      _handleSharedUrl(url);
-    });
+    // Listen for future shared URLs with error handling
+    _shareSubscription = ShareIntentService().sharedUrlStream.listen(
+      (url) {
+        _log.d('Received shared URL from stream: $url');
+        _handleSharedUrl(url);
+      },
+      onError: (error) {
+        _log.e('Share stream error: $error');
+      },
+      cancelOnError: false,
+    );
   }
 
   void _handleSharedUrl(String url) {
@@ -111,53 +121,66 @@ class _MainShellState extends ConsumerState<MainShell> {
     }
   }
 
-  Future<bool> _showExitDialog() async {
-    return await showDialog<bool>(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Exit App'),
-        content: const Text('Are you sure you want to exit?'),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context, false),
-            child: const Text('No'),
-          ),
-          TextButton(
-            onPressed: () => Navigator.pop(context, true),
-            child: const Text('Yes'),
-          ),
-        ],
-      ),
-    ) ?? false;
+  /// Handle back press with double-tap to exit
+  void _handleBackPress() {
+    final trackState = ref.read(trackProvider);
+    
+    // If on Home tab and has text in search bar or has content (but not loading), clear it
+    if (_currentIndex == 0 && !trackState.isLoading && (trackState.hasSearchText || trackState.hasContent)) {
+      ref.read(trackProvider.notifier).clear();
+      return;
+    }
+    
+    // If not on Home tab, go to Home tab first
+    if (_currentIndex != 0) {
+      _onNavTap(0);
+      return;
+    }
+    
+    // If loading, ignore back press
+    if (trackState.isLoading) {
+      return;
+    }
+    
+    // Double-tap to exit
+    final now = DateTime.now();
+    if (_lastBackPress != null && now.difference(_lastBackPress!) < const Duration(seconds: 2)) {
+      SystemNavigator.pop();
+    } else {
+      _lastBackPress = now;
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Press back again to exit'),
+          duration: Duration(seconds: 2),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+    }
   }
 
   @override
   Widget build(BuildContext context) {
     final queueState = ref.watch(downloadQueueProvider.select((s) => s.queuedCount));
     final trackState = ref.watch(trackProvider);
+    
+    // Determine if we can pop (for predictive back animation)
+    // canPop is true when we're at root with no content - enables predictive back gesture
+    final canPop = _currentIndex == 0 && 
+                   !trackState.hasSearchText && 
+                   !trackState.hasContent && 
+                   !trackState.isLoading;
 
     return PopScope(
-      canPop: false,
+      canPop: canPop,
       onPopInvokedWithResult: (didPop, result) async {
-        if (didPop) return;
-        
-        // If on Search tab and can go back in track history, go back
-        if (_currentIndex == 0 && trackState.canGoBack) {
-          ref.read(trackProvider.notifier).goBack();
+        if (didPop) {
+          // System handled the pop - this means predictive back completed
+          // We need to handle double-tap to exit here
           return;
         }
         
-        // If not on Search tab, go to Search tab first
-        if (_currentIndex != 0) {
-          _onNavTap(0);
-          return;
-        }
-        
-        // Already at root, show exit dialog
-        final shouldPop = await _showExitDialog();
-        if (shouldPop && context.mounted) {
-          SystemNavigator.pop();
-        }
+        // Handle back press manually when canPop is false
+        _handleBackPress();
       },
       child: Scaffold(
         body: PageView(
@@ -174,11 +197,14 @@ class _MainShellState extends ConsumerState<MainShell> {
           selectedIndex: _currentIndex,
           onDestinationSelected: _onNavTap,
           animationDuration: const Duration(milliseconds: 200),
+          backgroundColor: Theme.of(context).brightness == Brightness.dark
+              ? Color.alphaBlend(Colors.white.withValues(alpha: 0.05), Theme.of(context).colorScheme.surface)
+              : Color.alphaBlend(Colors.black.withValues(alpha: 0.03), Theme.of(context).colorScheme.surface),
           destinations: [
             const NavigationDestination(
-              icon: Icon(Icons.search_outlined),
-              selectedIcon: Icon(Icons.search),
-              label: 'Search',
+              icon: Icon(Icons.home_outlined),
+              selectedIcon: Icon(Icons.home),
+              label: 'Home',
             ),
             NavigationDestination(
               icon: Badge(

lib/screens/playlist_screen.dart

@@ -0,0 +1,453 @@
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:spotiflac_android/models/track.dart';
+import 'package:spotiflac_android/models/download_item.dart';
+import 'package:spotiflac_android/providers/download_queue_provider.dart';
+import 'package:spotiflac_android/providers/settings_provider.dart';
+
+/// Playlist detail screen with Material Expressive 3 design
+class PlaylistScreen extends ConsumerWidget {
+  final String playlistName;
+  final String? coverUrl;
+  final List<Track> tracks;
+
+  const PlaylistScreen({
+    super.key,
+    required this.playlistName,
+    this.coverUrl,
+    required this.tracks,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Scaffold(
+      body: CustomScrollView(
+        slivers: [
+          _buildAppBar(context, colorScheme),
+          _buildInfoCard(context, ref, colorScheme),
+          _buildTrackListHeader(context, colorScheme),
+          _buildTrackList(context, ref, colorScheme),
+          const SliverToBoxAdapter(child: SizedBox(height: 32)),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildAppBar(BuildContext context, ColorScheme colorScheme) {
+    return SliverAppBar(
+      expandedHeight: 280,
+      pinned: true,
+      stretch: true,
+      backgroundColor: colorScheme.surface,
+      surfaceTintColor: Colors.transparent,
+      flexibleSpace: FlexibleSpaceBar(
+        background: Stack(
+          fit: StackFit.expand,
+          children: [
+            if (coverUrl != null)
+              CachedNetworkImage(imageUrl: coverUrl!, fit: BoxFit.cover, color: Colors.black.withValues(alpha: 0.5), colorBlendMode: BlendMode.darken, memCacheWidth: 600),
+            Container(
+              decoration: BoxDecoration(
+                gradient: LinearGradient(
+                  begin: Alignment.topCenter,
+                  end: Alignment.bottomCenter,
+                  colors: [Colors.transparent, colorScheme.surface.withValues(alpha: 0.8), colorScheme.surface],
+                  stops: const [0.0, 0.7, 1.0],
+                ),
+              ),
+            ),
+            Center(
+              child: Padding(
+                padding: const EdgeInsets.only(top: 60),
+                child: Container(
+                  width: 140,
+                  height: 140,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(16),
+                    boxShadow: [BoxShadow(color: Colors.black.withValues(alpha: 0.3), blurRadius: 20, offset: const Offset(0, 10))],
+                  ),
+                  child: ClipRRect(
+                    borderRadius: BorderRadius.circular(16),
+                    child: coverUrl != null
+                        ? CachedNetworkImage(imageUrl: coverUrl!, fit: BoxFit.cover, memCacheWidth: 280)
+                        : Container(color: colorScheme.surfaceContainerHighest, child: Icon(Icons.playlist_play, size: 48, color: colorScheme.onSurfaceVariant)),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+        stretchModes: const [StretchMode.zoomBackground, StretchMode.blurBackground],
+      ),
+      leading: IconButton(
+        icon: Container(padding: const EdgeInsets.all(8), decoration: BoxDecoration(color: colorScheme.surface.withValues(alpha: 0.8), shape: BoxShape.circle), child: Icon(Icons.arrow_back, color: colorScheme.onSurface)),
+        onPressed: () => Navigator.pop(context),
+      ),
+    );
+  }
+
+  Widget _buildInfoCard(BuildContext context, WidgetRef ref, ColorScheme colorScheme) {
+    return SliverToBoxAdapter(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Card(
+          elevation: 0,
+          color: colorScheme.surfaceContainerLow,
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+          child: Padding(
+            padding: const EdgeInsets.all(20),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(playlistName, style: Theme.of(context).textTheme.headlineSmall?.copyWith(fontWeight: FontWeight.bold, color: colorScheme.onSurface)),
+                const SizedBox(height: 8),
+                Container(
+                  padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+                  decoration: BoxDecoration(color: colorScheme.tertiaryContainer, borderRadius: BorderRadius.circular(20)),
+                  child: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Icon(Icons.playlist_play, size: 14, color: colorScheme.onTertiaryContainer),
+                      const SizedBox(width: 4),
+                      Text('${tracks.length} tracks', style: TextStyle(color: colorScheme.onTertiaryContainer, fontWeight: FontWeight.w600, fontSize: 12)),
+                    ],
+                  ),
+                ),
+                const SizedBox(height: 16),
+                FilledButton.icon(
+                  onPressed: () => _downloadAll(context, ref),
+                  icon: const Icon(Icons.download),
+                  label: Text('Download All (${tracks.length})'),
+                  style: FilledButton.styleFrom(minimumSize: const Size.fromHeight(52), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16))),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTrackListHeader(BuildContext context, ColorScheme colorScheme) {
+    return SliverToBoxAdapter(
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(20, 8, 20, 8),
+        child: Row(
+          children: [
+            Icon(Icons.queue_music, size: 20, color: colorScheme.primary),
+            const SizedBox(width: 8),
+            Text('Tracks', style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600, color: colorScheme.onSurface)),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTrackList(BuildContext context, WidgetRef ref, ColorScheme colorScheme) {
+    return SliverList(
+      delegate: SliverChildBuilderDelegate(
+        (context, index) {
+          final track = tracks[index];
+          return KeyedSubtree(
+            key: ValueKey(track.id),
+            child: _PlaylistTrackItem(
+              track: track,
+              onDownload: () => _downloadTrack(context, ref, track),
+            ),
+          );
+        },
+        childCount: tracks.length,
+      ),
+    );
+  }
+
+  void _downloadTrack(BuildContext context, WidgetRef ref, Track track) {
+    final settings = ref.read(settingsProvider);
+    if (settings.askQualityBeforeDownload) {
+      _showQualityPicker(context, (quality) {
+        ref.read(downloadQueueProvider.notifier).addToQueue(track, settings.defaultService, qualityOverride: quality);
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added "${track.name}" to queue')));
+      }, trackName: track.name, artistName: track.artistName, coverUrl: track.coverUrl);
+    } else {
+      ref.read(downloadQueueProvider.notifier).addToQueue(track, settings.defaultService);
+      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added "${track.name}" to queue')));
+    }
+  }
+
+  void _downloadAll(BuildContext context, WidgetRef ref) {
+    if (tracks.isEmpty) return;
+    final settings = ref.read(settingsProvider);
+    if (settings.askQualityBeforeDownload) {
+      _showQualityPicker(context, (quality) {
+        ref.read(downloadQueueProvider.notifier).addMultipleToQueue(tracks, settings.defaultService, qualityOverride: quality);
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added ${tracks.length} tracks to queue')));
+      }, trackName: '${tracks.length} tracks', artistName: playlistName);
+    } else {
+      ref.read(downloadQueueProvider.notifier).addMultipleToQueue(tracks, settings.defaultService);
+      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added ${tracks.length} tracks to queue')));
+    }
+  }
+
+  void _showQualityPicker(BuildContext context, void Function(String quality) onSelect, {String? trackName, String? artistName, String? coverUrl}) {
+    final colorScheme = Theme.of(context).colorScheme;
+    showModalBottomSheet(
+      context: context,
+      backgroundColor: colorScheme.surfaceContainerHigh,
+      shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(28))),
+      builder: (context) => SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (trackName != null) ...[
+              _TrackInfoHeader(trackName: trackName, artistName: artistName, coverUrl: coverUrl),
+              Divider(height: 1, color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
+            ] else ...[
+              const SizedBox(height: 8),
+              Center(child: Container(width: 40, height: 4, decoration: BoxDecoration(color: colorScheme.onSurfaceVariant.withValues(alpha: 0.4), borderRadius: BorderRadius.circular(2)))),
+            ],
+            Padding(padding: const EdgeInsets.fromLTRB(24, 16, 24, 8), child: Text('Select Quality', style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold))),
+            _QualityOption(title: 'FLAC Lossless', subtitle: '16-bit / 44.1kHz', icon: Icons.music_note, onTap: () { Navigator.pop(context); onSelect('LOSSLESS'); }),
+            _QualityOption(title: 'Hi-Res FLAC', subtitle: '24-bit / up to 96kHz', icon: Icons.high_quality, onTap: () { Navigator.pop(context); onSelect('HI_RES'); }),
+            _QualityOption(title: 'Hi-Res FLAC Max', subtitle: '24-bit / up to 192kHz', icon: Icons.hd, onTap: () { Navigator.pop(context); onSelect('HI_RES_LOSSLESS'); }),
+            const SizedBox(height: 16),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _QualityOption extends StatelessWidget {
+  final String title;
+  final String subtitle;
+  final IconData icon;
+  final VoidCallback onTap;
+
+  const _QualityOption({required this.title, required this.subtitle, required this.icon, required this.onTap});
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return ListTile(
+      contentPadding: const EdgeInsets.symmetric(horizontal: 24, vertical: 4),
+      leading: Container(padding: const EdgeInsets.all(10), decoration: BoxDecoration(color: colorScheme.primaryContainer, borderRadius: BorderRadius.circular(12)), child: Icon(icon, color: colorScheme.onPrimaryContainer, size: 20)),
+      title: Text(title, style: const TextStyle(fontWeight: FontWeight.w500)),
+      subtitle: Text(subtitle, style: TextStyle(color: colorScheme.onSurfaceVariant)),
+      onTap: onTap,
+    );
+  }
+}
+
+class _TrackInfoHeader extends StatefulWidget {
+  final String trackName;
+  final String? artistName;
+  final String? coverUrl;
+  const _TrackInfoHeader({required this.trackName, this.artistName, this.coverUrl});
+
+  @override
+  State<_TrackInfoHeader> createState() => _TrackInfoHeaderState();
+}
+
+class _TrackInfoHeaderState extends State<_TrackInfoHeader> {
+  bool _expanded = false;
+  bool _isOverflowing = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: _isOverflowing ? () => setState(() => _expanded = !_expanded) : null,
+        borderRadius: const BorderRadius.only(topLeft: Radius.circular(28), topRight: Radius.circular(28)),
+        child: Column(
+          children: [
+            const SizedBox(height: 8),
+            Container(width: 40, height: 4, decoration: BoxDecoration(color: colorScheme.onSurfaceVariant.withValues(alpha: 0.4), borderRadius: BorderRadius.circular(2))),
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 12, 16, 12),
+              child: Row(
+                children: [
+                  ClipRRect(
+                    borderRadius: BorderRadius.circular(8),
+                    child: widget.coverUrl != null
+                        ? Image.network(widget.coverUrl!, width: 56, height: 56, fit: BoxFit.cover,
+                            errorBuilder: (_, e, s) => Container(width: 56, height: 56, color: colorScheme.surfaceContainerHighest, child: Icon(Icons.music_note, color: colorScheme.onSurfaceVariant)))
+                        : Container(width: 56, height: 56, color: colorScheme.surfaceContainerHighest, child: Icon(Icons.music_note, color: colorScheme.onSurfaceVariant)),
+                  ),
+                  const SizedBox(width: 12),
+                  Expanded(
+                    child: LayoutBuilder(
+                      builder: (context, constraints) {
+                        final titleStyle = Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600);
+                        final titleSpan = TextSpan(text: widget.trackName, style: titleStyle);
+                        final titlePainter = TextPainter(text: titleSpan, maxLines: 1, textDirection: TextDirection.ltr)..layout(maxWidth: constraints.maxWidth);
+                        final titleOverflows = titlePainter.didExceedMaxLines;
+                        
+                        WidgetsBinding.instance.addPostFrameCallback((_) {
+                          if (mounted && _isOverflowing != titleOverflows) {
+                            setState(() => _isOverflowing = titleOverflows);
+                          }
+                        });
+                        
+                        return Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              widget.trackName,
+                              style: titleStyle,
+                              maxLines: _expanded ? 10 : 1,
+                              overflow: _expanded ? TextOverflow.visible : TextOverflow.ellipsis,
+                            ),
+                            if (widget.artistName != null) ...[
+                              const SizedBox(height: 2),
+                              Text(
+                                widget.artistName!,
+                                style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant),
+                                maxLines: _expanded ? 3 : 1,
+                                overflow: _expanded ? TextOverflow.visible : TextOverflow.ellipsis,
+                              ),
+                            ],
+                          ],
+                        );
+                      },
+                    ),
+                  ),
+                  if (_isOverflowing || _expanded)
+                    Icon(_expanded ? Icons.expand_less : Icons.expand_more, color: colorScheme.onSurfaceVariant, size: 20),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+/// Separate Consumer widget for each track - only rebuilds when this specific track's status changes
+class _PlaylistTrackItem extends ConsumerWidget {
+  final Track track;
+  final VoidCallback onDownload;
+
+  const _PlaylistTrackItem({required this.track, required this.onDownload});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final colorScheme = Theme.of(context).colorScheme;
+    
+    // Only watch the specific item for this track
+    final queueItem = ref.watch(downloadQueueProvider.select((state) {
+      return state.items.where((item) => item.track.id == track.id).firstOrNull;
+    }));
+    
+    // Check if track is in history (already downloaded before)
+    final isInHistory = ref.watch(downloadHistoryProvider.select((state) {
+      return state.isDownloaded(track.id);
+    }));
+    
+    final isQueued = queueItem != null;
+    final isDownloading = queueItem?.status == DownloadStatus.downloading;
+    final isFinalizing = queueItem?.status == DownloadStatus.finalizing;
+    final isCompleted = queueItem?.status == DownloadStatus.completed;
+    final progress = queueItem?.progress ?? 0.0;
+    
+    // Show as downloaded if in queue completed OR in history
+    final showAsDownloaded = isCompleted || (!isQueued && isInHistory);
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8),
+      child: Card(
+        elevation: 0,
+        color: Colors.transparent,
+        margin: const EdgeInsets.symmetric(vertical: 2),
+        child: ListTile(
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+          leading: track.coverUrl != null
+              ? ClipRRect(borderRadius: BorderRadius.circular(8), child: CachedNetworkImage(imageUrl: track.coverUrl!, width: 48, height: 48, fit: BoxFit.cover, memCacheWidth: 96))
+              : Container(width: 48, height: 48, decoration: BoxDecoration(color: colorScheme.surfaceContainerHighest, borderRadius: BorderRadius.circular(8)), child: Icon(Icons.music_note, color: colorScheme.onSurfaceVariant)),
+          title: Text(track.name, maxLines: 1, overflow: TextOverflow.ellipsis, style: Theme.of(context).textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w500)),
+          subtitle: Text(track.artistName, maxLines: 1, overflow: TextOverflow.ellipsis, style: TextStyle(color: colorScheme.onSurfaceVariant)),
+          trailing: _buildDownloadButton(context, ref, colorScheme, isQueued: isQueued, isDownloading: isDownloading, isFinalizing: isFinalizing, showAsDownloaded: showAsDownloaded, isInHistory: isInHistory, progress: progress),
+          onTap: () => _handleTap(context, ref, isQueued: isQueued, isInHistory: isInHistory),
+        ),
+      ),
+    );
+  }
+
+  void _handleTap(BuildContext context, WidgetRef ref, {required bool isQueued, required bool isInHistory}) async {
+    if (isQueued) return;
+    
+    if (isInHistory) {
+      final historyItem = ref.read(downloadHistoryProvider.notifier).getBySpotifyId(track.id);
+      if (historyItem != null) {
+        final fileExists = await File(historyItem.filePath).exists();
+        if (fileExists) {
+          if (context.mounted) {
+            ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('"${track.name}" already downloaded')));
+          }
+          return;
+        } else {
+          ref.read(downloadHistoryProvider.notifier).removeBySpotifyId(track.id);
+        }
+      }
+    }
+    
+    onDownload();
+  }
+
+  Widget _buildDownloadButton(BuildContext context, WidgetRef ref, ColorScheme colorScheme, {
+    required bool isQueued,
+    required bool isDownloading,
+    required bool isFinalizing,
+    required bool showAsDownloaded,
+    required bool isInHistory,
+    required double progress,
+  }) {
+    const double size = 44.0;
+    const double iconSize = 20.0;
+    
+    if (showAsDownloaded) {
+      return GestureDetector(
+        onTap: () => _handleTap(context, ref, isQueued: isQueued, isInHistory: isInHistory),
+        child: Container(width: size, height: size, decoration: BoxDecoration(color: colorScheme.primaryContainer, shape: BoxShape.circle), child: Icon(Icons.check, color: colorScheme.onPrimaryContainer, size: iconSize)),
+      );
+    } else if (isFinalizing) {
+      return SizedBox(
+        width: size,
+        height: size,
+        child: Stack(
+          alignment: Alignment.center,
+          children: [
+            CircularProgressIndicator(strokeWidth: 3, color: colorScheme.tertiary, backgroundColor: colorScheme.surfaceContainerHighest),
+            Icon(Icons.edit_note, color: colorScheme.tertiary, size: 16),
+          ],
+        ),
+      );
+    } else if (isDownloading) {
+      return SizedBox(
+        width: size,
+        height: size,
+        child: Stack(
+          alignment: Alignment.center,
+          children: [
+            CircularProgressIndicator(value: progress > 0 ? progress : null, strokeWidth: 3, color: colorScheme.primary, backgroundColor: colorScheme.surfaceContainerHighest),
+            if (progress > 0) Text('${(progress * 100).toInt()}', style: TextStyle(fontSize: 10, fontWeight: FontWeight.bold, color: colorScheme.primary)),
+          ],
+        ),
+      );
+    } else if (isQueued) {
+      return Container(width: size, height: size, decoration: BoxDecoration(color: colorScheme.surfaceContainerHighest, shape: BoxShape.circle), child: Icon(Icons.hourglass_empty, color: colorScheme.onSurfaceVariant, size: iconSize));
+    } else {
+      return GestureDetector(
+        onTap: onDownload,
+        child: Container(width: size, height: size, decoration: BoxDecoration(color: colorScheme.secondaryContainer, shape: BoxShape.circle), child: Icon(Icons.download, color: colorScheme.onSecondaryContainer, size: iconSize)),
+      );
+    }
+  }
+}

lib/screens/queue_screen.dart

@@ -144,6 +144,18 @@ class QueueScreen extends ConsumerWidget {
             color: colorScheme.primary,
           ),
         );
+      case DownloadStatus.finalizing:
+        return SizedBox(
+          width: 24,
+          height: 24,
+          child: Stack(
+            alignment: Alignment.center,
+            children: [
+              CircularProgressIndicator(strokeWidth: 2, color: colorScheme.tertiary),
+              Icon(Icons.edit_note, color: colorScheme.tertiary, size: 12),
+            ],
+          ),
+        );
       case DownloadStatus.completed:
         return Icon(Icons.check_circle, color: colorScheme.primary);
       case DownloadStatus.failed:

lib/screens/queue_tab.dart

@@ -16,20 +16,41 @@ class QueueTab extends ConsumerStatefulWidget {
 
 class _QueueTabState extends ConsumerState<QueueTab> {
   final Map<String, bool> _fileExistsCache = {};
+  final Set<String> _pendingChecks = {}; // Track pending async checks
+  static const int _maxCacheSize = 500; // Limit cache size to prevent memory leak
 
+  /// Check if file exists - returns true optimistically while checking
+  /// This prevents the "red flash" on app start
   bool _checkFileExists(String? filePath) {
     if (filePath == null) return false;
+    
+    // If already cached, return cached value
     if (_fileExistsCache.containsKey(filePath)) {
       return _fileExistsCache[filePath]!;
     }
+    
+    // If check is pending, return true optimistically (assume file exists)
+    if (_pendingChecks.contains(filePath)) {
+      return true;
+    }
+    
+    // Limit cache size - remove oldest entry if full
+    if (_fileExistsCache.length >= _maxCacheSize) {
+      _fileExistsCache.remove(_fileExistsCache.keys.first);
+    }
+    
+    // Mark as pending and start async check
+    _pendingChecks.add(filePath);
     Future.microtask(() async {
       final exists = await File(filePath).exists();
+      _pendingChecks.remove(filePath);
       if (mounted && _fileExistsCache[filePath] != exists) {
         setState(() => _fileExistsCache[filePath] = exists);
       }
     });
-    _fileExistsCache[filePath] = false;
-    return false;
+    
+    // Return true optimistically while checking
+    return true;
   }
 
   Future<void> _openFile(String filePath) async {
@@ -69,8 +90,13 @@ class _QueueTabState extends ConsumerState<QueueTab> {
 
   @override
   Widget build(BuildContext context) {
-    final queueState = ref.watch(downloadQueueProvider);
-    final historyState = ref.watch(downloadHistoryProvider);
+    // Use select() to only rebuild when specific fields change
+    final queueItems = ref.watch(downloadQueueProvider.select((s) => s.items));
+    final isProcessing = ref.watch(downloadQueueProvider.select((s) => s.isProcessing));
+    final isPaused = ref.watch(downloadQueueProvider.select((s) => s.isPaused));
+    final queuedCount = ref.watch(downloadQueueProvider.select((s) => s.queuedCount));
+    final completedCount = ref.watch(downloadQueueProvider.select((s) => s.completedCount));
+    final historyItems = ref.watch(downloadHistoryProvider.select((s) => s.items));
     final historyViewMode = ref.watch(settingsProvider.select((s) => s.historyViewMode));
     final colorScheme = Theme.of(context).colorScheme;
 
@@ -78,7 +104,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {
       slivers: [
         // Collapsing App Bar - Simplified for performance
         SliverAppBar(
-          expandedHeight: 100,
+          expandedHeight: 130,
           collapsedHeight: kToolbarHeight,
           floating: false,
           pinned: true,
@@ -86,12 +112,12 @@ class _QueueTabState extends ConsumerState<QueueTab> {
           surfaceTintColor: Colors.transparent,
           automaticallyImplyLeading: false,
           flexibleSpace: FlexibleSpaceBar(
-            expandedTitleScale: 1.4,
+            expandedTitleScale: 1.3,
             titlePadding: const EdgeInsets.only(left: 24, bottom: 16),
             title: Text(
               'History',
               style: TextStyle(
-                fontSize: 20,
+                fontSize: 28,
                 fontWeight: FontWeight.bold,
                 color: colorScheme.onSurface,
               ),
@@ -100,7 +126,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {
         ),
 
         // Pause/Resume controls - only show when multiple items or paused
-        if ((queueState.isProcessing || queueState.queuedCount > 0) && (queueState.items.length > 1 || queueState.isPaused))
+        if ((isProcessing || queuedCount > 0) && (queueItems.length > 1 || isPaused))
           SliverToBoxAdapter(
             child: Padding(
               padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
@@ -113,14 +139,14 @@ class _QueueTabState extends ConsumerState<QueueTab> {
                       Container(
                         padding: const EdgeInsets.all(8),
                         decoration: BoxDecoration(
-                          color: queueState.isPaused 
+                          color: isPaused 
                               ? colorScheme.errorContainer 
                               : colorScheme.primaryContainer,
                           borderRadius: BorderRadius.circular(12),
                         ),
                         child: Icon(
-                          queueState.isPaused ? Icons.pause : Icons.downloading,
-                          color: queueState.isPaused 
+                          isPaused ? Icons.pause : Icons.downloading,
+                          color: isPaused 
                               ? colorScheme.onErrorContainer 
                               : colorScheme.onPrimaryContainer,
                         ),
@@ -129,9 +155,9 @@ class _QueueTabState extends ConsumerState<QueueTab> {
                       // Status text - simplified
                       Expanded(
                         child: Text(
-                          queueState.isPaused 
+                          isPaused 
                               ? 'Paused' 
-                              : '${queueState.completedCount}/${queueState.items.length}',
+                              : '$completedCount/${queueItems.length}',
                           style: Theme.of(context).textTheme.titleSmall?.copyWith(
                             fontWeight: FontWeight.bold,
                           ),
@@ -140,7 +166,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {
                       // Pause/Resume button
                       FilledButton.tonal(
                         onPressed: () => ref.read(downloadQueueProvider.notifier).togglePause(),
-                        child: Text(queueState.isPaused ? 'Resume' : 'Pause'),
+                        child: Text(isPaused ? 'Resume' : 'Pause'),
                       ),
                     ],
                   ),
@@ -150,34 +176,40 @@ class _QueueTabState extends ConsumerState<QueueTab> {
           ),
 
         // Queue header
-        if (queueState.items.isNotEmpty)
+        if (queueItems.isNotEmpty)
           SliverToBoxAdapter(
             child: Padding(
               padding: const EdgeInsets.fromLTRB(16, 8, 16, 8),
-              child: Text('Downloading (${queueState.items.length})',
+              child: Text('Downloading (${queueItems.length})',
                 style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold)),
             ),
           ),
 
-        // Queue list
-        if (queueState.items.isNotEmpty)
+        // Queue list with keys for efficient updates
+        if (queueItems.isNotEmpty)
           SliverList(delegate: SliverChildBuilderDelegate(
-            (context, index) => _buildQueueItem(context, queueState.items[index], colorScheme),
-            childCount: queueState.items.length,
+            (context, index) {
+              final item = queueItems[index];
+              return KeyedSubtree(
+                key: ValueKey(item.id),
+                child: _buildQueueItem(context, item, colorScheme),
+              );
+            },
+            childCount: queueItems.length,
           )),
 
         // History section header - show count only
-        if (historyState.items.isNotEmpty && queueState.items.isEmpty)
+        if (historyItems.isNotEmpty && queueItems.isEmpty)
           SliverToBoxAdapter(
             child: Padding(
               padding: const EdgeInsets.fromLTRB(16, 8, 16, 8),
-              child: Text('${historyState.items.length} ${historyState.items.length == 1 ? 'track' : 'tracks'}',
+              child: Text('${historyItems.length} ${historyItems.length == 1 ? 'track' : 'tracks'}',
                 style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant)),
             ),
           ),
 
         // History section header when queue has items (show "Downloaded" label)
-        if (historyState.items.isNotEmpty && queueState.items.isNotEmpty)
+        if (historyItems.isNotEmpty && queueItems.isNotEmpty)
           SliverToBoxAdapter(
             child: Padding(
               padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
@@ -186,8 +218,8 @@ class _QueueTabState extends ConsumerState<QueueTab> {
             ),
           ),
 
-        // History - Grid or List based on setting
-        if (historyState.items.isNotEmpty)
+        // History - Grid or List based on setting (with keys)
+        if (historyItems.isNotEmpty)
           historyViewMode == 'grid'
               ? SliverPadding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -199,18 +231,30 @@ class _QueueTabState extends ConsumerState<QueueTab> {
                       childAspectRatio: 0.75,
                     ),
                     delegate: SliverChildBuilderDelegate(
-                      (context, index) => _buildHistoryGridItem(context, historyState.items[index], colorScheme),
-                      childCount: historyState.items.length,
+                      (context, index) {
+                        final item = historyItems[index];
+                        return KeyedSubtree(
+                          key: ValueKey(item.id),
+                          child: _buildHistoryGridItem(context, item, colorScheme),
+                        );
+                      },
+                      childCount: historyItems.length,
                     ),
                   ),
                 )
               : SliverList(delegate: SliverChildBuilderDelegate(
-                  (context, index) => _buildHistoryItem(context, historyState.items[index], colorScheme),
-                  childCount: historyState.items.length,
+                  (context, index) {
+                    final item = historyItems[index];
+                    return KeyedSubtree(
+                      key: ValueKey(item.id),
+                      child: _buildHistoryItem(context, item, colorScheme),
+                    );
+                  },
+                  childCount: historyItems.length,
                 )),
 
         // Empty state when both queue and history are empty
-        if (queueState.items.isEmpty && historyState.items.isEmpty)
+        if (queueItems.isEmpty && historyItems.isEmpty)
           SliverFillRemaining(hasScrollBody: false, child: _buildEmptyState(context, colorScheme))
         else
           const SliverToBoxAdapter(child: SizedBox(height: 16)),
@@ -380,6 +424,25 @@ class _QueueTabState extends ConsumerState<QueueTab> {
           ],
         );
         
+      case DownloadStatus.finalizing:
+        // Finalizing: Show spinner with edit icon (embedding metadata)
+        return Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            SizedBox(
+              width: 40,
+              height: 40,
+              child: Stack(
+                alignment: Alignment.center,
+                children: [
+                  CircularProgressIndicator(strokeWidth: 3, color: colorScheme.tertiary),
+                  Icon(Icons.edit_note, color: colorScheme.tertiary, size: 16),
+                ],
+              ),
+            ),
+          ],
+        );
+        
       case DownloadStatus.completed:
         // Completed: Show play button and check icon
         final fileExists = _checkFileExists(item.filePath);

lib/screens/settings/about_page.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:spotiflac_android/constants/app_info.dart';
+import 'package:spotiflac_android/widgets/settings_group.dart';
 
 class AboutPage extends StatelessWidget {
   const AboutPage({super.key});
@@ -21,7 +23,10 @@ class AboutPage extends StatelessWidget {
             pinned: true,
             backgroundColor: colorScheme.surface,
             surfaceTintColor: Colors.transparent,
-            leading: IconButton(icon: const Icon(Icons.arrow_back), onPressed: () => Navigator.pop(context)),
+            leading: IconButton(
+              icon: const Icon(Icons.arrow_back),
+              onPressed: () => Navigator.pop(context),
+            ),
             flexibleSpace: LayoutBuilder(
               builder: (context, constraints) {
                 final maxHeight = 120 + topPadding;
@@ -35,10 +40,13 @@ class AboutPage extends StatelessWidget {
                     child: Container(
                       alignment: Alignment.bottomLeft,
                       padding: EdgeInsets.only(
+                        // When collapsed (expandRatio=0): left=56 to align with back button
+                        // When expanded (expandRatio=1): left=24 for normal padding
                         left: Tween<double>(begin: 56, end: 24).evaluate(animation),
-                        bottom: Tween<double>(begin: 12, end: 16).evaluate(animation),
+                        bottom: Tween<double>(begin: 16, end: 16).evaluate(animation),
                       ),
-                      child: Text('About',
+                      child: Text(
+                        'About',
                         style: TextStyle(
                           fontSize: Tween<double>(begin: 20, end: 28).evaluate(animation),
                           fontWeight: FontWeight.bold,
@@ -52,73 +60,90 @@ class AboutPage extends StatelessWidget {
             ),
           ),
 
-          // App info card
+          // App header card with logo and description
           SliverToBoxAdapter(
             child: Padding(
               padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
-              child: Card(
-                elevation: 0,
-                color: colorScheme.surfaceContainerHigh,
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-                child: Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Row(children: [
-                    Container(
-                      width: 56, height: 56,
-                      decoration: BoxDecoration(color: colorScheme.primaryContainer, borderRadius: BorderRadius.circular(16)),
-                      child: ClipRRect(
-                        borderRadius: BorderRadius.circular(16),
-                        child: Image.asset('assets/images/logo.png', fit: BoxFit.cover,
-                          errorBuilder: (_, __, ___) => Icon(Icons.music_note, size: 32, color: colorScheme.onPrimaryContainer)),
-                      ),
-                    ),
-                    const SizedBox(width: 16),
-                    Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-                      Text(AppInfo.appName, style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold)),
-                      const SizedBox(height: 4),
-                      Container(
-                        padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
-                        decoration: BoxDecoration(color: colorScheme.secondaryContainer, borderRadius: BorderRadius.circular(12)),
-                        child: Text('v${AppInfo.version}', style: Theme.of(context).textTheme.labelMedium?.copyWith(color: colorScheme.onSecondaryContainer)),
-                      ),
-                    ]),
-                  ]),
-                ),
-              ),
+              child: _AppHeaderCard(),
             ),
           ),
 
-          // GitHub section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'GitHub')),
-          SliverList(delegate: SliverChildListDelegate([
-            ListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              leading: Icon(Icons.phone_android, color: colorScheme.onSurfaceVariant),
-              title: Text('${AppInfo.appName} Mobile'),
-              subtitle: Text('github.com/${AppInfo.githubRepo}'),
-              trailing: const Icon(Icons.open_in_new, size: 20),
-              onTap: () => _launchUrl(AppInfo.githubUrl),
-            ),
-            ListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              leading: Icon(Icons.computer, color: colorScheme.onSurfaceVariant),
-              title: Text('Original ${AppInfo.appName}'),
-              subtitle: Text('github.com/${AppInfo.originalAuthor}/SpotiFLAC'),
-              trailing: const Icon(Icons.open_in_new, size: 20),
-              onTap: () => _launchUrl(AppInfo.originalGithubUrl),
-            ),
-          ])),
-
-          // Credits section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'Credits')),
+          // Contributors section
+          const SliverToBoxAdapter(
+            child: SettingsSectionHeader(title: 'Contributors'),
+          ),
           SliverToBoxAdapter(
-            child: Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 24),
-              child: Column(children: [
-                _CreditRow(label: 'Mobile Version', value: AppInfo.mobileAuthor),
-                const SizedBox(height: 12),
-                _CreditRow(label: 'Original Project', value: AppInfo.originalAuthor),
-              ]),
+            child: SettingsGroup(
+              children: [
+                _ContributorItem(
+                  name: AppInfo.mobileAuthor,
+                  description: 'Mobile version developer',
+                  githubUsername: AppInfo.mobileAuthor,
+                  showDivider: true,
+                ),
+                _ContributorItem(
+                  name: AppInfo.originalAuthor,
+                  description: 'Creator of the original SpotiFLAC',
+                  githubUsername: AppInfo.originalAuthor,
+                  showDivider: false,
+                ),
+              ],
+            ),
+          ),
+
+          // Links section
+          const SliverToBoxAdapter(
+            child: SettingsSectionHeader(title: 'Links'),
+          ),
+          SliverToBoxAdapter(
+            child: SettingsGroup(
+              children: [
+                SettingsItem(
+                  icon: Icons.phone_android,
+                  title: 'Mobile source code',
+                  subtitle: 'github.com/${AppInfo.githubRepo}',
+                  onTap: () => _launchUrl(AppInfo.githubUrl),
+                  showDivider: true,
+                ),
+                SettingsItem(
+                  icon: Icons.computer,
+                  title: 'PC source code',
+                  subtitle: 'github.com/${AppInfo.originalAuthor}/SpotiFLAC',
+                  onTap: () => _launchUrl(AppInfo.originalGithubUrl),
+                  showDivider: true,
+                ),
+                SettingsItem(
+                  icon: Icons.bug_report_outlined,
+                  title: 'Report an issue',
+                  subtitle: 'Report any problems you encounter',
+                  onTap: () => _launchUrl('${AppInfo.githubUrl}/issues/new'),
+                  showDivider: true,
+                ),
+                SettingsItem(
+                  icon: Icons.lightbulb_outline,
+                  title: 'Feature request',
+                  subtitle: 'Suggest new features for the app',
+                  onTap: () => _launchUrl('${AppInfo.githubUrl}/issues/new'),
+                  showDivider: false,
+                ),
+              ],
+            ),
+          ),
+
+          // App info section
+          const SliverToBoxAdapter(
+            child: SettingsSectionHeader(title: 'App'),
+          ),
+          SliverToBoxAdapter(
+            child: SettingsGroup(
+              children: [
+                SettingsItem(
+                  icon: Icons.info_outline,
+                  title: 'Version',
+                  subtitle: 'v${AppInfo.version} (build ${AppInfo.buildNumber})',
+                  showDivider: false,
+                ),
+              ],
             ),
           ),
 
@@ -126,42 +151,214 @@ class AboutPage extends StatelessWidget {
           SliverToBoxAdapter(
             child: Padding(
               padding: const EdgeInsets.all(24),
-              child: Center(child: Text(AppInfo.copyright,
-                style: Theme.of(context).textTheme.bodySmall?.copyWith(color: colorScheme.onSurfaceVariant))),
+              child: Center(
+                child: Text(
+                  AppInfo.copyright,
+                  style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                    color: colorScheme.onSurfaceVariant,
+                  ),
+                ),
+              ),
+            ),
+          ),
+
+          // Bottom padding
+          const SliverToBoxAdapter(child: SizedBox(height: 16)),
+        ],
+      ),
+    );
+  }
+
+  static Future<void> _launchUrl(String url) async {
+    final uri = Uri.parse(url);
+    // Use inAppBrowserView for reliable URL opening with app chooser
+    await launchUrl(uri, mode: LaunchMode.inAppBrowserView);
+  }
+}
+
+class _AppHeaderCard extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    
+    final cardColor = isDark 
+        ? Color.alphaBlend(Colors.white.withValues(alpha: 0.08), colorScheme.surface)
+        : colorScheme.surfaceContainerHighest;
+
+    return Container(
+      decoration: BoxDecoration(
+        color: cardColor,
+        borderRadius: BorderRadius.circular(20),
+      ),
+      padding: const EdgeInsets.all(24),
+      child: Column(
+        children: [
+          // App logo
+          Container(
+            width: 88,
+            height: 88,
+            decoration: BoxDecoration(
+              color: colorScheme.primaryContainer,
+              borderRadius: BorderRadius.circular(24),
+              boxShadow: [
+                BoxShadow(
+                  color: colorScheme.primary.withValues(alpha: 0.2),
+                  blurRadius: 16,
+                  offset: const Offset(0, 4),
+                ),
+              ],
+            ),
+            child: ClipRRect(
+              borderRadius: BorderRadius.circular(24),
+              child: Image.asset(
+                'assets/images/logo.png',
+                fit: BoxFit.cover,
+                errorBuilder: (_, _, _) => Icon(
+                  Icons.music_note,
+                  size: 48,
+                  color: colorScheme.onPrimaryContainer,
+                ),
+              ),
+            ),
+          ),
+          const SizedBox(height: 16),
+          // App name
+          Text(
+            AppInfo.appName,
+            style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          const SizedBox(height: 4),
+          // Version badge
+          Container(
+            padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
+            decoration: BoxDecoration(
+              color: colorScheme.secondaryContainer,
+              borderRadius: BorderRadius.circular(12),
+            ),
+            child: Text(
+              'v${AppInfo.version}',
+              style: Theme.of(context).textTheme.labelMedium?.copyWith(
+                color: colorScheme.onSecondaryContainer,
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+          ),
+          const SizedBox(height: 16),
+          // Description
+          Text(
+            'Download Spotify tracks in lossless quality from Tidal, Qobuz, and Amazon Music.',
+            textAlign: TextAlign.center,
+            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+              color: colorScheme.onSurfaceVariant,
             ),
           ),
         ],
       ),
     );
   }
-
-  Future<void> _launchUrl(String url) async {
-    final uri = Uri.parse(url);
-    if (await canLaunchUrl(uri)) await launchUrl(uri, mode: LaunchMode.externalApplication);
-  }
 }
 
-class _SectionHeader extends StatelessWidget {
-  final String title;
-  const _SectionHeader({required this.title});
-  @override
-  Widget build(BuildContext context) => Padding(
-    padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
-    child: Text(title, style: Theme.of(context).textTheme.titleSmall?.copyWith(
-      color: Theme.of(context).colorScheme.primary, fontWeight: FontWeight.w600)),
-  );
-}
+class _ContributorItem extends StatelessWidget {
+  final String name;
+  final String description;
+  final String githubUsername;
+  final bool showDivider;
+
+  const _ContributorItem({
+    required this.name,
+    required this.description,
+    required this.githubUsername,
+    this.showDivider = false,
+  });
 
-class _CreditRow extends StatelessWidget {
-  final String label;
-  final String value;
-  const _CreditRow({required this.label, required this.value});
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
-    return Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
-      Text(label, style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant)),
-      Text(value, style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600)),
-    ]);
+    
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        InkWell(
+          onTap: () => _launchGitHub(githubUsername),
+          splashColor: colorScheme.primary.withValues(alpha: 0.12),
+          highlightColor: colorScheme.primary.withValues(alpha: 0.08),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+            child: Row(
+              children: [
+                // GitHub Avatar
+                ClipRRect(
+                  borderRadius: BorderRadius.circular(12),
+                  child: CachedNetworkImage(
+                    imageUrl: 'https://github.com/$githubUsername.png',
+                    width: 40,
+                    height: 40,
+                    fit: BoxFit.cover,
+                    placeholder: (context, url) => Container(
+                      width: 40,
+                      height: 40,
+                      color: colorScheme.surfaceContainerHighest,
+                      child: Icon(
+                        Icons.person,
+                        color: colorScheme.onSurfaceVariant,
+                        size: 20,
+                      ),
+                    ),
+                    errorWidget: (context, url, error) => Container(
+                      width: 40,
+                      height: 40,
+                      color: colorScheme.surfaceContainerHighest,
+                      child: Icon(
+                        Icons.person,
+                        color: colorScheme.onSurfaceVariant,
+                        size: 20,
+                      ),
+                    ),
+                  ),
+                ),
+                const SizedBox(width: 16),
+                // Name and description
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        name,
+                        style: Theme.of(context).textTheme.bodyLarge,
+                      ),
+                      const SizedBox(height: 2),
+                      Text(
+                        description,
+                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                          color: colorScheme.onSurfaceVariant,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                // GitHub icon
+                Icon(Icons.chevron_right, color: colorScheme.onSurfaceVariant),
+              ],
+            ),
+          ),
+        ),
+        if (showDivider)
+          Divider(
+            height: 1,
+            thickness: 1,
+            indent: 76,
+            endIndent: 20,
+            color: colorScheme.outlineVariant.withValues(alpha: 0.3),
+          ),
+      ],
+    );
+  }
+
+  Future<void> _launchGitHub(String username) async {
+    final uri = Uri.parse('https://github.com/$username');
+    await launchUrl(uri, mode: LaunchMode.inAppBrowserView);
   }
 }

lib/screens/settings/appearance_settings_page.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/providers/theme_provider.dart';
+import 'package:spotiflac_android/widgets/settings_group.dart';
 
 class AppearanceSettingsPage extends ConsumerWidget {
   const AppearanceSettingsPage({super.key});
@@ -39,7 +40,7 @@ class AppearanceSettingsPage extends ConsumerWidget {
                       alignment: Alignment.bottomLeft,
                       padding: EdgeInsets.only(
                         left: Tween<double>(begin: 56, end: 24).evaluate(animation),
-                        bottom: Tween<double>(begin: 12, end: 16).evaluate(animation),
+                        bottom: Tween<double>(begin: 16, end: 16).evaluate(animation),
                       ),
                       child: Text('Appearance',
                         style: TextStyle(
@@ -56,46 +57,50 @@ class AppearanceSettingsPage extends ConsumerWidget {
           ),
 
           // Theme section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'Theme')),
+          const SliverToBoxAdapter(child: SettingsSectionHeader(title: 'Theme')),
           SliverToBoxAdapter(
-            child: Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              child: _ThemeModeSelector(
-                currentMode: themeSettings.themeMode,
-                onChanged: (mode) => ref.read(themeProvider.notifier).setThemeMode(mode),
-              ),
+            child: SettingsGroup(
+              children: [
+                _ThemeModeSelector(
+                  currentMode: themeSettings.themeMode,
+                  onChanged: (mode) => ref.read(themeProvider.notifier).setThemeMode(mode),
+                ),
+              ],
             ),
           ),
 
           // Color section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'Color')),
+          const SliverToBoxAdapter(child: SettingsSectionHeader(title: 'Color')),
           SliverToBoxAdapter(
-            child: SwitchListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              title: const Text('Dynamic Color'),
-              subtitle: const Text('Use colors from your wallpaper'),
-              value: themeSettings.useDynamicColor,
-              onChanged: (value) => ref.read(themeProvider.notifier).setUseDynamicColor(value),
+            child: SettingsGroup(
+              children: [
+                SettingsSwitchItem(
+                  icon: Icons.auto_awesome,
+                  title: 'Dynamic Color',
+                  subtitle: 'Use colors from your wallpaper',
+                  value: themeSettings.useDynamicColor,
+                  onChanged: (value) => ref.read(themeProvider.notifier).setUseDynamicColor(value),
+                  showDivider: !themeSettings.useDynamicColor,
+                ),
+                if (!themeSettings.useDynamicColor)
+                  _ColorPicker(
+                    currentColor: themeSettings.seedColorValue,
+                    onColorSelected: (color) => ref.read(themeProvider.notifier).setSeedColor(color),
+                  ),
+              ],
             ),
           ),
 
-          if (!themeSettings.useDynamicColor)
-            SliverToBoxAdapter(
-              child: _ColorPicker(
-                currentColor: themeSettings.seedColorValue,
-                onColorSelected: (color) => ref.read(themeProvider.notifier).setSeedColor(color),
-              ),
-            ),
-
           // Layout section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'Layout')),
+          const SliverToBoxAdapter(child: SettingsSectionHeader(title: 'Layout')),
           SliverToBoxAdapter(
-            child: Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              child: _HistoryViewSelector(
-                currentMode: settings.historyViewMode,
-                onChanged: (mode) => ref.read(settingsProvider.notifier).setHistoryViewMode(mode),
-              ),
+            child: SettingsGroup(
+              children: [
+                _HistoryViewSelector(
+                  currentMode: settings.historyViewMode,
+                  onChanged: (mode) => ref.read(settingsProvider.notifier).setHistoryViewMode(mode),
+                ),
+              ],
             ),
           ),
 
@@ -107,17 +112,6 @@ class AppearanceSettingsPage extends ConsumerWidget {
   }
 }
 
-class _SectionHeader extends StatelessWidget {
-  final String title;
-  const _SectionHeader({required this.title});
-  @override
-  Widget build(BuildContext context) => Padding(
-    padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
-    child: Text(title, style: Theme.of(context).textTheme.titleSmall?.copyWith(
-      color: Theme.of(context).colorScheme.primary, fontWeight: FontWeight.w600)),
-  );
-}
-
 class _ThemeModeSelector extends StatelessWidget {
   final ThemeMode currentMode;
   final ValueChanged<ThemeMode> onChanged;
@@ -125,21 +119,15 @@ class _ThemeModeSelector extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    return Card(
-      elevation: 0,
-      color: colorScheme.surfaceContainerHigh,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-      child: Padding(
-        padding: const EdgeInsets.all(8),
-        child: Row(children: [
-          _ThemeModeChip(icon: Icons.brightness_auto, label: 'System', isSelected: currentMode == ThemeMode.system, onTap: () => onChanged(ThemeMode.system)),
-          const SizedBox(width: 8),
-          _ThemeModeChip(icon: Icons.light_mode, label: 'Light', isSelected: currentMode == ThemeMode.light, onTap: () => onChanged(ThemeMode.light)),
-          const SizedBox(width: 8),
-          _ThemeModeChip(icon: Icons.dark_mode, label: 'Dark', isSelected: currentMode == ThemeMode.dark, onTap: () => onChanged(ThemeMode.dark)),
-        ]),
-      ),
+    return Padding(
+      padding: const EdgeInsets.all(12),
+      child: Row(children: [
+        _ThemeModeChip(icon: Icons.brightness_auto, label: 'System', isSelected: currentMode == ThemeMode.system, onTap: () => onChanged(ThemeMode.system)),
+        const SizedBox(width: 8),
+        _ThemeModeChip(icon: Icons.light_mode, label: 'Light', isSelected: currentMode == ThemeMode.light, onTap: () => onChanged(ThemeMode.light)),
+        const SizedBox(width: 8),
+        _ThemeModeChip(icon: Icons.dark_mode, label: 'Dark', isSelected: currentMode == ThemeMode.dark, onTap: () => onChanged(ThemeMode.dark)),
+      ]),
     );
   }
 }
@@ -154,22 +142,40 @@ class _ThemeModeChip extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    
+    // Unselected chips need contrast with card background
+    // Card uses: dark = white 8% overlay, light = surfaceContainerHighest
+    // So chips use: dark = white 5% overlay (darker), light = black 5% overlay (darker than card)
+    final unselectedColor = isDark 
+        ? Color.alphaBlend(Colors.white.withValues(alpha: 0.05), colorScheme.surface)
+        : Color.alphaBlend(Colors.black.withValues(alpha: 0.05), colorScheme.surfaceContainerHighest);
+    
     return Expanded(
-      child: Material(
-        color: isSelected ? colorScheme.primaryContainer : Colors.transparent,
-        borderRadius: BorderRadius.circular(12),
-        child: InkWell(
-          onTap: onTap,
+      child: Container(
+        decoration: BoxDecoration(
+          color: isSelected ? colorScheme.primaryContainer : unselectedColor,
           borderRadius: BorderRadius.circular(12),
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 14),
-            child: Column(children: [
-              Icon(icon, color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant),
-              const SizedBox(height: 6),
-              Text(label, style: TextStyle(fontSize: 12,
-                fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
-                color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant)),
-            ]),
+          border: !isDark && !isSelected 
+              ? Border.all(color: colorScheme.outlineVariant.withValues(alpha: 0.5), width: 1)
+              : null,
+        ),
+        child: Material(
+          color: Colors.transparent,
+          borderRadius: BorderRadius.circular(12),
+          child: InkWell(
+            onTap: onTap,
+            borderRadius: BorderRadius.circular(12),
+            child: Padding(
+              padding: const EdgeInsets.symmetric(vertical: 14),
+              child: Column(children: [
+                Icon(icon, color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant),
+                const SizedBox(height: 6),
+                Text(label, style: TextStyle(fontSize: 12,
+                  fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
+                  color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant)),
+              ]),
+            ),
           ),
         ),
       ),
@@ -191,9 +197,9 @@ class _ColorPicker extends StatelessWidget {
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
+      padding: const EdgeInsets.fromLTRB(20, 8, 20, 16),
       child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-        Text('Accent Color', style: Theme.of(context).textTheme.titleSmall),
+        Text('Accent Color', style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant)),
         const SizedBox(height: 12),
         Wrap(spacing: 12, runSpacing: 12, children: _colors.map((color) {
           final isSelected = color.toARGB32() == currentColor;
@@ -224,26 +230,21 @@ class _HistoryViewSelector extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
-    return Card(
-      elevation: 0,
-      color: colorScheme.surfaceContainerHigh,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-      child: Padding(
-        padding: const EdgeInsets.all(8),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(left: 8, bottom: 8),
-              child: Text('History View', style: Theme.of(context).textTheme.bodySmall?.copyWith(color: colorScheme.onSurfaceVariant)),
-            ),
-            Row(children: [
-              _ViewModeChip(icon: Icons.view_list, label: 'List', isSelected: currentMode == 'list', onTap: () => onChanged('list')),
-              const SizedBox(width: 8),
-              _ViewModeChip(icon: Icons.grid_view, label: 'Grid', isSelected: currentMode == 'grid', onTap: () => onChanged('grid')),
-            ]),
-          ],
-        ),
+    return Padding(
+      padding: const EdgeInsets.all(12),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(left: 8, bottom: 8),
+            child: Text('History View', style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant)),
+          ),
+          Row(children: [
+            _ViewModeChip(icon: Icons.view_list, label: 'List', isSelected: currentMode == 'list', onTap: () => onChanged('list')),
+            const SizedBox(width: 8),
+            _ViewModeChip(icon: Icons.grid_view, label: 'Grid', isSelected: currentMode == 'grid', onTap: () => onChanged('grid')),
+          ]),
+        ],
       ),
     );
   }
@@ -259,22 +260,38 @@ class _ViewModeChip extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    
+    // Unselected chips need contrast with card background
+    final unselectedColor = isDark 
+        ? Color.alphaBlend(Colors.white.withValues(alpha: 0.05), colorScheme.surface)
+        : Color.alphaBlend(Colors.black.withValues(alpha: 0.05), colorScheme.surfaceContainerHighest);
+    
     return Expanded(
-      child: Material(
-        color: isSelected ? colorScheme.primaryContainer : Colors.transparent,
-        borderRadius: BorderRadius.circular(12),
-        child: InkWell(
-          onTap: onTap,
+      child: Container(
+        decoration: BoxDecoration(
+          color: isSelected ? colorScheme.primaryContainer : unselectedColor,
           borderRadius: BorderRadius.circular(12),
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 14),
-            child: Column(children: [
-              Icon(icon, color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant),
-              const SizedBox(height: 6),
-              Text(label, style: TextStyle(fontSize: 12,
-                fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
-                color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant)),
-            ]),
+          border: !isDark && !isSelected 
+              ? Border.all(color: colorScheme.outlineVariant.withValues(alpha: 0.5), width: 1)
+              : null,
+        ),
+        child: Material(
+          color: Colors.transparent,
+          borderRadius: BorderRadius.circular(12),
+          child: InkWell(
+            onTap: onTap,
+            borderRadius: BorderRadius.circular(12),
+            child: Padding(
+              padding: const EdgeInsets.symmetric(vertical: 14),
+              child: Column(children: [
+                Icon(icon, color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant),
+                const SizedBox(height: 6),
+                Text(label, style: TextStyle(fontSize: 12,
+                  fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
+                  color: isSelected ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant)),
+              ]),
+            ),
           ),
         ),
       ),

lib/screens/settings/download_settings_page.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
+import 'package:spotiflac_android/widgets/settings_group.dart';
 
 class DownloadSettingsPage extends ConsumerWidget {
   const DownloadSettingsPage({super.key});
@@ -38,7 +39,7 @@ class DownloadSettingsPage extends ConsumerWidget {
                       alignment: Alignment.bottomLeft,
                       padding: EdgeInsets.only(
                         left: Tween<double>(begin: 56, end: 24).evaluate(animation),
-                        bottom: Tween<double>(begin: 12, end: 16).evaluate(animation),
+                        bottom: Tween<double>(begin: 16, end: 16).evaluate(animation),
                       ),
                       child: Text('Download',
                         style: TextStyle(
@@ -55,59 +56,82 @@ class DownloadSettingsPage extends ConsumerWidget {
           ),
 
           // Service section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'Service')),
+          const SliverToBoxAdapter(child: SettingsSectionHeader(title: 'Service')),
           SliverToBoxAdapter(
-            child: Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              child: _ServiceSelector(
-                currentService: settings.defaultService,
-                onChanged: (service) => ref.read(settingsProvider.notifier).setDefaultService(service),
-              ),
+            child: SettingsGroup(
+              children: [
+                _ServiceSelector(
+                  currentService: settings.defaultService,
+                  onChanged: (service) => ref.read(settingsProvider.notifier).setDefaultService(service),
+                ),
+              ],
             ),
           ),
 
           // Quality section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'Audio Quality')),
-          SliverList(delegate: SliverChildListDelegate([
-            _QualityOption(title: 'FLAC Lossless', subtitle: '16-bit / 44.1kHz', value: 'LOSSLESS',
-              isSelected: settings.audioQuality == 'LOSSLESS',
-              onTap: () => ref.read(settingsProvider.notifier).setAudioQuality('LOSSLESS')),
-            _QualityOption(title: 'Hi-Res FLAC', subtitle: '24-bit / up to 96kHz', value: 'HI_RES',
-              isSelected: settings.audioQuality == 'HI_RES',
-              onTap: () => ref.read(settingsProvider.notifier).setAudioQuality('HI_RES')),
-            _QualityOption(title: 'Hi-Res FLAC Max', subtitle: '24-bit / up to 192kHz', value: 'HI_RES_LOSSLESS',
-              isSelected: settings.audioQuality == 'HI_RES_LOSSLESS',
-              onTap: () => ref.read(settingsProvider.notifier).setAudioQuality('HI_RES_LOSSLESS')),
-          ])),
+          const SliverToBoxAdapter(child: SettingsSectionHeader(title: 'Audio Quality')),
+          SliverToBoxAdapter(
+            child: SettingsGroup(
+              children: [
+                SettingsSwitchItem(
+                  icon: Icons.tune,
+                  title: 'Ask Before Download',
+                  subtitle: 'Choose quality for each download',
+                  value: settings.askQualityBeforeDownload,
+                  onChanged: (value) => ref.read(settingsProvider.notifier).setAskQualityBeforeDownload(value),
+                ),
+                if (!settings.askQualityBeforeDownload) ...[
+                  _QualityOption(
+                    title: 'FLAC Lossless',
+                    subtitle: '16-bit / 44.1kHz',
+                    isSelected: settings.audioQuality == 'LOSSLESS',
+                    onTap: () => ref.read(settingsProvider.notifier).setAudioQuality('LOSSLESS'),
+                  ),
+                  _QualityOption(
+                    title: 'Hi-Res FLAC',
+                    subtitle: '24-bit / up to 96kHz',
+                    isSelected: settings.audioQuality == 'HI_RES',
+                    onTap: () => ref.read(settingsProvider.notifier).setAudioQuality('HI_RES'),
+                  ),
+                  _QualityOption(
+                    title: 'Hi-Res FLAC Max',
+                    subtitle: '24-bit / up to 192kHz',
+                    isSelected: settings.audioQuality == 'HI_RES_LOSSLESS',
+                    onTap: () => ref.read(settingsProvider.notifier).setAudioQuality('HI_RES_LOSSLESS'),
+                    showDivider: false,
+                  ),
+                ],
+              ],
+            ),
+          ),
 
           // File settings section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'File Settings')),
-          SliverList(delegate: SliverChildListDelegate([
-            ListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              leading: Icon(Icons.text_fields, color: colorScheme.onSurfaceVariant),
-              title: const Text('Filename Format'),
-              subtitle: Text(settings.filenameFormat),
-              trailing: const Icon(Icons.chevron_right),
-              onTap: () => _showFormatEditor(context, ref, settings.filenameFormat),
+          const SliverToBoxAdapter(child: SettingsSectionHeader(title: 'File Settings')),
+          SliverToBoxAdapter(
+            child: SettingsGroup(
+              children: [
+                SettingsItem(
+                  icon: Icons.text_fields,
+                  title: 'Filename Format',
+                  subtitle: settings.filenameFormat,
+                  onTap: () => _showFormatEditor(context, ref, settings.filenameFormat),
+                ),
+                SettingsItem(
+                  icon: Icons.folder_outlined,
+                  title: 'Download Directory',
+                  subtitle: settings.downloadDirectory.isEmpty ? 'Music/SpotiFLAC' : settings.downloadDirectory,
+                  onTap: () => _pickDirectory(ref),
+                ),
+                SettingsItem(
+                  icon: Icons.create_new_folder_outlined,
+                  title: 'Folder Organization',
+                  subtitle: _getFolderOrganizationLabel(settings.folderOrganization),
+                  onTap: () => _showFolderOrganizationPicker(context, ref, settings.folderOrganization),
+                  showDivider: false,
+                ),
+              ],
             ),
-            ListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              leading: Icon(Icons.folder_outlined, color: colorScheme.onSurfaceVariant),
-              title: const Text('Download Directory'),
-              subtitle: Text(settings.downloadDirectory.isEmpty ? 'Music/SpotiFLAC' : settings.downloadDirectory, maxLines: 1, overflow: TextOverflow.ellipsis),
-              trailing: const Icon(Icons.chevron_right),
-              onTap: () => _pickDirectory(ref),
-            ),
-            ListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              leading: Icon(Icons.create_new_folder_outlined, color: colorScheme.onSurfaceVariant),
-              title: const Text('Folder Organization'),
-              subtitle: Text(_getFolderOrganizationLabel(settings.folderOrganization)),
-              trailing: const Icon(Icons.chevron_right),
-              onTap: () => _showFolderOrganizationPicker(context, ref, settings.folderOrganization),
-            ),
-          ])),
+          ),
 
           const SliverToBoxAdapter(child: SizedBox(height: 32)),
         ],
@@ -150,13 +174,13 @@ class DownloadSettingsPage extends ConsumerWidget {
   String _getFolderOrganizationLabel(String value) {
     switch (value) {
       case 'artist':
-        return 'By Artist (Artist/Track.flac)';
+        return 'By Artist';
       case 'album':
-        return 'By Album (Album/Track.flac)';
+        return 'By Album';
       case 'artist_album':
-        return 'By Artist & Album (Artist/Album/Track.flac)';
+        return 'By Artist & Album';
       default:
-        return 'None (all in one folder)';
+        return 'None';
     }
   }
 
@@ -215,17 +239,6 @@ class DownloadSettingsPage extends ConsumerWidget {
   }
 }
 
-class _SectionHeader extends StatelessWidget {
-  final String title;
-  const _SectionHeader({required this.title});
-  @override
-  Widget build(BuildContext context) => Padding(
-    padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
-    child: Text(title, style: Theme.of(context).textTheme.titleSmall?.copyWith(
-      color: Theme.of(context).colorScheme.primary, fontWeight: FontWeight.w600)),
-  );
-}
-
 class _ServiceSelector extends StatelessWidget {
   final String currentService;
   final ValueChanged<String> onChanged;
@@ -233,21 +246,15 @@ class _ServiceSelector extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    return Card(
-      elevation: 0,
-      color: colorScheme.surfaceContainerHigh,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-      child: Padding(
-        padding: const EdgeInsets.all(8),
-        child: Row(children: [
-          _ServiceChip(icon: Icons.music_note, label: 'Tidal', isSelected: currentService == 'tidal', onTap: () => onChanged('tidal')),
-          const SizedBox(width: 8),
-          _ServiceChip(icon: Icons.album, label: 'Qobuz', isSelected: currentService == 'qobuz', onTap: () => onChanged('qobuz')),
-          const SizedBox(width: 8),
-          _ServiceChip(icon: Icons.shopping_bag, label: 'Amazon', isSelected: currentService == 'amazon', onTap: () => onChanged('amazon')),
-        ]),
-      ),
+    return Padding(
+      padding: const EdgeInsets.all(12),
+      child: Row(children: [
+        _ServiceChip(icon: Icons.music_note, label: 'Tidal', isSelected: currentService == 'tidal', onTap: () => onChanged('tidal')),
+        const SizedBox(width: 8),
+        _ServiceChip(icon: Icons.album, label: 'Qobuz', isSelected: currentService == 'qobuz', onTap: () => onChanged('qobuz')),
+        const SizedBox(width: 8),
+        _ServiceChip(icon: Icons.shopping_bag, label: 'Amazon', isSelected: currentService == 'amazon', onTap: () => onChanged('amazon')),
+      ]),
     );
   }
 }
@@ -262,9 +269,15 @@ class _ServiceChip extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    
+    final unselectedColor = isDark 
+        ? Color.alphaBlend(Colors.white.withValues(alpha: 0.05), colorScheme.surface)
+        : colorScheme.surfaceContainerHigh;
+    
     return Expanded(
       child: Material(
-        color: isSelected ? colorScheme.primaryContainer : Colors.transparent,
+        color: isSelected ? colorScheme.primaryContainer : unselectedColor,
         borderRadius: BorderRadius.circular(12),
         child: InkWell(
           onTap: onTap,
@@ -288,20 +301,49 @@ class _ServiceChip extends StatelessWidget {
 class _QualityOption extends StatelessWidget {
   final String title;
   final String subtitle;
-  final String value;
   final bool isSelected;
   final VoidCallback onTap;
-  const _QualityOption({required this.title, required this.subtitle, required this.value, required this.isSelected, required this.onTap});
+  final bool showDivider;
+  const _QualityOption({required this.title, required this.subtitle, required this.isSelected, required this.onTap, this.showDivider = true});
 
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
-    return ListTile(
-      contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-      title: Text(title),
-      subtitle: Text(subtitle),
-      trailing: isSelected ? Icon(Icons.check_circle, color: colorScheme.primary) : Icon(Icons.circle_outlined, color: colorScheme.outline),
-      onTap: onTap,
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        InkWell(
+          onTap: onTap,
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 14),
+            child: Row(
+              children: [
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(title, style: Theme.of(context).textTheme.bodyLarge),
+                      const SizedBox(height: 2),
+                      Text(subtitle, style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant)),
+                    ],
+                  ),
+                ),
+                isSelected 
+                    ? Icon(Icons.check_circle, color: colorScheme.primary)
+                    : Icon(Icons.circle_outlined, color: colorScheme.outline),
+              ],
+            ),
+          ),
+        ),
+        if (showDivider)
+          Divider(
+            height: 1,
+            thickness: 1,
+            indent: 20,
+            endIndent: 20,
+            color: colorScheme.outlineVariant.withValues(alpha: 0.3),
+          ),
+      ],
     );
   }
 }

lib/screens/settings/options_settings_page.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spotiflac_android/providers/download_queue_provider.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
+import 'package:spotiflac_android/widgets/settings_group.dart';
 
 class OptionsSettingsPage extends ConsumerWidget {
   const OptionsSettingsPage({super.key});
@@ -38,7 +39,7 @@ class OptionsSettingsPage extends ConsumerWidget {
                       alignment: Alignment.bottomLeft,
                       padding: EdgeInsets.only(
                         left: Tween<double>(begin: 56, end: 24).evaluate(animation),
-                        bottom: Tween<double>(begin: 12, end: 16).evaluate(animation),
+                        bottom: Tween<double>(begin: 16, end: 16).evaluate(animation),
                       ),
                       child: Text('Options',
                         style: TextStyle(
@@ -55,78 +56,96 @@ class OptionsSettingsPage extends ConsumerWidget {
           ),
 
           // Download options section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'Download')),
-          SliverList(delegate: SliverChildListDelegate([
-            SwitchListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              secondary: Icon(Icons.sync, color: colorScheme.onSurfaceVariant),
-              title: const Text('Auto Fallback'),
-              subtitle: const Text('Try other services if download fails'),
-              value: settings.autoFallback,
-              onChanged: (v) => ref.read(settingsProvider.notifier).setAutoFallback(v),
+          const SliverToBoxAdapter(child: SettingsSectionHeader(title: 'Download')),
+          SliverToBoxAdapter(
+            child: SettingsGroup(
+              children: [
+                SettingsSwitchItem(
+                  icon: Icons.sync,
+                  title: 'Auto Fallback',
+                  subtitle: 'Try other services if download fails',
+                  value: settings.autoFallback,
+                  onChanged: (v) => ref.read(settingsProvider.notifier).setAutoFallback(v),
+                ),
+                SettingsSwitchItem(
+                  icon: Icons.lyrics,
+                  title: 'Embed Lyrics',
+                  subtitle: 'Embed synced lyrics into FLAC files',
+                  value: settings.embedLyrics,
+                  onChanged: (v) => ref.read(settingsProvider.notifier).setEmbedLyrics(v),
+                ),
+                SettingsSwitchItem(
+                  icon: Icons.image,
+                  title: 'Max Quality Cover',
+                  subtitle: 'Download highest resolution cover art',
+                  value: settings.maxQualityCover,
+                  onChanged: (v) => ref.read(settingsProvider.notifier).setMaxQualityCover(v),
+                  showDivider: false,
+                ),
+              ],
             ),
-            SwitchListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              secondary: Icon(Icons.lyrics, color: colorScheme.onSurfaceVariant),
-              title: const Text('Embed Lyrics'),
-              subtitle: const Text('Embed synced lyrics into FLAC files'),
-              value: settings.embedLyrics,
-              onChanged: (v) => ref.read(settingsProvider.notifier).setEmbedLyrics(v),
-            ),
-            SwitchListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              secondary: Icon(Icons.image, color: colorScheme.onSurfaceVariant),
-              title: const Text('Max Quality Cover'),
-              subtitle: const Text('Download highest resolution cover art'),
-              value: settings.maxQualityCover,
-              onChanged: (v) => ref.read(settingsProvider.notifier).setMaxQualityCover(v),
-            ),
-          ])),
+          ),
 
           // Performance section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'Performance')),
+          const SliverToBoxAdapter(child: SettingsSectionHeader(title: 'Performance')),
           SliverToBoxAdapter(
-            child: _ConcurrentDownloadsSelector(
-              currentValue: settings.concurrentDownloads,
-              onChanged: (v) => ref.read(settingsProvider.notifier).setConcurrentDownloads(v),
+            child: SettingsGroup(
+              children: [
+                _ConcurrentDownloadsItem(
+                  currentValue: settings.concurrentDownloads,
+                  onChanged: (v) => ref.read(settingsProvider.notifier).setConcurrentDownloads(v),
+                ),
+              ],
             ),
           ),
 
           // Lyrics section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'Lyrics')),
-          SliverList(delegate: SliverChildListDelegate([
-            SwitchListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              secondary: Icon(Icons.translate, color: colorScheme.onSurfaceVariant),
-              title: const Text('Convert Japanese to Romaji'),
-              subtitle: const Text('Auto-convert Hiragana/Katakana lyrics'),
-              value: settings.convertLyricsToRomaji,
-              onChanged: (v) => ref.read(settingsProvider.notifier).setConvertLyricsToRomaji(v),
+          const SliverToBoxAdapter(child: SettingsSectionHeader(title: 'Lyrics')),
+          SliverToBoxAdapter(
+            child: SettingsGroup(
+              children: [
+                SettingsSwitchItem(
+                  icon: Icons.translate,
+                  title: 'Convert Japanese to Romaji',
+                  subtitle: 'Auto-convert Hiragana/Katakana lyrics',
+                  value: settings.convertLyricsToRomaji,
+                  onChanged: (v) => ref.read(settingsProvider.notifier).setConvertLyricsToRomaji(v),
+                  showDivider: false,
+                ),
+              ],
             ),
-          ])),
+          ),
 
           // App section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'App')),
+          const SliverToBoxAdapter(child: SettingsSectionHeader(title: 'App')),
           SliverToBoxAdapter(
-            child: SwitchListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              secondary: Icon(Icons.system_update, color: colorScheme.onSurfaceVariant),
-              title: const Text('Check for Updates'),
-              subtitle: const Text('Notify when new version is available'),
-              value: settings.checkForUpdates,
-              onChanged: (v) => ref.read(settingsProvider.notifier).setCheckForUpdates(v),
+            child: SettingsGroup(
+              children: [
+                SettingsSwitchItem(
+                  icon: Icons.system_update,
+                  title: 'Check for Updates',
+                  subtitle: 'Notify when new version is available',
+                  value: settings.checkForUpdates,
+                  onChanged: (v) => ref.read(settingsProvider.notifier).setCheckForUpdates(v),
+                  showDivider: false,
+                ),
+              ],
             ),
           ),
 
           // Data section
-          SliverToBoxAdapter(child: _SectionHeader(title: 'Data')),
+          const SliverToBoxAdapter(child: SettingsSectionHeader(title: 'Data')),
           SliverToBoxAdapter(
-            child: ListTile(
-              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-              leading: Icon(Icons.delete_forever, color: colorScheme.error),
-              title: const Text('Clear Download History'),
-              subtitle: const Text('Remove all downloaded tracks from history'),
-              onTap: () => _showClearHistoryDialog(context, ref, colorScheme),
+            child: SettingsGroup(
+              children: [
+                SettingsItem(
+                  icon: Icons.delete_forever,
+                  title: 'Clear Download History',
+                  subtitle: 'Remove all downloaded tracks from history',
+                  onTap: () => _showClearHistoryDialog(context, ref, colorScheme),
+                  showDivider: false,
+                ),
+              ],
             ),
           ),
 
@@ -163,35 +182,25 @@ class OptionsSettingsPage extends ConsumerWidget {
   }
 }
 
-class _SectionHeader extends StatelessWidget {
-  final String title;
-  const _SectionHeader({required this.title});
-  @override
-  Widget build(BuildContext context) => Padding(
-    padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
-    child: Text(title, style: Theme.of(context).textTheme.titleSmall?.copyWith(
-      color: Theme.of(context).colorScheme.primary, fontWeight: FontWeight.w600)),
-  );
-}
-
-class _ConcurrentDownloadsSelector extends StatelessWidget {
+class _ConcurrentDownloadsItem extends StatelessWidget {
   final int currentValue;
   final ValueChanged<int> onChanged;
-  const _ConcurrentDownloadsSelector({required this.currentValue, required this.onChanged});
+  const _ConcurrentDownloadsItem({required this.currentValue, required this.onChanged});
 
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 24),
+      padding: const EdgeInsets.all(20),
       child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
         Row(children: [
-          Icon(Icons.download_for_offline, color: colorScheme.onSurfaceVariant),
+          Icon(Icons.download_for_offline, color: colorScheme.onSurfaceVariant, size: 24),
           const SizedBox(width: 16),
           Expanded(child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-            const Text('Concurrent Downloads'),
+            Text('Concurrent Downloads', style: Theme.of(context).textTheme.bodyLarge),
+            const SizedBox(height: 2),
             Text(currentValue == 1 ? 'Sequential (1 at a time)' : '$currentValue parallel downloads',
-              style: Theme.of(context).textTheme.bodySmall?.copyWith(color: colorScheme.onSurfaceVariant)),
+              style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant)),
           ])),
         ]),
         const SizedBox(height: 16),
@@ -223,9 +232,15 @@ class _ConcurrentChip extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    
+    final unselectedColor = isDark 
+        ? Color.alphaBlend(Colors.white.withValues(alpha: 0.05), colorScheme.surface)
+        : colorScheme.surfaceContainerHigh;
+    
     return Expanded(
       child: Material(
-        color: isSelected ? colorScheme.primaryContainer : colorScheme.surfaceContainerHighest,
+        color: isSelected ? colorScheme.primaryContainer : unselectedColor,
         borderRadius: BorderRadius.circular(12),
         child: InkWell(
           onTap: onTap,

lib/screens/settings/settings_tab.dart

@@ -5,6 +5,7 @@ import 'package:spotiflac_android/screens/settings/appearance_settings_page.dart
 import 'package:spotiflac_android/screens/settings/download_settings_page.dart';
 import 'package:spotiflac_android/screens/settings/options_settings_page.dart';
 import 'package:spotiflac_android/screens/settings/about_page.dart';
+import 'package:spotiflac_android/widgets/settings_group.dart';
 
 class SettingsTab extends ConsumerWidget {
   const SettingsTab({super.key});
@@ -15,9 +16,9 @@ class SettingsTab extends ConsumerWidget {
 
     return CustomScrollView(
       slivers: [
-        // Collapsing App Bar - Simplified for performance
+        // Collapsing App Bar
         SliverAppBar(
-          expandedHeight: 100,
+          expandedHeight: 130,
           collapsedHeight: kToolbarHeight,
           floating: false,
           pinned: true,
@@ -25,12 +26,12 @@ class SettingsTab extends ConsumerWidget {
           surfaceTintColor: Colors.transparent,
           automaticallyImplyLeading: false,
           flexibleSpace: FlexibleSpaceBar(
-            expandedTitleScale: 1.4,
+            expandedTitleScale: 1.3,
             titlePadding: const EdgeInsets.only(left: 24, bottom: 16),
             title: Text(
               'Settings',
               style: TextStyle(
-                fontSize: 20,
+                fontSize: 28,
                 fontWeight: FontWeight.bold,
                 color: colorScheme.onSurface,
               ),
@@ -38,35 +39,50 @@ class SettingsTab extends ConsumerWidget {
           ),
         ),
 
-        // Menu items
-        SliverList(delegate: SliverChildListDelegate([
-          _SettingsMenuItem(
-            icon: Icons.palette_outlined,
-            title: 'Appearance',
-            subtitle: 'Theme, colors, display',
-            onTap: () => _navigateTo(context, const AppearanceSettingsPage()),
+        // First group: Appearance & Download
+        SliverToBoxAdapter(
+          child: SettingsGroup(
+            margin: const EdgeInsets.fromLTRB(16, 16, 16, 4),
+            children: [
+              SettingsItem(
+                icon: Icons.palette_outlined,
+                title: 'Appearance',
+                subtitle: 'Theme, colors, display',
+                onTap: () => _navigateTo(context, const AppearanceSettingsPage()),
+              ),
+              SettingsItem(
+                icon: Icons.download_outlined,
+                title: 'Download',
+                subtitle: 'Service, quality, filename format',
+                onTap: () => _navigateTo(context, const DownloadSettingsPage()),
+              ),
+              SettingsItem(
+                icon: Icons.tune_outlined,
+                title: 'Options',
+                subtitle: 'Fallback, lyrics, cover art, updates',
+                onTap: () => _navigateTo(context, const OptionsSettingsPage()),
+                showDivider: false,
+              ),
+            ],
           ),
-          _SettingsMenuItem(
-            icon: Icons.download_outlined,
-            title: 'Download',
-            subtitle: 'Service, quality, filename format',
-            onTap: () => _navigateTo(context, const DownloadSettingsPage()),
+        ),
+
+        // Second group: About
+        SliverToBoxAdapter(
+          child: SettingsGroup(
+            children: [
+              SettingsItem(
+                icon: Icons.info_outline,
+                title: 'About',
+                subtitle: 'Version ${AppInfo.version}, credits, GitHub',
+                onTap: () => _navigateTo(context, const AboutPage()),
+                showDivider: false,
+              ),
+            ],
           ),
-          _SettingsMenuItem(
-            icon: Icons.tune_outlined,
-            title: 'Options',
-            subtitle: 'Fallback, lyrics, cover art, updates',
-            onTap: () => _navigateTo(context, const OptionsSettingsPage()),
-          ),
-          _SettingsMenuItem(
-            icon: Icons.info_outline,
-            title: 'About',
-            subtitle: 'Version ${AppInfo.version}, credits, GitHub',
-            onTap: () => _navigateTo(context, const AboutPage()),
-          ),
-        ])),
+        ),
         
-        // Fill remaining space to enable scroll
+        // Fill remaining space
         const SliverFillRemaining(hasScrollBody: false, child: SizedBox()),
       ],
     );
@@ -76,37 +92,3 @@ class SettingsTab extends ConsumerWidget {
     Navigator.of(context).push(MaterialPageRoute(builder: (_) => page));
   }
 }
-
-class _SettingsMenuItem extends StatelessWidget {
-  final IconData icon;
-  final String title;
-  final String subtitle;
-  final VoidCallback onTap;
-
-  const _SettingsMenuItem({required this.icon, required this.title, required this.subtitle, required this.onTap});
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    return InkWell(
-      onTap: onTap,
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
-        child: Row(children: [
-          Container(
-            width: 44, height: 44,
-            decoration: BoxDecoration(color: colorScheme.surfaceContainerHighest, borderRadius: BorderRadius.circular(12)),
-            child: Icon(icon, color: colorScheme.onSurfaceVariant, size: 22),
-          ),
-          const SizedBox(width: 16),
-          Expanded(child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-            Text(title, style: Theme.of(context).textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w500)),
-            const SizedBox(height: 2),
-            Text(subtitle, style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant)),
-          ])),
-          Icon(Icons.chevron_right, color: colorScheme.onSurfaceVariant, size: 24),
-        ]),
-      ),
-    );
-  }
-}

lib/screens/settings_screen.dart

@@ -194,7 +194,7 @@ class SettingsScreen extends ConsumerWidget {
       builder: (context) => AlertDialog(
         title: Row(
           children: [
-            Image.asset('assets/images/logo.png', width: 40, height: 40, errorBuilder: (_, __, ___) => Icon(Icons.music_note, size: 40, color: colorScheme.primary)),
+            Image.asset('assets/images/logo.png', width: 40, height: 40, errorBuilder: (_, _, _) => Icon(Icons.music_note, size: 40, color: colorScheme.primary)),
             const SizedBox(width: 12),
             Text(AppInfo.appName),
           ],

lib/screens/settings_tab.dart

@@ -203,7 +203,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with AutomaticKeepAli
       builder: (context) => AlertDialog(
         title: Row(
           children: [
-            Image.asset('assets/images/logo.png', width: 40, height: 40, errorBuilder: (_, __, ___) => Icon(Icons.music_note, size: 40, color: colorScheme.primary)),
+            Image.asset('assets/images/logo.png', width: 40, height: 40, errorBuilder: (_, _, _) => Icon(Icons.music_note, size: 40, color: colorScheme.primary)),
             const SizedBox(width: 12),
             Text(AppInfo.appName),
           ],

lib/screens/track_metadata_screen.dart

@@ -5,6 +5,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:open_filex/open_filex.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'package:share_plus/share_plus.dart';
 import 'package:spotiflac_android/providers/download_queue_provider.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
 
@@ -191,7 +192,7 @@ class _TrackMetadataScreenState extends ConsumerState<TrackMetadataScreen> {
                       ? CachedNetworkImage(
                           imageUrl: item.coverUrl!,
                           fit: BoxFit.cover,
-                          placeholder: (_, __) => Container(
+                          placeholder: (_, _) => Container(
                             color: colorScheme.surfaceContainerHighest,
                             child: Icon(
                               Icons.music_note,
@@ -854,7 +855,7 @@ class _TrackMetadataScreenState extends ConsumerState<TrackMetadataScreen> {
               title: const Text('Share'),
               onTap: () {
                 Navigator.pop(context);
-                // TODO: Implement share
+                _shareFile(context);
               },
             ),
             ListTile(
@@ -926,6 +927,25 @@ class _TrackMetadataScreenState extends ConsumerState<TrackMetadataScreen> {
     );
   }
 
+  Future<void> _shareFile(BuildContext context) async {
+    final file = File(item.filePath);
+    if (!await file.exists()) {
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('File not found')),
+        );
+      }
+      return;
+    }
+    
+    await SharePlus.instance.share(
+      ShareParams(
+        files: [XFile(item.filePath)],
+        text: '${item.trackName} - ${item.artistName}',
+      ),
+    );
+  }
+
   String _formatFullDate(DateTime date) {
     final months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 
                     'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];

lib/services/apk_downloader.dart

@@ -2,6 +2,9 @@ import 'dart:io';
 import 'package:http/http.dart' as http;
 import 'package:path_provider/path_provider.dart';
 import 'package:open_filex/open_filex.dart';
+import 'package:spotiflac_android/utils/logger.dart';
+
+final _log = AppLogger('ApkDownloader');
 
 typedef ProgressCallback = void Function(int received, int total);
 
@@ -11,13 +14,22 @@ class ApkDownloader {
     required String version,
     ProgressCallback? onProgress,
   }) async {
+    // Validate URL for security
+    final uri = Uri.tryParse(url);
+    if (uri == null || uri.scheme != 'https') {
+      _log.e('Refusing to download from invalid or non-HTTPS URL');
+      return null;
+    }
+
+    final client = http.Client();
+    IOSink? sink;
+    
     try {
-      final client = http.Client();
-      final request = http.Request('GET', Uri.parse(url));
+      final request = http.Request('GET', uri);
       final response = await client.send(request);
 
       if (response.statusCode != 200) {
-        print('[ApkDownloader] Failed to download: ${response.statusCode}');
+        _log.e('Failed to download: ${response.statusCode}');
         return null;
       }
 
@@ -26,7 +38,7 @@ class ApkDownloader {
       // Get download directory
       final dir = await getExternalStorageDirectory();
       if (dir == null) {
-        print('[ApkDownloader] Could not get storage directory');
+        _log.e('Could not get storage directory');
         return null;
       }
 
@@ -38,7 +50,7 @@ class ApkDownloader {
         await file.delete();
       }
 
-      final sink = file.openWrite();
+      sink = file.openWrite();
       int received = 0;
 
       await for (final chunk in response.stream) {
@@ -47,23 +59,24 @@ class ApkDownloader {
         onProgress?.call(received, contentLength);
       }
 
-      await sink.close();
-      client.close();
-
-      print('[ApkDownloader] Downloaded to: $filePath');
+      await sink.flush();
+      _log.i('Downloaded to: $filePath');
       return filePath;
     } catch (e) {
-      print('[ApkDownloader] Error: $e');
+      _log.e('Error: $e');
       return null;
+    } finally {
+      await sink?.close();
+      client.close();
     }
   }
 
   static Future<void> installApk(String filePath) async {
     try {
       final result = await OpenFilex.open(filePath);
-      print('[ApkDownloader] Open result: ${result.type} - ${result.message}');
+      _log.i('Open result: ${result.type} - ${result.message}');
     } catch (e) {
-      print('[ApkDownloader] Install error: $e');
+      _log.e('Install error: $e');
     }
   }
 }

lib/services/ffmpeg_service.dart

@@ -1,6 +1,9 @@
 import 'dart:io';
 import 'package:ffmpeg_kit_flutter_new_audio/ffmpeg_kit.dart';
 import 'package:ffmpeg_kit_flutter_new_audio/return_code.dart';
+import 'package:spotiflac_android/utils/logger.dart';
+
+final _log = AppLogger('FFmpeg');
 
 /// FFmpeg service for audio conversion and remuxing
 class FFmpegService {
@@ -27,7 +30,7 @@ class FFmpegService {
     // Log error for debugging
     final logs = await session.getLogs();
     for (final log in logs) {
-      print('[FFmpeg] ${log.getMessage()}');
+      _log.d(log.getMessage());
     }
 
     return null;

lib/services/notification_service.dart

@@ -98,6 +98,49 @@ class NotificationService {
     );
   }
 
+  Future<void> showDownloadFinalizing({
+    required String trackName,
+    required String artistName,
+  }) async {
+    if (!_isInitialized) await initialize();
+
+    final androidDetails = AndroidNotificationDetails(
+      channelId,
+      channelName,
+      channelDescription: channelDescription,
+      importance: Importance.low,
+      priority: Priority.low,
+      showProgress: true,
+      maxProgress: 100,
+      progress: 100,
+      indeterminate: false,
+      ongoing: true,
+      autoCancel: false,
+      playSound: false,
+      enableVibration: false,
+      onlyAlertOnce: true,
+      icon: '@mipmap/ic_launcher',
+    );
+
+    const iosDetails = DarwinNotificationDetails(
+      presentAlert: false,
+      presentBadge: false,
+      presentSound: false,
+    );
+
+    final details = NotificationDetails(
+      android: androidDetails,
+      iOS: iosDetails,
+    );
+
+    await _notifications.show(
+      downloadProgressId,
+      'Finalizing $trackName',
+      '$artistName • Embedding metadata...',
+      details,
+    );
+  }
+
   Future<void> showDownloadComplete({
     required String trackName,
     required String artistName,

lib/services/platform_bridge.dart

@@ -26,6 +26,16 @@ class PlatformBridge {
     return jsonDecode(result as String) as Map<String, dynamic>;
   }
 
+  /// Search Spotify for tracks and artists
+  static Future<Map<String, dynamic>> searchSpotifyAll(String query, {int trackLimit = 15, int artistLimit = 3}) async {
+    final result = await _channel.invokeMethod('searchSpotifyAll', {
+      'query': query,
+      'track_limit': trackLimit,
+      'artist_limit': artistLimit,
+    });
+    return jsonDecode(result as String) as Map<String, dynamic>;
+  }
+
   /// Check track availability on streaming services
   static Future<Map<String, dynamic>> checkAvailability(String spotifyId, String isrc) async {
     final result = await _channel.invokeMethod('checkAvailability', {
@@ -234,4 +244,45 @@ class PlatformBridge {
   static Future<void> cleanupConnections() async {
     await _channel.invokeMethod('cleanupConnections');
   }
+
+  /// Start foreground download service to keep downloads running in background
+  static Future<void> startDownloadService({
+    String trackName = '',
+    String artistName = '',
+    int queueCount = 0,
+  }) async {
+    await _channel.invokeMethod('startDownloadService', {
+      'track_name': trackName,
+      'artist_name': artistName,
+      'queue_count': queueCount,
+    });
+  }
+
+  /// Stop foreground download service
+  static Future<void> stopDownloadService() async {
+    await _channel.invokeMethod('stopDownloadService');
+  }
+
+  /// Update download service notification progress
+  static Future<void> updateDownloadServiceProgress({
+    required String trackName,
+    required String artistName,
+    required int progress,
+    required int total,
+    required int queueCount,
+  }) async {
+    await _channel.invokeMethod('updateDownloadServiceProgress', {
+      'track_name': trackName,
+      'artist_name': artistName,
+      'progress': progress,
+      'total': total,
+      'queue_count': queueCount,
+    });
+  }
+
+  /// Check if download service is running
+  static Future<bool> isDownloadServiceRunning() async {
+    final result = await _channel.invokeMethod('isDownloadServiceRunning');
+    return result as bool;
+  }
 }

lib/services/share_intent_service.dart

@@ -1,5 +1,8 @@
 import 'dart:async';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
+import 'package:spotiflac_android/utils/logger.dart';
+
+final _log = AppLogger('ShareIntent');
 
 /// Service to handle incoming share intents from other apps (e.g., Spotify)
 class ShareIntentService {
@@ -30,7 +33,7 @@ class ShareIntentService {
     // Listen to media sharing coming from outside the app while the app is in memory
     _mediaSubscription = ReceiveSharingIntent.instance.getMediaStream().listen(
       _handleSharedMedia,
-      onError: (err) => print('[ShareIntent] Error: $err'),
+      onError: (err) => _log.e('Error: $err'),
     );
 
     // Get the media sharing coming from outside the app while the app is closed
@@ -49,7 +52,7 @@ class ShareIntentService {
       
       final url = _extractSpotifyUrl(textToCheck);
       if (url != null) {
-        print('[ShareIntent] Received Spotify URL: $url (initial: $isInitial)');
+        _log.i('Received Spotify URL: $url (initial: $isInitial)');
         if (isInitial) {
           // Store for later - listener might not be ready yet
           _pendingUrl = url;

lib/services/update_checker.dart

@@ -2,12 +2,15 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:http/http.dart' as http;
 import 'package:spotiflac_android/constants/app_info.dart';
+import 'package:spotiflac_android/utils/logger.dart';
+
+final _log = AppLogger('UpdateChecker');
 
 class UpdateInfo {
   final String version;
   final String changelog;
   final String downloadUrl;
-  final String? apkDownloadUrl; // Direct APK download URL
+  final String? apkDownloadUrl;
   final DateTime publishedAt;
 
   const UpdateInfo({
@@ -22,20 +25,16 @@ class UpdateInfo {
 class UpdateChecker {
   static const String _apiUrl = 'https://api.github.com/repos/${AppInfo.githubRepo}/releases/latest';
 
-  /// Get device CPU architecture
   static Future<String> _getDeviceArch() async {
     if (!Platform.isAndroid) return 'unknown';
     
     try {
-      // Read CPU info from /proc/cpuinfo
       final cpuInfo = await File('/proc/cpuinfo').readAsString();
       
-      // Check for 64-bit indicators
       if (cpuInfo.contains('AArch64') || cpuInfo.contains('aarch64')) {
         return 'arm64';
       }
       
-      // Check architecture from uname
       final result = await Process.run('uname', ['-m']);
       final arch = result.stdout.toString().trim().toLowerCase();
       
@@ -49,14 +48,13 @@ class UpdateChecker {
         return 'x86';
       }
       
-      return 'arm64'; // Default to arm64 for modern devices
+      return 'arm64';
     } catch (e) {
-      print('[UpdateChecker] Error detecting arch: $e');
-      return 'arm64'; // Default fallback
+      _log.e('Error detecting arch: $e');
+      return 'arm64';
     }
   }
 
-  /// Check for updates from GitHub releases
   static Future<UpdateInfo?> checkForUpdate() async {
     try {
       final response = await http.get(
@@ -65,7 +63,7 @@ class UpdateChecker {
       ).timeout(const Duration(seconds: 10));
 
       if (response.statusCode != 200) {
-        print('[UpdateChecker] GitHub API returned ${response.statusCode}');
+        _log.w('GitHub API returned ${response.statusCode}');
         return null;
       }
 
@@ -74,18 +72,16 @@ class UpdateChecker {
       final latestVersion = tagName.replaceFirst('v', '');
       
       if (!_isNewerVersion(latestVersion, AppInfo.version)) {
-        print('[UpdateChecker] No update available (current: ${AppInfo.version}, latest: $latestVersion)');
+        _log.i('No update available (current: ${AppInfo.version}, latest: $latestVersion)');
         return null;
       }
 
-      // Get changelog from release body
       final body = data['body'] as String? ?? 'No changelog available';
       final htmlUrl = data['html_url'] as String? ?? '${AppInfo.githubUrl}/releases';
       final publishedAt = DateTime.tryParse(data['published_at'] as String? ?? '') ?? DateTime.now();
 
-      // Find APK download URL from assets based on device architecture
       final deviceArch = await _getDeviceArch();
-      print('[UpdateChecker] Device architecture: $deviceArch');
+      _log.d('Device architecture: $deviceArch');
       
       String? arm64Url;
       String? arm32Url;
@@ -96,6 +92,12 @@ class UpdateChecker {
         final name = (asset['name'] as String? ?? '').toLowerCase();
         if (name.endsWith('.apk')) {
           final downloadUrl = asset['browser_download_url'] as String?;
+          // Only accept HTTPS URLs for security
+          final uri = downloadUrl != null ? Uri.tryParse(downloadUrl) : null;
+          if (uri == null || uri.scheme != 'https') {
+            _log.w('Skipping non-HTTPS APK URL: $downloadUrl');
+            continue;
+          }
           if (name.contains('arm64') || name.contains('v8a')) {
             arm64Url = downloadUrl;
           } else if (name.contains('arm32') || name.contains('v7a') || name.contains('armeabi')) {
@@ -106,7 +108,6 @@ class UpdateChecker {
         }
       }
       
-      // Select APK based on device architecture
       String? apkUrl;
       if (deviceArch == 'arm64') {
         apkUrl = arm64Url ?? universalUrl ?? arm32Url;
@@ -116,7 +117,7 @@ class UpdateChecker {
         apkUrl = universalUrl ?? arm64Url ?? arm32Url;
       }
 
-      print('[UpdateChecker] Update available: $latestVersion, APK URL: $apkUrl');
+      _log.i('Update available: $latestVersion, APK URL: $apkUrl');
       
       return UpdateInfo(
         version: latestVersion,
@@ -126,18 +127,19 @@ class UpdateChecker {
         publishedAt: publishedAt,
       );
     } catch (e) {
-      print('[UpdateChecker] Error checking for updates: $e');
+      _log.e('Error checking for updates: $e');
       return null;
     }
   }
 
-  /// Compare version strings (e.g., "1.1.1" vs "1.1.0")
   static bool _isNewerVersion(String latest, String current) {
     try {
-      final latestParts = latest.split('.').map(int.parse).toList();
-      final currentParts = current.split('.').map(int.parse).toList();
+      final latestBase = latest.split('-').first;
+      final currentBase = current.split('-').first;
+      
+      final latestParts = latestBase.split('.').map(int.parse).toList();
+      final currentParts = currentBase.split('.').map(int.parse).toList();
 
-      // Pad with zeros if needed
       while (latestParts.length < 3) {
         latestParts.add(0);
       }
@@ -149,8 +151,15 @@ class UpdateChecker {
         if (latestParts[i] > currentParts[i]) return true;
         if (latestParts[i] < currentParts[i]) return false;
       }
-      return false; // Same version
+      
+      final latestHasSuffix = latest.contains('-');
+      final currentHasSuffix = current.contains('-');
+      
+      if (!latestHasSuffix && currentHasSuffix) return true;
+      
+      return false;
     } catch (e) {
+      _log.e('Error comparing versions: $e');
       return false;
     }
   }

lib/theme/dynamic_color_wrapper.dart

@@ -27,7 +27,6 @@ class DynamicColorWrapper extends ConsumerWidget {
           // Use dynamic colors from wallpaper (Android 12+)
           lightScheme = lightDynamic;
           darkScheme = darkDynamic;
-          debugPrint('Using dynamic color from wallpaper');
         } else {
           // Fallback to seed color
           final seedColor = themeSettings.seedColor;
@@ -39,7 +38,6 @@ class DynamicColorWrapper extends ConsumerWidget {
             seedColor: seedColor,
             brightness: Brightness.dark,
           );
-          debugPrint('Using fallback seed color: ${seedColor.toARGB32().toRadixString(16)}');
         }
 
         // Build themes

lib/utils/logger.dart

@@ -0,0 +1,28 @@
+import 'package:logger/logger.dart';
+
+/// Global logger instance for the app
+/// Uses pretty printer in debug mode for readable output
+final log = Logger(
+  printer: PrettyPrinter(
+    methodCount: 0,
+    errorMethodCount: 5,
+    lineLength: 80,
+    colors: true,
+    printEmojis: false,
+    dateTimeFormat: DateTimeFormat.none,
+  ),
+  level: Level.debug,
+);
+
+/// Logger with class/tag prefix for better traceability
+class AppLogger {
+  final String _tag;
+  
+  AppLogger(this._tag);
+  
+  void d(String message) => log.d('[$_tag] $message');
+  void i(String message) => log.i('[$_tag] $message');
+  void w(String message) => log.w('[$_tag] $message');
+  void e(String message, [Object? error, StackTrace? stackTrace]) => 
+      log.e('[$_tag] $message', error: error, stackTrace: stackTrace);
+}

lib/widgets/settings_group.dart

@@ -0,0 +1,227 @@
+import 'package:flutter/material.dart';
+
+/// A grouped settings card that connects items together like Android Settings
+/// Items are connected with no gap between them, only separated when changing groups
+class SettingsGroup extends StatelessWidget {
+  final List<Widget> children;
+  final EdgeInsetsGeometry? margin;
+
+  const SettingsGroup({
+    super.key,
+    required this.children,
+    this.margin,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    
+    // Use a more contrasting color for cards
+    // In dark mode with dynamic color, surfaceContainerHighest can be too similar to surface
+    // So we add a slight white overlay to make it more visible
+    // In light mode with dynamic color, we add a slight black overlay for the same reason
+    final cardColor = isDark 
+        ? Color.alphaBlend(Colors.white.withValues(alpha: 0.08), colorScheme.surface)
+        : Color.alphaBlend(Colors.black.withValues(alpha: 0.04), colorScheme.surface);
+    
+    return Container(
+      margin: margin ?? const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+      decoration: BoxDecoration(
+        color: cardColor,
+        borderRadius: BorderRadius.circular(20),
+      ),
+      clipBehavior: Clip.antiAlias,
+      child: Material(
+        color: Colors.transparent,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: children,
+        ),
+      ),
+    );
+  }
+}
+
+/// A single settings item that can be used inside SettingsGroup
+class SettingsItem extends StatelessWidget {
+  final IconData? icon;
+  final String title;
+  final String? subtitle;
+  final Widget? trailing;
+  final VoidCallback? onTap;
+  final bool showDivider;
+
+  const SettingsItem({
+    super.key,
+    this.icon,
+    required this.title,
+    this.subtitle,
+    this.trailing,
+    this.onTap,
+    this.showDivider = true,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        InkWell(
+          onTap: onTap,
+          splashColor: colorScheme.primary.withValues(alpha: 0.12),
+          highlightColor: colorScheme.primary.withValues(alpha: 0.08),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
+            child: Row(
+              children: [
+                if (icon != null) ...[
+                  Icon(icon, color: colorScheme.onSurfaceVariant, size: 24),
+                  const SizedBox(width: 16),
+                ],
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        title,
+                        style: Theme.of(context).textTheme.bodyLarge,
+                      ),
+                      if (subtitle != null) ...[
+                        const SizedBox(height: 2),
+                        Text(
+                          subtitle!,
+                          style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                            color: colorScheme.onSurfaceVariant,
+                          ),
+                        ),
+                      ],
+                    ],
+                  ),
+                ),
+                if (trailing != null) ...[
+                  const SizedBox(width: 8),
+                  trailing!,
+                ] else if (onTap != null) ...[
+                  const SizedBox(width: 8),
+                  Icon(Icons.chevron_right, color: colorScheme.onSurfaceVariant),
+                ],
+              ],
+            ),
+          ),
+        ),
+        if (showDivider)
+          Divider(
+            height: 1,
+            thickness: 1,
+            indent: icon != null ? 56 : 20,
+            endIndent: 20,
+            color: colorScheme.outlineVariant.withValues(alpha: 0.3),
+          ),
+      ],
+    );
+  }
+}
+
+/// A switch settings item for SettingsGroup
+class SettingsSwitchItem extends StatelessWidget {
+  final IconData? icon;
+  final String title;
+  final String? subtitle;
+  final bool value;
+  final ValueChanged<bool>? onChanged;
+  final bool showDivider;
+
+  const SettingsSwitchItem({
+    super.key,
+    this.icon,
+    required this.title,
+    this.subtitle,
+    required this.value,
+    this.onChanged,
+    this.showDivider = true,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        InkWell(
+          onTap: onChanged != null ? () => onChanged!(!value) : null,
+          splashColor: colorScheme.primary.withValues(alpha: 0.12),
+          highlightColor: colorScheme.primary.withValues(alpha: 0.08),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+            child: Row(
+              children: [
+                if (icon != null) ...[
+                  Icon(icon, color: colorScheme.onSurfaceVariant, size: 24),
+                  const SizedBox(width: 16),
+                ],
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        title,
+                        style: Theme.of(context).textTheme.bodyLarge,
+                      ),
+                      if (subtitle != null) ...[
+                        const SizedBox(height: 2),
+                        Text(
+                          subtitle!,
+                          style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                            color: colorScheme.onSurfaceVariant,
+                          ),
+                        ),
+                      ],
+                    ],
+                  ),
+                ),
+                const SizedBox(width: 8),
+                Switch(
+                  value: value,
+                  onChanged: onChanged,
+                ),
+              ],
+            ),
+          ),
+        ),
+        if (showDivider)
+          Divider(
+            height: 1,
+            thickness: 1,
+            indent: icon != null ? 56 : 20,
+            endIndent: 20,
+            color: colorScheme.outlineVariant.withValues(alpha: 0.3),
+          ),
+      ],
+    );
+  }
+}
+
+/// Section header for settings groups
+class SettingsSectionHeader extends StatelessWidget {
+  final String title;
+
+  const SettingsSectionHeader({super.key, required this.title});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(32, 24, 32, 8),
+      child: Text(
+        title,
+        style: Theme.of(context).textTheme.titleSmall?.copyWith(
+          color: Theme.of(context).colorScheme.primary,
+          fontWeight: FontWeight.w600,
+        ),
+      ),
+    );
+  }
+}

lib/widgets/update_dialog.dart

@@ -69,6 +69,9 @@ class _UpdateDialogState extends State<UpdateDialog> {
     );
 
     if (filePath != null) {
+      // Cancel progress notification first
+      await notificationService.cancelUpdateNotification();
+      
       await notificationService.showUpdateDownloadComplete(
         version: widget.updateInfo.version,
       );
@@ -80,6 +83,9 @@ class _UpdateDialogState extends State<UpdateDialog> {
       // Open APK for installation
       await ApkDownloader.installApk(filePath);
     } else {
+      // Cancel progress notification first
+      await notificationService.cancelUpdateNotification();
+      
       await notificationService.showUpdateDownloadFailed();
       
       if (mounted) {
@@ -98,129 +104,202 @@ class _UpdateDialogState extends State<UpdateDialog> {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
+    final isDark = Theme.of(context).brightness == Brightness.dark;
     
-    return AlertDialog(
-      title: Row(
-        children: [
-          Icon(Icons.system_update, color: colorScheme.primary),
-          const SizedBox(width: 12),
-          const Text('Update Available'),
-        ],
-      ),
-      content: SizedBox(
-        width: double.maxFinite,
+    return Dialog(
+      backgroundColor: colorScheme.surfaceContainerHigh,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(28)),
+      child: Padding(
+        padding: const EdgeInsets.all(24),
         child: Column(
           mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            // Version info
+            // Header with icon
+            Row(
+              children: [
+                Container(
+                  padding: const EdgeInsets.all(12),
+                  decoration: BoxDecoration(
+                    color: colorScheme.primaryContainer,
+                    borderRadius: BorderRadius.circular(16),
+                  ),
+                  child: Icon(Icons.system_update_rounded, color: colorScheme.onPrimaryContainer, size: 28),
+                ),
+                const SizedBox(width: 16),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text('Update Available', style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold)),
+                      const SizedBox(height: 2),
+                      Text('A new version is ready', style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: colorScheme.onSurfaceVariant)),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 20),
+            
+            // Version badge
             Container(
-              padding: const EdgeInsets.all(12),
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
               decoration: BoxDecoration(
-                color: colorScheme.primaryContainer,
-                borderRadius: BorderRadius.circular(12),
+                color: isDark 
+                    ? Color.alphaBlend(Colors.white.withValues(alpha: 0.08), colorScheme.surface)
+                    : Color.alphaBlend(Colors.black.withValues(alpha: 0.04), colorScheme.surface),
+                borderRadius: BorderRadius.circular(16),
+                border: Border.all(color: colorScheme.outlineVariant.withValues(alpha: 0.5)),
               ),
               child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  Text(
-                    'v${AppInfo.version}',
-                    style: TextStyle(color: colorScheme.onPrimaryContainer),
-                  ),
-                  const SizedBox(width: 8),
-                  Icon(Icons.arrow_forward, size: 16, color: colorScheme.onPrimaryContainer),
-                  const SizedBox(width: 8),
-                  Text(
-                    'v${widget.updateInfo.version}',
-                    style: TextStyle(
-                      color: colorScheme.onPrimaryContainer,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
+                  _VersionChip(version: AppInfo.version, label: 'Current', colorScheme: colorScheme),
+                  const SizedBox(width: 12),
+                  Icon(Icons.arrow_forward_rounded, size: 20, color: colorScheme.primary),
+                  const SizedBox(width: 12),
+                  _VersionChip(version: widget.updateInfo.version, label: 'New', colorScheme: colorScheme, isNew: true),
                 ],
               ),
             ),
-            const SizedBox(height: 16),
+            const SizedBox(height: 20),
             
-            // Changelog header
-            Text(
-              'What\'s New:',
-              style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-            const SizedBox(height: 8),
-            
-            // Changelog content (scrollable) - hide when downloading
-            if (!_isDownloading)
-              Flexible(
-                child: Container(
-                  constraints: const BoxConstraints(maxHeight: 200),
-                  decoration: BoxDecoration(
-                    color: colorScheme.surfaceContainerHighest,
-                    borderRadius: BorderRadius.circular(8),
-                  ),
-                  child: SingleChildScrollView(
-                    padding: const EdgeInsets.all(12),
-                    child: Text(
-                      _formatChangelog(widget.updateInfo.changelog),
-                      style: Theme.of(context).textTheme.bodySmall,
+            // Download progress (when downloading)
+            if (_isDownloading) ...[
+              Container(
+                padding: const EdgeInsets.all(16),
+                decoration: BoxDecoration(
+                  color: isDark 
+                      ? Color.alphaBlend(Colors.white.withValues(alpha: 0.05), colorScheme.surface)
+                      : Color.alphaBlend(Colors.black.withValues(alpha: 0.03), colorScheme.surface),
+                  borderRadius: BorderRadius.circular(16),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        SizedBox(
+                          width: 20, height: 20,
+                          child: CircularProgressIndicator(strokeWidth: 2, color: colorScheme.primary),
+                        ),
+                        const SizedBox(width: 12),
+                        Text('Downloading...', style: Theme.of(context).textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w600)),
+                      ],
                     ),
+                    const SizedBox(height: 12),
+                    ClipRRect(
+                      borderRadius: BorderRadius.circular(4),
+                      child: LinearProgressIndicator(
+                        value: _progress,
+                        minHeight: 6,
+                        backgroundColor: colorScheme.surfaceContainerHighest,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Text(_statusText, style: Theme.of(context).textTheme.bodySmall?.copyWith(color: colorScheme.onSurfaceVariant)),
+                        Text('${(_progress * 100).toInt()}%', style: Theme.of(context).textTheme.bodySmall?.copyWith(color: colorScheme.primary, fontWeight: FontWeight.w600)),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            ] else ...[
+              // Changelog section
+              Text("What's New", style: Theme.of(context).textTheme.titleSmall?.copyWith(fontWeight: FontWeight.bold)),
+              const SizedBox(height: 8),
+              Container(
+                constraints: const BoxConstraints(maxHeight: 180),
+                decoration: BoxDecoration(
+                  color: isDark 
+                      ? Color.alphaBlend(Colors.white.withValues(alpha: 0.05), colorScheme.surface)
+                      : Color.alphaBlend(Colors.black.withValues(alpha: 0.03), colorScheme.surface),
+                  borderRadius: BorderRadius.circular(16),
+                ),
+                child: SingleChildScrollView(
+                  padding: const EdgeInsets.all(16),
+                  child: Text(
+                    _formatChangelog(widget.updateInfo.changelog),
+                    style: Theme.of(context).textTheme.bodySmall?.copyWith(height: 1.5),
                   ),
                 ),
               ),
-            
-            // Download progress
-            if (_isDownloading) ...[
-              const SizedBox(height: 8),
-              LinearProgressIndicator(value: _progress),
-              const SizedBox(height: 8),
-              Text(
-                _statusText,
-                style: Theme.of(context).textTheme.bodySmall,
-              ),
             ],
+            const SizedBox(height: 24),
+            
+            // Action buttons
+            if (_isDownloading)
+              SizedBox(
+                width: double.infinity,
+                child: OutlinedButton(
+                  onPressed: () => Navigator.pop(context),
+                  style: OutlinedButton.styleFrom(
+                    padding: const EdgeInsets.symmetric(vertical: 12),
+                    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+                  ),
+                  child: const Text('Cancel'),
+                ),
+              )
+            else
+              Column(
+                children: [
+                  SizedBox(
+                    width: double.infinity,
+                    child: FilledButton.icon(
+                      onPressed: _downloadAndInstall,
+                      icon: const Icon(Icons.download_rounded, size: 20),
+                      label: const Text('Download & Install'),
+                      style: FilledButton.styleFrom(
+                        padding: const EdgeInsets.symmetric(vertical: 14),
+                        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+                      ),
+                    ),
+                  ),
+                  const SizedBox(height: 8),
+                  Row(
+                    children: [
+                      Expanded(
+                        child: TextButton(
+                          onPressed: () {
+                            widget.onDisableUpdates();
+                            Navigator.pop(context);
+                          },
+                          style: TextButton.styleFrom(
+                            padding: const EdgeInsets.symmetric(vertical: 12),
+                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+                          ),
+                          child: Text("Don't remind", style: TextStyle(color: colorScheme.onSurfaceVariant)),
+                        ),
+                      ),
+                      const SizedBox(width: 8),
+                      Expanded(
+                        child: OutlinedButton(
+                          onPressed: () {
+                            widget.onDismiss();
+                            Navigator.pop(context);
+                          },
+                          style: OutlinedButton.styleFrom(
+                            padding: const EdgeInsets.symmetric(vertical: 12),
+                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+                          ),
+                          child: const Text('Later'),
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
           ],
         ),
       ),
-      actions: _isDownloading
-          ? [
-              TextButton(
-                onPressed: () => Navigator.pop(context),
-                child: const Text('Cancel'),
-              ),
-            ]
-          : [
-              // Don't remind again button
-              TextButton(
-                onPressed: () {
-                  widget.onDisableUpdates();
-                  Navigator.pop(context);
-                },
-                child: Text(
-                  'Don\'t remind',
-                  style: TextStyle(color: colorScheme.onSurfaceVariant),
-                ),
-              ),
-              // Later button
-              TextButton(
-                onPressed: () {
-                  widget.onDismiss();
-                  Navigator.pop(context);
-                },
-                child: const Text('Later'),
-              ),
-              // Download button
-              FilledButton(
-                onPressed: _downloadAndInstall,
-                child: const Text('Install'),
-              ),
-            ],
     );
   }
 
   /// Format changelog - clean up markdown and extract relevant content
   String _formatChangelog(String changelog) {
-    // Try to extract just the changelog section (between "What's New" and "Downloads" or "---")
     var content = changelog;
     
     // Find content after "What's New" header
@@ -238,19 +317,18 @@ class _UpdateDialogState extends State<UpdateDialog> {
     // Process line by line for better formatting
     final lines = content.split('\n');
     final formattedLines = <String>[];
-    String? currentSection;
     
     for (var line in lines) {
       line = line.trim();
       if (line.isEmpty) continue;
       
-      // Check if it's a section header (### Added, ### Fixed, etc.)
+      // Check if it's a section header
       final sectionMatch = RegExp(r'^#{1,3}\s*(.+)$').firstMatch(line);
       if (sectionMatch != null) {
-        currentSection = sectionMatch.group(1)?.trim();
-        if (currentSection != null && currentSection.isNotEmpty) {
+        final section = sectionMatch.group(1)?.trim();
+        if (section != null && section.isNotEmpty) {
           if (formattedLines.isNotEmpty) formattedLines.add('');
-          formattedLines.add('$currentSection:');
+          formattedLines.add(section);
         }
         continue;
       }
@@ -259,36 +337,23 @@ class _UpdateDialogState extends State<UpdateDialog> {
       final listMatch = RegExp(r'^[-*]\s+(.+)$').firstMatch(line);
       if (listMatch != null) {
         var itemText = listMatch.group(1) ?? '';
-        // Remove bold markdown
-        itemText = itemText.replaceAllMapped(
-          RegExp(r'\*\*([^*]+)\*\*'), 
-          (m) => m.group(1) ?? ''
-        );
-        // Remove code markdown
-        itemText = itemText.replaceAllMapped(
-          RegExp(r'`([^`]+)`'), 
-          (m) => m.group(1) ?? ''
-        );
+        itemText = itemText.replaceAllMapped(RegExp(r'\*\*([^*]+)\*\*'), (m) => m.group(1) ?? '');
+        itemText = itemText.replaceAllMapped(RegExp(r'`([^`]+)`'), (m) => m.group(1) ?? '');
         formattedLines.add('• $itemText');
         continue;
       }
       
-      // Check if it's a sub-item (indented list)
+      // Check if it's a sub-item
       final subListMatch = RegExp(r'^\s+[-*]\s+(.+)$').firstMatch(line);
       if (subListMatch != null) {
         var itemText = subListMatch.group(1) ?? '';
-        itemText = itemText.replaceAllMapped(
-          RegExp(r'\*\*([^*]+)\*\*'), 
-          (m) => m.group(1) ?? ''
-        );
+        itemText = itemText.replaceAllMapped(RegExp(r'\*\*([^*]+)\*\*'), (m) => m.group(1) ?? '');
         formattedLines.add('  - $itemText');
         continue;
       }
     }
     
     var formatted = formattedLines.join('\n').trim();
-    
-    // Limit length
     if (formatted.length > 2000) {
       formatted = '${formatted.substring(0, 2000)}...';
     }
@@ -297,6 +362,44 @@ class _UpdateDialogState extends State<UpdateDialog> {
   }
 }
 
+class _VersionChip extends StatelessWidget {
+  final String version;
+  final String label;
+  final ColorScheme colorScheme;
+  final bool isNew;
+
+  const _VersionChip({
+    required this.version,
+    required this.label,
+    required this.colorScheme,
+    this.isNew = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Text(label, style: Theme.of(context).textTheme.labelSmall?.copyWith(color: colorScheme.onSurfaceVariant)),
+        const SizedBox(height: 4),
+        Container(
+          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+          decoration: BoxDecoration(
+            color: isNew ? colorScheme.primaryContainer : colorScheme.surfaceContainerHighest,
+            borderRadius: BorderRadius.circular(20),
+          ),
+          child: Text(
+            'v$version',
+            style: Theme.of(context).textTheme.labelLarge?.copyWith(
+              color: isNew ? colorScheme.onPrimaryContainer : colorScheme.onSurfaceVariant,
+              fontWeight: isNew ? FontWeight.bold : FontWeight.w500,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
 /// Show update dialog
 Future<void> showUpdateDialog(
   BuildContext context, {

pubspec.lock

@@ -5,26 +5,26 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f
+      sha256: c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d
       url: "https://pub.dev"
     source: hosted
-    version: "85.0.0"
+    version: "91.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: f4ad0fea5f102201015c9aae9d93bc02f75dd9491529a8c21f88d17a8523d44c
+      sha256: f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08
       url: "https://pub.dev"
     source: hosted
-    version: "7.6.0"
+    version: "8.4.1"
   analyzer_buffer:
     dependency: transitive
     description:
       name: analyzer_buffer
-      sha256: f7833bee67c03c37241c67f8741b17cc501b69d9758df7a5a4a13ed6c947be43
+      sha256: aba2f75e63b3135fd1efaa8b6abefe1aa6e41b6bd9806221620fa48f98156033
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.10"
+    version: "0.1.11"
   archive:
     dependency: transitive
     description:
@@ -61,18 +61,18 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "7174c5d84b0fed00a1f5e7543597b35d67560465ae3d909f0889b8b20419d5e3"
+      sha256: c1668065e9ba04752570ad7e038288559d1e2ca5c6d0131c0f5f55e39e777413
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "4.0.3"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33"
+      sha256: "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.0"
   build_daemon:
     dependency: transitive
     description:
@@ -81,30 +81,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.1"
-  build_resolvers:
-    dependency: transitive
-    description:
-      name: build_resolvers
-      sha256: "82730bf3d9043366ba8c02e4add05842a10739899520a6a22ddbd22d333bd5bb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "32c6b3d172f1f46b7c4df6bc4a47b8d88afb9e505dd4ace4af80b3c37e89832b"
+      sha256: "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
-  build_runner_core:
-    dependency: transitive
-    description:
-      name: build_runner_core
-      sha256: "4b188774b369104ad96c0e4ca2471e5162f0566ce277771b179bed5eabf2d048"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.2.1"
+    version: "2.10.4"
   built_collection:
     dependency: transitive
     description:
@@ -245,10 +229,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb"
+      sha256: a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.3"
   dbus:
     dependency: transitive
     description:
@@ -386,26 +370,34 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: ef41ae901e7529e52934feba19ed82827b11baa67336829564aeab3129460610
+      sha256: "19ffb0a8bb7407875555e5e98d7343a633bb73707bae6c6a5f37c90014077875"
       url: "https://pub.dev"
     source: hosted
-    version: "18.0.1"
+    version: "19.5.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: "8f685642876742c941b29c32030f6f4f6dacd0e4eaecb3efbb187d6a3812ca01"
+      sha256: e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.0"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "6c5b83c86bf819cdb177a9247a3722067dd8cc6313827ce7c77a4b238a26fd52"
+      sha256: "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "9.1.0"
+  flutter_local_notifications_windows:
+    dependency: transitive
+    description:
+      name: flutter_local_notifications_windows
+      sha256: "8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -576,6 +568,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  logger:
+    dependency: "direct main"
+    description:
+      name: logger
+      sha256: a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.2"
   logging:
     dependency: transitive
     description:
@@ -620,10 +620,10 @@ packages:
     dependency: transitive
     description:
       name: mockito
-      sha256: "2314cbe9165bcd16106513df9cf3c3224713087f09723b128928dc11a4379f99"
+      sha256: dac24d461418d363778d53198d9ac0510b9d073869f078450f195766ec48d05e
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.0"
+    version: "5.6.1"
   node_preamble:
     dependency: transitive
     description:
@@ -876,18 +876,18 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da
+      sha256: "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840"
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.4"
+    version: "12.0.1"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
+      sha256: "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.2"
+    version: "6.1.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -985,18 +985,18 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3"
+      sha256: "07b277b67e0096c45196cbddddf2d8c6ffc49342e88bf31d460ce04605ddac75"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "4.1.1"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      sha256: a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca
+      sha256: "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.7"
+    version: "1.3.8"
   source_map_stack_trace:
     dependency: transitive
     description:
@@ -1149,14 +1149,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.10.1"
-  timing:
-    dependency: transitive
-    description:
-      name: timing
-      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
   typed_data:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: spotiflac_android
 description: Download Spotify tracks in FLAC from Tidal, Qobuz & Amazon Music
 publish_to: 'none'
-version: 1.5.5+22
+version: 2.0.0+30
 
 environment:
   sdk: ^3.10.0
@@ -46,21 +46,22 @@ dependencies:
   # Utils
   url_launcher: ^6.3.1
   device_info_plus: ^12.3.0
-  share_plus: ^10.1.4
+  share_plus: ^12.0.1
   receive_sharing_intent: ^1.8.1
+  logger: ^2.5.0
   
   # FFmpeg for audio conversion (audio-only version - much smaller)
   ffmpeg_kit_flutter_new_audio: ^2.0.0
   open_filex: ^4.7.0
   
   # Notifications
-  flutter_local_notifications: ^18.0.1
+  flutter_local_notifications: ^19.0.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^6.0.0
-  build_runner: ^2.4.15
+  build_runner: ^2.10.4
   riverpod_generator: ^4.0.0
   json_serializable: ^6.11.2
   flutter_launcher_icons: ^0.14.3