fix: update test imports and apply dart fix for lint issues

it5prasoon · it5prasoon · commit adfcef592f76 · 2026-02-14T13:10:37.000+05:30
- Updated test/helpers/pump_app.dart from vsound to aveditor
- Fixed import ordering across codebase
- Applied dart fix for lint compliance
diff --git a/lib/main_development.dart b/lib/main_development.dart
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a GPL-style license that can be found
 // in the LICENSE file.
 
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:get/get.dart';
 import 'package:aveditor/bootstrap.dart';
 import 'package:aveditor/src/app/app.dart';
 import 'package:aveditor/src/injection.dart' as di;
 import 'package:aveditor/src/presentation/presentation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
+import 'package:get/get.dart';
 
 Future<void> main() async {
   // Ensures that the Flutter binding has been initialized.
diff --git a/lib/main_production.dart b/lib/main_production.dart
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a GPL-style license that can be found
 // in the LICENSE file.
 
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:get/get.dart';
 import 'package:aveditor/bootstrap.dart';
 import 'package:aveditor/src/app/app.dart';
 import 'package:aveditor/src/injection.dart' as di;
 import 'package:aveditor/src/presentation/presentation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
+import 'package:get/get.dart';
 
 Future<void> main() async {
   // Ensures that the Flutter binding has been initialized.
diff --git a/lib/main_staging.dart b/lib/main_staging.dart
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a GPL-style license that can be found
 // in the LICENSE file.
 
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:get/get.dart';
 import 'package:aveditor/bootstrap.dart';
 import 'package:aveditor/src/app/app.dart';
 import 'package:aveditor/src/injection.dart' as di;
 import 'package:aveditor/src/presentation/presentation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
+import 'package:get/get.dart';
 
 Future<void> main() async {
   // Ensures that the Flutter binding has been initialized.
diff --git a/lib/src/app/controller/app_controller.dart b/lib/src/app/controller/app_controller.dart
@@ -4,12 +4,12 @@
 
 import 'dart:async';
 
-import 'package:flutter/services.dart';
-import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:get/get.dart';
 import 'package:aveditor/src/config/config.dart';
 import 'package:aveditor/src/core/core.dart';
 import 'package:aveditor/src/presentation/presentation.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
+import 'package:get/get.dart';
 
 class AppController extends GetxController {
   AppController({
diff --git a/lib/src/app/view/app.dart b/lib/src/app/view/app.dart
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a GPL-style license that can be found
 // in the LICENSE file.
 
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:sizer/sizer.dart';
 import 'package:aveditor/src/app/app.dart';
 import 'package:aveditor/src/components/components.dart';
 import 'package:aveditor/src/core/core.dart';
 import 'package:aveditor/src/presentation/presentation.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:sizer/sizer.dart';
 
 class App extends StatelessWidget {
   const App({super.key});
diff --git a/lib/src/components/video_thumbnail.dart b/lib/src/components/video_thumbnail.dart
@@ -28,7 +28,7 @@ class VideoThumbnail extends StatelessWidget {
         if (bytes == null) return const _LoadingGridViewItem();
 
         return InkWell(
-          overlayColor: MaterialStateProperty.all(Colors.transparent),
+          overlayColor: WidgetStateProperty.all(Colors.transparent),
           highlightColor: Colors.transparent,
           onTap: onTap,
           child: _LoadedGridViewItem(
@@ -102,7 +102,7 @@ class _LoadedGridViewItem extends StatelessWidget {
         ),
         DecoratedBox(
           decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
             border: Border.all(
               color: Theme.of(context).colorScheme.secondary,
             ),
diff --git a/lib/src/config/themes/app_theme.dart b/lib/src/config/themes/app_theme.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a GPL-style license that can be found
 // in the LICENSE file.
 
-import 'package:flutter/material.dart';
 import 'package:aveditor/src/config/config.dart';
+import 'package:flutter/material.dart';
 
 /// [AppTheme]
 ///
diff --git a/lib/src/config/themes/dark/dark_theme.dart b/lib/src/config/themes/dark/dark_theme.dart
@@ -26,12 +26,11 @@ class DarkTheme {
     primaryColorLight: const Color(0xFFF8F3F7),
     scaffoldBackgroundColor: const Color(0xFF181818),
     cardColor: const Color(0xFF181818),
-    indicatorColor: const Color(0xB3F8F3F7),
     focusColor: const Color(0x66181818),
     dividerColor: const Color(0x33F8F3F7),
     splashColor: const Color(0x33F8F3F7),
     iconTheme: const IconThemeData(color: Color(0xFFF8F3F7)),
-    appBarTheme: const AppBarTheme(color: Color(0xFF181818)),
+    appBarTheme: const AppBarTheme(backgroundColor: Color(0xFF181818)),
     sliderTheme: SliderThemeData(
       activeTrackColor: const Color(0xFFF8F3F7),
       inactiveTrackColor: const Color(0xFFF8F3F7),
@@ -54,10 +53,10 @@ class DarkTheme {
     ),
     outlinedButtonTheme: OutlinedButtonThemeData(
       style: ButtonStyle(
-        shape: MaterialStateProperty.all(
+        shape: WidgetStateProperty.all(
           RoundedRectangleBorder(borderRadius: BorderRadius.circular(1)),
         ),
-        side: MaterialStateProperty.all(
+        side: WidgetStateProperty.all(
           const BorderSide(color: Color(0xFFF8F3F7)),
         ),
       ),
@@ -107,7 +106,7 @@ class DarkTheme {
       primary: const Color(0xFF181818),
       // Sliding color
       secondary: const Color(0xFFF8F3F7),
-      background: const Color(0xFF181818),
-    ),
+      surface: const Color(0xFF181818),
+    ), tabBarTheme: const TabBarThemeData(indicatorColor: Color(0xB3F8F3F7)),
   );
 }
diff --git a/lib/src/config/themes/light/light_theme.dart b/lib/src/config/themes/light/light_theme.dart
@@ -26,12 +26,11 @@ class LightTheme {
     primaryColorLight: const Color(0xFF181818),
     scaffoldBackgroundColor: const Color(0xFFF8F3F7),
     cardColor: const Color(0xFFF8F3F7),
-    indicatorColor: const Color(0xB3181818),
     focusColor: const Color(0x66F8F3F7),
     dividerColor: const Color(0x80181818),
     splashColor: const Color(0x33181818),
     iconTheme: const IconThemeData(color: Color(0xFF181818)),
-    appBarTheme: const AppBarTheme(color: Color(0xFFF8F3F7)),
+    appBarTheme: const AppBarTheme(backgroundColor: Color(0xFFF8F3F7)),
     sliderTheme: SliderThemeData(
       activeTrackColor: const Color(0xFF181818),
       inactiveTrackColor: const Color(0xFF181818),
@@ -54,10 +53,10 @@ class LightTheme {
     ),
     outlinedButtonTheme: OutlinedButtonThemeData(
       style: ButtonStyle(
-        shape: MaterialStateProperty.all(
+        shape: WidgetStateProperty.all(
           RoundedRectangleBorder(borderRadius: BorderRadius.circular(1)),
         ),
-        side: MaterialStateProperty.all(
+        side: WidgetStateProperty.all(
           const BorderSide(color: Color(0xFF181818)),
         ),
       ),
@@ -107,7 +106,7 @@ class LightTheme {
       primary: const Color(0xFFF8F3F7),
       // Sliding color
       secondary: const Color(0xFF181818),
-      background: const Color(0xFFF8F3F7),
-    ),
+      surface: const Color(0xFFF8F3F7),
+    ), tabBarTheme: const TabBarThemeData(indicatorColor: Color(0xB3181818)),
   );
 }
diff --git a/lib/src/core/l10n/l10n.dart b/lib/src/core/l10n/l10n.dart
@@ -1,5 +1,5 @@
-import 'package:flutter/widgets.dart';
 import 'package:aveditor/src/core/core.dart';
+import 'package:flutter/widgets.dart';
 
 export 'app_localizations.dart';
 
diff --git a/lib/src/core/services/error_service/error_service.dart b/lib/src/core/services/error_service/error_service.dart
@@ -51,7 +51,7 @@ class _ErrorModalBottomSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Material(
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
       child: DecoratedBox(
         decoration: BoxDecoration(
           border: Border(
@@ -87,7 +87,7 @@ class _ErrorModalBottomSheet extends StatelessWidget {
                       InkWell(
                         onTap: () => Navigator.pop(context),
                         overlayColor:
-                            MaterialStateProperty.all(Colors.transparent),
+                            WidgetStateProperty.all(Colors.transparent),
                         highlightColor: Colors.transparent,
                         child: SvgPicture.asset(
                           closeIconPath!,
diff --git a/lib/src/injection.dart b/lib/src/injection.dart
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a GPL-style license that can be found
 // in the LICENSE file.
 
+import 'package:aveditor/src/core/core.dart';
 import 'package:get_it/get_it.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:video_player/video_player.dart';
-import 'package:aveditor/src/core/core.dart';
 
 final sl = GetIt.instance;
 
diff --git a/lib/src/presentation/edit/controller/edit_view_controller.dart b/lib/src/presentation/edit/controller/edit_view_controller.dart
@@ -6,6 +6,9 @@ import 'dart:async';
 import 'dart:developer' as developer;
 import 'dart:io';
 
+import 'package:aveditor/src/components/components.dart';
+import 'package:aveditor/src/core/core.dart';
+import 'package:aveditor/src/presentation/presentation.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:image_gallery_saver_plus/image_gallery_saver_plus.dart';
@@ -14,9 +17,6 @@ import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:scroll_to_index/scroll_to_index.dart';
-import 'package:aveditor/src/components/components.dart';
-import 'package:aveditor/src/core/core.dart';
-import 'package:aveditor/src/presentation/presentation.dart';
 
 class EditViewController extends GetxController
     with GetSingleTickerProviderStateMixin {
@@ -204,7 +204,9 @@ class EditViewController extends GetxController
 
   Future<void> _videoListener() async {
     if (_videoPlayerService.position.inSeconds !=
-        _videoPlayerService.duration.inSeconds) return;
+        _videoPlayerService.duration.inSeconds) {
+      return;
+    }
 
     try {
       await Future.wait<void>([
diff --git a/lib/src/presentation/edit/view/edit_view.dart b/lib/src/presentation/edit/view/edit_view.dart
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a GPL-style license that can be found
 // in the LICENSE file.
 
+import 'package:aveditor/src/components/components.dart';
+import 'package:aveditor/src/core/core.dart';
+import 'package:aveditor/src/presentation/presentation.dart';
 import 'package:dotted_border/dotted_border.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -11,9 +14,6 @@ import 'package:scroll_to_index/scroll_to_index.dart';
 import 'package:sizer/sizer.dart';
 import 'package:text_scroll/text_scroll.dart';
 import 'package:video_player/video_player.dart';
-import 'package:aveditor/src/components/components.dart';
-import 'package:aveditor/src/core/core.dart';
-import 'package:aveditor/src/presentation/presentation.dart';
 
 part 'widgets/control_panel_widget.dart';
 part 'widgets/no_sound_widget.dart';
diff --git a/lib/src/presentation/edit/view/widgets/control_panel_widget.dart b/lib/src/presentation/edit/view/widgets/control_panel_widget.dart
@@ -45,7 +45,7 @@ class _ControlPanelWidget extends StatelessWidget {
                 children: [
                   InkWell(
                     onTap: editViewController.onTapSettingsButton,
-                    overlayColor: MaterialStateProperty.all(Colors.transparent),
+                    overlayColor: WidgetStateProperty.all(Colors.transparent),
                     highlightColor: Colors.transparent,
                     child: AnimatedBuilder(
                       animation: editViewController.animation,
@@ -71,7 +71,7 @@ class _ControlPanelWidget extends StatelessWidget {
                   ),
                   InkWell(
                     onTap: editViewController.onTapSaveButton,
-                    overlayColor: MaterialStateProperty.all(Colors.transparent),
+                    overlayColor: WidgetStateProperty.all(Colors.transparent),
                     highlightColor: Colors.transparent,
                     child: AnimatedBuilder(
                       animation: editViewController.animation,
diff --git a/lib/src/presentation/edit/view/widgets/no_sound_widget.dart b/lib/src/presentation/edit/view/widgets/no_sound_widget.dart
@@ -18,7 +18,7 @@ class _NoSoundWidget extends StatelessWidget {
       controller: editViewController.autoScrollController,
       index: index,
       child: InkWell(
-        overlayColor: MaterialStateProperty.all(Colors.transparent),
+        overlayColor: WidgetStateProperty.all(Colors.transparent),
         highlightColor: Colors.transparent,
         onTap: () async {
           await editViewController.autoScrollController.scrollToIndex(
diff --git a/lib/src/presentation/edit/view/widgets/save_modal_bottom_sheet.dart b/lib/src/presentation/edit/view/widgets/save_modal_bottom_sheet.dart
@@ -12,7 +12,7 @@ class SaveModalBottomSheet extends StatelessWidget {
     final editViewController = Get.find<EditViewController>();
 
     return Material(
-      color: context.theme.colorScheme.background,
+      color: context.theme.colorScheme.surface,
       child: DecoratedBox(
         decoration: BoxDecoration(
           border: Border(
@@ -51,7 +51,7 @@ class SaveModalBottomSheet extends StatelessWidget {
                         Get.back<void>();
                       },
                       overlayColor:
-                          MaterialStateProperty.all(Colors.transparent),
+                          WidgetStateProperty.all(Colors.transparent),
                       highlightColor: Colors.transparent,
                       child: Obx(
                         () {
diff --git a/lib/src/presentation/edit/view/widgets/settings_modal_bottom_sheet.dart b/lib/src/presentation/edit/view/widgets/settings_modal_bottom_sheet.dart
@@ -12,7 +12,7 @@ class SettingsModalBottomSheet extends StatelessWidget {
     final editViewController = Get.find<EditViewController>();
 
     return Material(
-      color: context.theme.colorScheme.background,
+      color: context.theme.colorScheme.surface,
       child: DecoratedBox(
         decoration: BoxDecoration(
           border: Border(
@@ -47,7 +47,7 @@ class SettingsModalBottomSheet extends StatelessWidget {
                     InkWell(
                       onTap: Get.back<void>,
                       overlayColor:
-                          MaterialStateProperty.all(Colors.transparent),
+                          WidgetStateProperty.all(Colors.transparent),
                       highlightColor: Colors.transparent,
                       child: SvgPicture.asset(
                         kCloseIconPath,
diff --git a/lib/src/presentation/edit/view/widgets/sound_widget.dart b/lib/src/presentation/edit/view/widgets/sound_widget.dart
@@ -18,7 +18,7 @@ class _SoundWidget extends StatelessWidget {
       controller: editViewController.autoScrollController,
       index: index,
       child: InkWell(
-        overlayColor: MaterialStateProperty.all(Colors.transparent),
+        overlayColor: WidgetStateProperty.all(Colors.transparent),
         highlightColor: Colors.transparent,
         onTap: () async {
           await editViewController.autoScrollController.scrollToIndex(
diff --git a/lib/src/presentation/more/controller/more_view_controller.dart b/lib/src/presentation/more/controller/more_view_controller.dart
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a GPL-style license that can be found
 // in the LICENSE file.
 
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 import 'package:aveditor/src/app/app.dart';
 import 'package:aveditor/src/config/config.dart';
 import 'package:aveditor/src/core/core.dart';
 import 'package:aveditor/src/presentation/presentation.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 
 class MoreViewController extends GetxController
     with GetSingleTickerProviderStateMixin {
diff --git a/lib/src/presentation/more/view/more_view.dart b/lib/src/presentation/more/view/more_view.dart
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a GPL-style license that can be found
 // in the LICENSE file.
 
+import 'package:aveditor/src/components/components.dart';
+import 'package:aveditor/src/core/core.dart';
+import 'package:aveditor/src/presentation/presentation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
 import 'package:nil/nil.dart';
-import 'package:aveditor/src/components/components.dart';
-import 'package:aveditor/src/core/core.dart';
-import 'package:aveditor/src/presentation/presentation.dart';
 
 part 'widgets/copyright_widget.dart';
 part 'widgets/more_items_widget.dart';
diff --git a/lib/src/presentation/more/view/widgets/settings_bottom_sheet_widget.dart b/lib/src/presentation/more/view/widgets/settings_bottom_sheet_widget.dart
diff --git a/lib/src/presentation/navigation_bar/controller/navigation_bar_controller.dart b/lib/src/presentation/navigation_bar/controller/navigation_bar_controller.dart
diff --git a/lib/src/presentation/navigation_bar/view/navigation_bar_view.dart b/lib/src/presentation/navigation_bar/view/navigation_bar_view.dart
diff --git a/lib/src/presentation/select/controller/select_view_controller.dart b/lib/src/presentation/select/controller/select_view_controller.dart
diff --git a/lib/src/presentation/select/view/select_view.dart b/lib/src/presentation/select/view/select_view.dart
diff --git a/test/helpers/pump_app.dart b/test/helpers/pump_app.dart
