From de17ebe2b4466cb918ef4f921ab8edabc021a6a2 Mon Sep 17 00:00:00 2001 From: "Vicente J. Ruiz Jurado" Date: Mon, 6 Aug 2018 13:20:19 +0200 Subject: [PATCH] Monitorized areas to production --- android/app/build.gradle | 4 ++-- lib/globals.dart | 2 +- lib/mainDrawer.dart | 27 +++++++++++++-------------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index b3a11ed..4d2564b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -30,8 +30,8 @@ android { applicationId "org.comunes.fires" minSdkVersion 16 targetSdkVersion 27 - versionCode 3 - versionName "1.3" + versionCode 4 + versionName "1.4" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/lib/globals.dart b/lib/globals.dart index a2a4951..61ebbfb 100644 --- a/lib/globals.dart +++ b/lib/globals.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'dart:async'; -final String appVersion = '1.3'; +final String appVersion = '1.4'; final Widget appMediumIcon = Image.asset('images/logo-200.png', width: 60.0, height: 60.0); diff --git a/lib/mainDrawer.dart b/lib/mainDrawer.dart index f4544b7..4899326 100644 --- a/lib/mainDrawer.dart +++ b/lib/mainDrawer.dart @@ -10,10 +10,10 @@ import 'fireNotificationList.dart'; import 'generated/i18n.dart'; import 'globals.dart' as globals; import 'models/appState.dart'; +import 'monitoredAreas.dart'; import 'privacyPage.dart'; import 'sandbox.dart'; import 'supportPage.dart'; -import 'monitoredAreas.dart'; @immutable class _ViewModel { @@ -106,21 +106,20 @@ Widget mainDrawer(BuildContext context, String currentRoute) { value: ' ${view.unreadCount.toString()} ') : Text(S.of(context).fireNotificationsTitleShort), onTap: () { - Navigator.popAndPushNamed(context, FireNotificationList.routeName); + Navigator.popAndPushNamed( + context, FireNotificationList.routeName); + }, + ), + new ListTile( + leading: const Icon(Icons.map), + selected: currentRoute == MonitoredAreasPage.routeName, + title: new Text(S.of(context).monitoredAreasTitle), + onTap: () { + Navigator.pop(context); + Navigator.popAndPushNamed( + context, MonitoredAreasPage.routeName); }, ), - globals.isDevelopment - ? new ListTile( - leading: const Icon(Icons.map), - selected: currentRoute == MonitoredAreasPage.routeName, - title: new Text(S.of(context).monitoredAreasTitle), - onTap: () { - Navigator.pop(context); - Navigator.popAndPushNamed( - context, MonitoredAreasPage.routeName); - }, - ) - : null, new Divider(), new ListTile( leading: const Icon(Icons.favorite),