Remove logging v2 code (#8503)

flutter · Nov 4, 2024 · fbdf733 · fbdf733
1 parent 33e67d5
commit fbdf733
Show file tree

Hide file tree

Showing 19 changed files with 8 additions and 3,051 deletions.
diff --git a/packages/devtools_app/lib/devtools_app.dart b/packages/devtools_app/lib/devtools_app.dart
@@ -29,10 +29,6 @@ export 'src/screens/inspector_shared/inspector_screen.dart';
 export 'src/screens/inspector_shared/inspector_screen_controller.dart';
 export 'src/screens/logging/logging_controller.dart';
 export 'src/screens/logging/logging_screen.dart';
-export 'src/screens/logging/logging_screen_v2/log_data.dart';
-export 'src/screens/logging/logging_screen_v2/logging_controller_v2.dart';
-export 'src/screens/logging/logging_screen_v2/logging_model.dart';
-export 'src/screens/logging/logging_screen_v2/logging_screen_v2.dart';
 export 'src/screens/memory/framework/memory_controller.dart';
 export 'src/screens/memory/framework/memory_screen.dart';
 export 'src/screens/network/network_controller.dart';

diff --git a/packages/devtools_app/lib/src/app.dart b/packages/devtools_app/lib/src/app.dart
@@ -31,8 +31,6 @@ import 'screens/inspector_shared/inspector_screen.dart';
 import 'screens/inspector_shared/inspector_screen_controller.dart';
 import 'screens/logging/logging_controller.dart';
 import 'screens/logging/logging_screen.dart';
-import 'screens/logging/logging_screen_v2/logging_controller_v2.dart';
-import 'screens/logging/logging_screen_v2/logging_screen_v2.dart';
 import 'screens/memory/framework/memory_controller.dart';
 import 'screens/memory/framework/memory_screen.dart';
 import 'screens/network/network_controller.dart';
@@ -677,15 +675,10 @@ List<DevToolsScreen> defaultScreens({
       NetworkScreen(),
       createController: (_) => NetworkController(),
     ),
-    FeatureFlags.loggingV2
-        ? DevToolsScreen<LoggingControllerV2>(
-            LoggingScreenV2(),
-            createController: (_) => LoggingControllerV2(),
-          )
-        : DevToolsScreen<LoggingController>(
-            LoggingScreen(),
-            createController: (_) => LoggingController(),
-          ),
+    DevToolsScreen<LoggingController>(
+      LoggingScreen(),
+      createController: (_) => LoggingController(),
+    ),
     DevToolsScreen<void>(ProviderScreen()),
     DevToolsScreen<AppSizeController>(
       AppSizeScreen(),

diff --git a/packages/devtools_app/lib/src/screens/logging/logging_controls.dart b/packages/devtools_app/lib/src/screens/logging/logging_controls.dart
@@ -16,7 +16,8 @@ import '../../shared/primitives/utils.dart';
 import '../../shared/ui/filter.dart';
 import '../../shared/ui/search.dart';
 import 'logging_controller.dart';
-import 'shared/constants.dart';
+
+const _loggingMinVerboseWidth = 650.0;
 
 class LoggingControls extends StatelessWidget {
   const LoggingControls({super.key});
@@ -30,7 +31,7 @@ class LoggingControls extends StatelessWidget {
           onPressed: controller.clear,
           gaScreen: gac.logging,
           gaSelection: gac.clear,
-          minScreenWidthForTextBeforeScaling: loggingMinVerboseWidth,
+          minScreenWidthForTextBeforeScaling: _loggingMinVerboseWidth,
         ),
         const SizedBox(width: denseSpacing),
         Expanded(
@@ -39,7 +40,7 @@ class LoggingControls extends StatelessWidget {
             valueListenable: controller.filteredData,
             builder: (context, _, _) => SearchField<LoggingController>(
               searchFieldWidth:
-                  isScreenWiderThan(context, loggingMinVerboseWidth)
+                  isScreenWiderThan(context, _loggingMinVerboseWidth)
                       ? wideSearchFieldWidth
                       : defaultSearchFieldWidth,
               searchController: controller,

diff --git a/packages/devtools_app/lib/src/screens/logging/logging_screen_v2/log_data.dart b/packages/devtools_app/lib/src/screens/logging/logging_screen_v2/log_data.dart