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

Fix needle gap #261

Merged
merged 14 commits into from
May 6, 2024
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 1.0.3

**Fixes**

- Fixed Drawing of `Pointer` over `valueBar`


## 1.0.2

**Features**
Expand Down
33 changes: 32 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ This will add a line like this to your package's pubspec.yaml (and run an implic

```dart
dependencies:
geekyants_flutter_gauges: 1.0.1
geekyants_flutter_gauges: 1.0.2
```

## Usage
Expand All @@ -77,6 +77,8 @@ import 'package:geekyants_flutter_gauges/geekyants_flutter_gauges.dart';

Use it as below

# Linear Gauge usage

```dart
class _MyGaugeExampleState extends State<MyGaugeExample> {
@override
Expand All @@ -94,6 +96,31 @@ class _MyGaugeExampleState extends State<MyGaugeExample> {
}
```

# Radial Gauge usage

```dart
class _MyGaugeExampleState extends State<MyGaugeExample> {
@override
Widget build(BuildContext context) {
return Scaffold(
body: Center(
child: RadialGauge(
track: RadialTrack(
start: 0,
end: 100,
),
needlePointer: [
NeedlePointer(
value: 30,
),
],
),
)
);
}
}
```

## Linear Gauge

### **Gauge Orientation**:
Expand Down Expand Up @@ -224,3 +251,7 @@ In the Radial Gauge, the `NeedlePointer` and `RadialShapePointer` can be set to
## Credits

Made with ❤️ by <a href="https://geekyants.com/" ><img src="https://s3.ap-southeast-1.amazonaws.com/cdn.elitmus.com/sy0zfezmfdovlb4vaz6siv1l7g30" height="17"/></a>

```

```
50 changes: 30 additions & 20 deletions example/lib/gauge_vertical.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,36 @@ class _MyVerticalGaugeState extends State<MyVerticalGauge> {
return Scaffold(
body: Center(
child: Padding(
padding: const EdgeInsets.all(2.0),
child: LinearGauge(
linearGaugeBoxDecoration: const LinearGaugeBoxDecoration(
thickness: 30,
borderRadius: 10,
),
// enableAnimation: true,
gaugeOrientation: GaugeOrientation.horizontal,
rulers: RulerStyle(
primaryRulersWidth: 10,
primaryRulersHeight: 30,
primaryRulerColor: const Color(0xff310072),
inverseRulers: false,
showLabel: false,
showSecondaryRulers: false,
showPrimaryRulers: true,
rulerPosition: RulerPosition.center,
),
),
),
padding: const EdgeInsets.all(2.0),
child: LinearGauge(
end: 126,
gaugeOrientation: GaugeOrientation.vertical,
rulers: RulerStyle(
rulerPosition: RulerPosition.right,
),
pointers: const [
Pointer(
value: 50,
height: 20,
color: Colors.green,
width: 20,
shape: PointerShape.triangle,
isInteractive: true,
onChanged: null,
pointerPosition: PointerPosition.left,
),
],
curves: const [
CustomCurve(
startHeight: 4,
endHeight: 50,
midHeight: 5,
curvePosition: CurvePosition.left,
end: 126,
midPoint: 50 * 0.8,
),
],
)),
),
);
}
Expand Down
17 changes: 5 additions & 12 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import 'package:example/gauge_vertical.dart';
import 'package:flutter/material.dart';
import 'package:geekyants_flutter_gauges/geekyants_flutter_gauges.dart';

void main() {
runApp(
const MaterialApp(
debugShowCheckedModeBanner: false,
home: RadialGaugeExample(),
home: MyVerticalGauge(),
),
);
}
Expand Down Expand Up @@ -63,20 +64,12 @@ class _RadialGaugeExampleState extends State<RadialGaugeExample> {
backgroundColor: Colors.white,
body: RadialGauge(
track: RadialTrack(
color: Colors.grey,
start: 0,
end: 100,
trackStyle: TrackStyle(
showLastLabel: false,
secondaryRulerColor: Colors.grey,
secondaryRulerPerInterval: 3)),
start: 0,
end: 100,
),
needlePointer: [
NeedlePointer(
value: 30,
color: Colors.red,
tailColor: Colors.black,
tailRadius: 0,
needleStyle: NeedleStyle.flatNeedle,
),
],
),
Expand Down
2 changes: 1 addition & 1 deletion example/macos/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "";
TargetAttributes = {
33CC10EC2044A3C60003C045 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
38 changes: 19 additions & 19 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
url: "https://pub.dev"
source: hosted
version: "1.17.1"
version: "1.17.2"
cupertino_icons:
dependency: "direct main"
description:
Expand Down Expand Up @@ -82,14 +82,6 @@ packages:
relative: true
source: path
version: "1.0.2"
js:
dependency: transitive
description:
name: js
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
url: "https://pub.dev"
source: hosted
version: "0.6.7"
lints:
dependency: transitive
description:
Expand All @@ -102,18 +94,18 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev"
source: hosted
version: "0.12.15"
version: "0.12.16"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
version: "0.5.0"
meta:
dependency: transitive
description:
Expand All @@ -139,10 +131,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.0"
stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -179,10 +171,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
version: "0.6.0"
vector_math:
dependency: transitive
description:
Expand All @@ -191,6 +183,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
web:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
sdks:
dart: ">=3.0.0-0 <4.0.0"
dart: ">=3.1.0-185.0.dev <4.0.0"
flutter: ">=1.17.0"
1 change: 0 additions & 1 deletion lib/src/linear_gauge/custom_label/custom_ruler_label.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
/// ```
///
///

class CustomRulerLabel {
const CustomRulerLabel({
required this.text,
Expand Down
11 changes: 5 additions & 6 deletions lib/src/linear_gauge/linear_gauge.dart
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,11 @@ class _LinearGauge extends State<LinearGauge> with TickerProviderStateMixin {
}
}

if (widget.curves != null && widget.curves!.isNotEmpty) {
for (final CustomCurve curve in widget.curves!) {
_addChild(curve, null, null);
}
}
if (widget.pointers != null && widget.pointers!.isNotEmpty) {
for (final dynamic pointer in widget.pointers!) {
_addChild(
Expand All @@ -655,12 +660,6 @@ class _LinearGauge extends State<LinearGauge> with TickerProviderStateMixin {
}
}

if (widget.curves != null && widget.curves!.isNotEmpty) {
for (final CustomCurve curve in widget.curves!) {
_addChild(curve, null, null);
}
}

return _linearGaugeWidgets;
}

Expand Down
1 change: 1 addition & 0 deletions lib/src/radial_gauge/pointer/needle_pointer_painter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ class RenderNeedlePointer extends RenderBox {

final needlePaint = Paint()
..color = _color
..style = PaintingStyle.fill
..strokeWidth = strokeWidth
..shader = gradient.createShader(
Rect.fromPoints(
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: geekyants_flutter_gauges
description: A linear gauge package for Flutter that displays progress
and can be customized for appearance and behavior.
version: 1.0.2
version: 1.0.3
homepage: https://github.com/GeekyAnts/GaugesFlutter

environment:
Expand Down
Loading