Implementato blocco applicazione

is-sobrero · Oct 11, 2020 · b5ae9a9 · b5ae9a9
1 parent 5bfdcb4
commit b5ae9a9
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 61 deletions.
diff --git a/lib/cloud_connector/ConfigData.dart b/lib/cloud_connector/ConfigData.dart
@@ -21,16 +21,6 @@ class ConfigData {
     _code = json['code'];
     _data = json['data'] != null ? new Data.fromJson(json['data']) : null;
   }
-
-  Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = new Map<String, dynamic>();
-    data['status'] = this._status;
-    data['code'] = this._code;
-    if (this._data != null) {
-      data['data'] = this._data.toJson();
-    }
-    return data;
-  }
 }
 
 class Data {
@@ -43,54 +33,22 @@ class Data {
   String _trailingNoticeContent;
   String _trailingNoticeAction;
   String _trailingNoticeRedirect;
-
-  Data(
-      {int latestVersion,
-        bool headingNoticeEnabled,
-        String headingNoticeContent,
-        bool trailingNoticeEnabled,
-        String trailingNoticeTitle,
-        String trailingNoticeImg,
-        String trailingNoticeContent,
-        String trailingNoticeAction,
-        String trailingNoticeRedirect}) {
-    this._latestVersion = latestVersion;
-    this._headingNoticeEnabled = headingNoticeEnabled;
-    this._headingNoticeContent = headingNoticeContent;
-    this._trailingNoticeEnabled = trailingNoticeEnabled;
-    this._trailingNoticeTitle = trailingNoticeTitle;
-    this._trailingNoticeImg = trailingNoticeImg;
-    this._trailingNoticeContent = trailingNoticeContent;
-    this._trailingNoticeAction = trailingNoticeAction;
-    this._trailingNoticeRedirect = trailingNoticeRedirect;
-  }
+  String _stopEnabled;
+  String _stopType;
+  String _stopDescription;
 
   int get latestVersion => _latestVersion;
-  set latestVersion(int latestVersion) => _latestVersion = latestVersion;
   bool get headingNoticeEnabled => _headingNoticeEnabled;
-  set headingNoticeEnabled(bool headingNoticeEnabled) =>
-      _headingNoticeEnabled = headingNoticeEnabled;
   String get headingNoticeContent => _headingNoticeContent;
-  set headingNoticeContent(String headingNoticeContent) =>
-      _headingNoticeContent = headingNoticeContent;
   bool get trailingNoticeEnabled => _trailingNoticeEnabled;
-  set trailingNoticeEnabled(bool trailingNoticeEnabled) =>
-      _trailingNoticeEnabled = trailingNoticeEnabled;
   String get trailingNoticeTitle => _trailingNoticeTitle;
-  set trailingNoticeTitle(String trailingNoticeTitle) =>
-      _trailingNoticeTitle = trailingNoticeTitle;
   String get trailingNoticeImg => _trailingNoticeImg;
-  set trailingNoticeImg(String trailingNoticeImg) =>
-      _trailingNoticeImg = trailingNoticeImg;
   String get trailingNoticeContent => _trailingNoticeContent;
-  set trailingNoticeContent(String trailingNoticeContent) =>
-      _trailingNoticeContent = trailingNoticeContent;
   String get trailingNoticeAction => _trailingNoticeAction;
-  set trailingNoticeAction(String trailingNoticeAction) =>
-      _trailingNoticeAction = trailingNoticeAction;
   String get trailingNoticeRedirect => _trailingNoticeRedirect;
-  set trailingNoticeRedirect(String trailingNoticeRedirect) =>
-      _trailingNoticeRedirect = trailingNoticeRedirect;
+  String get stopEnabled => _stopEnabled;
+  String get stopType => _stopType;
+  String get stopDescription => _stopDescription;
 
   Data.fromJson(Map<String, dynamic> json) {
     _latestVersion = json['latest_version'];
@@ -102,19 +60,9 @@ class Data {
     _trailingNoticeContent = json['trailing_notice_content'];
     _trailingNoticeAction = json['trailing_notice_action'];
     _trailingNoticeRedirect = json['trailing_notice_redirect'];
+    _stopEnabled = json['stop_enabled'];
+    _stopType = json['stop_type'];
+    _stopDescription = json['stop_description'];
   }
 
-  Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = new Map<String, dynamic>();
-    data['latest_version'] = this._latestVersion;
-    data['heading_notice_enabled'] = this._headingNoticeEnabled;
-    data['heading_notice_content'] = this._headingNoticeContent;
-    data['trailing_notice_enabled'] = this._trailingNoticeEnabled;
-    data['trailing_notice_title'] = this._trailingNoticeTitle;
-    data['trailing_notice_img'] = this._trailingNoticeImg;
-    data['trailing_notice_content'] = this._trailingNoticeContent;
-    data['trailing_notice_action'] = this._trailingNoticeAction;
-    data['trailing_notice_redirect'] = this._trailingNoticeRedirect;
-    return data;
-  }
 }
diff --git a/lib/login/login.dart b/lib/login/login.dart
@@ -254,6 +254,25 @@ class _AppLoginState extends State<AppLogin> with SingleTickerProviderStateMixin
       }
     }
     ConfigData _config = await CloudConnector.getServerConfig();
