Merge remote-tracking branch 'LinusU/master' into update-flutter_lints

flutter_web_auth_2/example/README.md

@@ -8,9 +8,9 @@ This project is a starting point for a Flutter application.
 
 A few resources to get you started if this is your first Flutter project:
 
-- [Lab: Write your first Flutter app](https://flutter.io/docs/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://flutter.io/docs/cookbook)
+- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
+- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
 
-For help getting started with Flutter, view our 
-[online documentation](https://flutter.io/docs), which offers tutorials, 
+For help getting started with Flutter development, view the
+[online documentation](https://docs.flutter.dev/), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.

flutter_web_auth_2/example/android/app/src/main/AndroidManifest.xml

@@ -12,19 +12,20 @@
  android:icon="@mipmap/ic_launcher">
  <activity
  android:name=".MainActivity"
+ android:exported="true"
  android:launchMode="singleTop"
  android:theme="@style/LaunchTheme"
- android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
- android:exported="true"
+ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
  android:hardwareAccelerated="true"
  android:windowSoftInputMode="adjustResize">
- <!-- This keeps the window background of the activity showing
- until Flutter renders its first frame. It can be removed if
- there is no splash screen (such as the default splash screen
- defined in @style/LaunchTheme). -->
+ <!-- Specifies an Android theme to apply to this Activity as soon as
+ the Android process has started. This theme is visible to the user
+ while the Flutter UI initializes. After that, this theme continues
+ to determine the Window background behind the Flutter UI. -->
  <meta-data
- android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
- android:value="true" />
+ android:name="io.flutter.embedding.android.NormalTheme"
+ android:resource="@style/NormalTheme"
+ />
  <intent-filter>
  <action android:name="android.intent.action.MAIN" />
  <category android:name="android.intent.category.LAUNCHER" />
@@ -54,4 +55,15 @@
  android:name="flutterEmbedding"
  android:value="2" />
  </application>
+ <!-- Required to query activities that can process text, see:
+ https://developer.android.com/training/package-visibility and
+ https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+ In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+ <queries>
+ <intent>
+ <action android:name="android.intent.action.PROCESS_TEXT"/>
+ <data android:mimeType="text/plain"/>
+ </intent>
+ </queries>
 </manifest>

flutter_web_auth_2/example/android/app/src/main/kotlin/com/linusu/flutter_web_auth_2_example/MainActivity.kt

@@ -2,5 +2,4 @@ package com.linusu.flutter_web_auth_2_example
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterActivity() {
-}
+class MainActivity: FlutterActivity()

flutter_web_auth_2/example/android/app/src/main/res/values/styles.xml

@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
- <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+ <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+ <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
  <!-- Show a splash screen on the activity. Automatically removed when
- Flutter draws its first frame -->
+ the Flutter engine draws its first frame -->
  <item name="android:windowBackground">@drawable/launch_background</item>
  </style>
+ <!-- Theme applied to the Android Window as soon as the process has started.
+ This theme determines the color of the Android Window while your
+ Flutter UI initializes, as well as behind your Flutter UI while its
+ running.
+
+ This Theme is only used starting with V2 of Flutter's Android embedding. -->
+ <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+ <item name="android:windowBackground">?android:colorBackground</item>
+ </style>
 </resources>

flutter_web_auth_2/example/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

flutter_web_auth_2/example/ios/Runner.xcodeproj/project.pbxproj

@@ -16,6 +16,8 @@
  97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
  97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
  97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+ A3143F062D0495028253E2F1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B8E2FE615F702B8C539DF7F /* Pods_Runner.framework */; };
+ A7A9D35890057D806AACAE05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECA7C49ED332AB6540F2FFBE /* Pods_RunnerTests.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -84,6 +86,14 @@
  );
  runOnlyForDeploymentPostprocessing = 0;
  };
+ B9ED3590DFDC6A6586B8E77D /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ A7A9D35890057D806AACAE05 /* Pods_RunnerTests.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -117,6 +127,14 @@
  name = Frameworks;
  sourceTree = "<group>";
  };
+ 331C8082294A63A400263BE5 /* RunnerTests */ = {
+ isa = PBXGroup;
+ children = (
+ 331C807B294A618700263BE5 /* RunnerTests.swift */,
+ );
+ path = RunnerTests;
+ sourceTree = "<group>";
+ };
  9740EEB11CF90186004384FC /* Flutter */ = {
  isa = PBXGroup;
  children = (
@@ -269,24 +287,30 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
- 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+ 1FE375C65236475469EA4B9B /* [CP] Check Pods Manifest.lock */ = {
  isa = PBXShellScriptBuildPhase;
  alwaysOutOfDate = 1;
  buildActionMask = 2147483647;
  files = (
  );
+ inputFileListPaths = (
+ );
  inputPaths = (
  "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
  );
- name = "Thin Binary";
+ name = "[CP] Check Pods Manifest.lock";
+ outputFileListPaths = (
+ );
  outputPaths = (
+ "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
  shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
  };
  3B151151EEB90F686DCC201A /* [CP] Embed Pods Frameworks */ = {
  isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
  buildActionMask = 2147483647;
  files = (
  );
@@ -299,11 +323,11 @@
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
- showEnvVarsInLog = 0;
+ shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
  };
  608B7EE9FA07C439862030C3 /* [CP] Check Pods Manifest.lock */ = {
  isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
  buildActionMask = 2147483647;
  files = (
  );

flutter_web_auth_2/example/ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
-import UIKit
 import Flutter
+import UIKit
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
  override func application(
  _ application: UIApplication,

flutter_web_auth_2/example/macos/Runner.xcodeproj/project.pbxproj

@@ -67,7 +67,7 @@
  331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
  333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
  335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
- 33CC10ED2044A3C60003C045 /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 33CC10ED2044A3C60003C045 /* flutter_web_auth_2_example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = flutter_web_auth_2_example.app; sourceTree = BUILT_PRODUCTS_DIR; };
  33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
  33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
  33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -195,16 +195,17 @@
  6735D910DAA12511C1CADCF1 /* Pods-RunnerTests.release.xcconfig */,
  7DE778F81F465E88395FFB58 /* Pods-RunnerTests.profile.xcconfig */,
  );
- path = Pods;
+ name = Frameworks;
  sourceTree = "<group>";
  };
- D73912EC22F37F3D000D13A0 /* Frameworks */ = {
+ E778D932002577928F224ECA /* Pods */ = {
  isa = PBXGroup;
  children = (
  B6F6B0D85DF7AAE0034FF97E /* Pods_Runner.framework */,
  20F73EDDEEC3B1B21EB7EF64 /* Pods_RunnerTests.framework */,
  );
- name = Frameworks;
+ name = Pods;
+ path = Pods;
  sourceTree = "<group>";
  };
 /* End PBXGroup section */
@@ -248,7 +249,7 @@
  );
  name = Runner;
  productName = Runner;
- productReference = 33CC10ED2044A3C60003C045 /* example.app */;
+ productReference = 33CC10ED2044A3C60003C045 /* flutter_web_auth_2_example.app */;
  productType = "com.apple.product-type.application";
  };
 /* End PBXNativeTarget section */
@@ -586,7 +587,6 @@
  "$(inherited)",
  "@executable_path/../Frameworks",
  );
- MACOSX_DEPLOYMENT_TARGET = 10.15;
  PROVISIONING_PROFILE_SPECIFIER = "";
  SWIFT_VERSION = 5.0;
  };
@@ -723,7 +723,6 @@
  "$(inherited)",
  "@executable_path/../Frameworks",
  );
- MACOSX_DEPLOYMENT_TARGET = 10.15;
  PROVISIONING_PROFILE_SPECIFIER = "";
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
  SWIFT_VERSION = 5.0;
@@ -746,7 +745,6 @@
  "$(inherited)",
  "@executable_path/../Frameworks",
  );
