Fixed Simple Problem, that occured after migrating to new version.
Still WIP need to fix more Problems
This commit is contained in:
@ -8,7 +8,8 @@ import 'package:time_progress_tracker/models/app_state.dart';
|
||||
class SettingsStoreConnector extends StatelessWidget {
|
||||
final Widget Function(BuildContext, SettingsViewModel) loadedBuilder;
|
||||
|
||||
SettingsStoreConnector({
|
||||
const SettingsStoreConnector({
|
||||
super.key,
|
||||
@required this.loadedBuilder,
|
||||
});
|
||||
|
||||
@ -18,10 +19,11 @@ class SettingsStoreConnector extends StatelessWidget {
|
||||
onInit: loadSettingsIfUnloaded,
|
||||
converter: (store) => SettingsViewModel._create(store),
|
||||
builder: (context, SettingsViewModel vm) {
|
||||
if (!vm.hasSettingsLoaded)
|
||||
return Center(
|
||||
if (!vm.hasSettingsLoaded) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(),
|
||||
);
|
||||
}
|
||||
return loadedBuilder(context, vm);
|
||||
},
|
||||
);
|
||||
@ -44,17 +46,17 @@ class SettingsViewModel {
|
||||
);
|
||||
|
||||
factory SettingsViewModel._create(Store<AppState> store) {
|
||||
AppSettings _appSettings = store.state.appSettings;
|
||||
AppSettings appSettings = store.state.appSettings;
|
||||
|
||||
void _updateDoneColor(Color dC) => store.dispatch(
|
||||
UpdateAppSettingsActions(_appSettings.copyWith(doneColor: dC)));
|
||||
void _updateLeftColor(Color lC) => store.dispatch(
|
||||
UpdateAppSettingsActions(_appSettings.copyWith(leftColor: lC)));
|
||||
void updateDoneColor(Color dC) => store.dispatch(
|
||||
UpdateAppSettingsActions(appSettings.copyWith(doneColor: dC)));
|
||||
void updateLeftColor(Color lC) => store.dispatch(
|
||||
UpdateAppSettingsActions(appSettings.copyWith(leftColor: lC)));
|
||||
|
||||
void _updateDuration(Duration d) => store
|
||||
.dispatch(UpdateAppSettingsActions(_appSettings.copyWith(duration: d)));
|
||||
void updateDuration(Duration d) => store
|
||||
.dispatch(UpdateAppSettingsActions(appSettings.copyWith(duration: d)));
|
||||
|
||||
return SettingsViewModel(_appSettings, store.state.hasSettingsLoaded,
|
||||
_updateDoneColor, _updateLeftColor, _updateDuration);
|
||||
return SettingsViewModel(appSettings, store.state.hasSettingsLoaded,
|
||||
updateDoneColor, updateLeftColor, updateDuration);
|
||||
}
|
||||
}
|
||||
|
@ -8,7 +8,8 @@ import 'package:time_progress_tracker/models/time_progress.dart';
|
||||
class TimeProgressListStoreConnector extends StatelessWidget {
|
||||
final Widget Function(BuildContext, TimeProgressListViewModel) loadedBuilder;
|
||||
|
||||
TimeProgressListStoreConnector({
|
||||
const TimeProgressListStoreConnector({
|
||||
super.key,
|
||||
@required this.loadedBuilder,
|
||||
});
|
||||
|
||||
@ -18,10 +19,11 @@ class TimeProgressListStoreConnector extends StatelessWidget {
|
||||
onInit: loadTimeProgressListIfUnloaded,
|
||||
converter: (store) => TimeProgressListViewModel._create(store),
|
||||
builder: (context, TimeProgressListViewModel vm) {
|
||||
if (!vm.hasTpListLoaded)
|
||||
return Center(
|
||||
if (!vm.hasTpListLoaded) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(),
|
||||
);
|
||||
}
|
||||
return loadedBuilder(context, vm);
|
||||
},
|
||||
);
|
||||
|
@ -11,7 +11,8 @@ class TimeProgressStoreConnector extends StatelessWidget {
|
||||
final String timeProgressId;
|
||||
final Widget Function(BuildContext, TimeProgressViewModel) loadedBuilder;
|
||||
|
||||
TimeProgressStoreConnector({
|
||||
const TimeProgressStoreConnector({
|
||||
super.key,
|
||||
@required this.timeProgressId,
|
||||
@required this.loadedBuilder,
|
||||
});
|
||||
@ -23,14 +24,16 @@ class TimeProgressStoreConnector extends StatelessWidget {
|
||||
converter: (store) =>
|
||||
TimeProgressViewModel._create(store, timeProgressId),
|
||||
builder: (context, TimeProgressViewModel vm) {
|
||||
if (!vm.hasTpListLoaded)
|
||||
return Center(
|
||||
if (!vm.hasTpListLoaded) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(),
|
||||
);
|
||||
if (vm.tp == null)
|
||||
return Center(
|
||||
}
|
||||
if (vm.tp == null) {
|
||||
return const Center(
|
||||
child: Text("Error Invalid Time Progress"),
|
||||
);
|
||||
}
|
||||
return loadedBuilder(context, vm);
|
||||
},
|
||||
);
|
||||
@ -52,15 +55,15 @@ class TimeProgressViewModel {
|
||||
);
|
||||
|
||||
factory TimeProgressViewModel._create(Store<AppState> store, String id) {
|
||||
void _updateTimeProgress(TimeProgress tp) =>
|
||||
void updateTimeProgress(TimeProgress tp) =>
|
||||
store.dispatch(UpdateTimeProgressAction(id, tp));
|
||||
void _deleteTimeProgress() => store.dispatch(DeleteTimeProgressAction(id));
|
||||
void deleteTimeProgress() => store.dispatch(DeleteTimeProgressAction(id));
|
||||
|
||||
return TimeProgressViewModel(
|
||||
selectProgressById(store.state.timeProgressList, id),
|
||||
store.state.hasProgressesLoaded,
|
||||
_updateTimeProgress,
|
||||
_deleteTimeProgress,
|
||||
updateTimeProgress,
|
||||
deleteTimeProgress,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user