Added automatic update-merge of settings for new settings instead of falling back to defaults

This commit is contained in:
Elias Müller 2023-06-14 11:45:12 +02:00
parent 1c6d062f2d
commit 468c443ebd
14 changed files with 132 additions and 168 deletions

View File

@ -47,7 +47,7 @@
<entry key="args">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/args-2.4.2/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/args-2.4.1/lib" />
</list>
</value>
</entry>
@ -131,14 +131,14 @@
<entry key="build_runner">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/build_runner-2.4.5/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/build_runner-2.4.4/lib" />
</list>
</value>
</entry>
<entry key="build_runner_core">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/build_runner_core-7.2.10/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/build_runner_core-7.2.8/lib" />
</list>
</value>
</entry>
@ -152,7 +152,7 @@
<entry key="built_value">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/built_value-8.6.1/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/built_value-8.5.0/lib" />
</list>
</value>
</entry>
@ -208,7 +208,7 @@
<entry key="code_builder">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/code_builder-4.5.0/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/code_builder-4.4.0/lib" />
</list>
</value>
</entry>
@ -229,7 +229,7 @@
<entry key="cookie_jar">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/cookie_jar-4.0.3/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/cookie_jar-4.0.2/lib" />
</list>
</value>
</entry>
@ -257,7 +257,7 @@
<entry key="csslib">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/csslib-1.0.0/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/csslib-0.17.2/lib" />
</list>
</value>
</entry>
@ -299,7 +299,7 @@
<entry key="dynamite_runtime">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/git/nextcloud-neon-6b60409912de0599237aa0caf2042732b91fdbec/packages/dynamite/dynamite_runtime/lib" />
<option value="$USER_HOME$/.pub-cache/git/nextcloud-neon-35eb2d65799f3e6a5f53b62da8cac868d3e52f86/packages/dynamite/dynamite_runtime/lib" />
</list>
</value>
</entry>
@ -327,35 +327,7 @@
<entry key="file_picker">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.3.1/lib" />
</list>
</value>
</entry>
<entry key="file_selector_linux">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_linux-0.9.1+3/lib" />
</list>
</value>
</entry>
<entry key="file_selector_macos">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_macos-0.9.2/lib" />
</list>
</value>
</entry>
<entry key="file_selector_platform_interface">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_platform_interface-2.5.1/lib" />
</list>
</value>
</entry>
<entry key="file_selector_windows">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_windows-0.9.2/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.3.0/lib" />
</list>
</value>
</entry>
@ -439,7 +411,7 @@
<entry key="flutter_native_splash">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.1/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.0/lib" />
</list>
</value>
</entry>
@ -488,14 +460,14 @@
<entry key="graphs">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/graphs-2.3.1/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/graphs-2.3.0/lib" />
</list>
</value>
</entry>
<entry key="html">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/html-0.15.4/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/html-0.15.3/lib" />
</list>
</value>
</entry>
@ -530,14 +502,14 @@
<entry key="image_picker">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker-0.8.8/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker-0.8.7+5/lib" />
</list>
</value>
</entry>
<entry key="image_picker_android">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.6+20/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.6+16/lib" />
</list>
</value>
</entry>
@ -555,31 +527,10 @@
</list>
</value>
</entry>
<entry key="image_picker_linux">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_linux-0.2.0/lib" />
</list>
</value>
</entry>
<entry key="image_picker_macos">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_macos-0.2.0/lib" />
</list>
</value>
</entry>
<entry key="image_picker_platform_interface">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_platform_interface-2.8.0/lib" />
</list>
</value>
</entry>
<entry key="image_picker_windows">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_windows-0.2.0/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_platform_interface-2.6.3/lib" />
</list>
</value>
</entry>
@ -635,7 +586,7 @@
<entry key="lints">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/lints-2.1.1/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/lints-2.1.0/lib" />
</list>
</value>
</entry>
@ -656,7 +607,7 @@
<entry key="logging">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/logging-1.2.0/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/logging-1.1.1/lib" />
</list>
</value>
</entry>
@ -698,7 +649,7 @@
<entry key="nextcloud">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/git/nextcloud-neon-6b60409912de0599237aa0caf2042732b91fdbec/packages/nextcloud/lib" />
<option value="$USER_HOME$/.pub-cache/git/nextcloud-neon-35eb2d65799f3e6a5f53b62da8cac868d3e52f86/packages/nextcloud/lib" />
</list>
</value>
</entry>
@ -754,7 +705,7 @@
<entry key="path_provider_linux">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.10/lib" />
</list>
</value>
</entry>
@ -768,7 +719,7 @@
<entry key="path_provider_windows">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.7/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/lib" />
</list>
</value>
</entry>
@ -880,7 +831,7 @@
<entry key="shared_preferences">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences-2.1.2/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences-2.1.1/lib" />
</list>
</value>
</entry>
@ -1020,63 +971,63 @@
<entry key="syncfusion_flutter_calendar">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_calendar-21.2.9/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_calendar-21.2.5/lib" />
</list>
</value>
</entry>
<entry key="syncfusion_flutter_core">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_core-21.2.9/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_core-21.2.8/lib" />
</list>
</value>
</entry>
<entry key="syncfusion_flutter_datepicker">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_datepicker-21.2.9/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_datepicker-21.2.5/lib" />
</list>
</value>
</entry>
<entry key="syncfusion_flutter_pdf">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdf-21.2.9/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdf-21.2.8/lib" />
</list>
</value>
</entry>
<entry key="syncfusion_flutter_pdfviewer">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdfviewer-21.2.9/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdfviewer-21.2.8/lib" />
</list>
</value>
</entry>
<entry key="syncfusion_pdfviewer_macos">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_macos-21.2.9/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_macos-21.2.8/lib" />
</list>
</value>
</entry>
<entry key="syncfusion_pdfviewer_platform_interface">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_platform_interface-21.2.9/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_platform_interface-21.2.8/lib" />
</list>
</value>
</entry>
<entry key="syncfusion_pdfviewer_web">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_web-21.2.9/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_web-21.2.8/lib" />
</list>
</value>
</entry>
<entry key="syncfusion_pdfviewer_windows">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_windows-21.2.9/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_windows-21.2.8/lib" />
</list>
</value>
</entry>
@ -1104,7 +1055,7 @@
<entry key="timezone">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/timezone-0.9.2/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/timezone-0.9.1/lib" />
</list>
</value>
</entry>
@ -1125,7 +1076,7 @@
<entry key="universal_io">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/universal_io-2.2.2/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/universal_io-2.2.0/lib" />
</list>
</value>
</entry>
@ -1139,7 +1090,7 @@
<entry key="url_launcher_android">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.35/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.34/lib" />
</list>
</value>
</entry>
@ -1174,7 +1125,7 @@
<entry key="url_launcher_web">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.17/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.16/lib" />
</list>
</value>
</entry>
@ -1259,15 +1210,15 @@
</properties>
<CLASSES>
<root url="file://$USER_HOME$/.pub-cache/git/flowder-1ddd171a763c4f1ba09b95e34e35e2e5cf0d1bba//lib" />
<root url="file://$USER_HOME$/.pub-cache/git/nextcloud-neon-6b60409912de0599237aa0caf2042732b91fdbec/packages/dynamite/dynamite_runtime/lib" />
<root url="file://$USER_HOME$/.pub-cache/git/nextcloud-neon-6b60409912de0599237aa0caf2042732b91fdbec/packages/nextcloud/lib" />
<root url="file://$USER_HOME$/.pub-cache/git/nextcloud-neon-35eb2d65799f3e6a5f53b62da8cac868d3e52f86/packages/dynamite/dynamite_runtime/lib" />
<root url="file://$USER_HOME$/.pub-cache/git/nextcloud-neon-35eb2d65799f3e6a5f53b62da8cac868d3e52f86/packages/nextcloud/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-61.0.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/analyzer-5.13.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/animated_digit-3.2.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/another_flushbar-1.12.30/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/another_transformer_page_view-2.0.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/archive-3.3.7/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/args-2.4.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/args-2.4.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/asn1lib-1.4.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/async-2.11.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/back_button_interceptor-6.0.2/lib" />
@ -1279,10 +1230,10 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/build_config-1.1.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/build_daemon-4.0.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/build_resolvers-2.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/build_runner-2.4.5/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/build_runner_core-7.2.10/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/build_runner-2.4.4/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/build_runner_core-7.2.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/built_collection-5.1.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/built_value-8.6.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/built_value-8.5.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/cached_network_image-3.2.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/cached_network_image_platform_interface-2.0.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/cached_network_image_web-1.0.2/lib" />
@ -1290,14 +1241,14 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/checked_yaml-2.0.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/cli_util-0.4.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/clock-1.1.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/code_builder-4.5.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/code_builder-4.4.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/collection-1.17.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/convert-3.1.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/cookie_jar-4.0.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/cookie_jar-4.0.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/cross_file-0.3.3+4/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/crypto-3.0.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/crypton-2.1.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/csslib-1.0.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/csslib-0.17.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/cupertino_icons-1.0.5/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/dart_style-2.3.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/device_info_plus-8.2.2/lib" />
@ -1306,11 +1257,7 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/fake_async-1.3.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/ffi-2.0.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file-6.1.4/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.3.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_linux-0.9.1+3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_macos-0.9.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_platform_interface-2.5.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_windows-0.9.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.3.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/filesize-2.0.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/fixnum-1.1.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_blurhash-0.7.0/lib" />
@ -1319,25 +1266,22 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_linkify-6.0.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_lints-2.0.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_login-4.1.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.15/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/font_awesome_flutter-10.4.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/frontend_server_client-3.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/glob-2.1.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/graphs-2.3.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/html-0.15.4/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/graphs-2.3.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/html-0.15.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/http-0.13.6/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/http_multi_server-3.2.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/http_parser-4.0.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image-4.0.17/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker-0.8.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.6+20/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker-0.8.7+5/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.6+16/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_for_web-2.1.12/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_ios-0.8.7+4/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_linux-0.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_macos-0.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_platform_interface-2.8.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_windows-0.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_platform_interface-2.6.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/intl-0.18.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/io-1.0.4/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/jiffy-6.2.1/lib" />
@ -1345,10 +1289,10 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/json_annotation-4.8.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/json_serializable-6.7.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/linkify-5.0.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/lints-2.1.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/lints-2.1.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/loader_overlay-2.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/localstore-1.3.5/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/logging-1.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/logging-1.1.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/matcher-0.12.15/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/meta-1.9.1/lib" />
@ -1361,9 +1305,9 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider-2.0.15/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.10/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.0.6/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.7/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/pedantic-1.11.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/persistent_bottom_nav_bar-5.0.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/petitparser-5.4.0/lib" />
@ -1379,7 +1323,7 @@
<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/shared_preferences-2.1.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences-2.1.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_android-2.1.4/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.2.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.2.0/lib" />
@ -1398,29 +1342,29 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/stream_channel-2.1.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/stream_transform-2.1.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/string_scanner-1.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_calendar-21.2.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_core-21.2.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_datepicker-21.2.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdf-21.2.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdfviewer-21.2.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_macos-21.2.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_platform_interface-21.2.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_web-21.2.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_windows-21.2.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_calendar-21.2.5/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_core-21.2.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_datepicker-21.2.5/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdf-21.2.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdfviewer-21.2.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_macos-21.2.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_platform_interface-21.2.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_web-21.2.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_windows-21.2.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/synchronized-3.1.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/test_api-0.5.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/timezone-0.9.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/timezone-0.9.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/timing-1.0.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/typed_data-1.3.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/universal_io-2.2.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/universal_io-2.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher-6.1.11/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.35/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.34/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_ios-6.1.4/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_linux-3.0.5/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_macos-3.0.5/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_platform_interface-2.1.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.17/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.16/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_windows-3.0.6/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/uuid-3.0.7/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib" />

View File

@ -20,23 +20,17 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_ios-0.8.7+4" />
<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/device_info_plus-8.2.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_macos-0.9.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.17" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.35" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_windows-0.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_windows-0.9.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_web-21.2.9" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_selector_linux-0.9.1+3" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_macos-0.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker-0.8.8" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdfviewer-21.2.9" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.7" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_linux-0.2.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.3.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.6+20" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences-2.1.2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.16" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.34" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.6+16" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker-0.8.7+5" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_pdfviewer_web-21.2.8" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.10" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/syncfusion_flutter_pdfviewer-21.2.8" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/shared_preferences-2.1.1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.3.0" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6" />
</CLASSES>
<JAVADOC />
<SOURCES />

3
.idea/misc.xml generated
View File

@ -2,4 +2,7 @@
<component name="ProjectRootManager">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SuppressKotlinCodeStyleNotification">
<option name="disableForAll" value="true" />
</component>
</project>

View File

@ -7,7 +7,12 @@ import 'getHolidaysResponse.dart';
class GetHolidays {
Future<GetHolidaysResponse> query() async {
String response = (await http.get(Uri.parse("https://ferien-api.de/api/v1/holidays/HE"))).body;
List<dynamic> parsedListJson = jsonDecode(response);
return GetHolidaysResponse(List<GetHolidaysResponseObject>.from(parsedListJson.map<GetHolidaysResponseObject>((dynamic i) => GetHolidaysResponseObject.fromJson(i))));
return GetHolidaysResponse(
List<GetHolidaysResponseObject>.from(
jsonDecode(response).map<GetHolidaysResponseObject>(
(dynamic i) => GetHolidaysResponseObject.fromJson(i)
)
)
);
}
}

