Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Partially fixed imports #9

Merged
merged 1 commit into from
Jan 16, 2023
Merged

Partially fixed imports #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions lib/domain/core/calculator.dart
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions lib/src/buttons/control_button/control_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

import 'package:crane_monitoring_app/presentation/core/widgets/button/control_button/control_button_indicator.dart';
import 'package:flutter/material.dart';
import 'package:hmi_core/hmi_core.dart';

import 'control_button_indicator.dart';

class ControlButton extends StatelessWidget {
final Stream<DsDataPoint<num>>? _stream;
final List<String> _stateValues;
Expand Down
1 change: 0 additions & 1 deletion lib/src/buttons/control_button/control_button_indicator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:crane_monitoring_app/presentation/core/theme/app_theme.dart';
import 'package:flutter/material.dart';
import 'package:hmi_core/hmi_core.dart';

Expand Down
11 changes: 2 additions & 9 deletions lib/src/buttons/drop_down_control_button/drop_down_control_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
import 'dart:async';

import 'package:crane_monitoring_app/domain/core/entities/double_container.dart';
import 'package:crane_monitoring_app/presentation/core/dialogs/ds_data_stream_extract.dart';
import 'package:crane_monitoring_app/domain/core/entities/network_operation_state.dart';
import 'package:hmi_networking/hmi_networking.dart';
import 'package:crane_monitoring_app/infrastructure/stream/ds_send.dart';
import 'package:crane_monitoring_app/presentation/core/theme/app_theme.dart';
import 'package:crane_monitoring_app/presentation/core/widgets/button/pupup_menu_button/popup_menu_button_custom.dart';
import 'package:crane_monitoring_app/settings/common_settings.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:hmi_networking/hmi_networking.dart';
import 'package:hmi_core/hmi_core.dart';

import 'package:hmi_widgets/src/popups/popup_menu_button/popup_menu_button_custom.dart';
///
/// Кнопка посылает значение bool / int / real в DsClient
class DropDownControlButton extends StatefulWidget {
Expand Down
8 changes: 3 additions & 5 deletions lib/src/charts/crane_load_chart/crane_load_chart.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import 'dart:math';

import 'package:crane_monitoring_app/domain/core/entities/ds_data_point.dart';
import 'package:crane_monitoring_app/domain/core/entities/ds_status.dart';
import 'package:crane_monitoring_app/domain/core/log/log.dart';
import 'package:crane_monitoring_app/domain/swl/swl_data.dart';
import 'package:crane_monitoring_app/presentation/core/widgets/crane_load_chart/crane_load_point_painter.dart';
import 'package:flutter/material.dart';
import 'package:hmi_core/hmi_core.dart';

import 'crane_load_point_painter.dart';

/// диаграмма нагрузки крана
/// загружает координаты x, y, положения крана
Expand Down
3 changes: 1 addition & 2 deletions lib/src/charts/crane_load_chart/crane_load_point_painter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import 'dart:math';
import 'dart:ui';

import 'package:crane_monitoring_app/domain/core/log/log.dart';
import 'package:flutter/material.dart';

import 'package:hmi_core/hmi_core_log.dart';
///
class CraneLoadPointPainter extends CustomPainter {
static const _debug = false;
Expand Down
4 changes: 2 additions & 2 deletions lib/src/charts/crane_position_chart/crane_position_chart.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:crane_monitoring_app/domain/core/entities/ds_data_point.dart';
import 'package:crane_monitoring_app/presentation/core/widgets/crane_position_chart/crane_position_painter.dart';
import 'package:flutter/material.dart';
import 'package:hmi_core/hmi_core.dart';

import 'crane_position_painter.dart';
///
class CranePositionChart extends StatefulWidget {
final Stream<DsDataPoint<double>> _xStream;
Expand Down
4 changes: 2 additions & 2 deletions lib/src/charts/crane_position_chart/crane_position_painter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'dart:math';
import 'dart:ui';

import 'package:crane_monitoring_app/domain/core/log/log.dart';
import 'package:crane_monitoring_app/presentation/core/widgets/crane_position_chart/crane_position_chart.dart';
import 'package:flutter/material.dart';
import 'package:hmi_core/hmi_core_log.dart';

import 'crane_position_chart.dart';
///
class CranePositionPainter extends CustomPainter {
static const _debug = false;
Expand Down
9 changes: 3 additions & 6 deletions lib/src/indicators/status_indicators/dps_icon_indicator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import 'package:crane_monitoring_app/domain/core/entities/ds_data_point.dart';
import 'package:crane_monitoring_app/presentation/core/dialogs/ds_data_stream_extract.dart';
import 'package:crane_monitoring_app/domain/core/entities/state_constatnts.dart';
import 'package:crane_monitoring_app/domain/core/log/log.dart';
import 'package:crane_monitoring_app/presentation/core/theme/app_theme.dart';
import 'package:crane_monitoring_app/presentation/core/widgets/invalid_status_indicator.dart';
import 'package:flutter/material.dart';
import 'package:hmi_core/hmi_core.dart';
import 'package:hmi_widgets/src/theme/app_theme.dart';

import 'invalid_status_indicator.dart';
///
/// Double Point status indicator.
/// Simple icon, indicates state of streamed int:
Expand Down
6 changes: 2 additions & 4 deletions lib/src/indicators/status_indicators/invalid_status_indicator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:crane_monitoring_app/domain/core/entities/ds_data_point.dart';
import 'package:crane_monitoring_app/domain/core/entities/ds_status.dart';
import 'package:crane_monitoring_app/presentation/core/theme/app_theme.dart';
import 'package:flutter/material.dart';

import 'package:hmi_core/hmi_core.dart';
import 'package:hmi_widgets/src/theme/app_theme.dart';
///
/// маленький круглый цветовой индикатор
/// размером по умолчанию 8px
Expand Down
7 changes: 2 additions & 5 deletions lib/src/indicators/status_indicators/sps_icon_indicator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import 'package:crane_monitoring_app/domain/core/entities/ds_data_point.dart';
import 'package:crane_monitoring_app/domain/core/entities/ds_status.dart';
import 'package:crane_monitoring_app/domain/core/log/log.dart';
import 'package:crane_monitoring_app/presentation/core/theme/app_theme.dart';
import 'package:flutter/material.dart';

import 'package:hmi_core/hmi_core.dart';
import 'package:hmi_widgets/src/theme/app_theme.dart';
///
/// Single Point status indicator.
/// Simple icon, indicates state of streamed boolean.
Expand Down
1 change: 0 additions & 1 deletion lib/src/indicators/status_indicators/status_indicator_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:crane_monitoring_app/settings/common_settings.dart';
import 'package:flutter/material.dart';
import 'package:hmi_core/hmi_core.dart';

Expand Down
3 changes: 0 additions & 3 deletions lib/src/indicators/value_indicators/circular_value_indicator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import 'dart:math';

import 'package:crane_monitoring_app/domain/core/entities/relative_value.dart';
import 'package:crane_monitoring_app/presentation/core/theme/app_theme.dart';
import 'package:flutter/material.dart';
import 'package:hmi_core/hmi_core.dart';

///
/// Круговой индикатор значения из потока [stream] <DsDataPoint<double>.
/// Значение в потоке может изменяться в диапазоне [min]...[max].
Expand Down
3 changes: 0 additions & 3 deletions lib/src/indicators/value_indicators/linear_value_indicator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import 'dart:math';

import 'package:crane_monitoring_app/domain/auth/app_user.dart';
import 'package:crane_monitoring_app/domain/core/entities/relative_value.dart';
import 'package:crane_monitoring_app/presentation/core/theme/app_theme.dart';
import 'package:flutter/material.dart';
import 'package:hmi_core/hmi_core.dart';

Expand Down
4 changes: 1 addition & 3 deletions lib/src/indicators/value_indicators/text_value_indicator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:crane_monitoring_app/presentation/core/theme/app_theme.dart';
import 'package:flutter/material.dart';
import 'package:hmi_core/hmi_core.dart';

import 'package:hmi_widgets/src/theme/app_theme.dart';
///
/// Simple text field, indicates state of streamed [DsDataPoint] value,
class TextValueIndicator extends StatefulWidget {
Expand Down Expand Up @@ -36,7 +35,6 @@ class TextValueIndicator extends StatefulWidget {
low: _low,
);
}

///
class _TextValueIndicatorState extends State<TextValueIndicator> {
static const _debug = true;
Expand Down
3 changes: 0 additions & 3 deletions lib/src/theme/app_theme.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@

import 'package:crane_monitoring_app/presentation/core/theme/dark_theme_config.dart';
import 'package:crane_monitoring_app/presentation/core/theme/light_theme_config.dart';
import "package:flutter/material.dart";

final light_theme = LightThemeConfig();
Expand Down
9 changes: 9 additions & 0 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ dev_dependencies:
lint: ^1.10.0
mockito: ^5.3.0
# flutter_lints: ^2.0.0
fl_chart: ^0.55.1
hmi_core:
git:
url: https://github.com/a-givertzman/hmi_core.git
ref: master
hmi_networking:
git:
url: https://github.com/a-givertzman/hmi_networking.git
ref: master

# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
Expand Down
12 changes: 0 additions & 12 deletions test/hmi_widgets_test.dart
View file
Open in desktop

This file was deleted.