Nizz05/gemeindetrommler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

changed name from ui to author_id and reduced Resolution from images on pdf list to reduce pdf size

Browse Source
This commit is contained in:
Nizz05
2023-05-19 17:06:12 +02:00
parent c7fe414bc6
commit 9d41a5f5f1
3 changed files with 146 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/AddPage.dart
+58 -42
View File
@@ -7,14 +7,13 @@ import 'package:image_picker/image_picker.dart';
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:image/image.dart' as img; import 'package:image/image.dart' as img;
class AddScreen extends StatefulWidget { class AddScreen extends StatefulWidget {
final int initialIndex; final int initialIndex;
const AddScreen({Key? key, required this.initialIndex}) : super(key: key); const AddScreen({Key? key, required this.initialIndex}) : super(key: key);
@override @override
_AddScreenState createState() => _AddScreenState(); _AddScreenState createState() => _AddScreenState();
} }
class _AddScreenState extends State<AddScreen> { class _AddScreenState extends State<AddScreen> {
@@ -25,7 +24,6 @@ class _AddScreenState extends State<AddScreen> {
bool _uploading = false; bool _uploading = false;
int _selectedIndex = 0; int _selectedIndex = 0;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@@ -43,14 +41,13 @@ class _AddScreenState extends State<AddScreen> {
if (originalImage != null) { if (originalImage != null) {
int originSize = min(originalImage.width, originalImage.height); int originSize = min(originalImage.width, originalImage.height);
final croppedImage = img.copyCrop( final croppedImage = img.copyCrop(originalImage,
originalImage, x: (originalImage.width - originSize) ~/ 2,
x: (originalImage.width - originSize)~/2, y: (originalImage.height - originSize) ~/ 2,
y: (originalImage.height - originSize)~/2,
width: originSize, width: originSize,
height: originSize height: originSize);
); final newPath =
final newPath = imageFile.path.substring(0, imageFile.path.lastIndexOf('/')); imageFile.path.substring(0, imageFile.path.lastIndexOf('/'));
final newFile = File('$newPath/cropped.jpg'); final newFile = File('$newPath/cropped.jpg');
await newFile.writeAsBytes(img.encodePng(croppedImage)); await newFile.writeAsBytes(img.encodePng(croppedImage));
return newFile; return newFile;
@@ -72,17 +69,16 @@ class _AddScreenState extends State<AddScreen> {
if (originalImage != null) { if (originalImage != null) {
if (originalImage.width == originalImage.height) { if (originalImage.width == originalImage.height) {
// Wenn das Bild bereits im 1:1-Format ist, überspringen Sie das Zuschneiden // Wenn das Bild bereits im 1:1-Format ist, überspringen Sie das Zuschneiden
if(mounted) { if (mounted) {
setState(() { setState(() {
_imageFile = tempFile; _imageFile = tempFile;
print("1:1"); print("1:1");
}); });
} }
} else { } else {
// Wenn das Bild nicht im 1:1-Format ist, schneiden Sie es zu // Wenn das Bild nicht im 1:1-Format ist, schneiden Sie es zu
File croppedFile = await _cropImage(tempFile); File croppedFile = await _cropImage(tempFile);
if(mounted) { if (mounted) {
setState(() { setState(() {
_imageFile = croppedFile; _imageFile = croppedFile;
}); });
@@ -94,15 +90,16 @@ class _AddScreenState extends State<AddScreen> {
} }
} else { } else {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Die Dateigröße darf maximal 10 MB betragen.')), const SnackBar(
content: Text('Die Dateigröße darf maximal 10 MB betragen.')),
); );
} }
} }
} }
Future<void> addNewElementToFirestore(
String title, String description, File imageFile,
Future<void> addNewElementToFirestore(String title, String description, File imageFile, {required Function(bool) onComplete}) async { {required Function(bool) onComplete}) async {
String collectionName; String collectionName;
if (_selectedIndex == 0) { if (_selectedIndex == 0) {
collectionName = "CitizensForum"; collectionName = "CitizensForum";
@@ -112,7 +109,8 @@ class _AddScreenState extends State<AddScreen> {
collectionName = "Issues"; collectionName = "Issues";
} }
String imageUrl = await uploadImageToFirebaseStorage(imageFile, collectionName); String imageUrl =
await uploadImageToFirebaseStorage(imageFile, collectionName);
String? userId = FirebaseAuth.instance.currentUser?.uid; // get the user ID String? userId = FirebaseAuth.instance.currentUser?.uid; // get the user ID
try { try {
@@ -121,27 +119,29 @@ class _AddScreenState extends State<AddScreen> {
"description": description, "description": description,
"imageUrl": imageUrl, "imageUrl": imageUrl,
"createdDate": DateTime.now(), "createdDate": DateTime.now(),
"userId": userId, // add the user ID to the document "author_uid": userId, // add the user ID to the document
}); });
onComplete(true); onComplete(true);
} catch(e) { } catch (e) {
onComplete(false); onComplete(false);
} }
} }
Future<String> uploadImageToFirebaseStorage(
Future<String> uploadImageToFirebaseStorage(File imageFile, String collectionName) async { File imageFile, String collectionName) async {
Reference ref = FirebaseStorage.instance.ref().child("$collectionName/${DateTime.now().toString()}"); Reference ref = FirebaseStorage.instance
.ref()
.child("$collectionName/${DateTime.now().toString()}");
UploadTask uploadTask = ref.putFile(imageFile); UploadTask uploadTask = ref.putFile(imageFile);
return await (await uploadTask).ref.getDownloadURL(); return await (await uploadTask).ref.getDownloadURL();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
String appBarTitle = ''; String appBarTitle = '';
double keyboardHeight = MediaQuery.of(context).viewInsets.bottom;
if (_selectedIndex == 0) { if (_selectedIndex == 0) {
appBarTitle = 'Neue BürgerForum Information'; appBarTitle = 'Neue BürgerForum Information';
} else if (_selectedIndex == 1) { } else if (_selectedIndex == 1) {
@@ -171,19 +171,27 @@ class _AddScreenState extends State<AddScreen> {
child: IconButton( child: IconButton(
icon: const Icon(Icons.check), icon: const Icon(Icons.check),
onPressed: () async { onPressed: () async {
if (_formKey.currentState!.validate() && _imageFile != null && !_uploading) { if (_formKey.currentState!.validate() &&
_imageFile != null &&
!_uploading) {
setState(() { setState(() {
_uploading = true; _uploading = true;
}); });
Navigator.pop(context); // Fenster direkt schließen, nachdem der Upload-Button gedrückt wurde. Navigator.pop(
await addNewElementToFirestore(_titleController.text, _descriptionController.text, _imageFile!, onComplete: (bool success) { context); // Fenster direkt schließen, nachdem der Upload-Button gedrückt wurde.
if(mounted) { await addNewElementToFirestore(
_titleController.text,
_descriptionController.text,
_imageFile!, onComplete: (bool success) {
if (mounted) {
setState(() { setState(() {
_uploading = false; _uploading = false;
}); });
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
content: Text(success ? 'Upload erfolgreich.' : 'Upload fehlgeschlagen.'), content: Text(success
? 'Upload erfolgreich.'
: 'Upload fehlgeschlagen.'),
), ),
); );
} }
@@ -237,7 +245,18 @@ class _AddScreenState extends State<AddScreen> {
), ),
const SizedBox(height: 16.0), const SizedBox(height: 16.0),
_imageFile != null _imageFile != null
? Image.file(_imageFile!) ? Expanded(
child: LayoutBuilder(
builder: (context, constraints) {
double imageHeight = max(0, constraints.maxHeight - keyboardHeight);
return Container(
height: imageHeight,
child: Image.file(_imageFile!),
);
},
),
)
: Container( : Container(
height: 200.0, height: 200.0,
decoration: BoxDecoration( decoration: BoxDecoration(
@@ -249,8 +268,7 @@ class _AddScreenState extends State<AddScreen> {
onPressed: () { onPressed: () {
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
builder: (context) => builder: (context) => Column(
Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Container( Container(
@@ -258,8 +276,8 @@ class _AddScreenState extends State<AddScreen> {
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 16), horizontal: 16),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment mainAxisAlignment:
.spaceBetween, MainAxisAlignment.spaceBetween,
children: [ children: [
const Text( const Text(
'Bild hinzufügen', 'Bild hinzufügen',
@@ -281,8 +299,8 @@ class _AddScreenState extends State<AddScreen> {
child: SizedBox( child: SizedBox(
height: 80, height: 80,
child: ListTile( child: ListTile(
leading: const Icon( leading: const Icon(Icons.photo_library,
Icons.photo_library, size: 40), size: 40),
title: const Text( title: const Text(
'Galerie auswählen', 'Galerie auswählen',
style: TextStyle(fontSize: 20), style: TextStyle(fontSize: 20),
@@ -298,8 +316,8 @@ class _AddScreenState extends State<AddScreen> {
child: SizedBox( child: SizedBox(
height: 80, height: 80,
child: ListTile( child: ListTile(
leading: const Icon( leading: const Icon(Icons.camera_alt,
Icons.camera_alt, size: 40), size: 40),
title: const Text( title: const Text(
'Kamera verwenden', 'Kamera verwenden',
style: TextStyle(fontSize: 20), style: TextStyle(fontSize: 20),
@@ -318,9 +336,7 @@ class _AddScreenState extends State<AddScreen> {
child: Text( child: Text(
'Bild hinzufügen', 'Bild hinzufügen',
style: TextStyle( style: TextStyle(
color: Theme color: Theme.of(context).primaryColor,
.of(context)
.primaryColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
lib/UserDefinedList.dart
+2 -2
View File
@@ -214,7 +214,7 @@ class _GenericListState extends State<GenericList> {
DateFormat('dd.MM.yyyy').format(createdDate); DateFormat('dd.MM.yyyy').format(createdDate);
final currentUser = FirebaseAuth.instance.currentUser; final currentUser = FirebaseAuth.instance.currentUser;
if (currentUser != null && data['userId'] == currentUser.uid) { if (currentUser != null && data['author_uid'] == currentUser.uid) {
return Dismissible( return Dismissible(
key: UniqueKey(), key: UniqueKey(),
direction: DismissDirection.endToStart, direction: DismissDirection.endToStart,
@@ -368,7 +368,7 @@ class _GenericListState extends State<GenericList> {
final Uint8List bytes = response.bodyBytes; final Uint8List bytes = response.bodyBytes;
final img.Image? image = img.decodeImage(bytes); final img.Image? image = img.decodeImage(bytes);
final img.Image resizedImage = img.copyResize(image!, width: 500); // Beispielwert für die Breite final img.Image resizedImage = img.copyResize(image!, width: 290); // Beispielwert für die Breite
final Uint8List resizedBytes = Uint8List.fromList(img.encodeJpg(resizedImage)); final Uint8List resizedBytes = Uint8List.fromList(img.encodeJpg(resizedImage));
final imageProvider = pdfWidgets.MemoryImage(resizedBytes); final imageProvider = pdfWidgets.MemoryImage(resizedBytes);
pubspec.lock
+20 -20
View File
@@ -21,10 +21,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: async name: async
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.11.0" version: "2.10.0"
barcode: barcode:
dependency: transitive dependency: transitive
description: description:
@@ -85,10 +85,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: characters name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.0" version: "1.2.1"
clock: clock:
dependency: transitive dependency: transitive
description: description:
@@ -125,10 +125,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.17.1" version: "1.17.0"
convert: convert:
dependency: transitive dependency: transitive
description: description:
@@ -404,10 +404,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: js name: js
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.6.7" version: "0.6.5"
lints: lints:
dependency: transitive dependency: transitive
description: description:
@@ -428,10 +428,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.12.15" version: "0.12.13"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
@@ -444,10 +444,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.9.1" version: "1.8.0"
nested: nested:
dependency: transitive dependency: transitive
description: description:
@@ -468,10 +468,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: path name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.8.3" version: "1.8.2"
path_parsing: path_parsing:
dependency: transitive dependency: transitive
description: description:
@@ -540,10 +540,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: pdf_widget_wrapper name: pdf_widget_wrapper
sha256: e9d31fd7782ce28ae346b127ea7d1cd748d799bddee379f31191693610e23749 sha256: "754867bf32c4683da29ccc6bf31250905431fb0818a7258c153e21cd627b3212"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.0.1" version: "1.0.0"
pedantic: pedantic:
dependency: transitive dependency: transitive
description: description:
@@ -697,10 +697,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.5.1" version: "0.4.16"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
@@ -750,5 +750,5 @@ packages:
source: hosted source: hosted
version: "6.2.2" version: "6.2.2"
sdks: sdks:
dart: ">=3.0.0-0 <4.0.0" dart: ">=2.19.0 <3.0.0"
flutter: ">=3.9.0" flutter: ">=3.7.0"