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

Updated Flutter SDK for Null-Safety

Browse Source 
Ported Progress Detail Screen to PlatformScaffold

Signed-off-by: Andreas Fahrecker <AndreasFahrecker@gmail.com>
This commit is contained in:
Andreas Fahrecker
2021-03-18 18:34:29 +01:00
parent b1a90b1e05
commit 08db53db20
34 changed files with 245 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ui/app_yes_no_dialog_widget.dart
View File

@ -6,10 +6,10 @@ class AppYesNoDialog extends StatelessWidget {
final void Function() onYesPressed;
AppYesNoDialog({
Key key,
@required this.titleText,
@required this.contentText,
@required this.onYesPressed,
Key? key,
required this.titleText,
required this.contentText,
required this.onYesPressed,
}) : super(key: key);
@override

12
lib/ui/buttons/color_picker_btn.dart
View File

@ -8,10 +8,10 @@ class ColorPickerButton extends StatelessWidget {
final void Function(Color) onColorPicked;
ColorPickerButton({
@required this.title,
@required this.dialogTitle,
@required this.selectedColor,
@required this.onColorPicked,
required this.title,
required this.dialogTitle,
required this.selectedColor,
required this.onColorPicked,
});
@override
@ -37,8 +37,8 @@ class ColorPickerButton extends StatelessWidget {
child: Text(title),
style: TextButton.styleFrom(
primary: useBrightBackground(selectedColor)
? appTheme.primaryTextTheme.button.color
: appTheme.textTheme.button.color,
? appTheme.primaryTextTheme.button!.color
: appTheme.textTheme.button!.color,
backgroundColor: selectedColor,
),
);

2
lib/ui/buttons/create_progress_button.dart
View File

@ -8,7 +8,7 @@ class CreateProgressButton extends StatelessWidget {
final void Function() createProgress;
const CreateProgressButton({Key key, @required this.createProgress})
const CreateProgressButton({Key? key, required this.createProgress})
: super(key: key);
@override

12
lib/ui/buttons/date_picker_btn.dart
View File

@ -6,18 +6,18 @@ class DatePickerBtn extends StatelessWidget {
final void Function(DateTime) onDatePicked;
DatePickerBtn({
@required this.leadingString,
@required this.pickedDate,
@required this.onDatePicked,
required this.leadingString,
required this.pickedDate,
required this.onDatePicked,
}) : super();
void _onButtonPressed(BuildContext context) async {
onDatePicked(await showDatePicker(
onDatePicked((await showDatePicker(
context: context,
initialDate: pickedDate,
firstDate: DateTime(1900),
lastDate: DateTime(2100),
));
))!);
}
@override
@ -28,7 +28,7 @@ class DatePickerBtn extends StatelessWidget {
child: Text(
"$leadingString ${pickedDate.toLocal().toString().split(" ")[0]}"),
style: TextButton.styleFrom(
primary: appTheme.primaryTextTheme.button.color,
primary: appTheme.primaryTextTheme.button!.color,
backgroundColor: appTheme.accentColor,
),
);

34
lib/ui/buttons/detail_screen_leading_button.dart Normal file
View File

@ -0,0 +1,34 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:time_progress_tracker/ui/buttons/platform_action_button.dart';
class DetailScreenLeadingButton extends StatelessWidget {
final bool isEditMode, isEditedTpValid;
final void Function() saveTp, editTp;
const DetailScreenLeadingButton({
Key? key,
required this.isEditMode,
required this.isEditedTpValid,
required this.saveTp,
required this.editTp,
}) : super(key: key);
@override
Widget build(BuildContext context) {
final ThemeData materialTheme = Theme.of(context);
if (isEditMode)
return PlatformActionButton(
heroTag: "saveEditedTimeProgressBTN",
icon: Icons.save,
materialBackground: Colors.green,
onBtnPressed: isEditedTpValid ? saveTp : null);
return PlatformActionButton(
heroTag: "editTimeProgressBTN",
icon: Icons.edit,
materialBackground: materialTheme.accentColor,
onBtnPressed: editTp,
);
}
}

31
lib/ui/buttons/detail_screen_trailing_button.dart Normal file
View File

@ -0,0 +1,31 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:time_progress_tracker/ui/buttons/platform_action_button.dart';
class DetailScreenTrailingButton extends StatelessWidget {
final bool isEditMode;
final void Function() cancelEditTp, deleteTp;
const DetailScreenTrailingButton({
Key? key,
required this.isEditMode,
required this.cancelEditTp,
required this.deleteTp,
}) : super(key: key);
@override
Widget build(BuildContext context) {
if (isEditMode)
return PlatformActionButton(
heroTag: "cancelEditTimeProgressBTN",
icon: Icons.cancel,
materialBackground: Colors.red,
onBtnPressed: cancelEditTp);
return PlatformActionButton(
heroTag: "deleteTimeProgressBTN",
icon: Icons.delete,
materialBackground: Colors.red,
onBtnPressed: deleteTp,
);
}
}

13
lib/ui/buttons/platform_action_button.dart
View File

@ -6,13 +6,15 @@ import 'package:time_progress_tracker/utils/helper_functions.dart';
class PlatformActionButton extends StatelessWidget {
final String heroTag;
final IconData icon;
final void Function() onBtnPressed;
final Color? materialBackground;
final void Function()? onBtnPressed;
const PlatformActionButton({
Key key,
@required this.heroTag,
@required this.icon,
@required this.onBtnPressed,
Key? key,
required this.heroTag,
required this.icon,
this.materialBackground,
required this.onBtnPressed,
}) : super(key: key);
@override
@ -32,6 +34,7 @@ class PlatformActionButton extends StatelessWidget {
return FloatingActionButton(
heroTag: heroTag,
child: Icon(icon),
backgroundColor: materialBackground,
onPressed: onBtnPressed,
);
}

6
lib/ui/buttons/select_duration_btn.dart
View File

@ -6,8 +6,8 @@ class SelectDurationBtn extends StatelessWidget {
final void Function(Duration) updateDuration;
SelectDurationBtn({
@required this.duration,
@required this.updateDuration,
required this.duration,
required this.updateDuration,
});
void _onPickerConfirm(Picker picker, List<int> values) {
@ -40,7 +40,7 @@ class SelectDurationBtn extends StatelessWidget {
onPressed: () => _onButtonPressed(context, appTheme),
child: Text("$years Years $months Months $days Days"),
style: TextButton.styleFrom(
primary: appTheme.primaryTextTheme.button.color,
primary: appTheme.primaryTextTheme.button!.color,
backgroundColor: appTheme.accentColor,
));
}

16
lib/ui/detail_screen_floating_action_buttons.dart
View File

@ -11,14 +11,14 @@ class DetailScreenFloatingActionButtons extends StatelessWidget {
onDeleteProgress;
DetailScreenFloatingActionButtons({
@required this.editMode,
@required this.originalProgress,
@required this.editedProgress,
@required this.isEditedProgressValid,
@required this.onEditProgress,
@required this.onSaveEditedProgress,
@required this.onCancelEditProgress,
@required this.onDeleteProgress,
required this.editMode,
required this.originalProgress,
required this.editedProgress,
required this.isEditedProgressValid,
required this.onEditProgress,
required this.onSaveEditedProgress,
required this.onCancelEditProgress,
required this.onDeleteProgress,
});
@override

4
lib/ui/progress/progress_editor_widget.dart
View File

@ -8,8 +8,8 @@ class ProgressEditorWidget extends StatefulWidget {
final Function(TimeProgress, bool) onTimeProgressChanged;
ProgressEditorWidget({
@required this.timeProgress,
@required this.onTimeProgressChanged,
required this.timeProgress,
required this.onTimeProgressChanged,
});
@override

6
lib/ui/progress/progress_list_item.dart
View File

@ -24,9 +24,9 @@ class ProgressListItem extends StatelessWidget {
final Color doneColor, leftColor;
ProgressListItem({
@required this.timeProgress,
@required this.doneColor,
@required this.leftColor,
required this.timeProgress,
required this.doneColor,
required this.leftColor,
});
@override

6
lib/ui/progress/progress_list_view.dart
View File

@ -10,9 +10,9 @@ class ProgressListView extends StatelessWidget {
final Color doneColor, leftColor;
ProgressListView({
@required this.timeProgressList,
@required this.doneColor,
@required this.leftColor,
required this.timeProgressList,
required this.doneColor,
required this.leftColor,
});
Widget _renderListTile(TimeProgress tp) {

6
lib/ui/progress/progress_view_widget.dart
View File

@ -9,9 +9,9 @@ class ProgressViewWidget extends StatelessWidget {
final Color leftColor;
ProgressViewWidget({
@required this.timeProgress,
@required this.doneColor,
@required this.leftColor,
required this.timeProgress,
required this.doneColor,
required this.leftColor,
});
@override

2
lib/ui/screens/dashboard_screen.dart
View File

@ -44,7 +44,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
@override
Widget build(BuildContext context) {
Widget _renderCreateProgressBtn() => _tabSelectedIndex == 2
PlatformActionButton? _renderCreateProgressBtn() => _tabSelectedIndex == 2
? null
: PlatformActionButton(
heroTag: "goToCreateTimeProgressBTN",

8
lib/ui/screens/progress_creation_screen.dart
View File

@ -26,11 +26,11 @@ class ProgressCreationScreen extends StatefulWidget {
}
class _ProgressCreationScreenState extends State<ProgressCreationScreen> {
TimeProgress timeProgressToCreate;
TimeProgress timeProgressToCreate = TimeProgress.initialDefault();
bool _isProgressValid = false;
void initTimeProgress(TimeProgress timeProgress) {
if (timeProgressToCreate == null)
if (timeProgressToCreate == TimeProgress.initialDefault())
setState(() {
timeProgressToCreate = timeProgress;
});
@ -180,8 +180,8 @@ class _ViewModel {
final void Function(TimeProgress) onAddTimeProgress;
_ViewModel({
@required this.defaultDurationProgress,
@required this.onAddTimeProgress,
required this.defaultDurationProgress,
required this.onAddTimeProgress,
});
factory _ViewModel.create(Store<AppState> store) {

101
lib/ui/screens/progress_detail_screen.dart
View File

@ -1,18 +1,20 @@
import 'package:flutter/material.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
import 'package:time_progress_tracker/models/time_progress.dart';
import 'package:time_progress_tracker/redux/store_connectors/settings_store_connector.dart';
import 'package:time_progress_tracker/redux/store_connectors/time_progress_store_connector.dart';
import 'package:time_progress_tracker/ui/screens/dashboard_screen.dart';
import 'package:time_progress_tracker/ui/detail_screen_floating_action_buttons.dart';
import 'package:time_progress_tracker/ui/buttons/detail_screen_leading_button.dart';
import 'package:time_progress_tracker/ui/buttons/detail_screen_trailing_button.dart';
import 'package:time_progress_tracker/ui/progress/progress_editor_widget.dart';
import 'package:time_progress_tracker/ui/progress/progress_view_widget.dart';
import 'package:time_progress_tracker/utils/theme_utils.dart';
class ProgressDetailScreen extends StatefulWidget {
static const title = "Progress View";
final String tpId;
const ProgressDetailScreen({Key key, @required this.tpId}) : super(key: key);
const ProgressDetailScreen({Key? key, required this.tpId}) : super(key: key);
@override
State<StatefulWidget> createState() {
@ -22,10 +24,11 @@ class ProgressDetailScreen extends StatefulWidget {
class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
bool _editMode = false, _isEditedProgressValid = false;
TimeProgress _editedProgress, _originalProgress;
TimeProgress _editedProgress = TimeProgress.initialDefault(),
_originalProgress = TimeProgress.initialDefault();
void _initEditedProgress(TimeProgress tp) {
if (_editedProgress == null) {
if (_editedProgress == TimeProgress.initialDefault()) {
_editedProgress = tp;
_originalProgress = tp;
}
@ -54,10 +57,11 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
List<Widget> _renderColumnChildren(
SettingsViewModel settingsVm, TimeProgressViewModel tpVm) {
TimeProgress tp = tpVm.tp ?? TimeProgress.initialDefault();
List<Widget> columnChildren = [
Expanded(
child: ProgressViewWidget(
timeProgress: _editMode ? _editedProgress : tpVm.tp,
timeProgress: _editMode ? _editedProgress : tp,
doneColor: settingsVm.appSettings.doneColor,
leftColor: settingsVm.appSettings.leftColor,
))
@ -73,16 +77,67 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(ProgressDetailScreen.title),
TimeProgressStoreConnector leadingActionButton = TimeProgressStoreConnector(
timeProgressId: widget.tpId,
loadedBuilder: (context, tpVm) {
void _saveEditedTp() {
tpVm.updateTimeProgress(_editedProgress);
_switchEditMode(false);
}
return DetailScreenLeadingButton(
isEditMode: _editMode,
isEditedTpValid: _isEditedProgressValid,
saveTp: _saveEditedTp,
editTp: () => _switchEditMode(true),
);
},
);
TimeProgressStoreConnector trailingActionButton =
TimeProgressStoreConnector(
timeProgressId: widget.tpId,
loadedBuilder: (context, tpVm) {
void _deleteTp() {
tpVm.deleteTimeProgress();
Navigator.popUntil(context, (route) => route.isFirst);
}
return DetailScreenTrailingButton(
isEditMode: _editMode,
cancelEditTp: _cancelEditMode,
deleteTp: _deleteTp,
);
},
);
return PlatformScaffold(
appBar: PlatformAppBar(
title: Text(
ProgressDetailScreen.title,
style: toolbarTextStyle,
),
cupertino: (_, __) => CupertinoNavigationBarData(
transitionBetweenRoutes: false,
leading: leadingActionButton,
trailing: trailingActionButton,
),
),
material: (_, __) => MaterialScaffoldData(
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: Row(
children: [
Expanded(child: leadingActionButton),
Expanded(child: trailingActionButton),
],
),
),
body: SettingsStoreConnector(
loadedBuilder: (context, settingsVm) {
return TimeProgressStoreConnector(
timeProgressId: widget.tpId,
loadedBuilder: (context, tpVm) {
_initEditedProgress(tpVm.tp);
_initEditedProgress(tpVm.tp!);
return Container(
margin: EdgeInsets.all(8),
child: Column(
@ -92,32 +147,6 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
);
},
),
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: TimeProgressStoreConnector(
timeProgressId: widget.tpId,
loadedBuilder: (context, tpVm) {
void _saveEditedProgress() {
tpVm.updateTimeProgress(_editedProgress);
_switchEditMode(false);
}
void _deleteTimeProgress() {
tpVm.deleteTimeProgress();
Navigator.popUntil(
context, ModalRoute.withName(DashboardScreen.routeName));
}
return DetailScreenFloatingActionButtons(
editMode: _editMode,
originalProgress: tpVm.tp,
editedProgress: _editedProgress,
isEditedProgressValid: _isEditedProgressValid,
onEditProgress: () => _switchEditMode(true),
onSaveEditedProgress: _saveEditedProgress,
onCancelEditProgress: _cancelEditMode,
onDeleteProgress: _deleteTimeProgress);
},
),
);
}
}

8
lib/ui/settings/color_settings_widget.dart
View File

@ -6,10 +6,10 @@ class ColorSettingsWidget extends StatelessWidget {
final void Function(Color) updateDoneColor, updateLeftColor;
ColorSettingsWidget({
@required this.doneColor,
@required this.leftColor,
@required this.updateDoneColor,
@required this.updateLeftColor,
required this.doneColor,
required this.leftColor,
required this.updateDoneColor,
required this.updateLeftColor,
});
@override

4
lib/ui/settings/duration_settings_widget.dart
View File

@ -6,8 +6,8 @@ class DurationSettingsWidget extends StatelessWidget {
final void Function(Duration) updateDuration;
DurationSettingsWidget({
@required this.duration,
@required this.updateDuration,
required this.duration,
required this.updateDuration,
});
@override