diff --git a/lib/view/widgets/gauge_widget.dart b/lib/view/widgets/gauge_widget.dart index 6dd9d5270..2ad899085 100644 --- a/lib/view/widgets/gauge_widget.dart +++ b/lib/view/widgets/gauge_widget.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:girix_code_gauge/girix_code_gauge.dart'; +import 'package:gx_gauge/gx_gauge.dart'; import 'package:pslab/theme/colors.dart'; class InstrumentGauge extends StatelessWidget { @@ -30,34 +30,34 @@ class InstrumentGauge extends StatelessWidget { alignment: Alignment.center, children: [ GxRadialGauge( - value: GaugeValue( + value: GxGaugeValue( value: clampedValue.toDouble(), min: minValue.toDouble(), max: maxValue.toDouble()), - size: Size(size.toDouble(), size.toDouble()), + diameter: size.toDouble(), startAngleInDegree: 140.0, sweepAngleInDegree: 260.0, showValueAtCenter: false, showMajorTicks: true, showLabels: true, - interval: interval, - labelTickStyle: const RadialTickLabelStyle( + interval: interval.toDouble(), + labelTickStyle: const GxRadialTickLabelStyle( padding: 22, - position: RadialElementPosition.outside, + position: GxRadialElementPosition.outside, style: TextStyle( fontSize: 8, color: Colors.black87, fontWeight: FontWeight.w500, ), ), - majorTickStyle: RadialTickStyle( + majorTickStyle: GxRadialTickStyle( color: Colors.blueGrey.shade300, thickness: 2, length: 12, - position: RadialElementPosition.outside, - alignment: RadialElementAlignment.start, + position: GxRadialElementPosition.outside, + alignment: GxRadialElementAlignment.start, ), - style: const RadialGaugeStyle( + style: const GxRadialGaugeStyle( color: Color(0xFFEEEEEE), thickness: 15, gradient: LinearGradient( @@ -71,12 +71,12 @@ class InstrumentGauge extends StatelessWidget { ), ), showNeedle: true, - needle: const RadialNeedle( + needle: const GxRadialNeedle( color: Color(0xFF424242), - shape: RadialNeedleShape.tapperedLine, + shape: GxRadialNeedleShape.taperedLine, thickness: 8, - alignment: RadialElementAlignment.end, - circle: NeedleCircle( + alignment: GxRadialElementAlignment.end, + cap: GxNeedleCap( radius: 8, innerColor: Colors.black87, paintingStyle: PaintingStyle.fill, diff --git a/pubspec.lock b/pubspec.lock index c89a4617e..583f2174b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -647,14 +647,6 @@ packages: url: "https://pub.dev" source: hosted version: "9.3.0" - girix_code_gauge: - dependency: "direct main" - description: - name: girix_code_gauge - sha256: f1505ef49dacff948d051cad3883fe73b089fe868bf7313e56f99969309e7121 - url: "https://pub.dev" - source: hosted - version: "0.0.6" glob: dependency: transitive description: @@ -687,6 +679,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.8" + gx_gauge: + dependency: "direct main" + description: + name: gx_gauge + sha256: "0d5df416d93eedfc7f2950e70be8781e25365bd858c930bb442c5eb0fb4ebea0" + url: "https://pub.dev" + source: hosted + version: "1.0.1" home_widget: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index b52297182..0eed986a1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -50,7 +50,6 @@ dependencies: mp_audio_stream: ^0.3.0 ffi: ^2.2.0 home_widget: ^0.10.0 - girix_code_gauge: ^0.0.6 image_picker: ^1.2.3 rust_lib_pslab: path: rust_builder @@ -61,6 +60,7 @@ dependencies: freezed_annotation: ^3.1.0 archive: ^4.3.0 http: ^1.6.0 + gx_gauge: ^1.0.1 dev_dependencies: flutter_launcher_icons: ^0.14.1 flutter_test: