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

65
lib/screens/progress_detail_screen.dart
View File

@ -46,31 +46,27 @@ 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); return Scaffold(
final TimeProgress _timeProgress = appBar: AppBar(
timeProgressByIdSelector(store.state, args.id); title: Text(ProgressDetailScreen.title),
),
if (_timeProgress == null) //+++++Time Progress Not Found Error+++++ body: Container(
margin: EdgeInsets.all(8),
child: StoreConnector(
onInit: loadTimeProgressListIfUnloaded,
converter: (store) => timeProgressByIdSelector(store.state, args.id),
builder: (BuildContext context, TimeProgress timeProgress) {
if (timeProgress == null) //+++++Time Progress Not Found Error+++++
return Center( return Center(
child: Text("Error Invalid Time Progress"), child: Text("Error Invalid Time Progress"),
); );
if (_editedProgress == null) if (_editedProgress == null)
_editedProgress = _timeProgress; // initialize _editedProgress _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 = [ List<Widget> columnChildren = [
Expanded( Expanded(
child: ProgressViewWidget( child: ProgressViewWidget(
timeProgress: _editMode ? _editedProgress : _timeProgress), timeProgress: _editMode ? _editedProgress : timeProgress),
) )
]; ];
if (_editMode) if (_editMode)
@ -81,25 +77,40 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
), ),
)); ));
return Scaffold( return Column(
appBar: AppBar(
title: Text(ProgressDetailScreen.title),
),
body: Container(
margin: EdgeInsets.all(8),
child: Column(
children: columnChildren, children: columnChildren,
);
},
), ),
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat, floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: DetailScreenFloatingActionButtons( floatingActionButton: StoreConnector(
onInit: loadTimeProgressListIfUnloaded,
converter: (store) => timeProgressByIdSelector(store.state, args.id),
builder: (BuildContext context, TimeProgress timeProgress) {
final Store<AppState> store = StoreProvider.of<AppState>(context);
void _saveEditedProgress() {
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, editMode: _editMode,
originalProgress: timeProgressByIdSelector(store.state, args.id), originalProgress: timeProgress,
editedProgress: _editedProgress, editedProgress: _editedProgress,
onEditProgress: () => _switchEditMode(true), onEditProgress: () => _switchEditMode(true),
onSaveEditedProgress: _saveEditedProgress, onSaveEditedProgress: _saveEditedProgress,
onCancelEditProgress: () => _switchEditMode(false), onCancelEditProgress: () => _switchEditMode(false),
onDeleteProgress: _deleteTimeProgress), onDeleteProgress: _deleteTimeProgress);
}),
); );
} }
} }