From b6d4c0398a36f2bbcc216ba2b261689683da4cd4 Mon Sep 17 00:00:00 2001 From: 55nknown Date: Sat, 21 Jan 2023 13:59:32 +0100 Subject: [PATCH] m3 --- filcnaplo/ios/Podfile.lock | 12 ++++++++++++ filcnaplo/lib/theme/theme.dart | 4 ++-- filcnaplo/lib/ui/widgets/grade/grade_tile.dart | 14 +++++++------- filcnaplo/pubspec.yaml | 2 +- filcnaplo_desktop_ui | 2 +- filcnaplo_kreta_api | 2 +- filcnaplo_mobile_ui | 2 +- filcnaplo_premium | 2 +- 8 files changed, 26 insertions(+), 14 deletions(-) diff --git a/filcnaplo/ios/Podfile.lock b/filcnaplo/ios/Podfile.lock index cd0d96f..c6eb7aa 100644 --- a/filcnaplo/ios/Podfile.lock +++ b/filcnaplo/ios/Podfile.lock @@ -53,6 +53,10 @@ PODS: - FMDB/standard (2.7.5) - home_widget (0.0.1): - Flutter + - image_crop (0.0.1): + - Flutter + - image_picker_ios (0.0.1): + - Flutter - libwebp (1.2.4): - libwebp/demux (= 1.2.4) - libwebp/mux (= 1.2.4) @@ -105,6 +109,8 @@ DEPENDENCIES: - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`) - flutter_native_image (from `.symlinks/plugins/flutter_native_image/ios`) - home_widget (from `.symlinks/plugins/home_widget/ios`) + - image_crop (from `.symlinks/plugins/image_crop/ios`) + - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - live_activities (from `.symlinks/plugins/live_activities/ios`) - open_file (from `.symlinks/plugins/open_file/ios`) - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) @@ -146,6 +152,10 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_native_image/ios" home_widget: :path: ".symlinks/plugins/home_widget/ios" + image_crop: + :path: ".symlinks/plugins/image_crop/ios" + image_picker_ios: + :path: ".symlinks/plugins/image_picker_ios/ios" live_activities: :path: ".symlinks/plugins/live_activities/ios" open_file: @@ -184,6 +194,8 @@ SPEC CHECKSUMS: flutter_native_image: 9c0b7451838484458e5b0fae007b86a4c2d4bdfe FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a home_widget: 2829415127ee92e876f816cbbe44c0b6601b8a37 + image_crop: e0a67085d3ebf3cf46ca46d61c53a082507b0bc3 + image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef live_activities: 9ff56a06a2d43ecd68f56deeed13b18a8304789c Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d diff --git a/filcnaplo/lib/theme/theme.dart b/filcnaplo/lib/theme/theme.dart index cc0a1b5..fa99b99 100644 --- a/filcnaplo/lib/theme/theme.dart +++ b/filcnaplo/lib/theme/theme.dart @@ -41,7 +41,7 @@ class AppTheme { return ThemeData( brightness: Brightness.light, - useMaterial3: false, + useMaterial3: true, fontFamily: _fontFamily, scaffoldBackgroundColor: backgroundColor, backgroundColor: highlightColor, @@ -103,7 +103,7 @@ class AppTheme { return ThemeData( brightness: Brightness.dark, - useMaterial3: false, + useMaterial3: true, fontFamily: _fontFamily, scaffoldBackgroundColor: backgroundColor, backgroundColor: highlightColor, diff --git a/filcnaplo/lib/ui/widgets/grade/grade_tile.dart b/filcnaplo/lib/ui/widgets/grade/grade_tile.dart index caf8e35..d607625 100644 --- a/filcnaplo/lib/ui/widgets/grade/grade_tile.dart +++ b/filcnaplo/lib/ui/widgets/grade/grade_tile.dart @@ -147,13 +147,13 @@ class GradeTile extends StatelessWidget { ) : censored ? Container( - width: 15, - height: 15, - decoration: BoxDecoration( - color: AppColors.of(context).text.withOpacity(.45), - borderRadius: BorderRadius.circular(8.0), - ), - ) + width: 15, + height: 15, + decoration: BoxDecoration( + color: AppColors.of(context).text.withOpacity(.45), + borderRadius: BorderRadius.circular(8.0), + ), + ) : GradeValueWidget(grade.value), minLeadingWidth: isSubjectView ? 32.0 : 0, ), diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml index 273f820..d6cc508 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-beta.2+178 +version: 3.5.0-beta.3+179 environment: sdk: ">=2.16.0-80.1.beta <3.0.0" diff --git a/filcnaplo_desktop_ui b/filcnaplo_desktop_ui index a1272f0..51c9407 160000 --- a/filcnaplo_desktop_ui +++ b/filcnaplo_desktop_ui @@ -1 +1 @@ -Subproject commit a1272f07e5486b2a4b2cef387caa068cd115d5c8 +Subproject commit 51c94072cb40b2f9347b65537942df2f30d2c888 diff --git a/filcnaplo_kreta_api b/filcnaplo_kreta_api index 66a65ad..07b146e 160000 --- a/filcnaplo_kreta_api +++ b/filcnaplo_kreta_api @@ -1 +1 @@ -Subproject commit 66a65ad6494f8b8912735ab43a524967d11b525a +Subproject commit 07b146e4fe42798d66307fac72776bbf85c6b354 diff --git a/filcnaplo_mobile_ui b/filcnaplo_mobile_ui index 180b91b..2071c03 160000 --- a/filcnaplo_mobile_ui +++ b/filcnaplo_mobile_ui @@ -1 +1 @@ -Subproject commit 180b91b4b0ae5da553dd4527eea416ed45717517 +Subproject commit 2071c03e090a8d61fdfc9437ae435abb25cc4710 diff --git a/filcnaplo_premium b/filcnaplo_premium index 0fcf2f9..caf12a7 160000 --- a/filcnaplo_premium +++ b/filcnaplo_premium @@ -1 +1 @@ -Subproject commit 0fcf2f9dd8335d8648998d70fa98b8e7847c6795 +Subproject commit caf12a74a6aaf962ea76da87a0829b6d16f8f7e9