+    print(_config.data.stopEnabled);
+    if (_config.data.stopEnabled == "1" && Utilities.isInternalBuild){
+      showDialog(
+        context: context,
+        barrierDismissible: false,
+        builder: (context) => SobreroDialogNoAction(
+          headingWidget: Icon(
+            TablerIcons.info_circle,
+            color: Theme.of(context).primaryColor,
+            size: 35,
+          ),
+          title: "mySobrero è ${_config.data.stopType}",
+          content: Text(
+            _config.data.stopDescription
+          ),
+        ),
+      );
+      return -1;
+    }
     if (!kIsWeb) {
       final PackageInfo info = await PackageInfo.fromPlatform();
       int currentVersion = int.parse(info.buildNumber);

diff --git a/lib/ui/dialogs.dart b/lib/ui/dialogs.dart
@@ -86,6 +86,76 @@ class SobreroDialogSingle extends Dialog {
   }
 }
 
+class SobreroDialogNoAction extends Dialog {
+  SobreroDialogNoAction({
+    Key key,
+    this.headingImage,
+    this.headingWidget,
+    @required this.title,
+    @required this.content,
+  }) : super (key: key);
+
+  final String headingImage;
+  final String title;
+  final Widget headingWidget;
+  final Widget content;
+
+  @override
+  Widget build(BuildContext context) {
+    return Dialog(
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), //this right here
+      child: ConstrainedBox(
+        constraints: BoxConstraints(maxWidth: 300),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            if (headingImage != null )ClipRRect(
+              borderRadius: BorderRadius.circular(8.0),
+              child: Image.asset(headingImage),
+            ),
+            if (headingWidget != null) Padding(
+              padding: const EdgeInsets.only(top: 15),
+              child: headingWidget,
+            ),
+            Padding(
+              padding: EdgeInsets.fromLTRB(
+                  10,
+                  headingWidget == null ? 10 : 0,
+                  10,10
+              ),
+              child: Column(
+                children: <Widget>[
+                  Padding(
+                    padding: EdgeInsets.all(10.0),
+                    child: Column(
+                      children: [
+                        Text(
+                          title,
+                          style: TextStyle(
+                            fontSize: 18,
+                            fontWeight: FontWeight.bold,
+                          ),
+                          textAlign: TextAlign.center,
+                        ),
+                        Padding(
+                          padding: EdgeInsets.only(top: 16),
+                          child: content,
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
 class SobreroDialogAbort extends Dialog {
   SobreroDialogAbort({
     Key key,