View File

@ -12,7 +12,13 @@ class GetHolidaysCache extends RequestCache<GetHolidaysResponse> {
@override
GetHolidaysResponse onLocalData(String json) {
List<dynamic> parsedListJson = jsonDecode(json)['data'];
return GetHolidaysResponse(List<GetHolidaysResponseObject>.from(parsedListJson.map<GetHolidaysResponseObject>((dynamic i) => GetHolidaysResponseObject.fromJson(i))));
return GetHolidaysResponse(
List<GetHolidaysResponseObject>.from(
parsedListJson.map<GetHolidaysResponseObject>(
(dynamic i) => GetHolidaysResponseObject.fromJson(i)
)
)
);
}
@override

View File

@ -11,9 +11,7 @@ class SetFavorite extends TalkApi<void> {
SetFavorite(this.chatToken, this.favoriteState) : super("v4/room/$chatToken/favorite", null);
@override
assemble(String raw) {
}
assemble(String raw) {}
@override
Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {

View File

@ -95,8 +95,6 @@ class _MainState extends State<Main> {
themeMode: settings.val().appTheme,
theme: LightAppTheme.theme,
darkTheme: DarkAppTheme.theme,
home: Consumer<AccountModel>(
builder: (context, accountModel, child) {
switch(accountModel.state) {

View File

@ -25,19 +25,31 @@ class SettingsProvider extends ChangeNotifier {
}
SettingsProvider() {
init();
_readFromStorage();
}
void init({bool resetConfig = false}) async {
void reset() async {
_storage = await SharedPreferences.getInstance();
_storage.remove(_fieldName);
if(resetConfig) _storage.remove(_fieldName);
notifyListeners();
}
void _readFromStorage() async {
_storage = await SharedPreferences.getInstance();
try {
_settings = Settings.fromJson(jsonDecode(_storage.getString(_fieldName)!));
} catch(e) {
log("Settings are defective, using defaults: ${e.toString()}");
_settings = _defaults();
} catch(exception) {
try {
log("Settings were changed, trying to recover from old Settings: ${exception.toString()}");
_settings = Settings.fromJson(_mergeSettings(jsonDecode(_storage.getString(_fieldName)!), _defaults().toJson()));
log("Settings recovered successfully: ${_settings.toJson().toString()}");
} catch(exception) {
log("Settings are defective and not recoverable, using defaults: ${exception.toString()}");
_settings = _defaults();
log("Settings were reset to defaults!");
}
}
notifyListeners();
@ -47,6 +59,22 @@ class SettingsProvider extends ChangeNotifier {
await _storage.setString(_fieldName, jsonEncode(_settings.toJson()));
}
Map<String, dynamic> _mergeSettings(Map<String, dynamic> oldMap, Map<String, dynamic> newMap) {
Map<String, dynamic> mergedMap = Map.from(newMap);
oldMap.forEach((key, value) {
if (mergedMap.containsKey(key)) {
if (value is Map<String, dynamic> && mergedMap[key] is Map<String, dynamic>) {
mergedMap[key] = _mergeSettings(value, mergedMap[key]);
} else {
mergedMap[key] = value;
}
}
});
return mergedMap;
}
Settings _defaults() {
return Settings(
appTheme: ThemeMode.system,

View File

@ -39,7 +39,6 @@ class _SettingsState extends State<Settings> {
),
body: ListView(
children: [
ListTile(
leading: const Icon(Icons.logout_outlined),
title: const Text("Konto abmelden"),
@ -248,7 +247,7 @@ class _SettingsState extends State<Settings> {
confirmButton: "Unwiederruflich Löschen",
onConfirm: () {
setState(() {
Provider.of<SettingsProvider>(context, listen: false).init(resetConfig: true);
Provider.of<SettingsProvider>(context, listen: false).reset();
});
},
).asDialog(context);

View File

@ -6,13 +6,9 @@
#include "generated_plugin_registrant.h"
#include <file_selector_linux/file_selector_plugin.h>
#include <url_launcher_linux/url_launcher_plugin.h>
void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);

View File

@ -3,7 +3,6 @@
#
list(APPEND FLUTTER_PLUGIN_LIST
file_selector_linux
url_launcher_linux
)

View File

@ -6,7 +6,6 @@ import FlutterMacOS
import Foundation
import device_info_plus
import file_selector_macos
import package_info
import path_provider_foundation
import shared_preferences_foundation
@ -16,7 +15,6 @@ import url_launcher_macos
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))

View File

@ -6,13 +6,10 @@
#include "generated_plugin_registrant.h"
#include <file_selector_windows/file_selector_windows.h>
#include <syncfusion_pdfviewer_windows/syncfusion_pdfviewer_windows_plugin.h>
#include <url_launcher_windows/url_launcher_windows.h>
void RegisterPlugins(flutter::PluginRegistry* registry) {
FileSelectorWindowsRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FileSelectorWindows"));
SyncfusionPdfviewerWindowsPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("SyncfusionPdfviewerWindowsPlugin"));
UrlLauncherWindowsRegisterWithRegistrar(

View File

@ -3,7 +3,6 @@
#
list(APPEND FLUTTER_PLUGIN_LIST
file_selector_windows
syncfusion_pdfviewer_windows
url_launcher_windows
)