From 495e3f32701a0c1a40dafe3d78b01c5aa4a6f839 Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 10 Jul 2020 09:29:22 -0700 Subject: [PATCH 1/2] Init --- .../path_provider_fde/.flutter-plugins-dependencies | 1 + .../.flutter-plugins-dependencies | 1 + panache_core/.flutter-plugins-dependencies | 1 + panache_desktop/.flutter-plugins-dependencies | 1 + panache_mobile/.flutter-plugins-dependencies | 1 + .../ios/Flutter/flutter_export_environment.sh | 11 ++++++----- panache_services/.flutter-plugins-dependencies | 1 + panache_ui/.flutter-plugins-dependencies | 1 + panache_web/.flutter-plugins-dependencies | 1 + 9 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 desktop_plugins/path_provider_fde/.flutter-plugins-dependencies create mode 100644 desktop_plugins/shared_preferences_fde/.flutter-plugins-dependencies create mode 100644 panache_core/.flutter-plugins-dependencies create mode 100644 panache_desktop/.flutter-plugins-dependencies create mode 100644 panache_mobile/.flutter-plugins-dependencies create mode 100644 panache_services/.flutter-plugins-dependencies create mode 100644 panache_ui/.flutter-plugins-dependencies create mode 100644 panache_web/.flutter-plugins-dependencies diff --git a/desktop_plugins/path_provider_fde/.flutter-plugins-dependencies b/desktop_plugins/path_provider_fde/.flutter-plugins-dependencies new file mode 100644 index 0000000..234884e --- /dev/null +++ b/desktop_plugins/path_provider_fde/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[],"android":[],"macos":[{"name":"path_provider_fde","path":"C:\\\\Users\\\\felip\\\\Desktop\\\\panache\\\\desktop_plugins\\\\path_provider_fde\\\\","dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"path_provider_fde","dependencies":[]}],"date_created":"2020-07-10 09:29:03.664905","version":"1.17.4"} \ No newline at end of file diff --git a/desktop_plugins/shared_preferences_fde/.flutter-plugins-dependencies b/desktop_plugins/shared_preferences_fde/.flutter-plugins-dependencies new file mode 100644 index 0000000..8a6380b --- /dev/null +++ b/desktop_plugins/shared_preferences_fde/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[],"android":[],"macos":[{"name":"shared_preferences_fde","path":"C:\\\\Users\\\\felip\\\\Desktop\\\\panache\\\\desktop_plugins\\\\shared_preferences_fde\\\\","dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"shared_preferences_fde","dependencies":[]}],"date_created":"2020-07-10 09:29:05.480905","version":"1.17.4"} \ No newline at end of file diff --git a/panache_core/.flutter-plugins-dependencies b/panache_core/.flutter-plugins-dependencies new file mode 100644 index 0000000..e38cc9b --- /dev/null +++ b/panache_core/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]}],"android":[{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]}],"windows":[],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]}],"date_created":"2020-07-10 09:28:48.597102","version":"1.17.4"} \ No newline at end of file diff --git a/panache_desktop/.flutter-plugins-dependencies b/panache_desktop/.flutter-plugins-dependencies new file mode 100644 index 0000000..fd5fa5a --- /dev/null +++ b/panache_desktop/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.8\\\\","dependencies":[]}],"android":[{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.8\\\\","dependencies":[]}],"macos":[{"name":"path_provider_fde","path":"C:\\\\Users\\\\felip\\\\Desktop\\\\panache\\\\desktop_plugins\\\\path_provider_fde\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]},{"name":"shared_preferences_fde","path":"C:\\\\Users\\\\felip\\\\Desktop\\\\panache\\\\desktop_plugins\\\\shared_preferences_fde\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_macos-0.0.1+10\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]},{"name":"shared_preferences_linux","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_linux-0.0.2+1\\\\","dependencies":["path_provider_linux"]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_fde","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_fde","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]}],"date_created":"2020-07-10 09:28:51.281194","version":"1.17.4"} \ No newline at end of file diff --git a/panache_mobile/.flutter-plugins-dependencies b/panache_mobile/.flutter-plugins-dependencies new file mode 100644 index 0000000..810a8ef --- /dev/null +++ b/panache_mobile/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"google_sign_in","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in-3.3.0+1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.8\\\\","dependencies":[]}],"android":[{"name":"google_sign_in","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in-3.3.0+1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.8\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_macos-0.0.1+10\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]},{"name":"shared_preferences_linux","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_linux-0.0.2+1\\\\","dependencies":["path_provider_linux"]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"google_sign_in","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]}],"date_created":"2020-07-10 09:28:53.917908","version":"1.17.4"} \ No newline at end of file diff --git a/panache_mobile/ios/Flutter/flutter_export_environment.sh b/panache_mobile/ios/Flutter/flutter_export_environment.sh index 5d35632..5bad365 100755 --- a/panache_mobile/ios/Flutter/flutter_export_environment.sh +++ b/panache_mobile/ios/Flutter/flutter_export_environment.sh @@ -1,10 +1,11 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/Users/rxlabz/dev/tools/flutter" -export "FLUTTER_APPLICATION_PATH=/Users/rxlabz/dev/projects/panache/dev/panache/panache_mobile" -export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_ROOT=C:\flutter\flutter" +export "FLUTTER_APPLICATION_PATH=C:\Users\felip\Desktop\panache\panache_mobile" +export "FLUTTER_TARGET=lib\main.dart" export "FLUTTER_BUILD_DIR=build" -export "SYMROOT=${SOURCE_ROOT}/../build/ios" -export "FLUTTER_FRAMEWORK_DIR=/Users/rxlabz/dev/tools/flutter/bin/cache/artifacts/engine/ios" +export "SYMROOT=${SOURCE_ROOT}/../build\ios" +export "OTHER_LDFLAGS=$(inherited) -framework Flutter" +export "FLUTTER_FRAMEWORK_DIR=C:\flutter\flutter\bin\cache\artifacts\engine\ios" export "FLUTTER_BUILD_NAME=0.2.2" export "FLUTTER_BUILD_NUMBER=0.2.2" diff --git a/panache_services/.flutter-plugins-dependencies b/panache_services/.flutter-plugins-dependencies new file mode 100644 index 0000000..69ed80e --- /dev/null +++ b/panache_services/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.8\\\\","dependencies":[]}],"android":[{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.8\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]},{"name":"shared_preferences_fde","path":"C:\\\\Users\\\\felip\\\\Desktop\\\\panache\\\\desktop_plugins\\\\shared_preferences_fde\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_macos-0.0.1+10\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]},{"name":"shared_preferences_linux","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_linux-0.0.2+1\\\\","dependencies":["path_provider_linux"]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_fde","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]}],"date_created":"2020-07-10 09:28:56.576905","version":"1.17.4"} \ No newline at end of file diff --git a/panache_ui/.flutter-plugins-dependencies b/panache_ui/.flutter-plugins-dependencies new file mode 100644 index 0000000..6270617 --- /dev/null +++ b/panache_ui/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]}],"android":[{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]}],"windows":[],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]}],"date_created":"2020-07-10 09:28:59.241906","version":"1.17.4"} \ No newline at end of file diff --git a/panache_web/.flutter-plugins-dependencies b/panache_web/.flutter-plugins-dependencies new file mode 100644 index 0000000..0a9e073 --- /dev/null +++ b/panache_web/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]}],"android":[{"name":"path_provider","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]}],"windows":[],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]}],"date_created":"2020-07-10 09:29:01.828907","version":"1.17.4"} \ No newline at end of file From e207f87587c942dd7fc3c233e84cc1252dc96360 Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 10 Jul 2020 09:31:07 -0700 Subject: [PATCH 2/2] Fix Compile Issues --- panache_services/lib/src/services/http_client.dart | 2 +- .../src/screens/editor/controls/color_picker/color_slider.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panache_services/lib/src/services/http_client.dart b/panache_services/lib/src/services/http_client.dart index 3681502..a30e63d 100644 --- a/panache_services/lib/src/services/http_client.dart +++ b/panache_services/lib/src/services/http_client.dart @@ -7,7 +7,7 @@ class GoogleHttpClient extends IOClient { GoogleHttpClient(this._headers) : super(); @override - Future send(BaseRequest request) => + Future send(BaseRequest request) => super.send(request..headers.addAll(_headers)); @override diff --git a/panache_ui/lib/src/screens/editor/controls/color_picker/color_slider.dart b/panache_ui/lib/src/screens/editor/controls/color_picker/color_slider.dart index 63eb516..5cc3abe 100644 --- a/panache_ui/lib/src/screens/editor/controls/color_picker/color_slider.dart +++ b/panache_ui/lib/src/screens/editor/controls/color_picker/color_slider.dart @@ -1097,7 +1097,7 @@ class _RenderSlider extends RenderBox { } } -class GradientSliderThemeData extends Diagnosticable { +class GradientSliderThemeData with Diagnosticable { const GradientSliderThemeData({ @required this.startRailColor, @required this.endRailColor,