Resolve merge conflicts and update flutter candidate

Author: elliette

flutter-candidate.txt

@@ -1 +1 @@
-d59499988ac50c18a3d492f953c71efcc101b1a5
+5dff2b54f93ebbc5e711b5fc68d52cd275be9b07

packages/devtools_app/lib/initialization.dart

@@ -4,14 +4,12 @@
 
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
 
 import 'src/app.dart';
 import 'src/framework/app_error_handling.dart';
 import 'src/framework/framework_core.dart';
 import 'src/screens/debugger/syntax_highlighter.dart';
-import 'src/screens/provider/riverpod_error_logger_observer.dart';
 import 'src/shared/analytics/analytics_controller.dart';
 import 'src/shared/config_specific/logger/logger_helpers.dart';
 import 'src/shared/feature_flags.dart';
@@ -43,12 +41,9 @@ void runDevTools({
 
     // Run the app.
     runApp(
-      ProviderScope(
-        observers: const [ErrorLoggerObserver()],
-        child: DevToolsApp(
-          screens ?? defaultScreens(sampleData: sampleData),
-          await analyticsController,
-        ),
+      DevToolsApp(
+        screens ?? defaultScreens(sampleData: sampleData),
+        await analyticsController,
       ),
     );
   });

packages/devtools_app/lib/src/app.dart

@@ -304,9 +304,9 @@ class DevToolsAppState extends State<DevToolsApp> with AutoDisposeMixin {
             scaffold = DevToolsScaffold.withChild(
               embedMode: embedMode,
               child: CenteredMessage(
-                'No DevTools '
-                '${queryParams.hideAllExceptExtensions ? 'extensions' : 'screens'} '
-                'available for your project.',
+                message: 'No DevTools '
+                    '${queryParams.hideAllExceptExtensions ? 'extensions' : 'screens'} '
+                    'available for your project.',
               ),
             );
           } else {
@@ -426,7 +426,7 @@ class DevToolsAppState extends State<DevToolsApp> with AutoDisposeMixin {
       builder: (context, child) {
         if (child == null) {
           return const CenteredMessage(
-            'Uh-oh, something went wrong. Please refresh the page.',
+            message: 'Uh-oh, something went wrong. Please refresh the page.',
           );
         }
         return MultiProvider(

packages/devtools_app/lib/src/framework/initializer.dart

@@ -79,7 +79,7 @@ class _InitializerState extends State<Initializer>
           children: [
             const Spacer(),
             CenteredMessage(
-              _showConnectToNewAppButton
+              message: _showConnectToNewAppButton
                   ? 'Cannot connect to VM service.'
                   : 'Waiting for VM service connection...',
             ),

packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart

@@ -394,7 +394,7 @@ class _AnalysisViewState extends State<AnalysisView>
       valueListenable: controller.processingNotifier,
       builder: (context, processing, _) {
         return processing
-            ? const CenteredMessage(AppSizeScreen.loadingMessage)
+            ? const CenteredMessage(message: AppSizeScreen.loadingMessage)
             : Column(
                 children: [
                   Flexible(
@@ -498,7 +498,7 @@ class _DiffViewState extends State<DiffView>
       valueListenable: controller.processingNotifier,
       builder: (context, processing, _) {
         return processing
-            ? const CenteredMessage(AppSizeScreen.loadingMessage)
+            ? const CenteredMessage(message: AppSizeScreen.loadingMessage)
             : Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [

packages/devtools_app/lib/src/screens/deep_link_validation/deep_link_list_view.dart

@@ -97,7 +97,7 @@ class _DeepLinkListViewMainPanel extends StatelessWidget {
           case PagePhase.noLinks:
             // TODO(hangyujin): This is just a place holder to add UI.
             return const CenteredMessage(
-              'Your Flutter project has no Links to verify.',
+              message: 'Your Flutter project has no Links to verify.',
             );
           case PagePhase.analyzeErrorPage:
             assert(controller.currentAppLinkSettings?.error != null);
@@ -125,7 +125,7 @@ class _DeepLinkListViewMainPanel extends StatelessWidget {
 
           case PagePhase.validationErrorPage:
             // TODO(hangyujin): This is just a place holder to add Error handling.
-            return const CenteredMessage('Error validating domain ');
+            return const CenteredMessage(message: 'Error validating domain ');
         }
       },
     );

packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart

@@ -220,7 +220,8 @@ class DeepLinksController extends DisposableController
 
   AppLinkSettings? get currentAppLinkSettings =>
       androidAppLinks[selectedAndroidVariantIndex.value];
-
+  UniversalLinkSettings? get currentUniversalLinkSettings =>
+      iosLinks[selectedIosConfigurationIndex.value];
   @visibleForTesting
   final androidAppLinks = <int, AppLinkSettings>{};
 
@@ -301,6 +302,9 @@ class DeepLinksController extends DisposableController
   }
 
   Future<void> _loadAndroidAppLinks() async {
+    if (selectedProject.value!.androidVariants.isEmpty) {
+      return;
+    }
     final variant = selectedProject
         .value!.androidVariants[selectedAndroidVariantIndex.value];
     await ga.timeAsync(
@@ -327,6 +331,9 @@ class DeepLinksController extends DisposableController
 
   Future<void> _loadIosLinks() async {
     final iosBuildOptions = selectedProject.value!.iosBuildOptions;
+    if (iosBuildOptions.configurations.isEmpty) {
+      return;
+    }
     final configuration =
         iosBuildOptions.configurations[selectedIosConfigurationIndex.value];
     final target = iosBuildOptions.targets[selectedIosTargetIndex.value];
@@ -507,21 +514,22 @@ class DeepLinksController extends DisposableController
         .toSet()
         .toList();
 
-    late final Map<String, List<DomainError>> androidDomainErrors;
-    Map<String, List<DomainError>> iosDomainErrors =
-        <String, List<DomainError>>{};
-
-    late final Map<String, List<Path>> iosDomainPaths;
+    Map<String, List<DomainError>> androidDomainErrors = {};
+    Map<String, List<DomainError>> iosDomainErrors = {};
+    Map<String, List<Path>> iosDomainPaths = {};
     try {
-      final androidResult = await deepLinksService.validateAndroidDomain(
-        domains: domains,
-        applicationId: applicationId,
-        localFingerprint: localFingerprint.value,
-      );
-      androidDomainErrors = androidResult.domainErrors;
-      googlePlayFingerprintsAvailability.value =
-          androidResult.googlePlayFingerprintsAvailability;
-      if (FeatureFlags.deepLinkIosCheck) {
+      if (currentAppLinkSettings != null) {
+        final androidResult = await deepLinksService.validateAndroidDomain(
+          domains: domains,
+          applicationId: applicationId,
+          localFingerprint: localFingerprint.value,
+        );
+        androidDomainErrors = androidResult.domainErrors;
+        googlePlayFingerprintsAvailability.value =
+            androidResult.googlePlayFingerprintsAvailability;
+      }
+      if (FeatureFlags.deepLinkIosCheck &&
+          currentUniversalLinkSettings != null) {
         final iosResult = await deepLinksService.validateIosDomain(
           bundleId: bundleId,
           teamId: teamId,
@@ -607,11 +615,7 @@ class DeepLinksController extends DisposableController
 
   Future<void> validateLinks() async {
     final appLinkSettings = currentAppLinkSettings;
-    if (appLinkSettings == null) {
-      pagePhase.value = PagePhase.noLinks;
-      return;
-    }
-    if (appLinkSettings.error != null) {
+    if (appLinkSettings?.error != null) {
       pagePhase.value = PagePhase.analyzeErrorPage;
       ga.select(
         gac.deeplink,

packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_model.dart

@@ -120,7 +120,12 @@ class AndroidDomainError extends DomainError {
 }
 
 class IosDomainError extends DomainError {
-  const IosDomainError(super.title, super.explanation, super.fixDetails);
+  const IosDomainError(
+    super.title,
+    super.explanation,
+    super.fixDetails, {
+    this.subcheckErrors = const [],
+  });
   // TODO(hangyujin): Finalize strings for these domain errors.
 
   /// Existence of an Apple-App-Site-Association file.
@@ -163,13 +168,159 @@ class IosDomainError extends DomainError {
     'Ensure your domain is accessible without any redirects.',
   );
 
-  /// TODO(hangyujin): There are sub checkes of this check, add them and add links when finalized.
-  /// AASA file format follows guidelines.
-  static const fileFormat = IosDomainError(
-    'Apple-App-Site-Association file format is incorrect',
-    'This test checks that your Apple-App-Site-Association file '
-        'follows the correct format guidelines.',
-    'Ensure your Apple-App-Site-Association file follows the correct format guidelines.',
+  static IosDomainError iosFileFormatDomainError({
+    required List<AASAfileFormatSubCheck> subcheckErrors,
+  }) =>
+      IosDomainError(
+        'Apple-App-Site-Association file format is incorrect',
+        'This test checks that your Apple-App-Site-Association file '
+            'follows the correct format guidelines.',
+        'Ensure your Apple-App-Site-Association file follows the correct format guidelines.',
+        subcheckErrors: subcheckErrors,
+      );
+
+  final List<AASAfileFormatSubCheck> subcheckErrors;
+}
+
+String propertyTypeMessage({
+  required String property,
+  required String expectedType,
+}) {
+  return 'This test checks that the `$property` property only holds a $expectedType.';
+}
+
+class AASAfileFormatSubCheck extends CommonError {
+  const AASAfileFormatSubCheck(String title, String explanation)
+      : super(title, explanation, '');
+
+  static final appLinksFormat = AASAfileFormatSubCheck(
+    'Applinks format',
+    propertyTypeMessage(property: 'applinks', expectedType: 'object'),
+  );
+
+  static const appLinksSubstitutionVariablesFormat = AASAfileFormatSubCheck(
+    'Applinks substitution variables format',
+    'This test checks that the `applinks.SubstitutionVariables` property has a valid '
+        'substitution variable format. Ref - '
+        'https://developer.apple.com/documentation/bundleresources/applinks/substitutionvariables',
+  );
+
+  static const defaultsFormat = AASAfileFormatSubCheck(
+    'Applinks defaults format',
+    'This test checks that the `applinks.defaults` property only holds '
+        'the keys caseSensitive and percentEncoded. Ref - '
+        'https://developer.apple.com/documentation/bundleresources/applinks/defaults',
+  );
+
+  static final defaultsPercentEncodedFormat = AASAfileFormatSubCheck(
+    'Applinks defaults percent encoded format',
+    propertyTypeMessage(
+      property: 'applinks.defaults.percentEncoded',
+      expectedType: 'boolean',
+    ),
+  );
+
+  static final defaultsCaseSensitiveFormat = AASAfileFormatSubCheck(
+    'Applinks defaults case sensitive format',
+    propertyTypeMessage(
+      property: 'applinks.defaults.caseSensitive',
+      expectedType: 'boolean',
+    ),
+  );
+
+  static const detailsFormat = AASAfileFormatSubCheck(
+    'Applinks details format',
+    'This test checks that the `applinks.details` property is formatted properly. Ref - '
+        'https://developer.apple.com/documentation/bundleresources/applinks/details',
+  );
+
+  static const detailsAppIdFormat = AASAfileFormatSubCheck(
+    'Applinks details appIDs format',
+    'This test checks that the `applinks.details.appID` property is an array of strings.',
+  );
+
+  static const detailsPathsFormat = AASAfileFormatSubCheck(
+    'Applinks details paths format',
+    'This test checks that the `applinks.details.paths` property is an array of strings.',
+  );
+
+  static const detailsDefaultsFormat = AASAfileFormatSubCheck(
+    'Applinks details default format',
+    'This test checks that the `applinks.details.defaults` property only holds '
+        'the keys caseSensitive and percentEncoded. Ref - '
+        'https://developer.apple.com/documentation/bundleresources/applinks/details/default',
+  );
+
+  static final detailsDefaultsPercentEncodedFormat = AASAfileFormatSubCheck(
+    'Applinks defaults percent encoded format',
+    propertyTypeMessage(
+      property: 'applinks.details.defaults.percentEncoded',
+      expectedType: 'boolean',
+    ),
+  );
+
+  static final detailsDefaultsCaseSensitiveFormat = AASAfileFormatSubCheck(
+    'Applinks defaults case sensitive format',
+    propertyTypeMessage(
+      property: 'applinks.details.defaults.caseSensitive',
+      expectedType: 'boolean',
+    ),
+  );
+
+  static const componentFormat = AASAfileFormatSubCheck(
+    'Applinks details components format',
+    'This test checks that the `applinks.details.components` property is formatted properly. Ref - '
+        'https://developer.apple.com/documentation/bundleresources/applinks/details/components',
+  );
+
+  static final componentPathFormat = AASAfileFormatSubCheck(
+    'Applinks details components path format',
+    propertyTypeMessage(
+      property: 'applinks.details.components.path',
+      expectedType: 'string',
+    ),
+  );
+
+  static const componentQueryFormat = AASAfileFormatSubCheck(
+    'Applinks details components query format',
+    'This test checks that the `applinks.details.components.query` property only holds either a string or object of type `applinks.Details.Components.Query`.',
+  );
+
+  static final componentFragmentFormat = AASAfileFormatSubCheck(
+    'Applinks details components fragment format',
+    propertyTypeMessage(
+      property: 'applinks.details.components.fragment',
+      expectedType: 'string',
+    ),
+  );
+
+  static final componentExcludeFormat = AASAfileFormatSubCheck(
+    'Applinks details components exclude format',
+    propertyTypeMessage(
+      property: 'applinks.details.components.exclude',
+      expectedType: 'boolean',
+    ),
+  );
+  static final componentPercentEncodedFormat = AASAfileFormatSubCheck(
+    'Applinks details components percent encoded format',
+    propertyTypeMessage(
+      property: 'applinks.details.components.percentEncoded',
+      expectedType: 'boolean',
+    ),
+  );
+  static final componentCaseSensitiveFormat = AASAfileFormatSubCheck(
+    'Applinks details components case sensitive format',
+    propertyTypeMessage(
+      property: 'applinks.details.components.caseSensitive',
+      expectedType: 'boolean',
+    ),
+  );
+  static final componentCommentFormat = AASAfileFormatSubCheck(
+    'Applinks details components comment format',
+    propertyTypeMessage(
+      property: 'applinks.details.components.comment',
+      expectedType: 'string',
+    ),
   );
 }