From 5152d9dfeb466b20e232dfe4fa813d1a019dfcec Mon Sep 17 00:00:00 2001 From: Tomas Dvorak Date: Wed, 18 Mar 2026 19:44:39 +0100 Subject: [PATCH] Add swingmusic_mobile as submodule --- .gitmodules | 3 + swingmusic_mobile | 1 + swingmusic_mobile/.gitignore | 157 --- swingmusic_mobile/.metadata | 45 - swingmusic_mobile/README.md | 16 - swingmusic_mobile/analysis_options.yaml | 28 - swingmusic_mobile/android/.gitignore | 14 - .../android/app/build.gradle.kts | 44 - .../android/app/src/debug/AndroidManifest.xml | 7 - .../android/app/src/main/AndroidManifest.xml | 46 - .../swingmusic_mobile/MainActivity.kt | 5 - .../res/drawable-v21/launch_background.xml | 12 - .../main/res/drawable/launch_background.xml | 12 - .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 544 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 442 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1031 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 1443 -> 0 bytes .../app/src/main/res/values-night/styles.xml | 18 - .../app/src/main/res/values/styles.xml | 18 - .../app/src/profile/AndroidManifest.xml | 7 - swingmusic_mobile/android/build.gradle.kts | 24 - swingmusic_mobile/android/gradle.properties | 2 - .../gradle/wrapper/gradle-wrapper.properties | 5 - swingmusic_mobile/android/settings.gradle.kts | 26 - swingmusic_mobile/ios/.gitignore | 34 - .../ios/Flutter/AppFrameworkInfo.plist | 26 - swingmusic_mobile/ios/Flutter/Debug.xcconfig | 1 - .../ios/Flutter/Release.xcconfig | 1 - .../ios/Runner.xcodeproj/project.pbxproj | 616 ----------- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 - .../xcshareddata/xcschemes/Runner.xcscheme | 101 -- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 - .../ios/Runner/AppDelegate.swift | 13 - .../AppIcon.appiconset/Contents.json | 122 --- .../Icon-App-1024x1024@1x.png | Bin 10932 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 295 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 406 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 450 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 282 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 462 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 704 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 406 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 586 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 862 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 862 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 1674 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 762 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 1226 -> 0 bytes .../Icon-App-83.5x83.5@2x.png | Bin 1418 -> 0 bytes .../LaunchImage.imageset/Contents.json | 23 - .../LaunchImage.imageset/LaunchImage.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/README.md | 5 - .../Runner/Base.lproj/LaunchScreen.storyboard | 37 - .../ios/Runner/Base.lproj/Main.storyboard | 26 - swingmusic_mobile/ios/Runner/Info.plist | 49 - .../ios/Runner/Runner-Bridging-Header.h | 1 - .../ios/RunnerTests/RunnerTests.swift | 12 - .../lib/core/constants/app_constants.dart | 71 -- .../lib/core/constants/app_icons.dart | 97 -- .../lib/core/constants/app_spacing.dart | 128 --- .../lib/core/enums/auth_state.dart | 24 - .../lib/core/enums/playback_mode.dart | 50 - .../lib/core/themes/app_theme.dart | 237 ----- .../lib/core/widgets/album_card.dart | 201 ---- .../lib/core/widgets/mini_player.dart | 169 --- .../lib/core/widgets/track_list_tile.dart | 141 --- .../lib/data/models/album_model.dart | 236 ----- .../lib/data/models/artist_model.dart | 96 -- .../lib/data/models/folder_model.dart | 123 --- .../lib/data/models/playlist_model.dart | 152 --- .../lib/data/models/search_results_model.dart | 153 --- .../data/models/search_suggestion_model.dart | 15 - .../lib/data/models/track_model.dart | 316 ------ .../lib/data/services/api_service.dart | 283 ----- .../lib/data/services/audio_service.dart | 403 ------- .../lib/data/services/download_service.dart | 294 ------ .../data/services/enhanced_api_service.dart | 545 ---------- .../lib/data/services/lyrics_service.dart | 114 -- .../features/analytics/analytics_screen.dart | 442 -------- .../lib/features/auth/auth_screen.dart | 88 -- .../features/auth/enhanced_auth_screen.dart | 468 -------- .../lib/features/folder/folder_screen.dart | 889 ---------------- .../lib/features/home/home_screen.dart | 407 ------- .../lib/features/library/library_screen.dart | 363 ------- .../lib/features/lyrics/lyrics_screen.dart | 482 --------- .../lib/features/offline/offline_screen.dart | 374 ------- .../player/enhanced_player_screen.dart | 427 -------- .../player/enhanced_player_screen_new.dart | 489 --------- .../lib/features/player/player_screen.dart | 373 ------- .../features/playlists/playlists_screen.dart | 437 -------- .../lib/features/qr/qr_screen.dart | 292 ----- .../lib/features/search/search_screen.dart | 523 --------- .../settings/enhanced_settings_screen.dart | 845 --------------- .../features/settings/settings_screen.dart | 518 --------- swingmusic_mobile/lib/main.dart | 43 - .../lib/shared/providers/audio_provider.dart | 147 --- .../lib/shared/providers/auth_provider.dart | 208 ---- .../providers/enhanced_library_provider.dart | 699 ------------ .../shared/providers/library_provider.dart | 297 ------ .../lib/shared/routes/app_router.dart | 95 -- .../lib/shared/widgets/main_navigation.dart | 135 --- swingmusic_mobile/linux/.gitignore | 1 - swingmusic_mobile/linux/CMakeLists.txt | 128 --- .../linux/flutter/CMakeLists.txt | 88 -- swingmusic_mobile/linux/runner/CMakeLists.txt | 26 - swingmusic_mobile/linux/runner/main.cc | 6 - .../linux/runner/my_application.cc | 148 --- .../linux/runner/my_application.h | 21 - swingmusic_mobile/macos/.gitignore | 7 - .../macos/Flutter/Flutter-Debug.xcconfig | 1 - .../macos/Flutter/Flutter-Release.xcconfig | 1 - .../Flutter/GeneratedPluginRegistrant.swift | 18 - .../macos/Runner.xcodeproj/project.pbxproj | 705 ------------ .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/xcschemes/Runner.xcscheme | 99 -- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../macos/Runner/AppDelegate.swift | 13 - .../AppIcon.appiconset/Contents.json | 68 -- .../AppIcon.appiconset/app_icon_1024.png | Bin 102994 -> 0 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 5680 -> 0 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 520 -> 0 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 14142 -> 0 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 1066 -> 0 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 36406 -> 0 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 2218 -> 0 bytes .../macos/Runner/Base.lproj/MainMenu.xib | 343 ------ .../macos/Runner/Configs/AppInfo.xcconfig | 14 - .../macos/Runner/Configs/Debug.xcconfig | 2 - .../macos/Runner/Configs/Release.xcconfig | 2 - .../macos/Runner/Configs/Warnings.xcconfig | 13 - .../macos/Runner/DebugProfile.entitlements | 12 - swingmusic_mobile/macos/Runner/Info.plist | 32 - .../macos/Runner/MainFlutterWindow.swift | 15 - .../macos/Runner/Release.entitlements | 8 - .../macos/RunnerTests/RunnerTests.swift | 12 - swingmusic_mobile/pubspec.lock | 999 ------------------ swingmusic_mobile/pubspec.yaml | 69 -- swingmusic_mobile/test/widget_test.dart | 21 - swingmusic_mobile/windows/.gitignore | 17 - swingmusic_mobile/windows/CMakeLists.txt | 108 -- .../windows/flutter/CMakeLists.txt | 109 -- .../windows/runner/CMakeLists.txt | 40 - swingmusic_mobile/windows/runner/Runner.rc | 121 --- .../windows/runner/flutter_window.cpp | 71 -- .../windows/runner/flutter_window.h | 33 - swingmusic_mobile/windows/runner/main.cpp | 43 - swingmusic_mobile/windows/runner/resource.h | 16 - .../windows/runner/resources/app_icon.ico | Bin 33772 -> 0 bytes .../windows/runner/runner.exe.manifest | 14 - swingmusic_mobile/windows/runner/utils.cpp | 65 -- swingmusic_mobile/windows/runner/utils.h | 19 - .../windows/runner/win32_window.cpp | 288 ----- .../windows/runner/win32_window.h | 102 -- 161 files changed, 4 insertions(+), 18429 deletions(-) create mode 160000 swingmusic_mobile delete mode 100644 swingmusic_mobile/.gitignore delete mode 100644 swingmusic_mobile/.metadata delete mode 100644 swingmusic_mobile/README.md delete mode 100644 swingmusic_mobile/analysis_options.yaml delete mode 100644 swingmusic_mobile/android/.gitignore delete mode 100644 swingmusic_mobile/android/app/build.gradle.kts delete mode 100644 swingmusic_mobile/android/app/src/debug/AndroidManifest.xml delete mode 100644 swingmusic_mobile/android/app/src/main/AndroidManifest.xml delete mode 100644 swingmusic_mobile/android/app/src/main/kotlin/com/dvorinka/swingmusic/swingmusic_mobile/MainActivity.kt delete mode 100644 swingmusic_mobile/android/app/src/main/res/drawable-v21/launch_background.xml delete mode 100644 swingmusic_mobile/android/app/src/main/res/drawable/launch_background.xml delete mode 100644 swingmusic_mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 swingmusic_mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 swingmusic_mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 swingmusic_mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 swingmusic_mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 swingmusic_mobile/android/app/src/main/res/values-night/styles.xml delete mode 100644 swingmusic_mobile/android/app/src/main/res/values/styles.xml delete mode 100644 swingmusic_mobile/android/app/src/profile/AndroidManifest.xml delete mode 100644 swingmusic_mobile/android/build.gradle.kts delete mode 100644 swingmusic_mobile/android/gradle.properties delete mode 100644 swingmusic_mobile/android/gradle/wrapper/gradle-wrapper.properties delete mode 100644 swingmusic_mobile/android/settings.gradle.kts delete mode 100644 swingmusic_mobile/ios/.gitignore delete mode 100644 swingmusic_mobile/ios/Flutter/AppFrameworkInfo.plist delete mode 100644 swingmusic_mobile/ios/Flutter/Debug.xcconfig delete mode 100644 swingmusic_mobile/ios/Flutter/Release.xcconfig delete mode 100644 swingmusic_mobile/ios/Runner.xcodeproj/project.pbxproj delete mode 100644 swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 swingmusic_mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme delete mode 100644 swingmusic_mobile/ios/Runner.xcworkspace/contents.xcworkspacedata delete mode 100644 swingmusic_mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 swingmusic_mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 swingmusic_mobile/ios/Runner/AppDelegate.swift delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png delete mode 100644 swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md delete mode 100644 swingmusic_mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard delete mode 100644 swingmusic_mobile/ios/Runner/Base.lproj/Main.storyboard delete mode 100644 swingmusic_mobile/ios/Runner/Info.plist delete mode 100644 swingmusic_mobile/ios/Runner/Runner-Bridging-Header.h delete mode 100644 swingmusic_mobile/ios/RunnerTests/RunnerTests.swift delete mode 100644 swingmusic_mobile/lib/core/constants/app_constants.dart delete mode 100644 swingmusic_mobile/lib/core/constants/app_icons.dart delete mode 100644 swingmusic_mobile/lib/core/constants/app_spacing.dart delete mode 100644 swingmusic_mobile/lib/core/enums/auth_state.dart delete mode 100644 swingmusic_mobile/lib/core/enums/playback_mode.dart delete mode 100644 swingmusic_mobile/lib/core/themes/app_theme.dart delete mode 100644 swingmusic_mobile/lib/core/widgets/album_card.dart delete mode 100644 swingmusic_mobile/lib/core/widgets/mini_player.dart delete mode 100644 swingmusic_mobile/lib/core/widgets/track_list_tile.dart delete mode 100644 swingmusic_mobile/lib/data/models/album_model.dart delete mode 100644 swingmusic_mobile/lib/data/models/artist_model.dart delete mode 100644 swingmusic_mobile/lib/data/models/folder_model.dart delete mode 100644 swingmusic_mobile/lib/data/models/playlist_model.dart delete mode 100644 swingmusic_mobile/lib/data/models/search_results_model.dart delete mode 100644 swingmusic_mobile/lib/data/models/search_suggestion_model.dart delete mode 100644 swingmusic_mobile/lib/data/models/track_model.dart delete mode 100644 swingmusic_mobile/lib/data/services/api_service.dart delete mode 100644 swingmusic_mobile/lib/data/services/audio_service.dart delete mode 100644 swingmusic_mobile/lib/data/services/download_service.dart delete mode 100644 swingmusic_mobile/lib/data/services/enhanced_api_service.dart delete mode 100644 swingmusic_mobile/lib/data/services/lyrics_service.dart delete mode 100644 swingmusic_mobile/lib/features/analytics/analytics_screen.dart delete mode 100644 swingmusic_mobile/lib/features/auth/auth_screen.dart delete mode 100644 swingmusic_mobile/lib/features/auth/enhanced_auth_screen.dart delete mode 100644 swingmusic_mobile/lib/features/folder/folder_screen.dart delete mode 100644 swingmusic_mobile/lib/features/home/home_screen.dart delete mode 100644 swingmusic_mobile/lib/features/library/library_screen.dart delete mode 100644 swingmusic_mobile/lib/features/lyrics/lyrics_screen.dart delete mode 100644 swingmusic_mobile/lib/features/offline/offline_screen.dart delete mode 100644 swingmusic_mobile/lib/features/player/enhanced_player_screen.dart delete mode 100644 swingmusic_mobile/lib/features/player/enhanced_player_screen_new.dart delete mode 100644 swingmusic_mobile/lib/features/player/player_screen.dart delete mode 100644 swingmusic_mobile/lib/features/playlists/playlists_screen.dart delete mode 100644 swingmusic_mobile/lib/features/qr/qr_screen.dart delete mode 100644 swingmusic_mobile/lib/features/search/search_screen.dart delete mode 100644 swingmusic_mobile/lib/features/settings/enhanced_settings_screen.dart delete mode 100644 swingmusic_mobile/lib/features/settings/settings_screen.dart delete mode 100644 swingmusic_mobile/lib/main.dart delete mode 100644 swingmusic_mobile/lib/shared/providers/audio_provider.dart delete mode 100644 swingmusic_mobile/lib/shared/providers/auth_provider.dart delete mode 100644 swingmusic_mobile/lib/shared/providers/enhanced_library_provider.dart delete mode 100644 swingmusic_mobile/lib/shared/providers/library_provider.dart delete mode 100644 swingmusic_mobile/lib/shared/routes/app_router.dart delete mode 100644 swingmusic_mobile/lib/shared/widgets/main_navigation.dart delete mode 100644 swingmusic_mobile/linux/.gitignore delete mode 100644 swingmusic_mobile/linux/CMakeLists.txt delete mode 100644 swingmusic_mobile/linux/flutter/CMakeLists.txt delete mode 100644 swingmusic_mobile/linux/runner/CMakeLists.txt delete mode 100644 swingmusic_mobile/linux/runner/main.cc delete mode 100644 swingmusic_mobile/linux/runner/my_application.cc delete mode 100644 swingmusic_mobile/linux/runner/my_application.h delete mode 100644 swingmusic_mobile/macos/.gitignore delete mode 100644 swingmusic_mobile/macos/Flutter/Flutter-Debug.xcconfig delete mode 100644 swingmusic_mobile/macos/Flutter/Flutter-Release.xcconfig delete mode 100644 swingmusic_mobile/macos/Flutter/GeneratedPluginRegistrant.swift delete mode 100644 swingmusic_mobile/macos/Runner.xcodeproj/project.pbxproj delete mode 100644 swingmusic_mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 swingmusic_mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme delete mode 100644 swingmusic_mobile/macos/Runner.xcworkspace/contents.xcworkspacedata delete mode 100644 swingmusic_mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 swingmusic_mobile/macos/Runner/AppDelegate.swift delete mode 100644 swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png delete mode 100644 swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png delete mode 100644 swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png delete mode 100644 swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png delete mode 100644 swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png delete mode 100644 swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png delete mode 100644 swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png delete mode 100644 swingmusic_mobile/macos/Runner/Base.lproj/MainMenu.xib delete mode 100644 swingmusic_mobile/macos/Runner/Configs/AppInfo.xcconfig delete mode 100644 swingmusic_mobile/macos/Runner/Configs/Debug.xcconfig delete mode 100644 swingmusic_mobile/macos/Runner/Configs/Release.xcconfig delete mode 100644 swingmusic_mobile/macos/Runner/Configs/Warnings.xcconfig delete mode 100644 swingmusic_mobile/macos/Runner/DebugProfile.entitlements delete mode 100644 swingmusic_mobile/macos/Runner/Info.plist delete mode 100644 swingmusic_mobile/macos/Runner/MainFlutterWindow.swift delete mode 100644 swingmusic_mobile/macos/Runner/Release.entitlements delete mode 100644 swingmusic_mobile/macos/RunnerTests/RunnerTests.swift delete mode 100644 swingmusic_mobile/pubspec.lock delete mode 100644 swingmusic_mobile/pubspec.yaml delete mode 100644 swingmusic_mobile/test/widget_test.dart delete mode 100644 swingmusic_mobile/windows/.gitignore delete mode 100644 swingmusic_mobile/windows/CMakeLists.txt delete mode 100644 swingmusic_mobile/windows/flutter/CMakeLists.txt delete mode 100644 swingmusic_mobile/windows/runner/CMakeLists.txt delete mode 100644 swingmusic_mobile/windows/runner/Runner.rc delete mode 100644 swingmusic_mobile/windows/runner/flutter_window.cpp delete mode 100644 swingmusic_mobile/windows/runner/flutter_window.h delete mode 100644 swingmusic_mobile/windows/runner/main.cpp delete mode 100644 swingmusic_mobile/windows/runner/resource.h delete mode 100644 swingmusic_mobile/windows/runner/resources/app_icon.ico delete mode 100644 swingmusic_mobile/windows/runner/runner.exe.manifest delete mode 100644 swingmusic_mobile/windows/runner/utils.cpp delete mode 100644 swingmusic_mobile/windows/runner/utils.h delete mode 100644 swingmusic_mobile/windows/runner/win32_window.cpp delete mode 100644 swingmusic_mobile/windows/runner/win32_window.h diff --git a/.gitmodules b/.gitmodules index cce7dee2..e7f8e3e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,6 @@ path = swingmusic_mobile url = https://github.com/Dvorinka/swingmusic-mobile.git branch = master +[submodule "swingmusic_mobile"] + path = swingmusic_mobile + url = https://github.com/Dvorinka/swingmusic-mobile.git diff --git a/swingmusic_mobile b/swingmusic_mobile new file mode 160000 index 00000000..1208150e --- /dev/null +++ b/swingmusic_mobile @@ -0,0 +1 @@ +Subproject commit 1208150e98d995b9d02995428c837e4040945868 diff --git a/swingmusic_mobile/.gitignore b/swingmusic_mobile/.gitignore deleted file mode 100644 index db984b4a..00000000 --- a/swingmusic_mobile/.gitignore +++ /dev/null @@ -1,157 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.build/ -.buildlog/ -.history -.svn/ -.swiftpm/ -migrate_working_dir/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# VS Code related -.vscode/ -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json - -# Flutter/Dart/Pub related -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins-dependencies -.pub-cache/ -.pub/ -/build/ -/coverage/ -.packages -.pub-cache/ -.pub/ -/build/ - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release -/android/gradlew -/android/gradlew.bat -/android/local.properties -/android/.gradle/ -/android/captures/ -/android/gradlew -/android/gradlew.bat -/android/local.properties -/android/.gradle/ - -# iOS/Xcode related -/ios/Flutter/Flutter.framework -/ios/Flutter/Flutter.podspec -/ios/.symlinks/ -/ios/Pods/ -/ios/.symlinks/ -/ios/Pods/ -/ios/Flutter/App.framework -/ios/Flutter/Flutter.framework -/ios/Flutter/Flutter.podspec -/ios/Flutter/Generated.xcconfig -/ios/Flutter/ephemeral/ -/ios/app.flx -/ios/app.zip -/ios/app_flutter/ -/ios/flutter_assets/ -/ios/service_account.json - -# Web related -/web/ - -# Windows related -/windows/flutter/generated_plugin_registrant.cc -/windows/flutter/generated_plugin_registrant.h -/windows/flutter/generated_plugins.cmake - -# Linux related -/linux/flutter/generated_plugin_registrant.cc -/linux/flutter/generated_plugin_registrant.h -/linux/flutter/generated_plugins.cmake - -# macOS related -/macos/Flutter/Generated.xcconfig -/macos/Flutter/ephemeral/ -/macos/Flutter/flutter_assets/ -/macos/Flutter/App.framework -/macos/Flutter/Flutter.framework -/macos/Flutter/Flutter.podspec - -# Test coverage -/coverage/ - -# Environment files -.env -.env.local -.env.development -.env.test -.env.production - -# API keys and secrets -**/api_keys.dart -**/secrets.dart -**/config.dart - -# Temporary files -*.tmp -*.temp -*.bak -*.backup - -# Logs -logs/ -*.log - -# Database files -*.db -*.sqlite -*.sqlite3 - -# Generated files -*.g.dart -*.freezed.dart -*.mocks.dart - -# Node.js (if using for build tools) -node_modules/ -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Firebase -google-services.json -GoogleService-Info.plist - -# Localization -*.arb - -# Assets that should be managed separately -/assets/audio/ -/assets/images/large/ -*.mp3 -*.flac -*.wav -*.aac -*.ogg -*.m4a diff --git a/swingmusic_mobile/.metadata b/swingmusic_mobile/.metadata deleted file mode 100644 index 83b34ebb..00000000 --- a/swingmusic_mobile/.metadata +++ /dev/null @@ -1,45 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: "f6ff1529fd6d8af5f706051d9251ac9231c83407" - channel: "stable" - -project_type: app - -# Tracks metadata for the flutter migrate command -migration: - platforms: - - platform: root - create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - - platform: android - create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - - platform: ios - create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - - platform: linux - create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - - platform: macos - create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - - platform: web - create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - - platform: windows - create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407 - - # User provided section - - # List of Local paths (relative to this file) that should be - # ignored by the migrate tool. - # - # Files that are not part of the templates will be ignored by default. - unmanaged_files: - - 'lib/main.dart' - - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/swingmusic_mobile/README.md b/swingmusic_mobile/README.md deleted file mode 100644 index 49d435b1..00000000 --- a/swingmusic_mobile/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# swingmusic_mobile - -A new Flutter project. - -## Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) - -For help getting started with Flutter development, view the -[online documentation](https://docs.flutter.dev/), which offers tutorials, -samples, guidance on mobile development, and a full API reference. diff --git a/swingmusic_mobile/analysis_options.yaml b/swingmusic_mobile/analysis_options.yaml deleted file mode 100644 index 0d290213..00000000 --- a/swingmusic_mobile/analysis_options.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# This file configures the analyzer, which statically analyzes Dart code to -# check for errors, warnings, and lints. -# -# The issues identified by the analyzer are surfaced in the UI of Dart-enabled -# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be -# invoked from the command line by running `flutter analyze`. - -# The following line activates a set of recommended lints for Flutter apps, -# packages, and plugins designed to encourage good coding practices. -include: package:flutter_lints/flutter.yaml - -linter: - # The lint rules applied to this project can be customized in the - # section below to disable rules from the `package:flutter_lints/flutter.yaml` - # included above or to enable additional rules. A list of all available lints - # and their documentation is published at https://dart.dev/lints. - # - # Instead of disabling a lint rule for the entire project in the - # section below, it can also be suppressed for a single line of code - # or a specific dart file by using the `// ignore: name_of_lint` and - # `// ignore_for_file: name_of_lint` syntax on the line or in the file - # producing the lint. - rules: - # avoid_print: false # Uncomment to disable the `avoid_print` rule - # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options diff --git a/swingmusic_mobile/android/.gitignore b/swingmusic_mobile/android/.gitignore deleted file mode 100644 index be3943c9..00000000 --- a/swingmusic_mobile/android/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -gradle-wrapper.jar -/.gradle -/captures/ -/gradlew -/gradlew.bat -/local.properties -GeneratedPluginRegistrant.java -.cxx/ - -# Remember to never publicly share your keystore. -# See https://flutter.dev/to/reference-keystore -key.properties -**/*.keystore -**/*.jks diff --git a/swingmusic_mobile/android/app/build.gradle.kts b/swingmusic_mobile/android/app/build.gradle.kts deleted file mode 100644 index 4edb8304..00000000 --- a/swingmusic_mobile/android/app/build.gradle.kts +++ /dev/null @@ -1,44 +0,0 @@ -plugins { - id("com.android.application") - id("kotlin-android") - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. - id("dev.flutter.flutter-gradle-plugin") -} - -android { - namespace = "com.dvorinka.swingmusic.swingmusic_mobile" - compileSdk = flutter.compileSdkVersion - ndkVersion = flutter.ndkVersion - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.dvorinka.swingmusic.swingmusic_mobile" - // You can update the following values to match your application needs. - // For more information, see: https://flutter.dev/to/review-gradle-config. - minSdk = flutter.minSdkVersion - targetSdk = flutter.targetSdkVersion - versionCode = flutter.versionCode - versionName = flutter.versionName - } - - buildTypes { - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig = signingConfigs.getByName("debug") - } - } -} - -flutter { - source = "../.." -} diff --git a/swingmusic_mobile/android/app/src/debug/AndroidManifest.xml b/swingmusic_mobile/android/app/src/debug/AndroidManifest.xml deleted file mode 100644 index 399f6981..00000000 --- a/swingmusic_mobile/android/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/swingmusic_mobile/android/app/src/main/AndroidManifest.xml b/swingmusic_mobile/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index 2888c9fd..00000000 --- a/swingmusic_mobile/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/swingmusic_mobile/android/app/src/main/kotlin/com/dvorinka/swingmusic/swingmusic_mobile/MainActivity.kt b/swingmusic_mobile/android/app/src/main/kotlin/com/dvorinka/swingmusic/swingmusic_mobile/MainActivity.kt deleted file mode 100644 index cf523c39..00000000 --- a/swingmusic_mobile/android/app/src/main/kotlin/com/dvorinka/swingmusic/swingmusic_mobile/MainActivity.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.dvorinka.swingmusic.swingmusic_mobile - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity : FlutterActivity() diff --git a/swingmusic_mobile/android/app/src/main/res/drawable-v21/launch_background.xml b/swingmusic_mobile/android/app/src/main/res/drawable-v21/launch_background.xml deleted file mode 100644 index f74085f3..00000000 --- a/swingmusic_mobile/android/app/src/main/res/drawable-v21/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/swingmusic_mobile/android/app/src/main/res/drawable/launch_background.xml b/swingmusic_mobile/android/app/src/main/res/drawable/launch_background.xml deleted file mode 100644 index 304732f8..00000000 --- a/swingmusic_mobile/android/app/src/main/res/drawable/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/swingmusic_mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/swingmusic_mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index db77bb4b7b0906d62b1847e87f15cdcacf6a4f29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ diff --git a/swingmusic_mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/swingmusic_mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 17987b79bb8a35cc66c3c1fd44f5a5526c1b78be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ diff --git a/swingmusic_mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/swingmusic_mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index d5f1c8d34e7a88e3f88bea192c3a370d44689c3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof diff --git a/swingmusic_mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/swingmusic_mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 4d6372eebdb28e45604e46eeda8dd24651419bc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` diff --git a/swingmusic_mobile/android/app/src/main/res/values-night/styles.xml b/swingmusic_mobile/android/app/src/main/res/values-night/styles.xml deleted file mode 100644 index 06952be7..00000000 --- a/swingmusic_mobile/android/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/swingmusic_mobile/android/app/src/main/res/values/styles.xml b/swingmusic_mobile/android/app/src/main/res/values/styles.xml deleted file mode 100644 index cb1ef880..00000000 --- a/swingmusic_mobile/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/swingmusic_mobile/android/app/src/profile/AndroidManifest.xml b/swingmusic_mobile/android/app/src/profile/AndroidManifest.xml deleted file mode 100644 index 399f6981..00000000 --- a/swingmusic_mobile/android/app/src/profile/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/swingmusic_mobile/android/build.gradle.kts b/swingmusic_mobile/android/build.gradle.kts deleted file mode 100644 index dbee657b..00000000 --- a/swingmusic_mobile/android/build.gradle.kts +++ /dev/null @@ -1,24 +0,0 @@ -allprojects { - repositories { - google() - mavenCentral() - } -} - -val newBuildDir: Directory = - rootProject.layout.buildDirectory - .dir("../../build") - .get() -rootProject.layout.buildDirectory.value(newBuildDir) - -subprojects { - val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) - project.layout.buildDirectory.value(newSubprojectBuildDir) -} -subprojects { - project.evaluationDependsOn(":app") -} - -tasks.register("clean") { - delete(rootProject.layout.buildDirectory) -} diff --git a/swingmusic_mobile/android/gradle.properties b/swingmusic_mobile/android/gradle.properties deleted file mode 100644 index fbee1d8c..00000000 --- a/swingmusic_mobile/android/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError -android.useAndroidX=true diff --git a/swingmusic_mobile/android/gradle/wrapper/gradle-wrapper.properties b/swingmusic_mobile/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e4ef43fb..00000000 --- a/swingmusic_mobile/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip diff --git a/swingmusic_mobile/android/settings.gradle.kts b/swingmusic_mobile/android/settings.gradle.kts deleted file mode 100644 index ca7fe065..00000000 --- a/swingmusic_mobile/android/settings.gradle.kts +++ /dev/null @@ -1,26 +0,0 @@ -pluginManagement { - val flutterSdkPath = - run { - val properties = java.util.Properties() - file("local.properties").inputStream().use { properties.load(it) } - val flutterSdkPath = properties.getProperty("flutter.sdk") - require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } - flutterSdkPath - } - - includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") - - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} - -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 -} - -include(":app") diff --git a/swingmusic_mobile/ios/.gitignore b/swingmusic_mobile/ios/.gitignore deleted file mode 100644 index 7a7f9873..00000000 --- a/swingmusic_mobile/ios/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -**/dgph -*.mode1v3 -*.mode2v3 -*.moved-aside -*.pbxuser -*.perspectivev3 -**/*sync/ -.sconsign.dblite -.tags* -**/.vagrant/ -**/DerivedData/ -Icon? -**/Pods/ -**/.symlinks/ -profile -xcuserdata -**/.generated/ -Flutter/App.framework -Flutter/Flutter.framework -Flutter/Flutter.podspec -Flutter/Generated.xcconfig -Flutter/ephemeral/ -Flutter/app.flx -Flutter/app.zip -Flutter/flutter_assets/ -Flutter/flutter_export_environment.sh -ServiceDefinitions.json -Runner/GeneratedPluginRegistrant.* - -# Exceptions to above rules. -!default.mode1v3 -!default.mode2v3 -!default.pbxuser -!default.perspectivev3 diff --git a/swingmusic_mobile/ios/Flutter/AppFrameworkInfo.plist b/swingmusic_mobile/ios/Flutter/AppFrameworkInfo.plist deleted file mode 100644 index 1dc6cf76..00000000 --- a/swingmusic_mobile/ios/Flutter/AppFrameworkInfo.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - App - CFBundleIdentifier - io.flutter.flutter.app - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - App - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - MinimumOSVersion - 13.0 - - diff --git a/swingmusic_mobile/ios/Flutter/Debug.xcconfig b/swingmusic_mobile/ios/Flutter/Debug.xcconfig deleted file mode 100644 index 592ceee8..00000000 --- a/swingmusic_mobile/ios/Flutter/Debug.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "Generated.xcconfig" diff --git a/swingmusic_mobile/ios/Flutter/Release.xcconfig b/swingmusic_mobile/ios/Flutter/Release.xcconfig deleted file mode 100644 index 592ceee8..00000000 --- a/swingmusic_mobile/ios/Flutter/Release.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "Generated.xcconfig" diff --git a/swingmusic_mobile/ios/Runner.xcodeproj/project.pbxproj b/swingmusic_mobile/ios/Runner.xcodeproj/project.pbxproj deleted file mode 100644 index de0d01fa..00000000 --- a/swingmusic_mobile/ios/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,616 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* Begin PBXBuildFile section */ - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 97C146E61CF9000F007C117D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 97C146ED1CF9000F007C117D; - remoteInfo = Runner; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 9705A1C41CF9048500538489 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; - 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; - 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; - 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 331C8082294A63A400263BE5 /* RunnerTests */ = { - isa = PBXGroup; - children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, - ); - path = RunnerTests; - sourceTree = ""; - }; - 9740EEB11CF90186004384FC /* Flutter */ = { - isa = PBXGroup; - children = ( - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEB21CF90195004384FC /* Debug.xcconfig */, - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, - 9740EEB31CF90195004384FC /* Generated.xcconfig */, - ); - name = Flutter; - sourceTree = ""; - }; - 97C146E51CF9000F007C117D = { - isa = PBXGroup; - children = ( - 9740EEB11CF90186004384FC /* Flutter */, - 97C146F01CF9000F007C117D /* Runner */, - 97C146EF1CF9000F007C117D /* Products */, - 331C8082294A63A400263BE5 /* RunnerTests */, - ); - sourceTree = ""; - }; - 97C146EF1CF9000F007C117D /* Products */ = { - isa = PBXGroup; - children = ( - 97C146EE1CF9000F007C117D /* Runner.app */, - 331C8081294A63A400263BE5 /* RunnerTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 97C146F01CF9000F007C117D /* Runner */ = { - isa = PBXGroup; - children = ( - 97C146FA1CF9000F007C117D /* Main.storyboard */, - 97C146FD1CF9000F007C117D /* Assets.xcassets */, - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, - 97C147021CF9000F007C117D /* Info.plist */, - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, - 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, - 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, - ); - path = Runner; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 331C8080294A63A400263BE5 /* RunnerTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; - buildPhases = ( - 331C807D294A63A400263BE5 /* Sources */, - 331C807F294A63A400263BE5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 331C8086294A63A400263BE5 /* PBXTargetDependency */, - ); - name = RunnerTests; - productName = RunnerTests; - productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 97C146ED1CF9000F007C117D /* Runner */ = { - isa = PBXNativeTarget; - buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; - buildPhases = ( - 9740EEB61CF901F6004384FC /* Run Script */, - 97C146EA1CF9000F007C117D /* Sources */, - 97C146EB1CF9000F007C117D /* Frameworks */, - 97C146EC1CF9000F007C117D /* Resources */, - 9705A1C41CF9048500538489 /* Embed Frameworks */, - 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Runner; - productName = Runner; - productReference = 97C146EE1CF9000F007C117D /* Runner.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 97C146E61CF9000F007C117D /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1510; - ORGANIZATIONNAME = ""; - TargetAttributes = { - 331C8080294A63A400263BE5 = { - CreatedOnToolsVersion = 14.0; - TestTargetID = 97C146ED1CF9000F007C117D; - }; - 97C146ED1CF9000F007C117D = { - CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 1100; - }; - }; - }; - buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 97C146E51CF9000F007C117D; - productRefGroup = 97C146EF1CF9000F007C117D /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 97C146ED1CF9000F007C117D /* Runner */, - 331C8080294A63A400263BE5 /* RunnerTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 331C807F294A63A400263BE5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 97C146EC1CF9000F007C117D /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", - ); - name = "Thin Binary"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; - }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 331C807D294A63A400263BE5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 97C146EA1CF9000F007C117D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 97C146ED1CF9000F007C117D /* Runner */; - targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 97C146FA1CF9000F007C117D /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C146FB1CF9000F007C117D /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C147001CF9000F007C117D /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 249021D3217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Profile; - }; - 249021D4217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.dvorinka.swingmusic.swingmusicMobile; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Profile; - }; - 331C8088294A63A400263BE5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.dvorinka.swingmusic.swingmusicMobile.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; - }; - name = Debug; - }; - 331C8089294A63A400263BE5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.dvorinka.swingmusic.swingmusicMobile.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; - }; - name = Release; - }; - 331C808A294A63A400263BE5 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.dvorinka.swingmusic.swingmusicMobile.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; - }; - name = Profile; - }; - 97C147031CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 97C147041CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 97C147061CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.dvorinka.swingmusic.swingmusicMobile; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Debug; - }; - 97C147071CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.dvorinka.swingmusic.swingmusicMobile; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 331C8088294A63A400263BE5 /* Debug */, - 331C8089294A63A400263BE5 /* Release */, - 331C808A294A63A400263BE5 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147031CF9000F007C117D /* Debug */, - 97C147041CF9000F007C117D /* Release */, - 249021D3217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147061CF9000F007C117D /* Debug */, - 97C147071CF9000F007C117D /* Release */, - 249021D4217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 97C146E61CF9000F007C117D /* Project object */; -} diff --git a/swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a6..00000000 --- a/swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c5..00000000 --- a/swingmusic_mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/swingmusic_mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/swingmusic_mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100644 index e3773d42..00000000 --- a/swingmusic_mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/swingmusic_mobile/ios/Runner.xcworkspace/contents.xcworkspacedata b/swingmusic_mobile/ios/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d526a16..00000000 --- a/swingmusic_mobile/ios/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/swingmusic_mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/swingmusic_mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/swingmusic_mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/swingmusic_mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/swingmusic_mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c5..00000000 --- a/swingmusic_mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/swingmusic_mobile/ios/Runner/AppDelegate.swift b/swingmusic_mobile/ios/Runner/AppDelegate.swift deleted file mode 100644 index 62666446..00000000 --- a/swingmusic_mobile/ios/Runner/AppDelegate.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Flutter -import UIKit - -@main -@objc class AppDelegate: FlutterAppDelegate { - override func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? - ) -> Bool { - GeneratedPluginRegistrant.register(with: self) - return super.application(application, didFinishLaunchingWithOptions: launchOptions) - } -} diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index d36b1fab..00000000 --- a/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100644 index dc9ada4725e9b0ddb1deab583e5b5102493aa332..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10932 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 diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100644 index 797d452e458972bab9d994556c8305db4c827017..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P))>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index 6ed2d933e1120817fe9182483a228007b18ab6ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmV;z0X_bSP)iGWQ_5NJQ_~rNh*z)}eT%KUb z`7gNk0#AwF^#0T0?hIa^`~Ck;!}#m+_uT050aTR(J!bU#|IzRL%^UsMS#KsYnTF*!YeDOytlP4VhV?b} z%rz_<=#CPc)tU1MZTq~*2=8~iZ!lSa<{9b@2Jl;?IEV8)=fG217*|@)CCYgFze-x? zIFODUIA>nWKpE+bn~n7;-89sa>#DR>TSlqWk*!2hSN6D~Qb#VqbP~4Fk&m`@1$JGr zXPIdeRE&b2Thd#{MtDK$px*d3-Wx``>!oimf%|A-&-q*6KAH)e$3|6JV%HX{Hig)k suLT-RhftRq8b9;(V=235Wa|I=027H2wCDra;{X5v07*qoM6N<$f;9x^2LJ#7 diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index 4cd7b0099ca80c806f8fe495613e8d6c69460d76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmV+#0p(^bcu7P-R4C8Q z&e;xxFbF_Vrezo%_kH*OKhshZ6BFpG-Y1e10`QXJKbND7AMQ&cMj60B5TNObaZxYybcN07*qoM6N<$g3m;S%K!iX diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index fe730945a01f64a61e2235dbe3f45b08f7729182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmV;<0WtoGP)-}iV`2<;=$?g5M=KQbZ{F&YRNy7Nn@%_*5{gvDM0aKI4?ESmw z{NnZg)A0R`+4?NF_RZexyVB&^^ZvN!{I28tr{Vje;QNTz`dG&Jz0~Ek&f2;*Z7>B|cg}xYpxEFY+0YrKLF;^Q+-HreN0P{&i zK~zY`?b7ECf-n?@;d<&orQ*Q7KoR%4|C>{W^h6@&01>0SKS`dn{Q}GT%Qj_{PLZ_& zs`MFI#j-(>?bvdZ!8^xTwlY{qA)T4QLbY@j(!YJ7aXJervHy6HaG_2SB`6CC{He}f zHVw(fJWApwPq!6VY7r1w-Fs)@ox~N+q|w~e;JI~C4Vf^@d>Wvj=fl`^u9x9wd9 zR%3*Q+)t%S!MU_`id^@&Y{y7-r98lZX0?YrHlfmwb?#}^1b{8g&KzmkE(L>Z&)179 zp<)v6Y}pRl100G2FL_t(o!|l{-Q-VMg#&MKg7c{O0 z2wJImOS3Gy*Z2Qifdv~JYOp;v+U)a|nLoc7hNH;I$;lzDt$}rkaFw1mYK5_0Q(Sut zvbEloxON7$+HSOgC9Z8ltuC&0OSF!-mXv5caV>#bc3@hBPX@I$58-z}(ZZE!t-aOG zpjNkbau@>yEzH(5Yj4kZiMH32XI!4~gVXNnjAvRx;Sdg^`>2DpUEwoMhTs_st8pKG z(%SHyHdU&v%f36~uERh!bd`!T2dw;z6PrOTQ7Vt*#9F2uHlUVnb#ev_o^fh}Dzmq} zWtlk35}k=?xj28uO|5>>$yXadTUE@@IPpgH`gJ~Ro4>jd1IF|(+IX>8M4Ps{PNvmI zNj4D+XgN83gPt_Gm}`Ybv{;+&yu-C(Grdiahmo~BjG-l&mWM+{e5M1sm&=xduwgM9 z`8OEh`=F3r`^E{n_;%9weN{cf2%7=VzC@cYj+lg>+3|D|_1C@{hcU(DyQG_BvBWe? zvTv``=%b1zrol#=R`JB)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index 502f463a9bc882b461c96aadf492d1729e49e725..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmV-Q0=4~#P)+}#`wDE{8-2Mebf5<{{PqV{TgVcv*r8?UZ3{-|G?_}T*&y;@cqf{ z{Q*~+qr%%p!1pS*_Uicl#q9lc(D`!D`LN62sNwq{oYw(Wmhk)k<@f$!$@ng~_5)Ru z0Z)trIA5^j{DIW^c+vT2%lW+2<(RtE2wR;4O@)Tm`Xr*?A(qYoM}7i5Yxw>D(&6ou zxz!_Xr~yNF+waPe00049Nkl*;a!v6h%{rlvIH#gW3s8p;bFr=l}mRqpW2h zw=OA%hdyL~z+UHOzl0eKhEr$YYOL-c-%Y<)=j?(bzDweB7{b+%_ypvm_cG{SvM=DK zhv{K@m>#Bw>2W$eUI#iU)Wdgs8Y3U+A$Gd&{+j)d)BmGKx+43U_!tik_YlN)>$7G! zhkE!s;%oku3;IwG3U^2kw?z+HM)jB{@zFhK8P#KMSytSthr+4!c(5c%+^UBn`0X*2 zy3(k600_CSZj?O$Qu%&$;|TGUJrptR(HzyIx>5E(2r{eA(<6t3e3I0B)7d6s7?Z5J zZ!rtKvA{MiEBm&KFtoifx>5P^Z=vl)95XJn()aS5%ad(s?4-=Tkis9IGu{`Fy8r+H07*qoM6N<$f20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index 0ec303439225b78712f49115768196d8d76f6790..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmV-k1EKthP)20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index e9f5fea27c705180eb716271f41b582e76dcbd90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1674 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 diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index 0467bf12aa4d28f374bb26596605a46dcbb3e7c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1418 zcmV;51$Fv~P)q zKfU)WzW*n(@|xWGCA9ScMt*e9`2kdxPQ&&>|-UCa7_51w+ zLUsW@ZzZSW0y$)Hp~e9%PvP|a03ks1`~K?q{u;6NC8*{AOqIUq{CL&;p56Lf$oQGq z^={4hPQv)y=I|4n+?>7Fim=dxt1 z2H+Dm+1+fh+IF>G0SjJMkQQre1x4|G*Z==(Ot&kCnUrL4I(rf(ucITwmuHf^hXiJT zkdTm&kdTm&kdTm&kdP`esgWG0BcWCVkVZ&2dUwN`cgM8QJb`Z7Z~e<&Yj2(}>Tmf` zm1{eLgw!b{bXkjWbF%dTkTZEJWyWOb##Lfw4EK2}<0d6%>AGS{po>WCOy&f$Tay_> z?NBlkpo@s-O;0V%Y_Xa-G#_O08q5LR*~F%&)}{}r&L%Sbs8AS4t7Y0NEx*{soY=0MZExqA5XHQkqi#4gW3 zqODM^iyZl;dvf)-bOXtOru(s)Uc7~BFx{w-FK;2{`VA?(g&@3z&bfLFyctOH!cVsF z7IL=fo-qBndRUm;kAdXR4e6>k-z|21AaN%ubeVrHl*<|s&Ax@W-t?LR(P-24A5=>a z*R9#QvjzF8n%@1Nw@?CG@6(%>+-0ASK~jEmCV|&a*7-GKT72W<(TbSjf)&Eme6nGE z>Gkj4Sq&2e+-G%|+NM8OOm5zVl9{Z8Dd8A5z3y8mZ=4Bv4%>as_{9cN#bm~;h>62( zdqY93Zy}v&c4n($Vv!UybR8ocs7#zbfX1IY-*w~)p}XyZ-SFC~4w>BvMVr`dFbelV{lLL0bx7@*ZZdebr3`sP;? zVImji)kG)(6Juv0lz@q`F!k1FE;CQ(D0iG$wchPbKZQELlsZ#~rt8#90Y_Xh&3U-< z{s<&cCV_1`^TD^ia9!*mQDq& zn2{r`j};V|uV%_wsP!zB?m%;FeaRe+X47K0e+KE!8C{gAWF8)lCd1u1%~|M!XNRvw zvtqy3iz0WSpWdhn6$hP8PaRBmp)q`#PCA`Vd#Tc$@f1tAcM>f_I@bC)hkI9|o(Iqv zo}Piadq!j76}004RBio<`)70k^`K1NK)q>w?p^C6J2ZC!+UppiK6&y3Kmbv&O!oYF z34$0Z;QO!JOY#!`qyGH<3Pd}Pt@q*A0V=3SVtWKRR8d8Z&@)3qLPA19LPA19LPEUC YUoZo%k(ykuW&i*H07*qoM6N<$f+CH{y8r+H diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json deleted file mode 100644 index 0bedcf2f..00000000 --- a/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "LaunchImage.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "LaunchImage@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "LaunchImage@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png deleted file mode 100644 index 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png deleted file mode 100644 index 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png deleted file mode 100644 index 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v diff --git a/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md deleted file mode 100644 index 89c2725b..00000000 --- a/swingmusic_mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Launch Screen Assets - -You can customize the launch screen with your own desired assets by replacing the image files in this directory. - -You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/swingmusic_mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard b/swingmusic_mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index f2e259c7..00000000 --- a/swingmusic_mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/swingmusic_mobile/ios/Runner/Base.lproj/Main.storyboard b/swingmusic_mobile/ios/Runner/Base.lproj/Main.storyboard deleted file mode 100644 index f3c28516..00000000 --- a/swingmusic_mobile/ios/Runner/Base.lproj/Main.storyboard +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/swingmusic_mobile/ios/Runner/Info.plist b/swingmusic_mobile/ios/Runner/Info.plist deleted file mode 100644 index d8e1cf11..00000000 --- a/swingmusic_mobile/ios/Runner/Info.plist +++ /dev/null @@ -1,49 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Swingmusic Mobile - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - swingmusic_mobile - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - CADisableMinimumFrameDurationOnPhone - - UIApplicationSupportsIndirectInputEvents - - - diff --git a/swingmusic_mobile/ios/Runner/Runner-Bridging-Header.h b/swingmusic_mobile/ios/Runner/Runner-Bridging-Header.h deleted file mode 100644 index 308a2a56..00000000 --- a/swingmusic_mobile/ios/Runner/Runner-Bridging-Header.h +++ /dev/null @@ -1 +0,0 @@ -#import "GeneratedPluginRegistrant.h" diff --git a/swingmusic_mobile/ios/RunnerTests/RunnerTests.swift b/swingmusic_mobile/ios/RunnerTests/RunnerTests.swift deleted file mode 100644 index 86a7c3b1..00000000 --- a/swingmusic_mobile/ios/RunnerTests/RunnerTests.swift +++ /dev/null @@ -1,12 +0,0 @@ -import Flutter -import UIKit -import XCTest - -class RunnerTests: XCTestCase { - - func testExample() { - // If you add code to the Runner application, consider adding tests here. - // See https://developer.apple.com/documentation/xctest for more information about using XCTest. - } - -} diff --git a/swingmusic_mobile/lib/core/constants/app_constants.dart b/swingmusic_mobile/lib/core/constants/app_constants.dart deleted file mode 100644 index b029087c..00000000 --- a/swingmusic_mobile/lib/core/constants/app_constants.dart +++ /dev/null @@ -1,71 +0,0 @@ -class AppConstants { - // App Info - static const String appName = 'SwingMusic'; - static const String appVersion = '1.0.0'; - - // API Configuration - static const String defaultApiUrl = 'http://localhost:8181'; - static const Duration apiTimeout = Duration(seconds: 30); - static const int maxRetries = 3; - - // Audio Configuration - static const Duration audioFadeDuration = Duration(milliseconds: 500); - static const int maxAudioCacheSize = 100 * 1024 * 1024; // 100MB - static const String audioCacheKey = 'audio_cache'; - - // UI Configuration - static const double defaultPadding = 16.0; - static const double smallPadding = 8.0; - static const double largePadding = 24.0; - static const double borderRadius = 12.0; - static const double cardBorderRadius = 16.0; - - // Animation Durations - static const Duration fastAnimation = Duration(milliseconds: 200); - static const Duration mediumAnimation = Duration(milliseconds: 300); - static const Duration slowAnimation = Duration(milliseconds: 500); - - // Image Dimensions - static const double albumArtSize = 56.0; - static const double largeAlbumArtSize = 200.0; - static const double artistImageSize = 80.0; - - // Storage Keys - static const String themeKey = 'app_theme'; - static const String authTokenKey = 'auth_token'; - static const String userProfileKey = 'user_profile'; - static const String settingsKey = 'app_settings'; - static const String favoritesKey = 'favorites'; - static const String playlistsKey = 'playlists'; - - // Pagination - static const int defaultPageSize = 20; - static const int searchPageSize = 15; - - // Audio Quality - static const Map audioQualities = { - 'low': '96kbps', - 'medium': '192kbps', - 'high': '320kbps', - 'lossless': 'FLAC', - }; - - // Error Messages - static const String networkErrorMessage = 'Please check your internet connection'; - static const String serverErrorMessage = 'Server is temporarily unavailable'; - static const String authErrorMessage = 'Please login to continue'; - static const String genericErrorMessage = 'Something went wrong. Please try again'; - - // Routes - static const String homeRoute = '/home'; - static const String libraryRoute = '/library'; - static const String playerRoute = '/player'; - static const String searchRoute = '/search'; - static const String playlistsRoute = '/playlists'; - static const String settingsRoute = '/settings'; - static const String authRoute = '/auth'; - static const String qrRoute = '/qr'; - static const String offlineRoute = '/offline'; - static const String analyticsRoute = '/analytics'; - static const String profileRoute = '/profile'; -} diff --git a/swingmusic_mobile/lib/core/constants/app_icons.dart b/swingmusic_mobile/lib/core/constants/app_icons.dart deleted file mode 100644 index 58a53824..00000000 --- a/swingmusic_mobile/lib/core/constants/app_icons.dart +++ /dev/null @@ -1,97 +0,0 @@ -import 'package:flutter/material.dart'; - -/// Unified icon constants and sizes matching web client -class AppIcons { - // Navigation icons - static const IconData home = Icons.home_outlined; - static const IconData homeFilled = Icons.home; - static const IconData search = Icons.search_outlined; - static const IconData searchFilled = Icons.search; - static const IconData library = Icons.library_music_outlined; - static const IconData libraryFilled = Icons.library_music; - - // Media control icons - static const IconData play = Icons.play_arrow; - static const IconData pause = Icons.pause; - static const IconData skipBack = Icons.skip_previous; - static const IconData skipForward = Icons.skip_next; - static const IconData volume = Icons.volume_up_outlined; - static const IconData volumeMuted = Icons.volume_off_outlined; - - // Content icons - static const IconData album = Icons.album; - static const IconData artist = Icons.person; - static const IconData track = Icons.music_note; - static const IconData folder = Icons.folder; - static const IconData playlist = Icons.playlist_play; - static const IconData favorite = Icons.favorite_border; - static const IconData favoriteFilled = Icons.favorite; - - // Action icons - static const IconData more = Icons.more_vert; - static const IconData add = Icons.add; - static const IconData download = Icons.download; - static const IconData share = Icons.share; - static const IconData settings = Icons.settings; - static const IconData notifications = Icons.notifications_outlined; - static const IconData user = Icons.person; - - // Status icons - static const IconData playing = Icons.equalizer; - static const IconData success = Icons.check_circle; - static const IconData error = Icons.error; - static const IconData warning = Icons.warning; - static const IconData info = Icons.info; -} - -/// Unified icon sizes matching web client -class AppIconSizes { - static const double xs = 16.0; - static const double sm = 20.0; - static const double md = 24.0; - static const double lg = 32.0; - static const double xl = 48.0; - static const double xxl = 64.0; - - // Navigation icons - static const double navigationSize = sm; - - // Media control icons - static const double mediaControlSize = lg; - static const double mediaControlSmallSize = md; - - // Content icons - static const double contentIconSize = md; - static const double contentIconLargeSize = lg; - - // Action icons - static const double actionIconSize = sm; - static const double actionIconLargeSize = md; - - // Status icons - static const double statusIconSize = sm; - static const double statusIconLargeSize = md; -} - -/// Icon widget with consistent styling -class AppIcon extends StatelessWidget { - final IconData icon; - final double? size; - final Color? color; - - const AppIcon({ - super.key, - required this.icon, - this.size, - this.color, - }); - - @override - Widget build(BuildContext context) { - return Icon( - icon, - size: size ?? AppIconSizes.contentIconSize, - color: color ?? Theme.of(context).colorScheme.onSurface, - ); - } -} diff --git a/swingmusic_mobile/lib/core/constants/app_spacing.dart b/swingmusic_mobile/lib/core/constants/app_spacing.dart deleted file mode 100644 index e73d2c9e..00000000 --- a/swingmusic_mobile/lib/core/constants/app_spacing.dart +++ /dev/null @@ -1,128 +0,0 @@ -import 'package:flutter/material.dart'; - -/// Unified spacing constants matching web client design tokens exactly -class AppSpacing { - // Base spacing unit (4px) matching web client - static const double xs = 4.0; // 0.25rem = $smallest - static const double sm = 8.0; // 0.5rem = $smaller - static const double md = 12.0; // 0.75rem - static const double lg = 16.0; // 1rem = $small - static const double xl = 20.0; // 1.25rem - static const double xxl = 24.0; // 1.5rem = $medium - static const double xxxl = 32.0; // 2rem = $large - static const double larger = 32.0; // $larger = 2rem - - // Web client exact sizing from _variables.scss - static const double bannerHeight = 288.0; // $banner-height: 18rem - static const double songItemHeight = 64.0; // $song-item-height: 4rem - static const double contentPaddingBottom = 32.0; // $content-padding-bottom: 2rem - static const double navHeight = 72.0; // $navheight: 4.5rem - static const double cardWidth = 172.0; // $cardwidth: 10.75rem - static const double maxPadLeft = 80.0; // $maxpadleft: 5rem - static const double padBottom = 64.0; // $padbottom: 4rem - - // Web client specific component sizing - static const double buttonHeight = 36.0; // 2.25rem from basic.scss - static const double buttonMoreWidth = 40.0; // 2.5rem from basic.scss - static const double progressBarHeight = 4.8; // 0.3rem from ProgressBar.scss - static const double searchHeight = 36.0; // 2.25rem from inputs.scss - static const double tabHeight = 32.0; // 2rem from search-tabheaders.scss - static const double stateSize = 32.0; // 2rem from state.scss - static const double explicitIconWidth = 14.4; // 0.9rem from basic.scss - static const double spinnerSize = 20.0; // 1.25rem from basic.scss - - // Grid spacing matching web client album-grid.scss - static const double gridPadding = 16.0; // 1rem padding - static const double gridGap = 16.0; // 1rem gap - static const double gridGapVertical = 32.0; // 2rem vertical gap - static const double gridMinWidth = 144.0; // 9rem min-width - - // Consistent padding - static const EdgeInsets paddingXS = EdgeInsets.all(xs); - static const EdgeInsets paddingSM = EdgeInsets.all(sm); - static const EdgeInsets paddingMD = EdgeInsets.all(md); - static const EdgeInsets paddingLG = EdgeInsets.all(lg); - static const EdgeInsets paddingXL = EdgeInsets.all(xl); - - // Consistent margins - static const EdgeInsets marginXS = EdgeInsets.all(xs); - static const EdgeInsets marginSM = EdgeInsets.all(sm); - static const EdgeInsets marginMD = EdgeInsets.all(md); - static const EdgeInsets marginLG = EdgeInsets.all(lg); - static const EdgeInsets marginXL = EdgeInsets.all(xl); - - // Horizontal spacing - static const EdgeInsets horizontalXS = EdgeInsets.symmetric(horizontal: xs); - static const EdgeInsets horizontalSM = EdgeInsets.symmetric(horizontal: sm); - static const EdgeInsets horizontalMD = EdgeInsets.symmetric(horizontal: md); - static const EdgeInsets horizontalLG = EdgeInsets.symmetric(horizontal: lg); - static const EdgeInsets horizontalXL = EdgeInsets.symmetric(horizontal: xl); - - // Vertical spacing - static const EdgeInsets verticalXS = EdgeInsets.symmetric(vertical: xs); - static const EdgeInsets verticalSM = EdgeInsets.symmetric(vertical: sm); - static const EdgeInsets verticalMD = EdgeInsets.symmetric(vertical: md); - static const EdgeInsets verticalLG = EdgeInsets.symmetric(vertical: lg); - static const EdgeInsets verticalXL = EdgeInsets.symmetric(vertical: xl); - - // Card spacing matching web client album card - static const EdgeInsets cardPadding = EdgeInsets.all(lg); - static const EdgeInsets cardMargin = EdgeInsets.all(sm); - - // List spacing - static const EdgeInsets listPadding = EdgeInsets.symmetric(vertical: sm); - static const double listItemSpacing = sm; - - // Section spacing - static const double sectionSpacing = xxl; - static const EdgeInsets sectionPadding = EdgeInsets.all(lg); - - // Button spacing matching web client - static const EdgeInsets buttonPadding = EdgeInsets.symmetric(horizontal: lg, vertical: md); - - // Form spacing - static const double formFieldSpacing = md; - static const EdgeInsets formPadding = EdgeInsets.all(lg); - - // Animation and timing constants matching web client - static const Duration transitionFast = Duration(milliseconds: 200); // 0.2s ease-out - static const Duration transitionNormal = Duration(milliseconds: 250); // 0.25s ease - static const Duration transitionSlow = Duration(milliseconds: 300); // 0.3s ease - static const Duration spinnerDuration = Duration(milliseconds: 450); // 0.45s linear infinite - static const Duration pulseDuration = Duration(milliseconds: 600); // 0.6s infinite - static const Duration pulseDelay = Duration(milliseconds: 120); // $i * 0.12s - - // Z-index values matching web client - static const int dimmerZIndex = 1001; // From Global/index.scss -} - -/// Unified border radius constants matching web client exactly -class AppBorderRadius { - static const double xs = 4.0; // 0.25rem - static const double sm = 8.0; // 0.5rem = $small - static const double md = 12.0; // 0.75rem - static const double lg = 16.0; // 1rem = $rounded - static const double xl = 20.0; // 1.25rem = $rounded-lg - static const double xxl = 24.0; // 1.5rem = $rounded-md - static const double circular = 160.0; // 10rem = .circular - static const double full = 9999.0; - - // Web client specific border radius values - static const double progressBar = 5.0; // 5px from ProgressBar.scss - static const double input = 3.0; // 3px from inputs.scss - static const double scrollbar = 16.0; // 16px from scrollbars.scss - static const double searchInput = 3.0; // 3px from inputs.scss - static const double duration = 8.0; // 0.5rem from BottomBar.scss - static const double dragImage = 4.0; // $smaller from basic.scss - static const double badge = 4.0; // $smaller from basic.scss - static const double explicitIcon = 4.0; // $smaller from basic.scss - - static BorderRadius circularXS = BorderRadius.circular(xs); - static BorderRadius circularSM = BorderRadius.circular(sm); - static BorderRadius circularMD = BorderRadius.circular(md); - static BorderRadius circularLG = BorderRadius.circular(lg); - static BorderRadius circularXL = BorderRadius.circular(xl); - static BorderRadius circularXXL = BorderRadius.circular(xxl); - static BorderRadius circularFull = BorderRadius.circular(full); - static BorderRadius circularCircular = BorderRadius.circular(circular); -} diff --git a/swingmusic_mobile/lib/core/enums/auth_state.dart b/swingmusic_mobile/lib/core/enums/auth_state.dart deleted file mode 100644 index 9794eb12..00000000 --- a/swingmusic_mobile/lib/core/enums/auth_state.dart +++ /dev/null @@ -1,24 +0,0 @@ -enum AuthState { - loggedOut, - authenticating, - authenticated, - error; - - String get displayName { - switch (this) { - case AuthState.loggedOut: - return 'Logged Out'; - case AuthState.authenticating: - return 'Authenticating'; - case AuthState.authenticated: - return 'Authenticated'; - case AuthState.error: - return 'Error'; - } - } - - bool get isLoggedIn => this == AuthState.authenticated; - bool get isLoggedOut => this == AuthState.loggedOut; - bool get isAuthenticating => this == AuthState.authenticating; - bool get hasError => this == AuthState.error; -} diff --git a/swingmusic_mobile/lib/core/enums/playback_mode.dart b/swingmusic_mobile/lib/core/enums/playback_mode.dart deleted file mode 100644 index f4bf8c7a..00000000 --- a/swingmusic_mobile/lib/core/enums/playback_mode.dart +++ /dev/null @@ -1,50 +0,0 @@ -enum RepeatMode { - off, - one, - all; - - String get displayName { - switch (this) { - case RepeatMode.off: - return 'Off'; - case RepeatMode.one: - return 'Repeat One'; - case RepeatMode.all: - return 'Repeat All'; - } - } - - RepeatMode next() { - switch (this) { - case RepeatMode.off: - return RepeatMode.all; - case RepeatMode.all: - return RepeatMode.one; - case RepeatMode.one: - return RepeatMode.off; - } - } -} - -enum ShuffleMode { - off, - on; - - String get displayName { - switch (this) { - case ShuffleMode.off: - return 'Off'; - case ShuffleMode.on: - return 'On'; - } - } - - ShuffleMode toggle() { - switch (this) { - case ShuffleMode.off: - return ShuffleMode.on; - case ShuffleMode.on: - return ShuffleMode.off; - } - } -} diff --git a/swingmusic_mobile/lib/core/themes/app_theme.dart b/swingmusic_mobile/lib/core/themes/app_theme.dart deleted file mode 100644 index dea7f7df..00000000 --- a/swingmusic_mobile/lib/core/themes/app_theme.dart +++ /dev/null @@ -1,237 +0,0 @@ -import 'package:flutter/material.dart'; - -class AppTheme { - // Unified color scheme matching web client exactly - static const Color primaryColor = Color(0xFF006EFF); // $highlight-blue - static const Color secondaryColor = Color(0xFF8B5CF6); // --color-secondary - static const Color tertiaryColor = Color(0xFF10B981); // --color-accent - - // Web client exact colors - static const Color highlightBlue = Color(0xFF006EFF); // $highlight-blue - static const Color darkestBlue = Color(0xFF234ECE); // $darkestblue - static const Color darkBlue = Color(0xFF055EE2); // $darkblue - - // Apple human design guideline colors (exact match) - static const Color black = Color(0xFF181A1C); // $black - static const Color white = Color(0xFFFFFFDE); // $white (with alpha) - static const Color gray = Color(0xFF1A1919); // $gray - static const Color gray1 = Color(0xFF8E8E93); // $gray1 - static const Color gray2 = Color(0xFF636366); // $gray2 - static const Color gray3 = Color(0xFF48484A); // $gray3 - static const Color gray4 = Color(0xFF3A3A3C); // $gray4 - static const Color gray5 = Color(0xFF2C2C2E); // $gray5 - static const Color body = Color(0xFF000000); // $body - - // Semantic colors (exact match) - static const Color red = Color(0xFFF7635C); // $red - static const Color blue = Color(0xFF0A84FF); // $blue - static const Color green = Color(0xFF5EF784); // $green - static const Color yellow = Color(0xFFFFD60A); // $yellow - static const Color orange = Color(0xFFFF9F0A); // $orange - static const Color pink = Color(0xFFFF375F); // $pink - static const Color purple = Color(0xFFBF5AF2); // $purple - static const Color brown = Color(0xFFAC8E68); // $brown - static const Color indigo = Color(0xFF5E5CE6); // $indigo - static const Color teal = Color(0xFF40C8E0); // $teal - static const Color lightBrown = Color(0xFFEBCA89); // $lightbrown - - static const Color surfaceColor = Color(0xFFFAFAFA); // --color-surface - static const Color surfaceVariantColor = Color(0xFFF5F5F5); // --color-surface-variant - static const Color backgroundColor = Color(0xFFFFFFFF); // --color-background - - static const Color onPrimaryColor = Color(0xFFFFFFFF); // --color-on-primary - static const Color onSecondaryColor = Color(0xFFFFFFFF); // --color-on-secondary - static const Color onTertiaryColor = Color(0xFFFFFFFF); // --color-on-accent - static const Color onSurfaceColor = Color(0xFF1C1C1C); // --color-on-surface - static const Color onBackgroundColor = Color(0xFF1C1C1C); // --color-on-background - - static const Color outlineColor = Color(0xFFE5E7EB); // --color-border - static const Color outlineVariantColor = Color(0xFFF3F4F6); // --color-divider - - // Status colors - static const Color successColor = Color(0xFF10B981); - static const Color warningColor = Color(0xFFF59E0B); - static const Color errorColor = Color(0xFFEF4444); - static const Color infoColor = Color(0xFF3B82F6); - - static ThemeData lightTheme = ThemeData( - useMaterial3: true, - // Exact font family matching web client with fallbacks - fontFamily: 'SF Compact Display', - colorScheme: const ColorScheme.light( - primary: primaryColor, - secondary: secondaryColor, - tertiary: tertiaryColor, - surface: surfaceColor, - surfaceVariant: surfaceVariantColor, - background: backgroundColor, - onPrimary: onPrimaryColor, - onSecondary: onSecondaryColor, - onTertiary: onTertiaryColor, - onSurface: onSurfaceColor, - onBackground: onBackgroundColor, - outline: outlineColor, - outlineVariant: outlineVariantColor, - ), - // Consistent transitions matching web client - pageTransitionsTheme: const PageTransitionsTheme( - builders: { - TargetPlatform.android: FadeUpwardsPageTransitionsBuilder(), - TargetPlatform.iOS: CupertinoPageTransitionsBuilder(), - TargetPlatform.linux: FadeUpwardsPageTransitionsBuilder(), - TargetPlatform.macOS: CupertinoPageTransitionsBuilder(), - TargetPlatform.windows: FadeUpwardsPageTransitionsBuilder(), - }, - ), - appBarTheme: const AppBarTheme( - centerTitle: true, - elevation: 0, - backgroundColor: Colors.transparent, - foregroundColor: onSurfaceColor, - ), - cardTheme: CardThemeData( - elevation: 0, // Match web client flat design - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)), - ), - elevatedButtonTheme: ElevatedButtonThemeData( - style: ElevatedButton.styleFrom( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), // Match web client rounded-sm ($small) - ), - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), // Consistent padding - elevation: 0, // Match web client flat design - backgroundColor: primaryColor, - foregroundColor: onPrimaryColor, - textStyle: const TextStyle( - fontFamily: 'SF Compact Display', - fontWeight: FontWeight.w700, // Match web client font-weight - fontSize: 14, // Match web client font-size (0.9rem) - ), - ), - ), - textTheme: const TextTheme( - headlineLarge: TextStyle( - fontSize: 36, // Match web client larger headings - fontWeight: FontWeight.w700, // Match web client font-weight - letterSpacing: 0, - height: 1.2, - ), - headlineMedium: TextStyle( - fontSize: 28, - fontWeight: FontWeight.w700, // Match web client font-weight - letterSpacing: 0, - height: 1.2, - ), - headlineSmall: TextStyle( - fontSize: 24, - fontWeight: FontWeight.w700, // Match web client font-weight - letterSpacing: 0, - height: 1.2, - ), - titleLarge: TextStyle( - fontSize: 20, // Match web client title size - fontWeight: FontWeight.w700, // Match web client font-weight - letterSpacing: 0, - height: 1.3, - ), - titleMedium: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, // Match web client font-weight - letterSpacing: 0.15, - height: 1.3, - ), - titleSmall: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w700, // Match web client font-weight - letterSpacing: 0.1, - height: 1.3, - ), - bodyLarge: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w400, // Match web client font-weight - letterSpacing: 0.5, - height: 1.4, - ), - bodyMedium: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w400, // Match web client font-weight - letterSpacing: 0.25, - height: 1.4, - ), - bodySmall: TextStyle( - fontSize: 12, - fontWeight: FontWeight.w400, // Match web client font-weight - letterSpacing: 0.4, - height: 1.4, - ), - labelLarge: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w700, // Match web client font-weight - letterSpacing: 0.1, - height: 1.2, - ), - labelMedium: TextStyle( - fontSize: 12, - fontWeight: FontWeight.w700, // Match web client font-weight - letterSpacing: 0.5, - height: 1.2, - ), - labelSmall: TextStyle( - fontSize: 11, - fontWeight: FontWeight.w700, // Match web client font-weight - letterSpacing: 0.5, - height: 1.2, - ), - ), - ); - - static ThemeData darkTheme = ThemeData( - useMaterial3: true, - // Exact font family matching web client with fallbacks - fontFamily: 'SF Compact Display', - colorScheme: const ColorScheme.dark( - primary: Color(0xFF4A90E2), // Lighter version of $highlight-blue for dark mode - secondary: Color(0xFFA78BFA), // Lighter secondary for dark mode - tertiary: Color(0xFF34D399), // Lighter accent for dark mode - surface: gray4, // Match web client $gray4 exactly - surfaceVariant: gray5, // Match web client $gray5 exactly - background: body, // Match web client $body exactly - onPrimary: Color(0xFF1C1C1C), // Dark text on light primary - onSecondary: Color(0xFF1C1C1C), // Dark text on light secondary - onTertiary: Color(0xFF1C1C1C), // Dark text on light accent - onSurface: white, // Match web client $white - onBackground: white, // Match web client $white - outline: gray3, // Match web client $gray4 - outlineVariant: gray4, // Match web client $gray5 - ), - appBarTheme: const AppBarTheme( - centerTitle: true, - elevation: 0, - backgroundColor: Colors.transparent, - foregroundColor: white, - ), - cardTheme: CardThemeData( - elevation: 0, // Match web client flat design - color: gray4, // Match web client card background - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(16), - ), - ), - elevatedButtonTheme: ElevatedButtonThemeData( - style: ElevatedButton.styleFrom( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), // Match web client rounded-sm ($small) - ), - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), // Consistent padding - elevation: 0, // Match web client flat design - backgroundColor: const Color(0xFF4A90E2), // Updated primary color for dark mode - foregroundColor: const Color(0xFF1C1C1C), // Dark text on light primary - textStyle: const TextStyle( - fontFamily: 'SF Compact Display', - fontWeight: FontWeight.w700, // Match web client font-weight - fontSize: 14, // Match web client font-size (0.9rem) - ), - ), - ), - ); -} diff --git a/swingmusic_mobile/lib/core/widgets/album_card.dart b/swingmusic_mobile/lib/core/widgets/album_card.dart deleted file mode 100644 index b4351947..00000000 --- a/swingmusic_mobile/lib/core/widgets/album_card.dart +++ /dev/null @@ -1,201 +0,0 @@ -import 'package:flutter/material.dart'; -import '../../data/models/album_model.dart'; -import '../../core/constants/app_spacing.dart'; -import '../../core/themes/app_theme.dart'; - -class AlbumCard extends StatefulWidget { - final AlbumModel album; - final VoidCallback? onTap; - final double? width; - final double? height; - - const AlbumCard({ - super.key, - required this.album, - this.onTap, - this.width, - this.height, - }); - - @override - State createState() => _AlbumCardState(); -} - -class _AlbumCardState extends State { - bool _isHovered = false; - - @override - Widget build(BuildContext context) { - return MouseRegion( - onEnter: (_) => setState(() => _isHovered = true), - onExit: (_) => setState(() => _isHovered = false), - child: Card( - clipBehavior: Clip.antiAlias, - elevation: 0, - shape: RoundedRectangleBorder( - borderRadius: AppBorderRadius.circularLG, - ), - color: _isHovered ? AppTheme.gray5 : null, // Match web client hover background - child: InkWell( - onTap: onTap, - borderRadius: AppBorderRadius.circularLG, - child: Container( - width: width ?? 160, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Album Art - Expanded( - child: Container( - width: double.infinity, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceVariant, - borderRadius: AppBorderRadius.circularLG, - ), - child: ClipRRect( - borderRadius: AppBorderRadius.circularLG, - child: Stack( - children: [ - if (album.image.isNotEmpty) - Image.network( - album.image, - fit: BoxFit.cover, - width: double.infinity, - height: double.infinity, - errorBuilder: (context, error, stackTrace) { - return _buildDefaultAlbumArt(context); - }, - ) - else - _buildDefaultAlbumArt(context), - // Gradient overlay matching web client - Positioned.fill( - child: AnimatedOpacity( - opacity: _isHovered ? 1.0 : 0.0, - duration: AppSpacing.transitionNormal, // 0.25s ease from web client - child: DecoratedBox( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.bottomCenter, - end: Alignment.topCenter, - colors: [ - Colors.black.withValues(alpha: 0.6), - Colors.transparent, - ], - stops: const [0.0, 0.8], - ), - ), - ), - ), - ), - // Play button overlay matching web client PlayBtn.vue exactly - Positioned( - bottom: 12, - right: 12, - child: AnimatedContainer( - duration: AppSpacing.transitionNormal, - transform: Matrix4.translationValues( - 0, - _isHovered ? 0 : 16, // translateY(1rem) = 16px - 0, - ), - child: AnimatedOpacity( - opacity: _isHovered ? 1.0 : 0.0, - duration: AppSpacing.transitionNormal, - child: Container( - width: 40, // 2.5rem = 40px - height: 40, - decoration: BoxDecoration( - color: AppTheme.darkBlue, // $darkblue exact match - shape: BoxShape.circle, - boxShadow: [ - // Match web client shadow effects - BoxShadow( - color: Colors.black.withValues(alpha: 0.3), - blurRadius: 8, - offset: const Offset(0, 2), - ), - ], - ), - child: Icon( - Icons.play_arrow, - color: AppTheme.onPrimaryColor, - size: 28, // 1.75rem = 28px - ), - ), - ), - ), - ), - ], - ), - ), - ), - ), - - // Album Info - Padding( - padding: const EdgeInsets.all(12.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - album.displayTitle, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontWeight: FontWeight.w700, - fontSize: 15, // 0.95rem from web client - ), - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 4), - Text( - album.artistNames, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.75), - fontWeight: FontWeight.w700, - fontSize: 13, // 0.8rem from web client - ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - if (album.year.isNotEmpty) ...[ - const SizedBox(height: 2), - Text( - album.year, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.6), - fontSize: 12, - ), - ), - ], - ], - ), - ), - ], - ), - ), - ), - ), - ); - } - - Widget _buildDefaultAlbumArt(BuildContext context) { - return Container( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Theme.of(context).colorScheme.primary.withOpacity(0.7), - Theme.of(context).colorScheme.secondary.withOpacity(0.7), - ], - ), - ), - child: Icon( - Icons.album, - size: 48, - color: Theme.of(context).colorScheme.onPrimary, - ), - ); - } -} diff --git a/swingmusic_mobile/lib/core/widgets/mini_player.dart b/swingmusic_mobile/lib/core/widgets/mini_player.dart deleted file mode 100644 index 6be5fd5a..00000000 --- a/swingmusic_mobile/lib/core/widgets/mini_player.dart +++ /dev/null @@ -1,169 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../shared/providers/audio_provider.dart'; - -class MiniPlayer extends StatelessWidget { - const MiniPlayer({super.key}); - - @override - Widget build(BuildContext context) { - return Consumer( - builder: (context, audioProvider, child) { - final currentTrack = audioProvider.currentTrack; - - if (currentTrack == null) { - return const SizedBox.shrink(); - } - - return Container( - height: 80, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surface, - boxShadow: [ - BoxShadow( - color: Colors.black.withOpacity(0.1), - blurRadius: 8, - offset: const Offset(0, -2), - ), - ], - ), - child: InkWell( - onTap: () { - // Navigate to full player - Navigator.pushNamed(context, '/player'); - }, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0), - child: Row( - children: [ - // Album Art - ClipRRect( - borderRadius: BorderRadius.circular(4), - child: Container( - width: 56, - height: 56, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceVariant, - ), - child: currentTrack.image.isNotEmpty - ? Image.network( - currentTrack.image, - fit: BoxFit.cover, - errorBuilder: (context, error, stackTrace) { - return _buildDefaultArt(context); - }, - ) - : _buildDefaultArt(context), - ), - ), - - const SizedBox(width: 12), - - // Track Info - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - currentTrack.displayTitle, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontWeight: FontWeight.w500, - ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 2), - Text( - currentTrack.artistNames, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - ], - ), - ), - - // Progress Indicator - if (audioProvider.duration.inMilliseconds > 0) - SizedBox( - width: 40, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - '${audioProvider.positionFormatted} / ${audioProvider.durationFormatted}', - style: Theme.of(context).textTheme.bodySmall?.copyWith( - fontSize: 10, - ), - ), - const SizedBox(height: 4), - LinearProgressIndicator( - value: audioProvider.progress, - backgroundColor: Theme.of(context).colorScheme.surfaceVariant, - valueColor: AlwaysStoppedAnimation( - Theme.of(context).colorScheme.primary, - ), - ), - ], - ), - ), - - const SizedBox(width: 8), - - // Play/Pause Button - IconButton( - onPressed: () { - if (audioProvider.isPlaying) { - audioProvider.pause(); - } else { - audioProvider.play(); - } - }, - icon: audioProvider.isLoading - ? SizedBox( - width: 20, - height: 20, - child: CircularProgressIndicator( - strokeWidth: 2, - valueColor: AlwaysStoppedAnimation( - Theme.of(context).colorScheme.primary, - ), - ), - ) - : Icon( - audioProvider.isPlaying ? Icons.pause : Icons.play_arrow, - color: Theme.of(context).colorScheme.primary, - ), - ), - ], - ), - ), - ), - ); - }, - ); - } - - Widget _buildDefaultArt(BuildContext context) { - return Container( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Theme.of(context).colorScheme.primary.withOpacity(0.7), - Theme.of(context).colorScheme.secondary.withOpacity(0.7), - ], - ), - ), - child: Icon( - Icons.music_note, - size: 24, - color: Theme.of(context).colorScheme.onPrimary, - ), - ); - } -} diff --git a/swingmusic_mobile/lib/core/widgets/track_list_tile.dart b/swingmusic_mobile/lib/core/widgets/track_list_tile.dart deleted file mode 100644 index 0a6fbb28..00000000 --- a/swingmusic_mobile/lib/core/widgets/track_list_tile.dart +++ /dev/null @@ -1,141 +0,0 @@ -import 'package:flutter/material.dart'; -import '../../data/models/track_model.dart'; - -class TrackListTile extends StatelessWidget { - final TrackModel track; - final VoidCallback? onTap; - final VoidCallback? onPlay; - final bool isPlaying; - final bool showAlbumArt; - final Widget? trailing; - - const TrackListTile({ - super.key, - required this.track, - this.onTap, - this.onPlay, - this.isPlaying = false, - this.showAlbumArt = true, - this.trailing, - }); - - @override - Widget build(BuildContext context) { - return ListTile( - onTap: onTap, - dense: true, - leading: showAlbumArt - ? ClipRRect( - borderRadius: BorderRadius.circular(4), - child: Container( - width: 48, - height: 48, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceVariant, - ), - child: track.image.isNotEmpty - ? Image.network( - track.image, - fit: BoxFit.cover, - errorBuilder: (context, error, stackTrace) { - return _buildDefaultArt(context); - }, - ) - : _buildDefaultArt(context), - ), - ) - : SizedBox( - width: 24, - child: Center( - child: isPlaying - ? Icon( - Icons.equalizer, - size: 16, - color: Theme.of(context).colorScheme.primary, - ) - : Text( - '${track.track}', - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ), - ), - title: Text( - track.displayTitle, - style: TextStyle( - fontWeight: isPlaying ? FontWeight.w600 : FontWeight.normal, - color: isPlaying - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurface, - ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - subtitle: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - track.artistNames, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - if (track.displayAlbum.isNotEmpty) - Text( - track.displayAlbum, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - ], - ), - trailing: trailing ?? - Row( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - track.durationFormatted, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - const SizedBox(width: 8), - if (onPlay != null) - IconButton( - icon: Icon( - isPlaying ? Icons.pause : Icons.play_arrow, - color: Theme.of(context).colorScheme.primary, - ), - onPressed: onPlay, - visualDensity: VisualDensity.compact, - ), - ], - ), - ); - } - - Widget _buildDefaultArt(BuildContext context) { - return Container( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Theme.of(context).colorScheme.primary.withOpacity(0.7), - Theme.of(context).colorScheme.secondary.withOpacity(0.7), - ], - ), - ), - child: Icon( - Icons.music_note, - size: 24, - color: Theme.of(context).colorScheme.onPrimary, - ), - ); - } -} diff --git a/swingmusic_mobile/lib/data/models/album_model.dart b/swingmusic_mobile/lib/data/models/album_model.dart deleted file mode 100644 index cde6d033..00000000 --- a/swingmusic_mobile/lib/data/models/album_model.dart +++ /dev/null @@ -1,236 +0,0 @@ -import 'package:equatable/equatable.dart'; -import 'track_model.dart'; - -class AlbumModel extends Equatable { - final List albumartists; - final String albumhash; - final List artisthashes; - final String baseTitle; - final String color; - final int createdDate; - final int date; - final int duration; - final List genres; - final List genrehashes; - final String originalTitle; - final String title; - final int trackcount; - final int lastplayed; - final int playcount; - final int playduration; - final Map extra; - final String pathhash; - final int id; - final String type; - final String image; - final double score; - final List versions; - final List favUserids; - final String weakHash; - final bool isFavorite; - - const AlbumModel({ - required this.albumartists, - required this.albumhash, - required this.artisthashes, - required this.baseTitle, - this.color = '#6750A4', - required this.createdDate, - required this.date, - required this.duration, - required this.genres, - required this.genrehashes, - this.originalTitle = '', - required this.title, - required this.trackcount, - this.lastplayed = 0, - this.playcount = 0, - this.playduration = 0, - this.extra = const {}, - this.pathhash = '', - this.id = -1, - this.type = 'album', - this.image = '', - this.score = 0.0, - this.versions = const [], - this.favUserids = const [], - this.weakHash = '', - this.isFavorite = false, - }); - - AlbumModel copyWith({ - List? albumartists, - String? albumhash, - List? artisthashes, - String? baseTitle, - String? color, - int? createdDate, - int? date, - int? duration, - List? genres, - List? genrehashes, - String? originalTitle, - String? title, - int? trackcount, - int? lastplayed, - int? playcount, - int? playduration, - Map? extra, - String? pathhash, - int? id, - String? type, - String? image, - double? score, - List? versions, - List? favUserids, - String? weakHash, - bool? isFavorite, - }) { - return AlbumModel( - albumartists: albumartists ?? this.albumartists, - albumhash: albumhash ?? this.albumhash, - artisthashes: artisthashes ?? this.artisthashes, - baseTitle: baseTitle ?? this.baseTitle, - color: color ?? this.color, - createdDate: createdDate ?? this.createdDate, - date: date ?? this.date, - duration: duration ?? this.duration, - genres: genres ?? this.genres, - genrehashes: genrehashes ?? this.genrehashes, - originalTitle: originalTitle ?? this.originalTitle, - title: title ?? this.title, - trackcount: trackcount ?? this.trackcount, - lastplayed: lastplayed ?? this.lastplayed, - playcount: playcount ?? this.playcount, - playduration: playduration ?? this.playduration, - extra: extra ?? this.extra, - pathhash: pathhash ?? this.pathhash, - id: id ?? this.id, - type: type ?? this.type, - image: image ?? this.image, - score: score ?? this.score, - versions: versions ?? this.versions, - favUserids: favUserids ?? this.favUserids, - weakHash: weakHash ?? this.weakHash, - isFavorite: isFavorite ?? this.isFavorite, - ); - } - - @override - List get props => [ - albumartists, - albumhash, - artisthashes, - baseTitle, - color, - createdDate, - date, - duration, - genres, - genrehashes, - originalTitle, - title, - trackcount, - lastplayed, - playcount, - playduration, - extra, - pathhash, - id, - type, - image, - score, - versions, - favUserids, - weakHash, - isFavorite, - ]; - - String get displayTitle => originalTitle.isNotEmpty ? originalTitle : title; - - String get artistNames => albumartists.map((artist) => artist.name).join(', '); - - String get durationFormatted { - final hours = duration ~/ 3600; - final minutes = (duration % 3600) ~/ 60; - final seconds = duration % 60; - - if (hours > 0) { - return '${hours}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'; - } else { - return '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'; - } - } - - String get year { - if (date == 0) return ''; - final dateTime = DateTime.fromMillisecondsSinceEpoch(date * 1000); - return dateTime.year.toString(); - } - - factory AlbumModel.fromJson(Map json) { - return AlbumModel( - albumartists: (json['albumartists'] as List?) - ?.map((artist) => ArtistModel.fromJson(artist)) - .toList() ?? [], - albumhash: json['albumhash'] ?? '', - artisthashes: List.from(json['artisthashes'] ?? []), - baseTitle: json['base_title'] ?? '', - color: json['color'] ?? '#6750A4', - createdDate: json['created_date'] ?? 0, - date: json['date'] ?? 0, - duration: json['duration'] ?? 0, - genres: (json['genres'] as List?) - ?.map((genre) => GenreModel.fromJson(genre)) - .toList() ?? [], - genrehashes: List.from(json['genrehashes'] ?? []), - originalTitle: json['original_title'] ?? '', - title: json['title'] ?? '', - trackcount: json['trackcount'] ?? 0, - lastplayed: json['lastplayed'] ?? 0, - playcount: json['playcount'] ?? 0, - playduration: json['playduration'] ?? 0, - extra: json['extra'] ?? {}, - pathhash: json['pathhash'] ?? '', - id: json['id'] ?? -1, - type: json['type'] ?? 'album', - image: json['image'] ?? '', - score: (json['score'] ?? 0).toDouble(), - versions: List.from(json['versions'] ?? []), - favUserids: List.from(json['fav_userids'] ?? []), - weakHash: json['weak_hash'] ?? '', - isFavorite: json['is_favorite'] ?? false, - ); - } - - Map toJson() { - return { - 'albumartists': albumartists.map((artist) => artist.toJson()).toList(), - 'albumhash': albumhash, - 'artisthashes': artisthashes, - 'base_title': baseTitle, - 'color': color, - 'created_date': createdDate, - 'date': date, - 'duration': duration, - 'genres': genres.map((genre) => genre.toJson()).toList(), - 'genrehashes': genrehashes, - 'original_title': originalTitle, - 'title': title, - 'trackcount': trackcount, - 'lastplayed': lastplayed, - 'playcount': playcount, - 'playduration': playduration, - 'extra': extra, - 'pathhash': pathhash, - 'id': id, - 'type': type, - 'image': image, - 'score': score, - 'versions': versions, - 'fav_userids': favUserids, - 'weak_hash': weakHash, - 'is_favorite': isFavorite, - }; - } -} diff --git a/swingmusic_mobile/lib/data/models/artist_model.dart b/swingmusic_mobile/lib/data/models/artist_model.dart deleted file mode 100644 index 038c9255..00000000 --- a/swingmusic_mobile/lib/data/models/artist_model.dart +++ /dev/null @@ -1,96 +0,0 @@ -import 'package:equatable/equatable.dart'; -import 'album_model.dart'; -import 'track_model.dart'; - -class ArtistModel extends Equatable { - final String name; - final String artisthash; - final String image; - final int trackcount; - final int albumcount; - final int duration; - final int lastplayed; - final int playcount; - final int playduration; - final List favUserids; - final bool isFavorite; - final List albums; - final List tracks; - - const ArtistModel({ - required this.name, - required this.artisthash, - this.image = '', - this.trackcount = 0, - this.albumcount = 0, - this.duration = 0, - this.lastplayed = 0, - this.playcount = 0, - this.playduration = 0, - this.favUserids = const [], - this.isFavorite = false, - this.albums = const [], - this.tracks = const [], - }); - - ArtistModel copyWith({ - String? name, - String? artisthash, - String? image, - int? trackcount, - int? albumcount, - int? duration, - int? lastplayed, - int? playcount, - int? playduration, - List? favUserids, - bool? isFavorite, - List? albums, - List? tracks, - }) { - return ArtistModel( - name: name ?? this.name, - artisthash: artisthash ?? this.artisthash, - image: image ?? this.image, - trackcount: trackcount ?? this.trackcount, - albumcount: albumcount ?? this.albumcount, - duration: duration ?? this.duration, - lastplayed: lastplayed ?? this.lastplayed, - playcount: playcount ?? this.playcount, - playduration: playduration ?? this.playduration, - favUserids: favUserids ?? this.favUserids, - isFavorite: isFavorite ?? this.isFavorite, - albums: albums ?? this.albums, - tracks: tracks ?? this.tracks, - ); - } - - @override - List get props => [ - name, - artisthash, - image, - trackcount, - albumcount, - duration, - lastplayed, - playcount, - playduration, - favUserids, - isFavorite, - albums, - tracks, - ]; - - String get durationFormatted { - final hours = duration ~/ 3600; - final minutes = (duration % 3600) ~/ 60; - final seconds = duration % 60; - - if (hours > 0) { - return '${hours}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'; - } else { - return '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'; - } - } -} diff --git a/swingmusic_mobile/lib/data/models/folder_model.dart b/swingmusic_mobile/lib/data/models/folder_model.dart deleted file mode 100644 index fa447229..00000000 --- a/swingmusic_mobile/lib/data/models/folder_model.dart +++ /dev/null @@ -1,123 +0,0 @@ -import 'package:equatable/equatable.dart'; -import 'track_model.dart'; - -class FolderModel extends Equatable { - final String name; - final String path; - final String? parent; - final int trackcount; - final List subfolders; - final List tracks; - final String? image; - final bool isFavorite; - - const FolderModel({ - required this.name, - required this.path, - this.parent, - this.trackcount = 0, - this.subfolders = const [], - this.tracks = const [], - this.image, - this.isFavorite = false, - }); - - FolderModel copyWith({ - String? name, - String? path, - String? parent, - int? trackcount, - List? subfolders, - List? tracks, - String? image, - bool? isFavorite, - }) { - return FolderModel( - name: name ?? this.name, - path: path ?? this.path, - parent: parent ?? this.parent, - trackcount: trackcount ?? this.trackcount, - subfolders: subfolders ?? this.subfolders, - tracks: tracks ?? this.tracks, - image: image ?? this.image, - isFavorite: isFavorite ?? this.isFavorite, - ); - } - - factory FolderModel.fromJson(Map json) { - return FolderModel( - name: json['name'] ?? '', - path: json['path'] ?? '', - parent: json['parent'], - trackcount: json['trackcount'] ?? 0, - subfolders: (json['subfolders'] as List?) - ?.map((folder) => FolderModel.fromJson(folder)) - .toList() ?? [], - tracks: (json['tracks'] as List?) - ?.map((track) => TrackModel.fromJson(track)) - .toList() ?? [], - image: json['image'], - isFavorite: json['is_favorite'] ?? false, - ); - } - - Map toJson() { - return { - 'name': name, - 'path': path, - 'parent': parent, - 'trackcount': trackcount, - 'subfolders': subfolders.map((folder) => folder.toJson()).toList(), - 'tracks': tracks.map((track) => track.toJson()).toList(), - 'image': image, - 'is_favorite': isFavorite, - }; - } - - @override - List get props => [ - name, - path, - parent, - trackcount, - subfolders, - tracks, - image, - isFavorite, - ]; -} - -class FoldersAndTracksModel extends Equatable { - final List folders; - final List tracks; - final String currentPath; - - const FoldersAndTracksModel({ - required this.folders, - required this.tracks, - required this.currentPath, - }); - - factory FoldersAndTracksModel.fromJson(Map json) { - return FoldersAndTracksModel( - folders: (json['folders'] as List?) - ?.map((folder) => FolderModel.fromJson(folder)) - .toList() ?? [], - tracks: (json['tracks'] as List?) - ?.map((track) => TrackModel.fromJson(track)) - .toList() ?? [], - currentPath: json['current_path'] ?? '', - ); - } - - Map toJson() { - return { - 'folders': folders.map((folder) => folder.toJson()).toList(), - 'tracks': tracks.map((track) => track.toJson()).toList(), - 'current_path': currentPath, - }; - } - - @override - List get props => [folders, tracks, currentPath]; -} diff --git a/swingmusic_mobile/lib/data/models/playlist_model.dart b/swingmusic_mobile/lib/data/models/playlist_model.dart deleted file mode 100644 index 06a2d636..00000000 --- a/swingmusic_mobile/lib/data/models/playlist_model.dart +++ /dev/null @@ -1,152 +0,0 @@ -import 'package:equatable/equatable.dart'; -import 'track_model.dart'; - -class PlaylistModel extends Equatable { - final String id; - final String name; - final String description; - final String image; - final List tracks; - final int trackcount; - final int duration; - final DateTime createdDate; - final DateTime lastModified; - final bool isPublic; - final bool isCollaborative; - final String owner; - final List collaboratorIds; - final Map extra; - - const PlaylistModel({ - required this.id, - required this.name, - this.description = '', - this.image = '', - this.tracks = const [], - this.trackcount = 0, - this.duration = 0, - required this.createdDate, - required this.lastModified, - this.isPublic = false, - this.isCollaborative = false, - this.owner = '', - this.collaboratorIds = const [], - this.extra = const {}, - }); - - PlaylistModel copyWith({ - String? id, - String? name, - String? description, - String? image, - List? tracks, - int? trackcount, - int? duration, - DateTime? createdDate, - DateTime? lastModified, - bool? isPublic, - bool? isCollaborative, - String? owner, - List? collaboratorIds, - Map? extra, - }) { - return PlaylistModel( - id: id ?? this.id, - name: name ?? this.name, - description: description ?? this.description, - image: image ?? this.image, - tracks: tracks ?? this.tracks, - trackcount: trackcount ?? this.trackcount, - duration: duration ?? this.duration, - createdDate: createdDate ?? this.createdDate, - lastModified: lastModified ?? this.lastModified, - isPublic: isPublic ?? this.isPublic, - isCollaborative: isCollaborative ?? this.isCollaborative, - owner: owner ?? this.owner, - collaboratorIds: collaboratorIds ?? this.collaboratorIds, - extra: extra ?? this.extra, - ); - } - - @override - List get props => [ - id, - name, - description, - image, - tracks, - trackcount, - duration, - createdDate, - lastModified, - isPublic, - isCollaborative, - owner, - collaboratorIds, - extra, - ]; - - String get durationFormatted { - final hours = duration ~/ 3600; - final minutes = (duration % 3600) ~/ 60; - final seconds = duration % 60; - - if (hours > 0) { - return '${hours}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'; - } else { - return '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'; - } - } - - String get createdDateFormatted { - return '${createdDate.day.toString().padLeft(2, '0')}/${createdDate.month.toString().padLeft(2, '0')}/${createdDate.year}'; - } - - String get lastModifiedFormatted { - return '${lastModified.day.toString().padLeft(2, '0')}/${lastModified.month.toString().padLeft(2, '0')}/${lastModified.year}'; - } - - factory PlaylistModel.fromJson(Map json) { - return PlaylistModel( - id: json['id'] ?? '', - name: json['name'] ?? '', - description: json['description'] ?? '', - image: json['image'] ?? '', - tracks: (json['tracks'] as List?) - ?.map((track) => TrackModel.fromJson(track)) - .toList() ?? [], - trackcount: json['trackcount'] ?? 0, - duration: json['duration'] ?? 0, - createdDate: json['created_date'] != null - ? DateTime.parse(json['created_date']) - : DateTime.now(), - lastModified: json['last_modified'] != null - ? DateTime.parse(json['last_modified']) - : DateTime.now(), - isPublic: json['is_public'] ?? false, - isCollaborative: json['is_collaborative'] ?? false, - owner: json['owner'] ?? '', - collaboratorIds: List.from(json['collaborator_ids'] ?? []), - extra: json['extra'] ?? {}, - ); - } - - Map toJson() { - return { - 'id': id, - 'name': name, - 'description': description, - 'image': image, - 'tracks': tracks.map((track) => track.toJson()).toList(), - 'trackcount': trackcount, - 'duration': duration, - 'created_date': createdDate.toIso8601String(), - 'last_modified': lastModified.toIso8601String(), - 'is_public': isPublic, - 'is_collaborative': isCollaborative, - 'owner': owner, - 'collaborator_ids': collaboratorIds, - 'extra': extra, - }; - } -} diff --git a/swingmusic_mobile/lib/data/models/search_results_model.dart b/swingmusic_mobile/lib/data/models/search_results_model.dart deleted file mode 100644 index 9993caca..00000000 --- a/swingmusic_mobile/lib/data/models/search_results_model.dart +++ /dev/null @@ -1,153 +0,0 @@ -import 'package:equatable/equatable.dart'; -import 'album_model.dart'; -import 'folder_model.dart'; -import 'playlist_model.dart'; -import 'track_model.dart'; - -class SearchResultsModel extends Equatable { - final List tracks; - final List albums; - final List artists; - final List folders; - final List playlists; - - const SearchResultsModel({ - this.tracks = const [], - this.albums = const [], - this.artists = const [], - this.folders = const [], - this.playlists = const [], - }); - - SearchResultsModel copyWith({ - List? tracks, - List? albums, - List? artists, - List? folders, - List? playlists, - }) { - return SearchResultsModel( - tracks: tracks ?? this.tracks, - albums: albums ?? this.albums, - artists: artists ?? this.artists, - folders: folders ?? this.folders, - playlists: playlists ?? this.playlists, - ); - } - - factory SearchResultsModel.fromJson(Map json) { - return SearchResultsModel( - tracks: (json['tracks'] as List?) - ?.map((track) => TrackModel.fromJson(track)) - .toList() ?? [], - albums: (json['albums'] as List?) - ?.map((album) => AlbumModel.fromJson(album)) - .toList() ?? [], - artists: (json['artists'] as List?) - ?.map((artist) => ArtistModel.fromJson(artist)) - .toList() ?? [], - folders: (json['folders'] as List?) - ?.map((folder) => FolderModel.fromJson(folder)) - .toList() ?? [], - playlists: (json['playlists'] as List?) - ?.map((playlist) => PlaylistModel.fromJson(playlist)) - .toList() ?? [], - ); - } - - Map toJson() { - return { - 'tracks': tracks.map((track) => track.toJson()).toList(), - 'albums': albums.map((album) => album.toJson()).toList(), - 'artists': artists.map((artist) => artist.toJson()).toList(), - 'folders': folders.map((folder) => folder.toJson()).toList(), - 'playlists': playlists.map((playlist) => playlist.toJson()).toList(), - }; - } - - bool get isEmpty => - tracks.isEmpty && - albums.isEmpty && - artists.isEmpty && - folders.isEmpty && - playlists.isEmpty; - - bool get isNotEmpty => !isEmpty; - - @override - List get props => [ - tracks, - albums, - artists, - folders, - playlists, - ]; -} - -class TopSearchResultsModel extends Equatable { - final List topResults; - final SearchResultsModel allResults; - - const TopSearchResultsModel({ - required this.topResults, - required this.allResults, - }); - - factory TopSearchResultsModel.fromJson(Map json) { - return TopSearchResultsModel( - topResults: (json['top_results'] as List?) - ?.map((item) => TopResultItemModel.fromJson(item)) - .toList() ?? [], - allResults: SearchResultsModel.fromJson(json['all_results'] ?? {}), - ); - } - - Map toJson() { - return { - 'top_results': topResults.map((item) => item.toJson()).toList(), - 'all_results': allResults.toJson(), - }; - } - - @override - List get props => [topResults, allResults]; -} - -class TopResultItemModel extends Equatable { - final String type; // 'track', 'album', 'artist', 'folder', 'playlist' - final String title; - final String subtitle; - final String? image; - final dynamic data; // The actual model object - - const TopResultItemModel({ - required this.type, - required this.title, - required this.subtitle, - this.image, - this.data, - }); - - factory TopResultItemModel.fromJson(Map json) { - return TopResultItemModel( - type: json['type'] ?? '', - title: json['title'] ?? '', - subtitle: json['subtitle'] ?? '', - image: json['image'], - data: json['data'], - ); - } - - Map toJson() { - return { - 'type': type, - 'title': title, - 'subtitle': subtitle, - 'image': image, - 'data': data, - }; - } - - @override - List get props => [type, title, subtitle, image, data]; -} diff --git a/swingmusic_mobile/lib/data/models/search_suggestion_model.dart b/swingmusic_mobile/lib/data/models/search_suggestion_model.dart deleted file mode 100644 index 5160957e..00000000 --- a/swingmusic_mobile/lib/data/models/search_suggestion_model.dart +++ /dev/null @@ -1,15 +0,0 @@ -class SearchSuggestion { - final String id; - final String title; - final String? imageUrl; - final String type; // 'track', 'album', 'artist', 'playlist' - final dynamic data; - - SearchSuggestion({ - required this.id, - required this.title, - this.imageUrl, - required this.type, - this.data, - }); -} diff --git a/swingmusic_mobile/lib/data/models/track_model.dart b/swingmusic_mobile/lib/data/models/track_model.dart deleted file mode 100644 index b477d3ba..00000000 --- a/swingmusic_mobile/lib/data/models/track_model.dart +++ /dev/null @@ -1,316 +0,0 @@ -import 'package:equatable/equatable.dart'; - -class TrackModel extends Equatable { - final int id; - final String title; - final String album; - final String originalTitle; - final String albumhash; - final String originalAlbum; - final List artists; - final List albumartists; - final List artisthashes; - final int track; - final int disc; - final int duration; - final int bitrate; - final String filepath; - final String folder; - final List genres; - final List genrehashes; - final String copyright; - final int date; - final int lastModified; - final String trackhash; - final String image; - final String weakHash; - final Map extra; - final int lastplayed; - final int playcount; - final int playduration; - final bool explicit; - final List favUserids; - final bool isFavorite; - final double score; - - const TrackModel({ - required this.id, - required this.title, - required this.album, - this.originalTitle = '', - required this.albumhash, - this.originalAlbum = '', - required this.artists, - required this.albumartists, - required this.artisthashes, - required this.track, - required this.disc, - required this.duration, - required this.bitrate, - required this.filepath, - required this.folder, - required this.genres, - required this.genrehashes, - this.copyright = '', - required this.date, - required this.lastModified, - required this.trackhash, - this.image = '', - this.weakHash = '', - required this.extra, - this.lastplayed = 0, - this.playcount = 0, - this.playduration = 0, - this.explicit = false, - this.favUserids = const [], - this.isFavorite = false, - this.score = 0.0, - }); - - TrackModel copyWith({ - int? id, - String? title, - String? album, - String? originalTitle, - String? albumhash, - String? originalAlbum, - List? artists, - List? albumartists, - List? artisthashes, - int? track, - int? disc, - int? duration, - int? bitrate, - String? filepath, - String? folder, - List? genres, - List? genrehashes, - String? copyright, - int? date, - int? lastModified, - String? trackhash, - String? image, - String? weakHash, - Map? extra, - int? lastplayed, - int? playcount, - int? playduration, - bool? explicit, - List? favUserids, - bool? isFavorite, - double? score, - }) { - return TrackModel( - id: id ?? this.id, - title: title ?? this.title, - album: album ?? this.album, - originalTitle: originalTitle ?? this.originalTitle, - albumhash: albumhash ?? this.albumhash, - originalAlbum: originalAlbum ?? this.originalAlbum, - artists: artists ?? this.artists, - albumartists: albumartists ?? this.albumartists, - artisthashes: artisthashes ?? this.artisthashes, - track: track ?? this.track, - disc: disc ?? this.disc, - duration: duration ?? this.duration, - bitrate: bitrate ?? this.bitrate, - filepath: filepath ?? this.filepath, - folder: folder ?? this.folder, - genres: genres ?? this.genres, - genrehashes: genrehashes ?? this.genrehashes, - copyright: copyright ?? this.copyright, - date: date ?? this.date, - lastModified: lastModified ?? this.lastModified, - trackhash: trackhash ?? this.trackhash, - image: image ?? this.image, - weakHash: weakHash ?? this.weakHash, - extra: extra ?? this.extra, - lastplayed: lastplayed ?? this.lastplayed, - playcount: playcount ?? this.playcount, - playduration: playduration ?? this.playduration, - explicit: explicit ?? this.explicit, - favUserids: favUserids ?? this.favUserids, - isFavorite: isFavorite ?? this.isFavorite, - score: score ?? this.score, - ); - } - - @override - List get props => [ - id, - title, - album, - originalTitle, - albumhash, - originalAlbum, - artists, - albumartists, - artisthashes, - track, - disc, - duration, - bitrate, - filepath, - folder, - genres, - genrehashes, - copyright, - date, - lastModified, - trackhash, - image, - weakHash, - extra, - lastplayed, - playcount, - playduration, - explicit, - favUserids, - isFavorite, - score, - ]; - - String get displayTitle => originalTitle.isNotEmpty ? originalTitle : title; - - String get displayAlbum => originalAlbum.isNotEmpty ? originalAlbum : album; - - String get artistNames => artists.map((artist) => artist.name).join(', '); - - String get durationFormatted { - final minutes = duration ~/ 60; - final seconds = duration % 60; - return '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'; - } - - factory TrackModel.fromJson(Map json) { - return TrackModel( - id: json['id'] ?? 0, - title: json['title'] ?? '', - album: json['album'] ?? '', - originalTitle: json['original_title'] ?? '', - albumhash: json['albumhash'] ?? '', - originalAlbum: json['original_album'] ?? '', - artists: (json['artists'] as List?) - ?.map((artist) => ArtistModel.fromJson(artist)) - .toList() ?? [], - albumartists: (json['albumartists'] as List?) - ?.map((artist) => ArtistModel.fromJson(artist)) - .toList() ?? [], - artisthashes: List.from(json['artisthashes'] ?? []), - track: json['track'] ?? 0, - disc: json['disc'] ?? 1, - duration: json['duration'] ?? 0, - bitrate: json['bitrate'] ?? 0, - filepath: json['filepath'] ?? '', - folder: json['folder'] ?? '', - genres: (json['genres'] as List?) - ?.map((genre) => GenreModel.fromJson(genre)) - .toList() ?? [], - genrehashes: List.from(json['genrehashes'] ?? []), - copyright: json['copyright'] ?? '', - date: json['date'] ?? 0, - lastModified: json['last_modified'] ?? 0, - trackhash: json['trackhash'] ?? '', - image: json['image'] ?? '', - weakHash: json['weak_hash'] ?? '', - extra: json['extra'] ?? {}, - lastplayed: json['lastplayed'] ?? 0, - playcount: json['playcount'] ?? 0, - playduration: json['playduration'] ?? 0, - explicit: json['explicit'] ?? false, - favUserids: List.from(json['fav_userids'] ?? []), - isFavorite: json['is_favorite'] ?? false, - score: (json['score'] ?? 0).toDouble(), - ); - } - - Map toJson() { - return { - 'id': id, - 'title': title, - 'album': album, - 'original_title': originalTitle, - 'albumhash': albumhash, - 'original_album': originalAlbum, - 'artists': artists.map((artist) => artist.toJson()).toList(), - 'albumartists': albumartists.map((artist) => artist.toJson()).toList(), - 'artisthashes': artisthashes, - 'track': track, - 'disc': disc, - 'duration': duration, - 'bitrate': bitrate, - 'filepath': filepath, - 'folder': folder, - 'genres': genres.map((genre) => genre.toJson()).toList(), - 'genrehashes': genrehashes, - 'copyright': copyright, - 'date': date, - 'last_modified': lastModified, - 'trackhash': trackhash, - 'image': image, - 'weak_hash': weakHash, - 'extra': extra, - 'lastplayed': lastplayed, - 'playcount': playcount, - 'playduration': playduration, - 'explicit': explicit, - 'fav_userids': favUserids, - 'is_favorite': isFavorite, - 'score': score, - }; - } -} - -class ArtistModel extends Equatable { - final String name; - final String artisthash; - - const ArtistModel({ - required this.name, - required this.artisthash, - }); - - factory ArtistModel.fromJson(Map json) { - return ArtistModel( - name: json['name'] ?? '', - artisthash: json['artisthash'] ?? '', - ); - } - - Map toJson() { - return { - 'name': name, - 'artisthash': artisthash, - }; - } - - @override - List get props => [name, artisthash]; -} - -class GenreModel extends Equatable { - final String name; - final String genrehash; - - const GenreModel({ - required this.name, - required this.genrehash, - }); - - factory GenreModel.fromJson(Map json) { - return GenreModel( - name: json['name'] ?? '', - genrehash: json['genrehash'] ?? '', - ); - } - - Map toJson() { - return { - 'name': name, - 'genrehash': genrehash, - }; - } - - @override - List get props => [name, genrehash]; -} diff --git a/swingmusic_mobile/lib/data/services/api_service.dart b/swingmusic_mobile/lib/data/services/api_service.dart deleted file mode 100644 index e33f15f0..00000000 --- a/swingmusic_mobile/lib/data/services/api_service.dart +++ /dev/null @@ -1,283 +0,0 @@ -import 'package:dio/dio.dart'; -import '../../core/constants/app_constants.dart'; - -class ApiService { - late Dio _dio; - final String baseUrl; - - ApiService({String? baseUrl}) : baseUrl = baseUrl ?? AppConstants.defaultApiUrl { - _dio = Dio(BaseOptions( - baseUrl: baseUrl ?? AppConstants.defaultApiUrl, - connectTimeout: AppConstants.apiTimeout, - receiveTimeout: AppConstants.apiTimeout, - headers: { - 'Content-Type': 'application/json', - 'Accept': 'application/json', - }, - )); - - _dio.interceptors.add(LogInterceptor( - requestBody: true, - responseBody: true, - logPrint: (obj) { - // print(obj); // Enable for debugging - }, - )); - - _dio.interceptors.add(InterceptorsWrapper( - onError: (error, handler) { - // Handle common errors - String errorMessage = AppConstants.genericErrorMessage; - - if (error.type == DioExceptionType.connectionTimeout || - error.type == DioExceptionType.receiveTimeout) { - errorMessage = AppConstants.networkErrorMessage; - } else if (error.response?.statusCode == 500) { - errorMessage = AppConstants.serverErrorMessage; - } else if (error.response?.statusCode == 401) { - errorMessage = AppConstants.authErrorMessage; - } - - // You could emit this through a state management solution - // For now, just log it - print('API Error: $errorMessage'); - - handler.next(error); - }, - )); - } - - void setAuthToken(String token) { - _dio.options.headers['Authorization'] = 'Bearer $token'; - } - - void clearAuthToken() { - _dio.options.headers.remove('Authorization'); - } - - // Tracks API - Future> getTracks({int limit = 20, int offset = 0}) async { - try { - final response = await _dio.get('/tracks', queryParameters: { - 'limit': limit, - 'offset': offset, - }); - - return response.data['tracks'] ?? []; - } catch (e) { - throw Exception('Failed to load tracks: $e'); - } - } - - Future getTrack(String trackhash) async { - try { - final response = await _dio.get('/track/$trackhash'); - return response.data['track']; - } catch (e) { - throw Exception('Failed to load track: $e'); - } - } - - Future> searchTracks(String query, {int limit = 15}) async { - try { - final response = await _dio.get('/search/tracks', queryParameters: { - 'q': query, - 'limit': limit, - }); - - return response.data['tracks'] ?? []; - } catch (e) { - throw Exception('Failed to search tracks: $e'); - } - } - - // Albums API - Future> getAlbums({int limit = 20, int offset = 0}) async { - try { - final response = await _dio.get('/albums', queryParameters: { - 'limit': limit, - 'offset': offset, - }); - - return response.data['albums'] ?? []; - } catch (e) { - throw Exception('Failed to load albums: $e'); - } - } - - Future getAlbum(String albumhash) async { - try { - final response = await _dio.get('/album/$albumhash'); - return response.data['album']; - } catch (e) { - throw Exception('Failed to load album: $e'); - } - } - - Future> getAlbumTracks(String albumhash) async { - try { - final response = await _dio.get('/album/$albumhash/tracks'); - - return response.data['tracks'] ?? []; - } catch (e) { - throw Exception('Failed to load album tracks: $e'); - } - } - - // Artists API - Future> getArtists({int limit = 20, int offset = 0}) async { - try { - final response = await _dio.get('/artists', queryParameters: { - 'limit': limit, - 'offset': offset, - }); - - return response.data['artists'] ?? []; - } catch (e) { - throw Exception('Failed to load artists: $e'); - } - } - - Future getArtist(String artisthash) async { - try { - final response = await _dio.get('/artist/$artisthash'); - return response.data['artist']; - } catch (e) { - throw Exception('Failed to load artist: $e'); - } - } - - Future> getArtistAlbums(String artisthash) async { - try { - final response = await _dio.get('/artist/$artisthash/albums'); - - return response.data['albums'] ?? []; - } catch (e) { - throw Exception('Failed to load artist albums: $e'); - } - } - - Future> getArtistTracks(String artisthash) async { - try { - final response = await _dio.get('/artist/$artisthash/tracks'); - - return response.data['tracks'] ?? []; - } catch (e) { - throw Exception('Failed to load artist tracks: $e'); - } - } - - // Playlists API - Future> getPlaylists() async { - try { - final response = await _dio.get('/playlists'); - - return response.data['playlists'] ?? []; - } catch (e) { - throw Exception('Failed to load playlists: $e'); - } - } - - Future getPlaylist(String playlistId) async { - try { - final response = await _dio.get('/playlist/$playlistId'); - return response.data['playlist']; - } catch (e) { - throw Exception('Failed to load playlist: $e'); - } - } - - Future createPlaylist(String name, {String description = ''}) async { - try { - final response = await _dio.post('/playlists', data: { - 'name': name, - 'description': description, - }); - - return response.data['playlist']; - } catch (e) { - throw Exception('Failed to create playlist: $e'); - } - } - - Future addToPlaylist(String playlistId, String trackhash) async { - try { - await _dio.post('/playlist/$playlistId/add', data: { - 'trackhash': trackhash, - }); - } catch (e) { - throw Exception('Failed to add to playlist: $e'); - } - } - - Future removeFromPlaylist(String playlistId, String trackhash) async { - try { - await _dio.delete('/playlist/$playlistId/remove', data: { - 'trackhash': trackhash, - }); - } catch (e) { - throw Exception('Failed to remove from playlist: $e'); - } - } - - // Favorites API - Future toggleFavoriteTrack(String trackhash) async { - try { - await _dio.post('/favorites/track/toggle', data: { - 'trackhash': trackhash, - }); - } catch (e) { - throw Exception('Failed to toggle favorite track: $e'); - } - } - - Future toggleFavoriteAlbum(String albumhash) async { - try { - await _dio.post('/favorites/album/toggle', data: { - 'albumhash': albumhash, - }); - } catch (e) { - throw Exception('Failed to toggle favorite album: $e'); - } - } - - Future toggleFavoriteArtist(String artisthash) async { - try { - await _dio.post('/favorites/artist/toggle', data: { - 'artisthash': artisthash, - }); - } catch (e) { - throw Exception('Failed to toggle favorite artist: $e'); - } - } - - Future> getFavoriteTracks() async { - try { - final response = await _dio.get('/favorites/tracks'); - - return response.data['tracks'] ?? []; - } catch (e) { - throw Exception('Failed to load favorite tracks: $e'); - } - } - - Future> getFavoriteAlbums() async { - try { - final response = await _dio.get('/favorites/albums'); - - return response.data['albums'] ?? []; - } catch (e) { - throw Exception('Failed to load favorite albums: $e'); - } - } - - Future> getFavoriteArtists() async { - try { - final response = await _dio.get('/favorites/artists'); - - return response.data['artists'] ?? []; - } catch (e) { - throw Exception('Failed to load favorite artists: $e'); - } - } -} diff --git a/swingmusic_mobile/lib/data/services/audio_service.dart b/swingmusic_mobile/lib/data/services/audio_service.dart deleted file mode 100644 index 75dadbfd..00000000 --- a/swingmusic_mobile/lib/data/services/audio_service.dart +++ /dev/null @@ -1,403 +0,0 @@ -import 'dart:async'; -import 'package:just_audio/just_audio.dart'; -import 'package:audio_session/audio_session.dart'; -import '../models/track_model.dart'; -import '../../core/enums/playback_mode.dart'; - -class AudioService { - static final AudioService _instance = AudioService._internal(); - factory AudioService() => _instance; - AudioService._internal(); - - late AudioPlayer _audioPlayer; - late AudioSession _audioSession; - - // Playback state - TrackModel? _currentTrack; - bool _isPlaying = false; - bool _isLoading = false; - bool _isBuffering = false; - Duration _position = Duration.zero; - Duration _duration = Duration.zero; - double _volume = 1.0; - - // Playback modes - RepeatMode _repeatMode = RepeatMode.off; - ShuffleMode _shuffleMode = ShuffleMode.off; - double _playbackSpeed = 1.0; - - // Playlist - List _queue = []; - int _currentIndex = 0; - bool _isShuffleMode = false; - bool _isRepeatMode = false; - - // Error handling - String? _errorMessage; - - void _setError(String error) { - _errorMessage = error; - _errorController.add(_errorMessage); - print('Audio Error: $error'); - } - - void _clearError() { - if (_errorMessage != null) { - _errorMessage = null; - _errorController.add(_errorMessage); - } - } - - // Stream controllers - final _positionController = StreamController.broadcast(); - final _durationController = StreamController.broadcast(); - final _playingStateController = StreamController.broadcast(); - final _currentTrackController = StreamController.broadcast(); - final _queueController = StreamController>.broadcast(); - final _bufferingController = StreamController.broadcast(); - final _errorController = StreamController.broadcast(); - final _repeatModeController = StreamController.broadcast(); - final _shuffleModeController = StreamController.broadcast(); - - // Getters - TrackModel? get currentTrack => _currentTrack; - bool get isPlaying => _isPlaying; - bool get isPaused => !_isPlaying && _currentTrack != null; - bool get isLoading => _isLoading; - bool get isBuffering => _isBuffering; - Duration get position => _position; - Duration get duration => _duration; - double get volume => _volume; - List get queue => _queue; - int get currentIndex => _currentIndex; - bool get isShuffleMode => _isShuffleMode; - bool get isRepeatMode => _isRepeatMode; - RepeatMode get repeatMode => _repeatMode; - ShuffleMode get shuffleMode => _shuffleMode; - double get playbackSpeed => _playbackSpeed; - String? get errorMessage => _errorMessage; - - // Playback state helpers - bool get hasError => _errorMessage != null; - bool get canPlay => _currentTrack != null && !hasError; - bool get canPause => _isPlaying && !hasError; - bool get canGoNext => _queue.isNotEmpty && _currentIndex < _queue.length - 1; - bool get canGoPrevious => _queue.isNotEmpty && _currentIndex > 0; - - // Streams - Stream get positionStream => _positionController.stream; - Stream get durationStream => _durationController.stream; - Stream get playingStateStream => _playingStateController.stream; - Stream get currentTrackStream => _currentTrackController.stream; - Stream> get queueStream => _queueController.stream; - Stream get bufferingStream => _bufferingController.stream; - Stream get errorStream => _errorController.stream; - Stream get repeatModeStream => _repeatModeController.stream; - Stream get shuffleModeStream => _shuffleModeController.stream; - - Future initialize() async { - try { - _audioPlayer = AudioPlayer(); - _audioSession = await AudioSession.instance; - - // Configure audio session - await _audioSession.configure(const AudioSessionConfiguration.music()); - - // Set up listeners - _audioPlayer.positionStream.listen((position) { - _position = position; - _positionController.add(position); - }); - - _audioPlayer.durationStream.listen((duration) { - _duration = duration ?? Duration.zero; - _durationController.add(_duration); - }); - - _audioPlayer.playerStateStream.listen((state) { - _isPlaying = state.playing; - _playingStateController.add(_isPlaying); - }); - - // Handle player completion - _audioPlayer.playerStateStream.listen((state) { - if (state.processingState == ProcessingState.completed) { - _playNext(); - } - - // Handle buffering state - _isBuffering = state.processingState == ProcessingState.buffering || - state.processingState == ProcessingState.loading; - _bufferingController.add(_isBuffering); - }); - - // Handle player errors - _audioPlayer.playerStateStream.listen((state) { - if (state.playing && _errorMessage != null) { - _clearError(); - } - }); - - print('Audio service initialized successfully'); - } catch (e) { - throw Exception('Failed to initialize audio service: $e'); - } - } - - Future loadTrack(TrackModel track) async { - try { - _clearError(); - _isLoading = true; - _isBuffering = true; - _currentTrack = track; - _currentTrackController.add(_currentTrack); - _bufferingController.add(_isBuffering); - - // Create audio source from track filepath - final uri = Uri.parse(track.filepath); - await _audioPlayer.setAudioSource(AudioSource.uri(uri)); - - _isLoading = false; - _isBuffering = false; - _bufferingController.add(_isBuffering); - print('Track loaded: ${track.title}'); - } catch (e) { - _isLoading = false; - _isBuffering = false; - _bufferingController.add(_isBuffering); - _setError('Failed to load track: $e'); - throw Exception('Failed to load track: $e'); - } - } - - Future play() async { - try { - _clearError(); - if (_currentTrack != null && !hasError) { - await _audioPlayer.play(); - _isPlaying = true; - _playingStateController.add(_isPlaying); - print('Playing: ${_currentTrack?.title}'); - } - } catch (e) { - _setError('Failed to play: $e'); - throw Exception('Failed to play: $e'); - } - } - - Future pause() async { - try { - await _audioPlayer.pause(); - _isPlaying = false; - _playingStateController.add(_isPlaying); - print('Paused: ${_currentTrack?.title}'); - } catch (e) { - _setError('Failed to pause: $e'); - throw Exception('Failed to pause: $e'); - } - } - - Future stop() async { - try { - await _audioPlayer.stop(); - _isPlaying = false; - _position = Duration.zero; - _playingStateController.add(_isPlaying); - _positionController.add(_position); - _clearError(); - print('Stopped: ${_currentTrack?.title}'); - } catch (e) { - _setError('Failed to stop: $e'); - throw Exception('Failed to stop: $e'); - } - } - - Future seekTo(Duration position) async { - try { - await _audioPlayer.seek(position); - _position = position; - _positionController.add(_position); - } catch (e) { - throw Exception('Failed to seek: $e'); - } - } - - Future setVolume(double volume) async { - try { - await _audioPlayer.setVolume(volume); - } catch (e) { - throw Exception('Failed to set volume: $e'); - } - } - - Future setSpeed(double speed) async { - try { - await _audioPlayer.setSpeed(speed); - } catch (e) { - throw Exception('Failed to set speed: $e'); - } - } - - // Queue management - void setQueue(List tracks) { - _queue = List.from(tracks); - _currentIndex = 0; - _queueController.add(_queue); - - if (_queue.isNotEmpty && _currentTrack == null) { - loadTrack(_queue[_currentIndex]); - } - } - - void addToQueue(TrackModel track) { - _queue.add(track); - _queueController.add(_queue); - } - - void removeFromQueue(int index) { - if (index < _queue.length) { - _queue.removeAt(index); - if (index < _currentIndex) { - _currentIndex--; - } else if (index == _currentIndex) { - if (_currentIndex >= _queue.length) { - _currentIndex = _queue.length - 1; - } - loadTrack(_queue[_currentIndex]); - } - _queueController.add(_queue); - } - } - - void clearQueue() { - _queue.clear(); - _currentIndex = 0; - _queueController.add(_queue); - } - - Future playNext() async { - if (_queue.isNotEmpty) { - _playNext(); - } - } - - Future playPrevious() async { - if (_queue.isNotEmpty) { - if (_currentIndex > 0) { - _currentIndex--; - await loadTrack(_queue[_currentIndex]); - await play(); - } else if (_repeatMode == RepeatMode.all) { - // Loop to last track - _currentIndex = _queue.length - 1; - await loadTrack(_queue[_currentIndex]); - await play(); - } else { - // Restart current track if at beginning - await seekTo(Duration.zero); - await play(); - } - } - } - - void _playNext() { - if (_repeatMode == RepeatMode.one) { - // Repeat current track - loadTrack(_queue[_currentIndex]); - play(); - } else if (_shuffleMode == ShuffleMode.on) { - // Play random track - if (_queue.isNotEmpty) { - _currentIndex = (_currentIndex + 1) % _queue.length; - loadTrack(_queue[_currentIndex]); - play(); - } - } else { - // Play next track in order - if (_currentIndex < _queue.length - 1) { - _currentIndex++; - loadTrack(_queue[_currentIndex]); - play(); - } else if (_repeatMode == RepeatMode.all) { - // Loop back to first track - _currentIndex = 0; - loadTrack(_queue[_currentIndex]); - play(); - } else { - // End of queue - stop(); - } - } - } - - void jumpToIndex(int index) { - if (index >= 0 && index < _queue.length) { - _currentIndex = index; - loadTrack(_queue[_currentIndex]); - } - } - - // Playback modes - void toggleShuffle() { - _shuffleMode = _shuffleMode.toggle(); - _shuffleModeController.add(_shuffleMode); - - if (_shuffleMode == ShuffleMode.on && _queue.isNotEmpty) { - // Shuffle the queue while maintaining current track - final currentTrack = _queue[_currentIndex]; - _queue.shuffle(); - _currentIndex = _queue.indexOf(currentTrack); - _queueController.add(_queue); - } - } - - void toggleRepeat() { - _repeatMode = _repeatMode.next(); - _repeatModeController.add(_repeatMode); - } - - void setShuffleMode(bool enabled) { - _shuffleMode = enabled ? ShuffleMode.on : ShuffleMode.off; - _shuffleModeController.add(_shuffleMode); - - if (_shuffleMode == ShuffleMode.on && _queue.isNotEmpty) { - // Shuffle the queue while maintaining current track - final currentTrack = _queue[_currentIndex]; - _queue.shuffle(); - _currentIndex = _queue.indexOf(currentTrack); - _queueController.add(_queue); - } - } - - void setRepeatMode(RepeatMode mode) { - _repeatMode = mode; - _repeatModeController.add(_repeatMode); - } - - // Utility methods - String get positionFormatted { - final minutes = _position.inMinutes; - final seconds = _position.inSeconds % 60; - return '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'; - } - - String get durationFormatted { - final minutes = _duration.inMinutes; - final seconds = _duration.inSeconds % 60; - return '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'; - } - - double get progress { - if (_duration.inMilliseconds == 0) return 0.0; - return _position.inMilliseconds / _duration.inMilliseconds; - } - - Future dispose() async { - await _positionController.close(); - await _durationController.close(); - await _playingStateController.close(); - await _currentTrackController.close(); - await _queueController.close(); - await _audioPlayer.dispose(); - } -} diff --git a/swingmusic_mobile/lib/data/services/download_service.dart b/swingmusic_mobile/lib/data/services/download_service.dart deleted file mode 100644 index 39f7f7f8..00000000 --- a/swingmusic_mobile/lib/data/services/download_service.dart +++ /dev/null @@ -1,294 +0,0 @@ -import 'package:dio/dio.dart'; -import 'package:path/path.dart'; - -class DownloadService { - late Dio _dio; - final String baseUrl; - final String _downloadPath; - - DownloadService({String? baseUrl, String? downloadPath}) - : baseUrl = baseUrl ?? 'https://your-server.com', - _downloadPath = downloadPath ?? '/storage/emulated/0/Android/data/com.example.swingmusic/files/Downloads'; - - DownloadService() { - _dio = Dio(BaseOptions( - baseUrl: baseUrl, - connectTimeout: const Duration(seconds: 30), - receiveTimeout: const Duration(seconds: 30), - headers: { - 'Content-Type': 'application/json', - 'Accept': 'application/json', - }, - )); - - _dio.interceptors.add(LogInterceptor( - requestBody: true, - responseBody: true, - logPrint: (obj) { - print('Download API: $obj'); - }, - )); - - _dio.interceptors.add(InterceptorsWrapper( - onError: (error, handler) { - String errorMessage = 'Download failed'; - - if (error.type == DioExceptionType.connectionTimeout || - error.type == DioExceptionType.receiveTimeout) { - errorMessage = 'Network timeout - please check your connection'; - } else if (error.response?.statusCode == 404) { - errorMessage = 'Download not found'; - } else if (error.response?.statusCode == 500) { - errorMessage = 'Server error - please try again later'; - } else if (error.response?.statusCode == 503) { - errorMessage = 'Service unavailable - downloads are disabled'; - } - - print('Download Error: $errorMessage'); - handler.next(error); - }, - )); - } - - void setAuthToken(String token) { - _dio.options.headers['Authorization'] = 'Bearer $token'; - } - - Future> getDownloads() async { - try { - final response = await _dio.get('/downloads'); - - if (response.statusCode == 200) { - return response.data as Map? ?? {}; - } else { - return {}; - } - } catch (e) { - print('Error fetching downloads: $e'); - return {}; - } - } - - Future?> getDownload(String downloadId) async { - try { - final response = await _dio.get('/download/$downloadId'); - - if (response.statusCode == 200) { - return response.data as Map?; - } else { - return null; - } - } catch (e) { - print('Error fetching download: $e'); - return null; - } - } - - Future downloadTrack(String trackHash, { - String quality = '320kbps', - bool wifiOnly = false, - }) async { - try { - final response = await _dio.post('/download/track', data: { - 'trackHash': trackHash, - 'quality': quality, - 'wifiOnly': wifiOnly, - }); - - if (response.statusCode == 200) { - final data = response.data; - return data['downloadId'] as String? ?? ''; - } else { - throw Exception('Failed to start download'); - } - } catch (e) { - throw Exception('Failed to start download: $e'); - } - } - - Future downloadAlbum(String albumHash, { - String quality = '320kbps', - bool wifiOnly = false, - }) async { - try { - final response = await _dio.post('/download/album', data: { - 'albumHash': albumHash, - 'quality': quality, - 'wifiOnly': wifiOnly, - }); - - if (response.statusCode == 200) { - final data = response.data; - return data['downloadId'] as String? ?? ''; - } else { - throw Exception('Failed to start download'); - } - } catch (e) { - throw Exception('Failed to start download: $e'); - } - } - - Future downloadArtist(String artistHash, { - String quality = '320kbps', - bool wifiOnly = false, - }) async { - try { - final response = await _dio.post('/download/artist', data: { - 'artistHash': artistHash, - 'quality': quality, - 'wifiOnly': wifiOnly, - }); - - if (response.statusCode == 200) { - final data = response.data; - return data['downloadId'] as String? ?? ''; - } else { - throw Exception('Failed to start download'); - } - } catch (e) { - throw Exception('Failed to start download: $e'); - } - } - - Future downloadPlaylist(String playlistId, { - String quality = '320kbps', - bool wifiOnly = false, - }) async { - try { - final response = await _dio.post('/download/playlist', data: { - 'playlistId': playlistId, - 'quality': quality, - 'wifiOnly': wifiOnly, - }); - - if (response.statusCode == 200) { - final data = response.data; - return data['downloadId'] as String? ?? ''; - } else { - throw Exception('Failed to start download'); - } - } catch (e) { - throw Exception('Failed to start download: $e'); - } - } - - Future pauseDownload(String downloadId) async { - try { - final response = await _dio.post('/download/$downloadId/pause'); - - return response.statusCode == 200; - } catch (e) { - print('Error pausing download: $e'); - return false; - } - } - - Future resumeDownload(String downloadId) async { - try { - final response = await _dio.post('/download/$downloadId/resume'); - - return response.statusCode == 200; - } catch (e) { - print('Error resuming download: $e'); - return false; - } - } - - Future cancelDownload(String downloadId) async { - try { - final response = await _dio.post('/download/$downloadId/cancel'); - - return response.statusCode == 200; - } catch (e) { - print('Error canceling download: $e'); - return false; - } - } - - Future deleteDownload(String downloadId) async { - try { - final response = await _dio.delete('/download/$downloadId'); - - return response.statusCode == 200; - } catch (e) { - print('Error deleting download: $e'); - return false; - } - } - - Future> getDownloadStats() async { - try { - final response = await _dio.get('/download/stats'); - - if (response.statusCode == 200) { - return response.data as Map? ?? {}; - } else { - return {}; - } - } catch (e) { - print('Error fetching download stats: $e'); - return {}; - } - } - - Future getDownloadPath() async { - // TODO: Implement actual path resolution - return _downloadPath; - } - - Future updateDownloadSettings({ - String? downloadPath, - String? defaultQuality, - bool? wifiOnly, - int? maxConcurrentDownloads, - }) async { - try { - final response = await _dio.post('/download/settings', data: { - if (downloadPath != null) 'downloadPath': downloadPath, - if (defaultQuality != null) 'defaultQuality': defaultQuality, - if (wifiOnly != null) 'wifiOnly': wifiOnly, - if (maxConcurrentDownloads != null) 'maxConcurrentDownloads': maxConcurrentDownloads, - }); - - return response.statusCode == 200; - } catch (e) { - print('Error updating download settings: $e'); - return false; - } - } - - Future> getDownloadSettings() async { - try { - final response = await _dio.get('/download/settings'); - - if (response.statusCode == 200) { - return response.data as Map? ?? {}; - } else { - return {}; - } - } catch (e) { - print('Error fetching download settings: $e'); - return {}; - } - } - - Stream> watchDownloadProgress(String downloadId) { - // TODO: Implement WebSocket or SSE for real-time progress updates - // For now, return periodic polling - return Stream.periodic(const Duration(seconds: 1), (count) async { - final download = await getDownload(downloadId); - - if (download != null) { - return { - 'downloadId': downloadId, - 'progress': download['progress'] ?? 0.0, - 'status': download['status'] ?? 'unknown', - 'speed': download['speed'] ?? 0.0, - 'eta': download['eta'] ?? 0, - }; - } - - return {}; - }); - } -} diff --git a/swingmusic_mobile/lib/data/services/enhanced_api_service.dart b/swingmusic_mobile/lib/data/services/enhanced_api_service.dart deleted file mode 100644 index b5476b33..00000000 --- a/swingmusic_mobile/lib/data/services/enhanced_api_service.dart +++ /dev/null @@ -1,545 +0,0 @@ -import 'package:dio/dio.dart'; -import 'package:shared_preferences/shared_preferences.dart'; -import '../models/track_model.dart'; -import '../models/album_model.dart'; -import '../models/artist_model.dart'; -import '../models/playlist_model.dart'; -import '../models/search_suggestion_model.dart'; -import '../../core/constants/app_constants.dart'; - -class EnhancedApiService { - late Dio _dio; - final String baseUrl; - final SharedPreferences _prefs; - - EnhancedApiService({String? baseUrl}) : baseUrl = baseUrl ?? AppConstants.defaultApiUrl { - _dio = Dio(BaseOptions( - baseUrl: baseUrl, - connectTimeout: AppConstants.apiTimeout, - receiveTimeout: AppConstants.apiTimeout, - headers: { - 'Content-Type': 'application/json', - 'Accept': 'application/json', - }, - )); - - _prefs = SharedPreferences.getInstance() as Future; - - _dio.interceptors.add(LogInterceptor( - requestBody: true, - responseBody: true, - logPrint: (obj) { - print('API: $obj'); - }, - )); - - _dio.interceptors.add(InterceptorsWrapper( - onError: (error, handler) { - String errorMessage = AppConstants.genericErrorMessage; - - if (error.type == DioExceptionType.connectionTimeout || - error.type == DioExceptionType.receiveTimeout) { - errorMessage = AppConstants.networkErrorMessage; - } else if (error.response?.statusCode == 500) { - errorMessage = AppConstants.serverErrorMessage; - } else if (error.response?.statusCode == 401) { - errorMessage = AppConstants.authErrorMessage; - } else if (error.response?.statusCode == 404) { - errorMessage = 'Resource not found'; - } - - print('API Error: $errorMessage'); - handler.next(error); - }, - )); - } - - // Authentication methods - void setAuthToken(String token) { - _dio.options.headers['Authorization'] = 'Bearer $token'; - } - - void clearAuthToken() { - _dio.options.headers.remove('Authorization'); - } - - // Track methods - Future> getTracks({ - int limit = 20, - int offset = 0, - String? search, - String? genre, - String? artist, - String? album, - String? folder, - }) async { - try { - Map queryParams = { - 'limit': limit, - 'offset': offset, - }; - - if (search != null && search.isNotEmpty) { - queryParams['search'] = search; - } - if (genre != null && genre.isNotEmpty) { - queryParams['genre'] = genre; - } - if (artist != null && artist.isNotEmpty) { - queryParams['artist'] = artist; - } - if (album != null && album.isNotEmpty) { - queryParams['album'] = album; - } - if (folder != null && folder.isNotEmpty) { - queryParams['folder'] = folder; - } - - final response = await _dio.get('/tracks', queryParameters: queryParams); - final tracksData = response.data['tracks'] as List? ?? []; - - return tracksData.map((trackData) => TrackModel.fromJson(trackData)).toList(); - } catch (e) { - throw Exception('Failed to load tracks: $e'); - } - } - - Future getTrack(String trackHash) async { - try { - final response = await _dio.get('/track/$trackHash'); - final trackData = response.data['track']; - return trackData != null ? TrackModel.fromJson(trackData) : null; - } catch (e) { - throw Exception('Failed to load track: $e'); - } - } - - // Album methods - Future> getAlbums({ - int limit = 20, - int offset = 0, - String? search, - String? artist, - }) async { - try { - Map queryParams = { - 'limit': limit, - 'offset': offset, - }; - - if (search != null && search.isNotEmpty) { - queryParams['search'] = search; - } - if (artist != null && artist.isNotEmpty) { - queryParams['artist'] = artist; - } - - final response = await _dio.get('/albums', queryParameters: queryParams); - final albumsData = response.data['albums'] as List? ?? []; - - return albumsData.map((albumData) => AlbumModel.fromJson(albumData)).toList(); - } catch (e) { - throw Exception('Failed to load albums: $e'); - } - } - - Future getAlbum(String albumHash) async { - try { - final response = await _dio.get('/album/$albumHash'); - final albumData = response.data['album']; - return albumData != null ? AlbumModel.fromJson(albumData) : null; - } catch (e) { - throw Exception('Failed to load album: $e'); - } - } - - Future> getAlbumTracks(String albumHash, { - int limit = 20, - int offset = 0, - }) async { - try { - final response = await _dio.get('/album/$albumHash/tracks', queryParameters: { - 'limit': limit, - 'offset': offset, - }); - final tracksData = response.data['tracks'] as List? ?? []; - - return tracksData.map((trackData) => TrackModel.fromJson(trackData)).toList(); - } catch (e) { - throw Exception('Failed to load album tracks: $e'); - } - } - - // Artist methods - Future> getArtists({ - int limit = 20, - int offset = 0, - String? search, - }) async { - try { - Map queryParams = { - 'limit': limit, - 'offset': offset, - }; - - if (search != null && search.isNotEmpty) { - queryParams['search'] = search; - } - - final response = await _dio.get('/artists', queryParameters: queryParams); - final artistsData = response.data['artists'] as List? ?? []; - - return artistsData.map((artistData) => ArtistModel.fromJson(artistData)).toList(); - } catch (e) { - throw Exception('Failed to load artists: $e'); - } - } - - Future getArtist(String artistHash) async { - try { - final response = await _dio.get('/artist/$artistHash'); - final artistData = response.data['artist']; - return artistData != null ? ArtistModel.fromJson(artistData) : null; - } catch (e) { - throw Exception('Failed to load artist: $e'); - } - } - - Future> getArtistAlbums(String artistHash, { - int limit = 20, - int offset = 0, - }) async { - try { - final response = await _dio.get('/artist/$artistHash/albums', queryParameters: { - 'limit': limit, - 'offset': offset, - }); - final albumsData = response.data['albums'] as List? ?? []; - - return albumsData.map((albumData) => AlbumModel.fromJson(albumData)).toList(); - } catch (e) { - throw Exception('Failed to load artist albums: $e'); - } - } - - Future> getArtistTracks(String artistHash, { - int limit = 20, - int offset = 0, - }) async { - try { - final response = await _dio.get('/artist/$artistHash/tracks', queryParameters: { - 'limit': limit, - 'offset': offset, - }); - final tracksData = response.data['tracks'] as List? ?? []; - - return tracksData.map((trackData) => TrackModel.fromJson(trackData)).toList(); - } catch (e) { - throw Exception('Failed to load artist tracks: $e'); - } - } - - // Playlist methods - Future> getPlaylists() async { - try { - final response = await _dio.get('/playlists'); - final playlistsData = response.data['playlists'] as List? ?? []; - - return playlistsData.map((playlistData) => PlaylistModel.fromJson(playlistData)).toList(); - } catch (e) { - throw Exception('Failed to load playlists: $e'); - } - } - - Future getPlaylist(String playlistId) async { - try { - final response = await _dio.get('/playlist/$playlistId'); - final playlistData = response.data['playlist']; - return playlistData != null ? PlaylistModel.fromJson(playlistData) : null; - } catch (e) { - throw Exception('Failed to load playlist: $e'); - } - } - - Future createPlaylist(String name, String description) async { - try { - final response = await _dio.post('/playlists', data: { - 'name': name, - 'description': description, - }); - - return PlaylistModel.fromJson(response.data['playlist']); - } catch (e) { - throw Exception('Failed to create playlist: $e'); - } - } - - Future addToPlaylist(String playlistId, String trackHash) async { - try { - await _dio.post('/playlist/$playlistId/add', data: { - 'trackhash': trackHash, - }); - } catch (e) { - throw Exception('Failed to add to playlist: $e'); - } - } - - Future removeFromPlaylist(String playlistId, String trackHash) async { - try { - await _dio.delete('/playlist/$playlistId/remove', data: { - 'trackhash': trackHash, - }); - } catch (e) { - throw Exception('Failed to remove from playlist: $e'); - } - } - - // Favorites methods - Future toggleFavoriteTrack(String trackHash) async { - try { - await _dio.post('/favorites/track/toggle', data: { - 'trackhash': trackHash, - }); - } catch (e) { - throw Exception('Failed to toggle favorite track: $e'); - } - } - - Future toggleFavoriteAlbum(String albumHash) async { - try { - await _dio.post('/favorites/album/toggle', data: { - 'albumhash': albumHash, - }); - } catch (e) { - throw Exception('Failed to toggle favorite album: $e'); - } - } - - Future toggleFavoriteArtist(String artistHash) async { - try { - await _dio.post('/favorites/artist/toggle', data: { - 'artisthash': artistHash, - }); - } catch (e) { - throw Exception('Failed to toggle favorite artist: $e'); - } - } - - Future> getFavoriteTracks({ - int limit = 20, - int offset = 0, - }) async { - try { - final response = await _dio.get('/favorites/tracks', queryParameters: { - 'limit': limit, - 'offset': offset, - }); - final tracksData = response.data['tracks'] as List? ?? []; - - return tracksData.map((trackData) => TrackModel.fromJson(trackData)).toList(); - } catch (e) { - throw Exception('Failed to load favorite tracks: $e'); - } - } - - Future> getFavoriteAlbums({ - int limit = 20, - int offset = 0, - }) async { - try { - final response = await _dio.get('/favorites/albums', queryParameters: { - 'limit': limit, - 'offset': offset, - }); - final albumsData = response.data['albums'] as List? ?? []; - - return albumsData.map((albumData) => AlbumModel.fromJson(albumData)).toList(); - } catch (e) { - throw Exception('Failed to load favorite albums: $e'); - } - } - - Future> getFavoriteArtists({ - int limit = 20, - int offset = 0, - }) async { - try { - final response = await _dio.get('/favorites/artists', queryParameters: { - 'limit': limit, - 'offset': offset, - }); - final artistsData = response.data['artists'] as List? ?? []; - - return artistsData.map((artistData) => ArtistModel.fromJson(artistData)).toList(); - } catch (e) { - throw Exception('Failed to load favorite artists: $e'); - } - } - - // Search methods - Future> getSearchSuggestions(String query) async { - try { - final response = await _dio.get('/search/suggestions', queryParameters: { - 'q': query, - 'limit': 10, - }); - final suggestionsData = response.data['suggestions'] as List? ?? []; - - return suggestionsData.map((suggestionData) => SearchSuggestionModel.fromJson(suggestionData)).toList(); - } catch (e) { - throw Exception('Failed to get search suggestions: $e'); - } - } - - // Folder methods - Future> getFolders() async { - try { - final response = await _dio.get('/folders'); - return response.data['folders'] as List? ?? []; - } catch (e) { - throw Exception('Failed to load folders: $e'); - } - } - - Future> getFolderTracks(String folderHash, { - int limit = 20, - int offset = 0, - }) async { - try { - final response = await _dio.get('/folder/$folderHash/tracks', queryParameters: { - 'limit': limit, - 'offset': offset, - }); - final tracksData = response.data['tracks'] as List? ?? []; - - return tracksData.map((trackData) => TrackModel.fromJson(trackData)).toList(); - } catch (e) { - throw Exception('Failed to load folder tracks: $e'); - } - } - - // User methods - Future> getUserInfo() async { - try { - final response = await _dio.get('/user/info'); - return response.data as Map? ?? {}; - } catch (e) { - throw Exception('Failed to get user info: $e'); - } - } - - Future updateUserPreferences(Map preferences) async { - try { - await _dio.post('/user/preferences', data: preferences); - } catch (e) { - throw Exception('Failed to update user preferences: $e'); - } - } - - Future> getUserPreferences() async { - try { - final response = await _dio.get('/user/preferences'); - return response.data as Map? ?? {}; - } catch (e) { - throw Exception('Failed to get user preferences: $e'); - } - } - - // Statistics methods - Future> getStatistics() async { - try { - final response = await _dio.get('/statistics'); - return response.data as Map? ?? {}; - } catch (e) { - throw Exception('Failed to get statistics: $e'); - } - } - - // Download methods - Future downloadTrack(String trackHash) async { - try { - await _dio.post('/download/track', data: { - 'trackhash': trackHash, - }); - } catch (e) { - throw Exception('Failed to download track: $e'); - } - } - - Future> getDownloads() async { - try { - final response = await _dio.get('/downloads'); - return response.data['downloads'] as List? ?? []; - } catch (e) { - throw Exception('Failed to get downloads: $e'); - } - } - - Future deleteDownload(String downloadId) async { - try { - await _dio.delete('/download/$downloadId'); - } catch (e) { - throw Exception('Failed to delete download: $e'); - } - } - - // Lyrics methods - Future getLyrics(String trackHash) async { - try { - final response = await _dio.get('/lyrics/$trackHash'); - return response.data['lyrics'] as String?; - } catch (e) { - throw Exception('Failed to get lyrics: $e'); - } - } - - // Queue methods - Future> getQueue() async { - try { - final response = await _dio.get('/queue'); - final tracksData = response.data['tracks'] as List? ?? []; - - return tracksData.map((trackData) => TrackModel.fromJson(trackData)).toList(); - } catch (e) { - throw Exception('Failed to get queue: $e'); - } - } - - Future addToQueue(String trackHash) async { - try { - await _dio.post('/queue/add', data: { - 'trackhash': trackHash, - }); - } catch (e) { - throw Exception('Failed to add to queue: $e'); - } - } - - Future removeFromQueue(String trackHash) async { - try { - await _dio.delete('/queue/remove', data: { - 'trackhash': trackHash, - }); - } catch (e) { - throw Exception('Failed to remove from queue: $e'); - } - } - - Future clearQueue() async { - try { - await _dio.delete('/queue/clear'); - } catch (e) { - throw Exception('Failed to clear queue: $e'); - } - } - - Future reorderQueue(List trackHashes) async { - try { - await _dio.post('/queue/reorder', data: { - 'track_hashes': trackHashes, - }); - } catch (e) { - throw Exception('Failed to reorder queue: $e'); - } - } -} diff --git a/swingmusic_mobile/lib/data/services/lyrics_service.dart b/swingmusic_mobile/lib/data/services/lyrics_service.dart deleted file mode 100644 index 91b99d9c..00000000 --- a/swingmusic_mobile/lib/data/services/lyrics_service.dart +++ /dev/null @@ -1,114 +0,0 @@ -import 'package:dio/dio.dart'; -import '../models/track_model.dart'; - -class LyricsService { - late Dio _dio; - final String baseUrl; - - LyricsService({String? baseUrl}) : baseUrl = baseUrl ?? 'https://your-server.com' { - _dio = Dio(BaseOptions( - baseUrl: baseUrl, - connectTimeout: const Duration(seconds: 10), - receiveTimeout: const Duration(seconds: 10), - headers: { - 'Content-Type': 'application/json', - 'Accept': 'application/json', - }, - )); - - _dio.interceptors.add(LogInterceptor( - requestBody: true, - responseBody: true, - logPrint: (obj) { - print('Lyrics API: $obj'); - }, - )); - - _dio.interceptors.add(InterceptorsWrapper( - onError: (error, handler) { - String errorMessage = 'Failed to load lyrics'; - - if (error.type == DioExceptionType.connectionTimeout || - error.type == DioExceptionType.receiveTimeout) { - errorMessage = 'Network timeout - please check your connection'; - } else if (error.response?.statusCode == 404) { - errorMessage = 'Lyrics not found for this track'; - } else if (error.response?.statusCode == 500) { - errorMessage = 'Server error - please try again later'; - } - - print('Lyrics Error: $errorMessage'); - handler.next(error); - }, - )); - } - - void setAuthToken(String token) { - _dio.options.headers['Authorization'] = 'Bearer $token'; - } - - Future getLyrics(String trackHash) async { - try { - final response = await _dio.get('/lyrics/$trackHash'); - - if (response.statusCode == 200) { - final data = response.data; - return data['lyrics'] as String?; - } else { - return null; - } - } catch (e) { - print('Error fetching lyrics: $e'); - return null; - } - } - - Future searchLyrics(String query, {int limit = 10}) async { - try { - final response = await _dio.get('/lyrics/search', queryParameters: { - 'q': query, - 'limit': limit, - }); - - if (response.statusCode == 200) { - final data = response.data; - final results = data['results'] as List? ?? []; - return results.isNotEmpty ? results.first['lyrics'] as String? : null; - } else { - return null; - } - } catch (e) { - print('Error searching lyrics: $e'); - return null; - } - } - - Future saveLyrics(String trackHash, String lyrics) async { - try { - final response = await _dio.post('/lyrics/save', data: { - 'trackHash': trackHash, - 'lyrics': lyrics, - }); - - return response.statusCode == 200; - } catch (e) { - print('Error saving lyrics: $e'); - return false; - } - } - - Future> getLyricsStats() async { - try { - final response = await _dio.get('/lyrics/stats'); - - if (response.statusCode == 200) { - return response.data as Map? ?? {}; - } else { - return {}; - } - } catch (e) { - print('Error fetching lyrics stats: $e'); - return {}; - } - } -} diff --git a/swingmusic_mobile/lib/features/analytics/analytics_screen.dart b/swingmusic_mobile/lib/features/analytics/analytics_screen.dart deleted file mode 100644 index e6d32594..00000000 --- a/swingmusic_mobile/lib/features/analytics/analytics_screen.dart +++ /dev/null @@ -1,442 +0,0 @@ -import 'package:flutter/material.dart'; - -class AnalyticsScreen extends StatefulWidget { - const AnalyticsScreen({super.key}); - - @override - State createState() => _AnalyticsScreenState(); -} - -class _AnalyticsScreenState extends State { - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('Analytics'), - elevation: 0, - backgroundColor: Theme.of(context).colorScheme.surface, - ), - body: SingleChildScrollView( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Overview Cards - Row( - children: [ - Expanded( - child: _buildOverviewCard( - 'Total Plays', - Icons.play_arrow, - '12,345', - Theme.of(context).colorScheme.primary, - ), - ), - const SizedBox(width: 16), - Expanded( - child: _buildOverviewCard( - 'Total Listening Time', - Icons.access_time, - '48h 32m', - Theme.of(context).colorScheme.secondary, - ), - ), - ], - ), - const SizedBox(height: 16), - - // Top Tracks - _buildSectionHeader('Top Tracks'), - const SizedBox(height: 8), - _buildTopTracksList(), - - const SizedBox(height: 24), - - // Listening Stats - _buildSectionHeader('Listening Statistics'), - const SizedBox(height: 8), - _buildListeningStats(), - - const SizedBox(height: 24), - - // Genre Distribution - _buildSectionHeader('Genre Distribution'), - const SizedBox(height: 8), - _buildGenreChart(), - - const SizedBox(height: 24), - - // Time Distribution - _buildSectionHeader('Time Distribution'), - const SizedBox(height: 8), - _buildTimeChart(), - ], - ), - ), - ); - } - - Widget _buildSectionHeader(String title) { - return Container( - padding: const EdgeInsets.all(16.0), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceContainerHighest, - borderRadius: BorderRadius.circular(12.0), - ), - child: Row( - children: [ - Icon( - Icons.analytics, - color: Theme.of(context).colorScheme.primary, - size: 24, - ), - const SizedBox(width: 12), - Text( - title, - style: Theme.of(context).textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - ], - ), - ); - } - - Widget _buildOverviewCard(String title, IconData icon, String value, Color color) { - return Container( - padding: const EdgeInsets.all(16.0), - decoration: BoxDecoration( - color: color, - borderRadius: BorderRadius.circular(12.0), - border: Border.all( - color: Theme.of(context).colorScheme.outline, - width: 1.0, - ), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Icon( - icon, - color: Theme.of(context).colorScheme.onPrimary, - size: 32, - ), - const SizedBox(width: 12), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - title, - style: Theme.of(context).textTheme.titleMedium?.copyWith( - color: Theme.of(context).colorScheme.onPrimary, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 4), - Text( - value, - style: Theme.of(context).textTheme.headlineMedium?.copyWith( - color: Theme.of(context).colorScheme.onPrimary, - ), - ), - ], - ), - ], - ), - ], - ), - ); - } - - Widget _buildTopTracksList() { - final topTracks = [ - {'title': 'Bohemian Rhapsody', 'artist': 'Queen', 'plays': 1234, 'duration': '5:55'}, - {'title': 'Stairway to Heaven', 'artist': 'Led Zeppelin', 'plays': 987, 'duration': '8:02'}, - {'title': 'Hotel California', 'artist': 'Eagles', 'plays': 856, 'duration': '3:31'}, - {'title': 'Sweet Child O\' Mine', 'artist': 'Guns N\' Roses', 'plays': 743, 'duration': '5:44'}, - {'title': 'Don\'t Stop Believin\'', 'artist': 'Journey', 'plays': 654, 'duration': '4:12'}, - ]; - - return Card( - margin: const EdgeInsets.only(bottom: 16.0), - child: Column( - children: [ - ListView.builder( - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - itemCount: topTracks.length, - itemBuilder: (context, index) { - final track = topTracks[index]; - return ListTile( - leading: CircleAvatar( - backgroundColor: Theme.of(context).colorScheme.primary, - child: Text( - '${index + 1}', - style: const TextStyle( - color: Colors.white, - fontWeight: FontWeight.bold, - ), - ), - ), - title: Text( - track['title']?.toString() ?? '', - style: Theme.of(context).textTheme.titleMedium, - ), - subtitle: Text( - track['artist']?.toString() ?? '', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - trailing: Text( - '${track['plays'] ?? 0} plays', - style: Theme.of(context).textTheme.bodyLarge?.copyWith( - color: Theme.of(context).colorScheme.primary, - fontWeight: FontWeight.bold, - ), - ), - ); - }, - ), - ], - ), - ); - } - - Widget _buildListeningStats() { - return Card( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Daily Average', - style: Theme.of(context).textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 8), - Row( - children: [ - Expanded( - child: _buildStatItem('Songs per Day', '24'), - ), - Expanded( - child: _buildStatItem('Hours per Day', '3.2'), - ), - ], - ), - const SizedBox(height: 16), - Text( - 'Weekly Average', - style: Theme.of(context).textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 8), - Row( - children: [ - Expanded( - child: _buildStatItem('Songs per Week', '168'), - ), - Expanded( - child: _buildStatItem('Hours per Week', '22.4'), - ), - ], - ), - const SizedBox(height: 16), - Text( - 'Monthly Average', - style: Theme.of(context).textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 8), - Row( - children: [ - Expanded( - child: _buildStatItem('Songs per Month', '730'), - ), - Expanded( - child: _buildStatItem('Hours per Month', '97.1'), - ), - ], - ), - ], - ), - ), - ); - } - - Widget _buildStatItem(String label, String value) { - return Container( - padding: const EdgeInsets.all(12.0), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceContainer, - borderRadius: BorderRadius.circular(8.0), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - value, - style: Theme.of(context).textTheme.headlineMedium?.copyWith( - color: Theme.of(context).colorScheme.primary, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 4), - Text( - label, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ], - ), - ); - } - - Widget _buildGenreChart() { - final genres = { - 'Rock': 35, - 'Pop': 28, - 'Electronic': 15, - 'Classical': 12, - 'Jazz': 8, - 'Hip-Hop': 7, - 'Country': 5, - }; - - return Card( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Genre Distribution', - style: Theme.of(context).textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 16), - SizedBox( - height: 200, - child: Wrap( - spacing: 8.0, - runSpacing: 8.0, - children: genres.entries.map((entry) { - return Chip( - label: Text(entry.key), - backgroundColor: _getGenreColor(entry.key), - labelStyle: TextStyle( - color: Colors.white, - fontWeight: FontWeight.bold, - ), - ); - }).toList(), - ), - ), - ], - ), - ), - ); - } - - Color _getGenreColor(String genre) { - switch (genre) { - case 'Rock': - return Colors.red; - case 'Pop': - return Colors.purple; - case 'Electronic': - return Colors.blue; - case 'Classical': - return Colors.brown; - case 'Jazz': - return Colors.orange; - case 'Hip-Hop': - return Colors.green; - case 'Country': - return Colors.amber; - default: - return Colors.grey; - } - } - - Widget _buildTimeChart() { - final timeData = [ - {'period': 'Morning', 'hours': 2.5, 'percentage': 15}, - {'period': 'Afternoon', 'hours': 4.2, 'percentage': 25}, - {'period': 'Evening', 'hours': 3.8, 'percentage': 22}, - {'period': 'Night', 'hours': 7.5, 'percentage': 38}, - ]; - - return Card( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Daily Listening Pattern', - style: Theme.of(context).textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 16), - SizedBox( - height: 200, - child: Column( - children: timeData.map((data) { - return Padding( - padding: const EdgeInsets.only(bottom: 8.0), - child: Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - data['period']?.toString() ?? '', - style: Theme.of(context).textTheme.bodyMedium, - ), - Text( - '${data['percentage']}%', - style: Theme.of(context).textTheme.bodyLarge?.copyWith( - color: Theme.of(context).colorScheme.primary, - fontWeight: FontWeight.bold, - ), - ), - ], - ), - Container( - height: 8, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.primary, - borderRadius: BorderRadius.circular(4.0), - ), - child: FractionallySizedBox( - widthFactor: (data['percentage'] as int) / 100, - alignment: Alignment.centerLeft, - child: Container( - height: 4, - color: Colors.white, - ), - ), - ), - ], - ), - ); - }).toList(), - ), - ), - ], - ), - ), - ); - } -} diff --git a/swingmusic_mobile/lib/features/auth/auth_screen.dart b/swingmusic_mobile/lib/features/auth/auth_screen.dart deleted file mode 100644 index 14912e82..00000000 --- a/swingmusic_mobile/lib/features/auth/auth_screen.dart +++ /dev/null @@ -1,88 +0,0 @@ -import 'package:flutter/material.dart'; - -class AuthScreen extends StatefulWidget { - const AuthScreen({super.key}); - - @override - State createState() => _AuthScreenState(); -} - -class _AuthScreenState extends State { - bool _isLoading = false; - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('Authentication'), - elevation: 0, - backgroundColor: Theme.of(context).colorScheme.surface, - ), - body: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Icon( - Icons.music_note, - size: 80, - color: Colors.blue, - ), - const SizedBox(height: 24), - const Text( - 'SwingMusic', - style: TextStyle( - fontSize: 24, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 8), - const Text( - 'Connect to your music library', - style: TextStyle( - fontSize: 16, - color: Colors.grey, - ), - textAlign: TextAlign.center, - ), - const SizedBox(height: 32), - ElevatedButton( - onPressed: _isLoading ? null : _handleLogin, - style: ElevatedButton.styleFrom( - backgroundColor: Colors.blue, - foregroundColor: Colors.white, - ), - child: _isLoading - ? const SizedBox( - width: 20, - height: 20, - child: CircularProgressIndicator( - strokeWidth: 2, - valueColor: AlwaysStoppedAnimation(Colors.white), - ), - ) - : const Text('Login'), - ), - ], - ), - ), - ); - } - - void _handleLogin() async { - setState(() { - _isLoading = true; - }); - - await Future.delayed(const Duration(seconds: 2)); - - setState(() { - _isLoading = false; - }); - - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Login successful!')), - ); - - Navigator.of(context).pushNamedAndRemoveUntil('/', (route) => false); - } -} diff --git a/swingmusic_mobile/lib/features/auth/enhanced_auth_screen.dart b/swingmusic_mobile/lib/features/auth/enhanced_auth_screen.dart deleted file mode 100644 index 74af58ed..00000000 --- a/swingmusic_mobile/lib/features/auth/enhanced_auth_screen.dart +++ /dev/null @@ -1,468 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:provider/provider.dart'; -import '../../shared/providers/auth_provider.dart'; -import '../../core/constants/app_spacing.dart'; -import '../../core/enums/auth_state.dart'; - -class EnhancedAuthScreen extends StatefulWidget { - const EnhancedAuthScreen({super.key}); - - @override - State createState() => _EnhancedAuthScreenState(); -} - -class _EnhancedAuthScreenState extends State { - final _formKey = GlobalKey(); - final _baseUrlController = TextEditingController(); - final _usernameController = TextEditingController(); - final _passwordController = TextEditingController(); - final _qrCodeController = TextEditingController(); - - bool _isPasswordVisible = false; - bool _isLoading = false; - bool _isQrMode = false; - String? _errorMessage; - - @override - void initState() { - super.initState(); - WidgetsBinding.instance.addPostFrameCallback((_) { - Provider.of(context, listen: false).initialize(); - }); - } - - @override - void dispose() { - _baseUrlController.dispose(); - _usernameController.dispose(); - _passwordController.dispose(); - _qrCodeController.dispose(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: Theme.of(context).colorScheme.surface, - body: SafeArea( - child: SingleChildScrollView( - padding: AppSpacing.paddingLG, - child: Column( - children: [ - // Logo and Title - _buildHeader(context), - - const SizedBox(height: 32), - - // Auth Mode Toggle - _buildAuthModeToggle(context), - - const SizedBox(height: 32), - - // Auth Form - _buildAuthForm(context), - - const SizedBox(height: 24), - - // Error Message - if (_errorMessage != null) - _buildErrorMessage(context), - ], - ), - ), - ), - ); - } - - Widget _buildHeader(BuildContext context) { - return Column( - children: [ - Icon( - Icons.music_note, - size: 80, - color: Theme.of(context).colorScheme.primary, - ), - const SizedBox(height: 16), - Text( - 'SwingMusic', - style: Theme.of(context).textTheme.headlineLarge?.copyWith( - fontWeight: FontWeight.bold, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - const SizedBox(height: 8), - Text( - 'Connect to your music library', - style: Theme.of(context).textTheme.bodyLarge?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - textAlign: TextAlign.center, - ), - ], - ); - } - - Widget _buildAuthModeToggle(BuildContext context) { - return Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceVariant, - borderRadius: BorderRadius.circular(12), - ), - child: Row( - children: [ - Expanded( - child: GestureDetector( - onTap: () => setState(() => _isQrMode = false), - child: Container( - padding: const EdgeInsets.symmetric(vertical: 16), - decoration: BoxDecoration( - color: _isQrMode - ? Theme.of(context).colorScheme.surface - : Theme.of(context).colorScheme.primary, - borderRadius: const BorderRadius.only( - topLeft: Radius.circular(12), - bottomLeft: Radius.circular(12), - ), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.person, - color: _isQrMode - ? Theme.of(context).colorScheme.onSurfaceVariant - : Theme.of(context).colorScheme.onPrimary, - ), - const SizedBox(width: 8), - Text( - 'Username & Password', - style: TextStyle( - color: _isQrMode - ? Theme.of(context).colorScheme.onSurfaceVariant - : Theme.of(context).colorScheme.onPrimary, - fontWeight: FontWeight.w500, - ), - ), - ], - ), - ), - ), - ), - Expanded( - child: GestureDetector( - onTap: () => setState(() => _isQrMode = true), - child: Container( - padding: const EdgeInsets.symmetric(vertical: 16), - decoration: BoxDecoration( - color: _isQrMode - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.surface, - borderRadius: const BorderRadius.only( - topRight: Radius.circular(12), - bottomRight: Radius.circular(12), - ), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.qr_code_scanner, - color: _isQrMode - ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onSurfaceVariant, - ), - const SizedBox(width: 8), - Text( - 'QR Code', - style: TextStyle( - color: _isQrMode - ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onSurfaceVariant, - fontWeight: FontWeight.w500, - ), - ), - ], - ), - ), - ), - ), - ], - ), - ); - } - - Widget _buildAuthForm(BuildContext context) { - return Consumer( - builder: (context, authProvider, child) { - return Form( - key: _formKey, - child: Column( - children: [ - if (_isQrMode) ...[ - // QR Code Input - TextFormField( - controller: _qrCodeController, - decoration: InputDecoration( - labelText: 'QR Code', - hintText: 'Enter or scan QR code', - prefixIcon: const Icon(Icons.qr_code_scanner), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - ), - enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - borderSide: BorderSide( - color: Theme.of(context).colorScheme.outline, - ), - ), - focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - borderSide: BorderSide( - color: Theme.of(context).colorScheme.primary, - ), - ), - ), - readOnly: true, - onTap: () => _scanQrCode(context), - ), - ] else ...[ - // Server URL Input - TextFormField( - controller: _baseUrlController, - decoration: InputDecoration( - labelText: 'Server URL', - hintText: 'https://your-server.com', - prefixIcon: const Icon(Icons.link), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - ), - enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - borderSide: BorderSide( - color: Theme.of(context).colorScheme.outline, - ), - ), - focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - borderSide: BorderSide( - color: Theme.of(context).colorScheme.primary, - ), - ), - ), - validator: (value) { - if (value == null || value!.isEmpty) { - return 'Server URL is required'; - } - if (!_isValidUrl(value)) { - return 'Please enter a valid URL'; - } - return null; - }, - ), - - const SizedBox(height: 16), - - // Username Input - TextFormField( - controller: _usernameController, - decoration: InputDecoration( - labelText: 'Username', - hintText: 'Enter your username', - prefixIcon: const Icon(Icons.person), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - ), - enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - borderSide: BorderSide( - color: Theme.of(context).colorScheme.outline, - ), - ), - focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - borderSide: BorderSide( - color: Theme.of(context).colorScheme.primary, - ), - ), - ), - validator: (value) { - if (value == null || value!.isEmpty) { - return 'Username is required'; - } - return null; - }, - ), - - const SizedBox(height: 16), - - // Password Input - TextFormField( - controller: _passwordController, - obscureText: !_isPasswordVisible, - decoration: InputDecoration( - labelText: 'Password', - hintText: 'Enter your password', - prefixIcon: const Icon(Icons.lock), - suffixIcon: IconButton( - onPressed: () => setState(() => _isPasswordVisible = !_isPasswordVisible), - icon: Icon( - _isPasswordVisible ? Icons.visibility : Icons.visibility_off, - ), - ), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - ), - enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - borderSide: BorderSide( - color: Theme.of(context).colorScheme.outline, - ), - ), - focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - borderSide: BorderSide( - color: Theme.of(context).colorScheme.primary, - ), - ), - ), - validator: (value) { - if (value == null || value!.isEmpty) { - return 'Password is required'; - } - return null; - }, - ), - ], - - const SizedBox(height: 24), - - // Login Button - SizedBox( - width: double.infinity, - height: 50, - child: ElevatedButton( - onPressed: _isLoading ? null : () => _handleLogin(context), - style: ElevatedButton.styleFrom( - backgroundColor: Theme.of(context).colorScheme.primary, - foregroundColor: Theme.of(context).colorScheme.onPrimary, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12), - ), - ), - child: _isLoading - ? const SizedBox( - width: 20, - height: 20, - child: CircularProgressIndicator( - strokeWidth: 2, - valueColor: AlwaysStoppedAnimation(Colors.white), - ), - ) - : Text( - _isQrMode ? 'Login with QR' : 'Login', - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.w600, - ), - ), - ), - ), - ], - ), - ); - }, - ); - } - - Widget _buildErrorMessage(BuildContext context) { - return Container( - padding: const EdgeInsets.all(12), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.errorContainer, - borderRadius: BorderRadius.circular(8), - ), - child: Row( - children: [ - Icon( - Icons.error_outline, - color: Theme.of(context).colorScheme.error, - size: 20, - ), - const SizedBox(width: 8), - Expanded( - child: Text( - _errorMessage!, - style: TextStyle( - color: Theme.of(context).colorScheme.error, - fontSize: 14, - ), - ), - ), - IconButton( - onPressed: () => setState(() => _errorMessage = null), - icon: const Icon(Icons.close), - iconSize: 16, - color: Theme.of(context).colorScheme.error, - ), - ], - ), - ); - } - - bool _isValidUrl(String url) { - try { - final uri = Uri.parse(url); - return uri.hasScheme && (uri.scheme == 'http' || uri.scheme == 'https'); - } catch (e) { - return false; - } - } - - Future _handleLogin(BuildContext context) async { - if (!_formKey.currentState!.validate()) { - return; - } - - setState(() { - _isLoading = true; - _errorMessage = null; - }); - - try { - final authProvider = Provider.of(context, listen: false); - - if (_isQrMode) { - await authProvider.loginWithQrCode(_qrCodeController.text.trim()); - } else { - await authProvider.loginWithUsernameAndPassword( - _baseUrlController.text.trim(), - _usernameController.text.trim(), - _passwordController.text, - ); - } - - if (mounted) { - Navigator.of(context).pushReplacementNamed('/home'); - } - } catch (e) { - setState(() { - _isLoading = false; - _errorMessage = e.toString(); - }); - } - } - - Future _scanQrCode(BuildContext context) async { - try { - final qrCode = await Navigator.pushNamed('/qr'); - if (qrCode != null && mounted) { - _qrCodeController.text = qrCode!; - } - } catch (e) { - setState(() { - _errorMessage = 'Failed to scan QR code: $e'; - }); - } - } -} diff --git a/swingmusic_mobile/lib/features/folder/folder_screen.dart b/swingmusic_mobile/lib/features/folder/folder_screen.dart deleted file mode 100644 index 35fd36a3..00000000 --- a/swingmusic_mobile/lib/features/folder/folder_screen.dart +++ /dev/null @@ -1,889 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../shared/providers/audio_provider.dart'; -import '../../data/models/track_model.dart'; - -class FolderScreen extends StatefulWidget { - const FolderScreen({super.key}); - - @override - State createState() => _FolderScreenState(); -} - -class _FolderScreenState extends State { - List _folderItems = []; - List _currentPath = []; - bool _isLoading = false; - final TextEditingController _searchController = TextEditingController(); - String _currentFolderId = 'root'; - - @override - void initState() { - super.initState(); - _loadFolderContents(_currentFolderId); - } - - @override - void dispose() { - _searchController.dispose(); - super.dispose(); - } - - Future _loadFolderContents(String folderId) async { - setState(() { - _isLoading = true; - }); - - // Simulate API call - await Future.delayed(const Duration(milliseconds: 500)); - - setState(() { - _isLoading = false; - if (folderId == 'root') { - _currentPath = []; - _folderItems = [ - FolderItem( - id: 'music', - name: 'Music', - type: FolderType.folder, - itemCount: 156, - path: '/music', - modifiedDate: DateTime.now().subtract(const Duration(days: 1)), - ), - FolderItem( - id: 'downloads', - name: 'Downloads', - type: FolderType.folder, - itemCount: 42, - path: '/downloads', - modifiedDate: DateTime.now().subtract(const Duration(hours: 3)), - ), - FolderItem( - id: 'rock', - name: 'Rock', - type: FolderType.folder, - itemCount: 89, - path: '/music/rock', - modifiedDate: DateTime.now().subtract(const Duration(days: 7)), - ), - FolderItem( - id: 'pop', - name: 'Pop', - type: FolderType.folder, - itemCount: 67, - path: '/music/pop', - modifiedDate: DateTime.now().subtract(const Duration(days: 2)), - ), - FolderItem( - id: 'jazz', - name: 'Jazz', - type: FolderType.folder, - itemCount: 34, - path: '/music/jazz', - modifiedDate: DateTime.now().subtract(const Duration(days: 14)), - ), - FolderItem( - id: 'electronic', - name: 'Electronic', - type: FolderType.folder, - itemCount: 78, - path: '/music/electronic', - modifiedDate: DateTime.now().subtract(const Duration(days: 5)), - ), - FolderItem( - id: 'classical', - name: 'Classical', - type: FolderType.folder, - itemCount: 45, - path: '/music/classical', - modifiedDate: DateTime.now().subtract(const Duration(days: 21)), - ), - ]; - } else if (folderId == 'music') { - _currentPath = [ - FolderItem(id: 'root', name: '..', type: FolderType.folder, path: '/'), - FolderItem(id: 'rock', name: 'Rock', type: FolderType.folder, itemCount: 89, path: '/music/rock'), - FolderItem(id: 'pop', name: 'Pop', type: FolderType.folder, itemCount: 67, path: '/music/pop'), - FolderItem(id: 'jazz', name: 'Jazz', type: FolderType.folder, itemCount: 34, path: '/music/jazz'), - FolderItem(id: 'electronic', name: 'Electronic', type: FolderType.folder, itemCount: 78, path: '/music/electronic'), - FolderItem(id: 'classical', name: 'Classical', type: FolderType.folder, itemCount: 45, path: '/music/classical'), - ]; - _folderItems = [ - TrackFolderItem( - id: '1', - name: 'Bohemian Rhapsody.mp3', - artist: 'Queen', - album: 'A Night at the Opera', - duration: 334, - size: 5.2, - modifiedDate: DateTime.now().subtract(const Duration(days: 30)), - ), - TrackFolderItem( - id: '2', - name: 'Stairway to Heaven.mp3', - artist: 'Led Zeppelin', - album: 'Led Zeppelin IV', - duration: 482, - size: 7.8, - modifiedDate: DateTime.now().subtract(const Duration(days: 25)), - ), - TrackFolderItem( - id: '3', - name: 'Hotel California.mp3', - artist: 'Eagles', - album: 'Hotel California', - duration: 391, - size: 6.1, - modifiedDate: DateTime.now().subtract(const Duration(days: 20)), - ), - TrackFolderItem( - id: '4', - name: 'Sweet Child O\' Mine.mp3', - artist: 'Queen', - album: 'A Night at the Opera', - duration: 348, - size: 5.4, - modifiedDate: DateTime.now().subtract(const Duration(days: 15)), - ), - TrackFolderItem( - id: '5', - name: 'Another Brick in the Wall.mp3', - artist: 'Pink Floyd', - album: 'The Wall', - duration: 623, - size: 9.8, - modifiedDate: DateTime.now().subtract(const Duration(days: 10)), - ), - ]; - } else { - // Handle other folders with sample data - _currentPath = [ - FolderItem(id: 'root', name: '..', type: FolderType.folder, path: '/'), - ]; - _folderItems = [ - TrackFolderItem( - id: '1', - name: 'Sample Track.mp3', - artist: 'Sample Artist', - album: 'Sample Album', - duration: 240, - size: 4.2, - modifiedDate: DateTime.now().subtract(const Duration(days: 5)), - ), - ]; - } - }); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: Text(_getFolderTitle()), - elevation: 0, - backgroundColor: Theme.of(context).colorScheme.surface, - leading: _currentFolderId != 'root' - ? IconButton( - onPressed: () => _navigateToFolder('root'), - icon: const Icon(Icons.arrow_back), - ) - : null, - actions: [ - PopupMenuButton( - onSelected: _handleMenuAction, - itemBuilder: (context) => [ - const PopupMenuItem( - value: 'sort_name', - child: ListTile( - leading: const Icon(Icons.sort_by_alpha), - title: Text('Sort by Name'), - contentPadding: EdgeInsets.zero, - ), - ), - const PopupMenuItem( - value: 'sort_date', - child: ListTile( - leading: const Icon(Icons.access_time), - title: Text('Sort by Date'), - contentPadding: EdgeInsets.zero, - ), - ), - const PopupMenuItem( - value: 'sort_size', - child: ListTile( - leading: const Icon(Icons.storage), - title: Text('Sort by Size'), - contentPadding: EdgeInsets.zero, - ), - ), - const PopupMenuItem( - value: 'view_list', - child: ListTile( - leading: const Icon(Icons.list), - title: Text('List View'), - contentPadding: EdgeInsets.zero, - ), - ), - const PopupMenuItem( - value: 'view_grid', - child: ListTile( - leading: const Icon(Icons.grid_view), - title: Text('Grid View'), - contentPadding: EdgeInsets.zero, - ), - ), - ], - ), - ], - ), - body: Column( - children: [ - // Breadcrumb Navigation - _buildBreadcrumbNavigation(), - - // Search Bar - Padding( - padding: const EdgeInsets.all(16.0), - child: TextField( - controller: _searchController, - decoration: InputDecoration( - hintText: 'Search in current folder...', - prefixIcon: const Icon(Icons.search), - suffixIcon: _searchController.text.isNotEmpty - ? IconButton( - onPressed: () { - _searchController.clear(); - }, - icon: const Icon(Icons.clear), - ) - : null, - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - borderSide: BorderSide.none, - ), - filled: true, - fillColor: Theme.of(context).colorScheme.surfaceContainerHighest, - contentPadding: const EdgeInsets.symmetric( - horizontal: 16, - vertical: 12, - ), - ), - onChanged: (value) { - _filterItems(value); - }, - ), - ), - - // Folder Contents - Expanded( - child: _isLoading - ? const Center(child: CircularProgressIndicator()) - : _folderItems.isEmpty - ? _buildEmptyState() - : _buildFolderContents(), - ), - ], - ), - ); - } - - Widget _buildBreadcrumbNavigation() { - return Container( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), - child: SingleChildScrollView( - scrollDirection: Axis.horizontal, - child: Row( - children: [ - // Root/Home - InkWell( - onTap: () => _navigateToFolder('root'), - borderRadius: BorderRadius.circular(8), - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), - decoration: BoxDecoration( - color: _currentFolderId == 'root' - ? Theme.of(context).colorScheme.primaryContainer - : Theme.of(context).colorScheme.surfaceContainerHighest, - borderRadius: BorderRadius.circular(8), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.home, - size: 20, - color: _currentFolderId == 'root' - ? Theme.of(context).colorScheme.onPrimaryContainer - : Theme.of(context).colorScheme.onSurfaceVariant, - ), - const SizedBox(width: 8), - Text( - 'Home', - style: TextStyle( - color: _currentFolderId == 'root' - ? Theme.of(context).colorScheme.onPrimaryContainer - : Theme.of(context).colorScheme.onSurfaceVariant, - fontWeight: FontWeight.w500, - ), - ), - ], - ), - ), - ), - - // Breadcrumb items - ..._currentPath.map((item) { - return Padding( - padding: const EdgeInsets.only(left: 4), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - const Icon(Icons.chevron_right, size: 16), - const SizedBox(width: 4), - InkWell( - onTap: () => _navigateToFolder(item.id), - borderRadius: BorderRadius.circular(8), - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), - decoration: BoxDecoration( - color: item.id == _currentFolderId - ? Theme.of(context).colorScheme.primaryContainer - : Theme.of(context).colorScheme.surfaceContainerHighest, - borderRadius: BorderRadius.circular(8), - ), - child: Text( - item.name, - style: TextStyle( - color: item.id == _currentFolderId - ? Theme.of(context).colorScheme.onPrimaryContainer - : Theme.of(context).colorScheme.onSurfaceVariant, - fontWeight: FontWeight.w500, - ), - ), - ), - ), - ], - ), - ); - }).toList(), - ], - ), - ), - ); - } - - Widget _buildFolderContents() { - return ListView.builder( - padding: const EdgeInsets.all(8.0), - itemCount: _folderItems.length, - itemBuilder: (context, index) { - final item = _folderItems[index]; - - if (item is TrackFolderItem) { - return TrackFolderTile( - track: item, - onTap: () => _playTrack(item), - onPlay: () => _playTrack(item), - ); - } else { - return FolderTile( - folder: item, - onTap: () => _navigateToFolder(item.id), - onLongPress: () => _showFolderOptions(item), - ); - } - }, - ); - } - - Widget _buildEmptyState() { - return Center( - child: Padding( - padding: const EdgeInsets.all(32.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.folder_open, - size: 64, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - const SizedBox(height: 16), - Text( - 'This folder is empty', - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - const SizedBox(height: 8), - Text( - 'Add music files to see them here', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - textAlign: TextAlign.center, - ), - ], - ), - ), - ); - } - - String _getFolderTitle() { - if (_currentFolderId == 'root') { - return 'Music Library'; - } else { - final folder = _currentPath.firstWhere( - (item) => item.id == _currentFolderId, - orElse: () => FolderItem(id: '', name: '', type: FolderType.folder), - ); - return folder.name; - } - } - - void _filterItems(String query) { - setState(() { - if (query.isEmpty) { - _loadFolderContents(_currentFolderId); - } else { - // Filter items (in real app, this would call API) - _folderItems = _folderItems.where((item) { - final name = item.name.toLowerCase(); - return name.contains(query.toLowerCase()); - }).toList(); - } - }); - } - - void _navigateToFolder(String folderId) { - setState(() { - _currentFolderId = folderId; - }); - _loadFolderContents(folderId); - } - - void _playTrack(TrackFolderItem track) { - final trackModel = TrackModel( - id: int.parse(track.id), - title: track.name, - album: track.album, - albumhash: track.album.hashCode.toString(), - artists: [], - albumartists: [], - artisthashes: [], - track: 0, - disc: 1, - duration: track.duration, - bitrate: 320, - filepath: track.id, // Use ID as filepath for demo - folder: '', - genres: [], - genrehashes: [], - copyright: '', - date: DateTime.now().millisecondsSinceEpoch ~/ 1000, - lastModified: DateTime.now().millisecondsSinceEpoch ~/ 1000, - trackhash: track.id, - image: '', - weakHash: '', - extra: {}, - lastplayed: 0, - playcount: 0, - playduration: track.duration, - explicit: false, - favUserids: [], - isFavorite: false, - score: 0.0, - ); - - final audioProvider = Provider.of(context, listen: false); - audioProvider.setQueue([trackModel]); - audioProvider.loadTrack(trackModel); - audioProvider.play(); - - Navigator.pushNamed(context, '/player'); - } - - void _handleMenuAction(String action) { - switch (action) { - case 'sort_name': - setState(() { - _folderItems.sort((a, b) => a.name.compareTo(b.name)); - }); - break; - case 'sort_date': - setState(() { - _folderItems.sort((a, b) => b.modifiedDate!.compareTo(a.modifiedDate!)); - }); - break; - case 'sort_size': - setState(() { - _folderItems.sort((a, b) { - final sizeA = a is TrackFolderItem ? a.size : 0; - final sizeB = b is TrackFolderItem ? b.size : 0; - return sizeA.compareTo(sizeB); - }); - }); - break; - // View options would be handled here - } - } - - void _showFolderOptions(FolderItem folder) { - showModalBottomSheet( - context: context, - builder: (context) => Container( - padding: const EdgeInsets.all(16), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surface, - borderRadius: const BorderRadius.vertical(top: Radius.circular(16)), - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - ListTile( - leading: const Icon(Icons.play_arrow), - title: const Text('Play All'), - onTap: () { - Navigator.pop(context); - _playAllInFolder(); - }, - ), - ListTile( - leading: const Icon(Icons.shuffle), - title: const Text('Shuffle All'), - onTap: () { - Navigator.pop(context); - _shuffleAllInFolder(); - }, - ), - ListTile( - leading: const Icon(Icons.playlist_add), - title: const Text('Add to Playlist'), - onTap: () { - Navigator.pop(context); - _addToPlaylist(); - }, - ), - const SizedBox(height: 8), - ListTile( - leading: Icon( - Icons.delete, - color: Theme.of(context).colorScheme.error, - ), - title: Text( - 'Delete', - style: TextStyle( - color: Theme.of(context).colorScheme.error, - ), - ), - onTap: () { - Navigator.pop(context); - _deleteFolder(); - }, - ), - ], - ), - ), - ); - } - - void _playAllInFolder() { - // Implementation to play all tracks in folder - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Playing all tracks in folder')), - ); - } - - void _shuffleAllInFolder() { - // Implementation to shuffle all tracks in folder - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Shuffling all tracks in folder')), - ); - } - - void _addToPlaylist() { - // Implementation to add folder contents to playlist - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Added to playlist')), - ); - } - - void _deleteFolder() { - // Implementation to delete folder - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Folder deleted')), - ); - } -} - -// Helper classes -class FolderItem { - final String id; - final String name; - final FolderType type; - final int? itemCount; - final String? path; - final DateTime? modifiedDate; - - FolderItem({ - required this.id, - required this.name, - required this.type, - this.itemCount, - this.path, - this.modifiedDate, - }); -} - -class TrackFolderItem extends FolderItem { - final String artist; - final String album; - final int duration; - final double size; - - TrackFolderItem({ - required String id, - required String name, - required this.artist, - required this.album, - required this.duration, - required this.size, - String? path, - DateTime? modifiedDate, - }) : super( - id: id, - name: name, - type: FolderType.track, - path: path, - modifiedDate: modifiedDate ?? DateTime.now(), - ); -} - -enum FolderType { - folder, - track, -} - -// Custom widgets -class FolderTile extends StatelessWidget { - final FolderItem folder; - final VoidCallback onTap; - final VoidCallback? onLongPress; - - const FolderTile({ - super.key, - required this.folder, - required this.onTap, - this.onLongPress, - }); - - @override - Widget build(BuildContext context) { - return Card( - child: InkWell( - onTap: onTap, - onLongPress: onLongPress, - borderRadius: BorderRadius.circular(12), - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Row( - children: [ - // Folder/Track Icon - Container( - width: 48, - height: 48, - decoration: BoxDecoration( - color: folder.type == FolderType.folder - ? Theme.of(context).colorScheme.primary.withOpacity(0.1) - : Theme.of(context).colorScheme.secondary.withOpacity(0.1), - borderRadius: BorderRadius.circular(8.0), - ), - child: Icon( - folder.type == FolderType.folder ? Icons.folder : Icons.music_note, - color: folder.type == FolderType.folder - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.secondary, - ), - ), - - const SizedBox(width: 16), - - // Folder/Track Info - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - folder.name, - style: Theme.of(context).textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 4), - if (folder.itemCount != null) - Text( - '${folder.itemCount} items', - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - if (folder.modifiedDate != null) - Text( - _formatDate(folder.modifiedDate!), - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - if (folder is TrackFolderItem) - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - (folder as TrackFolderItem).artist, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - Text( - (folder as TrackFolderItem).album, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ], - ), - ], - ), - ), - ], - ), - ), - ), - ); - } -} - -class TrackFolderTile extends StatelessWidget { - final TrackFolderItem track; - final VoidCallback onTap; - final VoidCallback? onPlay; - - const TrackFolderTile({ - super.key, - required this.track, - required this.onTap, - this.onPlay, - }); - - @override - Widget build(BuildContext context) { - return Card( - child: InkWell( - onTap: onTap, - borderRadius: BorderRadius.circular(12), - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Row( - children: [ - // Track Icon - Container( - width: 48, - height: 48, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.secondary.withOpacity(0.1), - borderRadius: BorderRadius.circular(8), - ), - child: Icon( - Icons.music_note, - color: Theme.of(context).colorScheme.secondary, - ), - ), - - const SizedBox(width: 16), - - // Track Info - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - track.name, - style: Theme.of(context).textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 4), - Text( - track.artist, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - Text( - track.album, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - const SizedBox(height: 8), - Row( - children: [ - Text( - _formatDuration(track.duration), - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - const SizedBox(width: 8), - Text( - '${track.size.toStringAsFixed(1)} MB', - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ], - ), - ], - ), - ), - - // Play Button - IconButton( - onPressed: onPlay, - icon: const Icon(Icons.play_arrow), - color: Theme.of(context).colorScheme.primary, - ), - ], - ), - ), - ), - ); - } -} - -String _formatDate(DateTime date) { - final now = DateTime.now(); - final difference = now.difference(date); - - if (difference.inDays == 0) { - return 'Today'; - } else if (difference.inDays == 1) { - return 'Yesterday'; - } else if (difference.inDays < 7) { - return '${difference.inDays} days ago'; - } else if (difference.inDays < 30) { - return '${(difference.inDays / 7).floor()} weeks ago'; - } else { - return '${(difference.inDays / 30).floor()} months ago'; - } -} - -String _formatDuration(int seconds) { - final minutes = seconds ~/ 60; - final remainingSeconds = seconds % 60; - return '${minutes}:${remainingSeconds.toString().padLeft(2, '0')}'; -} diff --git a/swingmusic_mobile/lib/features/home/home_screen.dart b/swingmusic_mobile/lib/features/home/home_screen.dart deleted file mode 100644 index b271bdbd..00000000 --- a/swingmusic_mobile/lib/features/home/home_screen.dart +++ /dev/null @@ -1,407 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../shared/providers/audio_provider.dart'; -import '../../shared/providers/library_provider.dart'; -import '../../core/widgets/album_card.dart'; -import '../../core/widgets/track_list_tile.dart'; -import '../../data/models/track_model.dart'; - -class HomeScreen extends StatefulWidget { - const HomeScreen({super.key}); - - @override - State createState() => _HomeScreenState(); -} - -class _HomeScreenState extends State { - late LibraryProvider _libraryProvider; - late AudioProvider _audioProvider; - bool _isLoading = false; - - @override - void initState() { - super.initState(); - _libraryProvider = Provider.of(context, listen: false); - _audioProvider = Provider.of(context, listen: false); - _loadHomeData(); - } - - Future _loadHomeData() async { - setState(() { - _isLoading = true; - }); - - try { - // Load recent data from library - await Future.wait([ - _libraryProvider.loadTracks(limit: 10), - _libraryProvider.loadAlbums(limit: 5), - _libraryProvider.loadArtists(limit: 5), - ]); - } catch (e) { - // Handle error silently for now - } - - setState(() { - _isLoading = false; - }); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - body: CustomScrollView( - slivers: [ - // App Bar - SliverAppBar( - floating: true, - snap: true, - backgroundColor: Theme.of(context).colorScheme.surface, - elevation: 0, - title: Text( - 'SwingMusic', - style: Theme.of(context).textTheme.headlineMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - actions: [ - IconButton( - onPressed: () { - // Show notifications - }, - icon: const Icon(Icons.notifications_outlined), - ), - PopupMenuButton( - icon: CircleAvatar( - backgroundColor: Theme.of(context).colorScheme.primaryContainer, - child: Icon( - Icons.person, - color: Theme.of(context).colorScheme.onPrimaryContainer, - ), - ), - onSelected: (value) { - if (value == 'settings') { - Navigator.pushNamed(context, '/settings'); - } - }, - itemBuilder: (context) => [ - const PopupMenuItem( - value: 'settings', - child: Row( - children: [ - Icon(Icons.settings), - SizedBox(width: 8), - Text('Settings'), - ], - ), - ), - ], - ), - ], - ), - - // Quick Actions Section - SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Quick Actions', - style: Theme.of(context).textTheme.titleLarge, - ), - const SizedBox(height: 16), - Row( - children: [ - Expanded( - child: _buildQuickActionCard( - icon: Icons.search, - label: 'Search', - color: Theme.of(context).colorScheme.primary, - onTap: () { - Navigator.pushNamed(context, '/search'); - }, - ), - ), - const SizedBox(width: 12), - Expanded( - child: _buildQuickActionCard( - icon: Icons.library_music, - label: 'Library', - color: Theme.of(context).colorScheme.secondary, - onTap: () { - Navigator.pushNamed(context, '/library'); - }, - ), - ), - ], - ), - const SizedBox(height: 12), - Row( - children: [ - Expanded( - child: _buildQuickActionCard( - icon: Icons.favorite, - label: 'Favorites', - color: Colors.red, - onTap: () { - Navigator.pushNamed(context, '/library'); - }, - ), - ), - const SizedBox(width: 12), - Expanded( - child: _buildQuickActionCard( - icon: Icons.download, - label: 'Downloads', - color: Colors.green, - onTap: () { - // Navigate to downloads - }, - ), - ), - ], - ), - ], - ), - ), - ), - - // Recently Played Section - SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - 'Recently Played', - style: Theme.of(context).textTheme.titleLarge, - ), - TextButton( - onPressed: () { - Navigator.pushNamed(context, '/library'); - }, - child: const Text('See all'), - ), - ], - ), - const SizedBox(height: 16), - if (_isLoading) - const Center(child: CircularProgressIndicator()) - else if (_libraryProvider.tracks.isEmpty) - _buildEmptySection('No recently played tracks') - else - SizedBox( - height: 200, - child: ListView.builder( - scrollDirection: Axis.horizontal, - itemCount: _libraryProvider.tracks.length.clamp(0, 10), - itemBuilder: (context, index) { - final track = _libraryProvider.tracks[index]; - return Container( - width: 160, - margin: const EdgeInsets.only(right: 12), - child: TrackListTile( - track: track, - onTap: () => _playTrack(track), - onPlay: () => _playTrack(track), - showAlbumArt: true, - ), - ); - }, - ), - ), - ], - ), - ), - ), - - // Recent Albums Section - SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - 'Recent Albums', - style: Theme.of(context).textTheme.titleLarge, - ), - TextButton( - onPressed: () { - Navigator.pushNamed(context, '/library'); - }, - child: const Text('See all'), - ), - ], - ), - const SizedBox(height: 16), - if (_isLoading) - const Center(child: CircularProgressIndicator()) - else if (_libraryProvider.albums.isEmpty) - _buildEmptySection('No recent albums') - else - GridView.builder( - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, - childAspectRatio: 0.8, - crossAxisSpacing: 16, - mainAxisSpacing: 16, - ), - itemCount: _libraryProvider.albums.length.clamp(0, 4), - itemBuilder: (context, index) { - final album = _libraryProvider.albums[index]; - return AlbumCard( - album: album, - onTap: () { - // Navigate to album details - }, - ); - }, - ), - ], - ), - ), - ), - - // Top Artists Section - SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Top Artists', - style: Theme.of(context).textTheme.titleLarge, - ), - const SizedBox(height: 16), - if (_isLoading) - const Center(child: CircularProgressIndicator()) - else if (_libraryProvider.artists.isEmpty) - _buildEmptySection('No top artists') - else - ListView.builder( - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - itemCount: _libraryProvider.artists.length.clamp(0, 5), - itemBuilder: (context, index) { - final artist = _libraryProvider.artists[index]; - return ListTile( - leading: CircleAvatar( - backgroundColor: Theme.of(context).colorScheme.primaryContainer, - child: Text( - artist.name.isNotEmpty ? artist.name[0].toUpperCase() : '?', - style: TextStyle( - color: Theme.of(context).colorScheme.onPrimaryContainer, - fontWeight: FontWeight.bold, - ), - ), - ), - title: Text(artist.name), - trailing: const Icon(Icons.arrow_forward_ios), - onTap: () { - // Navigate to artist details - }, - ); - }, - ), - ], - ), - ), - ), - - // Bottom padding - const SliverToBoxAdapter( - child: SizedBox(height: 100), // Space for mini player - ), - ], - ), - ); - } - - Widget _buildQuickActionCard({ - required IconData icon, - required String label, - required Color color, - required VoidCallback onTap, - }) { - return Card( - child: InkWell( - onTap: onTap, - borderRadius: BorderRadius.circular(12), - child: Padding( - padding: const EdgeInsets.all(20.0), - child: Column( - children: [ - Container( - padding: const EdgeInsets.all(12), - decoration: BoxDecoration( - color: color.withValues(alpha: 0.1), - borderRadius: BorderRadius.circular(12), - ), - child: Icon( - icon, - color: color, - size: 28, - ), - ), - const SizedBox(height: 12), - Text( - label, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontWeight: FontWeight.w500, - ), - textAlign: TextAlign.center, - ), - ], - ), - ), - ), - ); - } - - Widget _buildEmptySection(String message) { - return Container( - padding: const EdgeInsets.all(32), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceContainerHighest, - borderRadius: BorderRadius.circular(12), - ), - child: Column( - children: [ - Icon( - Icons.music_note_outlined, - size: 48, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - const SizedBox(height: 12), - Text( - message, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ], - ), - ); - } - - void _playTrack(TrackModel track) { - _audioProvider.setQueue([track]); - _audioProvider.loadTrack(track); - _audioProvider.play(); - - Navigator.pushNamed(context, '/player'); - } -} diff --git a/swingmusic_mobile/lib/features/library/library_screen.dart b/swingmusic_mobile/lib/features/library/library_screen.dart deleted file mode 100644 index 1e2e7ead..00000000 --- a/swingmusic_mobile/lib/features/library/library_screen.dart +++ /dev/null @@ -1,363 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../shared/providers/audio_provider.dart'; -import '../../shared/providers/library_provider.dart'; -import '../../core/widgets/album_card.dart'; -import '../../core/widgets/track_list_tile.dart'; -import '../../data/models/track_model.dart'; - -class LibraryScreen extends StatefulWidget { - const LibraryScreen({super.key}); - - @override - State createState() => _LibraryScreenState(); -} - -class _LibraryScreenState extends State - with SingleTickerProviderStateMixin { - late TabController _tabController; - late LibraryProvider _libraryProvider; - late AudioProvider _audioProvider; - bool _isLoading = false; - - @override - void initState() { - super.initState(); - _tabController = TabController(length: 6, vsync: this); - _libraryProvider = Provider.of(context, listen: false); - _audioProvider = Provider.of(context, listen: false); - _loadLibraryData(); - } - - Future _loadLibraryData() async { - setState(() { - _isLoading = true; - }); - - try { - await Future.wait([ - _libraryProvider.loadTracks(), - _libraryProvider.loadAlbums(), - _libraryProvider.loadArtists(), - _libraryProvider.loadFavorites(), - ]); - } catch (e) { - // Handle error silently for now - } - - setState(() { - _isLoading = false; - }); - } - - @override - void dispose() { - _tabController.dispose(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - body: Column( - children: [ - // Header - Container( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Your Library', - style: Theme.of(context).textTheme.titleLarge, - ), - const SizedBox(height: 16), - // Search bar - TextField( - decoration: InputDecoration( - hintText: 'Search your library...', - prefixIcon: const Icon(Icons.search), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - ), - filled: true, - fillColor: Theme.of(context).colorScheme.surfaceContainerHighest, - ), - ), - ], - ), - ), - - // Tabs - TabBar( - controller: _tabController, - isScrollable: true, - tabs: const [ - Tab(text: 'Recent'), - Tab(text: 'Albums'), - Tab(text: 'Tracks'), - Tab(text: 'Folders'), - Tab(text: 'Favorites'), - Tab(text: 'Playlists'), - ], - ), - - // Tab content - Expanded( - child: TabBarView( - controller: _tabController, - children: [ - _buildRecentTab(), - _buildAlbumsTab(), - _buildTracksTab(), - _buildFoldersTab(), - _buildFavoritesTab(), - _buildPlaylistsTab(), - ], - ), - ), - ], - ), - ); - } - - Widget _buildRecentTab() { - if (_isLoading) { - return const Center(child: CircularProgressIndicator()); - } - - return SingleChildScrollView( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Recently Played', - style: Theme.of(context).textTheme.titleLarge, - ), - const SizedBox(height: 16), - if (_libraryProvider.tracks.isEmpty) - _buildEmptyState('No recently played tracks') - else - ListView.builder( - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - itemCount: _libraryProvider.tracks.length, - itemBuilder: (context, index) { - final track = _libraryProvider.tracks[index]; - return TrackListTile( - track: track, - onTap: () => _playTrack(track), - onPlay: () => _playTrack(track), - isPlaying: _isCurrentTrack(track), - ); - }, - ), - ], - ), - ); - } - - Widget _buildAlbumsTab() { - if (_isLoading) { - return const Center(child: CircularProgressIndicator()); - } - - return SingleChildScrollView( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Albums', - style: Theme.of(context).textTheme.titleLarge, - ), - const SizedBox(height: 16), - if (_libraryProvider.albums.isEmpty) - _buildEmptyState('No albums found') - else - GridView.builder( - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, - childAspectRatio: 0.8, - crossAxisSpacing: 16, - mainAxisSpacing: 16, - ), - itemCount: _libraryProvider.albums.length, - itemBuilder: (context, index) { - final album = _libraryProvider.albums[index]; - return AlbumCard( - album: album, - onTap: () { - // Navigate to album details - }, - ); - }, - ), - ], - ), - ); - } - - Widget _buildTracksTab() { - if (_isLoading) { - return const Center(child: CircularProgressIndicator()); - } - - return SingleChildScrollView( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'All Tracks', - style: Theme.of(context).textTheme.titleLarge, - ), - const SizedBox(height: 16), - if (_libraryProvider.tracks.isEmpty) - _buildEmptyState('No tracks found') - else - ListView.builder( - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - itemCount: _libraryProvider.tracks.length, - itemBuilder: (context, index) { - final track = _libraryProvider.tracks[index]; - return TrackListTile( - track: track, - onTap: () => _playTrack(track), - onPlay: () => _playTrack(track), - isPlaying: _isCurrentTrack(track), - ); - }, - ), - ], - ), - ); - } - - Widget _buildFavoritesTab() { - if (_isLoading) { - return const Center(child: CircularProgressIndicator()); - } - - return SingleChildScrollView( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Favorite Tracks', - style: Theme.of(context).textTheme.titleLarge, - ), - const SizedBox(height: 16), - if (_libraryProvider.favoriteTracks.isEmpty) - _buildEmptyState('No favorite tracks yet') - else - ListView.builder( - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - itemCount: _libraryProvider.favoriteTracks.length, - itemBuilder: (context, index) { - final track = _libraryProvider.favoriteTracks[index]; - return TrackListTile( - track: track, - onTap: () => _playTrack(track), - onPlay: () => _playTrack(track), - isPlaying: _isCurrentTrack(track), - ); - }, - ), - ], - ), - ); - } - - Widget _buildFoldersTab() { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.folder, - size: 64, - color: Theme.of(context).colorScheme.onSurface, - ), - const SizedBox(height: 16), - Text( - 'Folder navigation coming soon', - style: TextStyle( - fontSize: 18, - fontWeight: FontWeight.normal, - color: Theme.of(context).colorScheme.onSurface, - ), - textAlign: TextAlign.center, - ), - ], - ), - ); - } - - Widget _buildPlaylistsTab() { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.playlist_play, - size: 64, - color: Theme.of(context).colorScheme.onSurface, - ), - const SizedBox(height: 16), - Text( - 'Playlist management coming soon', - style: TextStyle( - fontSize: 18, - fontWeight: FontWeight.normal, - color: Theme.of(context).colorScheme.onSurface, - ), - textAlign: TextAlign.center, - ), - ], - ), - ); - } - - Widget _buildEmptyState(String message) { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.music_note, - size: 64, - color: Theme.of(context).colorScheme.onSurface, - ), - const SizedBox(height: 16), - Text( - message, - style: TextStyle( - fontSize: 18, - fontWeight: FontWeight.normal, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - ], - ), - ); - } - - void _playTrack(TrackModel track) { - _audioProvider.setQueue([track]); - _audioProvider.loadTrack(track); - _audioProvider.play(); - - Navigator.pushNamed(context, '/player'); - } - - bool _isCurrentTrack(TrackModel track) { - return _audioProvider.currentTrack?.trackhash == track.trackhash; - } -} diff --git a/swingmusic_mobile/lib/features/lyrics/lyrics_screen.dart b/swingmusic_mobile/lib/features/lyrics/lyrics_screen.dart deleted file mode 100644 index c5739eca..00000000 --- a/swingmusic_mobile/lib/features/lyrics/lyrics_screen.dart +++ /dev/null @@ -1,482 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../shared/providers/audio_provider.dart'; -import '../../data/services/lyrics_service.dart'; -import '../../core/constants/app_spacing.dart'; - -class LyricsScreen extends StatefulWidget { - const LyricsScreen({super.key}); - - @override - State createState() => _LyricsScreenState(); -} - -class _LyricsScreenState extends State { - bool _isLoading = false; - String? _lyrics; - String? _error; - final TextEditingController _lyricsController = TextEditingController(); - - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: Theme.of(context).colorScheme.surface, - appBar: AppBar( - backgroundColor: Theme.of(context).colorScheme.surface, - elevation: 0, - title: Text( - 'Lyrics', - style: Theme.of(context).textTheme.titleLarge?.copyWith( - color: Theme.of(context).colorScheme.onSurface, - fontWeight: FontWeight.w600, - ), - ), - leading: IconButton( - onPressed: () => Navigator.of(context).pop(), - icon: Icon( - Icons.close, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - ), - body: Consumer( - builder: (context, audioProvider, child) { - final currentTrack = audioProvider.currentTrack; - - if (currentTrack == null) { - return _buildEmptyState(context); - } - - return Column( - children: [ - // Track Info - Container( - padding: AppSpacing.paddingLG, - child: Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - currentTrack.displayTitle, - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface, - fontWeight: FontWeight.w600, - ), - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 8), - Text( - currentTrack.artistNames, - style: Theme.of(context).textTheme.titleMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8), - ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - if (currentTrack.displayAlbum.isNotEmpty) ...[ - const SizedBox(height: 4), - Text( - currentTrack.displayAlbum, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - ], - ], - ), - ), - const SizedBox(width: 16), - // Album Art - Container( - width: 80, - height: 80, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8), - boxShadow: [ - BoxShadow( - color: Colors.black.withOpacity(0.2), - blurRadius: 8, - offset: const Offset(0, 4), - ), - ], - child: ClipRRect( - borderRadius: BorderRadius.circular(8), - child: currentTrack.image.isNotEmpty - ? Image.network( - currentTrack.image, - fit: BoxFit.cover, - errorBuilder: (context, error, stackTrace) { - return Container( - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [ - Theme.of(context).colorScheme.primary.withOpacity(0.8), - Theme.of(context).colorScheme.primary, - ], - ), - ), - child: Icon( - Icons.music_note, - color: Theme.of(context).colorScheme.onPrimary, - size: 32, - ), - ); - }, - ) - : Container( - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [ - Theme.of(context).colorScheme.primary.withOpacity(0.8), - Theme.of(context).colorScheme.primary, - ], - ), - ), - child: Icon( - Icons.album, - color: Theme.of(context).colorScheme.onPrimary, - size: 32, - ), - ), - ), - ), - ], - ), - ), - - const SizedBox(height: 24), - - // Sync Button - SizedBox( - width: double.infinity, - child: ElevatedButton.icon( - onPressed: () => _loadLyrics(context, currentTrack?.trackhash ?? ''), - icon: Icon( - Icons.sync, - color: Theme.of(context).colorScheme.onPrimary, - ), - label: 'Sync Lyrics', - style: ElevatedButton.styleFrom( - backgroundColor: Theme.of(context).colorScheme.primary, - foregroundColor: Theme.of(context).colorScheme.onPrimary, - padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12), - ), - ), - ), - - const SizedBox(height: 24), - - // Lyrics Content - Expanded( - child: Container( - padding: AppSpacing.paddingLG, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceVariant, - borderRadius: BorderRadius.circular(12), - border: Border.all( - color: Theme.of(context).colorScheme.outline.withOpacity(0.3), - ), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (_isLoading) ...[ - const Center( - child: CircularProgressIndicator(), - ), - ] else if (_error != null) ...[ - Container( - padding: AppSpacing.paddingMD, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.errorContainer, - borderRadius: BorderRadius.circular(8), - ), - child: Row( - children: [ - Icon( - Icons.error_outline, - color: Theme.of(context).colorScheme.error, - size: 20, - ), - const SizedBox(width: 12), - Expanded( - child: Text( - _error!, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.error, - ), - ), - ), - ], - ), - ), - ] else if (_lyrics != null && _lyrics!.isNotEmpty) ...[ - // Edit Mode - if (_isEditMode) ...[ - _buildEditMode(context), - ] else ...[ - // Display Mode - _buildLyricsDisplay(context), - ], - ] else ...[ - Container( - padding: AppSpacing.paddingXL, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.lyrics, - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - size: 48, - ), - const SizedBox(height: 16), - Text( - 'No lyrics available', - style: Theme.of(context).textTheme.bodyLarge?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - textAlign: TextAlign.center, - ), - ], - ), - ), - ], - ], - ), - ), - ), - ], - ); - }, - ), - ); - } - - Widget _buildEmptyState(BuildContext context) { - return Container( - padding: AppSpacing.paddingXL, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.music_note, - size: 64, - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - const SizedBox(height: 16), - Text( - 'No lyrics available', - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface, - ), - textAlign: TextAlign.center, - ), - const SizedBox(height: 8), - Text( - 'Play a track to see its lyrics', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8), - ), - textAlign: TextAlign.center, - ), - ], - ), - ); - } - - Widget _buildLyricsDisplay(BuildContext context) { - return Container( - padding: AppSpacing.paddingMD, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Header with Edit button - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - 'Lyrics', - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface, - fontWeight: FontWeight.w600, - ), - ), - Row( - children: [ - // Edit/Save buttons - if (_isEditMode) ...[ - IconButton( - onPressed: () => _saveLyrics(context), - icon: Icon( - Icons.save, - color: Theme.of(context).colorScheme.primary, - size: 20, - ), - ), - IconButton( - onPressed: () => _cancelEdit(context), - icon: Icon( - Icons.close, - color: Theme.of(context).colorScheme.onSurface, - size: 20, - ), - ), - ] else ...[ - IconButton( - onPressed: () => _enableEditMode(context), - icon: Icon( - Icons.edit, - color: Theme.of(context).colorScheme.primary, - size: 20, - ), - ), - ], - ], - - // Sync button - SizedBox( - width: double.infinity, - child: ElevatedButton.icon( - onPressed: () => _syncLyrics(context), - icon: Icon( - Icons.refresh, - color: Theme.of(context).colorScheme.onPrimary, - ), - label: 'Sync', - style: ElevatedButton.styleFrom( - backgroundColor: Theme.of(context).colorScheme.primary, - foregroundColor: Theme.of(context).colorScheme.onPrimary, - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), - ), - ), - ), - ], - ), - ), - - // Lyrics text - Expanded( - child: SingleChildScrollView( - child: Text( - _lyrics!, - style: Theme.of(context).textTheme.bodyLarge?.copyWith( - height: 1.6, - color: Theme.of(context).colorScheme.onSurface, - leading: TextStyle( - height: 1.4, - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8), - ), - ), - ), - ), - ), - ], - ), - ); - } - - Widget _buildEditMode(BuildContext context) { - return Container( - padding: AppSpacing.paddingMD, - child: Row( - children: [ - Expanded( - child: TextField( - controller: _lyricsController, - maxLines: null, - style: TextStyle( - height: 1.6, - color: Theme.of(context).colorScheme.onSurface, - ), - decoration: InputDecoration( - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(8), - borderSide: BorderSide( - color: Theme.of(context).colorScheme.primary, - ), - ), - focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(8), - borderSide: BorderSide( - color: Theme.of(context).colorScheme.primary, - width: 2, - ), - ), - ), - ), - ), - IconButton( - onPressed: () => _saveLyrics(context), - icon: Icon( - Icons.save, - color: Theme.of(context).colorScheme.primary, - ), - ), - ], - ), - ); - } - - bool get _isEditMode => _lyricsController.text != _lyrics; - - void _enableEditMode() { - _lyricsController.text = _lyrics ?? ''; - setState(() {}); - } - - void _cancelEdit() { - _lyricsController.text = _lyrics ?? ''; - setState(() {}); - } - - void _saveLyrics(BuildContext context) { - final updatedLyrics = _lyricsController.text.trim(); - - // TODO: Save lyrics to API - setState(() { - _lyrics = updatedLyrics; - _isEditMode = false; - }); - - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Lyrics saved successfully'), - backgroundColor: Colors.green, - ), - ); - } - - Future _loadLyrics(BuildContext context, String trackHash) async { - setState(() { - _isLoading = true; - _error = null; - }); - - try { - final lyricsService = LyricsService(); - final lyrics = await lyricsService.getLyrics(trackHash); - - setState(() { - _isLoading = false; - _lyrics = lyrics; - }); - } catch (e) { - setState(() { - _isLoading = false; - _error = 'Failed to load lyrics: $e'; - }); - } - } - - void _syncLyrics(BuildContext context) { - final currentTrack = Provider.of(context, listen: false).currentTrack; - if (currentTrack != null) return; - - _loadLyrics(context, currentTrack.trackhash); - } -} diff --git a/swingmusic_mobile/lib/features/offline/offline_screen.dart b/swingmusic_mobile/lib/features/offline/offline_screen.dart deleted file mode 100644 index a561f080..00000000 --- a/swingmusic_mobile/lib/features/offline/offline_screen.dart +++ /dev/null @@ -1,374 +0,0 @@ -import 'package:flutter/material.dart'; - -class OfflineScreen extends StatefulWidget { - const OfflineScreen({super.key}); - - @override - State createState() => _OfflineScreenState(); -} - -class _OfflineScreenState extends State { - bool _isOfflineMode = false; - final List> _downloadedTracks = []; - int _totalDownloads = 0; - int _completedDownloads = 0; - double _totalDownloadSize = 0.0; - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('Offline Mode'), - elevation: 0, - backgroundColor: Theme.of(context).colorScheme.surface, - actions: [ - Switch( - value: _isOfflineMode, - onChanged: (value) { - setState(() { - _isOfflineMode = value; - }); - }, - activeThumbColor: Theme.of(context).colorScheme.primary, - activeTrackColor: Theme.of(context).colorScheme.onPrimary, - ), - ], - ), - body: Column( - children: [ - // Offline Mode Toggle Card - Container( - margin: const EdgeInsets.all(16.0), - padding: const EdgeInsets.all(16.0), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceContainerHighest, - borderRadius: BorderRadius.circular(12.0), - border: Border.all( - color: Theme.of(context).colorScheme.outline, - width: 1.0, - ), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Icon( - Icons.cloud_off, - color: _isOfflineMode - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurfaceVariant, - size: 24, - ), - const SizedBox(width: 12), - Text( - 'Offline Mode', - style: Theme.of(context).textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - ], - ), - const SizedBox(height: 8), - Text( - _isOfflineMode - ? 'Download music for offline listening' - : 'Connect to server for online mode', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ], - ), - ), - - const SizedBox(height: 16), - - // Downloads Section - Expanded( - child: Container( - margin: const EdgeInsets.all(16.0), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceContainerHighest, - borderRadius: BorderRadius.circular(12.0), - border: Border.all( - color: Theme.of(context).colorScheme.outline, - width: 1.0, - ), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Downloads Header - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - 'Downloads', - style: Theme.of(context).textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - IconButton( - onPressed: _clearDownloads, - icon: const Icon(Icons.clear_all), - tooltip: 'Clear All', - ), - ], - ), - const SizedBox(height: 16), - - // Download Stats - Container( - padding: const EdgeInsets.all(16.0), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surface, - borderRadius: BorderRadius.circular(8.0), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - _buildStatCard('Total', _totalDownloads.toString(), Icons.download), - _buildStatCard('Completed', _completedDownloads.toString(), Icons.check_circle), - _buildStatCard('Size', _formatFileSize(_totalDownloadSize), Icons.storage), - ], - ), - ), - const SizedBox(height: 16), - - // Downloaded Tracks List - Expanded( - child: _downloadedTracks.isEmpty - ? _buildEmptyState() - : _buildDownloadsList(), - ), - ], - ), - ), - ), - ], - ), - ); - } - - Widget _buildStatCard(String title, String value, IconData icon) { - return Container( - padding: const EdgeInsets.all(12.0), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.primaryContainer, - borderRadius: BorderRadius.circular(8.0), - ), - child: Column( - children: [ - Icon( - icon, - color: Theme.of(context).colorScheme.onPrimaryContainer, - size: 24, - ), - const SizedBox(height: 8), - Text( - title, - style: Theme.of(context).textTheme.labelMedium?.copyWith( - color: Theme.of(context).colorScheme.onPrimaryContainer, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 4), - Text( - value, - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - color: Theme.of(context).colorScheme.onPrimaryContainer, - ), - ), - ], - ), - ); - } - - Widget _buildEmptyState() { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.download_outlined, - size: 64, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - const SizedBox(height: 16), - Text( - 'No downloads yet', - style: Theme.of(context).textTheme.titleMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - const SizedBox(height: 8), - ElevatedButton( - onPressed: _simulateDownload, - style: ElevatedButton.styleFrom( - backgroundColor: Theme.of(context).colorScheme.primary, - foregroundColor: Theme.of(context).colorScheme.onPrimary, - ), - child: const Row( - mainAxisSize: MainAxisSize.min, - children: [ - const Icon(Icons.download), - const SizedBox(width: 8), - const Text('Download Sample Track'), - ], - ), - ), - ], - ), - ); - } - - Widget _buildDownloadsList() { - return ListView.builder( - padding: const EdgeInsets.all(8.0), - itemCount: _downloadedTracks.length, - itemBuilder: (context, index) { - final track = _downloadedTracks[index]; - return Card( - margin: const EdgeInsets.only(bottom: 8.0), - child: ListTile( - leading: ClipRRect( - borderRadius: BorderRadius.circular(8.0), - child: Container( - width: 48, - height: 48, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceContainer, - ), - child: track['isOffline'] == true - ? const Icon(Icons.offline_pin, color: Colors.green) - : const Icon(Icons.music_note, color: Colors.blue), - ), - ), - title: Text( - track['title']?.toString() ?? 'Unknown Track', - style: Theme.of(context).textTheme.titleMedium, - ), - subtitle: Text( - track['artist']?.toString() ?? 'Unknown Artist', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - trailing: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - _formatFileSize(track['size']?.toDouble() ?? 0.0), - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - const SizedBox(width: 8), - PopupMenuButton( - onSelected: (value) { - _handleTrackAction(track, value); - }, - itemBuilder: (context) => [ - const PopupMenuItem( - value: 'play', - child: Row( - children: [ - const Icon(Icons.play_arrow, size: 16), - const SizedBox(width: 8), - const Text('Play'), - ], - ), - ), - const PopupMenuItem( - value: 'delete', - child: Row( - children: [ - const Icon(Icons.delete, size: 16, color: Colors.red), - const SizedBox(width: 8), - const Text('Delete'), - ], - ), - ), - ], - ), - ], - ), - ), - ); - }, - ); - } - - String _formatFileSize(double bytes) { - if (bytes < 1024) { - return '${bytes.toStringAsFixed(0)} B'; - } else if (bytes < 1024 * 1024) { - return '${(bytes / 1024).toStringAsFixed(1)} KB'; - } else if (bytes < 1024 * 1024 * 1024) { - return '${(bytes / (1024 * 1024)).toStringAsFixed(1)} MB'; - } else { - return '${(bytes / (1024 * 1024 * 1024)).toStringAsFixed(1)} GB'; - } - } - - void _clearDownloads() { - setState(() { - _downloadedTracks.clear(); - _totalDownloads = 0; - _completedDownloads = 0; - _totalDownloadSize = 0.0; - }); - - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('All downloads cleared')), - ); - } - - void _simulateDownload() { - setState(() { - _totalDownloads++; - _completedDownloads++; - final trackSize = 5.2 * 1024 * 1024; // 5.2 MB - _totalDownloadSize += trackSize; - - _downloadedTracks.add({ - 'id': 'track_${_totalDownloads}', - 'title': 'Sample Track $_totalDownloads', - 'artist': 'Sample Artist', - 'album': 'Sample Album', - 'duration': '3:45', - 'size': trackSize, - 'isOffline': true, - 'downloadDate': DateTime.now().toIso8601String(), - }); - }); - - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Sample track downloaded')), - ); - } - - void _handleTrackAction(Map track, String action) { - switch (action) { - case 'play': - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Playing: ${track['title']}')), - ); - break; - case 'delete': - setState(() { - _downloadedTracks.remove(track); - _totalDownloads--; - if (track['isOffline'] == true) { - _completedDownloads--; - _totalDownloadSize -= (track['size'] ?? 0.0); - } - }); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Deleted: ${track['title']}')), - ); - break; - } - } -} diff --git a/swingmusic_mobile/lib/features/player/enhanced_player_screen.dart b/swingmusic_mobile/lib/features/player/enhanced_player_screen.dart deleted file mode 100644 index 1584ad33..00000000 --- a/swingmusic_mobile/lib/features/player/enhanced_player_screen.dart +++ /dev/null @@ -1,427 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../shared/providers/audio_provider.dart'; -import '../../core/constants/app_spacing.dart'; -import '../../core/enums/playback_mode.dart'; - -class EnhancedPlayerScreen extends StatefulWidget { - const EnhancedPlayerScreen({super.key}); - - @override - State createState() => _EnhancedPlayerScreenState(); -} - -class _EnhancedPlayerScreenState extends State { - @override - Widget build(BuildContext context) { - return Consumer( - builder: (context, audioProvider, child) { - final currentTrack = audioProvider.currentTrack; - - if (currentTrack == null) { - return _buildEmptyPlayer(); - } - - return Scaffold( - backgroundColor: Theme.of(context).colorScheme.surface, - body: Container( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Theme.of(context).colorScheme.surface, - Theme.of(context).colorScheme.surface.withOpacity(0.95), - ], - ), - ), - child: SafeArea( - child: Column( - children: [ - // Top Bar - Padding( - padding: AppSpacing.horizontalMD, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - IconButton( - onPressed: () => Navigator.of(context).pop(), - icon: Icon( - Icons.keyboard_arrow_down, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - Text( - 'Now Playing', - style: Theme.of(context).textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.bold, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - IconButton( - onPressed: () => _showMoreOptions(context), - icon: Icon( - Icons.more_vert, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - ], - ), - ), - - // Album Artwork - Expanded( - flex: 3, - child: Padding( - padding: AppSpacing.horizontalLG, - child: _buildAlbumArtwork(context, currentTrack), - ), - ), - - // Track Info & Controls - Expanded( - flex: 2, - child: Padding( - padding: AppSpacing.horizontalLG, - child: Column( - children: [ - // Track Info - _buildTrackInfo(context, currentTrack), - - const SizedBox(height: 24), - - // Progress Bar - _buildProgressBar(context, audioProvider), - - const SizedBox(height: 24), - - // Playback Controls - _buildPlaybackControls(context, audioProvider), - - const SizedBox(height: 16), - - // Bottom Controls - _buildBottomControls(context, audioProvider), - ], - ), - ), - ], - ), - ), - ), - ); - }, - ); - } - - Widget _buildAlbumArtwork(BuildContext context, dynamic currentTrack) { - return Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(16), - boxShadow: [ - BoxShadow( - color: Colors.black.withOpacity(0.3), - blurRadius: 20, - offset: const Offset(0, 8), - ), - ], - ), - child: ClipRRect( - borderRadius: BorderRadius.circular(16), - child: currentTrack.image.isNotEmpty - ? Image.network( - currentTrack.image, - fit: BoxFit.cover, - errorBuilder: (context, error, stackTrace) { - return _buildDefaultAlbumArt(context); - }, - ) - : _buildDefaultAlbumArt(context), - ), - ); - } - - Widget _buildTrackInfo(BuildContext context, dynamic currentTrack) { - return Column( - children: [ - Text( - currentTrack.displayTitle, - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - fontWeight: FontWeight.bold, - color: Theme.of(context).colorScheme.onSurface, - ), - textAlign: TextAlign.center, - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 8), - Text( - currentTrack.artistNames, - style: Theme.of(context).textTheme.titleMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8), - ), - textAlign: TextAlign.center, - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - if (currentTrack.displayAlbum.isNotEmpty) ...[ - const SizedBox(height: 4), - Text( - currentTrack.displayAlbum, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - textAlign: TextAlign.center, - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - ], - ], - ); - } - - Widget _buildProgressBar(BuildContext context, AudioProvider audioProvider) { - return Column( - children: [ - SliderTheme( - data: SliderTheme.of(context).copyWith( - thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 8), - trackHeight: 4, - activeTrackColor: Theme.of(context).colorScheme.primary, - inactiveTrackColor: Theme.of(context).colorScheme.surfaceVariant, - ), - child: Slider( - value: audioProvider.progress, - onChanged: (value) { - final newPosition = Duration( - milliseconds: (value * audioProvider.duration.inMilliseconds).round(), - ); - audioProvider.seekTo(newPosition); - }, - ), - ), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - audioProvider.positionFormatted, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8), - ), - ), - Text( - audioProvider.durationFormatted, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8), - ), - ), - ], - ), - ), - ], - ); - } - - Widget _buildPlaybackControls(BuildContext context, AudioProvider audioProvider) { - return Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - // Shuffle - IconButton( - onPressed: () => audioProvider.toggleShuffle(), - icon: Icon( - Icons.shuffle, - color: audioProvider.shuffleMode == ShuffleMode.on - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ), - - // Previous - IconButton( - onPressed: () => audioProvider.playPrevious(), - icon: Icon( - Icons.skip_previous, - color: Theme.of(context).colorScheme.onSurface, - ), - iconSize: 40, - ), - - // Play/Pause with buffering indicator - _buildPlayPauseButton(context, audioProvider), - - // Next - IconButton( - onPressed: () => audioProvider.playNext(), - icon: Icon( - Icons.skip_next, - color: Theme.of(context).colorScheme.onSurface, - ), - iconSize: 40, - ), - - // Repeat - IconButton( - onPressed: () => audioProvider.toggleRepeat(), - icon: _getRepeatIcon(audioProvider.repeatMode), - color: audioProvider.repeatMode != RepeatMode.off - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ], - ); - } - - Widget _buildPlayPauseButton(BuildContext context, AudioProvider audioProvider) { - return Container( - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Theme.of(context).colorScheme.primary, - ), - child: Stack( - alignment: Alignment.center, - children: [ - IconButton( - onPressed: () { - if (audioProvider.isPlaying) { - audioProvider.pause(); - } else { - audioProvider.play(); - } - }, - icon: Icon( - audioProvider.isPlaying ? Icons.pause : Icons.play_arrow, - color: Theme.of(context).colorScheme.onPrimary, - size: 48, - ), - ), - if (audioProvider.isBuffering) - Container( - width: 60, - height: 60, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Theme.of(context).colorScheme.primary.withOpacity(0.8), - ), - child: const CircularProgressIndicator( - strokeWidth: 3, - valueColor: AlwaysStoppedAnimation(Colors.white), - ), - ), - ], - ), - ); - } - - Widget _buildBottomControls(BuildContext context, AudioProvider audioProvider) { - return Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - // Favorite - IconButton( - onPressed: () => _toggleFavorite(context, audioProvider), - icon: Icon( - audioProvider.currentTrack?.isFavorite == true - ? Icons.favorite - : Icons.favorite_border, - color: audioProvider.currentTrack?.isFavorite == true - ? Colors.red - : Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ), - - // Queue - IconButton( - onPressed: () => _showQueue(context), - icon: Icon( - Icons.queue_music, - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ), - - // Volume - IconButton( - onPressed: () => _showVolumeSlider(context, audioProvider), - icon: Icon( - Icons.volume_up, - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ), - -} - -IconData _getRepeatIcon(RepeatMode mode) { -switch (mode) { - case RepeatMode.one: - return Icons.repeat_one; - case RepeatMode.all: - return Icons.repeat; - case RepeatMode.off: - default: - return Icons.repeat; -} -} - -void _toggleFavorite(BuildContext context, AudioProvider audioProvider) { -// Toggle favorite functionality -} - -void _showQueue(BuildContext context) { -// Show queue functionality -} - -void _showVolumeSlider(BuildContext context, AudioProvider audioProvider) { - showModalBottomSheet( - context: context, - builder: (context) => Container( - padding: AppSpacing.paddingLG, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - 'Volume', - style: Theme.of(context).textTheme.titleMedium, - ), - const SizedBox(height: 16), - Slider( - value: audioProvider.volume, - onChanged: (value) => audioProvider.setVolume(value), - min: 0.0, - max: 1.0, - ), - ], - ), - ), - ); -} - -void _showMoreOptions(BuildContext context) { -showModalBottomSheet( - context: context, - builder: (context) => Container( - padding: AppSpacing.large, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - ListTile( - leading: const Icon(Icons.share), - title: const Text('Share'), - onTap: () => Navigator.pop(context), - ), - ListTile( - leading: const Icon(Icons.playlist_add), - title: const Text('Add to Playlist'), - onTap: () => Navigator.pop(context), - ), - ListTile( - leading: const Icon(Icons.info_outline), - title: const Text('Track Info'), - onTap: () => Navigator.pop(context), - ), - ], - ), - ), -); -} diff --git a/swingmusic_mobile/lib/features/player/enhanced_player_screen_new.dart b/swingmusic_mobile/lib/features/player/enhanced_player_screen_new.dart deleted file mode 100644 index e1258c08..00000000 --- a/swingmusic_mobile/lib/features/player/enhanced_player_screen_new.dart +++ /dev/null @@ -1,489 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../shared/providers/audio_provider.dart'; -import '../../core/constants/app_spacing.dart'; -import '../../core/enums/playback_mode.dart'; - -class EnhancedPlayerScreen extends StatefulWidget { - const EnhancedPlayerScreen({super.key}); - - @override - State createState() => _EnhancedPlayerScreenState(); -} - -class _EnhancedPlayerScreenState extends State { - @override - Widget build(BuildContext context) { - return Consumer( - builder: (context, audioProvider, child) { - final currentTrack = audioProvider.currentTrack; - - if (currentTrack == null) { - return _buildEmptyPlayer(); - } - - return Scaffold( - backgroundColor: Theme.of(context).colorScheme.surface, - body: Container( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Theme.of(context).colorScheme.surface, - Theme.of(context).colorScheme.surface.withOpacity(0.95), - ], - ), - ), - child: SafeArea( - child: Column( - children: [ - // Top Bar - Padding( - padding: AppSpacing.horizontalMD, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - IconButton( - onPressed: () => Navigator.of(context).pop(), - icon: Icon( - Icons.keyboard_arrow_down, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - Text( - 'Now Playing', - style: Theme.of(context).textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.bold, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - IconButton( - onPressed: () => _showMoreOptions(context), - icon: Icon( - Icons.more_vert, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - ], - ), - ), - - // Album Artwork - Expanded( - flex: 3, - child: Padding( - padding: AppSpacing.horizontalLG, - child: _buildAlbumArtwork(context, currentTrack), - ), - ), - - // Track Info & Controls - Expanded( - flex: 2, - child: Padding( - padding: AppSpacing.horizontalLG, - child: Column( - children: [ - // Track Info - _buildTrackInfo(context, currentTrack), - - const SizedBox(height: 24), - - // Progress Bar - _buildProgressBar(context, audioProvider), - - const SizedBox(height: 24), - - // Playback Controls - _buildPlaybackControls(context, audioProvider), - - const SizedBox(height: 16), - - // Bottom Controls - _buildBottomControls(context, audioProvider), - ], - ), - ), - ], - ), - ), - ), - ); - }, - ); - } - - Widget _buildAlbumArtwork(BuildContext context, dynamic currentTrack) { - return Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(16), - boxShadow: [ - BoxShadow( - color: Colors.black.withOpacity(0.3), - blurRadius: 20, - offset: const Offset(0, 8), - ), - ], - ), - child: ClipRRect( - borderRadius: BorderRadius.circular(16), - child: currentTrack.image.isNotEmpty - ? Image.network( - currentTrack.image, - fit: BoxFit.cover, - errorBuilder: (context, error, stackTrace) { - return _buildDefaultAlbumArt(context); - }, - ) - : _buildDefaultAlbumArt(context), - ), - ); - } - - Widget _buildTrackInfo(BuildContext context, dynamic currentTrack) { - return Column( - children: [ - Text( - currentTrack.displayTitle, - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - fontWeight: FontWeight.bold, - color: Theme.of(context).colorScheme.onSurface, - ), - textAlign: TextAlign.center, - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 8), - Text( - currentTrack.artistNames, - style: Theme.of(context).textTheme.titleMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8), - ), - textAlign: TextAlign.center, - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - if (currentTrack.displayAlbum.isNotEmpty) ...[ - const SizedBox(height: 4), - Text( - currentTrack.displayAlbum, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - textAlign: TextAlign.center, - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - ], - ], - ); - } - - Widget _buildProgressBar(BuildContext context, AudioProvider audioProvider) { - return Column( - children: [ - SliderTheme( - data: SliderTheme.of(context).copyWith( - thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 8), - trackHeight: 4, - activeTrackColor: Theme.of(context).colorScheme.primary, - inactiveTrackColor: Theme.of(context).colorScheme.surfaceVariant, - ), - child: Slider( - value: audioProvider.progress, - onChanged: (value) { - final newPosition = Duration( - milliseconds: (value * audioProvider.duration.inMilliseconds).round(), - ); - audioProvider.seekTo(newPosition); - }, - ), - ), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - audioProvider.positionFormatted, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8), - ), - ), - Text( - audioProvider.durationFormatted, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8), - ), - ), - ], - ), - ), - ], - ); - } - - Widget _buildPlaybackControls(BuildContext context, AudioProvider audioProvider) { - return Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - // Shuffle - IconButton( - onPressed: () => audioProvider.toggleShuffle(), - icon: Icon( - Icons.shuffle, - color: audioProvider.shuffleMode == ShuffleMode.on - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ), - - // Previous - IconButton( - onPressed: () => audioProvider.playPrevious(), - icon: Icon( - Icons.skip_previous, - color: Theme.of(context).colorScheme.onSurface, - ), - iconSize: 40, - ), - - // Play/Pause with buffering indicator - _buildPlayPauseButton(context, audioProvider), - - // Next - IconButton( - onPressed: () => audioProvider.playNext(), - icon: Icon( - Icons.skip_next, - color: Theme.of(context).colorScheme.onSurface, - ), - iconSize: 40, - ), - - // Repeat - IconButton( - onPressed: () => audioProvider.toggleRepeat(), - icon: _getRepeatIcon(audioProvider.repeatMode), - color: audioProvider.repeatMode != RepeatMode.off - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ], - ); - } - - Widget _buildPlayPauseButton(BuildContext context, AudioProvider audioProvider) { - return Container( - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Theme.of(context).colorScheme.primary, - ), - child: Stack( - alignment: Alignment.center, - children: [ - IconButton( - onPressed: () { - if (audioProvider.isPlaying) { - audioProvider.pause(); - } else { - audioProvider.play(); - } - }, - icon: Icon( - audioProvider.isPlaying ? Icons.pause : Icons.play_arrow, - color: Theme.of(context).colorScheme.onPrimary, - size: 48, - ), - ), - if (audioProvider.isBuffering) - Container( - width: 60, - height: 60, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Theme.of(context).colorScheme.primary.withOpacity(0.8), - ), - child: const CircularProgressIndicator( - strokeWidth: 3, - valueColor: AlwaysStoppedAnimation(Colors.white), - ), - ), - ], - ), - ); - } - - Widget _buildBottomControls(BuildContext context, AudioProvider audioProvider) { - return Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - // Favorite - IconButton( - onPressed: () => _toggleFavorite(context, audioProvider), - icon: Icon( - audioProvider.currentTrack?.isFavorite == true - ? Icons.favorite - : Icons.favorite_border, - color: audioProvider.currentTrack?.isFavorite == true - ? Colors.red - : Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ), - - // Queue - IconButton( - onPressed: () => _showQueue(context), - icon: Icon( - Icons.queue_music, - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ), - - // Volume - IconButton( - onPressed: () => _showVolumeSlider(context, audioProvider), - icon: Icon( - Icons.volume_up, - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ), - - // More options - IconButton( - onPressed: () => _showMoreOptions(context), - icon: Icon( - Icons.more_horiz, - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - ), - ], - ); - } - - Widget _buildDefaultAlbumArt(BuildContext context) { - return Container( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Theme.of(context).colorScheme.primary.withOpacity(0.7), - Theme.of(context).colorScheme.secondary.withOpacity(0.7), - ], - ), - ), - child: Icon( - Icons.album, - size: 120, - color: Theme.of(context).colorScheme.onPrimary, - ), - ); - } - - Widget _buildEmptyPlayer() { - return Scaffold( - body: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.music_note, - size: 64, - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6), - ), - const SizedBox(height: 16), - Text( - 'No track playing', - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - color: Theme.of(context).colorScheme.onSurface, - ), - ), - const SizedBox(height: 8), - Text( - 'Select a track from your library to start playing', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8), - ), - textAlign: TextAlign.center, - ), - ], - ), - ), - ); - } - - IconData _getRepeatIcon(RepeatMode mode) { - switch (mode) { - case RepeatMode.one: - return Icons.repeat_one; - case RepeatMode.all: - return Icons.repeat; - case RepeatMode.off: - return Icons.repeat; - } - } - - void _toggleFavorite(BuildContext context, AudioProvider audioProvider) { - // Toggle favorite functionality - } - - void _showQueue(BuildContext context) { - // Show queue functionality - } - - void _showVolumeSlider(BuildContext context, AudioProvider audioProvider) { - showModalBottomSheet( - context: context, - builder: (context) => Container( - padding: AppSpacing.paddingLG, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - 'Volume', - style: Theme.of(context).textTheme.titleMedium, - ), - const SizedBox(height: 16), - Slider( - value: audioProvider.volume, - onChanged: (value) => audioProvider.setVolume(value), - min: 0.0, - max: 1.0, - ), - ], - ), - ), - ); - } - - void _showMoreOptions(BuildContext context) { - showModalBottomSheet( - context: context, - builder: (context) => Container( - padding: AppSpacing.paddingLG, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - ListTile( - leading: const Icon(Icons.share), - title: const Text('Share'), - onTap: () => Navigator.pop(context), - ), - ListTile( - leading: const Icon(Icons.playlist_add), - title: const Text('Add to Playlist'), - onTap: () => Navigator.pop(context), - ), - ListTile( - leading: const Icon(Icons.info_outline), - title: const Text('Track Info'), - onTap: () => Navigator.pop(context), - ), - ], - ), - ), - ); - } -} diff --git a/swingmusic_mobile/lib/features/player/player_screen.dart b/swingmusic_mobile/lib/features/player/player_screen.dart deleted file mode 100644 index 66be1681..00000000 --- a/swingmusic_mobile/lib/features/player/player_screen.dart +++ /dev/null @@ -1,373 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../shared/providers/audio_provider.dart'; -import '../../core/constants/app_spacing.dart'; - -class PlayerScreen extends StatefulWidget { - const PlayerScreen({super.key}); - - @override - State createState() => _PlayerScreenState(); -} - -class _PlayerScreenState extends State { - @override - void initState() { - super.initState(); - // Initialize audio service if not already done - WidgetsBinding.instance.addPostFrameCallback((_) { - Provider.of(context, listen: false).initialize(); - }); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - body: Consumer( - builder: (context, audioProvider, child) { - final currentTrack = audioProvider.currentTrack; - - if (currentTrack == null) { - return _buildEmptyPlayer(); - } - - return Column( - children: [ - // App Bar - SafeArea( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - IconButton( - onPressed: () => Navigator.of(context).pop(), - icon: const Icon(Icons.keyboard_arrow_down), - ), - Text( - 'Now Playing', - style: Theme.of(context).textTheme.titleMedium, - ), - IconButton( - onPressed: () { - // Show more options - }, - icon: const Icon(Icons.more_vert), - ), - ], - ), - ), - ), - - // Album Art - Expanded( - flex: 3, - child: Padding( - padding: const EdgeInsets.all(32.0), - child: Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(16), - boxShadow: [ - BoxShadow( - color: Colors.black.withOpacity(0.3), - blurRadius: 20, - offset: const Offset(0, 8), - ), - ], - ), - child: ClipRRect( - borderRadius: BorderRadius.circular(16), - child: Container( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Theme.of(context).colorScheme.primary.withOpacity(0.7), - Theme.of(context).colorScheme.secondary.withOpacity(0.7), - ], - ), - ), - child: currentTrack.image.isNotEmpty - ? Image.network( - currentTrack.image, - fit: BoxFit.cover, - errorBuilder: (context, error, stackTrace) { - return _buildDefaultAlbumArt(context); - }, - ) - : _buildDefaultAlbumArt(context), - ), - ), - ), - ), - ), - - // Track Info - Expanded( - flex: 1, - child: Padding( - padding: AppSpacing.horizontalXL, - child: Column( - children: [ - Text( - currentTrack.displayTitle, - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - fontWeight: FontWeight.bold, - ), - textAlign: TextAlign.center, - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 8), - Text( - currentTrack.artistNames, - style: Theme.of(context).textTheme.titleMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - textAlign: TextAlign.center, - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - if (currentTrack.displayAlbum.isNotEmpty) ...[ - const SizedBox(height: 4), - Text( - currentTrack.displayAlbum, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - textAlign: TextAlign.center, - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - ], - ], - ), - ), - ), - - // Progress Bar - Padding( - padding: AppSpacing.horizontalXL, - child: Column( - children: [ - SliderTheme( - data: SliderTheme.of(context).copyWith( - thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 8), - trackHeight: 4, - ), - child: Slider( - value: audioProvider.progress, - onChanged: (value) { - final newPosition = Duration( - milliseconds: (value * audioProvider.duration.inMilliseconds).round(), - ); - audioProvider.seekTo(newPosition); - }, - ), - ), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - audioProvider.positionFormatted, - style: Theme.of(context).textTheme.bodySmall, - ), - Text( - audioProvider.durationFormatted, - style: Theme.of(context).textTheme.bodySmall, - ), - // Volume Control - Expanded( - child: Row( - children: [ - Icon( - Icons.volume_up, - color: Theme.of(context).colorScheme.onSurfaceVariant, - size: 20, - ), - Expanded( - child: Slider( - value: audioProvider.volume, - onChanged: (value) { - audioProvider.setVolume(value); - }, - min: 0.0, - max: 1.0, - ), - ), - ], - ), - ), - ], - ), - ), - ], - ), - ), - - // Playback Controls - Expanded( - flex: 1, - child: Padding( - padding: AppSpacing.horizontalXL, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - // Shuffle - IconButton( - onPressed: () => audioProvider.toggleShuffle(), - icon: Icon( - Icons.shuffle, - color: audioProvider.isShuffleMode - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - - // Previous - IconButton( - onPressed: () => audioProvider.playPrevious(), - icon: const Icon(Icons.skip_previous), - iconSize: 32, - ), - - // Play/Pause - Container( - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Theme.of(context).colorScheme.primary, - ), - child: IconButton( - onPressed: () { - if (audioProvider.isPlaying) { - audioProvider.pause(); - } else { - audioProvider.play(); - } - }, - icon: audioProvider.isLoading - ? const SizedBox( - width: 24, - height: 24, - child: CircularProgressIndicator( - strokeWidth: 2, - valueColor: AlwaysStoppedAnimation(Colors.white), - ), - ) - : Icon( - audioProvider.isPlaying ? Icons.pause : Icons.play_arrow, - color: Theme.of(context).colorScheme.onPrimary, - size: 32, - ), - ), - ), - - // Next - IconButton( - onPressed: () => audioProvider.playNext(), - icon: const Icon(Icons.skip_next), - iconSize: 32, - ), - - // Repeat - IconButton( - onPressed: () => audioProvider.toggleRepeat(), - icon: Icon( - audioProvider.isRepeatMode ? Icons.repeat_one : Icons.repeat, - color: audioProvider.isRepeatMode - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ], - ), - ), - ), - - // Bottom Controls - Padding( - padding: const EdgeInsets.only(bottom: 32.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - IconButton( - onPressed: () { - // Add to favorites - }, - icon: const Icon(Icons.favorite_border), - ), - IconButton( - onPressed: () { - // Show playlist - }, - icon: const Icon(Icons.playlist_play), - ), - IconButton( - onPressed: () { - // Share - }, - icon: const Icon(Icons.share), - ), - ], - ), - ), - ], - ); - }, - ), - ); - } - - Widget _buildEmptyPlayer() { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.music_note, - size: 64, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - const SizedBox(height: 16), - Text( - 'No track playing', - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - const SizedBox(height: 8), - Text( - 'Select a track from your library to start playing', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - textAlign: TextAlign.center, - ), - ], - ), - ); - } - - Widget _buildDefaultAlbumArt(BuildContext context) { - return Container( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Theme.of(context).colorScheme.primary.withOpacity(0.7), - Theme.of(context).colorScheme.secondary.withOpacity(0.7), - ], - ), - ), - child: Icon( - Icons.album, - size: 120, - color: Theme.of(context).colorScheme.onPrimary, - ), - ); - } -} diff --git a/swingmusic_mobile/lib/features/playlists/playlists_screen.dart b/swingmusic_mobile/lib/features/playlists/playlists_screen.dart deleted file mode 100644 index 6d08c8df..00000000 --- a/swingmusic_mobile/lib/features/playlists/playlists_screen.dart +++ /dev/null @@ -1,437 +0,0 @@ -import 'package:flutter/material.dart'; -import '../../data/models/playlist_model.dart'; - -class PlaylistsScreen extends StatefulWidget { - const PlaylistsScreen({super.key}); - - @override - State createState() => _PlaylistsScreenState(); -} - -class _PlaylistsScreenState extends State { - List _playlists = []; - bool _isLoading = false; - final TextEditingController _playlistNameController = TextEditingController(); - final TextEditingController _searchController = TextEditingController(); - - @override - void initState() { - super.initState(); - _loadPlaylists(); - } - - @override - void dispose() { - _playlistNameController.dispose(); - _searchController.dispose(); - super.dispose(); - } - - Future _loadPlaylists() async { - setState(() { - _isLoading = true; - }); - - // Simulate API call - await Future.delayed(const Duration(seconds: 1)); - - setState(() { - _isLoading = false; - // Sample playlists for demo - _playlists = [ - PlaylistModel( - id: '1', - name: 'My Favorites', - description: 'My favorite tracks', - trackcount: 25, - isPublic: false, - createdDate: DateTime.now().subtract(const Duration(days: 30)), - lastModified: DateTime.now().subtract(const Duration(days: 5)), - ), - PlaylistModel( - id: '2', - name: 'Workout Mix', - description: 'High energy tracks for workouts', - trackcount: 18, - isPublic: false, - createdDate: DateTime.now().subtract(const Duration(days: 15)), - lastModified: DateTime.now().subtract(const Duration(days: 2)), - ), - PlaylistModel( - id: '3', - name: 'Chill Vibes', - description: 'Relaxing and focus music', - trackcount: 32, - isPublic: true, - createdDate: DateTime.now().subtract(const Duration(days: 7)), - lastModified: DateTime.now().subtract(const Duration(days: 1)), - ), - PlaylistModel( - id: '4', - name: 'Road Trip Classics', - description: 'Classic hits for long drives', - trackcount: 45, - isPublic: false, - createdDate: DateTime.now().subtract(const Duration(days: 90)), - lastModified: DateTime.now().subtract(const Duration(days: 10)), - ), - ]; - }); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('Playlists'), - elevation: 0, - backgroundColor: Theme.of(context).colorScheme.surface, - actions: [ - IconButton( - onPressed: _showCreatePlaylistDialog, - icon: const Icon(Icons.add), - ), - ], - ), - body: Column( - children: [ - // Search Bar - Padding( - padding: const EdgeInsets.all(16.0), - child: TextField( - controller: _searchController, - decoration: InputDecoration( - hintText: 'Search playlists...', - prefixIcon: const Icon(Icons.search), - suffixIcon: _searchController.text.isNotEmpty - ? IconButton( - onPressed: () { - _searchController.clear(); - _filterPlaylists(''); - }, - icon: const Icon(Icons.clear), - ) - : null, - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - borderSide: BorderSide.none, - ), - filled: true, - fillColor: Theme.of(context).colorScheme.surfaceContainerHighest, - contentPadding: const EdgeInsets.symmetric( - horizontal: 16, - vertical: 12, - ), - ), - onChanged: (value) { - _filterPlaylists(value); - }, - ), - ), - - // Playlists Grid - Expanded( - child: _isLoading - ? const Center(child: CircularProgressIndicator()) - : _playlists.isEmpty - ? _buildEmptyState() - : _buildPlaylistsGrid(), - ), - ], - ), - floatingActionButton: FloatingActionButton( - onPressed: _showCreatePlaylistDialog, - child: const Icon(Icons.add), - ), - ); - } - - Widget _buildPlaylistsGrid() { - return GridView.builder( - padding: const EdgeInsets.all(16.0), - gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, - childAspectRatio: 0.8, - crossAxisSpacing: 16, - mainAxisSpacing: 16, - ), - itemCount: _playlists.length, - itemBuilder: (context, index) { - final playlist = _playlists[index]; - return Card( - child: InkWell( - onTap: () => _openPlaylist(playlist), - borderRadius: BorderRadius.circular(12), - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Playlist Cover - Container( - width: double.infinity, - height: 120, - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Theme.of(context).colorScheme.primary.withValues(alpha: 0.8), - Theme.of(context).colorScheme.secondary.withValues(alpha: 0.8), - ], - ), - borderRadius: BorderRadius.circular(8), - ), - child: Stack( - children: [ - // Playlist Icon - Positioned( - top: 8, - right: 8, - child: Container( - padding: const EdgeInsets.all(4), - decoration: BoxDecoration( - color: Colors.black.withValues(alpha: 0.7), - borderRadius: BorderRadius.circular(4), - ), - child: Icon( - Icons.playlist_play, - color: Colors.white, - size: 20, - ), - ), - ), - // Public/Private Badge - if (playlist.isPublic) - Positioned( - bottom: 8, - left: 8, - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2), - decoration: BoxDecoration( - color: Colors.green, - borderRadius: BorderRadius.circular(8), - ), - child: Text( - 'PUBLIC', - style: const TextStyle( - color: Colors.white, - fontSize: 8, - fontWeight: FontWeight.bold, - ), - ), - ), - ), - ], - ), - ), - - const SizedBox(height: 12), - - // Playlist Info - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - playlist.name, - style: Theme.of(context).textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 4), - Text( - playlist.description, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 8), - Row( - children: [ - Icon( - Icons.music_note, - size: 16, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - const SizedBox(width: 4), - Text( - '${playlist.trackcount} tracks', - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ], - ), - const SizedBox(height: 4), - Text( - _formatDate(playlist.lastModified), - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ], - ), - ), - ], - ), - ), - ), - ); - }, - ); - } - - Widget _buildEmptyState() { - return Center( - child: Padding( - padding: const EdgeInsets.all(32.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.playlist_add, - size: 64, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - const SizedBox(height: 16), - Text( - 'No playlists yet', - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - const SizedBox(height: 8), - Text( - 'Create your first playlist to get started', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - textAlign: TextAlign.center, - ), - const SizedBox(height: 16), - ElevatedButton.icon( - onPressed: _showCreatePlaylistDialog, - icon: const Icon(Icons.add), - label: const Text('Create Playlist'), - style: ElevatedButton.styleFrom( - padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12), - ), - ), - ], - ), - ), - ); - } - - void _filterPlaylists(String query) { - setState(() { - if (query.isEmpty) { - // Reset to all playlists - _loadPlaylists(); - } else { - // Filter playlists (in real app, this would call API) - _playlists = _playlists.where((playlist) => - playlist.name.toLowerCase().contains(query.toLowerCase()) - ).toList(); - } - }); - } - - void _openPlaylist(PlaylistModel playlist) { - Navigator.pushNamed(context, '/playlist', arguments: playlist); - } - - void _showCreatePlaylistDialog() { - showDialog( - context: context, - builder: (context) => AlertDialog( - title: const Text('Create Playlist'), - content: Column( - mainAxisSize: MainAxisSize.min, - children: [ - TextField( - controller: _playlistNameController, - decoration: const InputDecoration( - labelText: 'Playlist Name', - border: OutlineInputBorder(), - ), - autofocus: true, - ), - const SizedBox(height: 16), - TextField( - decoration: const InputDecoration( - labelText: 'Description (Optional)', - border: OutlineInputBorder(), - ), - maxLines: 3, - ), - ], - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(context), - child: const Text('Cancel'), - ), - ElevatedButton( - onPressed: _createPlaylist, - child: const Text('Create'), - ), - ], - ), - ); - } - - void _createPlaylist() async { - final name = _playlistNameController.text.trim(); - if (name.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Please enter a playlist name')), - ); - return; - } - - // Create playlist (in real app, this would call API) - final newPlaylist = PlaylistModel( - id: DateTime.now().millisecondsSinceEpoch.toString(), - name: name, - description: '', - trackcount: 0, - isPublic: false, - createdDate: DateTime.now(), - lastModified: DateTime.now(), - ); - - setState(() { - _playlists.insert(0, newPlaylist); - }); - - _playlistNameController.clear(); - Navigator.pop(context); - - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Playlist "$name" created successfully')), - ); - } - - String _formatDate(DateTime date) { - final now = DateTime.now(); - final difference = now.difference(date); - - if (difference.inDays == 0) { - return 'Today'; - } else if (difference.inDays == 1) { - return 'Yesterday'; - } else if (difference.inDays < 7) { - return '${difference.inDays} days ago'; - } else if (difference.inDays < 30) { - return '${(difference.inDays / 7).floor()} weeks ago'; - } else { - return '${(difference.inDays / 30).floor()} months ago'; - } - } -} \ No newline at end of file diff --git a/swingmusic_mobile/lib/features/qr/qr_screen.dart b/swingmusic_mobile/lib/features/qr/qr_screen.dart deleted file mode 100644 index 241e4324..00000000 --- a/swingmusic_mobile/lib/features/qr/qr_screen.dart +++ /dev/null @@ -1,292 +0,0 @@ -import 'package:flutter/material.dart'; - -class QRScreen extends StatefulWidget { - const QRScreen({super.key}); - - @override - State createState() => _QRScreenState(); -} - -class _QRScreenState extends State { - String _qrCode = ''; - bool _isGenerating = false; - bool _isScanning = false; - final TextEditingController _qrController = TextEditingController(); - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('QR Code Pairing'), - elevation: 0, - backgroundColor: Theme.of(context).colorScheme.surface, - leading: IconButton( - onPressed: () => Navigator.of(context).pop(), - icon: const Icon(Icons.arrow_back), - ), - ), - body: Padding( - padding: const EdgeInsets.all(24.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - // QR Code Display - Container( - padding: const EdgeInsets.all(20.0), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceContainerHighest, - borderRadius: BorderRadius.circular(16.0), - border: Border.all( - color: Theme.of(context).colorScheme.outline, - width: 2.0, - ), - ), - child: Column( - children: [ - const Icon( - Icons.qr_code_scanner, - size: 80, - color: Colors.blue, - ), - const SizedBox(height: 16), - Text( - 'QR Code Pairing', - style: Theme.of(context).textTheme.headlineMedium?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 8), - Text( - 'Scan or generate a QR code to connect', - style: Theme.of(context).textTheme.bodyLarge?.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - textAlign: TextAlign.center, - ), - const SizedBox(height: 24), - - // QR Code Visual - Container( - width: 200, - height: 200, - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(12.0), - border: Border.all( - color: Theme.of(context).colorScheme.outline, - width: 2.0, - ), - ), - child: _isGenerating - ? const Center( - child: CircularProgressIndicator(), - ) - : Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - width: 180, - height: 180, - color: Colors.black, - child: const Center( - child: Text( - 'QR CODE', - style: TextStyle( - color: Colors.white, - fontSize: 24, - fontWeight: FontWeight.bold, - ), - ), - ), - ), - const SizedBox(height: 16), - Text( - _qrCode.isEmpty ? 'Generate QR Code' : _qrCode, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - ), - textAlign: TextAlign.center, - ), - ], - ), - ), - const SizedBox(height: 24), - - // Action Buttons - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Expanded( - child: ElevatedButton( - onPressed: _isScanning ? null : _toggleScanning, - style: ElevatedButton.styleFrom( - backgroundColor: Theme.of(context).colorScheme.primary, - foregroundColor: Theme.of(context).colorScheme.onPrimary, - ), - child: const Row( - mainAxisSize: MainAxisSize.min, - children: [ - const Icon(Icons.qr_code_scanner), - const SizedBox(width: 8), - const Text('Scan QR Code'), - ], - ), - ), - ), - const SizedBox(width: 16), - Expanded( - child: ElevatedButton( - onPressed: _isScanning ? null : _generateQRCode, - style: ElevatedButton.styleFrom( - backgroundColor: Theme.of(context).colorScheme.secondary, - foregroundColor: Theme.of(context).colorScheme.onSecondary, - ), - child: const Row( - mainAxisSize: MainAxisSize.min, - children: [ - const Icon(Icons.qr_code), - const SizedBox(width: 8), - const Text('Generate QR'), - ], - ), - ), - ), - ], - ), - const SizedBox(height: 16), - - // Manual Entry - TextField( - controller: _qrController, - decoration: InputDecoration( - labelText: 'Or enter QR code manually', - hintText: 'Enter QR code', - prefixIcon: const Icon(Icons.keyboard), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(12.0), - borderSide: BorderSide.none, - ), - filled: true, - fillColor: Theme.of(context).colorScheme.surfaceContainerHighest, - ), - onChanged: (value) { - setState(() { - _qrCode = value; - }); - }, - ), - const SizedBox(height: 24), - - // Connect Button - SizedBox( - width: double.infinity, - child: ElevatedButton( - onPressed: _qrCode.isEmpty ? null : _connectWithQR, - style: ElevatedButton.styleFrom( - backgroundColor: Colors.green, - foregroundColor: Colors.white, - padding: const EdgeInsets.symmetric(vertical: 16), - ), - child: const Text('Connect'), - ), - ), - ], - ), - ), - ], - ), - ), - ); - } - - void _toggleScanning() { - setState(() { - _isScanning = !_isScanning; - }); - - if (_isScanning) { - _scanQRCode(); - } - } - - void _generateQRCode() { - setState(() { - _isGenerating = true; - }); - - // Generate a random QR code for demo - Future.delayed(const Duration(seconds: 2)).then((_) { - setState(() { - _isGenerating = false; - _qrCode = 'SWING-${DateTime.now().millisecondsSinceEpoch % 10000}'; - }); - - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('QR Code generated!')), - ); - }); - } - - void _scanQRCode() async { - try { - // In a real app, this would use camera plugin - // For demo, we'll simulate scanning - await Future.delayed(const Duration(seconds: 3)); - - setState(() { - _isScanning = false; - _qrCode = 'DEMO-SCANNED-${DateTime.now().millisecondsSinceEpoch}'; - }); - - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('QR Code scanned!')), - ); - } catch (e) { - setState(() { - _isScanning = false; - }); - - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Scan failed: ${e.toString()}')), - ); - } - } - - void _connectWithQR() async { - if (_qrCode.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Please enter or scan a QR code')), - ); - return; - } - - setState(() { - _isGenerating = true; - }); - - try { - // Simulate connection with QR code - await Future.delayed(const Duration(seconds: 2)); - - setState(() { - _isGenerating = false; - }); - - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Connected with QR Code!')), - ); - - // Navigate to main app - Navigator.of(context).pushNamedAndRemoveUntil('/', (route) => false); - } catch (e) { - setState(() { - _isGenerating = false; - }); - - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Connection failed: ${e.toString()}')), - ); - } - } -} diff --git a/swingmusic_mobile/lib/features/search/search_screen.dart b/swingmusic_mobile/lib/features/search/search_screen.dart deleted file mode 100644 index 8f848e72..00000000 --- a/swingmusic_mobile/lib/features/search/search_screen.dart +++ /dev/null @@ -1,523 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../shared/providers/audio_provider.dart'; -import '../../core/widgets/album_card.dart'; -import '../../core/widgets/track_list_tile.dart'; -import '../../data/models/track_model.dart'; -import '../../data/models/album_model.dart'; -import '../../data/models/artist_model.dart' as artist_model; -import '../../data/models/search_suggestion_model.dart'; - -class SearchScreen extends StatefulWidget { - const SearchScreen({super.key}); - - @override - State createState() => _SearchScreenState(); -} - -class _SearchScreenState extends State with TickerProviderStateMixin { - late TabController _tabController; - final TextEditingController _searchController = TextEditingController(); - final FocusNode _searchFocusNode = FocusNode(); - - // Search results - final List _trackResults = []; - final List _albumResults = []; - final List _artistResults = []; - - bool _isSearching = false; - String _currentQuery = ''; - - // Search filters - String _selectedFilter = 'all'; // 'all', 'tracks', 'albums', 'artists' - final List _searchFilters = ['all', 'tracks', 'albums', 'artists']; - - @override - void initState() { - super.initState(); - _tabController = TabController(length: 4, vsync: this); - _searchFocusNode.requestFocus(); - } - - @override - void dispose() { - _tabController.dispose(); - _searchController.dispose(); - _searchFocusNode.dispose(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - body: Column( - children: [ - // Search Header - Container( - padding: const EdgeInsets.all(16.0), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surface, - boxShadow: [ - BoxShadow( - color: Colors.black.withValues(alpha: 0.1), - blurRadius: 4, - offset: const Offset(0, 2), - ), - ], - ), - child: Column( - children: [ - // Search Bar - TextField( - controller: _searchController, - focusNode: _searchFocusNode, - onChanged: _onSearchChanged, - onSubmitted: _onSearchSubmitted, - decoration: InputDecoration( - hintText: 'Search tracks, albums, artists...', - prefixIcon: const Icon(Icons.search), - suffixIcon: _searchController.text.isNotEmpty - ? IconButton( - onPressed: _clearSearch, - icon: const Icon(Icons.clear), - ) - : null, - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(12), - borderSide: BorderSide.none, - ), - filled: true, - fillColor: Theme.of(context).colorScheme.surfaceContainerHighest, - contentPadding: const EdgeInsets.symmetric( - horizontal: 16, - vertical: 12, - ), - ), - ), - - const SizedBox(height: 12), - - // Filter Chips - SingleChildScrollView( - scrollDirection: Axis.horizontal, - child: Row( - children: _searchFilters.map((filter) { - final isSelected = _selectedFilter == filter; - return Padding( - padding: const EdgeInsets.only(right: 8), - child: FilterChip( - label: Text(filter.toUpperCase()), - selected: isSelected, - onSelected: (selected) { - setState(() { - _selectedFilter = filter; - }); - _performSearch(_currentQuery); - }, - backgroundColor: isSelected - ? Theme.of(context).colorScheme.primaryContainer - : Theme.of(context).colorScheme.surfaceContainerHighest, - labelStyle: TextStyle( - color: isSelected - ? Theme.of(context).colorScheme.onPrimaryContainer - : Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ); - }).toList(), - ), - ), - ], - ), - ), - - // Search Results - Expanded( - child: _isSearching - ? const Center(child: CircularProgressIndicator()) - : _currentQuery.isEmpty - ? _buildSearchSuggestions() - : _buildSearchResults(), - ), - ], - ), - ); - } - - Widget _buildSearchSuggestions() { - return DefaultTabController( - length: 4, - child: Column( - children: [ - TabBar( - controller: _tabController, - isScrollable: true, - tabs: const [ - Tab(text: 'Top'), - Tab(text: 'Tracks'), - Tab(text: 'Albums'), - Tab(text: 'Artists'), - ], - ), - Expanded( - child: TabBarView( - controller: _tabController, - children: [ - _buildTopSearches(), - _buildRecentSearches(), - _buildBrowseGenres(), - _buildBrowseFolders(), - ], - ), - ), - ], - ), - ); - } - - Widget _buildTopSearches() { - return Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Top Searches', - style: Theme.of(context).textTheme.titleLarge, - ), - const SizedBox(height: 16), - // Sample top searches - ...['Rock', 'Pop', 'Jazz', 'Electronic', 'Classical'].map((genre) { - return Padding( - padding: const EdgeInsets.only(bottom: 8), - child: ListTile( - leading: Icon( - Icons.trending_up, - color: Theme.of(context).colorScheme.primary, - ), - title: Text(genre), - trailing: const Icon(Icons.arrow_forward_ios), - onTap: () { - _searchController.text = genre; - _performSearch(genre); - }, - ), - ); - }), - ], - ), - ); - } - - Widget _buildRecentSearches() { - return Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Recent Searches', - style: Theme.of(context).textTheme.titleLarge, - ), - const SizedBox(height: 16), - // Sample recent searches - ...['Beatles', 'Queen', 'Pink Floyd', 'Led Zeppelin'].map((search) { - return Padding( - padding: const EdgeInsets.only(bottom: 8), - child: ListTile( - leading: Icon( - Icons.history, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - title: Text(search), - trailing: IconButton( - onPressed: () { - _searchController.text = search; - _performSearch(search); - }, - icon: const Icon(Icons.arrow_forward_ios), - ), - onTap: () { - _searchController.text = search; - _performSearch(search); - }, - ), - ); - }), - ], - ), - ); - } - - Widget _buildBrowseGenres() { - return Padding( - padding: const EdgeInsets.all(16.0), - child: GridView.builder( - gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, - childAspectRatio: 2.5, - crossAxisSpacing: 12, - mainAxisSpacing: 12, - ), - itemCount: ['Rock', 'Pop', 'Jazz', 'Electronic', 'Classical', 'Hip Hop', 'Country', 'R&B'].length, - itemBuilder: (context, index) { - final genre = ['Rock', 'Pop', 'Jazz', 'Electronic', 'Classical', 'Hip Hop', 'Country', 'R&B'][index]; - return Card( - child: InkWell( - onTap: () { - _searchController.text = genre; - _performSearch(genre); - }, - borderRadius: BorderRadius.circular(8), - child: Center( - child: Text( - genre, - style: Theme.of(context).textTheme.bodyLarge?.copyWith( - fontWeight: FontWeight.w500, - ), - ), - ), - ), - ); - }, - ), - ); - } - - Widget _buildBrowseFolders() { - return Padding( - padding: const EdgeInsets.all(16.0), - child: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.folder_outlined, - size: 64, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - const SizedBox(height: 16), - Text( - 'Folder browsing coming soon', - style: TextStyle( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ], - ), - ), - ); - } - - Widget _buildSearchResults() { - if (_selectedFilter == 'all') { - return DefaultTabController( - length: 3, - child: Column( - children: [ - TabBar( - tabs: const [ - Tab(text: 'Tracks'), - Tab(text: 'Albums'), - Tab(text: 'Artists'), - ], - ), - Expanded( - child: TabBarView( - children: [ - _buildTrackResults(), - _buildAlbumResults(), - _buildArtistResults(), - ], - ), - ), - ], - ), - ); - } else if (_selectedFilter == 'tracks') { - return _buildTrackResults(); - } else if (_selectedFilter == 'albums') { - return _buildAlbumResults(); - } else { - return _buildArtistResults(); - } - } - - Widget _buildTrackResults() { - if (_trackResults.isEmpty) { - return _buildEmptyResults('No tracks found'); - } - - return ListView.builder( - itemCount: _trackResults.length, - itemBuilder: (context, index) { - final track = _trackResults[index]; - return TrackListTile( - track: track, - onTap: () => _playTrack(track), - onPlay: () => _playTrack(track), - ); - }, - ); - } - - Widget _buildAlbumResults() { - if (_albumResults.isEmpty) { - return _buildEmptyResults('No albums found'); - } - - return GridView.builder( - padding: const EdgeInsets.all(16.0), - gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, - childAspectRatio: 0.8, - crossAxisSpacing: 16, - mainAxisSpacing: 16, - ), - itemCount: _albumResults.length, - itemBuilder: (context, index) { - final album = _albumResults[index]; - return AlbumCard( - album: album, - onTap: () { - // Navigate to album details - }, - ); - }, - ); - } - - Widget _buildArtistResults() { - if (_artistResults.isEmpty) { - return _buildEmptyResults('No artists found'); - } - - return ListView.builder( - itemCount: _artistResults.length, - itemBuilder: (context, index) { - final artist = _artistResults[index]; - return ListTile( - leading: CircleAvatar( - backgroundColor: Theme.of(context).colorScheme.primaryContainer, - child: Text( - artist.name.isNotEmpty ? artist.name[0].toUpperCase() : '?', - style: TextStyle( - color: Theme.of(context).colorScheme.onPrimaryContainer, - fontWeight: FontWeight.bold, - ), - ), - ), - title: Text(artist.name), - trailing: const Icon(Icons.arrow_forward_ios), - onTap: () { - // Navigate to artist details - }, - ); - }, - ); - } - - Widget _buildEmptyResults(String message) { - return Center( - child: Padding( - padding: const EdgeInsets.all(32.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.search_off, - size: 64, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - const SizedBox(height: 16), - Text( - message, - style: TextStyle( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - const SizedBox(height: 8), - Text( - 'Try different keywords or browse categories', - style: TextStyle( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - textAlign: TextAlign.center, - ), - ], - ), - ), - ); - } - - void _onSearchChanged(String query) { - _currentQuery = query; - if (query.isEmpty) { - setState(() { - _isSearching = false; - _trackResults.clear(); - _albumResults.clear(); - _artistResults.clear(); - }); - } else { - // Debounce search - Future.delayed(const Duration(milliseconds: 500), () { - if (_searchController.text == query) { - _performSearch(query); - } - }); - } - } - - void _onSearchSubmitted(String query) { - _performSearch(query); - _searchFocusNode.unfocus(); - } - - void _clearSearch() { - _searchController.clear(); - setState(() { - _currentQuery = ''; - _isSearching = false; - _trackResults.clear(); - _albumResults.clear(); - _artistResults.clear(); - }); - } - - Future _performSearch(String query) async { - if (query.trim().isEmpty) return; - - setState(() { - _isSearching = true; - }); - - try { - // Simulate API call - await Future.delayed(const Duration(milliseconds: 800)); - - // This would be actual API calls - setState(() { - _isSearching = false; - // For demo, just clear results - _trackResults.clear(); - _albumResults.clear(); - _artistResults.clear(); - }); - } catch (e) { - setState(() { - _isSearching = false; - }); - // Handle error - } - } - - void _playTrack(TrackModel track) { - final audioProvider = Provider.of(context, listen: false); - audioProvider.setQueue([track]); - audioProvider.loadTrack(track); - audioProvider.play(); - - Navigator.pushNamed(context, '/player'); - } -} \ No newline at end of file diff --git a/swingmusic_mobile/lib/features/settings/enhanced_settings_screen.dart b/swingmusic_mobile/lib/features/settings/enhanced_settings_screen.dart deleted file mode 100644 index 3589d00b..00000000 --- a/swingmusic_mobile/lib/features/settings/enhanced_settings_screen.dart +++ /dev/null @@ -1,845 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../shared/providers/auth_provider.dart'; -import '../../shared/providers/enhanced_library_provider.dart'; -import '../../core/constants/app_spacing.dart'; - -class EnhancedSettingsScreen extends StatefulWidget { - const EnhancedSettingsScreen({super.key}); - - @override - State createState() => _EnhancedSettingsScreenState(); -} - -class _EnhancedSettingsScreenState extends State { - bool _isExpanded = false; - - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: Theme.of(context).colorScheme.surface, - appBar: AppBar( - backgroundColor: Theme.of(context).colorScheme.surface, - elevation: 0, - title: Text( - 'Settings', - style: Theme.of(context).textTheme.titleLarge?.copyWith( - color: Theme.of(context).colorScheme.onSurface, - fontWeight: FontWeight.w600, - ), - ), - leading: IconButton( - onPressed: () => Navigator.of(context).pop(), - icon: Icon( - Icons.arrow_back, - color: Theme.of(context).colorScheme.onSurface, - ), - ), - ), - body: SingleChildScrollView( - padding: AppSpacing.paddingLG, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Connection Settings - _buildSection( - context, - 'Connection', - Icons.cloud, - [ - _buildServerUrlTile(context), - _buildAuthStatusTile(context), - _buildConnectionTestTile(context), - ], - ), - - const SizedBox(height: 24), - - // Audio Settings - _buildSection( - context, - 'Audio', - Icons.music_note, - [ - _buildAudioQualityTile(context), - _buildCrossfadeTile(context), - _buildGaplessTile(context), - _buildVolumeTile(context), - ], - ), - - const SizedBox(height: 24), - - // Download Settings - _buildSection( - context, - 'Downloads', - Icons.download, - [ - _buildDownloadQualityTile(context), - _buildDownloadLocationTile(context), - _buildWifiOnlyTile(context), - _buildMaxDownloadSizeTile(context), - ], - ), - - const SizedBox(height: 24), - - // Theme Settings - _buildSection( - context, - 'Appearance', - Icons.palette, - [ - _buildThemeTile(context), - _buildAccentColorTile(context), - ], - ), - - const SizedBox(height: 24), - - // Cache Settings - _buildSection( - context, - 'Storage', - Icons.storage, - [ - _buildCacheSizeTile(context), - _buildClearCacheTile(context), - ], - ), - - const SizedBox(height: 24), - - // About - _buildSection( - context, - 'About', - Icons.info, - [ - _buildVersionTile(context), - _buildBuildNumberTile(context), - _buildDeveloperTile(context), - ], - ), - ], - ), - ), - ); - } - - Widget _buildSection( - BuildContext context, - String title, - IconData icon, - List children, - ) { - return Container( - margin: const EdgeInsets.only(bottom: 16), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceVariant, - borderRadius: BorderRadius.circular(12), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.all(16), - child: Row( - children: [ - Icon( - icon, - color: Theme.of(context).colorScheme.primary, - size: 20, - ), - const SizedBox(width: 12), - Text( - title, - style: Theme.of(context).textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.w600, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ), - ], - ), - ), - ...children, - ], - ), - ); - } - - Widget _buildServerUrlTile(BuildContext context) { - return Consumer( - builder: (context, authProvider, child) { - return ListTile( - leading: Icon( - Icons.link, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Server URL', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - authProvider.baseUrl ?? 'Not set', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: IconButton( - onPressed: () => _showServerUrlDialog(context, authProvider), - icon: Icon( - Icons.edit, - color: Theme.of(context).colorScheme.primary, - ), - ), - ); - }, - ); - } - - Widget _buildAuthStatusTile(BuildContext context) { - return Consumer( - builder: (context, authProvider, child) { - return ListTile( - leading: Icon( - authProvider.isLoggedIn ? Icons.check_circle : Icons.error, - color: authProvider.isLoggedIn - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.error, - ), - title: Text( - 'Authentication Status', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - authProvider.isLoggedIn ? 'Connected' : 'Not connected', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: authProvider.isLoggedIn - ? Theme.of(context).colorScheme.onSurface.withOpacity(0.7) - : Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: authProvider.isLoggedIn - ? IconButton( - onPressed: () => _showLogoutDialog(context, authProvider), - icon: Icon( - Icons.logout, - color: Theme.of(context).colorScheme.error, - ), - ) - : null, - ); - }, - ); - } - - Widget _buildConnectionTestTile(BuildContext context) { - return ListTile( - leading: Icon( - Icons.wifi, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Test Connection', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Check server connectivity', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: IconButton( - onPressed: () => _testConnection(context), - icon: Icon( - Icons.play_arrow, - color: Theme.of(context).colorScheme.primary, - ), - ), - ); - } - - Widget _buildAudioQualityTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.high_quality, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Audio Quality', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Higher quality uses more storage', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: DropdownButton( - value: libraryProvider.userPreferences['audioQuality'] ?? '320kbps', - items: const ['128kbps', '320kbps', '512kbps', 'flac'], - onChanged: (value) => libraryProvider.updateUserPreferences({ - 'audioQuality': value, - }), - ), - ); - }, - ); - } - - Widget _buildCrossfadeTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.blur_on, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Crossfade', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Smooth transitions between tracks', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: Switch( - value: libraryProvider.userPreferences['crossfade'] ?? false, - onChanged: (value) => libraryProvider.updateUserPreferences({ - 'crossfade': value, - }), - ), - ); - }, - ); - } - - Widget _buildGaplessTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.skip_next, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Gapless Playback', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Remove silence between tracks', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: Switch( - value: libraryProvider.userPreferences['gapless'] ?? false, - onChanged: (value) => libraryProvider.updateUserPreferences({ - 'gapless': value, - }), - ), - ); - }, - ); - } - - Widget _buildVolumeTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.volume_up, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Default Volume', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Set default volume level', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: DropdownButton( - value: (libraryProvider.userPreferences['defaultVolume'] ?? 1.0).toDouble(), - items: [0.25, 0.5, 0.75, 1.0], - onChanged: (value) => libraryProvider.updateUserPreferences({ - 'defaultVolume': value, - }), - ), - ); - }, - ); - } - - Widget _buildDownloadQualityTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.download, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Download Quality', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Choose audio quality for downloads', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: DropdownButton( - value: libraryProvider.userPreferences['downloadQuality'] ?? '320kbps', - items: const ['128kbps', '320kbps', '512kbps', 'flac'], - onChanged: (value) => libraryProvider.updateUserPreferences({ - 'downloadQuality': value, - }), - ), - ); - }, - ); - } - - Widget _buildDownloadLocationTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.folder, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Download Location', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Where to save downloaded files', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: DropdownButton( - value: libraryProvider.userPreferences['downloadLocation'] ?? 'Music', - items: const ['Music', 'Downloads', 'Custom'], - onChanged: (value) => libraryProvider.updateUserPreferences({ - 'downloadLocation': value, - }), - ), - ); - }, - ); - } - - Widget _buildWifiOnlyTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.wifi, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Wi-Fi Only', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Download only when connected to Wi-Fi', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: Switch( - value: libraryProvider.userPreferences['wifiOnly'] ?? false, - onChanged: (value) => libraryProvider.updateUserPreferences({ - 'wifiOnly': value, - }), - ), - ); - }, - ); - } - - Widget _buildMaxDownloadSizeTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.sd_storage, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Max Download Size', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Maximum size for automatic downloads', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: DropdownButton( - value: libraryProvider.userPreferences['maxDownloadSize'] ?? '100MB', - items: const ['50MB', '100MB', '500MB', '1GB'], - onChanged: (value) => libraryProvider.updateUserPreferences({ - 'maxDownloadSize': value, - }), - ), - ); - }, - ); - } - - Widget _buildThemeTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.palette, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Theme', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Choose app appearance', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: DropdownButton( - value: _getThemeMode(libraryProvider.userPreferences['theme']), - items: const [ - DropdownMenuItem(value: ThemeMode.system, child: Text('System')), - DropdownMenuItem(value: ThemeMode.light, child: Text('Light')), - DropdownMenuItem(value: ThemeMode.dark, child: Text('Dark')), - ], - onChanged: (ThemeMode? value) => libraryProvider.updateUserPreferences({ - 'theme': value?.name, - }), - ), - ); - }, - ); - } - - Widget _buildAccentColorTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.color_lens, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Accent Color', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Customize accent colors', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: DropdownButton( - value: libraryProvider.userPreferences['accentColor'] ?? 'Blue', - items: const [ - DropdownMenuItem(value: 'Blue', child: Text('Blue')), - DropdownMenuItem(value: 'Green', child: Text('Green')), - DropdownMenuItem(value: 'Purple', child: Text('Purple')), - DropdownMenuItem(value: 'Orange', child: Text('Orange')), - DropdownMenuItem(value: 'Red', child: Text('Red')), - ], - onChanged: (String? value) => libraryProvider.updateUserPreferences({ - 'accentColor': value, - }), - ), - ); - }, - ); - } - - Widget _buildCacheSizeTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.cached, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Cache Size', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Maximum cache size', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: DropdownButton( - value: libraryProvider.userPreferences['cacheSize'] ?? '500MB', - items: const ['100MB', '500MB', '1GB', '2GB', '5GB'], - onChanged: (String? value) => libraryProvider.updateUserPreferences({ - 'cacheSize': value, - }), - ), - ); - }, - ); - } - - Widget _buildClearCacheTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.clear_all, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Clear Cache', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'Free up storage space', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - trailing: IconButton( - onPressed: () => _showClearCacheDialog(context), - icon: Icon( - Icons.delete_sweep, - color: Theme.of(context).colorScheme.error, - ), - ), - ); - }, - ); - } - - Widget _buildVersionTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.info, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Version', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - libraryProvider.statistics['version'] ?? 'Unknown', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - ); - }, - ); - } - - Widget _buildBuildNumberTile(BuildContext context) { - return Consumer( - builder: (context, libraryProvider, child) { - return ListTile( - leading: Icon( - Icons.build, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Build Number', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - libraryProvider.statistics['buildNumber'] ?? 'Unknown', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - ), - ); - }, - ); - } - - Widget _buildDeveloperTile(BuildContext context) { - return ListTile( - leading: Icon( - Icons.code, - color: Theme.of(context).colorScheme.onSurface, - ), - title: Text( - 'Developer', - style: Theme.of(context).textTheme.bodyLarge, - ), - subtitle: Text( - 'View developer options', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), - ), - trailing: IconButton( - onPressed: () => _showDeveloperOptions(context), - icon: Icon( - Icons.more_horiz, - color: Theme.of(context).colorScheme.primary, - ), - ), - ); - } - - ThemeMode _getThemeMode(String? themeString) { - switch (themeString) { - case 'system': - return ThemeMode.system; - case 'light': - return ThemeMode.light; - case 'dark': - return ThemeMode.dark; - default: - return ThemeMode.system; - } - } - - void _showServerUrlDialog(BuildContext context, AuthProvider authProvider) { - final controller = TextEditingController(text: authProvider.baseUrl ?? ''); - - showDialog( - context: context, - builder: (context) => AlertDialog( - title: Text('Server URL'), - content: TextField( - controller: controller, - decoration: InputDecoration( - labelText: 'Server URL', - hintText: 'https://your-server.com', - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(8), - borderSide: BorderSide( - color: Theme.of(context).colorScheme.outline, - ), - ), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: Text('Cancel'), - ), - TextButton( - onPressed: () { - authProvider.updateBaseUrl(controller.text.trim()); - Navigator.of(context).pop(); - }, - child: Text('Save'), - ), - ], - ), - ); - } - - void _showLogoutDialog(BuildContext context, AuthProvider authProvider) { - showDialog( - context: context, - builder: (context) => AlertDialog( - title: Text('Logout'), - content: Text('Are you sure you want to logout?'), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: Text('Cancel'), - ), - TextButton( - onPressed: () { - authProvider.logout(); - Navigator.of(context).pop(); - }, - child: Text('Logout'), - ), - ], - ), - ); - } - - void _testConnection(BuildContext context) { - // TODO: Implement connection test - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Connection test not implemented yet')), - ); - } - - void _showClearCacheDialog(BuildContext context) { - showDialog( - context: context, - builder: (context) => AlertDialog( - title: Text('Clear Cache'), - content: Text('Are you sure you want to clear all cached data?'), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: Text('Cancel'), - ), - TextButton( - onPressed: () { - Navigator.of(context).pop(); - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Cache cleared successfully')), - ); - }, - child: Text('Clear'), - ), - ], - ), - ); - } - - void _showDeveloperOptions(BuildContext context) { - showDialog( - context: context, - builder: (context) => AlertDialog( - title: Text('Developer Options'), - content: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ListTile( - title: Text('Debug Mode'), - trailing: Switch( - value: false, - onChanged: (value) { - // TODO: Implement debug mode - }, - ), - ), - ListTile( - title: Text('Enable Logging'), - trailing: Switch( - value: false, - onChanged: (value) { - // TODO: Implement logging - }, - ), - ), - ], - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: Text('Close'), - ), - ], - ), - ); - } -} diff --git a/swingmusic_mobile/lib/features/settings/settings_screen.dart b/swingmusic_mobile/lib/features/settings/settings_screen.dart deleted file mode 100644 index e41da34f..00000000 --- a/swingmusic_mobile/lib/features/settings/settings_screen.dart +++ /dev/null @@ -1,518 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:shared_preferences/shared_preferences.dart'; -import '../../core/constants/app_constants.dart'; - -class SettingsScreen extends StatefulWidget { - const SettingsScreen({super.key}); - - @override - State createState() => _SettingsScreenState(); -} - -class _SettingsScreenState extends State { - bool _isLoading = false; - - // Connection settings - String _serverUrl = ''; - String _username = ''; - bool _isConnected = false; - - // Audio settings - double _volume = 1.0; - double _audioQuality = 1.0; // 0.5 = Low, 1.0 = High - bool _gaplessPlayback = false; - bool _crossfade = true; - double _crossfadeDuration = 5.0; - - // Theme settings - ThemeMode _themeMode = ThemeMode.system; - - // Download settings - String _downloadQuality = 'high'; // 'low', 'medium', 'high' - bool _wifiOnlyDownloads = true; - int _maxDownloadSize = 1000; // MB - - // Cache settings - int _cacheSize = 500; // MB - bool _clearCacheOnStart = false; - - // Analytics settings - bool _enableAnalytics = true; - bool _shareListeningData = false; - - @override - void initState() { - super.initState(); - _loadSettings(); - } - - Future _loadSettings() async { - setState(() { - _isLoading = true; - }); - - final prefs = await SharedPreferences.getInstance(); - - setState(() { - _serverUrl = prefs.getString('server_url') ?? AppConstants.defaultApiUrl; - _username = prefs.getString('username') ?? ''; - _isConnected = prefs.getBool('is_connected') ?? false; - _volume = prefs.getDouble('volume') ?? 1.0; - _audioQuality = prefs.getDouble('audio_quality') ?? 1.0; - _gaplessPlayback = prefs.getBool('gapless_playback') ?? false; - _crossfade = prefs.getBool('crossfade') ?? true; - _crossfadeDuration = prefs.getDouble('crossfade_duration') ?? 5.0; - - final themeIndex = prefs.getInt('theme_mode') ?? 2; - _themeMode = ThemeMode.values[themeIndex]; - - _downloadQuality = prefs.getString('download_quality') ?? 'high'; - _wifiOnlyDownloads = prefs.getBool('wifi_only_downloads') ?? true; - _maxDownloadSize = prefs.getInt('max_download_size') ?? 1000; - _cacheSize = prefs.getInt('cache_size') ?? 500; - _clearCacheOnStart = prefs.getBool('clear_cache_on_start') ?? false; - _enableAnalytics = prefs.getBool('enable_analytics') ?? true; - _shareListeningData = prefs.getBool('share_listening_data') ?? false; - _isLoading = false; - }); - } - - Future _saveSettings() async { - final prefs = await SharedPreferences.getInstance(); - - await prefs.setString('server_url', _serverUrl); - await prefs.setString('username', _username); - await prefs.setBool('is_connected', _isConnected); - await prefs.setDouble('volume', _volume); - await prefs.setDouble('audio_quality', _audioQuality); - await prefs.setBool('gapless_playback', _gaplessPlayback); - await prefs.setBool('crossfade', _crossfade); - await prefs.setDouble('crossfade_duration', _crossfadeDuration); - await prefs.setInt('theme_mode', _themeMode.index); - await prefs.setString('download_quality', _downloadQuality); - await prefs.setBool('wifi_only_downloads', _wifiOnlyDownloads); - await prefs.setInt('max_download_size', _maxDownloadSize); - await prefs.setInt('cache_size', _cacheSize); - await prefs.setBool('clear_cache_on_start', _clearCacheOnStart); - await prefs.setBool('enable_analytics', _enableAnalytics); - await prefs.setBool('share_listening_data', _shareListeningData); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('Settings'), - elevation: 0, - backgroundColor: Theme.of(context).colorScheme.surface, - actions: [ - TextButton( - onPressed: _saveSettings, - child: const Text('Save'), - ), - ], - ), - body: _isLoading - ? const Center(child: CircularProgressIndicator()) - : ListView( - padding: const EdgeInsets.all(16.0), - children: [ - // Connection Section - _buildSectionHeader('Connection'), - _buildServerUrlField(), - _buildUsernameField(), - _buildConnectionStatus(), - const SizedBox(height: 24), - - // Audio Section - _buildSectionHeader('Audio'), - _buildVolumeSlider(), - _buildAudioQualityDropdown(), - _buildGaplessPlaybackSwitch(), - _buildCrossfadeSwitch(), - _buildCrossfadeDurationSlider(), - const SizedBox(height: 24), - - // Theme Section - _buildSectionHeader('Appearance'), - _buildThemeSelector(), - const SizedBox(height: 24), - - // Download Section - _buildSectionHeader('Downloads'), - _buildDownloadQualityDropdown(), - _buildWifiOnlySwitch(), - _buildMaxDownloadSizeField(), - const SizedBox(height: 24), - - // Cache Section - _buildSectionHeader('Storage'), - _buildCacheSizeField(), - _buildClearCacheSwitch(), - _buildClearCacheButton(), - const SizedBox(height: 24), - - // Analytics Section - _buildSectionHeader('Analytics'), - _buildAnalyticsSwitch(), - _buildShareDataSwitch(), - const SizedBox(height: 24), - - // About Section - _buildSectionHeader('About'), - _buildAppInfo(), - _buildVersionInfo(), - ], - ), - ); - } - - Widget _buildSectionHeader(String title) { - return Padding( - padding: const EdgeInsets.only(bottom: 16), - child: Text( - title, - style: Theme.of(context).textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.bold, - ), - ), - ); - } - - Widget _buildServerUrlField() { - return TextField( - controller: TextEditingController(text: _serverUrl), - decoration: const InputDecoration( - labelText: 'Server URL', - hintText: 'http://192.168.1.100:1970', - border: OutlineInputBorder(), - ), - onChanged: (value) { - _serverUrl = value; - }, - ); - } - - Widget _buildUsernameField() { - return TextField( - controller: TextEditingController(text: _username), - decoration: const InputDecoration( - labelText: 'Username', - border: OutlineInputBorder(), - ), - onChanged: (value) { - _username = value; - }, - ); - } - - Widget _buildConnectionStatus() { - return Container( - padding: const EdgeInsets.all(16), - decoration: BoxDecoration( - color: _isConnected ? Colors.green : Colors.red, - borderRadius: BorderRadius.circular(8), - ), - child: Row( - children: [ - Icon( - _isConnected ? Icons.check_circle : Icons.error, - color: Colors.white, - ), - const SizedBox(width: 8), - Text( - _isConnected ? 'Connected' : 'Disconnected', - style: const TextStyle( - color: Colors.white, - fontWeight: FontWeight.w500, - ), - ), - ], - ), - ); - } - - Widget _buildVolumeSlider() { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text('Volume: ${(_volume * 100).round()}%'), - Slider( - value: _volume, - min: 0.0, - max: 1.0, - divisions: 20, - onChanged: (value) { - setState(() { - _volume = value; - }); - }, - ), - ], - ); - } - - Widget _buildAudioQualityDropdown() { - return DropdownButtonFormField( - decoration: const InputDecoration( - labelText: 'Audio Quality', - border: OutlineInputBorder(), - ), - items: ['Low', 'Medium', 'High'].map((quality) { - return DropdownMenuItem( - value: quality, - child: Text(quality), - ); - }).toList(), - onChanged: (value) { - if (value != null) { - setState(() { - _audioQuality = value == 'Low' ? 0.5 : value == 'High' ? 1.0 : 0.75; - }); - } - }, - ); - } - - Widget _buildGaplessPlaybackSwitch() { - return SwitchListTile( - title: const Text('Gapless Playback'), - subtitle: const Text('Remove gaps between tracks'), - value: _gaplessPlayback, - onChanged: (value) { - setState(() { - _gaplessPlayback = value; - }); - }, - ); - } - - Widget _buildCrossfadeSwitch() { - return SwitchListTile( - title: const Text('Crossfade'), - subtitle: const Text('Smooth transition between tracks'), - value: _crossfade, - onChanged: (value) { - setState(() { - _crossfade = value; - }); - }, - ); - } - - Widget _buildCrossfadeDurationSlider() { - if (!_crossfade) return const SizedBox.shrink(); - - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text('Crossfade Duration: ${_crossfadeDuration.round()}s'), - Slider( - value: _crossfadeDuration, - min: 1.0, - max: 10.0, - divisions: 18, - onChanged: (value) { - setState(() { - _crossfadeDuration = value; - }); - }, - ), - ], - ); - } - - Widget _buildThemeSelector() { - return Column( - children: [ - RadioListTile( - title: const Text('Light'), - value: ThemeMode.light, - groupValue: _themeMode, - onChanged: (ThemeMode? value) { - if (value != null) { - setState(() { - _themeMode = value; - }); - } - }, - ), - RadioListTile( - title: const Text('Dark'), - value: ThemeMode.dark, - groupValue: _themeMode, - onChanged: (ThemeMode? value) { - if (value != null) { - setState(() { - _themeMode = value; - }); - } - }, - ), - RadioListTile( - title: const Text('System'), - value: ThemeMode.system, - groupValue: _themeMode, - onChanged: (ThemeMode? value) { - if (value != null) { - setState(() { - _themeMode = value; - }); - } - }, - ), - ], - ); - } - - Widget _buildDownloadQualityDropdown() { - return DropdownButtonFormField( - decoration: const InputDecoration( - labelText: 'Download Quality', - border: OutlineInputBorder(), - ), - items: ['Low', 'Medium', 'High'].map((quality) { - return DropdownMenuItem( - value: quality, - child: Text(quality), - ); - }).toList(), - onChanged: (value) { - if (value != null) { - setState(() { - _downloadQuality = value; - }); - } - }, - ); - } - - Widget _buildWifiOnlySwitch() { - return SwitchListTile( - title: const Text('Wi-Fi Only Downloads'), - subtitle: const Text('Only download when connected to Wi-Fi'), - value: _wifiOnlyDownloads, - onChanged: (value) { - setState(() { - _wifiOnlyDownloads = value; - }); - }, - ); - } - - Widget _buildMaxDownloadSizeField() { - return TextField( - controller: TextEditingController(text: _maxDownloadSize.toString()), - decoration: const InputDecoration( - labelText: 'Max Download Size (MB)', - border: OutlineInputBorder(), - ), - keyboardType: TextInputType.number, - onChanged: (value) { - _maxDownloadSize = int.tryParse(value) ?? _maxDownloadSize; - }, - ); - } - - Widget _buildCacheSizeField() { - return TextField( - controller: TextEditingController(text: _cacheSize.toString()), - decoration: const InputDecoration( - labelText: 'Cache Size (MB)', - border: OutlineInputBorder(), - ), - keyboardType: TextInputType.number, - onChanged: (value) { - _cacheSize = int.tryParse(value) ?? _cacheSize; - }, - ); - } - - Widget _buildClearCacheSwitch() { - return SwitchListTile( - title: const Text('Clear Cache on Start'), - subtitle: const Text('Clear cache when app starts'), - value: _clearCacheOnStart, - onChanged: (value) { - setState(() { - _clearCacheOnStart = value; - }); - }, - ); - } - - Widget _buildClearCacheButton() { - return ElevatedButton.icon( - onPressed: () async { - // Clear cache logic - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Cache cleared')), - ); - }, - icon: const Icon(Icons.delete_outline), - label: const Text('Clear Cache'), - style: ElevatedButton.styleFrom( - backgroundColor: Colors.red, - foregroundColor: Colors.white, - ), - ); - } - - Widget _buildAnalyticsSwitch() { - return SwitchListTile( - title: const Text('Enable Analytics'), - subtitle: const Text('Track listening statistics'), - value: _enableAnalytics, - onChanged: (value) { - setState(() { - _enableAnalytics = value; - }); - }, - ); - } - - Widget _buildShareDataSwitch() { - return SwitchListTile( - title: const Text('Share Listening Data'), - subtitle: const Text('Share anonymous listening data for improvements'), - value: _shareListeningData, - onChanged: (value) { - setState(() { - _shareListeningData = value; - }); - }, - ); - } - - Widget _buildAppInfo() { - return ListTile( - leading: const Icon(Icons.info_outline), - title: const Text('About SwingMusic'), - trailing: const Icon(Icons.arrow_forward_ios), - onTap: () { - showAboutDialog( - context: context, - applicationName: 'SwingMusic', - applicationVersion: '1.0.0', - applicationIcon: const Icon(Icons.music_note), - children: [ - const Text('A modern music player for SwingMusic server'), - const Text('Built with Flutter'), - ], - ); - }, - ); - } - - Widget _buildVersionInfo() { - return ListTile( - leading: const Icon(Icons.code), - title: const Text('Version'), - subtitle: const Text('1.0.0 (Flutter)'), - trailing: const Icon(Icons.arrow_forward_ios), - onTap: () { - // Show changelog - }, - ); - } -} \ No newline at end of file diff --git a/swingmusic_mobile/lib/main.dart b/swingmusic_mobile/lib/main.dart deleted file mode 100644 index 8ad1278a..00000000 --- a/swingmusic_mobile/lib/main.dart +++ /dev/null @@ -1,43 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import 'features/home/home_screen.dart'; -import 'features/library/library_screen.dart'; -import 'features/player/enhanced_player_screen_new.dart'; -import 'features/search/search_screen.dart'; -import 'features/playlists/playlists_screen.dart'; -import 'features/settings/settings_screen.dart'; -import 'features/auth/enhanced_auth_screen.dart'; -import 'features/analytics/analytics_screen.dart'; -import 'shared/providers/audio_provider.dart'; -import 'shared/providers/auth_provider.dart'; -import 'shared/providers/enhanced_library_provider.dart'; -import 'shared/routes/app_router.dart'; -import 'shared/widgets/main_navigation.dart'; -import 'core/themes/app_theme.dart'; - -void main() { - runApp(const SwingMusicApp()); -} - -class SwingMusicApp extends StatelessWidget { - const SwingMusicApp({super.key}); - - @override - Widget build(BuildContext context) { - return MultiProvider( - providers: [ - ChangeNotifierProvider(create: (_) => AudioProvider()), - ChangeNotifierProvider(create: (_) => AuthProvider()), - ChangeNotifierProvider(create: (_) => EnhancedLibraryProvider()), - ], - child: MaterialApp.router( - title: 'SwingMusic', - theme: AppTheme.lightTheme, - darkTheme: AppTheme.darkTheme, - themeMode: ThemeMode.system, - routerConfig: AppRouter.router, - debugShowCheckedModeBanner: false, - ), - ); - } -} diff --git a/swingmusic_mobile/lib/shared/providers/audio_provider.dart b/swingmusic_mobile/lib/shared/providers/audio_provider.dart deleted file mode 100644 index e9a0d86c..00000000 --- a/swingmusic_mobile/lib/shared/providers/audio_provider.dart +++ /dev/null @@ -1,147 +0,0 @@ -import 'package:flutter/foundation.dart'; -import '../../data/services/audio_service.dart'; -import '../../data/models/track_model.dart'; -import '../../core/enums/playback_mode.dart'; - -class AudioProvider extends ChangeNotifier { - final AudioService _audioService = AudioService(); - - // Getters for audio state - TrackModel? get currentTrack => _audioService.currentTrack; - bool get isPlaying => _audioService.isPlaying; - bool get isPaused => _audioService.isPaused; - bool get isLoading => _audioService.isLoading; - bool get isBuffering => _audioService.isBuffering; - bool get hasError => _audioService.hasError; - String? get errorMessage => _audioService.errorMessage; - Duration get position => _audioService.position; - Duration get duration => _audioService.duration; - double get volume => _audioService.volume; - List get queue => _audioService.queue; - int get currentIndex => _audioService.currentIndex; - bool get isShuffleMode => _audioService.isShuffleMode; - bool get isRepeatMode => _audioService.isRepeatMode; - RepeatMode get repeatMode => _audioService.repeatMode; - ShuffleMode get shuffleMode => _audioService.shuffleMode; - double get playbackSpeed => _audioService.playbackSpeed; - - // Streams - Stream get positionStream => _audioService.positionStream; - Stream get durationStream => _audioService.durationStream; - Stream get playingStateStream => _audioService.playingStateStream; - Stream get currentTrackStream => _audioService.currentTrackStream; - Stream> get queueStream => _audioService.queueStream; - Stream get bufferingStream => _audioService.bufferingStream; - Stream get errorStream => _audioService.errorStream; - Stream get repeatModeStream => _audioService.repeatModeStream; - Stream get shuffleModeStream => _audioService.shuffleModeStream; - - // Audio controls - Future initialize() async { - await _audioService.initialize(); - notifyListeners(); - } - - Future loadTrack(TrackModel track) async { - await _audioService.loadTrack(track); - notifyListeners(); - } - - Future play() async { - await _audioService.play(); - notifyListeners(); - } - - Future pause() async { - await _audioService.pause(); - notifyListeners(); - } - - Future stop() async { - await _audioService.stop(); - notifyListeners(); - } - - Future seekTo(Duration position) async { - await _audioService.seekTo(position); - notifyListeners(); - } - - Future setVolume(double volume) async { - await _audioService.setVolume(volume); - notifyListeners(); - } - - Future setSpeed(double speed) async { - await _audioService.setSpeed(speed); - notifyListeners(); - } - - // Queue management - void setQueue(List tracks) { - _audioService.setQueue(tracks); - notifyListeners(); - } - - void addToQueue(TrackModel track) { - _audioService.addToQueue(track); - notifyListeners(); - } - - void removeFromQueue(int index) { - _audioService.removeFromQueue(index); - notifyListeners(); - } - - void clearQueue() { - _audioService.clearQueue(); - notifyListeners(); - } - - Future playNext() async { - await _audioService.playNext(); - notifyListeners(); - } - - Future playPrevious() async { - await _audioService.playPrevious(); - notifyListeners(); - } - - void jumpToIndex(int index) { - _audioService.jumpToIndex(index); - notifyListeners(); - } - - // Playback modes - void toggleShuffle() { - _audioService.toggleShuffle(); - notifyListeners(); - } - - void toggleRepeat() { - _audioService.toggleRepeat(); - notifyListeners(); - } - - void setShuffleMode(ShuffleMode mode) { - _audioService.setShuffleMode(mode == ShuffleMode.on); - notifyListeners(); - } - - void setRepeatMode(RepeatMode mode) { - _audioService.setRepeatMode(mode); - notifyListeners(); - } - - // Utility methods - String get positionFormatted => _audioService.positionFormatted; - String get durationFormatted => _audioService.durationFormatted; - double get progress => _audioService.progress; - - @override - void dispose() { - _audioService.dispose(); - super.dispose(); - } -} diff --git a/swingmusic_mobile/lib/shared/providers/auth_provider.dart b/swingmusic_mobile/lib/shared/providers/auth_provider.dart deleted file mode 100644 index 1a9fbc17..00000000 --- a/swingmusic_mobile/lib/shared/providers/auth_provider.dart +++ /dev/null @@ -1,208 +0,0 @@ -import 'package:flutter/foundation.dart'; -import 'dart:convert'; -import 'package:http/http.dart' as http; -import 'package:shared_preferences/shared_preferences.dart'; - -class AuthProvider extends ChangeNotifier { - AuthState _authState = AuthState.loggedOut; - String? _errorMessage; - String? _baseUrl; - String? _accessToken; - String? _refreshToken; - - // Getters - AuthState get authState => _authState; - String? get errorMessage => _errorMessage; - String? get baseUrl => _baseUrl; - String? get accessToken => _accessToken; - String? get refreshToken => _refreshToken; - bool get isLoggedIn => _authState.isLoggedIn; - bool get isLoggedOut => _authState.isLoggedOut; - bool get isAuthenticating => _authState.isAuthenticating; - bool get hasError => _authState.hasError; - - Future initialize() async { - await _loadStoredCredentials(); - _checkLoginStatus(); - } - - Future loginWithUsernameAndPassword( - String baseUrl, - String username, - String password, - ) async { - try { - _setAuthenticating(); - - // Validate URL - if (!_isValidUrl(baseUrl)) { - _setError('Please enter a valid server URL'); - return; - } - - if (username.isEmpty || password.isEmpty) { - _setError('Username and password are required'); - return; - } - - // Make API call to login - final response = await http.post( - Uri.parse('$baseUrl/api/auth/login'), - headers: {'Content-Type': 'application/json'}, - body: jsonEncode({ - 'username': username, - 'password': password, - }), - ); - - if (response.statusCode == 200) { - final data = jsonDecode(response.body); - _accessToken = data['access_token']; - _refreshToken = data['refresh_token']; - _baseUrl = baseUrl; - - // Store credentials - final prefs = await SharedPreferences.getInstance(); - await prefs.setString('access_token', _accessToken!); - await prefs.setString('refresh_token', _refreshToken!); - await prefs.setString('base_url', _baseUrl); - - _setAuthenticated(); - _clearError(); - } else { - _setError('Login failed: ${response.statusCode}'); - } - } catch (e) { - _setError('Login error: $e'); - } - } - - Future loginWithQrCode(String qrCode) async { - try { - _setAuthenticating(); - - // TODO: Implement QR code login logic - // For now, simulate successful login - await Future.delayed(const Duration(seconds: 1)); - - _accessToken = 'mock_token_from_qr'; - _refreshToken = 'mock_refresh_from_qr'; - - // Store credentials - final prefs = await SharedPreferences.getInstance(); - await prefs.setString('access_token', _accessToken!); - await prefs.setString('refresh_token', _refreshToken!); - - _setAuthenticated(); - _clearError(); - } catch (e) { - _setError('QR code login error: $e'); - } - } - - Future logout() async { - try { - final prefs = await SharedPreferences.getInstance(); - await prefs.remove('access_token'); - await prefs.remove('refresh_token'); - await prefs.remove('base_url'); - - _accessToken = null; - _refreshToken = null; - _setLoggedOut(); - _clearError(); - } catch (e) { - // Continue with logout even if storage fails - _accessToken = null; - _refreshToken = null; - _setLoggedOut(); - _clearError(); - } - } - - Future refreshTokens() async { - try { - if (_refreshToken == null) return; - - // TODO: Implement token refresh logic - // For now, just check if current token is still valid - } catch (e) { - _setError('Token refresh failed: $e'); - } - } - - void _setAuthenticating() { - _authState = AuthState.authenticating; - _clearError(); - notifyListeners(); - } - - void _setAuthenticated() { - _authState = AuthState.authenticated; - _clearError(); - notifyListeners(); - } - - void _setLoggedOut() { - _authState = AuthState.loggedOut; - _clearError(); - notifyListeners(); - } - - void _setError(String error) { - _errorMessage = error; - _authState = AuthState.error; - notifyListeners(); - } - - void _clearError() { - _errorMessage = null; - if (_authState == AuthState.error) { - _authState = AuthState.loggedOut; - } - notifyListeners(); - } - - bool _isValidUrl(String url) { - try { - final uri = Uri.parse(url); - return uri.hasScheme && (uri.scheme == 'http' || uri.scheme == 'https'); - } catch (e) { - return false; - } - } - - Future _loadStoredCredentials() async { - try { - final prefs = await SharedPreferences.getInstance(); - _accessToken = prefs.getString('access_token'); - _refreshToken = prefs.getString('refresh_token'); - _baseUrl = prefs.getString('base_url'); - - if (_accessToken != null) { - _setAuthenticated(); - } - } catch (e) { - // Continue without stored credentials - debugPrint('Error loading stored credentials: $e'); - } - } - - Future _checkLoginStatus() async { - // TODO: Implement token validation - // For now, assume stored token is valid - if (_accessToken != null) { - _setAuthenticated(); - } - } - - // HTTP client with auth headers - http.BaseClient get authenticatedHttpClient { - return http.BaseClient( - headers: { - 'Authorization': 'Bearer $_accessToken', - 'Content-Type': 'application/json', - }, - ); - } -} diff --git a/swingmusic_mobile/lib/shared/providers/enhanced_library_provider.dart b/swingmusic_mobile/lib/shared/providers/enhanced_library_provider.dart deleted file mode 100644 index 75d402e2..00000000 --- a/swingmusic_mobile/lib/shared/providers/enhanced_library_provider.dart +++ /dev/null @@ -1,699 +0,0 @@ -import 'package:flutter/foundation.dart'; -import '../../data/services/enhanced_api_service.dart'; -import '../../data/models/track_model.dart'; -import '../../data/models/album_model.dart'; -import '../../data/models/artist_model.dart' as artist; -import '../../data/models/playlist_model.dart'; - -class EnhancedLibraryProvider extends ChangeNotifier { - final EnhancedApiService _apiService; - - // State - List _tracks = []; - List _albums = []; - List _artists = []; - List _playlists = []; - List _folders = []; - Map _userInfo = {}; - Map _userPreferences = {}; - Map _statistics = {}; - List _favoriteTracks = []; - List _favoriteAlbums = []; - List _favoriteArtists = []; - List _queue = []; - - // Loading states - bool _isLoadingTracks = false; - bool _isLoadingAlbums = false; - bool _isLoadingArtists = false; - bool _isLoadingPlaylists = false; - bool _isLoadingFolders = false; - bool _isLoadingUserInfo = false; - bool _isLoadingStatistics = false; - bool _isLoadingFavorites = false; - bool _isLoadingQueue = false; - - // Error states - String? _error; - - EnhancedLibraryProvider({EnhancedApiService? apiService}) - : _apiService = apiService ?? EnhancedApiService(); - - // Getters - List get tracks => _tracks; - List get albums => _albums; - List get artists => _artists; - List get playlists => _playlists; - List get folders => _folders; - Map get userInfo => _userInfo; - Map get userPreferences => _userPreferences; - Map get statistics => _statistics; - List get favoriteTracks => _favoriteTracks; - List get favoriteAlbums => _favoriteAlbums; - List get favoriteArtists => _favoriteArtists; - List get queue => _queue; - - bool get isLoadingTracks => _isLoadingTracks; - bool get isLoadingAlbums => _isLoadingAlbums; - bool get isLoadingArtists => _isLoadingArtists; - bool get isLoadingPlaylists => _isLoadingPlaylists; - bool get isLoadingFolders => _isLoadingFolders; - bool get isLoadingUserInfo => _isLoadingUserInfo; - bool get isLoadingStatistics => _isLoadingStatistics; - bool get isLoadingFavorites => _isLoadingFavorites; - bool get isLoadingQueue => _isLoadingQueue; - - String? get error => _error; - bool get hasError => _error != null; - - // Initialize data - Future initialize() async { - await loadUserInfo(); - await loadStatistics(); - } - - // Track methods - Future loadTracks({String? search, String? artist, String? album, String? folder}) async { - _setLoadingTracks(true); - _clearError(); - - try { - _tracks = await _apiService.getTracks( - search: search, - artist: artist, - album: album, - folder: folder, - ); - _setLoadingTracks(false); - } catch (e) { - _setError('Failed to load tracks: $e'); - _setLoadingTracks(false); - } - } - - Future refreshTracks() async { - await loadTracks(); - } - - Future loadTrack(String trackHash) async { - try { - final track = await _apiService.getTrack(trackHash); - if (track != null) { - // Update track in current list if exists - final index = _tracks.indexWhere((t) => t.trackhash == trackHash); - if (index != -1) { - _tracks[index] = track; - } - } - } catch (e) { - _setError('Failed to load track: $e'); - } - } - - Future toggleFavoriteTrack(String trackHash) async { - try { - await _apiService.toggleFavoriteTrack(trackHash); - - // Update track in local list - final index = _tracks.indexWhere((t) => t.trackhash == trackHash); - if (index != -1) { - final track = _tracks[index]; - _tracks[index] = track.copyWith(isFavorite: !track.isFavorite); - } - - // Update in favorites list - final favIndex = _favoriteTracks.indexWhere((t) => t.trackhash == trackHash); - if (favIndex != -1) { - _favoriteTracks[favIndex] = _favoriteTracks[favIndex].copyWith(isFavorite: !_favoriteTracks[favIndex].isFavorite); - } else { - _favoriteTracks.add(_tracks.firstWhere((t) => t.trackhash == trackHash)); - } - - notifyListeners(); - } catch (e) { - _setError('Failed to toggle favorite: $e'); - } - } - - // Album methods - Future loadAlbums({String? search, String? artist}) async { - _setLoadingAlbums(true); - _clearError(); - - try { - _albums = await _apiService.getAlbums(search: search, artist: artist); - _setLoadingAlbums(false); - } catch (e) { - _setError('Failed to load albums: $e'); - } - } - - Future refreshAlbums() async { - await loadAlbums(); - } - - Future loadAlbum(String albumHash) async { - try { - final album = await _apiService.getAlbum(albumHash); - if (album != null) { - // Update album in current list if exists - final index = _albums.indexWhere((a) => a.albumhash == albumHash); - if (index != -1) { - _albums[index] = album; - } - } - } catch (e) { - _setError('Failed to load album: $e'); - } - } - - Future loadAlbumTracks(String albumHash) async { - _setLoadingTracks(true); - _clearError(); - - try { - final tracks = await _apiService.getAlbumTracks(albumHash); - _tracks = tracks; - _setLoadingTracks(false); - } catch (e) { - _setError('Failed to load album tracks: $e'); - } - } - - Future toggleFavoriteAlbum(String albumHash) async { - try { - await _apiService.toggleFavoriteAlbum(albumHash); - - // Update album in local list - final index = _albums.indexWhere((a) => a.albumhash == albumHash); - if (index != -1) { - final album = _albums[index]; - _albums[index] = album.copyWith(isFavorite: !album.isFavorite); - } - - // Update in favorites list - final favIndex = _favoriteAlbums.indexWhere((a) => a.albumhash == albumHash); - if (favIndex != -1) { - _favoriteAlbums[favIndex] = _favoriteAlbums[favIndex].copyWith(isFavorite: !_favoriteAlbums[favIndex].isFavorite); - } else { - _favoriteAlbums.add(_albums.firstWhere((a) => a.albumhash == albumHash)); - } - - notifyListeners(); - } catch (e) { - _setError('Failed to toggle favorite album: $e'); - } - } - - // Artist methods - Future loadArtists({String? search}) async { - _setLoadingArtists(true); - _clearError(); - - try { - _artists = await _apiService.getArtists(search: search); - _setLoadingArtists(false); - } catch (e) { - _setError('Failed to load artists: $e'); - } - } - - Future refreshArtists() async { - await loadArtists(); - } - - Future loadArtist(String artistHash) async { - try { - final artist = await _apiService.getArtist(artistHash); - if (artist != null) { - // Update artist in current list if exists - final index = _artists.indexWhere((a) => a.artisthash == artistHash); - if (index != -1) { - _artists[index] = artist; - } - } - } catch (e) { - _setError('Failed to load artist: $e'); - } - } - - Future loadArtistAlbums(String artistHash) async { - _setLoadingAlbums(true); - _clearError(); - - try { - final albums = await _apiService.getArtistAlbums(artistHash); - _albums = albums; - _setLoadingAlbums(false); - } catch (e) { - _setError('Failed to load artist albums: $e'); - } - } - - Future loadArtistTracks(String artistHash) async { - _setLoadingTracks(true); - _clearError(); - - try { - final tracks = await _apiService.getArtistTracks(artistHash); - _tracks = tracks; - _setLoadingTracks(false); - } catch (e) { - _setError('Failed to load artist tracks: $e'); - } - } - - Future toggleFavoriteArtist(String artistHash) async { - try { - await _apiService.toggleFavoriteArtist(artistHash); - - // Update artist in local list - final index = _artists.indexWhere((a) => a.artisthash == artistHash); - if (index != -1) { - final artist = _artists[index]; - _artists[index] = artist.copyWith(isFavorite: !artist.isFavorite); - } - - // Update in favorites list - final favIndex = _favoriteArtists.indexWhere((a) => a.artisthash == artistHash); - if (favIndex != -1) { - _favoriteArtists[favIndex] = _favoriteArtists[favIndex].copyWith(isFavorite: !_favoriteArtists[favIndex].isFavorite); - } else { - _favoriteArtists.add(_artists.firstWhere((a) => a.artisthash == artistHash)); - } - - notifyListeners(); - } catch (e) { - _setError('Failed to toggle favorite artist: $e'); - } - } - - // Playlist methods - Future loadPlaylists() async { - _setLoadingPlaylists(true); - _clearError(); - - try { - _playlists = await _apiService.getPlaylists(); - _setLoadingPlaylists(false); - } catch (e) { - _setError('Failed to load playlists: $e'); - } - } - - Future refreshPlaylists() async { - await loadPlaylists(); - } - - Future loadPlaylist(String playlistId) async { - try { - final playlist = await _apiService.getPlaylist(playlistId); - if (playlist != null) { - // Update playlist in current list if exists - final index = _playlists.indexWhere((p) => p.playlistId == playlistId); - if (index != -1) { - _playlists[index] = playlist; - } - } - } catch (e) { - _setError('Failed to load playlist: $e'); - } - } - - Future createPlaylist(String name, String description) async { - _setLoadingPlaylists(true); - _clearError(); - - try { - final newPlaylist = await _apiService.createPlaylist(name, description); - _playlists.insert(0, newPlaylist); - _setLoadingPlaylists(false); - } catch (e) { - _setError('Failed to create playlist: $e'); - } - } - - Future addToPlaylist(String playlistId, String trackHash) async { - try { - await _apiService.addToPlaylist(playlistId, trackHash); - } catch (e) { - _setError('Failed to add to playlist: $e'); - } - } - - Future removeFromPlaylist(String playlistId, String trackHash) async { - try { - await _apiService.removeFromPlaylist(playlistId, trackHash); - } catch (e) { - _setError('Failed to remove from playlist: $e'); - } - } - - // Folder methods - Future loadFolders() async { - _setLoadingFolders(true); - _clearError(); - - try { - _folders = await _apiService.getFolders(); - _setLoadingFolders(false); - } catch (e) { - _setError('Failed to load folders: $e'); - } - } - - Future loadFolderTracks(String folderHash) async { - _setLoadingTracks(true); - _clearError(); - - try { - final tracks = await _apiService.getFolderTracks(folderHash); - _tracks = tracks; - _setLoadingTracks(false); - } catch (e) { - _setError('Failed to load folder tracks: $e'); - } - } - - // Favorites methods - Future loadFavoriteTracks() async { - _setLoadingFavorites(true); - _clearError(); - - try { - _favoriteTracks = await _apiService.getFavoriteTracks(); - _setLoadingFavorites(false); - } catch (e) { - _setError('Failed to load favorite tracks: $e'); - } - } - - Future loadFavoriteAlbums() async { - _setLoadingFavorites(true); - _clearError(); - - try { - _favoriteAlbums = await _apiService.getFavoriteAlbums(); - _setLoadingFavorites(false); - } catch (e) { - _setError('Failed to load favorite albums: $e'); - } - } - - Future loadFavoriteArtists() async { - _setLoadingFavorites(true); - _clearError(); - - try { - _favoriteArtists = await _apiService.getFavoriteArtists(); - _setLoadingFavorites(false); - } catch (e) { - _setError('Failed to load favorite artists: $e'); - } - } - - // User methods - Future loadUserInfo() async { - _setLoadingUserInfo(true); - _clearError(); - - try { - _userInfo = await _apiService.getUserInfo(); - _setLoadingUserInfo(false); - } catch (e) { - _setError('Failed to load user info: $e'); - } - } - - Future updateUserPreferences(Map preferences) async { - try { - await _apiService.updateUserPreferences(preferences); - _userPreferences = preferences; - } catch (e) { - _setError('Failed to update preferences: $e'); - } - } - - Future loadUserPreferences() async { - _setLoadingUserInfo(true); - _clearError(); - - try { - _userPreferences = await _apiService.getUserPreferences(); - _setLoadingUserInfo(false); - } catch (e) { - _setError('Failed to load preferences: $e'); - } - } - - // Statistics methods - Future loadStatistics() async { - _setLoadingStatistics(true); - _clearError(); - - try { - _statistics = await _apiService.getStatistics(); - _setLoadingStatistics(false); - } catch (e) { - _setError('Failed to load statistics: $e'); - } - } - - // Download methods - Future loadDownloads() async { - _setLoadingDownloads(true); - _clearError(); - - try { - // TODO: Implement actual download loading from API - _downloads = [ - { - 'downloadId': '1', - 'title': 'Example Track 1', - 'artist': 'Example Artist', - 'status': 'completed', - 'progress': 1.0, - 'speed': 2.5, - 'eta': 0, - }, - { - 'downloadId': '2', - 'title': 'Example Track 2', - 'artist': 'Example Artist', - 'status': 'downloading', - 'progress': 0.5, - 'speed': 1.8, - 'eta': 120, - }, - ]; - _setLoadingDownloads(false); - } catch (e) { - _setError('Failed to load downloads: $e'); - _setLoadingDownloads(false); - } - } - - Future loadDownloadSettings() async { - _setLoadingUserInfo(true); - _clearError(); - - try { - // TODO: Implement actual settings loading from API - _downloadSettings = { - 'downloadPath': '/storage/emulated/0/Android/data/com.example.swingmusic/files/Downloads', - 'defaultQuality': '320kbps', - 'wifiOnly': false, - 'maxConcurrentDownloads': 3, - }; - _setLoadingUserInfo(false); - } catch (e) { - _setError('Failed to load download settings: $e'); - _setLoadingUserInfo(false); - } - } - - Future updateDownloadSettings(Map settings) async { - try { - // TODO: Implement actual settings update to API - _downloadSettings.addAll(settings); - } catch (e) { - _setError('Failed to update download settings: $e'); - } - } - - Future pauseDownload(String downloadId) async { - try { - // TODO: Implement actual pause via API - final index = _downloads.indexWhere((d) => d['downloadId'] == downloadId); - if (index != -1) { - _downloads[index] = {..._downloads[index], 'status': 'paused'}; - } - } catch (e) { - _setError('Failed to pause download: $e'); - } - } - - Future resumeDownload(String downloadId) async { - try { - // TODO: Implement actual resume via API - final index = _downloads.indexWhere((d) => d['downloadId'] == downloadId); - if (index != -1) { - _downloads[index] = {..._downloads[index], 'status': 'downloading'}; - } - } catch (e) { - _setError('Failed to resume download: $e'); - } - } - - Future cancelDownload(String downloadId) async { - try { - // TODO: Implement actual cancel via API - _downloads.removeWhere((d) => d['downloadId'] == downloadId); - } catch (e) { - _setError('Failed to cancel download: $e'); - } - } - - Future retryDownload(String downloadId) async { - try { - // TODO: Implement actual retry via API - final index = _downloads.indexWhere((d) => d['downloadId'] == downloadId); - if (index != -1) { - _downloads[index] = {..._downloads[index], 'status': 'downloading'}; - } - } catch (e) { - _setError('Failed to retry download: $e'); - } - } - - Future deleteDownload(String downloadId) async { - try { - // TODO: Implement actual delete via API - _downloads.removeWhere((d) => d['downloadId'] == downloadId); - } catch (e) { - _setError('Failed to delete download: $e'); - } - } - Future loadQueue() async { - _setLoadingQueue(true); - _clearError(); - - try { - _queue = await _apiService.getQueue(); - _setLoadingQueue(false); - } catch (e) { - _setError('Failed to load queue: $e'); - } - } - - Future addToQueue(String trackHash) async { - try { - await _apiService.addToQueue(trackHash); - - // Add to queue from tracks if available - final track = _tracks.firstWhere((t) => t.trackhash == trackHash); - if (track != null && !_queue.any((q) => q.trackhash == trackHash)) { - _queue.add(track); - } - - notifyListeners(); - } catch (e) { - _setError('Failed to add to queue: $e'); - } - } - - Future removeFromQueue(String trackHash) async { - try { - await _apiService.removeFromQueue(trackHash); - _queue.removeWhere((track) => track.trackhash == trackHash); - notifyListeners(); - } catch (e) { - _setError('Failed to remove from queue: $e'); - } - } - - Future clearQueue() async { - try { - await _apiService.clearQueue(); - _queue.clear(); - notifyListeners(); - } catch (e) { - _setError('Failed to clear queue: $e'); - } - } - - Future reorderQueue(List trackHashes) async { - try { - await _apiService.reorderQueue(trackHashes); - - // Reorder local queue - final reorderedQueue = []; - for (final hash in trackHashes) { - final track = _queue.firstWhere((t) => t.trackhash == hash); - if (track != null) { - reorderedQueue.add(track); - } - } - _queue = reorderedQueue; - notifyListeners(); - } catch (e) { - _setError('Failed to reorder queue: $e'); - } - } - - // Private helper methods - void _setLoadingTracks(bool loading) { - _isLoadingTracks = loading; - notifyListeners(); - } - - void _setLoadingAlbums(bool loading) { - _isLoadingAlbums = loading; - notifyListeners(); - } - - void _setLoadingArtists(bool loading) { - _isLoadingArtists = loading; - notifyListeners(); - } - - void _setLoadingPlaylists(bool loading) { - _isLoadingPlaylists = loading; - notifyListeners(); - } - - void _setLoadingFolders(bool loading) { - _isLoadingFolders = loading; - notifyListeners(); - } - - void _setLoadingUserInfo(bool loading) { - _isLoadingUserInfo = loading; - notifyListeners(); - } - - void _setLoadingStatistics(bool loading) { - _isLoadingStatistics = loading; - notifyListeners(); - } - - void _setLoadingFavorites(bool loading) { - _isLoadingFavorites = loading; - notifyListeners(); - } - - void _setLoadingQueue(bool loading) { - _isLoadingQueue = loading; - notifyListeners(); - } - - void _clearError() { - _error = null; - notifyListeners(); - } - - void _setError(String error) { - _error = error; - notifyListeners(); - } -} diff --git a/swingmusic_mobile/lib/shared/providers/library_provider.dart b/swingmusic_mobile/lib/shared/providers/library_provider.dart deleted file mode 100644 index fa923adb..00000000 --- a/swingmusic_mobile/lib/shared/providers/library_provider.dart +++ /dev/null @@ -1,297 +0,0 @@ -import 'package:flutter/foundation.dart'; -import '../../data/services/api_service.dart'; -import '../../data/models/track_model.dart'; -import '../../data/models/album_model.dart'; -import '../../data/models/playlist_model.dart'; - -class LibraryProvider extends ChangeNotifier { - final ApiService _apiService = ApiService(); - - // Library data - List _tracks = []; - List _albums = []; - List _artists = []; - List _playlists = []; - List _favoriteTracks = []; - List _favoriteAlbums = []; - List _favoriteArtists = []; - - // Loading states - bool _isLoadingTracks = false; - bool _isLoadingAlbums = false; - bool _isLoadingArtists = false; - bool _isLoadingPlaylists = false; - bool _isLoadingFavorites = false; - - // Search state - List _searchResults = []; - bool _isSearching = false; - String _searchQuery = ''; - - // Getters - List get tracks => _tracks; - List get albums => _albums; - List get artists => _artists; - List get playlists => _playlists; - List get favoriteTracks => _favoriteTracks; - List get favoriteAlbums => _favoriteAlbums; - List get favoriteArtists => _favoriteArtists; - - bool get isLoadingTracks => _isLoadingTracks; - bool get isLoadingAlbums => _isLoadingAlbums; - bool get isLoadingArtists => _isLoadingArtists; - bool get isLoadingPlaylists => _isLoadingPlaylists; - bool get isLoadingFavorites => _isLoadingFavorites; - - List get searchResults => _searchResults; - bool get isSearching => _isSearching; - String get searchQuery => _searchQuery; - - // Tracks operations - Future loadTracks({int limit = 20, int offset = 0}) async { - try { - _isLoadingTracks = true; - notifyListeners(); - - final response = await _apiService.getTracks(limit: limit, offset: offset); - _tracks = response.map((json) => TrackModel.fromJson(json)).toList(); - - _isLoadingTracks = false; - notifyListeners(); - } catch (e) { - _isLoadingTracks = false; - notifyListeners(); - throw Exception('Failed to load tracks: $e'); - } - } - - Future loadMoreTracks({int limit = 20}) async { - try { - final response = await _apiService.getTracks(limit: limit, offset: _tracks.length); - final newTracks = response.map((json) => TrackModel.fromJson(json)).toList(); - _tracks.addAll(newTracks); - notifyListeners(); - } catch (e) { - throw Exception('Failed to load more tracks: $e'); - } - } - - // Albums operations - Future loadAlbums({int limit = 20, int offset = 0}) async { - try { - _isLoadingAlbums = true; - notifyListeners(); - - final response = await _apiService.getAlbums(limit: limit, offset: offset); - _albums = response.map((json) => AlbumModel.fromJson(json)).toList(); - - _isLoadingAlbums = false; - notifyListeners(); - } catch (e) { - _isLoadingAlbums = false; - notifyListeners(); - throw Exception('Failed to load albums: $e'); - } - } - - Future loadMoreAlbums({int limit = 20}) async { - try { - final response = await _apiService.getAlbums(limit: limit, offset: _albums.length); - final newAlbums = response.map((json) => AlbumModel.fromJson(json)).toList(); - _albums.addAll(newAlbums); - notifyListeners(); - } catch (e) { - throw Exception('Failed to load more albums: $e'); - } - } - - // Artists operations - Future loadArtists({int limit = 20, int offset = 0}) async { - try { - _isLoadingArtists = true; - notifyListeners(); - - final response = await _apiService.getArtists(limit: limit, offset: offset); - _artists = response.map((json) => ArtistModel.fromJson(json)).toList(); - - _isLoadingArtists = false; - notifyListeners(); - } catch (e) { - _isLoadingArtists = false; - notifyListeners(); - throw Exception('Failed to load artists: $e'); - } - } - - Future loadMoreArtists({int limit = 20}) async { - try { - final response = await _apiService.getArtists(limit: limit, offset: _artists.length); - final newArtists = response.map((json) => ArtistModel.fromJson(json)).toList(); - _artists.addAll(newArtists); - notifyListeners(); - } catch (e) { - throw Exception('Failed to load more artists: $e'); - } - } - - // Playlists operations - Future loadPlaylists() async { - try { - _isLoadingPlaylists = true; - notifyListeners(); - - final response = await _apiService.getPlaylists(); - _playlists = response.map((json) => PlaylistModel.fromJson(json)).toList(); - - _isLoadingPlaylists = false; - notifyListeners(); - } catch (e) { - _isLoadingPlaylists = false; - notifyListeners(); - throw Exception('Failed to load playlists: $e'); - } - } - - Future createPlaylist(String name, {String description = ''}) async { - try { - final response = await _apiService.createPlaylist(name, description: description); - final newPlaylist = PlaylistModel.fromJson(response); - _playlists.add(newPlaylist); - notifyListeners(); - return newPlaylist; - } catch (e) { - throw Exception('Failed to create playlist: $e'); - } - } - - // Favorites operations - Future loadFavorites() async { - try { - _isLoadingFavorites = true; - notifyListeners(); - - final tracksResponse = await _apiService.getFavoriteTracks(); - final albumsResponse = await _apiService.getFavoriteAlbums(); - final artistsResponse = await _apiService.getFavoriteArtists(); - - _favoriteTracks = tracksResponse.map((json) => TrackModel.fromJson(json)).toList(); - _favoriteAlbums = albumsResponse.map((json) => AlbumModel.fromJson(json)).toList(); - _favoriteArtists = artistsResponse.map((json) => ArtistModel.fromJson(json)).toList(); - - _isLoadingFavorites = false; - notifyListeners(); - } catch (e) { - _isLoadingFavorites = false; - notifyListeners(); - throw Exception('Failed to load favorites: $e'); - } - } - - Future toggleFavoriteTrack(String trackhash) async { - try { - await _apiService.toggleFavoriteTrack(trackhash); - - // Update local state - final trackIndex = _favoriteTracks.indexWhere((track) => track.trackhash == trackhash); - if (trackIndex != -1) { - _favoriteTracks.removeAt(trackIndex); - } else { - final track = _tracks.firstWhere((t) => t.trackhash == trackhash); - _favoriteTracks.add(track); - } - notifyListeners(); - } catch (e) { - throw Exception('Failed to toggle favorite track: $e'); - } - } - - Future toggleFavoriteAlbum(String albumhash) async { - try { - await _apiService.toggleFavoriteAlbum(albumhash); - - // Update local state - final albumIndex = _favoriteAlbums.indexWhere((album) => album.albumhash == albumhash); - if (albumIndex != -1) { - _favoriteAlbums.removeAt(albumIndex); - } else { - final album = _albums.firstWhere((a) => a.albumhash == albumhash); - _favoriteAlbums.add(album); - } - notifyListeners(); - } catch (e) { - throw Exception('Failed to toggle favorite album: $e'); - } - } - - Future toggleFavoriteArtist(String artisthash) async { - try { - await _apiService.toggleFavoriteArtist(artisthash); - - // Update local state - final artistIndex = _favoriteArtists.indexWhere((artist) => artist.artisthash == artisthash); - if (artistIndex != -1) { - _favoriteArtists.removeAt(artistIndex); - } else { - final artist = _artists.firstWhere((a) => a.artisthash == artisthash); - _favoriteArtists.add(artist); - } - notifyListeners(); - } catch (e) { - throw Exception('Failed to toggle favorite artist: $e'); - } - } - - // Search operations - Future searchTracks(String query, {int limit = 15}) async { - if (query.isEmpty) { - _searchResults.clear(); - _searchQuery = ''; - notifyListeners(); - return; - } - - try { - _isSearching = true; - _searchQuery = query; - notifyListeners(); - - final response = await _apiService.searchTracks(query, limit: limit); - _searchResults = response.map((json) => TrackModel.fromJson(json)).toList(); - - _isSearching = false; - notifyListeners(); - } catch (e) { - _isSearching = false; - notifyListeners(); - throw Exception('Failed to search tracks: $e'); - } - } - - void clearSearch() { - _searchResults.clear(); - _searchQuery = ''; - _isSearching = false; - notifyListeners(); - } - - // Utility methods - void refresh() { - loadTracks(); - loadAlbums(); - loadArtists(); - loadPlaylists(); - loadFavorites(); - } - - bool isTrackFavorite(String trackhash) { - return _favoriteTracks.any((track) => track.trackhash == trackhash); - } - - bool isAlbumFavorite(String albumhash) { - return _favoriteAlbums.any((album) => album.albumhash == albumhash); - } - - bool isArtistFavorite(String artisthash) { - return _favoriteArtists.any((artist) => artist.artisthash == artisthash); - } -} diff --git a/swingmusic_mobile/lib/shared/routes/app_router.dart b/swingmusic_mobile/lib/shared/routes/app_router.dart deleted file mode 100644 index bb534706..00000000 --- a/swingmusic_mobile/lib/shared/routes/app_router.dart +++ /dev/null @@ -1,95 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:go_router/go_router.dart'; -import '../../features/player/enhanced_player_screen_new.dart'; -import '../../features/library/library_screen.dart'; -import '../../features/search/search_screen.dart'; -import '../../features/playlists/playlists_screen.dart'; -import '../../features/settings/enhanced_settings_screen.dart'; -import '../../features/auth/enhanced_auth_screen.dart'; -import '../../features/downloads/downloads_screen.dart'; -import '../../features/analytics/analytics_screen.dart'; -import '../../features/home/home_screen.dart'; -import '../widgets/main_navigation.dart'; -import '../../core/constants/app_constants.dart'; - -class AppRouter { - static final GoRouter _router = GoRouter( - initialLocation: AppConstants.homeRoute, - routes: [ - ShellRoute( - builder: (context, state, child) { - return MainNavigation(child: child); - }, - routes: [ - GoRoute( - path: AppConstants.homeRoute, - name: 'home', - builder: (context, state) => const HomeScreen(), - ), - GoRoute( - path: AppConstants.libraryRoute, - name: 'library', - builder: (context, state) => const LibraryScreen(), - ), - GoRoute( - path: AppConstants.playerRoute, - name: 'player', - builder: (context, state) => const EnhancedPlayerScreen(), - ), - GoRoute( - path: AppConstants.searchRoute, - name: 'search', - builder: (context, state) => const SearchScreen(), - ), - GoRoute( - path: AppConstants.playlistsRoute, - name: 'playlists', - builder: (context, state) => const PlaylistsScreen(), - ), - GoRoute( - path: AppConstants.authRoute, - name: 'auth', - builder: (context, state) => const EnhancedAuthScreen(), - ), - GoRoute( - path: '/downloads', - name: 'downloads', - builder: (context, state) => const DownloadsScreen(), - ), - GoRoute( - path: AppConstants.analyticsRoute, - name: 'analytics', - builder: (context, state) => const AnalyticsScreen(), - ), - GoRoute( - path: AppConstants.settingsRoute, - name: 'settings', - builder: (context, state) => const EnhancedSettingsScreen(), - ), - ], - ), - ], - errorBuilder: (context, state) => Scaffold( - body: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Icon( - Icons.error_outline, - size: 64, - color: Colors.red, - ), - const SizedBox(height: 16), - Text( - 'Page not found: ${state.uri}', - style: const TextStyle(fontSize: 18), - textAlign: TextAlign.center, - ), - ], - ), - ), - ), - ); - - static GoRouter get router => _router; -} diff --git a/swingmusic_mobile/lib/shared/widgets/main_navigation.dart b/swingmusic_mobile/lib/shared/widgets/main_navigation.dart deleted file mode 100644 index ca4f4f52..00000000 --- a/swingmusic_mobile/lib/shared/widgets/main_navigation.dart +++ /dev/null @@ -1,135 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:go_router/go_router.dart'; -import '../../core/constants/app_constants.dart'; -import '../../core/constants/app_icons.dart'; -import '../../core/widgets/mini_player.dart'; - -class MainNavigation extends StatefulWidget { - final Widget child; - - const MainNavigation({ - super.key, - required this.child, - }); - - @override - State createState() => _MainNavigationState(); -} - -class _MainNavigationState extends State { - int _currentIndex = 0; - - final List _navigationItems = [ - NavigationItem( - icon: AppIcons.home, - selectedIcon: AppIcons.homeFilled, - label: 'Home', - route: AppConstants.homeRoute, - ), - NavigationItem( - icon: AppIcons.search, - selectedIcon: AppIcons.searchFilled, - label: 'Search', - route: AppConstants.searchRoute, - ), - NavigationItem( - icon: AppIcons.library, - selectedIcon: AppIcons.libraryFilled, - label: 'Library', - route: AppConstants.libraryRoute, - ), - ]; - - @override - Widget build(BuildContext context) { - return Scaffold( - body: Column( - children: [ - Expanded( - child: widget.child, - ), - const MiniPlayer(), - ], - ), - bottomNavigationBar: Container( - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surface, - boxShadow: [ - BoxShadow( - color: Theme.of(context).shadowColor.withValues(alpha: 0.1), - blurRadius: 8, - offset: const Offset(0, -2), - ), - ], - ), - child: SafeArea( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: _navigationItems.map((item) { - final isSelected = _currentIndex == _navigationItems.indexOf(item); - return Expanded( - child: InkWell( - onTap: () => _onItemTapped(_navigationItems.indexOf(item)), - borderRadius: BorderRadius.circular(8), - child: Padding( - padding: const EdgeInsets.symmetric(vertical: 8.0), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - isSelected ? item.selectedIcon : item.icon, - color: isSelected - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.6), - size: 24, - ), - const SizedBox(height: 4), - Text( - item.label, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: isSelected - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.6), - fontWeight: isSelected ? FontWeight.w700 : FontWeight.w500, - fontSize: 12, - ), - ), - ], - ), - ), - ), - ); - }).toList(), - ), - ), - ), - ), - ); - } - - void _onItemTapped(int index) { - final item = _navigationItems[index]; - if (_currentIndex != index) { - setState(() { - _currentIndex = index; - }); - context.go(item.route); - } - } -} - -class NavigationItem { - final IconData icon; - final IconData selectedIcon; - final String label; - final String route; - - NavigationItem({ - required this.icon, - required this.selectedIcon, - required this.label, - required this.route, - }); -} diff --git a/swingmusic_mobile/linux/.gitignore b/swingmusic_mobile/linux/.gitignore deleted file mode 100644 index d3896c98..00000000 --- a/swingmusic_mobile/linux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -flutter/ephemeral diff --git a/swingmusic_mobile/linux/CMakeLists.txt b/swingmusic_mobile/linux/CMakeLists.txt deleted file mode 100644 index 162ab2a1..00000000 --- a/swingmusic_mobile/linux/CMakeLists.txt +++ /dev/null @@ -1,128 +0,0 @@ -# Project-level configuration. -cmake_minimum_required(VERSION 3.13) -project(runner LANGUAGES CXX) - -# The name of the executable created for the application. Change this to change -# the on-disk name of your application. -set(BINARY_NAME "swingmusic_mobile") -# The unique GTK application identifier for this application. See: -# https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.dvorinka.swingmusic.swingmusic_mobile") - -# Explicitly opt in to modern CMake behaviors to avoid warnings with recent -# versions of CMake. -cmake_policy(SET CMP0063 NEW) - -# Load bundled libraries from the lib/ directory relative to the binary. -set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") - -# Root filesystem for cross-building. -if(FLUTTER_TARGET_PLATFORM_SYSROOT) - set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) - set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) - set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) - set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) - set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) - set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -endif() - -# Define build configuration options. -if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_BUILD_TYPE "Debug" CACHE - STRING "Flutter build mode" FORCE) - set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS - "Debug" "Profile" "Release") -endif() - -# Compilation settings that should be applied to most targets. -# -# Be cautious about adding new options here, as plugins use this function by -# default. In most cases, you should add new options to specific targets instead -# of modifying this function. -function(APPLY_STANDARD_SETTINGS TARGET) - target_compile_features(${TARGET} PUBLIC cxx_std_14) - target_compile_options(${TARGET} PRIVATE -Wall -Werror) - target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") - target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") -endfunction() - -# Flutter library and tool build rules. -set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") -add_subdirectory(${FLUTTER_MANAGED_DIR}) - -# System-level dependencies. -find_package(PkgConfig REQUIRED) -pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) - -# Application build; see runner/CMakeLists.txt. -add_subdirectory("runner") - -# Run the Flutter tool portions of the build. This must not be removed. -add_dependencies(${BINARY_NAME} flutter_assemble) - -# Only the install-generated bundle's copy of the executable will launch -# correctly, since the resources must in the right relative locations. To avoid -# people trying to run the unbundled copy, put it in a subdirectory instead of -# the default top-level location. -set_target_properties(${BINARY_NAME} - PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" -) - - -# Generated plugin build rules, which manage building the plugins and adding -# them to the application. -include(flutter/generated_plugins.cmake) - - -# === Installation === -# By default, "installing" just makes a relocatable bundle in the build -# directory. -set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) -endif() - -# Start with a clean build bundle directory every time. -install(CODE " - file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") - " COMPONENT Runtime) - -set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") -set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") - -install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) - install(FILES "${bundled_library}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) -endforeach(bundled_library) - -# Copy the native assets provided by the build.dart from all packages. -set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") -install(DIRECTORY "${NATIVE_ASSETS_DIR}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -# Fully re-copy the assets directory on each build to avoid having stale files -# from a previous install. -set(FLUTTER_ASSET_DIR_NAME "flutter_assets") -install(CODE " - file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") - " COMPONENT Runtime) -install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" - DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) - -# Install the AOT library on non-Debug builds only. -if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") - install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) -endif() diff --git a/swingmusic_mobile/linux/flutter/CMakeLists.txt b/swingmusic_mobile/linux/flutter/CMakeLists.txt deleted file mode 100644 index d5bd0164..00000000 --- a/swingmusic_mobile/linux/flutter/CMakeLists.txt +++ /dev/null @@ -1,88 +0,0 @@ -# This file controls Flutter-level build steps. It should not be edited. -cmake_minimum_required(VERSION 3.10) - -set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") - -# Configuration provided via flutter tool. -include(${EPHEMERAL_DIR}/generated_config.cmake) - -# TODO: Move the rest of this into files in ephemeral. See -# https://github.com/flutter/flutter/issues/57146. - -# Serves the same purpose as list(TRANSFORM ... PREPEND ...), -# which isn't available in 3.10. -function(list_prepend LIST_NAME PREFIX) - set(NEW_LIST "") - foreach(element ${${LIST_NAME}}) - list(APPEND NEW_LIST "${PREFIX}${element}") - endforeach(element) - set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) -endfunction() - -# === Flutter Library === -# System-level dependencies. -find_package(PkgConfig REQUIRED) -pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) -pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) -pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) - -set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") - -# Published to parent scope for install step. -set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) -set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) -set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) -set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) - -list(APPEND FLUTTER_LIBRARY_HEADERS - "fl_basic_message_channel.h" - "fl_binary_codec.h" - "fl_binary_messenger.h" - "fl_dart_project.h" - "fl_engine.h" - "fl_json_message_codec.h" - "fl_json_method_codec.h" - "fl_message_codec.h" - "fl_method_call.h" - "fl_method_channel.h" - "fl_method_codec.h" - "fl_method_response.h" - "fl_plugin_registrar.h" - "fl_plugin_registry.h" - "fl_standard_message_codec.h" - "fl_standard_method_codec.h" - "fl_string_codec.h" - "fl_value.h" - "fl_view.h" - "flutter_linux.h" -) -list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") -add_library(flutter INTERFACE) -target_include_directories(flutter INTERFACE - "${EPHEMERAL_DIR}" -) -target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") -target_link_libraries(flutter INTERFACE - PkgConfig::GTK - PkgConfig::GLIB - PkgConfig::GIO -) -add_dependencies(flutter flutter_assemble) - -# === Flutter tool backend === -# _phony_ is a non-existent file to force this command to run every time, -# since currently there's no way to get a full input/output list from the -# flutter tool. -add_custom_command( - OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} - ${CMAKE_CURRENT_BINARY_DIR}/_phony_ - COMMAND ${CMAKE_COMMAND} -E env - ${FLUTTER_TOOL_ENVIRONMENT} - "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" - ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} - VERBATIM -) -add_custom_target(flutter_assemble DEPENDS - "${FLUTTER_LIBRARY}" - ${FLUTTER_LIBRARY_HEADERS} -) diff --git a/swingmusic_mobile/linux/runner/CMakeLists.txt b/swingmusic_mobile/linux/runner/CMakeLists.txt deleted file mode 100644 index e97dabc7..00000000 --- a/swingmusic_mobile/linux/runner/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -cmake_minimum_required(VERSION 3.13) -project(runner LANGUAGES CXX) - -# Define the application target. To change its name, change BINARY_NAME in the -# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer -# work. -# -# Any new source files that you add to the application should be added here. -add_executable(${BINARY_NAME} - "main.cc" - "my_application.cc" - "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" -) - -# Apply the standard set of build settings. This can be removed for applications -# that need different build settings. -apply_standard_settings(${BINARY_NAME}) - -# Add preprocessor definitions for the application ID. -add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") - -# Add dependency libraries. Add any application-specific dependencies here. -target_link_libraries(${BINARY_NAME} PRIVATE flutter) -target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) - -target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") diff --git a/swingmusic_mobile/linux/runner/main.cc b/swingmusic_mobile/linux/runner/main.cc deleted file mode 100644 index e7c5c543..00000000 --- a/swingmusic_mobile/linux/runner/main.cc +++ /dev/null @@ -1,6 +0,0 @@ -#include "my_application.h" - -int main(int argc, char** argv) { - g_autoptr(MyApplication) app = my_application_new(); - return g_application_run(G_APPLICATION(app), argc, argv); -} diff --git a/swingmusic_mobile/linux/runner/my_application.cc b/swingmusic_mobile/linux/runner/my_application.cc deleted file mode 100644 index 935100f2..00000000 --- a/swingmusic_mobile/linux/runner/my_application.cc +++ /dev/null @@ -1,148 +0,0 @@ -#include "my_application.h" - -#include -#ifdef GDK_WINDOWING_X11 -#include -#endif - -#include "flutter/generated_plugin_registrant.h" - -struct _MyApplication { - GtkApplication parent_instance; - char** dart_entrypoint_arguments; -}; - -G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) - -// Called when first Flutter frame received. -static void first_frame_cb(MyApplication* self, FlView* view) { - gtk_widget_show(gtk_widget_get_toplevel(GTK_WIDGET(view))); -} - -// Implements GApplication::activate. -static void my_application_activate(GApplication* application) { - MyApplication* self = MY_APPLICATION(application); - GtkWindow* window = - GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); - - // Use a header bar when running in GNOME as this is the common style used - // by applications and is the setup most users will be using (e.g. Ubuntu - // desktop). - // If running on X and not using GNOME then just use a traditional title bar - // in case the window manager does more exotic layout, e.g. tiling. - // If running on Wayland assume the header bar will work (may need changing - // if future cases occur). - gboolean use_header_bar = TRUE; -#ifdef GDK_WINDOWING_X11 - GdkScreen* screen = gtk_window_get_screen(window); - if (GDK_IS_X11_SCREEN(screen)) { - const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); - if (g_strcmp0(wm_name, "GNOME Shell") != 0) { - use_header_bar = FALSE; - } - } -#endif - if (use_header_bar) { - GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); - gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "swingmusic_mobile"); - gtk_header_bar_set_show_close_button(header_bar, TRUE); - gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); - } else { - gtk_window_set_title(window, "swingmusic_mobile"); - } - - gtk_window_set_default_size(window, 1280, 720); - - g_autoptr(FlDartProject) project = fl_dart_project_new(); - fl_dart_project_set_dart_entrypoint_arguments( - project, self->dart_entrypoint_arguments); - - FlView* view = fl_view_new(project); - GdkRGBA background_color; - // Background defaults to black, override it here if necessary, e.g. #00000000 - // for transparent. - gdk_rgba_parse(&background_color, "#000000"); - fl_view_set_background_color(view, &background_color); - gtk_widget_show(GTK_WIDGET(view)); - gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); - - // Show the window when Flutter renders. - // Requires the view to be realized so we can start rendering. - g_signal_connect_swapped(view, "first-frame", G_CALLBACK(first_frame_cb), - self); - gtk_widget_realize(GTK_WIDGET(view)); - - fl_register_plugins(FL_PLUGIN_REGISTRY(view)); - - gtk_widget_grab_focus(GTK_WIDGET(view)); -} - -// Implements GApplication::local_command_line. -static gboolean my_application_local_command_line(GApplication* application, - gchar*** arguments, - int* exit_status) { - MyApplication* self = MY_APPLICATION(application); - // Strip out the first argument as it is the binary name. - self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); - - g_autoptr(GError) error = nullptr; - if (!g_application_register(application, nullptr, &error)) { - g_warning("Failed to register: %s", error->message); - *exit_status = 1; - return TRUE; - } - - g_application_activate(application); - *exit_status = 0; - - return TRUE; -} - -// Implements GApplication::startup. -static void my_application_startup(GApplication* application) { - // MyApplication* self = MY_APPLICATION(object); - - // Perform any actions required at application startup. - - G_APPLICATION_CLASS(my_application_parent_class)->startup(application); -} - -// Implements GApplication::shutdown. -static void my_application_shutdown(GApplication* application) { - // MyApplication* self = MY_APPLICATION(object); - - // Perform any actions required at application shutdown. - - G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); -} - -// Implements GObject::dispose. -static void my_application_dispose(GObject* object) { - MyApplication* self = MY_APPLICATION(object); - g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); - G_OBJECT_CLASS(my_application_parent_class)->dispose(object); -} - -static void my_application_class_init(MyApplicationClass* klass) { - G_APPLICATION_CLASS(klass)->activate = my_application_activate; - G_APPLICATION_CLASS(klass)->local_command_line = - my_application_local_command_line; - G_APPLICATION_CLASS(klass)->startup = my_application_startup; - G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; - G_OBJECT_CLASS(klass)->dispose = my_application_dispose; -} - -static void my_application_init(MyApplication* self) {} - -MyApplication* my_application_new() { - // Set the program name to the application ID, which helps various systems - // like GTK and desktop environments map this running application to its - // corresponding .desktop file. This ensures better integration by allowing - // the application to be recognized beyond its binary name. - g_set_prgname(APPLICATION_ID); - - return MY_APPLICATION(g_object_new(my_application_get_type(), - "application-id", APPLICATION_ID, "flags", - G_APPLICATION_NON_UNIQUE, nullptr)); -} diff --git a/swingmusic_mobile/linux/runner/my_application.h b/swingmusic_mobile/linux/runner/my_application.h deleted file mode 100644 index db16367a..00000000 --- a/swingmusic_mobile/linux/runner/my_application.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef FLUTTER_MY_APPLICATION_H_ -#define FLUTTER_MY_APPLICATION_H_ - -#include - -G_DECLARE_FINAL_TYPE(MyApplication, - my_application, - MY, - APPLICATION, - GtkApplication) - -/** - * my_application_new: - * - * Creates a new Flutter-based application. - * - * Returns: a new #MyApplication. - */ -MyApplication* my_application_new(); - -#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/swingmusic_mobile/macos/.gitignore b/swingmusic_mobile/macos/.gitignore deleted file mode 100644 index 746adbb6..00000000 --- a/swingmusic_mobile/macos/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# Flutter-related -**/Flutter/ephemeral/ -**/Pods/ - -# Xcode-related -**/dgph -**/xcuserdata/ diff --git a/swingmusic_mobile/macos/Flutter/Flutter-Debug.xcconfig b/swingmusic_mobile/macos/Flutter/Flutter-Debug.xcconfig deleted file mode 100644 index c2efd0b6..00000000 --- a/swingmusic_mobile/macos/Flutter/Flutter-Debug.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/swingmusic_mobile/macos/Flutter/Flutter-Release.xcconfig b/swingmusic_mobile/macos/Flutter/Flutter-Release.xcconfig deleted file mode 100644 index c2efd0b6..00000000 --- a/swingmusic_mobile/macos/Flutter/Flutter-Release.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/swingmusic_mobile/macos/Flutter/GeneratedPluginRegistrant.swift b/swingmusic_mobile/macos/Flutter/GeneratedPluginRegistrant.swift deleted file mode 100644 index b4eac62c..00000000 --- a/swingmusic_mobile/macos/Flutter/GeneratedPluginRegistrant.swift +++ /dev/null @@ -1,18 +0,0 @@ -// -// Generated file. Do not edit. -// - -import FlutterMacOS -import Foundation - -import audio_session -import flutter_media_metadata -import just_audio -import shared_preferences_foundation - -func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin")) - FlutterMediaMetadataPlugin.register(with: registry.registrar(forPlugin: "FlutterMediaMetadataPlugin")) - JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin")) - SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) -} diff --git a/swingmusic_mobile/macos/Runner.xcodeproj/project.pbxproj b/swingmusic_mobile/macos/Runner.xcodeproj/project.pbxproj deleted file mode 100644 index 19537b59..00000000 --- a/swingmusic_mobile/macos/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,705 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* Begin PBXAggregateTarget section */ - 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; - buildPhases = ( - 33CC111E2044C6BF0003C045 /* ShellScript */, - ); - dependencies = ( - ); - name = "Flutter Assemble"; - productName = FLX; - }; -/* End PBXAggregateTarget section */ - -/* Begin PBXBuildFile section */ - 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; - 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; - 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; - 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; - 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; - 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 33CC10E52044A3C60003C045 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 33CC10EC2044A3C60003C045; - remoteInfo = Runner; - }; - 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 33CC10E52044A3C60003C045 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 33CC111A2044C6BA0003C045; - remoteInfo = FLX; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 33CC110E2044A8840003C045 /* Bundle Framework */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Bundle Framework"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; - 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; - 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* swingmusic_mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "swingmusic_mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; - 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; - 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; - 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; - 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; - 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; - 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; - 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; - 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; - 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 331C80D2294CF70F00263BE5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 33CC10EA2044A3C60003C045 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 331C80D6294CF71000263BE5 /* RunnerTests */ = { - isa = PBXGroup; - children = ( - 331C80D7294CF71000263BE5 /* RunnerTests.swift */, - ); - path = RunnerTests; - sourceTree = ""; - }; - 33BA886A226E78AF003329D5 /* Configs */ = { - isa = PBXGroup; - children = ( - 33E5194F232828860026EE4D /* AppInfo.xcconfig */, - 9740EEB21CF90195004384FC /* Debug.xcconfig */, - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, - 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, - ); - path = Configs; - sourceTree = ""; - }; - 33CC10E42044A3C60003C045 = { - isa = PBXGroup; - children = ( - 33FAB671232836740065AC1E /* Runner */, - 33CEB47122A05771004F2AC0 /* Flutter */, - 331C80D6294CF71000263BE5 /* RunnerTests */, - 33CC10EE2044A3C60003C045 /* Products */, - D73912EC22F37F3D000D13A0 /* Frameworks */, - ); - sourceTree = ""; - }; - 33CC10EE2044A3C60003C045 /* Products */ = { - isa = PBXGroup; - children = ( - 33CC10ED2044A3C60003C045 /* swingmusic_mobile.app */, - 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 33CC11242044D66E0003C045 /* Resources */ = { - isa = PBXGroup; - children = ( - 33CC10F22044A3C60003C045 /* Assets.xcassets */, - 33CC10F42044A3C60003C045 /* MainMenu.xib */, - 33CC10F72044A3C60003C045 /* Info.plist */, - ); - name = Resources; - path = ..; - sourceTree = ""; - }; - 33CEB47122A05771004F2AC0 /* Flutter */ = { - isa = PBXGroup; - children = ( - 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, - 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, - 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, - 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, - ); - path = Flutter; - sourceTree = ""; - }; - 33FAB671232836740065AC1E /* Runner */ = { - isa = PBXGroup; - children = ( - 33CC10F02044A3C60003C045 /* AppDelegate.swift */, - 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, - 33E51913231747F40026EE4D /* DebugProfile.entitlements */, - 33E51914231749380026EE4D /* Release.entitlements */, - 33CC11242044D66E0003C045 /* Resources */, - 33BA886A226E78AF003329D5 /* Configs */, - ); - path = Runner; - sourceTree = ""; - }; - D73912EC22F37F3D000D13A0 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 331C80D4294CF70F00263BE5 /* RunnerTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; - buildPhases = ( - 331C80D1294CF70F00263BE5 /* Sources */, - 331C80D2294CF70F00263BE5 /* Frameworks */, - 331C80D3294CF70F00263BE5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 331C80DA294CF71000263BE5 /* PBXTargetDependency */, - ); - name = RunnerTests; - productName = RunnerTests; - productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 33CC10EC2044A3C60003C045 /* Runner */ = { - isa = PBXNativeTarget; - buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; - buildPhases = ( - 33CC10E92044A3C60003C045 /* Sources */, - 33CC10EA2044A3C60003C045 /* Frameworks */, - 33CC10EB2044A3C60003C045 /* Resources */, - 33CC110E2044A8840003C045 /* Bundle Framework */, - 3399D490228B24CF009A79C7 /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - 33CC11202044C79F0003C045 /* PBXTargetDependency */, - ); - name = Runner; - productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* swingmusic_mobile.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 33CC10E52044A3C60003C045 /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = YES; - LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1510; - ORGANIZATIONNAME = ""; - TargetAttributes = { - 331C80D4294CF70F00263BE5 = { - CreatedOnToolsVersion = 14.0; - TestTargetID = 33CC10EC2044A3C60003C045; - }; - 33CC10EC2044A3C60003C045 = { - CreatedOnToolsVersion = 9.2; - LastSwiftMigration = 1100; - ProvisioningStyle = Automatic; - SystemCapabilities = { - com.apple.Sandbox = { - enabled = 1; - }; - }; - }; - 33CC111A2044C6BA0003C045 = { - CreatedOnToolsVersion = 9.2; - ProvisioningStyle = Manual; - }; - }; - }; - buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 33CC10E42044A3C60003C045; - productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 33CC10EC2044A3C60003C045 /* Runner */, - 331C80D4294CF70F00263BE5 /* RunnerTests */, - 33CC111A2044C6BA0003C045 /* Flutter Assemble */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 331C80D3294CF70F00263BE5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 33CC10EB2044A3C60003C045 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, - 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 3399D490228B24CF009A79C7 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; - }; - 33CC111E2044C6BF0003C045 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - Flutter/ephemeral/FlutterInputs.xcfilelist, - ); - inputPaths = ( - Flutter/ephemeral/tripwire, - ); - outputFileListPaths = ( - Flutter/ephemeral/FlutterOutputs.xcfilelist, - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 331C80D1294CF70F00263BE5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 33CC10E92044A3C60003C045 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, - 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, - 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 33CC10EC2044A3C60003C045 /* Runner */; - targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; - }; - 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; - targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - 33CC10F52044A3C60003C045 /* Base */, - ); - name = MainMenu.xib; - path = Runner; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 331C80DB294CF71000263BE5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.dvorinka.swingmusic.swingmusicMobile.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/swingmusic_mobile.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/swingmusic_mobile"; - }; - name = Debug; - }; - 331C80DC294CF71000263BE5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.dvorinka.swingmusic.swingmusicMobile.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/swingmusic_mobile.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/swingmusic_mobile"; - }; - name = Release; - }; - 331C80DD294CF71000263BE5 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.dvorinka.swingmusic.swingmusicMobile.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/swingmusic_mobile.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/swingmusic_mobile"; - }; - name = Profile; - }; - 338D0CE9231458BD00FA5F75 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - }; - name = Profile; - }; - 338D0CEA231458BD00FA5F75 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; - }; - name = Profile; - }; - 338D0CEB231458BD00FA5F75 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Profile; - }; - 33CC10F92044A3C60003C045 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 33CC10FA2044A3C60003C045 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - }; - name = Release; - }; - 33CC10FC2044A3C60003C045 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 33CC10FD2044A3C60003C045 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; - 33CC111C2044C6BA0003C045 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 33CC111D2044C6BA0003C045 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 331C80DB294CF71000263BE5 /* Debug */, - 331C80DC294CF71000263BE5 /* Release */, - 331C80DD294CF71000263BE5 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 33CC10F92044A3C60003C045 /* Debug */, - 33CC10FA2044A3C60003C045 /* Release */, - 338D0CE9231458BD00FA5F75 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 33CC10FC2044A3C60003C045 /* Debug */, - 33CC10FD2044A3C60003C045 /* Release */, - 338D0CEA231458BD00FA5F75 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 33CC111C2044C6BA0003C045 /* Debug */, - 33CC111D2044C6BA0003C045 /* Release */, - 338D0CEB231458BD00FA5F75 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 33CC10E52044A3C60003C045 /* Project object */; -} diff --git a/swingmusic_mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/swingmusic_mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/swingmusic_mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/swingmusic_mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/swingmusic_mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100644 index 9eb9a259..00000000 --- a/swingmusic_mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/swingmusic_mobile/macos/Runner.xcworkspace/contents.xcworkspacedata b/swingmusic_mobile/macos/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d526a16..00000000 --- a/swingmusic_mobile/macos/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/swingmusic_mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/swingmusic_mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/swingmusic_mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/swingmusic_mobile/macos/Runner/AppDelegate.swift b/swingmusic_mobile/macos/Runner/AppDelegate.swift deleted file mode 100644 index b3c17614..00000000 --- a/swingmusic_mobile/macos/Runner/AppDelegate.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Cocoa -import FlutterMacOS - -@main -class AppDelegate: FlutterAppDelegate { - override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { - return true - } - - override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { - return true - } -} diff --git a/swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index a2ec33f1..00000000 --- a/swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images" : [ - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "app_icon_16.png", - "scale" : "1x" - }, - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "app_icon_32.png", - "scale" : "2x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "app_icon_32.png", - "scale" : "1x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "app_icon_64.png", - "scale" : "2x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "app_icon_128.png", - "scale" : "1x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "app_icon_256.png", - "scale" : "2x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "app_icon_256.png", - "scale" : "1x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "app_icon_512.png", - "scale" : "2x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "app_icon_512.png", - "scale" : "1x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "app_icon_1024.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png deleted file mode 100644 index 82b6f9d9a33e198f5747104729e1fcef999772a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102994 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ⅅ8MglG&ER{i5lN315cO?EdHNLrg? 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 z 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 Pe7HEdAEg|=c=LY&YVNkY diff --git a/swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png deleted file mode 100644 index 13b35eba55c6dabc3aac36f33d859266c18fa0d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5680 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 diff --git a/swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png deleted file mode 100644 index 0a3f5fa40fb3d1e0710331a48de5d256da3f275d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 520 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 diff --git a/swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/swingmusic_mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png deleted file mode 100644 index 2f1632cfddf3d9dade342351e627a0a75609fb46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2218 zcmV;b2vzrqP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuE6iGxuRCodHTWf3-RTMruyW6Fu zQYeUM04eX6D5c0FCjKKPrco1(K`<0SL=crI{PC3-^hZU0kQie$gh-5!7z6SH6Q0J% zqot*`H1q{R5fHFYS}dje@;kG=v$L0(yY0?wY2%*c?A&{2?!D*x?m71{of2gv!$5|C z3>qG_BW}7K_yUcT3A5C6QD<+{aq?x;MAUyAiJn#Jv8_zZtQ{P zTRzbL3U9!qVuZzS$xKU10KiW~Bgdcv1-!uAhQxf3a7q+dU6lj?yoO4Lq4TUN4}h{N z*fIM=SS8|C2$(T>w$`t@3Tka!(r!7W`x z-isCVgQD^mG-MJ;XtJuK3V{Vy72GQ83KRWsHU?e*wrhKk=ApIYeDqLi;JI1e zuvv}5^Dc=k7F7?nm3nIw$NVmU-+R>> zyqOR$-2SDpJ}Pt;^RkJytDVXNTsu|mI1`~G7yw`EJR?VkGfNdqK9^^8P`JdtTV&tX4CNcV4 z&N06nZa??Fw1AgQOUSE2AmPE@WO(Fvo`%m`cDgiv(fAeRA%3AGXUbsGw{7Q`cY;1BI#ac3iN$$Hw z0LT0;xc%=q)me?Y*$xI@GRAw?+}>=9D+KTk??-HJ4=A>`V&vKFS75@MKdSF1JTq{S zc1!^8?YA|t+uKigaq!sT;Z!&0F2=k7F0PIU;F$leJLaw2UI6FL^w}OG&!;+b%ya1c z1n+6-inU<0VM-Y_s5iTElq)ThyF?StVcebpGI znw#+zLx2@ah{$_2jn+@}(zJZ{+}_N9BM;z)0yr|gF-4=Iyu@hI*Lk=-A8f#bAzc9f z`Kd6K--x@t04swJVC3JK1cHY-Hq+=|PN-VO;?^_C#;coU6TDP7Bt`;{JTG;!+jj(` zw5cLQ-(Cz-Tlb`A^w7|R56Ce;Wmr0)$KWOUZ6ai0PhzPeHwdl0H(etP zUV`va_i0s-4#DkNM8lUlqI7>YQLf)(lz9Q3Uw`)nc(z3{m5ZE77Ul$V%m)E}3&8L0 z-XaU|eB~Is08eORPk;=<>!1w)Kf}FOVS2l&9~A+@R#koFJ$Czd%Y(ENTV&A~U(IPI z;UY+gf+&6ioZ=roly<0Yst8ck>(M=S?B-ys3mLdM&)ex!hbt+ol|T6CTS+Sc0jv(& z7ijdvFwBq;0a{%3GGwkDKTeG`b+lyj0jjS1OMkYnepCdoosNY`*zmBIo*981BU%%U z@~$z0V`OVtIbEx5pa|Tct|Lg#ZQf5OYMUMRD>Wdxm5SAqV2}3!ceE-M2 z@O~lQ0OiKQp}o9I;?uxCgYVV?FH|?Riri*U$Zi_`V2eiA>l zdSm6;SEm6#T+SpcE8Ro_f2AwxzI z44hfe^WE3!h@W3RDyA_H440cpmYkv*)6m1XazTqw%=E5Xv7^@^^T7Q2wxr+Z2kVYr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/swingmusic_mobile/macos/Runner/Configs/AppInfo.xcconfig b/swingmusic_mobile/macos/Runner/Configs/AppInfo.xcconfig deleted file mode 100644 index 4a0512d1..00000000 --- a/swingmusic_mobile/macos/Runner/Configs/AppInfo.xcconfig +++ /dev/null @@ -1,14 +0,0 @@ -// Application-level settings for the Runner target. -// -// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the -// future. If not, the values below would default to using the project name when this becomes a -// 'flutter create' template. - -// The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = swingmusic_mobile - -// The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.dvorinka.swingmusic.swingmusicMobile - -// The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2026 com.dvorinka.swingmusic. All rights reserved. diff --git a/swingmusic_mobile/macos/Runner/Configs/Debug.xcconfig b/swingmusic_mobile/macos/Runner/Configs/Debug.xcconfig deleted file mode 100644 index 36b0fd94..00000000 --- a/swingmusic_mobile/macos/Runner/Configs/Debug.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../Flutter/Flutter-Debug.xcconfig" -#include "Warnings.xcconfig" diff --git a/swingmusic_mobile/macos/Runner/Configs/Release.xcconfig b/swingmusic_mobile/macos/Runner/Configs/Release.xcconfig deleted file mode 100644 index dff4f495..00000000 --- a/swingmusic_mobile/macos/Runner/Configs/Release.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../Flutter/Flutter-Release.xcconfig" -#include "Warnings.xcconfig" diff --git a/swingmusic_mobile/macos/Runner/Configs/Warnings.xcconfig b/swingmusic_mobile/macos/Runner/Configs/Warnings.xcconfig deleted file mode 100644 index 42bcbf47..00000000 --- a/swingmusic_mobile/macos/Runner/Configs/Warnings.xcconfig +++ /dev/null @@ -1,13 +0,0 @@ -WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings -GCC_WARN_UNDECLARED_SELECTOR = YES -CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES -CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE -CLANG_WARN__DUPLICATE_METHOD_MATCH = YES -CLANG_WARN_PRAGMA_PACK = YES -CLANG_WARN_STRICT_PROTOTYPES = YES -CLANG_WARN_COMMA = YES -GCC_WARN_STRICT_SELECTOR_MATCH = YES -CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES -CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES -GCC_WARN_SHADOW = YES -CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/swingmusic_mobile/macos/Runner/DebugProfile.entitlements b/swingmusic_mobile/macos/Runner/DebugProfile.entitlements deleted file mode 100644 index dddb8a30..00000000 --- a/swingmusic_mobile/macos/Runner/DebugProfile.entitlements +++ /dev/null @@ -1,12 +0,0 @@ - - - - - com.apple.security.app-sandbox - - com.apple.security.cs.allow-jit - - com.apple.security.network.server - - - diff --git a/swingmusic_mobile/macos/Runner/Info.plist b/swingmusic_mobile/macos/Runner/Info.plist deleted file mode 100644 index 4789daa6..00000000 --- a/swingmusic_mobile/macos/Runner/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIconFile - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSMinimumSystemVersion - $(MACOSX_DEPLOYMENT_TARGET) - NSHumanReadableCopyright - $(PRODUCT_COPYRIGHT) - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/swingmusic_mobile/macos/Runner/MainFlutterWindow.swift b/swingmusic_mobile/macos/Runner/MainFlutterWindow.swift deleted file mode 100644 index 3cc05eb2..00000000 --- a/swingmusic_mobile/macos/Runner/MainFlutterWindow.swift +++ /dev/null @@ -1,15 +0,0 @@ -import Cocoa -import FlutterMacOS - -class MainFlutterWindow: NSWindow { - override func awakeFromNib() { - let flutterViewController = FlutterViewController() - let windowFrame = self.frame - self.contentViewController = flutterViewController - self.setFrame(windowFrame, display: true) - - RegisterGeneratedPlugins(registry: flutterViewController) - - super.awakeFromNib() - } -} diff --git a/swingmusic_mobile/macos/Runner/Release.entitlements b/swingmusic_mobile/macos/Runner/Release.entitlements deleted file mode 100644 index 852fa1a4..00000000 --- a/swingmusic_mobile/macos/Runner/Release.entitlements +++ /dev/null @@ -1,8 +0,0 @@ - - - - - com.apple.security.app-sandbox - - - diff --git a/swingmusic_mobile/macos/RunnerTests/RunnerTests.swift b/swingmusic_mobile/macos/RunnerTests/RunnerTests.swift deleted file mode 100644 index 61f3bd1f..00000000 --- a/swingmusic_mobile/macos/RunnerTests/RunnerTests.swift +++ /dev/null @@ -1,12 +0,0 @@ -import Cocoa -import FlutterMacOS -import XCTest - -class RunnerTests: XCTestCase { - - func testExample() { - // If you add code to the Runner application, consider adding tests here. - // See https://developer.apple.com/documentation/xctest for more information about using XCTest. - } - -} diff --git a/swingmusic_mobile/pubspec.lock b/swingmusic_mobile/pubspec.lock deleted file mode 100644 index 880668d6..00000000 --- a/swingmusic_mobile/pubspec.lock +++ /dev/null @@ -1,999 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - _fe_analyzer_shared: - dependency: transitive - description: - name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" - url: "https://pub.dev" - source: hosted - version: "67.0.0" - analyzer: - dependency: transitive - description: - name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" - url: "https://pub.dev" - source: hosted - version: "6.4.1" - archive: - dependency: transitive - description: - name: archive - sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d - url: "https://pub.dev" - source: hosted - version: "3.6.1" - args: - dependency: transitive - description: - name: args - sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 - url: "https://pub.dev" - source: hosted - version: "2.7.0" - async: - dependency: transitive - description: - name: async - sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" - url: "https://pub.dev" - source: hosted - version: "2.13.0" - audio_session: - dependency: "direct main" - description: - name: audio_session - sha256: "2b7fff16a552486d078bfc09a8cde19f426dc6d6329262b684182597bec5b1ac" - url: "https://pub.dev" - source: hosted - version: "0.1.25" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" - url: "https://pub.dev" - source: hosted - version: "2.1.2" - build: - dependency: transitive - description: - name: build - sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" - url: "https://pub.dev" - source: hosted - version: "2.4.1" - build_config: - dependency: transitive - description: - name: build_config - sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" - url: "https://pub.dev" - source: hosted - version: "1.1.2" - build_daemon: - dependency: transitive - description: - name: build_daemon - sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957 - url: "https://pub.dev" - source: hosted - version: "4.1.1" - build_resolvers: - dependency: transitive - description: - name: build_resolvers - sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" - url: "https://pub.dev" - source: hosted - version: "2.4.2" - build_runner: - dependency: "direct dev" - description: - name: build_runner - sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" - url: "https://pub.dev" - source: hosted - version: "2.4.13" - build_runner_core: - dependency: transitive - description: - name: build_runner_core - sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 - url: "https://pub.dev" - source: hosted - version: "7.3.2" - built_collection: - dependency: transitive - description: - name: built_collection - sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" - url: "https://pub.dev" - source: hosted - version: "5.1.1" - built_value: - dependency: transitive - description: - name: built_value - sha256: "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9" - url: "https://pub.dev" - source: hosted - version: "8.12.4" - characters: - dependency: transitive - description: - name: characters - sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 - url: "https://pub.dev" - source: hosted - version: "1.4.0" - checked_yaml: - dependency: transitive - description: - name: checked_yaml - sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f" - url: "https://pub.dev" - source: hosted - version: "2.0.4" - clock: - dependency: transitive - description: - name: clock - sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b - url: "https://pub.dev" - source: hosted - version: "1.1.2" - code_assets: - dependency: transitive - description: - name: code_assets - sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - code_builder: - dependency: transitive - description: - name: code_builder - sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d" - url: "https://pub.dev" - source: hosted - version: "4.11.1" - collection: - dependency: transitive - description: - name: collection - sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" - url: "https://pub.dev" - source: hosted - version: "1.19.1" - convert: - dependency: transitive - description: - name: convert - sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 - url: "https://pub.dev" - source: hosted - version: "3.1.2" - crypto: - dependency: transitive - description: - name: crypto - sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf - url: "https://pub.dev" - source: hosted - version: "3.0.7" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 - url: "https://pub.dev" - source: hosted - version: "1.0.8" - dart_style: - dependency: transitive - description: - name: dart_style - sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" - url: "https://pub.dev" - source: hosted - version: "2.3.6" - dio: - dependency: "direct main" - description: - name: dio - sha256: aff32c08f92787a557dd5c0145ac91536481831a01b4648136373cddb0e64f8c - url: "https://pub.dev" - source: hosted - version: "5.9.2" - dio_web_adapter: - dependency: transitive - description: - name: dio_web_adapter - sha256: "2f9e64323a7c3c7ef69567d5c800424a11f8337b8b228bad02524c9fb3c1f340" - url: "https://pub.dev" - source: hosted - version: "2.1.2" - equatable: - dependency: "direct main" - description: - name: equatable - sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b" - url: "https://pub.dev" - source: hosted - version: "2.0.8" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" - url: "https://pub.dev" - source: hosted - version: "1.3.3" - ffi: - dependency: transitive - description: - name: ffi - sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45" - url: "https://pub.dev" - source: hosted - version: "2.2.0" - file: - dependency: transitive - description: - name: file - sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 - url: "https://pub.dev" - source: hosted - version: "7.0.1" - fixnum: - dependency: transitive - description: - name: fixnum - sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be - url: "https://pub.dev" - source: hosted - version: "1.1.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_audio_waveforms: - dependency: "direct main" - description: - name: flutter_audio_waveforms - sha256: "425dda9ee5ef9bb2ff2a2000b19ec595593b3baba6a1274da8d1d729846a144b" - url: "https://pub.dev" - source: hosted - version: "1.2.1+8" - flutter_lints: - dependency: "direct dev" - description: - name: flutter_lints - sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1" - url: "https://pub.dev" - source: hosted - version: "6.0.0" - flutter_localizations: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_media_metadata: - dependency: "direct main" - description: - name: flutter_media_metadata - sha256: "69cfc76ffd6cd5d546dcc4880584b3844c5e879e435aa54f57f1096c15bd04db" - url: "https://pub.dev" - source: hosted - version: "1.0.0+1" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - flutter_web_plugins: - dependency: transitive - description: flutter - source: sdk - version: "0.0.0" - frontend_server_client: - dependency: transitive - description: - name: frontend_server_client - sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 - url: "https://pub.dev" - source: hosted - version: "4.0.0" - glob: - dependency: transitive - description: - name: glob - sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de - url: "https://pub.dev" - source: hosted - version: "2.1.3" - go_router: - dependency: "direct main" - description: - name: go_router - sha256: c5fa45fa502ee880839e3b2152d987c44abae26d064a2376d4aad434cf0f7b15 - url: "https://pub.dev" - source: hosted - version: "12.1.3" - graphs: - dependency: transitive - description: - name: graphs - sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" - url: "https://pub.dev" - source: hosted - version: "2.3.2" - hive: - dependency: transitive - description: - name: hive - sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941" - url: "https://pub.dev" - source: hosted - version: "2.2.3" - hive_flutter: - dependency: "direct main" - description: - name: hive_flutter - sha256: dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc - url: "https://pub.dev" - source: hosted - version: "1.1.0" - hive_generator: - dependency: "direct dev" - description: - name: hive_generator - sha256: "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4" - url: "https://pub.dev" - source: hosted - version: "2.0.1" - hooks: - dependency: transitive - description: - name: hooks - sha256: e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388 - url: "https://pub.dev" - source: hosted - version: "1.0.2" - http_multi_server: - dependency: transitive - description: - name: http_multi_server - sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 - url: "https://pub.dev" - source: hosted - version: "3.2.2" - http_parser: - dependency: transitive - description: - name: http_parser - sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" - url: "https://pub.dev" - source: hosted - version: "4.1.2" - intl: - dependency: "direct main" - description: - name: intl - sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" - url: "https://pub.dev" - source: hosted - version: "0.20.2" - io: - dependency: transitive - description: - name: io - sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b - url: "https://pub.dev" - source: hosted - version: "1.0.5" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" - json_annotation: - dependency: "direct main" - description: - name: json_annotation - sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" - url: "https://pub.dev" - source: hosted - version: "4.9.0" - json_serializable: - dependency: "direct dev" - description: - name: json_serializable - sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b - url: "https://pub.dev" - source: hosted - version: "6.8.0" - just_audio: - dependency: "direct main" - description: - name: just_audio - sha256: f978d5b4ccea08f267dae0232ec5405c1b05d3f3cd63f82097ea46c015d5c09e - url: "https://pub.dev" - source: hosted - version: "0.9.46" - just_audio_platform_interface: - dependency: transitive - description: - name: just_audio_platform_interface - sha256: "2532c8d6702528824445921c5ff10548b518b13f808c2e34c2fd54793b999a6a" - url: "https://pub.dev" - source: hosted - version: "4.6.0" - just_audio_web: - dependency: transitive - description: - name: just_audio_web - sha256: "6ba8a2a7e87d57d32f0f7b42856ade3d6a9fbe0f1a11fabae0a4f00bb73f0663" - url: "https://pub.dev" - source: hosted - version: "0.4.16" - leak_tracker: - dependency: transitive - description: - name: leak_tracker - sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" - url: "https://pub.dev" - source: hosted - version: "11.0.2" - leak_tracker_flutter_testing: - dependency: transitive - description: - name: leak_tracker_flutter_testing - sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" - url: "https://pub.dev" - source: hosted - version: "3.0.10" - leak_tracker_testing: - dependency: transitive - description: - name: leak_tracker_testing - sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" - url: "https://pub.dev" - source: hosted - version: "3.0.2" - lints: - dependency: transitive - description: - name: lints - sha256: "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df" - url: "https://pub.dev" - source: hosted - version: "6.1.0" - logging: - dependency: transitive - description: - name: logging - sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 - url: "https://pub.dev" - source: hosted - version: "1.3.0" - lottie: - dependency: "direct main" - description: - name: lottie - sha256: a93542cc2d60a7057255405f62252533f8e8956e7e06754955669fd32fb4b216 - url: "https://pub.dev" - source: hosted - version: "2.7.0" - matcher: - dependency: transitive - description: - name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 - url: "https://pub.dev" - source: hosted - version: "0.12.17" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec - url: "https://pub.dev" - source: hosted - version: "0.11.1" - meta: - dependency: transitive - description: - name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" - url: "https://pub.dev" - source: hosted - version: "1.17.0" - mime: - dependency: transitive - description: - name: mime - sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" - url: "https://pub.dev" - source: hosted - version: "2.0.0" - native_toolchain_c: - dependency: transitive - description: - name: native_toolchain_c - sha256: "6ba77bb18063eebe9de401f5e6437e95e1438af0a87a3a39084fbd37c90df572" - url: "https://pub.dev" - source: hosted - version: "0.17.6" - nested: - dependency: transitive - description: - name: nested - sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - objective_c: - dependency: transitive - description: - name: objective_c - sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52" - url: "https://pub.dev" - source: hosted - version: "9.3.0" - package_config: - dependency: transitive - description: - name: package_config - sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc - url: "https://pub.dev" - source: hosted - version: "2.2.0" - path: - dependency: transitive - description: - name: path - sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" - url: "https://pub.dev" - source: hosted - version: "1.9.1" - path_provider: - dependency: "direct main" - description: - name: path_provider - sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" - url: "https://pub.dev" - source: hosted - version: "2.1.5" - path_provider_android: - dependency: transitive - description: - name: path_provider_android - sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e - url: "https://pub.dev" - source: hosted - version: "2.2.22" - path_provider_foundation: - dependency: transitive - description: - name: path_provider_foundation - sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699" - url: "https://pub.dev" - source: hosted - version: "2.6.0" - path_provider_linux: - dependency: transitive - description: - name: path_provider_linux - sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 - url: "https://pub.dev" - source: hosted - version: "2.2.1" - path_provider_platform_interface: - dependency: transitive - description: - name: path_provider_platform_interface - sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" - url: "https://pub.dev" - source: hosted - version: "2.1.2" - path_provider_windows: - dependency: transitive - description: - name: path_provider_windows - sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 - url: "https://pub.dev" - source: hosted - version: "2.3.0" - permission_handler: - dependency: "direct main" - description: - name: permission_handler - sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849" - url: "https://pub.dev" - source: hosted - version: "11.4.0" - permission_handler_android: - dependency: transitive - description: - name: permission_handler_android - sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc - url: "https://pub.dev" - source: hosted - version: "12.1.0" - permission_handler_apple: - dependency: transitive - description: - name: permission_handler_apple - sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023 - url: "https://pub.dev" - source: hosted - version: "9.4.7" - permission_handler_html: - dependency: transitive - description: - name: permission_handler_html - sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24" - url: "https://pub.dev" - source: hosted - version: "0.1.3+5" - permission_handler_platform_interface: - dependency: transitive - description: - name: permission_handler_platform_interface - sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878 - url: "https://pub.dev" - source: hosted - version: "4.3.0" - permission_handler_windows: - dependency: transitive - description: - name: permission_handler_windows - sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" - url: "https://pub.dev" - source: hosted - version: "0.2.1" - platform: - dependency: transitive - description: - name: platform - sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" - url: "https://pub.dev" - source: hosted - version: "3.1.6" - plugin_platform_interface: - dependency: transitive - description: - name: plugin_platform_interface - sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" - url: "https://pub.dev" - source: hosted - version: "2.1.8" - pool: - dependency: transitive - description: - name: pool - sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d" - url: "https://pub.dev" - source: hosted - version: "1.5.2" - provider: - dependency: "direct main" - description: - name: provider - sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272" - url: "https://pub.dev" - source: hosted - version: "6.1.5+1" - pub_semver: - dependency: transitive - description: - name: pub_semver - sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" - url: "https://pub.dev" - source: hosted - version: "2.2.0" - pubspec_parse: - dependency: transitive - description: - name: pubspec_parse - sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" - url: "https://pub.dev" - source: hosted - version: "1.5.0" - retrofit: - dependency: "direct main" - description: - name: retrofit - sha256: "0f629ed26b2c48c66fe54bd548313c6fdf7955be18bff37e08a46dd3f97f8eaf" - url: "https://pub.dev" - source: hosted - version: "4.9.2" - retrofit_generator: - dependency: "direct dev" - description: - name: retrofit_generator - sha256: "9499eb46b3657a62192ddbc208ff7e6c6b768b19e83c1ee6f6b119c864b99690" - url: "https://pub.dev" - source: hosted - version: "7.0.8" - rxdart: - dependency: transitive - description: - name: rxdart - sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" - url: "https://pub.dev" - source: hosted - version: "0.28.0" - shared_preferences: - dependency: "direct main" - description: - name: shared_preferences - sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64" - url: "https://pub.dev" - source: hosted - version: "2.5.4" - shared_preferences_android: - dependency: transitive - description: - name: shared_preferences_android - sha256: "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41" - url: "https://pub.dev" - source: hosted - version: "2.4.21" - shared_preferences_foundation: - dependency: transitive - description: - name: shared_preferences_foundation - sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f" - url: "https://pub.dev" - source: hosted - version: "2.5.6" - shared_preferences_linux: - dependency: transitive - description: - name: shared_preferences_linux - sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" - url: "https://pub.dev" - source: hosted - version: "2.4.1" - shared_preferences_platform_interface: - dependency: transitive - description: - name: shared_preferences_platform_interface - sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" - url: "https://pub.dev" - source: hosted - version: "2.4.1" - shared_preferences_web: - dependency: transitive - description: - name: shared_preferences_web - sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 - url: "https://pub.dev" - source: hosted - version: "2.4.3" - shared_preferences_windows: - dependency: transitive - description: - name: shared_preferences_windows - sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" - url: "https://pub.dev" - source: hosted - version: "2.4.1" - shelf: - dependency: transitive - description: - name: shelf - sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 - url: "https://pub.dev" - source: hosted - version: "1.4.2" - shelf_web_socket: - dependency: transitive - description: - name: shelf_web_socket - sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 - url: "https://pub.dev" - source: hosted - version: "2.0.1" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.0" - source_gen: - dependency: transitive - description: - name: source_gen - sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" - url: "https://pub.dev" - source: hosted - version: "1.5.0" - source_helper: - dependency: transitive - description: - name: source_helper - sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c" - url: "https://pub.dev" - source: hosted - version: "1.3.5" - source_span: - dependency: transitive - description: - name: source_span - sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab" - url: "https://pub.dev" - source: hosted - version: "1.10.2" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" - url: "https://pub.dev" - source: hosted - version: "1.12.1" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" - url: "https://pub.dev" - source: hosted - version: "2.1.4" - stream_transform: - dependency: transitive - description: - name: stream_transform - sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" - url: "https://pub.dev" - source: hosted - version: "1.4.1" - synchronized: - dependency: transitive - description: - name: synchronized - sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0 - url: "https://pub.dev" - source: hosted - version: "3.4.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" - url: "https://pub.dev" - source: hosted - version: "1.2.2" - test_api: - dependency: transitive - description: - name: test_api - sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 - url: "https://pub.dev" - source: hosted - version: "0.7.7" - timing: - dependency: transitive - description: - name: timing - sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" - url: "https://pub.dev" - source: hosted - version: "1.0.2" - tuple: - dependency: transitive - description: - name: tuple - sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151 - url: "https://pub.dev" - source: hosted - version: "2.0.2" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 - url: "https://pub.dev" - source: hosted - version: "1.4.0" - uuid: - dependency: "direct main" - description: - name: uuid - sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489" - url: "https://pub.dev" - source: hosted - version: "4.5.3" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b - url: "https://pub.dev" - source: hosted - version: "2.2.0" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" - url: "https://pub.dev" - source: hosted - version: "15.0.2" - watcher: - dependency: transitive - description: - name: watcher - sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635" - url: "https://pub.dev" - source: hosted - version: "1.2.1" - web: - dependency: transitive - description: - name: web - sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" - url: "https://pub.dev" - source: hosted - version: "1.1.1" - web_socket: - dependency: transitive - description: - name: web_socket - sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" - url: "https://pub.dev" - source: hosted - version: "1.0.1" - web_socket_channel: - dependency: transitive - description: - name: web_socket_channel - sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 - url: "https://pub.dev" - source: hosted - version: "3.0.3" - workmanager: - dependency: "direct main" - description: - name: workmanager - sha256: ed13530cccd28c5c9959ad42d657cd0666274ca74c56dea0ca183ddd527d3a00 - url: "https://pub.dev" - source: hosted - version: "0.5.2" - xdg_directories: - dependency: transitive - description: - name: xdg_directories - sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" - url: "https://pub.dev" - source: hosted - version: "1.1.0" - yaml: - dependency: transitive - description: - name: yaml - sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce - url: "https://pub.dev" - source: hosted - version: "3.1.3" -sdks: - dart: ">=3.10.4 <4.0.0" - flutter: ">=3.38.4" diff --git a/swingmusic_mobile/pubspec.yaml b/swingmusic_mobile/pubspec.yaml deleted file mode 100644 index 59bdd659..00000000 --- a/swingmusic_mobile/pubspec.yaml +++ /dev/null @@ -1,69 +0,0 @@ -name: swingmusic_mobile -description: "SwingMusic Mobile - Flutter cross-platform music player" - -publish_to: 'none' - -version: 1.0.0+1 - -environment: - sdk: ^3.10.4 - -dependencies: - flutter: - sdk: flutter - flutter_localizations: - sdk: flutter - provider: ^6.1.1 - go_router: ^12.1.3 - just_audio: ^0.9.46 - audio_session: ^0.1.25 - permission_handler: ^11.4.0 - path_provider: ^2.1.1 - shared_preferences: ^2.2.2 - dio: ^5.3.2 - retrofit: ^4.0.1 - json_annotation: ^4.8.1 - lottie: ^2.7.0 - hive_flutter: ^1.1.0 - - # Media & Metadata - flutter_media_metadata: ^1.0.0 - - # Visualizations - flutter_audio_waveforms: ^1.2.0 - - # Background Processing - workmanager: ^0.5.2 - - # UI Components - cupertino_icons: ^1.0.8 - - # Additional Utilities - equatable: ^2.0.5 - uuid: ^4.2.1 - intl: ^0.20.2 - -dev_dependencies: - flutter_test: - sdk: flutter - - # Linting - flutter_lints: ^6.0.0 - - # Code Generation - retrofit_generator: ^7.0.8 - json_serializable: ^6.7.1 - hive_generator: ^2.0.1 - build_runner: ^2.4.7 - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter packages. -flutter: - - uses-material-design: true - - assets: - - assets/images/ - - assets/audio/ diff --git a/swingmusic_mobile/test/widget_test.dart b/swingmusic_mobile/test/widget_test.dart deleted file mode 100644 index 71792436..00000000 --- a/swingmusic_mobile/test/widget_test.dart +++ /dev/null @@ -1,21 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility in the flutter_test package. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:swingmusic_mobile/main.dart'; - -void main() { - testWidgets('SwingMusic App smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(const SwingMusicApp()); - - // Verify that the app loads - expect(find.byType(MaterialApp), findsOneWidget); - }); -} diff --git a/swingmusic_mobile/windows/.gitignore b/swingmusic_mobile/windows/.gitignore deleted file mode 100644 index d492d0d9..00000000 --- a/swingmusic_mobile/windows/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -flutter/ephemeral/ - -# Visual Studio user-specific files. -*.suo -*.user -*.userosscache -*.sln.docstates - -# Visual Studio build-related files. -x64/ -x86/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ diff --git a/swingmusic_mobile/windows/CMakeLists.txt b/swingmusic_mobile/windows/CMakeLists.txt deleted file mode 100644 index a72f5c29..00000000 --- a/swingmusic_mobile/windows/CMakeLists.txt +++ /dev/null @@ -1,108 +0,0 @@ -# Project-level configuration. -cmake_minimum_required(VERSION 3.14) -project(swingmusic_mobile LANGUAGES CXX) - -# The name of the executable created for the application. Change this to change -# the on-disk name of your application. -set(BINARY_NAME "swingmusic_mobile") - -# Explicitly opt in to modern CMake behaviors to avoid warnings with recent -# versions of CMake. -cmake_policy(VERSION 3.14...3.25) - -# Define build configuration option. -get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) -if(IS_MULTICONFIG) - set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" - CACHE STRING "" FORCE) -else() - if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_BUILD_TYPE "Debug" CACHE - STRING "Flutter build mode" FORCE) - set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS - "Debug" "Profile" "Release") - endif() -endif() -# Define settings for the Profile build mode. -set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") -set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") -set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") -set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") - -# Use Unicode for all projects. -add_definitions(-DUNICODE -D_UNICODE) - -# Compilation settings that should be applied to most targets. -# -# Be cautious about adding new options here, as plugins use this function by -# default. In most cases, you should add new options to specific targets instead -# of modifying this function. -function(APPLY_STANDARD_SETTINGS TARGET) - target_compile_features(${TARGET} PUBLIC cxx_std_17) - target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") - target_compile_options(${TARGET} PRIVATE /EHsc) - target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") - target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") -endfunction() - -# Flutter library and tool build rules. -set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") -add_subdirectory(${FLUTTER_MANAGED_DIR}) - -# Application build; see runner/CMakeLists.txt. -add_subdirectory("runner") - - -# Generated plugin build rules, which manage building the plugins and adding -# them to the application. -include(flutter/generated_plugins.cmake) - - -# === Installation === -# Support files are copied into place next to the executable, so that it can -# run in place. This is done instead of making a separate bundle (as on Linux) -# so that building and running from within Visual Studio will work. -set(BUILD_BUNDLE_DIR "$") -# Make the "install" step default, as it's required to run. -set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) -endif() - -set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") -set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") - -install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -if(PLUGIN_BUNDLED_LIBRARIES) - install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) -endif() - -# Copy the native assets provided by the build.dart from all packages. -set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") -install(DIRECTORY "${NATIVE_ASSETS_DIR}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -# Fully re-copy the assets directory on each build to avoid having stale files -# from a previous install. -set(FLUTTER_ASSET_DIR_NAME "flutter_assets") -install(CODE " - file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") - " COMPONENT Runtime) -install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" - DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) - -# Install the AOT library on non-Debug builds only. -install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" - CONFIGURATIONS Profile;Release - COMPONENT Runtime) diff --git a/swingmusic_mobile/windows/flutter/CMakeLists.txt b/swingmusic_mobile/windows/flutter/CMakeLists.txt deleted file mode 100644 index 903f4899..00000000 --- a/swingmusic_mobile/windows/flutter/CMakeLists.txt +++ /dev/null @@ -1,109 +0,0 @@ -# This file controls Flutter-level build steps. It should not be edited. -cmake_minimum_required(VERSION 3.14) - -set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") - -# Configuration provided via flutter tool. -include(${EPHEMERAL_DIR}/generated_config.cmake) - -# TODO: Move the rest of this into files in ephemeral. See -# https://github.com/flutter/flutter/issues/57146. -set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") - -# Set fallback configurations for older versions of the flutter tool. -if (NOT DEFINED FLUTTER_TARGET_PLATFORM) - set(FLUTTER_TARGET_PLATFORM "windows-x64") -endif() - -# === Flutter Library === -set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") - -# Published to parent scope for install step. -set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) -set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) -set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) -set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) - -list(APPEND FLUTTER_LIBRARY_HEADERS - "flutter_export.h" - "flutter_windows.h" - "flutter_messenger.h" - "flutter_plugin_registrar.h" - "flutter_texture_registrar.h" -) -list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") -add_library(flutter INTERFACE) -target_include_directories(flutter INTERFACE - "${EPHEMERAL_DIR}" -) -target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") -add_dependencies(flutter flutter_assemble) - -# === Wrapper === -list(APPEND CPP_WRAPPER_SOURCES_CORE - "core_implementations.cc" - "standard_codec.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") -list(APPEND CPP_WRAPPER_SOURCES_PLUGIN - "plugin_registrar.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") -list(APPEND CPP_WRAPPER_SOURCES_APP - "flutter_engine.cc" - "flutter_view_controller.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") - -# Wrapper sources needed for a plugin. -add_library(flutter_wrapper_plugin STATIC - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_PLUGIN} -) -apply_standard_settings(flutter_wrapper_plugin) -set_target_properties(flutter_wrapper_plugin PROPERTIES - POSITION_INDEPENDENT_CODE ON) -set_target_properties(flutter_wrapper_plugin PROPERTIES - CXX_VISIBILITY_PRESET hidden) -target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) -target_include_directories(flutter_wrapper_plugin PUBLIC - "${WRAPPER_ROOT}/include" -) -add_dependencies(flutter_wrapper_plugin flutter_assemble) - -# Wrapper sources needed for the runner. -add_library(flutter_wrapper_app STATIC - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_APP} -) -apply_standard_settings(flutter_wrapper_app) -target_link_libraries(flutter_wrapper_app PUBLIC flutter) -target_include_directories(flutter_wrapper_app PUBLIC - "${WRAPPER_ROOT}/include" -) -add_dependencies(flutter_wrapper_app flutter_assemble) - -# === Flutter tool backend === -# _phony_ is a non-existent file to force this command to run every time, -# since currently there's no way to get a full input/output list from the -# flutter tool. -set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") -set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) -add_custom_command( - OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} - ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} - ${CPP_WRAPPER_SOURCES_APP} - ${PHONY_OUTPUT} - COMMAND ${CMAKE_COMMAND} -E env - ${FLUTTER_TOOL_ENVIRONMENT} - "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - ${FLUTTER_TARGET_PLATFORM} $ - VERBATIM -) -add_custom_target(flutter_assemble DEPENDS - "${FLUTTER_LIBRARY}" - ${FLUTTER_LIBRARY_HEADERS} - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_PLUGIN} - ${CPP_WRAPPER_SOURCES_APP} -) diff --git a/swingmusic_mobile/windows/runner/CMakeLists.txt b/swingmusic_mobile/windows/runner/CMakeLists.txt deleted file mode 100644 index 394917c0..00000000 --- a/swingmusic_mobile/windows/runner/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -cmake_minimum_required(VERSION 3.14) -project(runner LANGUAGES CXX) - -# Define the application target. To change its name, change BINARY_NAME in the -# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer -# work. -# -# Any new source files that you add to the application should be added here. -add_executable(${BINARY_NAME} WIN32 - "flutter_window.cpp" - "main.cpp" - "utils.cpp" - "win32_window.cpp" - "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" - "Runner.rc" - "runner.exe.manifest" -) - -# Apply the standard set of build settings. This can be removed for applications -# that need different build settings. -apply_standard_settings(${BINARY_NAME}) - -# Add preprocessor definitions for the build version. -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") - -# Disable Windows macros that collide with C++ standard library functions. -target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") - -# Add dependency libraries and include directories. Add any application-specific -# dependencies here. -target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) -target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") -target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") - -# Run the Flutter tool portions of the build. This must not be removed. -add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/swingmusic_mobile/windows/runner/Runner.rc b/swingmusic_mobile/windows/runner/Runner.rc deleted file mode 100644 index cdc00f58..00000000 --- a/swingmusic_mobile/windows/runner/Runner.rc +++ /dev/null @@ -1,121 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#pragma code_page(65001) -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_APP_ICON ICON "resources\\app_icon.ico" - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) -#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD -#else -#define VERSION_AS_NUMBER 1,0,0,0 -#endif - -#if defined(FLUTTER_VERSION) -#define VERSION_AS_STRING FLUTTER_VERSION -#else -#define VERSION_AS_STRING "1.0.0" -#endif - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VERSION_AS_NUMBER - PRODUCTVERSION VERSION_AS_NUMBER - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS__WINDOWS32 - FILETYPE VFT_APP - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "com.dvorinka.swingmusic" "\0" - VALUE "FileDescription", "swingmusic_mobile" "\0" - VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "swingmusic_mobile" "\0" - VALUE "LegalCopyright", "Copyright (C) 2026 com.dvorinka.swingmusic. All rights reserved." "\0" - VALUE "OriginalFilename", "swingmusic_mobile.exe" "\0" - VALUE "ProductName", "swingmusic_mobile" "\0" - VALUE "ProductVersion", VERSION_AS_STRING "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED diff --git a/swingmusic_mobile/windows/runner/flutter_window.cpp b/swingmusic_mobile/windows/runner/flutter_window.cpp deleted file mode 100644 index 955ee303..00000000 --- a/swingmusic_mobile/windows/runner/flutter_window.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include "flutter_window.h" - -#include - -#include "flutter/generated_plugin_registrant.h" - -FlutterWindow::FlutterWindow(const flutter::DartProject& project) - : project_(project) {} - -FlutterWindow::~FlutterWindow() {} - -bool FlutterWindow::OnCreate() { - if (!Win32Window::OnCreate()) { - return false; - } - - RECT frame = GetClientArea(); - - // The size here must match the window dimensions to avoid unnecessary surface - // creation / destruction in the startup path. - flutter_controller_ = std::make_unique( - frame.right - frame.left, frame.bottom - frame.top, project_); - // Ensure that basic setup of the controller was successful. - if (!flutter_controller_->engine() || !flutter_controller_->view()) { - return false; - } - RegisterPlugins(flutter_controller_->engine()); - SetChildContent(flutter_controller_->view()->GetNativeWindow()); - - flutter_controller_->engine()->SetNextFrameCallback([&]() { - this->Show(); - }); - - // Flutter can complete the first frame before the "show window" callback is - // registered. The following call ensures a frame is pending to ensure the - // window is shown. It is a no-op if the first frame hasn't completed yet. - flutter_controller_->ForceRedraw(); - - return true; -} - -void FlutterWindow::OnDestroy() { - if (flutter_controller_) { - flutter_controller_ = nullptr; - } - - Win32Window::OnDestroy(); -} - -LRESULT -FlutterWindow::MessageHandler(HWND hwnd, UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept { - // Give Flutter, including plugins, an opportunity to handle window messages. - if (flutter_controller_) { - std::optional result = - flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, - lparam); - if (result) { - return *result; - } - } - - switch (message) { - case WM_FONTCHANGE: - flutter_controller_->engine()->ReloadSystemFonts(); - break; - } - - return Win32Window::MessageHandler(hwnd, message, wparam, lparam); -} diff --git a/swingmusic_mobile/windows/runner/flutter_window.h b/swingmusic_mobile/windows/runner/flutter_window.h deleted file mode 100644 index 6da0652f..00000000 --- a/swingmusic_mobile/windows/runner/flutter_window.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef RUNNER_FLUTTER_WINDOW_H_ -#define RUNNER_FLUTTER_WINDOW_H_ - -#include -#include - -#include - -#include "win32_window.h" - -// A window that does nothing but host a Flutter view. -class FlutterWindow : public Win32Window { - public: - // Creates a new FlutterWindow hosting a Flutter view running |project|. - explicit FlutterWindow(const flutter::DartProject& project); - virtual ~FlutterWindow(); - - protected: - // Win32Window: - bool OnCreate() override; - void OnDestroy() override; - LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, - LPARAM const lparam) noexcept override; - - private: - // The project to run. - flutter::DartProject project_; - - // The Flutter instance hosted by this window. - std::unique_ptr flutter_controller_; -}; - -#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/swingmusic_mobile/windows/runner/main.cpp b/swingmusic_mobile/windows/runner/main.cpp deleted file mode 100644 index 3aded592..00000000 --- a/swingmusic_mobile/windows/runner/main.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include -#include -#include - -#include "flutter_window.h" -#include "utils.h" - -int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, - _In_ wchar_t *command_line, _In_ int show_command) { - // Attach to console when present (e.g., 'flutter run') or create a - // new console when running with a debugger. - if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { - CreateAndAttachConsole(); - } - - // Initialize COM, so that it is available for use in the library and/or - // plugins. - ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); - - flutter::DartProject project(L"data"); - - std::vector command_line_arguments = - GetCommandLineArguments(); - - project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); - - FlutterWindow window(project); - Win32Window::Point origin(10, 10); - Win32Window::Size size(1280, 720); - if (!window.Create(L"swingmusic_mobile", origin, size)) { - return EXIT_FAILURE; - } - window.SetQuitOnClose(true); - - ::MSG msg; - while (::GetMessage(&msg, nullptr, 0, 0)) { - ::TranslateMessage(&msg); - ::DispatchMessage(&msg); - } - - ::CoUninitialize(); - return EXIT_SUCCESS; -} diff --git a/swingmusic_mobile/windows/runner/resource.h b/swingmusic_mobile/windows/runner/resource.h deleted file mode 100644 index 66a65d1e..00000000 --- a/swingmusic_mobile/windows/runner/resource.h +++ /dev/null @@ -1,16 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Runner.rc -// -#define IDI_APP_ICON 101 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/swingmusic_mobile/windows/runner/resources/app_icon.ico b/swingmusic_mobile/windows/runner/resources/app_icon.ico deleted file mode 100644 index c04e20caf6370ebb9253ad831cc31de4a9c965f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33772 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 diff --git a/swingmusic_mobile/windows/runner/runner.exe.manifest b/swingmusic_mobile/windows/runner/runner.exe.manifest deleted file mode 100644 index 153653e8..00000000 --- a/swingmusic_mobile/windows/runner/runner.exe.manifest +++ /dev/null @@ -1,14 +0,0 @@ - - - - - PerMonitorV2 - - - - - - - - - diff --git a/swingmusic_mobile/windows/runner/utils.cpp b/swingmusic_mobile/windows/runner/utils.cpp deleted file mode 100644 index 3a0b4651..00000000 --- a/swingmusic_mobile/windows/runner/utils.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "utils.h" - -#include -#include -#include -#include - -#include - -void CreateAndAttachConsole() { - if (::AllocConsole()) { - FILE *unused; - if (freopen_s(&unused, "CONOUT$", "w", stdout)) { - _dup2(_fileno(stdout), 1); - } - if (freopen_s(&unused, "CONOUT$", "w", stderr)) { - _dup2(_fileno(stdout), 2); - } - std::ios::sync_with_stdio(); - FlutterDesktopResyncOutputStreams(); - } -} - -std::vector GetCommandLineArguments() { - // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. - int argc; - wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); - if (argv == nullptr) { - return std::vector(); - } - - std::vector command_line_arguments; - - // Skip the first argument as it's the binary name. - for (int i = 1; i < argc; i++) { - command_line_arguments.push_back(Utf8FromUtf16(argv[i])); - } - - ::LocalFree(argv); - - return command_line_arguments; -} - -std::string Utf8FromUtf16(const wchar_t* utf16_string) { - if (utf16_string == nullptr) { - return std::string(); - } - unsigned int target_length = ::WideCharToMultiByte( - CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - -1, nullptr, 0, nullptr, nullptr) - -1; // remove the trailing null character - int input_length = (int)wcslen(utf16_string); - std::string utf8_string; - if (target_length == 0 || target_length > utf8_string.max_size()) { - return utf8_string; - } - utf8_string.resize(target_length); - int converted_length = ::WideCharToMultiByte( - CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - input_length, utf8_string.data(), target_length, nullptr, nullptr); - if (converted_length == 0) { - return std::string(); - } - return utf8_string; -} diff --git a/swingmusic_mobile/windows/runner/utils.h b/swingmusic_mobile/windows/runner/utils.h deleted file mode 100644 index 3879d547..00000000 --- a/swingmusic_mobile/windows/runner/utils.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef RUNNER_UTILS_H_ -#define RUNNER_UTILS_H_ - -#include -#include - -// Creates a console for the process, and redirects stdout and stderr to -// it for both the runner and the Flutter library. -void CreateAndAttachConsole(); - -// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string -// encoded in UTF-8. Returns an empty std::string on failure. -std::string Utf8FromUtf16(const wchar_t* utf16_string); - -// Gets the command line arguments passed in as a std::vector, -// encoded in UTF-8. Returns an empty std::vector on failure. -std::vector GetCommandLineArguments(); - -#endif // RUNNER_UTILS_H_ diff --git a/swingmusic_mobile/windows/runner/win32_window.cpp b/swingmusic_mobile/windows/runner/win32_window.cpp deleted file mode 100644 index 60608d0f..00000000 --- a/swingmusic_mobile/windows/runner/win32_window.cpp +++ /dev/null @@ -1,288 +0,0 @@ -#include "win32_window.h" - -#include -#include - -#include "resource.h" - -namespace { - -/// Window attribute that enables dark mode window decorations. -/// -/// Redefined in case the developer's machine has a Windows SDK older than -/// version 10.0.22000.0. -/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute -#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE -#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 -#endif - -constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; - -/// Registry key for app theme preference. -/// -/// A value of 0 indicates apps should use dark mode. A non-zero or missing -/// value indicates apps should use light mode. -constexpr const wchar_t kGetPreferredBrightnessRegKey[] = - L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; -constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; - -// The number of Win32Window objects that currently exist. -static int g_active_window_count = 0; - -using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); - -// Scale helper to convert logical scaler values to physical using passed in -// scale factor -int Scale(int source, double scale_factor) { - return static_cast(source * scale_factor); -} - -// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. -// This API is only needed for PerMonitor V1 awareness mode. -void EnableFullDpiSupportIfAvailable(HWND hwnd) { - HMODULE user32_module = LoadLibraryA("User32.dll"); - if (!user32_module) { - return; - } - auto enable_non_client_dpi_scaling = - reinterpret_cast( - GetProcAddress(user32_module, "EnableNonClientDpiScaling")); - if (enable_non_client_dpi_scaling != nullptr) { - enable_non_client_dpi_scaling(hwnd); - } - FreeLibrary(user32_module); -} - -} // namespace - -// Manages the Win32Window's window class registration. -class WindowClassRegistrar { - public: - ~WindowClassRegistrar() = default; - - // Returns the singleton registrar instance. - static WindowClassRegistrar* GetInstance() { - if (!instance_) { - instance_ = new WindowClassRegistrar(); - } - return instance_; - } - - // Returns the name of the window class, registering the class if it hasn't - // previously been registered. - const wchar_t* GetWindowClass(); - - // Unregisters the window class. Should only be called if there are no - // instances of the window. - void UnregisterWindowClass(); - - private: - WindowClassRegistrar() = default; - - static WindowClassRegistrar* instance_; - - bool class_registered_ = false; -}; - -WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; - -const wchar_t* WindowClassRegistrar::GetWindowClass() { - if (!class_registered_) { - WNDCLASS window_class{}; - window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); - window_class.lpszClassName = kWindowClassName; - window_class.style = CS_HREDRAW | CS_VREDRAW; - window_class.cbClsExtra = 0; - window_class.cbWndExtra = 0; - window_class.hInstance = GetModuleHandle(nullptr); - window_class.hIcon = - LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); - window_class.hbrBackground = 0; - window_class.lpszMenuName = nullptr; - window_class.lpfnWndProc = Win32Window::WndProc; - RegisterClass(&window_class); - class_registered_ = true; - } - return kWindowClassName; -} - -void WindowClassRegistrar::UnregisterWindowClass() { - UnregisterClass(kWindowClassName, nullptr); - class_registered_ = false; -} - -Win32Window::Win32Window() { - ++g_active_window_count; -} - -Win32Window::~Win32Window() { - --g_active_window_count; - Destroy(); -} - -bool Win32Window::Create(const std::wstring& title, - const Point& origin, - const Size& size) { - Destroy(); - - const wchar_t* window_class = - WindowClassRegistrar::GetInstance()->GetWindowClass(); - - const POINT target_point = {static_cast(origin.x), - static_cast(origin.y)}; - HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); - UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); - double scale_factor = dpi / 96.0; - - HWND window = CreateWindow( - window_class, title.c_str(), WS_OVERLAPPEDWINDOW, - Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), - Scale(size.width, scale_factor), Scale(size.height, scale_factor), - nullptr, nullptr, GetModuleHandle(nullptr), this); - - if (!window) { - return false; - } - - UpdateTheme(window); - - return OnCreate(); -} - -bool Win32Window::Show() { - return ShowWindow(window_handle_, SW_SHOWNORMAL); -} - -// static -LRESULT CALLBACK Win32Window::WndProc(HWND const window, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept { - if (message == WM_NCCREATE) { - auto window_struct = reinterpret_cast(lparam); - SetWindowLongPtr(window, GWLP_USERDATA, - reinterpret_cast(window_struct->lpCreateParams)); - - auto that = static_cast(window_struct->lpCreateParams); - EnableFullDpiSupportIfAvailable(window); - that->window_handle_ = window; - } else if (Win32Window* that = GetThisFromHandle(window)) { - return that->MessageHandler(window, message, wparam, lparam); - } - - return DefWindowProc(window, message, wparam, lparam); -} - -LRESULT -Win32Window::MessageHandler(HWND hwnd, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept { - switch (message) { - case WM_DESTROY: - window_handle_ = nullptr; - Destroy(); - if (quit_on_close_) { - PostQuitMessage(0); - } - return 0; - - case WM_DPICHANGED: { - auto newRectSize = reinterpret_cast(lparam); - LONG newWidth = newRectSize->right - newRectSize->left; - LONG newHeight = newRectSize->bottom - newRectSize->top; - - SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, - newHeight, SWP_NOZORDER | SWP_NOACTIVATE); - - return 0; - } - case WM_SIZE: { - RECT rect = GetClientArea(); - if (child_content_ != nullptr) { - // Size and position the child window. - MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, - rect.bottom - rect.top, TRUE); - } - return 0; - } - - case WM_ACTIVATE: - if (child_content_ != nullptr) { - SetFocus(child_content_); - } - return 0; - - case WM_DWMCOLORIZATIONCOLORCHANGED: - UpdateTheme(hwnd); - return 0; - } - - return DefWindowProc(window_handle_, message, wparam, lparam); -} - -void Win32Window::Destroy() { - OnDestroy(); - - if (window_handle_) { - DestroyWindow(window_handle_); - window_handle_ = nullptr; - } - if (g_active_window_count == 0) { - WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); - } -} - -Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { - return reinterpret_cast( - GetWindowLongPtr(window, GWLP_USERDATA)); -} - -void Win32Window::SetChildContent(HWND content) { - child_content_ = content; - SetParent(content, window_handle_); - RECT frame = GetClientArea(); - - MoveWindow(content, frame.left, frame.top, frame.right - frame.left, - frame.bottom - frame.top, true); - - SetFocus(child_content_); -} - -RECT Win32Window::GetClientArea() { - RECT frame; - GetClientRect(window_handle_, &frame); - return frame; -} - -HWND Win32Window::GetHandle() { - return window_handle_; -} - -void Win32Window::SetQuitOnClose(bool quit_on_close) { - quit_on_close_ = quit_on_close; -} - -bool Win32Window::OnCreate() { - // No-op; provided for subclasses. - return true; -} - -void Win32Window::OnDestroy() { - // No-op; provided for subclasses. -} - -void Win32Window::UpdateTheme(HWND const window) { - DWORD light_mode; - DWORD light_mode_size = sizeof(light_mode); - LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, - kGetPreferredBrightnessRegValue, - RRF_RT_REG_DWORD, nullptr, &light_mode, - &light_mode_size); - - if (result == ERROR_SUCCESS) { - BOOL enable_dark_mode = light_mode == 0; - DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, - &enable_dark_mode, sizeof(enable_dark_mode)); - } -} diff --git a/swingmusic_mobile/windows/runner/win32_window.h b/swingmusic_mobile/windows/runner/win32_window.h deleted file mode 100644 index e901dde6..00000000 --- a/swingmusic_mobile/windows/runner/win32_window.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef RUNNER_WIN32_WINDOW_H_ -#define RUNNER_WIN32_WINDOW_H_ - -#include - -#include -#include -#include - -// A class abstraction for a high DPI-aware Win32 Window. Intended to be -// inherited from by classes that wish to specialize with custom -// rendering and input handling -class Win32Window { - public: - struct Point { - unsigned int x; - unsigned int y; - Point(unsigned int x, unsigned int y) : x(x), y(y) {} - }; - - struct Size { - unsigned int width; - unsigned int height; - Size(unsigned int width, unsigned int height) - : width(width), height(height) {} - }; - - Win32Window(); - virtual ~Win32Window(); - - // Creates a win32 window with |title| that is positioned and sized using - // |origin| and |size|. New windows are created on the default monitor. Window - // sizes are specified to the OS in physical pixels, hence to ensure a - // consistent size this function will scale the inputted width and height as - // as appropriate for the default monitor. The window is invisible until - // |Show| is called. Returns true if the window was created successfully. - bool Create(const std::wstring& title, const Point& origin, const Size& size); - - // Show the current window. Returns true if the window was successfully shown. - bool Show(); - - // Release OS resources associated with window. - void Destroy(); - - // Inserts |content| into the window tree. - void SetChildContent(HWND content); - - // Returns the backing Window handle to enable clients to set icon and other - // window properties. Returns nullptr if the window has been destroyed. - HWND GetHandle(); - - // If true, closing this window will quit the application. - void SetQuitOnClose(bool quit_on_close); - - // Return a RECT representing the bounds of the current client area. - RECT GetClientArea(); - - protected: - // Processes and route salient window messages for mouse handling, - // size change and DPI. Delegates handling of these to member overloads that - // inheriting classes can handle. - virtual LRESULT MessageHandler(HWND window, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept; - - // Called when CreateAndShow is called, allowing subclass window-related - // setup. Subclasses should return false if setup fails. - virtual bool OnCreate(); - - // Called when Destroy is called. - virtual void OnDestroy(); - - private: - friend class WindowClassRegistrar; - - // OS callback called by message pump. Handles the WM_NCCREATE message which - // is passed when the non-client area is being created and enables automatic - // non-client DPI scaling so that the non-client area automatically - // responds to changes in DPI. All other messages are handled by - // MessageHandler. - static LRESULT CALLBACK WndProc(HWND const window, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept; - - // Retrieves a class instance pointer for |window| - static Win32Window* GetThisFromHandle(HWND const window) noexcept; - - // Update the window frame's theme to match the system theme. - static void UpdateTheme(HWND const window); - - bool quit_on_close_ = false; - - // window handle for top level window. - HWND window_handle_ = nullptr; - - // window handle for hosted content. - HWND child_content_ = nullptr; -}; - -#endif // RUNNER_WIN32_WINDOW_H_