diff --git a/filcnaplo/lib/app.dart b/filcnaplo/lib/app.dart index 124aa98..313f523 100644 --- a/filcnaplo/lib/app.dart +++ b/filcnaplo/lib/app.dart @@ -1,3 +1,5 @@ +// ignore_for_file: deprecated_member_use + import 'dart:io'; import 'dart:math'; diff --git a/filcnaplo_mobile_ui/lib/screens/settings/debug/subject_icon_gallery.dart b/filcnaplo_mobile_ui/lib/screens/settings/debug/subject_icon_gallery.dart index e8ed7fc..e4116a5 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/debug/subject_icon_gallery.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/debug/subject_icon_gallery.dart @@ -3,7 +3,7 @@ import 'package:filcnaplo/theme/colors/colors.dart'; import 'package:flutter/material.dart'; class SubjectIconGallery extends StatelessWidget { - const SubjectIconGallery({Key? key}) : super(key: key); + const SubjectIconGallery({super.key}); @override Widget build(BuildContext context) { @@ -61,7 +61,7 @@ class SubjectIconGallery extends StatelessWidget { } class SubjectIconItem extends StatelessWidget { - const SubjectIconItem(this.name, {Key? key}) : super(key: key); + const SubjectIconItem(this.name, {super.key}); final String name; diff --git a/filcnaplo_mobile_ui/lib/screens/settings/modify_subject_names.dart b/filcnaplo_mobile_ui/lib/screens/settings/modify_subject_names.dart index d20f7cd..134940e 100644 --- a/filcnaplo_mobile_ui/lib/screens/settings/modify_subject_names.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/modify_subject_names.dart @@ -1,3 +1,5 @@ +// ignore_for_file: use_build_context_synchronously + import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:filcnaplo/api/providers/database_provider.dart'; import 'package:filcnaplo/api/providers/user_provider.dart'; @@ -22,8 +24,7 @@ import 'package:provider/provider.dart'; import 'modify_names.i18n.dart'; class MenuRenamedSubjects extends StatelessWidget { - const MenuRenamedSubjects({Key? key, required this.settings}) - : super(key: key); + const MenuRenamedSubjects({super.key, required this.settings}); final SettingsProvider settings; @@ -80,7 +81,7 @@ class MenuRenamedSubjects extends StatelessWidget { } class ModifySubjectNames extends StatefulWidget { - const ModifySubjectNames({Key? key}) : super(key: key); + const ModifySubjectNames({super.key}); @override State createState() => _ModifySubjectNamesState(); @@ -380,12 +381,12 @@ class _ModifySubjectNamesState extends State { class RenamedSubjectItem extends StatelessWidget { const RenamedSubjectItem({ - Key? key, + super.key, required this.subject, required this.renamedTo, required this.modifyCallback, required this.removeCallback, - }) : super(key: key); + }); final GradeSubject subject; final String renamedTo; diff --git a/filcnaplo_mobile_ui/lib/screens/settings/notifications_screen.dart b/filcnaplo_mobile_ui/lib/screens/settings/notifications_screen.dart index 5c60a9d..6f90f82 100644 --- a/filcnaplo_mobile_ui/lib/screens/settings/notifications_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/notifications_screen.dart @@ -10,7 +10,7 @@ import 'package:provider/provider.dart'; import 'notifications_screen.i18n.dart'; class MenuNotifications extends StatelessWidget { - const MenuNotifications({Key? key, required this.settings}) : super(key: key); + const MenuNotifications({super.key, required this.settings}); final SettingsProvider settings; diff --git a/filcnaplo_mobile_ui/lib/screens/settings/privacy_view.dart b/filcnaplo_mobile_ui/lib/screens/settings/privacy_view.dart index 89a9c30..0144dc4 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/privacy_view.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/privacy_view.dart @@ -4,7 +4,7 @@ import 'package:flutter_linkify/flutter_linkify.dart'; import 'settings_screen.i18n.dart'; class PrivacyView extends StatelessWidget { - const PrivacyView({Key? key}) : super(key: key); + const PrivacyView({super.key}); static void show(BuildContext context) => showDialog( context: context, diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_helper.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_helper.dart index 1b7561b..0f141f6 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/settings_helper.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/settings_helper.dart @@ -1,4 +1,4 @@ -// ignore_for_file: prefer_function_declarations_over_variables +// ignore_for_file: prefer_function_declarations_over_variables, library_private_types_in_public_api import 'dart:io'; @@ -319,7 +319,7 @@ class SettingsHelper { // Rounding modal class RoundingSetting extends StatefulWidget { - const RoundingSetting({Key? key}) : super(key: key); + const RoundingSetting({super.key}); @override _RoundingSettingState createState() => _RoundingSettingState(); @@ -405,7 +405,7 @@ class _RoundingSettingState extends State { // Bell Delay Modal class BellDelaySetting extends StatefulWidget { - const BellDelaySetting({Key? key}) : super(key: key); + const BellDelaySetting({super.key}); @override State createState() => _BellDelaySettingState(); @@ -524,7 +524,7 @@ class _BellDelaySettingState extends State } class GradeColorsSetting extends StatefulWidget { - const GradeColorsSetting({Key? key}) : super(key: key); + const GradeColorsSetting({super.key}); @override _GradeColorsSettingState createState() => _GradeColorsSettingState(); @@ -616,7 +616,7 @@ class _GradeColorsSettingState extends State { } class LiveActivityColorSetting extends StatefulWidget { - const LiveActivityColorSetting({Key? key}) : super(key: key); + const LiveActivityColorSetting({super.key}); @override _LiveActivityColorSettingState createState() => diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart index bf6c9dc..55832aa 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart @@ -1,4 +1,4 @@ -// ignore_for_file: no_leading_underscores_for_local_identifiers, use_build_context_synchronously +// ignore_for_file: no_leading_underscores_for_local_identifiers, use_build_context_synchronously, deprecated_member_use import 'package:filcnaplo/api/providers/update_provider.dart'; import 'package:filcnaplo_kreta_api/providers/absence_provider.dart'; diff --git a/filcnaplo_mobile_ui/lib/screens/settings/theme_screen.dart b/filcnaplo_mobile_ui/lib/screens/settings/theme_screen.dart index 7f66eea..d46fc0e 100644 --- a/filcnaplo_mobile_ui/lib/screens/settings/theme_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/theme_screen.dart @@ -1,3 +1,5 @@ +// ignore_for_file: use_build_context_synchronously, deprecated_member_use + import 'package:filcnaplo/models/settings.dart'; import 'package:filcnaplo/models/shared_theme.dart'; import 'package:filcnaplo/theme/colors/accent.dart'; @@ -26,7 +28,7 @@ import 'theme_screen.i18n.dart'; import 'package:share_plus/share_plus.dart'; class PremiumCustomAccentColorSetting extends StatefulWidget { - const PremiumCustomAccentColorSetting({Key? key}) : super(key: key); + const PremiumCustomAccentColorSetting({super.key}); @override State createState() => @@ -898,8 +900,10 @@ class _PremiumCustomAccentColorSettingState class ColorTab extends StatelessWidget { const ColorTab( - {Key? key, required this.tab, required this.color, this.unlocked = true}) - : super(key: key); + {super.key, + required this.tab, + required this.color, + this.unlocked = true}); final Tab tab; final Color color; @@ -936,8 +940,7 @@ class ColorTab extends StatelessWidget { class PremiumColorPickerItem extends StatelessWidget { const PremiumColorPickerItem( - {Key? key, required this.label, this.onTap, required this.color}) - : super(key: key); + {super.key, required this.label, this.onTap, required this.color}); final String label; final void Function()? onTap; @@ -948,6 +951,7 @@ class PremiumColorPickerItem extends StatelessWidget { return Material( type: MaterialType.transparency, child: InkWell( + onTap: onTap, child: Padding( padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0), child: Row( @@ -970,7 +974,6 @@ class PremiumColorPickerItem extends StatelessWidget { ], ), ), - onTap: onTap, ), ); } diff --git a/filcnaplo_mobile_ui/lib/screens/settings/user/nickname.dart b/filcnaplo_mobile_ui/lib/screens/settings/user/nickname.dart index 865537d..3d1dcd5 100644 --- a/filcnaplo_mobile_ui/lib/screens/settings/user/nickname.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/user/nickname.dart @@ -14,7 +14,7 @@ import 'package:provider/provider.dart'; class UserMenuNickname extends StatelessWidget { late User u; - UserMenuNickname(this.u, {Key? key}) : super(key: key); + UserMenuNickname(this.u, {super.key}); @override Widget build(BuildContext context) { @@ -39,7 +39,7 @@ class UserMenuNickname extends StatelessWidget { class UserNicknameEditor extends StatefulWidget { late User u; - UserNicknameEditor(this.u, {Key? key}) : super(key: key); + UserNicknameEditor(this.u, {super.key}); @override State createState() => _UserNicknameEditorState(); diff --git a/filcnaplo_mobile_ui/lib/screens/settings/user/profile_pic.dart b/filcnaplo_mobile_ui/lib/screens/settings/user/profile_pic.dart index 154f168..f72db46 100644 --- a/filcnaplo_mobile_ui/lib/screens/settings/user/profile_pic.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/user/profile_pic.dart @@ -1,3 +1,5 @@ +// ignore_for_file: use_build_context_synchronously + import 'dart:convert'; import 'dart:developer'; import 'dart:io'; @@ -20,7 +22,7 @@ import 'package:image_crop/image_crop.dart'; class UserMenuProfilePic extends StatelessWidget { late User u; - UserMenuProfilePic(this.u, {Key? key}) : super(key: key); + UserMenuProfilePic(this.u, {super.key}); @override Widget build(BuildContext context) { @@ -44,7 +46,7 @@ class UserMenuProfilePic extends StatelessWidget { class UserProfilePicEditor extends StatefulWidget { late User u; - UserProfilePicEditor(this.u, {Key? key}) : super(key: key); + UserProfilePicEditor(this.u, {super.key}); @override State createState() => _UserProfilePicEditorState(); diff --git a/filcnaplo_mobile_ui/lib/screens/summary/pages/allsum_page.dart b/filcnaplo_mobile_ui/lib/screens/summary/pages/allsum_page.dart index 01900ff..1e7056e 100644 --- a/filcnaplo_mobile_ui/lib/screens/summary/pages/allsum_page.dart +++ b/filcnaplo_mobile_ui/lib/screens/summary/pages/allsum_page.dart @@ -10,13 +10,13 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; class AllSumBody extends StatefulWidget { - const AllSumBody({Key? key}) : super(key: key); + const AllSumBody({super.key}); @override - _AllSumBodyState createState() => _AllSumBodyState(); + AllSumBodyState createState() => AllSumBodyState(); } -class _AllSumBodyState extends State { +class AllSumBodyState extends State { late UserProvider user; late GradeProvider gradeProvider; late HomeworkProvider homeworkProvider; @@ -30,14 +30,15 @@ class _AllSumBodyState extends State { int avgDropValue = 0; bool animation = false; - List getSubjectGrades(GradeSubject subject, {int days = 0}) => gradeProvider - .grades - .where((e) => - e.subject == subject && - e.type == GradeType.midYear && - (days == 0 || - e.date.isBefore(DateTime.now().subtract(Duration(days: days))))) - .toList(); + List getSubjectGrades(GradeSubject subject, {int days = 0}) => + gradeProvider.grades + .where((e) => + e.subject == subject && + e.type == GradeType.midYear && + (days == 0 || + e.date + .isBefore(DateTime.now().subtract(Duration(days: days))))) + .toList(); @override void initState() { diff --git a/filcnaplo_mobile_ui/lib/screens/summary/pages/grades_page.dart b/filcnaplo_mobile_ui/lib/screens/summary/pages/grades_page.dart index d56e3e4..cd0b4a1 100644 --- a/filcnaplo_mobile_ui/lib/screens/summary/pages/grades_page.dart +++ b/filcnaplo_mobile_ui/lib/screens/summary/pages/grades_page.dart @@ -28,13 +28,13 @@ List faces = [ ]; class GradesBody extends StatefulWidget { - const GradesBody({Key? key}) : super(key: key); + const GradesBody({super.key}); @override - _GradesBodyState createState() => _GradesBodyState(); + GradesBodyState createState() => GradesBodyState(); } -class _GradesBodyState extends State { +class GradesBodyState extends State { late UserProvider user; late GradeProvider gradeProvider; late SettingsProvider settings; diff --git a/filcnaplo_mobile_ui/lib/screens/summary/pages/lessons_page.dart b/filcnaplo_mobile_ui/lib/screens/summary/pages/lessons_page.dart index a90a02b..b606c62 100644 --- a/filcnaplo_mobile_ui/lib/screens/summary/pages/lessons_page.dart +++ b/filcnaplo_mobile_ui/lib/screens/summary/pages/lessons_page.dart @@ -1,3 +1,5 @@ +// ignore_for_file: no_leading_underscores_for_local_identifiers + import 'dart:math'; import 'package:filcnaplo/api/providers/user_provider.dart'; @@ -37,13 +39,13 @@ class SubjectAbsence { } class LessonsBody extends StatefulWidget { - const LessonsBody({Key? key}) : super(key: key); + const LessonsBody({super.key}); @override - _LessonsBodyState createState() => _LessonsBodyState(); + LessonsBodyState createState() => LessonsBodyState(); } -class _LessonsBodyState extends State { +class LessonsBodyState extends State { late UserProvider user; late AbsenceProvider absenceProvider; late SettingsProvider settingsProvider; diff --git a/filcnaplo_mobile_ui/lib/screens/summary/pages/personality_page.dart b/filcnaplo_mobile_ui/lib/screens/summary/pages/personality_page.dart index 7702c7a..f2bae43 100644 --- a/filcnaplo_mobile_ui/lib/screens/summary/pages/personality_page.dart +++ b/filcnaplo_mobile_ui/lib/screens/summary/pages/personality_page.dart @@ -13,13 +13,13 @@ import 'package:path_provider/path_provider.dart'; import 'package:image_gallery_saver/image_gallery_saver.dart'; class PersonalityBody extends StatefulWidget { - const PersonalityBody({Key? key}) : super(key: key); + const PersonalityBody({super.key}); @override - _PersonalityBodyState createState() => _PersonalityBodyState(); + PersonalityBodyState createState() => PersonalityBodyState(); } -class _PersonalityBodyState extends State { +class PersonalityBodyState extends State { late UserProvider user; bool isRevealed = false; diff --git a/filcnaplo_mobile_ui/lib/screens/summary/pages/start_page.dart b/filcnaplo_mobile_ui/lib/screens/summary/pages/start_page.dart index 90e807c..fdfc98e 100644 --- a/filcnaplo_mobile_ui/lib/screens/summary/pages/start_page.dart +++ b/filcnaplo_mobile_ui/lib/screens/summary/pages/start_page.dart @@ -9,13 +9,13 @@ import 'package:provider/provider.dart'; import 'package:wtf_sliding_sheet/wtf_sliding_sheet.dart'; class StartBody extends StatefulWidget { - const StartBody({Key? key}) : super(key: key); + const StartBody({super.key}); @override - _StartBodyState createState() => _StartBodyState(); + StartBodyState createState() => StartBodyState(); } -class _StartBodyState extends State { +class StartBodyState extends State { late UserProvider user; late GradeProvider gradeProvider; late SettingsProvider settings; diff --git a/filcnaplo_mobile_ui/lib/screens/summary/summary_screen.dart b/filcnaplo_mobile_ui/lib/screens/summary/summary_screen.dart index 7798761..a35b421 100644 --- a/filcnaplo_mobile_ui/lib/screens/summary/summary_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/summary/summary_screen.dart @@ -19,13 +19,13 @@ class SummaryScreen extends StatefulWidget { final bool isBottomSheet; const SummaryScreen({ - Key? key, + super.key, this.currentPage = 'personality', this.isBottomSheet = false, - }) : super(key: key); + }); @override - _SummaryScreenState createState() => _SummaryScreenState(); + SummaryScreenState createState() => SummaryScreenState(); static show( {required BuildContext context, @@ -34,7 +34,7 @@ class SummaryScreen extends StatefulWidget { builder: (context) => SummaryScreen(currentPage: currentPage))); } -class _SummaryScreenState extends State +class SummaryScreenState extends State with SingleTickerProviderStateMixin { late UserProvider user; late SettingsProvider settings; diff --git a/filcnaplo_mobile_ui/pubspec.yaml b/filcnaplo_mobile_ui/pubspec.yaml index 87263c2..d02517f 100644 --- a/filcnaplo_mobile_ui/pubspec.yaml +++ b/filcnaplo_mobile_ui/pubspec.yaml @@ -53,6 +53,12 @@ dependencies: auto_size_text: ^3.0.0 connectivity_plus: ^5.0.2 collection: ^1.18.0 + share_plus: ^7.2.1 + image_picker: ^0.8.9 + path_provider: ^2.1.1 + image_crop: + git: + url: https://github.com/kimaah/image_crop.git dev_dependencies: flutter_lints: ^3.0.1