refactor: showLoadingDialog helper, json_serializable for plex_home

lib/models/companion_remote/remote_session.g.dart

@@ -10,43 +10,61 @@ RemoteDevice _$RemoteDeviceFromJson(Map<String, dynamic> json) => RemoteDevice(
   id: json['id'] as String,
   name: json['name'] as String,
   platform: json['platform'] as String,
-  connectedAt: json['connectedAt'] == null ? null : DateTime.parse(json['connectedAt'] as String),
-  capabilities: (json['capabilities'] as Map<String, dynamic>?)?.map((k, e) => MapEntry(k, e as bool)),
-);
-
-Map<String, dynamic> _$RemoteDeviceToJson(RemoteDevice instance) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-  'platform': instance.platform,
-  'connectedAt': instance.connectedAt.toIso8601String(),
-  'capabilities': instance.capabilities,
-};
-
-RemoteSession _$RemoteSessionFromJson(Map<String, dynamic> json) => RemoteSession(
-  role: $enumDecode(_$RemoteSessionRoleEnumMap, json['role'], unknownValue: RemoteSessionRole.remote),
-  status:
-      $enumDecodeNullable(
-        _$RemoteSessionStatusEnumMap,
-        json['status'],
-        unknownValue: RemoteSessionStatus.disconnected,
-      ) ??
-      RemoteSessionStatus.disconnected,
-  connectedDevice: json['connectedDevice'] == null
+  connectedAt: json['connectedAt'] == null
       ? null
-      : RemoteDevice.fromJson(json['connectedDevice'] as Map<String, dynamic>),
-  createdAt: json['createdAt'] == null ? null : DateTime.parse(json['createdAt'] as String),
-  errorMessage: json['errorMessage'] as String?,
+      : DateTime.parse(json['connectedAt'] as String),
+  capabilities: (json['capabilities'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as bool),
+  ),
 );
 
-Map<String, dynamic> _$RemoteSessionToJson(RemoteSession instance) => <String, dynamic>{
-  'role': _$RemoteSessionRoleEnumMap[instance.role]!,
-  'status': _$RemoteSessionStatusEnumMap[instance.status]!,
-  'connectedDevice': instance.connectedDevice,
-  'createdAt': instance.createdAt.toIso8601String(),
-  'errorMessage': instance.errorMessage,
-};
+Map<String, dynamic> _$RemoteDeviceToJson(RemoteDevice instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'platform': instance.platform,
+      'connectedAt': instance.connectedAt.toIso8601String(),
+      'capabilities': instance.capabilities,
+    };
 
-const _$RemoteSessionRoleEnumMap = {RemoteSessionRole.host: 'host', RemoteSessionRole.remote: 'remote'};
+RemoteSession _$RemoteSessionFromJson(Map<String, dynamic> json) =>
+    RemoteSession(
+      role: $enumDecode(
+        _$RemoteSessionRoleEnumMap,
+        json['role'],
+        unknownValue: RemoteSessionRole.remote,
+      ),
+      status:
+          $enumDecodeNullable(
+            _$RemoteSessionStatusEnumMap,
+            json['status'],
+            unknownValue: RemoteSessionStatus.disconnected,
+          ) ??
+          RemoteSessionStatus.disconnected,
+      connectedDevice: json['connectedDevice'] == null
+          ? null
+          : RemoteDevice.fromJson(
+              json['connectedDevice'] as Map<String, dynamic>,
+            ),
+      createdAt: json['createdAt'] == null
+          ? null
+          : DateTime.parse(json['createdAt'] as String),
+      errorMessage: json['errorMessage'] as String?,
+    );
+
+Map<String, dynamic> _$RemoteSessionToJson(RemoteSession instance) =>
+    <String, dynamic>{
+      'role': _$RemoteSessionRoleEnumMap[instance.role]!,
+      'status': _$RemoteSessionStatusEnumMap[instance.status]!,
+      'connectedDevice': instance.connectedDevice,
+      'createdAt': instance.createdAt.toIso8601String(),
+      'errorMessage': instance.errorMessage,
+    };
+
+const _$RemoteSessionRoleEnumMap = {
+  RemoteSessionRole.host: 'host',
+  RemoteSessionRole.remote: 'remote',
+};
 
 const _$RemoteSessionStatusEnumMap = {
   RemoteSessionStatus.disconnected: 'disconnected',

lib/models/play_queue_response.g.dart

@@ -6,15 +6,21 @@ part of 'play_queue_response.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-PlayQueueResponse _$PlayQueueResponseFromJson(Map<String, dynamic> json) => PlayQueueResponse(
-  playQueueID: (json['playQueueID'] as num).toInt(),
-  playQueueSelectedItemID: (json['playQueueSelectedItemID'] as num?)?.toInt(),
-  playQueueSelectedItemOffset: (json['playQueueSelectedItemOffset'] as num?)?.toInt(),
-  playQueueSelectedMetadataItemID: json['playQueueSelectedMetadataItemID'] as String?,
-  playQueueShuffled: flexibleBool(json['playQueueShuffled']),
-  playQueueSourceURI: json['playQueueSourceURI'] as String?,
-  playQueueTotalCount: (json['playQueueTotalCount'] as num?)?.toInt(),
-  playQueueVersion: (json['playQueueVersion'] as num).toInt(),
-  size: (json['size'] as num?)?.toInt(),
-  items: (json['Metadata'] as List<dynamic>?)?.map((e) => PlexMetadata.fromJson(e as Map<String, dynamic>)).toList(),
-);
+PlayQueueResponse _$PlayQueueResponseFromJson(Map<String, dynamic> json) =>
+    PlayQueueResponse(
+      playQueueID: (json['playQueueID'] as num).toInt(),
+      playQueueSelectedItemID: (json['playQueueSelectedItemID'] as num?)
+          ?.toInt(),
+      playQueueSelectedItemOffset: (json['playQueueSelectedItemOffset'] as num?)
+          ?.toInt(),
+      playQueueSelectedMetadataItemID:
+          json['playQueueSelectedMetadataItemID'] as String?,
+      playQueueShuffled: flexibleBool(json['playQueueShuffled']),
+      playQueueSourceURI: json['playQueueSourceURI'] as String?,
+      playQueueTotalCount: (json['playQueueTotalCount'] as num?)?.toInt(),
+      playQueueVersion: (json['playQueueVersion'] as num).toInt(),
+      size: (json['size'] as num?)?.toInt(),
+      items: (json['Metadata'] as List<dynamic>?)
+          ?.map((e) => PlexMetadata.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );

lib/models/plex_home.dart

@@ -1,12 +1,23 @@
+import 'package:json_annotation/json_annotation.dart';
+
 import 'plex_home_user.dart';
 
+part 'plex_home.g.dart';
+
+@JsonSerializable()
 class PlexHome {
+  @JsonKey(defaultValue: 0)
   final int id;
+  @JsonKey(defaultValue: '')
   final String name;
   final int? guestUserID;
+  @JsonKey(defaultValue: '')
   final String guestUserUUID;
+  @JsonKey(defaultValue: false)
   final bool guestEnabled;
+  @JsonKey(defaultValue: false)
   final bool subscription;
+  @JsonKey(defaultValue: <PlexHomeUser>[])
   final List<PlexHomeUser> users;
 
   PlexHome({
@@ -19,32 +30,9 @@ class PlexHome {
     required this.users,
   });
 
-  factory PlexHome.fromJson(Map<String, dynamic> json) {
-    final List<dynamic> usersJson = json['users'] as List<dynamic>;
-    final users = usersJson.map((userJson) => PlexHomeUser.fromJson(userJson as Map<String, dynamic>)).toList();
+  factory PlexHome.fromJson(Map<String, dynamic> json) => _$PlexHomeFromJson(json);
 
-    return PlexHome(
-      id: (json['id'] as num?)?.toInt() ?? 0,
-      name: json['name'] as String? ?? '',
-      guestUserID: (json['guestUserID'] as num?)?.toInt(),
-      guestUserUUID: json['guestUserUUID'] as String? ?? '',
-      guestEnabled: json['guestEnabled'] as bool? ?? false,
-      subscription: json['subscription'] as bool? ?? false,
-      users: users,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'id': id,
-      'name': name,
-      'guestUserID': guestUserID,
-      'guestUserUUID': guestUserUUID,
-      'guestEnabled': guestEnabled,
-      'subscription': subscription,
-      'users': users.map((user) => user.toJson()).toList(),
-    };
-  }
+  Map<String, dynamic> toJson() => _$PlexHomeToJson(this);
 
   PlexHomeUser? get adminUser => users.where((user) => user.admin).firstOrNull;
 

lib/models/plex_home.g.dart

@@ -0,0 +1,31 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'plex_home.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+PlexHome _$PlexHomeFromJson(Map<String, dynamic> json) => PlexHome(
+  id: (json['id'] as num?)?.toInt() ?? 0,
+  name: json['name'] as String? ?? '',
+  guestUserID: (json['guestUserID'] as num?)?.toInt(),
+  guestUserUUID: json['guestUserUUID'] as String? ?? '',
+  guestEnabled: json['guestEnabled'] as bool? ?? false,
+  subscription: json['subscription'] as bool? ?? false,
+  users:
+      (json['users'] as List<dynamic>?)
+          ?.map((e) => PlexHomeUser.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
+);
+
+Map<String, dynamic> _$PlexHomeToJson(PlexHome instance) => <String, dynamic>{
+  'id': instance.id,
+  'name': instance.name,
+  'guestUserID': instance.guestUserID,
+  'guestUserUUID': instance.guestUserUUID,
+  'guestEnabled': instance.guestEnabled,
+  'subscription': instance.subscription,
+  'users': instance.users,
+};

lib/models/plex_home_user.dart

@@ -1,16 +1,30 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'plex_home_user.g.dart';
+
+@JsonSerializable()
 class PlexHomeUser {
+  @JsonKey(defaultValue: 0)
   final int id;
+  @JsonKey(defaultValue: '')
   final String uuid;
+  @JsonKey(defaultValue: 'Unknown')
   final String title;
   final String? username;
   final String? email;
   final String? friendlyName;
+  @JsonKey(defaultValue: '')
   final String thumb;
+  @JsonKey(defaultValue: false)
   final bool hasPassword;
+  @JsonKey(defaultValue: false)
   final bool restricted;
   final int? updatedAt;
+  @JsonKey(defaultValue: false)
   final bool admin;
+  @JsonKey(defaultValue: false)
   final bool guest;
+  @JsonKey(defaultValue: false)
   final bool protected;
 
   PlexHomeUser({
@@ -29,41 +43,9 @@ class PlexHomeUser {
     required this.protected,
   });
 
-  factory PlexHomeUser.fromJson(Map<String, dynamic> json) {
-    return PlexHomeUser(
-      id: (json['id'] as num?)?.toInt() ?? 0,
-      uuid: json['uuid'] as String? ?? '',
-      title: json['title'] as String? ?? 'Unknown',
-      username: json['username'] as String?,
-      email: json['email'] as String?,
-      friendlyName: json['friendlyName'] as String?,
-      thumb: json['thumb'] as String? ?? '',
-      hasPassword: json['hasPassword'] as bool? ?? false,
-      restricted: json['restricted'] as bool? ?? false,
-      updatedAt: (json['updatedAt'] as num?)?.toInt(),
-      admin: json['admin'] as bool? ?? false,
-      guest: json['guest'] as bool? ?? false,
-      protected: json['protected'] as bool? ?? false,
-    );
-  }
+  factory PlexHomeUser.fromJson(Map<String, dynamic> json) => _$PlexHomeUserFromJson(json);
 
-  Map<String, dynamic> toJson() {
-    return {
-      'id': id,
-      'uuid': uuid,
-      'title': title,
-      'username': username,
-      'email': email,
-      'friendlyName': friendlyName,
-      'thumb': thumb,
-      'hasPassword': hasPassword,
-      'restricted': restricted,
-      'updatedAt': updatedAt,
-      'admin': admin,
-      'guest': guest,
-      'protected': protected,
-    };
-  }
+  Map<String, dynamic> toJson() => _$PlexHomeUserToJson(this);
 
   String get displayName => friendlyName ?? title;
 

lib/models/plex_home_user.g.dart

@@ -0,0 +1,40 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'plex_home_user.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+PlexHomeUser _$PlexHomeUserFromJson(Map<String, dynamic> json) => PlexHomeUser(
+  id: (json['id'] as num?)?.toInt() ?? 0,
+  uuid: json['uuid'] as String? ?? '',
+  title: json['title'] as String? ?? 'Unknown',
+  username: json['username'] as String?,
+  email: json['email'] as String?,
+  friendlyName: json['friendlyName'] as String?,
+  thumb: json['thumb'] as String? ?? '',
+  hasPassword: json['hasPassword'] as bool? ?? false,
+  restricted: json['restricted'] as bool? ?? false,
+  updatedAt: (json['updatedAt'] as num?)?.toInt(),
+  admin: json['admin'] as bool? ?? false,
+  guest: json['guest'] as bool? ?? false,
+  protected: json['protected'] as bool? ?? false,
+);
+
+Map<String, dynamic> _$PlexHomeUserToJson(PlexHomeUser instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'uuid': instance.uuid,
+      'title': instance.title,
+      'username': instance.username,
+      'email': instance.email,
+      'friendlyName': instance.friendlyName,
+      'thumb': instance.thumb,
+      'hasPassword': instance.hasPassword,
+      'restricted': instance.restricted,
+      'updatedAt': instance.updatedAt,
+      'admin': instance.admin,
+      'guest': instance.guest,
+      'protected': instance.protected,
+    };

lib/models/plex_library.g.dart

@@ -19,15 +19,16 @@ PlexLibrary _$PlexLibraryFromJson(Map<String, dynamic> json) => PlexLibrary(
   hidden: (json['hidden'] as num?)?.toInt(),
 );
 
-Map<String, dynamic> _$PlexLibraryToJson(PlexLibrary instance) => <String, dynamic>{
-  'key': instance.key,
-  'title': instance.title,
-  'type': instance.type,
-  'agent': instance.agent,
-  'scanner': instance.scanner,
-  'language': instance.language,
-  'uuid': instance.uuid,
-  'updatedAt': instance.updatedAt,
-  'createdAt': instance.createdAt,
-  'hidden': instance.hidden,
-};
+Map<String, dynamic> _$PlexLibraryToJson(PlexLibrary instance) =>
+    <String, dynamic>{
+      'key': instance.key,
+      'title': instance.title,
+      'type': instance.type,
+      'agent': instance.agent,
+      'scanner': instance.scanner,
+      'language': instance.language,
+      'uuid': instance.uuid,
+      'updatedAt': instance.updatedAt,
+      'createdAt': instance.createdAt,
+      'hidden': instance.hidden,
+    };

lib/models/plex_metadata.g.dart

@@ -42,7 +42,9 @@ PlexMetadata _$PlexMetadataFromJson(Map<String, dynamic> json) => PlexMetadata(
   leafCount: (json['leafCount'] as num?)?.toInt(),
   viewedLeafCount: (json['viewedLeafCount'] as num?)?.toInt(),
   childCount: flexibleInt(json['childCount']),
-  role: (json['Role'] as List<dynamic>?)?.map((e) => PlexRole.fromJson(e as Map<String, dynamic>)).toList(),
+  role: (json['Role'] as List<dynamic>?)
+      ?.map((e) => PlexRole.fromJson(e as Map<String, dynamic>))
+      .toList(),
   mediaVersions: (json['Media'] as List<dynamic>?)
       ?.map((e) => PlexMediaVersion.fromJson(e as Map<String, dynamic>))
       .toList(),
@@ -74,58 +76,59 @@ PlexMetadata _$PlexMetadataFromJson(Map<String, dynamic> json) => PlexMetadata(
   backgroundSquare: json['backgroundSquare'] as String?,
 );
 
-Map<String, dynamic> _$PlexMetadataToJson(PlexMetadata instance) => <String, dynamic>{
-  'ratingKey': instance.ratingKey,
-  'key': instance.key,
-  'guid': instance.guid,
-  'studio': instance.studio,
-  'type': instance.type,
-  'title': instance.title,
-  'titleSort': instance.titleSort,
-  'contentRating': instance.contentRating,
-  'summary': instance.summary,
-  'rating': instance.rating,
-  'audienceRating': instance.audienceRating,
-  'userRating': instance.userRating,
-  'year': instance.year,
-  'originallyAvailableAt': instance.originallyAvailableAt,
-  'thumb': instance.thumb,
-  'art': instance.art,
-  'duration': instance.duration,
-  'addedAt': instance.addedAt,
-  'updatedAt': instance.updatedAt,
-  'lastViewedAt': instance.lastViewedAt,
-  'grandparentTitle': instance.grandparentTitle,
-  'grandparentThumb': instance.grandparentThumb,
-  'grandparentArt': instance.grandparentArt,
-  'grandparentRatingKey': instance.grandparentRatingKey,
-  'parentTitle': instance.parentTitle,
-  'parentThumb': instance.parentThumb,
-  'parentRatingKey': instance.parentRatingKey,
-  'parentIndex': instance.parentIndex,
-  'index': instance.index,
-  'grandparentTheme': instance.grandparentTheme,
-  'viewOffset': instance.viewOffset,
-  'viewCount': instance.viewCount,
-  'leafCount': instance.leafCount,
-  'viewedLeafCount': instance.viewedLeafCount,
-  'childCount': instance.childCount,
-  'Role': instance.role,
-  'audioLanguage': instance.audioLanguage,
-  'subtitleLanguage': instance.subtitleLanguage,
-  'subtitleMode': instance.subtitleMode,
-  'playlistItemID': instance.playlistItemID,
-  'playQueueItemID': instance.playQueueItemID,
-  'librarySectionID': instance.librarySectionID,
-  'librarySectionTitle': instance.librarySectionTitle,
-  'ratingImage': instance.ratingImage,
-  'audienceRatingImage': instance.audienceRatingImage,
-  'tagline': instance.tagline,
-  'originalTitle': instance.originalTitle,
-  'editionTitle': instance.editionTitle,
-  'subtype': instance.subtype,
-  'extraType': instance.extraType,
-  'primaryExtraKey': instance.primaryExtraKey,
-  'clearLogo': instance.clearLogo,
-  'backgroundSquare': instance.backgroundSquare,
-};
+Map<String, dynamic> _$PlexMetadataToJson(PlexMetadata instance) =>
+    <String, dynamic>{
+      'ratingKey': instance.ratingKey,
+      'key': instance.key,
+      'guid': instance.guid,
+      'studio': instance.studio,
+      'type': instance.type,
+      'title': instance.title,
+      'titleSort': instance.titleSort,
+      'contentRating': instance.contentRating,
+      'summary': instance.summary,
+      'rating': instance.rating,
+      'audienceRating': instance.audienceRating,
+      'userRating': instance.userRating,
+      'year': instance.year,
+      'originallyAvailableAt': instance.originallyAvailableAt,
+      'thumb': instance.thumb,
+      'art': instance.art,
+      'duration': instance.duration,
+      'addedAt': instance.addedAt,
+      'updatedAt': instance.updatedAt,
+      'lastViewedAt': instance.lastViewedAt,
+      'grandparentTitle': instance.grandparentTitle,
+      'grandparentThumb': instance.grandparentThumb,
+      'grandparentArt': instance.grandparentArt,
+      'grandparentRatingKey': instance.grandparentRatingKey,
+      'parentTitle': instance.parentTitle,
+      'parentThumb': instance.parentThumb,
+      'parentRatingKey': instance.parentRatingKey,
+      'parentIndex': instance.parentIndex,
+      'index': instance.index,
+      'grandparentTheme': instance.grandparentTheme,
+      'viewOffset': instance.viewOffset,
+      'viewCount': instance.viewCount,
+      'leafCount': instance.leafCount,
+      'viewedLeafCount': instance.viewedLeafCount,
+      'childCount': instance.childCount,
+      'Role': instance.role,
+      'audioLanguage': instance.audioLanguage,
+      'subtitleLanguage': instance.subtitleLanguage,
+      'subtitleMode': instance.subtitleMode,
+      'playlistItemID': instance.playlistItemID,
+      'playQueueItemID': instance.playQueueItemID,
+      'librarySectionID': instance.librarySectionID,
+      'librarySectionTitle': instance.librarySectionTitle,
+      'ratingImage': instance.ratingImage,
+      'audienceRatingImage': instance.audienceRatingImage,
+      'tagline': instance.tagline,
+      'originalTitle': instance.originalTitle,
+      'editionTitle': instance.editionTitle,
+      'subtype': instance.subtype,
+      'extraType': instance.extraType,
+      'primaryExtraKey': instance.primaryExtraKey,
+      'clearLogo': instance.clearLogo,
+      'backgroundSquare': instance.backgroundSquare,
+    };

lib/models/plex_playlist.g.dart

@@ -26,22 +26,23 @@ PlexPlaylist _$PlexPlaylistFromJson(Map<String, dynamic> json) => PlexPlaylist(
   thumb: json['thumb'] as String?,
 );
 
-Map<String, dynamic> _$PlexPlaylistToJson(PlexPlaylist instance) => <String, dynamic>{
-  'ratingKey': instance.ratingKey,
-  'key': instance.key,
-  'type': instance.type,
-  'title': instance.title,
-  'summary': instance.summary,
-  'smart': instance.smart,
-  'playlistType': instance.playlistType,
-  'duration': instance.duration,
-  'leafCount': instance.leafCount,
-  'composite': instance.composite,
-  'addedAt': instance.addedAt,
-  'updatedAt': instance.updatedAt,
-  'lastViewedAt': instance.lastViewedAt,
-  'viewCount': instance.viewCount,
-  'content': instance.content,
-  'guid': instance.guid,
-  'thumb': instance.thumb,
-};
+Map<String, dynamic> _$PlexPlaylistToJson(PlexPlaylist instance) =>
+    <String, dynamic>{
+      'ratingKey': instance.ratingKey,
+      'key': instance.key,
+      'type': instance.type,
+      'title': instance.title,
+      'summary': instance.summary,
+      'smart': instance.smart,
+      'playlistType': instance.playlistType,
+      'duration': instance.duration,
+      'leafCount': instance.leafCount,
+      'composite': instance.composite,
+      'addedAt': instance.addedAt,
+      'updatedAt': instance.updatedAt,
+      'lastViewedAt': instance.lastViewedAt,
+      'viewCount': instance.viewCount,
+      'content': instance.content,
+      'guid': instance.guid,
+      'thumb': instance.thumb,
+    };

lib/screens/media_detail_screen.dart

@@ -2327,13 +2327,8 @@ class _MediaDetailScreenState extends State<MediaDetailScreen>
     final playbackState = context.read<PlaybackStateProvider>();
 
     try {
-      // Show loading indicator
       if (context.mounted) {
-        showDialog(
-          context: context,
-          barrierDismissible: false,
-          builder: (context) => const Center(child: CircularProgressIndicator()),
-        );
+        showLoadingDialog(context);
       }
 
       // Determine the rating key for the play queue

lib/screens/settings/logs_screen.dart

@@ -12,6 +12,7 @@ import '../../focus/focusable_action_bar.dart';
 import '../../focus/focusable_button.dart';
 import '../../focus/key_event_utils.dart';
 import '../../i18n/strings.g.dart';
+import '../../utils/dialogs.dart';
 import '../../main.dart' show gitCommit;
 import '../../utils/app_logger.dart';
 import '../../utils/platform_detector.dart';
@@ -125,11 +126,7 @@ class _LogsScreenState extends State<LogsScreen> {
   Future<void> _uploadLogs() async {
     final logText = _formatAllLogs();
 
-    showDialog(
-      context: context,
-      barrierDismissible: false,
-      builder: (_) => const Center(child: CircularProgressIndicator()),
-    );
+    showLoadingDialog(context);
 
     try {
       final response = await httpClient.post(

lib/screens/settings/mpv_config_screen.dart

@@ -6,7 +6,6 @@ import '../../focus/dpad_navigator.dart';
 import '../../focus/key_event_utils.dart';
 import '../../i18n/strings.g.dart';
 import '../../models/mpv_config_models.dart';
-import '../../focus/focusable_button.dart';
 import '../../utils/dialogs.dart';
 import '../../utils/snackbar_helper.dart';
 import '../../services/settings_service.dart';
@@ -61,49 +60,15 @@ class _MpvConfigScreenState extends State<MpvConfigScreen> {
   Future<void> _showSavePresetDialog() async {
     if (_textController.text.trim().isEmpty) return;
 
-    final nameController = TextEditingController();
-    final saveFocusNode = FocusNode();
-
-    final result = await showDialog<bool>(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Text(t.mpvConfig.saveAsPreset),
-        content: TextField(
-          controller: nameController,
-          decoration: InputDecoration(labelText: t.mpvConfig.presetName, hintText: t.mpvConfig.presetNameHint),
-          autofocus: true,
-          textInputAction: TextInputAction.done,
-          onSubmitted: (_) => saveFocusNode.requestFocus(),
-        ),
-        actions: [
-          FocusableButton(
-            onPressed: () => Navigator.pop(context, false),
-            child: TextButton(onPressed: () => Navigator.pop(context, false), child: Text(t.common.cancel)),
-          ),
-          FocusableButton(
-            focusNode: saveFocusNode,
-            onPressed: () {
-              if (nameController.text.isNotEmpty) {
-                Navigator.pop(context, true);
-              }
-            },
-            child: FilledButton(
-              onPressed: () {
-                if (nameController.text.isNotEmpty) {
-                  Navigator.pop(context, true);
-                }
-              },
-              child: Text(t.common.save),
-            ),
-          ),
-        ],
-      ),
+    final name = await showTextInputDialog(
+      context,
+      title: t.mpvConfig.saveAsPreset,
+      labelText: t.mpvConfig.presetName,
+      hintText: t.mpvConfig.presetNameHint,
     );
 
-    saveFocusNode.dispose();
-
-    if (result == true) {
-      await _settingsService.saveMpvPreset(nameController.text.trim(), _textController.text);
+    if (name != null && name.trim().isNotEmpty) {
+      await _settingsService.saveMpvPreset(name.trim(), _textController.text);
       if (!mounted) return;
       setState(() {
         _presets = _settingsService.getMpvPresets();
@@ -113,8 +78,6 @@ class _MpvConfigScreenState extends State<MpvConfigScreen> {
         showSuccessSnackBar(context, t.mpvConfig.presetSaved);
       }
     }
-
-    nameController.dispose();
   }
 
   Future<void> _loadPreset(MpvPreset preset) async {

lib/utils/dialogs.dart

@@ -58,6 +58,16 @@ Future<bool> showConfirmDialog(
   return confirmed ?? false;
 }
 
+/// Shows a non-dismissible loading-spinner dialog. Caller is responsible for
+/// closing it via `Navigator.pop(context)` when the work completes.
+void showLoadingDialog(BuildContext context) {
+  showDialog<void>(
+    context: context,
+    barrierDismissible: false,
+    builder: (_) => const Center(child: CircularProgressIndicator()),
+  );
+}
+
 /// Shows the server-side 500 modal (bandwidth/transcoding limit rejection).
 Future<void> showServerLimitDialog(BuildContext context) async {
   await showDialog<void>(

lib/widgets/media_context_menu.dart

@@ -711,13 +711,8 @@ class MediaContextMenuState extends State<MediaContextMenu> {
     final client = _getClientForItem();
 
     try {
-      // Show loading indicator
       if (context.mounted) {
-        showDialog(
-          context: context,
-          barrierDismissible: false,
-          builder: (context) => const Center(child: CircularProgressIndicator()),
-        );
+        showLoadingDialog(context);
       }
 
       // Fetch file info