GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-12-25 23:12:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'krille/flutter-2-10' into 'main'

Browse Source 
chore: Upgrade to Flutter 2.10

See merge request famedly/fluffychat!713
This commit is contained in:
Krille Fear 2022-02-06 13:09:57 +00:00
commit 6dae4cca94
6 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
} }
android { android {
compileSdkVersion 30 compileSdkVersion 31
sourceSets { sourceSets {
main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += 'src/main/kotlin'

2
lib/config/themes.dart
View File

@ -38,7 +38,6 @@ abstract class FluffyThemes {
colorScheme: ThemeData.light().colorScheme.copyWith( colorScheme: ThemeData.light().colorScheme.copyWith(
primary: AppConfig.chatColor, primary: AppConfig.chatColor,
secondary: AppConfig.chatColor, secondary: AppConfig.chatColor,
secondaryVariant: AppConfig.secondaryColor,
surface: FluffyThemes.lighten(AppConfig.chatColor, 0.535), surface: FluffyThemes.lighten(AppConfig.chatColor, 0.535),
), ),
backgroundColor: Colors.white, backgroundColor: Colors.white,
@ -133,7 +132,6 @@ abstract class FluffyThemes {
colorScheme: ThemeData.dark().colorScheme.copyWith( colorScheme: ThemeData.dark().colorScheme.copyWith(
primary: FluffyThemes.lighten(AppConfig.chatColor, 0.33), primary: FluffyThemes.lighten(AppConfig.chatColor, 0.33),
secondary: FluffyThemes.lighten(AppConfig.chatColor, 0.33), secondary: FluffyThemes.lighten(AppConfig.chatColor, 0.33),
secondaryVariant: AppConfig.secondaryColor,
surface: FluffyThemes.darken(AppConfig.chatColor, 0.35), surface: FluffyThemes.darken(AppConfig.chatColor, 0.35),
), ),
secondaryHeaderColor: Colors.blueGrey.shade900, secondaryHeaderColor: Colors.blueGrey.shade900,

13
pubspec.lock
View File

@ -812,6 +812,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.11" 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: matrix:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1411,21 +1418,21 @@ packages:
name: test name: test
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.17.12" version: "1.19.5"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.3" version: "0.4.8"
test_core: test_core:
dependency: transitive dependency: transitive
description: description:
name: test_core name: test_core
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.2" version: "0.4.9"
timezone: timezone:
dependency: transitive dependency: transitive
description: description:

20
windows/flutter/generated_plugin_registrant.cc
View File

@ -2,14 +2,22 @@
// Generated file. Do not edit. // Generated file. Do not edit.
// //
// clang-format off
#include "generated_plugin_registrant.h" #include "generated_plugin_registrant.h"
#include <file_chooser/file_chooser_plugin.h> #include <desktop_drop/desktop_drop_plugin.h>
#include <url_launcher_windows/url_launcher_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) { void RegisterPlugins(flutter::PluginRegistry* registry) {
FileChooserPluginRegisterWithRegistrar( DesktopDropPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FileChooserPlugin")); registry->GetRegistrarForPlugin("DesktopDropPlugin"));
UrlLauncherPluginRegisterWithRegistrar( FileSelectorPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("UrlLauncherPlugin")); registry->GetRegistrarForPlugin("FileSelectorPlugin"));
FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
UrlLauncherWindowsRegisterWithRegistrar(
registry->GetRegistrarForPlugin("UrlLauncherWindows"));
} }

2
windows/flutter/generated_plugin_registrant.h
View File

@ -2,6 +2,8 @@
// Generated file. Do not edit. // Generated file. Do not edit.
// //
// clang-format off
#ifndef GENERATED_PLUGIN_REGISTRANT_ #ifndef GENERATED_PLUGIN_REGISTRANT_
#define GENERATED_PLUGIN_REGISTRANT_ #define GENERATED_PLUGIN_REGISTRANT_

4
windows/flutter/generated_plugins.cmake
View File

@ -3,7 +3,9 @@
# #
list(APPEND FLUTTER_PLUGIN_LIST list(APPEND FLUTTER_PLUGIN_LIST
file_chooser desktop_drop
file_selector_windows
flutter_secure_storage_windows
url_launcher_windows url_launcher_windows
) )