From ac1ed1a2b0a77d288c6d498cee4fa8c4f46e3c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20M=C3=BCller?= <elias@elias-mueller.com>
Date: Sun, 17 Mar 2024 22:46:33 +0100
Subject: [PATCH] Removed unnecessary loader overlays
---
.../more/share/selectShareTypeDialog.dart | 55 +++++++++----------
lib/view/pages/talk/chatView.dart | 31 +++++------
2 files changed, 40 insertions(+), 46 deletions(-)
diff --git a/lib/view/pages/more/share/selectShareTypeDialog.dart b/lib/view/pages/more/share/selectShareTypeDialog.dart
index 35dc4b3..7cd1b5c 100644
--- a/lib/view/pages/more/share/selectShareTypeDialog.dart
+++ b/lib/view/pages/more/share/selectShareTypeDialog.dart
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
-import 'package:loader_overlay/loader_overlay.dart';
import 'package:share_plus/share_plus.dart';
import '../../../../widget/sharePositionOrigin.dart';
@@ -10,34 +9,32 @@ class SelectShareTypeDialog extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return LoaderOverlay(
- child: SimpleDialog(
- children: [
- ListTile(
- leading: const Icon(Icons.qr_code_2_outlined),
- title: const Text("Per QR-Code"),
- trailing: const Icon(Icons.arrow_right),
- onTap: () {
- Navigator.of(context).push(MaterialPageRoute(builder: (context) => const QrShareView()));
- },
- ),
- ListTile(
- leading: const Icon(Icons.link_outlined),
- title: const Text("Per Link teilen"),
- trailing: const Icon(Icons.arrow_right),
- onTap: () {
- Share.share(
- sharePositionOrigin: SharePositionOrigin.get(context),
- subject: "App Teilen",
- "Hol dir die für das Marianum maßgeschneiderte App:"
- "\n\nAndroid: https://play.google.com/store/apps/details?id=eu.mhsl.marianum.mobile.client "
- "\niOS: https://apps.apple.com/us/app/marianum-fulda/id6458789560 "
- "\n\nViel Spaß!"
- );
- },
- )
- ],
- ),
+ return SimpleDialog(
+ children: [
+ ListTile(
+ leading: const Icon(Icons.qr_code_2_outlined),
+ title: const Text("Per QR-Code"),
+ trailing: const Icon(Icons.arrow_right),
+ onTap: () {
+ Navigator.of(context).push(MaterialPageRoute(builder: (context) => const QrShareView()));
+ },
+ ),
+ ListTile(
+ leading: const Icon(Icons.link_outlined),
+ title: const Text("Per Link teilen"),
+ trailing: const Icon(Icons.arrow_right),
+ onTap: () {
+ Share.share(
+ sharePositionOrigin: SharePositionOrigin.get(context),
+ subject: "App Teilen",
+ "Hol dir die für das Marianum maßgeschneiderte App:"
+ "\n\nAndroid: https://play.google.com/store/apps/details?id=eu.mhsl.marianum.mobile.client "
+ "\niOS: https://apps.apple.com/us/app/marianum-fulda/id6458789560 "
+ "\n\nViel Spaß!"
+ );
+ },
+ )
+ ],
);
}
}
diff --git a/lib/view/pages/talk/chatView.dart b/lib/view/pages/talk/chatView.dart
index c32cdf6..ab31d7e 100644
--- a/lib/view/pages/talk/chatView.dart
+++ b/lib/view/pages/talk/chatView.dart
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:loader_overlay/loader_overlay.dart';
import 'package:marianum_mobile/extensions/dateTime.dart';
import 'package:provider/provider.dart';
@@ -118,23 +117,21 @@ class _ChatViewState extends State<ChatView> {
invertColors: AppTheme.isDarkMode(context)
)
),
- child: LoaderOverlay(
- child: data.primaryLoading() ? const LoadingSpinner() : Column(
- children: [
- Expanded(
- child: ListView(
- reverse: true,
- controller: _listController,
- children: messages.reversed.toList(),
- ),
+ child: data.primaryLoading() ? const LoadingSpinner() : Column(
+ children: [
+ Expanded(
+ child: ListView(
+ reverse: true,
+ controller: _listController,
+ children: messages.reversed.toList(),
),
- Container(
- color: Theme.of(context).colorScheme.background,
- child: SafeArea(child: ChatTextfield(widget.room.token)),
- )
- ],
- ),
- )
+ ),
+ Container(
+ color: Theme.of(context).colorScheme.background,
+ child: SafeArea(child: ChatTextfield(widget.room.token)),
+ )
+ ],
+ ),
),
);
},