diff --git a/lib/content_views/approach_area_page.dart b/lib/content_views/approach_area_page.dart index 29b65b5..9d84d9a 100644 --- a/lib/content_views/approach_area_page.dart +++ b/lib/content_views/approach_area_page.dart @@ -6,8 +6,8 @@ import 'package:stadtbote/content_views/utils/content_view_widget.dart'; import 'package:stadtbote/main.dart'; import 'package:stadtbote/messages/pop_content_view_message.dart'; import 'package:stadtbote/model/rank.dart'; +import 'package:stadtbote/network_messages/zip_message.dart'; import 'package:stadtbote/popups/tasks_popups/zip_popup.dart'; -import 'package:stadtbote/protocoll_messages/zip_message.dart'; import 'package:stadtbote/tools/constants.dart'; import 'package:stadtbote/tools/messages/publish_payload_message.dart'; import 'package:badges/badges.dart' as badges; diff --git a/lib/content_views/assigned_jobs_page.dart b/lib/content_views/assigned_jobs_page.dart index 3484876..7ef26be 100644 --- a/lib/content_views/assigned_jobs_page.dart +++ b/lib/content_views/assigned_jobs_page.dart @@ -7,10 +7,12 @@ import 'package:stadtbote/content_views/utils/content_view_widget.dart'; import 'package:intl/intl.dart'; import 'package:badges/badges.dart' as badges; import 'package:stadtbote/messages/pop_content_view_message.dart'; -import 'package:stadtbote/protocoll_messages/accept_job_message.dart'; -import 'package:stadtbote/protocoll_messages/fin_task_message.dart'; +import 'package:stadtbote/network_messages/accept_job_message.dart'; +import 'package:stadtbote/network_messages/fin_task_message.dart'; +import 'package:stadtbote/tools/messages/job_received_message.dart'; import 'package:stadtbote/tools/messages/publish_payload_message.dart'; import 'package:stadtbote/tools/messages/refresh_badges_message.dart'; +import 'package:stadtbote/tools/messages/remove_job_message.dart'; import 'package:stadtbote/tools/messages/remove_state_0_job_from_map.dart'; import '../main.dart'; @@ -32,15 +34,15 @@ class AssignedJobsPage extends ContentViewWidget { } } -class _AssignedJobsPageState extends State with ProducerMixin { +class _AssignedJobsPageState extends State with ProducerMixin, ConsumerMixin { late bool _initCompleted = false; - List _entries = []; + List _jobs = []; @override void initState() { Future.delayed(const Duration(seconds: 0), () async { - _entries = await _createListEntries(); + _jobs = await _fetchState0Jobs(); _initMessages(); @@ -58,6 +60,8 @@ class _AssignedJobsPageState extends State with ProducerMixin return Util.getWaitWidget(context); } + var widgets = _createWidgets(); + return Container( height: 100, decoration: BoxDecoration( @@ -68,16 +72,22 @@ class _AssignedJobsPageState extends State with ProducerMixin width: 0.5, ), ), - child: SingleChildScrollView(child: Column(children: _entries)), + child: SingleChildScrollView(child: Column(children: widgets)), ); } - Future> _createListEntries() async { - List entries = []; + Future> _fetchState0Jobs() async { + return await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.stateAssigned).findAll(); + } - var jobs = await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.stateAssigned).findAll(); - for (var job in jobs) { - entries.add(ExpandableNotifier( + List _createWidgets() { + List widgets = []; + + for (var job in _jobs) { + var expandableController = ExpandableController(); + expandableController.expanded = true; + + widgets.add(ExpandableNotifier( child: ListTile( contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8), title: Container( @@ -123,6 +133,7 @@ class _AssignedJobsPageState extends State with ProducerMixin scrollOnExpand: true, scrollOnCollapse: false, child: ExpandablePanel( + controller: expandableController, theme: const ExpandableThemeData( headerAlignment: ExpandablePanelHeaderAlignment.center, tapBodyToCollapse: true, @@ -156,11 +167,35 @@ class _AssignedJobsPageState extends State with ProducerMixin const SizedBox(height: 20), Row(children: [ Expanded( - child: getDefaultButton(!job.global ? 'Ablehnen' : 'Ignorieren', () => {_sendAnswer(job, !job.global ? 2 : 3)}), + child: getDefaultButton(!job.global ? 'Ablehnen' : 'Ignorieren', () { + job.sendMessage( + routingKey: Constants.messageTopicRemoveJob, + payload: RemoveJobMessage(id: job.id), + ); + + _sendAnswer(job, !job.global ? 2 : 3); + + _jobs.removeWhere((databaseJob) => databaseJob.id == job.id); + + setState(() {}); + }), ), const SizedBox(width: 20), Expanded( - child: getDefaultButton('Annehmen', () => {_sendAnswer(job, 1)}), + child: getDefaultButton('Annehmen', () { + job.sendMessage( + routingKey: Constants.messageTopicRemoveJob, + payload: RemoveJobMessage(id: job.id), + ); + + _sendAnswer(job, 1); + + _jobs.removeWhere((databaseJob) => databaseJob.id == job.id); + + print("test:" + _jobs.length.toString()); + + setState(() {}); + }), ) ]) ], @@ -172,7 +207,7 @@ class _AssignedJobsPageState extends State with ProducerMixin )); } - return entries; + return widgets; } _sendAnswer(Job job, int item) async { @@ -203,13 +238,23 @@ class _AssignedJobsPageState extends State with ProducerMixin routingKey: Constants.messageTopicUpdateBadges, payload: RefreshBadgesMessage(), ); - - _entries = await _createListEntries(); - - setState(() {}); } - void _initMessages() {} + void _initMessages() { + subscribe( + queueId: Constants.messageTopicJobReceived, + callback: (message) { + var job = (message.payload as JobReceivedMessage).job; + + if (job.state == Constants.stateAssigned) { + _jobs.add(job); + + setState(() {}); + } + + }, + ); + } } class _HeaderWidget extends StatefulWidget { @@ -247,13 +292,10 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ProducerMixin { child: FittedBox( child: GestureDetector( onTap: () async { - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPopContentView, payload: PopContentViewMessage(count: 1), ); - - //await MessageService().publish(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1)); }, child: const CircleAvatar( radius: 10, @@ -276,13 +318,10 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ProducerMixin { child: FittedBox( child: GestureDetector( onTap: () async { - // TODO MESSAGING sendMessage( routingKey: Constants.messageTopicPopContentView, payload: PopContentViewMessage(count: 1), ); - - //await MessageService().publish(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1)); }, child: const CircleAvatar( backgroundColor: Constants.colorPrimary, diff --git a/lib/content_views/main_page.dart b/lib/content_views/main_page.dart index d9f8654..6512864 100644 --- a/lib/content_views/main_page.dart +++ b/lib/content_views/main_page.dart @@ -12,15 +12,14 @@ import 'package:stadtbote/model/job.dart'; import 'package:stadtbote/model/location_status.dart'; import 'package:stadtbote/model/chat_message.dart'; import 'package:stadtbote/model/session_status.dart'; +import 'package:stadtbote/network_messages/logout_message.dart'; import 'package:stadtbote/popups/infos_popup.dart'; -import 'package:stadtbote/protocoll_messages/logout_message.dart'; import 'package:stadtbote/tools/constants.dart'; import 'package:stadtbote/tools/messages/job_received_message.dart'; import 'package:stadtbote/tools/messages/publish_payload_message.dart'; import 'package:stadtbote/tools/messages/connect_client_message.dart'; import 'package:stadtbote/tools/messages/disconnect_client_message.dart'; import 'package:badges/badges.dart' as badges; -import 'package:stadtbote/tools/messages/remove_state_0_job_from_map.dart'; import 'package:stadtbote/tools/util.dart'; class MainPage extends ContentViewWidget { diff --git a/lib/content_views/messages_page.dart b/lib/content_views/messages_page.dart index 3aee782..bc0a8a6 100644 --- a/lib/content_views/messages_page.dart +++ b/lib/content_views/messages_page.dart @@ -10,7 +10,7 @@ import 'package:stadtbote/messages/pop_content_view_message.dart'; import 'package:stadtbote/model/chat_message.dart' as sbmessage; import 'package:stadtbote/model/chat_message.dart'; import 'package:stadtbote/model/session_status.dart'; -import 'package:stadtbote/protocoll_messages/messages_showed.dart'; +import 'package:stadtbote/network_messages/messages_showed.dart'; import 'package:stadtbote/tools/constants.dart'; import 'package:stadtbote/tools/messages/publish_payload_message.dart'; diff --git a/lib/content_views/set_desired_zip_page.dart b/lib/content_views/set_desired_zip_page.dart index 48ce920..5eef752 100644 --- a/lib/content_views/set_desired_zip_page.dart +++ b/lib/content_views/set_desired_zip_page.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:stadtbote/content_views/utils/content_view_widget.dart'; import 'package:stadtbote/messages/pop_content_view_message.dart'; -import 'package:stadtbote/protocoll_messages/set_desired_zip_message.dart'; +import 'package:stadtbote/network_messages/set_desired_zip_message.dart'; import 'package:stadtbote/tools/messages/publish_payload_message.dart'; import '../tools/constants.dart'; diff --git a/lib/content_views/task_list_page.dart b/lib/content_views/task_list_page.dart index 42d7cb9..bce06f4 100644 --- a/lib/content_views/task_list_page.dart +++ b/lib/content_views/task_list_page.dart @@ -10,6 +10,10 @@ import 'package:stadtbote/messages/pop_content_view_message.dart'; import 'package:stadtbote/model/job.dart'; import 'package:stadtbote/model/job_tour.dart'; import 'package:stadtbote/model/pictures.dart'; +import 'package:stadtbote/network_messages/accept_job_message.dart'; +import 'package:stadtbote/network_messages/fin_task_message.dart'; +import 'package:stadtbote/network_messages/fin_tour_message.dart'; +import 'package:stadtbote/network_messages/pic_message.dart'; import 'package:stadtbote/popups/tasks_popups/arrived_popup.dart'; import 'package:stadtbote/popups/tasks_popups/commision_number_popup.dart'; import 'package:stadtbote/popups/tasks_popups/pickup_delivery_status_popup.dart'; @@ -18,10 +22,6 @@ import 'package:stadtbote/popups/tasks_popups/scan_barcodes_popup.dart'; import 'package:stadtbote/popups/tasks_popups/signature_popup.dart'; import 'package:stadtbote/popups/tasks_popups/station_notice_popup.dart'; import 'package:stadtbote/popups/tasks_popups/take_photos_popup.dart'; -import 'package:stadtbote/protocoll_messages/accept_job_message.dart'; -import 'package:stadtbote/protocoll_messages/fin_task_message.dart'; -import 'package:stadtbote/protocoll_messages/fin_tour_message.dart'; -import 'package:stadtbote/protocoll_messages/pic_message.dart'; import 'package:stadtbote/tools/constants.dart'; import 'package:stadtbote/tools/messages/publish_payload_message.dart'; diff --git a/lib/protocoll_messages/accept_job_message.dart b/lib/network_messages/accept_job_message.dart similarity index 89% rename from lib/protocoll_messages/accept_job_message.dart rename to lib/network_messages/accept_job_message.dart index 6414eae..410cac3 100644 --- a/lib/protocoll_messages/accept_job_message.dart +++ b/lib/network_messages/accept_job_message.dart @@ -1,5 +1,5 @@ import 'package:json_annotation/json_annotation.dart'; -import 'package:stadtbote/protocoll_messages/fin_task_message.dart'; +import 'package:stadtbote/network_messages/fin_task_message.dart'; part 'accept_job_message.g.dart'; diff --git a/lib/protocoll_messages/accept_job_message.g.dart b/lib/network_messages/accept_job_message.g.dart similarity index 100% rename from lib/protocoll_messages/accept_job_message.g.dart rename to lib/network_messages/accept_job_message.g.dart diff --git a/lib/protocoll_messages/acknowledge_job.dart b/lib/network_messages/acknowledge_job.dart similarity index 100% rename from lib/protocoll_messages/acknowledge_job.dart rename to lib/network_messages/acknowledge_job.dart diff --git a/lib/protocoll_messages/acknowledge_job.g.dart b/lib/network_messages/acknowledge_job.g.dart similarity index 100% rename from lib/protocoll_messages/acknowledge_job.g.dart rename to lib/network_messages/acknowledge_job.g.dart diff --git a/lib/protocoll_messages/acknowledge_message.dart b/lib/network_messages/acknowledge_message.dart similarity index 100% rename from lib/protocoll_messages/acknowledge_message.dart rename to lib/network_messages/acknowledge_message.dart diff --git a/lib/protocoll_messages/acknowledge_message.g.dart b/lib/network_messages/acknowledge_message.g.dart similarity index 100% rename from lib/protocoll_messages/acknowledge_message.g.dart rename to lib/network_messages/acknowledge_message.g.dart diff --git a/lib/protocoll_messages/bootstrap_request.dart b/lib/network_messages/bootstrap_request.dart similarity index 87% rename from lib/protocoll_messages/bootstrap_request.dart rename to lib/network_messages/bootstrap_request.dart index 770ab0b..7df2fc8 100644 --- a/lib/protocoll_messages/bootstrap_request.dart +++ b/lib/network_messages/bootstrap_request.dart @@ -1,5 +1,5 @@ import 'package:json_annotation/json_annotation.dart'; -import 'package:stadtbote/protocoll_messages/device_object.dart'; +import 'package:stadtbote/network_messages/device_object.dart'; part 'bootstrap_request.g.dart'; diff --git a/lib/protocoll_messages/bootstrap_request.g.dart b/lib/network_messages/bootstrap_request.g.dart similarity index 100% rename from lib/protocoll_messages/bootstrap_request.g.dart rename to lib/network_messages/bootstrap_request.g.dart diff --git a/lib/protocoll_messages/bootstrap_response_config.dart b/lib/network_messages/bootstrap_response_config.dart similarity index 84% rename from lib/protocoll_messages/bootstrap_response_config.dart rename to lib/network_messages/bootstrap_response_config.dart index 68e6e35..3e271e7 100644 --- a/lib/protocoll_messages/bootstrap_response_config.dart +++ b/lib/network_messages/bootstrap_response_config.dart @@ -1,5 +1,5 @@ import 'package:json_annotation/json_annotation.dart'; -import 'package:stadtbote/protocoll_messages/bootstrap_response_topics.dart'; +import 'package:stadtbote/network_messages/bootstrap_response_topics.dart'; part 'bootstrap_response_config.g.dart'; diff --git a/lib/protocoll_messages/bootstrap_response_config.g.dart b/lib/network_messages/bootstrap_response_config.g.dart similarity index 100% rename from lib/protocoll_messages/bootstrap_response_config.g.dart rename to lib/network_messages/bootstrap_response_config.g.dart diff --git a/lib/protocoll_messages/bootstrap_response_payload.dart b/lib/network_messages/bootstrap_response_payload.dart similarity index 100% rename from lib/protocoll_messages/bootstrap_response_payload.dart rename to lib/network_messages/bootstrap_response_payload.dart diff --git a/lib/protocoll_messages/bootstrap_response_payload.g.dart b/lib/network_messages/bootstrap_response_payload.g.dart similarity index 100% rename from lib/protocoll_messages/bootstrap_response_payload.g.dart rename to lib/network_messages/bootstrap_response_payload.g.dart diff --git a/lib/protocoll_messages/bootstrap_response_topics.dart b/lib/network_messages/bootstrap_response_topics.dart similarity index 100% rename from lib/protocoll_messages/bootstrap_response_topics.dart rename to lib/network_messages/bootstrap_response_topics.dart diff --git a/lib/protocoll_messages/bootstrap_response_topics.g.dart b/lib/network_messages/bootstrap_response_topics.g.dart similarity index 100% rename from lib/protocoll_messages/bootstrap_response_topics.g.dart rename to lib/network_messages/bootstrap_response_topics.g.dart diff --git a/lib/protocoll_messages/chat_message.dart b/lib/network_messages/chat_message.dart similarity index 100% rename from lib/protocoll_messages/chat_message.dart rename to lib/network_messages/chat_message.dart diff --git a/lib/protocoll_messages/chat_message.g.dart b/lib/network_messages/chat_message.g.dart similarity index 100% rename from lib/protocoll_messages/chat_message.g.dart rename to lib/network_messages/chat_message.g.dart diff --git a/lib/protocoll_messages/connection_lost_message.dart b/lib/network_messages/connection_lost_message.dart similarity index 100% rename from lib/protocoll_messages/connection_lost_message.dart rename to lib/network_messages/connection_lost_message.dart diff --git a/lib/protocoll_messages/connection_lost_message.g.dart b/lib/network_messages/connection_lost_message.g.dart similarity index 100% rename from lib/protocoll_messages/connection_lost_message.g.dart rename to lib/network_messages/connection_lost_message.g.dart diff --git a/lib/protocoll_messages/device_log_request.dart b/lib/network_messages/device_log_request.dart similarity index 100% rename from lib/protocoll_messages/device_log_request.dart rename to lib/network_messages/device_log_request.dart diff --git a/lib/protocoll_messages/device_log_request.g.dart b/lib/network_messages/device_log_request.g.dart similarity index 100% rename from lib/protocoll_messages/device_log_request.g.dart rename to lib/network_messages/device_log_request.g.dart diff --git a/lib/protocoll_messages/device_log_response.dart b/lib/network_messages/device_log_response.dart similarity index 100% rename from lib/protocoll_messages/device_log_response.dart rename to lib/network_messages/device_log_response.dart diff --git a/lib/protocoll_messages/device_log_response.g.dart b/lib/network_messages/device_log_response.g.dart similarity index 100% rename from lib/protocoll_messages/device_log_response.g.dart rename to lib/network_messages/device_log_response.g.dart diff --git a/lib/protocoll_messages/device_object.dart b/lib/network_messages/device_object.dart similarity index 100% rename from lib/protocoll_messages/device_object.dart rename to lib/network_messages/device_object.dart diff --git a/lib/protocoll_messages/device_object.g.dart b/lib/network_messages/device_object.g.dart similarity index 100% rename from lib/protocoll_messages/device_object.g.dart rename to lib/network_messages/device_object.g.dart diff --git a/lib/protocoll_messages/fin_task_message.dart b/lib/network_messages/fin_task_message.dart similarity index 100% rename from lib/protocoll_messages/fin_task_message.dart rename to lib/network_messages/fin_task_message.dart diff --git a/lib/protocoll_messages/fin_task_message.g.dart b/lib/network_messages/fin_task_message.g.dart similarity index 100% rename from lib/protocoll_messages/fin_task_message.g.dart rename to lib/network_messages/fin_task_message.g.dart diff --git a/lib/protocoll_messages/fin_tour_message.dart b/lib/network_messages/fin_tour_message.dart similarity index 88% rename from lib/protocoll_messages/fin_tour_message.dart rename to lib/network_messages/fin_tour_message.dart index 460871b..05a9195 100644 --- a/lib/protocoll_messages/fin_tour_message.dart +++ b/lib/network_messages/fin_tour_message.dart @@ -1,6 +1,6 @@ import 'package:json_annotation/json_annotation.dart'; -import 'package:stadtbote/protocoll_messages/accept_job_message.dart'; -import 'package:stadtbote/protocoll_messages/fin_task_message.dart'; +import 'package:stadtbote/network_messages/accept_job_message.dart'; +import 'package:stadtbote/network_messages/fin_task_message.dart'; part 'fin_tour_message.g.dart'; diff --git a/lib/protocoll_messages/fin_tour_message.g.dart b/lib/network_messages/fin_tour_message.g.dart similarity index 100% rename from lib/protocoll_messages/fin_tour_message.g.dart rename to lib/network_messages/fin_tour_message.g.dart diff --git a/lib/protocoll_messages/job_del_message.dart b/lib/network_messages/job_del_message.dart similarity index 100% rename from lib/protocoll_messages/job_del_message.dart rename to lib/network_messages/job_del_message.dart diff --git a/lib/protocoll_messages/job_del_message.g.dart b/lib/network_messages/job_del_message.g.dart similarity index 100% rename from lib/protocoll_messages/job_del_message.g.dart rename to lib/network_messages/job_del_message.g.dart diff --git a/lib/protocoll_messages/logout_message.dart b/lib/network_messages/logout_message.dart similarity index 100% rename from lib/protocoll_messages/logout_message.dart rename to lib/network_messages/logout_message.dart diff --git a/lib/protocoll_messages/logout_message.g.dart b/lib/network_messages/logout_message.g.dart similarity index 100% rename from lib/protocoll_messages/logout_message.g.dart rename to lib/network_messages/logout_message.g.dart diff --git a/lib/protocoll_messages/messages_showed.dart b/lib/network_messages/messages_showed.dart similarity index 100% rename from lib/protocoll_messages/messages_showed.dart rename to lib/network_messages/messages_showed.dart diff --git a/lib/protocoll_messages/messages_showed.g.dart b/lib/network_messages/messages_showed.g.dart similarity index 100% rename from lib/protocoll_messages/messages_showed.g.dart rename to lib/network_messages/messages_showed.g.dart diff --git a/lib/protocoll_messages/pic_message.dart b/lib/network_messages/pic_message.dart similarity index 100% rename from lib/protocoll_messages/pic_message.dart rename to lib/network_messages/pic_message.dart diff --git a/lib/protocoll_messages/pic_message.g.dart b/lib/network_messages/pic_message.g.dart similarity index 100% rename from lib/protocoll_messages/pic_message.g.dart rename to lib/network_messages/pic_message.g.dart diff --git a/lib/protocoll_messages/set_desired_zip_message.dart b/lib/network_messages/set_desired_zip_message.dart similarity index 100% rename from lib/protocoll_messages/set_desired_zip_message.dart rename to lib/network_messages/set_desired_zip_message.dart diff --git a/lib/protocoll_messages/set_desired_zip_message.g.dart b/lib/network_messages/set_desired_zip_message.g.dart similarity index 100% rename from lib/protocoll_messages/set_desired_zip_message.g.dart rename to lib/network_messages/set_desired_zip_message.g.dart diff --git a/lib/protocoll_messages/start_session_message.dart b/lib/network_messages/start_session_message.dart similarity index 100% rename from lib/protocoll_messages/start_session_message.dart rename to lib/network_messages/start_session_message.dart diff --git a/lib/protocoll_messages/start_session_message.g.dart b/lib/network_messages/start_session_message.g.dart similarity index 100% rename from lib/protocoll_messages/start_session_message.g.dart rename to lib/network_messages/start_session_message.g.dart diff --git a/lib/protocoll_messages/status_info_update.dart b/lib/network_messages/status_info_update.dart similarity index 100% rename from lib/protocoll_messages/status_info_update.dart rename to lib/network_messages/status_info_update.dart diff --git a/lib/protocoll_messages/sync_jobs_message.dart b/lib/network_messages/sync_jobs_message.dart similarity index 100% rename from lib/protocoll_messages/sync_jobs_message.dart rename to lib/network_messages/sync_jobs_message.dart diff --git a/lib/protocoll_messages/sync_jobs_message.g.dart b/lib/network_messages/sync_jobs_message.g.dart similarity index 100% rename from lib/protocoll_messages/sync_jobs_message.g.dart rename to lib/network_messages/sync_jobs_message.g.dart diff --git a/lib/protocoll_messages/track_message.dart b/lib/network_messages/track_message.dart similarity index 100% rename from lib/protocoll_messages/track_message.dart rename to lib/network_messages/track_message.dart diff --git a/lib/protocoll_messages/track_message.g.dart b/lib/network_messages/track_message.g.dart similarity index 100% rename from lib/protocoll_messages/track_message.g.dart rename to lib/network_messages/track_message.g.dart diff --git a/lib/protocoll_messages/track_station_message.dart b/lib/network_messages/track_station_message.dart similarity index 86% rename from lib/protocoll_messages/track_station_message.dart rename to lib/network_messages/track_station_message.dart index ce813d8..62fa69c 100644 --- a/lib/protocoll_messages/track_station_message.dart +++ b/lib/network_messages/track_station_message.dart @@ -1,5 +1,5 @@ import 'package:json_annotation/json_annotation.dart'; -import 'package:stadtbote/protocoll_messages/fin_task_message.dart'; +import 'package:stadtbote/network_messages/fin_task_message.dart'; part 'track_station_message.g.dart'; diff --git a/lib/protocoll_messages/track_station_message.g.dart b/lib/network_messages/track_station_message.g.dart similarity index 100% rename from lib/protocoll_messages/track_station_message.g.dart rename to lib/network_messages/track_station_message.g.dart diff --git a/lib/protocoll_messages/zip_message.dart b/lib/network_messages/zip_message.dart similarity index 100% rename from lib/protocoll_messages/zip_message.dart rename to lib/network_messages/zip_message.dart diff --git a/lib/protocoll_messages/zip_message.g.dart b/lib/network_messages/zip_message.g.dart similarity index 100% rename from lib/protocoll_messages/zip_message.g.dart rename to lib/network_messages/zip_message.g.dart diff --git a/lib/popups/accept_jobs_popup.dart b/lib/popups/accept_jobs_popup.dart index e600c93..ea39a64 100644 --- a/lib/popups/accept_jobs_popup.dart +++ b/lib/popups/accept_jobs_popup.dart @@ -5,9 +5,9 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:shared_map/shared_map.dart'; import 'package:stadtbote/main.dart'; -import 'package:stadtbote/protocoll_messages/accept_job_message.dart'; import 'package:stadtbote/model/job.dart'; -import 'package:stadtbote/protocoll_messages/fin_task_message.dart'; +import 'package:stadtbote/network_messages/accept_job_message.dart'; +import 'package:stadtbote/network_messages/fin_task_message.dart'; import 'package:stadtbote/tools/ExtendedStatefulBuilder.dart'; import 'package:stadtbote/tools/constants.dart'; import 'package:stadtbote/tools/messages/job_deleted_message.dart'; @@ -188,7 +188,7 @@ Future> _fetchJobWidgets(StateSetter dialogState, Function() onFini var job = jobEntry.value; ExpandableController controller = ExpandableController(); - controller.expanded = _infoExpandedMap[job.id] != null ? _infoExpandedMap[job.id]! : false; + controller.expanded = false; controller.addListener(() { if (controller.expanded) { diff --git a/lib/tools/mqtt_core.dart b/lib/tools/mqtt_core.dart index 0d04259..87d0930 100644 --- a/lib/tools/mqtt_core.dart +++ b/lib/tools/mqtt_core.dart @@ -16,19 +16,19 @@ import 'package:stadtbote/model/chat_message.dart'; import 'package:stadtbote/model/location_status.dart'; import 'package:stadtbote/model/rank.dart'; import 'package:stadtbote/model/status.dart'; -import 'package:stadtbote/protocoll_messages/acknowledge_job.dart'; -import 'package:stadtbote/protocoll_messages/bootstrap_request.dart'; -import 'package:stadtbote/protocoll_messages/bootstrap_response_payload.dart'; -import 'package:stadtbote/protocoll_messages/connection_lost_message.dart'; -import 'package:stadtbote/protocoll_messages/device_log_request.dart'; -import 'package:stadtbote/protocoll_messages/device_log_response.dart'; -import 'package:stadtbote/protocoll_messages/device_object.dart'; -import 'package:stadtbote/protocoll_messages/job_del_message.dart'; -import 'package:stadtbote/protocoll_messages/acknowledge_message.dart'; -import 'package:stadtbote/protocoll_messages/start_session_message.dart'; -import 'package:stadtbote/protocoll_messages/status_info_update.dart'; -import 'package:stadtbote/protocoll_messages/sync_jobs_message.dart'; -import 'package:stadtbote/protocoll_messages/track_message.dart'; +import 'package:stadtbote/network_messages/acknowledge_job.dart'; +import 'package:stadtbote/network_messages/acknowledge_message.dart'; +import 'package:stadtbote/network_messages/bootstrap_request.dart'; +import 'package:stadtbote/network_messages/bootstrap_response_payload.dart'; +import 'package:stadtbote/network_messages/connection_lost_message.dart'; +import 'package:stadtbote/network_messages/device_log_request.dart'; +import 'package:stadtbote/network_messages/device_log_response.dart'; +import 'package:stadtbote/network_messages/device_object.dart'; +import 'package:stadtbote/network_messages/job_del_message.dart'; +import 'package:stadtbote/network_messages/start_session_message.dart'; +import 'package:stadtbote/network_messages/status_info_update.dart'; +import 'package:stadtbote/network_messages/sync_jobs_message.dart'; +import 'package:stadtbote/network_messages/track_message.dart'; import 'package:stadtbote/tools/connection_status.dart'; import 'package:stadtbote/tools/message_header.dart'; import 'package:stadtbote/tools/messages/publish_payload_message.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 25d5f3d..badff4e 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: 330.0.0+330 +version: 332.0.0+332 environment: sdk: '>=2.19.6 <3.0.0'