diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 0ad5ccc..37c5d95 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ + android:icon="@mipmap/ic_launcher"> { final _formKey = GlobalKey(); final _titleController = TextEditingController(); final _descriptionController = TextEditingController(); - final _imageController = TextEditingController(); + File? _imageFile; + + Future _getImage(ImageSource source) async { + final pickedFile = await ImagePicker().getImage(source: source); + + if (pickedFile != null) { + setState(() { + _imageFile = File(pickedFile.path); + }); + } + } @override Widget build(BuildContext context) { @@ -24,7 +37,9 @@ class _AddScreenState extends State { onPressed: () { _titleController.clear(); _descriptionController.clear(); - _imageController.clear(); + setState(() { + _imageFile = null; + }); }, ), ), @@ -84,23 +99,52 @@ class _AddScreenState extends State { }, ), SizedBox(height: 16.0), - TextFormField( - decoration: InputDecoration( - labelText: 'Bild', - filled: true, - fillColor: Colors.grey[200], - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(16.0), - ), - ), - controller: _imageController, - validator: (value) { - if (value!.isEmpty) { - return 'Bitte geben Sie ein Bild ein.'; - } - return null; - }, - ), + _imageFile != null + ? Image.file(_imageFile!) + : Container( + height: 150.0, + decoration: BoxDecoration( + color: Colors.grey[200], + borderRadius: BorderRadius.circular(16.0), + ), + child: Center( + child: TextButton( + onPressed: () { + showModalBottomSheet( + context: context, + builder: (context) => Column( + mainAxisSize: MainAxisSize.min, + children: [ + ListTile( + leading: Icon(Icons.photo_library), + title: Text('Galerie auswählen'), + onTap: () { + Navigator.pop(context); + _getImage(ImageSource.gallery); + }, // + ), + ListTile( + leading: Icon(Icons.camera_alt), + title: Text('Kamera verwenden'), + onTap: () { + Navigator.pop(context); + _getImage(ImageSource.camera); + }, + ), + ], + ), + ); + }, + child: Text( + 'Bild hinzufügen', + style: TextStyle( + color: Theme.of(context).primaryColor, + fontWeight: FontWeight.bold, + ), + ), + ), + ), + ), ], ), ), diff --git a/lib/DetailPage.dart b/lib/DetailPage.dart index b9c008f..b20e089 100644 --- a/lib/DetailPage.dart +++ b/lib/DetailPage.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; class DetailPage extends StatelessWidget { final String title; final String description; - final Image image; + final Image? image; const DetailPage({ super.key, diff --git a/lib/UserDefinedList.dart b/lib/UserDefinedList.dart index b9febd5..2b44801 100644 --- a/lib/UserDefinedList.dart +++ b/lib/UserDefinedList.dart @@ -5,12 +5,12 @@ import 'DetailPage.dart'; class UserDefinedItem extends StatelessWidget { final String title; final String description; - final Image image; + final Image? image; const UserDefinedItem({super.key, required this.title, required this.description, - required this.image, + this.image, }); @override @@ -28,7 +28,7 @@ class UserDefinedItem extends StatelessWidget { builder: (context) => DetailPage( title: title, description: description, - image: image, + image: image!= null ? image! : null, ), ), ); @@ -130,26 +130,45 @@ class NewsList extends StatelessWidget { } } +IssueList issueList = IssueList(); + class IssueList extends StatelessWidget { - const IssueList({super.key}); + final List _items = []; + + IssueList({super.key}); + + void addUDI(UserDefinedItem udi) { + _items.add(udi); + } + + void removeUDI(UserDefinedItem udi) { + _items.remove(udi); + } @override Widget build(BuildContext context) { + final UserDefinedItem item1 = UserDefinedItem( + title: 'Licht ausgebrannt', + description: 'Licht ist ausgebrannt in der Sebastianstraße', + image: Image.network('https://api.ebsg.at/uploads/immo70/originals/objekt_809_oggau-am-neusiedler-see_7063_6021.jpeg',), + ); + final UserDefinedItem item2 = UserDefinedItem( + title: 'test2', + description: 'Gemeide Amt der Marktgemeinde Oggau. SPÖ regierend', + image: Image.network('https://upload.wikimedia.org/wikipedia/commons/a/a1/Oggau_am_Neusiedler_See_-_Gemeindeamt_%2801%29.jpg'), + ); + //addUDI(item1); + //addUDI(item2); return ListView( - children: [ - UserDefinedItem( - title: 'Licht ausgebrannt', - description: 'Licht ist ausgebrannt in der Sebastianstraße', - image: Image.network('https://api.ebsg.at/uploads/immo70/originals/objekt_809_oggau-am-neusiedler-see_7063_6021.jpeg',), + children: _items.map((item) => UserDefinedItem( + title: item.title, + description: item.description, + image: item.image, ), - UserDefinedItem( - title: 'test2', - description: 'Gemeide Amt der Marktgemeinde Oggau. SPÖ regierend', - image: Image.network('https://upload.wikimedia.org/wikipedia/commons/a/a1/Oggau_am_Neusiedler_See_-_Gemeindeamt_%2801%29.jpg'), - ), - - ], + ).toList(), ); } } + + diff --git a/lib/home.dart b/lib/home.dart index dc5ea63..1e7b5b5 100644 --- a/lib/home.dart +++ b/lib/home.dart @@ -33,7 +33,7 @@ class _MyHomePageState extends State { Widget build(BuildContext context) { final List widgetOptions = [ const NewsList(), - login ? const IssueList() : const Text( + login ? issueList: const Text( 'Mängel (nur für angemeldete Benutzer verfügbar)', style: optionStyle, textAlign: TextAlign.center, diff --git a/pubspec.lock b/pubspec.lock index eb98ba2..b8d192d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,56 +5,64 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted version: "1.2.1" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" cross_file: dependency: transitive description: name: cross_file - url: "https://pub.dartlang.org" + sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9" + url: "https://pub.dev" source: hosted version: "0.3.3+4" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + url: "https://pub.dev" source: hosted version: "1.0.5" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted version: "1.3.1" flutter: @@ -66,14 +74,16 @@ packages: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org" + sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + url: "https://pub.dev" source: hosted version: "2.0.1" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" + sha256: "4bef634684b2c7f3468c77c766c831229af829a0cd2d4ee6c1b99558bd14e5d2" + url: "https://pub.dev" source: hosted version: "2.0.8" flutter_test: @@ -90,98 +100,112 @@ packages: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + url: "https://pub.dev" source: hosted version: "0.13.5" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted version: "4.0.2" image_picker: dependency: "direct main" description: name: image_picker - url: "https://pub.dartlang.org" + sha256: "22207768556b82d55ec70166824350fee32298732d5efa4d6e756f848f51f66a" + url: "https://pub.dev" source: hosted version: "0.8.6+3" image_picker_android: dependency: transitive description: name: image_picker_android - url: "https://pub.dartlang.org" + sha256: "68d067baf7f6e401b1124ee83dd6967e67847314250fd68012aab34a69beb344" + url: "https://pub.dev" source: hosted version: "0.8.5+7" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - url: "https://pub.dartlang.org" + sha256: "66fc6e3877bbde82c33d122f3588777c3784ac5bd7d1cdd79213ef7aecb85b34" + url: "https://pub.dev" source: hosted version: "2.1.11" image_picker_ios: dependency: transitive description: name: image_picker_ios - url: "https://pub.dartlang.org" + sha256: "39aa70b5f1e5e7c94585b9738632d5fdb764a5655e40cd9e7b95fbd2fc50c519" + url: "https://pub.dev" source: hosted version: "0.8.6+9" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - url: "https://pub.dartlang.org" + sha256: "1991219d9dbc42a99aff77e663af8ca51ced592cd6685c9485e3458302d3d4f8" + url: "https://pub.dev" source: hosted version: "2.6.3" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.5" lints: dependency: transitive description: name: lints - url: "https://pub.dartlang.org" + sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + url: "https://pub.dev" source: hosted version: "2.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.12" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted version: "1.8.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted version: "1.8.2" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" source: hosted version: "2.1.4" sky_engine: @@ -193,58 +217,66 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted - version: "0.4.12" + version: "0.4.16" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted version: "1.3.1" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" sdks: dart: ">=2.18.2 <3.0.0" flutter: ">=3.0.0"