jonas/mensaapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Fixes' into 'main'

Browse Source 
Fix Image Scaling Issue

See merge request brausjonas/mensaapp!14
This commit is contained in:
Jonas Braus
2024-11-25 15:48:37 +00:00
parent 8ab4e4cd5f cba4a82d67
commit 6b5a1243c8
8 changed files with 357 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devtools_options.yaml
+3
View File
@@ -0,0 +1,3 @@
description: This file stores settings for Dart & Flutter DevTools.
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
extensions:
lib/pages/pageEssen.dart
+125 -112
View File
@@ -13,126 +13,139 @@ class PageEssen extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final FocusNode _focus = FocusNode();
return Consumer<LanguageProvider>(builder: (context, languageProvider, child){ return Consumer<LanguageProvider>(builder: (context, languageProvider, child){
return Scaffold( return GestureDetector(
body: Stack( onTap: () {
children: [ _focus.unfocus();
// Hintergrundbild },
Container( child: Scaffold(
width: 1600, body: Stack(
height: 750, children: [
decoration: BoxDecoration( // Hintergrundbild
image: DecorationImage( Center(
image: AssetImage("assets/backgrounds/Essen.jpg"), child: Container(
fit: BoxFit.cover, // Deckt den gesamten Bildschirm ab width: MediaQuery.of(context).size.width * 0.8,
colorFilter: ColorFilter.mode( height: MediaQuery.of(context).size.height,
Colors.white.withOpacity(0.2), decoration: BoxDecoration(
BlendMode.dstATop, image: DecorationImage(
image: AssetImage("assets/backgrounds/Essen.jpg"),
fit: BoxFit.cover, // Deckt den gesamten Bildschirm ab
colorFilter: ColorFilter.mode(
Colors.white.withOpacity(0.6),
BlendMode.dstATop,
),
),
), ),
), ),
), ),
), // Vordergrundinhalte
// Vordergrundinhalte
Center( Center(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Consumer<PageProvider>( Consumer<PageProvider>(
builder: (context, pageProvider, child) { builder: (context, pageProvider, child) {
return Text( return Text(
pageProvider.selectedEssenName, pageProvider.selectedEssenName,
style: const TextStyle(fontSize: 40), style: TextStyle(fontSize: 40, fontWeight: FontWeight.bold),
); );
}, },
),
const SizedBox(
height: 30,
),
Container(
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.8),
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(80),
bottomRight: Radius.circular(80))),
height: 400,
width: 600,
padding: EdgeInsets.symmetric(horizontal: 20),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageEssen"]["question1"],
style: TextStyle(fontSize: 35),
),
Consumer<EssenProvider>(
builder: (context, essenProvider, child) {
return RatingStars(
onRate: (value) {
essenProvider.setRatingGeschmack(value);
},
initRating: essenProvider.ratingGeschmack,
);
},
)
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageEssen"]["question2"],
style: TextStyle(fontSize: 35),
),
Consumer<EssenProvider>(
builder: (context, essenProvider, child) {
return RatingStars(
onRate: (value) {
essenProvider.setRatingQuali(value);
},
initRating: essenProvider.ratingQuali,
);
},
)
],
),
const SizedBox(
height: 50,
),
Consumer<EssenProvider>(
builder: (context, essenProvider, child) {
return TextFormField(
initialValue: essenProvider.freiText,
onChanged: (value) {
essenProvider.setFreiText(value);
},
autofocus: false,
maxLength: 500,
maxLines: 4,
decoration: InputDecoration(
labelText: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["textfield"],
labelStyle: const TextStyle(fontSize: 20),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(15),
),
),
style: TextStyle(fontSize: 20),
);
},
),
],
), ),
), const SizedBox(
], height: 30,
),
Container(
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.9),
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(80),
bottomRight: Radius.circular(80))),
height: 400,
width: 600,
padding: EdgeInsets.symmetric(horizontal: 20),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageEssen"]["question1"],
style: TextStyle(fontSize: 35),
),
Consumer<EssenProvider>(
builder: (context, essenProvider, child) {
return RatingStars(
onRate: (value) {
essenProvider.setRatingGeschmack(value);
},
initRating: essenProvider.ratingGeschmack,
);
},
)
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageEssen"]["question2"],
style: TextStyle(fontSize: 35),
),
Consumer<EssenProvider>(
builder: (context, essenProvider, child) {
return RatingStars(
onRate: (value) {
essenProvider.setRatingQuali(value);
},
initRating: essenProvider.ratingQuali,
);
},
)
],
),
const SizedBox(
height: 50,
),
Consumer<EssenProvider>(
builder: (context, essenProvider, child) {
return TextFormField(
initialValue: essenProvider.freiText,
onChanged: (value) {
essenProvider.setFreiText(value);
},
autofocus: false,
maxLength: 500,
maxLines: 4,
focusNode: _focus,
decoration: InputDecoration(
labelText: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["textfield"],
labelStyle: const TextStyle(fontSize: 20),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(15),
),
),
onFieldSubmitted: (value) {
Navigator.pop(context);
},
style: TextStyle(fontSize: 20),
);
},
),
],
),
),
],
),
), ),
), ),
), ],
], ),
), ),
); );
}); });
lib/pages/pageEssenSelect.dart
+12 -10
View File
@@ -21,16 +21,18 @@ class PageEssenSelect extends StatelessWidget {
return Scaffold( return Scaffold(
body: Stack( body: Stack(
children: [ children: [
Container( Center(
width: 1600, child: Container(
height: 750, width: MediaQuery.of(context).size.width * 0.8,
decoration: BoxDecoration( height: MediaQuery.of(context).size.height,
image: DecorationImage( decoration: BoxDecoration(
image: AssetImage("assets/backgrounds/Essen.jpg"), image: DecorationImage(
fit: BoxFit.cover, // Deckt den gesamten Bildschirm ab image: AssetImage("assets/backgrounds/Essen.jpg"),
colorFilter: ColorFilter.mode( fit: BoxFit.cover, // Deckt den gesamten Bildschirm ab
Colors.white.withOpacity(0.2), colorFilter: ColorFilter.mode(
BlendMode.dstATop, Colors.white.withOpacity(0.6),
BlendMode.dstATop,
),
), ),
), ),
), ),
lib/pages/pageService.dart
+100 -90
View File
@@ -10,103 +10,113 @@ class PageService extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final FocusNode _focus = FocusNode();
return Consumer<LanguageProvider>(builder: (context, languageProvider, child){ return Consumer<LanguageProvider>(builder: (context, languageProvider, child){
return Scaffold( return GestureDetector(
body: Stack( onTap: () {
children: [ _focus.unfocus();
Container( },
width: 1600, child: Scaffold(
height: 750, body: Stack(
decoration: BoxDecoration( children: [
image: DecorationImage( Center(
image: AssetImage("assets/backgrounds/Service.jpg"),
fit: BoxFit.cover,
colorFilter: ColorFilter.mode(
Colors.white.withOpacity(0.2),
BlendMode.dstATop
),
)
),
),
Center(
child: SingleChildScrollView(
child: Container( child: Container(
width: MediaQuery.of(context).size.width * 0.8,
height: MediaQuery.of(context).size.height,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white.withOpacity(0.8), image: DecorationImage(
borderRadius: BorderRadius.only( image: AssetImage("assets/backgrounds/Service.jpg"),
topLeft: Radius.circular(80), fit: BoxFit.cover,
bottomRight: Radius.circular(80) colorFilter: ColorFilter.mode(
Colors.white.withOpacity(0.6),
BlendMode.dstATop
),
) )
), ),
width: 600,
height: 400,
padding: EdgeInsets.symmetric(horizontal: 20),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageService"]["question1"],
style: TextStyle(fontSize: 35),
),
Consumer<ServiceProvider>(
builder: (context, essenProvider, child) {
return RatingStars(onRate: (value) {
essenProvider.setRatingFrage1(value);
}, initRating: essenProvider.ratingFrage1,);
},
)
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageService"]["question2"],
style: TextStyle(fontSize: 35),
),
Consumer<ServiceProvider>(
builder: (context, essenProvider, child) {
return RatingStars(onRate: (value) {
essenProvider.setRatingFrage2(value);
}, initRating: essenProvider.ratingFrage2,);
},
)
],
),
const SizedBox(
height: 50,
),
Consumer<ServiceProvider>(
builder: (context, essenProvider, child) {
return TextFormField(
initialValue: essenProvider.freiText,
onChanged: (value) {
essenProvider.setFreiText(value);
},
autofocus: false,
maxLength: 500,
maxLines: 4,
decoration: InputDecoration(
labelText: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["textfield"],
labelStyle: const TextStyle(fontSize: 20),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(15)
),
),
style: TextStyle(fontSize: 20),
);
},
)
],
),
), ),
), ),
) Center(
], child: SingleChildScrollView(
child: Container(
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.9),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(80),
bottomRight: Radius.circular(80)
)
),
width: 600,
height: 400,
padding: EdgeInsets.symmetric(horizontal: 20),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageService"]["question1"],
style: TextStyle(fontSize: 35),
),
Consumer<ServiceProvider>(
builder: (context, essenProvider, child) {
return RatingStars(onRate: (value) {
essenProvider.setRatingFrage1(value);
}, initRating: essenProvider.ratingFrage1,);
},
)
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageService"]["question2"],
style: TextStyle(fontSize: 35),
),
Consumer<ServiceProvider>(
builder: (context, essenProvider, child) {
return RatingStars(onRate: (value) {
essenProvider.setRatingFrage2(value);
}, initRating: essenProvider.ratingFrage2,);
},
)
],
),
const SizedBox(
height: 50,
),
Consumer<ServiceProvider>(
builder: (context, essenProvider, child) {
return TextFormField(
initialValue: essenProvider.freiText,
onChanged: (value) {
essenProvider.setFreiText(value);
},
autofocus: false,
maxLength: 500,
maxLines: 4,
focusNode: _focus,
decoration: InputDecoration(
labelText: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["textfield"],
labelStyle: const TextStyle(fontSize: 20),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(15)
),
),
style: TextStyle(fontSize: 20),
);
},
)
],
),
),
),
)
],
),
), ),
); );
}); });
lib/pages/pageSpezielleErnaehrung.dart
+108 -98
View File
@@ -12,109 +12,119 @@ class PageSpezielleErnaehrung extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final FocusNode _focus = FocusNode();
return Consumer<LanguageProvider>(builder: (context, languageProvider, child) { return Consumer<LanguageProvider>(builder: (context, languageProvider, child) {
return Scaffold( return GestureDetector(
body: Stack( onTap: () {
children: [ _focus.unfocus();
Container( },
width: 1600, child: Scaffold(
height: 750, body: Stack(
decoration: BoxDecoration( children: [
image: DecorationImage( Center(
image: AssetImage("assets/backgrounds/Speziell.jpg"),
fit: BoxFit.cover,
colorFilter: ColorFilter.mode(
Colors.white.withOpacity(0.2), BlendMode.dstATop),
)),
),
Center(
child: SingleChildScrollView(
child: Container( child: Container(
width: MediaQuery.of(context).size.width * 0.8,
height: MediaQuery.of(context).size.height,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white.withOpacity(0.8), image: DecorationImage(
borderRadius: BorderRadius.only( image: AssetImage("assets/backgrounds/Anmerkungen.jpg"),
topLeft: Radius.circular(80), fit: BoxFit.cover,
bottomRight: Radius.circular(80))), colorFilter: ColorFilter.mode(
width: 650, Colors.white.withOpacity(0.6), BlendMode.dstATop),
height: 450, )),
padding: EdgeInsets.symmetric(horizontal: 20),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageSpecial"]["question1"],
style: TextStyle(fontSize: 35),
),
Consumer<SpezielleErnaehrungProvider>(
builder:
(context, spezielleErnaehrungProvider, child) {
return RatingStars(
onRate: (value) {
spezielleErnaehrungProvider
.setRatingSitzmoeglichkeit(value);
},
initRating: spezielleErnaehrungProvider
.ratingSitzmoeglichkeit,
);
},
)
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageSpecial"]["question2"],
style: TextStyle(fontSize: 35),
),
Consumer<SpezielleErnaehrungProvider>(
builder:
(context, spezielleErnaehrungProvider, child) {
return RatingStars(
onRate: (value) {
spezielleErnaehrungProvider
.setRatingKeineAhnung(value);
},
initRating:
spezielleErnaehrungProvider.ratingKeineAhnung,
);
},
),
],
),
const SizedBox(
height: 50,
),
Consumer<SpezielleErnaehrungProvider>(
builder: (context, spezielleErnaehrungProvider, child) {
return TextFormField(
initialValue: spezielleErnaehrungProvider.freiText,
onChanged: (value) {
spezielleErnaehrungProvider.setFreiText(value);
},
autofocus: false,
maxLength: 500,
maxLines: 5,
decoration: InputDecoration(
labelText: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["textfield"],
labelStyle: const TextStyle(fontSize: 20),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(15)),
),
style: TextStyle(fontSize: 20),
);
},
)
],
),
), ),
), ),
) Center(
], child: SingleChildScrollView(
child: Container(
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.9),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(80),
bottomRight: Radius.circular(80))),
width: 650,
height: 450,
padding: EdgeInsets.symmetric(horizontal: 20),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageSpecial"]["question1"],
style: TextStyle(fontSize: 35),
),
Consumer<SpezielleErnaehrungProvider>(
builder:
(context, spezielleErnaehrungProvider, child) {
return RatingStars(
onRate: (value) {
spezielleErnaehrungProvider
.setRatingSitzmoeglichkeit(value);
},
initRating: spezielleErnaehrungProvider
.ratingSitzmoeglichkeit,
);
},
)
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageSpecial"]["question2"],
style: TextStyle(fontSize: 35),
),
Consumer<SpezielleErnaehrungProvider>(
builder:
(context, spezielleErnaehrungProvider, child) {
return RatingStars(
onRate: (value) {
spezielleErnaehrungProvider
.setRatingKeineAhnung(value);
},
initRating:
spezielleErnaehrungProvider.ratingKeineAhnung,
);
},
),
],
),
const SizedBox(
height: 50,
),
Consumer<SpezielleErnaehrungProvider>(
builder: (context, spezielleErnaehrungProvider, child) {
return TextFormField(
initialValue: spezielleErnaehrungProvider.freiText,
onChanged: (value) {
spezielleErnaehrungProvider.setFreiText(value);
},
autofocus: false,
maxLength: 500,
maxLines: 5,
focusNode: _focus,
decoration: InputDecoration(
labelText: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["textfield"],
labelStyle: const TextStyle(fontSize: 20),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(15)),
),
style: TextStyle(fontSize: 20),
);
},
)
],
),
),
),
)
],
),
), ),
); );
}); });
lib/providers/languageProvider.dart
+6 -12
View File
@@ -39,10 +39,8 @@ class LanguageProvider extends ChangeNotifier {
"navBar": "navBar":
{ {
"0": "Essen", "0": "Essen",
"1": "Ambiente", "1": "Service",
"2": "Service", "2": "Spezielle Ernährung"
"3": "Anmerkungen",
"4": "Spezielle Ernährung"
}, },
"floating": "floating":
{ {
@@ -85,10 +83,8 @@ class LanguageProvider extends ChangeNotifier {
}, },
"navBar": { "navBar": {
"0": "Food", "0": "Food",
"1": "Ambience", "1": "Service",
"2": "Service", "2": "Special Diet"
"3": "Remarks",
"4": "Special Diet"
}, },
"floating": { "floating": {
"info": "* Required field", "info": "* Required field",
@@ -130,10 +126,8 @@ class LanguageProvider extends ChangeNotifier {
}, },
"navBar": { "navBar": {
"0": "Nourriture", "0": "Nourriture",
"1": "Ambiance", "1": "Service",
"2": "Service", "2": "Régime spécial"
"3": "Remarques",
"4": "Régime spécial"
}, },
"floating": { "floating": {
"info": "* Champ obligatoire", "info": "* Champ obligatoire",
lib/providers/pageProvider.dart
-2
View File
@@ -12,9 +12,7 @@ class PageProvider extends ChangeNotifier {
String selectedEssenName = ""; String selectedEssenName = "";
List<Widget> pages = [ List<Widget> pages = [
const PageEssenSelect(), const PageEssenSelect(),
const PageAmbiente(),
const PageService(), const PageService(),
const PageAnmerkungen(),
const PageSpezielleErnaehrung() const PageSpezielleErnaehrung()
]; ];
lib/spaces/spaceRate.dart
+3 -16
View File
@@ -84,7 +84,7 @@ class SpaceRate extends StatelessWidget {
appBar: AppBar( appBar: AppBar(
leading: IconButton( leading: IconButton(
icon: Icon( icon: Icon(
Icons.home, Icons.home_rounded,
size: 36, size: 36,
color: Theme.of(context).colorScheme.onPrimary, color: Theme.of(context).colorScheme.onPrimary,
), ),
@@ -247,29 +247,16 @@ class SpaceRate extends StatelessWidget {
["navBar"]["0"], ["navBar"]["0"],
), ),
GButton( GButton(
icon: Icons.chair, icon: Icons.mood,
/* prev: landscape*/
text: Provider.of<LanguageProvider>(context).languageData[ text: Provider.of<LanguageProvider>(context).languageData[
Provider.of<LanguageProvider>(context).language] Provider.of<LanguageProvider>(context).language]
["navBar"]["1"], ["navBar"]["1"],
), ),
GButton(
icon: Icons.mood,
text: Provider.of<LanguageProvider>(context).languageData[
Provider.of<LanguageProvider>(context).language]
["navBar"]["2"],
),
GButton(
icon: Icons.feedback,
text: Provider.of<LanguageProvider>(context).languageData[
Provider.of<LanguageProvider>(context).language]
["navBar"]["3"],
),
GButton( GButton(
icon: Icons.grass, icon: Icons.grass,
text: Provider.of<LanguageProvider>(context).languageData[ text: Provider.of<LanguageProvider>(context).languageData[
Provider.of<LanguageProvider>(context).language] Provider.of<LanguageProvider>(context).language]
["navBar"]["4"], ["navBar"]["2"],
), ),
], ],
), ),