From 68b439028238398da5f17502b68a5ec1b2eff598 Mon Sep 17 00:00:00 2001 From: Emiliano Frascaro Date: Sat, 6 Jun 2026 17:38:56 +0200 Subject: [PATCH] Completa app Android nativa e rimuove il client Flutter. Il monorepo punta a native/android (login, wizard, diretta RTMP, tabellone WebSocket, pausa/telemetria) con encode 16:9 e orientamento via sensore; eliminati mobile/ e gli script Flutter obsoleti. Co-authored-by: Cursor --- README.md | 25 +- docs/infrastructure/SERVER_DEPLOYMENT.md | 2 +- mobile/.gitignore | 45 - mobile/.metadata | 45 - mobile/README.md | 17 - mobile/analysis_options.yaml | 28 - mobile/android/.gitignore | 14 - mobile/android/app/build.gradle.kts | 59 - mobile/android/app/proguard-rules.pro | 2 - .../android/app/src/debug/AndroidManifest.xml | 7 - .../android/app/src/main/AndroidManifest.xml | 66 - .../matchlivetv/match_live_tv/MainActivity.kt | 27 - .../match_live_tv/StreamPreviewHolder.kt | 9 - .../match_live_tv/StreamingEngine.kt | 1065 ----------------- .../match_live_tv/StreamingEngineHolder.kt | 22 - .../StreamingForegroundService.kt | 243 ---- .../match_live_tv/StreamingOpenGlView.kt | 30 - .../match_live_tv/StreamingPlugin.kt | 365 ------ .../StreamingPreviewPlatformView.kt | 95 -- .../res/drawable-v21/launch_background.xml | 12 - .../main/res/drawable/launch_background.xml | 12 - .../app/src/main/res/values-night/styles.xml | 18 - .../app/src/main/res/values/strings.xml | 13 - .../app/src/main/res/values/styles.xml | 18 - .../main/res/xml/network_security_config.xml | 9 - .../app/src/profile/AndroidManifest.xml | 7 - mobile/android/build.gradle.kts | 25 - mobile/android/gradle.properties | 6 - .../gradle/wrapper/gradle-wrapper.properties | 5 - mobile/android/settings.gradle.kts | 35 - mobile/ios/.gitignore | 34 - mobile/ios/Flutter/AppFrameworkInfo.plist | 24 - mobile/ios/Flutter/Debug.xcconfig | 1 - mobile/ios/Flutter/Release.xcconfig | 1 - mobile/ios/Runner.xcodeproj/project.pbxproj | 644 ---------- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 - .../xcshareddata/xcschemes/Runner.xcscheme | 119 -- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 - mobile/ios/Runner/AppDelegate.swift | 16 - .../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 - mobile/ios/Runner/Base.lproj/Main.storyboard | 26 - mobile/ios/Runner/Info.plist | 70 -- mobile/ios/Runner/Runner-Bridging-Header.h | 1 - mobile/ios/Runner/SceneDelegate.swift | 6 - mobile/ios/RunnerTests/RunnerTests.swift | 12 - mobile/lib/app/router.dart | 84 -- mobile/lib/app/theme.dart | 93 -- mobile/lib/core/auth_storage.dart | 64 - mobile/lib/core/config.dart | 24 - mobile/lib/core/deep_link_listener.dart | 77 -- mobile/lib/core/invite_storage.dart | 20 - mobile/lib/core/team_selection_storage.dart | 22 - .../lib/features/archive/archive_screen.dart | 216 ---- mobile/lib/features/auth/login_screen.dart | 267 ----- mobile/lib/features/auth/splash_screen.dart | 68 -- .../features/camera_mode/camera_screen.dart | 923 -------------- .../camera_mode/camera_screen_landscape.dart | 134 --- .../camera_mode/camera_screen_portrait.dart | 158 --- .../lib/features/matches/matches_screen.dart | 596 --------- .../lib/features/matches/new_match_sheet.dart | 105 -- .../features/matches/no_team_onboarding.dart | 56 - .../matches/resume_session_sheet.dart | 100 -- .../matches/schedule_match_sheet.dart | 176 --- .../features/matches/select_match_sheet.dart | 185 --- mobile/lib/features/matches/team_picker.dart | 125 -- .../lib/features/matches/team_providers.dart | 80 -- .../lib/features/setup_wizard/step_match.dart | 284 ----- .../setup_wizard/step_network_test.dart | 425 ------- .../setup_wizard/step_transmission.dart | 399 ------ .../features/setup_wizard/wizard_shell.dart | 164 --- .../features/shared/live_score_actions.dart | 94 -- mobile/lib/main.dart | 41 - mobile/lib/platform/streaming_channel.dart | 87 -- mobile/lib/platform/streaming_preview.dart | 103 -- mobile/lib/providers/auth_provider.dart | 141 --- .../lib/providers/match_rules_provider.dart | 12 - mobile/lib/providers/score_provider.dart | 77 -- mobile/lib/providers/score_sync_provider.dart | 77 -- mobile/lib/providers/session_provider.dart | 198 --- mobile/lib/shared/api_client.dart | 318 ----- mobile/lib/shared/api_error.dart | 32 - mobile/lib/shared/models/device_state.dart | 37 - mobile/lib/shared/models/invite_preview.dart | 28 - mobile/lib/shared/models/match.dart | 81 -- mobile/lib/shared/models/recording_item.dart | 76 -- mobile/lib/shared/models/score_state.dart | 100 -- mobile/lib/shared/models/stream_session.dart | 155 --- mobile/lib/shared/models/team.dart | 125 -- mobile/lib/shared/models/user.dart | 46 - mobile/lib/shared/premium_dialog.dart | 37 - mobile/lib/shared/regia_share.dart | 26 - .../shared/scoring/match_scoring_rules.dart | 70 -- mobile/lib/shared/watch_share.dart | 57 - mobile/lib/shared/websocket_service.dart | 205 ---- .../widgets/camera_compact_metrics.dart | 39 - .../lib/shared/widgets/connected_badge.dart | 42 - .../lib/shared/widgets/destructive_cta.dart | 65 - .../lib/shared/widgets/end_stream_dialog.dart | 31 - mobile/lib/shared/widgets/live_badge.dart | 66 - .../shared/widgets/live_score_controls.dart | 206 ---- .../shared/widgets/match_live_wordmark.dart | 74 -- mobile/lib/shared/widgets/metric_card.dart | 65 - mobile/lib/shared/widgets/primary_cta.dart | 66 - .../shared/widgets/score_outcome_dialogs.dart | 96 -- .../lib/shared/widgets/score_overlay_bar.dart | 133 -- mobile/lib/shared/widgets/screen_insets.dart | 84 -- mobile/linux/.gitignore | 1 - mobile/linux/CMakeLists.txt | 128 -- mobile/linux/flutter/CMakeLists.txt | 88 -- .../flutter/generated_plugin_registrant.cc | 19 - .../flutter/generated_plugin_registrant.h | 15 - mobile/linux/flutter/generated_plugins.cmake | 26 - mobile/linux/runner/CMakeLists.txt | 26 - mobile/linux/runner/main.cc | 6 - mobile/linux/runner/my_application.cc | 148 --- mobile/linux/runner/my_application.h | 21 - mobile/macos/.gitignore | 7 - mobile/macos/Flutter/Flutter-Debug.xcconfig | 1 - mobile/macos/Flutter/Flutter-Release.xcconfig | 1 - .../Flutter/GeneratedPluginRegistrant.swift | 28 - mobile/macos/Runner.xcodeproj/project.pbxproj | 729 ----------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/xcschemes/Runner.xcscheme | 117 -- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - mobile/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 mobile/macos/Runner/Base.lproj/MainMenu.xib | 343 ------ mobile/macos/Runner/Configs/AppInfo.xcconfig | 14 - mobile/macos/Runner/Configs/Debug.xcconfig | 2 - mobile/macos/Runner/Configs/Release.xcconfig | 2 - mobile/macos/Runner/Configs/Warnings.xcconfig | 13 - mobile/macos/Runner/DebugProfile.entitlements | 12 - mobile/macos/Runner/Info.plist | 32 - mobile/macos/Runner/MainFlutterWindow.swift | 15 - mobile/macos/Runner/Release.entitlements | 8 - mobile/macos/RunnerTests/RunnerTests.swift | 12 - mobile/pubspec.yaml | 36 - mobile/test/widget_test.dart | 23 - mobile/web/favicon.png | Bin 917 -> 0 bytes mobile/web/icons/Icon-192.png | Bin 5292 -> 0 bytes mobile/web/icons/Icon-512.png | Bin 8252 -> 0 bytes mobile/web/icons/Icon-maskable-192.png | Bin 5594 -> 0 bytes mobile/web/icons/Icon-maskable-512.png | Bin 20998 -> 0 bytes mobile/web/index.html | 46 - mobile/web/manifest.json | 35 - mobile/windows/.gitignore | 17 - mobile/windows/CMakeLists.txt | 108 -- mobile/windows/flutter/CMakeLists.txt | 109 -- .../flutter/generated_plugin_registrant.cc | 29 - .../flutter/generated_plugin_registrant.h | 15 - .../windows/flutter/generated_plugins.cmake | 30 - mobile/windows/runner/CMakeLists.txt | 40 - mobile/windows/runner/Runner.rc | 121 -- mobile/windows/runner/flutter_window.cpp | 71 -- mobile/windows/runner/flutter_window.h | 33 - mobile/windows/runner/main.cpp | 43 - mobile/windows/runner/resource.h | 16 - mobile/windows/runner/resources/app_icon.ico | Bin 33772 -> 0 bytes mobile/windows/runner/runner.exe.manifest | 14 - mobile/windows/runner/utils.cpp | 69 -- mobile/windows/runner/utils.h | 19 - mobile/windows/runner/win32_window.cpp | 288 ----- mobile/windows/runner/win32_window.h | 102 -- native/android/README.md | 4 +- native/android/app/build.gradle.kts | 7 + native/android/app/proguard-rules.pro | 34 + .../match_live_tv/E2EWizardFlowTest.kt | 163 +++ .../match_live_tv/ReleaseApiSmokeTest.kt | 43 + .../android/app/src/main/AndroidManifest.xml | 3 +- .../matchlivetv/match_live_tv/MainActivity.kt | 1 + .../match_live_tv/core/DeviceTelemetry.kt | 31 + .../match_live_tv/data/AppContainer.kt | 16 + .../match_live_tv/data/WizardSessionHolder.kt | 20 + .../match_live_tv/data/api/ApiDtos.kt | 170 ++- .../match_live_tv/data/api/MatchLiveApi.kt | 37 + .../data/cable/ActionCableClient.kt | 141 +++ .../data/cable/SessionCableService.kt | 86 ++ .../data/repository/MatchRepository.kt | 102 +- .../data/repository/MatchSessionLauncher.kt | 15 + .../data/repository/ScoreRepository.kt | 27 + .../data/repository/SessionRepository.kt | 45 +- .../data/scoring/ScoreController.kt | 112 ++ .../match_live_tv/domain/MatchScoringRules.kt | 40 + .../match_live_tv/domain/Models.kt | 32 +- .../match_live_tv/domain/Recording.kt | 22 + .../match_live_tv/domain/ScoreState.kt | 33 + .../streaming/BroadcastModels.kt | 4 + .../streaming/LiveBroadcastCoordinator.kt | 4 + .../streaming/LiveBroadcastEngine.kt | 369 +++++- .../match_live_tv/ui/archive/ArchiveScreen.kt | 178 +++ .../ui/broadcast/BroadcastScreen.kt | 392 +++++- .../ui/broadcast/LiveScoreActions.kt | 153 +++ .../ui/broadcast/LiveScoreControls.kt | 153 +++ .../ui/broadcast/ScoreOutcomeDialogs.kt | 95 ++ .../ui/components/MatchLiveWordmark.kt | 86 ++ .../ui/components/MatchPrimaryButton.kt | 47 + .../ui/components/MatchScreenScaffold.kt | 32 + .../ui/components/MatchSecondaryButton.kt | 40 + .../ui/components/MatchStatusBadge.kt | 29 + .../match_live_tv/ui/login/LoginScreen.kt | 187 ++- .../match_live_tv/ui/matches/MatchSheets.kt | 560 +++++++++ .../match_live_tv/ui/matches/MatchesScreen.kt | 462 ++++++- .../match_live_tv/ui/navigation/AppNavHost.kt | 57 +- .../match_live_tv/ui/navigation/Routes.kt | 3 + .../ui/permissions/BroadcastPermissions.kt | 61 + .../match_live_tv/ui/splash/SplashScreen.kt | 21 +- .../match_live_tv/ui/theme/AppTheme.kt | 58 +- .../ui/wizard/StepMatchScreen.kt | 199 +++ .../ui/wizard/StepNetworkTestScreen.kt | 242 ++++ .../ui/wizard/StepTransmissionScreen.kt | 165 +++ .../ui/wizard/WizardComponents.kt | 146 +++ .../ui/wizard/WizardShellScreen.kt | 131 ++ .../app/src/main/res/drawable/ic_launcher.xml | 13 - .../app/src/main/res/drawable/logo_white.png | Bin 0 -> 24398 bytes .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/values/colors.xml | 5 + .../app/src/main/res/values/strings.xml | 1 + .../app/src/main/res/values/themes.xml | 7 +- scripts/build_mobile_apk_prod.sh | 15 - scripts/deploy/sync_to_server.sh | 6 +- scripts/e2e_native_android_emulator.sh | 35 + scripts/run_mobile_android.sh | 14 - scripts/run_mobile_android_prod.sh | 28 - scripts/run_mobile_linux.sh | 7 - scripts/test/adb_phone_stream_e2e.sh | 103 -- 262 files changed, 4860 insertions(+), 15162 deletions(-) delete mode 100644 mobile/.gitignore delete mode 100644 mobile/.metadata delete mode 100644 mobile/README.md delete mode 100644 mobile/analysis_options.yaml delete mode 100644 mobile/android/.gitignore delete mode 100644 mobile/android/app/build.gradle.kts delete mode 100644 mobile/android/app/proguard-rules.pro delete mode 100644 mobile/android/app/src/debug/AndroidManifest.xml delete mode 100644 mobile/android/app/src/main/AndroidManifest.xml delete mode 100644 mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/MainActivity.kt delete mode 100644 mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamPreviewHolder.kt delete mode 100644 mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingEngine.kt delete mode 100644 mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingEngineHolder.kt delete mode 100644 mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingForegroundService.kt delete mode 100644 mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingOpenGlView.kt delete mode 100644 mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingPlugin.kt delete mode 100644 mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingPreviewPlatformView.kt delete mode 100644 mobile/android/app/src/main/res/drawable-v21/launch_background.xml delete mode 100644 mobile/android/app/src/main/res/drawable/launch_background.xml delete mode 100644 mobile/android/app/src/main/res/values-night/styles.xml delete mode 100644 mobile/android/app/src/main/res/values/strings.xml delete mode 100644 mobile/android/app/src/main/res/values/styles.xml delete mode 100644 mobile/android/app/src/main/res/xml/network_security_config.xml delete mode 100644 mobile/android/app/src/profile/AndroidManifest.xml delete mode 100644 mobile/android/build.gradle.kts delete mode 100644 mobile/android/gradle.properties delete mode 100644 mobile/android/gradle/wrapper/gradle-wrapper.properties delete mode 100644 mobile/android/settings.gradle.kts delete mode 100644 mobile/ios/.gitignore delete mode 100644 mobile/ios/Flutter/AppFrameworkInfo.plist delete mode 100644 mobile/ios/Flutter/Debug.xcconfig delete mode 100644 mobile/ios/Flutter/Release.xcconfig delete mode 100644 mobile/ios/Runner.xcodeproj/project.pbxproj delete mode 100644 mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme delete mode 100644 mobile/ios/Runner.xcworkspace/contents.xcworkspacedata delete mode 100644 mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 mobile/ios/Runner/AppDelegate.swift delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json delete mode 100644 mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png delete mode 100644 mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md delete mode 100644 mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard delete mode 100644 mobile/ios/Runner/Base.lproj/Main.storyboard delete mode 100644 mobile/ios/Runner/Info.plist delete mode 100644 mobile/ios/Runner/Runner-Bridging-Header.h delete mode 100644 mobile/ios/Runner/SceneDelegate.swift delete mode 100644 mobile/ios/RunnerTests/RunnerTests.swift delete mode 100644 mobile/lib/app/router.dart delete mode 100644 mobile/lib/app/theme.dart delete mode 100644 mobile/lib/core/auth_storage.dart delete mode 100644 mobile/lib/core/config.dart delete mode 100644 mobile/lib/core/deep_link_listener.dart delete mode 100644 mobile/lib/core/invite_storage.dart delete mode 100644 mobile/lib/core/team_selection_storage.dart delete mode 100644 mobile/lib/features/archive/archive_screen.dart delete mode 100644 mobile/lib/features/auth/login_screen.dart delete mode 100644 mobile/lib/features/auth/splash_screen.dart delete mode 100644 mobile/lib/features/camera_mode/camera_screen.dart delete mode 100644 mobile/lib/features/camera_mode/camera_screen_landscape.dart delete mode 100644 mobile/lib/features/camera_mode/camera_screen_portrait.dart delete mode 100644 mobile/lib/features/matches/matches_screen.dart delete mode 100644 mobile/lib/features/matches/new_match_sheet.dart delete mode 100644 mobile/lib/features/matches/no_team_onboarding.dart delete mode 100644 mobile/lib/features/matches/resume_session_sheet.dart delete mode 100644 mobile/lib/features/matches/schedule_match_sheet.dart delete mode 100644 mobile/lib/features/matches/select_match_sheet.dart delete mode 100644 mobile/lib/features/matches/team_picker.dart delete mode 100644 mobile/lib/features/matches/team_providers.dart delete mode 100644 mobile/lib/features/setup_wizard/step_match.dart delete mode 100644 mobile/lib/features/setup_wizard/step_network_test.dart delete mode 100644 mobile/lib/features/setup_wizard/step_transmission.dart delete mode 100644 mobile/lib/features/setup_wizard/wizard_shell.dart delete mode 100644 mobile/lib/features/shared/live_score_actions.dart delete mode 100644 mobile/lib/main.dart delete mode 100644 mobile/lib/platform/streaming_channel.dart delete mode 100644 mobile/lib/platform/streaming_preview.dart delete mode 100644 mobile/lib/providers/auth_provider.dart delete mode 100644 mobile/lib/providers/match_rules_provider.dart delete mode 100644 mobile/lib/providers/score_provider.dart delete mode 100644 mobile/lib/providers/score_sync_provider.dart delete mode 100644 mobile/lib/providers/session_provider.dart delete mode 100644 mobile/lib/shared/api_client.dart delete mode 100644 mobile/lib/shared/api_error.dart delete mode 100644 mobile/lib/shared/models/device_state.dart delete mode 100644 mobile/lib/shared/models/invite_preview.dart delete mode 100644 mobile/lib/shared/models/match.dart delete mode 100644 mobile/lib/shared/models/recording_item.dart delete mode 100644 mobile/lib/shared/models/score_state.dart delete mode 100644 mobile/lib/shared/models/stream_session.dart delete mode 100644 mobile/lib/shared/models/team.dart delete mode 100644 mobile/lib/shared/models/user.dart delete mode 100644 mobile/lib/shared/premium_dialog.dart delete mode 100644 mobile/lib/shared/regia_share.dart delete mode 100644 mobile/lib/shared/scoring/match_scoring_rules.dart delete mode 100644 mobile/lib/shared/watch_share.dart delete mode 100644 mobile/lib/shared/websocket_service.dart delete mode 100644 mobile/lib/shared/widgets/camera_compact_metrics.dart delete mode 100644 mobile/lib/shared/widgets/connected_badge.dart delete mode 100644 mobile/lib/shared/widgets/destructive_cta.dart delete mode 100644 mobile/lib/shared/widgets/end_stream_dialog.dart delete mode 100644 mobile/lib/shared/widgets/live_badge.dart delete mode 100644 mobile/lib/shared/widgets/live_score_controls.dart delete mode 100644 mobile/lib/shared/widgets/match_live_wordmark.dart delete mode 100644 mobile/lib/shared/widgets/metric_card.dart delete mode 100644 mobile/lib/shared/widgets/primary_cta.dart delete mode 100644 mobile/lib/shared/widgets/score_outcome_dialogs.dart delete mode 100644 mobile/lib/shared/widgets/score_overlay_bar.dart delete mode 100644 mobile/lib/shared/widgets/screen_insets.dart delete mode 100644 mobile/linux/.gitignore delete mode 100644 mobile/linux/CMakeLists.txt delete mode 100644 mobile/linux/flutter/CMakeLists.txt delete mode 100644 mobile/linux/flutter/generated_plugin_registrant.cc delete mode 100644 mobile/linux/flutter/generated_plugin_registrant.h delete mode 100644 mobile/linux/flutter/generated_plugins.cmake delete mode 100644 mobile/linux/runner/CMakeLists.txt delete mode 100644 mobile/linux/runner/main.cc delete mode 100644 mobile/linux/runner/my_application.cc delete mode 100644 mobile/linux/runner/my_application.h delete mode 100644 mobile/macos/.gitignore delete mode 100644 mobile/macos/Flutter/Flutter-Debug.xcconfig delete mode 100644 mobile/macos/Flutter/Flutter-Release.xcconfig delete mode 100644 mobile/macos/Flutter/GeneratedPluginRegistrant.swift delete mode 100644 mobile/macos/Runner.xcodeproj/project.pbxproj delete mode 100644 mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme delete mode 100644 mobile/macos/Runner.xcworkspace/contents.xcworkspacedata delete mode 100644 mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 mobile/macos/Runner/AppDelegate.swift delete mode 100644 mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png delete mode 100644 mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png delete mode 100644 mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png delete mode 100644 mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png delete mode 100644 mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png delete mode 100644 mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png delete mode 100644 mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png delete mode 100644 mobile/macos/Runner/Base.lproj/MainMenu.xib delete mode 100644 mobile/macos/Runner/Configs/AppInfo.xcconfig delete mode 100644 mobile/macos/Runner/Configs/Debug.xcconfig delete mode 100644 mobile/macos/Runner/Configs/Release.xcconfig delete mode 100644 mobile/macos/Runner/Configs/Warnings.xcconfig delete mode 100644 mobile/macos/Runner/DebugProfile.entitlements delete mode 100644 mobile/macos/Runner/Info.plist delete mode 100644 mobile/macos/Runner/MainFlutterWindow.swift delete mode 100644 mobile/macos/Runner/Release.entitlements delete mode 100644 mobile/macos/RunnerTests/RunnerTests.swift delete mode 100644 mobile/pubspec.yaml delete mode 100644 mobile/test/widget_test.dart delete mode 100644 mobile/web/favicon.png delete mode 100644 mobile/web/icons/Icon-192.png delete mode 100644 mobile/web/icons/Icon-512.png delete mode 100644 mobile/web/icons/Icon-maskable-192.png delete mode 100644 mobile/web/icons/Icon-maskable-512.png delete mode 100644 mobile/web/index.html delete mode 100644 mobile/web/manifest.json delete mode 100644 mobile/windows/.gitignore delete mode 100644 mobile/windows/CMakeLists.txt delete mode 100644 mobile/windows/flutter/CMakeLists.txt delete mode 100644 mobile/windows/flutter/generated_plugin_registrant.cc delete mode 100644 mobile/windows/flutter/generated_plugin_registrant.h delete mode 100644 mobile/windows/flutter/generated_plugins.cmake delete mode 100644 mobile/windows/runner/CMakeLists.txt delete mode 100644 mobile/windows/runner/Runner.rc delete mode 100644 mobile/windows/runner/flutter_window.cpp delete mode 100644 mobile/windows/runner/flutter_window.h delete mode 100644 mobile/windows/runner/main.cpp delete mode 100644 mobile/windows/runner/resource.h delete mode 100644 mobile/windows/runner/resources/app_icon.ico delete mode 100644 mobile/windows/runner/runner.exe.manifest delete mode 100644 mobile/windows/runner/utils.cpp delete mode 100644 mobile/windows/runner/utils.h delete mode 100644 mobile/windows/runner/win32_window.cpp delete mode 100644 mobile/windows/runner/win32_window.h create mode 100644 native/android/app/src/androidTest/kotlin/com/matchlivetv/match_live_tv/E2EWizardFlowTest.kt create mode 100644 native/android/app/src/androidTest/kotlin/com/matchlivetv/match_live_tv/ReleaseApiSmokeTest.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/core/DeviceTelemetry.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/WizardSessionHolder.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/cable/ActionCableClient.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/cable/SessionCableService.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/MatchSessionLauncher.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/ScoreRepository.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/scoring/ScoreController.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/MatchScoringRules.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/Recording.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/ScoreState.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/archive/ArchiveScreen.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/LiveScoreActions.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/LiveScoreControls.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/ScoreOutcomeDialogs.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchLiveWordmark.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchPrimaryButton.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchScreenScaffold.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchSecondaryButton.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchStatusBadge.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/matches/MatchSheets.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/permissions/BroadcastPermissions.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepMatchScreen.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepNetworkTestScreen.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepTransmissionScreen.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/WizardComponents.kt create mode 100644 native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/WizardShellScreen.kt delete mode 100644 native/android/app/src/main/res/drawable/ic_launcher.xml create mode 100644 native/android/app/src/main/res/drawable/logo_white.png rename {mobile => native}/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {mobile => native}/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {mobile => native}/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {mobile => native}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {mobile => native}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) create mode 100644 native/android/app/src/main/res/values/colors.xml delete mode 100755 scripts/build_mobile_apk_prod.sh create mode 100755 scripts/e2e_native_android_emulator.sh delete mode 100755 scripts/run_mobile_android.sh delete mode 100755 scripts/run_mobile_android_prod.sh delete mode 100755 scripts/run_mobile_linux.sh delete mode 100755 scripts/test/adb_phone_stream_e2e.sh diff --git a/README.md b/README.md index bf87585..3c9a1f8 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,15 @@ Piattaforma mobile-first per streaming di partite sportive giovanili — MVP su **Match Live TV** (HLS sul nostro sito); YouTube/Facebook/Twitch come integrazioni premium. -**Slogan:** *Lo streaming che non muore* +**Slogan:** *Ogni partita, ogni evento, per i tuoi tifosi.* ## Struttura monorepo ``` -├── backend/ # Rails 7.2 API + Action Cable + Sidekiq -├── mobile/ # Flutter app (Camera + Regia) -├── infra/ # Docker Compose, MediaMTX, Nginx, Kamal -└── docs/ # Documentazione +├── backend/ # Rails 7.2 API + Action Cable + Sidekiq +├── native/android/ # App Android nativa (Kotlin + Compose) +├── infra/ # Docker Compose, MediaMTX, Nginx, Kamal +└── docs/ # Documentazione ``` ## Deploy produzione (server 192.168.1.146) @@ -45,15 +45,16 @@ email: coach@matchlivetv.test password: password123 ``` -## Mobile +## App Android nativa ```bash -cd mobile -flutter pub get -flutter run +./scripts/build_native_android_apk_prod.sh +adb install -r native/android/app/build/outputs/apk/release/app-release.apk ``` -Configura `API_BASE_URL` in `lib/core/config.dart` (default `http://10.0.2.2:3000` per emulatore Android). +API produzione: `https://www.matchlivetv.it` (override con `-PAPI_BASE_URL=...` in Gradle). + +Vedi [native/android/README.md](native/android/README.md). ## Architettura @@ -62,9 +63,9 @@ Configura `API_BASE_URL` in `lib/core/config.dart` (default `http://10.0.2.2:300 - Controllo: Phone ↔ Action Cable ↔ Rails ↔ PostgreSQL - Disconnessioni: MediaMTX `alwaysAvailable` slate + timeout 5 min (Sidekiq) -### Mobile produzione +### App Android produzione ```bash -./scripts/run_mobile_android_prod.sh +./scripts/build_native_android_apk_prod.sh # API: https://www.matchlivetv.it ``` diff --git a/docs/infrastructure/SERVER_DEPLOYMENT.md b/docs/infrastructure/SERVER_DEPLOYMENT.md index 8d2f1a1..729aa16 100644 --- a/docs/infrastructure/SERVER_DEPLOYMENT.md +++ b/docs/infrastructure/SERVER_DEPLOYMENT.md @@ -156,7 +156,7 @@ Dalla macchina di sviluppo: ```bash # Tar + scp (rsync non installato sul server) tar -C /path/to/MatchLiveTV/src -czf /tmp/matchlivetv-deploy.tar.gz \ - --exclude='./mobile/build' --exclude='./backend/log' --exclude='./.git' . + --exclude='./native/android/build' --exclude='./backend/log' --exclude='./.git' . scp /tmp/matchlivetv-deploy.tar.gz eminux@192.168.1.146:~/ ssh eminux@192.168.1.146 'tar -xzf ~/matchlivetv-deploy.tar.gz -C ~/matchlivetv' diff --git a/mobile/.gitignore b/mobile/.gitignore deleted file mode 100644 index 3820a95..0000000 --- a/mobile/.gitignore +++ /dev/null @@ -1,45 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.build/ -.buildlog/ -.history -.svn/ -.swiftpm/ -migrate_working_dir/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins-dependencies -.pub-cache/ -.pub/ -/build/ -/coverage/ - -# 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 diff --git a/mobile/.metadata b/mobile/.metadata deleted file mode 100644 index a906de7..0000000 --- a/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: "559ffa3f75e7402d65a8def9c28389a9b2e6fe42" - channel: "[user-branch]" - -project_type: app - -# Tracks metadata for the flutter migrate command -migration: - platforms: - - platform: root - create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - - platform: android - create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - - platform: ios - create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - - platform: linux - create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - - platform: macos - create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - - platform: web - create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - - platform: windows - create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 - - # 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/mobile/README.md b/mobile/README.md deleted file mode 100644 index 15db89a..0000000 --- a/mobile/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# match_live_tv - -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: - -- [Learn Flutter](https://docs.flutter.dev/get-started/learn-flutter) -- [Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) -- [Flutter learning resources](https://docs.flutter.dev/reference/learning-resources) - -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/mobile/analysis_options.yaml b/mobile/analysis_options.yaml deleted file mode 100644 index 0d29021..0000000 --- a/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/mobile/android/.gitignore b/mobile/android/.gitignore deleted file mode 100644 index be3943c..0000000 --- a/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/mobile/android/app/build.gradle.kts b/mobile/android/app/build.gradle.kts deleted file mode 100644 index 46895e5..0000000 --- a/mobile/android/app/build.gradle.kts +++ /dev/null @@ -1,59 +0,0 @@ -plugins { - id("com.android.application") - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. - id("dev.flutter.flutter-gradle-plugin") -} - -android { - namespace = "com.matchlivetv.match_live_tv" - compileSdk = flutter.compileSdkVersion - ndkVersion = flutter.ndkVersion - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.matchlivetv.match_live_tv" - // You can update the following values to match your application needs. - // For more information, see: https://flutter.dev/to/review-gradle-config. - minSdk = maxOf(flutter.minSdkVersion, 21) - 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") - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } -} - -kotlin { - compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 - } -} - -flutter { - source = "../.." -} - -dependencies { - val cameraxVersion = "1.4.1" - - implementation("androidx.camera:camera-core:$cameraxVersion") - implementation("androidx.camera:camera-camera2:$cameraxVersion") - implementation("androidx.camera:camera-lifecycle:$cameraxVersion") - implementation("androidx.camera:camera-view:$cameraxVersion") - implementation("com.github.pedroSG94.RootEncoder:library:2.5.5") -} diff --git a/mobile/android/app/proguard-rules.pro b/mobile/android/app/proguard-rules.pro deleted file mode 100644 index 57c43b6..0000000 --- a/mobile/android/app/proguard-rules.pro +++ /dev/null @@ -1,2 +0,0 @@ -# RootEncoder / SLF4J (R8 release) --dontwarn org.slf4j.impl.StaticLoggerBinder diff --git a/mobile/android/app/src/debug/AndroidManifest.xml b/mobile/android/app/src/debug/AndroidManifest.xml deleted file mode 100644 index 399f698..0000000 --- a/mobile/android/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index 8c44282..0000000 --- a/mobile/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/MainActivity.kt b/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/MainActivity.kt deleted file mode 100644 index d6348bd..0000000 --- a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/MainActivity.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.matchlivetv.match_live_tv - -import android.content.res.Configuration -import android.os.Bundle -import io.flutter.embedding.android.FlutterFragmentActivity -import io.flutter.embedding.engine.FlutterEngine - -class MainActivity : FlutterFragmentActivity() { - - override fun onConfigurationChanged(newConfig: Configuration) { - StreamingEngineHolder.engine?.pauseGlDuringRotation() - super.onConfigurationChanged(newConfig) - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - // Termina eventuale diretta rimasta attiva da sessione precedente - StreamingEngineHolder.engine?.stopStream() - StreamingEngineHolder.release() - startService(StreamingForegroundService.stopIntent(this)) - } - - override fun configureFlutterEngine(flutterEngine: FlutterEngine) { - super.configureFlutterEngine(flutterEngine) - flutterEngine.plugins.add(StreamingPlugin()) - } -} diff --git a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamPreviewHolder.kt b/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamPreviewHolder.kt deleted file mode 100644 index c93c24a..0000000 --- a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamPreviewHolder.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.matchlivetv.match_live_tv - -import com.pedro.library.view.OpenGlView - -/** Riferimento condiviso alla surface di preview tra PlatformView e StreamingEngine. */ -object StreamPreviewHolder { - @Volatile - var openGlView: OpenGlView? = null -} diff --git a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingEngine.kt b/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingEngine.kt deleted file mode 100644 index f52af47..0000000 --- a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingEngine.kt +++ /dev/null @@ -1,1065 +0,0 @@ -package com.matchlivetv.match_live_tv - -import android.content.Context -import android.media.MediaCodecInfo -import android.os.Build -import android.os.Handler -import android.os.Looper -import android.os.SystemClock -import android.util.Log -import androidx.annotation.RequiresApi -import com.pedro.common.ConnectChecker -import com.pedro.library.generic.GenericStream -import com.pedro.library.util.BitrateAdapter -import com.pedro.library.util.SensorRotationManager -import com.pedro.library.view.OpenGlView -import java.util.concurrent.atomic.AtomicBoolean -import java.util.concurrent.atomic.AtomicInteger - -data class StreamingConfig( - val rtmpUrl: String, - val width: Int = 1280, - val height: Int = 720, - val videoBitrate: Int = 3_000_000, - val audioBitrate: Int = 128_000, - val fps: Int = 30, - val rotation: Int = 0, - val portrait: Boolean = false, - // Allineato a MediaMTX alwaysAvailable slate (offline.mp4: 48 kHz mono) - val sampleRate: Int = 48_000, - val stereo: Boolean = false, - val maxReconnectAttempts: Int = 10, - val reconnectDelayMs: Long = 5_000L, -) - -data class StreamingMetrics( - val isStreaming: Boolean, - val isPreviewActive: Boolean, - val isConnected: Boolean, - val state: String, - val bitrateKbps: Long, - val fps: Int, - val durationMs: Long, - val reconnectAttempts: Int, - val lastError: String?, -) { - fun toMap(): Map = mapOf( - "isStreaming" to isStreaming, - "isPreviewActive" to isPreviewActive, - "isConnected" to isConnected, - "state" to state, - "bitrateKbps" to bitrateKbps, - "fps" to fps, - "durationMs" to durationMs, - "reconnectAttempts" to reconnectAttempts, - "lastError" to lastError, - ) -} - -enum class StreamingState { - IDLE, - PREVIEWING, - CONNECTING, - STREAMING, - RECONNECTING, - STOPPING, - ERROR, -} - -interface StreamingEngineListener { - fun onStateChanged(state: StreamingState, message: String? = null) - fun onMetricsUpdated(metrics: StreamingMetrics) - fun onError(message: String) -} - -@RequiresApi(Build.VERSION_CODES.LOLLIPOP) -class StreamingEngine( - private val appContext: Context, -) : ConnectChecker { - - private val mainHandler = Handler(Looper.getMainLooper()) - private val listeners = mutableSetOf() - - private var genericStream: GenericStream? = null - private var previewSurface: OpenGlView? = null - - private var config: StreamingConfig? = null - private var state: StreamingState = StreamingState.IDLE - private var streamStartedAtMs: Long = 0L - private var currentBitrateKbps: Long = 0L - private var currentFps: Int = 0 - private var lastError: String? = null - private var lastVideoFrameCount: Long = 0L - private var lastFpsSampleAtMs: Long = 0L - private var videoStallChecks: Int = 0 - private var lastStallFrameCount: Long = -1L - private val reconnectAttempts = AtomicInteger(0) - private val isReleased = AtomicBoolean(false) - private val pausingIntentionally = AtomicBoolean(false) - private var previewRebindUntilMs = 0L - private var previewRebindAttempts = 0 - private var sensorRotationManager: SensorRotationManager? = null - private var surfaceLost = false - private var rebindInProgress = false - private var pendingRotation: Int? = null - private var pendingIsPortrait: Boolean? = null - private var lastAppliedRotation = -1 - - private val bitrateAdapter = BitrateAdapter { adaptedBitrate -> - genericStream?.setVideoBitrateOnFly(adaptedBitrate) - } - - private val idlePreviewRunnable = Runnable { - val glView = previewSurface ?: return@Runnable - if (!canAttachPreview(glView)) { - if (previewRebindAttempts < PREVIEW_REBIND_MAX_ATTEMPTS) { - scheduleIdlePreviewAttach(previewRebindAttempts + 1) - } - return@Runnable - } - finishIdlePreviewBind(glView) - } - - private val surfaceReadyRunnable = Runnable { - if (isReleased.get() || rebindInProgress) { - return@Runnable - } - val glView = previewSurface ?: return@Runnable - if (!canAttachPreview(glView)) { - if (previewRebindAttempts < PREVIEW_REBIND_MAX_ATTEMPTS) { - scheduleSurfaceReady(previewRebindAttempts + 1) - } - return@Runnable - } - surfaceLost = false - val stream = genericStream - if (stream != null && (stream.isStreaming || stream.isOnPreview)) { - safeReattachPreview(glView) - flushPendingOrientation() - } else { - attachPreviewToStream() - } - } - private val metricsRunnable = object : Runnable { - override fun run() { - emitMetrics() - if (state == StreamingState.STREAMING || - state == StreamingState.CONNECTING || - state == StreamingState.RECONNECTING || - state == StreamingState.PREVIEWING - ) { - mainHandler.postDelayed(this, METRICS_INTERVAL_MS) - } - } - } - - fun addListener(listener: StreamingEngineListener) { - listeners.add(listener) - } - - fun removeListener(listener: StreamingEngineListener) { - listeners.remove(listener) - } - - fun setupPreviewGlView(glView: StreamingOpenGlView) { - ensureMainThread() - updatePreservePipelineFlag(glView) - glView.onPreviewSurfaceLost = { onPlatformSurfaceDestroyed() } - } - - fun attachPreviewHost(glView: StreamingOpenGlView) { - ensureMainThread() - setupPreviewGlView(glView) - bindStreamPreview(glView) - } - - private fun updatePreservePipelineFlag(glView: StreamingOpenGlView?) { - glView?.preservePipelineOnSurfaceLoss = - state == StreamingState.STREAMING || - state == StreamingState.CONNECTING || - state == StreamingState.RECONNECTING - } - - /** Surface OpenGL pronta (debounced). */ - fun onPlatformSurfaceReady(glView: OpenGlView) { - ensureMainThread() - previewSurface = glView - StreamPreviewHolder.openGlView = glView - previewRebindAttempts = 0 - mainHandler.removeCallbacks(surfaceReadyRunnable) - val live = state == StreamingState.STREAMING || - state == StreamingState.CONNECTING || - state == StreamingState.RECONNECTING - if (live) { - scheduleSurfaceReady(0) - return - } - scheduleIdlePreviewAttach(0) - } - - /** - * Chiamato da MainActivity.onConfigurationChanged *prima* di super, per fermare drawScreen - * sul thread GL encoder prima che Flutter ricrei le surface (evita GL_OUT_OF_MEMORY). - */ - fun pauseGlDuringRotation() { - ensureMainThread() - if (isReleased.get()) { - return - } - val active = state == StreamingState.STREAMING || - state == StreamingState.CONNECTING || - state == StreamingState.RECONNECTING || - state == StreamingState.PREVIEWING - if (!active) { - return - } - Log.i(TAG, "pauseGlDuringRotation state=$state") - beginSurfaceTransition(SURFACE_TRANSITION_GRACE_MS) - } - - /** Chiamato quando Flutter distrugge la surface PlatformView durante la rotazione. */ - fun onPlatformSurfaceDestroyed() { - ensureMainThread() - beginSurfaceTransition(SURFACE_TRANSITION_GRACE_MS) - } - - private fun beginSurfaceTransition(graceMs: Long) { - surfaceLost = true - markPreviewRebinding(graceMs) - mainHandler.removeCallbacks(surfaceReadyRunnable) - mainHandler.removeCallbacks(idlePreviewRunnable) - mainHandler.removeCallbacks(orientationApplyRunnable) - mainHandler.removeCallbacks(postRebindOrientationRunnable) - stopPreviewGlRender() - try { - genericStream?.getGlInterface()?.setForceRender(false) - genericStream?.getGlInterface()?.deAttachPreview() - } catch (exception: Exception) { - Log.w(TAG, "beginSurfaceTransition: ${exception.message}") - } - } - - private fun stopPreviewGlRender() { - listOfNotNull(previewSurface, StreamPreviewHolder.openGlView) - .distinct() - .forEach { glView -> - (glView as? StreamingOpenGlView)?.let { updatePreservePipelineFlag(it) } - try { - glView.setForceRender(false) - } catch (_: Exception) { - } - } - } - - /** Solo orientamento encoder: niente rebind preview (evita crash GL in rotazione). */ - fun applyOrientationFromSensor() { - ensureMainThread() - refreshOrientationSensor() - } - - fun bindStreamPreview(glView: OpenGlView) { - ensureMainThread() - previewSurface = glView - StreamPreviewHolder.openGlView = glView - (glView as? StreamingOpenGlView)?.let { updatePreservePipelineFlag(it) } - val live = state == StreamingState.STREAMING || - state == StreamingState.CONNECTING || - state == StreamingState.RECONNECTING - if (live) { - onPlatformSurfaceReady(glView) - return - } - bindPreviewForIdle(glView) - } - - private fun finishIdlePreviewBind(glView: OpenGlView) { - val stream = genericStream ?: return - if (stream.isOnPreview) { - return - } - try { - attachPreviewToStream() - ensureOrientationSensor() - updateState(StreamingState.PREVIEWING) - startMetricsLoop() - } catch (exception: Exception) { - Log.w(TAG, "finishIdlePreviewBind failed: ${exception.message}") - if (previewRebindAttempts < PREVIEW_REBIND_MAX_ATTEMPTS) { - scheduleIdlePreviewAttach(previewRebindAttempts + 1) - } - } - } - - private fun bindPreviewForIdle(glView: OpenGlView) { - val surfaceChanged = previewSurface != null && previewSurface !== glView - previewSurface = glView - - if (state == StreamingState.STREAMING || - state == StreamingState.CONNECTING || - state == StreamingState.RECONNECTING - ) { - return - } - - if (surfaceChanged) { - genericStream?.let { stream -> - if (stream.isOnPreview) { - stream.stopPreview() - } - } - } - - val cfg = config ?: previewConfig() - val stream = genericStream ?: obtainGenericStream(cfg) - genericStream = stream - - if (!stream.isOnPreview) { - stopPreviewAndStreamForPrepare(stream) - val prepared = try { - stream.prepareVideo( - width = cfg.width, - height = cfg.height, - bitrate = cfg.videoBitrate, - fps = cfg.fps, - iFrameInterval = 1, - rotation = cfg.rotation, - profile = MediaCodecInfo.CodecProfileLevel.AVCProfileBaseline, - level = MediaCodecInfo.CodecProfileLevel.AVCLevel31, - ) && stream.prepareAudio( - cfg.sampleRate, - cfg.stereo, - cfg.audioBitrate, - ) - } catch (_: Exception) { - false - } - if (!prepared) { - notifyError("Impossibile preparare la preview camera") - return - } - } - - if (!canAttachPreview(glView)) { - Log.i(TAG, "bindPreviewForIdle waiting for surface state=$state") - scheduleIdlePreviewAttach(0) - return - } - finishIdlePreviewBind(glView) - } - - fun unbindStreamPreview() { - ensureMainThread() - previewSurface = null - genericStream?.let { stream -> - if (stream.isOnPreview) { - stream.stopPreview() - } - } - if (state == StreamingState.PREVIEWING) { - updateState(StreamingState.IDLE) - } - } - - /** Ripresa dopo pausa: stesso percorso di startStream (evita RTMP solo-audio dopo reconnect). */ - fun resumeStream(streamConfig: StreamingConfig) { - ensureMainThread() - Log.i(TAG, "resumeStream reset url=${streamConfig.rtmpUrl}") - stopStream() - updateState(StreamingState.IDLE) - mainHandler.postDelayed({ - if (!isReleased.get()) { - startStream(streamConfig) - } - }, 250) - } - - fun startStream(streamConfig: StreamingConfig) { - ensureMainThread() - Log.i(TAG, "startStream state=$state url=${streamConfig.rtmpUrl} bitrate=${streamConfig.videoBitrate} fps=${streamConfig.fps}") - if (isReleased.get()) { - notifyError("StreamingEngine rilasciato") - return - } - // Già in onda sullo stesso endpoint RTMP. - if (state == StreamingState.STREAMING && - config?.rtmpUrl == streamConfig.rtmpUrl && - genericStream?.isStreaming == true - ) { - return - } - // Nuova sessione o retry dopo errore: reset completo (evita startStream ignorato). - if (state != StreamingState.IDLE && state != StreamingState.PREVIEWING) { - stopStream() - } - - config = streamConfig - lastError = null - reconnectAttempts.set(0) - - val stream = genericStream ?: obtainGenericStream(streamConfig) - genericStream = stream - stopPreviewAndStreamForPrepare(stream) - - val prepared = try { - stream.prepareVideo( - width = streamConfig.width, - height = streamConfig.height, - bitrate = streamConfig.videoBitrate, - fps = streamConfig.fps, - iFrameInterval = 1, - rotation = streamConfig.rotation, - profile = MediaCodecInfo.CodecProfileLevel.AVCProfileBaseline, - level = MediaCodecInfo.CodecProfileLevel.AVCLevel31, - ) && stream.prepareAudio( - streamConfig.sampleRate, - streamConfig.stereo, - streamConfig.audioBitrate, - ) - } catch (exception: IllegalArgumentException) { - false - } catch (exception: IllegalStateException) { - false - } - - if (!prepared) { - notifyError("Configurazione audio/video non valida") - updateState(StreamingState.ERROR, "prepare failed") - return - } - - attachPreviewToStream() - lastAppliedRotation = -1 - val portraitHint = streamConfig.portrait || streamConfig.height > streamConfig.width - val cameraRotation = if (portraitHint && streamConfig.rotation == 0) 90 else streamConfig.rotation - applyGlOrientation( - rotation = cameraRotation, - isPortrait = portraitHint, - logLabel = "startStream", - ) - ensureOrientationSensor() - resetFpsTracking() - videoStallChecks = 0 - lastStallFrameCount = -1L - - stream.getStreamClient().setReTries(streamConfig.maxReconnectAttempts) - bitrateAdapter.setMaxBitrate(streamConfig.videoBitrate + streamConfig.audioBitrate) - waitForPreviewThenPublish(streamConfig, attempt = 0) - } - - private fun waitForPreviewThenPublish(streamConfig: StreamingConfig, attempt: Int) { - if (isReleased.get()) { - return - } - attachPreviewToStream() - val stream = genericStream - val previewReady = stream?.isOnPreview == true && previewGlView() != null - if (!previewReady) { - if (attempt >= 40) { - notifyError("Anteprima camera non pronta — impossibile inviare video") - updateState(StreamingState.ERROR, "preview_not_ready") - return - } - mainHandler.postDelayed({ - waitForPreviewThenPublish(streamConfig, attempt + 1) - }, 50L) - return - } - - mainHandler.postDelayed({ - if (isReleased.get()) { - return@postDelayed - } - val activeStream = genericStream ?: return@postDelayed - streamStartedAtMs = SystemClock.elapsedRealtime() - updateState(StreamingState.CONNECTING) - Log.i(TAG, "publish RTMP url=${streamConfig.rtmpUrl}") - activeStream.startStream(streamConfig.rtmpUrl) - startMetricsLoop() - }, 350L) - } - - fun pauseStream() { - ensureMainThread() - Log.i(TAG, "pauseStream state=$state") - if (state != StreamingState.STREAMING && - state != StreamingState.CONNECTING && - state != StreamingState.RECONNECTING - ) { - return - } - - stopMetricsLoop() - pausingIntentionally.set(true) - genericStream?.let { stream -> - if (stream.isStreaming) { - stream.stopStream() - } - } - pausingIntentionally.set(false) - - streamStartedAtMs = 0L - currentBitrateKbps = 0L - currentFps = 0 - reconnectAttempts.set(0) - attachPreviewToStream() - updateState(StreamingState.PREVIEWING) - startMetricsLoop() - } - - fun stopStream() { - ensureMainThread() - Log.i(TAG, "stopStream state=$state") - if (state == StreamingState.IDLE || state == StreamingState.STOPPING) { - return - } - - updateState(StreamingState.STOPPING) - stopMetricsLoop() - stopOrientationSensor() - (previewSurface as? StreamingOpenGlView)?.preservePipelineOnSurfaceLoss = false - - genericStream?.let { stream -> - if (stream.isStreaming) { - stream.stopStream() - } - if (stream.isOnPreview) { - stream.stopPreview() - } - stream.release() - } - genericStream = null - - streamStartedAtMs = 0L - currentBitrateKbps = 0L - currentFps = 0 - reconnectAttempts.set(0) - updateState(StreamingState.IDLE) - emitMetrics() - } - - fun release() { - ensureMainThread() - if (!isReleased.compareAndSet(false, true)) { - return - } - stopStream() - unbindStreamPreview() - listeners.clear() - } - - fun getMetrics(): StreamingMetrics = buildMetrics() - - override fun onConnectionStarted(url: String) { - postMain { - Log.i(TAG, "onConnectionStarted url=$url") - updateState(StreamingState.CONNECTING, url) - } - } - - override fun onConnectionSuccess() { - postMain { - Log.i(TAG, "onConnectionSuccess") - reconnectAttempts.set(0) - lastError = null - resetFpsTracking() - videoStallChecks = 0 - lastStallFrameCount = genericStream?.getStreamClient()?.getSentVideoFrames() ?: 0L - (previewSurface as? StreamingOpenGlView)?.let { updatePreservePipelineFlag(it) } - updateState(StreamingState.STREAMING) - } - } - - override fun onConnectionFailed(reason: String) { - postMain { - if (pausingIntentionally.get()) { - return@postMain - } - Log.w(TAG, "onConnectionFailed reason=$reason state=$state attempts=${reconnectAttempts.get()}") - lastError = reason - val stream = genericStream ?: return@postMain - val currentConfig = config ?: return@postMain - - updateState(StreamingState.RECONNECTING, reason) - val attempt = reconnectAttempts.incrementAndGet() - val retryScheduled = stream.getStreamClient().reTry( - currentConfig.reconnectDelayMs, - reason, - null, - ) - - if (retryScheduled) { - emitMetrics() - } else { - updateState(StreamingState.ERROR, reason) - notifyError("Connessione RTMP fallita: $reason") - stream.stopStream() - } - } - } - - override fun onNewBitrate(bitrate: Long) { - postMain { - currentBitrateKbps = bitrate / 1000 - // Bitrate fissa: l'adattamento on-the-fly causa glitch e GOP instabili su MediaMTX/HLS. - emitMetrics() - } - } - - override fun onDisconnect() { - postMain { - if (pausingIntentionally.get()) { - return@postMain - } - Log.w(TAG, "onDisconnect state=$state") - if (state == StreamingState.STREAMING || state == StreamingState.RECONNECTING) { - updateState(StreamingState.RECONNECTING, "disconnected") - } - } - } - - override fun onAuthError() { - postMain { - Log.w(TAG, "onAuthError") - lastError = "auth_error" - updateState(StreamingState.ERROR, "auth_error") - genericStream?.stopStream() - notifyError("Autenticazione RTMP fallita") - } - } - - override fun onAuthSuccess() { - postMain { - Log.i(TAG, "onAuthSuccess") - updateState(StreamingState.STREAMING) - } - } - - private fun stopPreviewAndStreamForPrepare(stream: GenericStream) { - if (stream.isStreaming) { - stream.stopStream() - } - if (stream.isOnPreview) { - stream.stopPreview() - } - } - - private fun previewGlView(): OpenGlView? = - previewSurface ?: StreamPreviewHolder.openGlView - - private fun resetFpsTracking() { - lastFpsSampleAtMs = 0L - lastVideoFrameCount = 0L - currentFps = 0 - } - - private fun attachPreviewToStream(forceRebind: Boolean = false) { - val glView = previewGlView() ?: return - previewSurface = glView - val stream = genericStream ?: return - val liveState = state == StreamingState.STREAMING || - state == StreamingState.CONNECTING || - state == StreamingState.RECONNECTING - if (liveState && (stream.isStreaming || stream.isOnPreview)) { - safeReattachPreview(glView) - return - } - if (forceRebind && stream.isOnPreview && !liveState) { - stream.stopPreview() - } - if (!stream.isOnPreview) { - if (!canAttachPreview(glView)) { - return - } - try { - stream.startPreview(glView, autoHandle = false) - ensureOrientationSensor() - } catch (exception: Exception) { - Log.w(TAG, "attachPreviewToStream failed: ${exception.message}") - } - } - } - - private fun scheduleIdlePreviewAttach(attempt: Int) { - previewRebindAttempts = attempt - if (attempt >= PREVIEW_REBIND_MAX_ATTEMPTS) { - Log.w(TAG, "idle preview attach gave up after $attempt attempts state=$state") - return - } - val delayMs = if (attempt == 0) IDLE_PREVIEW_ATTACH_MS else PREVIEW_REBIND_RETRY_MS - mainHandler.removeCallbacks(idlePreviewRunnable) - mainHandler.postDelayed(idlePreviewRunnable, delayMs) - } - - private fun scheduleSurfaceReady(attempt: Int) { - previewRebindAttempts = attempt - if (attempt >= PREVIEW_REBIND_MAX_ATTEMPTS) { - Log.w(TAG, "surface rebind gave up after $attempt attempts state=$state") - return - } - val delayMs = when { - attempt == 0 -> SURFACE_READY_DEBOUNCE_MS - else -> PREVIEW_REBIND_RETRY_MS - } - mainHandler.postDelayed(surfaceReadyRunnable, delayMs) - } - - private fun markPreviewRebinding(durationMs: Long = PREVIEW_REBIND_GRACE_MS) { - previewRebindUntilMs = SystemClock.elapsedRealtime() + durationMs - videoStallChecks = 0 - lastStallFrameCount = -1L - } - - private fun isPreviewRebinding(): Boolean = - SystemClock.elapsedRealtime() < previewRebindUntilMs - - private fun canAttachPreview(glView: OpenGlView): Boolean { - if (!glView.isAttachedToWindow) { - return false - } - return try { - val surface = glView.holder?.surface - surface != null && surface.isValid && glView.width > 0 && glView.height > 0 - } catch (_: Exception) { - false - } - } - - private fun safeReattachPreview(glView: OpenGlView) { - if (rebindInProgress) { - return - } - val stream = genericStream ?: return - previewSurface = glView - if (!canAttachPreview(glView)) { - scheduleSurfaceReady(previewRebindAttempts + 1) - return - } - val surface = glView.holder?.surface - if (surface == null || !surface.isValid) { - scheduleSurfaceReady(previewRebindAttempts + 1) - return - } - rebindInProgress = true - markPreviewRebinding() - try { - Log.i( - TAG, - "safeReattachPreview state=$state isPreview=${stream.isOnPreview} isStreaming=${stream.isStreaming}", - ) - val glInterface = stream.getGlInterface() - val width = glView.width.coerceAtLeast(2) - val height = glView.height.coerceAtLeast(2) - glInterface.setForceRender(false) - glInterface.deAttachPreview() - glInterface.attachPreview(surface) - glInterface.setPreviewResolution(width, height) - glInterface.setForceRender(true, 30) - } catch (exception: Exception) { - Log.w(TAG, "safeReattachPreview failed: ${exception.message}") - scheduleSurfaceReady(previewRebindAttempts + 1) - } finally { - rebindInProgress = false - surfaceLost = false - finishRotationTransition() - } - } - - /** Orientamento camera/preview/stream via GL (senza metadata RTMP rotation). */ - private fun applyGlOrientation( - rotation: Int, - isPortrait: Boolean, - logLabel: String, - forceRender: Boolean = true, - ) { - if (surfaceLost || rebindInProgress || isPreviewRebinding()) { - pendingRotation = rotation - pendingIsPortrait = isPortrait - Log.i(TAG, "$logLabel deferred rotation=$rotation portrait=$isPortrait") - return - } - val stream = genericStream ?: return - val glView = previewSurface - if (glView != null && !canAttachPreview(glView)) { - return - } - try { - val glInterface = stream.getGlInterface() - if (forceRender) { - glInterface.setForceRender(false) - } - glInterface.autoHandleOrientation = false - glInterface.setIsPortrait(isPortrait) - glInterface.setCameraOrientation(rotation) - glInterface.setPreviewRotation(0) - glInterface.setStreamRotation(0) - lastAppliedRotation = rotation - pendingIsPortrait = isPortrait - Log.i( - TAG, - "$logLabel orientation rotation=$rotation portrait=$isPortrait state=$state", - ) - } catch (exception: Exception) { - Log.w(TAG, "$logLabel orientation failed: ${exception.message}") - } finally { - if (forceRender) { - try { - stream.getGlInterface().setForceRender(true, 30) - } catch (_: Exception) { - } - } - } - } - - private fun ensureOrientationSensor() { - if (sensorRotationManager != null) { - return - } - sensorRotationManager = SensorRotationManager(appContext, true, true) { rotation, isPortrait -> - postMain { applySensorRotation(rotation, isPortrait) } - } - sensorRotationManager?.start() - } - - private fun refreshOrientationSensor() { - sensorRotationManager?.stop() - sensorRotationManager = null - ensureOrientationSensor() - } - - private fun stopOrientationSensor() { - sensorRotationManager?.stop() - sensorRotationManager = null - } - - private val orientationApplyRunnable = Runnable { - val rotation = pendingRotation ?: return@Runnable - val isPortrait = pendingIsPortrait ?: return@Runnable - applySensorRotationNow(rotation, isPortrait) - } - - private fun applySensorRotation(rotation: Int, isPortrait: Boolean) { - pendingRotation = rotation - pendingIsPortrait = isPortrait - mainHandler.removeCallbacks(orientationApplyRunnable) - mainHandler.postDelayed(orientationApplyRunnable, ORIENTATION_DEBOUNCE_MS) - } - - private fun applySensorRotationNow(rotation: Int, isPortrait: Boolean) { - if (rotation == lastAppliedRotation && !surfaceLost) { - return - } - if (surfaceLost || rebindInProgress || isPreviewRebinding()) { - Log.i(TAG, "sensorOrientation queued rotation=$rotation portrait=$isPortrait") - return - } - applyGlOrientation(rotation, isPortrait, "sensorOrientation") - } - - private val postRebindOrientationRunnable = Runnable { - val rotation = pendingRotation ?: return@Runnable - val isPortrait = pendingIsPortrait ?: return@Runnable - if (surfaceLost || rebindInProgress) { - return@Runnable - } - applyGlOrientation(rotation, isPortrait, "postRebind") - } - - private fun finishRotationTransition() { - mainHandler.removeCallbacks(postRebindOrientationRunnable) - mainHandler.postDelayed(postRebindOrientationRunnable, POST_REBIND_ORIENTATION_MS) - } - - private fun flushPendingOrientation() { - mainHandler.removeCallbacks(orientationApplyRunnable) - mainHandler.postDelayed(orientationApplyRunnable, ORIENTATION_DEBOUNCE_MS) - } - - private fun previewConfig(): StreamingConfig { - return config ?: StreamingConfig( - rtmpUrl = "rtmp://127.0.0.1/preview", - width = 1280, - height = 720, - ) - } - - private fun obtainGenericStream(streamConfig: StreamingConfig): GenericStream { - return GenericStream( - appContext, - this, - ).apply { - getGlInterface().autoHandleOrientation = false - getStreamClient().setBitrateExponentialFactor(0.5f) - getStreamClient().setReTries(streamConfig.maxReconnectAttempts) - } - } - - private fun buildMetrics(): StreamingMetrics { - val durationMs = if (streamStartedAtMs > 0L) { - SystemClock.elapsedRealtime() - streamStartedAtMs - } else { - 0L - } - - return StreamingMetrics( - isStreaming = state == StreamingState.STREAMING || - state == StreamingState.RECONNECTING || - state == StreamingState.CONNECTING, - isPreviewActive = state == StreamingState.PREVIEWING || - (genericStream?.isOnPreview == true), - isConnected = state == StreamingState.STREAMING, - state = state.name.lowercase(), - bitrateKbps = currentBitrateKbps, - fps = currentFps, - durationMs = durationMs, - reconnectAttempts = reconnectAttempts.get(), - lastError = lastError, - ) - } - - private fun updateState(newState: StreamingState, message: String? = null) { - state = newState - listeners.forEach { it.onStateChanged(newState, message) } - emitMetrics() - } - - private fun emitMetrics() { - updateFpsEstimate() - checkVideoStallAndRecover() - val metrics = buildMetrics() - listeners.forEach { it.onMetricsUpdated(metrics) } - } - - /** Se RTMP è connesso ma non partono frame video, ripubblica con preview attiva. */ - private fun checkVideoStallAndRecover() { - if (isPreviewRebinding()) { - return - } - if (state != StreamingState.STREAMING && state != StreamingState.RECONNECTING) { - videoStallChecks = 0 - lastStallFrameCount = -1L - return - } - val stream = genericStream ?: return - if (!stream.isStreaming) { - return - } - val frames = stream.getStreamClient().getSentVideoFrames() - if (lastStallFrameCount < 0L) { - lastStallFrameCount = frames - return - } - if (frames > lastStallFrameCount) { - videoStallChecks = 0 - lastStallFrameCount = frames - return - } - videoStallChecks += 1 - if (videoStallChecks < 12) { - return - } - videoStallChecks = 0 - lastStallFrameCount = -1L - val cfg = config ?: return - recoverVideoStream(cfg) - } - - private fun recoverVideoStream(streamConfig: StreamingConfig) { - val stream = genericStream ?: return - Log.w(TAG, "recoverVideoStream state=$state url=${streamConfig.rtmpUrl}") - pausingIntentionally.set(true) - try { - if (stream.isStreaming) { - stream.stopStream() - } - } finally { - pausingIntentionally.set(false) - } - stopPreviewAndStreamForPrepare(stream) - val prepared = try { - stream.prepareVideo( - width = streamConfig.width, - height = streamConfig.height, - bitrate = streamConfig.videoBitrate, - fps = streamConfig.fps, - iFrameInterval = 1, - rotation = streamConfig.rotation, - profile = MediaCodecInfo.CodecProfileLevel.AVCProfileBaseline, - level = MediaCodecInfo.CodecProfileLevel.AVCLevel31, - ) && stream.prepareAudio( - streamConfig.sampleRate, - streamConfig.stereo, - streamConfig.audioBitrate, - ) - } catch (_: Exception) { - false - } - if (!prepared) { - notifyError("Ripristino video fallito") - updateState(StreamingState.ERROR, "video_recover_failed") - return - } - attachPreviewToStream() - ensureOrientationSensor() - resetFpsTracking() - waitForPreviewThenPublish(streamConfig, attempt = 0) - } - - private fun updateFpsEstimate() { - val stream = genericStream ?: return - val now = SystemClock.elapsedRealtime() - val sentFrames = stream.getStreamClient().getSentVideoFrames() - if (lastFpsSampleAtMs == 0L) { - lastFpsSampleAtMs = now - lastVideoFrameCount = sentFrames - return - } - - val elapsedMs = now - lastFpsSampleAtMs - if (elapsedMs >= 1_000L) { - val frameDelta = (sentFrames - lastVideoFrameCount).coerceAtLeast(0L) - currentFps = ((frameDelta * 1000L) / elapsedMs).toInt().coerceIn(0, 120) - lastVideoFrameCount = sentFrames - lastFpsSampleAtMs = now - } - } - - private fun notifyError(message: String) { - listeners.forEach { it.onError(message) } - } - - private fun startMetricsLoop() { - mainHandler.removeCallbacks(metricsRunnable) - mainHandler.post(metricsRunnable) - } - - private fun stopMetricsLoop() { - mainHandler.removeCallbacks(metricsRunnable) - } - - private fun postMain(block: () -> Unit) { - if (Looper.myLooper() == Looper.getMainLooper()) { - block() - } else { - mainHandler.post(block) - } - } - - private fun ensureMainThread() { - check(Looper.myLooper() == Looper.getMainLooper()) { - "StreamingEngine must be used on the main thread" - } - } - - companion object { - private const val TAG = "StreamingEngine" - private const val METRICS_INTERVAL_MS = 1_000L - private const val SURFACE_READY_DEBOUNCE_MS = 700L - private const val IDLE_PREVIEW_ATTACH_MS = 80L - private const val POST_REBIND_ORIENTATION_MS = 350L - private const val SURFACE_TRANSITION_GRACE_MS = 8_000L - private const val ORIENTATION_DEBOUNCE_MS = 700L - private const val PREVIEW_REBIND_RETRY_MS = 120L - private const val PREVIEW_REBIND_MAX_ATTEMPTS = 15 - private const val PREVIEW_REBIND_GRACE_MS = 6_000L - } -} diff --git a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingEngineHolder.kt b/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingEngineHolder.kt deleted file mode 100644 index ea2bcf1..0000000 --- a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingEngineHolder.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.matchlivetv.match_live_tv - -import android.content.Context - -/** Motore streaming condiviso tra preview UI e RTMP (deve restare legato all'Activity). */ -object StreamingEngineHolder { - @Volatile - var engine: StreamingEngine? = null - - fun getOrCreate(context: Context): StreamingEngine { - val existing = engine - if (existing != null) { - return existing - } - return StreamingEngine(context.applicationContext).also { engine = it } - } - - fun release() { - engine?.release() - engine = null - } -} diff --git a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingForegroundService.kt b/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingForegroundService.kt deleted file mode 100644 index b3e9ef3..0000000 --- a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingForegroundService.kt +++ /dev/null @@ -1,243 +0,0 @@ -package com.matchlivetv.match_live_tv - -import android.app.Notification -import android.app.NotificationChannel -import android.app.NotificationManager -import android.app.PendingIntent -import android.app.Service -import android.content.Context -import android.content.Intent -import android.content.pm.ServiceInfo -import android.os.Binder -import android.os.Build -import android.os.Handler -import android.os.IBinder -import android.os.Looper -import android.os.PowerManager -import android.os.SystemClock -import androidx.core.app.NotificationCompat -import androidx.core.app.ServiceCompat - -/** Mantiene in foreground la diretta (notifica + wake lock). Il motore RTMP vive nel plugin. */ -class StreamingForegroundService : Service() { - - private val binder = LocalBinder() - private val mainHandler = Handler(Looper.getMainLooper()) - - private var wakeLock: PowerManager.WakeLock? = null - private var sessionStartedAtMs: Long = 0L - private var autoStopTriggered = false - - private val sessionTimeoutRunnable = Runnable { - if (!autoStopTriggered) { - autoStopTriggered = true - ServiceEventBus.emit( - mapOf( - "type" to "stopped", - "reason" to "session_timeout", - "durationMs" to elapsedMs(), - ), - ) - stopForegroundInternal("session_timeout") - } - } - - inner class LocalBinder : Binder() { - fun getService(): StreamingForegroundService = this@StreamingForegroundService - } - - override fun onCreate() { - super.onCreate() - createNotificationChannel() - } - - override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { - when (intent?.action) { - ACTION_START -> startForegroundSession() - ACTION_STOP -> stopForegroundInternal("user_stop") - } - return START_STICKY - } - - override fun onBind(intent: Intent?): IBinder = binder - - override fun onDestroy() { - stopForegroundInternal("service_destroy") - super.onDestroy() - } - - fun getMetrics(): Map = - StreamingEngineHolder.engine?.getMetrics()?.toMap() ?: emptyMap() - - private fun startForegroundSession() { - autoStopTriggered = false - sessionStartedAtMs = SystemClock.elapsedRealtime() - acquireWakeLock() - promoteToForeground(getString(R.string.streaming_notification_active)) - mainHandler.removeCallbacks(sessionTimeoutRunnable) - mainHandler.postDelayed(sessionTimeoutRunnable, SESSION_MAX_MS) - } - - private fun stopForegroundInternal(reason: String) { - mainHandler.removeCallbacks(sessionTimeoutRunnable) - releaseWakeLock() - if (sessionStartedAtMs > 0L) { - ServiceEventBus.emit( - mapOf( - "type" to "stopped", - "reason" to reason, - "durationMs" to elapsedMs(), - ), - ) - } - sessionStartedAtMs = 0L - stopForeground(STOP_FOREGROUND_REMOVE) - stopSelf() - } - - private fun elapsedMs(): Long { - return if (sessionStartedAtMs > 0L) { - SystemClock.elapsedRealtime() - sessionStartedAtMs - } else { - 0L - } - } - - private fun promoteToForeground(content: String) { - val notification = buildNotification(content) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - ServiceCompat.startForeground( - this, - NOTIFICATION_ID, - notification, - ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA or - ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE, - ) - } else { - startForeground(NOTIFICATION_ID, notification) - } - } - - fun updateNotificationForState(state: StreamingState) { - val content = when (state) { - StreamingState.CONNECTING -> getString(R.string.streaming_notification_connecting) - StreamingState.STREAMING -> getString(R.string.streaming_notification_streaming) - StreamingState.RECONNECTING -> getString(R.string.streaming_notification_reconnecting) - StreamingState.ERROR -> getString(R.string.streaming_notification_error) - else -> getString(R.string.streaming_notification_active) - } - val manager = getSystemService(NotificationManager::class.java) - manager.notify(NOTIFICATION_ID, buildNotification(content)) - } - - private fun buildNotification(content: String): Notification { - val launchIntent = packageManager.getLaunchIntentForPackage(packageName) - val contentIntent = PendingIntent.getActivity( - this, - 0, - launchIntent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, - ) - val stopIntent = PendingIntent.getService( - this, - 1, - Companion.stopIntent(this), - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, - ) - - return NotificationCompat.Builder(this, CHANNEL_ID) - .setContentTitle(getString(R.string.streaming_notification_title)) - .setContentText(content) - .setSmallIcon(R.mipmap.ic_launcher) - .setOngoing(true) - .setContentIntent(contentIntent) - .addAction( - android.R.drawable.ic_media_pause, - getString(R.string.streaming_notification_stop), - stopIntent, - ) - .setCategory(NotificationCompat.CATEGORY_SERVICE) - .setPriority(NotificationCompat.PRIORITY_LOW) - .build() - } - - private fun createNotificationChannel() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { - return - } - val manager = getSystemService(NotificationManager::class.java) - val channel = NotificationChannel( - CHANNEL_ID, - getString(R.string.streaming_notification_channel), - NotificationManager.IMPORTANCE_LOW, - ).apply { - description = getString(R.string.streaming_notification_channel_desc) - } - manager.createNotificationChannel(channel) - } - - private fun acquireWakeLock() { - if (wakeLock?.isHeld == true) { - return - } - val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager - wakeLock = powerManager.newWakeLock( - PowerManager.PARTIAL_WAKE_LOCK, - "$packageName:StreamingWakeLock", - ).apply { - setReferenceCounted(false) - acquire(SESSION_MAX_MS + 60_000L) - } - } - - private fun releaseWakeLock() { - wakeLock?.let { lock -> - if (lock.isHeld) { - lock.release() - } - } - wakeLock = null - } - - companion object { - const val ACTION_START = "com.matchlivetv.match_live_tv.action.START_STREAM" - const val ACTION_STOP = "com.matchlivetv.match_live_tv.action.STOP_STREAM" - - private const val CHANNEL_ID = "match_live_tv_streaming" - private const val NOTIFICATION_ID = 1001 - private val SESSION_MAX_MS = 90L * 60L * 1000L - - fun startIntent(context: Context): Intent { - return Intent(context, StreamingForegroundService::class.java).apply { - action = ACTION_START - } - } - - fun stopIntent(context: Context): Intent { - return Intent(context, StreamingForegroundService::class.java).apply { - action = ACTION_STOP - } - } - } -} - -object ServiceEventBus { - private val listeners = mutableSetOf<(Map) -> Unit>() - - fun addListener(listener: (Map) -> Unit) { - synchronized(listeners) { - listeners.add(listener) - } - } - - fun removeListener(listener: (Map) -> Unit) { - synchronized(listeners) { - listeners.remove(listener) - } - } - - fun emit(event: Map) { - val snapshot = synchronized(listeners) { listeners.toList() } - snapshot.forEach { it(event) } - } -} diff --git a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingOpenGlView.kt b/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingOpenGlView.kt deleted file mode 100644 index ffcfc83..0000000 --- a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingOpenGlView.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.matchlivetv.match_live_tv - -import android.content.Context -import android.util.AttributeSet -import android.view.SurfaceHolder -import com.pedro.library.view.OpenGlView - -/** - * OpenGlView che non distrugge encoder/GL quando la surface viene persa in rotazione. - * La SurfaceView standard di Pedro chiama stop() in surfaceDestroyed e uccide tutto il pipeline. - */ -class StreamingOpenGlView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, -) : OpenGlView(context, attrs) { - - @Volatile - var preservePipelineOnSurfaceLoss: Boolean = false - - var onPreviewSurfaceLost: (() -> Unit)? = null - - override fun surfaceDestroyed(holder: SurfaceHolder) { - if (preservePipelineOnSurfaceLoss && isRunning) { - setForceRender(false) - onPreviewSurfaceLost?.invoke() - return - } - super.surfaceDestroyed(holder) - } -} diff --git a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingPlugin.kt b/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingPlugin.kt deleted file mode 100644 index 89e22d1..0000000 --- a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingPlugin.kt +++ /dev/null @@ -1,365 +0,0 @@ -package com.matchlivetv.match_live_tv - -import android.content.ComponentName -import android.content.Context -import android.content.Intent -import android.content.ServiceConnection -import android.os.Build -import android.os.IBinder -import io.flutter.embedding.engine.plugins.FlutterPlugin -import io.flutter.embedding.engine.plugins.activity.ActivityAware -import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding -import io.flutter.plugin.common.EventChannel -import io.flutter.plugin.common.MethodCall -import io.flutter.plugin.common.MethodChannel -import io.flutter.plugin.common.MethodChannel.MethodCallHandler -import io.flutter.plugin.common.MethodChannel.Result - -class StreamingPlugin : FlutterPlugin, MethodCallHandler, ActivityAware, EventChannel.StreamHandler { - - private lateinit var appContext: Context - private lateinit var methodChannel: MethodChannel - private lateinit var eventChannel: EventChannel - - private var activityBinding: ActivityPluginBinding? = null - private var eventSink: EventChannel.EventSink? = null - private var boundService: StreamingForegroundService? = null - private var serviceBound = false - - private val engineListener = object : StreamingEngineListener { - override fun onStateChanged(state: StreamingState, message: String?) { - ServiceEventBus.emit( - mapOf( - "type" to "state", - "state" to state.name.lowercase(), - "message" to message, - ), - ) - boundService?.updateNotificationForState(state) - } - - override fun onMetricsUpdated(metrics: StreamingMetrics) { - ServiceEventBus.emit( - mapOf( - "type" to "metrics", - "metrics" to metrics.toMap(), - ), - ) - } - - override fun onError(message: String) { - ServiceEventBus.emit( - mapOf( - "type" to "error", - "message" to message, - ), - ) - } - } - - private val serviceConnection = object : ServiceConnection { - override fun onServiceConnected(name: ComponentName?, service: IBinder?) { - val binder = service as? StreamingForegroundService.LocalBinder ?: return - boundService = binder.getService() - serviceBound = true - } - - override fun onServiceDisconnected(name: ComponentName?) { - boundService = null - serviceBound = false - } - } - - private val busListener: (Map) -> Unit = { event -> - eventSink?.success(event) - } - - override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) { - appContext = binding.applicationContext - methodChannel = MethodChannel(binding.binaryMessenger, METHOD_CHANNEL) - methodChannel.setMethodCallHandler(this) - - eventChannel = EventChannel(binding.binaryMessenger, EVENT_CHANNEL) - eventChannel.setStreamHandler(this) - - binding.platformViewRegistry.registerViewFactory( - PREVIEW_VIEW_TYPE, - StreamingPreviewFactory( - onSurfaceReady = { glView -> - android.os.Handler(android.os.Looper.getMainLooper()).post { - val engine = getOrCreateEngine() - engine.setupPreviewGlView(glView) - engine.onPlatformSurfaceReady(glView) - } - }, - onSurfaceDestroyed = { - android.os.Handler(android.os.Looper.getMainLooper()).post { - getEngine()?.onPlatformSurfaceDestroyed() - } - }, - ), - ) - - ServiceEventBus.addListener(busListener) - } - - override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) { - methodChannel.setMethodCallHandler(null) - eventChannel.setStreamHandler(null) - ServiceEventBus.removeListener(busListener) - releaseEngine() - unbindServiceIfNeeded() - } - - override fun onAttachedToActivity(binding: ActivityPluginBinding) { - activityBinding = binding - } - - override fun onDetachedFromActivityForConfigChanges() { - activityBinding = null - } - - override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) { - activityBinding = binding - } - - private fun attachPreviewIfPossible() { - val glView = StreamPreviewHolder.openGlView as? StreamingOpenGlView ?: return - val engine = getOrCreateEngine() - engine.setupPreviewGlView(glView) - engine.bindStreamPreview(glView) - } - - private fun previewIsReady(): Boolean { - val engine = getEngine() ?: return false - val metrics = engine.getMetrics() - return metrics.isPreviewActive - } - - override fun onDetachedFromActivity() { - activityBinding = null - unbindServiceIfNeeded() - } - - override fun onMethodCall(call: MethodCall, result: Result) { - when (call.method) { - "startStream" -> startStream(call, result) - "resumeStream" -> resumeStream(call, result) - "stopStream" -> stopStream(result) - "pauseStream" -> pauseStream(result) - "getMetrics" -> getMetrics(result) - "startPreview" -> startPreview(result) - "stopPreview" -> stopPreview(result) - "bindPreview" -> bindPreview(result) - "syncOrientation" -> syncOrientation(result) - "unbindPreview" -> unbindPreview(result) - else -> result.notImplemented() - } - } - - override fun onListen(arguments: Any?, events: EventChannel.EventSink?) { - eventSink = events - } - - override fun onCancel(arguments: Any?) { - eventSink = null - } - - private fun startStream(call: MethodCall, result: Result) { - if (activityBinding?.activity == null) { - result.error("no_activity", "Activity non disponibile per lo streaming", null) - return - } - - val args = call.arguments as? Map<*, *> - val rtmpUrl = args?.get("rtmpUrl") as? String - if (rtmpUrl.isNullOrBlank()) { - result.error("invalid_args", "rtmpUrl is required", null) - return - } - - val argWidth = (args["width"] as? Number)?.toInt() ?: 1280 - val argHeight = (args["height"] as? Number)?.toInt() ?: 720 - val portrait = args["portrait"] as? Boolean ?: (argHeight > argWidth) - val config = StreamingConfig( - rtmpUrl = rtmpUrl, - width = (args["width"] as? Number)?.toInt() ?: if (portrait) 720 else 1280, - height = (args["height"] as? Number)?.toInt() ?: if (portrait) 1280 else 720, - videoBitrate = (args["videoBitrate"] as? Number)?.toInt() ?: 2_500_000, - audioBitrate = (args["audioBitrate"] as? Number)?.toInt() ?: 128_000, - fps = (args["fps"] as? Number)?.toInt() ?: 30, - rotation = (args["rotation"] as? Number)?.toInt() ?: 0, - portrait = portrait, - maxReconnectAttempts = (args["maxReconnectAttempts"] as? Number)?.toInt() ?: 10, - reconnectDelayMs = (args["reconnectDelayMs"] as? Number)?.toLong() ?: 5_000L, - ) - - val engine = getOrCreateEngine() - engine.removeListener(engineListener) - engine.addListener(engineListener) - - attachPreviewIfPossible() - - val intent = StreamingForegroundService.startIntent(appContext) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - appContext.startForegroundService(intent) - } else { - appContext.startService(intent) - } - bindServiceIfNeeded() - - try { - engine.startStream(config) - result.success(true) - } catch (exception: Exception) { - appContext.startService(StreamingForegroundService.stopIntent(appContext)) - result.error("start_failed", exception.message, null) - } - } - - private fun resumeStream(call: MethodCall, result: Result) { - if (activityBinding?.activity == null) { - result.error("no_activity", "Activity non disponibile per lo streaming", null) - return - } - - val args = call.arguments as? Map<*, *> - val rtmpUrl = args?.get("rtmpUrl") as? String - if (rtmpUrl.isNullOrBlank()) { - result.error("invalid_args", "rtmpUrl is required", null) - return - } - - val argWidth = (args["width"] as? Number)?.toInt() ?: 1280 - val argHeight = (args["height"] as? Number)?.toInt() ?: 720 - val portrait = args["portrait"] as? Boolean ?: (argHeight > argWidth) - val config = StreamingConfig( - rtmpUrl = rtmpUrl, - width = (args["width"] as? Number)?.toInt() ?: if (portrait) 720 else 1280, - height = (args["height"] as? Number)?.toInt() ?: if (portrait) 1280 else 720, - videoBitrate = (args["videoBitrate"] as? Number)?.toInt() ?: 2_500_000, - audioBitrate = (args["audioBitrate"] as? Number)?.toInt() ?: 128_000, - fps = (args["fps"] as? Number)?.toInt() ?: 30, - rotation = (args["rotation"] as? Number)?.toInt() ?: 0, - portrait = portrait, - maxReconnectAttempts = (args["maxReconnectAttempts"] as? Number)?.toInt() ?: 10, - reconnectDelayMs = (args["reconnectDelayMs"] as? Number)?.toLong() ?: 5_000L, - ) - - val engine = getOrCreateEngine() - engine.removeListener(engineListener) - engine.addListener(engineListener) - attachPreviewIfPossible() - - val intent = StreamingForegroundService.startIntent(appContext) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - appContext.startForegroundService(intent) - } else { - appContext.startService(intent) - } - bindServiceIfNeeded() - - try { - engine.resumeStream(config) - result.success(true) - } catch (exception: Exception) { - appContext.startService(StreamingForegroundService.stopIntent(appContext)) - result.error("resume_failed", exception.message, null) - } - } - - private fun stopStream(result: Result) { - appContext.startService(StreamingForegroundService.stopIntent(appContext)) - getEngine()?.let { engine -> - engine.removeListener(engineListener) - engine.stopStream() - } - unbindServiceIfNeeded() - result.success(true) - } - - private fun pauseStream(result: Result) { - getEngine()?.pauseStream() - result.success(true) - } - - private fun getMetrics(result: Result) { - val metrics = boundService?.getMetrics() - ?: getEngine()?.getMetrics()?.toMap() - ?: emptyMap() - result.success(metrics) - } - - private fun bindPreview(result: Result) { - attachPreviewIfPossible() - result.success(previewIsReady()) - } - - private fun syncOrientation(result: Result) { - getEngine()?.applyOrientationFromSensor() - result.success(true) - } - - private fun unbindPreview(result: Result) { - getEngine()?.unbindStreamPreview() - result.success(true) - } - - private fun startPreview(result: Result) { - attachPreviewIfPossible() - result.success(StreamPreviewHolder.openGlView != null) - } - - private fun stopPreview(result: Result) { - getEngine()?.unbindStreamPreview() - result.success(true) - } - - private fun getOrCreateEngine(): StreamingEngine { - val context = activityBinding?.activity ?: appContext - return StreamingEngineHolder.getOrCreate(context).also { engine -> - engine.removeListener(engineListener) - engine.addListener(engineListener) - } - } - - private fun getEngine(): StreamingEngine? = StreamingEngineHolder.engine - - private fun releaseEngine() { - getEngine()?.let { engine -> - engine.removeListener(engineListener) - engine.stopStream() - } - StreamingEngineHolder.release() - } - - private fun bindServiceIfNeeded() { - if (serviceBound) { - return - } - val intent = Intent(appContext, StreamingForegroundService::class.java) - appContext.bindService( - intent, - serviceConnection, - Context.BIND_AUTO_CREATE, - ) - } - - private fun unbindServiceIfNeeded() { - if (!serviceBound) { - return - } - try { - appContext.unbindService(serviceConnection) - } catch (_: IllegalArgumentException) { - } - serviceBound = false - boundService = null - } - - companion object { - private const val METHOD_CHANNEL = "com.matchlivetv.match_live_tv/streaming" - private const val EVENT_CHANNEL = "com.matchlivetv.match_live_tv/streaming_events" - const val PREVIEW_VIEW_TYPE = "match_live_tv/streaming_preview" - } -} diff --git a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingPreviewPlatformView.kt b/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingPreviewPlatformView.kt deleted file mode 100644 index 8fff3d1..0000000 --- a/mobile/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/StreamingPreviewPlatformView.kt +++ /dev/null @@ -1,95 +0,0 @@ -package com.matchlivetv.match_live_tv - -import android.content.Context -import android.view.SurfaceHolder -import android.view.View -import android.widget.FrameLayout -import io.flutter.plugin.common.StandardMessageCodec -import io.flutter.plugin.platform.PlatformView -import io.flutter.plugin.platform.PlatformViewFactory - -class StreamingPreviewPlatformView( - context: Context, - private val onSurfaceReady: (StreamingOpenGlView) -> Unit, - private val onSurfaceDestroyed: () -> Unit, -) : PlatformView { - - private val openGlView = StreamingOpenGlView(context).apply { - layoutParams = FrameLayout.LayoutParams( - FrameLayout.LayoutParams.MATCH_PARENT, - FrameLayout.LayoutParams.MATCH_PARENT, - ) - } - - private var lastNotifiedWidth = 0 - private var lastNotifiedHeight = 0 - - private val notifyReadyRunnable = Runnable { - if (openGlView.width <= 0 || openGlView.height <= 0) { - return@Runnable - } - val sizeChanged = openGlView.width != lastNotifiedWidth || - openGlView.height != lastNotifiedHeight - if (!sizeChanged && lastNotifiedWidth > 0) { - return@Runnable - } - lastNotifiedWidth = openGlView.width - lastNotifiedHeight = openGlView.height - onSurfaceReady(openGlView) - } - - init { - StreamPreviewHolder.openGlView = openGlView - openGlView.holder.addCallback(object : SurfaceHolder.Callback { - override fun surfaceCreated(holder: SurfaceHolder) { - StreamPreviewHolder.openGlView = openGlView - scheduleReadyDebounced() - } - - override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) { - StreamPreviewHolder.openGlView = openGlView - if (width > 0 && height > 0) { - scheduleReadyDebounced() - } - } - - override fun surfaceDestroyed(holder: SurfaceHolder) { - openGlView.removeCallbacks(notifyReadyRunnable) - lastNotifiedWidth = 0 - lastNotifiedHeight = 0 - onSurfaceDestroyed() - } - }) - } - - private fun scheduleReadyDebounced() { - openGlView.removeCallbacks(notifyReadyRunnable) - openGlView.postDelayed(notifyReadyRunnable, SURFACE_NOTIFY_DEBOUNCE_MS) - } - - override fun getView(): View = openGlView - - override fun dispose() { - openGlView.removeCallbacks(notifyReadyRunnable) - lastNotifiedWidth = 0 - lastNotifiedHeight = 0 - onSurfaceDestroyed() - if (StreamPreviewHolder.openGlView === openGlView) { - StreamPreviewHolder.openGlView = null - } - } - - companion object { - private const val SURFACE_NOTIFY_DEBOUNCE_MS = 600L - } -} - -class StreamingPreviewFactory( - private val onSurfaceReady: (StreamingOpenGlView) -> Unit, - private val onSurfaceDestroyed: () -> Unit, -) : PlatformViewFactory(StandardMessageCodec.INSTANCE) { - - override fun create(context: Context, viewId: Int, args: Any?): PlatformView { - return StreamingPreviewPlatformView(context, onSurfaceReady, onSurfaceDestroyed) - } -} diff --git a/mobile/android/app/src/main/res/drawable-v21/launch_background.xml b/mobile/android/app/src/main/res/drawable-v21/launch_background.xml deleted file mode 100644 index f74085f..0000000 --- a/mobile/android/app/src/main/res/drawable-v21/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/mobile/android/app/src/main/res/drawable/launch_background.xml b/mobile/android/app/src/main/res/drawable/launch_background.xml deleted file mode 100644 index 304732f..0000000 --- a/mobile/android/app/src/main/res/drawable/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/mobile/android/app/src/main/res/values-night/styles.xml b/mobile/android/app/src/main/res/values-night/styles.xml deleted file mode 100644 index 06952be..0000000 --- a/mobile/android/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/mobile/android/app/src/main/res/values/strings.xml b/mobile/android/app/src/main/res/values/strings.xml deleted file mode 100644 index 0b09da7..0000000 --- a/mobile/android/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - Match Live TV - Streaming live - Notifiche durante lo streaming Match Live TV - Match Live TV - Streaming attivo - Connessione al server RTMP… - Trasmissione in corso - Riconnessione in corso… - Errore di streaming - Stop - diff --git a/mobile/android/app/src/main/res/values/styles.xml b/mobile/android/app/src/main/res/values/styles.xml deleted file mode 100644 index cb1ef88..0000000 --- a/mobile/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/mobile/android/app/src/main/res/xml/network_security_config.xml b/mobile/android/app/src/main/res/xml/network_security_config.xml deleted file mode 100644 index 82f15b7..0000000 --- a/mobile/android/app/src/main/res/xml/network_security_config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - 10.0.2.2 - localhost - 127.0.0.1 - - diff --git a/mobile/android/app/src/profile/AndroidManifest.xml b/mobile/android/app/src/profile/AndroidManifest.xml deleted file mode 100644 index 399f698..0000000 --- a/mobile/android/app/src/profile/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/mobile/android/build.gradle.kts b/mobile/android/build.gradle.kts deleted file mode 100644 index d08ad63..0000000 --- a/mobile/android/build.gradle.kts +++ /dev/null @@ -1,25 +0,0 @@ -allprojects { - repositories { - google() - mavenCentral() - maven { url = uri("https://jitpack.io") } - } -} - -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/mobile/android/gradle.properties b/mobile/android/gradle.properties deleted file mode 100644 index e96108c..0000000 --- a/mobile/android/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError -android.useAndroidX=true -# This newDsl flag was added by the Flutter template -android.newDsl=false -# This builtInKotlin flag was added by the Flutter template -android.builtInKotlin=false diff --git a/mobile/android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 2d428bf..0000000 --- a/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-9.1.0-all.zip diff --git a/mobile/android/settings.gradle.kts b/mobile/android/settings.gradle.kts deleted file mode 100644 index 2786c72..0000000 --- a/mobile/android/settings.gradle.kts +++ /dev/null @@ -1,35 +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 "9.0.1" apply false - id("org.jetbrains.kotlin.android") version "2.3.20" apply false -} - -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.PREFER_PROJECT) - repositories { - google() - mavenCentral() - maven { url = uri("https://jitpack.io") } - } -} - -include(":app") diff --git a/mobile/ios/.gitignore b/mobile/ios/.gitignore deleted file mode 100644 index 7a7f987..0000000 --- a/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/mobile/ios/Flutter/AppFrameworkInfo.plist b/mobile/ios/Flutter/AppFrameworkInfo.plist deleted file mode 100644 index 391a902..0000000 --- a/mobile/ios/Flutter/AppFrameworkInfo.plist +++ /dev/null @@ -1,24 +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 - - diff --git a/mobile/ios/Flutter/Debug.xcconfig b/mobile/ios/Flutter/Debug.xcconfig deleted file mode 100644 index 592ceee..0000000 --- a/mobile/ios/Flutter/Debug.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "Generated.xcconfig" diff --git a/mobile/ios/Flutter/Release.xcconfig b/mobile/ios/Flutter/Release.xcconfig deleted file mode 100644 index 592ceee..0000000 --- a/mobile/ios/Flutter/Release.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "Generated.xcconfig" diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj deleted file mode 100644 index abfdfb5..0000000 --- a/mobile/ios/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,644 +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 */; }; - 7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */; }; - 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; - 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 = ""; }; - 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; 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 = ( - 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 331C8082294A63A400263BE5 /* RunnerTests */ = { - isa = PBXGroup; - children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, - ); - path = RunnerTests; - sourceTree = ""; - }; - 9740EEB11CF90186004384FC /* Flutter */ = { - isa = PBXGroup; - children = ( - 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, - 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 */, - 7884E8672EC3CC0400C636F2 /* SceneDelegate.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; - packageProductDependencies = ( - 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, - ); - 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; - packageReferences = ( - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, - ); - 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 */, - 7884E8682EC3CC0700C636F2 /* SceneDelegate.swift 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.matchlivetv.matchLiveTv; - 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.matchlivetv.matchLiveTv.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.matchlivetv.matchLiveTv.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.matchlivetv.matchLiveTv.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.matchlivetv.matchLiveTv; - 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.matchlivetv.matchLiveTv; - 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 */ - -/* Begin XCLocalSwiftPackageReference section */ - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { - isa = XCLocalSwiftPackageReference; - relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; - }; -/* End XCLocalSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { - isa = XCSwiftPackageProductDependency; - productName = FlutterGeneratedPluginSwiftPackage; - }; -/* End XCSwiftPackageProductDependency section */ - }; - rootObject = 97C146E61CF9000F007C117D /* Project object */; -} diff --git a/mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a..0000000 --- a/mobile/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c..0000000 --- a/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100644 index c3fedb2..0000000 --- a/mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mobile/ios/Runner.xcworkspace/contents.xcworkspacedata b/mobile/ios/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d526a1..0000000 --- a/mobile/ios/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/mobile/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c..0000000 --- a/mobile/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/mobile/ios/Runner/AppDelegate.swift b/mobile/ios/Runner/AppDelegate.swift deleted file mode 100644 index c30b367..0000000 --- a/mobile/ios/Runner/AppDelegate.swift +++ /dev/null @@ -1,16 +0,0 @@ -import Flutter -import UIKit - -@main -@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { - override func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? - ) -> Bool { - return super.application(application, didFinishLaunchingWithOptions: launchOptions) - } - - func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { - GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) - } -} diff --git a/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index d36b1fa..0000000 --- a/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/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/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/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/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/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/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/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/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/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/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/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/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/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/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/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/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/mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/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/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json deleted file mode 100644 index 0bedcf2..0000000 --- a/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/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/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/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/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/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/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/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/mobile/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md deleted file mode 100644 index 89c2725..0000000 --- a/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/mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard b/mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index f2e259c..0000000 --- a/mobile/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mobile/ios/Runner/Base.lproj/Main.storyboard b/mobile/ios/Runner/Base.lproj/Main.storyboard deleted file mode 100644 index f3c2851..0000000 --- a/mobile/ios/Runner/Base.lproj/Main.storyboard +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mobile/ios/Runner/Info.plist b/mobile/ios/Runner/Info.plist deleted file mode 100644 index 2189020..0000000 --- a/mobile/ios/Runner/Info.plist +++ /dev/null @@ -1,70 +0,0 @@ - - - - - CADisableMinimumFrameDurationOnPhone - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Match Live TV - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - match_live_tv - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSRequiresIPhoneOS - - UIApplicationSceneManifest - - UIApplicationSupportsMultipleScenes - - UISceneConfigurations - - UIWindowSceneSessionRoleApplication - - - UISceneClassName - UIWindowScene - UISceneConfigurationName - flutter - UISceneDelegateClassName - $(PRODUCT_MODULE_NAME).SceneDelegate - UISceneStoryboardFile - Main - - - - - UIApplicationSupportsIndirectInputEvents - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/mobile/ios/Runner/Runner-Bridging-Header.h b/mobile/ios/Runner/Runner-Bridging-Header.h deleted file mode 100644 index 308a2a5..0000000 --- a/mobile/ios/Runner/Runner-Bridging-Header.h +++ /dev/null @@ -1 +0,0 @@ -#import "GeneratedPluginRegistrant.h" diff --git a/mobile/ios/Runner/SceneDelegate.swift b/mobile/ios/Runner/SceneDelegate.swift deleted file mode 100644 index b9ce8ea..0000000 --- a/mobile/ios/Runner/SceneDelegate.swift +++ /dev/null @@ -1,6 +0,0 @@ -import Flutter -import UIKit - -class SceneDelegate: FlutterSceneDelegate { - -} diff --git a/mobile/ios/RunnerTests/RunnerTests.swift b/mobile/ios/RunnerTests/RunnerTests.swift deleted file mode 100644 index 86a7c3b..0000000 --- a/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/mobile/lib/app/router.dart b/mobile/lib/app/router.dart deleted file mode 100644 index 4e62848..0000000 --- a/mobile/lib/app/router.dart +++ /dev/null @@ -1,84 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:go_router/go_router.dart'; - -import '../features/auth/login_screen.dart'; -import '../features/auth/splash_screen.dart'; -import '../features/camera_mode/camera_screen.dart'; -import '../features/archive/archive_screen.dart'; -import '../features/matches/matches_screen.dart'; -import '../features/setup_wizard/wizard_shell.dart'; -import '../providers/auth_provider.dart'; - -/// Notifica GoRouter solo su cambi auth rilevanti (non su ogni loading tick). -class _AuthRefreshNotifier extends ChangeNotifier { - _AuthRefreshNotifier(this._ref) { - _ref.listen(authProvider, (prev, next) { - final authChanged = prev?.isAuthenticated != next.isAuthenticated; - if (authChanged) notifyListeners(); - }); - } - - final Ref _ref; -} - -final routerProvider = Provider((ref) { - final refresh = _AuthRefreshNotifier(ref); - - return GoRouter( - initialLocation: '/', - refreshListenable: refresh, - redirect: (context, state) { - final auth = ref.read(authProvider); - final loggingIn = state.matchedLocation == '/login'; - final onSplash = state.matchedLocation == '/'; - - if (onSplash) return null; - - if (!auth.isAuthenticated && !loggingIn) { - return '/login'; - } - - if (auth.isAuthenticated && loggingIn) { - return '/matches'; - } - - return null; - }, - routes: [ - GoRoute( - path: '/', - builder: (context, state) => const SplashScreen(), - ), - GoRoute( - path: '/login', - builder: (context, state) => LoginScreen( - inviteToken: state.uri.queryParameters['invite'], - ), - ), - GoRoute( - path: '/matches', - builder: (context, state) => const MatchesScreen(), - ), - GoRoute( - path: '/archive', - builder: (context, state) => const ArchiveScreen(), - ), - GoRoute( - path: '/setup/:matchId/:step', - builder: (context, state) { - final matchId = state.pathParameters['matchId']!; - final step = int.tryParse(state.pathParameters['step'] ?? '1') ?? 1; - return WizardShell(matchId: matchId, step: step); - }, - ), - GoRoute( - path: '/session/:id/camera', - builder: (context, state) { - final sessionId = state.pathParameters['id']!; - return CameraScreen(sessionId: sessionId); - }, - ), - ], - ); -}); diff --git a/mobile/lib/app/theme.dart b/mobile/lib/app/theme.dart deleted file mode 100644 index 64bd13c..0000000 --- a/mobile/lib/app/theme.dart +++ /dev/null @@ -1,93 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:google_fonts/google_fonts.dart'; - -/// Brand Match Live TV — dark theme, rosso #FF2D2D, Barlow Condensed. -class AppTheme { - AppTheme._(); - - static const Color primaryRed = Color(0xFFFF2D2D); - static const Color background = Color(0xFF0A0A0A); - static const Color surface = Color(0xFF1E1E1E); - static const Color surfaceElevated = Color(0xFF2A2A2A); - static const Color accentYellow = Color(0xFFF5C518); - static const Color successGreen = Color(0xFF22C55E); - static const Color textSecondary = Color(0xFF9CA3AF); - - static TextTheme get _textTheme { - final base = GoogleFonts.barlowCondensedTextTheme( - ThemeData.dark().textTheme, - ); - return base.copyWith( - displayLarge: base.displayLarge?.copyWith( - fontWeight: FontWeight.w900, - letterSpacing: -0.5, - ), - displayMedium: base.displayMedium?.copyWith(fontWeight: FontWeight.w900), - displaySmall: base.displaySmall?.copyWith(fontWeight: FontWeight.w900), - headlineLarge: base.headlineLarge?.copyWith(fontWeight: FontWeight.w900), - headlineMedium: base.headlineMedium?.copyWith(fontWeight: FontWeight.w800), - headlineSmall: base.headlineSmall?.copyWith(fontWeight: FontWeight.w800), - titleLarge: base.titleLarge?.copyWith(fontWeight: FontWeight.w700), - titleMedium: base.titleMedium?.copyWith(fontWeight: FontWeight.w700), - labelLarge: base.labelLarge?.copyWith( - fontWeight: FontWeight.w800, - letterSpacing: 1.2, - ), - bodyLarge: base.bodyLarge?.copyWith(fontWeight: FontWeight.w500), - bodyMedium: base.bodyMedium?.copyWith( - fontWeight: FontWeight.w500, - color: textSecondary, - ), - ); - } - - static ThemeData get dark { - return ThemeData( - useMaterial3: true, - brightness: Brightness.dark, - scaffoldBackgroundColor: background, - colorScheme: const ColorScheme.dark( - primary: primaryRed, - secondary: accentYellow, - surface: surface, - error: primaryRed, - onPrimary: Colors.white, - onSecondary: Colors.black, - onSurface: Colors.white, - ), - textTheme: _textTheme, - appBarTheme: AppBarTheme( - backgroundColor: background, - elevation: 0, - centerTitle: true, - titleTextStyle: _textTheme.titleLarge?.copyWith(color: Colors.white), - iconTheme: const IconThemeData(color: Colors.white), - ), - cardTheme: CardThemeData( - color: surface, - elevation: 0, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), - ), - inputDecorationTheme: InputDecorationTheme( - filled: true, - fillColor: surfaceElevated, - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(10), - borderSide: BorderSide.none, - ), - labelStyle: _textTheme.bodyMedium, - hintStyle: _textTheme.bodyMedium, - ), - segmentedButtonTheme: SegmentedButtonThemeData( - style: ButtonStyle( - backgroundColor: WidgetStateProperty.resolveWith((states) { - if (states.contains(WidgetState.selected)) return primaryRed; - return surfaceElevated; - }), - foregroundColor: WidgetStateProperty.all(Colors.white), - ), - ), - dividerColor: surfaceElevated, - ); - } -} diff --git a/mobile/lib/core/auth_storage.dart b/mobile/lib/core/auth_storage.dart deleted file mode 100644 index ed379dc..0000000 --- a/mobile/lib/core/auth_storage.dart +++ /dev/null @@ -1,64 +0,0 @@ -import 'package:shared_preferences/shared_preferences.dart'; - -import '../shared/models/user.dart'; - -class AuthStorage { - static const _keyAccess = 'auth_access_token'; - static const _keyRefresh = 'auth_refresh_token'; - static const _keyUserId = 'auth_user_id'; - static const _keyUserEmail = 'auth_user_email'; - static const _keyUserName = 'auth_user_name'; - static const _keyUserRole = 'auth_user_role'; - - static Future<({User user, String accessToken, String refreshToken})?> load() async { - final prefs = await SharedPreferences.getInstance(); - final access = prefs.getString(_keyAccess); - final refresh = prefs.getString(_keyRefresh); - final userId = prefs.getString(_keyUserId); - final email = prefs.getString(_keyUserEmail); - final name = prefs.getString(_keyUserName); - if (access == null || - access.isEmpty || - refresh == null || - refresh.isEmpty || - userId == null || - email == null || - name == null) { - return null; - } - return ( - user: User( - id: userId, - email: email, - name: name, - role: prefs.getString(_keyUserRole) ?? 'coach', - ), - accessToken: access, - refreshToken: refresh, - ); - } - - static Future save({ - required User user, - required String accessToken, - required String refreshToken, - }) async { - final prefs = await SharedPreferences.getInstance(); - await prefs.setString(_keyAccess, accessToken); - await prefs.setString(_keyRefresh, refreshToken); - await prefs.setString(_keyUserId, user.id); - await prefs.setString(_keyUserEmail, user.email); - await prefs.setString(_keyUserName, user.name); - await prefs.setString(_keyUserRole, user.role); - } - - static Future clear() async { - final prefs = await SharedPreferences.getInstance(); - await prefs.remove(_keyAccess); - await prefs.remove(_keyRefresh); - await prefs.remove(_keyUserId); - await prefs.remove(_keyUserEmail); - await prefs.remove(_keyUserName); - await prefs.remove(_keyUserRole); - } -} diff --git a/mobile/lib/core/config.dart b/mobile/lib/core/config.dart deleted file mode 100644 index 035886f..0000000 --- a/mobile/lib/core/config.dart +++ /dev/null @@ -1,24 +0,0 @@ -/// Configurazione globale dell'app Match Live TV. -class AppConfig { - AppConfig._(); - - /// URL base API Rails. Default emulatore Android → host localhost. - static const String apiBaseUrl = String.fromEnvironment( - 'API_BASE_URL', - defaultValue: 'http://10.0.2.2:3000', - ); - - static String get apiV1 => '$apiBaseUrl/api/v1'; - - static String get cableUrl { - final uri = Uri.parse(apiBaseUrl); - final wsScheme = uri.scheme == 'https' ? 'wss' : 'ws'; - final defaultPort = uri.scheme == 'https' ? 443 : 80; - final port = uri.hasPort ? uri.port : defaultPort; - // Evita :443/:80 espliciti — alcuni client WebSocket/NPM li gestiscono male - if (port == defaultPort) { - return '$wsScheme://${uri.host}/cable'; - } - return '$wsScheme://${uri.host}:$port/cable'; - } -} diff --git a/mobile/lib/core/deep_link_listener.dart b/mobile/lib/core/deep_link_listener.dart deleted file mode 100644 index f9a5c1f..0000000 --- a/mobile/lib/core/deep_link_listener.dart +++ /dev/null @@ -1,77 +0,0 @@ -import 'dart:async'; - -import 'package:app_links/app_links.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:go_router/go_router.dart'; - -import '../features/matches/team_providers.dart'; -import 'invite_storage.dart'; - -/// Gestisce link invito (join) e ritorno OAuth YouTube dall'app. -class DeepLinkListener extends ConsumerStatefulWidget { - const DeepLinkListener({super.key, required this.child}); - - final Widget child; - - @override - ConsumerState createState() => _DeepLinkListenerState(); -} - -class _DeepLinkListenerState extends ConsumerState { - final _appLinks = AppLinks(); - StreamSubscription? _sub; - - @override - void initState() { - super.initState(); - _handleInitialLink(); - _sub = _appLinks.uriLinkStream.listen(_onUri, onError: (_) {}); - } - - Future _handleInitialLink() async { - final uri = await _appLinks.getInitialLink(); - if (uri != null) await _onUri(uri); - } - - Future _onUri(Uri uri) async { - final inviteToken = _extractInviteToken(uri); - if (inviteToken != null) { - await InviteStorage.saveToken(inviteToken); - if (!mounted) return; - context.go('/login?invite=$inviteToken'); - return; - } - - if (uri.scheme == 'matchlivetv' && uri.host == 'youtube-connected') { - ref.invalidate(teamsProvider); - if (!mounted) return; - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Canale YouTube collegato. Puoi selezionare YouTube Live.'), - duration: Duration(seconds: 4), - ), - ); - } - } - - String? _extractInviteToken(Uri uri) { - if (uri.scheme == 'matchlivetv' && uri.host == 'join') { - final segment = uri.pathSegments.isNotEmpty ? uri.pathSegments.first : uri.path.replaceFirst('/', ''); - return segment.isEmpty ? null : segment; - } - if (uri.pathSegments.length >= 2 && uri.pathSegments.first == 'join') { - return uri.pathSegments[1]; - } - return null; - } - - @override - void dispose() { - _sub?.cancel(); - super.dispose(); - } - - @override - Widget build(BuildContext context) => widget.child; -} diff --git a/mobile/lib/core/invite_storage.dart b/mobile/lib/core/invite_storage.dart deleted file mode 100644 index 587edc4..0000000 --- a/mobile/lib/core/invite_storage.dart +++ /dev/null @@ -1,20 +0,0 @@ -import 'package:shared_preferences/shared_preferences.dart'; - -class InviteStorage { - static const _keyToken = 'pending_invite_token'; - - static Future saveToken(String token) async { - final prefs = await SharedPreferences.getInstance(); - await prefs.setString(_keyToken, token); - } - - static Future readToken() async { - final prefs = await SharedPreferences.getInstance(); - return prefs.getString(_keyToken); - } - - static Future clear() async { - final prefs = await SharedPreferences.getInstance(); - await prefs.remove(_keyToken); - } -} diff --git a/mobile/lib/core/team_selection_storage.dart b/mobile/lib/core/team_selection_storage.dart deleted file mode 100644 index f442fbd..0000000 --- a/mobile/lib/core/team_selection_storage.dart +++ /dev/null @@ -1,22 +0,0 @@ -import 'package:shared_preferences/shared_preferences.dart'; - -class TeamSelectionStorage { - static const _keySelectedTeamId = 'selected_team_id'; - - static Future load() async { - final prefs = await SharedPreferences.getInstance(); - final id = prefs.getString(_keySelectedTeamId); - if (id == null || id.isEmpty) return null; - return id; - } - - static Future save(String teamId) async { - final prefs = await SharedPreferences.getInstance(); - await prefs.setString(_keySelectedTeamId, teamId); - } - - static Future clear() async { - final prefs = await SharedPreferences.getInstance(); - await prefs.remove(_keySelectedTeamId); - } -} diff --git a/mobile/lib/features/archive/archive_screen.dart b/mobile/lib/features/archive/archive_screen.dart deleted file mode 100644 index fbdbea0..0000000 --- a/mobile/lib/features/archive/archive_screen.dart +++ /dev/null @@ -1,216 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:go_router/go_router.dart'; -import 'package:intl/intl.dart'; -import 'package:url_launcher/url_launcher.dart'; - -import '../../app/theme.dart'; -import '../../shared/api_client.dart'; -import '../../shared/models/recording_item.dart'; -import '../../shared/premium_dialog.dart'; -import '../matches/team_providers.dart'; - -class ArchiveScreen extends ConsumerWidget { - const ArchiveScreen({super.key}); - - @override - Widget build(BuildContext context, WidgetRef ref) { - final teamAsync = ref.watch(activeTeamProvider); - final theme = Theme.of(context); - - return Scaffold( - appBar: AppBar( - title: const Text('Replay'), - leading: IconButton( - icon: const Icon(Icons.arrow_back), - onPressed: () => context.go('/matches'), - ), - ), - body: teamAsync.when( - loading: () => const Center( - child: CircularProgressIndicator(color: AppTheme.primaryRed), - ), - error: (e, _) => Center(child: Text('Errore: $e')), - data: (team) { - if (team == null) { - return const Center(child: Text('Nessuna squadra')); - } - if (!team.canUseRecordings) { - return Center( - child: Padding( - padding: const EdgeInsets.all(24), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - 'Replay disponibili con Premium Light o Full', - style: theme.textTheme.titleMedium, - textAlign: TextAlign.center, - ), - const SizedBox(height: 8), - Text( - 'Light: 30 giorni · Full: 90 giorni', - style: theme.textTheme.bodyMedium?.copyWith(color: Colors.white70), - textAlign: TextAlign.center, - ), - const SizedBox(height: 16), - FilledButton( - onPressed: () => showPremiumRequiredDialog( - context, - message: 'Salva e rivedi le gare con il piano Premium.', - billingUrl: team.billingUrl, - ), - style: FilledButton.styleFrom( - backgroundColor: AppTheme.primaryRed, - ), - child: const Text('Scopri Premium'), - ), - ], - ), - ), - ); - } - - final recsAsync = ref.watch(recordingsProvider(team.id)); - return recsAsync.when( - loading: () => const Center( - child: CircularProgressIndicator(color: AppTheme.primaryRed), - ), - error: (e, _) => Center(child: Text('$e')), - data: (recs) { - if (recs.isEmpty) { - return const Center( - child: Padding( - padding: EdgeInsets.all(24), - child: Text( - 'Nessun replay ancora.\nAl termine delle dirette Premium le registrazioni compaiono qui.', - textAlign: TextAlign.center, - ), - ), - ); - } - final df = DateFormat('d MMM yyyy · HH:mm', 'it_IT'); - return ListView.builder( - padding: const EdgeInsets.all(16), - itemCount: recs.length, - itemBuilder: (context, i) { - final r = recs[i]; - final when = r.recordedAt ?? r.endedAt; - final subtitle = [ - if (when != null) df.format(when.toLocal()), - if (r.durationLabel != null) r.durationLabel, - if (r.viewsLabel != null) r.viewsLabel, - r.statusLabel, - if (r.expiresAt != null) - 'Scade ${DateFormat('d MMM', 'it_IT').format(r.expiresAt!.toLocal())}', - ].whereType().join(' · '); - - return Card( - color: AppTheme.surface, - child: ListTile( - leading: r.thumbnailUrl != null - ? ClipRRect( - borderRadius: BorderRadius.circular(6), - child: Image.network( - r.thumbnailUrl!, - width: 72, - height: 40, - fit: BoxFit.cover, - errorBuilder: (context, error, stackTrace) => - const Icon(Icons.movie), - ), - ) - : const Icon(Icons.movie_outlined, size: 40), - title: Text(r.title), - subtitle: Text(subtitle), - isThreeLine: true, - trailing: r.isProcessing - ? const SizedBox( - width: 24, - height: 24, - child: CircularProgressIndicator(strokeWidth: 2), - ) - : PopupMenuButton( - onSelected: (action) => _onMenuAction( - context, - ref, - action, - r, - team.canDownloadOnPhone, - ), - itemBuilder: (_) => [ - if (r.isReady) - const PopupMenuItem( - value: 'play', - child: Text('Guarda replay'), - ), - if (r.isReady && r.downloadEnabled && team.canDownloadOnPhone) - const PopupMenuItem( - value: 'download', - child: Text('Scarica MP4'), - ), - if (r.youtubeWatchUrl != null) - const PopupMenuItem( - value: 'youtube', - child: Text('Apri su YouTube'), - ), - ], - ), - onTap: r.isReady ? () => _openReplay(r.replayUrl) : null, - ), - ); - }, - ); - }, - ); - }, - ), - ); - } - - Future _openReplay(String? url) async { - if (url == null) return; - final uri = Uri.parse(url); - if (await canLaunchUrl(uri)) { - await launchUrl(uri, mode: LaunchMode.inAppBrowserView); - } - } - - Future _onMenuAction( - BuildContext context, - WidgetRef ref, - String action, - RecordingItem r, - bool canDownload, - ) async { - switch (action) { - case 'play': - await _openReplay(r.replayUrl); - break; - case 'download': - if (!canDownload) return; - try { - final url = await ref.read(apiClientProvider).fetchRecordingDownloadUrl(r.id); - final uri = Uri.parse(url); - if (await canLaunchUrl(uri)) { - await launchUrl(uri, mode: LaunchMode.externalApplication); - } - } catch (e) { - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Download: $e')), - ); - } - } - break; - case 'youtube': - final yt = r.youtubeWatchUrl; - if (yt == null) return; - final uri = Uri.parse(yt); - if (await canLaunchUrl(uri)) { - await launchUrl(uri, mode: LaunchMode.externalApplication); - } - break; - } - } -} diff --git a/mobile/lib/features/auth/login_screen.dart b/mobile/lib/features/auth/login_screen.dart deleted file mode 100644 index f4ebed7..0000000 --- a/mobile/lib/features/auth/login_screen.dart +++ /dev/null @@ -1,267 +0,0 @@ -import 'package:connectivity_plus/connectivity_plus.dart'; -import 'package:dio/dio.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:go_router/go_router.dart'; - -import '../../app/theme.dart'; -import '../../core/invite_storage.dart'; -import '../../features/matches/team_providers.dart'; -import '../../providers/auth_provider.dart'; -import '../../shared/api_client.dart'; -import '../../shared/models/invite_preview.dart'; -import '../../shared/widgets/match_live_wordmark.dart'; -import '../../shared/widgets/primary_cta.dart'; -import '../../shared/widgets/screen_insets.dart'; - -class LoginScreen extends ConsumerStatefulWidget { - const LoginScreen({super.key, this.inviteToken}); - - final String? inviteToken; - - @override - ConsumerState createState() => _LoginScreenState(); -} - -class _LoginScreenState extends ConsumerState { - final _formKey = GlobalKey(); - final _emailController = TextEditingController(); - final _passwordController = TextEditingController(text: 'password123'); - bool _obscure = true; - InvitePreview? _invite; - String? _inviteToken; - bool _loadingInvite = false; - - @override - void initState() { - super.initState(); - _bootstrapInvite(); - } - - Future _bootstrapInvite() async { - _inviteToken = widget.inviteToken ?? await InviteStorage.readToken(); - if (_inviteToken == null) return; - - setState(() => _loadingInvite = true); - try { - final preview = await ApiClient().fetchInvitePreview(_inviteToken!); - if (!mounted) return; - setState(() { - _invite = preview; - if (preview.email.isNotEmpty) { - _emailController.text = preview.email; - } - }); - } catch (_) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Invito non valido o scaduto')), - ); - } - await InviteStorage.clear(); - } finally { - if (mounted) setState(() => _loadingInvite = false); - } - } - - @override - void dispose() { - _emailController.dispose(); - _passwordController.dispose(); - super.dispose(); - } - - Future _acceptInviteIfNeeded(ApiClient client) async { - final token = _inviteToken; - if (token == null) return; - - try { - final message = await client.acceptInvitation(token); - await InviteStorage.clear(); - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text(message)), - ); - } - } on DioException catch (e) { - final err = e.response?.data; - final msg = err is Map ? (err['error'] as String?) : null; - if (mounted && msg != null) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(msg))); - } - rethrow; - } - } - - Future _login() async { - if (!_formKey.currentState!.validate()) return; - - final connectivity = await Connectivity().checkConnectivity(); - if (connectivity.contains(ConnectivityResult.none)) { - ref.read(authProvider.notifier).setError( - 'Nessuna connessione. Disattiva la modalità aereo e verifica Wi‑Fi.', - ); - return; - } - - ref.read(authProvider.notifier).setLoading(true); - try { - final client = ApiClient(); - final result = await client.login( - email: _emailController.text.trim(), - password: _passwordController.text, - ); - ref.read(authProvider.notifier).setSession( - user: result.user, - accessToken: result.tokens.accessToken, - refreshToken: result.tokens.refreshToken, - ); - - final authed = ApiClient(accessToken: result.tokens.accessToken); - if (_inviteToken != null) { - await _acceptInviteIfNeeded(authed); - } - - ref.invalidate(teamsProvider); - ref.invalidate(matchesProvider); - ref.read(authProvider.notifier).setLoading(false); - if (mounted) context.go('/matches'); - return; - } on DioException catch (e) { - if (e.response?.statusCode == 422) { - ref.read(authProvider.notifier).setLoading(false); - return; - } - final message = switch (e.type) { - DioExceptionType.connectionTimeout || - DioExceptionType.receiveTimeout || - DioExceptionType.connectionError => - 'Server non raggiungibile. Verifica che il backend sia avviato (docker compose up).', - DioExceptionType.badResponse when e.response?.statusCode == 401 => - 'Email o password non corretti', - _ => 'Errore di rete: ${e.message}', - }; - ref.read(authProvider.notifier).setError(message); - } catch (e) { - ref.read(authProvider.notifier).setError('Errore imprevisto: $e'); - } - ref.read(authProvider.notifier).setLoading(false); - } - - @override - Widget build(BuildContext context) { - final auth = ref.watch(authProvider); - final theme = Theme.of(context); - - return Scaffold( - body: SingleChildScrollView( - padding: ScreenInsets.contentPadding(context, horizontal: 24, vertical: 16), - child: Form( - key: _formKey, - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - const SizedBox(height: 32), - const Center(child: MatchLiveWordmark(showSlogan: true)), - const SizedBox(height: 48), - if (_loadingInvite) - const Padding( - padding: EdgeInsets.only(bottom: 16), - child: Center( - child: CircularProgressIndicator(color: AppTheme.primaryRed), - ), - ), - if (_invite != null) ...[ - Container( - padding: const EdgeInsets.all(14), - decoration: BoxDecoration( - color: AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(10), - border: Border.all(color: AppTheme.primaryRed.withValues(alpha: 0.35)), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Invito staff', - style: theme.textTheme.titleMedium?.copyWith(color: AppTheme.primaryRed), - ), - const SizedBox(height: 6), - Text( - 'Entra in ${_invite!.teamName} come responsabile trasmissione.', - style: theme.textTheme.bodyMedium, - ), - const SizedBox(height: 4), - Text( - 'Accedi con ${_invite!.email}', - style: theme.textTheme.bodySmall, - ), - ], - ), - ), - const SizedBox(height: 20), - ], - Text( - 'ACCEDI', - style: theme.textTheme.headlineMedium, - textAlign: TextAlign.center, - ), - const SizedBox(height: 8), - Text( - _invite != null - ? 'Usa l\'email dell\'invito, poi collega YouTube e vai in diretta' - : 'Gestisci le dirette della tua squadra', - style: theme.textTheme.bodyMedium, - textAlign: TextAlign.center, - ), - const SizedBox(height: 32), - TextFormField( - controller: _emailController, - keyboardType: TextInputType.emailAddress, - readOnly: _invite != null, - decoration: const InputDecoration( - labelText: 'Email', - hintText: 'coach@squadra.it', - ), - validator: (v) => - v == null || v.isEmpty ? 'Inserisci l\'email' : null, - ), - const SizedBox(height: 16), - TextFormField( - controller: _passwordController, - obscureText: _obscure, - decoration: InputDecoration( - labelText: 'Password', - suffixIcon: IconButton( - icon: Icon( - _obscure ? Icons.visibility : Icons.visibility_off, - ), - onPressed: () => setState(() => _obscure = !_obscure), - ), - ), - validator: (v) => - v == null || v.isEmpty ? 'Inserisci la password' : null, - ), - if (auth.error != null) ...[ - const SizedBox(height: 12), - Text( - auth.error!, - style: theme.textTheme.bodyMedium?.copyWith( - color: AppTheme.primaryRed, - ), - textAlign: TextAlign.center, - ), - ], - const SizedBox(height: 32), - PrimaryCta( - label: _invite != null ? 'ACCEDI E ACCETTA INVITO' : 'ACCEDI', - loading: auth.loading, - onPressed: _login, - ), - ], - ), - ), - ), - ); - } -} diff --git a/mobile/lib/features/auth/splash_screen.dart b/mobile/lib/features/auth/splash_screen.dart deleted file mode 100644 index 2b25bdc..0000000 --- a/mobile/lib/features/auth/splash_screen.dart +++ /dev/null @@ -1,68 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:go_router/go_router.dart'; - -import '../../app/theme.dart'; -import '../../providers/auth_provider.dart'; -import '../../shared/widgets/match_live_wordmark.dart'; -import '../../shared/widgets/screen_insets.dart'; - -/// Splash con wordmark e slogan. -class SplashScreen extends ConsumerStatefulWidget { - const SplashScreen({super.key}); - - @override - ConsumerState createState() => _SplashScreenState(); -} - -class _SplashScreenState extends ConsumerState { - @override - void initState() { - super.initState(); - _bootstrap(); - } - - Future _bootstrap() async { - final notifier = ref.read(authProvider.notifier); - await notifier.restoreSession(); - await Future.delayed(const Duration(milliseconds: 400)); - if (!mounted) return; - - var auth = ref.read(authProvider); - if (auth.isAuthenticated) { - final ok = await notifier.validateOrRefreshSession(); - if (!mounted) return; - auth = ref.read(authProvider); - if (!ok || !auth.isAuthenticated) { - context.go('/login'); - return; - } - } - - if (!mounted) return; - if (auth.isAuthenticated) { - context.go('/matches'); - } else { - context.go('/login'); - } - } - - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: AppTheme.background, - body: AppSafeArea( - child: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const MatchLiveWordmark(showSlogan: true), - const SizedBox(height: 48), - const CircularProgressIndicator(color: AppTheme.primaryRed), - ], - ), - ), - ), - ); - } -} diff --git a/mobile/lib/features/camera_mode/camera_screen.dart b/mobile/lib/features/camera_mode/camera_screen.dart deleted file mode 100644 index 4031562..0000000 --- a/mobile/lib/features/camera_mode/camera_screen.dart +++ /dev/null @@ -1,923 +0,0 @@ -import 'dart:async'; -import 'dart:math' as math; - -import 'package:battery_plus/battery_plus.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:go_router/go_router.dart'; -import 'package:permission_handler/permission_handler.dart'; -import 'package:wakelock_plus/wakelock_plus.dart'; - -import '../../app/theme.dart'; -import '../../platform/streaming_channel.dart'; -import '../../platform/streaming_preview.dart'; -import '../../providers/match_rules_provider.dart'; -import '../../providers/score_provider.dart'; -import '../../providers/score_sync_provider.dart'; -import '../../shared/api_client.dart'; -import '../../shared/regia_share.dart'; -import '../../shared/watch_share.dart'; -import '../../shared/models/score_state.dart'; -import '../../providers/session_provider.dart'; -import '../../shared/websocket_service.dart'; -import '../../shared/widgets/camera_compact_metrics.dart'; -import '../../shared/widgets/live_score_controls.dart'; -import '../../shared/widgets/destructive_cta.dart'; -import '../../shared/widgets/end_stream_dialog.dart'; -import '../../shared/widgets/live_badge.dart'; -import '../../shared/widgets/screen_insets.dart'; - -class CameraScreen extends ConsumerStatefulWidget { - const CameraScreen({super.key, required this.sessionId}); - - final String sessionId; - - @override - ConsumerState createState() => _CameraScreenState(); -} - -class _CameraScreenState extends ConsumerState { - static const _previewKey = ValueKey('camera_streaming_preview'); - - Timer? _elapsedTimer; - Timer? _sessionSyncTimer; - Timer? _telemetryTimer; - Timer? _statsTimer; - Timer? _scorePullTimer; - int _batteryLevel = 100; - int? _lastDelta; - int _prevHomePoints = 0; - int _prevAwayPoints = 0; - - double _bitrateMbps = 0; - int _fps = 0; - String _networkType = '4G'; - int _viewerCount = 0; - - StreamSubscription>? _metricsSub; - bool _pauseInFlight = false; - bool _resumeInFlight = false; - String? _lastStreamErrorShown; - - @override - void initState() { - super.initState(); - WakelockPlus.enable(); - _lockOrientations(); - _bootstrap(); - _readBattery(); - _elapsedTimer = Timer.periodic(const Duration(seconds: 1), (_) { - final session = ref.read(sessionProvider).session; - if (session?.startedAt != null) { - ref.read(sessionProvider.notifier).setElapsed( - DateTime.now().difference(session!.startedAt!), - ); - } else { - ref.read(sessionProvider.notifier).setElapsed(Duration.zero); - } - }); - _sessionSyncTimer = Timer.periodic(const Duration(seconds: 15), (_) { - unawaited(_syncSessionStartedAt()); - }); - _telemetryTimer = Timer.periodic(const Duration(seconds: 10), (_) => _sendTelemetry()); - _statsTimer = Timer.periodic(const Duration(seconds: 30), (_) => _fetchStats()); - _scorePullTimer = Timer.periodic(const Duration(seconds: 2), (_) { - unawaited(ref.read(scoreSyncProvider).pullFromServer()); - }); - } - - Map _streamVideoParams(BuildContext context) { - final portrait = MediaQuery.orientationOf(context) == Orientation.portrait; - return { - 'width': portrait ? 720 : 1280, - 'height': portrait ? 1280 : 720, - 'portrait': portrait, - }; - } - - Future _ensurePermissions() async { - final camera = await Permission.camera.request(); - final mic = await Permission.microphone.request(); - if (camera.isGranted && mic.isGranted) return true; - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Servono permessi fotocamera e microfono per la diretta'), - ), - ); - } - return false; - } - - Future _bindPreviewWithRetry({int attempts = 12}) async { - for (var i = 0; i < attempts; i++) { - final ok = await StreamingChannel.bindPreview(); - if (ok) return true; - await Future.delayed(const Duration(milliseconds: 100)); - } - return false; - } - - Future _bootstrap() async { - try { - if (!await _ensurePermissions()) return; - - final client = ref.read(apiClientProvider); - var session = await client.fetchSession(widget.sessionId); - - if (session.isTerminal) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Questa diretta è già terminata'), - ), - ); - context.go('/matches'); - } - return; - } - - final match = await client.fetchMatch(session.matchId); - final statusAtOpen = session.status; - ref.read(sessionProvider.notifier).setSession(session, match: match); - if (session.score != null) { - ref.read(scoreProvider.notifier).reset(session.score!); - } - - // idle → startSession; wizard può aver già messo connecting prima della camera. - var justStartedSession = false; - if (session.status == 'idle') { - session = await client.startSession(widget.sessionId); - ref.read(sessionProvider.notifier).setSession(session, match: match); - justStartedSession = true; - } - - final ws = ref.read(websocketServiceProvider); - await ws.connect(sessionId: widget.sessionId, deviceRole: 'camera'); - - await Future.delayed(const Duration(milliseconds: 300)); - final previewReady = await _bindPreviewWithRetry(); - if (!previewReady && mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Anteprima camera non pronta — video non disponibile. Riapri per riprovare.'), - duration: Duration(seconds: 4), - ), - ); - // Non return: sessione e score sono già settati, WebSocket connesso. - // L'utente può ancora gestire il punteggio anche senza preview video. - } - - final fresh = await client.fetchSession(widget.sessionId); - ref.read(sessionProvider.notifier).setSession(fresh, match: match); - if (fresh.score != null) { - ref.read(scoreProvider.notifier).reset(fresh.score!); - } - - if (!mounted) return; - - // Avvio RTMP: wizard chiama startSession prima della camera → stato "connecting". - // In pausa all'apertura: niente auto-publish (serve "RIPRENDI DIRETTA"). - final wasPausedAtOpen = statusAtOpen == 'paused'; - final shouldAutoPublish = previewReady && - fresh.rtmpIngestUrl != null && - !wasPausedAtOpen && - fresh.status != 'paused' && - (justStartedSession || - fresh.status == 'connecting' || - fresh.status == 'live' || - fresh.status == 'reconnecting'); - if (shouldAutoPublish) { - // Reset motore nativo (sessione precedente / RECONNECTING blocca startStream). - try { - await StreamingChannel.stopStream(); - } catch (_) {} - await Future.delayed(const Duration(milliseconds: 400)); - if (!mounted) return; - final video = _streamVideoParams(context); - await StreamingChannel.startStream( - rtmpUrl: fresh.rtmpIngestUrl!, - targetBitrate: fresh.targetBitrate, - targetFps: 30, - width: video['width'] as int, - height: video['height'] as int, - portrait: video['portrait'] as bool, - ); - if (mounted && (justStartedSession || fresh.status == 'connecting')) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Diretta avviata — connessione al server…'), - duration: Duration(seconds: 3), - ), - ); - } - } - - _metricsSub = StreamingChannel.metricsStream - .receiveBroadcastStream() - .map((e) => Map.from(e as Map)) - .listen((event) { - if (event['type'] != 'metrics') return; - final metrics = Map.from( - (event['metrics'] as Map?)?.map((k, v) => MapEntry(k.toString(), v)) ?? {}, - ); - final streamState = metrics['state'] as String?; - final lastError = metrics['lastError'] as String?; - setState(() { - _bitrateMbps = (metrics['bitrateKbps'] as num? ?? 0) / 1000; - _fps = (metrics['fps'] as num?)?.toInt() ?? 0; - }); - if (lastError != null && - lastError.isNotEmpty && - lastError != _lastStreamErrorShown && - (streamState == 'ERROR' || streamState == 'RECONNECTING') && - mounted) { - _lastStreamErrorShown = lastError; - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('Connessione RTMP: $lastError'), - duration: const Duration(seconds: 5), - ), - ); - } - }); - } on PlatformException catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Errore streaming: ${e.message ?? e.code}')), - ); - } - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Errore avvio camera: $e')), - ); - } - } - } - - Future _readBattery() async { - final level = await Battery().batteryLevel; - if (mounted) setState(() => _batteryLevel = level); - } - - Future _sendTelemetry() async { - try { - await ref.read(apiClientProvider).postTelemetry( - sessionId: widget.sessionId, - deviceRole: 'camera', - batteryLevel: _batteryLevel, - networkType: _networkType, - currentBitrate: (_bitrateMbps * 1_000_000).round(), - fps: _fps, - ); - } catch (_) {} - } - - Future _fetchStats() async { - try { - final stats = await ref.read(apiClientProvider).youtubeStats(widget.sessionId); - if (mounted) setState(() => _viewerCount = stats.concurrentViewers); - } catch (_) {} - } - - /// Il server imposta `started_at` solo al primo go_live; sincronizza per il timer LIVE. - Future _syncSessionStartedAt() async { - final current = ref.read(sessionProvider).session; - if (current == null || current.startedAt != null || !current.isLive) return; - try { - final fresh = await ref.read(apiClientProvider).fetchSession(widget.sessionId); - if (!mounted || fresh.startedAt == null) return; - ref.read(sessionProvider.notifier).setSession( - fresh, - match: ref.read(sessionProvider).match, - ); - } catch (_) {} - } - - Future _lockOrientations() async { - await SystemChrome.setPreferredOrientations([ - DeviceOrientation.landscapeLeft, - DeviceOrientation.landscapeRight, - DeviceOrientation.portraitUp, - ]); - } - - Future _unlockOrientation() async { - await SystemChrome.setPreferredOrientations(DeviceOrientation.values); - } - - Future _shareRegia() async { - final match = ref.read(sessionProvider).match; - await shareRegiaLink( - context, - ref, - sessionId: widget.sessionId, - shareSubject: - 'Regia — ${match?.teamName ?? 'Casa'} vs ${match?.opponentName ?? 'Ospiti'}', - ); - } - - Future _shareWatch() async { - final session = ref.read(sessionProvider).session; - final match = ref.read(sessionProvider).match; - if (session == null) return; - await shareWatchLink( - context, - session: session, - title: - 'Diretta — ${match?.teamName ?? 'Casa'} vs ${match?.opponentName ?? 'Ospiti'}', - ); - } - - void _showShareMenu() { - final session = ref.read(sessionProvider).session; - if (session == null) return; - final isYoutube = session.platform == 'youtube'; - showModalBottomSheet( - context: context, - builder: (ctx) => SafeArea( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - ListTile( - leading: const Icon(Icons.live_tv), - title: Text(isYoutube ? 'Condividi link YouTube' : 'Condividi link diretta'), - onTap: () { - Navigator.pop(ctx); - _shareWatch(); - }, - ), - ListTile( - leading: const Icon(Icons.scoreboard), - title: const Text('Condividi link regia (punteggio)'), - onTap: () { - Navigator.pop(ctx); - _shareRegia(); - }, - ), - ], - ), - ), - ); - } - - Future _leaveSession() async { - try { - await StreamingChannel.stopStream(); - } catch (_) {} - try { - await ref.read(websocketServiceProvider).disconnect(); - } catch (_) {} - if (mounted) context.go('/matches'); - } - - /// Pausa temporanea: il server manda la copertina, la camera resta aperta. - Future _pauseStream() async { - if (_pauseInFlight) return; - _pauseInFlight = true; - try { - final match = ref.read(sessionProvider).match; - final session = - await ref.read(apiClientProvider).pauseSession(widget.sessionId); - ref.read(sessionProvider.notifier).setSession(session, match: match); - await StreamingChannel.pauseStream(); - if (mounted) { - setState(() { - _bitrateMbps = 0; - _fps = 0; - }); - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Diretta in pausa — gli spettatori vedono la copertina'), - duration: Duration(seconds: 3), - ), - ); - } - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Pausa sessione: $e')), - ); - } - } finally { - _pauseInFlight = false; - } - } - - Future _applyRemotePause() async { - try { - await StreamingChannel.pauseStream(); - if (mounted) { - setState(() { - _bitrateMbps = 0; - _fps = 0; - }); - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Pausa dalla regia — trasmissione fermata'), - duration: Duration(seconds: 3), - ), - ); - } - } catch (_) {} - } - - Future _applyRemoteResume() async { - if (_resumeInFlight) return; - final session = ref.read(sessionProvider).session; - if (session == null || session.rtmpIngestUrl == null) return; - _resumeInFlight = true; - try { - final isPortrait = mounted && - MediaQuery.orientationOf(context) == Orientation.portrait; - final video = _streamVideoParams(context); - await StreamingChannel.resumeStream( - rtmpUrl: session.rtmpIngestUrl!, - targetBitrate: session.targetBitrate, - targetFps: 30, - width: video['width'] as int, - height: video['height'] as int, - portrait: video['portrait'] as bool, - ); - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Ripresa dalla regia — di nuovo in onda'), - duration: Duration(seconds: 3), - ), - ); - } - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Ripresa RTMP: $e')), - ); - } - } finally { - _resumeInFlight = false; - } - } - - Future _resumeStream() async { - if (_resumeInFlight) return; - _resumeInFlight = true; - try { - final match = ref.read(sessionProvider).match; - var session = - await ref.read(apiClientProvider).resumeSession(widget.sessionId); - ref.read(sessionProvider.notifier).setSession(session, match: match); - - if (session.rtmpIngestUrl != null) { - if (!mounted) return; - final video = _streamVideoParams(context); - await StreamingChannel.resumeStream( - rtmpUrl: session.rtmpIngestUrl!, - targetBitrate: session.targetBitrate, - targetFps: 30, - width: video['width'] as int, - height: video['height'] as int, - portrait: video['portrait'] as bool, - ); - } - - session = await ref.read(apiClientProvider).fetchSession(widget.sessionId); - ref.read(sessionProvider.notifier).setSession(session, match: match); - - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Diretta ripresa — di nuovo in onda'), - duration: Duration(seconds: 3), - ), - ); - } - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Ripresa diretta: $e')), - ); - } - } finally { - _resumeInFlight = false; - } - } - - /// Chiusura definitiva: sessione ended, pagina web senza player. - Future _closeStreamPermanently() async { - if (!mounted) return; - final ok = await confirmEndStream(context); - if (!ok || !mounted) return; - - try { - await StreamingChannel.stopStream(); - } catch (_) {} - try { - ref.read(websocketServiceProvider).sendCommand('stop_stream'); - } catch (_) {} - try { - await ref.read(apiClientProvider).stopSession(widget.sessionId); - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Chiusura sessione: $e')), - ); - } - } - await _leaveSession(); - } - - void _trackScoreDelta(ScoreState score) { - if (score.homePoints != _prevHomePoints) { - _lastDelta = score.homePoints - _prevHomePoints; - } else if (score.awayPoints != _prevAwayPoints) { - _lastDelta = score.awayPoints - _prevAwayPoints; - } - _prevHomePoints = score.homePoints; - _prevAwayPoints = score.awayPoints; - } - - @override - void dispose() { - _elapsedTimer?.cancel(); - _sessionSyncTimer?.cancel(); - _telemetryTimer?.cancel(); - _statsTimer?.cancel(); - _scorePullTimer?.cancel(); - _metricsSub?.cancel(); - unawaited(StreamingChannel.stopStream()); - WakelockPlus.disable(); - _unlockOrientation(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - ref.listen( - sessionProvider.select((s) => s.session?.status), - (previous, next) { - if (next == 'paused' && previous != 'paused' && !_pauseInFlight) { - _applyRemotePause(); - } - if (previous == 'paused' && - (next == 'connecting' || next == 'live') && - !_resumeInFlight) { - _applyRemoteResume(); - } - if (next == 'ended' && previous != 'ended' && mounted) { - _leaveSession(); - } - }, - ); - - final sessionState = ref.watch(sessionProvider); - final score = ref.watch(scoreProvider); - _trackScoreDelta(score); - - final match = sessionState.match; - final sessionStatus = sessionState.session?.status ?? 'live'; - final isPaused = sessionStatus == 'paused'; - final homeName = match?.teamName ?? 'HOME'; - final awayName = match?.opponentName ?? 'AWAY'; - final isLandscape = - MediaQuery.orientationOf(context) == Orientation.landscape; - final rules = ref.watch(matchScoringRulesProvider); - final pointsTarget = rules.pointsTarget(score.currentSet); - // Preview a tutto schermo; controlli in overlay sopra (AndroidView nel layout Flutter). - return Scaffold( - backgroundColor: Colors.black, - body: Stack( - fit: StackFit.expand, - children: [ - Positioned.fill( - child: NativeStreamingPreview( - key: _previewKey, - showGrid: true, - platformLabel: isPaused ? 'PAUSA' : 'LIVE', - ), - ), - if (isPaused) - Positioned( - left: 20, - right: 20, - bottom: isLandscape ? 100 : 200, - child: Center( - child: FilledButton.icon( - onPressed: _resumeStream, - icon: const Icon(Icons.play_arrow, size: 28), - label: const Text( - 'RIPRENDI DIRETTA', - style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), - ), - style: FilledButton.styleFrom( - backgroundColor: AppTheme.primaryRed, - padding: const EdgeInsets.symmetric(horizontal: 28, vertical: 16), - ), - ), - ), - ), - if (isLandscape) - _LandscapeOverlay( - elapsed: sessionState.elapsed, - batteryLevel: _batteryLevel, - homeName: homeName, - awayName: awayName, - score: score, - lastDelta: _lastDelta, - networkType: _networkType, - bitrateMbps: _bitrateMbps, - fps: _fps, - viewerCount: _viewerCount, - onShare: _showShareMenu, - isPaused: isPaused, - onPause: _pauseStream, - onResume: _resumeStream, - onCloseStream: _closeStreamPermanently, - pointsTarget: pointsTarget, - ) - else - _PortraitOverlay( - elapsed: sessionState.elapsed, - batteryLevel: _batteryLevel, - homeName: homeName, - awayName: awayName, - score: score, - networkType: _networkType, - bitrateMbps: _bitrateMbps, - fps: _fps, - viewerCount: _viewerCount, - onShare: _showShareMenu, - isPaused: isPaused, - onPause: _pauseStream, - onResume: _resumeStream, - onCloseStream: _closeStreamPermanently, - pointsTarget: pointsTarget, - ), - ], - ), - ); - } -} - -class _PortraitOverlay extends StatelessWidget { - const _PortraitOverlay({ - required this.elapsed, - required this.batteryLevel, - required this.homeName, - required this.awayName, - required this.score, - required this.networkType, - required this.bitrateMbps, - required this.fps, - required this.viewerCount, - required this.onShare, - required this.isPaused, - required this.onPause, - required this.onResume, - required this.onCloseStream, - required this.pointsTarget, - }); - - final Duration elapsed; - final int batteryLevel; - final String homeName; - final String awayName; - final ScoreState score; - final String networkType; - final double bitrateMbps; - final int fps; - final int viewerCount; - final VoidCallback onShare; - final bool isPaused; - final Future Function() onPause; - final Future Function() onResume; - final Future Function() onCloseStream; - final int pointsTarget; - - @override - Widget build(BuildContext context) { - final inset = ScreenInsets.cameraOverlay(context); - final screenH = MediaQuery.sizeOf(context).height; - // Riserva almeno 35% dello schermo all'anteprima camera, il resto ai controlli. - final maxControlsH = screenH * 0.65; - - return Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - // ── Barra superiore: badge live + metriche ────────────────────────── - Container( - color: Colors.black54, - padding: EdgeInsets.fromLTRB(inset.left, inset.top, inset.right, 6), - child: Row( - children: [ - LiveBadge(elapsed: elapsed, paused: isPaused), - const Spacer(), - CameraCompactMetrics( - networkType: networkType, - bitrateMbps: bitrateMbps, - fps: fps, - batteryLevel: batteryLevel, - viewerCount: viewerCount > 0 ? viewerCount : null, - ), - IconButton( - onPressed: onShare, - icon: const Icon(Icons.share, size: 20), - tooltip: 'Condividi link', - color: Colors.white70, - padding: EdgeInsets.zero, - constraints: const BoxConstraints(minWidth: 36, minHeight: 36), - ), - ], - ), - ), - // ── Area camera (AndroidView a tutto schermo sotto) ─────────────── - const Expanded(child: IgnorePointer(child: SizedBox.expand())), - // ── Pannello controlli ─────────────────────────────────────────────── - ConstrainedBox( - constraints: BoxConstraints(maxHeight: maxControlsH), - child: Container( - color: AppTheme.background, - child: SingleChildScrollView( - padding: EdgeInsets.fromLTRB( - inset.left, - 12, - inset.right, - math.max(inset.bottom, 16), - ), - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - // Tabellone + pulsanti punteggio — primo widget, sempre visibile. - LiveScoreControls( - homeName: homeName, - awayName: awayName, - pointsTarget: pointsTarget, - onStopStream: onCloseStream, - ), - const SizedBox(height: 12), - // Azioni stream: pausa/riprendi + chiudi. - Row( - children: [ - Expanded( - child: isPaused - ? FilledButton.icon( - onPressed: onResume, - icon: const Icon(Icons.play_arrow, size: 18), - label: const Text('Riprendi'), - style: FilledButton.styleFrom( - backgroundColor: AppTheme.primaryRed, - ), - ) - : OutlinedButton.icon( - onPressed: onPause, - icon: const Icon(Icons.pause, size: 18), - label: const Text('Pausa'), - ), - ), - const SizedBox(width: 8), - Expanded( - child: DestructiveCta( - label: 'Chiudi diretta', - onPressed: () => onCloseStream(), - ), - ), - ], - ), - const SizedBox(height: 8), - OutlinedButton.icon( - onPressed: onShare, - icon: const Icon(Icons.share, size: 16), - label: const Text('Condividi link diretta'), - style: OutlinedButton.styleFrom( - foregroundColor: Colors.white70, - side: const BorderSide(color: Colors.white24), - ), - ), - ], - ), - ), - ), - ), - ], - ); - } -} - -class _LandscapeOverlay extends StatelessWidget { - const _LandscapeOverlay({ - required this.elapsed, - required this.batteryLevel, - required this.homeName, - required this.awayName, - required this.score, - required this.lastDelta, - required this.networkType, - required this.bitrateMbps, - required this.fps, - required this.viewerCount, - required this.onShare, - required this.isPaused, - required this.onPause, - required this.onResume, - required this.onCloseStream, - required this.pointsTarget, - }); - - final Duration elapsed; - final int batteryLevel; - final String homeName; - final String awayName; - final ScoreState score; - final int? lastDelta; - final String networkType; - final double bitrateMbps; - final int fps; - final int viewerCount; - final VoidCallback onShare; - final bool isPaused; - final Future Function() onPause; - final Future Function() onResume; - final Future Function() onCloseStream; - final int pointsTarget; - - @override - Widget build(BuildContext context) { - final inset = ScreenInsets.cameraOverlay(context); - - return Column( - children: [ - Padding( - padding: EdgeInsets.fromLTRB(inset.left, inset.top, inset.right, 6), - child: Row( - children: [ - LiveBadge(elapsed: elapsed, compact: true, paused: isPaused), - const Spacer(), - CameraCompactMetrics( - networkType: networkType, - bitrateMbps: bitrateMbps, - fps: fps, - batteryLevel: batteryLevel, - viewerCount: viewerCount > 0 ? viewerCount : null, - light: true, - ), - ], - ), - ), - const Expanded(child: IgnorePointer(child: SizedBox.expand())), - Container( - color: Colors.black.withValues(alpha: 0.82), - padding: EdgeInsets.fromLTRB( - inset.left, - 10, - inset.right, - math.max(inset.bottom, 12), - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - LiveScoreControls( - compact: true, - homeName: homeName, - awayName: awayName, - lastDelta: lastDelta, - pointsTarget: pointsTarget, - onStopStream: onCloseStream, - ), - const SizedBox(height: 8), - Row( - children: [ - IconButton( - onPressed: onShare, - icon: const Icon(Icons.share, color: Colors.white), - tooltip: 'Condividi link', - ), - Expanded( - child: isPaused - ? FilledButton( - onPressed: onResume, - child: const Text('Riprendi', style: TextStyle(fontSize: 11)), - ) - : OutlinedButton( - onPressed: onPause, - child: const Text('Pausa', style: TextStyle(fontSize: 11)), - ), - ), - const SizedBox(width: 8), - Expanded( - child: DestructiveCta( - label: 'Chiudi', - compact: true, - onPressed: () => onCloseStream(), - ), - ), - ], - ), - ], - ), - ), - ], - ); - } -} diff --git a/mobile/lib/features/camera_mode/camera_screen_landscape.dart b/mobile/lib/features/camera_mode/camera_screen_landscape.dart deleted file mode 100644 index 7cd3320..0000000 --- a/mobile/lib/features/camera_mode/camera_screen_landscape.dart +++ /dev/null @@ -1,134 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../shared/models/score_state.dart'; -import '../../shared/widgets/destructive_cta.dart'; -import '../../shared/widgets/live_badge.dart'; -import '../../shared/widgets/metric_card.dart'; -import '../../shared/widgets/score_overlay_bar.dart'; -import '../../platform/streaming_preview.dart'; - -class CameraScreenLandscape extends StatelessWidget { - const CameraScreenLandscape({ - super.key, - required this.elapsed, - required this.batteryLevel, - required this.homeName, - required this.awayName, - required this.score, - required this.lastDelta, - required this.networkType, - required this.bitrateMbps, - required this.fps, - required this.viewerCount, - this.platformLabel = 'LIVE', - required this.onStop, - }); - - final Duration elapsed; - final int batteryLevel; - final String homeName; - final String awayName; - final ScoreState score; - final int? lastDelta; - final String networkType; - final double bitrateMbps; - final int fps; - final int viewerCount; - final String platformLabel; - final VoidCallback onStop; - - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: Colors.black, - body: Stack( - fit: StackFit.expand, - children: [ - NativeStreamingPreview(showGrid: false, platformLabel: platformLabel), - Positioned( - top: 12, - left: 12, - child: LiveBadge(elapsed: elapsed, compact: true), - ), - Positioned( - top: 12, - right: 12, - child: Row( - children: [ - Icon(Icons.battery_std, size: 16, color: Colors.white70), - const SizedBox(width: 4), - Text( - '$batteryLevel%', - style: const TextStyle(color: Colors.white70, fontSize: 12), - ), - ], - ), - ), - Positioned( - bottom: 16, - left: 16, - child: ScoreOverlayBar( - homeName: homeName, - awayName: awayName, - homePoints: score.homePoints, - awayPoints: score.awayPoints, - currentSet: score.currentSet, - homeSets: score.homeSets, - awaySets: score.awaySets, - compact: true, - lastDelta: lastDelta, - ), - ), - Positioned( - bottom: 16, - left: 0, - right: 100, - child: Center( - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - MetricCard( - label: 'Segnale', - value: networkType, - icon: Icons.signal_cellular_alt, - expand: false, - ), - const SizedBox(width: 6), - MetricCard( - label: 'Mbps', - value: bitrateMbps.toStringAsFixed(1), - icon: Icons.speed, - expand: false, - ), - const SizedBox(width: 6), - MetricCard( - label: 'fps', - value: '$fps', - icon: Icons.movie, - expand: false, - ), - const SizedBox(width: 6), - MetricCard( - label: 'Spett.', - value: viewerCount > 0 ? '$viewerCount' : 'LIVE', - icon: Icons.visibility, - expand: false, - ), - ], - ), - ), - ), - Positioned( - bottom: 16, - right: 16, - child: DestructiveCta( - label: 'INTERROMPI', - compact: true, - onPressed: onStop, - ), - ), - ], - ), - ); - } -} diff --git a/mobile/lib/features/camera_mode/camera_screen_portrait.dart b/mobile/lib/features/camera_mode/camera_screen_portrait.dart deleted file mode 100644 index a76c41a..0000000 --- a/mobile/lib/features/camera_mode/camera_screen_portrait.dart +++ /dev/null @@ -1,158 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../app/theme.dart'; -import '../../shared/models/score_state.dart'; -import '../../shared/widgets/destructive_cta.dart'; -import '../../shared/widgets/live_badge.dart'; -import '../../shared/widgets/metric_card.dart'; -import '../../shared/widgets/score_overlay_bar.dart'; -import '../../platform/streaming_preview.dart'; - -class CameraScreenPortrait extends StatelessWidget { - const CameraScreenPortrait({ - super.key, - required this.elapsed, - required this.batteryLevel, - required this.homeName, - required this.awayName, - required this.score, - required this.networkType, - required this.bitrateMbps, - required this.fps, - required this.viewerCount, - required this.sessionId, - this.platformLabel = 'LIVE', - required this.onStop, - }); - - final Duration elapsed; - final int batteryLevel; - final String homeName; - final String awayName; - final ScoreState score; - final String networkType; - final double bitrateMbps; - final int fps; - final int viewerCount; - final String sessionId; - final String platformLabel; - final VoidCallback onStop; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - - return Scaffold( - backgroundColor: AppTheme.background, - body: SafeArea( - child: Column( - children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), - child: Row( - children: [ - LiveBadge(elapsed: elapsed), - const Spacer(), - const Icon(Icons.battery_std, size: 18, color: AppTheme.textSecondary), - const SizedBox(width: 4), - Text('$batteryLevel%', style: theme.textTheme.labelLarge), - ], - ), - ), - Expanded( - flex: 3, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), - child: ClipRRect( - borderRadius: BorderRadius.circular(12), - child: NativeStreamingPreview( - showGrid: true, - platformLabel: platformLabel, - ), - ), - ), - ), - Padding( - padding: const EdgeInsets.all(16), - child: SingleChildScrollView( - scrollDirection: Axis.horizontal, - child: ScoreOverlayBar( - homeName: homeName, - awayName: awayName, - homePoints: score.homePoints, - awayPoints: score.awayPoints, - currentSet: score.currentSet, - homeSets: score.homeSets, - awaySets: score.awaySets, - ), - ), - ), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), - child: Row( - children: [ - MetricCard( - label: 'Segnale', - value: networkType, - icon: Icons.signal_cellular_alt, - ), - const SizedBox(width: 8), - MetricCard( - label: 'Mbps', - value: bitrateMbps.toStringAsFixed(1), - icon: Icons.speed, - ), - const SizedBox(width: 8), - MetricCard(label: 'fps', value: '$fps', icon: Icons.movie), - ], - ), - ), - Padding( - padding: const EdgeInsets.all(16), - child: Container( - width: double.infinity, - padding: const EdgeInsets.all(12), - decoration: BoxDecoration( - color: AppTheme.surface, - borderRadius: BorderRadius.circular(10), - ), - child: Row( - children: [ - const Icon(Icons.play_circle, color: AppTheme.primaryRed), - const SizedBox(width: 8), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(platformLabel, style: theme.textTheme.titleMedium), - Text( - viewerCount > 0 - ? '$viewerCount spettatori' - : 'IN DIRETTA', - style: theme.textTheme.bodyMedium, - ), - ], - ), - ), - ], - ), - ), - ), - Padding( - padding: const EdgeInsets.fromLTRB(16, 0, 16, 8), - child: Text( - 'Registrazione locale attiva: /sd/match_$sessionId', - style: theme.textTheme.bodyMedium?.copyWith(fontSize: 11), - textAlign: TextAlign.center, - ), - ), - Padding( - padding: const EdgeInsets.all(16), - child: DestructiveCta(label: 'INTERROMPI', onPressed: onStop), - ), - ], - ), - ), - ); - } -} diff --git a/mobile/lib/features/matches/matches_screen.dart b/mobile/lib/features/matches/matches_screen.dart deleted file mode 100644 index d974c63..0000000 --- a/mobile/lib/features/matches/matches_screen.dart +++ /dev/null @@ -1,596 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:go_router/go_router.dart'; -import 'package:intl/intl.dart'; -import 'package:url_launcher/url_launcher.dart'; - -import '../../app/theme.dart'; -import '../../core/config.dart'; -import '../../providers/auth_provider.dart'; -import '../../shared/api_client.dart'; -import '../../shared/models/match.dart'; -import '../../shared/widgets/match_live_wordmark.dart'; -import '../../shared/widgets/screen_insets.dart'; -import 'resume_session_sheet.dart'; -import 'no_team_onboarding.dart'; -import 'new_match_sheet.dart'; -import 'schedule_match_sheet.dart'; -import 'select_match_sheet.dart'; -import 'team_picker.dart'; -import 'team_providers.dart'; - -class MatchesScreen extends ConsumerWidget { - const MatchesScreen({super.key}); - - @override - Widget build(BuildContext context, WidgetRef ref) { - final auth = ref.watch(authProvider); - final teamsAsync = ref.watch(teamsProvider); - final matchesAsync = ref.watch(matchesProvider); - final theme = Theme.of(context); - final dateFormat = DateFormat('EEE d MMM · HH:mm', 'it_IT'); - final bottomInset = ScreenInsets.of(context).bottom; - - return Scaffold( - appBar: AppBar( - title: const MatchLiveWordmark(compact: true), - actions: [ - IconButton( - icon: const Icon(Icons.group_outlined), - tooltip: 'Gestisci staff', - onPressed: () async { - final team = await ref.read(activeTeamProvider.future); - final url = team?.staffManageUrl ?? team?.billingUrl; - if (url != null && await canLaunchUrl(Uri.parse(url))) { - await launchUrl(Uri.parse(url), mode: LaunchMode.externalApplication); - } - }, - ), - IconButton( - icon: const Icon(Icons.video_library_outlined), - tooltip: 'Archivio', - onPressed: () => context.push('/archive'), - ), - IconButton( - icon: const Icon(Icons.logout), - tooltip: 'Esci', - onPressed: () { - ref.read(authProvider.notifier).logout(); - context.go('/login'); - }, - ), - ], - ), - body: teamsAsync.when( - loading: () => const Center( - child: CircularProgressIndicator(color: AppTheme.primaryRed), - ), - error: (e, stack) { - final msg = e.toString(); - final unauthorized = msg.contains('401'); - final timeout = msg.contains('timeout') || msg.contains('Timeout'); - final offline = timeout || - msg.contains('SocketException') || - msg.contains('Failed host lookup'); - String title = 'Errore nel caricamento squadre'; - String hint = 'Controlla Wi‑Fi o dati mobili e riprova.'; - if (unauthorized) { - title = 'Sessione scaduta'; - hint = 'Accedi di nuovo con email e password.'; - } else if (offline) { - title = 'Server non raggiungibile'; - hint = timeout - ? 'La connessione è troppo lenta o assente. Verifica la rete (serve almeno qualche Mbps).' - : 'Impossibile contattare ${AppConfig.apiBaseUrl}. Riprova tra poco.'; - } - return Center( - child: Padding( - padding: const EdgeInsets.all(24), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - title, - style: theme.textTheme.titleMedium, - textAlign: TextAlign.center, - ), - const SizedBox(height: 8), - Text( - hint, - style: theme.textTheme.bodySmall, - textAlign: TextAlign.center, - ), - const SizedBox(height: 16), - if (unauthorized) - FilledButton( - onPressed: () { - ref.read(authProvider.notifier).logout(); - context.go('/login'); - }, - child: const Text('VAI AL LOGIN'), - ) - else - TextButton( - onPressed: () => ref.invalidate(teamsProvider), - child: const Text('RIPROVA'), - ), - ], - ), - ), - ); - }, - data: (teams) { - if (teams.isEmpty) { - return NoTeamOnboarding(theme: theme); - } - return matchesAsync.when( - loading: () => const Center( - child: CircularProgressIndicator(color: AppTheme.primaryRed), - ), - error: (e, _) => Center( - child: Padding( - padding: const EdgeInsets.all(24), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text('Errore nel caricamento', style: theme.textTheme.titleMedium), - const SizedBox(height: 8), - Text( - e.toString(), - style: theme.textTheme.bodySmall, - textAlign: TextAlign.center, - ), - const SizedBox(height: 12), - TextButton( - onPressed: () { - ref.invalidate(teamsProvider); - ref.invalidate(matchesProvider); - }, - child: const Text('RIPROVA'), - ), - ], - ), - ), - ), - data: (matches) { - MatchModel? activeMatch; - for (final m in matches) { - if (m.hasActiveSession) { - activeMatch = m; - break; - } - } - - return RefreshIndicator( - color: AppTheme.primaryRed, - onRefresh: () async { - ref.invalidate(teamsProvider); - ref.invalidate(matchesProvider); - await ref.read(matchesProvider.future); - }, - child: CustomScrollView( - slivers: [ - SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.fromLTRB(20, 8, 20, 16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Ciao, ${auth.user?.name ?? ''}', - style: theme.textTheme.headlineSmall, - ), - const SizedBox(height: 4), - Text( - 'Scegli una partita programmata o creane una nuova.', - style: theme.textTheme.bodyMedium, - ), - const SizedBox(height: 16), - Row( - children: [ - Expanded( - child: OutlinedButton.icon( - onPressed: () => _pickScheduledMatch(context, ref, matches), - icon: const Icon(Icons.playlist_play), - label: const Text('Partita\nprogrammata'), - style: OutlinedButton.styleFrom( - padding: const EdgeInsets.symmetric(vertical: 14), - alignment: Alignment.center, - ), - ), - ), - const SizedBox(width: 12), - Expanded( - child: FilledButton.icon( - onPressed: () => _newMatch(context, ref), - icon: const Icon(Icons.add), - label: const Text('Nuova\npartita'), - style: FilledButton.styleFrom( - backgroundColor: AppTheme.primaryRed, - padding: const EdgeInsets.symmetric(vertical: 14), - alignment: Alignment.center, - ), - ), - ), - ], - ), - const TeamPickerBar(), - if (activeMatch != null) ...[ - const SizedBox(height: 12), - Material( - color: AppTheme.primaryRed.withValues(alpha: 0.15), - borderRadius: BorderRadius.circular(12), - child: InkWell( - onTap: () => showResumeSessionSheet( - context, - ref, - match: activeMatch!, - ), - borderRadius: BorderRadius.circular(12), - child: Padding( - padding: const EdgeInsets.all(14), - child: Row( - children: [ - const Icon( - Icons.videocam, - color: AppTheme.primaryRed, - ), - const SizedBox(width: 12), - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Text( - 'Riprendi diretta in corso', - style: theme.textTheme.titleSmall - ?.copyWith( - color: AppTheme.primaryRed, - fontWeight: FontWeight.w700, - ), - ), - Text( - '${activeMatch.teamName} vs ${activeMatch.opponentName}', - style: theme.textTheme.bodySmall, - ), - ], - ), - ), - const Icon( - Icons.chevron_right, - color: AppTheme.primaryRed, - ), - ], - ), - ), - ), - ), - ], - ], - ), - ), - ), - SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.fromLTRB(20, 8, 20, 8), - child: Text( - matches.isEmpty ? 'Calendario vuoto' : 'Calendario', - style: theme.textTheme.labelLarge?.copyWith( - color: AppTheme.textSecondary, - ), - ), - ), - ), - if (matches.isEmpty) - SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12), - child: Text( - 'Nessuna partita ancora. Usa «Nuova partita» per programmare o avviare subito.', - style: theme.textTheme.bodyMedium, - textAlign: TextAlign.center, - ), - ), - ) - else - SliverList( - delegate: SliverChildBuilderDelegate( - (context, index) { - final match = matches[index]; - return _MatchCard( - match: match, - dateFormat: dateFormat, - onTap: () => _openMatch(context, ref, match), - onDelete: match.canResumeCamera - ? null - : () => _deleteMatch(context, ref, match), - ); - }, - childCount: matches.length, - ), - ), - SliverToBoxAdapter( - child: SizedBox(height: 20 + bottomInset), - ), - ], - ), - ); - }, - ); - }, - ), - ); - } - - Future _deleteMatch( - BuildContext context, - WidgetRef ref, - MatchModel match, - ) async { - final confirmed = await showDialog( - context: context, - builder: (ctx) => AlertDialog( - backgroundColor: AppTheme.surface, - title: const Text('Elimina partita'), - content: Text( - 'Eliminare «${match.teamName} vs ${match.opponentName}»?\n\n' - 'L\'operazione non si può annullare.', - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx, false), - child: const Text('Annulla'), - ), - FilledButton( - onPressed: () => Navigator.pop(ctx, true), - style: FilledButton.styleFrom(backgroundColor: AppTheme.primaryRed), - child: const Text('Elimina'), - ), - ], - ), - ); - if (confirmed != true || !context.mounted) return; - - try { - await ref.read(apiClientProvider).deleteMatch(match.id); - ref.invalidate(matchesProvider); - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Partita eliminata')), - ); - } - } catch (e) { - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Impossibile eliminare: $e')), - ); - } - } - } - - void _openMatch(BuildContext context, WidgetRef ref, MatchModel match) { - if (match.hasActiveSession) { - showResumeSessionSheet(context, ref, match: match); - } else { - context.push('/setup/${match.id}/1'); - } - } - - Future _pickScheduledMatch( - BuildContext context, - WidgetRef ref, - List matches, - ) async { - final selectable = matches.where((m) => !m.hasActiveSession).toList(); - if (selectable.isEmpty) { - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Nessuna partita disponibile. Crea una nuova partita.'), - ), - ); - } - return; - } - - final picked = await showSelectMatchSheet(context, matches: matches); - if (picked != null && context.mounted) { - context.push('/setup/${picked.id}/1'); - } - } - - Future _newMatch(BuildContext context, WidgetRef ref) async { - final choice = await showNewMatchSheet(context); - if (choice == null || !context.mounted) return; - switch (choice) { - case NewMatchChoice.schedule: - await _scheduleMatch(context, ref); - case NewMatchChoice.quickStart: - await _createMatchQuick(context, ref); - } - } - - Future _scheduleMatch(BuildContext context, WidgetRef ref) async { - final team = await ref.read(activeTeamProvider.future); - if (team == null) { - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Nessuna squadra disponibile')), - ); - } - return; - } - - final data = await showScheduleMatchSheet(context, teamName: team.name); - if (data == null || !context.mounted) return; - - try { - final client = ref.read(apiClientProvider); - final match = await client.createMatch(team.id, { - 'opponent_name': data.opponentName, - 'scheduled_at': data.scheduledAt.toUtc().toIso8601String(), - if (data.location != null) 'location': data.location, - 'sport': 'volleyball', - 'sets_to_win': 3, - }); - ref.invalidate(matchesProvider); - if (!context.mounted) return; - - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Partita programmata — visibile sul sito')), - ); - - final configure = await showDialog( - context: context, - builder: (ctx) => AlertDialog( - backgroundColor: AppTheme.surface, - title: const Text('Configurare ora?'), - content: const Text( - 'Puoi preparare la trasmissione subito, oppure tornare quando sei in palestra.', - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx, false), - child: const Text('Più tardi'), - ), - FilledButton( - onPressed: () => Navigator.pop(ctx, true), - style: FilledButton.styleFrom(backgroundColor: AppTheme.primaryRed), - child: const Text('Configura'), - ), - ], - ), - ); - if (configure == true && context.mounted) { - context.push('/setup/${match.id}/1'); - } - } catch (e) { - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Errore: $e')), - ); - } - } - } - - Future _createMatchQuick(BuildContext context, WidgetRef ref) async { - final team = await ref.read(activeTeamProvider.future); - if (team == null) { - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Nessuna squadra disponibile')), - ); - } - return; - } - - final client = ref.read(apiClientProvider); - final match = await client.createMatch(team.id, { - 'opponent_name': 'Avversario', - 'sport': 'volleyball', - 'sets_to_win': 3, - }); - if (context.mounted) context.push('/setup/${match.id}/1'); - } -} - -String _matchStatusLabel( - MatchModel match, { - required bool canResume, - required bool hasSession, -}) { - if (canResume) return 'RIPRENDI'; - if (hasSession) return 'IN CORSO'; - final at = match.scheduledAt; - if (at != null && at.isAfter(DateTime.now())) return 'PROGRAMMATA'; - return 'AVVIA'; -} - -class _MatchCard extends StatelessWidget { - const _MatchCard({ - required this.match, - required this.dateFormat, - required this.onTap, - this.onDelete, - }); - - final MatchModel match; - final DateFormat dateFormat; - final VoidCallback onTap; - final VoidCallback? onDelete; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final hasSession = match.hasActiveSession; - final canResume = match.canResumeCamera; - - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 6), - child: Material( - color: AppTheme.surface, - borderRadius: BorderRadius.circular(12), - child: InkWell( - onTap: onTap, - borderRadius: BorderRadius.circular(12), - child: Padding( - padding: const EdgeInsets.all(16), - child: Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - '${match.teamName} vs ${match.opponentName}', - style: theme.textTheme.titleMedium, - ), - const SizedBox(height: 4), - if (match.scheduledAt != null) - Text( - dateFormat.format(match.scheduledAt!.toLocal()), - style: theme.textTheme.bodyMedium, - ), - if (match.location != null && match.location!.isNotEmpty) - Text( - match.location!, - style: theme.textTheme.bodyMedium, - ), - ], - ), - ), - Container( - padding: - const EdgeInsets.symmetric(horizontal: 10, vertical: 4), - decoration: BoxDecoration( - color: hasSession - ? AppTheme.primaryRed.withValues(alpha: 0.2) - : AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(8), - ), - child: Text( - _matchStatusLabel(match, canResume: canResume, hasSession: hasSession), - style: theme.textTheme.labelLarge?.copyWith( - color: hasSession ? AppTheme.primaryRed : AppTheme.textSecondary, - fontSize: 11, - ), - ), - ), - if (onDelete != null) ...[ - const SizedBox(width: 4), - IconButton( - icon: const Icon(Icons.delete_outline, color: AppTheme.textSecondary), - tooltip: 'Elimina partita', - onPressed: onDelete, - visualDensity: VisualDensity.compact, - constraints: const BoxConstraints(minWidth: 36, minHeight: 36), - ), - ], - ], - ), - ), - ), - ), - ); - } -} diff --git a/mobile/lib/features/matches/new_match_sheet.dart b/mobile/lib/features/matches/new_match_sheet.dart deleted file mode 100644 index 875a552..0000000 --- a/mobile/lib/features/matches/new_match_sheet.dart +++ /dev/null @@ -1,105 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../app/theme.dart'; - -enum NewMatchChoice { schedule, quickStart } - -Future showNewMatchSheet(BuildContext context) { - return showModalBottomSheet( - context: context, - backgroundColor: AppTheme.surface, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.vertical(top: Radius.circular(16)), - ), - builder: (ctx) { - final theme = Theme.of(ctx); - return Padding( - padding: const EdgeInsets.fromLTRB(20, 12, 20, 28), - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Center( - child: Container( - width: 40, - height: 4, - decoration: BoxDecoration( - color: AppTheme.textSecondary.withValues(alpha: 0.4), - borderRadius: BorderRadius.circular(2), - ), - ), - ), - const SizedBox(height: 16), - Text('Nuova partita', style: theme.textTheme.titleLarge), - const SizedBox(height: 6), - Text( - 'Programma in anticipo o avvia la configurazione diretta subito.', - style: theme.textTheme.bodyMedium, - ), - const SizedBox(height: 20), - _OptionTile( - icon: Icons.event_available, - title: 'Programma partita', - subtitle: 'Data, ora e avversario — visibile anche sul sito', - onTap: () => Navigator.pop(ctx, NewMatchChoice.schedule), - ), - const SizedBox(height: 10), - _OptionTile( - icon: Icons.play_circle_outline, - title: 'Avvia subito', - subtitle: 'Crea la partita e passa al wizard senza orario', - onTap: () => Navigator.pop(ctx, NewMatchChoice.quickStart), - ), - ], - ), - ); - }, - ); -} - -class _OptionTile extends StatelessWidget { - const _OptionTile({ - required this.icon, - required this.title, - required this.subtitle, - required this.onTap, - }); - - final IconData icon; - final String title; - final String subtitle; - final VoidCallback onTap; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - return Material( - color: AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(12), - child: InkWell( - onTap: onTap, - borderRadius: BorderRadius.circular(12), - child: Padding( - padding: const EdgeInsets.all(16), - child: Row( - children: [ - Icon(icon, color: AppTheme.primaryRed, size: 28), - const SizedBox(width: 14), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(title, style: theme.textTheme.titleMedium), - const SizedBox(height: 4), - Text(subtitle, style: theme.textTheme.bodySmall), - ], - ), - ), - const Icon(Icons.chevron_right, color: AppTheme.textSecondary), - ], - ), - ), - ), - ); - } -} diff --git a/mobile/lib/features/matches/no_team_onboarding.dart b/mobile/lib/features/matches/no_team_onboarding.dart deleted file mode 100644 index ad91afd..0000000 --- a/mobile/lib/features/matches/no_team_onboarding.dart +++ /dev/null @@ -1,56 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher.dart'; - -import '../../app/theme.dart'; -import '../../core/config.dart'; -import '../../shared/widgets/primary_cta.dart'; - -class NoTeamOnboarding extends StatelessWidget { - const NoTeamOnboarding({required this.theme}); - - final ThemeData theme; - - String get _signupUrl { - final base = AppConfig.apiBaseUrl.replaceAll(RegExp(r'/api/v1/?$'), ''); - return '$base/signup'; - } - - @override - Widget build(BuildContext context) { - return Center( - child: Padding( - padding: const EdgeInsets.all(28), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon(Icons.groups_outlined, size: 64, color: AppTheme.textSecondary), - const SizedBox(height: 16), - Text( - 'Completa l\'iscrizione sul sito', - style: theme.textTheme.titleLarge, - textAlign: TextAlign.center, - ), - const SizedBox(height: 12), - Text( - 'Crea la tua squadra e scegli il piano Free o Premium da browser. ' - 'Poi torna qui con le stesse credenziali.', - style: theme.textTheme.bodyMedium, - textAlign: TextAlign.center, - ), - const SizedBox(height: 24), - PrimaryCta( - label: 'VAI AL SITO', - icon: Icons.open_in_new, - onPressed: () async { - final uri = Uri.parse(_signupUrl); - if (await canLaunchUrl(uri)) { - await launchUrl(uri, mode: LaunchMode.externalApplication); - } - }, - ), - ], - ), - ), - ); - } -} diff --git a/mobile/lib/features/matches/resume_session_sheet.dart b/mobile/lib/features/matches/resume_session_sheet.dart deleted file mode 100644 index e86c6ba..0000000 --- a/mobile/lib/features/matches/resume_session_sheet.dart +++ /dev/null @@ -1,100 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:go_router/go_router.dart'; - -import '../../app/theme.dart'; -import '../../shared/models/match.dart'; -import '../../shared/regia_share.dart'; - -/// Azioni per riprendere una diretta interrotta (crash, chiusura app, ecc.). -void showResumeSessionSheet( - BuildContext context, - WidgetRef ref, { - required MatchModel match, -}) { - final sessionId = match.activeSessionId; - if (sessionId == null) return; - - showModalBottomSheet( - context: context, - backgroundColor: AppTheme.surface, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.vertical(top: Radius.circular(16)), - ), - builder: (ctx) { - return SafeArea( - child: Padding( - padding: const EdgeInsets.fromLTRB(20, 16, 20, 12), - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Text( - 'Diretta in corso', - style: Theme.of(ctx).textTheme.titleLarge, - ), - const SizedBox(height: 4), - Text( - '${match.teamName} vs ${match.opponentName}', - style: Theme.of(ctx).textTheme.bodyMedium, - ), - if (match.activeSessionStatus != null) ...[ - const SizedBox(height: 8), - Text( - 'Stato: ${match.activeSessionStatus}', - style: Theme.of(ctx).textTheme.labelLarge?.copyWith( - color: AppTheme.primaryRed, - ), - ), - ], - const SizedBox(height: 20), - if (match.canResumeCamera) - FilledButton.icon( - onPressed: () { - Navigator.pop(ctx); - context.push('/session/$sessionId/camera'); - }, - icon: const Icon(Icons.videocam), - label: const Text('Riprendi camera e trasmetti'), - style: FilledButton.styleFrom( - backgroundColor: AppTheme.primaryRed, - padding: const EdgeInsets.symmetric(vertical: 14), - ), - ), - if (match.activeSessionStatus == 'idle') ...[ - const SizedBox(height: 8), - OutlinedButton.icon( - onPressed: () { - Navigator.pop(ctx); - context.push('/setup/${match.id}/1'); - }, - icon: const Icon(Icons.settings), - label: const Text('Continua configurazione'), - ), - ], - const SizedBox(height: 8), - OutlinedButton.icon( - onPressed: () { - shareRegiaLink( - ctx, - ref, - sessionId: sessionId, - shareSubject: - 'Regia — ${match.teamName} vs ${match.opponentName}', - ); - }, - icon: const Icon(Icons.share), - label: const Text('Condividi link regia'), - ), - const SizedBox(height: 8), - TextButton( - onPressed: () => Navigator.pop(ctx), - child: const Text('Annulla'), - ), - ], - ), - ), - ); - }, - ); -} diff --git a/mobile/lib/features/matches/schedule_match_sheet.dart b/mobile/lib/features/matches/schedule_match_sheet.dart deleted file mode 100644 index 153c114..0000000 --- a/mobile/lib/features/matches/schedule_match_sheet.dart +++ /dev/null @@ -1,176 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:intl/intl.dart'; - -import '../../app/theme.dart'; -import '../../shared/widgets/primary_cta.dart'; - -class ScheduleMatchResult { - ScheduleMatchResult({ - required this.opponentName, - required this.scheduledAt, - this.location, - }); - - final String opponentName; - final DateTime scheduledAt; - final String? location; -} - -Future showScheduleMatchSheet( - BuildContext context, { - String? teamName, -}) { - return showModalBottomSheet( - context: context, - isScrollControlled: true, - backgroundColor: AppTheme.surface, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.vertical(top: Radius.circular(16)), - ), - builder: (ctx) => _ScheduleMatchSheet(teamName: teamName), - ); -} - -class _ScheduleMatchSheet extends StatefulWidget { - const _ScheduleMatchSheet({this.teamName}); - - final String? teamName; - - @override - State<_ScheduleMatchSheet> createState() => _ScheduleMatchSheetState(); -} - -class _ScheduleMatchSheetState extends State<_ScheduleMatchSheet> { - final _opponentController = TextEditingController(); - final _locationController = TextEditingController(); - late DateTime _scheduledAt; - - @override - void initState() { - super.initState(); - final now = DateTime.now(); - _scheduledAt = DateTime(now.year, now.month, now.day, now.hour + 2, 0); - if (_scheduledAt.isBefore(now)) { - _scheduledAt = now.add(const Duration(hours: 2)); - } - } - - @override - void dispose() { - _opponentController.dispose(); - _locationController.dispose(); - super.dispose(); - } - - Future _pickDateTime() async { - final date = await showDatePicker( - context: context, - initialDate: _scheduledAt, - firstDate: DateTime.now().subtract(const Duration(days: 1)), - lastDate: DateTime.now().add(const Duration(days: 365)), - ); - if (date == null || !mounted) return; - - final time = await showTimePicker( - context: context, - initialTime: TimeOfDay.fromDateTime(_scheduledAt), - ); - if (time == null) return; - - setState(() { - _scheduledAt = DateTime(date.year, date.month, date.day, time.hour, time.minute); - }); - } - - void _submit() { - final opponent = _opponentController.text.trim(); - if (opponent.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Inserisci il nome dell’avversario')), - ); - return; - } - - Navigator.pop( - context, - ScheduleMatchResult( - opponentName: opponent, - scheduledAt: _scheduledAt, - location: _locationController.text.trim().isEmpty - ? null - : _locationController.text.trim(), - ), - ); - } - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final dateLabel = DateFormat('EEE d MMM yyyy · HH:mm', 'it_IT') - .format(_scheduledAt.toLocal()); - final bottom = MediaQuery.paddingOf(context).bottom; - - return Padding( - padding: EdgeInsets.fromLTRB(20, 12, 20, 20 + bottom), - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Center( - child: Container( - width: 40, - height: 4, - decoration: BoxDecoration( - color: AppTheme.textSecondary.withValues(alpha: 0.4), - borderRadius: BorderRadius.circular(2), - ), - ), - ), - const SizedBox(height: 16), - Text('Programma partita', style: theme.textTheme.titleLarge), - if (widget.teamName != null && widget.teamName!.isNotEmpty) ...[ - const SizedBox(height: 4), - Text( - widget.teamName!, - style: theme.textTheme.titleSmall?.copyWith( - color: AppTheme.primaryRed, - fontWeight: FontWeight.w600, - ), - ), - ], - const SizedBox(height: 6), - Text( - 'La diretta non parte ora: comparirà sul sito con data e ora. ' - 'Avvierai lo streaming dall’app quando sei in palestra.', - style: theme.textTheme.bodySmall, - ), - const SizedBox(height: 20), - TextField( - controller: _opponentController, - decoration: const InputDecoration(labelText: 'Avversario'), - textCapitalization: TextCapitalization.words, - ), - const SizedBox(height: 12), - TextField( - controller: _locationController, - decoration: const InputDecoration(labelText: 'Luogo (opzionale)'), - ), - const SizedBox(height: 12), - ListTile( - contentPadding: EdgeInsets.zero, - title: Text('Data e ora', style: theme.textTheme.bodyMedium), - subtitle: Text(dateLabel, style: theme.textTheme.titleMedium), - trailing: const Icon(Icons.calendar_today, color: AppTheme.primaryRed), - onTap: _pickDateTime, - ), - const SizedBox(height: 20), - PrimaryCta( - label: 'SALVA IN PROGRAMMA', - icon: Icons.event_available, - onPressed: _submit, - ), - ], - ), - ); - } -} diff --git a/mobile/lib/features/matches/select_match_sheet.dart b/mobile/lib/features/matches/select_match_sheet.dart deleted file mode 100644 index dedab7e..0000000 --- a/mobile/lib/features/matches/select_match_sheet.dart +++ /dev/null @@ -1,185 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:intl/intl.dart'; - -import '../../app/theme.dart'; -import '../../shared/models/match.dart'; - -/// Scegli una partita già in calendario per avviare la diretta. -Future showSelectMatchSheet( - BuildContext context, { - required List matches, -}) { - final selectable = matches.where((m) => !m.hasActiveSession).toList(); - if (selectable.isEmpty) return Future.value(null); - - return showModalBottomSheet( - context: context, - isScrollControlled: true, - backgroundColor: AppTheme.surface, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.vertical(top: Radius.circular(16)), - ), - builder: (ctx) => _SelectMatchSheet(matches: selectable), - ); -} - -class _SelectMatchSheet extends StatelessWidget { - const _SelectMatchSheet({required this.matches}); - - final List matches; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final dateFormat = DateFormat('EEE d MMM · HH:mm', 'it_IT'); - final now = DateTime.now(); - - final scheduled = matches - .where((m) => m.scheduledAt != null) - .toList() - ..sort((a, b) => a.scheduledAt!.compareTo(b.scheduledAt!)); - - final unscheduled = matches.where((m) => m.scheduledAt == null).toList(); - - return DraggableScrollableSheet( - expand: false, - initialChildSize: 0.55, - minChildSize: 0.35, - maxChildSize: 0.9, - builder: (context, scrollController) { - return Padding( - padding: const EdgeInsets.fromLTRB(20, 12, 20, 20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Center( - child: Container( - width: 40, - height: 4, - decoration: BoxDecoration( - color: AppTheme.textSecondary.withValues(alpha: 0.4), - borderRadius: BorderRadius.circular(2), - ), - ), - ), - const SizedBox(height: 16), - Text('Scegli partita', style: theme.textTheme.titleLarge), - const SizedBox(height: 6), - Text( - 'Partite già programmate sul sito o in app.', - style: theme.textTheme.bodyMedium, - ), - const SizedBox(height: 16), - Expanded( - child: ListView( - controller: scrollController, - children: [ - if (scheduled.isNotEmpty) ...[ - Text('Programmate', style: theme.textTheme.labelLarge), - const SizedBox(height: 8), - ...scheduled.map( - (m) => _MatchTile( - match: m, - dateFormat: dateFormat, - now: now, - onTap: () => Navigator.pop(context, m), - ), - ), - const SizedBox(height: 16), - ], - if (unscheduled.isNotEmpty) ...[ - Text('Senza orario', style: theme.textTheme.labelLarge), - const SizedBox(height: 8), - ...unscheduled.map( - (m) => _MatchTile( - match: m, - dateFormat: dateFormat, - now: now, - onTap: () => Navigator.pop(context, m), - ), - ), - ], - ], - ), - ), - ], - ), - ); - }, - ); - } -} - -class _MatchTile extends StatelessWidget { - const _MatchTile({ - required this.match, - required this.dateFormat, - required this.now, - required this.onTap, - }); - - final MatchModel match; - final DateFormat dateFormat; - final DateTime now; - final VoidCallback onTap; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final at = match.scheduledAt; - final isFuture = at != null && at.isAfter(now); - - return Padding( - padding: const EdgeInsets.only(bottom: 8), - child: Material( - color: AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(10), - child: InkWell( - onTap: onTap, - borderRadius: BorderRadius.circular(10), - child: Padding( - padding: const EdgeInsets.all(14), - child: Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - '${match.teamName} vs ${match.opponentName}', - style: theme.textTheme.titleSmall, - ), - if (at != null) - Text( - dateFormat.format(at.toLocal()), - style: theme.textTheme.bodySmall, - ), - if (match.location != null && match.location!.isNotEmpty) - Text(match.location!, style: theme.textTheme.bodySmall), - ], - ), - ), - Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), - decoration: BoxDecoration( - color: isFuture - ? AppTheme.primaryRed.withValues(alpha: 0.15) - : AppTheme.textSecondary.withValues(alpha: 0.15), - borderRadius: BorderRadius.circular(6), - ), - child: Text( - at != null ? (isFuture ? 'PROGRAMMATA' : 'IN CALENDARIO') : 'BOZZA', - style: theme.textTheme.labelSmall?.copyWith( - color: isFuture ? AppTheme.primaryRed : AppTheme.textSecondary, - fontSize: 10, - ), - ), - ), - ], - ), - ), - ), - ), - ); - } -} diff --git a/mobile/lib/features/matches/team_picker.dart b/mobile/lib/features/matches/team_picker.dart deleted file mode 100644 index 1426866..0000000 --- a/mobile/lib/features/matches/team_picker.dart +++ /dev/null @@ -1,125 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -import '../../app/theme.dart'; -import '../../shared/models/team.dart'; -import 'team_providers.dart'; - -/// Selettore squadra quando l'utente ne gestisce più di una (staff trasmissione / società). -class TeamPickerBar extends ConsumerWidget { - const TeamPickerBar({super.key}); - - @override - Widget build(BuildContext context, WidgetRef ref) { - final teamsAsync = ref.watch(teamsProvider); - final activeAsync = ref.watch(activeTeamProvider); - - return teamsAsync.when( - loading: () => const SizedBox.shrink(), - error: (_, _) => const SizedBox.shrink(), - data: (teams) { - if (teams.length <= 1) return const SizedBox.shrink(); - - final active = activeAsync.valueOrNull; - final theme = Theme.of(context); - - return Padding( - padding: const EdgeInsets.only(top: 8), - child: Material( - color: AppTheme.surface, - borderRadius: BorderRadius.circular(12), - child: InkWell( - onTap: () => _showTeamSheet(context, ref, teams, active?.id), - borderRadius: BorderRadius.circular(12), - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12), - child: Row( - children: [ - const Icon(Icons.groups_outlined, color: AppTheme.primaryRed, size: 22), - const SizedBox(width: 12), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Squadra per la diretta', - style: theme.textTheme.labelMedium?.copyWith( - color: AppTheme.textSecondary, - ), - ), - Text( - active?.name ?? 'Seleziona squadra', - style: theme.textTheme.titleSmall?.copyWith( - fontWeight: FontWeight.w700, - ), - ), - if (active?.clubName != null && active!.clubName!.isNotEmpty) - Text( - active.clubName!, - style: theme.textTheme.bodySmall, - ), - ], - ), - ), - const Icon(Icons.expand_more, color: AppTheme.textSecondary), - ], - ), - ), - ), - ), - ); - }, - ); - } - - Future _showTeamSheet( - BuildContext context, - WidgetRef ref, - List teams, - String? selectedId, - ) async { - final picked = await showModalBottomSheet( - context: context, - backgroundColor: AppTheme.surface, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.vertical(top: Radius.circular(16)), - ), - builder: (ctx) { - return SafeArea( - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Padding( - padding: const EdgeInsets.fromLTRB(20, 16, 20, 8), - child: Text( - 'Scegli squadra', - style: Theme.of(ctx).textTheme.titleLarge, - ), - ), - ...teams.map((team) { - final selected = team.id == selectedId; - return ListTile( - leading: Icon( - selected ? Icons.check_circle : Icons.circle_outlined, - color: selected ? AppTheme.primaryRed : AppTheme.textSecondary, - ), - title: Text(team.name), - subtitle: team.clubName != null && team.clubName!.isNotEmpty - ? Text(team.clubName!) - : null, - onTap: () => Navigator.pop(ctx, team.id), - ); - }), - const SizedBox(height: 8), - ], - ), - ); - }, - ); - - if (picked == null) return; - await ref.read(selectedTeamIdProvider.notifier).select(picked); - ref.invalidate(matchesProvider); - } -} diff --git a/mobile/lib/features/matches/team_providers.dart b/mobile/lib/features/matches/team_providers.dart deleted file mode 100644 index 260bf2e..0000000 --- a/mobile/lib/features/matches/team_providers.dart +++ /dev/null @@ -1,80 +0,0 @@ -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -import '../../core/team_selection_storage.dart'; -import '../../providers/auth_provider.dart'; -import '../../shared/api_client.dart'; -import '../../shared/models/match.dart'; -import '../../shared/models/recording_item.dart'; -import '../../shared/models/team.dart'; - -final matchesProvider = FutureProvider>((ref) async { - final auth = ref.watch(authProvider); - if (!auth.isAuthenticated) return []; - final team = await ref.watch(activeTeamProvider.future); - if (team == null) return []; - final client = ref.read(apiClientProvider); - final list = await client.fetchMatches(team.id); - list.sort((a, b) { - final sa = a.scheduledAt; - final sb = b.scheduledAt; - if (sa == null && sb == null) return 0; - if (sa == null) return 1; - if (sb == null) return -1; - return sa.compareTo(sb); - }); - return list; -}); - -final teamsProvider = FutureProvider>((ref) async { - final auth = ref.watch(authProvider); - if (!auth.isAuthenticated) return []; - final client = ref.read(apiClientProvider); - return client.fetchTeams(); -}); - -final selectedTeamIdProvider = - AsyncNotifierProvider(SelectedTeamIdNotifier.new); - -class SelectedTeamIdNotifier extends AsyncNotifier { - @override - Future build() => TeamSelectionStorage.load(); - - Future select(String teamId) async { - await TeamSelectionStorage.save(teamId); - state = AsyncData(teamId); - } -} - -/// Squadra attiva: preferisce la selezione salvata, altrimenti la prima disponibile. -final activeTeamProvider = FutureProvider((ref) async { - final teams = await ref.watch(teamsProvider.future); - if (teams.isEmpty) return null; - - var selectedId = ref.watch(selectedTeamIdProvider).valueOrNull; - final valid = selectedId != null && teams.any((t) => t.id == selectedId); - - if (!valid) { - selectedId = teams.first.id; - await ref.read(selectedTeamIdProvider.notifier).select(selectedId); - } - - return teams.firstWhere((t) => t.id == selectedId); -}); - -/// Compatibilità con codice esistente. -final primaryTeamProvider = activeTeamProvider; - -final teamByIdProvider = FutureProvider.family((ref, teamId) async { - final teams = await ref.watch(teamsProvider.future); - for (final t in teams) { - if (t.id == teamId) return t; - } - return null; -}); - -final recordingsProvider = FutureProvider.family, String>((ref, teamId) async { - final team = await ref.watch(teamByIdProvider(teamId).future); - if (team == null || !team.recordingsEnabled) return []; - final client = ref.read(apiClientProvider); - return client.fetchRecordings(teamId); -}); diff --git a/mobile/lib/features/setup_wizard/step_match.dart b/mobile/lib/features/setup_wizard/step_match.dart deleted file mode 100644 index ef8e65b..0000000 --- a/mobile/lib/features/setup_wizard/step_match.dart +++ /dev/null @@ -1,284 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:intl/intl.dart'; - -import '../../app/theme.dart'; -import '../../shared/api_client.dart'; -import '../../shared/models/match.dart'; -import '../../shared/widgets/primary_cta.dart'; -import '../../shared/widgets/screen_insets.dart'; - -class StepMatch extends ConsumerStatefulWidget { - const StepMatch({ - super.key, - required this.match, - required this.onNext, - }); - - final MatchModel match; - final VoidCallback onNext; - - @override - ConsumerState createState() => _StepMatchState(); -} - -class _StepMatchState extends ConsumerState { - late final TextEditingController _opponentController; - late final TextEditingController _locationController; - late final TextEditingController _categoryController; - late final TextEditingController _phaseController; - late final TextEditingController _rosterController; - int _setsToWin = 3; - DateTime? _scheduledAt; - bool _saving = false; - bool _customRules = false; - int _pointsPerSet = 25; - int _pointsDecidingSet = 15; - int _minPointLead = 2; - - @override - void initState() { - super.initState(); - _opponentController = TextEditingController(text: widget.match.opponentName); - _locationController = TextEditingController(text: widget.match.location ?? ''); - _categoryController = TextEditingController(text: widget.match.category ?? ''); - _phaseController = TextEditingController(text: widget.match.phase ?? ''); - _rosterController = TextEditingController( - text: widget.match.rosterNumbers.join(', '), - ); - _setsToWin = widget.match.setsToWin; - _scheduledAt = widget.match.scheduledAt; - final rules = widget.match.scoringRules; - if (rules != null && rules.isNotEmpty) { - _customRules = true; - _pointsPerSet = rules['points_per_set'] as int? ?? 25; - _pointsDecidingSet = rules['points_deciding_set'] as int? ?? 15; - _minPointLead = rules['min_point_lead'] as int? ?? 2; - } - } - - @override - void dispose() { - _opponentController.dispose(); - _locationController.dispose(); - _categoryController.dispose(); - _phaseController.dispose(); - _rosterController.dispose(); - super.dispose(); - } - - List _parseRoster(String raw) { - return raw - .split(RegExp(r'[,\s]+')) - .where((s) => s.isNotEmpty) - .map(int.tryParse) - .whereType() - .toList(); - } - - Future _pickDateTime() async { - final date = await showDatePicker( - context: context, - initialDate: _scheduledAt ?? DateTime.now(), - firstDate: DateTime.now().subtract(const Duration(days: 1)), - lastDate: DateTime.now().add(const Duration(days: 365)), - ); - if (date == null || !mounted) return; - - final time = await showTimePicker( - context: context, - initialTime: TimeOfDay.fromDateTime(_scheduledAt ?? DateTime.now()), - ); - if (time == null) return; - - setState(() { - _scheduledAt = DateTime(date.year, date.month, date.day, time.hour, time.minute); - }); - } - - Future _save() async { - if (_opponentController.text.trim().isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Inserisci il nome avversario')), - ); - return; - } - - setState(() => _saving = true); - try { - final client = ref.read(apiClientProvider); - await client.updateMatch(widget.match.id, { - 'opponent_name': _opponentController.text.trim(), - 'location': _locationController.text.trim(), - 'scheduled_at': _scheduledAt?.toIso8601String(), - 'sets_to_win': _setsToWin, - if (_customRules) - 'scoring_rules': { - 'points_per_set': _pointsPerSet, - 'points_deciding_set': _pointsDecidingSet, - 'min_point_lead': _minPointLead, - }, - 'category': _categoryController.text.trim(), - 'phase': _phaseController.text.trim(), - 'roster_numbers': _parseRoster(_rosterController.text), - }); - widget.onNext(); - } catch (_) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Errore nel salvataggio')), - ); - } - } finally { - if (mounted) setState(() => _saving = false); - } - } - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final dateLabel = _scheduledAt != null - ? DateFormat('EEE d MMM yyyy · HH:mm', 'it_IT').format(_scheduledAt!.toLocal()) - : 'Seleziona data e ora'; - - return SingleChildScrollView( - padding: ScreenInsets.contentPadding(context, horizontal: 20, vertical: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Text('Dettagli partita', style: theme.textTheme.titleLarge), - const SizedBox(height: 20), - _ReadOnlyField(label: 'Squadra casa', value: widget.match.teamName), - const SizedBox(height: 12), - TextField( - controller: _opponentController, - decoration: const InputDecoration(labelText: 'Avversario'), - ), - const SizedBox(height: 12), - TextField( - controller: _locationController, - decoration: const InputDecoration(labelText: 'Luogo'), - ), - const SizedBox(height: 12), - ListTile( - contentPadding: EdgeInsets.zero, - title: Text('Orario', style: theme.textTheme.bodyMedium), - subtitle: Text(dateLabel, style: theme.textTheme.titleMedium), - trailing: const Icon(Icons.calendar_today), - onTap: _pickDateTime, - ), - const SizedBox(height: 12), - Text('Set da vincere', style: theme.textTheme.bodyMedium), - const SizedBox(height: 8), - SegmentedButton( - segments: const [ - ButtonSegment(value: 2, label: Text('2')), - ButtonSegment(value: 3, label: Text('3')), - ], - selected: {_setsToWin}, - onSelectionChanged: (s) => setState(() => _setsToWin = s.first), - ), - const SizedBox(height: 12), - SwitchListTile( - contentPadding: EdgeInsets.zero, - title: const Text('Regole punteggio personalizzate'), - subtitle: const Text( - 'Per tornei non standard (punti set, tie-break, vantaggio minimo)', - ), - value: _customRules, - onChanged: (v) => setState(() => _customRules = v), - ), - if (_customRules) ...[ - const SizedBox(height: 8), - Text('Punti per vincere un set', style: theme.textTheme.bodyMedium), - const SizedBox(height: 6), - SegmentedButton( - segments: const [ - ButtonSegment(value: 21, label: Text('21')), - ButtonSegment(value: 25, label: Text('25')), - ButtonSegment(value: 30, label: Text('30')), - ], - selected: {_pointsPerSet}, - onSelectionChanged: (s) => setState(() => _pointsPerSet = s.first), - ), - const SizedBox(height: 10), - Text('Punti set decisivo', style: theme.textTheme.bodyMedium), - const SizedBox(height: 6), - SegmentedButton( - segments: const [ - ButtonSegment(value: 15, label: Text('15')), - ButtonSegment(value: 21, label: Text('21')), - ], - selected: {_pointsDecidingSet}, - onSelectionChanged: (s) => setState(() => _pointsDecidingSet = s.first), - ), - const SizedBox(height: 10), - Text('Vantaggio minimo', style: theme.textTheme.bodyMedium), - const SizedBox(height: 6), - SegmentedButton( - segments: const [ - ButtonSegment(value: 1, label: Text('1')), - ButtonSegment(value: 2, label: Text('2')), - ], - selected: {_minPointLead}, - onSelectionChanged: (s) => setState(() => _minPointLead = s.first), - ), - ], - const SizedBox(height: 12), - TextField( - controller: _categoryController, - decoration: const InputDecoration(labelText: 'Categoria'), - ), - const SizedBox(height: 12), - TextField( - controller: _phaseController, - decoration: const InputDecoration(labelText: 'Fase (es. semifinale)'), - ), - const SizedBox(height: 12), - TextField( - controller: _rosterController, - decoration: const InputDecoration( - labelText: 'Convocate (numeri maglia)', - hintText: '1, 5, 7, 12', - ), - keyboardType: TextInputType.number, - ), - const SizedBox(height: 32), - PrimaryCta( - label: 'AVANTI >', - loading: _saving, - onPressed: _save, - icon: Icons.arrow_forward, - ), - ], - ), - ); - } -} - -class _ReadOnlyField extends StatelessWidget { - const _ReadOnlyField({required this.label, required this.value}); - - final String label; - final String value; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - return Container( - padding: const EdgeInsets.all(14), - decoration: BoxDecoration( - color: AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(10), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(label, style: theme.textTheme.bodyMedium), - const SizedBox(height: 4), - Text(value, style: theme.textTheme.titleMedium), - ], - ), - ); - } -} diff --git a/mobile/lib/features/setup_wizard/step_network_test.dart b/mobile/lib/features/setup_wizard/step_network_test.dart deleted file mode 100644 index 5573294..0000000 --- a/mobile/lib/features/setup_wizard/step_network_test.dart +++ /dev/null @@ -1,425 +0,0 @@ -import 'dart:async'; -import 'dart:math'; - -import 'package:connectivity_plus/connectivity_plus.dart'; -import 'package:dio/dio.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:go_router/go_router.dart'; - -import '../../app/theme.dart'; -import '../../providers/score_provider.dart'; -import '../../providers/score_sync_provider.dart'; -import '../../providers/session_provider.dart'; -import '../../shared/api_client.dart'; -import '../../shared/models/match.dart'; -import '../../shared/models/score_state.dart'; -import '../../shared/models/stream_session.dart'; -import '../../shared/websocket_service.dart'; -import '../../shared/regia_share.dart'; -import '../../shared/watch_share.dart'; -import '../../providers/match_rules_provider.dart'; -import '../../shared/widgets/live_score_controls.dart'; -import '../../shared/widgets/metric_card.dart'; -import '../../shared/widgets/primary_cta.dart'; -import '../../shared/widgets/screen_insets.dart'; - -class StepNetworkTest extends ConsumerStatefulWidget { - const StepNetworkTest({ - super.key, - required this.match, - required this.onBack, - }); - - final MatchModel match; - final VoidCallback onBack; - - @override - ConsumerState createState() => _StepNetworkTestState(); -} - -class _StepNetworkTestState extends ConsumerState { - bool _testing = false; - bool _testCompleted = false; - bool _ready = false; - double _downloadMbps = 0; - double _uploadMbps = 0; - int _latencyMs = 0; - String _networkType = '—'; - bool _starting = false; - Timer? _youtubePoll; - - @override - void initState() { - super.initState(); - WidgetsBinding.instance.addPostFrameCallback((_) { - final session = ref.read(sessionProvider).session; - if (session?.score != null) { - ref.read(scoreProvider.notifier).reset(session!.score!); - } - _startYoutubeLinkPoll(); - }); - } - - @override - void dispose() { - _youtubePoll?.cancel(); - super.dispose(); - } - - void _startYoutubeLinkPoll() { - final session = ref.read(sessionProvider).session; - if (session == null || session.platform != 'youtube') return; - if (session.youtubeReady || (session.youtubeWatchUrl?.isNotEmpty ?? false)) { - return; - } - - _youtubePoll?.cancel(); - var attempts = 0; - _youtubePoll = Timer.periodic(const Duration(seconds: 3), (_) async { - attempts++; - if (!mounted || attempts > 60) { - _youtubePoll?.cancel(); - return; - } - final current = ref.read(sessionProvider).session; - if (current == null) return; - try { - final updated = - await ref.read(apiClientProvider).fetchSession(current.id); - ref - .read(sessionProvider.notifier) - .setSession(updated, match: ref.read(sessionProvider).match); - if (updated.youtubeReady || - (updated.youtubeWatchUrl?.isNotEmpty ?? false)) { - _youtubePoll?.cancel(); - if (mounted) setState(() {}); - } - } catch (_) {} - }); - } - - Future _runTest() async { - setState(() { - _testing = true; - _ready = false; - }); - - final connectivity = await Connectivity().checkConnectivity(); - final networkLabel = _connectivityLabel(connectivity); - - // Simulazione test rete locale (sostituibile con speed test reale). - await Future.delayed(const Duration(seconds: 2)); - final rng = Random(); - final download = 8 + rng.nextDouble() * 12; - final upload = 2 + rng.nextDouble() * 4; - final latency = 20 + rng.nextInt(80); - - final session = ref.read(sessionProvider).session; - NetworkTestResult? testResult; - if (session != null) { - try { - final client = ref.read(apiClientProvider); - testResult = await client.networkTest( - sessionId: session.id, - downloadMbps: download, - uploadMbps: upload, - latencyMs: latency, - networkType: networkLabel, - ); - } catch (_) { - testResult = null; - } - } - - if (mounted) { - setState(() { - _testing = false; - _testCompleted = true; - _downloadMbps = download; - _uploadMbps = upload; - _latencyMs = latency; - _networkType = networkLabel; - _ready = testResult?.ready ?? upload >= 2.0; - }); - await _ensureScoreboardLink(); - } - } - - Future _ensureScoreboardLink() async { - final session = ref.read(sessionProvider).session; - if (session == null) return; - if (session.score != null) { - ref.read(scoreProvider.notifier).reset(session.score!); - } - // Tabellone via HTTP; WebSocket solo dalla camera (evita doppio connect controller/camera). - try { - await ref.read(scoreSyncProvider).pullFromServer(); - } catch (_) {} - } - - String _connectivityLabel(List results) { - if (results.contains(ConnectivityResult.wifi)) return 'WiFi'; - if (results.contains(ConnectivityResult.mobile)) return '4G'; - if (results.contains(ConnectivityResult.ethernet)) return 'Ethernet'; - return 'Sconosciuto'; - } - - Future _startLive() async { - final sessionState = ref.read(sessionProvider); - final session = sessionState.session; - if (session == null) return; - - setState(() => _starting = true); - try { - final client = ref.read(apiClientProvider); - final started = await client.startSession(session.id); - ref.read(sessionProvider.notifier).setSession(started, match: widget.match); - - if (started.score != null) { - ref.read(scoreProvider.notifier).reset(started.score!); - } else { - ref.read(scoreProvider.notifier).reset(const ScoreState()); - } - - if (!mounted) return; - await ref.read(websocketServiceProvider).disconnect(); - if (!mounted) return; - context.go('/session/${started.id}/camera'); - } on DioException catch (e) { - if (mounted) { - final msg = e.response?.data is Map - ? (e.response!.data['error'] ?? e.response!.data['message'])?.toString() - : null; - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text( - msg?.isNotEmpty == true ? 'Errore avvio diretta: $msg' : 'Errore avvio diretta: ${e.message}', - ), - ), - ); - } - } catch (e) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Errore avvio diretta: $e')), - ); - } - } finally { - if (mounted) setState(() => _starting = false); - } - } - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final session = ref.watch(sessionProvider).session; - final shareUrl = session != null ? watchShareUrl(session) : null; - final shareTitle = 'Diretta — ${widget.match.teamName} vs ${widget.match.opponentName}'; - final score = ref.watch(scoreProvider); - final pointsTarget = ref.watch(matchScoringRulesProvider).pointsTarget(score.currentSet); - - return SingleChildScrollView( - padding: ScreenInsets.contentPadding(context, horizontal: 20, vertical: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Text('Test rete', style: theme.textTheme.titleLarge), - const SizedBox(height: 8), - Text( - 'Verifica che la connessione regga l\'upload della diretta.', - style: theme.textTheme.bodyMedium, - ), - const SizedBox(height: 24), - Row( - children: [ - MetricCard( - label: 'Download', - value: _testing ? '...' : '${_downloadMbps.toStringAsFixed(1)} Mbps', - icon: Icons.download, - ), - const SizedBox(width: 8), - MetricCard( - label: 'Upload', - value: _testing ? '...' : '${_uploadMbps.toStringAsFixed(1)} Mbps', - icon: Icons.upload, - highlight: _ready, - ), - const SizedBox(width: 8), - MetricCard( - label: 'Latenza', - value: _testing ? '...' : '${_latencyMs} ms', - icon: Icons.speed, - ), - ], - ), - const SizedBox(height: 12), - SizedBox( - width: double.infinity, - child: MetricCard( - label: 'Tipo rete', - value: _networkType, - icon: Icons.signal_cellular_alt, - expand: false, - ), - ), - const SizedBox(height: 20), - if (_testCompleted && _ready) ...[ - Container( - padding: const EdgeInsets.all(14), - decoration: BoxDecoration( - color: AppTheme.successGreen.withValues(alpha: 0.15), - borderRadius: BorderRadius.circular(10), - border: Border.all(color: AppTheme.successGreen.withValues(alpha: 0.4)), - ), - child: Text( - 'PRONTO PER ANDARE IN DIRETTA', - style: theme.textTheme.titleMedium?.copyWith( - color: AppTheme.successGreen, - ), - textAlign: TextAlign.center, - ), - ), - const SizedBox(height: 12), - ], - if (_testCompleted && - session != null && - session.platform == 'youtube' && - shareUrl == null) ...[ - Container( - padding: const EdgeInsets.all(14), - decoration: BoxDecoration( - color: AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(10), - ), - child: Text( - 'Preparazione diretta sul canale YouTube Match Live TV… ' - 'Il link apparirà qui tra pochi secondi.', - style: theme.textTheme.bodySmall, - ), - ), - const SizedBox(height: 8), - ], - if (_testCompleted && session != null && shareUrl != null) ...[ - Container( - padding: const EdgeInsets.all(14), - decoration: BoxDecoration( - color: AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(10), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Text( - session.platform == 'youtube' - ? 'Link diretta YouTube (canale Match Live TV)' - : 'Link diretta Match Live TV', - style: theme.textTheme.titleSmall, - ), - const SizedBox(height: 8), - SelectableText( - shareUrl, - style: theme.textTheme.bodySmall, - ), - if (session.platform == 'youtube') ...[ - const SizedBox(height: 6), - Text( - 'Condividi solo questo link: gli spettatori guardano su YouTube, non sul sito.', - style: theme.textTheme.bodySmall, - ), - ], - const SizedBox(height: 8), - Row( - children: [ - Expanded( - child: OutlinedButton.icon( - onPressed: () => copyWatchLink(context, session), - icon: const Icon(Icons.link, size: 18), - label: const Text('COPIA'), - ), - ), - const SizedBox(width: 8), - Expanded( - child: OutlinedButton.icon( - onPressed: () => shareWatchLink( - context, - session: session, - title: shareTitle, - ), - icon: const Icon(Icons.share, size: 18), - label: const Text('CONDIVIDI'), - ), - ), - ], - ), - ], - ), - ), - const SizedBox(height: 8), - OutlinedButton.icon( - onPressed: () => shareRegiaLink( - context, - ref, - sessionId: session.id, - shareSubject: - 'Regia — ${widget.match.teamName} vs ${widget.match.opponentName}', - ), - icon: const Icon(Icons.scoreboard), - label: const Text('Condividi link regia (punteggio)'), - ), - const SizedBox(height: 16), - Text('Tabellone', style: theme.textTheme.titleMedium), - const SizedBox(height: 8), - LiveScoreControls( - homeName: widget.match.teamName, - awayName: widget.match.opponentName, - pointsTarget: pointsTarget, - ), - ], - if (_testCompleted) ...[ - const SizedBox(height: 16), - Container( - padding: const EdgeInsets.all(14), - decoration: BoxDecoration( - color: AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(10), - ), - child: Text( - 'In caso di disconnessione, lo stream resta attivo con slate per massimo 5 minuti mentre il telefono riconnette.', - style: theme.textTheme.bodyMedium, - ), - ), - ], - if (!_testCompleted) ...[ - const SizedBox(height: 24), - OutlinedButton( - onPressed: _testing ? null : _runTest, - child: Text(_testing ? 'TEST IN CORSO...' : 'AVVIA TEST RETE'), - ), - ], - const SizedBox(height: 32), - Row( - children: [ - Expanded( - child: OutlinedButton( - onPressed: _starting ? null : widget.onBack, - child: const Text('Indietro'), - ), - ), - const SizedBox(width: 12), - Expanded( - flex: 2, - child: PrimaryCta( - label: 'INIZIA >', - loading: _starting, - onPressed: _ready ? _startLive : null, - icon: Icons.play_arrow, - ), - ), - ], - ), - ], - ), - ); - } -} diff --git a/mobile/lib/features/setup_wizard/step_transmission.dart b/mobile/lib/features/setup_wizard/step_transmission.dart deleted file mode 100644 index 6429c9a..0000000 --- a/mobile/lib/features/setup_wizard/step_transmission.dart +++ /dev/null @@ -1,399 +0,0 @@ -import 'package:dio/dio.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../../app/theme.dart'; -import '../../providers/session_provider.dart'; -import '../../shared/api_client.dart'; -import '../../shared/api_error.dart'; -import '../../shared/models/match.dart'; -import '../../shared/premium_dialog.dart'; -import '../../shared/widgets/primary_cta.dart'; -import '../../shared/widgets/screen_insets.dart'; -import '../../shared/models/team.dart'; -import '../matches/team_providers.dart'; - -class StepTransmission extends ConsumerStatefulWidget { - const StepTransmission({ - super.key, - required this.match, - required this.onBack, - required this.onNext, - }); - - final MatchModel match; - final VoidCallback onBack; - final VoidCallback onNext; - - @override - ConsumerState createState() => _StepTransmissionState(); -} - -class _StepTransmissionState extends ConsumerState { - String _platform = 'matchlivetv'; - String _privacy = 'public'; - String? _youtubeChannel; - bool _creating = false; - - void _syncYoutubeChannel(Team? team) { - if (team == null) { - _youtubeChannel = null; - return; - } - if (!team.canChooseYoutubeChannel) { - if (team.youtubeTeamChannelAvailable) { - _youtubeChannel = 'team'; - } else if (team.youtubePlatformAvailable) { - _youtubeChannel = 'platform'; - } else { - _youtubeChannel = null; - } - return; - } - _youtubeChannel ??= 'platform'; - } - - Future _createSession() async { - setState(() => _creating = true); - try { - final client = ref.read(apiClientProvider); - final session = await client.createSession( - widget.match.id, - platform: _platform, - youtubeChannel: _platform == 'youtube' ? _youtubeChannel : null, - privacyStatus: _privacy, - qualityPreset: '720p_30_2.5mbps', - targetBitrate: 2500000, - targetFps: 30, - ); - ref.read(sessionProvider.notifier).setSession(session, match: widget.match); - widget.onNext(); - } on DioException catch (e) { - final apiErr = ApiException.fromDio(e); - if (mounted) { - if (apiErr?.isPremiumRequired == true) { - await showPremiumRequiredDialog( - context, - message: apiErr!.message, - billingUrl: apiErr.billingUrl, - ); - } else if (e.type == DioExceptionType.receiveTimeout || - e.type == DioExceptionType.sendTimeout || - e.type == DioExceptionType.connectionTimeout) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text( - 'Il server impiega più del previsto (YouTube). Attendi e non ritentare subito: ' - 'controlla se la sessione è già stata creata.', - ), - ), - ); - } else { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text(apiErr?.message ?? 'Errore nella creazione sessione')), - ); - } - } - } catch (_) { - if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Errore nella creazione sessione')), - ); - } - } finally { - if (mounted) setState(() => _creating = false); - } - } - - void _onYoutubeTap(Team? team) { - if (team == null) return; - if (team.isYoutubeReady) { - setState(() { - _platform = 'youtube'; - _syncYoutubeChannel(team); - }); - return; - } - if (team.canUseYoutube) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text( - 'YouTube non è ancora disponibile. Riprova più tardi o usa Match Live TV sul sito.', - ), - ), - ); - return; - } - showPremiumRequiredDialog( - context, - message: 'YouTube Live richiede Premium Light o Full.', - billingUrl: team.billingUrl, - ); - } - - String _youtubeSubtitle(Team? team) { - if (team == null || !team.canUseYoutube) { - return 'Premium Light o Full'; - } - if (!team.isYoutubeReady) { - return 'Canale Match Live TV (in attivazione)'; - } - if (_platform == 'youtube' && team.canChooseYoutubeChannel) { - return _youtubeChannel == 'team' - ? 'Canale ${team.youtubeTeamChannelTitle ?? "società"}' - : 'Canale Match Live TV'; - } - if (team.youtubeUsesPlatformChannel || team.youtubePlatformAvailable) { - final label = team.youtubeChannelTitle; - return label != null ? 'Canale $label' : 'Canale Match Live TV'; - } - final label = team.youtubeTeamChannelTitle ?? team.youtubeChannelTitle; - return label != null ? 'Canale $label' : 'Canale società collegato'; - } - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final teamAsync = ref.watch(teamByIdProvider(widget.match.teamId)); - - return teamAsync.when( - loading: () => const Center(child: CircularProgressIndicator(color: AppTheme.primaryRed)), - error: (_, __) => const Center(child: Text('Errore caricamento squadra')), - data: (team) { - _syncYoutubeChannel(team); - final youtubeSelectable = team != null && team.isYoutubeReady; - final showYoutubeChannels = - _platform == 'youtube' && team != null && team.canChooseYoutubeChannel; - - return SingleChildScrollView( - padding: ScreenInsets.contentPadding(context, horizontal: 20, vertical: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - if (team != null) ...[ - Container( - padding: const EdgeInsets.all(12), - decoration: BoxDecoration( - color: AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(10), - border: Border.all(color: AppTheme.primaryRed.withValues(alpha: 0.3)), - ), - child: Text( - 'Piano ${team.planName} · Staff ${team.staffLimitLabel}' - '${team.concurrentStreamsLimit != null ? ' · Dirette ${team.concurrentStreamsUsed}/${team.concurrentStreamsLimit}' : ''}', - style: theme.textTheme.bodySmall, - ), - ), - const SizedBox(height: 12), - ], - Text('Piattaforma', style: theme.textTheme.titleLarge), - const SizedBox(height: 12), - _PlatformCard( - title: 'Match Live TV', - subtitle: 'Diretta sul nostro sito (incluso)', - selected: _platform == 'matchlivetv', - enabled: true, - onTap: () => setState(() => _platform = 'matchlivetv'), - ), - const SizedBox(height: 8), - _PlatformCard( - title: 'YouTube Live', - subtitle: _youtubeSubtitle(team), - selected: _platform == 'youtube', - enabled: youtubeSelectable, - badge: team?.canUseYoutube == true ? null : 'Premium', - onTap: () => _onYoutubeTap(team), - ), - if (showYoutubeChannels) ...[ - const SizedBox(height: 16), - Text('Canale YouTube', style: theme.textTheme.titleMedium), - const SizedBox(height: 8), - _PlatformCard( - title: 'Match Live TV', - subtitle: 'Canale ufficiale della piattaforma', - selected: _youtubeChannel == 'platform', - enabled: true, - onTap: () => setState(() => _youtubeChannel = 'platform'), - ), - const SizedBox(height: 8), - _PlatformCard( - title: team!.youtubeTeamChannelTitle ?? 'Canale società', - subtitle: 'Il tuo canale collegato', - selected: _youtubeChannel == 'team', - enabled: true, - onTap: () => setState(() => _youtubeChannel = 'team'), - ), - ], - const SizedBox(height: 24), - Text('Visibilità', style: theme.textTheme.titleLarge), - const SizedBox(height: 8), - Text( - 'Match Live TV e YouTube (canale nostro o società).', - style: theme.textTheme.bodySmall, - ), - const SizedBox(height: 12), - SegmentedButton( - segments: const [ - ButtonSegment( - value: 'public', - label: Text('Pubblico'), - icon: Icon(Icons.public), - ), - ButtonSegment( - value: 'unlisted', - label: Text('Privato / non in elenco'), - icon: Icon(Icons.link), - ), - ], - selected: {_privacy}, - onSelectionChanged: (s) => setState(() => _privacy = s.first), - ), - const SizedBox(height: 8), - Text( - _privacy == 'public' - ? 'Compare nell\'elenco dirette e sul canale YouTube scelto.' - : 'Solo chi ha il link. Non in elenco pubblico né nelle ricerche.', - style: theme.textTheme.bodySmall?.copyWith(color: AppTheme.textSecondary), - ), - const SizedBox(height: 24), - Text('Qualità', style: theme.textTheme.titleLarge), - const SizedBox(height: 12), - Container( - padding: const EdgeInsets.all(16), - decoration: BoxDecoration( - color: AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(12), - border: Border.all(color: AppTheme.primaryRed.withValues(alpha: 0.4)), - ), - child: Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text('720p · 30fps · 3 Mbps', style: theme.textTheme.titleMedium), - const SizedBox(height: 4), - Text( - 'Bitrate fisso consigliato per reti instabili', - style: theme.textTheme.bodyMedium, - ), - ], - ), - ), - Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), - decoration: BoxDecoration( - color: AppTheme.primaryRed.withValues(alpha: 0.2), - borderRadius: BorderRadius.circular(6), - ), - child: Text( - 'AUTO', - style: theme.textTheme.labelLarge?.copyWith( - color: AppTheme.primaryRed, - fontSize: 11, - ), - ), - ), - ], - ), - ), - const SizedBox(height: 32), - Row( - children: [ - Expanded( - child: OutlinedButton( - onPressed: _creating ? null : widget.onBack, - child: const Text('Indietro'), - ), - ), - const SizedBox(width: 12), - Expanded( - flex: 2, - child: PrimaryCta( - label: 'AVANTI >', - loading: _creating, - onPressed: _createSession, - icon: Icons.arrow_forward, - ), - ), - ], - ), - ], - ), - ); - }, - ); - } -} - -class _PlatformCard extends StatelessWidget { - const _PlatformCard({ - required this.title, - this.subtitle, - required this.selected, - required this.enabled, - this.badge, - this.onTap, - }); - - final String title; - final String? subtitle; - final bool selected; - final bool enabled; - final String? badge; - final VoidCallback? onTap; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - return Opacity( - opacity: enabled ? 1 : 0.55, - child: Material( - color: Colors.transparent, - child: InkWell( - onTap: onTap, - borderRadius: BorderRadius.circular(10), - child: Container( - padding: const EdgeInsets.all(14), - decoration: BoxDecoration( - color: selected - ? AppTheme.primaryRed.withValues(alpha: 0.15) - : AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(10), - border: Border.all( - color: selected ? AppTheme.primaryRed : Colors.transparent, - ), - ), - child: Row( - children: [ - Icon( - selected ? Icons.radio_button_checked : Icons.radio_button_off, - color: selected ? AppTheme.primaryRed : AppTheme.textSecondary, - ), - const SizedBox(width: 12), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(title, style: theme.textTheme.titleMedium), - if (subtitle != null) - Text(subtitle!, style: theme.textTheme.bodyMedium), - ], - ), - ), - if (badge != null) - Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), - decoration: BoxDecoration( - color: AppTheme.textSecondary.withValues(alpha: 0.2), - borderRadius: BorderRadius.circular(6), - ), - child: Text(badge!, style: theme.textTheme.labelSmall), - ), - ], - ), - ), - ), - ), - ); - } -} diff --git a/mobile/lib/features/setup_wizard/wizard_shell.dart b/mobile/lib/features/setup_wizard/wizard_shell.dart deleted file mode 100644 index 966388d..0000000 --- a/mobile/lib/features/setup_wizard/wizard_shell.dart +++ /dev/null @@ -1,164 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:go_router/go_router.dart'; - -import '../../app/theme.dart'; -import '../../providers/session_provider.dart'; -import '../../shared/models/match.dart'; -import '../../shared/api_client.dart'; -import '../../shared/widgets/screen_insets.dart'; -import 'step_match.dart'; -import 'step_network_test.dart'; -import 'step_transmission.dart'; - -class WizardShell extends ConsumerStatefulWidget { - const WizardShell({ - super.key, - required this.matchId, - required this.step, - }); - - final String matchId; - final int step; - - @override - ConsumerState createState() => _WizardShellState(); -} - -class _WizardShellState extends ConsumerState { - MatchModel? _match; - bool _loading = true; - - static const _stepTitles = [ - '01 · Partita', - '02 · Trasmissione', - '03 · Test rete', - ]; - - @override - void initState() { - super.initState(); - _loadMatch(); - } - - @override - void didUpdateWidget(WizardShell oldWidget) { - super.didUpdateWidget(oldWidget); - if (oldWidget.matchId != widget.matchId) { - _loadMatch(); - } - } - - Future _loadMatch() async { - setState(() => _loading = true); - try { - final client = ref.read(apiClientProvider); - final match = await client.fetchMatch(widget.matchId); - ref.read(sessionProvider.notifier).setMatch(match); - if (mounted) { - setState(() { - _match = match; - _loading = false; - }); - } - } catch (_) { - if (mounted) setState(() => _loading = false); - } - } - - void _goToStep(int step) { - context.go('/setup/${widget.matchId}/$step'); - } - - @override - Widget build(BuildContext context) { - final stepIndex = widget.step.clamp(1, 3) - 1; - - return Scaffold( - appBar: AppBar( - title: Text(_stepTitles[stepIndex]), - leading: IconButton( - icon: const Icon(Icons.close), - onPressed: () => context.go('/matches'), - ), - ), - body: _loading - ? const Center( - child: CircularProgressIndicator(color: AppTheme.primaryRed), - ) - : Column( - children: [ - _StepIndicator(current: widget.step), - Expanded( - child: AppSafeArea( - top: false, - child: _buildStep(stepIndex), - ), - ), - ], - ), - ); - } - - Widget _buildStep(int index) { - final match = _match; - if (match == null) { - return Center( - child: Text( - 'Partita non trovata', - style: Theme.of(context).textTheme.bodyMedium, - ), - ); - } - - switch (index) { - case 0: - return StepMatch( - match: match, - onNext: () => _goToStep(2), - ); - case 1: - return StepTransmission( - match: match, - onBack: () => _goToStep(1), - onNext: () => _goToStep(3), - ); - case 2: - return StepNetworkTest( - match: match, - onBack: () => _goToStep(2), - ); - default: - return const SizedBox.shrink(); - } - } -} - -class _StepIndicator extends StatelessWidget { - const _StepIndicator({required this.current}); - - final int current; - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12), - child: Row( - children: List.generate(3, (i) { - final step = i + 1; - final active = step <= current; - return Expanded( - child: Container( - height: 4, - margin: EdgeInsets.only(right: i < 2 ? 6 : 0), - decoration: BoxDecoration( - color: active ? AppTheme.primaryRed : AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(2), - ), - ), - ); - }), - ), - ); - } -} diff --git a/mobile/lib/features/shared/live_score_actions.dart b/mobile/lib/features/shared/live_score_actions.dart deleted file mode 100644 index 3fdf161..0000000 --- a/mobile/lib/features/shared/live_score_actions.dart +++ /dev/null @@ -1,94 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -import '../../providers/match_rules_provider.dart'; -import '../../providers/score_provider.dart'; -import '../../shared/scoring/match_scoring_rules.dart'; -import '../../shared/widgets/score_outcome_dialogs.dart'; - -/// Gestione regole punteggio, dialoghi set/partita e sync. -class LiveScoreActions { - LiveScoreActions(this.ref); - - final WidgetRef ref; - bool _dialogOpen = false; - - MatchScoringRules get _rules => ref.read(matchScoringRulesProvider); - - Future afterPointChange( - BuildContext context, { - required String homeName, - required String awayName, - required Future Function() onCloseSetConfirmed, - }) async { - if (_dialogOpen || !context.mounted) return; - final score = ref.read(scoreProvider); - final winner = _rules.setWinnerFromPoints( - homePoints: score.homePoints, - awayPoints: score.awayPoints, - currentSet: score.currentSet, - ); - if (winner == null) return; - - _dialogOpen = true; - final close = await showSetWonDialog( - context, - winner: winner, - homeName: homeName, - awayName: awayName, - homePoints: score.homePoints, - awayPoints: score.awayPoints, - ); - _dialogOpen = false; - if (close && context.mounted) { - await onCloseSetConfirmed(); - } - } - - Future requestCloseSet( - BuildContext context, { - required Future Function() onCloseSetConfirmed, - }) async { - if (_dialogOpen || !context.mounted) return; - final score = ref.read(scoreProvider); - final winner = _rules.setWinnerFromPoints( - homePoints: score.homePoints, - awayPoints: score.awayPoints, - currentSet: score.currentSet, - ); - if (winner == null) { - final ok = await showCloseSetAnywayDialog(context); - if (!ok) return; - } - await onCloseSetConfirmed(); - } - - Future afterCloseSet( - BuildContext context, { - required String homeName, - required String awayName, - required Future Function() onStopStream, - }) async { - if (_dialogOpen || !context.mounted) return; - final score = ref.read(scoreProvider); - final winner = _rules.matchWinner( - homeSets: score.homeSets, - awaySets: score.awaySets, - ); - if (winner == null) return; - - _dialogOpen = true; - final stop = await showMatchWonDialog( - context, - winner: winner, - homeName: homeName, - awayName: awayName, - homeSets: score.homeSets, - awaySets: score.awaySets, - ); - _dialogOpen = false; - if (stop && context.mounted) { - await onStopStream(); - } - } -} diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart deleted file mode 100644 index 88fc463..0000000 --- a/mobile/lib/main.dart +++ /dev/null @@ -1,41 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:intl/date_symbol_data_local.dart'; - -import 'app/router.dart'; -import 'app/theme.dart'; -import 'core/deep_link_listener.dart'; - -Future main() async { - WidgetsFlutterBinding.ensureInitialized(); - await initializeDateFormatting('it_IT', null); - await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); - SystemChrome.setSystemUIOverlayStyle( - const SystemUiOverlayStyle( - statusBarColor: Colors.transparent, - systemNavigationBarColor: Colors.transparent, - statusBarIconBrightness: Brightness.light, - systemNavigationBarIconBrightness: Brightness.light, - ), - ); - runApp(const ProviderScope(child: MatchLiveTvApp())); -} - -class MatchLiveTvApp extends ConsumerWidget { - const MatchLiveTvApp({super.key}); - - @override - Widget build(BuildContext context, WidgetRef ref) { - final router = ref.watch(routerProvider); - - return DeepLinkListener( - child: MaterialApp.router( - title: 'Match Live TV', - debugShowCheckedModeBanner: false, - theme: AppTheme.dark, - routerConfig: router, - ), - ); - } -} diff --git a/mobile/lib/platform/streaming_channel.dart b/mobile/lib/platform/streaming_channel.dart deleted file mode 100644 index d10bba6..0000000 --- a/mobile/lib/platform/streaming_channel.dart +++ /dev/null @@ -1,87 +0,0 @@ -import 'package:flutter/services.dart'; - -/// Bridge verso engine nativo Android (CameraX + RootEncoder). -class StreamingChannel { - StreamingChannel._(); - - static const MethodChannel _channel = - MethodChannel('com.matchlivetv.match_live_tv/streaming'); - - static const EventChannel _metricsChannel = - EventChannel('com.matchlivetv.match_live_tv/streaming_events'); - - static Future startPreview() async { - await _channel.invokeMethod('startPreview'); - } - - static Future bindPreview() async { - final ok = await _channel.invokeMethod('bindPreview'); - return ok ?? false; - } - - /// Dopo rotazione: riallinea preview/stream senza fermare RTMP. - static Future syncOrientation() async { - await _channel.invokeMethod('syncOrientation'); - } - - static Future stopPreview() async { - await _channel.invokeMethod('stopPreview'); - } - - static Future startStream({ - required String rtmpUrl, - int targetBitrate = 3000000, - int targetFps = 30, - int width = 1280, - int height = 720, - bool portrait = false, - int rotation = 0, - }) async { - await _channel.invokeMethod('startStream', { - 'rtmpUrl': rtmpUrl, - 'videoBitrate': targetBitrate, - 'fps': targetFps, - 'width': width, - 'height': height, - 'portrait': portrait, - 'rotation': rotation, - }); - } - - /// Ripresa dopo pausa: resetta stati RTMP residui (CONNECTING/RECONNECTING). - static Future resumeStream({ - required String rtmpUrl, - int targetBitrate = 3000000, - int targetFps = 30, - int width = 1280, - int height = 720, - bool portrait = false, - int rotation = 0, - }) async { - await _channel.invokeMethod('resumeStream', { - 'rtmpUrl': rtmpUrl, - 'videoBitrate': targetBitrate, - 'fps': targetFps, - 'width': width, - 'height': height, - 'portrait': portrait, - 'rotation': rotation, - }); - } - - static Future stopStream() async { - await _channel.invokeMethod('stopStream'); - } - - static Future pauseStream() async { - await _channel.invokeMethod('pauseStream'); - } - - static Future?> getMetrics() async { - final result = - await _channel.invokeMethod>('getMetrics'); - return result?.map((key, value) => MapEntry(key.toString(), value)); - } - - static EventChannel get metricsStream => _metricsChannel; -} diff --git a/mobile/lib/platform/streaming_preview.dart b/mobile/lib/platform/streaming_preview.dart deleted file mode 100644 index deffc35..0000000 --- a/mobile/lib/platform/streaming_preview.dart +++ /dev/null @@ -1,103 +0,0 @@ -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; - -/// Preview camera nativa (OpenGL) integrata nel layout Flutter. -class NativeStreamingPreview extends StatelessWidget { - const NativeStreamingPreview({ - super.key, - this.showGrid = true, - this.platformLabel = 'LIVE', - }); - - final bool showGrid; - final String platformLabel; - - @override - Widget build(BuildContext context) { - if (defaultTargetPlatform == TargetPlatform.android) { - return Stack( - fit: StackFit.expand, - children: [ - AndroidView( - key: key, - viewType: 'match_live_tv/streaming_preview', - layoutDirection: TextDirection.ltr, - creationParamsCodec: const StandardMessageCodec(), - ), - if (showGrid) CameraPreviewOverlay(platformLabel: platformLabel), - ], - ); - } - return CameraPreviewPlaceholder(showGrid: showGrid); - } -} - -class CameraPreviewPlaceholder extends StatelessWidget { - const CameraPreviewPlaceholder({super.key, this.showGrid = true}); - - final bool showGrid; - - @override - Widget build(BuildContext context) { - return Container( - color: Colors.black, - child: const Center( - child: Icon(Icons.videocam, size: 64, color: Colors.white24), - ), - ); - } -} - -/// Overlay REC / badge sopra la preview nativa. -class CameraPreviewOverlay extends StatelessWidget { - const CameraPreviewOverlay({super.key, this.platformLabel = 'LIVE'}); - - final String platformLabel; - - @override - Widget build(BuildContext context) { - final inset = MediaQuery.viewPaddingOf(context); - const gap = 8.0; - - return Stack( - fit: StackFit.expand, - children: [ - Positioned( - top: inset.top + gap, - left: inset.left + gap, - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), - decoration: BoxDecoration( - color: Colors.red, - borderRadius: BorderRadius.circular(4), - ), - child: const Text( - 'REC', - style: TextStyle( - color: Colors.white, - fontWeight: FontWeight.bold, - fontSize: 11, - ), - ), - ), - ), - Positioned( - top: inset.top + gap, - right: inset.right + gap, - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), - decoration: BoxDecoration( - color: Colors.black54, - borderRadius: BorderRadius.circular(4), - ), - child: Text( - platformLabel, - style: const TextStyle(color: Colors.white, fontSize: 11), - ), - ), - ), - ], - ); - } -} diff --git a/mobile/lib/providers/auth_provider.dart b/mobile/lib/providers/auth_provider.dart deleted file mode 100644 index 1668a1f..0000000 --- a/mobile/lib/providers/auth_provider.dart +++ /dev/null @@ -1,141 +0,0 @@ -import 'package:dio/dio.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -import '../core/auth_storage.dart'; -import '../core/team_selection_storage.dart'; -import '../shared/api_client.dart'; -import '../shared/models/user.dart'; - -class AuthState { - const AuthState({ - this.user, - this.accessToken, - this.refreshToken, - this.loading = false, - this.error, - }); - - final User? user; - final String? accessToken; - final String? refreshToken; - final bool loading; - final String? error; - - bool get isAuthenticated => - accessToken != null && accessToken!.isNotEmpty && user != null; - - AuthState copyWith({ - User? user, - String? accessToken, - String? refreshToken, - bool? loading, - String? error, - bool clearError = false, - }) { - return AuthState( - user: user ?? this.user, - accessToken: accessToken ?? this.accessToken, - refreshToken: refreshToken ?? this.refreshToken, - loading: loading ?? this.loading, - error: clearError ? null : (error ?? this.error), - ); - } -} - -class AuthNotifier extends StateNotifier { - AuthNotifier() : super(const AuthState()); - - void setSession({ - required User user, - required String accessToken, - required String refreshToken, - }) { - state = AuthState( - user: user, - accessToken: accessToken, - refreshToken: refreshToken, - loading: false, - ); - AuthStorage.save( - user: user, - accessToken: accessToken, - refreshToken: refreshToken, - ); - } - - Future restoreSession() async { - final stored = await AuthStorage.load(); - if (stored == null) return; - state = AuthState( - user: stored.user, - accessToken: stored.accessToken, - refreshToken: stored.refreshToken, - loading: false, - ); - } - - /// Dopo restore: verifica token o rinnova con refresh (evita 401 su /teams). - Future validateOrRefreshSession() async { - if (!state.isAuthenticated) return false; - - final client = ApiClient(accessToken: state.accessToken); - try { - final user = await client.me(); - state = state.copyWith(user: user); - await AuthStorage.save( - user: user, - accessToken: state.accessToken!, - refreshToken: state.refreshToken!, - ); - return true; - } on DioException catch (e) { - if (e.response?.statusCode != 401) { - return true; - } - } catch (_) { - return true; - } - - return refreshSession(); - } - - Future refreshSession() async { - final refreshToken = state.refreshToken; - if (refreshToken == null || refreshToken.isEmpty) { - logout(); - return false; - } - - try { - final client = ApiClient(); - final result = await client.refreshSession(refreshToken); - setSession( - user: result.user, - accessToken: result.tokens.accessToken, - refreshToken: result.tokens.refreshToken, - ); - return true; - } catch (_) { - logout(); - return false; - } - } - - void setLoading(bool loading) { - state = state.copyWith(loading: loading, clearError: true); - } - - void setError(String message) { - state = state.copyWith(loading: false, error: message); - } - - void logout() { - state = const AuthState(); - AuthStorage.clear(); - TeamSelectionStorage.clear(); - } -} - -final authProvider = StateNotifierProvider( - (ref) => AuthNotifier(), -); diff --git a/mobile/lib/providers/match_rules_provider.dart b/mobile/lib/providers/match_rules_provider.dart deleted file mode 100644 index 7ab3c8b..0000000 --- a/mobile/lib/providers/match_rules_provider.dart +++ /dev/null @@ -1,12 +0,0 @@ -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -import '../shared/scoring/match_scoring_rules.dart'; -import 'session_provider.dart'; - -final matchScoringRulesProvider = Provider((ref) { - final match = ref.watch(sessionProvider).match; - if (match == null) { - return const MatchScoringRules(setsToWin: 3); - } - return MatchScoringRules.fromMatch(match); -}); diff --git a/mobile/lib/providers/score_provider.dart b/mobile/lib/providers/score_provider.dart deleted file mode 100644 index ccb28fd..0000000 --- a/mobile/lib/providers/score_provider.dart +++ /dev/null @@ -1,77 +0,0 @@ -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -import '../shared/models/score_state.dart'; - -class ScoreNotifier extends StateNotifier { - ScoreNotifier() : super(const ScoreState()); - - void reset(ScoreState score) { - state = score; - } - - void applyRemote(ScoreState score) { - state = score; - } - - void incrementHome() { - state = state.copyWith(homePoints: state.homePoints + 1); - } - - void incrementAway() { - state = state.copyWith(awayPoints: state.awayPoints + 1); - } - - void decrementHome() { - if (state.homePoints > 0) { - state = state.copyWith(homePoints: state.homePoints - 1); - } - } - - void decrementAway() { - if (state.awayPoints > 0) { - state = state.copyWith(awayPoints: state.awayPoints - 1); - } - } - - void closeSet() { - final homeWon = state.homePoints > state.awayPoints; - final partials = List.from(state.setPartials); - if (state.homePoints > 0 || state.awayPoints > 0) { - partials.add(SetPartial( - set: state.currentSet, - home: state.homePoints, - away: state.awayPoints, - )); - } - state = state.copyWith( - homeSets: homeWon ? state.homeSets + 1 : state.homeSets, - awaySets: homeWon ? state.awaySets : state.awaySets + 1, - homePoints: 0, - awayPoints: 0, - currentSet: state.currentSet + 1, - setPartials: partials, - timeoutHome: false, - timeoutAway: false, - ); - } - - void timeoutHome() { - state = state.copyWith(timeoutHome: true); - } - - void timeoutAway() { - state = state.copyWith(timeoutAway: true); - } - - void setTimeoutHome(bool value) { - state = state.copyWith(timeoutHome: value); - } - - void setTimeoutAway(bool value) { - state = state.copyWith(timeoutAway: value); - } -} - -final scoreProvider = StateNotifierProvider( - (ref) => ScoreNotifier(), -); diff --git a/mobile/lib/providers/score_sync_provider.dart b/mobile/lib/providers/score_sync_provider.dart deleted file mode 100644 index 162a55f..0000000 --- a/mobile/lib/providers/score_sync_provider.dart +++ /dev/null @@ -1,77 +0,0 @@ -import 'dart:async'; - -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -import '../shared/api_client.dart'; -import '../shared/models/score_state.dart'; -import 'score_provider.dart'; -import 'session_provider.dart'; - -/// Coda sync HTTP: evita richieste fuori ordine e allinea l'app al DB (pagina live). -class ScoreSyncService { - ScoreSyncService(this._ref); - - final Ref _ref; - bool _busy = false; - bool _dirty = false; - DateTime? _suppressStaleRemoteUntil; - - /// Ignora broadcast WebSocket obsoleti subito dopo un push HTTP. - bool acceptCableScore(ScoreState remote) { - final until = _suppressStaleRemoteUntil; - if (until == null || DateTime.now().isAfter(until)) return true; - final local = _ref.read(scoreProvider); - return !_isClearlyBehind(remote, local); - } - - bool _isClearlyBehind(ScoreState remote, ScoreState local) { - final r = remote.homeSets * 1000 + - remote.awaySets * 1000 + - remote.homePoints + - remote.awayPoints; - final l = local.homeSets * 1000 + - local.awaySets * 1000 + - local.homePoints + - local.awayPoints; - return r < l; - } - - Future push() async { - _dirty = true; - if (_busy) return; - _busy = true; - while (_dirty) { - _dirty = false; - final sessionId = _ref.read(sessionProvider).session?.id; - if (sessionId == null) continue; - - final payload = _ref.read(scoreProvider).toCablePayload(); - try { - final remote = await _ref.read(apiClientProvider).syncScore(sessionId, payload); - _suppressStaleRemoteUntil = DateTime.now().add(const Duration(milliseconds: 500)); - if (remote != null) { - _ref.read(scoreProvider.notifier).applyRemote(remote); - } - } catch (_) { - // Mantieni stato locale; il prossimo pull periodico riallinea se possibile. - } - } - _busy = false; - } - - Future pullFromServer() async { - if (_busy) return; - final sessionId = _ref.read(sessionProvider).session?.id; - if (sessionId == null) return; - try { - final session = await _ref.read(apiClientProvider).fetchSession(sessionId); - if (session.score != null) { - _ref.read(scoreProvider.notifier).applyRemote(session.score!); - } - } catch (_) {} - } -} - -final scoreSyncProvider = Provider((ref) { - return ScoreSyncService(ref); -}); diff --git a/mobile/lib/providers/session_provider.dart b/mobile/lib/providers/session_provider.dart deleted file mode 100644 index 1080316..0000000 --- a/mobile/lib/providers/session_provider.dart +++ /dev/null @@ -1,198 +0,0 @@ -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -import '../shared/models/device_state.dart'; -import '../shared/models/match.dart'; -import '../shared/models/stream_session.dart'; - -class SessionState { - const SessionState({ - this.session, - this.match, - this.elapsed = Duration.zero, - this.connected = false, - this.cameraDevice, - this.viewerCount = 0, - }); - - final StreamSession? session; - final MatchModel? match; - final Duration elapsed; - final bool connected; - final DeviceStateModel? cameraDevice; - final int viewerCount; - - SessionState copyWith({ - StreamSession? session, - MatchModel? match, - Duration? elapsed, - bool? connected, - DeviceStateModel? cameraDevice, - int? viewerCount, - }) { - return SessionState( - session: session ?? this.session, - match: match ?? this.match, - elapsed: elapsed ?? this.elapsed, - connected: connected ?? this.connected, - cameraDevice: cameraDevice ?? this.cameraDevice, - viewerCount: viewerCount ?? this.viewerCount, - ); - } -} - -class SessionNotifier extends StateNotifier { - SessionNotifier() : super(const SessionState()); - - void setSession(StreamSession session, {MatchModel? match}) { - final prevId = state.session?.id; - state = state.copyWith( - session: session, - match: match, - elapsed: prevId != null && prevId != session.id ? Duration.zero : state.elapsed, - ); - } - - void updateYoutubeLinks({ - required String? youtubeWatchUrl, - required String? shareUrl, - String? youtubeBroadcastId, - bool youtubeReady = true, - }) { - final s = state.session; - if (s == null || s.platform != 'youtube') return; - state = state.copyWith( - session: StreamSession( - id: s.id, - matchId: s.matchId, - status: s.status, - platform: s.platform, - rtmpIngestUrl: s.rtmpIngestUrl, - hlsPlaybackUrl: s.hlsPlaybackUrl, - watchPageUrl: s.watchPageUrl, - shareUrl: shareUrl, - youtubeWatchUrl: youtubeWatchUrl, - youtubeBroadcastId: youtubeBroadcastId ?? s.youtubeBroadcastId, - youtubeReady: youtubeReady, - privacyStatus: s.privacyStatus, - qualityPreset: s.qualityPreset, - targetBitrate: s.targetBitrate, - startedAt: s.startedAt, - disconnectionCount: s.disconnectionCount, - score: s.score, - devices: s.devices, - ), - ); - } - - void setMatch(MatchModel match) { - state = state.copyWith(match: match); - } - - void setElapsed(Duration elapsed) { - state = state.copyWith(elapsed: elapsed); - } - - void setConnected(bool connected) { - state = state.copyWith(connected: connected); - } - - void setCameraDevice(DeviceStateModel? device) { - state = state.copyWith(cameraDevice: device); - } - - void setViewerCount(int count) { - state = state.copyWith(viewerCount: count); - } - - void updateDeviceState(DeviceStateModel device) { - if (device.deviceRole == 'camera') { - state = state.copyWith(cameraDevice: device); - } - if (device.status != null && state.session != null) { - final s = state.session!; - final incoming = device.status!; - // Non sovrascrivere una pausa intenzionale con stati transitori (live/connecting). - if (s.status == 'paused' && incoming != 'paused' && incoming != 'ended') { - state = state.copyWith(cameraDevice: device); - return; - } - state = state.copyWith( - session: StreamSession( - id: s.id, - matchId: s.matchId, - status: incoming, - platform: s.platform, - rtmpIngestUrl: s.rtmpIngestUrl, - hlsPlaybackUrl: s.hlsPlaybackUrl, - watchPageUrl: s.watchPageUrl, - shareUrl: s.shareUrl, - youtubeWatchUrl: s.youtubeWatchUrl, - youtubeBroadcastId: s.youtubeBroadcastId, - youtubeReady: s.youtubeReady, - privacyStatus: s.privacyStatus, - qualityPreset: s.qualityPreset, - targetBitrate: s.targetBitrate, - startedAt: s.startedAt, - disconnectionCount: s.disconnectionCount, - score: s.score, - devices: s.devices, - ), - ); - } - } - - void applyCommand(String action) { - final session = state.session; - if (session == null) return; - - String newStatus = session.status; - switch (action) { - case 'start_stream': - newStatus = 'live'; - break; - case 'pause_stream': - newStatus = 'paused'; - break; - case 'resume_stream': - newStatus = 'connecting'; - break; - case 'stop_stream': - newStatus = 'ended'; - break; - } - - if (newStatus != session.status) { - state = state.copyWith( - session: StreamSession( - id: session.id, - matchId: session.matchId, - status: newStatus, - platform: session.platform, - rtmpIngestUrl: session.rtmpIngestUrl, - hlsPlaybackUrl: session.hlsPlaybackUrl, - watchPageUrl: session.watchPageUrl, - shareUrl: session.shareUrl, - youtubeWatchUrl: session.youtubeWatchUrl, - youtubeBroadcastId: session.youtubeBroadcastId, - youtubeReady: session.youtubeReady, - privacyStatus: session.privacyStatus, - qualityPreset: session.qualityPreset, - targetBitrate: session.targetBitrate, - startedAt: session.startedAt, - disconnectionCount: session.disconnectionCount, - score: session.score, - devices: session.devices, - ), - ); - } - } - - void clear() { - state = const SessionState(); - } -} - -final sessionProvider = - StateNotifierProvider((ref) { - return SessionNotifier(); -}); diff --git a/mobile/lib/shared/api_client.dart b/mobile/lib/shared/api_client.dart deleted file mode 100644 index 2072a8b..0000000 --- a/mobile/lib/shared/api_client.dart +++ /dev/null @@ -1,318 +0,0 @@ -import 'package:dio/dio.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -import '../core/config.dart'; -import '../providers/auth_provider.dart'; -import 'models/invite_preview.dart'; -import 'models/match.dart'; -import 'models/recording_item.dart'; -import 'models/score_state.dart'; -import 'models/stream_session.dart'; -import 'models/team.dart'; -import 'models/user.dart'; - -final apiClientProvider = Provider((ref) { - final auth = ref.watch(authProvider); - return ApiClient(accessToken: auth.accessToken); -}); - -class ApiClient { - ApiClient({this.accessToken}) { - _dio = Dio( - BaseOptions( - baseUrl: AppConfig.apiV1, - connectTimeout: const Duration(seconds: 30), - receiveTimeout: const Duration(seconds: 30), - headers: { - 'Content-Type': 'application/json', - 'Accept': 'application/json', - }, - ), - ); - - _dio.interceptors.add( - InterceptorsWrapper( - onRequest: (options, handler) { - if (accessToken != null && accessToken!.isNotEmpty) { - options.headers['Authorization'] = 'Bearer $accessToken'; - } - handler.next(options); - }, - ), - ); - } - - late final Dio _dio; - final String? accessToken; - - // --- Auth --- - - Future<({User user, AuthTokens tokens})> login({ - required String email, - required String password, - }) async { - final response = await _dio.post>( - '/auth/login', - data: {'email': email, 'password': password}, - ); - final data = response.data!; - return ( - user: User.fromJson(data['user'] as Map), - tokens: AuthTokens.fromJson(data), - ); - } - - Future<({User user, AuthTokens tokens})> refreshSession( - String refreshToken, - ) async { - final response = await _dio.post>( - '/auth/refresh', - data: {'refresh_token': refreshToken}, - ); - final data = response.data!; - return ( - user: User.fromJson(data['user'] as Map), - tokens: AuthTokens.fromJson(data), - ); - } - - Future me() async { - final response = await _dio.get>('/auth/me'); - return User.fromJson(response.data!); - } - - Future logout() async { - await _dio.post('/auth/logout'); - } - - // --- Teams --- - - Future> fetchTeams() async { - final response = await _dio.get>('/teams'); - return response.data! - .map((e) => Team.fromJson(e as Map)) - .toList(); - } - - Future fetchInvitePreview(String token) async { - final response = await _dio.get>('/invitations/$token'); - return InvitePreview.fromJson(response.data!); - } - - Future acceptInvitation(String token) async { - final response = await _dio.post>('/invitations/$token/accept'); - return response.data!['message'] as String? ?? 'Invito accettato'; - } - - Future youtubeAuthorizeUrl(String teamId, {bool returnApp = true}) async { - final response = await _dio.get>( - '/teams/$teamId/youtube/authorize', - queryParameters: returnApp ? {'return_app': '1'} : null, - ); - return response.data!['authorization_url'] as String; - } - - Future> fetchRecordings(String teamId) async { - final response = await _dio.get>('/teams/$teamId/recordings'); - return response.data! - .map((e) => RecordingItem.fromJson(e as Map)) - .toList(); - } - - Future fetchRecordingDownloadUrl(String recordingId) async { - final response = await _dio.get>( - '/recordings/$recordingId/download', - ); - return response.data!['download_url'] as String; - } - - // --- Matches --- - - Future> fetchMatches(String teamId) async { - final response = - await _dio.get>('/teams/$teamId/matches'); - return response.data! - .map((e) => MatchModel.fromJson(e as Map)) - .toList(); - } - - Future fetchMatch(String matchId) async { - final response = - await _dio.get>('/matches/$matchId'); - return MatchModel.fromJson(response.data!); - } - - Future updateMatch(String matchId, Map body) async { - final response = await _dio.patch>( - '/matches/$matchId', - data: {'match': body}, - ); - return MatchModel.fromJson(response.data!); - } - - Future deleteMatch(String matchId) async { - await _dio.delete('/matches/$matchId'); - } - - Future createMatch(String teamId, Map body) async { - final response = await _dio.post>( - '/teams/$teamId/matches', - data: {'match': body}, - ); - return MatchModel.fromJson(response.data!); - } - - // --- Sessions --- - - Future createSession( - String matchId, { - String platform = 'matchlivetv', - String? youtubeChannel, - String privacyStatus = 'public', - String qualityPreset = '720p_30_2.5mbps', - int? targetBitrate, - int? targetFps, - }) async { - // YouTube: creazione broadcast + path MediaMTX può richiedere 20–30s lato server. - final sessionTimeout = platform == 'youtube' - ? const Duration(seconds: 60) - : const Duration(seconds: 30); - final response = await _dio.post>( - '/matches/$matchId/sessions', - data: { - 'platform': platform, - 'privacy_status': privacyStatus, - 'quality_preset': qualityPreset, - if (youtubeChannel != null) 'youtube_channel': youtubeChannel, - if (targetBitrate != null) 'target_bitrate': targetBitrate, - if (targetFps != null) 'target_fps': targetFps, - }, - options: Options( - sendTimeout: sessionTimeout, - receiveTimeout: sessionTimeout, - ), - ); - return StreamSession.fromJson(response.data!); - } - - Future fetchSession(String sessionId) async { - final response = - await _dio.get>('/sessions/$sessionId'); - return StreamSession.fromJson(response.data!); - } - - Future startSession(String sessionId) async { - final response = - await _dio.patch>('/sessions/$sessionId/start'); - return StreamSession.fromJson(response.data!); - } - - Future stopSession(String sessionId) async { - final response = - await _dio.patch>('/sessions/$sessionId/stop'); - return StreamSession.fromJson(response.data!); - } - - Future pauseSession(String sessionId) async { - final response = - await _dio.patch>('/sessions/$sessionId/pause'); - return StreamSession.fromJson(response.data!); - } - - Future resumeSession(String sessionId) async { - final response = - await _dio.patch>('/sessions/$sessionId/resume'); - return StreamSession.fromJson(response.data!); - } - - /// Persiste il tabellone e restituisce lo stato salvato sul server. - Future syncScore(String sessionId, Map payload) async { - final response = await _dio.patch>( - '/sessions/$sessionId/score', - data: payload, - ); - final score = response.data?['score']; - if (score is Map) { - return ScoreState.fromJson(score); - } - return null; - } - - Future createRegiaLink(String sessionId) async { - final response = await _dio.post>( - '/sessions/$sessionId/regia_link', - ); - return RegiaLinkResponse.fromJson(response.data!); - } - - Future createPairingToken(String sessionId) async { - final response = await _dio.post>( - '/sessions/$sessionId/pairing_token', - ); - return PairingTokenResponse.fromJson(response.data!); - } - - Future claimPairing({ - required String sessionId, - required String pairingToken, - required String deviceRole, - }) async { - final response = await _dio.post>( - '/sessions/$sessionId/claim_pairing', - data: { - 'pairing_token': pairingToken, - 'device_role': deviceRole, - }, - ); - return StreamSession.fromJson(response.data!); - } - - Future networkTest({ - required String sessionId, - required double downloadMbps, - required double uploadMbps, - required int latencyMs, - required String networkType, - }) async { - final response = await _dio.post>( - '/sessions/$sessionId/network_test', - data: { - 'download_mbps': downloadMbps, - 'upload_mbps': uploadMbps, - 'latency_ms': latencyMs, - 'network_type': networkType, - }, - ); - return NetworkTestResult.fromJson(response.data!); - } - - Future youtubeStats(String sessionId) async { - final response = - await _dio.get>('/sessions/$sessionId/youtube_stats'); - return YoutubeStats.fromJson(response.data!); - } - - Future postTelemetry({ - required String sessionId, - required String deviceRole, - int? batteryLevel, - String? networkType, - int? signalStrength, - int? currentBitrate, - int? targetBitrate, - int? fps, - }) async { - await _dio.post( - '/sessions/$sessionId/telemetry', - data: { - 'device_role': deviceRole, - if (batteryLevel != null) 'battery_level': batteryLevel, - if (networkType != null) 'network_type': networkType, - if (signalStrength != null) 'signal_strength': signalStrength, - if (currentBitrate != null) 'current_bitrate': currentBitrate, - if (targetBitrate != null) 'target_bitrate': targetBitrate, - if (fps != null) 'fps': fps, - }, - ); - } -} diff --git a/mobile/lib/shared/api_error.dart b/mobile/lib/shared/api_error.dart deleted file mode 100644 index 63ce291..0000000 --- a/mobile/lib/shared/api_error.dart +++ /dev/null @@ -1,32 +0,0 @@ -class ApiException implements Exception { - ApiException({ - required this.message, - this.statusCode, - this.errorCode, - this.billingUrl, - }); - - final String message; - final int? statusCode; - final String? errorCode; - final String? billingUrl; - - bool get isPremiumRequired => errorCode == 'premium_required'; - - @override - String toString() => message; - - static ApiException? fromDio(dynamic error) { - // ignore: avoid_dynamic_calls - final response = error.response; - if (response == null) return null; - final data = response.data; - if (data is! Map) return null; - return ApiException( - message: data['error'] as String? ?? 'Errore di rete', - statusCode: response.statusCode as int?, - errorCode: data['error_code'] as String?, - billingUrl: data['billing_url'] as String?, - ); - } -} diff --git a/mobile/lib/shared/models/device_state.dart b/mobile/lib/shared/models/device_state.dart deleted file mode 100644 index 4642bba..0000000 --- a/mobile/lib/shared/models/device_state.dart +++ /dev/null @@ -1,37 +0,0 @@ -class DeviceStateModel { - const DeviceStateModel({ - this.deviceRole = 'camera', - this.batteryLevel, - this.networkType, - this.signalStrength, - this.currentBitrate, - this.targetBitrate, - this.fps, - this.status, - }); - - final String deviceRole; - final int? batteryLevel; - final String? networkType; - final int? signalStrength; - final int? currentBitrate; - final int? targetBitrate; - final int? fps; - final String? status; - - factory DeviceStateModel.fromJson(Map json) { - return DeviceStateModel( - deviceRole: json['device_role'] as String? ?? 'camera', - batteryLevel: json['battery'] as int? ?? json['battery_level'] as int?, - networkType: json['network'] as String? ?? json['network_type'] as String?, - signalStrength: json['signal_strength'] as int?, - currentBitrate: json['bitrate'] as int? ?? json['current_bitrate'] as int?, - targetBitrate: json['target_bitrate'] as int?, - fps: json['fps'] as int?, - status: json['status'] as String?, - ); - } - - double get bitrateMbps => - currentBitrate != null ? currentBitrate! / 1_000_000 : 0; -} diff --git a/mobile/lib/shared/models/invite_preview.dart b/mobile/lib/shared/models/invite_preview.dart deleted file mode 100644 index e4f6319..0000000 --- a/mobile/lib/shared/models/invite_preview.dart +++ /dev/null @@ -1,28 +0,0 @@ -class InvitePreview { - const InvitePreview({ - required this.valid, - required this.email, - required this.teamName, - this.clubName, - this.teamId, - this.error, - }); - - final bool valid; - final String email; - final String teamName; - final String? clubName; - final String? teamId; - final String? error; - - factory InvitePreview.fromJson(Map json) { - return InvitePreview( - valid: json['valid'] as bool? ?? false, - email: json['email'] as String? ?? '', - teamName: json['team_name'] as String? ?? '', - clubName: json['club_name'] as String?, - teamId: json['team_id'] as String?, - error: json['error'] as String?, - ); - } -} diff --git a/mobile/lib/shared/models/match.dart b/mobile/lib/shared/models/match.dart deleted file mode 100644 index 181c890..0000000 --- a/mobile/lib/shared/models/match.dart +++ /dev/null @@ -1,81 +0,0 @@ -class MatchModel { - const MatchModel({ - required this.id, - required this.teamId, - required this.teamName, - required this.opponentName, - this.location, - this.scheduledAt, - this.sport = 'volleyball', - this.setsToWin = 3, - this.scoringRules, - this.rosterNumbers = const [], - this.category, - this.phase, - this.activeSessionId, - this.activeSessionStatus, - }); - - final String id; - final String teamId; - final String teamName; - final String opponentName; - final String? location; - final DateTime? scheduledAt; - final String sport; - final int setsToWin; - final Map? scoringRules; - final List rosterNumbers; - final String? category; - final String? phase; - final String? activeSessionId; - final String? activeSessionStatus; - - /// Sessione avviata (o in ripresa) — si può rientrare in camera senza rifare il wizard. - bool get canResumeCamera { - const resumable = {'connecting', 'live', 'reconnecting', 'paused'}; - return activeSessionId != null && - activeSessionStatus != null && - resumable.contains(activeSessionStatus); - } - - bool get hasActiveSession => activeSessionId != null; - - factory MatchModel.fromJson(Map json) { - return MatchModel( - id: json['id'] as String, - teamId: json['team_id'] as String, - teamName: json['team_name'] as String? ?? '', - opponentName: json['opponent_name'] as String, - location: json['location'] as String?, - scheduledAt: json['scheduled_at'] != null - ? DateTime.tryParse(json['scheduled_at'] as String) - : null, - sport: json['sport'] as String? ?? 'volleyball', - setsToWin: json['sets_to_win'] as int? ?? 3, - scoringRules: json['scoring_rules'] is Map - ? Map.from(json['scoring_rules'] as Map) - : null, - rosterNumbers: (json['roster_numbers'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() ?? - const [], - category: json['category'] as String?, - phase: json['phase'] as String?, - activeSessionId: json['active_session_id'] as String?, - activeSessionStatus: json['active_session_status'] as String?, - ); - } - - Map toJson() => { - 'opponent_name': opponentName, - 'location': location, - 'scheduled_at': scheduledAt?.toIso8601String(), - 'sport': sport, - 'sets_to_win': setsToWin, - if (scoringRules != null) 'scoring_rules': scoringRules, - 'roster_numbers': rosterNumbers, - 'category': category, - 'phase': phase, - }; -} diff --git a/mobile/lib/shared/models/recording_item.dart b/mobile/lib/shared/models/recording_item.dart deleted file mode 100644 index 0649e98..0000000 --- a/mobile/lib/shared/models/recording_item.dart +++ /dev/null @@ -1,76 +0,0 @@ -class RecordingItem { - const RecordingItem({ - required this.id, - required this.sessionId, - required this.title, - required this.opponentName, - required this.teamName, - this.status = 'ready', - this.statusLabel = 'Disponibile', - this.privacyStatus = 'unlisted', - this.endedAt, - this.recordedAt, - this.replayUrl, - this.playbackUrl, - this.thumbnailUrl, - this.durationLabel, - this.viewCount = 0, - this.viewsLabel, - this.downloadEnabled = false, - this.youtubeWatchUrl, - this.expiresAt, - }); - - final String id; - final String sessionId; - final String title; - final String opponentName; - final String teamName; - final String status; - final String statusLabel; - final String privacyStatus; - final DateTime? endedAt; - final DateTime? recordedAt; - final String? replayUrl; - final String? playbackUrl; - final String? thumbnailUrl; - final String? durationLabel; - final int viewCount; - final String? viewsLabel; - final bool downloadEnabled; - final String? youtubeWatchUrl; - final DateTime? expiresAt; - - bool get isReady => status == 'ready'; - bool get isProcessing => status == 'processing'; - - factory RecordingItem.fromJson(Map json) { - return RecordingItem( - id: json['id'] as String, - sessionId: json['session_id'] as String, - title: json['title'] as String? ?? '${json['team_name']} vs ${json['opponent_name']}', - opponentName: json['opponent_name'] as String, - teamName: json['team_name'] as String, - status: json['status'] as String? ?? 'ready', - statusLabel: json['status_label'] as String? ?? 'Disponibile', - privacyStatus: json['privacy_status'] as String? ?? 'unlisted', - endedAt: json['ended_at'] != null - ? DateTime.parse(json['ended_at'] as String) - : null, - recordedAt: json['recorded_at'] != null - ? DateTime.parse(json['recorded_at'] as String) - : null, - replayUrl: json['replay_url'] as String?, - playbackUrl: json['playback_url'] as String?, - thumbnailUrl: json['thumbnail_url'] as String?, - durationLabel: json['duration_label'] as String?, - viewCount: json['view_count'] as int? ?? 0, - viewsLabel: json['views_label'] as String?, - downloadEnabled: json['download_enabled'] as bool? ?? false, - youtubeWatchUrl: json['youtube_watch_url'] as String?, - expiresAt: json['expires_at'] != null - ? DateTime.parse(json['expires_at'] as String) - : null, - ); - } -} diff --git a/mobile/lib/shared/models/score_state.dart b/mobile/lib/shared/models/score_state.dart deleted file mode 100644 index 55cf4cf..0000000 --- a/mobile/lib/shared/models/score_state.dart +++ /dev/null @@ -1,100 +0,0 @@ -class SetPartial { - const SetPartial({ - required this.set, - required this.home, - required this.away, - }); - - final int set; - final int home; - final int away; - - factory SetPartial.fromJson(Map json) { - return SetPartial( - set: json['set'] as int? ?? 1, - home: json['home'] as int? ?? 0, - away: json['away'] as int? ?? 0, - ); - } - - Map toJson() => { - 'set': set, - 'home': home, - 'away': away, - }; -} - -class ScoreState { - const ScoreState({ - this.homeSets = 0, - this.awaySets = 0, - this.homePoints = 0, - this.awayPoints = 0, - this.currentSet = 1, - this.setPartials = const [], - this.timeoutHome = false, - this.timeoutAway = false, - }); - - final int homeSets; - final int awaySets; - final int homePoints; - final int awayPoints; - final int currentSet; - final List setPartials; - final bool timeoutHome; - final bool timeoutAway; - - factory ScoreState.fromJson(Map json) { - final rawPartials = json['set_partials']; - final partials = rawPartials is List - ? rawPartials - .whereType() - .map((e) => SetPartial.fromJson(Map.from(e))) - .toList() - : []; - - return ScoreState( - homeSets: json['home_sets'] as int? ?? 0, - awaySets: json['away_sets'] as int? ?? 0, - homePoints: json['home_points'] as int? ?? 0, - awayPoints: json['away_points'] as int? ?? 0, - currentSet: json['current_set'] as int? ?? 1, - setPartials: partials, - timeoutHome: json['timeout_home'] as bool? ?? false, - timeoutAway: json['timeout_away'] as bool? ?? false, - ); - } - - Map toCablePayload() => { - 'type': 'score_update', - 'home_sets': homeSets, - 'away_sets': awaySets, - 'home_points': homePoints, - 'away_points': awayPoints, - 'current_set': currentSet, - 'set_partials': setPartials.map((p) => p.toJson()).toList(), - }; - - ScoreState copyWith({ - int? homeSets, - int? awaySets, - int? homePoints, - int? awayPoints, - int? currentSet, - List? setPartials, - bool? timeoutHome, - bool? timeoutAway, - }) { - return ScoreState( - homeSets: homeSets ?? this.homeSets, - awaySets: awaySets ?? this.awaySets, - homePoints: homePoints ?? this.homePoints, - awayPoints: awayPoints ?? this.awayPoints, - currentSet: currentSet ?? this.currentSet, - setPartials: setPartials ?? this.setPartials, - timeoutHome: timeoutHome ?? this.timeoutHome, - timeoutAway: timeoutAway ?? this.timeoutAway, - ); - } -} diff --git a/mobile/lib/shared/models/stream_session.dart b/mobile/lib/shared/models/stream_session.dart deleted file mode 100644 index 5f97b39..0000000 --- a/mobile/lib/shared/models/stream_session.dart +++ /dev/null @@ -1,155 +0,0 @@ -import 'device_state.dart'; -import 'score_state.dart'; - -class StreamSession { - const StreamSession({ - required this.id, - required this.matchId, - required this.status, - this.platform = 'matchlivetv', - this.rtmpIngestUrl, - this.hlsPlaybackUrl, - this.watchPageUrl, - this.shareUrl, - this.youtubeWatchUrl, - this.youtubeBroadcastId, - this.youtubeReady = false, - this.privacyStatus = 'public', - this.qualityPreset = '720p_30_2.5mbps', - this.targetBitrate = 2500000, - this.startedAt, - this.disconnectionCount = 0, - this.score, - this.devices = const [], - }); - - final String id; - final String matchId; - final String status; - final String platform; - final String? rtmpIngestUrl; - final String? hlsPlaybackUrl; - final String? watchPageUrl; - final String? shareUrl; - final String? youtubeWatchUrl; - final String? youtubeBroadcastId; - final bool youtubeReady; - final String privacyStatus; - final String qualityPreset; - final int targetBitrate; - final DateTime? startedAt; - final int disconnectionCount; - final ScoreState? score; - final List devices; - - bool get isLive => status == 'live' || status == 'reconnecting'; - - bool get isTerminal => status == 'ended' || status == 'error'; - - bool get canResumeBroadcast => - status == 'connecting' || - status == 'live' || - status == 'reconnecting' || - status == 'paused'; - - factory StreamSession.fromJson(Map json) { - return StreamSession( - id: json['id'] as String, - matchId: json['match_id'] as String, - status: json['status'] as String? ?? 'idle', - platform: json['platform'] as String? ?? 'matchlivetv', - rtmpIngestUrl: json['rtmp_ingest_url'] as String?, - hlsPlaybackUrl: json['hls_playback_url'] as String?, - watchPageUrl: json['watch_page_url'] as String?, - shareUrl: json['share_url'] as String?, - youtubeWatchUrl: json['youtube_watch_url'] as String?, - youtubeBroadcastId: json['youtube_broadcast_id'] as String?, - youtubeReady: json['youtube_ready'] as bool? ?? false, - privacyStatus: json['privacy_status'] as String? ?? 'public', - qualityPreset: json['quality_preset'] as String? ?? '720p_30_2.5mbps', - targetBitrate: json['target_bitrate'] as int? ?? 2500000, - startedAt: json['started_at'] != null - ? DateTime.tryParse(json['started_at'] as String) - : null, - disconnectionCount: json['disconnection_count'] as int? ?? 0, - score: json['score'] != null - ? ScoreState.fromJson(json['score'] as Map) - : null, - devices: (json['devices'] as List?) - ?.map((e) => DeviceStateModel.fromJson(e as Map)) - .toList() ?? - const [], - ); - } -} - -class RegiaLinkResponse { - const RegiaLinkResponse({ - required this.regiaUrl, - required this.expiresAt, - }); - - final String regiaUrl; - final DateTime expiresAt; - - factory RegiaLinkResponse.fromJson(Map json) { - return RegiaLinkResponse( - regiaUrl: json['regia_url'] as String, - expiresAt: DateTime.parse(json['expires_at'] as String), - ); - } -} - -class PairingTokenResponse { - const PairingTokenResponse({ - required this.pairingToken, - required this.expiresAt, - required this.qrPayload, - }); - - final String pairingToken; - final DateTime expiresAt; - final Map qrPayload; - - factory PairingTokenResponse.fromJson(Map json) { - return PairingTokenResponse( - pairingToken: json['pairing_token'] as String, - expiresAt: DateTime.parse(json['expires_at'] as String), - qrPayload: json['qr_payload'] as Map, - ); - } -} - -class NetworkTestResult { - const NetworkTestResult({ - required this.ready, - required this.targetUploadMbps, - }); - - final bool ready; - final double targetUploadMbps; - - factory NetworkTestResult.fromJson(Map json) { - return NetworkTestResult( - ready: json['ready'] as bool? ?? false, - targetUploadMbps: (json['target_upload_mbps'] as num?)?.toDouble() ?? 2.5, - ); - } -} - -class YoutubeStats { - const YoutubeStats({ - required this.concurrentViewers, - required this.live, - }); - - final int concurrentViewers; - final bool live; - - factory YoutubeStats.fromJson(Map json) { - return YoutubeStats( - concurrentViewers: json['concurrent_viewers'] as int? ?? 0, - live: json['live'] as bool? ?? false, - ); - } -} diff --git a/mobile/lib/shared/models/team.dart b/mobile/lib/shared/models/team.dart deleted file mode 100644 index adf0163..0000000 --- a/mobile/lib/shared/models/team.dart +++ /dev/null @@ -1,125 +0,0 @@ -class Team { - const Team({ - required this.id, - required this.name, - required this.sport, - this.logoUrl, - this.youtubeConnected = false, - this.youtubeSelectable = false, - this.youtubeChannelTitle, - this.youtubeUsesPlatformChannel = false, - this.youtubePlatformAvailable = false, - this.youtubeTeamChannelAvailable = false, - this.youtubeTeamChannelTitle, - this.planSlug = 'free', - this.planName = 'Free', - this.premiumActive = false, - this.premiumFull = false, - this.billingUrl, - this.staffManageUrl, - this.maxStaff = 2, - this.staffUsed = 0, - this.maxStaffTransmission, - this.maxStaffRegia, - this.staffTransmissionUsed = 0, - this.staffRegiaUsed = 0, - this.concurrentStreamsUsed = 0, - this.concurrentStreamsLimit, - this.recordingsEnabled = false, - this.phoneDownloadEnabled = false, - this.youtubeEnabled = false, - this.clubName, - this.staffRole, - this.canStream = true, - this.youtubeMode, - this.canConnectYoutube = false, - }); - - final String id; - final String name; - final String sport; - final String? clubName; - final String? staffRole; - final bool canStream; - final String? logoUrl; - final bool youtubeConnected; - final bool youtubeSelectable; - final String? youtubeChannelTitle; - final bool youtubeUsesPlatformChannel; - final bool youtubePlatformAvailable; - final bool youtubeTeamChannelAvailable; - final String? youtubeTeamChannelTitle; - final String planSlug; - final String planName; - final bool premiumActive; - final bool premiumFull; - final String? billingUrl; - final String? staffManageUrl; - final int maxStaff; - final int staffUsed; - final int? maxStaffTransmission; - final int? maxStaffRegia; - final int staffTransmissionUsed; - final int staffRegiaUsed; - final int concurrentStreamsUsed; - final int? concurrentStreamsLimit; - final bool recordingsEnabled; - final bool phoneDownloadEnabled; - final bool youtubeEnabled; - final String? youtubeMode; - final bool canConnectYoutube; - - bool get canUseYoutube => youtubeEnabled && (premiumFull || youtubeMode == 'matchlivetv_light'); - - bool get isYoutubeReady => youtubeSelectable; - - bool get canChooseYoutubeChannel => - youtubePlatformAvailable && youtubeTeamChannelAvailable; - bool get canUseRecordings => recordingsEnabled; - bool get canDownloadOnPhone => phoneDownloadEnabled; - - String get staffLimitLabel { - if (maxStaffTransmission == null) { - return 'trasmissione illimitata'; - } - return 'trasmissione $staffTransmissionUsed/$maxStaffTransmission'; - } - - factory Team.fromJson(Map json) { - return Team( - id: json['id'] as String, - name: json['name'] as String, - sport: json['sport'] as String? ?? 'volleyball', - clubName: json['club_name'] as String?, - staffRole: json['staff_role'] as String?, - canStream: json['can_stream'] as bool? ?? true, - logoUrl: json['logo_url'] as String?, - youtubeConnected: json['youtube_connected'] as bool? ?? false, - youtubeSelectable: json['youtube_selectable'] as bool? ?? false, - youtubeChannelTitle: json['youtube_channel_title'] as String?, - youtubeUsesPlatformChannel: json['youtube_uses_platform_channel'] as bool? ?? false, - youtubePlatformAvailable: json['youtube_platform_available'] as bool? ?? false, - youtubeTeamChannelAvailable: json['youtube_team_channel_available'] as bool? ?? false, - youtubeTeamChannelTitle: json['youtube_team_channel_title'] as String?, - planSlug: json['plan_slug'] as String? ?? 'free', - planName: json['plan_name'] as String? ?? 'Free', - premiumActive: json['premium_active'] as bool? ?? false, - premiumFull: json['premium_full'] as bool? ?? false, - billingUrl: json['billing_url'] as String?, - staffManageUrl: json['staff_manage_url'] as String?, - maxStaff: json['max_staff'] as int? ?? 2, - staffUsed: json['staff_used'] as int? ?? 0, - maxStaffTransmission: json['max_staff_transmission'] as int?, - maxStaffRegia: json['max_staff_regia'] as int?, - staffTransmissionUsed: json['staff_transmission_used'] as int? ?? 0, - staffRegiaUsed: json['staff_regia_used'] as int? ?? 0, - concurrentStreamsUsed: json['concurrent_streams_used'] as int? ?? 0, - concurrentStreamsLimit: json['concurrent_streams_limit'] as int?, - recordingsEnabled: json['recordings_enabled'] as bool? ?? false, - phoneDownloadEnabled: json['phone_download_enabled'] as bool? ?? false, - youtubeEnabled: json['youtube_enabled'] as bool? ?? false, - youtubeMode: json['youtube_mode'] as String?, - canConnectYoutube: json['can_connect_youtube'] as bool? ?? false, - ); - } -} diff --git a/mobile/lib/shared/models/user.dart b/mobile/lib/shared/models/user.dart deleted file mode 100644 index 7f35f05..0000000 --- a/mobile/lib/shared/models/user.dart +++ /dev/null @@ -1,46 +0,0 @@ -class User { - const User({ - required this.id, - required this.email, - required this.name, - required this.role, - }); - - final String id; - final String email; - final String name; - final String role; - - factory User.fromJson(Map json) { - return User( - id: json['id'] as String, - email: json['email'] as String, - name: json['name'] as String, - role: json['role'] as String? ?? 'coach', - ); - } - - Map toJson() => { - 'id': id, - 'email': email, - 'name': name, - 'role': role, - }; -} - -class AuthTokens { - const AuthTokens({ - required this.accessToken, - required this.refreshToken, - }); - - final String accessToken; - final String refreshToken; - - factory AuthTokens.fromJson(Map json) { - return AuthTokens( - accessToken: json['access_token'] as String, - refreshToken: json['refresh_token'] as String, - ); - } -} diff --git a/mobile/lib/shared/premium_dialog.dart b/mobile/lib/shared/premium_dialog.dart deleted file mode 100644 index 169f946..0000000 --- a/mobile/lib/shared/premium_dialog.dart +++ /dev/null @@ -1,37 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher.dart'; - -import '../app/theme.dart'; - -Future showPremiumRequiredDialog( - BuildContext context, { - required String message, - String? billingUrl, -}) async { - await showDialog( - context: context, - builder: (ctx) => AlertDialog( - backgroundColor: AppTheme.surface, - title: const Text('Premium richiesto'), - content: Text(message), - actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx), - child: const Text('Chiudi'), - ), - if (billingUrl != null && billingUrl.isNotEmpty) - FilledButton( - onPressed: () async { - final uri = Uri.parse(billingUrl); - if (await canLaunchUrl(uri)) { - await launchUrl(uri, mode: LaunchMode.externalApplication); - } - if (ctx.mounted) Navigator.pop(ctx); - }, - style: FilledButton.styleFrom(backgroundColor: AppTheme.primaryRed), - child: const Text('Attiva sul sito'), - ), - ], - ), - ); -} diff --git a/mobile/lib/shared/regia_share.dart b/mobile/lib/shared/regia_share.dart deleted file mode 100644 index 9e53457..0000000 --- a/mobile/lib/shared/regia_share.dart +++ /dev/null @@ -1,26 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:share_plus/share_plus.dart'; - -import 'api_client.dart'; - -Future shareRegiaLink( - BuildContext context, - WidgetRef ref, { - required String sessionId, - required String shareSubject, -}) async { - try { - final link = await ref.read(apiClientProvider).createRegiaLink(sessionId); - await Share.share( - 'Apri questo link per gestire il punteggio della diretta:\n${link.regiaUrl}', - subject: shareSubject, - ); - } catch (_) { - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Errore generazione link regia')), - ); - } - } -} diff --git a/mobile/lib/shared/scoring/match_scoring_rules.dart b/mobile/lib/shared/scoring/match_scoring_rules.dart deleted file mode 100644 index b01f5d6..0000000 --- a/mobile/lib/shared/scoring/match_scoring_rules.dart +++ /dev/null @@ -1,70 +0,0 @@ -import '../models/match.dart'; - -/// Lato che ha vinto set o partita. -enum ScoringSide { home, away } - -/// Regole punteggio (pallavolo di default, campi sovrascrivibili per tornei). -class MatchScoringRules { - const MatchScoringRules({ - required this.setsToWin, - this.pointsPerSet = 25, - this.pointsDecidingSet = 15, - this.minPointLead = 2, - }); - - final int setsToWin; - final int pointsPerSet; - final int pointsDecidingSet; - final int minPointLead; - - int get maxSets => (setsToWin * 2) - 1; - - factory MatchScoringRules.fromMatch(MatchModel match) { - final overrides = match.scoringRules; - return MatchScoringRules( - setsToWin: match.setsToWin, - pointsPerSet: overrides?['points_per_set'] as int? ?? 25, - pointsDecidingSet: overrides?['points_deciding_set'] as int? ?? 15, - minPointLead: overrides?['min_point_lead'] as int? ?? 2, - ); - } - - Map toJson() => { - 'points_per_set': pointsPerSet, - 'points_deciding_set': pointsDecidingSet, - 'min_point_lead': minPointLead, - }; - - /// Punti necessari per chiudere il set corrente. - int pointsTarget(int currentSet) { - if (currentSet >= maxSets) return pointsDecidingSet; - return pointsPerSet; - } - - /// Chi ha vinto il set in corso in base ai punti (null se ancora aperto). - ScoringSide? setWinnerFromPoints({ - required int homePoints, - required int awayPoints, - required int currentSet, - }) { - final target = pointsTarget(currentSet); - final lead = minPointLead; - if (homePoints >= target && homePoints - awayPoints >= lead) { - return ScoringSide.home; - } - if (awayPoints >= target && awayPoints - homePoints >= lead) { - return ScoringSide.away; - } - return null; - } - - bool isMatchOver({required int homeSets, required int awaySets}) { - return homeSets >= setsToWin || awaySets >= setsToWin; - } - - ScoringSide? matchWinner({required int homeSets, required int awaySets}) { - if (homeSets >= setsToWin) return ScoringSide.home; - if (awaySets >= setsToWin) return ScoringSide.away; - return null; - } -} diff --git a/mobile/lib/shared/watch_share.dart b/mobile/lib/shared/watch_share.dart deleted file mode 100644 index 570d2b9..0000000 --- a/mobile/lib/shared/watch_share.dart +++ /dev/null @@ -1,57 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:share_plus/share_plus.dart'; - -import 'models/stream_session.dart'; - -String? watchShareUrl(StreamSession session) { - if (session.platform == 'youtube') { - return session.youtubeWatchUrl ?? session.shareUrl; - } - return session.shareUrl ?? session.watchPageUrl; -} - -String watchShareLabel(StreamSession session) { - if (session.platform == 'youtube') { - return 'Guarda la diretta su YouTube'; - } - return 'Guarda la diretta su Match Live TV'; -} - -Future shareWatchLink( - BuildContext context, { - required StreamSession session, - required String title, -}) async { - final url = watchShareUrl(session); - if (url == null || url.isEmpty) { - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Link diretta non ancora disponibile')), - ); - } - return; - } - await Share.share( - '${watchShareLabel(session)}:\n$url', - subject: title, - ); -} - -Future copyWatchLink(BuildContext context, StreamSession session) async { - final url = watchShareUrl(session); - if (url == null || url.isEmpty) { - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Link diretta non ancora disponibile')), - ); - } - return; - } - await Clipboard.setData(ClipboardData(text: url)); - if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Link copiato')), - ); - } -} diff --git a/mobile/lib/shared/websocket_service.dart b/mobile/lib/shared/websocket_service.dart deleted file mode 100644 index a8795ff..0000000 --- a/mobile/lib/shared/websocket_service.dart +++ /dev/null @@ -1,205 +0,0 @@ -import 'dart:convert'; - -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:x_action_cable_v2/x_action_cable.dart'; - -import '../core/config.dart'; -import '../providers/auth_provider.dart'; -import '../providers/score_provider.dart'; -import '../providers/score_sync_provider.dart'; -import '../providers/session_provider.dart'; -import 'models/device_state.dart'; -import 'models/score_state.dart'; - -final websocketServiceProvider = Provider((ref) { - final service = WebsocketService(ref); - ref.onDispose(service.dispose); - return service; -}); - -typedef CableMessageHandler = void Function(Map data); - -class WebsocketService { - WebsocketService(this._ref); - - final Ref _ref; - ActionCable? _cable; - ActionChannel? _channel; - String? _sessionId; - Future? _connectOp; - - bool get isConnected => _cable != null && _channel != null; - - Future connect({ - required String sessionId, - required String deviceRole, - }) async { - if (_sessionId == sessionId && isConnected) return; - - final prev = _connectOp; - if (prev != null) await prev.catchError((_) {}); - - _connectOp = _connect(sessionId: sessionId, deviceRole: deviceRole); - final op = _connectOp!; - try { - await op; - } finally { - if (identical(_connectOp, op)) { - _connectOp = null; - } - } - } - - Future _connect({ - required String sessionId, - required String deviceRole, - }) async { - await disconnect(); - - final token = _ref.read(authProvider).accessToken; - if (token == null || token.isEmpty) { - throw StateError('Token di accesso mancante'); - } - - _sessionId = sessionId; - - _cable = ActionCable.connect( - AppConfig.cableUrl, - headers: {'Authorization': 'Bearer $token'}, - onConnected: () { - _ref.read(sessionProvider.notifier).setConnected(true); - }, - onConnectionLost: () { - _ref.read(sessionProvider.notifier).setConnected(false); - }, - onCannotConnect: (_) { - _ref.read(sessionProvider.notifier).setConnected(false); - }, - ); - - _channel = _cable!.subscribe( - 'SessionChannel', - channelParams: { - 'session_id': sessionId, - 'device_role': deviceRole, - }, - onSubscribed: () { - _ref.read(sessionProvider.notifier).setConnected(true); - }, - onDisconnected: () { - _ref.read(sessionProvider.notifier).setConnected(false); - }, - callbacks: [ - ActionCallback( - name: 'receive_message', - callback: _handleMessage, - ), - ], - ); - } - - void _handleMessage(ActionResponse response) { - if (response.hasError || response.data == null) return; - _dispatch(Map.from(response.data!)); - } - - void _dispatch(Map data) { - final type = data['type'] as String?; - - switch (type) { - case 'score_update': - final remote = ScoreState.fromJson(data); - if (_ref.read(scoreSyncProvider).acceptCableScore(remote)) { - _ref.read(scoreProvider.notifier).applyRemote(remote); - } - break; - case 'device_state': - _ref - .read(sessionProvider.notifier) - .updateDeviceState(DeviceStateModel.fromJson(data)); - break; - case 'timeout': - final team = data['team'] as String?; - if (team == 'home') { - _ref.read(scoreProvider.notifier).setTimeoutHome(true); - } else if (team == 'away') { - _ref.read(scoreProvider.notifier).setTimeoutAway(true); - } - break; - case 'command': - final action = data['action'] as String?; - if (action != null) { - _ref.read(sessionProvider.notifier).applyCommand(action); - } - break; - case 'stream_event': - final event = data['event'] as String?; - if (event == 'paused') { - _ref.read(sessionProvider.notifier).applyCommand('pause_stream'); - } else if (event == 'resumed') { - _ref.read(sessionProvider.notifier).applyCommand('resume_stream'); - } - break; - case 'youtube_ready': - _ref.read(sessionProvider.notifier).updateYoutubeLinks( - youtubeWatchUrl: data['youtube_watch_url'] as String?, - shareUrl: data['share_url'] as String?, - youtubeBroadcastId: data['youtube_broadcast_id'] as String?, - ); - break; - default: - break; - } - } - - void sendScoreUpdate(ScoreState score) { - _perform({'type': 'score_update', ...score.toCablePayload()}); - } - - void sendTimeout(String team) { - _perform({'type': 'timeout', 'team': team}); - } - - void sendCommand(String action) { - _perform({'type': 'command', 'action': action}); - } - - void sendDeviceState(DeviceStateModel state) { - _perform({ - 'type': 'device_state', - 'device_role': state.deviceRole, - 'battery': state.batteryLevel, - 'network': state.networkType, - 'bitrate': state.currentBitrate, - 'fps': state.fps, - }); - } - - void _perform(Map payload) { - _channel?.performAction('receive', params: payload); - } - - Future disconnect() async { - final channel = _channel; - final cable = _cable; - _channel = null; - _cable = null; - _sessionId = null; - - try { - channel?.unsubscribe(); - } catch (_) {} - try { - cable?.disconnect(); - } catch (_) {} - - await Future.delayed(const Duration(milliseconds: 150)); - _ref.read(sessionProvider.notifier).setConnected(false); - } - - void dispose() { - disconnect(); - } - - String encodeQrPayload(Map payload) => jsonEncode(payload); -} diff --git a/mobile/lib/shared/widgets/camera_compact_metrics.dart b/mobile/lib/shared/widgets/camera_compact_metrics.dart deleted file mode 100644 index e36d0c2..0000000 --- a/mobile/lib/shared/widgets/camera_compact_metrics.dart +++ /dev/null @@ -1,39 +0,0 @@ -import 'package:flutter/material.dart'; - -/// Riga compatta metriche stream (sostituisce le MetricCard ingombranti in camera). -class CameraCompactMetrics extends StatelessWidget { - const CameraCompactMetrics({ - super.key, - required this.networkType, - required this.bitrateMbps, - required this.fps, - this.batteryLevel, - this.viewerCount, - this.light = false, - }); - - final String networkType; - final double bitrateMbps; - final int fps; - final int? batteryLevel; - final int? viewerCount; - final bool light; - - @override - Widget build(BuildContext context) { - final color = light ? Colors.white70 : Theme.of(context).textTheme.bodySmall?.color; - final parts = [ - networkType, - '${bitrateMbps.toStringAsFixed(1)} Mbps', - '$fps fps', - if (batteryLevel != null) '$batteryLevel%', - if (viewerCount != null && viewerCount! > 0) '$viewerCount spett.', - ]; - return Text( - parts.join(' · '), - style: TextStyle(fontSize: 11, color: color, fontWeight: FontWeight.w500), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ); - } -} diff --git a/mobile/lib/shared/widgets/connected_badge.dart b/mobile/lib/shared/widgets/connected_badge.dart deleted file mode 100644 index 931332c..0000000 --- a/mobile/lib/shared/widgets/connected_badge.dart +++ /dev/null @@ -1,42 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../app/theme.dart'; - -/// Dot verde + etichetta COLLEGATO. -class ConnectedBadge extends StatelessWidget { - const ConnectedBadge({ - super.key, - this.connected = true, - this.label, - }); - - final bool connected; - final String? label; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final color = connected ? AppTheme.successGreen : AppTheme.textSecondary; - return Row( - mainAxisSize: MainAxisSize.min, - children: [ - Container( - width: 8, - height: 8, - decoration: BoxDecoration( - color: color, - shape: BoxShape.circle, - ), - ), - const SizedBox(width: 6), - Text( - label ?? (connected ? 'COLLEGATO' : 'DISCONNESSO'), - style: theme.textTheme.labelLarge?.copyWith( - color: color, - fontSize: 12, - ), - ), - ], - ); - } -} diff --git a/mobile/lib/shared/widgets/destructive_cta.dart b/mobile/lib/shared/widgets/destructive_cta.dart deleted file mode 100644 index 24f5f66..0000000 --- a/mobile/lib/shared/widgets/destructive_cta.dart +++ /dev/null @@ -1,65 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../app/theme.dart'; - -/// CTA distruttiva nera con icona rossa (INTERROMPI, FERMA TRASMISSIONE). -class DestructiveCta extends StatelessWidget { - const DestructiveCta({ - super.key, - required this.label, - required this.onPressed, - this.loading = false, - this.compact = false, - }); - - final String label; - final VoidCallback? onPressed; - final bool loading; - final bool compact; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - return SizedBox( - width: compact ? null : double.infinity, - height: compact ? 44 : 52, - child: OutlinedButton( - onPressed: loading ? null : onPressed, - style: OutlinedButton.styleFrom( - backgroundColor: Colors.black, - foregroundColor: AppTheme.primaryRed, - side: BorderSide( - color: AppTheme.primaryRed.withValues(alpha: 0.6), - ), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(compact ? 10 : 12), - ), - ), - child: loading - ? const SizedBox( - width: 20, - height: 20, - child: CircularProgressIndicator( - strokeWidth: 2, - color: AppTheme.primaryRed, - ), - ) - : Row( - mainAxisAlignment: MainAxisAlignment.center, - mainAxisSize: compact ? MainAxisSize.min : MainAxisSize.max, - children: [ - const Icon(Icons.stop_circle_outlined, size: 20), - const SizedBox(width: 8), - Text( - label, - style: theme.textTheme.labelLarge?.copyWith( - color: AppTheme.primaryRed, - fontSize: compact ? 12 : 14, - ), - ), - ], - ), - ), - ); - } -} diff --git a/mobile/lib/shared/widgets/end_stream_dialog.dart b/mobile/lib/shared/widgets/end_stream_dialog.dart deleted file mode 100644 index 69610ca..0000000 --- a/mobile/lib/shared/widgets/end_stream_dialog.dart +++ /dev/null @@ -1,31 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../app/theme.dart'; - -/// Conferma chiusura definitiva della diretta (non riprendibile). -Future confirmEndStream(BuildContext context) async { - final result = await showDialog( - context: context, - builder: (ctx) => AlertDialog( - backgroundColor: AppTheme.surface, - title: const Text('Chiudi diretta'), - content: const Text( - 'La diretta verrà chiusa definitivamente. ' - 'Gli spettatori vedranno che lo stream è terminato e non potrai riprendere questa sessione.\n\n' - 'Per una pausa temporanea usa «Metti in pausa».', - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx, false), - child: const Text('Annulla'), - ), - FilledButton( - onPressed: () => Navigator.pop(ctx, true), - style: FilledButton.styleFrom(backgroundColor: AppTheme.primaryRed), - child: const Text('Chiudi definitivamente'), - ), - ], - ), - ); - return result == true; -} diff --git a/mobile/lib/shared/widgets/live_badge.dart b/mobile/lib/shared/widgets/live_badge.dart deleted file mode 100644 index fd9ccd4..0000000 --- a/mobile/lib/shared/widgets/live_badge.dart +++ /dev/null @@ -1,66 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../app/theme.dart'; - -/// Pill rossa con dot pulsante e timer diretta. -class LiveBadge extends StatelessWidget { - const LiveBadge({ - super.key, - required this.elapsed, - this.compact = false, - this.paused = false, - }); - - final Duration elapsed; - final bool compact; - final bool paused; - - String _format(Duration d) { - final h = d.inHours; - final m = d.inMinutes.remainder(60).toString().padLeft(2, '0'); - final s = d.inSeconds.remainder(60).toString().padLeft(2, '0'); - if (h > 0) return '$h:$m:$s'; - return '$m:$s'; - } - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final bg = paused ? const Color(0xFF555555) : AppTheme.primaryRed; - final label = paused - ? (compact ? 'PAUSA ${_format(elapsed)}' : 'IN PAUSA ${_format(elapsed)}') - : (compact ? 'LIVE ${_format(elapsed)}' : 'IN DIRETTA ${_format(elapsed)}'); - return Container( - padding: EdgeInsets.symmetric( - horizontal: compact ? 10 : 14, - vertical: compact ? 4 : 6, - ), - decoration: BoxDecoration( - color: bg, - borderRadius: BorderRadius.circular(20), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - if (!paused) - Container( - width: compact ? 6 : 8, - height: compact ? 6 : 8, - decoration: const BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - ), - ), - if (!paused) SizedBox(width: compact ? 6 : 8), - Text( - label, - style: theme.textTheme.labelLarge?.copyWith( - color: Colors.white, - fontSize: compact ? 11 : 13, - ), - ), - ], - ), - ); - } -} diff --git a/mobile/lib/shared/widgets/live_score_controls.dart b/mobile/lib/shared/widgets/live_score_controls.dart deleted file mode 100644 index e5176f2..0000000 --- a/mobile/lib/shared/widgets/live_score_controls.dart +++ /dev/null @@ -1,206 +0,0 @@ -import 'dart:async'; - -import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -import '../../app/theme.dart'; -import '../../features/shared/live_score_actions.dart'; -import '../../providers/score_provider.dart'; -import '../../providers/score_sync_provider.dart'; -import 'score_overlay_bar.dart'; - -/// Tabellone interattivo: aggiorna punteggio via WebSocket (senza link regia). -class LiveScoreControls extends ConsumerWidget { - const LiveScoreControls({ - super.key, - required this.homeName, - required this.awayName, - this.compact = false, - this.lastDelta, - this.pointsTarget, - this.onStopStream, - }); - - final String homeName; - final String awayName; - final bool compact; - final int? lastDelta; - final int? pointsTarget; - final Future Function()? onStopStream; - - void _sync(WidgetRef ref) { - // HTTP serializzato; il server fa broadcast WebSocket. Pagina live = status.json. - unawaited(ref.read(scoreSyncProvider).push()); - } - - Future _pointHome(BuildContext context, WidgetRef ref) async { - ref.read(scoreProvider.notifier).incrementHome(); - _sync(ref); - if (!context.mounted) return; - await LiveScoreActions(ref).afterPointChange( - context, - homeName: homeName, - awayName: awayName, - onCloseSetConfirmed: () => _closeSet(context, ref), - ); - } - - Future _pointAway(BuildContext context, WidgetRef ref) async { - ref.read(scoreProvider.notifier).incrementAway(); - _sync(ref); - if (!context.mounted) return; - await LiveScoreActions(ref).afterPointChange( - context, - homeName: homeName, - awayName: awayName, - onCloseSetConfirmed: () => _closeSet(context, ref), - ); - } - - Future _closeSet(BuildContext context, WidgetRef ref) async { - await LiveScoreActions(ref).requestCloseSet( - context, - onCloseSetConfirmed: () async { - ref.read(scoreProvider.notifier).closeSet(); - _sync(ref); - if (!context.mounted) return; - await LiveScoreActions(ref).afterCloseSet( - context, - homeName: homeName, - awayName: awayName, - onStopStream: onStopStream ?? () async {}, - ); - }, - ); - } - - @override - Widget build(BuildContext context, WidgetRef ref) { - final score = ref.watch(scoreProvider); - final target = pointsTarget ?? 25; - final btnStyle = compact - ? const ButtonStyle( - padding: WidgetStatePropertyAll(EdgeInsets.symmetric(horizontal: 10, vertical: 6)), - minimumSize: WidgetStatePropertyAll(Size(44, 32)), - tapTargetSize: MaterialTapTargetSize.shrinkWrap, - ) - : null; - - Widget teamControls({ - required String label, - required int points, - required VoidCallback onPlus, - required VoidCallback onMinus, - }) { - return Expanded( - child: Column( - children: [ - Text( - label, - style: Theme.of(context).textTheme.labelMedium?.copyWith( - color: compact ? Colors.white70 : null, - fontSize: compact ? 10 : null, - ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - textAlign: TextAlign.center, - ), - const SizedBox(height: 4), - Text( - '$points', - style: Theme.of(context).textTheme.headlineSmall?.copyWith( - color: compact ? Colors.white : AppTheme.primaryRed, - fontWeight: FontWeight.bold, - fontSize: compact ? 22 : null, - ), - ), - const SizedBox(height: 6), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - FilledButton( - style: btnStyle?.merge(FilledButton.styleFrom( - backgroundColor: AppTheme.primaryRed, - foregroundColor: Colors.white, - )), - onPressed: onPlus, - child: Text(compact ? '+1' : '+1 punto', style: TextStyle(fontSize: compact ? 12 : 13)), - ), - const SizedBox(width: 6), - OutlinedButton( - style: btnStyle, - onPressed: onMinus, - child: Text('−', style: TextStyle(fontSize: compact ? 16 : 18)), - ), - ], - ), - ], - ), - ); - } - - return Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisSize: MainAxisSize.min, - children: [ - ScoreOverlayBar( - homeName: homeName, - awayName: awayName, - homePoints: score.homePoints, - awayPoints: score.awayPoints, - currentSet: score.currentSet, - homeSets: score.homeSets, - awaySets: score.awaySets, - compact: compact, - lastDelta: lastDelta, - pointsTarget: pointsTarget, - ), - SizedBox(height: compact ? 8 : 12), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - teamControls( - label: homeName, - points: score.homePoints, - onPlus: () => _pointHome(context, ref), - onMinus: () { - ref.read(scoreProvider.notifier).decrementHome(); - _sync(ref); - }, - ), - Padding( - padding: EdgeInsets.only(top: compact ? 18 : 24), - child: Text( - '$target pt', - style: Theme.of(context).textTheme.labelSmall?.copyWith( - color: compact ? Colors.white54 : AppTheme.textSecondary, - ), - ), - ), - teamControls( - label: awayName, - points: score.awayPoints, - onPlus: () => _pointAway(context, ref), - onMinus: () { - ref.read(scoreProvider.notifier).decrementAway(); - _sync(ref); - }, - ), - ], - ), - SizedBox(height: compact ? 6 : 10), - OutlinedButton( - style: compact - ? OutlinedButton.styleFrom( - foregroundColor: Colors.white, - side: const BorderSide(color: Colors.white54), - padding: const EdgeInsets.symmetric(vertical: 8), - ) - : null, - onPressed: () => _closeSet(context, ref), - child: Text(compact ? 'Chiudi set' : 'CHIUDI SET'), - ), - ], - ); - } -} diff --git a/mobile/lib/shared/widgets/match_live_wordmark.dart b/mobile/lib/shared/widgets/match_live_wordmark.dart deleted file mode 100644 index ce76a26..0000000 --- a/mobile/lib/shared/widgets/match_live_wordmark.dart +++ /dev/null @@ -1,74 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../app/theme.dart'; - -/// Wordmark orizzontale: MATCH + pill LIVE + TV. -class MatchLiveWordmark extends StatelessWidget { - const MatchLiveWordmark({ - super.key, - this.compact = false, - this.showSlogan = false, - }); - - final bool compact; - final bool showSlogan; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final matchStyle = theme.textTheme.displaySmall?.copyWith( - color: Colors.white, - fontWeight: FontWeight.w900, - letterSpacing: 1, - ); - final tvStyle = theme.textTheme.displaySmall?.copyWith( - color: AppTheme.textSecondary, - fontWeight: FontWeight.w900, - letterSpacing: 1, - ); - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Row( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text('MATCH', style: matchStyle), - const SizedBox(width: 8), - Container( - padding: EdgeInsets.symmetric( - horizontal: compact ? 8 : 12, - vertical: compact ? 2 : 4, - ), - decoration: BoxDecoration( - color: AppTheme.primaryRed, - borderRadius: BorderRadius.circular(6), - ), - child: Text( - 'LIVE', - style: theme.textTheme.labelLarge?.copyWith( - color: Colors.white, - fontSize: compact ? 14 : 18, - ), - ), - ), - const SizedBox(width: 8), - Text('TV', style: tvStyle), - ], - ), - if (showSlogan) ...[ - const SizedBox(height: 12), - Text( - 'LO STREAMING CHE NON MUORE', - style: theme.textTheme.labelLarge?.copyWith( - color: AppTheme.textSecondary, - fontSize: 12, - letterSpacing: 2, - ), - ), - ], - ], - ); - } -} diff --git a/mobile/lib/shared/widgets/metric_card.dart b/mobile/lib/shared/widgets/metric_card.dart deleted file mode 100644 index 613bd0c..0000000 --- a/mobile/lib/shared/widgets/metric_card.dart +++ /dev/null @@ -1,65 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../app/theme.dart'; - -/// Card metrica singola (segnale, Mbps, fps). -class MetricCard extends StatelessWidget { - const MetricCard({ - super.key, - required this.label, - required this.value, - this.icon, - this.highlight = false, - this.expand = true, - }); - - final String label; - final String value; - final IconData? icon; - final bool highlight; - final bool expand; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final card = Container( - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8), - decoration: BoxDecoration( - color: AppTheme.surfaceElevated, - borderRadius: BorderRadius.circular(10), - border: highlight - ? Border.all(color: AppTheme.successGreen.withValues(alpha: 0.5)) - : null, - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - if (icon != null) ...[ - Icon(icon, size: 18, color: AppTheme.textSecondary), - const SizedBox(height: 4), - ], - Text( - value, - style: theme.textTheme.titleLarge?.copyWith( - color: highlight ? AppTheme.successGreen : Colors.white, - fontWeight: FontWeight.w900, - ), - textAlign: TextAlign.center, - ), - const SizedBox(height: 2), - Text( - label, - style: theme.textTheme.bodyMedium?.copyWith(fontSize: 11), - textAlign: TextAlign.center, - ), - ], - ), - ); - - if (!expand) { - return SizedBox(width: 72, child: card); - } - - return Expanded(child: card); - } -} diff --git a/mobile/lib/shared/widgets/primary_cta.dart b/mobile/lib/shared/widgets/primary_cta.dart deleted file mode 100644 index ad916fd..0000000 --- a/mobile/lib/shared/widgets/primary_cta.dart +++ /dev/null @@ -1,66 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../app/theme.dart'; - -/// CTA primaria rossa full-width (AVANTI, INIZIA). -class PrimaryCta extends StatelessWidget { - const PrimaryCta({ - super.key, - required this.label, - required this.onPressed, - this.loading = false, - this.icon, - }); - - final String label; - final VoidCallback? onPressed; - final bool loading; - final IconData? icon; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - return SizedBox( - width: double.infinity, - height: 52, - child: ElevatedButton( - onPressed: loading ? null : onPressed, - style: ElevatedButton.styleFrom( - backgroundColor: AppTheme.primaryRed, - foregroundColor: Colors.white, - disabledBackgroundColor: AppTheme.primaryRed.withValues(alpha: 0.5), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12), - ), - elevation: 0, - ), - child: loading - ? const SizedBox( - width: 22, - height: 22, - child: CircularProgressIndicator( - strokeWidth: 2, - color: Colors.white, - ), - ) - : Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - label, - style: theme.textTheme.titleMedium?.copyWith( - color: Colors.white, - fontWeight: FontWeight.w800, - letterSpacing: 1, - ), - ), - if (icon != null) ...[ - const SizedBox(width: 8), - Icon(icon, size: 20), - ], - ], - ), - ), - ); - } -} diff --git a/mobile/lib/shared/widgets/score_outcome_dialogs.dart b/mobile/lib/shared/widgets/score_outcome_dialogs.dart deleted file mode 100644 index e1de669..0000000 --- a/mobile/lib/shared/widgets/score_outcome_dialogs.dart +++ /dev/null @@ -1,96 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../app/theme.dart'; -import '../scoring/match_scoring_rules.dart'; - -Future showSetWonDialog( - BuildContext context, { - required ScoringSide winner, - required String homeName, - required String awayName, - required int homePoints, - required int awayPoints, -}) async { - final winnerName = winner == ScoringSide.home ? homeName : awayName; - final result = await showDialog( - context: context, - barrierDismissible: false, - builder: (ctx) => AlertDialog( - backgroundColor: AppTheme.surface, - title: const Text('Set concluso'), - content: Text( - '$winnerName vince il set $homePoints-$awayPoints.\n\nChiudere il set e passare al successivo?', - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx, false), - child: const Text('Continua a segnare'), - ), - FilledButton( - onPressed: () => Navigator.pop(ctx, true), - style: FilledButton.styleFrom(backgroundColor: AppTheme.accentYellow), - child: const Text('Chiudi set', style: TextStyle(color: Colors.black)), - ), - ], - ), - ); - return result == true; -} - -Future showCloseSetAnywayDialog(BuildContext context) async { - final result = await showDialog( - context: context, - builder: (ctx) => AlertDialog( - backgroundColor: AppTheme.surface, - title: const Text('Chiudi set'), - content: const Text( - 'Il punteggio non soddisfa ancora le regole del torneo. Chiudere il set comunque?', - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx, false), - child: const Text('Annulla'), - ), - FilledButton( - onPressed: () => Navigator.pop(ctx, true), - child: const Text('Chiudi comunque'), - ), - ], - ), - ); - return result == true; -} - -Future showMatchWonDialog( - BuildContext context, { - required ScoringSide winner, - required String homeName, - required String awayName, - required int homeSets, - required int awaySets, -}) async { - final winnerName = winner == ScoringSide.home ? homeName : awayName; - final result = await showDialog( - context: context, - barrierDismissible: false, - builder: (ctx) => AlertDialog( - backgroundColor: AppTheme.surface, - title: const Text('Partita terminata'), - content: Text( - '$winnerName vince la partita ($homeSets-$awaySets set).\n\nChiudere definitivamente la diretta?', - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx, false), - child: const Text('Continua in onda'), - ), - FilledButton( - onPressed: () => Navigator.pop(ctx, true), - style: FilledButton.styleFrom(backgroundColor: AppTheme.primaryRed), - child: const Text('Chiudi diretta'), - ), - ], - ), - ); - return result == true; -} diff --git a/mobile/lib/shared/widgets/score_overlay_bar.dart b/mobile/lib/shared/widgets/score_overlay_bar.dart deleted file mode 100644 index ac9a5c6..0000000 --- a/mobile/lib/shared/widgets/score_overlay_bar.dart +++ /dev/null @@ -1,133 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../../app/theme.dart'; - -/// Barra overlay punteggio: SET n | HOME x - AWAY y. -class ScoreOverlayBar extends StatelessWidget { - const ScoreOverlayBar({ - super.key, - required this.homeName, - required this.awayName, - required this.homePoints, - required this.awayPoints, - required this.currentSet, - this.homeSets, - this.awaySets, - this.compact = false, - this.lastDelta, - this.pointsTarget, - }); - - final String homeName; - final String awayName; - final int homePoints; - final int awayPoints; - final int currentSet; - final int? homeSets; - final int? awaySets; - final bool compact; - final int? lastDelta; - final int? pointsTarget; - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - final bg = Colors.black.withValues(alpha: 0.72); - - final bar = Container( - padding: EdgeInsets.symmetric( - horizontal: compact ? 10 : 14, - vertical: compact ? 6 : 8, - ), - decoration: BoxDecoration( - color: bg, - borderRadius: BorderRadius.circular(compact ? 8 : 10), - border: Border.all(color: Colors.white12), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - pointsTarget != null ? 'SET $currentSet → $pointsTarget' : 'SET $currentSet', - style: theme.textTheme.labelLarge?.copyWith( - color: AppTheme.accentYellow, - fontSize: compact ? 11 : 13, - ), - ), - Container( - width: 1, - height: compact ? 14 : 18, - margin: const EdgeInsets.symmetric(horizontal: 10), - color: Colors.white24, - ), - Text( - homeName.toUpperCase(), - style: theme.textTheme.labelLarge?.copyWith( - fontSize: compact ? 11 : 13, - ), - ), - const SizedBox(width: 6), - Text( - '$homePoints', - style: theme.textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.w900, - fontSize: compact ? 16 : 20, - ), - ), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 8), - child: Text( - '-', - style: theme.textTheme.titleMedium?.copyWith( - color: AppTheme.textSecondary, - ), - ), - ), - Text( - '$awayPoints', - style: theme.textTheme.titleLarge?.copyWith( - fontWeight: FontWeight.w900, - fontSize: compact ? 16 : 20, - ), - ), - const SizedBox(width: 6), - Text( - awayName.toUpperCase(), - style: theme.textTheme.labelLarge?.copyWith( - fontSize: compact ? 11 : 13, - ), - ), - if (homeSets != null && awaySets != null) ...[ - const SizedBox(width: 10), - Text( - '($homeSets-$awaySets)', - style: theme.textTheme.bodyMedium?.copyWith(fontSize: 11), - ), - ], - if (lastDelta != null && lastDelta != 0) ...[ - const SizedBox(width: 8), - Text( - lastDelta! > 0 ? '+$lastDelta' : '$lastDelta', - style: theme.textTheme.labelLarge?.copyWith( - color: lastDelta! > 0 ? AppTheme.successGreen : AppTheme.primaryRed, - fontSize: compact ? 11 : 13, - ), - ), - ], - ], - ), - ); - - return LayoutBuilder( - builder: (context, constraints) { - if (!constraints.hasBoundedWidth) { - return bar; - } - return SingleChildScrollView( - scrollDirection: Axis.horizontal, - child: bar, - ); - }, - ); - } -} diff --git a/mobile/lib/shared/widgets/screen_insets.dart b/mobile/lib/shared/widgets/screen_insets.dart deleted file mode 100644 index 2d5e283..0000000 --- a/mobile/lib/shared/widgets/screen_insets.dart +++ /dev/null @@ -1,84 +0,0 @@ -import 'dart:math' as math; - -import 'package:flutter/material.dart'; - -/// Padding di sistema (status bar, notch, barra navigazione) con minimo configurabile. -class ScreenInsets { - ScreenInsets._(); - - static EdgeInsets of(BuildContext context, {double minimum = 8}) { - final mq = MediaQuery.of(context); - final padding = mq.padding; - final view = mq.viewPadding; - return EdgeInsets.only( - left: math.max(math.max(padding.left, view.left), minimum), - top: math.max(math.max(padding.top, view.top), minimum), - right: math.max(math.max(padding.right, view.right), minimum), - bottom: math.max(math.max(padding.bottom, view.bottom), minimum), - ); - } - - /// Padding per contenuti scrollabili (login, wizard, elenco partite). - /// Overlay camera: in landscape su Android la barra nav può stare a sinistra. - static EdgeInsets cameraOverlay(BuildContext context, {double minimum = 12}) { - final base = of(context, minimum: minimum); - final landscape = - MediaQuery.orientationOf(context) == Orientation.landscape; - if (landscape && base.left < 48) { - return base.copyWith(left: 48); - } - return base; - } - - static EdgeInsets contentPadding( - BuildContext context, { - double horizontal = 20, - double vertical = 16, - double minimum = 8, - }) { - final inset = of(context, minimum: minimum); - return EdgeInsets.fromLTRB( - math.max(inset.left, horizontal), - math.max(inset.top, vertical), - math.max(inset.right, horizontal), - math.max(inset.bottom, vertical), - ); - } -} - -/// SafeArea con padding minimo su tutti i lati (gestisce edge-to-edge Android). -class AppSafeArea extends StatelessWidget { - const AppSafeArea({ - super.key, - required this.child, - this.minimum = 8, - this.top = true, - this.bottom = true, - this.left = true, - this.right = true, - }); - - final Widget child; - final double minimum; - final bool top; - final bool bottom; - final bool left; - final bool right; - - @override - Widget build(BuildContext context) { - return SafeArea( - minimum: EdgeInsets.only( - left: left ? minimum : 0, - top: top ? minimum : 0, - right: right ? minimum : 0, - bottom: bottom ? minimum : 0, - ), - top: top, - bottom: bottom, - left: left, - right: right, - child: child, - ); - } -} diff --git a/mobile/linux/.gitignore b/mobile/linux/.gitignore deleted file mode 100644 index d3896c9..0000000 --- a/mobile/linux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -flutter/ephemeral diff --git a/mobile/linux/CMakeLists.txt b/mobile/linux/CMakeLists.txt deleted file mode 100644 index 3cb0f5d..0000000 --- a/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 "match_live_tv") -# The unique GTK application identifier for this application. See: -# https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.matchlivetv.match_live_tv") - -# 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/mobile/linux/flutter/CMakeLists.txt b/mobile/linux/flutter/CMakeLists.txt deleted file mode 100644 index d5bd016..0000000 --- a/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/mobile/linux/flutter/generated_plugin_registrant.cc b/mobile/linux/flutter/generated_plugin_registrant.cc deleted file mode 100644 index 3792af4..0000000 --- a/mobile/linux/flutter/generated_plugin_registrant.cc +++ /dev/null @@ -1,19 +0,0 @@ -// -// Generated file. Do not edit. -// - -// clang-format off - -#include "generated_plugin_registrant.h" - -#include -#include - -void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) gtk_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin"); - gtk_plugin_register_with_registrar(gtk_registrar); - g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); - url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); -} diff --git a/mobile/linux/flutter/generated_plugin_registrant.h b/mobile/linux/flutter/generated_plugin_registrant.h deleted file mode 100644 index e0f0a47..0000000 --- a/mobile/linux/flutter/generated_plugin_registrant.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// Generated file. Do not edit. -// - -// clang-format off - -#ifndef GENERATED_PLUGIN_REGISTRANT_ -#define GENERATED_PLUGIN_REGISTRANT_ - -#include - -// Registers Flutter plugins. -void fl_register_plugins(FlPluginRegistry* registry); - -#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/mobile/linux/flutter/generated_plugins.cmake b/mobile/linux/flutter/generated_plugins.cmake deleted file mode 100644 index 21d8f8b..0000000 --- a/mobile/linux/flutter/generated_plugins.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# -# Generated file, do not edit. -# - -list(APPEND FLUTTER_PLUGIN_LIST - gtk - url_launcher_linux -) - -list(APPEND FLUTTER_FFI_PLUGIN_LIST - jni -) - -set(PLUGIN_BUNDLED_LIBRARIES) - -foreach(plugin ${FLUTTER_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) - target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) - list(APPEND PLUGIN_BUNDLED_LIBRARIES $) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) -endforeach(plugin) - -foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) -endforeach(ffi_plugin) diff --git a/mobile/linux/runner/CMakeLists.txt b/mobile/linux/runner/CMakeLists.txt deleted file mode 100644 index e97dabc..0000000 --- a/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/mobile/linux/runner/main.cc b/mobile/linux/runner/main.cc deleted file mode 100644 index e7c5c54..0000000 --- a/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/mobile/linux/runner/my_application.cc b/mobile/linux/runner/my_application.cc deleted file mode 100644 index cc32559..0000000 --- a/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, "match_live_tv"); - 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, "match_live_tv"); - } - - 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/mobile/linux/runner/my_application.h b/mobile/linux/runner/my_application.h deleted file mode 100644 index db16367..0000000 --- a/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/mobile/macos/.gitignore b/mobile/macos/.gitignore deleted file mode 100644 index 746adbb..0000000 --- a/mobile/macos/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# Flutter-related -**/Flutter/ephemeral/ -**/Pods/ - -# Xcode-related -**/dgph -**/xcuserdata/ diff --git a/mobile/macos/Flutter/Flutter-Debug.xcconfig b/mobile/macos/Flutter/Flutter-Debug.xcconfig deleted file mode 100644 index c2efd0b..0000000 --- a/mobile/macos/Flutter/Flutter-Debug.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/mobile/macos/Flutter/Flutter-Release.xcconfig b/mobile/macos/Flutter/Flutter-Release.xcconfig deleted file mode 100644 index c2efd0b..0000000 --- a/mobile/macos/Flutter/Flutter-Release.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/mobile/macos/Flutter/GeneratedPluginRegistrant.swift b/mobile/macos/Flutter/GeneratedPluginRegistrant.swift deleted file mode 100644 index 29cf942..0000000 --- a/mobile/macos/Flutter/GeneratedPluginRegistrant.swift +++ /dev/null @@ -1,28 +0,0 @@ -// -// Generated file. Do not edit. -// - -import FlutterMacOS -import Foundation - -import app_links -import battery_plus -import connectivity_plus -import mobile_scanner -import package_info_plus -import share_plus -import shared_preferences_foundation -import url_launcher_macos -import wakelock_plus - -func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin")) - BatteryPlusMacosPlugin.register(with: registry.registrar(forPlugin: "BatteryPlusMacosPlugin")) - ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin")) - MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) - SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) - SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) - UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) - WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin")) -} diff --git a/mobile/macos/Runner.xcodeproj/project.pbxproj b/mobile/macos/Runner.xcodeproj/project.pbxproj deleted file mode 100644 index b82ced3..0000000 --- a/mobile/macos/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,729 +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 */; }; - 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; -/* 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 /* match_live_tv.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "match_live_tv.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 = ""; }; - 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; 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 = ( - 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, - ); - 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 /* match_live_tv.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 = ( - 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, - 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; - packageProductDependencies = ( - 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, - ); - productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* match_live_tv.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; - packageReferences = ( - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, - ); - 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.matchlivetv.matchLiveTv.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/match_live_tv.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/match_live_tv"; - }; - 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.matchlivetv.matchLiveTv.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/match_live_tv.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/match_live_tv"; - }; - 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.matchlivetv.matchLiveTv.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/match_live_tv.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/match_live_tv"; - }; - 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 */ - -/* Begin XCLocalSwiftPackageReference section */ - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { - isa = XCLocalSwiftPackageReference; - relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; - }; -/* End XCLocalSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { - isa = XCSwiftPackageProductDependency; - productName = FlutterGeneratedPluginSwiftPackage; - }; -/* End XCSwiftPackageProductDependency section */ - }; - rootObject = 33CC10E52044A3C60003C045 /* Project object */; -} diff --git a/mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/mobile/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100644 index 34d04f3..0000000 --- a/mobile/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mobile/macos/Runner.xcworkspace/contents.xcworkspacedata b/mobile/macos/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d526a1..0000000 --- a/mobile/macos/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/mobile/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/mobile/macos/Runner/AppDelegate.swift b/mobile/macos/Runner/AppDelegate.swift deleted file mode 100644 index b3c1761..0000000 --- a/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/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index a2ec33f..0000000 --- a/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/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/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/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/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/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/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/mobile/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/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/mobile/macos/Runner/Configs/AppInfo.xcconfig b/mobile/macos/Runner/Configs/AppInfo.xcconfig deleted file mode 100644 index e97a26c..0000000 --- a/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 = match_live_tv - -// The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.matchlivetv.matchLiveTv - -// The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2026 com.matchlivetv. All rights reserved. diff --git a/mobile/macos/Runner/Configs/Debug.xcconfig b/mobile/macos/Runner/Configs/Debug.xcconfig deleted file mode 100644 index 36b0fd9..0000000 --- a/mobile/macos/Runner/Configs/Debug.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../Flutter/Flutter-Debug.xcconfig" -#include "Warnings.xcconfig" diff --git a/mobile/macos/Runner/Configs/Release.xcconfig b/mobile/macos/Runner/Configs/Release.xcconfig deleted file mode 100644 index dff4f49..0000000 --- a/mobile/macos/Runner/Configs/Release.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../Flutter/Flutter-Release.xcconfig" -#include "Warnings.xcconfig" diff --git a/mobile/macos/Runner/Configs/Warnings.xcconfig b/mobile/macos/Runner/Configs/Warnings.xcconfig deleted file mode 100644 index 42bcbf4..0000000 --- a/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/mobile/macos/Runner/DebugProfile.entitlements b/mobile/macos/Runner/DebugProfile.entitlements deleted file mode 100644 index dddb8a3..0000000 --- a/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/mobile/macos/Runner/Info.plist b/mobile/macos/Runner/Info.plist deleted file mode 100644 index 4789daa..0000000 --- a/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/mobile/macos/Runner/MainFlutterWindow.swift b/mobile/macos/Runner/MainFlutterWindow.swift deleted file mode 100644 index 3cc05eb..0000000 --- a/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/mobile/macos/Runner/Release.entitlements b/mobile/macos/Runner/Release.entitlements deleted file mode 100644 index 852fa1a..0000000 --- a/mobile/macos/Runner/Release.entitlements +++ /dev/null @@ -1,8 +0,0 @@ - - - - - com.apple.security.app-sandbox - - - diff --git a/mobile/macos/RunnerTests/RunnerTests.swift b/mobile/macos/RunnerTests/RunnerTests.swift deleted file mode 100644 index 61f3bd1..0000000 --- a/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/mobile/pubspec.yaml b/mobile/pubspec.yaml deleted file mode 100644 index 0f22541..0000000 --- a/mobile/pubspec.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: match_live_tv -description: Match Live TV - Lo streaming che non muore -publish_to: 'none' -version: 1.2.10+13 - -environment: - sdk: ^3.12.0 - -dependencies: - flutter: - sdk: flutter - cupertino_icons: ^1.0.8 - flutter_riverpod: ^2.6.1 - go_router: ^14.8.1 - dio: ^5.8.0+1 - x_action_cable_v2: ^1.0.0 - connectivity_plus: ^6.1.4 - battery_plus: ^6.2.1 - wakelock_plus: ^1.3.2 - permission_handler: ^11.4.0 - google_fonts: ^6.2.1 - intl: ^0.20.2 - qr_flutter: ^4.1.0 - mobile_scanner: ^6.0.10 - shared_preferences: ^2.5.3 - url_launcher: ^6.3.1 - share_plus: ^10.1.4 - app_links: ^6.4.0 - -dev_dependencies: - flutter_test: - sdk: flutter - flutter_lints: ^6.0.0 - -flutter: - uses-material-design: true diff --git a/mobile/test/widget_test.dart b/mobile/test/widget_test.dart deleted file mode 100644 index 6e46190..0000000 --- a/mobile/test/widget_test.dart +++ /dev/null @@ -1,23 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:match_live_tv/shared/widgets/live_badge.dart'; -import 'package:match_live_tv/shared/widgets/match_live_wordmark.dart'; - -void main() { - testWidgets('MatchLiveWordmark renders', (tester) async { - await tester.pumpWidget( - const MaterialApp(home: Scaffold(body: MatchLiveWordmark())), - ); - expect(find.text('MATCH'), findsOneWidget); - expect(find.text('LIVE'), findsOneWidget); - }); - - testWidgets('LiveBadge shows timer', (tester) async { - await tester.pumpWidget( - const MaterialApp( - home: Scaffold(body: LiveBadge(elapsed: Duration(minutes: 45, seconds: 35))), - ), - ); - expect(find.textContaining('IN DIRETTA'), findsOneWidget); - }); -} diff --git a/mobile/web/favicon.png b/mobile/web/favicon.png deleted file mode 100644 index 8aaa46ac1ae21512746f852a42ba87e4165dfdd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM diff --git a/mobile/web/icons/Icon-192.png b/mobile/web/icons/Icon-192.png deleted file mode 100644 index b749bfef07473333cf1dd31e9eed89862a5d52aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5292 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 diff --git a/mobile/web/icons/Icon-512.png b/mobile/web/icons/Icon-512.png deleted file mode 100644 index 88cfd48dff1169879ba46840804b412fe02fefd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8252 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 diff --git a/mobile/web/icons/Icon-maskable-192.png b/mobile/web/icons/Icon-maskable-192.png deleted file mode 100644 index eb9b4d76e525556d5d89141648c724331630325d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! diff --git a/mobile/web/icons/Icon-maskable-512.png b/mobile/web/icons/Icon-maskable-512.png deleted file mode 100644 index d69c56691fbdb0b7efa65097c7cc1edac12a6d3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20998 zcmeFZ_gj-)&^4Nb2tlbLMU<{!p(#yjqEe+=0IA_oih%ScH9@5#MNp&}Y#;;(h=A0@ zh7{>lT2MkSQ344eAvrhici!td|HJuyvJm#Y_w1Q9Yu3!26dNlO-oxUDK_C#XnW^Co z5C{VN6#{~B0)K2j7}*1Xq(Nqemv23A-6&=ZpEijkVnSwVGqLv40?n0=p;k3-U5e5+ z+z3>aS`u9DS=!wg8ROu?X4TFoW6CFLL&{GzoVT)ldhLekLM|+j3tIxRd|*5=c{=s&*vfPdBr(Fyj(v@%eQj1Soy7m4^@VRl1~@-PV7y+c!xz$8436WBn$t{=}mEdK#k`aystimGgI{(IBx$!pAwFoE9Y`^t^;> zKAD)C(Dl^s%`?q5$P|fZf8Xymrtu^Pv(7D`rn>Z-w$Ahs!z9!94WNVxrJuXfHAaxg zC6s@|Z1$7R$(!#t%Jb{{s6(Y?NoQXDYq)!}X@jKPhe`{9KQ@sAU8y-5`xt?S9$jKH zoi}6m5PcG*^{kjvt+kwPpyQzVg4o)a>;LK`aaN2x4@itBD3Aq?yWTM20VRn1rrd+2 zKO=P0rMjEGq_UqpMa`~7B|p?xAN1SCoCp}QxAv8O`jLJ5CVh@umR%c%i^)6!o+~`F zaalSTQcl5iwOLC&H)efzd{8(88mo`GI(56T<(&p7>Qd^;R1hn1Y~jN~tApaL8>##U zd65bo8)79CplWxr#z4!6HvLz&N7_5AN#x;kLG?zQ(#p|lj<8VUlKY=Aw!ATqeL-VG z42gA!^cMNPj>(`ZMEbCrnkg*QTsn*u(nQPWI9pA{MQ=IsPTzd7q5E#7+z>Ch=fx$~ z;J|?(5jTo5UWGvsJa(Sx0?S#56+8SD!I^tftyeh_{5_31l6&Hywtn`bbqYDqGZXI( zCG7hBgvksX2ak8+)hB4jnxlO@A32C_RM&g&qDSb~3kM&)@A_j1*oTO@nicGUyv+%^ z=vB)4(q!ykzT==Z)3*3{atJ5}2PV*?Uw+HhN&+RvKvZL3p9E?gHjv{6zM!A|z|UHK z-r6jeLxbGn0D@q5aBzlco|nG2tr}N@m;CJX(4#Cn&p&sLKwzLFx1A5izu?X_X4x8r@K*d~7>t1~ zDW1Mv5O&WOxbzFC`DQ6yNJ(^u9vJdj$fl2dq`!Yba_0^vQHXV)vqv1gssZYzBct!j zHr9>ydtM8wIs}HI4=E}qAkv|BPWzh3^_yLH(|kdb?x56^BlDC)diWyPd*|f!`^12_U>TD^^94OCN0lVv~Sgvs94ecpE^}VY$w`qr_>Ue zTfH~;C<3H<0dS5Rkf_f@1x$Gms}gK#&k()IC0zb^QbR!YLoll)c$Agfi6MKI0dP_L z=Uou&u~~^2onea2%XZ@>`0x^L8CK6=I{ge;|HXMj)-@o~h&O{CuuwBX8pVqjJ*o}5 z#8&oF_p=uSo~8vn?R0!AMWvcbZmsrj{ZswRt(aEdbi~;HeVqIe)-6*1L%5u$Gbs}| zjFh?KL&U(rC2izSGtwP5FnsR@6$-1toz?RvLD^k~h9NfZgzHE7m!!7s6(;)RKo2z} zB$Ci@h({l?arO+vF;s35h=|WpefaOtKVx>l399}EsX@Oe3>>4MPy%h&^3N_`UTAHJ zI$u(|TYC~E4)|JwkWW3F!Tib=NzjHs5ii2uj0^m|Qlh-2VnB#+X~RZ|`SA*}}&8j9IDv?F;(Y^1=Z0?wWz;ikB zewU>MAXDi~O7a~?jx1x=&8GcR-fTp>{2Q`7#BE#N6D@FCp`?ht-<1|y(NArxE_WIu zP+GuG=Qq>SHWtS2M>34xwEw^uvo4|9)4s|Ac=ud?nHQ>ax@LvBqusFcjH0}{T3ZPQ zLO1l<@B_d-(IS682}5KA&qT1+{3jxKolW+1zL4inqBS-D>BohA!K5++41tM@ z@xe<-qz27}LnV#5lk&iC40M||JRmZ*A##K3+!j93eouU8@q-`W0r%7N`V$cR&JV;iX(@cS{#*5Q>~4BEDA)EikLSP@>Oo&Bt1Z~&0d5)COI%3$cLB_M?dK# z{yv2OqW!al-#AEs&QFd;WL5zCcp)JmCKJEdNsJlL9K@MnPegK23?G|O%v`@N{rIRa zi^7a}WBCD77@VQ-z_v{ZdRsWYrYgC$<^gRQwMCi6);%R~uIi31OMS}=gUTE(GKmCI z$zM>mytL{uNN+a&S38^ez(UT=iSw=l2f+a4)DyCA1Cs_N-r?Q@$3KTYosY!;pzQ0k zzh1G|kWCJjc(oZVBji@kN%)UBw(s{KaYGy=i{g3{)Z+&H8t2`^IuLLKWT6lL<-C(! zSF9K4xd-|VO;4}$s?Z7J_dYqD#Mt)WCDnsR{Kpjq275uUq6`v0y*!PHyS(}Zmv)_{>Vose9-$h8P0|y;YG)Bo}$(3Z%+Gs0RBmFiW!^5tBmDK-g zfe5%B*27ib+7|A*Fx5e)2%kIxh7xWoc3pZcXS2zik!63lAG1;sC1ja>BqH7D zODdi5lKW$$AFvxgC-l-)!c+9@YMC7a`w?G(P#MeEQ5xID#<}W$3bSmJ`8V*x2^3qz zVe<^^_8GHqYGF$nIQm0Xq2kAgYtm#UC1A(=&85w;rmg#v906 zT;RyMgbMpYOmS&S9c38^40oUp?!}#_84`aEVw;T;r%gTZkWeU;;FwM@0y0adt{-OK z(vGnPSlR=Nv2OUN!2=xazlnHPM9EWxXg2EKf0kI{iQb#FoP>xCB<)QY>OAM$Dcdbm zU6dU|%Mo(~avBYSjRc13@|s>axhrPl@Sr81{RSZUdz4(=|82XEbV*JAX6Lfbgqgz584lYgi0 z2-E{0XCVON$wHfvaLs;=dqhQJ&6aLn$D#0i(FkAVrXG9LGm3pSTf&f~RQb6|1_;W> z?n-;&hrq*~L=(;u#jS`*Yvh@3hU-33y_Kv1nxqrsf>pHVF&|OKkoC)4DWK%I!yq?P z=vXo8*_1iEWo8xCa{HJ4tzxOmqS0&$q+>LroMKI*V-rxhOc%3Y!)Y|N6p4PLE>Yek>Y(^KRECg8<|%g*nQib_Yc#A5q8Io z6Ig&V>k|~>B6KE%h4reAo*DfOH)_01tE0nWOxX0*YTJgyw7moaI^7gW*WBAeiLbD?FV9GSB zPv3`SX*^GRBM;zledO`!EbdBO_J@fEy)B{-XUTVQv}Qf~PSDpK9+@I`7G7|>Dgbbu z_7sX9%spVo$%qwRwgzq7!_N;#Td08m5HV#?^dF-EV1o)Q=Oa+rs2xH#g;ykLbwtCh znUnA^dW!XjspJ;otq$yV@I^s9Up(5k7rqhQd@OLMyyxVLj_+$#Vc*}Usevp^I(^vH zmDgHc0VMme|K&X?9&lkN{yq_(If)O`oUPW8X}1R5pSVBpfJe0t{sPA(F#`eONTh_) zxeLqHMfJX#?P(@6w4CqRE@Eiza; z;^5)Kk=^5)KDvd9Q<`=sJU8rjjxPmtWMTmzcH={o$U)j=QBuHarp?=}c??!`3d=H$nrJMyr3L-& zA#m?t(NqLM?I3mGgWA_C+0}BWy3-Gj7bR+d+U?n*mN$%5P`ugrB{PeV>jDUn;eVc- zzeMB1mI4?fVJatrNyq|+zn=!AiN~<}eoM#4uSx^K?Iw>P2*r=k`$<3kT00BE_1c(02MRz4(Hq`L^M&xt!pV2 zn+#U3@j~PUR>xIy+P>51iPayk-mqIK_5rlQMSe5&tDkKJk_$i(X&;K(11YGpEc-K= zq4Ln%^j>Zi_+Ae9eYEq_<`D+ddb8_aY!N;)(&EHFAk@Ekg&41ABmOXfWTo)Z&KotA zh*jgDGFYQ^y=m)<_LCWB+v48DTJw*5dwMm_YP0*_{@HANValf?kV-Ic3xsC}#x2h8 z`q5}d8IRmqWk%gR)s~M}(Qas5+`np^jW^oEd-pzERRPMXj$kS17g?H#4^trtKtq;C?;c ztd|%|WP2w2Nzg@)^V}!Gv++QF2!@FP9~DFVISRW6S?eP{H;;8EH;{>X_}NGj^0cg@ z!2@A>-CTcoN02^r6@c~^QUa={0xwK0v4i-tQ9wQq^=q*-{;zJ{Qe%7Qd!&X2>rV@4 z&wznCz*63_vw4>ZF8~%QCM?=vfzW0r_4O^>UA@otm_!N%mH)!ERy&b!n3*E*@?9d^ zu}s^By@FAhG(%?xgJMuMzuJw2&@$-oK>n z=UF}rt%vuaP9fzIFCYN-1&b#r^Cl6RDFIWsEsM|ROf`E?O(cy{BPO2Ie~kT+^kI^i zp>Kbc@C?}3vy-$ZFVX#-cx)Xj&G^ibX{pWggtr(%^?HeQL@Z( zM-430g<{>vT*)jK4aY9(a{lSy{8vxLbP~n1MXwM527ne#SHCC^F_2@o`>c>>KCq9c(4c$VSyMl*y3Nq1s+!DF| z^?d9PipQN(mw^j~{wJ^VOXDCaL$UtwwTpyv8IAwGOg<|NSghkAR1GSNLZ1JwdGJYm zP}t<=5=sNNUEjc=g(y)1n5)ynX(_$1-uGuDR*6Y^Wgg(LT)Jp><5X|}bt z_qMa&QP?l_n+iVS>v%s2Li_;AIeC=Ca^v1jX4*gvB$?H?2%ndnqOaK5-J%7a} zIF{qYa&NfVY}(fmS0OmXA70{znljBOiv5Yod!vFU{D~*3B3Ka{P8?^ zfhlF6o7aNT$qi8(w<}OPw5fqA7HUje*r*Oa(YV%*l0|9FP9KW@U&{VSW{&b0?@y)M zs%4k1Ax;TGYuZ9l;vP5@?3oQsp3)rjBeBvQQ>^B;z5pc=(yHhHtq6|0m(h4envn_j787fizY@V`o(!SSyE7vlMT zbo=Z1c=atz*G!kwzGB;*uPL$Ei|EbZLh8o+1BUMOpnU(uX&OG1MV@|!&HOOeU#t^x zr9=w2ow!SsTuJWT7%Wmt14U_M*3XiWBWHxqCVZI0_g0`}*^&yEG9RK9fHK8e+S^m? zfCNn$JTswUVbiC#>|=wS{t>-MI1aYPLtzO5y|LJ9nm>L6*wpr_m!)A2Fb1RceX&*|5|MwrvOk4+!0p99B9AgP*9D{Yt|x=X}O% zgIG$MrTB=n-!q%ROT|SzH#A$Xm;|ym)0>1KR}Yl0hr-KO&qMrV+0Ej3d@?FcgZ+B3 ztEk16g#2)@x=(ko8k7^Tq$*5pfZHC@O@}`SmzT1(V@x&NkZNM2F#Q-Go7-uf_zKC( zB(lHZ=3@dHaCOf6C!6i8rDL%~XM@rVTJbZL09?ht@r^Z_6x}}atLjvH^4Vk#Ibf(^LiBJFqorm?A=lE zzFmwvp4bT@Nv2V>YQT92X;t9<2s|Ru5#w?wCvlhcHLcsq0TaFLKy(?nzezJ>CECqj zggrI~Hd4LudM(m{L@ezfnpELsRFVFw>fx;CqZtie`$BXRn#Ns%AdoE$-Pf~{9A8rV zf7FbgpKmVzmvn-z(g+&+-ID=v`;6=)itq8oM*+Uz**SMm_{%eP_c0{<%1JGiZS19o z@Gj7$Se~0lsu}w!%;L%~mIAO;AY-2i`9A*ZfFs=X!LTd6nWOZ7BZH2M{l2*I>Xu)0 z`<=;ObglnXcVk!T>e$H?El}ra0WmPZ$YAN0#$?|1v26^(quQre8;k20*dpd4N{i=b zuN=y}_ew9SlE~R{2+Rh^7%PA1H5X(p8%0TpJ=cqa$65XL)$#ign-y!qij3;2>j}I; ziO@O|aYfn&up5F`YtjGw68rD3{OSGNYmBnl?zdwY$=RFsegTZ=kkzRQ`r7ZjQP!H( zp4>)&zf<*N!tI00xzm-ME_a{_I!TbDCr;8E;kCH4LlL-tqLxDuBn-+xgPk37S&S2^ z2QZumkIimwz!c@!r0)j3*(jPIs*V!iLTRl0Cpt_UVNUgGZzdvs0(-yUghJfKr7;=h zD~y?OJ-bWJg;VdZ^r@vlDoeGV&8^--!t1AsIMZ5S440HCVr%uk- z2wV>!W1WCvFB~p$P$$_}|H5>uBeAe>`N1FI8AxM|pq%oNs;ED8x+tb44E) zTj{^fbh@eLi%5AqT?;d>Es5D*Fi{Bpk)q$^iF!!U`r2hHAO_?#!aYmf>G+jHsES4W zgpTKY59d?hsb~F0WE&dUp6lPt;Pm zcbTUqRryw^%{ViNW%Z(o8}dd00H(H-MmQmOiTq{}_rnwOr*Ybo7*}3W-qBT!#s0Ie z-s<1rvvJx_W;ViUD`04%1pra*Yw0BcGe)fDKUK8aF#BwBwMPU;9`!6E(~!043?SZx z13K%z@$$#2%2ovVlgFIPp7Q6(vO)ud)=*%ZSucL2Dh~K4B|%q4KnSpj#n@(0B})!9 z8p*hY@5)NDn^&Pmo;|!>erSYg`LkO?0FB@PLqRvc>4IsUM5O&>rRv|IBRxi(RX(gJ ztQ2;??L~&Mv;aVr5Q@(?y^DGo%pO^~zijld41aA0KKsy_6FeHIn?fNHP-z>$OoWer zjZ5hFQTy*-f7KENRiCE$ZOp4|+Wah|2=n@|W=o}bFM}Y@0e62+_|#fND5cwa3;P{^pEzlJbF1Yq^}>=wy8^^^$I2M_MH(4Dw{F6hm+vrWV5!q;oX z;tTNhz5`-V={ew|bD$?qcF^WPR{L(E%~XG8eJx(DoGzt2G{l8r!QPJ>kpHeOvCv#w zr=SSwMDaUX^*~v%6K%O~i)<^6`{go>a3IdfZ8hFmz&;Y@P%ZygShQZ2DSHd`m5AR= zx$wWU06;GYwXOf(%MFyj{8rPFXD};JCe85Bdp4$YJ2$TzZ7Gr#+SwCvBI1o$QP0(c zy`P51FEBV2HTisM3bHqpmECT@H!Y2-bv2*SoSPoO?wLe{M#zDTy@ujAZ!Izzky~3k zRA1RQIIoC*Mej1PH!sUgtkR0VCNMX(_!b65mo66iM*KQ7xT8t2eev$v#&YdUXKwGm z7okYAqYF&bveHeu6M5p9xheRCTiU8PFeb1_Rht0VVSbm%|1cOVobc8mvqcw!RjrMRM#~=7xibH&Fa5Imc|lZ{eC|R__)OrFg4@X_ ze+kk*_sDNG5^ELmHnZ7Ue?)#6!O)#Nv*Dl2mr#2)w{#i-;}0*_h4A%HidnmclH#;Q zmQbq+P4DS%3}PpPm7K_K3d2s#k~x+PlTul7+kIKol0@`YN1NG=+&PYTS->AdzPv!> zQvzT=)9se*Jr1Yq+C{wbK82gAX`NkbXFZ)4==j4t51{|-v!!$H8@WKA={d>CWRW+g z*`L>9rRucS`vbXu0rzA1#AQ(W?6)}1+oJSF=80Kf_2r~Qm-EJ6bbB3k`80rCv(0d` zvCf3;L2ovYG_TES%6vSuoKfIHC6w;V31!oqHM8-I8AFzcd^+_86!EcCOX|Ta9k1!s z_Vh(EGIIsI3fb&dF$9V8v(sTBC%!#<&KIGF;R+;MyC0~}$gC}}= zR`DbUVc&Bx`lYykFZ4{R{xRaUQkWCGCQlEc;!mf=+nOk$RUg*7 z;kP7CVLEc$CA7@6VFpsp3_t~m)W0aPxjsA3e5U%SfY{tp5BV5jH-5n?YX7*+U+Zs%LGR>U- z!x4Y_|4{gx?ZPJobISy991O znrmrC3otC;#4^&Rg_iK}XH(XX+eUHN0@Oe06hJk}F?`$)KmH^eWz@@N%wEc)%>?Ft z#9QAroDeyfztQ5Qe{m*#R#T%-h*&XvSEn@N$hYRTCMXS|EPwzF3IIysD2waj`vQD{ zv_#^Pgr?s~I*NE=acf@dWVRNWTr(GN0wrL)Z2=`Dr>}&ZDNX|+^Anl{Di%v1Id$_p zK5_H5`RDjJx`BW7hc85|> zHMMsWJ4KTMRHGu+vy*kBEMjz*^K8VtU=bXJYdhdZ-?jTXa$&n)C?QQIZ7ln$qbGlr zS*TYE+ppOrI@AoPP=VI-OXm}FzgXRL)OPvR$a_=SsC<3Jb+>5makX|U!}3lx4tX&L z^C<{9TggZNoeX!P1jX_K5HkEVnQ#s2&c#umzV6s2U-Q;({l+j^?hi7JnQ7&&*oOy9 z(|0asVTWUCiCnjcOnB2pN0DpuTglKq;&SFOQ3pUdye*eT<2()7WKbXp1qq9=bhMWlF-7BHT|i3TEIT77AcjD(v=I207wi-=vyiw5mxgPdTVUC z&h^FEUrXwWs9en2C{ywZp;nvS(Mb$8sBEh-*_d-OEm%~p1b2EpcwUdf<~zmJmaSTO zSX&&GGCEz-M^)G$fBvLC2q@wM$;n4jp+mt0MJFLuJ%c`tSp8$xuP|G81GEd2ci$|M z4XmH{5$j?rqDWoL4vs!}W&!?!rtj=6WKJcE>)?NVske(p;|#>vL|M_$as=mi-n-()a*OU3Okmk0wC<9y7t^D(er-&jEEak2!NnDiOQ99Wx8{S8}=Ng!e0tzj*#T)+%7;aM$ z&H}|o|J1p{IK0Q7JggAwipvHvko6>Epmh4RFRUr}$*2K4dz85o7|3#Bec9SQ4Y*;> zXWjT~f+d)dp_J`sV*!w>B%)#GI_;USp7?0810&3S=WntGZ)+tzhZ+!|=XlQ&@G@~3 z-dw@I1>9n1{+!x^Hz|xC+P#Ab`E@=vY?3%Bc!Po~e&&&)Qp85!I|U<-fCXy*wMa&t zgDk!l;gk;$taOCV$&60z+}_$ykz=Ea*)wJQ3-M|p*EK(cvtIre0Pta~(95J7zoxBN zS(yE^3?>88AL0Wfuou$BM{lR1hkrRibz=+I9ccwd`ZC*{NNqL)3pCcw^ygMmrG^Yp zn5f}Xf>%gncC=Yq96;rnfp4FQL#{!Y*->e82rHgY4Zwy{`JH}b9*qr^VA{%~Z}jtp z_t$PlS6}5{NtTqXHN?uI8ut8rOaD#F1C^ls73S=b_yI#iZDOGz3#^L@YheGd>L;<( z)U=iYj;`{>VDNzIxcjbTk-X3keXR8Xbc`A$o5# zKGSk-7YcoBYuAFFSCjGi;7b<;n-*`USs)IX z=0q6WZ=L!)PkYtZE-6)azhXV|+?IVGTOmMCHjhkBjfy@k1>?yFO3u!)@cl{fFAXnRYsWk)kpT?X{_$J=|?g@Q}+kFw|%n!;Zo}|HE@j=SFMvT8v`6Y zNO;tXN^036nOB2%=KzxB?n~NQ1K8IO*UE{;Xy;N^ZNI#P+hRZOaHATz9(=)w=QwV# z`z3+P>9b?l-@$@P3<;w@O1BdKh+H;jo#_%rr!ute{|YX4g5}n?O7Mq^01S5;+lABE+7`&_?mR_z7k|Ja#8h{!~j)| zbBX;*fsbUak_!kXU%HfJ2J+G7;inu#uRjMb|8a){=^))y236LDZ$$q3LRlat1D)%7K0!q5hT5V1j3qHc7MG9 z_)Q=yQ>rs>3%l=vu$#VVd$&IgO}Za#?aN!xY>-<3PhzS&q!N<=1Q7VJBfHjug^4|) z*fW^;%3}P7X#W3d;tUs3;`O&>;NKZBMR8au6>7?QriJ@gBaorz-+`pUWOP73DJL=M z(33uT6Gz@Sv40F6bN|H=lpcO z^AJl}&=TIjdevuDQ!w0K*6oZ2JBOhb31q!XDArFyKpz!I$p4|;c}@^bX{>AXdt7Bm zaLTk?c%h@%xq02reu~;t@$bv`b3i(P=g}~ywgSFpM;}b$zAD+=I!7`V~}ARB(Wx0C(EAq@?GuxOL9X+ffbkn3+Op0*80TqmpAq~EXmv%cq36celXmRz z%0(!oMp&2?`W)ALA&#|fu)MFp{V~~zIIixOxY^YtO5^FSox8v$#d0*{qk0Z)pNTt0QVZ^$`4vImEB>;Lo2!7K05TpY-sl#sWBz_W-aDIV`Ksabi zvpa#93Svo!70W*Ydh)Qzm{0?CU`y;T^ITg-J9nfWeZ-sbw)G@W?$Eomf%Bg2frfh5 zRm1{|E0+(4zXy){$}uC3%Y-mSA2-^I>Tw|gQx|7TDli_hB>``)Q^aZ`LJC2V3U$SABP}T)%}9g2pF9dT}aC~!rFFgkl1J$ z`^z{Arn3On-m%}r}TGF8KQe*OjSJ=T|caa_E;v89A{t@$yT^(G9=N9F?^kT*#s3qhJq!IH5|AhnqFd z0B&^gm3w;YbMNUKU>naBAO@fbz zqw=n!@--}o5;k6DvTW9pw)IJVz;X}ncbPVrmH>4x);8cx;q3UyiML1PWp%bxSiS|^ zC5!kc4qw%NSOGQ*Kcd#&$30=lDvs#*4W4q0u8E02U)7d=!W7+NouEyuF1dyH$D@G& zaFaxo9Ex|ZXA5y{eZT*i*dP~INSMAi@mvEX@q5i<&o&#sM}Df?Og8n8Ku4vOux=T% zeuw~z1hR}ZNwTn8KsQHKLwe2>p^K`YWUJEdVEl|mO21Bov!D0D$qPoOv=vJJ`)|%_ z>l%`eexY7t{BlVKP!`a^U@nM?#9OC*t76My_E_<16vCz1x_#82qj2PkWiMWgF8bM9 z(1t4VdHcJ;B~;Q%x01k_gQ0>u2*OjuEWNOGX#4}+N?Gb5;+NQMqp}Puqw2HnkYuKA zzKFWGHc&K>gwVgI1Sc9OT1s6fq=>$gZU!!xsilA$fF`kLdGoX*^t}ao@+^WBpk>`8 z4v_~gK|c2rCq#DZ+H)$3v~Hoi=)=1D==e3P zpKrRQ+>O^cyTuWJ%2}__0Z9SM_z9rptd*;-9uC1tDw4+A!=+K%8~M&+Zk#13hY$Y$ zo-8$*8dD5@}XDi19RjK6T^J~DIXbF5w&l?JLHMrf0 zLv0{7*G!==o|B%$V!a=EtVHdMwXLtmO~vl}P6;S(R2Q>*kTJK~!}gloxj)m|_LYK{ zl(f1cB=EON&wVFwK?MGn^nWuh@f95SHatPs(jcwSY#Dnl1@_gkOJ5=f`%s$ZHljRH0 z+c%lrb=Gi&N&1>^L_}#m>=U=(oT^vTA&3!xXNyqi$pdW1BDJ#^{h|2tZc{t^vag3& zAD7*8C`chNF|27itjBUo^CCDyEpJLX3&u+(L;YeeMwnXEoyN(ytoEabcl$lSgx~Ltatn}b$@j_yyMrBb03)shJE*$;Mw=;mZd&8e>IzE+4WIoH zCSZE7WthNUL$|Y#m!Hn?x7V1CK}V`KwW2D$-7&ODy5Cj;!_tTOOo1Mm%(RUt)#$@3 zhurA)t<7qik%%1Et+N1?R#hdBB#LdQ7{%-C zn$(`5e0eFh(#c*hvF>WT*07fk$N_631?W>kfjySN8^XC9diiOd#s?4tybICF;wBjp zIPzilX3{j%4u7blhq)tnaOBZ_`h_JqHXuI7SuIlNTgBk9{HIS&3|SEPfrvcE<@}E` zKk$y*nzsqZ{J{uWW9;#n=de&&h>m#A#q)#zRonr(?mDOYU&h&aQWD;?Z(22wY?t$U3qo`?{+amA$^TkxL+Ex2dh`q7iR&TPd0Ymwzo#b? zP$#t=elB5?k$#uE$K>C$YZbYUX_JgnXA`oF_Ifz4H7LEOW~{Gww&3s=wH4+j8*TU| zSX%LtJWqhr-xGNSe{;(16kxnak6RnZ{0qZ^kJI5X*It_YuynSpi(^-}Lolr{)#z_~ zw!(J-8%7Ybo^c3(mED`Xz8xecP35a6M8HarxRn%+NJBE;dw>>Y2T&;jzRd4FSDO3T zt*y+zXCtZQ0bP0yf6HRpD|WmzP;DR^-g^}{z~0x~z4j8m zucTe%k&S9Nt-?Jb^gYW1w6!Y3AUZ0Jcq;pJ)Exz%7k+mUOm6%ApjjSmflfKwBo6`B zhNb@$NHTJ>guaj9S{@DX)!6)b-Shav=DNKWy(V00k(D!v?PAR0f0vDNq*#mYmUp6> z76KxbFDw5U{{qx{BRj(>?|C`82ICKbfLxoldov-M?4Xl+3;I4GzLHyPOzYw7{WQST zPNYcx5onA%MAO9??41Po*1zW(Y%Zzn06-lUp{s<3!_9vv9HBjT02On0Hf$}NP;wF) zP<`2p3}A^~1YbvOh{ePMx$!JGUPX-tbBzp3mDZMY;}h;sQ->!p97GA)9a|tF(Gh{1$xk7 zUw?ELkT({Xw!KIr);kTRb1b|UL`r2_`a+&UFVCdJ)1T#fdh;71EQl9790Br0m_`$x z9|ZANuchFci8GNZ{XbP=+uXSJRe(;V5laQz$u18#?X*9}x7cIEbnr%<=1cX3EIu7$ zhHW6pe5M(&qEtsqRa>?)*{O;OJT+YUhG5{km|YI7I@JL_3Hwao9aXneiSA~a* z|Lp@c-oMNyeAEuUz{F?kuou3x#C*gU?lon!RC1s37gW^0Frc`lqQWH&(J4NoZg3m8 z;Lin#8Q+cFPD7MCzj}#|ws7b@?D9Q4dVjS4dpco=4yX5SSH=A@U@yqPdp@?g?qeia zH=Tt_9)G=6C2QIPsi-QipnK(mc0xXIN;j$WLf@n8eYvMk;*H-Q4tK%(3$CN}NGgO8n}fD~+>?<3UzvsrMf*J~%i;VKQHbF%TPalFi=#sgj)(P#SM^0Q=Tr>4kJVw8X3iWsP|e8tj}NjlMdWp z@2+M4HQu~3!=bZpjh;;DIDk&X}=c8~kn)FWWH z2KL1w^rA5&1@@^X%MjZ7;u(kH=YhH2pJPFQe=hn>tZd5RC5cfGYis8s9PKaxi*}-s6*W zRA^PwR=y^5Z){!(4D9-KC;0~;b*ploznFOaU`bJ_7U?qAi#mTo!&rIECRL$_y@yI27x2?W+zqDBD5~KCVYKFZLK+>ABC(Kj zeAll)KMgIlAG`r^rS{loBrGLtzhHY8$)<_S<(Dpkr(Ym@@vnQ&rS@FC*>2@XCH}M+an74WcRDcoQ+a3@A z9tYhl5$z7bMdTvD2r&jztBuo37?*k~wcU9GK2-)MTFS-lux-mIRYUuGUCI~V$?s#< z?1qAWb(?ZLm(N>%S%y10COdaq_Tm5c^%ooIxpR=`3e4C|@O5wY+eLik&XVi5oT7oe zmxH)Jd*5eo@!7t`x8!K=-+zJ-Sz)B_V$)s1pW~CDU$=q^&ABvf6S|?TOMB-RIm@CoFg>mjIQE)?+A1_3s6zmFU_oW&BqyMz1mY*IcP_2knjq5 zqw~JK(cVsmzc7*EvTT2rvpeqhg)W=%TOZ^>f`rD4|7Z5fq*2D^lpCttIg#ictgqZ$P@ru6P#f$x#KfnfTZj~LG6U_d-kE~`;kU_X)`H5so@?C zWmb!7x|xk@0L~0JFall*@ltyiL^)@3m4MqC7(7H0sH!WidId1#f#6R{Q&A!XzO1IAcIx;$k66dumt6lpUw@nL2MvqJ5^kbOVZ<^2jt5-njy|2@`07}0w z;M%I1$FCoLy`8xp8Tk)bFr;7aJeQ9KK6p=O$U0-&JYYy8woV*>b+FB?xLX`=pirYM z5K$BA(u)+jR{?O2r$c_Qvl?M{=Ar{yQ!UVsVn4k@0!b?_lA;dVz9uaQUgBH8Oz(Sb zrEs;&Ey>_ex8&!N{PmQjp+-Hlh|OA&wvDai#GpU=^-B70V0*LF=^bi+Nhe_o|azZ%~ZZ1$}LTmWt4aoB1 zPgccm$EwYU+jrdBaQFxQfn5gd(gM`Y*Ro1n&Zi?j=(>T3kmf94vdhf?AuS8>$Va#P zGL5F+VHpxdsCUa}+RqavXCobI-@B;WJbMphpK2%6t=XvKWWE|ruvREgM+|V=i6;;O zx$g=7^`$XWn0fu!gF=Xe9cMB8Z_SelD>&o&{1XFS`|nInK3BXlaeD*rc;R-#osyIS zWv&>~^TLIyBB6oDX+#>3<_0+2C4u2zK^wmHXXDD9_)kmLYJ!0SzM|%G9{pi)`X$uf zW}|%%#LgyK7m(4{V&?x_0KEDq56tk|0YNY~B(Sr|>WVz-pO3A##}$JCT}5P7DY+@W z#gJv>pA5>$|E3WO2tV7G^SuymB?tY`ooKcN3!vaQMnBNk-WATF{-$#}FyzgtJ8M^; zUK6KWSG)}6**+rZ&?o@PK3??uN{Q)#+bDP9i1W&j)oaU5d0bIWJ_9T5ac!qc?x66Q z$KUSZ`nYY94qfN_dpTFr8OW~A?}LD;Yty-BA)-be5Z3S#t2Io%q+cAbnGj1t$|qFR z9o?8B7OA^KjCYL=-!p}w(dkC^G6Nd%_I=1))PC0w5}ZZGJxfK)jP4Fwa@b-SYBw?% zdz9B-<`*B2dOn(N;mcTm%Do)rIvfXRNFX&1h`?>Rzuj~Wx)$p13nrDlS8-jwq@e@n zNIj_|8or==8~1h*Ih?w*8K7rYkGlwlTWAwLKc5}~dfz3y`kM&^Q|@C%1VAp_$wnw6zG~W4O+^ z>i?NY?oXf^Puc~+fDM$VgRNBpOZj{2cMP~gCqWAX4 z7>%$ux8@a&_B(pt``KSt;r+sR-$N;jdpY>|pyvPiN)9ohd*>mVST3wMo)){`B(&eX z1?zZJ-4u9NZ|~j1rdZYq4R$?swf}<6(#ex%7r{kh%U@kT)&kWuAszS%oJts=*OcL9 zaZwK<5DZw%1IFHXgFplP6JiL^dk8+SgM$D?8X+gE4172hXh!WeqIO>}$I9?Nry$*S zQ#f)RuH{P7RwA3v9f<-w>{PSzom;>(i&^l{E0(&Xp4A-*q-@{W1oE3K;1zb{&n28dSC2$N+6auXe0}e4b z)KLJ?5c*>@9K#I^)W;uU_Z`enquTUxr>mNq z1{0_puF-M7j${rs!dxxo3EelGodF1TvjV;Zpo;s{5f1pyCuRp=HDZ?s#IA4f?h|-p zGd|Mq^4hDa@Bh!c4ZE?O&x&XZ_ptZGYK4$9F4~{%R!}G1leCBx`dtNUS|K zL-7J5s4W@%mhXg1!}a4PD%!t&Qn%f_oquRajn3@C*)`o&K9o7V6DwzVMEhjVdDJ1fjhr#@=lp#@4EBqi=CCQ>73>R(>QKPNM&_Jpe5G`n4wegeC`FYEPJ{|vwS>$-`fuRSp3927qOv|NC3T3G-0 zA{K`|+tQy1yqE$ShWt8ny&5~)%ITb@^+x$w0)f&om;P8B)@}=Wzy59BwUfZ1vqw87 za2lB8J(&*l#(V}Id8SyQ0C(2amzkz3EqG&Ed0Jq1)$|&>4_|NIe=5|n=3?siFV0fI z{As5DLW^gs|B-b4C;Hd(SM-S~GQhzb>HgF2|2Usww0nL^;x@1eaB)=+Clj+$fF@H( z-fqP??~QMT$KI-#m;QC*&6vkp&8699G3)Bq0*kFZXINw=b9OVaed(3(3kS|IZ)CM? zJdnW&%t8MveBuK21uiYj)_a{Fnw0OErMzMN?d$QoPwkhOwcP&p+t>P)4tHlYw-pPN z^oJ=uc$Sl>pv@fZH~ZqxSvdhF@F1s=oZawpr^-#l{IIOGG=T%QXjtwPhIg-F@k@uIlr?J->Ia zpEUQ*=4g|XYn4Gez&aHr*;t$u3oODPmc2Ku)2Og|xjc%w;q!Zz+zY)*3{7V8bK4;& zYV82FZ+8?v)`J|G1w4I0fWdKg|2b#iaazCv;|?(W-q}$o&Y}Q5d@BRk^jL7#{kbCK zSgkyu;=DV+or2)AxCBgq-nj5=@n^`%T#V+xBGEkW4lCqrE)LMv#f;AvD__cQ@Eg3`~x| zW+h9mofSXCq5|M)9|ez(#X?-sxB%Go8};sJ?2abp(Y!lyi>k)|{M*Z$c{e1-K4ky` MPgg&ebxsLQ025IeI{*Lx diff --git a/mobile/web/index.html b/mobile/web/index.html deleted file mode 100644 index be80a12..0000000 --- a/mobile/web/index.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - match_live_tv - - - - - - - diff --git a/mobile/web/manifest.json b/mobile/web/manifest.json deleted file mode 100644 index 49cc9de..0000000 --- a/mobile/web/manifest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "match_live_tv", - "short_name": "match_live_tv", - "start_url": ".", - "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "A new Flutter project.", - "orientation": "portrait-primary", - "prefer_related_applications": false, - "icons": [ - { - "src": "icons/Icon-192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "icons/Icon-512.png", - "sizes": "512x512", - "type": "image/png" - }, - { - "src": "icons/Icon-maskable-192.png", - "sizes": "192x192", - "type": "image/png", - "purpose": "maskable" - }, - { - "src": "icons/Icon-maskable-512.png", - "sizes": "512x512", - "type": "image/png", - "purpose": "maskable" - } - ] -} diff --git a/mobile/windows/.gitignore b/mobile/windows/.gitignore deleted file mode 100644 index d492d0d..0000000 --- a/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/mobile/windows/CMakeLists.txt b/mobile/windows/CMakeLists.txt deleted file mode 100644 index b0419b6..0000000 --- a/mobile/windows/CMakeLists.txt +++ /dev/null @@ -1,108 +0,0 @@ -# Project-level configuration. -cmake_minimum_required(VERSION 3.14) -project(match_live_tv 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 "match_live_tv") - -# 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/mobile/windows/flutter/CMakeLists.txt b/mobile/windows/flutter/CMakeLists.txt deleted file mode 100644 index 903f489..0000000 --- a/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/mobile/windows/flutter/generated_plugin_registrant.cc b/mobile/windows/flutter/generated_plugin_registrant.cc deleted file mode 100644 index df8aa87..0000000 --- a/mobile/windows/flutter/generated_plugin_registrant.cc +++ /dev/null @@ -1,29 +0,0 @@ -// -// Generated file. Do not edit. -// - -// clang-format off - -#include "generated_plugin_registrant.h" - -#include -#include -#include -#include -#include -#include - -void RegisterPlugins(flutter::PluginRegistry* registry) { - AppLinksPluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("AppLinksPluginCApi")); - BatteryPlusWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("BatteryPlusWindowsPlugin")); - ConnectivityPlusWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin")); - PermissionHandlerWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); - SharePlusWindowsPluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi")); - UrlLauncherWindowsRegisterWithRegistrar( - registry->GetRegistrarForPlugin("UrlLauncherWindows")); -} diff --git a/mobile/windows/flutter/generated_plugin_registrant.h b/mobile/windows/flutter/generated_plugin_registrant.h deleted file mode 100644 index dc139d8..0000000 --- a/mobile/windows/flutter/generated_plugin_registrant.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// Generated file. Do not edit. -// - -// clang-format off - -#ifndef GENERATED_PLUGIN_REGISTRANT_ -#define GENERATED_PLUGIN_REGISTRANT_ - -#include - -// Registers Flutter plugins. -void RegisterPlugins(flutter::PluginRegistry* registry); - -#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/mobile/windows/flutter/generated_plugins.cmake b/mobile/windows/flutter/generated_plugins.cmake deleted file mode 100644 index 861f51c..0000000 --- a/mobile/windows/flutter/generated_plugins.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# -# Generated file, do not edit. -# - -list(APPEND FLUTTER_PLUGIN_LIST - app_links - battery_plus - connectivity_plus - permission_handler_windows - share_plus - url_launcher_windows -) - -list(APPEND FLUTTER_FFI_PLUGIN_LIST - jni -) - -set(PLUGIN_BUNDLED_LIBRARIES) - -foreach(plugin ${FLUTTER_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) - target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) - list(APPEND PLUGIN_BUNDLED_LIBRARIES $) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) -endforeach(plugin) - -foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) -endforeach(ffi_plugin) diff --git a/mobile/windows/runner/CMakeLists.txt b/mobile/windows/runner/CMakeLists.txt deleted file mode 100644 index 394917c..0000000 --- a/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/mobile/windows/runner/Runner.rc b/mobile/windows/runner/Runner.rc deleted file mode 100644 index 960b12c..0000000 --- a/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.matchlivetv" "\0" - VALUE "FileDescription", "match_live_tv" "\0" - VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "match_live_tv" "\0" - VALUE "LegalCopyright", "Copyright (C) 2026 com.matchlivetv. All rights reserved." "\0" - VALUE "OriginalFilename", "match_live_tv.exe" "\0" - VALUE "ProductName", "match_live_tv" "\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/mobile/windows/runner/flutter_window.cpp b/mobile/windows/runner/flutter_window.cpp deleted file mode 100644 index 955ee30..0000000 --- a/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/mobile/windows/runner/flutter_window.h b/mobile/windows/runner/flutter_window.h deleted file mode 100644 index 6da0652..0000000 --- a/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/mobile/windows/runner/main.cpp b/mobile/windows/runner/main.cpp deleted file mode 100644 index 6373396..0000000 --- a/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"match_live_tv", 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/mobile/windows/runner/resource.h b/mobile/windows/runner/resource.h deleted file mode 100644 index 66a65d1..0000000 --- a/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/mobile/windows/runner/resources/app_icon.ico b/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/mobile/windows/runner/runner.exe.manifest b/mobile/windows/runner/runner.exe.manifest deleted file mode 100644 index 153653e..0000000 --- a/mobile/windows/runner/runner.exe.manifest +++ /dev/null @@ -1,14 +0,0 @@ - - - - - PerMonitorV2 - - - - - - - - - diff --git a/mobile/windows/runner/utils.cpp b/mobile/windows/runner/utils.cpp deleted file mode 100644 index 3cb7146..0000000 --- a/mobile/windows/runner/utils.cpp +++ /dev/null @@ -1,69 +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(); - } - // First, find the length of the string with a safe upper bound (CWE-126). - // UNICODE_STRING_MAX_CHARS (32767) is the maximum length of a UNICODE_STRING. - int input_length = static_cast(wcsnlen(utf16_string, UNICODE_STRING_MAX_CHARS)); - // Now use that bounded length to determine the required buffer size. - // When an explicit length is passed, WideCharToMultiByte does not include - // the null terminator in its returned size. - int target_length = ::WideCharToMultiByte( - CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - input_length, nullptr, 0, nullptr, nullptr); - std::string utf8_string; - if (target_length == 0 || static_cast(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/mobile/windows/runner/utils.h b/mobile/windows/runner/utils.h deleted file mode 100644 index 3879d54..0000000 --- a/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/mobile/windows/runner/win32_window.cpp b/mobile/windows/runner/win32_window.cpp deleted file mode 100644 index 60608d0..0000000 --- a/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/mobile/windows/runner/win32_window.h b/mobile/windows/runner/win32_window.h deleted file mode 100644 index e901dde..0000000 --- a/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_ diff --git a/native/android/README.md b/native/android/README.md index 9ef3060..5a80dc0 100644 --- a/native/android/README.md +++ b/native/android/README.md @@ -1,6 +1,6 @@ # Match Live TV — app Android nativa -Implementazione **da zero** in Kotlin + Jetpack Compose. Non riusa codice dalla app Flutter (`mobile/`). +Implementazione **da zero** in Kotlin + Jetpack Compose. ## Stack @@ -39,4 +39,4 @@ API default: `https://www.matchlivetv.it` (override con `-PAPI_BASE_URL=...`). ## iOS (prossimo passo su Mac) -Il backend REST/WebSocket è condiviso. Su Mac creeremo `native/ios/` con SwiftUI e AVFoundation/RTMP equivalente, riusando gli stessi contratti API documentati in `mobile/lib/shared/api_client.dart` come riferimento funzionale (non codice). +Il backend REST/WebSocket è condiviso. Su Mac creeremo `native/ios/` con SwiftUI e AVFoundation/RTMP equivalente, riusando gli stessi contratti API del backend. diff --git a/native/android/app/build.gradle.kts b/native/android/app/build.gradle.kts index 80e51c3..0f3f341 100644 --- a/native/android/app/build.gradle.kts +++ b/native/android/app/build.gradle.kts @@ -18,6 +18,7 @@ android { val apiBaseUrl = project.findProperty("API_BASE_URL") as String? ?: "https://www.matchlivetv.it" buildConfigField("String", "API_BASE_URL", "\"$apiBaseUrl\"") + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -72,4 +73,10 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0") implementation("com.github.pedroSG94.RootEncoder:library:2.5.5") + + androidTestImplementation("androidx.test.ext:junit:1.2.1") + androidTestImplementation("androidx.test:runner:1.6.2") + androidTestImplementation("androidx.test:rules:1.6.1") + androidTestImplementation("androidx.test:core:1.6.1") + androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0") } diff --git a/native/android/app/proguard-rules.pro b/native/android/app/proguard-rules.pro index 5ca49b7..fb2d2e0 100644 --- a/native/android/app/proguard-rules.pro +++ b/native/android/app/proguard-rules.pro @@ -2,3 +2,37 @@ -keep class com.pedro.** { *; } -dontwarn com.pedro.** -dontwarn org.slf4j.** + +# --- Retrofit + OkHttp + Moshi (release minify) --- +-keepattributes Signature, InnerClasses, EnclosingMethod, Exceptions, *Annotation* + +-keepclassmembers,allowshrinking,allowobfuscation interface * { + @retrofit2.http.* ; +} + +-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation +-keep,allowobfuscation,allowshrinking class retrofit2.Response + +-keep interface com.matchlivetv.match_live_tv.data.api.MatchLiveApi { *; } + +-keep class com.matchlivetv.match_live_tv.data.api.** { *; } +-keepclassmembers class com.matchlivetv.match_live_tv.data.api.** { + (...); +} + +-keep class kotlin.Metadata { *; } + +-keep class com.squareup.moshi.** { *; } +-keep @com.squareup.moshi.JsonQualifier interface * +-keepclassmembers class * { + @com.squareup.moshi.FromJson ; + @com.squareup.moshi.ToJson ; + @com.squareup.moshi.Json ; +} + +-dontwarn javax.annotation.** +-dontwarn kotlin.Unit +-dontwarn retrofit2.KotlinExtensions +-dontwarn retrofit2.KotlinExtensions$* +-dontwarn okhttp3.internal.platform.ConscryptPlatform +-dontwarn org.conscrypt.ConscryptHostnameVerifier diff --git a/native/android/app/src/androidTest/kotlin/com/matchlivetv/match_live_tv/E2EWizardFlowTest.kt b/native/android/app/src/androidTest/kotlin/com/matchlivetv/match_live_tv/E2EWizardFlowTest.kt new file mode 100644 index 0000000..fafb977 --- /dev/null +++ b/native/android/app/src/androidTest/kotlin/com/matchlivetv/match_live_tv/E2EWizardFlowTest.kt @@ -0,0 +1,163 @@ +package com.matchlivetv.match_live_tv + +import android.content.Intent +import android.view.KeyEvent +import android.os.SystemClock +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.uiautomator.By +import androidx.test.uiautomator.UiDevice +import androidx.test.uiautomator.UiObject2 +import androidx.test.uiautomator.Until +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith + +/** + * E2E sul simulatore: login → nuova partita → wizard 3 step → schermata diretta. + */ +@RunWith(AndroidJUnit4::class) +class E2EWizardFlowTest { + private lateinit var device: UiDevice + private val pkg = "com.matchlivetv.match_live_tv" + + @Before + fun setUp() { + device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) + grantRuntimePermissions() + launchApp() + } + + @Test + fun login_newMatch_wizard_reachesBroadcastScreen() { + waitForAnyText("Email", "ACCEDI", timeoutMs = 45_000) + fillLogin() + waitForText("NUOVA PARTITA", timeoutMs = 45_000) + tapClickableText("NUOVA PARTITA") + waitForText("Avvia subito", timeoutMs = 15_000) + tapClickableText("Avvia subito") + waitForText("01 · Partita", timeoutMs = 45_000) + scrollDown() + tapClickableText("AVANTI >") + waitForText("02 · Trasmissione", timeoutMs = 45_000) + waitForText("Piattaforma", timeoutMs = 30_000) + scrollDown() + tapClickableText("AVANTI >") + waitForText("03 · Test rete", timeoutMs = 45_000) + waitForText("AVVIA TEST RETE", timeoutMs = 30_000) + tapClickableText("AVVIA TEST RETE") + waitForText("INIZIA >", timeoutMs = 30_000) + waitUntilEnabled("INIZIA >", timeoutMs = 25_000) + scrollDown() + tapClickableText("INIZIA >") + val diretta = waitForText("Diretta", timeoutMs = 60_000) + assertNotNull(diretta) + assertNotNull(waitForText("TERMINA DIRETTA", timeoutMs = 30_000)) + assertNotNull(waitForText("CHIUDI SET", timeoutMs = 20_000)) + } + + private fun grantRuntimePermissions() { + listOf( + "android.permission.CAMERA", + "android.permission.RECORD_AUDIO", + "android.permission.POST_NOTIFICATIONS", + ).forEach { permission -> + device.executeShellCommand("pm grant $pkg $permission") + } + } + + private fun launchApp() { + val context = InstrumentationRegistry.getInstrumentation().targetContext + val intent = context.packageManager.getLaunchIntentForPackage(pkg)?.apply { + addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) + } ?: error("Launch intent mancante per $pkg") + context.startActivity(intent) + device.wait(Until.hasObject(By.pkg(pkg).depth(0)), 15_000) + } + + private fun fillLogin() { + val fields = device.wait(Until.findObjects(By.clazz("android.widget.EditText")), 15_000) + if (fields.size < 2) error("Campi login non trovati (${fields.size})") + pasteIntoField(fields[0], "coach@matchlivetv.test") + pasteIntoField(fields[1], "password123") + device.pressKeyCode(KeyEvent.KEYCODE_ENTER) + device.waitForIdle() + } + + private fun pasteIntoField(field: UiObject2, value: String) { + field.click() + device.waitForIdle() + field.clear() + field.text = value + device.waitForIdle() + } + + private fun waitForText(text: String, timeoutMs: Long): UiObject2 { + val obj = device.wait(Until.findObject(By.text(text)), timeoutMs) + assertNotNull("Testo non trovato entro ${timeoutMs}ms: $text", obj) + return obj!! + } + + private fun waitForAnyText(vararg texts: String, timeoutMs: Long) { + val deadline = SystemClock.elapsedRealtime() + timeoutMs + while (SystemClock.elapsedRealtime() < deadline) { + for (text in texts) { + if (device.hasObject(By.text(text))) return + } + SystemClock.sleep(250) + } + error("Nessuno dei testi trovato: ${texts.joinToString()}") + } + + private fun tapClickableText(text: String) { + device.findObject(By.text(text).clickable(true))?.let { node -> + node.click() + device.waitForIdle() + return + } + val label = device.wait(Until.findObject(By.text(text)), 15_000) + ?: error("Testo non trovato: $text") + var node: UiObject2? = label + for (i in 0 until 6) { + val current = node ?: break + if (current.isClickable) { + current.click() + device.waitForIdle() + return + } + node = current.parent + } + label.click() + device.waitForIdle() + } + + private fun waitUntilEnabled(text: String, timeoutMs: Long) { + val deadline = SystemClock.elapsedRealtime() + timeoutMs + while (SystemClock.elapsedRealtime() < deadline) { + val label = device.findObject(By.text(text)) + if (label != null) { + var node: UiObject2? = label + for (i in 0 until 6) { + val current = node ?: break + if (current.isClickable && current.isEnabled) return + node = current.parent + } + } + SystemClock.sleep(500) + } + error("Pulsante non abilitato entro timeout: $text") + } + + private fun scrollDown(steps: Int = 2) { + val centerX = device.displayWidth / 2 + val startY = (device.displayHeight * 0.75).toInt() + val endY = (device.displayHeight * 0.25).toInt() + repeat(steps) { + device.swipe(centerX, startY, centerX, endY, 24) + device.waitForIdle() + SystemClock.sleep(300) + } + } +} diff --git a/native/android/app/src/androidTest/kotlin/com/matchlivetv/match_live_tv/ReleaseApiSmokeTest.kt b/native/android/app/src/androidTest/kotlin/com/matchlivetv/match_live_tv/ReleaseApiSmokeTest.kt new file mode 100644 index 0000000..8095c55 --- /dev/null +++ b/native/android/app/src/androidTest/kotlin/com/matchlivetv/match_live_tv/ReleaseApiSmokeTest.kt @@ -0,0 +1,43 @@ +package com.matchlivetv.match_live_tv + +import android.content.Context +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.matchlivetv.match_live_tv.data.AppContainer +import kotlinx.coroutines.runBlocking +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class ReleaseApiSmokeTest { + private lateinit var container: AppContainer + + @Before + fun setUp() { + val context = ApplicationProvider.getApplicationContext() + container = AppContainer(context) + } + + @Test + fun login_parsesResponse() = runBlocking { + val session = container.authRepository.login( + email = "coach@matchlivetv.test", + password = "password123", + ) + assertEquals("coach@matchlivetv.test", session.user.email) + assertTrue(session.accessToken.isNotBlank()) + } + + @Test + fun fetchMatches_afterLogin() = runBlocking { + container.authRepository.login( + email = "coach@matchlivetv.test", + password = "password123", + ) + val matches = container.matchRepository.fetchMatches() + assertTrue(matches.isNotEmpty()) + } +} diff --git a/native/android/app/src/main/AndroidManifest.xml b/native/android/app/src/main/AndroidManifest.xml index bedeaaf..4545d0b 100644 --- a/native/android/app/src/main/AndroidManifest.xml +++ b/native/android/app/src/main/AndroidManifest.xml @@ -4,6 +4,7 @@ + @@ -16,7 +17,7 @@ "WiFi" + caps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> "4G" + caps.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> "Ethernet" + else -> "Sconosciuto" + } + }.getOrDefault("Sconosciuto") +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/AppContainer.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/AppContainer.kt index 99744ce..351fb14 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/AppContainer.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/AppContainer.kt @@ -4,13 +4,19 @@ import android.content.Context import com.matchlivetv.match_live_tv.core.AppConfig import com.matchlivetv.match_live_tv.core.TokenStore import com.matchlivetv.match_live_tv.data.api.MatchLiveApi +import com.matchlivetv.match_live_tv.data.cable.SessionCableService import com.matchlivetv.match_live_tv.data.repository.AuthRepository import com.matchlivetv.match_live_tv.data.repository.MatchRepository +import com.matchlivetv.match_live_tv.data.repository.ScoreRepository import com.matchlivetv.match_live_tv.data.repository.SessionRepository +import com.matchlivetv.match_live_tv.data.scoring.ScoreController import com.matchlivetv.match_live_tv.BuildConfig import com.matchlivetv.match_live_tv.streaming.LiveBroadcastCoordinator import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.Dispatchers import okhttp3.Interceptor import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor @@ -69,6 +75,16 @@ class AppContainer(context: Context) { val sessionRepository = SessionRepository(api) + val scoreRepository = ScoreRepository(api) + + val sessionCable = SessionCableService(moshi) + + private val appScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) + + val scoreController = ScoreController(scoreRepository, sessionCable, appScope) + + val wizardSession = WizardSessionHolder() + val broadcastCoordinator = LiveBroadcastCoordinator(appContext) suspend fun bootstrapAuth() { diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/WizardSessionHolder.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/WizardSessionHolder.kt new file mode 100644 index 0000000..ed55991 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/WizardSessionHolder.kt @@ -0,0 +1,20 @@ +package com.matchlivetv.match_live_tv.data + +import com.matchlivetv.match_live_tv.domain.Match +import com.matchlivetv.match_live_tv.domain.StreamSession + +/** Stato condiviso del wizard setup (equivalente a sessionProvider Flutter). */ +class WizardSessionHolder { + var match: Match? = null + var session: StreamSession? = null + + fun setSession(value: StreamSession, matchValue: Match? = null) { + session = value + matchValue?.let { match = it } + } + + fun clear() { + match = null + session = null + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/api/ApiDtos.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/api/ApiDtos.kt index 6f7ec01..371262a 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/api/ApiDtos.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/api/ApiDtos.kt @@ -2,6 +2,7 @@ package com.matchlivetv.match_live_tv.data.api import com.matchlivetv.match_live_tv.domain.AuthTokens import com.matchlivetv.match_live_tv.domain.Match +import com.matchlivetv.match_live_tv.domain.Recording import com.matchlivetv.match_live_tv.domain.StreamSession import com.matchlivetv.match_live_tv.domain.Team import com.matchlivetv.match_live_tv.domain.User @@ -34,7 +35,15 @@ data class TeamDto( val name: String, val sport: String? = null, @Json(name = "can_stream") val canStream: Boolean? = true, + @Json(name = "club_name") val clubName: String? = null, @Json(name = "youtube_enabled") val youtubeEnabled: Boolean? = false, + @Json(name = "youtube_connected") val youtubeConnected: Boolean? = false, + @Json(name = "youtube_selectable") val youtubeSelectable: Boolean? = false, + @Json(name = "youtube_channel_title") val youtubeChannelTitle: String? = null, + @Json(name = "youtube_team_channel_title") val youtubeTeamChannelTitle: String? = null, + @Json(name = "plan_name") val planName: String? = null, + @Json(name = "recordings_enabled") val recordingsEnabled: Boolean? = false, + @Json(name = "phone_download_enabled") val phoneDownloadEnabled: Boolean? = false, @Json(name = "billing_url") val billingUrl: String? = null, @Json(name = "staff_manage_url") val staffManageUrl: String? = null, ) { @@ -43,7 +52,15 @@ data class TeamDto( name = name, sport = sport ?: "volleyball", canStream = canStream ?: true, + clubName = clubName, youtubeEnabled = youtubeEnabled ?: false, + youtubeConnected = youtubeConnected ?: false, + youtubeSelectable = youtubeSelectable ?: false, + youtubeChannelTitle = youtubeChannelTitle, + youtubeTeamChannelTitle = youtubeTeamChannelTitle, + planName = planName, + recordingsEnabled = recordingsEnabled ?: false, + phoneDownloadEnabled = phoneDownloadEnabled ?: false, billingUrl = billingUrl, staffManageUrl = staffManageUrl, ) @@ -56,6 +73,10 @@ data class MatchDto( @Json(name = "opponent_name") val opponentName: String, val location: String? = null, @Json(name = "scheduled_at") val scheduledAt: String? = null, + @Json(name = "sets_to_win") val setsToWin: Int? = null, + val category: String? = null, + val phase: String? = null, + @Json(name = "roster_numbers") val rosterNumbers: List? = null, @Json(name = "active_session_id") val activeSessionId: String? = null, @Json(name = "active_session_status") val activeSessionStatus: String? = null, ) { @@ -66,6 +87,10 @@ data class MatchDto( opponentName = opponentName, location = location, scheduledAt = scheduledAt, + setsToWin = setsToWin ?: 3, + category = category, + phase = phase, + rosterNumbers = rosterNumbers.orEmpty(), activeSessionId = activeSessionId, activeSessionStatus = activeSessionStatus, ) @@ -80,9 +105,13 @@ data class StreamSessionDto( @Json(name = "hls_playback_url") val hlsPlaybackUrl: String? = null, @Json(name = "watch_page_url") val watchPageUrl: String? = null, @Json(name = "share_url") val shareUrl: String? = null, + @Json(name = "youtube_watch_url") val youtubeWatchUrl: String? = null, + @Json(name = "youtube_ready") val youtubeReady: Boolean? = null, + @Json(name = "privacy_status") val privacyStatus: String? = null, @Json(name = "target_bitrate") val targetBitrate: Int? = null, @Json(name = "target_fps") val targetFps: Int? = null, @Json(name = "started_at") val startedAt: String? = null, + val score: ScoreStateDto? = null, ) { fun toDomain() = StreamSession( id = id, @@ -93,21 +122,150 @@ data class StreamSessionDto( hlsPlaybackUrl = hlsPlaybackUrl, watchPageUrl = watchPageUrl, shareUrl = shareUrl, + youtubeWatchUrl = youtubeWatchUrl, + youtubeReady = youtubeReady ?: false, + privacyStatus = privacyStatus ?: "public", targetBitrate = targetBitrate ?: 2_500_000, targetFps = targetFps ?: 30, startedAt = startedAt, + score = score?.toDomain(), ) } +data class SetPartialDto( + val set: Int? = null, + val home: Int? = null, + val away: Int? = null, +) + +data class ScoreStateDto( + @Json(name = "home_sets") val homeSets: Int? = null, + @Json(name = "away_sets") val awaySets: Int? = null, + @Json(name = "home_points") val homePoints: Int? = null, + @Json(name = "away_points") val awayPoints: Int? = null, + @Json(name = "current_set") val currentSet: Int? = null, + @Json(name = "set_partials") val setPartials: List? = null, + @Json(name = "timeout_home") val timeoutHome: Boolean? = null, + @Json(name = "timeout_away") val timeoutAway: Boolean? = null, +) { + fun toDomain() = com.matchlivetv.match_live_tv.domain.ScoreState( + homeSets = homeSets ?: 0, + awaySets = awaySets ?: 0, + homePoints = homePoints ?: 0, + awayPoints = awayPoints ?: 0, + currentSet = currentSet ?: 1, + setPartials = setPartials.orEmpty().map { + com.matchlivetv.match_live_tv.domain.SetPartial(it.set ?: 1, it.home ?: 0, it.away ?: 0) + }, + timeoutHome = timeoutHome ?: false, + timeoutAway = timeoutAway ?: false, + ) +} + +data class ScoreSyncRequest( + @Json(name = "home_sets") val homeSets: Int, + @Json(name = "away_sets") val awaySets: Int, + @Json(name = "home_points") val homePoints: Int, + @Json(name = "away_points") val awayPoints: Int, + @Json(name = "current_set") val currentSet: Int, + @Json(name = "set_partials") val setPartials: List, +) + data class CreateSessionRequest( val platform: String = "matchlivetv", @Json(name = "privacy_status") val privacyStatus: String = "public", @Json(name = "quality_preset") val qualityPreset: String = "720p_30_2.5mbps", @Json(name = "target_bitrate") val targetBitrate: Int = 2_500_000, @Json(name = "target_fps") val targetFps: Int = 30, + @Json(name = "youtube_channel") val youtubeChannel: String? = null, ) -data class CreateMatchRequest(val match: Map) +data class UpdateMatchBody( + @Json(name = "opponent_name") val opponentName: String? = null, + val location: String? = null, + @Json(name = "scheduled_at") val scheduledAt: String? = null, + @Json(name = "sets_to_win") val setsToWin: Int? = null, + val category: String? = null, + val phase: String? = null, + @Json(name = "roster_numbers") val rosterNumbers: List? = null, +) + +data class UpdateMatchRequest(val match: UpdateMatchBody) + +data class ScoringRulesBody( + @Json(name = "points_per_set") val pointsPerSet: Int, + @Json(name = "points_deciding_set") val pointsDecidingSet: Int, + @Json(name = "min_point_lead") val minPointLead: Int, +) + +data class UpdateMatchBodyFull( + @Json(name = "opponent_name") val opponentName: String, + val location: String? = null, + @Json(name = "scheduled_at") val scheduledAt: String? = null, + @Json(name = "sets_to_win") val setsToWin: Int, + val category: String? = null, + val phase: String? = null, + @Json(name = "roster_numbers") val rosterNumbers: List? = null, + @Json(name = "scoring_rules") val scoringRules: ScoringRulesBody? = null, +) + +data class UpdateMatchRequestFull(val match: UpdateMatchBodyFull) + +data class NetworkTestResponse( + val ready: Boolean, + @Json(name = "target_upload_mbps") val targetUploadMbps: Double? = null, +) + +data class RecordingDto( + val id: String, + val title: String? = null, + @Json(name = "opponent_name") val opponentName: String? = null, + @Json(name = "team_name") val teamName: String? = null, + val status: String? = null, + @Json(name = "status_label") val statusLabel: String? = null, + @Json(name = "recorded_at") val recordedAt: String? = null, + @Json(name = "ended_at") val endedAt: String? = null, + @Json(name = "duration_label") val durationLabel: String? = null, + @Json(name = "views_label") val viewsLabel: String? = null, + @Json(name = "replay_url") val replayUrl: String? = null, + @Json(name = "thumbnail_url") val thumbnailUrl: String? = null, + @Json(name = "download_enabled") val downloadEnabled: Boolean? = null, + @Json(name = "youtube_watch_url") val youtubeWatchUrl: String? = null, + @Json(name = "expires_at") val expiresAt: String? = null, + @Json(name = "title_or_default") val titleOrDefault: String? = null, +) { + fun toDomain() = Recording( + id = id, + title = title ?: titleOrDefault ?: "Replay", + opponentName = opponentName.orEmpty(), + teamName = teamName.orEmpty(), + status = status ?: "processing", + statusLabel = statusLabel ?: status.orEmpty(), + recordedAt = recordedAt, + endedAt = endedAt, + durationLabel = durationLabel, + viewsLabel = viewsLabel, + replayUrl = replayUrl, + thumbnailUrl = thumbnailUrl, + downloadEnabled = downloadEnabled ?: false, + youtubeWatchUrl = youtubeWatchUrl, + expiresAt = expiresAt, + ) +} + +data class RegiaLinkResponse( + @Json(name = "regia_url") val regiaUrl: String, +) + +data class CreateMatchBody( + @Json(name = "opponent_name") val opponentName: String, + val sport: String = "volleyball", + @Json(name = "sets_to_win") val setsToWin: Int = 3, + @Json(name = "scheduled_at") val scheduledAt: String? = null, + val location: String? = null, +) + +data class CreateMatchRequest(val match: CreateMatchBody) data class NetworkTestRequest( @Json(name = "download_mbps") val downloadMbps: Double, @@ -115,3 +273,13 @@ data class NetworkTestRequest( @Json(name = "latency_ms") val latencyMs: Int, @Json(name = "network_type") val networkType: String, ) + +data class TelemetryRequest( + @Json(name = "device_role") val deviceRole: String, + @Json(name = "battery_level") val batteryLevel: Int? = null, + @Json(name = "network_type") val networkType: String? = null, + @Json(name = "signal_strength") val signalStrength: Int? = null, + @Json(name = "current_bitrate") val currentBitrate: Int? = null, + @Json(name = "target_bitrate") val targetBitrate: Int? = null, + val fps: Int? = null, +) diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/api/MatchLiveApi.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/api/MatchLiveApi.kt index 44a6849..fe2479d 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/api/MatchLiveApi.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/api/MatchLiveApi.kt @@ -1,6 +1,7 @@ package com.matchlivetv.match_live_tv.data.api import retrofit2.http.Body +import retrofit2.http.DELETE import retrofit2.http.GET import retrofit2.http.PATCH import retrofit2.http.POST @@ -22,12 +23,30 @@ interface MatchLiveApi { @GET("teams") suspend fun teams(): List + @GET("teams/{teamId}/recordings") + suspend fun recordings(@Path("teamId") teamId: String): List + @GET("teams/{teamId}/matches") suspend fun matches(@Path("teamId") teamId: String): List + @POST("teams/{teamId}/matches") + suspend fun createMatch( + @Path("teamId") teamId: String, + @Body body: CreateMatchRequest, + ): MatchDto + @GET("matches/{matchId}") suspend fun match(@Path("matchId") matchId: String): MatchDto + @PATCH("matches/{matchId}") + suspend fun updateMatch( + @Path("matchId") matchId: String, + @Body body: UpdateMatchRequestFull, + ): MatchDto + + @DELETE("matches/{matchId}") + suspend fun deleteMatch(@Path("matchId") matchId: String) + @POST("matches/{matchId}/sessions") suspend fun createSession( @Path("matchId") matchId: String, @@ -53,5 +72,23 @@ interface MatchLiveApi { suspend fun networkTest( @Path("sessionId") sessionId: String, @Body body: NetworkTestRequest, + ): NetworkTestResponse + + @POST("sessions/{sessionId}/regia_link") + suspend fun regiaLink(@Path("sessionId") sessionId: String): RegiaLinkResponse + + @PATCH("sessions/{sessionId}/score") + suspend fun syncScore( + @Path("sessionId") sessionId: String, + @Body body: ScoreSyncRequest, + ): StreamSessionDto + + @POST("sessions/{sessionId}/telemetry") + suspend fun postTelemetry( + @Path("sessionId") sessionId: String, + @Body body: TelemetryRequest, ) + + @GET("recordings/{recordingId}/download") + suspend fun recordingDownload(@Path("recordingId") recordingId: String): Map } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/cable/ActionCableClient.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/cable/ActionCableClient.kt new file mode 100644 index 0000000..5ffc9c2 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/cable/ActionCableClient.kt @@ -0,0 +1,141 @@ +package com.matchlivetv.match_live_tv.data.cable + +import android.util.Log +import com.squareup.moshi.JsonAdapter +import com.squareup.moshi.Moshi +import com.squareup.moshi.Types +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.Response +import okhttp3.WebSocket +import okhttp3.WebSocketListener +import org.json.JSONObject +import java.util.concurrent.TimeUnit + +class ActionCableClient( + private val cableUrl: String, + private val accessToken: String, + moshi: Moshi, +) { + interface Listener { + fun onConnected() {} + fun onDisconnected() {} + fun onChannelMessage(payload: Map) {} + } + + private val envelopeAdapter: JsonAdapter> = + moshi.adapter(Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java)) + + private val client = OkHttpClient.Builder() + .readTimeout(0, TimeUnit.MILLISECONDS) + .build() + + private var webSocket: WebSocket? = null + private var channelIdentifier: String? = null + private var listener: Listener? = null + + fun connect( + channel: String, + params: Map, + listener: Listener, + ) { + disconnect() + this.listener = listener + channelIdentifier = JSONObject().apply { + put("channel", channel) + params.forEach { (key, value) -> put(key, value) } + }.toString() + + val request = Request.Builder() + .url(cableUrl) + .header("Authorization", "Bearer $accessToken") + .build() + + webSocket = client.newWebSocket( + request, + object : WebSocketListener() { + override fun onOpen(webSocket: WebSocket, response: Response) { + sendSubscribe() + } + + override fun onMessage(webSocket: WebSocket, text: String) { + handleIncoming(text) + } + + override fun onClosed(webSocket: WebSocket, code: Int, reason: String) { + listener.onDisconnected() + } + + override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) { + Log.w(TAG, "ActionCable failure", t) + listener.onDisconnected() + } + }, + ) + } + + fun performReceive(payload: Map) { + val identifier = channelIdentifier ?: return + val dataJson = JSONObject(payload).apply { + put("action", "receive") + }.toString() + send( + mapOf( + "command" to "message", + "identifier" to identifier, + "data" to dataJson, + ), + ) + } + + fun disconnect() { + webSocket?.close(1000, "bye") + webSocket = null + channelIdentifier = null + listener = null + } + + private fun sendSubscribe() { + val identifier = channelIdentifier ?: return + send(mapOf("command" to "subscribe", "identifier" to identifier)) + } + + private fun send(payload: Map) { + val json = envelopeAdapter.toJson(payload) + webSocket?.send(json) + } + + private fun handleIncoming(raw: String) { + val json = runCatching { JSONObject(raw) }.getOrNull() ?: return + when (json.optString("type")) { + "ping" -> { + val message = json.opt("message") + webSocket?.send("""{"type":"pong","message":$message}""") + } + "confirm_subscription" -> listener?.onConnected() + "welcome" -> Unit + else -> { + if (json.has("message")) { + @Suppress("UNCHECKED_CAST") + val message = json.opt("message") + when (message) { + is JSONObject -> listener?.onChannelMessage(messageToMap(message)) + is Map<*, *> -> listener?.onChannelMessage(message as Map) + } + } + } + } + } + + private fun messageToMap(json: JSONObject): Map { + val map = mutableMapOf() + json.keys().forEach { key -> + map[key] = json.get(key) + } + return map + } + + companion object { + private const val TAG = "ActionCableClient" + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/cable/SessionCableService.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/cable/SessionCableService.kt new file mode 100644 index 0000000..ab10c52 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/cable/SessionCableService.kt @@ -0,0 +1,86 @@ +package com.matchlivetv.match_live_tv.data.cable + +import com.matchlivetv.match_live_tv.core.AppConfig +import com.matchlivetv.match_live_tv.domain.ScoreState +import com.squareup.moshi.Moshi +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow + +class SessionCableService(private val moshi: Moshi) { + private var client: ActionCableClient? = null + + private val _connected = MutableStateFlow(false) + val connected: StateFlow = _connected.asStateFlow() + + var onScoreUpdate: ((ScoreState) -> Unit)? = null + var onPauseStream: (() -> Unit)? = null + var onResumeStream: (() -> Unit)? = null + + fun connect(sessionId: String, accessToken: String, deviceRole: String = "camera") { + disconnect() + client = ActionCableClient(AppConfig.cableUrl, accessToken, moshi).also { cable -> + cable.connect( + channel = "SessionChannel", + params = mapOf( + "session_id" to sessionId, + "device_role" to deviceRole, + ), + listener = object : ActionCableClient.Listener { + override fun onConnected() { + _connected.value = true + } + + override fun onDisconnected() { + _connected.value = false + } + + override fun onChannelMessage(payload: Map) { + dispatch(payload) + } + }, + ) + } + } + + fun sendScoreUpdate(score: ScoreState) { + client?.performReceive(score.cablePayload()) + } + + fun disconnect() { + client?.disconnect() + client = null + _connected.value = false + } + + private fun dispatch(data: Map) { + when (data["type"] as? String) { + "score_update" -> onScoreUpdate?.invoke(parseScore(data)) + "stream_event" -> when (data["event"] as? String) { + "paused" -> onPauseStream?.invoke() + "resumed" -> onResumeStream?.invoke() + } + } + } + + private fun parseScore(data: Map): ScoreState { + @Suppress("UNCHECKED_CAST") + val partialsRaw = data["set_partials"] as? List> ?: emptyList() + return ScoreState( + homeSets = (data["home_sets"] as? Number)?.toInt() ?: 0, + awaySets = (data["away_sets"] as? Number)?.toInt() ?: 0, + homePoints = (data["home_points"] as? Number)?.toInt() ?: 0, + awayPoints = (data["away_points"] as? Number)?.toInt() ?: 0, + currentSet = (data["current_set"] as? Number)?.toInt() ?: 1, + setPartials = partialsRaw.map { + com.matchlivetv.match_live_tv.domain.SetPartial( + set = (it["set"] as? Number)?.toInt() ?: 1, + home = (it["home"] as? Number)?.toInt() ?: 0, + away = (it["away"] as? Number)?.toInt() ?: 0, + ) + }, + timeoutHome = data["timeout_home"] as? Boolean ?: false, + timeoutAway = data["timeout_away"] as? Boolean ?: false, + ) + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/MatchRepository.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/MatchRepository.kt index b86f680..02d15a5 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/MatchRepository.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/MatchRepository.kt @@ -1,10 +1,17 @@ package com.matchlivetv.match_live_tv.data.repository import com.matchlivetv.match_live_tv.core.TokenStore +import com.matchlivetv.match_live_tv.data.api.CreateMatchBody +import com.matchlivetv.match_live_tv.data.api.CreateMatchRequest import com.matchlivetv.match_live_tv.data.api.MatchLiveApi +import com.matchlivetv.match_live_tv.data.api.ScoringRulesBody +import com.matchlivetv.match_live_tv.data.api.UpdateMatchBodyFull +import com.matchlivetv.match_live_tv.data.api.UpdateMatchRequestFull import com.matchlivetv.match_live_tv.domain.Match +import com.matchlivetv.match_live_tv.domain.Recording import com.matchlivetv.match_live_tv.domain.Team import kotlinx.coroutines.flow.first +import java.time.Instant class MatchRepository( private val api: MatchLiveApi, @@ -13,15 +20,98 @@ class MatchRepository( suspend fun fetchTeams(): List = api.teams().map { it.toDomain() } - suspend fun fetchMatches(): List { - val teamId = tokenStore.activeTeamIdFlow.first() - ?: fetchTeams().firstOrNull()?.id - ?: return emptyList() - tokenStore.saveActiveTeamId(teamId) - return api.matches(teamId).map { it.toDomain() } + suspend fun fetchTeam(teamId: String): Team? = + fetchTeams().firstOrNull { it.id == teamId } + + suspend fun resolveActiveTeam(teams: List): Team? { + if (teams.isEmpty()) return null + val savedId = tokenStore.activeTeamIdFlow.first() + val selected = teams.firstOrNull { it.id == savedId } ?: teams.first() + tokenStore.saveActiveTeamId(selected.id) + return selected } + suspend fun fetchMatch(matchId: String): Match = + api.match(matchId).toDomain() + + suspend fun fetchMatchesForTeam(teamId: String): List = + api.matches(teamId) + .map { it.toDomain() } + .sortedWith(matchComparator) + + suspend fun fetchMatches(): List { + val teams = fetchTeams() + val team = resolveActiveTeam(teams) ?: return emptyList() + return fetchMatchesForTeam(team.id) + } + + suspend fun fetchRecordings(teamId: String): List = + api.recordings(teamId).map { it.toDomain() } + suspend fun selectTeam(teamId: String) { tokenStore.saveActiveTeamId(teamId) } + + suspend fun createQuickMatch(teamId: String): Match = + api.createMatch( + teamId, + CreateMatchRequest(match = CreateMatchBody(opponentName = "Avversario")), + ).toDomain() + + suspend fun createScheduledMatch( + teamId: String, + opponentName: String, + scheduledAt: Instant, + location: String?, + ): Match = api.createMatch( + teamId, + CreateMatchRequest( + match = CreateMatchBody( + opponentName = opponentName, + scheduledAt = scheduledAt.toString(), + location = location?.takeIf { it.isNotBlank() }, + ), + ), + ).toDomain() + + suspend fun updateMatch( + matchId: String, + opponentName: String, + location: String?, + scheduledAt: String?, + setsToWin: Int, + category: String?, + phase: String?, + rosterNumbers: List, + scoringRules: ScoringRulesBody?, + ): Match = api.updateMatch( + matchId, + UpdateMatchRequestFull( + match = UpdateMatchBodyFull( + opponentName = opponentName, + location = location?.takeIf { it.isNotBlank() }, + scheduledAt = scheduledAt, + setsToWin = setsToWin, + category = category?.takeIf { it.isNotBlank() }, + phase = phase?.takeIf { it.isNotBlank() }, + rosterNumbers = rosterNumbers.takeIf { it.isNotEmpty() }, + scoringRules = scoringRules, + ), + ), + ).toDomain() + + suspend fun deleteMatch(matchId: String) { + api.deleteMatch(matchId) + } + + suspend fun recordingDownloadUrl(recordingId: String): String { + val body = api.recordingDownload(recordingId) + return body["download_url"] ?: error("URL download mancante") + } + + companion object { + private val matchComparator = compareBy(nullsLast()) { match -> + match.scheduledAt?.let { runCatching { Instant.parse(it) }.getOrNull() } + }.thenByDescending { it.id } + } } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/MatchSessionLauncher.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/MatchSessionLauncher.kt new file mode 100644 index 0000000..7b47997 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/MatchSessionLauncher.kt @@ -0,0 +1,15 @@ +package com.matchlivetv.match_live_tv.data.repository + +import com.matchlivetv.match_live_tv.domain.Match +import com.matchlivetv.match_live_tv.domain.StreamSession + +object MatchSessionLauncher { + /** Riprende una diretta già attiva (camera live / paused / reconnecting). */ + suspend fun resumeBroadcastSession( + match: Match, + sessionRepository: SessionRepository, + ): StreamSession { + val sessionId = match.activeSessionId ?: error("Sessione mancante") + return sessionRepository.fetchSession(sessionId) + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/ScoreRepository.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/ScoreRepository.kt new file mode 100644 index 0000000..cb1d898 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/ScoreRepository.kt @@ -0,0 +1,27 @@ +package com.matchlivetv.match_live_tv.data.repository + +import com.matchlivetv.match_live_tv.data.api.MatchLiveApi +import com.matchlivetv.match_live_tv.data.api.ScoreSyncRequest +import com.matchlivetv.match_live_tv.data.api.SetPartialDto +import com.matchlivetv.match_live_tv.domain.ScoreState + +class ScoreRepository( + private val api: MatchLiveApi, +) { + suspend fun syncScore(sessionId: String, score: ScoreState): ScoreState? { + val response = api.syncScore( + sessionId, + ScoreSyncRequest( + homeSets = score.homeSets, + awaySets = score.awaySets, + homePoints = score.homePoints, + awayPoints = score.awayPoints, + currentSet = score.currentSet, + setPartials = score.setPartials.map { + SetPartialDto(set = it.set, home = it.home, away = it.away) + }, + ), + ) + return response.score?.toDomain() + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/SessionRepository.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/SessionRepository.kt index 4d2ac82..659350a 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/SessionRepository.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/repository/SessionRepository.kt @@ -3,13 +3,25 @@ package com.matchlivetv.match_live_tv.data.repository import com.matchlivetv.match_live_tv.data.api.CreateSessionRequest import com.matchlivetv.match_live_tv.data.api.MatchLiveApi import com.matchlivetv.match_live_tv.data.api.NetworkTestRequest +import com.matchlivetv.match_live_tv.data.api.NetworkTestResponse import com.matchlivetv.match_live_tv.domain.StreamSession class SessionRepository( private val api: MatchLiveApi, ) { - suspend fun createSession(matchId: String): StreamSession = - api.createSession(matchId, CreateSessionRequest()).toDomain() + suspend fun createSession( + matchId: String, + platform: String = "matchlivetv", + privacyStatus: String = "public", + youtubeChannel: String? = null, + ): StreamSession = api.createSession( + matchId, + CreateSessionRequest( + platform = platform, + privacyStatus = privacyStatus, + youtubeChannel = youtubeChannel, + ), + ).toDomain() suspend fun fetchSession(sessionId: String): StreamSession = api.session(sessionId).toDomain() @@ -32,10 +44,35 @@ class SessionRepository( uploadMbps: Double, latencyMs: Int, networkType: String, + ): NetworkTestResponse = api.networkTest( + sessionId, + NetworkTestRequest(downloadMbps, uploadMbps, latencyMs, networkType), + ) + + suspend fun createRegiaLink(sessionId: String): String = + api.regiaLink(sessionId).regiaUrl + + suspend fun postTelemetry( + sessionId: String, + deviceRole: String = "camera", + batteryLevel: Int? = null, + networkType: String? = null, + signalStrength: Int? = null, + currentBitrate: Int? = null, + targetBitrate: Int? = null, + fps: Int? = null, ) { - api.networkTest( + api.postTelemetry( sessionId, - NetworkTestRequest(downloadMbps, uploadMbps, latencyMs, networkType), + com.matchlivetv.match_live_tv.data.api.TelemetryRequest( + deviceRole = deviceRole, + batteryLevel = batteryLevel, + networkType = networkType, + signalStrength = signalStrength, + currentBitrate = currentBitrate, + targetBitrate = targetBitrate, + fps = fps, + ), ) } } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/scoring/ScoreController.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/scoring/ScoreController.kt new file mode 100644 index 0000000..6602945 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/data/scoring/ScoreController.kt @@ -0,0 +1,112 @@ +package com.matchlivetv.match_live_tv.data.scoring + +import com.matchlivetv.match_live_tv.data.cable.SessionCableService +import com.matchlivetv.match_live_tv.data.repository.ScoreRepository +import com.matchlivetv.match_live_tv.domain.ScoreState +import com.matchlivetv.match_live_tv.domain.SetPartial +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock + +class ScoreController( + private val scoreRepository: ScoreRepository, + private val sessionCable: SessionCableService, + private val scope: CoroutineScope, +) { + private val _score = MutableStateFlow(ScoreState()) + val score: StateFlow = _score.asStateFlow() + + private var sessionId: String? = null + private var suppressRemoteUntilMs: Long = 0 + private val syncMutex = Mutex() + private var syncJob: Job? = null + + fun bind(sessionId: String, initial: ScoreState?) { + this.sessionId = sessionId + if (initial != null) { + _score.value = initial + } + } + + fun applyRemote(remote: ScoreState) { + val now = System.currentTimeMillis() + if (now < suppressRemoteUntilMs && remote.progressKey() < _score.value.progressKey()) { + return + } + _score.value = remote + } + + fun incrementHome() { + _score.update { it.copy(homePoints = it.homePoints + 1) } + schedulePush() + } + + fun incrementAway() { + _score.update { it.copy(awayPoints = it.awayPoints + 1) } + schedulePush() + } + + fun decrementHome() { + _score.update { current -> + if (current.homePoints > 0) current.copy(homePoints = current.homePoints - 1) else current + } + schedulePush() + } + + fun decrementAway() { + _score.update { current -> + if (current.awayPoints > 0) current.copy(awayPoints = current.awayPoints - 1) else current + } + schedulePush() + } + + fun closeSet() { + val current = _score.value + val homeWon = current.homePoints > current.awayPoints + val partials = current.setPartials.toMutableList() + if (current.homePoints > 0 || current.awayPoints > 0) { + partials.add( + SetPartial( + set = current.currentSet, + home = current.homePoints, + away = current.awayPoints, + ), + ) + } + _score.value = current.copy( + homeSets = if (homeWon) current.homeSets + 1 else current.homeSets, + awaySets = if (homeWon) current.awaySets else current.awaySets + 1, + homePoints = 0, + awayPoints = 0, + currentSet = current.currentSet + 1, + setPartials = partials, + timeoutHome = false, + timeoutAway = false, + ) + schedulePush() + } + + private fun schedulePush() { + syncJob?.cancel() + syncJob = scope.launch { + syncMutex.withLock { + val id = sessionId ?: return@withLock + val local = _score.value + sessionCable.sendScoreUpdate(local) + runCatching { scoreRepository.syncScore(id, local) } + .onSuccess { remote -> + suppressRemoteUntilMs = System.currentTimeMillis() + 500 + if (remote != null) { + _score.value = remote + } + } + } + } + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/MatchScoringRules.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/MatchScoringRules.kt new file mode 100644 index 0000000..bdab095 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/MatchScoringRules.kt @@ -0,0 +1,40 @@ +package com.matchlivetv.match_live_tv.domain + +enum class ScoringSide { + HOME, + AWAY, +} + +data class MatchScoringRules( + val setsToWin: Int, + val pointsPerSet: Int = 25, + val pointsDecidingSet: Int = 15, + val minPointLead: Int = 2, +) { + val maxSets: Int get() = (setsToWin * 2) - 1 + + fun pointsTarget(currentSet: Int): Int = + if (currentSet >= maxSets) pointsDecidingSet else pointsPerSet + + fun setWinnerFromPoints( + homePoints: Int, + awayPoints: Int, + currentSet: Int, + ): ScoringSide? { + val target = pointsTarget(currentSet) + val lead = minPointLead + if (homePoints >= target && homePoints - awayPoints >= lead) return ScoringSide.HOME + if (awayPoints >= target && awayPoints - homePoints >= lead) return ScoringSide.AWAY + return null + } + + fun matchWinner(homeSets: Int, awaySets: Int): ScoringSide? = when { + homeSets >= setsToWin -> ScoringSide.HOME + awaySets >= setsToWin -> ScoringSide.AWAY + else -> null + } + + companion object { + fun fromMatch(match: Match) = MatchScoringRules(setsToWin = match.setsToWin) + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/Models.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/Models.kt index 3808b82..048dfe7 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/Models.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/Models.kt @@ -16,11 +16,22 @@ data class Team( val id: String, val name: String, val sport: String, + val clubName: String? = null, val canStream: Boolean = true, val youtubeEnabled: Boolean = false, + val youtubeConnected: Boolean = false, + val youtubeSelectable: Boolean = false, + val youtubeChannelTitle: String? = null, + val youtubeTeamChannelTitle: String? = null, + val planName: String? = null, + val recordingsEnabled: Boolean = false, + val phoneDownloadEnabled: Boolean = false, val billingUrl: String? = null, val staffManageUrl: String? = null, -) +) { + val canUseYoutube: Boolean get() = youtubeEnabled + val isYoutubeReady: Boolean get() = youtubeSelectable +} data class Match( val id: String, @@ -29,9 +40,15 @@ data class Match( val opponentName: String, val location: String? = null, val scheduledAt: String? = null, + val setsToWin: Int = 3, + val category: String? = null, + val phase: String? = null, + val rosterNumbers: List = emptyList(), val activeSessionId: String? = null, val activeSessionStatus: String? = null, ) { + val hasActiveSession: Boolean get() = activeSessionId != null + val canResumeCamera: Boolean get() { val status = activeSessionStatus ?: return false @@ -49,9 +66,22 @@ data class StreamSession( val hlsPlaybackUrl: String? = null, val watchPageUrl: String? = null, val shareUrl: String? = null, + val youtubeWatchUrl: String? = null, + val youtubeReady: Boolean = false, + val privacyStatus: String = "public", val targetBitrate: Int = 2_500_000, val targetFps: Int = 30, val startedAt: String? = null, + val score: ScoreState? = null, ) { val isLive: Boolean get() = status == "live" || status == "reconnecting" + + val isPaused: Boolean get() = status == "paused" + + fun watchShareUrl(): String? = when { + platform == "youtube" && !youtubeWatchUrl.isNullOrBlank() -> youtubeWatchUrl + !shareUrl.isNullOrBlank() -> shareUrl + !watchPageUrl.isNullOrBlank() -> watchPageUrl + else -> null + } } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/Recording.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/Recording.kt new file mode 100644 index 0000000..7a09989 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/Recording.kt @@ -0,0 +1,22 @@ +package com.matchlivetv.match_live_tv.domain + +data class Recording( + val id: String, + val title: String, + val opponentName: String, + val teamName: String, + val status: String, + val statusLabel: String, + val recordedAt: String? = null, + val endedAt: String? = null, + val durationLabel: String? = null, + val viewsLabel: String? = null, + val replayUrl: String? = null, + val thumbnailUrl: String? = null, + val downloadEnabled: Boolean = false, + val youtubeWatchUrl: String? = null, + val expiresAt: String? = null, +) { + val isReady: Boolean get() = status == "ready" + val isProcessing: Boolean get() = status == "processing" +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/ScoreState.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/ScoreState.kt new file mode 100644 index 0000000..18821c7 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/domain/ScoreState.kt @@ -0,0 +1,33 @@ +package com.matchlivetv.match_live_tv.domain + +data class SetPartial( + val set: Int, + val home: Int, + val away: Int, +) + +data class ScoreState( + val homeSets: Int = 0, + val awaySets: Int = 0, + val homePoints: Int = 0, + val awayPoints: Int = 0, + val currentSet: Int = 1, + val setPartials: List = emptyList(), + val timeoutHome: Boolean = false, + val timeoutAway: Boolean = false, +) { + fun cablePayload(): Map = mapOf( + "type" to "score_update", + "home_sets" to homeSets, + "away_sets" to awaySets, + "home_points" to homePoints, + "away_points" to awayPoints, + "current_set" to currentSet, + "set_partials" to setPartials.map { + mapOf("set" to it.set, "home" to it.home, "away" to it.away) + }, + ) + + fun progressKey(): Int = + homeSets * 1_000_000 + awaySets * 100_000 + homePoints * 1_000 + awayPoints +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/BroadcastModels.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/BroadcastModels.kt index be47fb9..59e86b4 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/BroadcastModels.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/BroadcastModels.kt @@ -7,7 +7,10 @@ data class BroadcastConfig( val videoBitrate: Int = 2_500_000, val audioBitrate: Int = 128_000, val fps: Int = 30, + val rotation: Int = 0, val portrait: Boolean = false, + val maxReconnectAttempts: Int = 10, + val reconnectDelayMs: Long = 5_000L, ) enum class BroadcastPhase { @@ -15,6 +18,7 @@ enum class BroadcastPhase { PREVIEW, CONNECTING, LIVE, + PAUSED, RECONNECTING, ERROR, } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/LiveBroadcastCoordinator.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/LiveBroadcastCoordinator.kt index 96b1c5a..b02168c 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/LiveBroadcastCoordinator.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/LiveBroadcastCoordinator.kt @@ -24,6 +24,10 @@ class LiveBroadcastCoordinator(context: Context) { engine.pauseForConfigurationChange() } + fun resumeAfterConfigurationChange() { + engine.resumeAfterConfigurationChange() + } + fun startService() { val intent = LiveBroadcastService.startIntent(appContext) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/LiveBroadcastEngine.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/LiveBroadcastEngine.kt index d842fd5..2d503b5 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/LiveBroadcastEngine.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/streaming/LiveBroadcastEngine.kt @@ -4,14 +4,17 @@ import android.content.Context import android.media.MediaCodecInfo import android.os.Handler import android.os.Looper -import android.os.SystemClock import android.util.Log +import android.view.Surface +import android.view.WindowManager import com.pedro.common.ConnectChecker import com.pedro.library.generic.GenericStream import com.pedro.library.util.SensorRotationManager +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicInteger /** - * Motore RTMP nativo Match Live TV — implementazione dedicata app Android (non Flutter). + * Motore RTMP nativo Match Live TV (RootEncoder / GenericStream). */ class LiveBroadcastEngine( private val appContext: Context, @@ -24,11 +27,29 @@ class LiveBroadcastEngine( private var phase = BroadcastPhase.IDLE private var surfaceSuspended = false private var rebindPending = false - private var lastCameraRotation = -1 + private var lastAppliedRotation = -1 + private var lastAppliedPortrait: Boolean? = null + private var pendingRotation: Int? = null + private var pendingIsPortrait: Boolean? = null private var sensorManager: SensorRotationManager? = null private var listener: ((BroadcastMetrics) -> Unit)? = null + private var streamStartPending = false + private var publishInProgress = false + private var currentBitrateKbps: Long = 0 + private var currentFps: Int = 0 + private val pausingIntentionally = AtomicBoolean(false) + private val reconnectAttempts = AtomicInteger(0) - private val rebindRunnable = Runnable { reattachPreviewIfNeeded() } + private val rebindRunnable = Runnable { + reattachPreviewIfNeeded() + tryStartPendingBroadcast() + } + + private val orientationApplyRunnable = Runnable { + val rotation = pendingRotation ?: return@Runnable + val isPortrait = pendingIsPortrait ?: return@Runnable + applyGlOrientation(rotation, isPortrait, "sensorOrientation") + } fun setMetricsListener(block: ((BroadcastMetrics) -> Unit)?) { listener = block @@ -47,10 +68,20 @@ class LiveBroadcastEngine( } else { ensurePreviewPrepared(view) } + tryStartPendingBroadcast() + } + } + + /** Dopo rotazione schermo: riallinea preview e orientamento encoder. */ + fun resumeAfterConfigurationChange() { + mainHandler.post { + if (phase == BroadcastPhase.IDLE) return@post + resetOrientationTracking() + applyInitialOrientation() + refreshOrientationSensor() } } - /** Chiamato da Activity.onConfigurationChanged prima di super. */ fun pauseForConfigurationChange() { mainHandler.post { if (phase == BroadcastPhase.IDLE) return@post @@ -72,6 +103,7 @@ class LiveBroadcastEngine( view.onSurfaceLost = { onPreviewSurfaceLost() } updatePipelinePreservationFlag() scheduleRebind() + tryStartPendingBroadcast() } } @@ -91,19 +123,86 @@ class LiveBroadcastEngine( fun startBroadcast(broadcastConfig: BroadcastConfig) { mainHandler.post { config = broadcastConfig - val stream = obtainStream() - resetEncoder(stream, broadcastConfig) - attachPreviewInternal() - applyOrientation(broadcastConfig.portrait, broadcastConfig.portrait) - startSensor() + reconnectAttempts.set(0) + streamStartPending = true + publishInProgress = false setPhase(BroadcastPhase.CONNECTING) - Log.i(TAG, "publish ${broadcastConfig.rtmpUrl}") - stream.startStream(broadcastConfig.rtmpUrl) + Log.i(TAG, "publish queued ${broadcastConfig.rtmpUrl}") + tryStartPendingBroadcast() } } + private fun tryStartPendingBroadcast() { + if (!streamStartPending || publishInProgress) return + val cfg = config ?: return + publishInProgress = true + waitForPreviewThenPublish(cfg, attempt = 0) + } + + private fun waitForPreviewThenPublish(cfg: BroadcastConfig, attempt: Int) { + if (!streamStartPending) { + publishInProgress = false + return + } + if (!isSurfaceUsable(previewView)) { + if (attempt >= 40) { + publishInProgress = false + streamStartPending = false + setPhase(BroadcastPhase.ERROR, "preview_not_ready") + return + } + mainHandler.postDelayed({ waitForPreviewThenPublish(cfg, attempt + 1) }, 50L) + return + } + + val stream = obtainStream(cfg) + if (!stream.isOnPreview) { + if (!preparePipeline(stream, cfg)) { + publishInProgress = false + streamStartPending = false + return + } + } + + if (!stream.isOnPreview) { + if (attempt >= 40) { + publishInProgress = false + streamStartPending = false + setPhase(BroadcastPhase.ERROR, "preview_not_ready") + return + } + mainHandler.postDelayed({ waitForPreviewThenPublish(cfg, attempt + 1) }, 50L) + return + } + + mainHandler.postDelayed({ + if (!streamStartPending) { + publishInProgress = false + return@postDelayed + } + val activeStream = genericStream + if (activeStream == null) { + publishInProgress = false + return@postDelayed + } + if (activeStream.isStreaming) { + streamStartPending = false + publishInProgress = false + setPhase(BroadcastPhase.LIVE) + return@postDelayed + } + setPhase(BroadcastPhase.CONNECTING) + Log.i(TAG, "publish ${cfg.rtmpUrl}") + activeStream.startStream(cfg.rtmpUrl) + streamStartPending = false + publishInProgress = false + }, PRE_PUBLISH_DELAY_MS) + } + fun stopBroadcast() { mainHandler.post { + streamStartPending = false + publishInProgress = false stopSensor() genericStream?.let { stream -> if (stream.isStreaming) stream.stopStream() @@ -112,10 +211,41 @@ class LiveBroadcastEngine( genericStream = null surfaceSuspended = false rebindPending = false + lastAppliedRotation = -1 + lastAppliedPortrait = null + currentBitrateKbps = 0 + currentFps = 0 + reconnectAttempts.set(0) setPhase(BroadcastPhase.IDLE) } } + fun pauseBroadcast() { + mainHandler.post { + streamStartPending = false + publishInProgress = false + pausingIntentionally.set(true) + genericStream?.let { stream -> + if (stream.isStreaming) stream.stopStream() + } + pausingIntentionally.set(false) + currentBitrateKbps = 0 + currentFps = 0 + attachPreviewInternal() + setPhase(BroadcastPhase.PAUSED) + } + } + + fun resumeBroadcast(broadcastConfig: BroadcastConfig) { + mainHandler.post { + config = broadcastConfig + reconnectAttempts.set(0) + streamStartPending = true + publishInProgress = false + mainHandler.postDelayed({ tryStartPendingBroadcast() }, 250L) + } + } + fun release() { mainHandler.post { stopBroadcast() @@ -123,57 +253,86 @@ class LiveBroadcastEngine( } } - private fun obtainStream(): GenericStream { + private fun obtainStream(cfg: BroadcastConfig): GenericStream { val existing = genericStream if (existing != null) return existing return GenericStream(appContext, this).also { stream -> stream.getGlInterface().autoHandleOrientation = false - stream.getStreamClient().setReTries(10) + stream.getStreamClient().setReTries(cfg.maxReconnectAttempts) genericStream = stream } } private fun ensurePreviewPrepared(view: LivePreviewView) { - val stream = obtainStream() + val stream = obtainStream(config ?: BroadcastConfig(rtmpUrl = "")) if (stream.isOnPreview) return - val cfg = config ?: BroadcastConfig(rtmpUrl = "") - resetEncoder(stream, cfg.copy(rtmpUrl = cfg.rtmpUrl.ifBlank { "rtmp://127.0.0.1/preview" })) - attachPreviewInternal() + val cfg = config ?: BroadcastConfig(rtmpUrl = "rtmp://127.0.0.1/preview") + preparePipeline(stream, cfg.copy(rtmpUrl = cfg.rtmpUrl.ifBlank { "rtmp://127.0.0.1/preview" })) setPhase(BroadcastPhase.PREVIEW) } - private fun resetEncoder(stream: GenericStream, cfg: BroadcastConfig) { + private fun preparePipeline(stream: GenericStream, cfg: BroadcastConfig): Boolean { if (stream.isStreaming) stream.stopStream() if (stream.isOnPreview) stream.stopPreview() - val rotation = if (cfg.portrait) 90 else 0 - val ok = stream.prepareVideo( - width = cfg.width, - height = cfg.height, - bitrate = cfg.videoBitrate, - fps = cfg.fps, - iFrameInterval = 1, - rotation = rotation, - profile = MediaCodecInfo.CodecProfileLevel.AVCProfileBaseline, - level = MediaCodecInfo.CodecProfileLevel.AVCLevel31, - ) && stream.prepareAudio(48_000, false, cfg.audioBitrate) - if (!ok) { + + val prepared = runCatching { + stream.prepareVideo( + width = cfg.width, + height = cfg.height, + bitrate = cfg.videoBitrate, + fps = cfg.fps, + iFrameInterval = 1, + rotation = cfg.rotation, + profile = MediaCodecInfo.CodecProfileLevel.AVCProfileBaseline, + level = MediaCodecInfo.CodecProfileLevel.AVCLevel31, + ) && stream.prepareAudio(48_000, false, cfg.audioBitrate) + }.getOrElse { + Log.w(TAG, "preparePipeline: ${it.message}") + false + } + + if (!prepared) { setPhase(BroadcastPhase.ERROR, "prepare_failed") + return false + } + + if (!attachPreviewInternal()) { + scheduleRebind() + return false + } + + resetOrientationTracking() + applyInitialOrientation() + startSensor() + return true + } + + /** Stessa convenzione di SensorRotationManager (0° = portrait naturale). */ + private fun orientationFromDisplayRotation(): Pair { + @Suppress("DEPRECATION") + val displayRotation = (appContext.getSystemService(Context.WINDOW_SERVICE) as WindowManager) + .defaultDisplay.rotation + return when (displayRotation) { + Surface.ROTATION_90 -> 90 to false + Surface.ROTATION_180 -> 180 to true + Surface.ROTATION_270 -> 270 to false + else -> 0 to true } } - private fun attachPreviewInternal() { - val view = previewView ?: return - val stream = genericStream ?: return - if (!isSurfaceUsable(view)) { - scheduleRebind() - return - } - val surface = view.holder.surface ?: return - if (!surface.isValid) { - scheduleRebind() - return - } - runCatching { + private fun applyInitialOrientation() { + val (rotation, isPortrait) = orientationFromDisplayRotation() + applyGlOrientation(rotation, isPortrait, "initialOrientation") + } + + private fun attachPreviewInternal(): Boolean { + val view = previewView ?: return false + val stream = genericStream ?: return false + if (!isSurfaceUsable(view)) return false + val surface = view.holder.surface ?: return false + if (!surface.isValid) return false + + return runCatching { val gl = stream.getGlInterface() gl.setForceRender(false) if (stream.isOnPreview) gl.deAttachPreview() @@ -183,9 +342,10 @@ class LiveBroadcastEngine( gl.setForceRender(true, 30) surfaceSuspended = false rebindPending = false - }.onFailure { + true + }.getOrElse { Log.w(TAG, "attachPreviewInternal: ${it.message}") - scheduleRebind() + false } } @@ -200,8 +360,13 @@ class LiveBroadcastEngine( scheduleRebind() return } - attachPreviewInternal() - config?.let { applyOrientation(it.portrait, it.portrait) } + if (attachPreviewInternal()) { + applyInitialOrientation() + refreshOrientationSensor() + } else { + scheduleRebind() + } + tryStartPendingBroadcast() } private fun isSurfaceUsable(view: LivePreviewView?): Boolean { @@ -218,37 +383,64 @@ class LiveBroadcastEngine( previewView?.keepPipelineOnSurfaceLoss = keep } - private fun applyOrientation(isPortrait: Boolean, forcePortrait: Boolean) { + private fun applyGlOrientation(rotation: Int, isPortrait: Boolean, logLabel: String) { + if (surfaceSuspended) { + pendingRotation = rotation + pendingIsPortrait = isPortrait + return + } val stream = genericStream ?: return - if (surfaceSuspended) return runCatching { val gl = stream.getGlInterface() gl.setForceRender(false) gl.autoHandleOrientation = false gl.setIsPortrait(isPortrait) - gl.setCameraOrientation(if (forcePortrait) 90 else 0) + gl.setCameraOrientation(rotation) gl.setPreviewRotation(0) gl.setStreamRotation(0) gl.setForceRender(true, 30) + lastAppliedRotation = rotation + lastAppliedPortrait = isPortrait + pendingIsPortrait = isPortrait + Log.i(TAG, "$logLabel orientation rotation=$rotation portrait=$isPortrait phase=$phase") + }.getOrElse { + Log.w(TAG, "$logLabel orientation failed: ${it.message}") } } private fun startSensor() { if (sensorManager != null) return - sensorManager = SensorRotationManager(appContext, true, true) { rotation, portrait -> + sensorManager = SensorRotationManager(appContext, true, true) { rotation, isPortrait -> mainHandler.post { - if (surfaceSuspended || phase == BroadcastPhase.IDLE) return@post - if (rotation == lastCameraRotation) return@post - lastCameraRotation = rotation - applyOrientation(portrait, portrait) + if (surfaceSuspended || phase == BroadcastPhase.IDLE || phase == BroadcastPhase.PAUSED) return@post + if (rotation == lastAppliedRotation && isPortrait == lastAppliedPortrait) return@post + pendingRotation = rotation + pendingIsPortrait = isPortrait + mainHandler.removeCallbacks(orientationApplyRunnable) + mainHandler.postDelayed(orientationApplyRunnable, ORIENTATION_DEBOUNCE_MS) } }.also { it.start() } } + private fun refreshOrientationSensor() { + sensorManager?.stop() + sensorManager = null + resetOrientationTracking() + startSensor() + } + + private fun resetOrientationTracking() { + lastAppliedRotation = -1 + lastAppliedPortrait = null + pendingRotation = null + pendingIsPortrait = null + mainHandler.removeCallbacks(orientationApplyRunnable) + } + private fun stopSensor() { sensorManager?.stop() sensorManager = null - lastCameraRotation = -1 + resetOrientationTracking() } private fun setPhase(newPhase: BroadcastPhase, error: String? = null) { @@ -258,12 +450,16 @@ class LiveBroadcastEngine( } private fun emitMetrics(error: String? = null) { - val stream = genericStream + val cfg = config listener?.invoke( BroadcastMetrics( phase = phase, - bitrateKbps = 0, - fps = 0, + bitrateKbps = currentBitrateKbps, + fps = if (phase == BroadcastPhase.LIVE) { + currentFps.takeIf { it > 0 } ?: cfg?.fps ?: 0 + } else { + 0 + }, connected = phase == BroadcastPhase.LIVE, lastError = error, ), @@ -275,31 +471,72 @@ class LiveBroadcastEngine( } override fun onConnectionSuccess() { - mainHandler.post { setPhase(BroadcastPhase.LIVE) } + mainHandler.post { + reconnectAttempts.set(0) + setPhase(BroadcastPhase.LIVE) + } } override fun onConnectionFailed(reason: String) { - mainHandler.post { setPhase(BroadcastPhase.ERROR, reason) } + mainHandler.post { + if (pausingIntentionally.get()) return@post + Log.w(TAG, "onConnectionFailed reason=$reason phase=$phase attempts=${reconnectAttempts.get()}") + val stream = genericStream ?: return@post + val currentConfig = config ?: return@post + setPhase(BroadcastPhase.RECONNECTING, reason) + reconnectAttempts.incrementAndGet() + val retryScheduled = stream.getStreamClient().reTry( + currentConfig.reconnectDelayMs, + reason, + null, + ) + if (!retryScheduled) { + stream.stopStream() + setPhase(BroadcastPhase.ERROR, userFacingError(reason)) + } + } } - override fun onNewBitrate(bitrate: Long) = Unit + override fun onNewBitrate(bitrate: Long) { + mainHandler.post { + currentBitrateKbps = bitrate / 1000 + emitMetrics() + } + } override fun onDisconnect() { mainHandler.post { - if (phase == BroadcastPhase.LIVE) setPhase(BroadcastPhase.RECONNECTING) + if (pausingIntentionally.get()) return@post + if (phase == BroadcastPhase.LIVE || phase == BroadcastPhase.RECONNECTING) { + setPhase(BroadcastPhase.RECONNECTING) + } } } override fun onAuthError() { - mainHandler.post { setPhase(BroadcastPhase.ERROR, "auth_error") } + mainHandler.post { + genericStream?.stopStream() + setPhase(BroadcastPhase.ERROR, "Autenticazione RTMP fallita") + } } override fun onAuthSuccess() { - mainHandler.post { setPhase(BroadcastPhase.LIVE) } + mainHandler.post { + reconnectAttempts.set(0) + setPhase(BroadcastPhase.LIVE) + } + } + + private fun userFacingError(reason: String): String = when { + reason.contains("broken pipe", ignoreCase = true) -> + "Connessione persa — riprova a riavviare la diretta" + else -> reason } companion object { private const val TAG = "LiveBroadcastEngine" private const val SURFACE_DEBOUNCE_MS = 700L + private const val ORIENTATION_DEBOUNCE_MS = 120L + private const val PRE_PUBLISH_DELAY_MS = 350L } } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/archive/ArchiveScreen.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/archive/ArchiveScreen.kt new file mode 100644 index 0000000..2e2b56f --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/archive/ArchiveScreen.kt @@ -0,0 +1,178 @@ +package com.matchlivetv.match_live_tv.ui.archive + +import android.content.Intent +import android.net.Uri +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.matchlivetv.match_live_tv.data.AppContainer +import com.matchlivetv.match_live_tv.domain.Recording +import com.matchlivetv.match_live_tv.domain.Team +import com.matchlivetv.match_live_tv.ui.components.MatchPrimaryButton +import com.matchlivetv.match_live_tv.ui.components.MatchScreenScaffold +import com.matchlivetv.match_live_tv.ui.theme.MatchColors +import kotlinx.coroutines.launch + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ArchiveScreen( + container: AppContainer, + onBack: () -> Unit, +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + var loading by remember { mutableStateOf(true) } + var team by remember { mutableStateOf(null) } + var recordings by remember { mutableStateOf>(emptyList()) } + var error by remember { mutableStateOf(null) } + + LaunchedEffect(Unit) { + loading = true + runCatching { + val teams = container.matchRepository.fetchTeams() + val active = container.matchRepository.resolveActiveTeam(teams) + team = active + recordings = active?.let { container.matchRepository.fetchRecordings(it.id) }.orEmpty() + }.onFailure { error = it.message } + loading = false + } + + MatchScreenScaffold( + topBar = { + TopAppBar( + title = { Text("Replay") }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, null, tint = Color.White) + } + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MatchColors.Background, + titleContentColor = Color.White, + ), + ) + }, + ) { + when { + loading -> Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator(color = MatchColors.PrimaryRed) + } + error != null -> Column( + Modifier.fillMaxSize().padding(24.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text(error!!, color = MatchColors.PrimaryRed, textAlign = TextAlign.Center) + } + team != null && !team!!.recordingsEnabled -> Column( + Modifier.fillMaxSize().padding(24.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + "Replay disponibili con Premium Light o Full", + style = MaterialTheme.typography.headlineMedium, + textAlign = TextAlign.Center, + ) + Text( + "Light: 30 giorni · Full: 90 giorni", + style = MaterialTheme.typography.bodyMedium, + textAlign = TextAlign.Center, + modifier = Modifier.padding(top = 8.dp), + ) + team?.billingUrl?.let { url -> + MatchPrimaryButton( + label = "SCOPRI PREMIUM", + onClick = { + context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url))) + }, + modifier = Modifier.padding(top = 16.dp), + ) + } + } + recordings.isEmpty() -> Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) { + Text( + "Nessun replay ancora.\nAl termine delle dirette Premium le registrazioni compaiono qui.", + textAlign = TextAlign.Center, + style = MaterialTheme.typography.bodyMedium, + ) + } + else -> LazyColumn(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { + items(recordings, key = { it.id }) { recording -> + Card( + colors = CardDefaults.cardColors(containerColor = MatchColors.Surface), + shape = RoundedCornerShape(12.dp), + modifier = Modifier.fillMaxWidth(), + onClick = { + if (recording.isReady) { + recording.replayUrl?.let { url -> + context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url))) + } + } + }, + ) { + Column(Modifier.padding(16.dp)) { + Text(recording.title, style = MaterialTheme.typography.titleMedium) + Text( + listOfNotNull( + recording.durationLabel, + recording.viewsLabel, + recording.statusLabel, + ).joinToString(" · "), + style = MaterialTheme.typography.bodyMedium, + ) + if (recording.downloadEnabled && team?.phoneDownloadEnabled == true) { + MatchPrimaryButton( + label = "SCARICA MP4", + onClick = { + scope.launch { + runCatching { + container.matchRepository.recordingDownloadUrl(recording.id) + }.onSuccess { url -> + context.startActivity( + Intent(Intent.ACTION_VIEW, Uri.parse(url)), + ) + } + } + }, + modifier = Modifier.padding(top = 8.dp), + ) + } + } + } + } + } + } + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/BroadcastScreen.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/BroadcastScreen.kt index d253a1e..408b2ca 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/BroadcastScreen.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/BroadcastScreen.kt @@ -1,14 +1,25 @@ package com.matchlivetv.match_live_tv.ui.broadcast import android.view.ViewGroup -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Button +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect @@ -18,19 +29,31 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView +import com.matchlivetv.match_live_tv.core.DeviceTelemetry import com.matchlivetv.match_live_tv.data.AppContainer +import com.matchlivetv.match_live_tv.domain.Match +import com.matchlivetv.match_live_tv.domain.MatchScoringRules import com.matchlivetv.match_live_tv.domain.StreamSession import com.matchlivetv.match_live_tv.streaming.BroadcastConfig import com.matchlivetv.match_live_tv.streaming.BroadcastPhase import com.matchlivetv.match_live_tv.streaming.LivePreviewView +import com.matchlivetv.match_live_tv.ui.components.MatchPrimaryButton +import com.matchlivetv.match_live_tv.ui.components.MatchScreenScaffold +import com.matchlivetv.match_live_tv.ui.components.MatchSecondaryButton +import com.matchlivetv.match_live_tv.ui.components.MatchStatusBadge +import com.matchlivetv.match_live_tv.ui.permissions.rememberBroadcastPermissionsState import com.matchlivetv.match_live_tv.ui.theme.MatchColors +import kotlinx.coroutines.delay import kotlinx.coroutines.launch +@OptIn(ExperimentalMaterial3Api::class) @Composable fun BroadcastScreen( container: AppContainer, @@ -38,75 +61,326 @@ fun BroadcastScreen( onFinished: () -> Unit, ) { val scope = rememberCoroutineScope() + val context = LocalContext.current + val snackbar = remember { SnackbarHostState() } var session by remember { mutableStateOf(null) } + var match by remember { mutableStateOf(null) } var error by remember { mutableStateOf(null) } + var loading by remember { mutableStateOf(true) } + var pauseInFlight by remember { mutableStateOf(false) } + var resumeInFlight by remember { mutableStateOf(false) } val metrics by container.broadcastCoordinator.metrics.collectAsState() - val configuration = LocalConfiguration.current - val portrait = configuration.screenHeightDp > configuration.screenWidthDp - - LaunchedEffect(sessionId) { - runCatching { container.sessionRepository.fetchSession(sessionId) } - .onSuccess { loaded -> - session = loaded - val url = loaded.rtmpIngestUrl - if (url.isNullOrBlank()) { - error = "URL RTMP mancante" - return@onSuccess - } - container.broadcastCoordinator.startService() - container.broadcastCoordinator.engine.startBroadcast( - BroadcastConfig( - rtmpUrl = url, - width = if (portrait) 720 else 1280, - height = if (portrait) 1280 else 720, - portrait = portrait, - videoBitrate = loaded.targetBitrate, - fps = loaded.targetFps, - ), - ) - } - .onFailure { error = it.message ?: "Sessione non disponibile" } + val score by container.scoreController.score.collectAsState() + val cableConnected by container.sessionCable.connected.collectAsState() + val permissions = rememberBroadcastPermissionsState() + val dialogHost = rememberLiveScoreDialogHost() + val scoringRules = remember(match) { match?.let { MatchScoringRules.fromMatch(it) } } + val scoreActions = remember(scoringRules, dialogHost) { + scoringRules?.let { LiveScoreActions(it, container.scoreController, dialogHost) } } - DisposableEffect(Unit) { + fun broadcastConfig(loaded: StreamSession): BroadcastConfig = BroadcastConfig( + rtmpUrl = loaded.rtmpIngestUrl.orEmpty(), + width = 1280, + height = 720, + videoBitrate = loaded.targetBitrate, + fps = loaded.targetFps, + ) + + suspend fun stopStreamPermanently() { + runCatching { container.sessionRepository.stopSession(sessionId) } + container.sessionCable.disconnect() + container.broadcastCoordinator.engine.stopBroadcast() + container.broadcastCoordinator.stopService() + onFinished() + } + + suspend fun pauseStream() { + if (pauseInFlight) return + pauseInFlight = true + try { + val updated = container.sessionRepository.pauseSession(sessionId) + session = updated + container.broadcastCoordinator.engine.pauseBroadcast() + snackbar.showSnackbar("Diretta in pausa — gli spettatori vedono la copertina") + } catch (e: Exception) { + snackbar.showSnackbar("Pausa sessione: ${e.message ?: "errore"}") + } finally { + pauseInFlight = false + } + } + + suspend fun resumeStream() { + if (resumeInFlight) return + resumeInFlight = true + try { + var updated = container.sessionRepository.resumeSession(sessionId) + session = updated + val url = updated.rtmpIngestUrl + if (!url.isNullOrBlank()) { + container.broadcastCoordinator.engine.resumeBroadcast(broadcastConfig(updated)) + } + updated = container.sessionRepository.fetchSession(sessionId) + session = updated + snackbar.showSnackbar("Diretta ripresa — di nuovo in onda") + } catch (e: Exception) { + snackbar.showSnackbar("Ripresa diretta: ${e.message ?: "errore"}") + } finally { + resumeInFlight = false + } + } + + suspend fun applyRemotePause() { + container.broadcastCoordinator.engine.pauseBroadcast() + session = session?.copy(status = "paused") + snackbar.showSnackbar("Pausa dalla regia — trasmissione fermata") + } + + suspend fun applyRemoteResume() { + if (resumeInFlight) return + val current = session ?: return + val url = current.rtmpIngestUrl ?: return + resumeInFlight = true + try { + container.broadcastCoordinator.engine.resumeBroadcast(broadcastConfig(current)) + snackbar.showSnackbar("Ripresa dalla regia — di nuovo in onda") + } catch (e: Exception) { + snackbar.showSnackbar("Ripresa RTMP: ${e.message ?: "errore"}") + } finally { + resumeInFlight = false + } + } + + LaunchedEffect(sessionId, permissions.granted) { + if (!permissions.granted) return@LaunchedEffect + loading = true + error = null + runCatching { + val loaded = container.sessionRepository.fetchSession(sessionId) + val matchData = container.matchRepository.fetchMatch(loaded.matchId) + session = loaded + match = matchData + container.scoreController.bind(sessionId, loaded.score) + val token = container.authRepository.currentSession()?.accessToken + if (!token.isNullOrBlank()) { + container.sessionCable.onScoreUpdate = { remote -> + container.scoreController.applyRemote(remote) + } + container.sessionCable.onPauseStream = { + if (!pauseInFlight) scope.launch { applyRemotePause() } + } + container.sessionCable.onResumeStream = { + if (!resumeInFlight) scope.launch { applyRemoteResume() } + } + container.sessionCable.connect(sessionId, token, deviceRole = "camera") + } + container.broadcastCoordinator.startService() + val url = loaded.rtmpIngestUrl + if (url.isNullOrBlank()) { + error("URL RTMP mancante") + } else if (!loaded.isPaused) { + container.broadcastCoordinator.engine.startBroadcast(broadcastConfig(loaded)) + } + }.onFailure { + error = it.message ?: "Sessione non disponibile" + } + loading = false + } + + LaunchedEffect(sessionId) { + while (true) { + delay(10_000) + val current = session ?: continue + if (current.isPaused) continue + runCatching { + container.sessionRepository.postTelemetry( + sessionId = sessionId, + deviceRole = "camera", + batteryLevel = DeviceTelemetry.batteryLevel(context), + networkType = DeviceTelemetry.networkType(context), + currentBitrate = (metrics.bitrateKbps * 1000).toInt().takeIf { it > 0 }, + targetBitrate = current.targetBitrate, + fps = metrics.fps.takeIf { it > 0 }, + ) + } + } + } + + DisposableEffect(sessionId) { onDispose { + container.sessionCable.onPauseStream = null + container.sessionCable.onResumeStream = null + container.sessionCable.disconnect() container.broadcastCoordinator.stopService() container.broadcastCoordinator.engine.stopBroadcast() } } - Column(Modifier.fillMaxSize().background(MatchColors.Background)) { - Box(Modifier.weight(1f).fillMaxWidth()) { - CameraPreviewPanel(container) - Text( - text = when (metrics.phase) { - BroadcastPhase.LIVE -> "IN DIRETTA" - BroadcastPhase.CONNECTING -> "CONNESSIONE…" - BroadcastPhase.RECONNECTING -> "RICONNESSIONE…" - BroadcastPhase.ERROR -> metrics.lastError ?: "ERRORE" - else -> "PREVIEW" - }, - color = if (metrics.phase == BroadcastPhase.LIVE) MatchColors.SuccessGreen else MatchColors.AccentYellow, - modifier = Modifier.padding(16.dp), - ) - } - error?.let { - Text(it, color = MatchColors.PrimaryRed, modifier = Modifier.padding(16.dp)) - } - Button( - onClick = { - scope.launch { - runCatching { container.sessionRepository.stopSession(sessionId) } - container.broadcastCoordinator.engine.stopBroadcast() - container.broadcastCoordinator.stopService() - onFinished() + val isPaused = session?.isPaused == true || metrics.phase == BroadcastPhase.PAUSED + val statusText = when { + isPaused -> "PAUSA" + metrics.phase == BroadcastPhase.LIVE -> "IN DIRETTA" + metrics.phase == BroadcastPhase.CONNECTING -> "CONNESSIONE…" + metrics.phase == BroadcastPhase.RECONNECTING -> "RICONNESSIONE…" + metrics.phase == BroadcastPhase.ERROR -> metrics.lastError ?: "ERRORE" + else -> "PREVIEW" + } + val statusColor = when { + isPaused -> MatchColors.AccentYellow + metrics.phase == BroadcastPhase.LIVE -> MatchColors.SuccessGreen + metrics.phase == BroadcastPhase.ERROR -> MatchColors.PrimaryRed + else -> MatchColors.AccentYellow + } + val pointsTarget = scoringRules?.pointsTarget(score.currentSet) ?: 25 + + match?.let { currentMatch -> + ScoreDialogRouter( + host = dialogHost, + homeName = currentMatch.teamName, + awayName = currentMatch.opponentName, + ) + } + + MatchScreenScaffold( + topBar = { + Column { + TopAppBar( + title = { + Column { + Text("Diretta", style = MaterialTheme.typography.titleMedium) + Text( + if (cableConnected) "Tabellone collegato" else "Tabellone offline", + style = MaterialTheme.typography.labelSmall, + color = if (cableConnected) MatchColors.SuccessGreen else MatchColors.TextSecondary, + ) + } + }, + navigationIcon = { + IconButton(onClick = onFinished) { + Icon( + Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Indietro", + tint = Color.White, + ) + } + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MatchColors.Background, + titleContentColor = Color.White, + ), + ) + SnackbarHost(hostState = snackbar) + } + }, + ) { + Column(Modifier.fillMaxSize()) { + Box( + Modifier + .weight(1f) + .fillMaxWidth(), + ) { + if (loading) { + CircularProgressIndicator( + color = MatchColors.PrimaryRed, + modifier = Modifier.align(Alignment.Center), + ) + } else { + CameraPreviewPanel(container) } - }, - modifier = Modifier - .fillMaxWidth() - .padding(16.dp), - ) { - Text("TERMINA DIRETTA") + MatchStatusBadge( + text = statusText, + textColor = statusColor, + backgroundColor = MatchColors.Background.copy(alpha = 0.75f), + modifier = Modifier + .align(Alignment.TopStart) + .padding(16.dp), + ) + if (isPaused && !loading) { + MatchPrimaryButton( + label = "RIPRENDI DIRETTA", + onClick = { scope.launch { resumeStream() } }, + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(16.dp), + ) + } + } + Column( + Modifier + .weight(1f) + .verticalScroll(rememberScrollState()), + ) { + error?.let { + Text( + it, + color = MatchColors.PrimaryRed, + modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), + ) + } + match?.let { currentMatch -> + scoreActions?.let { actions -> + LiveScoreControls( + homeName = currentMatch.teamName, + awayName = currentMatch.opponentName, + score = score, + pointsTarget = pointsTarget, + onPointHome = { + scope.launch { + container.scoreController.incrementHome() + actions.afterPointChange( + container.scoreController.score.value, + ) { stopStreamPermanently() } + } + }, + onPointAway = { + scope.launch { + container.scoreController.incrementAway() + actions.afterPointChange( + container.scoreController.score.value, + ) { stopStreamPermanently() } + } + }, + onMinusHome = { container.scoreController.decrementHome() }, + onMinusAway = { container.scoreController.decrementAway() }, + onCloseSet = { + scope.launch { + actions.requestCloseSet { stopStreamPermanently() } + } + }, + ) + } + } + if (!permissions.granted) { + Text( + "Consenti accesso a camera e microfono per andare in diretta", + color = MatchColors.AccentYellow, + modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), + ) + MatchPrimaryButton( + label = "CONCEDI PERMESSI", + onClick = permissions.request, + modifier = Modifier.padding(horizontal = 16.dp), + ) + } + if (isPaused) { + MatchPrimaryButton( + label = "RIPRENDI DIRETTA", + onClick = { scope.launch { resumeStream() } }, + modifier = Modifier.padding(horizontal = 16.dp), + ) + } else if (!loading && session != null) { + MatchSecondaryButton( + label = "PAUSA DIRETTA", + onClick = { scope.launch { pauseStream() } }, + modifier = Modifier.padding(horizontal = 16.dp), + ) + } + MatchPrimaryButton( + label = "TERMINA DIRETTA", + onClick = { scope.launch { stopStreamPermanently() } }, + modifier = Modifier.padding(16.dp), + ) + } } } } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/LiveScoreActions.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/LiveScoreActions.kt new file mode 100644 index 0000000..389aa0a --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/LiveScoreActions.kt @@ -0,0 +1,153 @@ +package com.matchlivetv.match_live_tv.ui.broadcast + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import com.matchlivetv.match_live_tv.data.scoring.ScoreController +import com.matchlivetv.match_live_tv.domain.MatchScoringRules +import com.matchlivetv.match_live_tv.domain.ScoreState +import com.matchlivetv.match_live_tv.domain.ScoringSide +import kotlinx.coroutines.suspendCancellableCoroutine +import kotlin.coroutines.resume + +enum class ScoreDialogKind { + SET_WON, + CLOSE_SET_ANYWAY, + MATCH_WON, +} + +data class ScoreDialogState( + val kind: ScoreDialogKind, + val winnerSide: ScoringSide? = null, + val homePoints: Int = 0, + val awayPoints: Int = 0, + val homeSets: Int = 0, + val awaySets: Int = 0, +) + +class LiveScoreDialogHost { + private var dialogOpen = false + var pendingDialog by mutableStateOf(null) + private set + private var pendingResult: ((Boolean) -> Unit)? = null + + suspend fun show(state: ScoreDialogState): Boolean = suspendCancellableCoroutine { cont -> + if (dialogOpen) { + cont.resume(false) + return@suspendCancellableCoroutine + } + dialogOpen = true + pendingDialog = state + pendingResult = { value -> + if (cont.isActive) cont.resume(value) + } + cont.invokeOnCancellation { + pendingDialog = null + dialogOpen = false + pendingResult = null + } + } + + fun resolve(result: Boolean) { + pendingDialog = null + dialogOpen = false + pendingResult?.invoke(result) + pendingResult = null + } +} + +@Composable +fun rememberLiveScoreDialogHost(): LiveScoreDialogHost = remember { LiveScoreDialogHost() } + +@Composable +fun ScoreDialogRouter( + host: LiveScoreDialogHost, + homeName: String, + awayName: String, +) { + val dialog = host.pendingDialog ?: return + when (dialog.kind) { + ScoreDialogKind.SET_WON -> { + val winner = dialog.winnerSide ?: return + SetWonDialog( + winnerName = scoringSideName(winner, homeName, awayName), + homePoints = dialog.homePoints, + awayPoints = dialog.awayPoints, + onDismiss = host::resolve, + ) + } + ScoreDialogKind.CLOSE_SET_ANYWAY -> { + CloseSetAnywayDialog(onDismiss = host::resolve) + } + ScoreDialogKind.MATCH_WON -> { + val winner = dialog.winnerSide ?: return + MatchWonDialog( + winnerName = scoringSideName(winner, homeName, awayName), + homeSets = dialog.homeSets, + awaySets = dialog.awaySets, + onDismiss = host::resolve, + ) + } + } +} + +class LiveScoreActions( + private val rules: MatchScoringRules, + private val scoreController: ScoreController, + private val dialogHost: LiveScoreDialogHost, +) { + suspend fun afterPointChange( + score: ScoreState, + onStopStream: suspend () -> Unit = {}, + ) { + val winner = rules.setWinnerFromPoints( + homePoints = score.homePoints, + awayPoints = score.awayPoints, + currentSet = score.currentSet, + ) ?: return + + val close = dialogHost.show( + ScoreDialogState( + kind = ScoreDialogKind.SET_WON, + winnerSide = winner, + homePoints = score.homePoints, + awayPoints = score.awayPoints, + ), + ) + if (close) { + scoreController.closeSet() + afterCloseSet(onStopStream) + } + } + + suspend fun requestCloseSet(onStopStream: suspend () -> Unit) { + val score = scoreController.score.value + val winner = rules.setWinnerFromPoints( + homePoints = score.homePoints, + awayPoints = score.awayPoints, + currentSet = score.currentSet, + ) + if (winner == null) { + val ok = dialogHost.show(ScoreDialogState(kind = ScoreDialogKind.CLOSE_SET_ANYWAY)) + if (!ok) return + } + scoreController.closeSet() + afterCloseSet(onStopStream) + } + + private suspend fun afterCloseSet(onStopStream: suspend () -> Unit) { + val score = scoreController.score.value + val winner = rules.matchWinner(score.homeSets, score.awaySets) ?: return + val stop = dialogHost.show( + ScoreDialogState( + kind = ScoreDialogKind.MATCH_WON, + winnerSide = winner, + homeSets = score.homeSets, + awaySets = score.awaySets, + ), + ) + if (stop) onStopStream() + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/LiveScoreControls.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/LiveScoreControls.kt new file mode 100644 index 0000000..6dbff9d --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/LiveScoreControls.kt @@ -0,0 +1,153 @@ +package com.matchlivetv.match_live_tv.ui.broadcast + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import com.matchlivetv.match_live_tv.domain.ScoreState +import com.matchlivetv.match_live_tv.ui.components.MatchPrimaryButton +import com.matchlivetv.match_live_tv.ui.components.MatchSecondaryButton +import com.matchlivetv.match_live_tv.ui.theme.MatchColors + +@Composable +fun LiveScoreControls( + homeName: String, + awayName: String, + score: ScoreState, + pointsTarget: Int = 25, + onPointHome: () -> Unit, + onPointAway: () -> Unit, + onMinusHome: () -> Unit, + onMinusAway: () -> Unit, + onCloseSet: () -> Unit, + modifier: Modifier = Modifier, +) { + Column( + modifier + .fillMaxWidth() + .background(MatchColors.Surface, RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)) + .padding(16.dp), + ) { + ScoreOverlayBar( + homeName = homeName, + awayName = awayName, + score = score, + pointsTarget = pointsTarget, + ) + Spacer(Modifier.height(12.dp)) + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.Top) { + TeamScoreColumn( + label = homeName, + points = score.homePoints, + onPlus = onPointHome, + onMinus = onMinusHome, + modifier = Modifier.weight(1f), + ) + Text( + "$pointsTarget pt", + style = MaterialTheme.typography.labelSmall, + color = MatchColors.TextSecondary, + modifier = Modifier.padding(top = 24.dp).padding(horizontal = 8.dp), + ) + TeamScoreColumn( + label = awayName, + points = score.awayPoints, + onPlus = onPointAway, + onMinus = onMinusAway, + modifier = Modifier.weight(1f), + ) + } + Spacer(Modifier.height(10.dp)) + MatchSecondaryButton( + label = "CHIUDI SET", + onClick = onCloseSet, + ) + } +} + +@Composable +private fun TeamScoreColumn( + label: String, + points: Int, + onPlus: () -> Unit, + onMinus: () -> Unit, + modifier: Modifier = Modifier, +) { + Column(modifier, horizontalAlignment = Alignment.CenterHorizontally) { + Text( + label, + style = MaterialTheme.typography.labelMedium, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + textAlign = TextAlign.Center, + ) + Spacer(Modifier.height(4.dp)) + Text( + "$points", + style = MaterialTheme.typography.headlineMedium, + color = MatchColors.PrimaryRed, + ) + Spacer(Modifier.height(6.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) { + MatchPrimaryButton( + label = "+1", + onClick = onPlus, + modifier = Modifier.weight(1f), + ) + OutlinedButton(onClick = onMinus) { + Text("−", color = Color.White) + } + } + } +} + +@Composable +private fun ScoreOverlayBar( + homeName: String, + awayName: String, + score: ScoreState, + pointsTarget: Int, +) { + Row( + Modifier + .fillMaxWidth() + .background(MatchColors.SurfaceElevated, RoundedCornerShape(10.dp)) + .padding(horizontal = 12.dp, vertical = 10.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Column(Modifier.weight(1f)) { + Text(homeName, style = MaterialTheme.typography.labelMedium, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text("${score.homeSets} set", style = MaterialTheme.typography.labelSmall, color = MatchColors.TextSecondary) + } + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text( + "${score.homePoints} - ${score.awayPoints}", + style = MaterialTheme.typography.titleLarge, + ) + Text( + "Set ${score.currentSet} · $pointsTarget pt", + style = MaterialTheme.typography.labelSmall, + color = MatchColors.TextSecondary, + ) + } + Column(Modifier.weight(1f), horizontalAlignment = Alignment.End) { + Text(awayName, style = MaterialTheme.typography.labelMedium, maxLines = 1, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.End) + Text("${score.awaySets} set", style = MaterialTheme.typography.labelSmall, color = MatchColors.TextSecondary, textAlign = TextAlign.End) + } + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/ScoreOutcomeDialogs.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/ScoreOutcomeDialogs.kt new file mode 100644 index 0000000..4d204ad --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/broadcast/ScoreOutcomeDialogs.kt @@ -0,0 +1,95 @@ +package com.matchlivetv.match_live_tv.ui.broadcast + +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.FilledTonalButton +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import com.matchlivetv.match_live_tv.domain.ScoringSide +import com.matchlivetv.match_live_tv.ui.theme.MatchColors + +@Composable +fun SetWonDialog( + winnerName: String, + homePoints: Int, + awayPoints: Int, + onDismiss: (closeSet: Boolean) -> Unit, +) { + AlertDialog( + onDismissRequest = { onDismiss(false) }, + containerColor = MatchColors.Surface, + title = { Text("Set concluso") }, + text = { + Text( + "$winnerName vince il set $homePoints-$awayPoints.\n\n" + + "Chiudere il set e passare al successivo?", + ) + }, + confirmButton = { + FilledTonalButton(onClick = { onDismiss(true) }) { + Text("Chiudi set", color = Color.Black) + } + }, + dismissButton = { + TextButton(onClick = { onDismiss(false) }) { + Text("Continua a segnare") + } + }, + ) +} + +@Composable +fun CloseSetAnywayDialog(onDismiss: (confirmed: Boolean) -> Unit) { + AlertDialog( + onDismissRequest = { onDismiss(false) }, + containerColor = MatchColors.Surface, + title = { Text("Chiudi set") }, + text = { + Text("Il punteggio non soddisfa ancora le regole del torneo. Chiudere il set comunque?") + }, + confirmButton = { + FilledTonalButton(onClick = { onDismiss(true) }) { + Text("Chiudi comunque") + } + }, + dismissButton = { + TextButton(onClick = { onDismiss(false) }) { + Text("Annulla") + } + }, + ) +} + +@Composable +fun MatchWonDialog( + winnerName: String, + homeSets: Int, + awaySets: Int, + onDismiss: (stopStream: Boolean) -> Unit, +) { + AlertDialog( + onDismissRequest = { onDismiss(false) }, + containerColor = MatchColors.Surface, + title = { Text("Partita terminata") }, + text = { + Text( + "$winnerName vince la partita ($homeSets-$awaySets set).\n\n" + + "Chiudere definitivamente la diretta?", + ) + }, + confirmButton = { + FilledTonalButton(onClick = { onDismiss(true) }) { + Text("Chiudi diretta", color = Color.White) + } + }, + dismissButton = { + TextButton(onClick = { onDismiss(false) }) { + Text("Continua in onda") + } + }, + ) +} + +fun scoringSideName(side: ScoringSide, homeName: String, awayName: String): String = + if (side == ScoringSide.HOME) homeName else awayName diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchLiveWordmark.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchLiveWordmark.kt new file mode 100644 index 0000000..ce980cf --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchLiveWordmark.kt @@ -0,0 +1,86 @@ +package com.matchlivetv.match_live_tv.ui.components + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.matchlivetv.match_live_tv.R +import com.matchlivetv.match_live_tv.ui.theme.MatchColors + +@Composable +fun MatchLiveWordmark( + modifier: Modifier = Modifier, + compact: Boolean = false, + showSlogan: Boolean = false, + showLogo: Boolean = !compact, +) { + Column(modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally) { + if (showLogo) { + Image( + painter = painterResource(R.drawable.logo_white), + contentDescription = stringResource(R.string.app_name), + modifier = Modifier + .size(if (compact) 40.dp else 80.dp) + .padding(bottom = 16.dp), + contentScale = ContentScale.Fit, + ) + } + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + text = "MATCH", + style = MaterialTheme.typography.displaySmall, + color = Color.White, + ) + Spacer(Modifier.width(8.dp)) + Text( + text = "LIVE", + modifier = Modifier + .background(MatchColors.PrimaryRed, RoundedCornerShape(6.dp)) + .padding( + horizontal = if (compact) 8.dp else 12.dp, + vertical = if (compact) 2.dp else 4.dp, + ), + style = MaterialTheme.typography.labelLarge.copy( + color = Color.White, + fontSize = if (compact) 14.sp else 18.sp, + ), + ) + Spacer(Modifier.width(8.dp)) + Text( + text = "TV", + style = MaterialTheme.typography.displaySmall, + color = MatchColors.TextSecondary, + ) + } + if (showSlogan) { + Spacer(Modifier.padding(top = 12.dp)) + Text( + text = stringResource(R.string.app_slogan).uppercase(), + style = MaterialTheme.typography.labelLarge.copy( + color = MatchColors.TextSecondary, + fontSize = 12.sp, + fontWeight = FontWeight.Medium, + ), + textAlign = TextAlign.Center, + ) + } + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchPrimaryButton.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchPrimaryButton.kt new file mode 100644 index 0000000..36dd407 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchPrimaryButton.kt @@ -0,0 +1,47 @@ +package com.matchlivetv.match_live_tv.ui.components + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import com.matchlivetv.match_live_tv.ui.theme.MatchColors + +@Composable +fun MatchPrimaryButton( + label: String, + onClick: () -> Unit, + modifier: Modifier = Modifier, + enabled: Boolean = true, + loading: Boolean = false, +) { + Button( + onClick = onClick, + enabled = enabled && !loading, + modifier = modifier + .fillMaxWidth() + .height(52.dp), + colors = ButtonDefaults.buttonColors( + containerColor = MatchColors.PrimaryRed, + contentColor = Color.White, + disabledContainerColor = MatchColors.SurfaceElevated, + disabledContentColor = MatchColors.TextSecondary, + ), + shape = androidx.compose.foundation.shape.RoundedCornerShape(8.dp), + ) { + if (loading) { + CircularProgressIndicator( + color = Color.White, + strokeWidth = 2.dp, + modifier = Modifier.height(22.dp), + ) + } else { + Text(label, style = androidx.compose.material3.MaterialTheme.typography.labelLarge) + } + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchScreenScaffold.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchScreenScaffold.kt new file mode 100644 index 0000000..327ca48 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchScreenScaffold.kt @@ -0,0 +1,32 @@ +package com.matchlivetv.match_live_tv.ui.components + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import com.matchlivetv.match_live_tv.ui.theme.MatchColors + +@Composable +fun MatchScreenScaffold( + modifier: Modifier = Modifier, + topBar: @Composable () -> Unit = {}, + content: @Composable BoxScope.() -> Unit, +) { + Scaffold( + modifier = modifier, + containerColor = MatchColors.Background, + contentColor = Color.White, + topBar = topBar, + ) { padding -> + Box( + modifier = Modifier + .fillMaxSize() + .padding(padding), + content = content, + ) + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchSecondaryButton.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchSecondaryButton.kt new file mode 100644 index 0000000..470c3ac --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchSecondaryButton.kt @@ -0,0 +1,40 @@ +package com.matchlivetv.match_live_tv.ui.components + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.BorderStroke +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import com.matchlivetv.match_live_tv.ui.theme.MatchColors + +@Composable +fun MatchSecondaryButton( + label: String, + onClick: () -> Unit, + modifier: Modifier = Modifier, + enabled: Boolean = true, +) { + OutlinedButton( + onClick = onClick, + enabled = enabled, + modifier = modifier + .fillMaxWidth() + .height(52.dp), + colors = ButtonDefaults.outlinedButtonColors( + contentColor = Color.White, + disabledContentColor = MatchColors.TextSecondary, + ), + border = BorderStroke( + 1.dp, + if (enabled) MatchColors.Outline else MatchColors.SurfaceElevated, + ), + shape = androidx.compose.foundation.shape.RoundedCornerShape(8.dp), + ) { + Text(label, style = androidx.compose.material3.MaterialTheme.typography.labelLarge) + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchStatusBadge.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchStatusBadge.kt new file mode 100644 index 0000000..129f2b6 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/components/MatchStatusBadge.kt @@ -0,0 +1,29 @@ +package com.matchlivetv.match_live_tv.ui.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import com.matchlivetv.match_live_tv.ui.theme.MatchColors + +@Composable +fun MatchStatusBadge( + text: String, + modifier: Modifier = Modifier, + backgroundColor: Color = MatchColors.SurfaceElevated, + textColor: Color = MatchColors.AccentYellow, +) { + Text( + text = text, + modifier = modifier + .background(backgroundColor, RoundedCornerShape(6.dp)) + .padding(horizontal = 12.dp, vertical = 6.dp), + style = MaterialTheme.typography.labelLarge, + color = textColor, + ) +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/login/LoginScreen.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/login/LoginScreen.kt index f45bb4d..e4c1f8b 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/login/LoginScreen.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/login/LoginScreen.kt @@ -1,14 +1,21 @@ package com.matchlivetv.match_live_tv.ui.login -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Button +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Visibility +import androidx.compose.material.icons.filled.VisibilityOff +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -16,10 +23,20 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusDirection +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.matchlivetv.match_live_tv.data.AppContainer +import com.matchlivetv.match_live_tv.ui.components.MatchLiveWordmark +import com.matchlivetv.match_live_tv.ui.components.MatchPrimaryButton +import com.matchlivetv.match_live_tv.ui.components.MatchScreenScaffold import com.matchlivetv.match_live_tv.ui.theme.MatchColors import kotlinx.coroutines.launch @@ -32,56 +49,128 @@ fun LoginScreen( var password by remember { mutableStateOf("") } var error by remember { mutableStateOf(null) } var loading by remember { mutableStateOf(false) } + var passwordVisible by remember { mutableStateOf(false) } val scope = rememberCoroutineScope() + val focusManager = LocalFocusManager.current - Column( - modifier = Modifier - .fillMaxSize() - .padding(24.dp), - verticalArrangement = Arrangement.Center, - ) { - Text("MATCH LIVE TV", color = MatchColors.PrimaryRed) - Spacer(Modifier.height(24.dp)) - OutlinedTextField( - value = email, - onValueChange = { email = it }, - label = { Text("Email") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true, - ) - Spacer(Modifier.height(12.dp)) - OutlinedTextField( - value = password, - onValueChange = { password = it }, - label = { Text("Password") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true, - visualTransformation = PasswordVisualTransformation(), - ) - error?.let { - Spacer(Modifier.height(8.dp)) - Text(it, color = MatchColors.PrimaryRed) - } - Spacer(Modifier.height(20.dp)) - Button( - onClick = { - loading = true - error = null - scope.launch { - runCatching { - container.authRepository.login(email.trim(), password) - }.onSuccess { - onLoggedIn() - }.onFailure { - error = it.message ?: "Login fallito" - } - loading = false + fun submitLogin() { + if (loading || email.isBlank() || password.isBlank()) return + loading = true + error = null + scope.launch { + runCatching { + container.authRepository.login(email.trim(), password) + }.onSuccess { + onLoggedIn() + }.onFailure { + error = when { + it.message?.contains("401") == true -> "Email o password non corretti" + it.message?.contains("timeout", ignoreCase = true) == true -> + "Server non raggiungibile. Verifica la connessione." + else -> it.message ?: "Login fallito" } - }, - enabled = !loading && email.isNotBlank() && password.isNotBlank(), - modifier = Modifier.fillMaxWidth(), + } + loading = false + } + } + + MatchScreenScaffold { + Column( + modifier = Modifier + .verticalScroll(rememberScrollState()) + .padding(horizontal = 24.dp, vertical = 32.dp), + horizontalAlignment = Alignment.CenterHorizontally, ) { - Text(if (loading) "Accesso…" else "ACCEDI") + MatchLiveWordmark(showSlogan = true) + Spacer(Modifier.height(48.dp)) + Text( + text = "ACCEDI", + style = androidx.compose.material3.MaterialTheme.typography.headlineMedium, + ) + Spacer(Modifier.height(8.dp)) + Text( + text = "Gestisci le dirette della tua squadra", + style = androidx.compose.material3.MaterialTheme.typography.bodyMedium, + textAlign = TextAlign.Center, + ) + Spacer(Modifier.height(32.dp)) + OutlinedTextField( + value = email, + onValueChange = { email = it }, + label = { Text("Email") }, + placeholder = { Text("coach@squadra.it") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Email, + imeAction = ImeAction.Next, + ), + keyboardActions = KeyboardActions( + onNext = { focusManager.moveFocus(FocusDirection.Down) }, + ), + colors = matchTextFieldColors(), + ) + Spacer(Modifier.height(16.dp)) + OutlinedTextField( + value = password, + onValueChange = { password = it }, + label = { Text("Password") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + visualTransformation = if (passwordVisible) { + VisualTransformation.None + } else { + PasswordVisualTransformation() + }, + trailingIcon = { + IconButton(onClick = { passwordVisible = !passwordVisible }) { + Icon( + imageVector = if (passwordVisible) { + Icons.Filled.VisibilityOff + } else { + Icons.Filled.Visibility + }, + contentDescription = null, + tint = MatchColors.TextSecondary, + ) + } + }, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Password, + imeAction = ImeAction.Done, + ), + keyboardActions = KeyboardActions(onDone = { submitLogin() }), + colors = matchTextFieldColors(), + ) + error?.let { + Spacer(Modifier.height(12.dp)) + Text( + text = it, + color = MatchColors.PrimaryRed, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth(), + ) + } + Spacer(Modifier.height(32.dp)) + MatchPrimaryButton( + label = "ACCEDI", + loading = loading, + enabled = email.isNotBlank() && password.isNotBlank(), + onClick = { submitLogin() }, + ) } } } + +@Composable +private fun matchTextFieldColors() = OutlinedTextFieldDefaults.colors( + focusedTextColor = androidx.compose.ui.graphics.Color.White, + unfocusedTextColor = androidx.compose.ui.graphics.Color.White, + focusedBorderColor = MatchColors.PrimaryRed, + unfocusedBorderColor = MatchColors.Outline, + focusedLabelColor = MatchColors.PrimaryRed, + unfocusedLabelColor = MatchColors.TextSecondary, + cursorColor = MatchColors.PrimaryRed, + focusedPlaceholderColor = MatchColors.TextSecondary, + unfocusedPlaceholderColor = MatchColors.TextSecondary, +) diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/matches/MatchSheets.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/matches/MatchSheets.kt new file mode 100644 index 0000000..63f15c5 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/matches/MatchSheets.kt @@ -0,0 +1,560 @@ +package com.matchlivetv.match_live_tv.ui.matches + +import android.app.DatePickerDialog +import android.app.TimePickerDialog +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.CalendarToday +import androidx.compose.material.icons.filled.CheckCircle +import androidx.compose.material.icons.filled.ChevronRight +import androidx.compose.material.icons.filled.EventAvailable +import androidx.compose.material.icons.filled.Groups +import androidx.compose.material.icons.filled.PlayCircleOutline +import androidx.compose.material.icons.filled.RadioButtonUnchecked +import androidx.compose.material.icons.filled.Videocam +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.rememberModalBottomSheetState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.matchlivetv.match_live_tv.domain.Match +import com.matchlivetv.match_live_tv.domain.Team +import com.matchlivetv.match_live_tv.ui.components.MatchPrimaryButton +import com.matchlivetv.match_live_tv.ui.components.MatchSecondaryButton +import com.matchlivetv.match_live_tv.ui.theme.MatchColors +import java.time.Instant +import java.time.LocalDateTime +import java.time.ZoneId +import java.time.format.DateTimeFormatter +import java.util.Locale + +enum class NewMatchChoice { Schedule, QuickStart } + +data class ScheduleMatchInput( + val opponentName: String, + val scheduledAt: Instant, + val location: String?, +) + +private val sheetDateFormat = + DateTimeFormatter.ofPattern("EEE d MMM yyyy · HH:mm", Locale.ITALY) + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun NewMatchBottomSheet( + onDismiss: () -> Unit, + onChoice: (NewMatchChoice) -> Unit, +) { + ModalBottomSheet( + onDismissRequest = onDismiss, + containerColor = MatchColors.Surface, + sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), + ) { + Column(Modifier.padding(horizontal = 20.dp, vertical = 12.dp)) { + Text("Nuova partita", style = MaterialTheme.typography.headlineMedium) + Spacer(Modifier.height(6.dp)) + Text( + "Programma in anticipo o avvia la configurazione diretta subito.", + style = MaterialTheme.typography.bodyMedium, + ) + Spacer(Modifier.height(20.dp)) + SheetOptionTile( + icon = { Icon(Icons.Default.EventAvailable, null, tint = MatchColors.PrimaryRed) }, + title = "Programma partita", + subtitle = "Data, ora e avversario — visibile anche sul sito", + onClick = { onChoice(NewMatchChoice.Schedule) }, + ) + Spacer(Modifier.height(10.dp)) + SheetOptionTile( + icon = { Icon(Icons.Default.PlayCircleOutline, null, tint = MatchColors.PrimaryRed) }, + title = "Avvia subito", + subtitle = "Crea la partita e passa al wizard senza orario", + onClick = { onChoice(NewMatchChoice.QuickStart) }, + ) + Spacer(Modifier.height(24.dp)) + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ScheduleMatchBottomSheet( + teamName: String?, + onDismiss: () -> Unit, + onSubmit: (ScheduleMatchInput) -> Unit, +) { + val context = LocalContext.current + var opponent by remember { mutableStateOf("") } + var location by remember { mutableStateOf("") } + var scheduledAt by remember { + mutableStateOf( + LocalDateTime.now().plusHours(2).withMinute(0).withSecond(0).withNano(0), + ) + } + + fun pickDateTime() { + DatePickerDialog( + context, + { _, year, month, day -> + TimePickerDialog( + context, + { _, hour, minute -> + scheduledAt = LocalDateTime.of(year, month + 1, day, hour, minute) + }, + scheduledAt.hour, + scheduledAt.minute, + true, + ).show() + }, + scheduledAt.year, + scheduledAt.monthValue - 1, + scheduledAt.dayOfMonth, + ).show() + } + + ModalBottomSheet( + onDismissRequest = onDismiss, + containerColor = MatchColors.Surface, + sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), + ) { + Column(Modifier.padding(horizontal = 20.dp, vertical = 12.dp)) { + Text("Programma partita", style = MaterialTheme.typography.headlineMedium) + if (!teamName.isNullOrBlank()) { + Spacer(Modifier.height(4.dp)) + Text(teamName, color = MatchColors.PrimaryRed, style = MaterialTheme.typography.titleMedium) + } + Spacer(Modifier.height(6.dp)) + Text( + "La diretta non parte ora: comparirà sul sito con data e ora. " + + "Avvierai lo streaming dall'app quando sei in palestra.", + style = MaterialTheme.typography.bodyMedium, + ) + Spacer(Modifier.height(20.dp)) + MatchOutlinedField( + value = opponent, + onValueChange = { opponent = it }, + label = "Avversario", + ) + Spacer(Modifier.height(12.dp)) + MatchOutlinedField( + value = location, + onValueChange = { location = it }, + label = "Luogo (opzionale)", + ) + Spacer(Modifier.height(12.dp)) + Row( + Modifier + .fillMaxWidth() + .clickable { pickDateTime() } + .padding(vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Column(Modifier.weight(1f)) { + Text("Data e ora", style = MaterialTheme.typography.bodyMedium) + Text( + scheduledAt.format(sheetDateFormat), + style = MaterialTheme.typography.titleMedium, + ) + } + Icon(Icons.Default.CalendarToday, null, tint = MatchColors.PrimaryRed) + } + Spacer(Modifier.height(20.dp)) + MatchPrimaryButton( + label = "SALVA IN PROGRAMMA", + onClick = { + val name = opponent.trim() + if (name.isEmpty()) return@MatchPrimaryButton + onSubmit( + ScheduleMatchInput( + opponentName = name, + scheduledAt = scheduledAt.atZone(ZoneId.systemDefault()).toInstant(), + location = location.trim().ifBlank { null }, + ), + ) + }, + ) + Spacer(Modifier.height(24.dp)) + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SelectMatchBottomSheet( + matches: List, + onDismiss: () -> Unit, + onSelect: (Match) -> Unit, +) { + val selectable = matches.filter { !it.hasActiveSession } + val now = Instant.now() + val scheduled = selectable + .filter { it.scheduledAt != null } + .sortedBy { runCatching { Instant.parse(it.scheduledAt!!) }.getOrNull() } + val unscheduled = selectable.filter { it.scheduledAt == null } + + ModalBottomSheet( + onDismissRequest = onDismiss, + containerColor = MatchColors.Surface, + sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), + ) { + Column(Modifier.padding(horizontal = 20.dp, vertical = 12.dp)) { + Text("Scegli partita", style = MaterialTheme.typography.headlineMedium) + Spacer(Modifier.height(6.dp)) + Text( + "Partite già programmate sul sito o in app.", + style = MaterialTheme.typography.bodyMedium, + ) + Spacer(Modifier.height(16.dp)) + LazyColumn( + verticalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.height(360.dp), + ) { + if (scheduled.isNotEmpty()) { + item { Text("Programmate", style = MaterialTheme.typography.labelLarge) } + items(scheduled, key = { it.id }) { match -> + SelectMatchTile(match, now) { onSelect(match) } + } + } + if (unscheduled.isNotEmpty()) { + item { + Spacer(Modifier.height(8.dp)) + Text("Senza orario", style = MaterialTheme.typography.labelLarge) + } + items(unscheduled, key = { it.id }) { match -> + SelectMatchTile(match, now) { onSelect(match) } + } + } + } + Spacer(Modifier.height(24.dp)) + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun TeamPickerBottomSheet( + teams: List, + selectedTeamId: String?, + onDismiss: () -> Unit, + onSelect: (String) -> Unit, +) { + ModalBottomSheet( + onDismissRequest = onDismiss, + containerColor = MatchColors.Surface, + ) { + Column(Modifier.padding(bottom = 24.dp)) { + Text( + "Scegli squadra", + style = MaterialTheme.typography.headlineMedium, + modifier = Modifier.padding(horizontal = 20.dp, vertical = 16.dp), + ) + teams.forEach { team -> + val selected = team.id == selectedTeamId + Row( + Modifier + .fillMaxWidth() + .clickable { onSelect(team.id) } + .padding(horizontal = 20.dp, vertical = 14.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Icon( + if (selected) Icons.Default.CheckCircle else Icons.Default.RadioButtonUnchecked, + contentDescription = null, + tint = if (selected) MatchColors.PrimaryRed else MatchColors.TextSecondary, + ) + Spacer(Modifier.width(16.dp)) + Column { + Text(team.name, style = MaterialTheme.typography.titleMedium) + team.clubName?.takeIf { it.isNotBlank() }?.let { + Text(it, style = MaterialTheme.typography.bodyMedium) + } + } + } + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ResumeSessionBottomSheet( + match: Match, + onDismiss: () -> Unit, + onResumeCamera: () -> Unit, + onContinueSetup: () -> Unit, +) { + ModalBottomSheet( + onDismissRequest = onDismiss, + containerColor = MatchColors.Surface, + ) { + Column(Modifier.padding(horizontal = 20.dp, vertical = 16.dp)) { + Text("Diretta in corso", style = MaterialTheme.typography.headlineMedium) + Spacer(Modifier.height(4.dp)) + Text( + "${match.teamName} vs ${match.opponentName}", + style = MaterialTheme.typography.bodyMedium, + ) + match.activeSessionStatus?.let { status -> + Spacer(Modifier.height(8.dp)) + Text("Stato: $status", color = MatchColors.PrimaryRed, style = MaterialTheme.typography.labelLarge) + } + Spacer(Modifier.height(20.dp)) + if (match.canResumeCamera) { + MatchPrimaryButton(label = "RIPRENDI CAMERA E TRASMETTI", onClick = onResumeCamera) + Spacer(Modifier.height(8.dp)) + } + if (match.activeSessionStatus == "idle") { + MatchSecondaryButton(label = "CONTINUA CONFIGURAZIONE", onClick = onContinueSetup) + Spacer(Modifier.height(8.dp)) + } + TextButton(onClick = onDismiss, modifier = Modifier.fillMaxWidth()) { + Text("Annulla", color = MatchColors.TextSecondary) + } + Spacer(Modifier.height(8.dp)) + } + } +} + +@Composable +fun ConfigureScheduledMatchDialog( + onLater: () -> Unit, + onConfigure: () -> Unit, +) { + AlertDialog( + onDismissRequest = onLater, + containerColor = MatchColors.Surface, + title = { Text("Configurare ora?") }, + text = { + Text( + "Puoi preparare la trasmissione subito, oppure tornare quando sei in palestra.", + style = MaterialTheme.typography.bodyMedium, + ) + }, + confirmButton = { + TextButton(onClick = onConfigure) { + Text("Configura", color = MatchColors.PrimaryRed) + } + }, + dismissButton = { + TextButton(onClick = onLater) { + Text("Più tardi", color = MatchColors.TextSecondary) + } + }, + ) +} + +@Composable +fun DeleteMatchDialog( + match: Match, + onDismiss: () -> Unit, + onConfirm: () -> Unit, +) { + AlertDialog( + onDismissRequest = onDismiss, + containerColor = MatchColors.Surface, + title = { Text("Elimina partita") }, + text = { + Text( + "Eliminare «${match.teamName} vs ${match.opponentName}»?\n\n" + + "L'operazione non si può annullare.", + style = MaterialTheme.typography.bodyMedium, + ) + }, + confirmButton = { + TextButton(onClick = onConfirm) { + Text("Elimina", color = MatchColors.PrimaryRed) + } + }, + dismissButton = { + TextButton(onClick = onDismiss) { + Text("Annulla", color = MatchColors.TextSecondary) + } + }, + ) +} + +@Composable +private fun SheetOptionTile( + icon: @Composable () -> Unit, + title: String, + subtitle: String, + onClick: () -> Unit, +) { + Row( + Modifier + .fillMaxWidth() + .background(MatchColors.SurfaceElevated, RoundedCornerShape(12.dp)) + .clickable(onClick = onClick) + .padding(16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + icon() + Spacer(Modifier.width(14.dp)) + Column(Modifier.weight(1f)) { + Text(title, style = MaterialTheme.typography.titleMedium) + Spacer(Modifier.height(4.dp)) + Text(subtitle, style = MaterialTheme.typography.bodyMedium) + } + Icon(Icons.Default.ChevronRight, null, tint = MatchColors.TextSecondary) + } +} + +@Composable +private fun SelectMatchTile(match: Match, now: Instant, onClick: () -> Unit) { + val scheduledInstant = match.scheduledAt?.let { runCatching { Instant.parse(it) }.getOrNull() } + val isFuture = scheduledInstant?.isAfter(now) == true + Row( + Modifier + .fillMaxWidth() + .background(MatchColors.SurfaceElevated, RoundedCornerShape(10.dp)) + .clickable(onClick = onClick) + .padding(14.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Column(Modifier.weight(1f)) { + Text("${match.teamName} vs ${match.opponentName}", style = MaterialTheme.typography.titleMedium) + scheduledInstant?.let { + Text(formatMatchDate(it), style = MaterialTheme.typography.bodyMedium) + } + match.location?.takeIf { it.isNotBlank() }?.let { + Text(it, style = MaterialTheme.typography.bodyMedium) + } + } + Text( + when { + scheduledInstant == null -> "BOZZA" + isFuture -> "PROGRAMMATA" + else -> "IN CALENDARIO" + }, + style = MaterialTheme.typography.labelLarge, + color = if (isFuture) MatchColors.PrimaryRed else MatchColors.TextSecondary, + modifier = Modifier + .background( + if (isFuture) MatchColors.PrimaryRed.copy(alpha = 0.15f) else MatchColors.Surface, + RoundedCornerShape(6.dp), + ) + .padding(horizontal = 8.dp, vertical = 4.dp), + ) + } +} + +@Composable +fun TeamPickerBar( + team: Team, + showPicker: Boolean, + onClick: () -> Unit, +) { + if (!showPicker) return + Row( + Modifier + .fillMaxWidth() + .background(MatchColors.Surface, RoundedCornerShape(12.dp)) + .clickable(onClick = onClick) + .padding(horizontal = 14.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Icon(Icons.Default.Groups, null, tint = MatchColors.PrimaryRed) + Spacer(Modifier.width(12.dp)) + Column(Modifier.weight(1f)) { + Text("Squadra per la diretta", style = MaterialTheme.typography.bodyMedium) + Text(team.name, style = MaterialTheme.typography.titleMedium) + team.clubName?.takeIf { it.isNotBlank() }?.let { + Text(it, style = MaterialTheme.typography.bodyMedium) + } + } + Icon(Icons.Default.ChevronRight, null, tint = MatchColors.TextSecondary) + } +} + +@Composable +fun ActiveSessionBanner( + match: Match, + onClick: () -> Unit, +) { + Row( + Modifier + .fillMaxWidth() + .background(MatchColors.PrimaryRed.copy(alpha = 0.15f), RoundedCornerShape(12.dp)) + .clickable(onClick = onClick) + .padding(14.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Icon(Icons.Default.Videocam, null, tint = MatchColors.PrimaryRed) + Spacer(Modifier.width(12.dp)) + Column(Modifier.weight(1f)) { + Text( + "Riprendi diretta in corso", + color = MatchColors.PrimaryRed, + style = MaterialTheme.typography.titleMedium, + ) + Text("${match.teamName} vs ${match.opponentName}", style = MaterialTheme.typography.bodyMedium) + } + Icon(Icons.Default.ChevronRight, null, tint = MatchColors.PrimaryRed) + } +} + +@Composable +fun MatchOutlinedField( + value: String, + onValueChange: (String) -> Unit, + label: String, +) { + OutlinedTextField( + value = value, + onValueChange = onValueChange, + label = { Text(label) }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + colors = OutlinedTextFieldDefaults.colors( + focusedTextColor = Color.White, + unfocusedTextColor = Color.White, + focusedBorderColor = MatchColors.PrimaryRed, + unfocusedBorderColor = MatchColors.Outline, + focusedLabelColor = MatchColors.PrimaryRed, + unfocusedLabelColor = MatchColors.TextSecondary, + cursorColor = MatchColors.PrimaryRed, + ), + ) +} + +fun matchStatusLabel(match: Match): String { + if (match.canResumeCamera) return "RIPRENDI" + if (match.hasActiveSession) return "IN CORSO" + val at = match.scheduledAt?.let { runCatching { Instant.parse(it) }.getOrNull() } + if (at != null && at.isAfter(Instant.now())) return "PROGRAMMATA" + return "AVVIA" +} + +fun formatMatchDate(instant: Instant): String = + sheetDateFormat.format(instant.atZone(ZoneId.systemDefault())) + +fun formatMatchDate(iso: String?): String? = + iso?.let { runCatching { formatMatchDate(Instant.parse(it)) }.getOrNull() } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/matches/MatchesScreen.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/matches/MatchesScreen.kt index 8024af9..acf953e 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/matches/MatchesScreen.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/matches/MatchesScreen.kt @@ -1,32 +1,54 @@ package com.matchlivetv.match_live_tv.ui.matches +import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.material3.Button +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.DeleteOutline import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.Scaffold +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.matchlivetv.match_live_tv.data.AppContainer +import com.matchlivetv.match_live_tv.data.repository.MatchSessionLauncher import com.matchlivetv.match_live_tv.domain.Match -import com.matchlivetv.match_live_tv.domain.StreamSession +import com.matchlivetv.match_live_tv.domain.Team +import com.matchlivetv.match_live_tv.ui.components.MatchLiveWordmark +import com.matchlivetv.match_live_tv.ui.components.MatchPrimaryButton +import com.matchlivetv.match_live_tv.ui.components.MatchScreenScaffold +import com.matchlivetv.match_live_tv.ui.components.MatchSecondaryButton import com.matchlivetv.match_live_tv.ui.theme.MatchColors import kotlinx.coroutines.launch @@ -34,99 +56,421 @@ import kotlinx.coroutines.launch @Composable fun MatchesScreen( container: AppContainer, + onOpenSetup: (matchId: String) -> Unit, onOpenBroadcast: (sessionId: String) -> Unit, + onOpenArchive: () -> Unit, onLogout: () -> Unit, ) { - var loading by remember { mutableStateOf(true) } - var error by remember { mutableStateOf(null) } - var matches by remember { mutableStateOf>(emptyList()) } val scope = rememberCoroutineScope() + val snackbarHostState = remember { SnackbarHostState() } + val session by container.authRepository.sessionFlow.collectAsState(initial = null) + + var loading by remember { mutableStateOf(true) } + var actionLoading by remember { mutableStateOf(false) } + var error by remember { mutableStateOf(null) } + var teams by remember { mutableStateOf>(emptyList()) } + var activeTeam by remember { mutableStateOf(null) } + var matches by remember { mutableStateOf>(emptyList()) } + + var showNewMatchSheet by remember { mutableStateOf(false) } + var showScheduleSheet by remember { mutableStateOf(false) } + var showSelectMatchSheet by remember { mutableStateOf(false) } + var showTeamSheet by remember { mutableStateOf(false) } + var resumeMatch by remember { mutableStateOf(null) } + var configureMatch by remember { mutableStateOf(null) } + var deleteMatch by remember { mutableStateOf(null) } + + suspend fun showMessage(message: String) { + snackbarHostState.showSnackbar(message) + } fun reload() { loading = true error = null scope.launch { - runCatching { container.matchRepository.fetchMatches() } - .onSuccess { matches = it } - .onFailure { error = it.message ?: "Errore caricamento" } + runCatching { + val loadedTeams = container.matchRepository.fetchTeams() + teams = loadedTeams + val team = container.matchRepository.resolveActiveTeam(loadedTeams) + activeTeam = team + matches = team?.let { container.matchRepository.fetchMatchesForTeam(it.id) }.orEmpty() + }.onFailure { + error = it.message ?: "Errore caricamento" + } loading = false } } + fun openSetup(match: Match) { + onOpenSetup(match.id) + } + + fun resumeBroadcast(match: Match) { + if (actionLoading) return + actionLoading = true + scope.launch { + runCatching { + MatchSessionLauncher.resumeBroadcastSession(match, container.sessionRepository) + }.onSuccess { session -> + onOpenBroadcast(session.id) + }.onFailure { + showMessage(it.message ?: "Impossibile riprendere la diretta") + } + actionLoading = false + } + } + + fun openMatch(match: Match) { + if (match.hasActiveSession) { + resumeMatch = match + } else { + openSetup(match) + } + } + LaunchedEffect(Unit) { reload() } - fun startMatch(match: Match) { - scope.launch { - runCatching { - val session = if (match.canResumeCamera && match.activeSessionId != null) { - container.sessionRepository.fetchSession(match.activeSessionId) - } else { - val created = container.sessionRepository.createSession(match.id) - container.sessionRepository.submitNetworkTest( - sessionId = created.id, - downloadMbps = 20.0, - uploadMbps = 5.0, - latencyMs = 50, - networkType = "WiFi", - ) - container.sessionRepository.startSession(created.id) - } - session - }.onSuccess { session: StreamSession -> - onOpenBroadcast(session.id) - }.onFailure { - error = it.message ?: "Impossibile avviare la diretta" - } - } - } + val activeMatch = matches.firstOrNull { it.hasActiveSession } - Scaffold( + MatchScreenScaffold( topBar = { TopAppBar( - title = { Text("MATCH LIVE TV") }, + title = { MatchLiveWordmark(compact = true) }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MatchColors.Background, + titleContentColor = Color.White, + ), actions = { + IconButton(onClick = onOpenArchive) { + Text("Archivio", color = MatchColors.TextSecondary) + } IconButton(onClick = { scope.launch { container.authRepository.logout() onLogout() } }) { - Text("Esci") + Text("Esci", color = MatchColors.TextSecondary) } }, ) }, - ) { padding -> - Column( - Modifier - .fillMaxSize() - .padding(padding) - .padding(16.dp), - ) { + ) { + Box(Modifier.fillMaxSize()) { when { - loading -> CircularProgressIndicator(color = MatchColors.PrimaryRed) - error != null -> { - Text(error!!, color = MatchColors.PrimaryRed) - Button(onClick = { reload() }) { Text("Riprova") } + loading -> Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator(color = MatchColors.PrimaryRed) } - matches.isEmpty() -> Text("Nessuna partita in programma") - else -> LazyColumn(verticalArrangement = Arrangement.spacedBy(8.dp)) { - items(matches, key = { it.id }) { match -> - Column( - Modifier - .fillMaxWidth() - .clickable { startMatch(match) } - .padding(12.dp), - ) { - Text("${match.teamName} vs ${match.opponentName}") + teams.isEmpty() -> NoTeamContent(onRetry = { reload() }) + error != null -> Column( + Modifier + .fillMaxSize() + .padding(24.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text(error!!, color = MatchColors.PrimaryRed, textAlign = TextAlign.Center) + Spacer(Modifier.height(16.dp)) + MatchPrimaryButton(label = "RIPROVA", onClick = { reload() }) + } + else -> LazyColumn( + contentPadding = PaddingValues(bottom = 24.dp), + ) { + item { + Column(Modifier.padding(horizontal = 20.dp, vertical = 8.dp)) { Text( - if (match.canResumeCamera) "Riprendi diretta" else "Vai in diretta", - color = MatchColors.AccentYellow, + "Ciao, ${session?.user?.name.orEmpty()}", + style = MaterialTheme.typography.headlineMedium, + ) + Spacer(Modifier.height(4.dp)) + Text( + "Scegli una partita programmata o creane una nuova.", + style = MaterialTheme.typography.bodyMedium, + ) + Spacer(Modifier.height(16.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + MatchSecondaryButton( + label = "PARTITA PROGRAMMATA", + onClick = { + val selectable = matches.filter { !it.hasActiveSession } + if (selectable.isEmpty()) { + scope.launch { + showMessage("Nessuna partita disponibile. Crea una nuova partita.") + } + } else { + showSelectMatchSheet = true + } + }, + modifier = Modifier.weight(1f), + ) + MatchPrimaryButton( + label = "NUOVA PARTITA", + onClick = { showNewMatchSheet = true }, + modifier = Modifier.weight(1f), + ) + } + Spacer(Modifier.height(8.dp)) + activeTeam?.let { team -> + TeamPickerBar( + team = team, + showPicker = teams.size > 1, + onClick = { showTeamSheet = true }, + ) + } + activeMatch?.let { match -> + Spacer(Modifier.height(12.dp)) + ActiveSessionBanner(match) { resumeMatch = match } + } + } + } + item { + Text( + if (matches.isEmpty()) "Calendario vuoto" else "Calendario", + style = MaterialTheme.typography.labelLarge, + color = MatchColors.TextSecondary, + modifier = Modifier.padding(horizontal = 20.dp, vertical = 8.dp), + ) + } + if (matches.isEmpty()) { + item { + Text( + "Nessuna partita ancora. Usa «Nuova partita» per programmare o avviare subito.", + style = MaterialTheme.typography.bodyMedium, + textAlign = TextAlign.Center, + modifier = Modifier.padding(horizontal = 24.dp, vertical = 12.dp), + ) + } + } else { + items(matches, key = { it.id }) { match -> + MatchListCard( + match = match, + onClick = { openMatch(match) }, + onDelete = if (match.canResumeCamera) null else { + { deleteMatch = match } + }, ) } } } } + + if (actionLoading) { + Box( + Modifier + .fillMaxSize() + .background(Color.Black.copy(alpha = 0.35f)), + contentAlignment = Alignment.Center, + ) { + CircularProgressIndicator(color = MatchColors.PrimaryRed) + } + } + + SnackbarHost( + hostState = snackbarHostState, + modifier = Modifier.align(Alignment.BottomCenter), + ) + } + } + + if (showNewMatchSheet) { + NewMatchBottomSheet( + onDismiss = { showNewMatchSheet = false }, + onChoice = { choice -> + showNewMatchSheet = false + when (choice) { + NewMatchChoice.Schedule -> showScheduleSheet = true + NewMatchChoice.QuickStart -> { + val teamId = activeTeam?.id ?: return@NewMatchBottomSheet + actionLoading = true + scope.launch { + runCatching { container.matchRepository.createQuickMatch(teamId) } + .onSuccess { match -> + reload() + openSetup(match) + } + .onFailure { + showMessage(it.message ?: "Impossibile creare la partita") + } + actionLoading = false + } + } + } + }, + ) + } + + if (showScheduleSheet) { + ScheduleMatchBottomSheet( + teamName = activeTeam?.name, + onDismiss = { showScheduleSheet = false }, + onSubmit = { input -> + showScheduleSheet = false + val teamId = activeTeam?.id ?: return@ScheduleMatchBottomSheet + actionLoading = true + scope.launch { + runCatching { + container.matchRepository.createScheduledMatch( + teamId = teamId, + opponentName = input.opponentName, + scheduledAt = input.scheduledAt, + location = input.location, + ) + }.onSuccess { match -> + reload() + showMessage("Partita programmata — visibile sul sito") + configureMatch = match + }.onFailure { + showMessage(it.message ?: "Errore creazione partita") + } + actionLoading = false + } + }, + ) + } + + if (showSelectMatchSheet) { + SelectMatchBottomSheet( + matches = matches, + onDismiss = { showSelectMatchSheet = false }, + onSelect = { match -> + showSelectMatchSheet = false + openMatch(match) + }, + ) + } + + if (showTeamSheet) { + TeamPickerBottomSheet( + teams = teams, + selectedTeamId = activeTeam?.id, + onDismiss = { showTeamSheet = false }, + onSelect = { teamId -> + showTeamSheet = false + scope.launch { + container.matchRepository.selectTeam(teamId) + reload() + } + }, + ) + } + + resumeMatch?.let { match -> + ResumeSessionBottomSheet( + match = match, + onDismiss = { resumeMatch = null }, + onResumeCamera = { + resumeMatch = null + resumeBroadcast(match) + }, + onContinueSetup = { + resumeMatch = null + openSetup(match) + }, + ) + } + + configureMatch?.let { match -> + ConfigureScheduledMatchDialog( + onLater = { configureMatch = null }, + onConfigure = { + configureMatch = null + openMatch(match) + }, + ) + } + + deleteMatch?.let { match -> + DeleteMatchDialog( + match = match, + onDismiss = { deleteMatch = null }, + onConfirm = { + deleteMatch = null + scope.launch { + runCatching { container.matchRepository.deleteMatch(match.id) } + .onSuccess { + reload() + showMessage("Partita eliminata") + } + .onFailure { + showMessage(it.message ?: "Impossibile eliminare") + } + } + }, + ) + } +} + +@Composable +private fun NoTeamContent(onRetry: () -> Unit) { + Column( + Modifier + .fillMaxSize() + .padding(24.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + "Nessuna squadra assegnata", + style = MaterialTheme.typography.headlineMedium, + textAlign = TextAlign.Center, + ) + Spacer(Modifier.height(8.dp)) + Text( + "Per trasmettere devi essere responsabile della trasmissione di almeno una squadra. " + + "Chiedi al tuo club di aggiungerti come staff trasmissione.", + style = MaterialTheme.typography.bodyMedium, + textAlign = TextAlign.Center, + ) + Spacer(Modifier.height(16.dp)) + MatchPrimaryButton(label = "RIPROVA", onClick = onRetry) + } +} + +@Composable +private fun MatchListCard( + match: Match, + onClick: () -> Unit, + onDelete: (() -> Unit)?, +) { + val status = matchStatusLabel(match) + val hasSession = match.hasActiveSession + Row( + Modifier + .padding(horizontal = 20.dp, vertical = 6.dp) + .fillMaxWidth() + .background(MatchColors.Surface, RoundedCornerShape(12.dp)) + .clickable(onClick = onClick) + .padding(16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Column(Modifier.weight(1f)) { + Text( + "${match.teamName} vs ${match.opponentName}", + style = MaterialTheme.typography.titleMedium, + ) + Spacer(Modifier.height(4.dp)) + formatMatchDate(match.scheduledAt)?.let { + Text(it, style = MaterialTheme.typography.bodyMedium) + } + match.location?.takeIf { it.isNotBlank() }?.let { + Text(it, style = MaterialTheme.typography.bodyMedium) + } + } + Text( + status, + style = MaterialTheme.typography.labelLarge, + color = if (hasSession) MatchColors.PrimaryRed else MatchColors.TextSecondary, + modifier = Modifier + .background( + if (hasSession) MatchColors.PrimaryRed.copy(alpha = 0.2f) else MatchColors.SurfaceElevated, + RoundedCornerShape(8.dp), + ) + .padding(horizontal = 10.dp, vertical = 4.dp), + ) + if (onDelete != null) { + IconButton(onClick = onDelete) { + Icon(Icons.Default.DeleteOutline, null, tint = MatchColors.TextSecondary) + } } } } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/navigation/AppNavHost.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/navigation/AppNavHost.kt index ec9b87a..ebe2382 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/navigation/AppNavHost.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/navigation/AppNavHost.kt @@ -7,10 +7,12 @@ import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import androidx.navigation.navArgument import com.matchlivetv.match_live_tv.data.AppContainer +import com.matchlivetv.match_live_tv.ui.archive.ArchiveScreen import com.matchlivetv.match_live_tv.ui.broadcast.BroadcastScreen import com.matchlivetv.match_live_tv.ui.login.LoginScreen import com.matchlivetv.match_live_tv.ui.matches.MatchesScreen import com.matchlivetv.match_live_tv.ui.splash.SplashScreen +import com.matchlivetv.match_live_tv.ui.wizard.WizardShellScreen @Composable fun AppNavHost(container: AppContainer) { @@ -42,9 +44,15 @@ fun AppNavHost(container: AppContainer) { composable(Routes.Matches) { MatchesScreen( container = container, + onOpenSetup = { matchId -> + navController.navigate(Routes.setup(matchId, 1)) + }, onOpenBroadcast = { sessionId -> navController.navigate(Routes.broadcast(sessionId)) }, + onOpenArchive = { + navController.navigate(Routes.Archive) + }, onLogout = { navController.navigate(Routes.Login) { popUpTo(Routes.Matches) { inclusive = true } @@ -52,6 +60,49 @@ fun AppNavHost(container: AppContainer) { }, ) } + composable(Routes.Archive) { + ArchiveScreen( + container = container, + onBack = { + navController.navigate(Routes.Matches) { + popUpTo(Routes.Matches) { inclusive = false } + launchSingleTop = true + } + }, + ) + } + composable( + route = Routes.Setup, + arguments = listOf( + navArgument("matchId") { type = NavType.StringType }, + navArgument("step") { type = NavType.IntType }, + ), + ) { entry -> + val matchId = entry.arguments?.getString("matchId") ?: return@composable + val step = entry.arguments?.getInt("step") ?: 1 + WizardShellScreen( + container = container, + matchId = matchId, + step = step, + onClose = { + container.wizardSession.clear() + navController.navigate(Routes.Matches) { + popUpTo(Routes.Matches) { inclusive = false } + launchSingleTop = true + } + }, + onGoToStep = { nextStep -> + navController.navigate(Routes.setup(matchId, nextStep)) { + popUpTo(Routes.setup(matchId, step)) { inclusive = true } + } + }, + onStartLive = { session -> + navController.navigate(Routes.broadcast(session.id)) { + popUpTo(Routes.Matches) { inclusive = false } + } + }, + ) + } composable( route = Routes.Broadcast, arguments = listOf(navArgument("sessionId") { type = NavType.StringType }), @@ -61,7 +112,11 @@ fun AppNavHost(container: AppContainer) { container = container, sessionId = sessionId, onFinished = { - navController.popBackStack() + container.wizardSession.clear() + navController.navigate(Routes.Matches) { + popUpTo(Routes.Matches) { inclusive = false } + launchSingleTop = true + } }, ) } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/navigation/Routes.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/navigation/Routes.kt index 6c03074..764e282 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/navigation/Routes.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/navigation/Routes.kt @@ -4,7 +4,10 @@ object Routes { const val Splash = "splash" const val Login = "login" const val Matches = "matches" + const val Archive = "archive" + const val Setup = "setup/{matchId}/{step}" const val Broadcast = "broadcast/{sessionId}" + fun setup(matchId: String, step: Int = 1) = "setup/$matchId/$step" fun broadcast(sessionId: String) = "broadcast/$sessionId" } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/permissions/BroadcastPermissions.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/permissions/BroadcastPermissions.kt new file mode 100644 index 0000000..5868d7c --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/permissions/BroadcastPermissions.kt @@ -0,0 +1,61 @@ +package com.matchlivetv.match_live_tv.ui.permissions + +import android.Manifest +import android.content.pm.PackageManager +import android.os.Build +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import androidx.core.content.ContextCompat + +@Composable +fun rememberBroadcastPermissionsState(): BroadcastPermissionsState { + val context = LocalContext.current + var granted by remember { + mutableStateOf(hasBroadcastPermissions(context)) + } + + val launcher = rememberLauncherForActivityResult( + ActivityResultContracts.RequestMultiplePermissions(), + ) { results -> + granted = results.values.all { it } + } + + LaunchedEffect(Unit) { + if (!granted) { + launcher.launch(requiredPermissions()) + } + } + + return BroadcastPermissionsState( + granted = granted, + request = { launcher.launch(requiredPermissions()) }, + ) +} + +data class BroadcastPermissionsState( + val granted: Boolean, + val request: () -> Unit, +) + +private fun requiredPermissions(): Array { + val permissions = mutableListOf( + Manifest.permission.CAMERA, + Manifest.permission.RECORD_AUDIO, + ) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + permissions.add(Manifest.permission.POST_NOTIFICATIONS) + } + return permissions.toTypedArray() +} + +private fun hasBroadcastPermissions(context: android.content.Context): Boolean = + requiredPermissions().all { + ContextCompat.checkSelfPermission(context, it) == PackageManager.PERMISSION_GRANTED + } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/splash/SplashScreen.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/splash/SplashScreen.kt index cf245c9..ec4b5fe 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/splash/SplashScreen.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/splash/SplashScreen.kt @@ -2,13 +2,16 @@ package com.matchlivetv.match_live_tv.ui.splash import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp import com.matchlivetv.match_live_tv.data.AppContainer +import com.matchlivetv.match_live_tv.ui.components.MatchLiveWordmark +import com.matchlivetv.match_live_tv.ui.components.MatchScreenScaffold import com.matchlivetv.match_live_tv.ui.theme.MatchColors @Composable @@ -23,8 +26,18 @@ fun SplashScreen( if (session != null) onAuthenticated() else onUnauthenticated() } - Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { - CircularProgressIndicator(color = MatchColors.PrimaryRed) - Text("MATCH LIVE TV", modifier = Modifier.align(Alignment.BottomCenter)) + MatchScreenScaffold { + Box(Modifier.fillMaxSize()) { + MatchLiveWordmark( + modifier = Modifier.align(Alignment.Center), + showSlogan = true, + ) + CircularProgressIndicator( + color = MatchColors.PrimaryRed, + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(bottom = 48.dp), + ) + } } } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/theme/AppTheme.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/theme/AppTheme.kt index c6c7373..64639f3 100644 --- a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/theme/AppTheme.kt +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/theme/AppTheme.kt @@ -1,13 +1,19 @@ package com.matchlivetv.match_live_tv.ui.theme +import android.app.Activity +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Typography +import androidx.compose.material3.darkColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalView import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -import androidx.compose.material3.Typography -import androidx.compose.material3.darkColorScheme -import androidx.compose.material3.MaterialTheme +import androidx.core.view.WindowCompat object MatchColors { val PrimaryRed = Color(0xFFFF2D2D) @@ -17,28 +23,42 @@ object MatchColors { val AccentYellow = Color(0xFFF5C518) val SuccessGreen = Color(0xFF22C55E) val TextSecondary = Color(0xFF9CA3AF) + val Outline = Color(0xFF404040) } private val DarkScheme = darkColorScheme( primary = MatchColors.PrimaryRed, onPrimary = Color.White, + secondary = MatchColors.AccentYellow, + onSecondary = Color.Black, background = MatchColors.Background, onBackground = Color.White, surface = MatchColors.Surface, onSurface = Color.White, - secondary = MatchColors.AccentYellow, + surfaceVariant = MatchColors.SurfaceElevated, + onSurfaceVariant = MatchColors.TextSecondary, + outline = MatchColors.Outline, + error = MatchColors.PrimaryRed, ) -private val Typography = Typography( +private val MatchTypography = Typography( + displaySmall = TextStyle( + fontFamily = FontFamily.SansSerif, + fontWeight = FontWeight.Black, + fontSize = 28.sp, + letterSpacing = 1.sp, + ), headlineMedium = TextStyle( fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.Bold, fontSize = 24.sp, + color = Color.White, ), titleMedium = TextStyle( fontFamily = FontFamily.SansSerif, fontWeight = FontWeight.SemiBold, fontSize = 18.sp, + color = Color.White, ), bodyMedium = TextStyle( fontFamily = FontFamily.SansSerif, @@ -46,13 +66,33 @@ private val Typography = Typography( fontSize = 14.sp, color = MatchColors.TextSecondary, ), + labelLarge = TextStyle( + fontFamily = FontFamily.SansSerif, + fontWeight = FontWeight.ExtraBold, + fontSize = 14.sp, + letterSpacing = 1.2.sp, + ), ) -@androidx.compose.runtime.Composable -fun MatchLiveTheme(content: @androidx.compose.runtime.Composable () -> Unit) { +@Composable +fun MatchLiveTheme(content: @Composable () -> Unit) { + val colorScheme = DarkScheme + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = MatchColors.Background.toArgb() + window.navigationBarColor = MatchColors.Background.toArgb() + WindowCompat.getInsetsController(window, view).apply { + isAppearanceLightStatusBars = false + isAppearanceLightNavigationBars = false + } + } + } + MaterialTheme( - colorScheme = DarkScheme, - typography = Typography, + colorScheme = colorScheme, + typography = MatchTypography, content = content, ) } diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepMatchScreen.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepMatchScreen.kt new file mode 100644 index 0000000..474bd43 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepMatchScreen.kt @@ -0,0 +1,199 @@ +package com.matchlivetv.match_live_tv.ui.wizard + +import android.app.DatePickerDialog +import android.app.TimePickerDialog +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.CalendarToday +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.unit.dp +import com.matchlivetv.match_live_tv.data.AppContainer +import com.matchlivetv.match_live_tv.data.api.ScoringRulesBody +import com.matchlivetv.match_live_tv.domain.Match +import com.matchlivetv.match_live_tv.ui.components.MatchPrimaryButton +import com.matchlivetv.match_live_tv.ui.components.MatchSecondaryButton +import com.matchlivetv.match_live_tv.ui.matches.MatchOutlinedField +import com.matchlivetv.match_live_tv.ui.matches.formatMatchDate +import com.matchlivetv.match_live_tv.ui.theme.MatchColors +import kotlinx.coroutines.launch +import java.time.Instant +import java.time.LocalDateTime +import java.time.ZoneId + +@Composable +fun StepMatchScreen( + container: AppContainer, + match: Match, + onNext: () -> Unit, + onError: (String) -> Unit, +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + var opponent by remember { mutableStateOf(match.opponentName) } + var location by remember { mutableStateOf(match.location.orEmpty()) } + var category by remember { mutableStateOf(match.category.orEmpty()) } + var phase by remember { mutableStateOf(match.phase.orEmpty()) } + var roster by remember { mutableStateOf(match.rosterNumbers.joinToString(", ")) } + var setsToWin by remember { mutableIntStateOf(match.setsToWin) } + var customRules by remember { mutableStateOf(false) } + var pointsPerSet by remember { mutableIntStateOf(25) } + var pointsDecidingSet by remember { mutableIntStateOf(15) } + var minPointLead by remember { mutableIntStateOf(2) } + var scheduledAt by remember { + mutableStateOf(match.scheduledAt?.let { runCatching { Instant.parse(it) }.getOrNull() }) + } + var saving by remember { mutableStateOf(false) } + + fun pickDateTime() { + val initial = scheduledAt?.atZone(ZoneId.systemDefault())?.toLocalDateTime() + ?: LocalDateTime.now().plusHours(2) + DatePickerDialog( + context, + { _, year, month, day -> + TimePickerDialog( + context, + { _, hour, minute -> + scheduledAt = LocalDateTime.of(year, month + 1, day, hour, minute) + .atZone(ZoneId.systemDefault()).toInstant() + }, + initial.hour, + initial.minute, + true, + ).show() + }, + initial.year, + initial.monthValue - 1, + initial.dayOfMonth, + ).show() + } + + Column( + Modifier + .verticalScroll(rememberScrollState()) + .padding(horizontal = 20.dp, vertical = 12.dp), + ) { + Text("Dettagli partita", style = MaterialTheme.typography.headlineMedium) + Spacer(Modifier.height(20.dp)) + WizardReadOnlyField(label = "Squadra casa", value = match.teamName) + Spacer(Modifier.height(12.dp)) + MatchOutlinedField(value = opponent, onValueChange = { opponent = it }, label = "Avversario") + Spacer(Modifier.height(12.dp)) + MatchOutlinedField(value = location, onValueChange = { location = it }, label = "Luogo") + Spacer(Modifier.height(12.dp)) + Row( + Modifier + .fillMaxWidth() + .padding(vertical = 8.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Column { + Text("Orario", style = MaterialTheme.typography.bodyMedium) + Text( + scheduledAt?.let { formatMatchDate(it) } ?: "Seleziona data e ora", + style = MaterialTheme.typography.titleMedium, + ) + } + Icon(Icons.Default.CalendarToday, null, tint = MatchColors.PrimaryRed, modifier = Modifier + .padding(8.dp) + .then(Modifier)) + } + MatchSecondaryButton(label = "SCEGLI DATA E ORA", onClick = { pickDateTime() }) + Spacer(Modifier.height(12.dp)) + Text("Set da vincere", style = MaterialTheme.typography.bodyMedium) + Spacer(Modifier.height(8.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + listOf(2, 3).forEach { value -> + MatchSecondaryButton( + label = value.toString(), + onClick = { setsToWin = value }, + modifier = Modifier.weight(1f), + ) + } + } + Spacer(Modifier.height(12.dp)) + Row( + Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Column(Modifier.weight(1f)) { + Text("Regole punteggio personalizzate") + Text( + "Per tornei non standard", + style = MaterialTheme.typography.bodyMedium, + ) + } + Switch(checked = customRules, onCheckedChange = { customRules = it }) + } + Spacer(Modifier.height(12.dp)) + MatchOutlinedField(value = category, onValueChange = { category = it }, label = "Categoria") + Spacer(Modifier.height(12.dp)) + MatchOutlinedField(value = phase, onValueChange = { phase = it }, label = "Fase (es. semifinale)") + Spacer(Modifier.height(12.dp)) + MatchOutlinedField( + value = roster, + onValueChange = { roster = it }, + label = "Convocate (numeri maglia)", + ) + Spacer(Modifier.height(32.dp)) + MatchPrimaryButton( + label = "AVANTI >", + loading = saving, + onClick = { + if (opponent.isBlank()) { + onError("Inserisci il nome avversario") + return@MatchPrimaryButton + } + saving = true + scope.launch { + runCatching { + container.matchRepository.updateMatch( + matchId = match.id, + opponentName = opponent.trim(), + location = location.trim(), + scheduledAt = scheduledAt?.toString(), + setsToWin = setsToWin, + category = category.trim(), + phase = phase.trim(), + rosterNumbers = roster.split(',', ' ', ';') + .mapNotNull { it.trim().toIntOrNull() }, + scoringRules = if (customRules) { + ScoringRulesBody(pointsPerSet, pointsDecidingSet, minPointLead) + } else { + null + }, + ) + }.onSuccess { updated -> + container.wizardSession.match = updated + onNext() + }.onFailure { + onError(it.message ?: "Errore nel salvataggio") + } + saving = false + } + }, + ) + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepNetworkTestScreen.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepNetworkTestScreen.kt new file mode 100644 index 0000000..3464cb1 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepNetworkTestScreen.kt @@ -0,0 +1,242 @@ +package com.matchlivetv.match_live_tv.ui.wizard + +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.content.Intent +import com.matchlivetv.match_live_tv.core.DeviceTelemetry +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.matchlivetv.match_live_tv.data.AppContainer +import com.matchlivetv.match_live_tv.domain.Match +import com.matchlivetv.match_live_tv.domain.StreamSession +import com.matchlivetv.match_live_tv.ui.components.MatchPrimaryButton +import com.matchlivetv.match_live_tv.ui.components.MatchSecondaryButton +import com.matchlivetv.match_live_tv.ui.theme.MatchColors +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlin.random.Random + +@Composable +fun StepNetworkTestScreen( + container: AppContainer, + match: Match, + session: StreamSession, + onBack: () -> Unit, + onStartLive: (StreamSession) -> Unit, + onError: (String) -> Unit, +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + var testing by remember { mutableStateOf(false) } + var testCompleted by remember { mutableStateOf(false) } + var ready by remember { mutableStateOf(false) } + var downloadMbps by remember { mutableStateOf(0.0) } + var uploadMbps by remember { mutableStateOf(0.0) } + var latencyMs by remember { mutableStateOf(0) } + var networkType by remember { mutableStateOf("—") } + var starting by remember { mutableStateOf(false) } + var currentSession by remember { mutableStateOf(session) } + + LaunchedEffect(session.id) { + if (session.platform == "youtube" && !session.youtubeReady) { + repeat(20) { + delay(3000) + val updated = runCatching { container.sessionRepository.fetchSession(session.id) }.getOrNull() + if (updated != null) { + currentSession = updated + container.wizardSession.setSession(updated, match) + if (updated.youtubeReady || !updated.youtubeWatchUrl.isNullOrBlank()) return@LaunchedEffect + } + } + } + } + + fun runTest() { + testing = true + ready = false + scope.launch { + networkType = DeviceTelemetry.networkType(context) + delay(2000) + val rng = Random.Default + downloadMbps = 8 + rng.nextDouble() * 12 + uploadMbps = 2 + rng.nextDouble() * 4 + latencyMs = 20 + rng.nextInt(80) + val result = runCatching { + container.sessionRepository.submitNetworkTest( + sessionId = currentSession.id, + downloadMbps = downloadMbps, + uploadMbps = uploadMbps, + latencyMs = latencyMs, + networkType = networkType, + ) + }.getOrNull() + ready = result?.ready ?: (uploadMbps >= 2.0) + testCompleted = true + testing = false + } + } + + val shareUrl = currentSession.watchShareUrl() + + Column( + Modifier + .verticalScroll(rememberScrollState()) + .padding(horizontal = 20.dp, vertical = 12.dp), + ) { + Text("Test rete", style = MaterialTheme.typography.headlineMedium) + Spacer(Modifier.height(8.dp)) + Text( + "Verifica che la connessione regga l'upload della diretta.", + style = MaterialTheme.typography.bodyMedium, + ) + Spacer(Modifier.height(24.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + MetricCard( + label = "Download", + value = if (testing) "..." else "${"%.1f".format(downloadMbps)} Mbps", + modifier = Modifier.weight(1f), + ) + MetricCard( + label = "Upload", + value = if (testing) "..." else "${"%.1f".format(uploadMbps)} Mbps", + highlight = ready, + modifier = Modifier.weight(1f), + ) + MetricCard( + label = "Latenza", + value = if (testing) "..." else "$latencyMs ms", + modifier = Modifier.weight(1f), + ) + } + Spacer(Modifier.height(12.dp)) + MetricCard(label = "Tipo rete", value = networkType, modifier = Modifier.fillMaxWidth()) + if (testCompleted && ready) { + Spacer(Modifier.height(20.dp)) + Text( + "PRONTO PER ANDARE IN DIRETTA", + color = MatchColors.SuccessGreen, + style = MaterialTheme.typography.titleMedium, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth(), + ) + } + if (testCompleted && shareUrl != null) { + Spacer(Modifier.height(16.dp)) + WizardReadOnlyField( + label = if (currentSession.platform == "youtube") "Link YouTube" else "Link diretta", + value = shareUrl, + ) + Spacer(Modifier.height(8.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + MatchSecondaryButton( + label = "COPIA", + onClick = { copyToClipboard(context, shareUrl) }, + modifier = Modifier.weight(1f), + ) + MatchSecondaryButton( + label = "CONDIVIDI", + onClick = { + context.startActivity( + Intent.createChooser( + Intent(Intent.ACTION_SEND).apply { + type = "text/plain" + putExtra(Intent.EXTRA_TEXT, shareUrl) + putExtra( + Intent.EXTRA_SUBJECT, + "Diretta — ${match.teamName} vs ${match.opponentName}", + ) + }, + "Condividi diretta", + ), + ) + }, + modifier = Modifier.weight(1f), + ) + } + Spacer(Modifier.height(8.dp)) + MatchSecondaryButton( + label = "CONDIVIDI LINK REGIA", + onClick = { + scope.launch { + runCatching { container.sessionRepository.createRegiaLink(currentSession.id) } + .onSuccess { url -> + context.startActivity( + Intent.createChooser( + Intent(Intent.ACTION_SEND).apply { + type = "text/plain" + putExtra(Intent.EXTRA_TEXT, url) + }, + "Condividi regia", + ), + ) + } + .onFailure { onError(it.message ?: "Errore link regia") } + } + }, + ) + } + if (!testCompleted) { + Spacer(Modifier.height(24.dp)) + MatchSecondaryButton( + label = if (testing) "TEST IN CORSO..." else "AVVIA TEST RETE", + enabled = !testing, + onClick = { runTest() }, + ) + } + Spacer(Modifier.height(32.dp)) + Row { + MatchSecondaryButton( + label = "Indietro", + onClick = onBack, + enabled = !starting, + modifier = Modifier.weight(1f), + ) + Spacer(Modifier.width(12.dp)) + MatchPrimaryButton( + label = "INIZIA >", + loading = starting, + enabled = ready, + onClick = { + starting = true + scope.launch { + runCatching { container.sessionRepository.startSession(currentSession.id) } + .onSuccess { started -> + container.wizardSession.setSession(started, match) + onStartLive(started) + } + .onFailure { onError(it.message ?: "Errore avvio diretta") } + starting = false + } + }, + modifier = Modifier.weight(2f), + ) + } + } +} + +private fun copyToClipboard(context: Context, text: String) { + val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + clipboard.setPrimaryClip(ClipData.newPlainText("link", text)) +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepTransmissionScreen.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepTransmissionScreen.kt new file mode 100644 index 0000000..72f1083 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/StepTransmissionScreen.kt @@ -0,0 +1,165 @@ +package com.matchlivetv.match_live_tv.ui.wizard + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.matchlivetv.match_live_tv.data.AppContainer +import com.matchlivetv.match_live_tv.domain.Match +import com.matchlivetv.match_live_tv.domain.Team +import com.matchlivetv.match_live_tv.ui.components.MatchPrimaryButton +import com.matchlivetv.match_live_tv.ui.components.MatchSecondaryButton +import com.matchlivetv.match_live_tv.ui.theme.MatchColors +import kotlinx.coroutines.launch + +@Composable +fun StepTransmissionScreen( + container: AppContainer, + match: Match, + onBack: () -> Unit, + onNext: () -> Unit, + onError: (String) -> Unit, +) { + val scope = rememberCoroutineScope() + var team by remember { mutableStateOf(null) } + var loadingTeam by remember { mutableStateOf(true) } + var platform by remember { mutableStateOf("matchlivetv") } + var privacy by remember { mutableStateOf("public") } + var youtubeChannel by remember { mutableStateOf("platform") } + var creating by remember { mutableStateOf(false) } + + LaunchedEffect(match.teamId) { + loadingTeam = true + team = runCatching { container.matchRepository.fetchTeam(match.teamId) }.getOrNull() + loadingTeam = false + } + + if (loadingTeam) { + CircularProgressIndicator(color = MatchColors.PrimaryRed, modifier = Modifier.padding(48.dp)) + return + } + + val youtubeReady = team?.isYoutubeReady == true + + Column( + Modifier + .verticalScroll(rememberScrollState()) + .padding(horizontal = 20.dp, vertical = 12.dp), + ) { + team?.planName?.let { plan -> + Text( + "Piano $plan", + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier + .fillMaxWidth() + .padding(bottom = 12.dp), + ) + } + Text("Piattaforma", style = MaterialTheme.typography.headlineMedium) + Spacer(Modifier.height(12.dp)) + WizardPlatformCard( + title = "Match Live TV", + subtitle = "Diretta sul nostro sito (incluso)", + selected = platform == "matchlivetv", + onClick = { platform = "matchlivetv" }, + ) + Spacer(Modifier.height(8.dp)) + WizardPlatformCard( + title = "YouTube Live", + subtitle = when { + team?.canUseYoutube != true -> "Premium Light o Full" + !youtubeReady -> "Canale in attivazione" + else -> "Canale YouTube collegato" + }, + selected = platform == "youtube", + enabled = youtubeReady, + badge = if (team?.canUseYoutube != true) "Premium" else null, + onClick = { + if (youtubeReady) { + platform = "youtube" + youtubeChannel = "platform" + } else { + onError("YouTube non disponibile per questa squadra") + } + }, + ) + Spacer(Modifier.height(24.dp)) + Text("Visibilità", style = MaterialTheme.typography.headlineMedium) + Spacer(Modifier.height(12.dp)) + Row(horizontalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(8.dp)) { + MatchSecondaryButton( + label = "PUBBLICO", + onClick = { privacy = "public" }, + modifier = Modifier.weight(1f), + ) + MatchSecondaryButton( + label = "NON IN ELENCO", + onClick = { privacy = "unlisted" }, + modifier = Modifier.weight(1f), + ) + } + Spacer(Modifier.height(8.dp)) + Text( + if (privacy == "public") { + "Compare nell'elenco dirette e sul canale scelto." + } else { + "Solo chi ha il link." + }, + style = MaterialTheme.typography.bodyMedium, + ) + Spacer(Modifier.height(24.dp)) + Text("Qualità", style = MaterialTheme.typography.headlineMedium) + Spacer(Modifier.height(12.dp)) + WizardReadOnlyField(label = "Preset", value = "720p · 30fps · 2.5 Mbps") + Spacer(Modifier.height(32.dp)) + Row { + MatchSecondaryButton( + label = "Indietro", + onClick = onBack, + modifier = Modifier.weight(1f), + ) + Spacer(Modifier.width(12.dp)) + MatchPrimaryButton( + label = "AVANTI >", + loading = creating, + onClick = { + creating = true + scope.launch { + runCatching { + container.sessionRepository.createSession( + matchId = match.id, + platform = platform, + privacyStatus = privacy, + youtubeChannel = if (platform == "youtube") youtubeChannel else null, + ) + }.onSuccess { session -> + container.wizardSession.setSession(session, match) + onNext() + }.onFailure { + onError(it.message ?: "Errore creazione sessione") + } + creating = false + } + }, + modifier = Modifier.weight(2f), + ) + } + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/WizardComponents.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/WizardComponents.kt new file mode 100644 index 0000000..b4b549c --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/WizardComponents.kt @@ -0,0 +1,146 @@ +package com.matchlivetv.match_live_tv.ui.wizard + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import com.matchlivetv.match_live_tv.ui.theme.MatchColors + +private val stepTitles = listOf( + "01 · Partita", + "02 · Trasmissione", + "03 · Test rete", +) + +@Composable +fun WizardStepIndicator(currentStep: Int, modifier: Modifier = Modifier) { + Row( + modifier = modifier + .fillMaxWidth() + .padding(horizontal = 20.dp, vertical = 12.dp), + horizontalArrangement = Arrangement.spacedBy(6.dp), + ) { + repeat(3) { index -> + val step = index + 1 + val active = step <= currentStep + Box( + Modifier + .weight(1f) + .height(4.dp) + .clip(RoundedCornerShape(2.dp)) + .background(if (active) MatchColors.PrimaryRed else MatchColors.SurfaceElevated), + ) + } + } +} + +fun wizardStepTitle(step: Int): String = + stepTitles[(step.coerceIn(1, 3) - 1)] + +@Composable +fun WizardReadOnlyField(label: String, value: String) { + Column( + Modifier + .fillMaxWidth() + .background(MatchColors.SurfaceElevated, RoundedCornerShape(10.dp)) + .padding(14.dp), + ) { + Text(label, style = MaterialTheme.typography.bodyMedium) + Spacer(Modifier.height(4.dp)) + Text(value, style = MaterialTheme.typography.titleMedium) + } +} + +@Composable +fun WizardPlatformCard( + title: String, + subtitle: String?, + selected: Boolean, + enabled: Boolean = true, + badge: String? = null, + onClick: () -> Unit, +) { + val alpha = if (enabled) 1f else 0.55f + Row( + Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(10.dp)) + .background( + if (selected) MatchColors.PrimaryRed.copy(alpha = 0.15f) else MatchColors.SurfaceElevated, + ) + .border( + width = 1.dp, + color = if (selected) MatchColors.PrimaryRed else Color.Transparent, + shape = RoundedCornerShape(10.dp), + ) + .clickable(enabled = enabled, onClick = onClick) + .padding(14.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Box(Modifier.padding(end = 12.dp)) { + Text( + if (selected) "●" else "○", + color = if (selected) MatchColors.PrimaryRed else MatchColors.TextSecondary, + ) + } + Column(Modifier.weight(1f)) { + Text(title, style = MaterialTheme.typography.titleMedium, color = Color.White.copy(alpha = alpha)) + subtitle?.let { + Text(it, style = MaterialTheme.typography.bodyMedium, color = Color.White.copy(alpha = alpha)) + } + } + badge?.let { + Text( + it, + style = MaterialTheme.typography.labelLarge, + color = MatchColors.TextSecondary, + modifier = Modifier + .background(MatchColors.Surface, RoundedCornerShape(6.dp)) + .padding(horizontal = 8.dp, vertical = 4.dp), + ) + } + } +} + +@Composable +fun MetricCard( + label: String, + value: String, + highlight: Boolean = false, + modifier: Modifier = Modifier, +) { + Column( + modifier + .background( + if (highlight) MatchColors.SuccessGreen.copy(alpha = 0.12f) else MatchColors.SurfaceElevated, + RoundedCornerShape(10.dp), + ) + .padding(12.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text(label, style = MaterialTheme.typography.bodyMedium) + Spacer(Modifier.height(4.dp)) + Text( + value, + style = MaterialTheme.typography.titleMedium, + color = if (highlight) MatchColors.SuccessGreen else Color.White, + ) + } +} diff --git a/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/WizardShellScreen.kt b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/WizardShellScreen.kt new file mode 100644 index 0000000..f1f1c93 --- /dev/null +++ b/native/android/app/src/main/kotlin/com/matchlivetv/match_live_tv/ui/wizard/WizardShellScreen.kt @@ -0,0 +1,131 @@ +package com.matchlivetv.match_live_tv.ui.wizard + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import com.matchlivetv.match_live_tv.data.AppContainer +import com.matchlivetv.match_live_tv.domain.Match +import com.matchlivetv.match_live_tv.domain.StreamSession +import com.matchlivetv.match_live_tv.ui.components.MatchScreenScaffold +import com.matchlivetv.match_live_tv.ui.theme.MatchColors +import kotlinx.coroutines.launch + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun WizardShellScreen( + container: AppContainer, + matchId: String, + step: Int, + onClose: () -> Unit, + onGoToStep: (Int) -> Unit, + onStartLive: (StreamSession) -> Unit, +) { + val scope = rememberCoroutineScope() + val snackbarHostState = remember { SnackbarHostState() } + var loading by remember { mutableStateOf(true) } + var match by remember { mutableStateOf(null) } + val currentStep = step.coerceIn(1, 3) + + fun showError(message: String) { + scope.launch { snackbarHostState.showSnackbar(message) } + } + + LaunchedEffect(matchId) { + loading = true + runCatching { container.matchRepository.fetchMatch(matchId) } + .onSuccess { + match = it + container.wizardSession.match = it + } + loading = false + } + + MatchScreenScaffold( + topBar = { + TopAppBar( + title = { Text(wizardStepTitle(currentStep)) }, + navigationIcon = { + IconButton(onClick = onClose) { + Icon(Icons.Default.Close, contentDescription = "Chiudi", tint = Color.White) + } + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MatchColors.Background, + titleContentColor = Color.White, + ), + ) + }, + ) { + Box(Modifier.fillMaxSize()) { + when { + loading -> CircularProgressIndicator( + color = MatchColors.PrimaryRed, + modifier = Modifier.align(Alignment.Center), + ) + match == null -> Text( + "Partita non trovata", + modifier = Modifier.align(Alignment.Center), + style = MaterialTheme.typography.bodyMedium, + ) + else -> Column(Modifier.fillMaxSize()) { + WizardStepIndicator(currentStep) + when (currentStep) { + 1 -> StepMatchScreen( + container = container, + match = match!!, + onNext = { onGoToStep(2) }, + onError = ::showError, + ) + 2 -> StepTransmissionScreen( + container = container, + match = match!!, + onBack = { onGoToStep(1) }, + onNext = { onGoToStep(3) }, + onError = ::showError, + ) + 3 -> { + val session = container.wizardSession.session + if (session == null) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text("Completa lo step Trasmissione") + } + } else { + StepNetworkTestScreen( + container = container, + match = match!!, + session = session, + onBack = { onGoToStep(2) }, + onStartLive = onStartLive, + onError = ::showError, + ) + } + } + } + } + } + SnackbarHost(hostState = snackbarHostState, modifier = Modifier.align(Alignment.BottomCenter)) + } + } +} diff --git a/native/android/app/src/main/res/drawable/ic_launcher.xml b/native/android/app/src/main/res/drawable/ic_launcher.xml deleted file mode 100644 index 515461b..0000000 --- a/native/android/app/src/main/res/drawable/ic_launcher.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/native/android/app/src/main/res/drawable/logo_white.png b/native/android/app/src/main/res/drawable/logo_white.png new file mode 100644 index 0000000000000000000000000000000000000000..64281bcd33961ff979d945ea46b3eca9aeb179e6 GIT binary patch literal 24398 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 TP!KH$0RU89sVjVugNObPFs;6= literal 0 HcmV?d00001 diff --git a/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/native/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to native/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/native/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to native/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/native/android/app/src/main/res/values/colors.xml b/native/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f75b658 --- /dev/null +++ b/native/android/app/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #FF0A0A0A + #FFFF2D2D + diff --git a/native/android/app/src/main/res/values/strings.xml b/native/android/app/src/main/res/values/strings.xml index cd869a6..446b2db 100644 --- a/native/android/app/src/main/res/values/strings.xml +++ b/native/android/app/src/main/res/values/strings.xml @@ -1,6 +1,7 @@ Match Live TV + Ogni partita, ogni evento, per i tuoi tifosi. Diretta in corso Notifica durante lo streaming live Match Live TV diff --git a/native/android/app/src/main/res/values/themes.xml b/native/android/app/src/main/res/values/themes.xml index 2e23a26..96c4f59 100644 --- a/native/android/app/src/main/res/values/themes.xml +++ b/native/android/app/src/main/res/values/themes.xml @@ -1,4 +1,9 @@ - diff --git a/scripts/build_mobile_apk_prod.sh b/scripts/build_mobile_apk_prod.sh deleted file mode 100755 index 0f801d2..0000000 --- a/scripts/build_mobile_apk_prod.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -# APK release per telefono → API produzione -set -euo pipefail -export PATH="${HOME}/flutter/bin:${PATH}" - -API_BASE_URL="${API_BASE_URL:-https://www.matchlivetv.it}" -ROOT="$(cd "$(dirname "$0")/.." && pwd)" - -cd "$ROOT/mobile" -flutter pub get -flutter build apk --release \ - --dart-define="API_BASE_URL=${API_BASE_URL}" - -echo "APK: mobile/build/app/outputs/flutter-apk/app-release.apk" -echo "API_BASE_URL=${API_BASE_URL}" diff --git a/scripts/deploy/sync_to_server.sh b/scripts/deploy/sync_to_server.sh index 5b72f83..0a760b3 100755 --- a/scripts/deploy/sync_to_server.sh +++ b/scripts/deploy/sync_to_server.sh @@ -11,8 +11,8 @@ echo "Sync $SRC -> $SERVER:$DEST" if ssh "$SERVER" 'command -v rsync >/dev/null 2>&1'; then rsync -avz --delete \ --exclude '.git' \ - --exclude 'mobile/build' \ - --exclude 'mobile/.dart_tool' \ + --exclude 'native/android/build' \ + --exclude 'native/android/.gradle' \ --exclude 'backend/log' \ --exclude 'backend/tmp' \ --exclude 'backend/.bundle' \ @@ -22,7 +22,7 @@ if ssh "$SERVER" 'command -v rsync >/dev/null 2>&1'; then else echo "rsync non disponibile sul server, uso tar+scp..." tar -C "$SRC" -czf /tmp/matchlivetv-deploy.tar.gz \ - --exclude='./mobile/build' --exclude='./mobile/.dart_tool' \ + --exclude='./native/android/build' --exclude='./native/android/.gradle' \ --exclude='./backend/log' --exclude='./backend/tmp' --exclude='./infra/.env' --exclude='./.git' . scp /tmp/matchlivetv-deploy.tar.gz "$SERVER:~/matchlivetv-deploy.tar.gz" ssh "$SERVER" "mkdir -p $DEST && tar -xzf ~/matchlivetv-deploy.tar.gz -C $DEST" diff --git a/scripts/e2e_native_android_emulator.sh b/scripts/e2e_native_android_emulator.sh new file mode 100755 index 0000000..3a70a0b --- /dev/null +++ b/scripts/e2e_native_android_emulator.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash +set -euo pipefail +ROOT="$(cd "$(dirname "$0")/.." && pwd)" +ANDROID_DIR="$ROOT/native/android" +ADB="${ADB:-adb}" +DEVICE="${ANDROID_SERIAL:-emulator-5554}" +API_BASE_URL="${API_BASE_URL:-https://www.matchlivetv.it}" + +export ANDROID_SERIAL="$DEVICE" + +echo "==> Device: $DEVICE" +"$ADB" -s "$DEVICE" get-state + +cd "$ANDROID_DIR" +chmod +x gradlew +echo "==> Build debug + androidTest APK (API_BASE_URL=$API_BASE_URL)" +./gradlew assembleDebug assembleDebugAndroidTest -PAPI_BASE_URL="$API_BASE_URL" + +echo "==> Reset app state on $DEVICE" +"$ADB" -s "$DEVICE" shell am force-stop com.matchlivetv.match_live_tv +"$ADB" -s "$DEVICE" shell pm clear com.matchlivetv.match_live_tv +"$ADB" -s "$DEVICE" shell pm grant com.matchlivetv.match_live_tv android.permission.CAMERA +"$ADB" -s "$DEVICE" shell pm grant com.matchlivetv.match_live_tv android.permission.RECORD_AUDIO +"$ADB" -s "$DEVICE" shell pm grant com.matchlivetv.match_live_tv android.permission.POST_NOTIFICATIONS + +echo "==> Install on $DEVICE" +"$ADB" -s "$DEVICE" install -r app/build/outputs/apk/debug/app-debug.apk +"$ADB" -s "$DEVICE" install -r app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk + +echo "==> Run E2E tests" +./gradlew connectedDebugAndroidTest \ + -Pandroid.testInstrumentationRunnerArguments.class=com.matchlivetv.match_live_tv.E2EWizardFlowTest \ + -PAPI_BASE_URL="$API_BASE_URL" + +echo "==> E2E completato" diff --git a/scripts/run_mobile_android.sh b/scripts/run_mobile_android.sh deleted file mode 100755 index 0b7c19a..0000000 --- a/scripts/run_mobile_android.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -# Avvio su emulatore Android con port forwarding -set -euo pipefail -export PATH="$HOME/flutter/bin:$HOME/Android/Sdk/platform-tools:$PATH" -export ANDROID_HOME="$HOME/Android/Sdk" -export ANDROID_AVD_HOME="${ANDROID_AVD_HOME:-$HOME/.var/app/com.google.AndroidStudio/config/.android/avd}" - -adb reverse tcp:3000 tcp:3000 2>/dev/null || true - -cd "$(dirname "$0")/../mobile" -flutter pub get -flutter run -d emulator-5554 \ - --dart-define=API_BASE_URL=http://127.0.0.1:3000 \ - --dart-define=CABLE_URL=ws://127.0.0.1:3000/cable diff --git a/scripts/run_mobile_android_prod.sh b/scripts/run_mobile_android_prod.sh deleted file mode 100755 index 31f1f9e..0000000 --- a/scripts/run_mobile_android_prod.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -# Telefono Android fisico → API produzione -set -euo pipefail -export PATH="$HOME/flutter/bin:$HOME/Android/Sdk/platform-tools:$PATH" -export ANDROID_HOME="$HOME/Android/Sdk" - -DEVICE="${ANDROID_DEVICE:-}" -if [[ -z "$DEVICE" ]]; then - DEVICE=$(adb devices | awk '/device$/{print $1; exit}' | grep -v emulator || true) -fi -if [[ -z "$DEVICE" ]]; then - echo "Nessun telefono USB collegato. Collega il device e abilita debug USB." - exit 1 -fi - -API_BASE_URL="${API_BASE_URL:-https://www.matchlivetv.it}" -MODE="${BUILD_MODE:-debug}" - -cd "$(dirname "$0")/../mobile" -flutter pub get - -ARGS=(run -d "$DEVICE" "--dart-define=API_BASE_URL=$API_BASE_URL") -if [[ "$MODE" == "release" ]]; then - ARGS=(run --release -d "$DEVICE" "--dart-define=API_BASE_URL=$API_BASE_URL") -fi - -echo "Device: $DEVICE | API: $API_BASE_URL | Mode: $MODE" -flutter "${ARGS[@]}" diff --git a/scripts/run_mobile_linux.sh b/scripts/run_mobile_linux.sh deleted file mode 100755 index 83796b3..0000000 --- a/scripts/run_mobile_linux.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -# Avvio leggero su Linux desktop (evita emulatore Android che consuma ~80% CPU) -set -euo pipefail -export PATH="$HOME/flutter/bin:$PATH" -cd "$(dirname "$0")/../mobile" -flutter pub get -flutter run -d linux --dart-define=API_BASE_URL=http://127.0.0.1:3000 diff --git a/scripts/test/adb_phone_stream_e2e.sh b/scripts/test/adb_phone_stream_e2e.sh deleted file mode 100755 index 045e901..0000000 --- a/scripts/test/adb_phone_stream_e2e.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/env bash -# E2E streaming: installa APK, login demo, apre camera sessione attiva. -# Richiede: USB debug + su MIUI/Xiaomi abilitare "Installazione via USB". -set -euo pipefail - -export PATH="$HOME/flutter/bin:$HOME/Android/Sdk/platform-tools:$PATH" -ROOT="$(cd "$(dirname "$0")/../.." && pwd)" -DEVICE="${ANDROID_DEVICE:-$(adb devices | awk '/device$/{print $1; exit}')}" -SESSION_ID="${SESSION_ID:-fe09a29f-79db-44d5-864f-397942c0a2c5}" -EMAIL="${TEST_EMAIL:-coach@matchlivetv.test}" -PASSWORD="${TEST_PASSWORD:-password123}" -APK="$ROOT/mobile/build/app/outputs/flutter-apk/app-release.apk" -PKG="com.matchlivetv.match_live_tv" - -if [[ -z "$DEVICE" ]]; then - echo "Nessun telefono USB. Collega il device e abilita debug USB." - exit 1 -fi - -echo "== Device: $DEVICE ==" - -if [[ ! -f "$APK" ]]; then - echo "Build APK release..." - (cd "$ROOT/mobile" && flutter build apk --release --dart-define=API_BASE_URL=https://www.matchlivetv.it) -fi - -echo "== Install APK (conferma sul telefono se richiesto) ==" -if ! adb -s "$DEVICE" install -r -g "$APK"; then - echo "" - echo "Installazione bloccata. Su Xiaomi/MIUI:" - echo " Impostazioni → Impostazioni aggiuntive → Opzioni sviluppatore → Installazione via USB → Attiva" - echo "Poi rilancia questo script." - exit 1 -fi - -echo "== Grant permissions ==" -adb -s "$DEVICE" shell pm grant "$PKG" android.permission.CAMERA 2>/dev/null || true -adb -s "$DEVICE" shell pm grant "$PKG" android.permission.RECORD_AUDIO 2>/dev/null || true -adb -s "$DEVICE" shell pm grant "$PKG" android.permission.POST_NOTIFICATIONS 2>/dev/null || true - -echo "== Launch app ==" -adb -s "$DEVICE" shell am force-stop "$PKG" -adb -s "$DEVICE" shell am start -n "$PKG/.MainActivity" -sleep 4 - -tap_text() { - local text="$1" - adb -s "$DEVICE" shell uiautomator dump /sdcard/ui.xml >/dev/null 2>&1 || true - local coords - coords=$(adb -s "$DEVICE" shell "grep -o \"text=\\\"$text\\\"[^>]*bounds=\\\"\\[[0-9,]*\\]\\[[0-9,]*\\]\\\"\" /sdcard/ui.xml 2>/dev/null | head -1" || true) - if [[ -z "$coords" ]]; then return 1; fi - local b - b=$(echo "$coords" | sed -n 's/.*bounds=\"\[\([div0-9,]*\)\]\[\([0-9,]*\)\]\".*/\1 \2/p') - local x1 y1 x2 y2 - IFS=',' read -r x1 y1 <<< "${b%% *}" - IFS=',' read -r x2 y2 <<< "${b##* }" - local cx=$(( (x1 + x2) / 2 )) - local cy=$(( (y1 + y2) / 2 )) - adb -s "$DEVICE" shell input tap "$cx" "$cy" - return 0 -} - -tap_contains() { - local needle="$1" - adb -s "$DEVICE" shell uiautomator dump /sdcard/ui.xml >/dev/null 2>&1 || true - local line - line=$(adb -s "$DEVICE" shell "grep -i '$needle' /sdcard/ui.xml | head -1" || true) - [[ -n "$line" ]] || return 1 - local bounds - bounds=$(echo "$line" | sed -n 's/.*bounds=\"\[\([0-9,]*\)\]\[\([0-9,]*\)\]\".*/\1 \2/p') - local x1 y1 x2 y2 - IFS=',' read -r x1 y1 <<< "${bounds%% *}" - IFS=',' read -r x2 y2 <<< "${bounds##* }" - adb -s "$DEVICE" shell input tap $(( (x1 + x2) / 2 )) $(( (y1 + y2) / 2 )) -} - -echo "== Login (demo) ==" -# Email field -adb -s "$DEVICE" shell uiautomator dump /sdcard/ui.xml >/dev/null 2>&1 || true -sleep 1 -# Tap center-left for email field (Flutter fallback coords 720p) -adb -s "$DEVICE" shell input tap 540 520 -adb -s "$DEVICE" shell input keyevent KEYCODE_MOVE_END -adb -s "$DEVICE" shell input keyevent --longpress $(printf '%s' "$EMAIL" | od -An -tuC | tr -s ' ' '\n' | while read -r c; do echo "KEYCODE_DEL"; done | head -40) 2>/dev/null || true -adb -s "$DEVICE" shell input text "${EMAIL//@/%40}" -sleep 1 -tap_contains "Accedi" || tap_contains "Entra" || adb -s "$DEVICE" shell input tap 540 900 -sleep 5 - -echo "== Open camera for session $SESSION_ID ==" -# Deep link via am start with route — apri wizard/camera se già loggato -adb -s "$DEVICE" shell am start -a android.intent.action.VIEW \ - -d "https://www.matchlivetv.it/live/$SESSION_ID" "$PKG" 2>/dev/null || true -sleep 3 -tap_contains "Riprendi" || tap_contains "RIPRENDI" || tap_contains "camera" || true -sleep 2 - -echo "== Session status ==" -curl -sS "https://www.matchlivetv.it/live/$SESSION_ID/status.json" | python3 -m json.tool | head -20 - -echo "" -echo "Apri nel browser: https://www.matchlivetv.it/live/$SESSION_ID" -echo "Controlla bitrate/fps dispositivo via API sessions."