MarianumMobile/Client
5
1
Fork 0
Code Issues 34 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Revert "Updated feedback to include screenshot and drawings"

Browse Source 
This reverts commit 7b3c0b4885.
This commit is contained in:
Elias Müller
2024-03-17 22:49:59 +01:00
parent ac1ed1a2b0
commit 97b414412d
17 changed files with 111 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/main.dart
View File

@ -2,14 +2,12 @@ import 'dart:async';
import 'dart:developer';
import 'dart:io';
import 'package:feedback/feedback.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:jiffy/jiffy.dart';
import 'package:loader_overlay/loader_overlay.dart';
import 'package:provider/provider.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
@ -30,7 +28,6 @@ import 'storage/base/settingsProvider.dart';
import 'theming/darkAppTheme.dart';
import 'theming/lightAppTheme.dart';
import 'view/login/login.dart';
import 'view/pages/more/feedback/feedbackForm.dart';
import 'widget/placeholderView.dart';
Future<void> main() async {
@ -71,12 +68,7 @@ Future<void> main() async {
ChangeNotifierProvider(create: (context) => MessageProps()),
ChangeNotifierProvider(create: (context) => HolidaysProps()),
],
child: BetterFeedback(
themeMode: ThemeMode.dark,
feedbackBuilder: (context, callback, scrollController) => FeedbackForm(callback: callback, scrollController: scrollController),
localeOverride: const Locale('de'),
child: const Main(),
),
child: const Main(),
)
);
}
@ -130,20 +122,18 @@ class _MainState extends State<Main> {
themeMode: settings.val().appTheme,
theme: LightAppTheme.theme,
darkTheme: DarkAppTheme.theme,
home: LoaderOverlay(
child: Breaker(
breaker: BreakerArea.global,
child: Consumer<AccountModel>(
builder: (context, accountModel, child) {
switch(accountModel.state) {
case AccountModelState.loggedIn: return const App();
case AccountModelState.loggedOut: return const Login();
case AccountModelState.undefined: return const PlaceholderView(icon: Icons.timer, text: "Daten werden geladen");
}
},
)
),
),
home: Breaker(
breaker: BreakerArea.global,
child: Consumer<AccountModel>(
builder: (context, accountModel, child) {
switch(accountModel.state) {
case AccountModelState.loggedIn: return const App();
case AccountModelState.loggedOut: return const Login();
case AccountModelState.undefined: return const PlaceholderView(icon: Icons.timer, text: "Daten werden geladen");
}
},
)
)
);
},
),