Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>12.0</string>
<string>13.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion client/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '12.0'
# platform :ios, '13.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
12 changes: 6 additions & 6 deletions client/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ PODS:
- FlutterMacOS
- permission_handler_apple (9.3.0):
- Flutter
- record_ios (1.0.0):
- record_ios (1.1.0):
- Flutter
- rive_common (0.0.1):
- Flutter
Expand Down Expand Up @@ -169,7 +169,7 @@ SPEC CHECKSUMS:
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
Google-Mobile-Ads-SDK: 1dfb0c3cb46c7e2b00b0f4de74a1e06d9ea25d67
google_mobile_ads: 535223588a6791b7a3cc3513a1bc7b89d12f3e62
Expand All @@ -180,7 +180,7 @@ SPEC CHECKSUMS:
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
record_ios: fee1c924aa4879b882ebca2b4bce6011bcfc3d8b
record_ios: f75fa1d57f840012775c0e93a38a7f3ceea1a374
rive_common: dd421daaf9ae69f0125aa761dd96abd278399952
SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
sensors_plus: 6a11ed0c2e1d0bd0b20b4029d3bad27d96e0c65b
Expand All @@ -190,8 +190,8 @@ SPEC CHECKSUMS:
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2
webview_flutter_wkwebview: 8ebf4fded22593026f7dbff1fbff31ea98573c8d

PODFILE CHECKSUM: 6e0773c9c44c19ccfa69850451666ad1d1af99d1
PODFILE CHECKSUM: 462a5b249f9f1900cbd87af7b6af48272dc2df5a

COCOAPODS: 1.14.3
COCOAPODS: 1.16.2
6 changes: 3 additions & 3 deletions client/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down Expand Up @@ -441,7 +441,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -490,7 +490,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class BarChartEventData extends Equatable {
BarTouchResponse? response,
) {
return BarChartEventData(
eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
eventType: resolveFlTouchEventType(event),
groupIndex: response != null && response.spot != null
? response.spot!.touchedBarGroupIndex
: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class CandlestickChartEventData extends Equatable {
CandlestickTouchResponse? response,
) {
return CandlestickChartEventData(
eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
eventType: resolveFlTouchEventType(event),
spotIndex: response?.touchedSpot?.spotIndex,
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,19 +167,20 @@ FLHorizontalAlignment? parseFLHorizontalAlignment(String? value,
defaultValue;
}

const eventMap = {
"FlPointerEnterEvent": "pointerEnter",
"FlPointerExitEvent": "pointerExit",
"FlPointerHoverEvent": "pointerHover",
"FlPanCancelEvent": "panCancel",
"FlPanDownEvent": "panDown",
"FlPanEndEvent": "panEnd",
"FlPanStartEvent": "panStart",
"FlPanUpdateEvent": "panUpdate",
"FlLongPressEnd": "longPressEnd",
"FlLongPressMoveUpdate": "longPressMoveUpdate",
"FlLongPressStart": "longPressStart",
"FlTapCancelEvent": "tapCancel",
"FlTapDownEvent": "tapDown",
"FlTapUpEvent": "tapUp",
};
String resolveFlTouchEventType(FlTouchEvent event) {
if (event is FlPointerEnterEvent) return "pointerEnter";
if (event is FlPointerExitEvent) return "pointerExit";
if (event is FlPointerHoverEvent) return "pointerHover";
if (event is FlPanCancelEvent) return "panCancel";
if (event is FlPanDownEvent) return "panDown";
if (event is FlPanEndEvent) return "panEnd";
if (event is FlPanStartEvent) return "panStart";
if (event is FlPanUpdateEvent) return "panUpdate";
if (event is FlLongPressEnd) return "longPressEnd";
if (event is FlLongPressMoveUpdate) return "longPressMoveUpdate";
if (event is FlLongPressStart) return "longPressStart";
if (event is FlTapCancelEvent) return "tapCancel";
if (event is FlTapDownEvent) return "tapDown";
if (event is FlTapUpEvent) return "tapUp";
return "undefined";
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class LineChartEventData extends Equatable {
factory LineChartEventData.fromDetails(
FlTouchEvent event, LineTouchResponse? response) {
return LineChartEventData(
eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
eventType: resolveFlTouchEventType(event),
barSpots: response != null && response.lineBarSpots != null
? response.lineBarSpots!
.map((bs) => LineChartEventDataSpot(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class PieChartEventData extends Equatable {
factory PieChartEventData.fromDetails(
FlTouchEvent event, PieTouchResponse? response) {
return PieChartEventData(
eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
eventType: resolveFlTouchEventType(event),
sectionIndex: response?.touchedSection?.touchedSectionIndex,
localPosition: event.localPosition,
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class RadarChartEventData extends Equatable {
final touchedSpot = response?.touchedSpot;

return RadarChartEventData(
eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
eventType: resolveFlTouchEventType(event),
dataSetIndex: touchedSpot?.touchedDataSetIndex,
entryIndex: touchedSpot?.touchedRadarEntryIndex,
entryValue: touchedSpot?.touchedRadarEntry.value,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ScatterChartEventData extends Equatable {
factory ScatterChartEventData.fromDetails(
FlTouchEvent event, ScatterTouchResponse? response) {
return ScatterChartEventData(
eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
eventType: resolveFlTouchEventType(event),
spotIndex: response?.touchedSpot?.spotIndex);
}

Expand Down
5 changes: 2 additions & 3 deletions sdk/python/packages/flet/docs/controls/filepicker.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ example_images: ../examples/controls/file_picker/media
--8<-- "{{ examples }}/pick_save_and_get_directory_path.py"
```

{{ image(example_images + "/pick_save_and_get_directory_path.png", alt="pick-save-and-get-directory-path", width="80%") }}

{{ image(example_images + "/pick_save_and_get_directory_path.png", width="80%") }}


### Pick and upload files
Expand All @@ -26,7 +25,7 @@ example_images: ../examples/controls/file_picker/media
--8<-- "{{ examples }}/pick_and_upload.py"
```

{{ image(example_images + "/pick_and_upload.png", alt="pick-and-upload", width="80%") }}
{{ image(example_images + "/pick_and_upload.png", width="80%") }}


{{ class_members(class_name) }}