Skip to content

Commit

Permalink
Make MeasurementChartWidgetFl work
Browse files Browse the repository at this point in the history 
This still doesn't look completely nice, but it's a good start
  • Loading branch information
@rolandgeider
rolandgeider committed Oct 1, 2023
1 parent 84ccc67 commit ef5a708
Show file tree
Hide file tree
Showing 10 changed files with 175 additions and 122 deletions.
2 changes: 1 addition & 1 deletion ios/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ SPEC CHECKSUMS:
image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
rive_common: 60ae7896ab40f9513974f36f015de33f70d2c5c5
rive_common: b5b1aa30c63b8f0f00f32cddc9ea394d3d3473b5
shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
Expand Down
5 changes: 2 additions & 3 deletions lib/exceptions/http_exception.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,11 @@ class WgerHttpException implements Exception {
errors = {'unknown_error': 'An unknown error occurred, no further information available'};
} else {
try {
errors = json.decode(responseBody);
errors = {'unknown_error': json.decode(responseBody)};
} catch (e) {
errors = responseBody;
errors = {'unknown_error': responseBody};
}
}
errors = errors;
}

@override
Expand Down
132 changes: 101 additions & 31 deletions lib/widgets/core/charts.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,50 +16,120 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import 'package:charts_flutter/flutter.dart' as charts;
import 'package:fl_chart/fl_chart.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:intl/intl.dart';
import 'package:wger/theme/theme.dart';

class MeasurementChartEntry {
num value;
DateTime date;

MeasurementChartEntry(this.value, this.date);
}

/// Weight chart widget
class MeasurementChartWidget extends StatelessWidget {
class MeasurementChartWidgetFl extends StatefulWidget {
final List<MeasurementChartEntry> _entries;
final String unit;

/// [_entries] is a list of [MeasurementChartEntry]
const MeasurementChartWidget(this._entries, {this.unit = 'kg'});
const MeasurementChartWidgetFl(this._entries, {this.unit = 'kg'});

@override
Widget build(BuildContext context) {
final unitTickFormatter = charts.BasicNumericTickFormatterSpec((num? value) => '$value $unit');
State<MeasurementChartWidgetFl> createState() => _MeasurementChartWidgetFlState();
}

return charts.TimeSeriesChart(
[
charts.Series<MeasurementChartEntry, DateTime>(
id: 'Measurement',
colorFn: (_, __) => wgerChartSecondaryColor,
domainFn: (MeasurementChartEntry entry, _) => entry.date,
class _MeasurementChartWidgetFlState extends State<MeasurementChartWidgetFl> {
final interval = 15 * Duration.millisecondsPerDay / 1000 / 60;

// expression body => same as above(arrow expression)
//domainFn: (MeasurementChartEntry entry, _){ return entry.date;} ,
measureFn: (MeasurementChartEntry entry, _) => entry.value,
data: _entries,
)
],
defaultRenderer: charts.LineRendererConfig(includePoints: true),
primaryMeasureAxis: charts.NumericAxisSpec(
tickProviderSpec: const charts.BasicNumericTickProviderSpec(zeroBound: false),
tickFormatterSpec: unitTickFormatter,
@override
Widget build(BuildContext context) {
return AspectRatio(
aspectRatio: 1.70,
child: Padding(
padding: const EdgeInsets.only(
right: 18,
left: 12,
top: 24,
bottom: 12,
),
child: LineChart(
mainData(),
),
),
);
}

LineChartData mainData() {
return LineChartData(
// minY: 75,
// maxY: 90,
gridData: FlGridData(
show: true,
drawVerticalLine: true,
//horizontalInterval: 1,
//verticalInterval: interval,
getDrawingHorizontalLine: (value) {
return FlLine(
color: Colors.grey,
strokeWidth: 1,
);
},
getDrawingVerticalLine: (value) {
return FlLine(
color: Colors.grey,
strokeWidth: 1,
);
},
),
titlesData: FlTitlesData(
show: true,
rightTitles: AxisTitles(
sideTitles: SideTitles(showTitles: false),
),
topTitles: AxisTitles(
sideTitles: SideTitles(showTitles: false),
),
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
getTitlesWidget: (value, meta) {
final DateTime date = DateTime.fromMillisecondsSinceEpoch(value.toInt() * 1000 * 60);
return Text(DateFormat.yMd().format(date));
},
interval: interval,
),
),
leftTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
// interval: 1,
//interval: interval,
//getTitlesWidget: leftTitleWidgets,
reservedSize: 42,
),
),
),
borderData: FlBorderData(
show: true,
border: Border.all(color: const Color(0xff37434d)),
),
lineBarsData: [
LineChartBarData(
spots: [
...widget._entries
.map((e) => FlSpot(e.date.millisecondsSinceEpoch / 1000 / 60, e.value.toDouble()))
],
isCurved: false,
color: wgerSecondaryColor,
barWidth: 2,
isStrokeCapRound: true,
dotData: FlDotData(
show: true,
),
),
],
);
}
}

class MeasurementChartEntry {
num value;
DateTime date;

MeasurementChartEntry(this.value, this.date);
}

// // #TODO : Del Later /// test state less >> del later
Expand Down
135 changes: 57 additions & 78 deletions lib/widgets/dashboard/widgets.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ import 'package:wger/widgets/nutrition/forms.dart';
import 'package:wger/widgets/weight/forms.dart';
import 'package:wger/widgets/workouts/forms.dart';

// line chart import
import 'package:wger/widgets/core/fl_chart_line.dart';

