diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index 6065cfc..83c8afa 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -1017,6 +1017,20 @@ </list> </value> </entry> + <entry key="share_plus"> + <value> + <list> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus-7.1.0/lib" /> + </list> + </value> + </entry> + <entry key="share_plus_platform_interface"> + <value> + <list> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_platform_interface-3.3.0/lib" /> + </list> + </value> + </entry> <entry key="shared_preferences"> <value> <list> @@ -1560,6 +1574,8 @@ <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/pubspec_parse-1.2.3/lib" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/quiver-3.2.1/lib" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/rxdart-0.27.7/lib" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus-7.1.0/lib" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_platform_interface-3.3.0/lib" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences-2.2.1/lib" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.1/lib" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.3.4/lib" /> diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml index a66e8f7..5cf28e4 100644 --- a/.idea/libraries/Flutter_Plugins.xml +++ b/.idea/libraries/Flutter_Plugins.xml @@ -1,32 +1,28 @@ <component name="libraryTable"> <library name="Flutter Plugins" type="FlutterPluginsLibraryType"> <CLASSES> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/libphonenumber_plugin-0.3.2" /> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/better_open_file-3.6.4" /> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/package_info-2.0.2" /> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/libphonenumber_web-0.3.1" /> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/sqflite-2.3.0" /> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2" /> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_core-2.15.1" /> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_core_web-2.7.0" /> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.2" /> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_in_app_messaging-0.7.3+5" /> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/device_info_plus-9.0.3" /> - <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/fast_rsa-3.6.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_windows-0.2.1+1" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/libphonenumber_plugin-0.3.2" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.5.0" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_macos-3.0.7" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/better_open_file-3.6.4" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/package_info-2.0.2" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher-6.1.14" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/libphonenumber_web-0.3.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_linux-0.9.2+1" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_core-2.15.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_for_web-3.0.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.3.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_local_notifications-15.1.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider-2.1.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_foundation-2.3.1" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/device_info_plus-9.0.3" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_web-2.2.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.20" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_macos-0.9.3+2" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus-7.1.0" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_windows-0.9.3+1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_macos-0.2.1+1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_messaging-14.6.7" /> @@ -39,12 +35,17 @@ <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_ios-6.1.5" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.7+5" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker-1.0.4" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/fast_rsa-3.6.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_core_web-2.7.0" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_web-22.2.11" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.3.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_ios-0.8.8+2" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.3.4" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.2" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/sqflite-2.3.0" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_linux-0.2.1+1" /> + <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_in_app_messaging-0.7.3+5" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences-2.2.1" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.2.1" /> </CLASSES> diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml index fac6e3b..41b2598 100644 --- a/android/.idea/gradle.xml +++ b/android/.idea/gradle.xml @@ -10,18 +10,24 @@ <option name="modules"> <set> <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/better_open_file-3.6.4/android" /> - <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/device_info_plus-8.2.2/android" /> - <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.3.1/android" /> - <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.1/android" /> - <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.15/android" /> - <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.7+4/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/device_info_plus-9.0.3/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/fast_rsa-3.6.1/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.5.0/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_core-2.15.1/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_in_app_messaging-0.7.3+5/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/firebase_messaging-14.6.7/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_local_notifications-15.1.1/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.2/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.16/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.7+5/android" /> <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/libphonenumber_plugin-0.3.2/android" /> <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/package_info-2.0.2/android" /> - <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/android" /> - <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.0/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_android-2.2.0/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.1/android" /> <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/sqflite-2.3.0/android" /> - <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdfviewer-21.2.10/android" /> - <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.37/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdfviewer-22.2.11/android" /> + <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.1.0/android" /> <option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$/app" /> </set> diff --git a/android/.idea/jarRepositories.xml b/android/.idea/jarRepositories.xml index aea0c22..de44b4a 100644 --- a/android/.idea/jarRepositories.xml +++ b/android/.idea/jarRepositories.xml @@ -12,13 +12,13 @@ <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> </remote-repository> <remote-repository> - <option name="id" value="MavenRepo" /> - <option name="name" value="MavenRepo" /> + <option name="id" value="MavenRepo15" /> + <option name="name" value="MavenRepo15" /> <option name="url" value="https://repo.maven.apache.org/maven2/" /> </remote-repository> <remote-repository> - <option name="id" value="Google8" /> - <option name="name" value="Google8" /> + <option name="id" value="Google17" /> + <option name="name" value="Google17" /> <option name="url" value="https://dl.google.com/dl/android/maven2/" /> </remote-repository> <remote-repository> diff --git a/android/.idea/workspace.xml b/android/.idea/workspace.xml index 8086053..b4df895 100644 --- a/android/.idea/workspace.xml +++ b/android/.idea/workspace.xml @@ -4,50 +4,50 @@ <option name="autoReloadType" value="NONE" /> </component> <component name="ChangeListManager"> - <list default="true" id="aa1d4660-dd4d-4aab-a4e2-749864e3d02c" name="Changes" comment=""> + <list default="true" id="1e6f96b5-8617-4b23-87a0-46fedaa97586" name="Changes" comment=""> + <change beforePath="$PROJECT_DIR$/../.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/libraries/Dart_Packages.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../.idea/libraries/Flutter_Plugins.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/libraries/Flutter_Plugins.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../lib/api/requestCache.dart" beforeDir="false" afterPath="$PROJECT_DIR$/../lib/api/requestCache.dart" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../lib/model/dataHolder.dart" beforeDir="false" afterPath="$PROJECT_DIR$/../lib/model/dataHolder.dart" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../lib/model/timetable/timetableProps.dart" beforeDir="false" afterPath="$PROJECT_DIR$/../lib/model/timetable/timetableProps.dart" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../lib/view/pages/more/overhang.dart" beforeDir="false" afterPath="$PROJECT_DIR$/../lib/view/pages/more/overhang.dart" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../lib/view/pages/timetable/timetable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/../lib/view/pages/timetable/timetable.dart" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../lib/widget/loadingSpinner.dart" beforeDir="false" afterPath="$PROJECT_DIR$/../lib/widget/loadingSpinner.dart" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../macos/Flutter/GeneratedPluginRegistrant.swift" beforeDir="false" afterPath="$PROJECT_DIR$/../macos/Flutter/GeneratedPluginRegistrant.swift" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../pubspec.yaml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../windows/flutter/generated_plugin_registrant.cc" beforeDir="false" afterPath="$PROJECT_DIR$/../windows/flutter/generated_plugin_registrant.cc" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../windows/flutter/generated_plugins.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/../windows/flutter/generated_plugins.cmake" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="LAST_RESOLUTION" value="IGNORE" /> </component> - <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[5200de3d4dd02295]" /> + <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[/home/elias/.android/avd/Pixel_XL_API_30.avd]" /> <component name="ExternalProjectsData"> <projectState path="$PROJECT_DIR$"> <ProjectState /> </projectState> </component> - <component name="GenerateSignedApkSettings"> - <option name="EXPORT_PRIVATE_KEY" value="false" /> - <option name="KEY_STORE_PATH" value="$USER_HOME$/upload-keystore.jks" /> - <option name="KEY_ALIAS" value="upload" /> - </component> <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> </component> - <component name="ProjectId" id="2TIxvwh2GdUl98Wy9jWCgaDdwAn" /> + <component name="ProjectId" id="2Utb0UGY4YplQt3khSheV37uOMK" /> <component name="ProjectViewState"> <option name="hideEmptyMiddlePackages" value="true" /> <option name="showLibraryContents" value="true" /> </component> <component name="PropertiesComponent"><![CDATA[{ "keyToString": { - "BundleExportedModule": "android.app", - "ExportBundle.BundlePathForandroid.app": "/home/elias/projects/MarianumMobile/Client/android/app", "RunOnceActivity.OpenProjectViewOnStart": "true", "RunOnceActivity.ShowReadmeOnStart": "true", "RunOnceActivity.cidr.known.project.marker": "true", "cidr.known.project.marker": "true", "dart.analysis.tool.window.visible": "false", - "last_opened_file_path": "/home/elias/upload-keystore.jks", "show.migrate.to.gradle.popup": "false" - }, - "keyToStringList": { - "ExportApk.BuildVariants": [ - "release" - ] } }]]></component> <component name="RunManager"> @@ -121,11 +121,11 @@ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> <component name="TaskManager"> <task active="true" id="Default" summary="Default task"> - <changelist id="aa1d4660-dd4d-4aab-a4e2-749864e3d02c" name="Changes" comment="" /> - <created>1690744630092</created> + <changelist id="1e6f96b5-8617-4b23-87a0-46fedaa97586" name="Changes" comment="" /> + <created>1693761601368</created> <option name="number" value="Default" /> <option name="presentableId" value="Default" /> - <updated>1690744630092</updated> + <updated>1693761601368</updated> </task> <servers /> </component> diff --git a/android/build.gradle b/android/build.gradle index db9efaf..391b068 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.8.0' repositories { google() mavenCentral() diff --git a/lib/model/dataHolder.dart b/lib/model/dataHolder.dart index d8703b5..5169eb8 100644 --- a/lib/model/dataHolder.dart +++ b/lib/model/dataHolder.dart @@ -14,6 +14,7 @@ abstract class DataHolder extends ChangeNotifier { List<ApiResponse?> properties(); bool primaryLoading() { + // log("${toString()} ${properties().map((e) => e != null ? "1" : "0").join(", ")}"); for(ApiResponse? element in properties()) { if(element == null) return true; } diff --git a/lib/model/timetable/timetableProps.dart b/lib/model/timetable/timetableProps.dart index c3ca35d..40545eb 100644 --- a/lib/model/timetable/timetableProps.dart +++ b/lib/model/timetable/timetableProps.dart @@ -1,7 +1,8 @@ +import 'dart:convert'; + import 'package:intl/intl.dart'; import '../../api/apiResponse.dart'; -import '../../api/webuntis/queries/getHolidays/getHolidaysCache.dart'; import '../../api/webuntis/queries/getHolidays/getHolidaysResponse.dart'; import '../../api/webuntis/queries/getRooms/getRoomsCache.dart'; import '../../api/webuntis/queries/getRooms/getRoomsResponse.dart'; @@ -78,12 +79,16 @@ class TimetableProps extends DataHolder { } ); - GetHolidaysCache( - onUpdate: (GetHolidaysResponse data) => { - _getHolidaysResponse = data, - notifyListeners(), - } - ); + // GetHolidaysCache( // TODO is this fixed by webuntis? miese kriese + // onUpdate: (GetHolidaysResponse data) => { + // _getHolidaysResponse = data, + // notifyListeners(), + // } + // ); + _getHolidaysResponse = GetHolidaysResponse.fromJson(jsonDecode(""" + {"jsonrpc":"2.0","id":"ID","result":[]} + """)); + notifyListeners(); } DateTime getDate(DateTime d) => DateTime(d.year, d.month, d.day); diff --git a/lib/view/pages/more/overhang.dart b/lib/view/pages/more/overhang.dart index 2cae8cb..08eb965 100644 --- a/lib/view/pages/more/overhang.dart +++ b/lib/view/pages/more/overhang.dart @@ -8,6 +8,7 @@ import 'package:fast_rsa/fast_rsa.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/material.dart'; import 'package:persistent_bottom_nav_bar/persistent_tab_view.dart'; +import 'package:share_plus/share_plus.dart'; import '../../../model/endpointData.dart'; import '../../../widget/ListItem.dart'; @@ -23,6 +24,7 @@ class Overhang extends StatelessWidget { @override Widget build(BuildContext context) { + return Scaffold( appBar: AppBar( title: const Text("Mehr"), @@ -36,6 +38,19 @@ class Overhang extends StatelessWidget { const ListItemNavigator(icon: Icons.room, text: "Raumplan", target: Roomplan()), const ListItemNavigator(icon: Icons.calculate, text: "Notendurschnittsrechner", target: GradeAverage()), const ListItemNavigator(icon: Icons.calendar_month, text: "Schulferien", target: Holidays()), + ListTile( + leading: const Icon(Icons.share_outlined), + title: const Text("Teile die App mit deiner Klasse"), + onTap: () { + Share.share( // TODO ipad needs position argument + subject: "App Teilen", + "Hol dir die inoffizielle App für's Marianum:" + "\n\nAndroid: https://play.google.com/store/apps/details?id=eu.mhsl.marianum.mobile.client " + "\nApple: https://apps.apple.com/us/app/marianum-fulda/id6458789560 " + "\n\nViel Spaß!" + ); + }, + ), DebugTile(context, onlyInDebug: true).callback(onTab: () async { log("Starting"); log("Generate keys"); diff --git a/lib/widget/loadingSpinner.dart b/lib/widget/loadingSpinner.dart index 6ab2502..8fb9cfd 100644 --- a/lib/widget/loadingSpinner.dart +++ b/lib/widget/loadingSpinner.dart @@ -16,7 +16,7 @@ class _LoadingSpinnerState extends State<LoadingSpinner> { @override void initState() { - timer = Timer(const Duration(seconds: 15), () { + timer = Timer(const Duration(seconds: 30), () { setState(() { textVisible = true; }); @@ -33,13 +33,16 @@ class _LoadingSpinnerState extends State<LoadingSpinner> { children: [ Visibility( visible: !textVisible, - replacement: const Icon(Icons.signal_wifi_connected_no_internet_4_outlined), + replacement: const Icon(Icons.sentiment_dissatisfied_outlined), child: const CircularProgressIndicator(), ), const SizedBox(height: 30), Visibility( visible: textVisible, - child: const Text("Etwas scheint nicht zu funktionieren!\nBist du mit dem Internet verbunden?\n\nVersuche die App neuzustarten"), + child: const Text( + textAlign: TextAlign.center, + "Irgendetwas funktioniert nicht!\nBist du mit dem Internet verbunden?\n\nVersuche die App neuzustarten" + ), ), ], ), diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 8ef9ded..7e74013 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -13,6 +13,7 @@ import firebase_messaging import flutter_local_notifications import package_info import path_provider_foundation +import share_plus import shared_preferences_foundation import sqflite import syncfusion_pdfviewer_macos @@ -27,6 +28,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) SyncfusionFlutterPdfViewerPlugin.register(with: registry.registrar(forPlugin: "SyncfusionFlutterPdfViewerPlugin")) diff --git a/pubspec.yaml b/pubspec.yaml index 09f0011..c17b259 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -87,6 +87,7 @@ dependencies: flutter_local_notifications: ^15.1.0+1 fluttertoast: ^8.2.2 fast_rsa: ^3.6.1 + share_plus: ^7.1.0 dev_dependencies: flutter_test: diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index b785075..da31771 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -9,6 +9,7 @@ #include <fast_rsa/fast_rsa_plugin.h> #include <file_selector_windows/file_selector_windows.h> #include <firebase_core/firebase_core_plugin_c_api.h> +#include <share_plus/share_plus_windows_plugin_c_api.h> #include <syncfusion_pdfviewer_windows/syncfusion_pdfviewer_windows_plugin.h> #include <url_launcher_windows/url_launcher_windows.h> @@ -19,6 +20,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("FileSelectorWindows")); FirebaseCorePluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FirebaseCorePluginCApi")); + SharePlusWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi")); SyncfusionPdfviewerWindowsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("SyncfusionPdfviewerWindowsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index ab8f8ec..a2ae4b5 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST fast_rsa file_selector_windows firebase_core + share_plus syncfusion_pdfviewer_windows url_launcher_windows )