Merge branch 'Delete_Items' into 'main'

Vorhandene News & Bürgerforumnews & Mängel können mit einem swipe nach rechts...

See merge request Gruber.Nicolas/oggauer_gemeindetrommler!6
This commit is contained in:
2023-05-04 20:18:05 +00:00
+126 -42
View File
@@ -1,5 +1,6 @@
import 'package:cached_network_image/cached_network_image.dart'; import 'package:cached_network_image/cached_network_image.dart';
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_storage/firebase_storage.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'DetailPage.dart'; import 'DetailPage.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
@@ -27,13 +28,12 @@ class UserDefinedItem extends StatelessWidget {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) => DetailPage(
DetailPage( title: title,
title: title, datum: datum,
datum: datum, description: description,
description: description, imageUrl: imageUrl,
imageUrl: imageUrl, ),
),
), ),
); );
}, },
@@ -54,8 +54,6 @@ class UserDefinedItem extends StatelessWidget {
), ),
errorWidget: (context, url, error) => Icon(Icons.error), errorWidget: (context, url, error) => Icon(Icons.error),
), ),
), ),
Flexible( Flexible(
flex: 1, flex: 1,
@@ -72,8 +70,7 @@ class UserDefinedItem extends StatelessWidget {
title, title,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: const TextStyle( style: const TextStyle(
fontSize: 20, fontSize: 20, fontWeight: FontWeight.bold),
fontWeight: FontWeight.bold),
), ),
), ),
Text( Text(
@@ -110,8 +107,6 @@ class UserDefinedItem extends StatelessWidget {
// Ändern Sie die Verwendung von Image.network in UserDefinedItem-Widgets in Ihren ListView.builder-Aufrufen: // Ändern Sie die Verwendung von Image.network in UserDefinedItem-Widgets in Ihren ListView.builder-Aufrufen:
class NewsList extends StatefulWidget { class NewsList extends StatefulWidget {
const NewsList({Key? key}) : super(key: key); const NewsList({Key? key}) : super(key: key);
@@ -131,7 +126,8 @@ class _NewsListState extends State<NewsList> {
firestore.enablePersistence(); firestore.enablePersistence();
// Enable network // Enable network
firestore.settings = Settings(cacheSizeBytes: Settings.CACHE_SIZE_UNLIMITED); firestore.settings =
Settings(cacheSizeBytes: Settings.CACHE_SIZE_UNLIMITED);
// Configure the stream to use the cache first and then the server // Configure the stream to use the cache first and then the server
newsStream = firestore newsStream = firestore
@@ -140,6 +136,19 @@ class _NewsListState extends State<NewsList> {
.snapshots(includeMetadataChanges: true); .snapshots(includeMetadataChanges: true);
} }
Future<void> _deleteNews(String newsId, String? imageUrl) async {
try {
if (imageUrl != null) {
// Löschen Sie das Bild vom Firebase Storage
await FirebaseStorage.instance.refFromURL(imageUrl).delete();
}
// Löschen Sie das Dokument von der Firestore-Kollektion
await firestore.collection('News').doc(newsId).delete();
} catch (e) {
print('Error deleting news: $e');
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return StreamBuilder<QuerySnapshot>( return StreamBuilder<QuerySnapshot>(
@@ -157,16 +166,33 @@ class _NewsListState extends State<NewsList> {
itemCount: documents.length, itemCount: documents.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
final Map<String, dynamic> data = final Map<String, dynamic> data =
documents[index].data()! as Map<String, dynamic>; documents[index].data()! as Map<String, dynamic>;
final DateTime createdDate = final String newsId = documents[index].id;
data['createdDate'].toDate(); final DateTime createdDate = data['createdDate'].toDate();
final formattedDate = final formattedDate =
DateFormat('dd.MM.yyyy').format(createdDate); DateFormat('dd.MM.yyyy').format(createdDate);
return UserDefinedItem( return Dismissible(
title: data['title'] ?? '', key: UniqueKey(),
datum: formattedDate, direction: DismissDirection.endToStart,
description: data['description'] ?? '', onDismissed: (direction) {
imageUrl: data['imageUrl'] ?? '', _deleteNews(newsId, data['imageUrl']);
},
background: Container(
color: Colors.red,
child: const Align(
alignment: Alignment.centerRight,
child: Padding(
padding: EdgeInsets.only(right: 16),
child: Icon(Icons.delete, color: Colors.white),
),
),
),
child: UserDefinedItem(
title: data['title'] ?? '',
datum: formattedDate,
description: data['description'] ?? '',
imageUrl: data['imageUrl'] ?? '',
),
); );
}, },
); );
@@ -175,12 +201,14 @@ class _NewsListState extends State<NewsList> {
); );
} }
} }
class IssueList extends StatefulWidget { class IssueList extends StatefulWidget {
const IssueList({Key? key}) : super(key: key); const IssueList({Key? key}) : super(key: key);
@override @override
_IssueListState createState() => _IssueListState(); _IssueListState createState() => _IssueListState();
} }
class _IssueListState extends State<IssueList> { class _IssueListState extends State<IssueList> {
final FirebaseFirestore firestore = FirebaseFirestore.instance; final FirebaseFirestore firestore = FirebaseFirestore.instance;
late Stream<QuerySnapshot> issueStream; late Stream<QuerySnapshot> issueStream;
@@ -193,7 +221,8 @@ class _IssueListState extends State<IssueList> {
firestore.enablePersistence(); firestore.enablePersistence();
// Enable network // Enable network
firestore.settings = Settings(cacheSizeBytes: Settings.CACHE_SIZE_UNLIMITED); firestore.settings =
Settings(cacheSizeBytes: Settings.CACHE_SIZE_UNLIMITED);
// Configure the stream to use the cache first and then the server // Configure the stream to use the cache first and then the server
issueStream = firestore issueStream = firestore
@@ -202,6 +231,16 @@ class _IssueListState extends State<IssueList> {
.snapshots(includeMetadataChanges: true); .snapshots(includeMetadataChanges: true);
} }
Future<void> _deleteIssue(String issueId, String imageUrl) async {
try {
final Reference ref = FirebaseStorage.instance.refFromURL(imageUrl);
await ref.delete();
await firestore.collection('Issues').doc(issueId).delete();
} catch (e) {
print('Error deleting issue: $e');
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return StreamBuilder<QuerySnapshot>( return StreamBuilder<QuerySnapshot>(
@@ -219,16 +258,33 @@ class _IssueListState extends State<IssueList> {
itemCount: documents.length, itemCount: documents.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
final Map<String, dynamic> data = final Map<String, dynamic> data =
documents[index].data()! as Map<String, dynamic>; documents[index].data()! as Map<String, dynamic>;
final DateTime createdDate = final String issueId = documents[index].id;
data['createdDate'].toDate(); final DateTime createdDate = data['createdDate'].toDate();
final formattedDate = final formattedDate =
DateFormat('dd.MM.yyyy').format(createdDate); DateFormat('dd.MM.yyyy').format(createdDate);
return UserDefinedItem( return Dismissible(
title: data['title'] ?? '', key: UniqueKey(),
datum: formattedDate, direction: DismissDirection.endToStart,
description: data['description'] ?? '', onDismissed: (direction) {
imageUrl: data['imageUrl'] ?? '', _deleteIssue(issueId, data['imageUrl']);
},
background: Container(
color: Colors.red,
child: const Align(
alignment: Alignment.centerRight,
child: Padding(
padding: EdgeInsets.only(right: 16),
child: Icon(Icons.delete, color: Colors.white),
),
),
),
child: UserDefinedItem(
title: data['title'] ?? '',
datum: formattedDate,
description: data['description'] ?? '',
imageUrl: data['imageUrl'] ?? '',
),
); );
}, },
); );
@@ -237,6 +293,7 @@ class _IssueListState extends State<IssueList> {
); );
} }
} }
class CitizensForum extends StatefulWidget { class CitizensForum extends StatefulWidget {
const CitizensForum({Key? key}) : super(key: key); const CitizensForum({Key? key}) : super(key: key);
@@ -256,7 +313,8 @@ class _CitizensForumState extends State<CitizensForum> {
firestore.enablePersistence(); firestore.enablePersistence();
// Enable network // Enable network
firestore.settings = Settings(cacheSizeBytes: Settings.CACHE_SIZE_UNLIMITED); firestore.settings =
Settings(cacheSizeBytes: Settings.CACHE_SIZE_UNLIMITED);
// Configure the stream to use the cache first and then the server // Configure the stream to use the cache first and then the server
citizenStream = firestore citizenStream = firestore
@@ -265,11 +323,22 @@ class _CitizensForumState extends State<CitizensForum> {
.snapshots(includeMetadataChanges: true); .snapshots(includeMetadataChanges: true);
} }
Future<void> deleteDocument(String documentId, String? imageUrl) async {
// Delete document
await firestore.collection('CitizensForum').doc(documentId).delete();
// Delete image file
if (imageUrl != null) {
await FirebaseStorage.instance.refFromURL(imageUrl).delete();
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return StreamBuilder<QuerySnapshot<Map<String, dynamic>>>( return StreamBuilder<QuerySnapshot<Map<String, dynamic>>>(
stream: citizenStream, stream: citizenStream,
builder: (BuildContext context, AsyncSnapshot<QuerySnapshot<Map<String, dynamic>>> snapshot) { builder: (BuildContext context,
AsyncSnapshot<QuerySnapshot<Map<String, dynamic>>> snapshot) {
if (snapshot.hasError) { if (snapshot.hasError) {
return Text('Error: ${snapshot.error}'); return Text('Error: ${snapshot.error}');
} }
@@ -277,18 +346,33 @@ class _CitizensForumState extends State<CitizensForum> {
case ConnectionState.waiting: case ConnectionState.waiting:
return const Text('Loading...'); return const Text('Loading...');
default: default:
final List<QueryDocumentSnapshot<Map<String, dynamic>>> documents = snapshot.data!.docs; final List<QueryDocumentSnapshot<Map<String, dynamic>>> documents =
snapshot.data!.docs;
return ListView.builder( return ListView.builder(
itemCount: documents.length, itemCount: documents.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
final Map<String, dynamic> data = documents[index].data(); final Map<String, dynamic> data = documents[index].data();
final String documentId = documents[index].id;
final DateTime createdDate = data['createdDate'].toDate(); final DateTime createdDate = data['createdDate'].toDate();
final formattedDate = DateFormat('dd.MM.yyyy').format(createdDate); final formattedDate =
return UserDefinedItem( DateFormat('dd.MM.yyyy').format(createdDate);
title: data['title'] ?? '', return Dismissible(
datum: formattedDate, key: Key(documentId),
description: data['description'] ?? '', direction: DismissDirection.endToStart,
imageUrl: data['imageUrl'] ?? '', background: Container(
alignment: Alignment.centerRight,
padding: const EdgeInsets.only(right: 16.0),
color: Colors.red,
child: const Icon(Icons.delete, color: Colors.white),
),
onDismissed: (_) =>
deleteDocument(documentId, data['imageUrl']),
child: UserDefinedItem(
title: data['title'] ?? '',
datum: formattedDate,
description: data['description'] ?? '',
imageUrl: data['imageUrl'] ?? '',
),
); );
}, },
); );