class DashboardNutritionWidget extends StatefulWidget {
@override
_DashboardNutritionWidgetState createState() => _DashboardNutritionWidgetState();
Expand Down Expand Up @@ -271,28 +268,11 @@ class _DashboardWeightWidgetState extends State<DashboardWeightWidget> {
Column(
children: [
Container(
color: Colors.amberAccent,
padding: const EdgeInsets.all(15),
height: 180,
child: MeasurementChartWidget(weightEntriesData.items
.map((e) => MeasurementChartEntry(e.weight, e.date))
.toList()),
),

// Fl _chart line sample 2 for testing
Container(
color: Color.fromARGB(255, 68, 150, 118),
padding: const EdgeInsets.all(15),
height: 180,
//child: null,
//child: LineChartSample2(),
child: LineChartSample2(
weightEntriesData.items
.map((e) => MeasurementChartEntryflchat(e.weight, e.date))
.toList(),
),
height: 200,
child: MeasurementChartWidgetFl(weightEntriesData.items
.map((e) => MeasurementChartEntry(e.weight, e.date))
.toList()),
),

Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Expand Down Expand Up @@ -388,62 +368,61 @@ class _DashboardMeasurementWidgetState extends State<DashboardMeasurementWidget>
),
),

//color: Colors.lightBlue,
Column(
children: [
if (items.isNotEmpty)
Column(children: [
CarouselSlider(
items: items,
carouselController: _controller,
options: CarouselOptions(
autoPlay: false,
enlargeCenterPage: false,
viewportFraction: 1,
enableInfiniteScroll: false,
aspectRatio: 1.1,
onPageChanged: (index, reason) {
setState(() {
_current = index;
});
}),
//color: Colors.lightBlue,
Column(
children: [
if (items.isNotEmpty)
Column(children: [
CarouselSlider(
items: items,
carouselController: _controller,
options: CarouselOptions(
autoPlay: false,
enlargeCenterPage: false,
viewportFraction: 1,
enableInfiniteScroll: false,
aspectRatio: 1.1,
onPageChanged: (index, reason) {
setState(() {
_current = index;
});
}),
),
Padding(
padding: const EdgeInsets.only(bottom: 10),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: items.asMap().entries.map(
(entry) {
return GestureDetector(
onTap: () => _controller.animateToPage(entry.key),
child: Container(
width: 12.0,
height: 12.0,
margin:
EdgeInsets.symmetric(vertical: 8.0, horizontal: 4.0),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: (Theme.of(context).brightness == Brightness.dark
? Colors.white
: wgerPrimaryColor)
.withOpacity(_current == entry.key ? 0.9 : 0.4)),
),
);
},
).toList(),
),
Padding(
padding: const EdgeInsets.only(bottom: 10),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: items.asMap().entries.map(
(entry) {
return GestureDetector(
onTap: () => _controller.animateToPage(entry.key),
child: Container(
width: 12.0,
height: 12.0,
margin: EdgeInsets.symmetric(
vertical: 8.0, horizontal: 4.0),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: (Theme.of(context).brightness == Brightness.dark
? Colors.white
: wgerPrimaryColor)
.withOpacity(
_current == entry.key ? 0.9 : 0.4)),
),
);
},
).toList(),
),
),
])
else
NothingFound(
AppLocalizations.of(context).noMeasurementEntries,
AppLocalizations.of(context).newEntry,
MeasurementCategoryForm(),
),
],
),
],
])
else
NothingFound(
AppLocalizations.of(context).noMeasurementEntries,
AppLocalizations.of(context).newEntry,
MeasurementCategoryForm(),
),
],
),
],
),
),
));
Expand Down
7 changes: 2 additions & 5 deletions lib/widgets/measurements/categories_card.dart
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

import '../../models/measurements/measurement_category.dart';
import '../../screens/form_screen.dart';
import '../../screens/measurement_entries_screen.dart';
import '../core/charts.dart';
import 'forms.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

class CategoriesCard extends StatelessWidget {
MeasurementCategory currentCategory;
Expand All @@ -26,13 +26,10 @@ class CategoriesCard extends StatelessWidget {
style: Theme.of(context).textTheme.headline6,
),
),

// #FIXME : Measurements Dashboard (Custom color set )
Container(
color: Color.fromARGB(255, 159, 114, 211),
padding: const EdgeInsets.all(10),
height: 220,
child: MeasurementChartWidget(
child: MeasurementChartWidgetFl(
currentCategory.entries.map((e) => MeasurementChartEntry(e.value, e.date)).toList(),
unit: currentCategory.unit,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/measurements/entries.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class EntriesList extends StatelessWidget {
color: Colors.lightGreenAccent,
padding: const EdgeInsets.all(10),
height: 220,
child: MeasurementChartWidget(
child: MeasurementChartWidgetFl(
_category.entries.map((e) => MeasurementChartEntry(e.value, e.date)).toList(),
unit: _category.unit,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/weight/entries_list.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class WeightEntriesList extends StatelessWidget {
color: Theme.of(context).cardColor,
padding: const EdgeInsets.all(15),
height: 220,
child: MeasurementChartWidget(
child: MeasurementChartWidgetFl(
_weightProvider.items.map((e) => MeasurementChartEntry(e.weight, e.date)).toList()),
),
TextButton(
Expand Down
8 changes: 8 additions & 0 deletions pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.0"
fl_chart:
dependency: "direct main"
description:
name: fl_chart
sha256: "48a1b69be9544e2b03d9a8e843affd89e43f3194c9248776222efcb4206bb1ec"
url: "https://pub.dev"
source: hosted
version: "0.62.0"
flutter:
dependency: "direct main"
description: flutter
Expand Down
Loading

0 comments on commit ef5a708

Please sign in to comment.