From 7a150f31958478221cf51b30c5ed90519a96351a Mon Sep 17 00:00:00 2001
From: Maximilian Betz <Maximilian.Betz@awi.de>
Date: Thu, 31 Mar 2022 14:29:50 +0200
Subject: [PATCH] event more cleanup
---
lib/addevent.dart | 1 -
lib/configuration.dart | 1 -
lib/databaseconnector.dart | 1 -
lib/datamodel.dart | 2 --
lib/main.dart | 14 ++------------
5 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/lib/addevent.dart b/lib/addevent.dart
index c1cde5a..242ce79 100644
--- a/lib/addevent.dart
+++ b/lib/addevent.dart
@@ -8,7 +8,6 @@ import 'datamodel.dart';
import 'databaseconnector.dart';
import 'dart:async';
import 'package:geolocator/geolocator.dart';
-import 'package:shared_preferences/shared_preferences.dart';
class AddEvent extends StatefulWidget {
const AddEvent({Key? key}) : super(key: key);
diff --git a/lib/configuration.dart b/lib/configuration.dart
index 3cc0ac8..45b08ad 100644
--- a/lib/configuration.dart
+++ b/lib/configuration.dart
@@ -5,7 +5,6 @@ import 'package:flutter/services.dart';
import 'datamodel.dart';
import 'sensorconnector.dart';
import 'databaseconnector.dart';
-import 'package:shared_preferences/shared_preferences.dart';
import 'package:path/path.dart';
import 'package:path_provider/path_provider.dart';
diff --git a/lib/databaseconnector.dart b/lib/databaseconnector.dart
index 9d2c46d..96a6ff4 100644
--- a/lib/databaseconnector.dart
+++ b/lib/databaseconnector.dart
@@ -1,5 +1,4 @@
import 'dart:convert';
-
import 'package:sqflite/sqflite.dart';
import 'package:path/path.dart';
import 'dart:async';
diff --git a/lib/datamodel.dart b/lib/datamodel.dart
index b9488bd..dfa5a21 100644
--- a/lib/datamodel.dart
+++ b/lib/datamodel.dart
@@ -1,6 +1,4 @@
-
import 'dart:convert';
-
import 'package:flutter/cupertino.dart';
import 'package:shared_preferences/shared_preferences.dart';
diff --git a/lib/main.dart b/lib/main.dart
index f4f1bba..77b0403 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,4 @@
-import 'dart:convert';
import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'datamodel.dart';
import 'addevent.dart';
@@ -14,7 +12,7 @@ Future<void> loadConfiguration() async {
final EventStoreInstance event = EventStoreInstance();
WidgetsFlutterBinding.ensureInitialized();
-
+ // Load conf and last event fields from shared preferences to prefill UI
await configuration.loadFromSharedPrefs();
await event.loadFromSharedPrefs();
@@ -25,21 +23,13 @@ Future<void> loadConfiguration() async {
var database = DatabaseInstance();
await database.connect(); //Do once at start of APP!
-
- //TODO: there should be a loading screen until configuration is loaded and database connection is established.
}
void main() {
loadConfiguration();
- EventStoreInstance events = EventStoreInstance();
- final ConfigurationStoreInstance configuration = ConfigurationStoreInstance();
-
- //Reset old data
- events.reset(); // TODO: load configuration and events from shared preferences.
- configuration.reset();
- configuration.loginInformation = SensorLogin.fromJson({"mail":"admin","password":"adminadmin"}); //TODO: replace for productive version.
+ //configuration.loginInformation = SensorLogin.fromJson({"mail":"admin","password":"adminadmin"}); //TODO: replace for productive version.
runApp(MaterialApp(
title: 'Mobile Event Log',
--
GitLab