brandon.presley
/
fmassive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove edit button from start_plan 

This just messes up our navigation stack too much
and makes it confusing when you go backwards.
This commit is contained in:
Brandon Presley 2023-11-30 13:07:06 +13:00
parent a9486727b2
commit 6908623ba2
1 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/start_plan.dart
View File

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter/material.dart' as material; import 'package:flutter/material.dart' as material;
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:fmassive/database.dart'; import 'package:fmassive/database.dart';
import 'package:fmassive/edit_plan.dart';
import 'package:fmassive/main.dart'; import 'package:fmassive/main.dart';
import 'package:moor_flutter/moor_flutter.dart'; import 'package:moor_flutter/moor_flutter.dart';
@ -30,11 +29,15 @@ class _StartPlanState extends State<StartPlan> {
..addColumns([db.gymSets.name, db.gymSets.sets]) ..addColumns([db.gymSets.name, db.gymSets.sets])
..where(db.gymSets.name.isIn(exercises)) ..where(db.gymSets.name.isIn(exercises))
..groupBy([db.gymSets.name, db.gymSets.sets])) ..groupBy([db.gymSets.name, db.gymSets.sets]))
.map((row) => .map(
MapEntry(row.read(db.gymSets.name), row.read(db.gymSets.sets)),) (row) =>
MapEntry(row.read(db.gymSets.name), row.read(db.gymSets.sets)),
)
.get(); .get();
final map = Map.fromIterables( final map = Map.fromIterables(
query.map((entry) => entry.key), query.map((entry) => entry.value),); query.map((entry) => entry.key),
query.map((entry) => entry.value),
);
setState(() { setState(() {
totals = []; totals = [];
for (var exercise in exercises) { for (var exercise in exercises) {
@ -54,7 +57,9 @@ class _StartPlanState extends State<StartPlan> {
.map((row) => MapEntry(row.read(db.gymSets.name), row.read(countExp))) .map((row) => MapEntry(row.read(db.gymSets.name), row.read(countExp)))
.get(); .get();
final map = Map.fromIterables( final map = Map.fromIterables(
query.map((entry) => entry.key), query.map((entry) => entry.value),); query.map((entry) => entry.key),
query.map((entry) => entry.value),
);
setState(() { setState(() {
counts = []; counts = [];
for (var exercise in exercises) { for (var exercise in exercises) {
@ -76,7 +81,9 @@ class _StartPlanState extends State<StartPlan> {
final firstSet = sets.first; final firstSet = sets.first;
repsController.text = firstSet.reps.toString(); repsController.text = firstSet.reps.toString();
repsController.selection = TextSelection( repsController.selection = TextSelection(
baseOffset: 0, extentOffset: firstSet.reps.toString().length,); baseOffset: 0,
extentOffset: firstSet.reps.toString().length,
);
weightController.text = firstSet.weight.toString(); weightController.text = firstSet.weight.toString();
} }
@ -99,24 +106,11 @@ class _StartPlanState extends State<StartPlan> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<Widget> actions = [];
if (widget.plan.id.present)
actions.add(IconButton(
onPressed: () async {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => EditPlanPage(plan: widget.plan),
),
);
},
icon: const Icon(Icons.edit),),);
if (totals.isEmpty || counts.isEmpty) return Container(); if (totals.isEmpty || counts.isEmpty) return Container();
return SafeArea( return SafeArea(
child: Scaffold( child: Scaffold(
appBar: AppBar(title: const Text('Start plan'), actions: actions), appBar: AppBar(title: const Text('Start plan')),
body: Padding( body: Padding(
padding: const EdgeInsets.all(16.0), padding: const EdgeInsets.all(16.0),
child: material.Column( child: material.Column(
@ -157,7 +151,9 @@ class _StartPlanState extends State<StartPlan> {
focusNode: repsNode, focusNode: repsNode,
onTap: () { onTap: () {
repsController.selection = TextSelection( repsController.selection = TextSelection(
baseOffset: 0, extentOffset: repsController.text.length,); baseOffset: 0,
extentOffset: repsController.text.length,
);
}, },
), ),
TextFormField( TextFormField(
@ -166,7 +162,9 @@ class _StartPlanState extends State<StartPlan> {
focusNode: weightNode, focusNode: weightNode,
onTap: () { onTap: () {
weightController.selection = TextSelection( weightController.selection = TextSelection(
baseOffset: 0, extentOffset: weightController.text.length,); baseOffset: 0,
extentOffset: weightController.text.length,
);
}, },
), ),
], ],
@ -178,7 +176,8 @@ class _StartPlanState extends State<StartPlan> {
created: Value(DateTime.now().toIso8601String()), created: Value(DateTime.now().toIso8601String()),
name: Value(exercises[selectedExercise]), name: Value(exercises[selectedExercise]),
reps: Value(int.tryParse(repsController.text) ?? 0), reps: Value(int.tryParse(repsController.text) ?? 0),
weight: Value(double.tryParse(weightController.text) ?? 0),); weight: Value(double.tryParse(weightController.text) ?? 0),
);
await db.into(db.gymSets).insert(gymSet); await db.into(db.gymSets).insert(gymSet);
const platform = MethodChannel('com.massive/android'); const platform = MethodChannel('com.massive/android');
platform.invokeMethod('timer', [180000]); platform.invokeMethod('timer', [180000]);
@ -186,6 +185,7 @@ class _StartPlanState extends State<StartPlan> {
}, },
child: const Icon(Icons.check), child: const Icon(Icons.check),
), ),
),); ),
);
} }
} }