diff --git a/lib/mixins/item_updatable.dart b/lib/mixins/item_updatable.dart index d26b3515..0fecdd2a 100644 --- a/lib/mixins/item_updatable.dart +++ b/lib/mixins/item_updatable.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../client/plex_client.dart'; +import '../services/plex_client.dart'; import '../models/plex_metadata.dart'; /// Mixin for screens that need to update individual items after watch state changes diff --git a/lib/mixins/library_tab_state.dart b/lib/mixins/library_tab_state.dart index 4c7a3fea..a505e1c1 100644 --- a/lib/mixins/library_tab_state.dart +++ b/lib/mixins/library_tab_state.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../client/plex_client.dart'; +import '../services/plex_client.dart'; import '../models/plex_library.dart'; import '../utils/provider_extensions.dart'; diff --git a/lib/config/plex_config.dart b/lib/models/plex_config.dart similarity index 100% rename from lib/config/plex_config.dart rename to lib/models/plex_config.dart diff --git a/lib/mpv/src/models/audio_device.dart b/lib/mpv/models/audio_device.dart similarity index 100% rename from lib/mpv/src/models/audio_device.dart rename to lib/mpv/models/audio_device.dart diff --git a/lib/mpv/src/models/audio_track.dart b/lib/mpv/models/audio_track.dart similarity index 100% rename from lib/mpv/src/models/audio_track.dart rename to lib/mpv/models/audio_track.dart diff --git a/lib/mpv/src/models/media.dart b/lib/mpv/models/media.dart similarity index 100% rename from lib/mpv/src/models/media.dart rename to lib/mpv/models/media.dart diff --git a/lib/mpv/src/models/player_log.dart b/lib/mpv/models/player_log.dart similarity index 100% rename from lib/mpv/src/models/player_log.dart rename to lib/mpv/models/player_log.dart diff --git a/lib/mpv/src/models/player_log_level.dart b/lib/mpv/models/player_log_level.dart similarity index 100% rename from lib/mpv/src/models/player_log_level.dart rename to lib/mpv/models/player_log_level.dart diff --git a/lib/mpv/src/models/subtitle_track.dart b/lib/mpv/models/subtitle_track.dart similarity index 100% rename from lib/mpv/src/models/subtitle_track.dart rename to lib/mpv/models/subtitle_track.dart diff --git a/lib/mpv/src/models/track_selection.dart b/lib/mpv/models/track_selection.dart similarity index 100% rename from lib/mpv/src/models/track_selection.dart rename to lib/mpv/models/track_selection.dart diff --git a/lib/mpv/src/models/tracks.dart b/lib/mpv/models/tracks.dart similarity index 100% rename from lib/mpv/src/models/tracks.dart rename to lib/mpv/models/tracks.dart diff --git a/lib/mpv/mpv.dart b/lib/mpv/mpv.dart index 5491f416..2dc297d4 100644 --- a/lib/mpv/mpv.dart +++ b/lib/mpv/mpv.dart @@ -44,19 +44,19 @@ library; // Player -export 'src/player/player.dart'; -export 'src/player/player_state.dart'; -export 'src/player/player_streams.dart'; +export 'player/player.dart'; +export 'player/player_state.dart'; +export 'player/player_streams.dart'; // Models -export 'src/models/media.dart'; -export 'src/models/audio_device.dart'; -export 'src/models/audio_track.dart'; -export 'src/models/subtitle_track.dart'; -export 'src/models/tracks.dart'; -export 'src/models/track_selection.dart'; -export 'src/models/player_log.dart'; -export 'src/models/player_log_level.dart'; +export 'models/media.dart'; +export 'models/audio_device.dart'; +export 'models/audio_track.dart'; +export 'models/subtitle_track.dart'; +export 'models/tracks.dart'; +export 'models/track_selection.dart'; +export 'models/player_log.dart'; +export 'models/player_log_level.dart'; // Video -export 'src/video/video.dart'; +export 'video/video.dart'; diff --git a/lib/mpv/src/player/platform/player_linux.dart b/lib/mpv/player/platform/player_linux.dart similarity index 100% rename from lib/mpv/src/player/platform/player_linux.dart rename to lib/mpv/player/platform/player_linux.dart diff --git a/lib/mpv/src/player/platform/player_windows.dart b/lib/mpv/player/platform/player_windows.dart similarity index 100% rename from lib/mpv/src/player/platform/player_windows.dart rename to lib/mpv/player/platform/player_windows.dart diff --git a/lib/mpv/src/player/player.dart b/lib/mpv/player/player.dart similarity index 100% rename from lib/mpv/src/player/player.dart rename to lib/mpv/player/player.dart diff --git a/lib/mpv/src/player/player_native.dart b/lib/mpv/player/player_native.dart similarity index 100% rename from lib/mpv/src/player/player_native.dart rename to lib/mpv/player/player_native.dart diff --git a/lib/mpv/src/player/player_state.dart b/lib/mpv/player/player_state.dart similarity index 100% rename from lib/mpv/src/player/player_state.dart rename to lib/mpv/player/player_state.dart diff --git a/lib/mpv/src/player/player_streams.dart b/lib/mpv/player/player_streams.dart similarity index 100% rename from lib/mpv/src/player/player_streams.dart rename to lib/mpv/player/player_streams.dart diff --git a/lib/mpv/src/player/video_rect_support.dart b/lib/mpv/player/video_rect_support.dart similarity index 100% rename from lib/mpv/src/player/video_rect_support.dart rename to lib/mpv/player/video_rect_support.dart diff --git a/lib/mpv/src/video/video.dart b/lib/mpv/video/video.dart similarity index 100% rename from lib/mpv/src/video/video.dart rename to lib/mpv/video/video.dart diff --git a/lib/providers/multi_server_provider.dart b/lib/providers/multi_server_provider.dart index b2fc2e9f..c9ce69d0 100644 --- a/lib/providers/multi_server_provider.dart +++ b/lib/providers/multi_server_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart'; -import '../client/plex_client.dart'; +import '../services/plex_client.dart'; import '../services/data_aggregation_service.dart'; import '../services/multi_server_manager.dart'; import '../services/plex_auth_service.dart'; diff --git a/lib/providers/playback_state_provider.dart b/lib/providers/playback_state_provider.dart index a1960fea..ff409e89 100644 --- a/lib/providers/playback_state_provider.dart +++ b/lib/providers/playback_state_provider.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import '../models/plex_metadata.dart'; import '../models/play_queue_response.dart'; -import '../client/plex_client.dart'; +import '../services/plex_client.dart'; /// Playback mode types /// diff --git a/lib/providers/plex_client_provider.dart b/lib/providers/plex_client_provider.dart index 99c9aaa0..d395d26e 100644 --- a/lib/providers/plex_client_provider.dart +++ b/lib/providers/plex_client_provider.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import '../client/plex_client.dart'; +import '../services/plex_client.dart'; import '../utils/app_logger.dart'; class PlexClientProvider extends ChangeNotifier { diff --git a/lib/screens/base_media_list_detail_screen.dart b/lib/screens/base_media_list_detail_screen.dart index aadc322d..a0e7aaaf 100644 --- a/lib/screens/base_media_list_detail_screen.dart +++ b/lib/screens/base_media_list_detail_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../models/plex_metadata.dart'; import '../providers/multi_server_provider.dart'; import '../utils/provider_extensions.dart'; diff --git a/lib/screens/discover_screen.dart b/lib/screens/discover_screen.dart index 93490599..36692b32 100644 --- a/lib/screens/discover_screen.dart +++ b/lib/screens/discover_screen.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:cached_network_image/cached_network_image.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../utils/plex_image_helper.dart'; import '../models/plex_metadata.dart'; import '../models/plex_hub.dart'; diff --git a/lib/screens/hub_detail_screen.dart b/lib/screens/hub_detail_screen.dart index 979d04b4..ba4aefcb 100644 --- a/lib/screens/hub_detail_screen.dart +++ b/lib/screens/hub_detail_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../models/plex_hub.dart'; import '../models/plex_metadata.dart'; import '../models/plex_sort.dart'; diff --git a/lib/screens/libraries_screen.dart b/lib/screens/libraries_screen.dart index 2219fc5a..294165d6 100644 --- a/lib/screens/libraries_screen.dart +++ b/lib/screens/libraries_screen.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:dio/dio.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../models/plex_library.dart'; import '../models/plex_metadata.dart'; import '../models/plex_sort.dart'; diff --git a/lib/screens/library_tabs/library_browse_tab.dart b/lib/screens/library_tabs/library_browse_tab.dart index e66ba6ed..37999490 100644 --- a/lib/screens/library_tabs/library_browse_tab.dart +++ b/lib/screens/library_tabs/library_browse_tab.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:dio/dio.dart'; -import '../../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../../models/plex_library.dart'; import '../../models/plex_metadata.dart'; import '../../models/plex_filter.dart'; diff --git a/lib/screens/library_tabs/library_recommended_tab.dart b/lib/screens/library_tabs/library_recommended_tab.dart index fc2067f9..dd0a7d7f 100644 --- a/lib/screens/library_tabs/library_recommended_tab.dart +++ b/lib/screens/library_tabs/library_recommended_tab.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import '../../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../../i18n/strings.g.dart'; import '../../mixins/item_updatable.dart'; import '../../models/plex_hub.dart'; diff --git a/lib/screens/main_screen.dart b/lib/screens/main_screen.dart index 5db05afa..0cff555d 100644 --- a/lib/screens/main_screen.dart +++ b/lib/screens/main_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../i18n/strings.g.dart'; import '../utils/app_logger.dart'; import '../utils/keyboard_utils.dart'; diff --git a/lib/screens/media_detail_screen.dart b/lib/screens/media_detail_screen.dart index a5d6b91b..22dab50d 100644 --- a/lib/screens/media_detail_screen.dart +++ b/lib/screens/media_detail_screen.dart @@ -7,7 +7,7 @@ import '../widgets/plex_optimized_image.dart'; import '../utils/plex_image_helper.dart'; import '../mixins/keyboard_long_press_mixin.dart'; import '../widgets/focus/focus_indicator.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../models/plex_metadata.dart'; import '../providers/playback_state_provider.dart'; import '../theme/theme_helper.dart'; diff --git a/lib/screens/playlist_detail_screen.dart b/lib/screens/playlist_detail_screen.dart index 97344519..3769e070 100644 --- a/lib/screens/playlist_detail_screen.dart +++ b/lib/screens/playlist_detail_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../models/plex_playlist.dart'; import '../models/plex_metadata.dart'; import '../providers/settings_provider.dart'; diff --git a/lib/screens/season_detail_screen.dart b/lib/screens/season_detail_screen.dart index a4773d71..c305d5e9 100644 --- a/lib/screens/season_detail_screen.dart +++ b/lib/screens/season_detail_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../widgets/plex_optimized_image.dart'; import '../widgets/focus/focus_indicator.dart'; import '../models/plex_metadata.dart'; diff --git a/lib/screens/video_player_screen.dart b/lib/screens/video_player_screen.dart index 5a29acc6..30de9656 100644 --- a/lib/screens/video_player_screen.dart +++ b/lib/screens/video_player_screen.dart @@ -8,7 +8,7 @@ import 'package:provider/provider.dart'; import '../mpv/mpv.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../models/plex_media_version.dart'; import '../models/plex_metadata.dart'; import '../models/plex_media_info.dart'; diff --git a/lib/services/data_aggregation_service.dart b/lib/services/data_aggregation_service.dart index c04e9b2b..f9b5a36d 100644 --- a/lib/services/data_aggregation_service.dart +++ b/lib/services/data_aggregation_service.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import '../client/plex_client.dart'; +import 'plex_client.dart'; import '../models/plex_hub.dart'; import '../models/plex_library.dart'; import '../models/plex_metadata.dart'; diff --git a/lib/services/episode_navigation_service.dart b/lib/services/episode_navigation_service.dart index 39578c01..677d5dfd 100644 --- a/lib/services/episode_navigation_service.dart +++ b/lib/services/episode_navigation_service.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../mpv/mpv.dart'; -import '../client/plex_client.dart'; +import 'plex_client.dart'; import '../models/plex_metadata.dart'; import '../providers/playback_state_provider.dart'; import '../utils/app_logger.dart'; diff --git a/lib/services/media_controls_manager.dart b/lib/services/media_controls_manager.dart index e94594eb..990e5c2d 100644 --- a/lib/services/media_controls_manager.dart +++ b/lib/services/media_controls_manager.dart @@ -1,7 +1,7 @@ import 'package:os_media_controls/os_media_controls.dart'; import 'package:rate_limiter/rate_limiter.dart'; -import '../client/plex_client.dart'; +import 'plex_client.dart'; import '../models/plex_metadata.dart'; import '../utils/app_logger.dart'; diff --git a/lib/services/multi_server_manager.dart b/lib/services/multi_server_manager.dart index d0776531..e91256fe 100644 --- a/lib/services/multi_server_manager.dart +++ b/lib/services/multi_server_manager.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'package:connectivity_plus/connectivity_plus.dart'; -import '../client/plex_client.dart'; -import '../config/plex_config.dart'; +import 'plex_client.dart'; +import '../models/plex_config.dart'; import '../utils/app_logger.dart'; import 'plex_auth_service.dart'; import 'storage_service.dart'; diff --git a/lib/services/playback_initialization_service.dart b/lib/services/playback_initialization_service.dart index 5caf6929..5448fa50 100644 --- a/lib/services/playback_initialization_service.dart +++ b/lib/services/playback_initialization_service.dart @@ -1,4 +1,4 @@ -import '../client/plex_client.dart'; +import 'plex_client.dart'; import '../models/plex_media_info.dart'; import '../models/plex_metadata.dart'; import '../mpv/mpv.dart'; diff --git a/lib/services/playback_progress_tracker.dart b/lib/services/playback_progress_tracker.dart index 0af68472..999bb097 100644 --- a/lib/services/playback_progress_tracker.dart +++ b/lib/services/playback_progress_tracker.dart @@ -2,7 +2,7 @@ import 'dart:async'; import '../mpv/mpv.dart'; -import '../client/plex_client.dart'; +import 'plex_client.dart'; import '../models/plex_metadata.dart'; import '../utils/app_logger.dart'; diff --git a/lib/services/plex_auth_service.dart b/lib/services/plex_auth_service.dart index b1484afd..b83571c1 100644 --- a/lib/services/plex_auth_service.dart +++ b/lib/services/plex_auth_service.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:dio/dio.dart'; import 'package:uuid/uuid.dart'; import 'storage_service.dart'; -import '../client/plex_client.dart'; +import 'plex_client.dart'; import '../models/plex_user_profile.dart'; import '../models/plex_home.dart'; import '../models/user_switch_response.dart'; diff --git a/lib/client/plex_client.dart b/lib/services/plex_client.dart similarity index 99% rename from lib/client/plex_client.dart rename to lib/services/plex_client.dart index a62b1c2f..e8938288 100644 --- a/lib/client/plex_client.dart +++ b/lib/services/plex_client.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'package:dio/dio.dart'; -import '../config/plex_config.dart'; +import '../models/plex_config.dart'; import '../models/play_queue_response.dart'; import '../models/plex_file_info.dart'; import '../models/plex_filter.dart'; @@ -14,7 +14,7 @@ import '../models/plex_metadata.dart'; import '../models/plex_playlist.dart'; import '../models/plex_sort.dart'; import '../models/plex_video_playback_data.dart'; -import '../network/endpoint_failover_interceptor.dart'; +import '../utils/endpoint_failover_interceptor.dart'; import '../utils/app_logger.dart'; import '../utils/log_redaction_manager.dart'; diff --git a/lib/utils/collection_playlist_play_helper.dart b/lib/utils/collection_playlist_play_helper.dart index d2e2e46d..4f5b48db 100644 --- a/lib/utils/collection_playlist_play_helper.dart +++ b/lib/utils/collection_playlist_play_helper.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../client/plex_client.dart'; +import '../services/plex_client.dart'; import '../models/plex_metadata.dart'; import '../models/plex_playlist.dart'; import '../models/play_queue_response.dart'; diff --git a/lib/network/endpoint_failover_interceptor.dart b/lib/utils/endpoint_failover_interceptor.dart similarity index 100% rename from lib/network/endpoint_failover_interceptor.dart rename to lib/utils/endpoint_failover_interceptor.dart diff --git a/lib/utils/grid_size_calculator.dart b/lib/utils/grid_size_calculator.dart index 35f403a2..b8408ef1 100644 --- a/lib/utils/grid_size_calculator.dart +++ b/lib/utils/grid_size_calculator.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import '../services/settings_service.dart' show LibraryDensity; -import '../constants/layout_constants.dart'; +import 'layout_constants.dart'; /// Utility class for calculating consistent grid sizes across the app class GridSizeCalculator { diff --git a/lib/constants/layout_constants.dart b/lib/utils/layout_constants.dart similarity index 100% rename from lib/constants/layout_constants.dart rename to lib/utils/layout_constants.dart diff --git a/lib/utils/plex_image_helper.dart b/lib/utils/plex_image_helper.dart index cdbd6485..434bbd3f 100644 --- a/lib/utils/plex_image_helper.dart +++ b/lib/utils/plex_image_helper.dart @@ -1,5 +1,5 @@ import 'dart:math'; -import '../client/plex_client.dart'; +import '../services/plex_client.dart'; /// Image types for different transcoding strategies enum ImageType { diff --git a/lib/utils/provider_extensions.dart b/lib/utils/provider_extensions.dart index ce036e7a..99dd9382 100644 --- a/lib/utils/provider_extensions.dart +++ b/lib/utils/provider_extensions.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../client/plex_client.dart'; +import '../services/plex_client.dart'; import '../i18n/strings.g.dart'; import '../models/plex_library.dart'; import '../models/plex_user_profile.dart'; diff --git a/lib/widgets/media_card.dart b/lib/widgets/media_card.dart index a51bf16b..387d1d06 100644 --- a/lib/widgets/media_card.dart +++ b/lib/widgets/media_card.dart @@ -3,7 +3,7 @@ import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'focus/focus_indicator.dart'; import 'hub_navigation_controller.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../mixins/keyboard_long_press_mixin.dart'; import '../models/plex_metadata.dart'; import '../models/plex_playlist.dart'; diff --git a/lib/widgets/media_context_menu.dart b/lib/widgets/media_context_menu.dart index 2220f9d6..2cea2d76 100644 --- a/lib/widgets/media_context_menu.dart +++ b/lib/widgets/media_context_menu.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../models/plex_metadata.dart'; import '../models/plex_playlist.dart'; import '../providers/multi_server_provider.dart'; diff --git a/lib/widgets/playlist_item_card.dart b/lib/widgets/playlist_item_card.dart index b9a0bd85..9036126f 100644 --- a/lib/widgets/playlist_item_card.dart +++ b/lib/widgets/playlist_item_card.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../mixins/keyboard_long_press_mixin.dart'; import '../models/plex_metadata.dart'; import '../utils/duration_formatter.dart'; diff --git a/lib/widgets/plex_optimized_image.dart b/lib/widgets/plex_optimized_image.dart index 8287e202..16073700 100644 --- a/lib/widgets/plex_optimized_image.dart +++ b/lib/widgets/plex_optimized_image.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; -import '../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../utils/plex_image_helper.dart'; import 'media_card.dart'; diff --git a/lib/widgets/video_controls/sheets/chapter_sheet.dart b/lib/widgets/video_controls/sheets/chapter_sheet.dart index c2e099e7..ee5fb49b 100644 --- a/lib/widgets/video_controls/sheets/chapter_sheet.dart +++ b/lib/widgets/video_controls/sheets/chapter_sheet.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import '../../../mpv/mpv.dart'; -import '../../../client/plex_client.dart'; +import '../../../services/plex_client.dart'; import '../../../models/plex_media_info.dart'; import '../../../utils/duration_formatter.dart'; import '../../../utils/provider_extensions.dart'; diff --git a/lib/widgets/video_controls/video_controls.dart b/lib/widgets/video_controls/video_controls.dart index fc6ddeb9..5de8312c 100644 --- a/lib/widgets/video_controls/video_controls.dart +++ b/lib/widgets/video_controls/video_controls.dart @@ -9,7 +9,7 @@ import 'package:window_manager/window_manager.dart'; import '../../mpv/mpv.dart'; -import '../../client/plex_client.dart'; +import '../../services/plex_client.dart'; import '../../models/plex_media_info.dart'; import '../../models/plex_media_version.dart'; import '../../models/plex_metadata.dart';