Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Added splash page

Michael Rademaker40ce622b0d20
diff --git a/console/generic_app/assets/images/or_splash.png b/console/generic_app/assets/images/or_splash.png
new file mode 100644
index 000000000..0464d21b3
Binary files /dev/null and b/console/generic_app/assets/images/or_splash.png differ
diff --git a/console/generic_app/lib/main.dart b/console/generic_app/lib/main.dart
index b7de2d015..5740ccd61 100644
--- a/console/generic_app/lib/main.dart
+++ b/console/generic_app/lib/main.dart
@@ -1,10 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:generic_app/ui/SplashPage.dart';
import 'generated/l10n.dart';
-import 'package:generic_app/ui/ProjectPage.dart';
-
void main() {
WidgetsFlutterBinding.ensureInitialized();
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp])
@@ -28,7 +27,7 @@ class ORApp extends StatelessWidget {
GlobalCupertinoLocalizations.delegate,
],
supportedLocales: S.delegate.supportedLocales,
- home: ProjectPage(),
+ home: SplashPage(),
);
}
}
diff --git a/console/generic_app/lib/ui/ProjectPage.dart b/console/generic_app/lib/ui/ProjectPage.dart
index 44af68a4a..0144f87bb 100644
--- a/console/generic_app/lib/ui/ProjectPage.dart
+++ b/console/generic_app/lib/ui/ProjectPage.dart
@@ -4,6 +4,7 @@ import 'package:generic_app/generated/l10n.dart';
import 'package:generic_app/models/ConsoleAppConfig.dart';
import 'package:generic_app/network/ApiManager.dart';
import 'package:generic_app/ui/WebViewPage.dart';
+import 'package:shared_preferences/shared_preferences.dart';
class ProjectPage extends StatefulWidget {
ProjectPage({Key key}) : super(key: key);
@@ -13,12 +14,22 @@ class ProjectPage extends StatefulWidget {
}
class _ProjectPageState extends State<ProjectPage> {
+ SharedPreferences _sharedPreferences;
String _projectName;
String _realmName;
BuildContext _innerContext;
+ @override
+ void initState() {
+ SharedPreferences.getInstance().then((value) {
+ _sharedPreferences = value;
+ });
+ super.initState();
+ }
+
@override
Widget build(BuildContext context) {
+
return Scaffold(body: Builder(builder: (BuildContext innerContext) {
_innerContext = innerContext;
return SafeArea(
@@ -123,7 +134,8 @@ class _ProjectPageState extends State<ProjectPage> {
var apiManager =
new ApiManager("https://$_projectName.openremote.io/api/$_realmName");
apiManager.get(["app", "config"], ConsoleAppConfig.fromJson).then((value) {
- print(value);
+ _sharedPreferences.setString("project", _projectName);
+ _sharedPreferences.setString("realm", _realmName);
CurrentConsoleAppConfig.instance.updateConfig(value, _projectName);
Navigator.push(
context,
diff --git a/console/generic_app/lib/ui/SplashPage.dart b/console/generic_app/lib/ui/SplashPage.dart
new file mode 100644
index 000000000..55ba4ddad
--- /dev/null
+++ b/console/generic_app/lib/ui/SplashPage.dart
@@ -0,0 +1,77 @@
+import 'dart:async';
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:generic_app/config/CurrentConsoleAppConfig.dart';
+import 'package:generic_app/models/ConsoleAppConfig.dart';
+import 'package:generic_app/network/ApiManager.dart';
+import 'package:generic_app/ui/ProjectPage.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'WebViewPage.dart';
+
+class SplashPage extends StatefulWidget {
+ SplashPage({Key key}) : super(key: key);
+
+ @override
+ _SplashPageState createState() => _SplashPageState();
+}
+
+class _SplashPageState extends State<SplashPage> {
+ SharedPreferences _sharedPreferences;
+ String _projectName;
+ String _realmName;
+
+ @override
+ Widget build(BuildContext context) {
+ return new FutureBuilder(
+ future: _getProjectData(),
+ builder: (BuildContext context, AsyncSnapshot snapshot) {
+ Timer(Duration(seconds: 3), () {
+ if (snapshot.hasData) {
+ if (snapshot.data) {
+ _getConsoleAppConfig();
+ }
+ } else {
+ Navigator.pushReplacement(context,
+ CupertinoPageRoute(builder: (context) => ProjectPage()));
+ }
+ });
+ return Scaffold(
+ body: Align(
+ alignment: Alignment.center,
+ child: Container(
+ padding: EdgeInsets.all(50),
+ child: Image.asset('assets/images/or_splash.png',
+ fit: BoxFit.contain),
+ )));
+ });
+ }
+
+ Future<bool> _getProjectData() async {
+ _sharedPreferences = await SharedPreferences.getInstance();
+ _projectName = _sharedPreferences.getString("project");
+ _realmName = _sharedPreferences.getString("realm");
+
+ return _projectName != null && _realmName != null;
+ }
+
+ void _getConsoleAppConfig() {
+ var apiManager =
+ new ApiManager("https://$_projectName.openremote.io/api/$_realmName");
+ apiManager.get(["app", "config"], ConsoleAppConfig.fromJson).then((value) {
+ print(value);
+ CurrentConsoleAppConfig.instance.updateConfig(value, _projectName);
+ Navigator.pushReplacement(
+ context,
+ CupertinoPageRoute(
+ builder: (context) => WebViewPage(
+ initialUrl: CurrentConsoleAppConfig.instance.url,
+ )));
+ }).catchError((onError) {
+ print(onError);
+ Navigator.pushReplacement(
+ context, CupertinoPageRoute(builder: (context) => ProjectPage()));
+ });
+ }
+}