Last changes not published
This commit is contained in:
parent
ac65ccf990
commit
21ec08303a
43 changed files with 607 additions and 613 deletions
|
|
@ -3,6 +3,7 @@ import 'dart:async';
|
|||
import 'package:comunes_flutter/comunes_flutter.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_simple_dependency_injection/injector.dart';
|
||||
import 'package:package_info/package_info.dart';
|
||||
import 'package:redux/redux.dart';
|
||||
import 'package:sentry/sentry.dart';
|
||||
|
||||
|
|
@ -12,7 +13,6 @@ import 'models/appState.dart';
|
|||
import 'models/firesApi.dart';
|
||||
import 'redux/fetchDataMiddleware.dart';
|
||||
import 'redux/reducers.dart';
|
||||
import 'package:package_info/package_info.dart';
|
||||
import 'sentryReport.dart';
|
||||
|
||||
Future<PackageInfo> loadPackageInfo() async {
|
||||
|
|
@ -22,13 +22,14 @@ Future<PackageInfo> loadPackageInfo() async {
|
|||
|
||||
Future<Map<String, dynamic>> loadSecrets() async {
|
||||
return await SecretLoader(
|
||||
secretPath: globals.isDevelopment?
|
||||
'assets/private-settings-dev.json' :
|
||||
'assets/private-settings.json'
|
||||
).load();
|
||||
secretPath: globals.isDevelopment
|
||||
? 'assets/private-settings-dev.json'
|
||||
: 'assets/private-settings.json')
|
||||
.load();
|
||||
}
|
||||
|
||||
void mainCommon(List<Middleware<AppState>> otherMiddleware) {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
final injector = Injector.getInjector();
|
||||
injector.map<FiresApi>((i) => new FiresApi(), isSingleton: true);
|
||||
loadPackageInfo().then((packageInfo) {
|
||||
|
|
@ -36,13 +37,12 @@ void mainCommon(List<Middleware<AppState>> otherMiddleware) {
|
|||
print('Running version ${packageInfo.version}');
|
||||
loadSecrets().then((secrets) {
|
||||
final store = new Store<AppState>(appStateReducer,
|
||||
initialState: new AppState(
|
||||
gmapKey: secrets['gmapKey'],
|
||||
firesApiKey: secrets['firesApiKey'],
|
||||
serverUrl: secrets['firesApiUrl'],
|
||||
firesApiUrl: secrets['firesApiUrl'] + "api/v1/"),
|
||||
middleware: List.from(otherMiddleware)
|
||||
..add(fetchDataMiddleware));
|
||||
initialState: new AppState(
|
||||
gmapKey: secrets['gmapKey'],
|
||||
firesApiKey: secrets['firesApiKey'],
|
||||
serverUrl: secrets['firesApiUrl'],
|
||||
firesApiUrl: secrets['firesApiUrl'] + "api/v1/"),
|
||||
middleware: List.from(otherMiddleware)..add(fetchDataMiddleware));
|
||||
|
||||
injector.map<Store<AppState>>((i) => store);
|
||||
injector.map<String>((i) => store.state.firesApiUrl, key: "firesApiUrl");
|
||||
|
|
@ -56,9 +56,9 @@ void mainCommon(List<Middleware<AppState>> otherMiddleware) {
|
|||
}
|
||||
|
||||
// https://flutter.io/cookbook/maintenance/error-reporting/
|
||||
runZoned<Future<Null>>(() async {
|
||||
runZonedGuarded<Future<void>>(() async {
|
||||
runApp(new FiresApp(store));
|
||||
}, onError: (error, stackTrace) {
|
||||
}, (Object error, StackTrace stackTrace) {
|
||||
// Whenever an error occurs, call the `_reportError` function. This will send
|
||||
// Dart errors to our dev console or Sentry depending on the environment.
|
||||
reportError(error, stackTrace);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue