From 6a902e5fcd884f1c87915c76b0e65f63fbbc4e65 Mon Sep 17 00:00:00 2001 From: TheOneWithTheBraid Date: Sun, 30 May 2021 17:43:26 +0200 Subject: [PATCH] Updated dependencies --- lib/main.dart | 108 ++++++++---------- linux/flutter/generated_plugin_registrant.cc | 2 - linux/flutter/generated_plugin_registrant.h | 2 - macos/Flutter/GeneratedPluginRegistrant.swift | 2 - pubspec.lock | 4 +- pubspec.yaml | 32 +++--- .../flutter/generated_plugin_registrant.cc | 2 - windows/flutter/generated_plugin_registrant.h | 2 - 8 files changed, 64 insertions(+), 90 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index ccbd2fc..e3a92d9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -62,6 +62,44 @@ const TextStyle kEmphasisFont = TextStyle( height: 1.22, letterSpacing: 1.8); +final kTextTheme = TextTheme( + headline1: kHugeFont, + headline2: kHugeFont, + headline3: kLargeFont + .copyWith(color: kDarkColor) + .copyWith(fontSize: kLargeFontSize * kFontSizeDivision), + headline4: kLargeFont.copyWith(color: kDarkColor), + headline5: kLargeFont.copyWith(color: kDarkColor), + headline6: kLargeFont.copyWith(color: kDarkColor), + bodyText1: kBodyFont, + bodyText2: kEmphasisFont, + caption: kEmphasisFont, + button: kEmphasisFont, +); + +final kColorScheme = ColorScheme( + primary: kPrimaryColor, + primaryVariant: kPrimaryColorAccent, + secondary: kSecondaryColor, + secondaryVariant: kSecondaryColorAccent, + surface: kDarkColor, + background: kDarkColor, + error: Colors.deepOrange, + onPrimary: kLightColor, + onSecondary: kDarkColor, + onSurface: kDarkColor, + onBackground: kLightColor, + onError: kLightColor, + brightness: Brightness.dark); + +final kDialogTheme = + DialogTheme(titleTextStyle: kLargeFont.copyWith(color: kLightColor)); + +final kSnackBarTheme = SnackBarThemeData( + backgroundColor: kDarkColor, + actionTextColor: kSecondaryColorAccent, + contentTextStyle: kBodyFont); + class XournalppMobile extends StatelessWidget { // This widget is the root of your application. @override @@ -76,75 +114,21 @@ class XournalppMobile extends StatelessWidget { primarySwatch: kPrimaryColor, accentColor: kSecondaryColor, fontFamily: 'Open Sans', - textTheme: TextTheme( - headline1: kHugeFont, - headline2: kHugeFont, - headline3: kLargeFont - .copyWith(color: kDarkColor) - .copyWith(fontSize: kLargeFontSize * kFontSizeDivision), - headline4: kLargeFont.copyWith(color: kDarkColor), - headline5: kLargeFont.copyWith(color: kDarkColor), - headline6: kLargeFont.copyWith(color: kDarkColor), - bodyText1: kBodyFont, - bodyText2: kEmphasisFont, - caption: kEmphasisFont, - button: kEmphasisFont, - ), - colorScheme: ColorScheme( - primary: kPrimaryColor, - primaryVariant: kPrimaryColorAccent, - secondary: kSecondaryColor, - secondaryVariant: kSecondaryColorAccent, - surface: kLightColor, - background: kDarkColor, - error: Colors.deepOrange, - onPrimary: kLightColor, - onSecondary: kDarkColor, - onSurface: kDarkColor, - onBackground: kLightColor, - onError: kLightColor, - brightness: Brightness.light), + textTheme: kTextTheme, + colorScheme: kColorScheme, visualDensity: VisualDensity.adaptivePlatformDensity, - dialogTheme: DialogTheme( - titleTextStyle: kLargeFont.copyWith(color: kDarkColor))), + dialogTheme: kDialogTheme, + snackBarTheme: kSnackBarTheme), darkTheme: ThemeData( brightness: Brightness.dark, primarySwatch: kPrimaryColor, accentColor: kSecondaryColor, fontFamily: 'Open Sans', - textTheme: TextTheme( - headline1: kHugeFont, - headline2: kHugeFont, - headline3: kLargeFont.copyWith(color: kLightColor), - headline4: kLargeFont.copyWith(color: kLightColor), - headline5: kLargeFont.copyWith(color: kLightColor), - headline6: kLargeFont.copyWith(color: kLightColor), - bodyText1: kBodyFont, - bodyText2: kEmphasisFont, - caption: kEmphasisFont, - button: kEmphasisFont, - ), - colorScheme: ColorScheme( - primary: kPrimaryColor, - primaryVariant: kPrimaryColorAccent, - secondary: kSecondaryColor, - secondaryVariant: kSecondaryColorAccent, - surface: kDarkColor, - background: kDarkColor, - error: Colors.deepOrange, - onPrimary: kLightColor, - onSecondary: kDarkColor, - onSurface: kDarkColor, - onBackground: kLightColor, - onError: kLightColor, - brightness: Brightness.dark), + textTheme: kTextTheme, + colorScheme: kColorScheme, visualDensity: VisualDensity.adaptivePlatformDensity, - dialogTheme: DialogTheme( - titleTextStyle: kLargeFont.copyWith(color: kLightColor)), - snackBarTheme: SnackBarThemeData( - backgroundColor: kDarkColor, - actionTextColor: kSecondaryColorAccent, - contentTextStyle: kBodyFont)), + dialogTheme: kDialogTheme, + snackBarTheme: kSnackBarTheme), home: OpenPage(), ); } diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index ba25154..c73f13a 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -2,8 +2,6 @@ // Generated file. Do not edit. // -// clang-format off - #include "generated_plugin_registrant.h" #include diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h index e0f0a47..9bf7478 100644 --- a/linux/flutter/generated_plugin_registrant.h +++ b/linux/flutter/generated_plugin_registrant.h @@ -2,8 +2,6 @@ // Generated file. Do not edit. // -// clang-format off - #ifndef GENERATED_PLUGIN_REGISTRANT_ #define GENERATED_PLUGIN_REGISTRANT_ diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 7921a8c..4db8165 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -2,8 +2,6 @@ // Generated file. Do not edit. // -// clang-format off - import FlutterMacOS import Foundation diff --git a/pubspec.lock b/pubspec.lock index da84d6e..f3af096 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -42,7 +42,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.6.1" barcode: dependency: transitive description: @@ -762,7 +762,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19" + version: "0.3.0" transparent_image: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 872e79c..0a73adf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,26 +11,26 @@ environment: dependencies: flutter: sdk: flutter - file_picker_cross: ^4.2.8 - katex_flutter: ^4.0.0 - intl: ^0.16.1 - archive: ^2.0.13 - xml: ^4.2.0 + file_picker_cross: ^4.4.2 + katex_flutter: ^4.0.2+26 + intl: ^0.17.0 + archive: ^3.1.2 + xml: ^5.1.1 url_launcher: ^5.5.0 - transparent_image: ^1.0.0 + transparent_image: ^2.0.0 # catcher: ^0.4.0 - receive_sharing_intent: ^1.4.0 + receive_sharing_intent: ^1.4.5 after_init: ^0.1.2 - flutter_dropzone: ^1.0.7 - shared_preferences: ^0.5.8 + flutter_dropzone: ^2.0.1 + shared_preferences: ^2.0.6 flutter_absolute_path: 1.0.6 matrix_gesture_detector: ^0.1.0 - vector_math: ^2.0.8 - dwds: ^0.4.0 - flutter_colorpicker: ^0.3.4 - package_info: ^0.4.1 - printing: ^4.0.0 - pdf: ^2.0.0 + vector_math: ^2.1.0 + dwds: ^11.0.2 + flutter_colorpicker: ^0.4.0 + package_info: ^2.0.2 + printing: ^5.2.1 + pdf: ^3.3.0 # zefyr: ^0.12.0 # notus: ^0.1.5 @@ -38,7 +38,7 @@ dev_dependencies: flutter_test: sdk: flutter - flutter_launcher_icons: "^0.7.3" + flutter_launcher_icons: ^0.9.0 flutter_icons: android: true diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 4889144..717e434 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -2,8 +2,6 @@ // Generated file. Do not edit. // -// clang-format off - #include "generated_plugin_registrant.h" #include diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h index dc139d8..9846246 100644 --- a/windows/flutter/generated_plugin_registrant.h +++ b/windows/flutter/generated_plugin_registrant.h @@ -2,8 +2,6 @@ // Generated file. Do not edit. // -// clang-format off - #ifndef GENERATED_PLUGIN_REGISTRANT_ #define GENERATED_PLUGIN_REGISTRANT_