SAP · navaronbracke · Jun 5, 2023 · Jun 5, 2023 · Jun 5, 2023 · Jun 5, 2023
diff --git a/.metadata b/.metadata
@@ -1,10 +1,36 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: 84f3d28555368a70270e9ac8390a9441df95e752
+  revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
   channel: stable
 
 project_type: plugin
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
+      base_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
+    - platform: android
+      create_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
+      base_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
+    - platform: ios
+      create_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
+      base_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
+    - platform: web
+      create_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
+      base_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -19,7 +19,6 @@ linter:
     avoid_dynamic_calls: true
     avoid_positional_boolean_parameters: true
     avoid_redundant_argument_values: true
-    avoid_returning_null_for_future: true
     avoid_returning_this: true # Cascade operator `..` is preferred if code gets flagged.
     avoid_slow_async_io: true
     avoid_unused_constructor_parameters: true

diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml
@@ -20,7 +20,6 @@ linter:
     avoid_positional_boolean_parameters: true
     avoid_print: false # The example app uses print statements.
     avoid_redundant_argument_values: true
-    avoid_returning_null_for_future: true
     avoid_returning_this: true # Cascade operator `..` is preferred if code gets flagged.
     avoid_slow_async_io: true
     avoid_unused_constructor_parameters: true

diff --git a/example/android/app/src/main/res/drawable-v21/launch_background.xml b/example/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/example/android/app/src/main/res/values-night/styles.xml b/example/android/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             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.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -17,8 +17,7 @@ void main() async {
 
   // Demonstrate explicit initialization before calling `runApp()`,
   // using the configuration for the example app.
-  const String exampleAppApiKey =
-      'YOUR-API-KEY-HERE';
+  const String exampleAppApiKey = 'YOUR-API-KEY-HERE';
   const String exampleAppApiDomain = 'us1.gigya.com';
 
   try {

diff --git a/example/lib/routes/account_information_page.dart b/example/lib/routes/account_information_page.dart
@@ -51,7 +51,7 @@ class _AccountInformationPageState extends State<AccountInformationPage> {
 
       print('Update account result: $result');
 
-      if (mounted) {
+      if (context.mounted) {
         FocusScope.of(context).unfocus();
         setState(() {
           _inProgress = false;
@@ -238,9 +238,9 @@ class _AccountInformationPageState extends State<AccountInformationPage> {
             case ConnectionState.active:
             case ConnectionState.none:
             case ConnectionState.waiting:
-              return Column(
+              return const Column(
                 mainAxisAlignment: MainAxisAlignment.center,
-                children: const <Widget>[
+                children: <Widget>[
                   CircularProgressIndicator(),
                   Text('Fetching account...'),
                 ],

diff --git a/example/lib/routes/home_page.dart b/example/lib/routes/home_page.dart
@@ -192,9 +192,9 @@ class _HomePageState extends State<HomePage> {
             case ConnectionState.none:
             case ConnectionState.active:
             case ConnectionState.waiting:
-              return Column(
+              return const Column(
                 mainAxisAlignment: MainAxisAlignment.center,
-                children: const <Widget>[
+                children: <Widget>[
                   CircularProgressIndicator(),
                   Padding(
                     padding: EdgeInsets.all(8),

diff --git a/example/lib/routes/login_with_credentials_page.dart b/example/lib/routes/login_with_credentials_page.dart
@@ -66,7 +66,7 @@ class _LoginWithCredentialsPageState extends State<LoginWithCredentialsPage> {
     if (mounted) {
       setState(() {
         _inProgress = false;
-        _requestResult = 'Login success: \n\n ${account.uid}';
+        _requestResult = 'Login success: \n\n ${account.toJson()}';
       });
     }
   }
@@ -112,15 +112,15 @@ class _LoginWithCredentialsPageState extends State<LoginWithCredentialsPage> {
   }
 
   void _resolveLinkAccount(LinkAccountResolver resolver) async {
-    final ConflictingAccounts? conflictingAccounts =
-        await resolver.conflictingAccounts;
+    final ConflictingAccount? conflictingAccount =
+        await resolver.conflictingAccount;
 
-    if (!mounted || conflictingAccounts == null) {
+    if (!mounted || conflictingAccount == null) {
       return;
     }
 
-    if (conflictingAccounts.loginProviders.contains('site')) {
-      _showLinkToSiteBottomSheet(conflictingAccounts.loginID, resolver);
+    if (conflictingAccount.loginProviders.contains('site')) {
+      _showLinkToSiteBottomSheet(conflictingAccount.loginID, resolver);
     } else {
       _showLinkToSocialBottomSheet(resolver);
     }
@@ -143,14 +143,14 @@ class _LoginWithCredentialsPageState extends State<LoginWithCredentialsPage> {
       _setLoginSuccess(account);
 
       // Remove the bottom sheet.
-      if (mounted) {
+      if (context.mounted) {
         Navigator.of(context).pop();
       }
     } catch (error) {
       _setGenericError(error);
 
       // Remove the bottom sheet.
-      if (mounted) {
+      if (context.mounted) {
         Navigator.of(context).pop();
       }
     }
@@ -169,14 +169,14 @@ class _LoginWithCredentialsPageState extends State<LoginWithCredentialsPage> {
       _setLoginSuccess(account);
 
       // Remove the bottom sheet.
-      if (mounted) {
+      if (context.mounted) {
         Navigator.of(context).pop();
       }
     } catch (error) {
       _setGenericError(error);
 
       // Remove the bottom sheet.
-      if (mounted) {
+      if (context.mounted) {
         Navigator.of(context).pop();
       }
     }
@@ -214,7 +214,7 @@ class _LoginWithCredentialsPageState extends State<LoginWithCredentialsPage> {
       return;
     }
 
-    scaffoldState.showBottomSheet<void>(
+    scaffoldState.showBottomSheet(
       (BuildContext context) => Material(
         color: Colors.white,
         elevation: 4,
@@ -234,6 +234,7 @@ class _LoginWithCredentialsPageState extends State<LoginWithCredentialsPage> {
                 ),
                 TextField(
                   controller: _linkPasswordController,
+                  obscureText: true,
                   decoration: const InputDecoration(hintText: 'password'),
                 ),
                 Padding(
@@ -276,7 +277,7 @@ class _LoginWithCredentialsPageState extends State<LoginWithCredentialsPage> {
       return;
     }
 
-    scaffoldState.showBottomSheet<void>(
+    scaffoldState.showBottomSheet(
       (BuildContext context) => Material(
         color: Colors.white,
         elevation: 4,
@@ -351,6 +352,7 @@ class _LoginWithCredentialsPageState extends State<LoginWithCredentialsPage> {
               padding: const EdgeInsets.all(8.0),
               child: TextFormField(
                 controller: _passwordController,
+                obscureText: true,
                 decoration: const InputDecoration(hintText: 'Enter password'),
                 validator: (String? value) {
                   if (value == null || value.trim().isEmpty) {

diff --git a/example/lib/routes/manage_connections_page.dart b/example/lib/routes/manage_connections_page.dart
@@ -79,9 +79,9 @@ class _ManageConnectionsPageState extends State<ManageConnectionsPage> {
             case ConnectionState.none:
             case ConnectionState.active:
             case ConnectionState.waiting:
-              return Column(
+              return const Column(
                 mainAxisAlignment: MainAxisAlignment.center,
-                children: const <Widget>[
+                children: <Widget>[
                   CircularProgressIndicator(),
                   Text('Fetching account...'),
                 ],
@@ -109,19 +109,23 @@ class _ManageConnectionsPageState extends State<ManageConnectionsPage> {
               }
 
               final Account account = snapshot.data!;
-              final String socialProviders = account.socialProviders ?? '';
 
               return Column(
                 children: <Widget>[
                   const Text('Social connections for this account'),
                   Expanded(
-                    child: socialProviders.isEmpty
+                    child: account.socialProviders.isEmpty
                         ? const Center(
                             child: Text(
                               'No social connections for this account',
                             ),
                           )
-                        : Text(socialProviders),
+                        : ListView.builder(
+                            itemBuilder: (_, int index) => Text(
+                              account.socialProviders[index],
+                            ),
+                            itemCount: account.socialProviders.length,
+                          ),
                   ),
                   Padding(
                     padding: const EdgeInsets.symmetric(vertical: 16),

diff --git a/example/lib/routes/one_time_password_login_page.dart b/example/lib/routes/one_time_password_login_page.dart
@@ -60,7 +60,7 @@ class _OneTimePasswordLoginPageState extends State<OneTimePasswordLoginPage> {
     PendingOtpVerification verification,
     String phone,
   ) {
-    _scaffoldKey.currentState?.showBottomSheet<void>((BuildContext context) {
+    _scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return Material(
         color: Colors.white,
         elevation: 4,