Feature/code cleanup (#9)
* Implemented hasSettingsLoaded reducer * Added Padding to Progress List View * Created Settings and Time Progress List Store Connector * Rewritten Home Active Tab * Fixed missing onTap in Progress List Tile * Started using new Store Connectors in Inactive and Settings Tab * Created Time Progress Store Connector * Rewritten ProgressDetailScreen with new Store Connectors * Rewritten DatePickerBtn with TextButton * Deleted unused widget * Changed Foreground Color behaviour in ColorPicker BTN * Created Select Duration Button * Rewritten Duration Setting Widget * Updated Version Number Signed-off-by: Andreas Fahrecker <AndreasFahrecker@gmail.com>
This commit is contained in:
Andreas Fahrecker
committed by
GitHub
GitHub
parent
fc35476503
commit
40bdcc44f9
@ -1,5 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:time_progress_tracker/screens/progress_creation_screen.dart';
|
||||
import 'package:time_progress_tracker/widgets/buttons/create_progress_button.dart';
|
||||
import 'package:time_progress_tracker/widgets/home/home_bottom_navbar.dart';
|
||||
import 'package:time_progress_tracker/widgets/home/tabs/home_active_progresses_tab.dart';
|
||||
import 'package:time_progress_tracker/widgets/home/tabs/home_inactive_progresses_tab.dart';
|
||||
@ -37,15 +37,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
),
|
||||
body: _children[_currentIndex],
|
||||
floatingActionButtonLocation: FloatingActionButtonLocation.endFloat,
|
||||
floatingActionButton: _currentIndex != 2
|
||||
? FloatingActionButton(
|
||||
heroTag: "createProgressBTN",
|
||||
child: Icon(Icons.add),
|
||||
onPressed: () {
|
||||
Navigator.pushNamed(context, ProgressCreationScreen.routeName);
|
||||
},
|
||||
)
|
||||
: null,
|
||||
floatingActionButton: _currentIndex != 2 ? CreateProgressButton() : null,
|
||||
bottomNavigationBar: HomeBottomNavBar(
|
||||
currentIndex: _currentIndex,
|
||||
onTap: onBottomTabTapped,
|
||||
|
||||
@ -1,15 +1,11 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_redux/flutter_redux.dart';
|
||||
import 'package:redux/redux.dart';
|
||||
import 'package:time_progress_tracker/actions/actions.dart';
|
||||
import 'package:time_progress_tracker/models/app_settings.dart';
|
||||
import 'package:time_progress_tracker/models/app_state.dart';
|
||||
import 'package:time_progress_tracker/models/time_progress.dart';
|
||||
import 'package:time_progress_tracker/screens/home_screen.dart';
|
||||
import 'package:time_progress_tracker/selectors/time_progress_selectors.dart';
|
||||
import 'package:time_progress_tracker/widgets/detail_screen_floating_action_buttons.dart';
|
||||
import 'package:time_progress_tracker/widgets/progress_editor_widget.dart';
|
||||
import 'package:time_progress_tracker/widgets/progress_view_widget.dart';
|
||||
import 'package:time_progress_tracker/widgets/store_connectors/settings_store_connector.dart';
|
||||
import 'package:time_progress_tracker/widgets/store_connectors/time_progress_store_connector.dart';
|
||||
|
||||
class ProgressDetailScreenArguments {
|
||||
final String id;
|
||||
@ -31,6 +27,13 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
|
||||
bool _editMode = false, _isEditedProgressValid = false;
|
||||
TimeProgress _editedProgress, _originalProgress;
|
||||
|
||||
void _initEditedProgress(TimeProgress tp) {
|
||||
if (_editedProgress == null) {
|
||||
_editedProgress = tp;
|
||||
_originalProgress = tp;
|
||||
}
|
||||
}
|
||||
|
||||
void _onEditedProgressChanged(
|
||||
TimeProgress newProgress, bool isNewProgressValid) {
|
||||
setState(() {
|
||||
@ -52,87 +55,75 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
|
||||
});
|
||||
}
|
||||
|
||||
List<Widget> _renderColumnChildren(
|
||||
SettingsViewModel settingsVm, TimeProgressViewModel tpVm) {
|
||||
List<Widget> columnChildren = [
|
||||
Expanded(
|
||||
child: ProgressViewWidget(
|
||||
timeProgress: _editMode ? _editedProgress : tpVm.tp,
|
||||
doneColor: settingsVm.appSettings.doneColor,
|
||||
leftColor: settingsVm.appSettings.leftColor,
|
||||
))
|
||||
];
|
||||
if (_editMode)
|
||||
columnChildren.add(Expanded(
|
||||
child: ProgressEditorWidget(
|
||||
timeProgress: _editedProgress,
|
||||
onTimeProgressChanged: _onEditedProgressChanged,
|
||||
)));
|
||||
return columnChildren;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final ProgressDetailScreenArguments args =
|
||||
ModalRoute.of(context).settings.arguments;
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Text(ProgressDetailScreen.title),
|
||||
),
|
||||
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(
|
||||
child: Text("Error Invalid Time Progress"),
|
||||
);
|
||||
if (_editedProgress == null) {
|
||||
_editedProgress = timeProgress;
|
||||
_originalProgress = timeProgress;
|
||||
} // initialize _editedProgress
|
||||
|
||||
List<Widget> columnChildren = [
|
||||
Expanded(
|
||||
child: StoreConnector<AppState, AppSettings>(
|
||||
onInit: loadSettingsIfUnloaded,
|
||||
converter: (store) => appSettingsSelector(store.state),
|
||||
builder: (BuildContext context, AppSettings settings) {
|
||||
return ProgressViewWidget(
|
||||
timeProgress: _editMode ? _editedProgress : timeProgress,
|
||||
doneColor: settings.doneColor,
|
||||
leftColor: settings.leftColor,
|
||||
);
|
||||
},
|
||||
),
|
||||
)
|
||||
];
|
||||
if (_editMode)
|
||||
columnChildren.add(Expanded(
|
||||
child: ProgressEditorWidget(
|
||||
timeProgress: _editedProgress,
|
||||
onTimeProgressChanged: _onEditedProgressChanged,
|
||||
),
|
||||
));
|
||||
|
||||
return Column(
|
||||
children: columnChildren,
|
||||
);
|
||||
},
|
||||
),
|
||||
body: SettingsStoreConnector(
|
||||
loadedBuilder: (context, settingsVm) {
|
||||
return TimeProgressStoreConnector(
|
||||
timeProgressId: args.id,
|
||||
loadedBuilder: (context, tpVm) {
|
||||
_initEditedProgress(tpVm.tp);
|
||||
return Container(
|
||||
margin: EdgeInsets.all(8),
|
||||
child: Column(
|
||||
children: _renderColumnChildren(settingsVm, tpVm),
|
||||
));
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
|
||||
floatingActionButton: StoreConnector(
|
||||
onInit: loadTimeProgressListIfUnloaded,
|
||||
converter: (store) => timeProgressByIdSelector(store.state, args.id),
|
||||
builder: (BuildContext context, TimeProgress timeProgress) {
|
||||
final Store<AppState> store = StoreProvider.of<AppState>(context);
|
||||
floatingActionButton: TimeProgressStoreConnector(
|
||||
timeProgressId: args.id,
|
||||
loadedBuilder: (context, tpVm) {
|
||||
void _saveEditedProgress() {
|
||||
tpVm.updateTimeProgress(_editedProgress);
|
||||
_switchEditMode(false);
|
||||
}
|
||||
|
||||
void _saveEditedProgress() {
|
||||
store
|
||||
.dispatch(UpdateTimeProgressAction(args.id, _editedProgress));
|
||||
_switchEditMode(false);
|
||||
}
|
||||
void _deleteTimeProgress() {
|
||||
tpVm.deleteTimeProgress();
|
||||
Navigator.popUntil(
|
||||
context, ModalRoute.withName(HomeScreen.routeName));
|
||||
}
|
||||
|
||||
void _deleteTimeProgress() {
|
||||
store.dispatch(DeleteTimeProgressAction(args.id));
|
||||
Navigator.popUntil(
|
||||
context, ModalRoute.withName(HomeScreen.routeName));
|
||||
}
|
||||
|
||||
return DetailScreenFloatingActionButtons(
|
||||
editMode: _editMode,
|
||||
originalProgress: timeProgress,
|
||||
editedProgress: _editedProgress,
|
||||
isEditedProgressValid: _isEditedProgressValid,
|
||||
onEditProgress: () => _switchEditMode(true),
|
||||
onSaveEditedProgress: _saveEditedProgress,
|
||||
onCancelEditProgress: _cancelEditMode,
|
||||
onDeleteProgress: _deleteTimeProgress);
|
||||
}),
|
||||
return DetailScreenFloatingActionButtons(
|
||||
editMode: _editMode,
|
||||
originalProgress: tpVm.tp,
|
||||
editedProgress: _editedProgress,
|
||||
isEditedProgressValid: _isEditedProgressValid,
|
||||
onEditProgress: () => _switchEditMode(true),
|
||||
onSaveEditedProgress: _saveEditedProgress,
|
||||
onCancelEditProgress: _cancelEditMode,
|
||||
onDeleteProgress: _deleteTimeProgress);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user