From ef6f69584590131a74d6cb283deb50822ad7ab8d Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Wed, 7 Feb 2024 14:30:55 +0100
Subject: [PATCH] update: main layout and some initial text
---
.idea/.gitignore | 3 -
.idea/libraries/Dart_Packages.xml | 220 ------------------------------
.idea/libraries/Dart_SDK.xml | 29 ----
.idea/modules.xml | 8 --
.idea/repo2900.iml | 15 --
.idea/vcs.xml | 6 -
app/lib/main.dart | 47 ++++---
7 files changed, 31 insertions(+), 297 deletions(-)
delete mode 100644 .idea/.gitignore
delete mode 100644 .idea/libraries/Dart_Packages.xml
delete mode 100644 .idea/libraries/Dart_SDK.xml
delete mode 100644 .idea/modules.xml
delete mode 100644 .idea/repo2900.iml
delete mode 100644 .idea/vcs.xml
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d33521..00000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
deleted file mode 100644
index 3c2e5fe0..00000000
--- a/.idea/libraries/Dart_Packages.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<component name="libraryTable">
- <library name="Dart Packages" type="DartPackagesLibraryType">
- <properties>
- <option name="packageNameToDirsMap">
- <entry key="async">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib" />
- </list>
- </value>
- </entry>
- <entry key="boolean_selector">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib" />
- </list>
- </value>
- </entry>
- <entry key="characters">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib" />
- </list>
- </value>
- </entry>
- <entry key="clock">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib" />
- </list>
- </value>
- </entry>
- <entry key="collection">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.18.0/lib" />
- </list>
- </value>
- </entry>
- <entry key="fake_async">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib" />
- </list>
- </value>
- </entry>
- <entry key="flutter">
- <value>
- <list>
- <option value="$USER_HOME$/flutter/packages/flutter/lib" />
- </list>
- </value>
- </entry>
- <entry key="flutter_lints">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/lib" />
- </list>
- </value>
- </entry>
- <entry key="flutter_test">
- <value>
- <list>
- <option value="$USER_HOME$/flutter/packages/flutter_test/lib" />
- </list>
- </value>
- </entry>
- <entry key="http">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/http-0.13.6/lib" />
- </list>
- </value>
- </entry>
- <entry key="http_parser">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.0.2/lib" />
- </list>
- </value>
- </entry>
- <entry key="lints">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/lib" />
- </list>
- </value>
- </entry>
- <entry key="matcher">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/lib" />
- </list>
- </value>
- </entry>
- <entry key="material_color_utilities">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/lib" />
- </list>
- </value>
- </entry>
- <entry key="meta">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.10.0/lib" />
- </list>
- </value>
- </entry>
- <entry key="path">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib" />
- </list>
- </value>
- </entry>
- <entry key="sky_engine">
- <value>
- <list>
- <option value="$USER_HOME$/flutter/bin/cache/pkg/sky_engine/lib" />
- </list>
- </value>
- </entry>
- <entry key="source_span">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib" />
- </list>
- </value>
- </entry>
- <entry key="stack_trace">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.1/lib" />
- </list>
- </value>
- </entry>
- <entry key="stream_channel">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.2/lib" />
- </list>
- </value>
- </entry>
- <entry key="string_scanner">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib" />
- </list>
- </value>
- </entry>
- <entry key="term_glyph">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib" />
- </list>
- </value>
- </entry>
- <entry key="test_api">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.1/lib" />
- </list>
- </value>
- </entry>
- <entry key="typed_data">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.2/lib" />
- </list>
- </value>
- </entry>
- <entry key="vector_math">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib" />
- </list>
- </value>
- </entry>
- <entry key="web">
- <value>
- <list>
- <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.3.0/lib" />
- </list>
- </value>
- </entry>
- </option>
- </properties>
- <CLASSES>
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.18.0/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/http-0.13.6/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.0.2/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.10.0/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.1/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.2/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.1/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.2/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib" />
- <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.3.0/lib" />
- <root url="file://$USER_HOME$/flutter/bin/cache/pkg/sky_engine/lib" />
- <root url="file://$USER_HOME$/flutter/packages/flutter/lib" />
- <root url="file://$USER_HOME$/flutter/packages/flutter_test/lib" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
deleted file mode 100644
index 3b3c0ad6..00000000
--- a/.idea/libraries/Dart_SDK.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<component name="libraryTable">
- <library name="Dart SDK">
- <CLASSES>
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/async" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/cli" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/collection" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/convert" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/core" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/developer" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/ffi" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/html" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/indexed_db" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/io" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/isolate" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js_interop" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js_interop_unsafe" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js_util" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/math" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/mirrors" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/svg" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/typed_data" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/web_audio" />
- <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/web_gl" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index b886f057..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/repo2900.iml" filepath="$PROJECT_DIR$/.idea/repo2900.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/repo2900.iml b/.idea/repo2900.iml
deleted file mode 100644
index e80ce9c8..00000000
--- a/.idea/repo2900.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/app/.dart_tool" />
- <excludeFolder url="file://$MODULE_DIR$/app/.pub" />
- <excludeFolder url="file://$MODULE_DIR$/app/build" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Dart SDK" level="project" />
- <orderEntry type="library" name="Dart Packages" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddf..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/app/lib/main.dart b/app/lib/main.dart
index 2b2fb703..b4099199 100644
--- a/app/lib/main.dart
+++ b/app/lib/main.dart
@@ -70,31 +70,46 @@ class _DefaultPageState extends State<DefaultPage> {
super.dispose();
}
+ // Main widget
@override
Widget build(BuildContext context) {
double screenWidth = MediaQuery.of(context).size.width;
- double boxWidth = 0.8;
- double boxHeight = 1.2;
+ double boxWidth = 0.9;
+ double boxHeight = 1.5;
return Scaffold(
appBar: AppBar(
title: const Text('IceMap'),
),
body: Center(
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: <Widget>[
- Container(
- width: screenWidth * boxWidth,
- height: screenWidth * boxHeight,
- color: Colors.blue, // Set the color of the box
- ),
- SizedBox(height: 20), // Spacing between box and text
- Text(
- 'Default page',
- style: TextStyle(fontSize: 24),
- ),
- ],
+ child: SingleChildScrollView(
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: <Widget>[
+ Container( // Map container
+ width: screenWidth * boxWidth,
+ height: screenWidth * boxHeight,
+ color: Colors.blue,
+ ),
+ SizedBox(height: 20),
+ Container( // Detailed info container
+ width: screenWidth * boxWidth,
+ height: screenWidth * boxHeight,
+ color: Colors.blue,
+ child: Align(
+ alignment: Alignment.topLeft,
+ child: Padding(
+ padding: EdgeInsets.only(top: 10, left: 10), // Edge padding, text
+ child: Text(
+ 'Placeholder text',
+ style: TextStyle(fontSize: 20, color: Colors.black),
+ ),
+ ),
+ ),
+ ),
+ SizedBox(height: 20),
+ ],
+ ),
),
),
);
--
GitLab