From 111587f2b844c1076e217efb793fe5645d0fa25b Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Mon, 12 Feb 2024 13:51:30 +0100
Subject: [PATCH] update: remove lower box color, add new fonts
---
app/assets/fonts/lato/Lato-Black.ttf | 0
app/assets/fonts/lato/Lato-BlackItalic.ttf | 0
app/assets/fonts/lato/Lato-Bold.ttf | 0
app/assets/fonts/lato/Lato-BoldItalic.ttf | 0
app/assets/fonts/lato/Lato-Italic.ttf | 0
app/assets/fonts/lato/Lato-Light.ttf | 0
app/assets/fonts/lato/Lato-LightItalic.ttf | 0
app/assets/fonts/lato/Lato-Regular.ttf | 0
app/assets/fonts/lato/Lato-Thin.ttf | 0
app/assets/fonts/lato/Lato-ThinItalic.ttf | 0
app/assets/fonts/lato/OFL.txt | 0
app/assets/fonts/rokkitt/OFL.txt | 93 +++++++++++++++
app/assets/fonts/rokkitt/README.txt | 81 +++++++++++++
.../Rokkitt-Italic-VariableFont_wght.ttf | 0
.../rokkitt/Rokkitt-VariableFont_wght.ttf | 0
.../fonts/rokkitt/static/Rokkitt-Black.ttf | 0
.../rokkitt/static/Rokkitt-BlackItalic.ttf | 0
.../fonts/rokkitt/static/Rokkitt-Bold.ttf | 0
.../rokkitt/static/Rokkitt-BoldItalic.ttf | 0
.../rokkitt/static/Rokkitt-ExtraBold.ttf | 0
.../static/Rokkitt-ExtraBoldItalic.ttf | 0
.../rokkitt/static/Rokkitt-ExtraLight.ttf | 0
.../static/Rokkitt-ExtraLightItalic.ttf | 0
.../fonts/rokkitt/static/Rokkitt-Italic.ttf | 0
.../fonts/rokkitt/static/Rokkitt-Light.ttf | 0
.../rokkitt/static/Rokkitt-LightItalic.ttf | 0
.../fonts/rokkitt/static/Rokkitt-Medium.ttf | 0
.../rokkitt/static/Rokkitt-MediumItalic.ttf | 0
.../fonts/rokkitt/static/Rokkitt-Regular.ttf | 0
.../fonts/rokkitt/static/Rokkitt-SemiBold.ttf | 0
.../rokkitt/static/Rokkitt-SemiBoldItalic.ttf | 0
.../fonts/rokkitt/static/Rokkitt-Thin.ttf | 0
.../rokkitt/static/Rokkitt-ThinItalic.ttf | 0
app/lib/main.dart | 7 +-
app/lib/pages/consts.dart | 27 ++++-
app/lib/pages/default_page.dart | 17 +--
app/lib/pages/widgets/map_widget.dart | 25 ++--
.../Flutter/GeneratedPluginRegistrant.swift | 2 +
app/pubspec.lock | 108 +++++++++++++++++-
app/pubspec.yaml | 4 +-
40 files changed, 337 insertions(+), 27 deletions(-)
create mode 100644 app/assets/fonts/lato/Lato-Black.ttf
create mode 100644 app/assets/fonts/lato/Lato-BlackItalic.ttf
create mode 100644 app/assets/fonts/lato/Lato-Bold.ttf
create mode 100644 app/assets/fonts/lato/Lato-BoldItalic.ttf
create mode 100644 app/assets/fonts/lato/Lato-Italic.ttf
create mode 100644 app/assets/fonts/lato/Lato-Light.ttf
create mode 100644 app/assets/fonts/lato/Lato-LightItalic.ttf
create mode 100644 app/assets/fonts/lato/Lato-Regular.ttf
create mode 100644 app/assets/fonts/lato/Lato-Thin.ttf
create mode 100644 app/assets/fonts/lato/Lato-ThinItalic.ttf
create mode 100644 app/assets/fonts/lato/OFL.txt
create mode 100644 app/assets/fonts/rokkitt/OFL.txt
create mode 100644 app/assets/fonts/rokkitt/README.txt
create mode 100644 app/assets/fonts/rokkitt/Rokkitt-Italic-VariableFont_wght.ttf
create mode 100644 app/assets/fonts/rokkitt/Rokkitt-VariableFont_wght.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-Black.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-BlackItalic.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-Bold.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-BoldItalic.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-ExtraBold.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-ExtraBoldItalic.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-ExtraLight.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-ExtraLightItalic.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-Italic.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-Light.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-LightItalic.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-Medium.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-MediumItalic.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-Regular.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-SemiBold.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-SemiBoldItalic.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-Thin.ttf
create mode 100644 app/assets/fonts/rokkitt/static/Rokkitt-ThinItalic.ttf
diff --git a/app/assets/fonts/lato/Lato-Black.ttf b/app/assets/fonts/lato/Lato-Black.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/lato/Lato-BlackItalic.ttf b/app/assets/fonts/lato/Lato-BlackItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/lato/Lato-Bold.ttf b/app/assets/fonts/lato/Lato-Bold.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/lato/Lato-BoldItalic.ttf b/app/assets/fonts/lato/Lato-BoldItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/lato/Lato-Italic.ttf b/app/assets/fonts/lato/Lato-Italic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/lato/Lato-Light.ttf b/app/assets/fonts/lato/Lato-Light.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/lato/Lato-LightItalic.ttf b/app/assets/fonts/lato/Lato-LightItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/lato/Lato-Regular.ttf b/app/assets/fonts/lato/Lato-Regular.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/lato/Lato-Thin.ttf b/app/assets/fonts/lato/Lato-Thin.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/lato/Lato-ThinItalic.ttf b/app/assets/fonts/lato/Lato-ThinItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/lato/OFL.txt b/app/assets/fonts/lato/OFL.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/OFL.txt b/app/assets/fonts/rokkitt/OFL.txt
new file mode 100644
index 00000000..28dcbea4
--- /dev/null
+++ b/app/assets/fonts/rokkitt/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2016 The Rokkit Project Authors (https://github.com/googlefonts/RokkittFont)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/app/assets/fonts/rokkitt/README.txt b/app/assets/fonts/rokkitt/README.txt
new file mode 100644
index 00000000..7d629dc3
--- /dev/null
+++ b/app/assets/fonts/rokkitt/README.txt
@@ -0,0 +1,81 @@
+Rokkitt Variable Font
+=====================
+
+This download contains Rokkitt as both variable fonts and static fonts.
+
+Rokkitt is a variable font with this axis:
+ wght
+
+This means all the styles are contained in these files:
+ Rokkitt-VariableFont_wght.ttf
+ Rokkitt-Italic-VariableFont_wght.ttf
+
+If your app fully supports variable fonts, you can now pick intermediate styles
+that aren’t available as static fonts. Not all apps support variable fonts, and
+in those cases you can use the static font files for Rokkitt:
+ static/Rokkitt-Thin.ttf
+ static/Rokkitt-ExtraLight.ttf
+ static/Rokkitt-Light.ttf
+ static/Rokkitt-Regular.ttf
+ static/Rokkitt-Medium.ttf
+ static/Rokkitt-SemiBold.ttf
+ static/Rokkitt-Bold.ttf
+ static/Rokkitt-ExtraBold.ttf
+ static/Rokkitt-Black.ttf
+ static/Rokkitt-ThinItalic.ttf
+ static/Rokkitt-ExtraLightItalic.ttf
+ static/Rokkitt-LightItalic.ttf
+ static/Rokkitt-Italic.ttf
+ static/Rokkitt-MediumItalic.ttf
+ static/Rokkitt-SemiBoldItalic.ttf
+ static/Rokkitt-BoldItalic.ttf
+ static/Rokkitt-ExtraBoldItalic.ttf
+ static/Rokkitt-BlackItalic.ttf
+
+Get started
+-----------
+
+1. Install the font files you want to use
+
+2. Use your app's font picker to view the font family and all the
+available styles
+
+Learn more about variable fonts
+-------------------------------
+
+ https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
+ https://variablefonts.typenetwork.com
+ https://medium.com/variable-fonts
+
+In desktop apps
+
+ https://theblog.adobe.com/can-variable-fonts-illustrator-cc
+ https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
+
+Online
+
+ https://developers.google.com/fonts/docs/getting_started
+ https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
+ https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
+
+Installing fonts
+
+ MacOS: https://support.apple.com/en-us/HT201749
+ Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
+ Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
+
+Android Apps
+
+ https://developers.google.com/fonts/docs/android
+ https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
+
+License
+-------
+Please read the full license text (OFL.txt) to understand the permissions,
+restrictions and requirements for usage, redistribution, and modification.
+
+You can use them in your products & projects – print or digital,
+commercial or otherwise.
+
+This isn't legal advice, please consider consulting a lawyer and see the full
+license for all details.
diff --git a/app/assets/fonts/rokkitt/Rokkitt-Italic-VariableFont_wght.ttf b/app/assets/fonts/rokkitt/Rokkitt-Italic-VariableFont_wght.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/Rokkitt-VariableFont_wght.ttf b/app/assets/fonts/rokkitt/Rokkitt-VariableFont_wght.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Black.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Black.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-BlackItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-BlackItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Bold.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Bold.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-BoldItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-BoldItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-ExtraBold.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-ExtraBold.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-ExtraBoldItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-ExtraBoldItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-ExtraLight.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-ExtraLight.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-ExtraLightItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-ExtraLightItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Italic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Italic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Light.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Light.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-LightItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-LightItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Medium.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Medium.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-MediumItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-MediumItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Regular.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Regular.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-SemiBold.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-SemiBold.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-SemiBoldItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-SemiBoldItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-Thin.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-Thin.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/assets/fonts/rokkitt/static/Rokkitt-ThinItalic.ttf b/app/assets/fonts/rokkitt/static/Rokkitt-ThinItalic.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/lib/main.dart b/app/lib/main.dart
index 7f804e16..506c846b 100644
--- a/app/lib/main.dart
+++ b/app/lib/main.dart
@@ -1,16 +1,17 @@
import 'package:flutter/material.dart';
import 'pages/default_page.dart';
-import 'pages/marker_data.dart';
void main() {
- runApp(MyApp());
+ runApp(const MyApp());
}
class MyApp extends StatelessWidget {
+ const MyApp({super.key});
+
@override
Widget build(BuildContext context) {
return const MaterialApp(
- home: DefaultPage(),
+ home: const DefaultPage(),
);
}
}
diff --git a/app/lib/pages/consts.dart b/app/lib/pages/consts.dart
index 8ee35bb3..3238b397 100644
--- a/app/lib/pages/consts.dart
+++ b/app/lib/pages/consts.dart
@@ -1,4 +1,29 @@
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+// API variables
const String port = "8443";
const String serverURI = "https://127.0.0.1:$port/";
const String mapEndpoint = "update_map";
-const int fetchInterval = 5;
\ No newline at end of file
+const int fetchInterval = 5;
+
+// Font variables
+const textColor = Colors.white;
+final appTitleStyle = GoogleFonts.dmSans(
+ fontSize: 35,
+ color: Colors.black,
+ fontWeight: FontWeight.bold, // Add this line to make the text bold
+);
+final titleStyle = GoogleFonts.dmSans(
+ fontSize: 35,
+ color: textColor,
+ fontWeight: FontWeight.bold, // Add this line to make the text bold
+);
+final textStyle = GoogleFonts.dmSans(fontSize: 20, color: textColor);
+final chartTextStyle = GoogleFonts.dmSans(fontSize: 14, color: textColor);
+
+// Colors
+const darkBlue = Color(0xFF00B4D8);
+const lightBlue = Color(0xFFCAF0F8);
+const superLightBlue = Color(0xFFCAF0F8);
+const barBlue = Color(0xFF0077B6);
\ No newline at end of file
diff --git a/app/lib/pages/default_page.dart b/app/lib/pages/default_page.dart
index 0cb4318d..10741804 100644
--- a/app/lib/pages/default_page.dart
+++ b/app/lib/pages/default_page.dart
@@ -27,7 +27,7 @@ class _DefaultPageState extends State<DefaultPage> {
(X509Certificate cert, String host, int port) => true;
// Request makers from API and wait for response
- var request = await client.getUrl(Uri.parse(serverURI+mapEndpoint));
+ var request = await client.getUrl(Uri.parse(serverURI + mapEndpoint));
var response = await request.close();
// Attempt to parse json if request is ok
@@ -38,7 +38,8 @@ class _DefaultPageState extends State<DefaultPage> {
List<dynamic> jsonData = json.decode(responseBody);
// Convert response from type List<dynamic> to List<MarkerTemplate>
- markerList = jsonData.map((data) => MarkerTemplate.fromJson(data)).toList();
+ markerList =
+ jsonData.map((data) => MarkerTemplate.fromJson(data)).toList();
});
} else {
print('Request failed with status: ${response.statusCode}');
@@ -73,16 +74,18 @@ class _DefaultPageState extends State<DefaultPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
- backgroundColor: const Color(0xFFCAF0F8),
+ backgroundColor: darkBlue,
appBar: AppBar(
- title: Text('IceMap'),
+ title: Text(
+ 'IceMap',
+ style: appTitleStyle,
+ ),
),
body: ListView(
children: [
- MapContainerWidget(markerList: markerList),// Return a specific list element
+ MapContainerWidget(markerList: markerList),
],
),
);
}
-}
-
+}
\ No newline at end of file
diff --git a/app/lib/pages/widgets/map_widget.dart b/app/lib/pages/widgets/map_widget.dart
index dccf3e8e..de8b22d0 100644
--- a/app/lib/pages/widgets/map_widget.dart
+++ b/app/lib/pages/widgets/map_widget.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import '../marker_data.dart';
+import '../consts.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:latlong2/latlong.dart';
import 'package:fl_chart/fl_chart.dart';
@@ -34,14 +35,14 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
builder: (context, constraints) {
double screenWidth = constraints.maxWidth;
double boxWidth = 0.86;
- double boxHeight = 1.5;
+ double boxHeight = 1.4;
return Column(
children: [
const SizedBox(height: contPadding),
ClipRRect(
borderRadius: BorderRadius.circular(20),
- child: SizedBox(
+ child: Container(
width: screenWidth * boxWidth,
height: screenWidth * boxHeight,
child: FlutterMap(
@@ -89,7 +90,6 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
child: Container(
width: screenWidth * boxWidth,
height: screenWidth * boxHeight * 1.5, // NB: make dynamic
- color: const Color(0xFF00B4D8),
child: Align(
alignment: Alignment.topLeft,
child: Padding(
@@ -97,17 +97,17 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- const Text(
+ Text(
'Ice stats',
- style: TextStyle(fontSize: 30, color: Colors.black),
+ style: titleStyle,
),
Text(
'Latitude: ${selectedMarker?.geoData.latitude}',
- style: const TextStyle(fontSize: 20, color: Colors.black),
+ style: textStyle,
),
Text(
'Longitude: ${selectedMarker?.geoData.longitude}',
- style: const TextStyle(fontSize: 20, color: Colors.black),
+ style: textStyle,
),
const SizedBox(height: contPadding),
SizedBox(
@@ -115,7 +115,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
height: 200,
child: LineChart(
LineChartData(
- backgroundColor: const Color(0xFFCAF0F8),
+ backgroundColor: lightBlue,
titlesData: FlTitlesData(
leftTitles: SideTitles(showTitles: true),
bottomTitles: SideTitles(showTitles: true),
@@ -131,7 +131,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
LineChartBarData(
spots: chartData,
isCurved: true,
- colors: [const Color(0xFF0077B6)],
+ colors: [barBlue],
),
],
),
@@ -149,7 +149,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
titlesData: FlTitlesData(
bottomTitles: SideTitles(
showTitles: true,
- getTextStyles: (value) => const TextStyle(color: Colors.black, fontSize: 14),
+ getTextStyles: (value) => chartTextStyle,
margin: 10,
getTitles: (value) {
switch (value.toInt()) {
@@ -166,7 +166,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
),
leftTitles: SideTitles(
showTitles: true,
- getTextStyles: (value) => const TextStyle(color: Colors.black, fontSize: 14),
+ getTextStyles: (value) => chartTextStyle,
margin: 10,
reservedSize: 30,
interval: 5,
@@ -174,7 +174,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
),
borderData: FlBorderData(
show: true,
- border: Border.all(color: Colors.black, width: 1),
+ border: Border.all(color: Colors.white, width: 1),
),
barGroups: [
BarChartGroupData(
@@ -214,6 +214,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
),
),
),
+ const SizedBox(height: contPadding),
],
);
},
diff --git a/app/macos/Flutter/GeneratedPluginRegistrant.swift b/app/macos/Flutter/GeneratedPluginRegistrant.swift
index cccf817a..e777c67d 100644
--- a/app/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/app/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,6 +5,8 @@
import FlutterMacOS
import Foundation
+import path_provider_foundation
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+ PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
}
diff --git a/app/pubspec.lock b/app/pubspec.lock
index 839fa15f..98e04063 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -41,6 +41,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.18.0"
+ crypto:
+ dependency: transitive
+ description:
+ name: crypto
+ sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.3"
equatable:
dependency: transitive
description:
@@ -57,6 +65,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.3.1"
+ ffi:
+ dependency: transitive
+ description:
+ name: ffi
+ sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.1.0"
fl_chart:
dependency: "direct main"
description:
@@ -91,6 +107,14 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
+ google_fonts:
+ dependency: "direct main"
+ description:
+ name: google_fonts
+ sha256: "6b6f10f0ce3c42f6552d1c70d2c28d764cf22bb487f50f66cca31dcd5194f4d6"
+ url: "https://pub.dev"
+ source: hosted
+ version: "4.0.4"
http:
dependency: "direct main"
description:
@@ -203,6 +227,54 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.2.1"
+ path_provider:
+ dependency: transitive
+ description:
+ name: path_provider
+ sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.1.2"
+ path_provider_android:
+ dependency: transitive
+ description:
+ name: path_provider_android
+ sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.2.2"
+ path_provider_foundation:
+ dependency: transitive
+ description:
+ name: path_provider_foundation
+ sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.3.2"
+ path_provider_linux:
+ dependency: transitive
+ description:
+ name: path_provider_linux
+ sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.2.1"
+ path_provider_platform_interface:
+ dependency: transitive
+ description:
+ name: path_provider_platform_interface
+ sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.1.2"
+ path_provider_windows:
+ dependency: transitive
+ description:
+ name: path_provider_windows
+ sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.2.1"
pedantic:
dependency: transitive
description:
@@ -211,6 +283,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.11.1"
+ platform:
+ dependency: transitive
+ description:
+ name: platform
+ sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.1.4"
+ plugin_platform_interface:
+ dependency: transitive
+ description:
+ name: plugin_platform_interface
+ sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.1.8"
polylabel:
dependency: transitive
description:
@@ -328,6 +416,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.3.0"
+ win32:
+ dependency: transitive
+ description:
+ name: win32
+ sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
+ url: "https://pub.dev"
+ source: hosted
+ version: "5.2.0"
wkt_parser:
dependency: transitive
description:
@@ -336,6 +432,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.0"
+ xdg_directories:
+ dependency: transitive
+ description:
+ name: xdg_directories
+ sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.0.4"
sdks:
- dart: ">=3.2.0-194.0.dev <4.0.0"
- flutter: ">=3.3.0"
+ dart: ">=3.2.0 <4.0.0"
+ flutter: ">=3.10.0"
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 0e2b2e79..804a5c15 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -14,6 +14,7 @@ dependencies:
latlong2: ^0.8.2
provider: ^5.0.0
fl_chart: ^0.20.0-nullsafety1
+ google_fonts: any
@@ -25,5 +26,4 @@ dev_dependencies:
flutter:
uses-material-design: true
assets:
- - assets/icons/circle-red.png
-
+ - assets/icons/
--
GitLab