From 991aee6c90587fff8a2f623f8ae2a846a3fe6d3b Mon Sep 17 00:00:00 2001
From: edde746 <86283021+edde746@users.noreply.github.com>
Date: Tue, 14 Jul 2026 01:21:38 +0200
Subject: [PATCH] fix(ci): resolve analyzer and settings test failures

---
 pubspec.lock                                  | 20 ++-----------------
 pubspec.yaml                                  |  3 ++-
 .../settings/settings_screen_test.dart        | 15 ++++++++------
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 35d3b570..3d7bec44 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -9,14 +9,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "93.0.0"
-  analysis_server_plugin:
-    dependency: transitive
-    description:
-      name: analysis_server_plugin
-      sha256: "5f3920acbd5765764ec9ef6c5bbdd102015424281232ee4fb4f5431c87abb4eb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.7"
   analyzer:
     dependency: "direct dev"
     description:
@@ -323,10 +315,10 @@ packages:
     dependency: "direct dev"
     description:
       name: dart_code_linter
-      sha256: "44cce8527a2094201067b50aed97778930638cc43e8bb3cb0b40a90c36fb9c84"
+      sha256: "8ece88f710621ca1c40b6c344b316d78bb2269d728d37d2a44f19a81d9d2cb93"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.6"
+    version: "4.0.2"
   dart_discord_presence:
     dependency: "direct main"
     description:
@@ -1511,14 +1503,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.3"
-  yaml_edit:
-    dependency: transitive
-    description:
-      name: yaml_edit
-      sha256: "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.4"
 sdks:
   dart: ">=3.12.0 <4.0.0"
   flutter: ">=3.44.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index b8f7e441..fecdde1f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -91,7 +91,8 @@ dev_dependencies:
   json_serializable: ^6.7.1
   slang_build_runner: ^4.14.0
   sentry_dart_plugin: ^3.3.0
-  dart_code_linter: ^4.0.2
+  # dart_code_linter 4.1.6 crashes analyzer 10.0.1 during plugin analysis.
+  dart_code_linter: 4.0.2
   drift_dev: ^2.28.3
   shared_preferences_platform_interface: ^2.4.0
   path_provider_platform_interface: ^2.1.0
diff --git a/test/screens/settings/settings_screen_test.dart b/test/screens/settings/settings_screen_test.dart
index 00f94ab1..b950c8d5 100644
--- a/test/screens/settings/settings_screen_test.dart
+++ b/test/screens/settings/settings_screen_test.dart
@@ -67,7 +67,7 @@ void main() {
     }
   });
 
-  testWidgets('migrated rows use the standard navigation geometry without losing activation', (tester) async {
+  testWidgets('migrated rows retain compact mobile navigation geometry and activation', (tester) async {
     final harness = await _pumpSettingsScreen(tester);
     addTearDown(() => harness.dispose(tester));
 
@@ -108,10 +108,10 @@ void main() {
         find.descendant(of: focusableFinder, matching: find.byType(ListTile)),
       );
 
-      expect(focusable.dense, isFalse, reason: '${row.title} must not inherit the compact tile default');
-      expect(focusable.visualDensity, VisualDensity.standard);
-      expect(materialTile.dense, isFalse);
-      expect(materialTile.visualDensity, VisualDensity.standard);
+      expect(focusable.dense, isTrue, reason: '${row.title} must use the shared compact mobile density');
+      expect(focusable.visualDensity, const VisualDensity(vertical: -3));
+      expect(materialTile.dense, isTrue);
+      expect(materialTile.visualDensity, const VisualDensity(vertical: -3));
       expect(focusable.onTap, isNotNull, reason: '${row.title} must remain pointer activatable');
       expect(materialTile.onTap, isNotNull);
       expect(materialTile.focusNode, isNotNull, reason: '${row.title} must remain D-pad focusable');
@@ -316,7 +316,10 @@ Future<_SettingsHarness> _pumpSettingsScreen(WidgetTester tester) async {
           ChangeNotifierProvider<TrackersProvider>.value(value: trackers),
           ChangeNotifierProvider<SeerrAccountProvider>.value(value: seerr),
         ],
-        child: MaterialApp(theme: monoTheme(dark: true), home: const SettingsScreen()),
+        child: MaterialApp(
+          theme: monoTheme(dark: true).copyWith(platform: TargetPlatform.android),
+          home: const SettingsScreen(),
+        ),
       ),
     ),
   );