diff --git a/filcnaplo/android/app/src/main/AndroidManifest.xml b/filcnaplo/android/app/src/main/AndroidManifest.xml index 9e7636b..ed9a9b7 100644 --- a/filcnaplo/android/app/src/main/AndroidManifest.xml +++ b/filcnaplo/android/app/src/main/AndroidManifest.xml @@ -8,7 +8,6 @@ - E @@ -21,5 +20,4 @@ - \ No newline at end of file diff --git a/filcnaplo/ios/Podfile.lock b/filcnaplo/ios/Podfile.lock index f33f8bd..b50aa09 100644 --- a/filcnaplo/ios/Podfile.lock +++ b/filcnaplo/ios/Podfile.lock @@ -39,6 +39,10 @@ PODS: - Flutter (1.0.0) - flutter_custom_tabs (0.0.1): - Flutter + - flutter_foreground_task (0.0.1): + - Flutter + - flutter_local_notifications (0.0.1): + - Flutter - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) @@ -56,6 +60,8 @@ PODS: - SDWebImage/Core (5.13.2) - share_plus (0.0.1): - Flutter + - shared_preferences_ios (0.0.1): + - Flutter - sqflite (0.0.2): - Flutter - FMDB (>= 2.7.5) @@ -69,11 +75,14 @@ DEPENDENCIES: - file_picker (from `.symlinks/plugins/file_picker/ios`) - Flutter (from `Flutter`) - flutter_custom_tabs (from `.symlinks/plugins/flutter_custom_tabs/ios`) + - flutter_foreground_task (from `.symlinks/plugins/flutter_foreground_task/ios`) + - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - open_file (from `.symlinks/plugins/open_file/ios`) - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - quick_actions_ios (from `.symlinks/plugins/quick_actions_ios/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) + - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) @@ -96,6 +105,10 @@ EXTERNAL SOURCES: :path: Flutter flutter_custom_tabs: :path: ".symlinks/plugins/flutter_custom_tabs/ios" + flutter_foreground_task: + :path: ".symlinks/plugins/flutter_foreground_task/ios" + flutter_local_notifications: + :path: ".symlinks/plugins/flutter_local_notifications/ios" open_file: :path: ".symlinks/plugins/open_file/ios" path_provider_ios: @@ -106,6 +119,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/quick_actions_ios/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" + shared_preferences_ios: + :path: ".symlinks/plugins/shared_preferences_ios/ios" sqflite: :path: ".symlinks/plugins/sqflite/ios" url_launcher_ios: @@ -123,6 +138,8 @@ SPEC CHECKSUMS: file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_custom_tabs: 7a10a08686955cb748e5d26e0ae586d30689bf89 + flutter_foreground_task: 21ef182ab0a29a3005cc72cd70e5f45cb7f7f817 + flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 @@ -131,6 +148,7 @@ SPEC CHECKSUMS: ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866 share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 + shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780 url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de diff --git a/filcnaplo/lib/app.dart b/filcnaplo/lib/app.dart index bab4dda..f4bd1d4 100644 --- a/filcnaplo/lib/app.dart +++ b/filcnaplo/lib/app.dart @@ -81,7 +81,7 @@ class App extends StatelessWidget { ChangeNotifierProvider(create: (context) => ThemeModeObserver(initialTheme: settings.theme)), ChangeNotifierProvider(create: (context) => NewsProvider(context: context)), ChangeNotifierProvider(create: (context) => UpdateProvider(context: context)), - + // User data providers ChangeNotifierProvider(create: (context) => GradeProvider(context: context)), ChangeNotifierProvider(create: (context) => TimetableProvider(context: context)), @@ -91,7 +91,7 @@ class App extends StatelessWidget { ChangeNotifierProvider(create: (context) => NoteProvider(context: context)), ChangeNotifierProvider(create: (context) => EventProvider(context: context)), ChangeNotifierProvider(create: (context) => AbsenceProvider(context: context)), - + ChangeNotifierProvider(create: (context) => GradeCalculatorProvider(context)), ], child: Consumer( @@ -104,7 +104,7 @@ class App extends StatelessWidget { builder: (context, child) { // Limit font size scaling to 1.0 double textScaleFactor = min(MediaQuery.of(context).textScaleFactor, 1.0); - + return MediaQuery( data: MediaQuery.of(context).copyWith(textScaleFactor: textScaleFactor), child: child ?? Container(), @@ -127,14 +127,14 @@ class App extends StatelessWidget { ], localeListResolutionCallback: (locales, supported) { Locale locale = const Locale('hu', 'HU'); - + for (var loc in locales ?? []) { if (supported.contains(loc)) { locale = loc; break; } } - + return locale; }, onGenerateRoute: (settings) => rootNavigator(settings), diff --git a/filcnaplo/macos/Podfile.lock b/filcnaplo/macos/Podfile.lock index eab376e..715c79c 100644 --- a/filcnaplo/macos/Podfile.lock +++ b/filcnaplo/macos/Podfile.lock @@ -6,6 +6,8 @@ PODS: - FlutterMacOS - flutter_acrylic (0.1.0): - FlutterMacOS + - flutter_local_notifications (0.0.1): + - FlutterMacOS - FlutterMacOS (1.0.0) - FMDB (2.7.5): - FMDB/standard (= 2.7.5) @@ -15,6 +17,8 @@ PODS: - ReachabilitySwift (5.0.0) - share_plus_macos (0.0.1): - FlutterMacOS + - shared_preferences_macos (0.0.1): + - FlutterMacOS - sqflite (0.0.2): - FlutterMacOS - FMDB (>= 2.7.5) @@ -25,9 +29,11 @@ DEPENDENCIES: - connectivity_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus_macos/macos`) - dynamic_color (from `Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos`) - flutter_acrylic (from `Flutter/ephemeral/.symlinks/plugins/flutter_acrylic/macos`) + - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - share_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos`) + - shared_preferences_macos (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos`) - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) @@ -43,12 +49,16 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos flutter_acrylic: :path: Flutter/ephemeral/.symlinks/plugins/flutter_acrylic/macos + flutter_local_notifications: + :path: Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos FlutterMacOS: :path: Flutter/ephemeral path_provider_macos: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos share_plus_macos: :path: Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos + shared_preferences_macos: + :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos sqflite: :path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos url_launcher_macos: @@ -58,11 +68,13 @@ SPEC CHECKSUMS: connectivity_plus_macos: f6e86fd000e971d361e54b5afcadc8c8fa773308 dynamic_color: 394d6a888650f8534e029b27d2f8bc5c64e44008 flutter_acrylic: c3df24ae52ab6597197837ce59ef2a8542640c17 + flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4 FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19 ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4 + shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727 sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3