From 63223af3615f1e934907bffc5fdc13d6a58a195e Mon Sep 17 00:00:00 2001
From: Maximilian Betz <Maximilian.Betz@awi.de>
Date: Fri, 1 Apr 2022 11:43:02 +0200
Subject: [PATCH] some more ui improvements for horizonal view and different
devices
---
lib/addevent.dart | 1 +
lib/configuration.dart | 17 ++++++++---------
lib/overview.dart | 1 -
lib/viewevents.dart | 21 +++++++++------------
4 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/lib/addevent.dart b/lib/addevent.dart
index 242ce79..102a491 100644
--- a/lib/addevent.dart
+++ b/lib/addevent.dart
@@ -526,3 +526,4 @@ class _AddEventPageState extends State<AddEvent> {
}
//TODO: update shared preferences current event on adding event!
+//TODO: long urn string is not displayed correctly!
\ No newline at end of file
diff --git a/lib/configuration.dart b/lib/configuration.dart
index 1301311..8b9b93c 100644
--- a/lib/configuration.dart
+++ b/lib/configuration.dart
@@ -130,7 +130,8 @@ class _MyHomePageState extends State<Configuration> {
child:
Center(
child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ mainAxisSize: MainAxisSize.max,
children: <Widget>[
const SizedBox(height: 50),
const Text(
@@ -217,8 +218,8 @@ class _MyHomePageState extends State<Configuration> {
enabled: false,
style: _statusStyle,
controller: TextEditingController(
- text: _status,
- ),
+ text: _status,
+ ),
),
const SizedBox(height: 15.0),
@@ -228,11 +229,11 @@ class _MyHomePageState extends State<Configuration> {
),
),
bottomNavigationBar: Container(
- margin: const EdgeInsets.symmetric(vertical: 10.0),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.end,
+ margin: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 5.0),
+ child:Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ mainAxisSize: MainAxisSize.max,
children: [
- //const SizedBox(width: 10.0),
FloatingActionButton.extended(
heroTag: null,
tooltip: 'Export events to local .json file',
@@ -242,7 +243,6 @@ class _MyHomePageState extends State<Configuration> {
dumpToFile();
},
),
- const SizedBox(width: 50),
FloatingActionButton.extended(
heroTag: null,
tooltip: 'Download corresponding devices and store locally',
@@ -253,7 +253,6 @@ class _MyHomePageState extends State<Configuration> {
//TODO: display failed as user feedback somehow
},
),
- const SizedBox(width: 5.0),
],
),
)
diff --git a/lib/overview.dart b/lib/overview.dart
index 9ff03e5..59e7aff 100644
--- a/lib/overview.dart
+++ b/lib/overview.dart
@@ -7,7 +7,6 @@ class Overview extends StatelessWidget {
Widget _buildPopupInfoDialog(BuildContext context) {
return AlertDialog(
- title: const Text('Information'),
content: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
diff --git a/lib/viewevents.dart b/lib/viewevents.dart
index b5f0c7c..18c8ea9 100644
--- a/lib/viewevents.dart
+++ b/lib/viewevents.dart
@@ -237,15 +237,13 @@ class _ViewEvents extends State<ViewEvents> {
),
),
),
- bottomNavigationBar: Row(
- mainAxisAlignment: MainAxisAlignment.end,
- children: [
- const SizedBox(width: 10),
- Text(_status, style: _statusStyle),
- const SizedBox(width: 50),
- Container(
- margin: const EdgeInsets.symmetric(vertical: 10.0),
- child:
+ bottomNavigationBar: Container(
+ margin: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 5.0),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ const SizedBox(width: 1),
+ Text(_status, style: _statusStyle),
FloatingActionButton.extended(
heroTag: null,
tooltip: 'Upload Events',
@@ -255,9 +253,8 @@ class _ViewEvents extends State<ViewEvents> {
syncEvents();
},
),
- ),
- const SizedBox(width: 5.0),
- ],
+ ],
+ ),
),
);
}
--
GitLab