Merge branch 'flutter:main' into enable-intro_flutter_gpu_attempt_2

Author: domesticmouse

firebase-auth-flutterfire-ui/codelab_rebuild.yaml

@@ -6,9 +6,9 @@ plugins {
 }
 
 android {
-    namespace = "com.example.complete"
+    namespace = "com.example.firebase_auth_flutterfire_ui"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = flutter.ndkVersion
+    ndkVersion = "27.0.12077973"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
@@ -21,10 +21,10 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.example.complete"
+        applicationId = "com.example.firebase_auth_flutterfire_ui"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = flutter.minSdkVersion
+        minSdk = 23
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName

firebase-auth-flutterfire-ui/complete/.firebaserc

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
-        android:label="complete"
+        android:label="firebase_auth_flutterfire_ui"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

firebase-auth-flutterfire-ui/complete/android/app/build.gradle.kts

@@ -1,4 +1,4 @@
-package com.example.complete
+package com.example.firebase_auth_flutterfire_ui
 
 import io.flutter.embedding.android.FlutterActivity
 

firebase-auth-flutterfire-ui/complete/android/app/src/main/AndroidManifest.xml

@@ -5,15 +5,15 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Complete</string>
+	<string>Firebase Auth Flutterfire Ui</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>complete</string>
+	<string>firebase_auth_flutterfire_ui</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

firebase-auth-flutterfire-ui/complete/android/app/src/main/kotlin/com/example/complete/MainActivity.kt renamed to firebase-auth-flutterfire-ui/complete/android/app/src/main/kotlin/com/example/firebase_auth_flutterfire_ui/MainActivity.kt

@@ -3,14 +3,17 @@ import 'package:flutter/material.dart';
 import 'auth_gate.dart';
 
 class MyApp extends StatelessWidget {
-  const MyApp({super.key});
+  const MyApp({super.key, required this.clientId});
+
+  final String clientId;
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
       theme: ThemeData(
         colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
       ),
-      home: const AuthGate(),
+      home: AuthGate(clientId: clientId),
     );
   }
 }

firebase-auth-flutterfire-ui/complete/ios/Runner.xcodeproj/project.pbxproj

@@ -4,10 +4,11 @@ import 'package:firebase_ui_oauth_google/firebase_ui_oauth_google.dart';
 import 'package:flutter/material.dart';
 
 import 'home.dart';
-import 'main.dart';
 
 class AuthGate extends StatelessWidget {
-  const AuthGate({super.key});
+  const AuthGate({super.key, required this.clientId});
+
+  final String clientId;
 
   @override
   Widget build(BuildContext context) {
@@ -46,6 +47,15 @@ class AuthGate extends StatelessWidget {
                 ),
               );
             },
+            sideBuilder: (context, shrinkOffset) {
+              return Padding(
+                padding: const EdgeInsets.all(20),
+                child: AspectRatio(
+                  aspectRatio: 1,
+                  child: Image.asset('flutterfire_300x.png'),
+                ),
+              );
+            },
           );
         }
 

firebase-auth-flutterfire-ui/complete/ios/Runner/Info.plist

@@ -43,7 +43,7 @@ class HomeScreen extends StatelessWidget {
       body: Center(
         child: Column(
           children: [
-            Image.asset('dash.png'),
+            SizedBox(width: 250, child: Image.asset('assets/dash.png')),
             Text('Welcome!', style: Theme.of(context).textTheme.displaySmall),
             const SignOutButton(),
           ],