Edit mixin private properties

case_study/code_size/optimized/code_size_images/test/widget_test.dart

@@ -5,11 +5,10 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
+import 'package:code_size_images/main.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:code_size_images/main.dart';
-
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.

case_study/code_size/optimized/code_size_package/test/widget_test.dart

@@ -5,11 +5,10 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
+import 'package:code_size_package/main.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:code_size_package/main.dart';
-
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.

case_study/code_size/unoptimized/code_size_images/test/widget_test.dart

@@ -5,11 +5,10 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
+import 'package:code_size_images/main.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:code_size_images/main.dart';
-
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.

case_study/code_size/unoptimized/code_size_package/test/widget_test.dart

@@ -5,11 +5,10 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
+import 'package:code_size_package/main.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:code_size_package/main.dart';
-
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.

case_study/platform_channel/lib/channel_demo.dart

@@ -1,5 +1,5 @@
-import 'package:flutter/services.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 
 class ChannelDemo extends StatefulWidget {

packages/devtools_app/lib/src/provider/instance_viewer/instance_providers.dart

@@ -415,16 +415,28 @@ Future<List<ObjectField>> _parseFields(
   final fields = instance.fields.map((field) async {
     final owner = await eval.getClass(field.decl.owner, isAlive);
 
-    final ownerPackageName = tryParsePackageName(owner.library.uri);
+    String ownerUri;
+    String ownerName;
+    if (owner.mixin == null) {
+      ownerUri = owner.library.uri;
+      ownerName = owner.name;
+    } else {
+      final mixinClass = await eval.getClass(owner.mixin.typeClass, isAlive);
+
+      ownerUri = mixinClass.library.uri;
+      ownerName = mixinClass.name;
+    }
+
+    final ownerPackageName = tryParsePackageName(ownerUri);
 
     return ObjectField(
       name: field.decl.name,
       isFinal: field.decl.isFinal,
       ref: parseSentinel<InstanceRef>(field.value),
-      ownerName: owner.name,
-      ownerUri: owner.library.uri,
+      ownerName: ownerName,
+      ownerUri: ownerUri,
       eval: await ref.watch(libraryEvalProvider(owner.library.uri).future),
-      isDefinedByDependency: ownerPackageName == appName,
+      isDefinedByDependency: ownerPackageName != appName,
     );
   }).toList();
 

packages/devtools_app/lib/src/provider/instance_viewer/instance_viewer.dart

@@ -96,9 +96,11 @@ class InstanceViewer extends StatefulWidget {
   const InstanceViewer({
     Key key,
     this.rootPath,
+    @required this.showInternalProperties,
   }) : super(key: key);
 
   final InstancePath rootPath;
+  final bool showInternalProperties;
 
   @override
   _InstanceViewerState createState() => _InstanceViewerState();
@@ -351,6 +353,13 @@ class _InstanceViewerState extends State<InstanceViewer> {
     @required InstancePath path,
   }) sync* {
     for (final field in instance.fields) {
+      if (!widget.showInternalProperties &&
+          field.isDefinedByDependency &&
+          field.isPrivate) {
+        // Hide private properties from classes defined by dependencies
+        continue;
+      }
+
       final children = _buildListViewItems(
         context,
         watch,

packages/devtools_app/lib/src/provider/provider_screen.dart

@@ -8,6 +8,7 @@ import 'package:provider/provider.dart' as provider show Provider;
 
 import '../banner_messages.dart';
 import '../common_widgets.dart';
+import '../dialogs.dart';
 import '../screen.dart';
 import '../split.dart';
 import './instance_viewer/instance_details.dart';
@@ -39,6 +40,8 @@ final _selectedProviderNode = AutoDisposeProvider<ProviderNode>((ref) {
       );
 });
 
+final _showInternals = StateProvider<bool>((ref) => false);
+
 class ProviderScreen extends Screen {
   const ProviderScreen()
       : super.conditional(
@@ -82,8 +85,8 @@ class ProviderScreenBody extends ConsumerWidget {
             child: Column(
               children: const [
                 AreaPaneHeader(
-                  title: Text('Providers'),
                   needsTopBorder: false,
+                  title: Text('Providers'),
                 ),
                 Expanded(
                   child: ProviderList(),
@@ -95,13 +98,25 @@ class ProviderScreenBody extends ConsumerWidget {
             child: Column(
               children: [
                 AreaPaneHeader(
-                  title: Text(detailsTitleText),
                   needsTopBorder: false,
+                  title: Text(detailsTitleText),
+                  actions: [
+                    SettingsOutlinedButton(
+                      onPressed: () {
+                        showDialog(
+                          context: context,
+                          builder: (_) => _StateInspectorSettingsDialog(),
+                        );
+                      },
+                      tooltip: 'State inspector configurations',
+                    ),
+                  ],
                 ),
                 if (selectedProviderId != null)
                   Expanded(
                     child: InstanceViewer(
                       rootPath: InstancePath.fromProviderId(selectedProviderId),
+                      showInternalProperties: watch(_showInternals).state,
                     ),
                   )
               ],
@@ -122,3 +137,44 @@ void showProviderErrorBanner(BuildContext context) {
         .build(context),
   );
 }
+
+class _StateInspectorSettingsDialog extends ConsumerWidget {
+  @override
+  Widget build(BuildContext context, ScopedReader watch) {
+    final theme = Theme.of(context);
+
+    return DevToolsDialog(
+      title: dialogTitleText(theme, 'State inspector configurations'),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Tooltip(
+            message: 'Show private properties inherited from SDKs/packages',
+            waitDuration: tooltipWait,
+            child: InkWell(
+              onTap: () => _toggleShowInternals(context),
+              child: Row(
+                children: [
+                  Checkbox(
+                    value: watch(_showInternals).state,
+                    onChanged: (_) => _toggleShowInternals(context),
+                  ),
+                  const Text('Show internals'),
+                ],
+              ),
+            ),
+          )
+        ],
+      ),
+      actions: [
+        DialogCloseButton(),
+      ],
+    );
+  }
+
+  void _toggleShowInternals(BuildContext context) {
+    final showInternals = context.read(_showInternals);
+    showInternals.state = !showInternals.state;
+  }
+}