YourLocations persist refactor
This commit is contained in:
parent
a9329e3824
commit
b22df7a8e2
2 changed files with 18 additions and 30 deletions
|
|
@ -1,42 +1,39 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:comunes_flutter/comunes_flutter.dart';
|
||||
import 'package:fires_flutter/models/yourLocationPersist.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_simple_dependency_injection/injector.dart';
|
||||
import 'package:redux/redux.dart';
|
||||
|
||||
import 'firebaseMessagingConf.dart';
|
||||
import 'firesApp.dart';
|
||||
import 'globals.dart' as globals;
|
||||
import 'models/appState.dart';
|
||||
import 'models/firesApi.dart';
|
||||
import 'redux/fetchDataMiddleware.dart';
|
||||
import 'redux/reducers.dart';
|
||||
import 'package:fires_flutter/models/yourLocationPersist.dart';
|
||||
import 'package:flutter_simple_dependency_injection/injector.dart';
|
||||
|
||||
Future<Map<String, dynamic>> loadSecrets() async {
|
||||
return await SecretLoader(secretPath: 'assets/private-settings.json').load();
|
||||
}
|
||||
|
||||
void mainCommon(List<Middleware<AppState>> otherMiddleware) {
|
||||
|
||||
final injector = Injector.getInjector();
|
||||
injector.map(FiresApi, (i) => new FiresApi(), isSingleton: true);
|
||||
loadSecrets().then((secrets) {
|
||||
|
||||
final store = new Store<AppState>(appStateReducer,
|
||||
initialState: new AppState(
|
||||
gmapKey: secrets['gmapKey'],
|
||||
firesApiKey: secrets['firesApiKey'],
|
||||
firesApiUrl: secrets['firesApiUrl'] + "api/v1/"),
|
||||
middleware: List.from(otherMiddleware)..add(fetchYourLocationsMiddleware));
|
||||
middleware: List.from(otherMiddleware)
|
||||
..add(fetchYourLocationsMiddleware));
|
||||
|
||||
injector.map(String, (i) => store.state.firesApiUrl, key: "firesApiUrl");
|
||||
injector.map(String, (i) => store.state.firesApiKey, key: "firesApiKey");
|
||||
injector.map(String, (i) => store.state.gmapKey, key: "gmapKey");
|
||||
|
||||
globals.prefs.then((prefs) {
|
||||
loadYourLocationsWithPrefs(prefs);
|
||||
loadYourLocations().then((yl) {
|
||||
firebaseConfig(store);
|
||||
|
||||
// Run baby run!
|
||||
|
|
@ -46,7 +43,5 @@ void mainCommon(List<Middleware<AppState>> otherMiddleware) {
|
|||
// Listen to store changes, and re-render when the state is updated
|
||||
// store.onChange.listen((state) {
|
||||
// });
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue