From d59260fe24a0a029173efb3b53282e8d2ceb5782 Mon Sep 17 00:00:00 2001
From: Sven Carstensen <sven.carstensen@appcreation.de>
Date: Tue, 30 Apr 2024 12:46:48 +0200
Subject: [PATCH] #576 und Refactoring

---
 integration_test/job_test.dart                 | 1 -
 lib/content_views/assigned_jobs_page.dart      | 2 +-
 lib/content_views/main_page.dart               | 1 -
 lib/content_views/messages_page.dart           | 2 +-
 lib/content_views/task_list_page.dart          | 2 +-
 lib/main.dart                                  | 1 -
 lib/popups/tasks_popups/take_photos_popup.dart | 8 ++++----
 pubspec.yaml                                   | 2 +-
 8 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/integration_test/job_test.dart b/integration_test/job_test.dart
index 7d30f97..80e3e81 100644
--- a/integration_test/job_test.dart
+++ b/integration_test/job_test.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:stadtbote/main.dart';
 
diff --git a/lib/content_views/assigned_jobs_page.dart b/lib/content_views/assigned_jobs_page.dart
index e2f2cd3..b463ad6 100644
--- a/lib/content_views/assigned_jobs_page.dart
+++ b/lib/content_views/assigned_jobs_page.dart
@@ -158,7 +158,7 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> {
                                   width: 0.5,
                                 ),
                               ),
-                              child: const Text('asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd '),
+                              child: Text(job.rem),
                             ),
                           ],
                         ),
diff --git a/lib/content_views/main_page.dart b/lib/content_views/main_page.dart
index eb7eb2c..f13c62e 100644
--- a/lib/content_views/main_page.dart
+++ b/lib/content_views/main_page.dart
@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:isar/isar.dart';
 import 'package:stadtbote/content_views/accepted_jobs_page.dart';
diff --git a/lib/content_views/messages_page.dart b/lib/content_views/messages_page.dart
index b54731b..944334e 100644
--- a/lib/content_views/messages_page.dart
+++ b/lib/content_views/messages_page.dart
@@ -129,7 +129,7 @@ class _MessagesPageState extends State<MessagesPage> {
         author: message.from == _sid ? _user : _central,
         createdAt: DateTime.parse(message.time).toLocal().millisecondsSinceEpoch,
         id: message.id.toString(),
-        text: message.subj + "\n" + message.text,
+        text: "${message.subj}\n${message.text}",
       ));
 
       _messages.sort((a, b) => b.createdAt! > a.createdAt! ? 1 : 0);
diff --git a/lib/content_views/task_list_page.dart b/lib/content_views/task_list_page.dart
index c85eebb..bfe5194 100644
--- a/lib/content_views/task_list_page.dart
+++ b/lib/content_views/task_list_page.dart
@@ -102,7 +102,7 @@ class _TaskListPageState extends State<TaskListPage> {
           child: Column(
             children: [
               Visibility(
-                visible: _commisionNumber.length > 0,
+                visible: _commisionNumber.isNotEmpty,
                 child: Row(
                   children: [
                     Text('Komm-#: $_commisionNumber', style: const TextStyle(fontSize: 20), textAlign: TextAlign.left),
diff --git a/lib/main.dart b/lib/main.dart
index db8c447..c3a1536 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
-import 'package:is_lock_screen/is_lock_screen.dart';
 import 'package:isar/isar.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:stadtbote/messages/pop_content_view_message.dart';
diff --git a/lib/popups/tasks_popups/take_photos_popup.dart b/lib/popups/tasks_popups/take_photos_popup.dart
index 1a37a92..d9327ed 100644
--- a/lib/popups/tasks_popups/take_photos_popup.dart
+++ b/lib/popups/tasks_popups/take_photos_popup.dart
@@ -1,7 +1,7 @@
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:image/image.dart' as imageLib;
+import 'package:image/image.dart' as image_lib;
 import 'package:stadtbote/model/task_info.dart';
 import 'package:stadtbote/tools/util.dart';
 
@@ -26,12 +26,12 @@ Future<void> showTakePhotosPopup(BuildContext context, TaskInfo taskInfo, Functi
                   if (photo != null) {
                     var fullsizeImageData = await photo.readAsBytes();
 
-                    imageLib.Image? image = imageLib.decodeImage(fullsizeImageData);
+                    image_lib.Image? image = image_lib.decodeImage(fullsizeImageData);
 
                     if (image != null) {
-                      var thumbnail = imageLib.copyResize(image, width: 800);
+                      var thumbnail = image_lib.copyResize(image, width: 800);
 
-                      var resizedImageData = imageLib.encodeJpg(thumbnail, quality: 75);
+                      var resizedImageData = image_lib.encodeJpg(thumbnail, quality: 75);
 
                       photo.delete();
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 24b1384..6b14c8b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 301.0.0+301
+version: 302.0.0+302
 
 environment:
   sdk: '>=2.19.6 <3.0.0'