From a43bf056c9c8a34a242a08225d2c8acc6975fc84 Mon Sep 17 00:00:00 2001 From: 55nknown Date: Mon, 27 Feb 2023 14:38:56 +0100 Subject: [PATCH] fixes --- filcnaplo/ios/Podfile.lock | 2 +- filcnaplo/ios/Runner.xcodeproj/project.pbxproj | 4 +++- filcnaplo/ios/Runner/Info.plist | 2 ++ filcnaplo/lib/theme/theme.dart | 6 ++---- filcnaplo/lib/ui/filter/sort.dart | 2 +- filcnaplo/lib/ui/filter/widgets.dart | 2 +- filcnaplo/pubspec.yaml | 4 ++-- filcnaplo_desktop_ui | 2 +- filcnaplo_mobile_ui | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/filcnaplo/ios/Podfile.lock b/filcnaplo/ios/Podfile.lock index c6eb7aa..2a05203 100644 --- a/filcnaplo/ios/Podfile.lock +++ b/filcnaplo/ios/Podfile.lock @@ -195,7 +195,7 @@ SPEC CHECKSUMS: FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a home_widget: 2829415127ee92e876f816cbbe44c0b6601b8a37 image_crop: e0a67085d3ebf3cf46ca46d61c53a082507b0bc3 - image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb + image_picker_ios: 58b9c4269cb176f89acea5e5d043c9358f2d25f8 libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef live_activities: 9ff56a06a2d43ecd68f56deeed13b18a8304789c Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d diff --git a/filcnaplo/ios/Runner.xcodeproj/project.pbxproj b/filcnaplo/ios/Runner.xcodeproj/project.pbxproj index bf864ef..279de27 100644 --- a/filcnaplo/ios/Runner.xcodeproj/project.pbxproj +++ b/filcnaplo/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -298,6 +298,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -351,6 +352,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); diff --git a/filcnaplo/ios/Runner/Info.plist b/filcnaplo/ios/Runner/Info.plist index 7275bb5..4849263 100644 --- a/filcnaplo/ios/Runner/Info.plist +++ b/filcnaplo/ios/Runner/Info.plist @@ -56,5 +56,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/filcnaplo/lib/theme/theme.dart b/filcnaplo/lib/theme/theme.dart index fa99b99..34573a0 100644 --- a/filcnaplo/lib/theme/theme.dart +++ b/filcnaplo/lib/theme/theme.dart @@ -44,12 +44,11 @@ class AppTheme { useMaterial3: true, fontFamily: _fontFamily, scaffoldBackgroundColor: backgroundColor, - backgroundColor: highlightColor, primaryColor: lightColors.filc, dividerColor: const Color(0x00000000), colorScheme: ColorScheme.fromSwatch( accentColor: accent, - backgroundColor: backgroundColor, + backgroundColor: highlightColor, brightness: Brightness.light, cardColor: highlightColor, errorColor: lightColors.red, @@ -106,12 +105,11 @@ class AppTheme { useMaterial3: true, fontFamily: _fontFamily, scaffoldBackgroundColor: backgroundColor, - backgroundColor: highlightColor, primaryColor: darkColors.filc, dividerColor: const Color(0x00000000), colorScheme: ColorScheme.fromSwatch( accentColor: accent, - backgroundColor: backgroundColor, + backgroundColor: highlightColor, brightness: Brightness.dark, cardColor: highlightColor, errorColor: darkColors.red, diff --git a/filcnaplo/lib/ui/filter/sort.dart b/filcnaplo/lib/ui/filter/sort.dart index c685f13..a849f79 100644 --- a/filcnaplo/lib/ui/filter/sort.dart +++ b/filcnaplo/lib/ui/filter/sort.dart @@ -7,7 +7,7 @@ import 'package:filcnaplo_mobile_ui/common/panel/panel.dart'; import 'package:filcnaplo_mobile_ui/common/widgets/absence/absence_viewable.dart'; import 'package:filcnaplo_mobile_ui/common/widgets/absence_group/absence_group_tile.dart'; import 'package:flutter/material.dart'; -import 'package:implicitly_animated_reorderable_list_2/implicitly_animated_reorderable_list_2.dart'; +import 'package:animated_list_plus/animated_list_plus.dart'; import 'package:filcnaplo_mobile_ui/common/widgets/lesson/changed_lesson_tile.dart'; import 'package:filcnaplo/utils/format.dart'; diff --git a/filcnaplo/lib/ui/filter/widgets.dart b/filcnaplo/lib/ui/filter/widgets.dart index 75d816d..90ea8ae 100644 --- a/filcnaplo/lib/ui/filter/widgets.dart +++ b/filcnaplo/lib/ui/filter/widgets.dart @@ -25,7 +25,7 @@ import 'package:filcnaplo_premium/providers/premium_provider.dart'; import 'package:filcnaplo_premium/ui/mobile/premium/premium_inline.dart'; import 'package:filcnaplo_mobile_ui/common/panel/panel.dart'; import 'package:flutter/material.dart'; -import 'package:implicitly_animated_reorderable_list_2/transitions.dart'; +import 'package:animated_list_plus/transitions.dart'; import 'package:provider/provider.dart'; const List homeFilters = [FilterType.all, FilterType.grades, FilterType.messages, FilterType.absences]; diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml index 1b683c7..9b2dd19 100644 --- a/filcnaplo/pubspec.yaml +++ b/filcnaplo/pubspec.yaml @@ -3,7 +3,7 @@ description: "Nem hivatalos e-napló alkalmazás az e-Kréta rendszerhez" homepage: https://filcnaplo.hu publish_to: "none" -version: 3.5.0+183 +version: 3.5.0+191 environment: sdk: ">=2.17.0 <3.0.0" @@ -42,7 +42,7 @@ dependencies: connectivity_plus: ^3.0.2 flutter_displaymode: ^0.4.0 quick_actions: ^1.0.1 - implicitly_animated_reorderable_list_2: ^0.4.2 + animated_list_plus: ^0.5.0 dynamic_color: ^1.2.2 material_color_utilities: ^0.2.0 crypto: ^3.0.2 diff --git a/filcnaplo_desktop_ui b/filcnaplo_desktop_ui index 295808b..e2284b1 160000 --- a/filcnaplo_desktop_ui +++ b/filcnaplo_desktop_ui @@ -1 +1 @@ -Subproject commit 295808bacd0282d5bbdc824abb3b633e85641968 +Subproject commit e2284b1a17f6ac50bc7a4945594d587d88e5b8dc diff --git a/filcnaplo_mobile_ui b/filcnaplo_mobile_ui index 927630a..11e5f75 160000 --- a/filcnaplo_mobile_ui +++ b/filcnaplo_mobile_ui @@ -1 +1 @@ -Subproject commit 927630a22ace1112dba2827f9698cec2bfdd0a97 +Subproject commit 11e5f75b3b0657333b6485b09622cc0faa266d65