comunes/todos-contra-el-fuego-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More work with redux, and location edit (wip)

Browse source
This commit is contained in:
vjrj 2018-07-03 13:07:02 +02:00
parent e97a5a1a9f
commit e55edce3d4
17 changed files with 311 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

63
lib/yourLocationMapBottom.dart
View file

@ -1,4 +1,4 @@
import 'package:comunes_flutter/comunes_flutter.dart';
import 'package:fires_flutter/models/yourLocation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
@ -7,12 +7,18 @@ import 'customBottomAppBar.dart';
import 'generated/i18n.dart';
import 'models/appState.dart';
import 'models/fireMapState.dart';
import 'redux/actions.dart';
@immutable
class _ViewModel {
final FireMapState state;
final OnLocationEditConfirm onLocationEditConfirm;
final OnLocationEditCancel onLocationEditCancel;
_ViewModel({@required this.state});
_ViewModel(
{@required this.state,
@required this.onLocationEditConfirm,
@required this.onLocationEditCancel});
@override
bool operator ==(Object other) =>
@ -29,30 +35,53 @@ class YourLocationMapBottom extends StatelessWidget {
@override
Widget build(BuildContext context) {
return new StoreConnector<AppState, _ViewModel>(
distinct: true, // FIXME
distinct: true,
converter: (store) {
return new _ViewModel(state: store.state.fireMapState);
return new _ViewModel(
state: store.state.fireMapState,
onLocationEditConfirm: (loc) =>
store.dispatch(new EditConfirmYourLocationAction(loc)),
onLocationEditCancel: (loc) =>
store.dispatch(new
EditCancelYourLocationAction(loc)));
},
builder: (context, view) {
int kmAround = view.state.yourLocation.distance;
YourLocation loc = view.state.yourLocation;
int kmAround = loc.distance;
return new CustomBottomAppBar(
fabLocation: FloatingActionButtonLocation.centerFloat,
showNotch: false,
color: fires100,
// height: 170.0,
mainAxisAlignment: MainAxisAlignment.center,
actions: listWithoutNulls(<Widget>[
view.state.status == FireMapStatus.subscriptionConfirm ||
view.state.numFires == null
? null
: new Text(view.state.numFires > 0
? S.of(context).firesAroundThisArea(
view.state.numFires.toString(), kmAround.toString())
: S
.of(context)
.noFiresAroundThisArea(kmAround.toString())),
SizedBox(width: 10.0)
]));
actions: buildActionList(view, loc, context, kmAround));
});
}
List<Widget> buildActionList(
_ViewModel view, YourLocation loc, BuildContext context, int kmAround) {
List<Widget> actionList = new List<Widget>();
switch (view.state.status) {
case FireMapStatus.edit:
actionList.add(new FlatButton(
onPressed: () => view.onLocationEditConfirm(loc),
child: new Text(S.of(context).SAVE, style: Theme.of(context).textTheme.button)));
actionList.add(new FlatButton(
onPressed: () => view.onLocationEditCancel(loc),
child: new Text(S.of(context).CANCEL, style: Theme.of(context).textTheme.button)));
break;
case FireMapStatus.subscriptionConfirm:
break;
case FireMapStatus.unsubscribe:
case FireMapStatus.view:
if (view.state.numFires != null) {
actionList.add(new Text(view.state.numFires > 0
? S.of(context).firesAroundThisArea(
view.state.numFires.toString(), kmAround.toString())
: S.of(context).noFiresAroundThisArea(kmAround.toString())));
// SizedBox(width: 10.0)
}
}
return actionList;
}
}