- MACOSX_DEPLOYMENT_TARGET = 10.15;
  PROVISIONING_PROFILE_SPECIFIER = "";
  SWIFT_VERSION = 5.0;
  };

flutter_web_auth_2/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -15,7 +15,7 @@
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "33CC10EC2044A3C60003C045"
- BuildableName = "example.app"
+ BuildableName = "flutter_web_auth_2_example.app"
  BlueprintName = "Runner"
  ReferencedContainer = "container:Runner.xcodeproj">
  </BuildableReference>
@@ -31,7 +31,7 @@
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "33CC10EC2044A3C60003C045"
- BuildableName = "example.app"
+ BuildableName = "flutter_web_auth_2_example.app"
  BlueprintName = "Runner"
  ReferencedContainer = "container:Runner.xcodeproj">
  </BuildableReference>
@@ -65,7 +65,7 @@
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "33CC10EC2044A3C60003C045"
- BuildableName = "example.app"
+ BuildableName = "flutter_web_auth_2_example.app"
  BlueprintName = "Runner"
  ReferencedContainer = "container:Runner.xcodeproj">
  </BuildableReference>
@@ -82,7 +82,7 @@
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "33CC10EC2044A3C60003C045"
- BuildableName = "example.app"
+ BuildableName = "flutter_web_auth_2_example.app"
  BlueprintName = "Runner"
  ReferencedContainer = "container:Runner.xcodeproj">
  </BuildableReference>

