Skip to content

Commit 3280dfb

Browse files
fix(flet-charts): Refactor chart event parser to overcome minification (#5797)
* refactor: Replace eventMap with resolveFlTouchEventType function for better parsing * use resolveFlTouchEventType * chore: Update deployment target to iOS 13.0 and upgrade record_ios pod to version 1.1.0 * cherry-pick updates to file picker examples * Fix indentation in chart event data constructors Corrected indentation for eventType parameter in the constructors of BarChartEventData, CandlestickChartEventData, PieChartEventData, and RadarChartEventData for improved code readability and consistency. --------- Co-authored-by: Feodor Fitsner <feodor@appveyor.com>
1 parent 8240267 commit 3280dfb

File tree

12 files changed

+36
-36
lines changed

12 files changed

+36
-36
lines changed

client/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>12.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

client/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '12.0'
2+
# platform :ios, '13.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

client/ios/Podfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ PODS:
6262
- FlutterMacOS
6363
- permission_handler_apple (9.3.0):
6464
- Flutter
65-
- record_ios (1.0.0):
65+
- record_ios (1.1.0):
6666
- Flutter
6767
- rive_common (0.0.1):
6868
- Flutter
@@ -169,7 +169,7 @@ SPEC CHECKSUMS:
169169
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
170170
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
171171
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
172-
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
172+
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
173173
geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
174174
Google-Mobile-Ads-SDK: 1dfb0c3cb46c7e2b00b0f4de74a1e06d9ea25d67
175175
google_mobile_ads: 535223588a6791b7a3cc3513a1bc7b89d12f3e62
@@ -180,7 +180,7 @@ SPEC CHECKSUMS:
180180
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
181181
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
182182
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
183-
record_ios: fee1c924aa4879b882ebca2b4bce6011bcfc3d8b
183+
record_ios: f75fa1d57f840012775c0e93a38a7f3ceea1a374
184184
rive_common: dd421daaf9ae69f0125aa761dd96abd278399952
185185
SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
186186
sensors_plus: 6a11ed0c2e1d0bd0b20b4029d3bad27d96e0c65b
@@ -190,8 +190,8 @@ SPEC CHECKSUMS:
190190
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
191191
volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
192192
wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
193-
webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2
193+
webview_flutter_wkwebview: 8ebf4fded22593026f7dbff1fbff31ea98573c8d
194194

195-
PODFILE CHECKSUM: 6e0773c9c44c19ccfa69850451666ad1d1af99d1
195+
PODFILE CHECKSUM: 462a5b249f9f1900cbd87af7b6af48272dc2df5a
196196

197-
COCOAPODS: 1.14.3
197+
COCOAPODS: 1.16.2

client/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
361361
GCC_WARN_UNUSED_FUNCTION = YES;
362362
GCC_WARN_UNUSED_VARIABLE = YES;
363-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
363+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
364364
MTL_ENABLE_DEBUG_INFO = NO;
365365
SDKROOT = iphoneos;
366366
SUPPORTED_PLATFORMS = iphoneos;
@@ -441,7 +441,7 @@
441441
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
442442
GCC_WARN_UNUSED_FUNCTION = YES;
443443
GCC_WARN_UNUSED_VARIABLE = YES;
444-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
444+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
445445
MTL_ENABLE_DEBUG_INFO = YES;
446446
ONLY_ACTIVE_ARCH = YES;
447447
SDKROOT = iphoneos;
@@ -490,7 +490,7 @@
490490
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
491491
GCC_WARN_UNUSED_FUNCTION = YES;
492492
GCC_WARN_UNUSED_VARIABLE = YES;
493-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
493+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
494494
MTL_ENABLE_DEBUG_INFO = NO;
495495
SDKROOT = iphoneos;
496496
SUPPORTED_PLATFORMS = iphoneos;

sdk/python/packages/flet-charts/src/flutter/flet_charts/lib/src/utils/bar_chart.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class BarChartEventData extends Equatable {
2424
BarTouchResponse? response,
2525
) {
2626
return BarChartEventData(
27-
eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
27+
eventType: resolveFlTouchEventType(event),
2828
groupIndex: response != null && response.spot != null
2929
? response.spot!.touchedBarGroupIndex
3030
: null,

sdk/python/packages/flet-charts/src/flutter/flet_charts/lib/src/utils/candlestick_chart.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class CandlestickChartEventData extends Equatable {
1919
CandlestickTouchResponse? response,
2020
) {
2121
return CandlestickChartEventData(
22-
eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
22+
eventType: resolveFlTouchEventType(event),
2323
spotIndex: response?.touchedSpot?.spotIndex,
2424
);
2525
}

sdk/python/packages/flet-charts/src/flutter/flet_charts/lib/src/utils/charts.dart

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -167,19 +167,20 @@ FLHorizontalAlignment? parseFLHorizontalAlignment(String? value,
167167
defaultValue;
168168
}
169169

170-
const eventMap = {
171-
"FlPointerEnterEvent": "pointerEnter",
172-
"FlPointerExitEvent": "pointerExit",
173-
"FlPointerHoverEvent": "pointerHover",
174-
"FlPanCancelEvent": "panCancel",
175-
"FlPanDownEvent": "panDown",
176-
"FlPanEndEvent": "panEnd",
177-
"FlPanStartEvent": "panStart",
178-
"FlPanUpdateEvent": "panUpdate",
179-
"FlLongPressEnd": "longPressEnd",
180-
"FlLongPressMoveUpdate": "longPressMoveUpdate",
181-
"FlLongPressStart": "longPressStart",
182-
"FlTapCancelEvent": "tapCancel",
183-
"FlTapDownEvent": "tapDown",
184-
"FlTapUpEvent": "tapUp",
185-
};
170+
String resolveFlTouchEventType(FlTouchEvent event) {
171+
if (event is FlPointerEnterEvent) return "pointerEnter";
172+
if (event is FlPointerExitEvent) return "pointerExit";
173+
if (event is FlPointerHoverEvent) return "pointerHover";
174+
if (event is FlPanCancelEvent) return "panCancel";
175+
if (event is FlPanDownEvent) return "panDown";
176+
if (event is FlPanEndEvent) return "panEnd";
177+
if (event is FlPanStartEvent) return "panStart";
178+
if (event is FlPanUpdateEvent) return "panUpdate";
179+
if (event is FlLongPressEnd) return "longPressEnd";
180+
if (event is FlLongPressMoveUpdate) return "longPressMoveUpdate";
181+
if (event is FlLongPressStart) return "longPressStart";
182+
if (event is FlTapCancelEvent) return "tapCancel";
183+
if (event is FlTapDownEvent) return "tapDown";
184+
if (event is FlTapUpEvent) return "tapUp";
185+
return "undefined";
186+
}

sdk/python/packages/flet-charts/src/flutter/flet_charts/lib/src/utils/line_chart.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class LineChartEventData extends Equatable {
1414
factory LineChartEventData.fromDetails(
1515
FlTouchEvent event, LineTouchResponse? response) {
1616
return LineChartEventData(
17-
eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
17+
eventType: resolveFlTouchEventType(event),
1818
barSpots: response != null && response.lineBarSpots != null
1919
? response.lineBarSpots!
2020
.map((bs) => LineChartEventDataSpot(

sdk/python/packages/flet-charts/src/flutter/flet_charts/lib/src/utils/pie_chart.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class PieChartEventData extends Equatable {
1818
factory PieChartEventData.fromDetails(
1919
FlTouchEvent event, PieTouchResponse? response) {
2020
return PieChartEventData(
21-
eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
21+
eventType: resolveFlTouchEventType(event),
2222
sectionIndex: response?.touchedSection?.touchedSectionIndex,
2323
localPosition: event.localPosition,
2424
);

sdk/python/packages/flet-charts/src/flutter/flet_charts/lib/src/utils/radar_chart.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class RadarChartEventData extends Equatable {
3131
final touchedSpot = response?.touchedSpot;
3232

3333
return RadarChartEventData(
34-
eventType: eventMap[event.runtimeType.toString()] ?? "undefined",
34+
eventType: resolveFlTouchEventType(event),
3535
dataSetIndex: touchedSpot?.touchedDataSetIndex,
3636
entryIndex: touchedSpot?.touchedRadarEntryIndex,
3737
entryValue: touchedSpot?.touchedRadarEntry.value,

0 commit comments

Comments
 (0)