Prepare for update to new UI with spinner

.metadata

@@ -1,10 +1,30 @@
 # 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: 98ea50199562c0ad5d8989da134d28900f902f44
+  revision: daa2ecf16534b286b7365d5c84554516b89cfd80
   channel: master
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: daa2ecf16534b286b7365d5c84554516b89cfd80
+      base_revision: daa2ecf16534b286b7365d5c84554516b89cfd80
+    - platform: android
+      create_revision: daa2ecf16534b286b7365d5c84554516b89cfd80
+      base_revision: daa2ecf16534b286b7365d5c84554516b89cfd80
+
+  # 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'

android/app/build.gradle

@@ -45,9 +45,9 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.stefaney.photos"
-	// You can update the following values to match your application needs.
-	// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -67,5 +67,8 @@ flutter {
 }
 
 dependencies {
+    implementation 'com.android.support:appcompat-v7:23.1.1'
+    implementation 'com.android.support:leanback-v17:23.1.1'
+    implementation 'com.android.support:design:23.1.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

android/app/google-services.json

@@ -19,7 +19,7 @@
           "client_type": 1,
           "android_info": {
             "package_name": "com.stefaney.photos",
-            "certificate_hash": "48fc031cb2e012da1725744ebb5ce0ac1e066a0f"
+            "certificate_hash": "90e6c0acc63a8a9a147f6b093eb3810699d7fbc4"
           }
         },
         {
@@ -52,4 +52,4 @@
     }
   ],
   "configuration_version": "1"
-}
+}

android/app/src/debug/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.stefaney.photos">
-    <!-- Flutter needs it to communicate with the running application
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

android/app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
         android:label="photos"
         android:allowBackup="false"
         android:banner="@mipmap/photos_banner"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <service
             android:name=".MainService"
@@ -24,8 +25,9 @@
         </service>
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
-	    android:theme="@style/Theme.Leanback"
+            android:theme="@style/Theme.Leanback"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">

android/app/src/main/res/values-night/styles.xml

@@ -3,7 +3,7 @@
     <!-- 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
-             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.

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

@@ -3,7 +3,7 @@
     <!-- 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.

android/app/src/profile/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.stefaney.photos">
-    <!-- Flutter needs it to communicate with the running application
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

lib/main.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:photos/src/model/app.dart';
 import 'package:scoped_model/scoped_model.dart';
 
-import 'src/model/photo_card_producer.dart';
 import 'src/model/photo_cards.dart';
+import 'src/model/photo_producer.dart';
 import 'src/model/photos_library_api_model.dart';
 import 'src/pages/home_page.dart';
 

lib/src/pages/home_page.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:scoped_model/scoped_model.dart';
 
-import '../model/photo_card_producer.dart';
 import '../model/photo_cards.dart';
+import '../model/photo_producer.dart';
 import '../model/photos_library_api_model.dart';
 
 import 'interactive_login_required_page.dart';

lib/src/pages/photos_page.dart

@@ -5,8 +5,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:scoped_model/scoped_model.dart';
 
-import '../model/photo_card_producer.dart';
 import '../model/photo_cards.dart';
+import '../model/photo_producer.dart';
 import '../model/photos_library_api_model.dart';
 
 class PhotosHome extends StatefulWidget {

pubspec.lock

@@ -257,12 +257,11 @@ packages:
     source: hosted
     version: "5.4.2"
   google_sign_in_android:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: google_sign_in_android
-      sha256: "41187ee48f8f3f7588cb932a5ab3cc8c83f354d1d50c750f61b240efac1b33d2"
-      url: "https://pub.dev"
-    source: hosted
+      path: "/Users/tvolkert/project/flutter/plugins/packages/google_sign_in/google_sign_in_android"
+      relative: false
+    source: path
     version: "6.1.4"
   google_sign_in_ios:
     dependency: transitive

pubspec.yaml

@@ -24,6 +24,10 @@ dev_dependencies:
   build_runner: any
   json_serializable: any
 
+dependency_overrides:
+  google_sign_in_android:
+    path: /Users/tvolkert/project/flutter/plugins/packages/google_sign_in/google_sign_in_android
+
 builders:
   json_serializable: any