Commit be64cbc3 authored by Stefan Haslinger's avatar Stefan Haslinger

tweaking bargraphs to be more decent

parent 3ca5ec0d
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_secure_storage","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"path_provider","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.8/","dependencies":[]},{"name":"shared_preferences","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+2/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"uni_links","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.4.7/","dependencies":[]}],"android":[{"name":"flutter_secure_storage","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"path_provider","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.8/","dependencies":[]},{"name":"shared_preferences","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+2/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"uni_links","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.4.7/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+2/","dependencies":[]},{"name":"shared_preferences_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+8/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"url_launcher_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-0.0.1+5/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+5/","dependencies":[]},{"name":"url_launcher_web","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-0.1.1+5/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_secure_storage","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos"]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]}],"date_created":"2020-06-06 07:55:46.592738","version":"1.17.0-4.0.pre.7"}
\ No newline at end of file
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_secure_storage","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"path_provider","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.8/","dependencies":[]},{"name":"shared_preferences","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+2/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"uni_links","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.4.7/","dependencies":[]}],"android":[{"name":"flutter_secure_storage","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"path_provider","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.8/","dependencies":[]},{"name":"shared_preferences","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+2/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"uni_links","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.4.7/","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+2/","dependencies":[]},{"name":"shared_preferences_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+8/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+1/","dependencies":[]},{"name":"url_launcher_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-0.0.1+5/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+5/","dependencies":[]},{"name":"url_launcher_web","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-0.1.1+5/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_secure_storage","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos"]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]}],"date_created":"2020-06-06 08:46:23.411056","version":"1.17.0-4.0.pre.7"}
\ No newline at end of file
......@@ -18,7 +18,7 @@ class BarChartPainter extends CustomPainter {
final double value;
final double maximum;
final double minimum;
final double strokeWidth = 1;
final double strokeWidth = 0.5;
final List<BarZone> barZones;
bool showPercentage = false;
......@@ -35,7 +35,7 @@ class BarChartPainter extends CustomPainter {
Offset(width - strokeWidth / 2, height - strokeWidth / 2),
),
Paint()
..color = MyColor.darkGray
..color = MyColor.lightGray
..style = PaintingStyle.stroke
..strokeWidth = strokeWidth,
);
......
......@@ -41,8 +41,10 @@ class _ActivityBarGraphWidgetState extends State<ActivityBarGraphWidget> {
@override
Widget build(BuildContext context) {
if (_powerZones.isNotEmpty && _laps.isNotEmpty) {
return SingleChildScrollView(scrollDirection: Axis.horizontal,
child: Container(width: 500,
return SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Container(
width: 500,
child: ListView(padding: const EdgeInsets.all(20), children: <Widget>[
Table(columnWidths: const <int, TableColumnWidth>{
0: FixedColumnWidth(60),
......@@ -62,12 +64,14 @@ class _ActivityBarGraphWidgetState extends State<ActivityBarGraphWidget> {
const Text('Activity'),
MyBarChart(
width: 150,
height: 20,
value: widget.activity.db.avgPower,
powerZones: _powerZones,
),
Text(widget.activity.db.avgPower.toStringAsFixed(1)),
MyBarChart(
width: 150,
height: 20,
value: widget.activity.db.avgHeartRate,
heartRateZones: _heartRateZones,
),
......@@ -78,12 +82,14 @@ class _ActivityBarGraphWidgetState extends State<ActivityBarGraphWidget> {
Text('Lap ' + lap.index.toString()),
MyBarChart(
width: 150,
height: 20,
value: lap.db.avgPower,
powerZones: _powerZones,
),
Text(lap.db.avgPower.toStringAsFixed(1)),
MyBarChart(
width: 150,
height: 20,
value: lap.db.avgHeartRate,
heartRateZones: _heartRateZones,
),
......@@ -104,17 +110,25 @@ class _ActivityBarGraphWidgetState extends State<ActivityBarGraphWidget> {
TableRow(children: <Widget>[
const Text('Activity'),
MyBarChart.visualizeDistributions(
distributions: _heartRateDistributions),
height: 20,
distributions: _heartRateDistributions,
),
MyBarChart.visualizeDistributions(
distributions: _powerDistributions),
height: 20,
distributions: _powerDistributions,
),
]),
for (Lap lap in _laps)
TableRow(children: <Widget>[
Text('Lap ' + lap.index.toString()),
MyBarChart.visualizeDistributions(
distributions: lap.powerDistributions),
height: 20,
distributions: lap.powerDistributions,
),
MyBarChart.visualizeDistributions(
distributions: lap.heartRateDistributions),
height: 20,
distributions: lap.heartRateDistributions,
),
]),
]),
const SizedBox(height: 40),
......@@ -131,6 +145,7 @@ class _ActivityBarGraphWidgetState extends State<ActivityBarGraphWidget> {
TableRow(children: <Widget>[
const Text('Activity'),
MyBarChart(
height: 20,
value: widget.activity.db.avgSpeed.toPaceDouble(),
maximum: 700,
),
......@@ -140,6 +155,7 @@ class _ActivityBarGraphWidgetState extends State<ActivityBarGraphWidget> {
TableRow(children: <Widget>[
Text('Lap ' + lap.index.toString()),
MyBarChart(
height: 20,
value: lap.db.avgSpeed.toPaceDouble(),
maximum: 700,
),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment