Speech Profile Page Improvements #971
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| import 'package:flutter/material.dart'; | ||
|
|
||
| class ProgressBarWithPercentage extends StatefulWidget { | ||
| final double progressValue; | ||
|
|
||
| const ProgressBarWithPercentage({super.key, required this.progressValue}); | ||
|
There was a problem hiding this comment.
The - const ProgressBarWithPercentage({super.key, required this.progressValue});
+ const ProgressBarWithPercentage({Key? key, required this.progressValue}) : super(key: key); |
||
| @override | ||
| _ProgressBarWithPercentageState createState() => _ProgressBarWithPercentageState(); | ||
| } | ||
|
|
||
| class _ProgressBarWithPercentageState extends State<ProgressBarWithPercentage> { | ||
| @override | ||
| Widget build(BuildContext context) { | ||
| return SizedBox( | ||
| height: 60, | ||
| width: 400, | ||
| child: Column( | ||
| crossAxisAlignment: CrossAxisAlignment.center, | ||
| mainAxisAlignment: MainAxisAlignment.end, | ||
| mainAxisSize: MainAxisSize.min, | ||
| children: [ | ||
| SizedBox( | ||
| height: 46, | ||
| child: Stack( | ||
| children: [ | ||
| Positioned( | ||
| left: widget.progressValue * (400 - 122), | ||
| child: ProgressBubble( | ||
| content: '${(widget.progressValue * 100).toInt()}%', | ||
| ), | ||
| ), | ||
| ], | ||
| ), | ||
| ), | ||
| SizedBox( | ||
| width: 300, | ||
| height: 8, | ||
| child: ClipRRect( | ||
| borderRadius: const BorderRadius.all(Radius.circular(10)), | ||
| child: LinearProgressIndicator( | ||
| value: widget.progressValue, | ||
| backgroundColor: Colors.grey.shade300, | ||
| valueColor: const AlwaysStoppedAnimation<Color>(Colors.deepPurple), | ||
| ), | ||
| ), | ||
| ), | ||
| ], | ||
| ), | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| class TrianglePainter extends CustomPainter { | ||
| final Color color; | ||
| final Color shadowColor; | ||
| final double triangleHeight; | ||
| final double triangleBaseWidth; | ||
|
|
||
| TrianglePainter({ | ||
| required this.color, | ||
| required this.shadowColor, | ||
| this.triangleHeight = 10.0, // Default height | ||
| this.triangleBaseWidth = 10.0, // Default base width | ||
| }); | ||
|
|
||
| @override | ||
| void paint(Canvas canvas, Size size) { | ||
| final paint = Paint() | ||
| ..color = color | ||
| ..style = PaintingStyle.fill; | ||
|
|
||
| final trianglePath = Path() | ||
| // Move to the left point of the base of the triangle | ||
| ..moveTo(size.width / 2 - triangleBaseWidth / 2, 0) | ||
| // Draw a line to the right point of the base | ||
| ..lineTo(size.width / 2 + triangleBaseWidth / 2, 0) | ||
| // Draw a line to the tip of the triangle (height) | ||
| ..lineTo(size.width / 2, triangleHeight) | ||
| ..close(); | ||
|
|
||
| // Draw triangle | ||
| canvas.drawPath(trianglePath, paint); | ||
| } | ||
|
|
||
| @override | ||
| bool shouldRepaint(covariant CustomPainter oldDelegate) => false; | ||
|
There was a problem hiding this comment.
The - bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+ bool shouldRepaint(covariant TrianglePainter oldDelegate) {
+ return oldDelegate.color != color ||
+ oldDelegate.shadowColor != shadowColor ||
+ oldDelegate.triangleHeight != triangleHeight ||
+ oldDelegate.triangleBaseWidth != triangleBaseWidth;
+ } |
||
| } | ||
|
Comment on lines
+56
to
+90
There was a problem hiding this comment.
In the @override
-89: bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+89: bool shouldRepaint(covariant TrianglePainter oldDelegate) {
+90: return oldDelegate.color != color ||
+91: oldDelegate.shadowColor != shadowColor ||
+92: oldDelegate.triangleHeight != triangleHeight ||
+93: oldDelegate.triangleBaseWidth != triangleBaseWidth;
+94: } |
||
|
|
||
| class ProgressBubble extends StatelessWidget { | ||
| final String content; | ||
| final double triangleHeight; | ||
|
|
||
| const ProgressBubble({ | ||
| super.key, | ||
| required this.content, | ||
| this.triangleHeight = 10, | ||
| }); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return Column( | ||
| mainAxisSize: MainAxisSize.min, | ||
| children: [ | ||
| Container( | ||
| // margin: const EdgeInsets.symmetric(horizontal: 16), | ||
| decoration: BoxDecoration( | ||
| color: Colors.white, | ||
| borderRadius: BorderRadius.circular(12), | ||
| ), | ||
| child: Padding( | ||
| padding: const EdgeInsets.all(10), | ||
| child: Text( | ||
| content, | ||
| style: const TextStyle( | ||
| fontSize: 14, | ||
| color: Colors.grey, | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| CustomPaint( | ||
| painter: TrianglePainter( | ||
| color: Colors.white, | ||
| shadowColor: Colors.grey.withOpacity(0.5), | ||
| ), | ||
| size: Size(10, triangleHeight), | ||
| ), | ||
| ], | ||
| ); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The import of
percentage_bar_progress.dartis new. Ensure that this file exists and is accessible from the current file's location. If it doesn't exist or isn't accessible, it will cause a compilation error.+ import 'package:friend_private/pages/speech_profile/percentage_bar_progress.dart';