From c945a1412aaa7f07acca0eb2f569e1596f97af58 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Tue, 15 Nov 2022 21:38:27 +0100 Subject: [PATCH] chore: Update dependencies --- ios/Flutter/AppFrameworkInfo.plist | 2 +- ios/Podfile | 2 +- ios/Podfile.lock | 107 +++++++++++++-------------- ios/Runner.xcodeproj/project.pbxproj | 6 +- lib/config/app_configs.dart | 2 +- lib/config/app_themes.dart | 9 ++- lib/widgets/status/status.dart | 2 +- pubspec.lock | 85 ++++++++++++++++++--- pubspec.yaml | 8 +- 9 files changed, 145 insertions(+), 78 deletions(-) diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 8d4492f..9625e10 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/ios/Podfile b/ios/Podfile index 9411102..313ea4a 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '10.0' +platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 164dd05..9e47635 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,39 +1,36 @@ PODS: - - Firebase/CoreOnly (8.15.0): - - FirebaseCore (= 8.15.0) - - Firebase/Messaging (8.15.0): + - Firebase/CoreOnly (10.1.0): + - FirebaseCore (= 10.1.0) + - Firebase/Messaging (10.1.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 8.15.0) - - firebase_core (1.17.1): - - Firebase/CoreOnly (= 8.15.0) + - FirebaseMessaging (~> 10.1.0) + - firebase_core (2.2.0): + - Firebase/CoreOnly (= 10.1.0) - Flutter - - firebase_messaging (11.4.1): - - Firebase/Messaging (= 8.15.0) + - firebase_messaging (14.1.0): + - Firebase/Messaging (= 10.1.0) - firebase_core - Flutter - - FirebaseCore (8.15.0): - - FirebaseCoreDiagnostics (~> 8.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (8.15.0): - - GoogleDataTransport (~> 9.1) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (~> 2.30908.0) - - FirebaseInstallations (8.15.0): - - FirebaseCore (~> 8.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) - - PromisesObjC (< 3.0, >= 1.2) - - FirebaseMessaging (8.15.0): - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleDataTransport (~> 9.1) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Reachability (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) - - nanopb (~> 2.30908.0) + - FirebaseCore (10.1.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreInternal (10.2.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseInstallations (10.2.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) + - PromisesObjC (~> 2.1) + - FirebaseMessaging (10.1.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Reachability (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) + - nanopb (< 2.30910.0, >= 2.30908.0) - Flutter (1.0.0) - flutter_app_badger (1.3.0): - Flutter @@ -53,30 +50,30 @@ PODS: - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): + - GoogleUtilities/AppDelegateSwizzler (7.10.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.10.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/Logger (7.10.0): - GoogleUtilities/Environment - - GoogleUtilities/Network (7.7.0): + - GoogleUtilities/Network (7.10.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): + - "GoogleUtilities/NSData+zlib (7.10.0)" + - GoogleUtilities/Reachability (7.10.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): + - GoogleUtilities/UserDefaults (7.10.0): - GoogleUtilities/Logger - image_picker_ios (0.0.1): - Flutter - - nanopb (2.30908.0): - - nanopb/decode (= 2.30908.0) - - nanopb/encode (= 2.30908.0) - - nanopb/decode (2.30908.0) - - nanopb/encode (2.30908.0) + - nanopb (2.30909.0): + - nanopb/decode (= 2.30909.0) + - nanopb/encode (= 2.30909.0) + - nanopb/decode (2.30909.0) + - nanopb/encode (2.30909.0) - OrderedSet (5.0.0) - package_info (0.0.1): - Flutter @@ -124,7 +121,7 @@ SPEC REPOS: trunk: - Firebase - FirebaseCore - - FirebaseCoreDiagnostics + - FirebaseCoreInternal - FirebaseInstallations - FirebaseMessaging - FMDB @@ -171,22 +168,22 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/wakelock/ios" SPEC CHECKSUMS: - Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d - firebase_core: 318de541b0e61d3f24262982a3f0b54afe72439b - firebase_messaging: 943cfe65e0b3f457240489ce67655e40da1d270c - FirebaseCore: 5743c5785c074a794d35f2fff7ecc254a91e08b1 - FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb - FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd - FirebaseMessaging: 5e5118a2383b3531e730d974680954c679ca0a13 - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + Firebase: 444b35a9c568a516666213c2f6cccd10cb12559f + firebase_core: d2242c6f318db1d0dcecfbfa491e943337b0d755 + firebase_messaging: 59f435c4cd0d5448e7268a7f70bce9b1287c1742 + FirebaseCore: 55e7ae35991ccca4db03ff8d8df6ed5f17a3e4c7 + FirebaseCoreInternal: 091bde13e47bb1c5e9fe397634f3593dc390430f + FirebaseInstallations: 004915af170935e3a583faefd5f8bc851afc220f + FirebaseMessaging: 4487bbff9b9b927ba1dd3ea40d1ceb58e4ee3cb5 + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_app_badger: b87fc231847b03b92ce1412aa351842e7e97932f flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721 flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 + GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95 image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb - nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 + nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 @@ -200,6 +197,6 @@ SPEC CHECKSUMS: video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f -PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea +PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d COCOAPODS: 1.11.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index ace1d9a..ccdcac6 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -454,7 +454,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -648,7 +648,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -697,7 +697,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/lib/config/app_configs.dart b/lib/config/app_configs.dart index 7a7858e..e431dc2 100644 --- a/lib/config/app_configs.dart +++ b/lib/config/app_configs.dart @@ -11,7 +11,7 @@ abstract class AppConfigs { static const Duration defaultTimeout = Duration(seconds: 30); static const String privacyUrl = '$applicationWebsite/-/blob/main/PRIVACY.md'; static const String issueUrl = '$applicationWebsite/issues'; - static const Color primaryColor = Color(0xFF5625BA); + static const Color primaryColor = Color.fromARGB(255, 135, 103, 172); static const String fallbackBlurHash = 'L5H2EC=PM+yV0g-mq.wG9c010J}I'; static const String pushGatewayUrl = 'https://janian.de/push/notify'; static const List mobileApps = [ diff --git a/lib/config/app_themes.dart b/lib/config/app_themes.dart index f9543e4..2475430 100644 --- a/lib/config/app_themes.dart +++ b/lib/config/app_themes.dart @@ -7,7 +7,10 @@ abstract class AppThemes { static const double radius = 12; static ThemeData buildTheme( - ColorScheme? scheme, Color? primaryColor, bool isLight) => + ColorScheme? scheme, + Color? primaryColor, + bool isLight, + ) => ThemeData( brightness: isLight ? Brightness.light : Brightness.dark, useMaterial3: true, @@ -21,6 +24,10 @@ abstract class AppThemes { statusBarBrightness: !isLight ? Brightness.dark : Brightness.light, ), ), + inputDecorationTheme: InputDecorationTheme( + border: UnderlineInputBorder(), + filled: true, + ), dividerColor: isLight ? Colors.grey.shade200 : Colors.grey.shade700, colorSchemeSeed: primaryColor ?? (scheme == null ? AppConfigs.primaryColor : null), diff --git a/lib/widgets/status/status.dart b/lib/widgets/status/status.dart index f5035bb..04e5157 100644 --- a/lib/widgets/status/status.dart +++ b/lib/widgets/status/status.dart @@ -1,6 +1,5 @@ import 'dart:io'; -import 'package:fluffypix/utils/links_callback.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -15,6 +14,7 @@ import 'package:share/share.dart'; import 'package:fluffypix/model/fluffy_pix.dart'; import 'package:fluffypix/model/status.dart'; import 'package:fluffypix/model/status_visibility.dart'; +import 'package:fluffypix/utils/links_callback.dart'; import 'package:fluffypix/widgets/avatar.dart'; import 'package:fluffypix/widgets/status/status_content.dart'; import '../../model/fluffy_pix_api_extension.dart'; diff --git a/pubspec.lock b/pubspec.lock index 8b25cc0..6f009ff 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,13 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _flutterfire_internals: + dependency: transitive + description: + name: _flutterfire_internals + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.8" adaptive_dialog: dependency: "direct main" description: @@ -78,6 +85,27 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.2.1" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.1" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.5" clock: dependency: transitive description: @@ -85,6 +113,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.1" + cloud_firestore_platform_interface: + dependency: transitive + description: + name: cloud_firestore_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "5.8.5" + cloud_firestore_web: + dependency: transitive + description: + name: cloud_firestore_web + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.5" collection: dependency: transitive description: @@ -168,49 +210,49 @@ packages: name: firebase_core url: "https://pub.dartlang.org" source: hosted - version: "1.17.1" + version: "2.2.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.4.0" + version: "4.5.2" firebase_core_web: dependency: transitive description: name: firebase_core_web url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" + version: "2.0.1" firebase_messaging: dependency: "direct main" description: name: firebase_messaging url: "https://pub.dartlang.org" source: hosted - version: "11.4.1" + version: "14.1.0" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "3.5.1" + version: "4.2.6" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web url: "https://pub.dartlang.org" source: hosted - version: "2.4.1" + version: "3.2.6" flick_video_player: dependency: "direct main" description: name: flick_video_player url: "https://pub.dartlang.org" source: hosted - version: "0.3.1" + version: "0.5.0" flutter: dependency: "direct main" description: flutter @@ -250,14 +292,14 @@ packages: name: flutter_inappwebview url: "https://pub.dartlang.org" source: hosted - version: "5.4.3+7" + version: "5.7.1" flutter_launcher_icons: dependency: "direct dev" description: name: flutter_launcher_icons url: "https://pub.dartlang.org" source: hosted - version: "0.9.2" + version: "0.10.0" flutter_lints: dependency: "direct dev" description: @@ -448,6 +490,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.6.4" + json_annotation: + dependency: transitive + description: + name: json_annotation + url: "https://pub.dartlang.org" + source: hosted + version: "4.7.0" lints: dependency: transitive description: @@ -615,7 +664,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" process: dependency: transitive description: @@ -838,6 +887,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.0" + universal_html: + dependency: transitive + description: + name: universal_html + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.8" + universal_io: + dependency: transitive + description: + name: universal_io + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" url_launcher: dependency: "direct main" description: @@ -949,7 +1012,7 @@ packages: name: wakelock url: "https://pub.dartlang.org" source: hosted - version: "0.5.6" + version: "0.6.2" wakelock_macos: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 25b576b..ce2042c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: hive_flutter: ^1.1.0 url_launcher: ^6.0.9 flutter_matrix_html: ^1.1.0 - flutter_inappwebview: ^5.3.2 + flutter_inappwebview: ^5.7.1 flutter_app_badger: ^1.3.0 uni_links: ^0.5.1 adaptive_dialog: ^1.1.0 @@ -31,8 +31,8 @@ dependencies: receive_sharing_intent: ^1.4.5 package_info: ^2.0.2 elliptic: ^0.3.5 - firebase_messaging: ^11.4.1 - flick_video_player: ^0.3.1 + firebase_messaging: ^14.1.0 + flick_video_player: ^0.5.0 video_player: ^2.1.15 flutter_local_notifications: ^9.1.4 shared_preferences: ^2.0.15 @@ -43,7 +43,7 @@ dev_dependencies: import_sorter: ^4.6.0 flutter_test: sdk: flutter - flutter_launcher_icons: "^0.9.2" + flutter_launcher_icons: ^0.10.0 flutter_icons: android: "launcher_icon"