Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Flutter packages #3719

Merged
merged 12 commits into from
Aug 5, 2024
40 changes: 20 additions & 20 deletions client/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ packages:
dependency: transitive
description:
name: file_picker
sha256: "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a"
sha256: "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258"
url: "https://pub.dev"
source: hosted
version: "8.0.3"
version: "8.0.6"
fixnum:
dependency: transitive
description:
Expand All @@ -229,10 +229,10 @@ packages:
dependency: transitive
description:
name: fl_chart
sha256: "5a74434cc83bf64346efb562f1a06eefaf1bcb530dc3d96a104f631a1eff8d79"
sha256: d0f0d49112f2f4b192481c16d05b6418bd7820e021e265a3c22db98acf7ed7fb
url: "https://pub.dev"
source: hosted
version: "0.65.0"
version: "0.68.0"
flet:
dependency: "direct main"
description:
Expand Down Expand Up @@ -361,10 +361,10 @@ packages:
dependency: transitive
description:
name: flutter_markdown
sha256: "21b085a1c185e46701373866144ced56cfb7a0c33f63c916bb8fe2d0c1491278"
sha256: "2e8a801b1ded5ea001a4529c97b1f213dcb11c6b20668e081cafb23468593514"
url: "https://pub.dev"
source: hosted
version: "0.6.19"
version: "0.7.3"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
Expand Down Expand Up @@ -893,26 +893,26 @@ packages:
dependency: transitive
description:
name: record
sha256: "5c8e12c692a4800b33f5f8b6c821ea083b12bfdbd031b36ba9322c40a4eeecc9"
sha256: "4a5cf4d083d1ee49e0878823c4397d073f8eb0a775f31215d388e2bc47a9e867"
url: "https://pub.dev"
source: hosted
version: "5.0.4"
version: "5.1.2"
record_android:
dependency: transitive
description:
name: record_android
sha256: "805ecaa232a671aff2ee9ec4730ef6addb97c548d2db6b1fbd5197f1d4f47a5a"
sha256: "9ccf6a206dc72b486cf37893690e70c17610e8f05dba8da1a808e73dc2f49a04"
url: "https://pub.dev"
source: hosted
version: "1.0.4"
version: "1.2.4"
record_darwin:
dependency: transitive
description:
name: record_darwin
sha256: ee8cb1bb1712d7ce38140ecabe70e5c286c02f05296d66043bee865ace7eb1b9
sha256: b038c26d1066eb81f4e7433bfb85f0d450ca3fac0002a7216b83a21b775ecf21
url: "https://pub.dev"
source: hosted
version: "1.0.1"
version: "1.1.1"
record_linux:
dependency: transitive
description:
Expand All @@ -925,10 +925,10 @@ packages:
dependency: transitive
description:
name: record_platform_interface
sha256: "3a4b56e94ecd2a0b2b43eb1fa6f94c5b8484334f5d38ef43959c4bf97fb374cf"
sha256: "11f8b03ea8a0e279b0e306571dbe0db0202c0b8e866495c9fa1ad2281d5e4c15"
url: "https://pub.dev"
source: hosted
version: "1.0.2"
version: "1.1.0"
record_web:
dependency: transitive
description:
Expand Down Expand Up @@ -1053,10 +1053,10 @@ packages:
dependency: transitive
description:
name: shared_preferences
sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180
url: "https://pub.dev"
source: hosted
version: "2.2.2"
version: "2.2.3"
shared_preferences_android:
dependency: transitive
description:
Expand Down Expand Up @@ -1426,10 +1426,10 @@ packages:
dependency: transitive
description:
name: win32
sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
url: "https://pub.dev"
source: hosted
version: "5.2.0"
version: "5.5.1"
window_manager:
dependency: transitive
description:
Expand Down Expand Up @@ -1479,5 +1479,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.3.0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
dart: ">=3.4.0 <4.0.0"
flutter: ">=3.19.0"
2 changes: 1 addition & 1 deletion packages/flet/lib/flet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export 'src/utils/others.dart';
export 'src/utils/platform_utils_non_web.dart'
if (dart.library.js) "src/utils/platform_utils_web.dart";
export 'src/utils/responsive.dart';
export 'src/utils/shadows.dart';
export 'src/utils/box.dart';
export 'src/utils/strings.dart';
export 'src/utils/text.dart';
export 'src/utils/textfield.dart';
Expand Down
33 changes: 31 additions & 2 deletions packages/flet/lib/src/controls/barchart.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,22 @@ import '../models/control.dart';
import '../utils/animations.dart';
import '../utils/borders.dart';
import '../utils/charts.dart';
import '../utils/edge_insets.dart';
import '../utils/gradient.dart';
import '../utils/text.dart';
import 'charts.dart';
import 'create_control.dart';

TooltipDirection? parseTooltipDirection(String? value,
[TooltipDirection? defValue]) {
if (value == null) {
return defValue;
}
return TooltipDirection.values.firstWhereOrNull(
(e) => e.name.toLowerCase() == value.toLowerCase()) ??
defValue;
}

class BarChartEventData extends Equatable {
final String eventType;
final int? groupIndex;
Expand Down Expand Up @@ -229,8 +240,26 @@ class _BarChartControlState extends State<BarChartControl> {
barTouchData: BarTouchData(
enabled: interactive,
touchTooltipData: BarTouchTooltipData(
tooltipBgColor:
widget.control.attrColor("tooltipBgColor", context),
getTooltipColor: (BarChartGroupData group) => widget.control
.attrColor("tooltipBgColor", context,
Theme.of(context).colorScheme.secondary)!,
tooltipRoundedRadius:
widget.control.attrDouble("tooltipRoundedRadius"),
tooltipMargin: widget.control.attrDouble("tooltipMargin"),
tooltipPadding:
parseEdgeInsets(widget.control, "tooltipPadding"),
maxContentWidth: widget.control.attrDouble("tooltipMaxWidth"),
rotateAngle: widget.control.attrDouble("tooltipRotateAngle"),
tooltipHorizontalOffset:
widget.control.attrDouble("tooltipHorizontalOffset"),
tooltipBorder: parseBorderSide(
Theme.of(context), widget.control, "tooltipBorderSide"),
fitInsideHorizontally:
widget.control.attrBool("tooltipFitInsideHorizontally"),
fitInsideVertically:
widget.control.attrBool("tooltipFitInsideVertically"),
direction: parseTooltipDirection(
widget.control.attrString("tooltipDirection")),
getTooltipItem: (group, groupIndex, rod, rodIndex) {
var dp = viewModel.barGroups[groupIndex].barRods[rodIndex];

Expand Down
2 changes: 1 addition & 1 deletion packages/flet/lib/src/controls/container.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import '../models/control.dart';
import '../utils/alignment.dart';
import '../utils/animations.dart';
import '../utils/borders.dart';
import '../utils/box.dart';
import '../utils/edge_insets.dart';
import '../utils/gradient.dart';
import '../utils/images.dart';
import '../utils/launch_url.dart';
import '../utils/others.dart';
import '../utils/shadows.dart';
import 'create_control.dart';
import 'error.dart';
import 'flet_store_mixin.dart';
Expand Down
2 changes: 2 additions & 0 deletions packages/flet/lib/src/controls/create_control.dart
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@ Widget createWidget(
key: key,
parent: parent,
control: controlView.control,
children: controlView.children,
parentDisabled: parentDisabled,
backend: backend);
case "fletapp":
return FletAppControl(
Expand Down
2 changes: 1 addition & 1 deletion packages/flet/lib/src/controls/cupertino_textfield.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import 'package:flutter/services.dart';
import '../flet_control_backend.dart';
import '../models/control.dart';
import '../utils/borders.dart';
import '../utils/box.dart';
import '../utils/form_field.dart';
import '../utils/gradient.dart';
import '../utils/images.dart';
import '../utils/shadows.dart';
import '../utils/text.dart';
import '../utils/textfield.dart';
import 'create_control.dart';
Expand Down
33 changes: 29 additions & 4 deletions packages/flet/lib/src/controls/linechart.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ import '../models/app_state.dart';
import '../models/control.dart';
import '../utils/animations.dart';
import '../utils/borders.dart';
import '../utils/box.dart';
import '../utils/charts.dart';
import '../utils/colors.dart';
import '../utils/edge_insets.dart';
import '../utils/gradient.dart';
import '../utils/numbers.dart';
import '../utils/shadows.dart';
import '../utils/text.dart';
import 'charts.dart';
import 'create_control.dart';
Expand Down Expand Up @@ -324,9 +325,33 @@ class _LineChartControlState extends State<LineChartControl> {
}).toList();
},
touchTooltipData: LineTouchTooltipData(
tooltipBgColor:
widget.control.attrColor("tooltipBgColor", context) ??
const Color.fromRGBO(96, 125, 139, 1),
getTooltipColor: (LineBarSpot spot) => widget.control
.attrColor("tooltipBgColor", context,
const Color.fromRGBO(96, 125, 139, 1))!,
tooltipRoundedRadius:
widget.control.attrDouble("tooltipRoundedRadius", 4)!,
tooltipMargin:
widget.control.attrDouble("tooltipMargin", 16)!,
tooltipPadding: parseEdgeInsets(
widget.control,
"tooltipPadding",
const EdgeInsets.symmetric(
horizontal: 16, vertical: 8))!,
maxContentWidth: widget.control
.attrDouble("tooltipMaxContentWidth", 120)!,
rotateAngle:
widget.control.attrDouble("tooltipRotateAngle", 0.0)!,
tooltipHorizontalOffset: widget.control
.attrDouble("tooltipHorizontalOffset", 0)!,
tooltipBorder: parseBorderSide(Theme.of(context),
widget.control, "tooltipBorderSide") ??
BorderSide.none,
fitInsideHorizontally: widget.control
.attrBool("tooltipFitInsideHorizontally", false)!,
fitInsideVertically: widget.control
.attrBool("tooltipFitInsideVertically", false)!,
showOnTopOfTheChartBoxArea: widget.control
.attrBool("tooltipShowOnTopOfChartBoxArea", false)!,
getTooltipItems: (touchedSpots) {
return touchedSpots.map((spot) {
var dp = viewModel.dataSeries[spot.barIndex]
Expand Down
Loading