Skip to content

armgit / core

Public Imported from GitHub
0

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

Added quick action to get back at project page

Michael Rademaker3bcc42de9cfc
diff --git a/console/generic_app/lib/generated/intl/messages_en.dart b/console/generic_app/lib/generated/intl/messages_en.dart
index b379a918b..8244af1d8 100644
--- a/console/generic_app/lib/generated/intl/messages_en.dart
+++ b/console/generic_app/lib/generated/intl/messages_en.dart
@@ -24,6 +24,7 @@ class MessageLookup extends MessageLookupByLibrary {
"connect" : MessageLookupByLibrary.simpleMessage("Connect"),
"connectToYourApplication" : MessageLookupByLibrary.simpleMessage("Connect to your application"),
"project" : MessageLookupByLibrary.simpleMessage("Project"),
- "realm" : MessageLookupByLibrary.simpleMessage("Realm")
+ "realm" : MessageLookupByLibrary.simpleMessage("Realm"),
+ "startingPage" : MessageLookupByLibrary.simpleMessage("Starting page")
};
}
diff --git a/console/generic_app/lib/generated/intl/messages_nl.dart b/console/generic_app/lib/generated/intl/messages_nl.dart
index 4120a7c12..bfd46de46 100644
--- a/console/generic_app/lib/generated/intl/messages_nl.dart
+++ b/console/generic_app/lib/generated/intl/messages_nl.dart
@@ -24,6 +24,7 @@ class MessageLookup extends MessageLookupByLibrary {
"connect" : MessageLookupByLibrary.simpleMessage("Verbind"),
"connectToYourApplication" : MessageLookupByLibrary.simpleMessage("Verbind met jouw applicatie"),
"project" : MessageLookupByLibrary.simpleMessage("Project"),
- "realm" : MessageLookupByLibrary.simpleMessage("Realm")
+ "realm" : MessageLookupByLibrary.simpleMessage("Realm"),
+ "startingPage" : MessageLookupByLibrary.simpleMessage("Begin pagina")
};
}
diff --git a/console/generic_app/lib/generated/l10n.dart b/console/generic_app/lib/generated/l10n.dart
index 23655b73b..d6c67ceb3 100644
--- a/console/generic_app/lib/generated/l10n.dart
+++ b/console/generic_app/lib/generated/l10n.dart
@@ -72,6 +72,16 @@ class S {
args: [],
);
}
+
+ /// `Starting page`
+ String get startingPage {
+ return Intl.message(
+ 'Starting page',
+ name: 'startingPage',
+ desc: '',
+ args: [],
+ );
+ }
}
class AppLocalizationDelegate extends LocalizationsDelegate<S> {
diff --git a/console/generic_app/lib/l10n/intl_en.arb b/console/generic_app/lib/l10n/intl_en.arb
index f8254f2bb..083c1419b 100644
--- a/console/generic_app/lib/l10n/intl_en.arb
+++ b/console/generic_app/lib/l10n/intl_en.arb
@@ -2,5 +2,6 @@
"connectToYourApplication": "Connect to your application",
"project": "Project",
"realm": "Realm",
- "connect": "Connect"
+ "connect": "Connect",
+ "startingPage": "Starting page"
}
\ No newline at end of file
diff --git a/console/generic_app/lib/l10n/intl_nl.arb b/console/generic_app/lib/l10n/intl_nl.arb
index 52cc752f2..033395d55 100644
--- a/console/generic_app/lib/l10n/intl_nl.arb
+++ b/console/generic_app/lib/l10n/intl_nl.arb
@@ -2,5 +2,6 @@
"connectToYourApplication": "Verbind met jouw applicatie",
"project": "Project",
"realm": "Realm",
- "connect": "Verbind"
+ "connect": "Verbind",
+ "startingPage": "Begin pagina"
}
\ No newline at end of file
diff --git a/console/generic_app/lib/ui/SplashPage.dart b/console/generic_app/lib/ui/SplashPage.dart
index 6c66092c0..c5f71dd6a 100644
--- a/console/generic_app/lib/ui/SplashPage.dart
+++ b/console/generic_app/lib/ui/SplashPage.dart
@@ -1,11 +1,14 @@
import 'dart:async';
+import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:generic_app/config/CurrentConsoleAppConfig.dart';
+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/ProjectPage.dart';
+import 'package:quick_actions/quick_actions.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'WebViewPage.dart';
@@ -22,31 +25,64 @@ class _SplashPageState extends State<SplashPage> {
String _projectName;
String _realmName;
+ String _shortCut;
+
+ @override
+ void initState() {
+ final QuickActions quickActions = QuickActions();
+ quickActions.setShortcutItems(<ShortcutItem>[
+ const ShortcutItem(
+ type: 'project_page', localizedTitle: 'startingPage', icon: 'home'),
+ ]);
+ quickActions.initialize((String shortcutType) {
+ _shortCut = shortcutType;
+ });
+
+
+ super.initState();
+ }
+
@override
Widget build(BuildContext context) {
- return new FutureBuilder(
- future: Future.delayed(Duration(seconds: 3), _getProjectData),
- builder: (BuildContext context, AsyncSnapshot snapshot) {
- if (snapshot.hasData) {
- Future.delayed(Duration.zero, () {
- if (snapshot.data) {
- Navigator.pushReplacement(context,
- MaterialPageRoute(builder: (context) => WebViewPage(initialUrl: CurrentConsoleAppConfig.instance.url)));
- } else {
- Navigator.pushReplacement(context,
- MaterialPageRoute(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),
- )));
- });
+ if (_shortCut != null && _shortCut == 'startingPage') {
+ Future.delayed(
+ Duration(seconds: 3),
+ () => Navigator.pushReplacement(
+ context, MaterialPageRoute(builder: (context) => ProjectPage())));
+ return _splashIcon();
+ } else {
+ return new FutureBuilder(
+ future: Future.delayed(Duration(seconds: 3), _getProjectData),
+ builder: (BuildContext context, AsyncSnapshot snapshot) {
+ if (snapshot.hasData) {
+ Future.delayed(Duration.zero, () {
+ if (snapshot.data) {
+ Navigator.pushReplacement(
+ context,
+ MaterialPageRoute(
+ builder: (context) => WebViewPage(
+ initialUrl:
+ CurrentConsoleAppConfig.instance.url)));
+ } else {
+ Navigator.pushReplacement(context,
+ MaterialPageRoute(builder: (context) => ProjectPage()));
+ }
+ });
+ }
+ return _splashIcon();
+ });
+ }
+ }
+
+ Widget _splashIcon() {
+ 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 {
@@ -54,22 +90,23 @@ class _SplashPageState extends State<SplashPage> {
_projectName = _sharedPreferences.getString("project");
_realmName = _sharedPreferences.getString("realm");
- bool hasData = _projectName != null && _realmName != null;
+ bool hasData = _projectName != null && _realmName != null && _shortCut == null;
if (hasData) {
- await _getConsoleAppConfig();
+ hasData = await _getConsoleAppConfig();
}
- return hasData;
+ return hasData && _shortCut == null;
}
- Future _getConsoleAppConfig() async {
- var apiManager = new ApiManager("https://$_projectName.openremote.io/api/$_realmName");
+ Future<bool> _getConsoleAppConfig() async {
+ var apiManager = new ApiManager("https://$_projectName.openremote.io/api/$_realmName");
return apiManager
.get(["app", "config"], ConsoleAppConfig.fromJson).then((value) {
- print(value);
CurrentConsoleAppConfig.instance.updateConfig(value, _projectName);
+ return true;
}).catchError((onError) {
print(onError);
+ return false;
});
}
}
diff --git a/console/generic_app/pubspec.lock b/console/generic_app/pubspec.lock
index d50a81639..1318986d8 100644
--- a/console/generic_app/pubspec.lock
+++ b/console/generic_app/pubspec.lock
@@ -413,6 +413,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.5"
+ quick_actions:
+ dependency: "direct main"
+ description:
+ name: quick_actions
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.4.0+6"
quiver:
dependency: transitive
description:
diff --git a/console/generic_app/pubspec.yaml b/console/generic_app/pubspec.yaml
index e347c5d03..758bf11af 100644
--- a/console/generic_app/pubspec.yaml
+++ b/console/generic_app/pubspec.yaml
@@ -34,6 +34,7 @@ dependencies:
shared_preferences: ^0.5.7+3
permission_handler: ^5.0.1+1
firebase_messaging: ^5.1.4
+ quick_actions: 0.4.0+6
dev_dependencies:
flutter_test: