Commit 05348ed
Changed files (2)
lib
lib/components/measurement_list.dart
@@ -28,53 +28,54 @@ class MeasurementList extends StatelessWidget {
return Column(
children: [
Consumer<Settings>(
- builder: (context, settings, child) {
- return Column (
+ builder: (context, settings, child) {
+ return Column (
+ children: [
+ Row(
children: [
- Row(
- children: [
- Expanded(
- flex: _sideFlex,
- child: const SizedBox(),
- ),
- Expanded(
- flex: _tableElementsSizes[0],
- child: const Text("time", style: TextStyle(fontWeight: FontWeight.bold))
- ),
- Expanded(
- flex: _tableElementsSizes[1],
- child: Text("sys",
- style: TextStyle(fontWeight: FontWeight.bold, color: settings.sysColor))
- ),
- Expanded(
- flex: _tableElementsSizes[2],
- child: Text("dia",
- style: TextStyle(fontWeight: FontWeight.bold, color: settings.diaColor))
- ),
- Expanded(
- flex: _tableElementsSizes[3],
- child: Text("pul",
- style: TextStyle(fontWeight: FontWeight.bold, color: settings.pulColor))
- ),
- Expanded(
- flex: _tableElementsSizes[4],
- child: const Text("notes", style: TextStyle(fontWeight: FontWeight.bold))
- ),
- Expanded(
- flex: _sideFlex,
- child: const SizedBox(),
- ),
- ],
+ Expanded(
+ flex: _sideFlex,
+ child: const SizedBox(),
),
- Divider(
- height: 5,
- thickness: 2,
- color: Theme.of(context).primaryColor,
- )
- ]
- );
- }
- ),
+ Expanded(
+ flex: _tableElementsSizes[0],
+ child: const Text("time", style: TextStyle(fontWeight: FontWeight.bold))
+ ),
+ Expanded(
+ flex: _tableElementsSizes[1],
+ child: Text("sys",
+ style: TextStyle(fontWeight: FontWeight.bold, color: settings.sysColor))
+ ),
+ Expanded(
+ flex: _tableElementsSizes[2],
+ child: Text("dia",
+ style: TextStyle(fontWeight: FontWeight.bold, color: settings.diaColor))
+ ),
+ Expanded(
+ flex: _tableElementsSizes[3],
+ child: Text("pul",
+ style: TextStyle(fontWeight: FontWeight.bold, color: settings.pulColor))
+ ),
+ Expanded(
+ flex: _tableElementsSizes[4],
+ child: const Text("notes", style: TextStyle(fontWeight: FontWeight.bold))
+ ),
+ Expanded(
+ flex: _sideFlex,
+ child: const SizedBox(),
+ ),
+ ],
+ ),
+ const SizedBox(height: 10,),
+ Divider(
+ height: 0,
+ thickness: 2,
+ color: Theme.of(context).primaryColor,
+ )
+ ]
+ );
+ }
+ ),
Expanded(
child: Consumer<BloodPressureModel>(
builder: (context, model, child) {
@@ -96,6 +97,7 @@ class MeasurementList extends StatelessWidget {
return ListView.builder(
itemCount: data.length,
shrinkWrap: true,
+ padding: const EdgeInsets.all(2),
itemBuilder: (context, index) {
final formatter = DateFormat(settings.dateFormatString);
return Column(
lib/components/settings_widgets.dart
@@ -25,7 +25,7 @@ class SettingsTile extends StatelessWidget {
return InkWell(
onTap: () => onPressed(context),
child: SizedBox(
- height: 45,
+ height: 48,
child: Row(
children: [
lead,
@@ -94,6 +94,7 @@ class ColorSelectionSettingsTile extends StatelessWidget {
contentPadding: const EdgeInsets.all(6.0),
title: const Text('select color'),
content: MaterialColorPicker(
+ circleSize: 53,
selectedColor: initialColor,
onMainColorChange: (color) {
onMainColorChanged?.call(color);
@@ -195,7 +196,7 @@ class _SliderSettingsTileState extends State<SliderSettingsTile> {
var trail = widget.trailing ?? const SizedBox.shrink();
return SizedBox(
- height: 70,
+ height: 80,
child: Row(
children: [
lead,