From 50f4483d012d3373bead28b72b5a87307f672d13 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Mon, 19 Feb 2024 16:32:12 +0100
Subject: [PATCH] add: search button to appbar, some search bar code
---
app/lib/pages/default_page.dart | 13 ++-
app/lib/pages/widgets/map_widget.dart | 3 +
app/pubspec.lock | 113 +-------------------------
app/pubspec.yaml | 3 -
4 files changed, 16 insertions(+), 116 deletions(-)
diff --git a/app/lib/pages/default_page.dart b/app/lib/pages/default_page.dart
index 433d223f..29ad2d91 100644
--- a/app/lib/pages/default_page.dart
+++ b/app/lib/pages/default_page.dart
@@ -14,6 +14,7 @@ class DefaultPage extends StatefulWidget {
class _DefaultPageState extends State<DefaultPage> {
late Timer _timer;
+ bool showBar = false;
List<Measurement> markerList = [];
@@ -30,14 +31,14 @@ class _DefaultPageState extends State<DefaultPage> {
context: context,
builder: (BuildContext context) {
return AlertDialog(
- title: Text("Error"),
+ title: const Text("Error"),
content: Text(e.toString()),
actions: [
TextButton(
onPressed: () {
Navigator.of(context).pop();
},
- child: Text("OK"),
+ child: const Text("OK"),
),
],
);
@@ -83,6 +84,14 @@ class _DefaultPageState extends State<DefaultPage> {
backgroundColor: Colors.transparent,
appBar: AppBar(
title: const Text('IceMap'),
+ actions: [
+ IconButton(
+ icon: const Icon(Icons.search),
+ onPressed: () {
+ showBar = !showBar;
+ },
+ ),
+ ],
),
body: ListView(
children: [ // Add main widget
diff --git a/app/lib/pages/widgets/map_widget.dart b/app/lib/pages/widgets/map_widget.dart
index 847b9a9e..e8d22998 100644
--- a/app/lib/pages/widgets/map_widget.dart
+++ b/app/lib/pages/widgets/map_widget.dart
@@ -34,6 +34,9 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
return Column(
children: [
const SizedBox(height: contPadding),
+ /*if (true) NB: add search bar
+ const SearchBar(),
+ const SizedBox(height: contPadding),*/
ClipRRect(
borderRadius: BorderRadius.circular(20),
child: Stack( // Stack of quick view, map layer, satellite layer, and buttons
diff --git a/app/pubspec.lock b/app/pubspec.lock
index 1551ab20..98e04063 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -49,14 +49,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.3"
- csslib:
- dependency: transitive
- description:
- name: csslib
- sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
- url: "https://pub.dev"
- source: hosted
- version: "1.0.0"
equatable:
dependency: transitive
description:
@@ -110,24 +102,11 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.0"
- flutter_plugin_android_lifecycle:
- dependency: transitive
- description:
- name: flutter_plugin_android_lifecycle
- sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da
- url: "https://pub.dev"
- source: hosted
- version: "2.0.17"
flutter_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
- flutter_web_plugins:
- dependency: transitive
- description: flutter
- source: sdk
- version: "0.0.0"
google_fonts:
dependency: "direct main"
description:
@@ -136,62 +115,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.4"
- google_maps:
- dependency: transitive
- description:
- name: google_maps
- sha256: "555d5d736339b0478e821167ac521c810d7b51c3b2734e6802a9f046b64ea37a"
- url: "https://pub.dev"
- source: hosted
- version: "6.3.0"
- google_maps_flutter:
- dependency: "direct main"
- description:
- name: google_maps_flutter
- sha256: ae66fef3e71261d7df2eff29b2a119e190b2884325ecaa55321b1e17b5504066
- url: "https://pub.dev"
- source: hosted
- version: "2.5.3"
- google_maps_flutter_android:
- dependency: transitive
- description:
- name: google_maps_flutter_android
- sha256: "714530f865f13bb3b9505c58821c3baed5d247a871724acf5d2ea5808fbed02c"
- url: "https://pub.dev"
- source: hosted
- version: "2.6.2"
- google_maps_flutter_ios:
- dependency: transitive
- description:
- name: google_maps_flutter_ios
- sha256: "29503b5159da2308a66212c3827963998bfb943ba073e2114fb2d486b47fd2c8"
- url: "https://pub.dev"
- source: hosted
- version: "2.4.2"
- google_maps_flutter_platform_interface:
- dependency: transitive
- description:
- name: google_maps_flutter_platform_interface
- sha256: "6060779f020638a8eedeb0fb14234818e5fa32ec45a4653d6428ab436e2bbc64"
- url: "https://pub.dev"
- source: hosted
- version: "2.4.3"
- google_maps_flutter_web:
- dependency: transitive
- description:
- name: google_maps_flutter_web
- sha256: "6245721c160d6f531c1ef568cf9bef8d660cd585a982aa75121269030163785a"
- url: "https://pub.dev"
- source: hosted
- version: "0.5.4+3"
- html:
- dependency: transitive
- description:
- name: html
- sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
- url: "https://pub.dev"
- source: hosted
- version: "0.15.4"
http:
dependency: "direct main"
description:
@@ -216,22 +139,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.19.0"
- js:
- dependency: transitive
- description:
- name: js
- sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
- url: "https://pub.dev"
- source: hosted
- version: "0.6.7"
- js_wrapping:
- dependency: transitive
- description:
- name: js_wrapping
- sha256: e385980f7c76a8c1c9a560dfb623b890975841542471eade630b2871d243851c
- url: "https://pub.dev"
- source: hosted
- version: "0.7.4"
latlong2:
dependency: "direct main"
description:
@@ -416,14 +323,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "5.0.0"
- sanitize_html:
- dependency: transitive
- description:
- name: sanitize_html
- sha256: "12669c4a913688a26555323fb9cec373d8f9fbe091f2d01c40c723b33caa8989"
- url: "https://pub.dev"
- source: hosted
- version: "2.1.0"
sky_engine:
dependency: transitive
description: flutter
@@ -453,14 +352,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.2"
- stream_transform:
- dependency: transitive
- description:
- name: stream_transform
- sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
- url: "https://pub.dev"
- source: hosted
- version: "2.1.0"
string_scanner:
dependency: transitive
description:
@@ -550,5 +441,5 @@ packages:
source: hosted
version: "1.0.4"
sdks:
- dart: ">=3.2.3 <4.0.0"
- flutter: ">=3.16.6"
+ dart: ">=3.2.0 <4.0.0"
+ flutter: ">=3.10.0"
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 04ffc04f..1338bfd8 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -15,9 +15,6 @@ dependencies:
provider: ^5.0.0
fl_chart: ^0.20.0-nullsafety1
google_fonts: any
- google_maps_flutter: ^2.0.12
-
-
dev_dependencies:
flutter_test:
--
GitLab