flutter_web_auth_2/example/macos/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
  override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
  return true

flutter_web_auth_2/example/macos/Runner/Configs/AppInfo.xcconfig

@@ -5,10 +5,10 @@
 // 'flutter create' template.
 
 // The application's name. By default this is also the title of the Flutter window.
-PRODUCT_NAME = example
+PRODUCT_NAME = flutter_web_auth_2_example
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.linusu.example
+PRODUCT_BUNDLE_IDENTIFIER = com.linusu.flutterWebAuth2Example
 
 // The copyright displayed in application information
 PRODUCT_COPYRIGHT = Copyright © 2023 com.linusu. All rights reserved.

flutter_web_auth_2/example/pubspec.yaml

@@ -6,6 +6,12 @@ publish_to: 'none'
 environment:
  sdk: ">=2.15.0 <4.0.0"
 
+# Dependencies specify other packages that your package needs in order to work.
+# To automatically upgrade your package dependencies to the latest versions
+# consider running `flutter pub upgrade --major-versions`. Alternatively,
+# dependencies can be manually updated by changing the version numbers below to
+# the latest version available on pub.dev. To see which dependencies have newer
+# versions available, run `flutter pub outdated`.
 dependencies:
  cupertino_icons: ^1.0.3
  desktop_webview_window: ^0.2.3
@@ -20,9 +26,9 @@ dev_dependencies:
 
 
 # For information on the generic Dart part of this file, see the
-# following page: https://www.dartlang.org/tools/pub/pubspec
+# following page: https://dart.dev/tools/pub/pubspec
 
-# The following section is specific to Flutter.
+# The following section is specific to Flutter packages.
 flutter:
 
  # The following line ensures that the Material Icons font is
@@ -32,14 +38,14 @@ flutter:
 
  # To add assets to your application, add an assets section, like this:
  # assets:
- # - images/a_dot_burr.jpeg
- # - images/a_dot_ham.jpeg
+ #  - images/a_dot_burr.jpeg
+ #  - images/a_dot_ham.jpeg
 
  # An image asset can refer to one or more resolution-specific "variants", see
- # https://flutter.io/assets-and-images/#resolution-aware.
+ # https://flutter.dev/to/resolution-aware-images
 
  # For details regarding adding assets from package dependencies, see
- # https://flutter.io/assets-and-images/#from-packages
+ # https://flutter.dev/to/asset-from-package
 
  # To add custom fonts to your application, add a fonts section here,
  # in this "flutter" section. Each entry in this list should have a
@@ -59,4 +65,4 @@ flutter:
  # weight: 700
  #
  # For details regarding fonts from package dependencies,
- # see https://flutter.io/custom-fonts/#from-packages
+ # see https://flutter.dev/to/font-from-package

flutter_web_auth_2/example/web/index.html

@@ -18,18 +18,18 @@
 
  <meta charset="UTF-8">
  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
- <meta name="description" content="A new Flutter project.">
+ <meta name="description" content="Demonstrates how to use the flutter_web_auth_2 plugin.">
 
  <!-- iOS meta tags & icons -->
  <meta name="apple-mobile-web-app-capable" content="yes">
  <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-title" content="example">
+ <meta name="apple-mobile-web-app-title" content="flutter_web_auth_2_example">
  <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
  <!-- Favicon -->
  <link rel="icon" type="image/png" href="favicon.png"/>
 
- <title>example</title>
+ <title>flutter_web_auth_2_example</title>
  <link rel="manifest" href="manifest.json">
 </head>
 <body>

flutter_web_auth_2/example/web/manifest.json

@@ -1,11 +1,11 @@
 {
- "name": "example",
- "short_name": "example",
+ "name": "flutter_web_auth_2_example",
+ "short_name": "flutter_web_auth_2_example",
  "start_url": ".",
  "display": "standalone",
  "background_color": "#0175C2",
  "theme_color": "#0175C2",
- "description": "A new Flutter project.",
+ "description": "Demonstrates how to use the flutter_web_auth_2 plugin.",
  "orientation": "portrait-primary",
  "prefer_related_applications": false,
  "icons": [