time-progress-tracker/time_progress_tracker
2
0
Fork 0
Code Issues Pull Requests Packages Activity

Code cleanup

Browse Source 
Signed-off-by: Andreas Fahrecker <AndreasFahrecker@gmail.com>
This commit is contained in:
Andreas Fahrecker 2021-02-12 00:34:14 +01:00
parent d06d7f1448
commit 9ee29a7c7c
1 changed files with 56 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
lib/screens/progress_detail_screen.dart
View File

@ -46,60 +46,71 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final ProgressDetailScreenArguments args = final ProgressDetailScreenArguments args =
ModalRoute.of(context).settings.arguments; ModalRoute.of(context).settings.arguments;
final Store<AppState> store = StoreProvider.of<AppState>(context);
final TimeProgress _timeProgress =
timeProgressByIdSelector(store.state, args.id);
if (_timeProgress == null) //+++++Time Progress Not Found Error+++++
return Center(
child: Text("Error Invalid Time Progress"),
);
if (_editedProgress == null)
_editedProgress = _timeProgress; // initialize _editedProgress
void _saveEditedProgress() {
store.dispatch(UpdateTimeProgressAction(args.id, _editedProgress));
_switchEditMode(false);
}
void _deleteTimeProgress() {
store.dispatch(DeleteTimeProgressAction(args.id));
Navigator.popUntil(context, ModalRoute.withName(HomeScreen.routeName));
}
List<Widget> columnChildren = [
Expanded(
child: ProgressViewWidget(
timeProgress: _editMode ? _editedProgress : _timeProgress),
)
];
if (_editMode)
columnChildren.add(Expanded(
child: ProgressEditorWidget(
timeProgress: _editedProgress,
onTimeProgressChanged: _onEditedProgressChanged,
),
));
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(ProgressDetailScreen.title), title: Text(ProgressDetailScreen.title),
), ),
body: Container( body: Container(
margin: EdgeInsets.all(8), margin: EdgeInsets.all(8),
child: Column( child: StoreConnector(
children: columnChildren, onInit: loadTimeProgressListIfUnloaded,
converter: (store) => timeProgressByIdSelector(store.state, args.id),
builder: (BuildContext context, TimeProgress timeProgress) {
if (timeProgress == null) //+++++Time Progress Not Found Error+++++
return Center(
child: Text("Error Invalid Time Progress"),
);
if (_editedProgress == null)
_editedProgress = timeProgress; // initialize _editedProgress
List<Widget> columnChildren = [
Expanded(
child: ProgressViewWidget(
timeProgress: _editMode ? _editedProgress : timeProgress),
)
];
if (_editMode)
columnChildren.add(Expanded(
child: ProgressEditorWidget(
timeProgress: _editedProgress,
onTimeProgressChanged: _onEditedProgressChanged,
),
));
return Column(
children: columnChildren,
);
},
), ),
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat, floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: DetailScreenFloatingActionButtons( floatingActionButton: StoreConnector(
editMode: _editMode, onInit: loadTimeProgressListIfUnloaded,
originalProgress: timeProgressByIdSelector(store.state, args.id), converter: (store) => timeProgressByIdSelector(store.state, args.id),
editedProgress: _editedProgress, builder: (BuildContext context, TimeProgress timeProgress) {
onEditProgress: () => _switchEditMode(true), final Store<AppState> store = StoreProvider.of<AppState>(context);
onSaveEditedProgress: _saveEditedProgress,
onCancelEditProgress: () => _switchEditMode(false), void _saveEditedProgress() {
onDeleteProgress: _deleteTimeProgress), store
.dispatch(UpdateTimeProgressAction(args.id, _editedProgress));
_switchEditMode(false);
}
void _deleteTimeProgress() {
store.dispatch(DeleteTimeProgressAction(args.id));
Navigator.popUntil(
context, ModalRoute.withName(HomeScreen.routeName));
}
return DetailScreenFloatingActionButtons(
editMode: _editMode,
originalProgress: timeProgress,
editedProgress: _editedProgress,
onEditProgress: () => _switchEditMode(true),
onSaveEditedProgress: _saveEditedProgress,
onCancelEditProgress: () => _switchEditMode(false),
onDeleteProgress: _deleteTimeProgress);
}),
); );
} }
} }