More redux work
This commit is contained in:
vjrj
parent
69428c5d96
commit
5d947f9577
14 changed files with 170 additions and 88 deletions
|
|
@ -1,19 +1,50 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:comunes_flutter/comunes_flutter.dart';
|
||||
import 'package:fires_flutter/models/yourLocation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_fab_dialer/flutter_fab_dialer.dart';
|
||||
import 'package:flutter_redux/flutter_redux.dart';
|
||||
|
||||
import 'colors.dart';
|
||||
import 'generated/i18n.dart';
|
||||
import 'genericMap.dart';
|
||||
import 'globalFiresBottomStats.dart';
|
||||
import 'globals.dart' as globals;
|
||||
import 'locationUtils.dart';
|
||||
import 'mainDrawer.dart';
|
||||
import 'models/appState.dart';
|
||||
import 'placesAutocompleteUtils.dart';
|
||||
import 'package:fires_flutter/models/yourLocation.dart';
|
||||
import 'package:fires_flutter/models/yourLocationPersist.dart';
|
||||
import 'redux/actions.dart';
|
||||
|
||||
class _ViewModel {
|
||||
final List<YourLocation> yourLocations;
|
||||
final AddYourLocationFunction onAdd;
|
||||
final DeleteYourLocationFunction onDelete;
|
||||
final ToggleSubscriptionFunction onToggleSubs;
|
||||
|
||||
_ViewModel(
|
||||
{@required this.onAdd,
|
||||
@required this.onDelete,
|
||||
@required this.onToggleSubs,
|
||||
@required this.yourLocations});
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) =>
|
||||
identical(this, other) ||
|
||||
other is _ViewModel &&
|
||||
runtimeType == other.runtimeType &&
|
||||
yourLocations == other.yourLocations &&
|
||||
onAdd == other.onAdd &&
|
||||
onDelete == other.onDelete &&
|
||||
onToggleSubs == other.onToggleSubs;
|
||||
|
||||
@override
|
||||
int get hashCode =>
|
||||
yourLocations.hashCode ^
|
||||
onAdd.hashCode ^
|
||||
onDelete.hashCode ^
|
||||
onToggleSubs.hashCode;
|
||||
}
|
||||
|
||||
class ActiveFiresPage extends StatefulWidget {
|
||||
static const String routeName = '/fires';
|
||||
|
|
@ -27,7 +58,7 @@ class ActiveFiresPage extends StatefulWidget {
|
|||
class _ActiveFiresPageState extends State<ActiveFiresPage> {
|
||||
final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
|
||||
|
||||
List<FabMiniMenuItem> _fabMiniMenuItemList() {
|
||||
List<FabMiniMenuItem> _fabMiniMenuItemList(AddYourLocationFunction onAdd) {
|
||||
return [
|
||||
new FabMiniMenuItem.withText(
|
||||
new Icon(Icons.location_searching),
|
||||
|
|
@ -35,7 +66,7 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
|
|||
8.0,
|
||||
S.of(context).addYourCurrentPosition,
|
||||
() {
|
||||
onAddYourLocation();
|
||||
onAddYourLocation(onAdd);
|
||||
},
|
||||
S.of(context).addYourCurrentPosition,
|
||||
Colors.black38,
|
||||
|
|
@ -43,14 +74,14 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
|
|||
),
|
||||
new FabMiniMenuItem.withText(new Icon(Icons.edit_location), fires600, 8.0,
|
||||
S.of(context).addSomePlace, () {
|
||||
onAddOtherLocation();
|
||||
onAddOtherLocation(onAdd);
|
||||
}, S.of(context).addSomePlace, Colors.black38, Colors.white)
|
||||
];
|
||||
}
|
||||
|
||||
_ActiveFiresPageState();
|
||||
|
||||
Widget _buildRow(YourLocation loc) {
|
||||
Widget _buildRow(YourLocation loc, onToggle) {
|
||||
return new ListTile(
|
||||
dense: true,
|
||||
leading: const Icon(Icons.location_on),
|
||||
|
|
@ -60,10 +91,11 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
|
|||
: Icons.notifications_off),
|
||||
onPressed: () {
|
||||
loc.subscribed = !loc.subscribed;
|
||||
int i = globals.yourLocations.indexOf(loc);
|
||||
onToggle(loc.id);
|
||||
/* FIXME int i = globals.yourLocations.indexOf(loc);
|
||||
globals.yourLocations.removeAt(i);
|
||||
globals.yourLocations.insert(i, loc);
|
||||
persistYourLocations();
|
||||
persistYourLocations(); */
|
||||
setState(() {});
|
||||
}),
|
||||
title: new Text(loc.description),
|
||||
|
|
@ -92,31 +124,31 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
|
|||
));
|
||||
}
|
||||
|
||||
Widget _buildSavedLocations() {
|
||||
Widget _buildSavedLocations(List<YourLocation> yl, onDeleted, onToggle) {
|
||||
return new ListView.builder(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
itemCount: globals.yourLocations.length,
|
||||
itemCount: yl.length,
|
||||
itemBuilder: (BuildContext _context, int i) {
|
||||
return _buildItem(globals.yourLocations.elementAt(i));
|
||||
return _buildItem(yl.elementAt(i), onDeleted, onToggle);
|
||||
});
|
||||
}
|
||||
|
||||
void handleUndo(YourLocation item) {
|
||||
setState(() {
|
||||
/* FIXME
|
||||
globals.yourLocations.add(item);
|
||||
persistYourLocations();
|
||||
persistYourLocations(); */
|
||||
});
|
||||
}
|
||||
|
||||
Widget _buildItem(YourLocation item) {
|
||||
Widget _buildItem(YourLocation item, onDelete, onToggle) {
|
||||
final ThemeData theme = Theme.of(context);
|
||||
return new Dismissible(
|
||||
key: new ObjectKey(item),
|
||||
direction: DismissDirection.horizontal,
|
||||
onDismissed: (DismissDirection direction) {
|
||||
setState(() {
|
||||
globals.yourLocations.remove(item);
|
||||
persistYourLocations();
|
||||
onDelete(item.id);
|
||||
});
|
||||
|
||||
_scaffoldKey.currentState.showSnackBar(new SnackBar(
|
||||
|
|
@ -142,67 +174,89 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
|
|||
color: theme.canvasColor,
|
||||
border: new Border(
|
||||
bottom: new BorderSide(color: theme.dividerColor))),
|
||||
child: _buildRow(item)));
|
||||
child: _buildRow(item, onToggle)));
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var hasLocations = globals.yourLocations.length > 0;
|
||||
final title = hasLocations
|
||||
? S.of(context).firesInYourPlaces
|
||||
: S.of(context).firesInTheWorld;
|
||||
print('Building Active Fires');
|
||||
return Scaffold(
|
||||
key: _scaffoldKey,
|
||||
// FIXME new?
|
||||
drawer: new MainDrawer(context),
|
||||
appBar: new AppBar(
|
||||
title: Text(title),
|
||||
leading: IconButton(
|
||||
icon: Icon(Icons.menu),
|
||||
onPressed: () {
|
||||
_scaffoldKey.currentState.openDrawer();
|
||||
},
|
||||
),
|
||||
),
|
||||
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
|
||||
bottomNavigationBar: new GlobalFiresBottomStats(),
|
||||
body: hasLocations
|
||||
? new Stack(children: <Widget>[
|
||||
_buildSavedLocations(),
|
||||
new FabDialer(
|
||||
_fabMiniMenuItemList(), fires600, new Icon(Icons.add))
|
||||
])
|
||||
: new Center(
|
||||
child: new CenteredColumn(children: <Widget>[
|
||||
new RoundedBtn(
|
||||
icon: Icons.location_searching,
|
||||
text: 'Fires near your',
|
||||
onPressed: onAddYourLocation,
|
||||
backColor: fires600),
|
||||
const SizedBox(height: 26.0),
|
||||
new RoundedBtn(
|
||||
icon: Icons.edit_location,
|
||||
text: S.of(context).firesNearPlace,
|
||||
onPressed: onAddOtherLocation,
|
||||
backColor: fires600),
|
||||
])),
|
||||
);
|
||||
return new StoreConnector<AppState, _ViewModel>(
|
||||
distinct: false, // FIXME
|
||||
converter: (store) {
|
||||
return new _ViewModel(
|
||||
onAdd: (loc) {
|
||||
store.dispatch(new AddYourLocationAction(loc));
|
||||
},
|
||||
onDelete: (id) {
|
||||
store.dispatch(new DeleteYourLocationAction(id));
|
||||
},
|
||||
onToggleSubs: (id) {
|
||||
store.dispatch(new ToggleSubscriptionAction(id));
|
||||
},
|
||||
yourLocations: store.state.yourLocations);
|
||||
},
|
||||
builder: (context, view) {
|
||||
var hasLocations = view.yourLocations.length > 0;
|
||||
final title = hasLocations
|
||||
? S.of(context).firesInYourPlaces
|
||||
: S.of(context).firesInTheWorld;
|
||||
print('Building Active Fires');
|
||||
|
||||
return Scaffold(
|
||||
key: _scaffoldKey,
|
||||
// FIXME new?
|
||||
drawer: new MainDrawer(context),
|
||||
appBar: new AppBar(
|
||||
title: Text(title),
|
||||
leading: IconButton(
|
||||
icon: Icon(Icons.menu),
|
||||
onPressed: () {
|
||||
_scaffoldKey.currentState.openDrawer();
|
||||
},
|
||||
),
|
||||
),
|
||||
floatingActionButtonLocation:
|
||||
FloatingActionButtonLocation.centerFloat,
|
||||
bottomNavigationBar: new GlobalFiresBottomStats(),
|
||||
body: hasLocations
|
||||
? new Stack(children: <Widget>[
|
||||
_buildSavedLocations(
|
||||
view.yourLocations, view.onDelete, view.onToggleSubs),
|
||||
new FabDialer(_fabMiniMenuItemList(view.onAdd), fires600,
|
||||
new Icon(Icons.add))
|
||||
])
|
||||
: new Center(
|
||||
child: new CenteredColumn(children: <Widget>[
|
||||
new RoundedBtn(
|
||||
icon: Icons.location_searching,
|
||||
text: 'Fires near your',
|
||||
onPressed: () => onAddYourLocation(view.onAdd),
|
||||
backColor: fires600),
|
||||
const SizedBox(height: 26.0),
|
||||
new RoundedBtn(
|
||||
icon: Icons.edit_location,
|
||||
text: S.of(context).firesNearPlace,
|
||||
onPressed: () => onAddOtherLocation(view.onAdd),
|
||||
backColor: fires600),
|
||||
])),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
void onAddYourLocation() {
|
||||
void onAddYourLocation(AddYourLocationFunction onAdd) {
|
||||
Future<YourLocation> location = getUserLocation(_scaffoldKey);
|
||||
_saveLocation(location);
|
||||
_saveLocation(location, onAdd);
|
||||
}
|
||||
|
||||
void onAddOtherLocation() {
|
||||
void onAddOtherLocation(AddYourLocationFunction onAdd) {
|
||||
Future<YourLocation> location = openPlacesDialog(_scaffoldKey);
|
||||
_saveLocation(location);
|
||||
_saveLocation(location, onAdd);
|
||||
}
|
||||
|
||||
void _saveLocation(Future<YourLocation> location) {
|
||||
void _saveLocation(Future<YourLocation> location, onAdd) {
|
||||
location.then((newLocation) {
|
||||
if (newLocation != YourLocation.noLocation) {
|
||||
onAdd(newLocation);
|
||||
/* FIXME
|
||||
if (globals.yourLocations.contains(newLocation)) {
|
||||
showSnackMsg(S.of(context).addedThisLocation);
|
||||
} else
|
||||
|
|
@ -212,7 +266,7 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
|
|||
new Timer(new Duration(milliseconds: 1000), () {
|
||||
showLocationMap(newLocation);
|
||||
});
|
||||
});
|
||||
}); */
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue