Removed column on fires map
This commit is contained in:
parent
aa4909f69f
commit
cee04a3d12
1 changed files with 48 additions and 52 deletions
|
|
@ -1,23 +1,24 @@
|
||||||
|
import 'dart:convert' show json;
|
||||||
|
import 'dart:core';
|
||||||
|
|
||||||
|
import 'package:comunes_flutter/comunes_flutter.dart';
|
||||||
|
import 'package:firebase_messaging/firebase_messaging.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'basicLocation.dart';
|
|
||||||
import 'package:flutter_map/flutter_map.dart';
|
import 'package:flutter_map/flutter_map.dart';
|
||||||
import 'package:flutter_map/plugin_api.dart';
|
import 'package:flutter_map/plugin_api.dart';
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
|
import 'package:just_debounce_it/just_debounce_it.dart';
|
||||||
import 'package:latlong/latlong.dart';
|
import 'package:latlong/latlong.dart';
|
||||||
import 'package:comunes_flutter/comunes_flutter.dart';
|
|
||||||
|
import 'basicLocation.dart';
|
||||||
import 'colors.dart';
|
import 'colors.dart';
|
||||||
import 'customBottomAppBar.dart';
|
import 'customBottomAppBar.dart';
|
||||||
import 'dart:core';
|
|
||||||
import 'globals.dart' as globals;
|
|
||||||
import 'package:http/http.dart' as http;
|
|
||||||
import 'dart:convert' show json;
|
|
||||||
import 'fireMarker.dart';
|
|
||||||
import 'zoomMapPlugin.dart';
|
|
||||||
import 'dummyMapPlugin.dart';
|
import 'dummyMapPlugin.dart';
|
||||||
import 'fireMarkType.dart';
|
import 'fireMarkType.dart';
|
||||||
|
import 'fireMarker.dart';
|
||||||
|
import 'globals.dart' as globals;
|
||||||
import 'slider.dart';
|
import 'slider.dart';
|
||||||
import 'package:just_debounce_it/just_debounce_it.dart';
|
import 'zoomMapPlugin.dart';
|
||||||
import 'package:firebase_messaging/firebase_messaging.dart';
|
|
||||||
|
|
||||||
|
|
||||||
enum MapOperation { view, subscriptionConfirm, unsubscribe }
|
enum MapOperation { view, subscriptionConfirm, unsubscribe }
|
||||||
|
|
||||||
|
|
@ -40,7 +41,6 @@ class _GenericMapState extends State<GenericMap> {
|
||||||
final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
|
final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
|
||||||
final FirebaseMessaging _firebaseMessaging = new FirebaseMessaging();
|
final FirebaseMessaging _firebaseMessaging = new FirebaseMessaging();
|
||||||
|
|
||||||
|
|
||||||
final BasicLocation location;
|
final BasicLocation location;
|
||||||
final String title;
|
final String title;
|
||||||
int numFires;
|
int numFires;
|
||||||
|
|
@ -137,10 +137,7 @@ class _GenericMapState extends State<GenericMap> {
|
||||||
appBar: new AppBar(
|
appBar: new AppBar(
|
||||||
title: new Text(title),
|
title: new Text(title),
|
||||||
),
|
),
|
||||||
floatingActionButton: Column(mainAxisAlignment: MainAxisAlignment.end,
|
floatingActionButton: FloatingActionButton.extended(
|
||||||
// crossAxisAlignment: CrossAxisAlignment.center,
|
|
||||||
children: <Widget>[
|
|
||||||
FloatingActionButton.extended(
|
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
setState(() {
|
setState(() {
|
||||||
switch (operation) {
|
switch (operation) {
|
||||||
|
|
@ -174,8 +171,7 @@ class _GenericMapState extends State<GenericMap> {
|
||||||
style: const TextStyle(color: fires600),
|
style: const TextStyle(color: fires600),
|
||||||
),
|
),
|
||||||
backgroundColor: Colors.white,
|
backgroundColor: Colors.white,
|
||||||
)
|
),
|
||||||
]),
|
|
||||||
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
|
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
|
||||||
bottomNavigationBar: new CustomBottomAppBar(
|
bottomNavigationBar: new CustomBottomAppBar(
|
||||||
fabLocation: FloatingActionButtonLocation.centerFloat,
|
fabLocation: FloatingActionButtonLocation.centerFloat,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue