From 41951b895aedd23e2ee32c5da5ede547db1420d4 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sat, 5 Feb 2022 09:31:40 +0100
Subject: [PATCH 1/2] chore: Upgrade to Flutter 2.10

---
 lib/config/themes.dart                        |  2 --
 pubspec.lock                                  | 13 +++++++++---
 .../flutter/generated_plugin_registrant.cc    | 20 +++++++++++++------
 windows/flutter/generated_plugin_registrant.h |  2 ++
 windows/flutter/generated_plugins.cmake       |  4 +++-
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index 31e8e1cb..1d364a22 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -38,7 +38,6 @@ abstract class FluffyThemes {
         colorScheme: ThemeData.light().colorScheme.copyWith(
               primary: AppConfig.chatColor,
               secondary: AppConfig.chatColor,
-              secondaryVariant: AppConfig.secondaryColor,
               surface: FluffyThemes.lighten(AppConfig.chatColor, 0.535),
             ),
         backgroundColor: Colors.white,
@@ -133,7 +132,6 @@ abstract class FluffyThemes {
         colorScheme: ThemeData.dark().colorScheme.copyWith(
               primary: FluffyThemes.lighten(AppConfig.chatColor, 0.33),
               secondary: FluffyThemes.lighten(AppConfig.chatColor, 0.33),
-              secondaryVariant: AppConfig.secondaryColor,
               surface: FluffyThemes.darken(AppConfig.chatColor, 0.35),
             ),
         secondaryHeaderColor: Colors.blueGrey.shade900,
diff --git a/pubspec.lock b/pubspec.lock
index 557a592b..ab30a439 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -812,6 +812,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   matrix:
     dependency: "direct main"
     description:
@@ -1411,21 +1418,21 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.17.12"
+    version: "1.19.5"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.9"
   timezone:
     dependency: transitive
     description:
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 9579d43c..bf1e2199 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -2,14 +2,22 @@
 //  Generated file. Do not edit.
 //
 
+// clang-format off
+
 #include "generated_plugin_registrant.h"
 
-#include <file_chooser/file_chooser_plugin.h>
-#include <url_launcher_windows/url_launcher_plugin.h>
+#include <desktop_drop/desktop_drop_plugin.h>
+#include <file_selector_windows/file_selector_plugin.h>
+#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
+#include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  FileChooserPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("FileChooserPlugin"));
-  UrlLauncherPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("UrlLauncherPlugin"));
+  DesktopDropPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("DesktopDropPlugin"));
+  FileSelectorPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FileSelectorPlugin"));
+  FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }
diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h
index 9846246b..dc139d85 100644
--- a/windows/flutter/generated_plugin_registrant.h
+++ b/windows/flutter/generated_plugin_registrant.h
@@ -2,6 +2,8 @@
 //  Generated file. Do not edit.
 //
 
+// clang-format off
+
 #ifndef GENERATED_PLUGIN_REGISTRANT_
 #define GENERATED_PLUGIN_REGISTRANT_
 
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 5c2bdaf0..acf95a15 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,7 +3,9 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  file_chooser
+  desktop_drop
+  file_selector_windows
+  flutter_secure_storage_windows
   url_launcher_windows
 )
 

From e0417bdcf93527c792c1fddcc1a24bcbbe41b804 Mon Sep 17 00:00:00 2001
From: Krille Fear <christian-pauly@posteo.de>
Date: Sun, 6 Feb 2022 12:52:16 +0000
Subject: [PATCH 2/2] chore: Set compileSdkVersion to 31

Should fix build Android
with Flutter 2.10
---
 android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 39c920e8..d8b2adc8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'