Skip to content
Snippets Groups Projects
Commit 5a7366a1 authored by Sara Savanovic Djordjevic's avatar Sara Savanovic Djordjevic
Browse files

update: add back AppBar

parent d80a4c4c
No related branches found
No related tags found
1 merge request!10Clhp map
...@@ -25,6 +25,7 @@ final titleStyle = GoogleFonts.chakraPetch( ...@@ -25,6 +25,7 @@ final titleStyle = GoogleFonts.chakraPetch(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
); );
final regTextStyle = GoogleFonts.chakraPetch(fontSize: 16, color: textColor); final regTextStyle = GoogleFonts.chakraPetch(fontSize: 16, color: textColor);
final regTextStyleBig = GoogleFonts.chakraPetch(fontSize: 18, color: textColor);
final chartTextStyle = GoogleFonts.chakraPetch(fontSize: 12, color: textColor); final chartTextStyle = GoogleFonts.chakraPetch(fontSize: 12, color: textColor);
final subHeadingStyle = GoogleFonts.chakraPetch(fontSize: 18, color: textColor, fontWeight: FontWeight.bold); final subHeadingStyle = GoogleFonts.chakraPetch(fontSize: 18, color: textColor, fontWeight: FontWeight.bold);
......
...@@ -88,6 +88,35 @@ class _DefaultPageState extends State<DefaultPage> { ...@@ -88,6 +88,35 @@ class _DefaultPageState extends State<DefaultPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MaterialApp( return MaterialApp(
home: Scaffold( home: Scaffold(
appBar: AppBar(
backgroundColor: Colors.black87,
leading: IconButton(
icon: const Icon(
Icons.menu,
color: Colors.white54
),
onPressed: () {
// Not implemented
},
),
title: Text(
'Mjøsa',
style: regTextStyleBig,
),
actions: [
IconButton(
icon: const Icon(
Icons.search,
color: Colors.white54
),
onPressed: () {
setState(() {
showBar = !showBar;
});
},
),
],
),
body: FutureBuilder( body: FutureBuilder(
future: Future.wait([markerListFuture, relationFuture]), future: Future.wait([markerListFuture, relationFuture]),
builder: (BuildContext context, AsyncSnapshot<List<dynamic>> snapshot) { builder: (BuildContext context, AsyncSnapshot<List<dynamic>> snapshot) {
......
...@@ -51,12 +51,6 @@ class _ChoroplethMapState extends State<ChoroplethMap> { ...@@ -51,12 +51,6 @@ class _ChoroplethMapState extends State<ChoroplethMap> {
} }
}; };
// ?Should the map be pre-divided into groups?
// Parse relation to json
// Make a list of key value pairs (key: groupID, value: appended shapes)
// Parse back to Uint8list
// Initialise data source // Initialise data source
dataSource = MapShapeSource.memory( dataSource = MapShapeSource.memory(
widget.relation, widget.relation,
...@@ -98,8 +92,8 @@ class _ChoroplethMapState extends State<ChoroplethMap> { ...@@ -98,8 +92,8 @@ class _ChoroplethMapState extends State<ChoroplethMap> {
SfMapsTheme( SfMapsTheme(
data: SfMapsThemeData( // Coloring of selected shape data: SfMapsThemeData( // Coloring of selected shape
selectionColor: selectedColor, selectionColor: selectedColor,
selectionStrokeWidth: 3, selectionStrokeWidth: 3.5,
selectionStrokeColor: Colors.red[900], selectionStrokeColor: Colors.blue[600],
), ),
child: SfMaps( child: SfMaps(
layers: [ layers: [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment