diff --git a/lib/entity_widgets/common/badge.dart b/lib/entities/badge.widget.dart similarity index 99% rename from lib/entity_widgets/common/badge.dart rename to lib/entities/badge.widget.dart index 32080cf..36c8984 100644 --- a/lib/entity_widgets/common/badge.dart +++ b/lib/entities/badge.widget.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../main.dart'; class BadgeWidget extends StatelessWidget { @override diff --git a/lib/entity_widgets/common/camera_stream_view.dart b/lib/entities/camera/widgets/camera_stream_view.dart similarity index 97% rename from lib/entity_widgets/common/camera_stream_view.dart rename to lib/entities/camera/widgets/camera_stream_view.dart index 4e62a6e..9300100 100644 --- a/lib/entity_widgets/common/camera_stream_view.dart +++ b/lib/entities/camera/widgets/camera_stream_view.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class CameraStreamView extends StatefulWidget { diff --git a/lib/entity_widgets/common/mode_selector.dart b/lib/entities/climate/widgets/mode_selector.dart similarity index 98% rename from lib/entity_widgets/common/mode_selector.dart rename to lib/entities/climate/widgets/mode_selector.dart index 365933f..d77f130 100644 --- a/lib/entity_widgets/common/mode_selector.dart +++ b/lib/entities/climate/widgets/mode_selector.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class ModeSelectorWidget extends StatelessWidget { diff --git a/lib/entity_widgets/common/mode_swicth.dart b/lib/entities/climate/widgets/mode_swicth.dart similarity index 97% rename from lib/entity_widgets/common/mode_swicth.dart rename to lib/entities/climate/widgets/mode_swicth.dart index d34ca3e..9051fd9 100644 --- a/lib/entity_widgets/common/mode_swicth.dart +++ b/lib/entities/climate/widgets/mode_swicth.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class ModeSwitchWidget extends StatelessWidget { diff --git a/lib/entity_widgets/default_entity_container.dart b/lib/entities/default_entity_container.widget.dart similarity index 100% rename from lib/entity_widgets/default_entity_container.dart rename to lib/entities/default_entity_container.widget.dart diff --git a/lib/entity_widgets/entity_colors.class.dart b/lib/entities/entity_colors.class.dart similarity index 100% rename from lib/entity_widgets/entity_colors.class.dart rename to lib/entities/entity_colors.class.dart diff --git a/lib/entity_widgets/entity_icon.dart b/lib/entities/entity_icon.widget.dart similarity index 100% rename from lib/entity_widgets/entity_icon.dart rename to lib/entities/entity_icon.widget.dart diff --git a/lib/entity_widgets/model_widgets.dart b/lib/entities/entity_model.widget.dart similarity index 100% rename from lib/entity_widgets/model_widgets.dart rename to lib/entities/entity_model.widget.dart diff --git a/lib/entity_widgets/entity_name.dart b/lib/entities/entity_name.widget.dart similarity index 100% rename from lib/entity_widgets/entity_name.dart rename to lib/entities/entity_name.widget.dart diff --git a/lib/entity_widgets/common/flat_service_button.dart b/lib/entities/flat_service_button.widget.dart similarity index 97% rename from lib/entity_widgets/common/flat_service_button.dart rename to lib/entities/flat_service_button.widget.dart index 405d6a1..6dc4612 100644 --- a/lib/entity_widgets/common/flat_service_button.dart +++ b/lib/entities/flat_service_button.widget.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../main.dart'; class FlatServiceButton extends StatelessWidget { diff --git a/lib/entity_widgets/common/light_color_picker.dart b/lib/entities/light/widgets/light_color_picker.dart similarity index 99% rename from lib/entity_widgets/common/light_color_picker.dart rename to lib/entities/light/widgets/light_color_picker.dart index f3052f3..0ca6a45 100644 --- a/lib/entity_widgets/common/light_color_picker.dart +++ b/lib/entities/light/widgets/light_color_picker.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class LightColorPicker extends StatefulWidget { diff --git a/lib/entity_widgets/missed_entity.dart b/lib/entities/missed_entity.widget.dart similarity index 100% rename from lib/entity_widgets/missed_entity.dart rename to lib/entities/missed_entity.widget.dart diff --git a/lib/entity_widgets/common/simple_state.dart b/lib/entities/simple_state.widget.dart similarity index 98% rename from lib/entity_widgets/common/simple_state.dart rename to lib/entities/simple_state.widget.dart index eb68ec4..47ffe36 100644 --- a/lib/entity_widgets/common/simple_state.dart +++ b/lib/entities/simple_state.widget.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../main.dart'; class SimpleEntityState extends StatelessWidget { diff --git a/lib/entity_widgets/common/universal_slider.dart b/lib/entities/universal_slider.widget.dart similarity index 98% rename from lib/entity_widgets/common/universal_slider.dart rename to lib/entities/universal_slider.widget.dart index 3ce9739..cc17104 100644 --- a/lib/entity_widgets/common/universal_slider.dart +++ b/lib/entities/universal_slider.widget.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../main.dart'; class UniversalSlider extends StatelessWidget { diff --git a/lib/main.dart b/lib/main.dart index a4f6414..03c4af3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -51,35 +51,35 @@ part 'entities/fan/fan_entity.class.dart'; part 'entities/automation/automation_entity.class.dart'; part 'entities/camera/camera_entity.class.dart'; part 'entities/alarm_control_panel/alarm_control_panel_entity.class.dart'; -part 'entity_widgets/common/badge.dart'; -part 'entity_widgets/model_widgets.dart'; -part 'entity_widgets/default_entity_container.dart'; -part 'entity_widgets/missed_entity.dart'; +part 'entities/badge.widget.dart'; +part 'entities/entity_model.widget.dart'; +part 'entities/default_entity_container.widget.dart'; +part 'entities/missed_entity.widget.dart'; part 'cards/widgets/glance_card_entity_container.dart'; part 'cards/widgets/entity_button_card_body.widget.dart'; -part 'entity_widgets/common/entity_attributes_list.dart'; -part 'entity_widgets/entity_icon.dart'; -part 'entity_widgets/entity_name.dart'; -part 'entity_widgets/common/last_updated.dart'; -part 'entity_widgets/common/mode_swicth.dart'; -part 'entity_widgets/common/mode_selector.dart'; -part 'entity_widgets/common/universal_slider.dart'; -part 'entity_widgets/common/flat_service_button.dart'; -part 'entity_widgets/common/light_color_picker.dart'; -part 'entity_widgets/common/camera_stream_view.dart'; -part 'entity_widgets/entity_colors.class.dart'; -part 'entity_widgets/entity_page_container.dart'; -part 'entity_widgets/history_chart/entity_history.dart'; -part 'entity_widgets/history_chart/simple_state_history_chart.dart'; -part 'entity_widgets/history_chart/numeric_state_history_chart.dart'; -part 'entity_widgets/history_chart/combined_history_chart.dart'; -part 'entity_widgets/history_chart/history_control_widget.dart'; -part 'entity_widgets/history_chart/entity_history_moment.dart'; +part 'pages/widgets/entity_attributes_list.dart'; +part 'entities/entity_icon.widget.dart'; +part 'entities/entity_name.widget.dart'; +part 'pages/widgets/last_updated.dart'; +part 'entities/climate/widgets/mode_swicth.dart'; +part 'entities/climate/widgets/mode_selector.dart'; +part 'entities/universal_slider.widget.dart'; +part 'entities/flat_service_button.widget.dart'; +part 'entities/light/widgets/light_color_picker.dart'; +part 'entities/camera/widgets/camera_stream_view.dart'; +part 'entities/entity_colors.class.dart'; +part 'pages/widgets/entity_page_container.widget.dart'; +part 'plugins/history_chart/entity_history.dart'; +part 'plugins/history_chart/simple_state_history_chart.dart'; +part 'plugins/history_chart/numeric_state_history_chart.dart'; +part 'plugins/history_chart/combined_history_chart.dart'; +part 'plugins/history_chart/history_control_widget.dart'; +part 'plugins/history_chart/entity_history_moment.dart'; part 'entities/switch/widget/switch_state.dart'; part 'entities/slider/widgets/slider_controls.dart'; part 'entities/text/widgets/text_input_state.dart'; part 'entities/select/widgets/select_state.dart'; -part 'entity_widgets/common/simple_state.dart'; +part 'entities/simple_state.widget.dart'; part 'entities/timer/widgets/timer_state.dart'; part 'entities/climate/widgets/climate_state.widget.dart'; part 'entities/cover/widgets/cover_state.dart'; @@ -102,7 +102,7 @@ part 'pages/main.page.dart'; part 'home_assistant.class.dart'; part 'pages/log.page.dart'; part 'pages/entity.page.dart'; -part 'mdi.class.dart'; +part 'utils/mdi.class.dart'; part 'entity_collection.class.dart'; part 'managers/auth_manager.class.dart'; part 'managers/location_manager.class.dart'; diff --git a/lib/entity_widgets/common/entity_attributes_list.dart b/lib/pages/widgets/entity_attributes_list.dart similarity index 100% rename from lib/entity_widgets/common/entity_attributes_list.dart rename to lib/pages/widgets/entity_attributes_list.dart diff --git a/lib/entity_widgets/entity_page_container.dart b/lib/pages/widgets/entity_page_container.widget.dart similarity index 90% rename from lib/entity_widgets/entity_page_container.dart rename to lib/pages/widgets/entity_page_container.widget.dart index 2b09eff..5573e12 100644 --- a/lib/entity_widgets/entity_page_container.dart +++ b/lib/pages/widgets/entity_page_container.widget.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class EntityPageContainer extends StatelessWidget { EntityPageContainer({Key key, @required this.children}) : super(key: key); diff --git a/lib/entity_widgets/common/last_updated.dart b/lib/pages/widgets/last_updated.dart similarity index 100% rename from lib/entity_widgets/common/last_updated.dart rename to lib/pages/widgets/last_updated.dart diff --git a/lib/entity_widgets/history_chart/combined_history_chart.dart b/lib/plugins/history_chart/combined_history_chart.dart similarity index 100% rename from lib/entity_widgets/history_chart/combined_history_chart.dart rename to lib/plugins/history_chart/combined_history_chart.dart diff --git a/lib/entity_widgets/history_chart/entity_history.dart b/lib/plugins/history_chart/entity_history.dart similarity index 100% rename from lib/entity_widgets/history_chart/entity_history.dart rename to lib/plugins/history_chart/entity_history.dart diff --git a/lib/entity_widgets/history_chart/entity_history_moment.dart b/lib/plugins/history_chart/entity_history_moment.dart similarity index 100% rename from lib/entity_widgets/history_chart/entity_history_moment.dart rename to lib/plugins/history_chart/entity_history_moment.dart diff --git a/lib/entity_widgets/history_chart/history_control_widget.dart b/lib/plugins/history_chart/history_control_widget.dart similarity index 100% rename from lib/entity_widgets/history_chart/history_control_widget.dart rename to lib/plugins/history_chart/history_control_widget.dart diff --git a/lib/entity_widgets/history_chart/numeric_state_history_chart.dart b/lib/plugins/history_chart/numeric_state_history_chart.dart similarity index 100% rename from lib/entity_widgets/history_chart/numeric_state_history_chart.dart rename to lib/plugins/history_chart/numeric_state_history_chart.dart diff --git a/lib/entity_widgets/history_chart/simple_state_history_chart.dart b/lib/plugins/history_chart/simple_state_history_chart.dart similarity index 100% rename from lib/entity_widgets/history_chart/simple_state_history_chart.dart rename to lib/plugins/history_chart/simple_state_history_chart.dart diff --git a/lib/mdi.class.dart b/lib/utils/mdi.class.dart similarity index 99% rename from lib/mdi.class.dart rename to lib/utils/mdi.class.dart index 069fc93..63af439 100644 --- a/lib/mdi.class.dart +++ b/lib/utils/mdi.class.dart @@ -1,4 +1,4 @@ -part of 'main.dart'; +part of '../main.dart'; class MaterialDesignIcons { static final Map defaultIconsByDomains = {