Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove logging v2 code #8503

Merged
merged 1 commit into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions packages/devtools_app/lib/devtools_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
15 changes: 4 additions & 11 deletions packages/devtools_app/lib/src/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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});
Expand All @@ -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(
Expand All @@ -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,
Expand Down

This file was deleted.

Loading
Loading