diff --git a/lib/entity_class/const.dart b/lib/const.dart similarity index 99% rename from lib/entity_class/const.dart rename to lib/const.dart index 9e338e5..ccd8710 100644 --- a/lib/entity_class/const.dart +++ b/lib/const.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of 'main.dart'; class EntityState { static const on = 'on'; diff --git a/lib/entity_class/alarm_control_panel.class.dart b/lib/entities/alarm_control_panel/alarm_control_panel_entity.class.dart similarity index 91% rename from lib/entity_class/alarm_control_panel.class.dart rename to lib/entities/alarm_control_panel/alarm_control_panel_entity.class.dart index 7166a96..6cf3ca2 100644 --- a/lib/entity_class/alarm_control_panel.class.dart +++ b/lib/entities/alarm_control_panel/alarm_control_panel_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class AlarmControlPanelEntity extends Entity { AlarmControlPanelEntity(Map rawData, String webHost) : super(rawData, webHost); diff --git a/lib/entity_widgets/controls/alarm_control_panel_controls.dart b/lib/entities/alarm_control_panel/widgets/alarm_control_panel_controls.widget.dart similarity index 99% rename from lib/entity_widgets/controls/alarm_control_panel_controls.dart rename to lib/entities/alarm_control_panel/widgets/alarm_control_panel_controls.widget.dart index 6964911..c1a91a3 100644 --- a/lib/entity_widgets/controls/alarm_control_panel_controls.dart +++ b/lib/entities/alarm_control_panel/widgets/alarm_control_panel_controls.widget.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class AlarmControlPanelControlsWidget extends StatefulWidget { diff --git a/lib/entity_class/automation_entity.dart b/lib/entities/automation/automation_entity.class.dart similarity index 95% rename from lib/entity_class/automation_entity.dart rename to lib/entities/automation/automation_entity.class.dart index b2d0270..cb998df 100644 --- a/lib/entity_class/automation_entity.dart +++ b/lib/entities/automation/automation_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class AutomationEntity extends Entity { AutomationEntity(Map rawData, String webHost) : super(rawData, webHost); diff --git a/lib/entity_class/button_entity.class.dart b/lib/entities/button/button_entity.class.dart similarity index 92% rename from lib/entity_class/button_entity.class.dart rename to lib/entities/button/button_entity.class.dart index 05da8f0..3383da2 100644 --- a/lib/entity_class/button_entity.class.dart +++ b/lib/entities/button/button_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class ButtonEntity extends Entity { ButtonEntity(Map rawData, String webHost) : super(rawData, webHost); diff --git a/lib/entity_class/camera_entity.class.dart b/lib/entities/camera/camera_entity.class.dart similarity index 93% rename from lib/entity_class/camera_entity.class.dart rename to lib/entities/camera/camera_entity.class.dart index 4a2d519..810f04a 100644 --- a/lib/entity_class/camera_entity.class.dart +++ b/lib/entities/camera/camera_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class CameraEntity extends Entity { diff --git a/lib/entity_class/climate_entity.class.dart b/lib/entities/climate/climate_entity.class.dart similarity index 99% rename from lib/entity_class/climate_entity.class.dart rename to lib/entities/climate/climate_entity.class.dart index d634415..a8ce00f 100644 --- a/lib/entity_class/climate_entity.class.dart +++ b/lib/entities/climate/climate_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class ClimateEntity extends Entity { diff --git a/lib/entity_widgets/controls/climate_controls.dart b/lib/entities/climate/widgets/climate_controls.dart similarity index 99% rename from lib/entity_widgets/controls/climate_controls.dart rename to lib/entities/climate/widgets/climate_controls.dart index ac68481..ee2f7a0 100644 --- a/lib/entity_widgets/controls/climate_controls.dart +++ b/lib/entities/climate/widgets/climate_controls.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class ClimateControlWidget extends StatefulWidget { diff --git a/lib/entity_widgets/state/climate_state.dart b/lib/entities/climate/widgets/climate_state.widget.dart similarity index 98% rename from lib/entity_widgets/state/climate_state.dart rename to lib/entities/climate/widgets/climate_state.widget.dart index 9499116..4d9c244 100644 --- a/lib/entity_widgets/state/climate_state.dart +++ b/lib/entities/climate/widgets/climate_state.widget.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class ClimateStateWidget extends StatelessWidget { @override diff --git a/lib/entity_class/cover_entity.class.dart b/lib/entities/cover/cover_entity.class.dart similarity index 98% rename from lib/entity_class/cover_entity.class.dart rename to lib/entities/cover/cover_entity.class.dart index 9082bd7..2c53178 100644 --- a/lib/entity_class/cover_entity.class.dart +++ b/lib/entities/cover/cover_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class CoverEntity extends Entity { diff --git a/lib/entity_widgets/controls/cover_controls.dart b/lib/entities/cover/widgets/cover_controls.widget.dart similarity index 99% rename from lib/entity_widgets/controls/cover_controls.dart rename to lib/entities/cover/widgets/cover_controls.widget.dart index 3132d1f..40ab1b2 100644 --- a/lib/entity_widgets/controls/cover_controls.dart +++ b/lib/entities/cover/widgets/cover_controls.widget.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class CoverControlWidget extends StatefulWidget { diff --git a/lib/entity_widgets/state/cover_state.dart b/lib/entities/cover/widgets/cover_state.dart similarity index 98% rename from lib/entity_widgets/state/cover_state.dart rename to lib/entities/cover/widgets/cover_state.dart index 48a8c32..a115557 100644 --- a/lib/entity_widgets/state/cover_state.dart +++ b/lib/entities/cover/widgets/cover_state.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class CoverStateWidget extends StatelessWidget { void _open(CoverEntity entity) { diff --git a/lib/entity_class/date_time_entity.class.dart b/lib/entities/date_time/date_time_entity.class.dart similarity index 97% rename from lib/entity_class/date_time_entity.class.dart rename to lib/entities/date_time/date_time_entity.class.dart index 8aea4e5..fdca0b1 100644 --- a/lib/entity_class/date_time_entity.class.dart +++ b/lib/entities/date_time/date_time_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class DateTimeEntity extends Entity { DateTimeEntity(Map rawData, String webHost) : super(rawData, webHost); diff --git a/lib/entity_widgets/state/date_time_state.dart b/lib/entities/date_time/widgets/date_time_state.dart similarity index 98% rename from lib/entity_widgets/state/date_time_state.dart rename to lib/entities/date_time/widgets/date_time_state.dart index a210eb3..40f87b4 100644 --- a/lib/entity_widgets/state/date_time_state.dart +++ b/lib/entities/date_time/widgets/date_time_state.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class DateTimeStateWidget extends StatelessWidget { @override diff --git a/lib/entity_class/entity.class.dart b/lib/entities/entity.class.dart similarity index 100% rename from lib/entity_class/entity.class.dart rename to lib/entities/entity.class.dart diff --git a/lib/entity_class/entity_wrapper.class.dart b/lib/entities/entity_wrapper.class.dart similarity index 100% rename from lib/entity_class/entity_wrapper.class.dart rename to lib/entities/entity_wrapper.class.dart diff --git a/lib/entity_class/fan_entity.class.dart b/lib/entities/fan/fan_entity.class.dart similarity index 96% rename from lib/entity_class/fan_entity.class.dart rename to lib/entities/fan/fan_entity.class.dart index 927a57c..3cf1816 100644 --- a/lib/entity_class/fan_entity.class.dart +++ b/lib/entities/fan/fan_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class FanEntity extends Entity { diff --git a/lib/entity_widgets/controls/fan_controls.dart b/lib/entities/fan/widgets/fan_controls.dart similarity index 99% rename from lib/entity_widgets/controls/fan_controls.dart rename to lib/entities/fan/widgets/fan_controls.dart index a2e2457..a630896 100644 --- a/lib/entity_widgets/controls/fan_controls.dart +++ b/lib/entities/fan/widgets/fan_controls.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class FanControlsWidget extends StatefulWidget { diff --git a/lib/entity_class/group_entity.class.dart b/lib/entities/group/group_entity.class.dart similarity index 97% rename from lib/entity_class/group_entity.class.dart rename to lib/entities/group/group_entity.class.dart index ada70a9..196bdec 100644 --- a/lib/entity_class/group_entity.class.dart +++ b/lib/entities/group/group_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class GroupEntity extends Entity { diff --git a/lib/entity_class/light_entity.class.dart b/lib/entities/light/light_entity.class.dart similarity index 98% rename from lib/entity_class/light_entity.class.dart rename to lib/entities/light/light_entity.class.dart index 687ddfc..0f70155 100644 --- a/lib/entity_class/light_entity.class.dart +++ b/lib/entities/light/light_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class LightEntity extends Entity { diff --git a/lib/entity_widgets/controls/light_controls.dart b/lib/entities/light/widgets/light_controls.dart similarity index 99% rename from lib/entity_widgets/controls/light_controls.dart rename to lib/entities/light/widgets/light_controls.dart index 66715b2..f6e3b63 100644 --- a/lib/entity_widgets/controls/light_controls.dart +++ b/lib/entities/light/widgets/light_controls.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class LightControlsWidget extends StatefulWidget { diff --git a/lib/entity_class/lock_entity.class.dart b/lib/entities/lock/lock_entity.class.dart similarity index 93% rename from lib/entity_class/lock_entity.class.dart rename to lib/entities/lock/lock_entity.class.dart index 238cce5..96a72f4 100644 --- a/lib/entity_class/lock_entity.class.dart +++ b/lib/entities/lock/lock_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class LockEntity extends Entity { LockEntity(Map rawData, String webHost) : super(rawData, webHost); diff --git a/lib/entity_widgets/state/lock_state.dart b/lib/entities/lock/widgets/lock_state.dart similarity index 98% rename from lib/entity_widgets/state/lock_state.dart rename to lib/entities/lock/widgets/lock_state.dart index ceeac4e..0890b47 100644 --- a/lib/entity_widgets/state/lock_state.dart +++ b/lib/entities/lock/widgets/lock_state.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class LockStateWidget extends StatelessWidget { diff --git a/lib/entity_class/media_player_entity.class.dart b/lib/entities/media_player/media_player_entity.class.dart similarity index 99% rename from lib/entity_class/media_player_entity.class.dart rename to lib/entities/media_player/media_player_entity.class.dart index f144b79..ee02445 100644 --- a/lib/entity_class/media_player_entity.class.dart +++ b/lib/entities/media_player/media_player_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class MediaPlayerEntity extends Entity { diff --git a/lib/entity_widgets/controls/media_player_widgets.dart b/lib/entities/media_player/widgets/media_player_widgets.dart similarity index 99% rename from lib/entity_widgets/controls/media_player_widgets.dart rename to lib/entities/media_player/widgets/media_player_widgets.dart index baf5f48..bd93b4e 100644 --- a/lib/entity_widgets/controls/media_player_widgets.dart +++ b/lib/entities/media_player/widgets/media_player_widgets.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class MediaPlayerWidget extends StatelessWidget { diff --git a/lib/entity_class/select_entity.class.dart b/lib/entities/select/select_entity.class.dart similarity index 92% rename from lib/entity_class/select_entity.class.dart rename to lib/entities/select/select_entity.class.dart index ce0637a..05771d3 100644 --- a/lib/entity_class/select_entity.class.dart +++ b/lib/entities/select/select_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class SelectEntity extends Entity { List get listOptions => attributes["options"] != null diff --git a/lib/entity_widgets/state/select_state.dart b/lib/entities/select/widgets/select_state.dart similarity index 97% rename from lib/entity_widgets/state/select_state.dart rename to lib/entities/select/widgets/select_state.dart index b0f1f4e..aa482f0 100644 --- a/lib/entity_widgets/state/select_state.dart +++ b/lib/entities/select/widgets/select_state.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class SelectStateWidget extends StatefulWidget { diff --git a/lib/entity_class/other_entity.class.dart b/lib/entities/sensor/sensor_entity.class.dart similarity index 67% rename from lib/entity_class/other_entity.class.dart rename to lib/entities/sensor/sensor_entity.class.dart index 9f64996..1991b19 100644 --- a/lib/entity_class/other_entity.class.dart +++ b/lib/entities/sensor/sensor_entity.class.dart @@ -1,8 +1,4 @@ -part of '../main.dart'; - -class SunEntity extends Entity { - SunEntity(Map rawData, String webHost) : super(rawData, webHost); -} +part of '../../main.dart'; class SensorEntity extends Entity { diff --git a/lib/entity_class/slider_entity.dart b/lib/entities/slider/slider_entity.dart similarity index 97% rename from lib/entity_class/slider_entity.dart rename to lib/entities/slider/slider_entity.dart index 233377b..307c7ea 100644 --- a/lib/entity_class/slider_entity.dart +++ b/lib/entities/slider/slider_entity.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class SliderEntity extends Entity { SliderEntity(Map rawData, String webHost) : super(rawData, webHost); diff --git a/lib/entity_widgets/controls/slider_controls.dart b/lib/entities/slider/widgets/slider_controls.dart similarity index 98% rename from lib/entity_widgets/controls/slider_controls.dart rename to lib/entities/slider/widgets/slider_controls.dart index b67743e..226c418 100644 --- a/lib/entity_widgets/controls/slider_controls.dart +++ b/lib/entities/slider/widgets/slider_controls.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class SliderControlsWidget extends StatefulWidget { diff --git a/lib/entities/sun/sun_entity.class.dart b/lib/entities/sun/sun_entity.class.dart new file mode 100644 index 0000000..8b4c1f1 --- /dev/null +++ b/lib/entities/sun/sun_entity.class.dart @@ -0,0 +1,5 @@ +part of '../../main.dart'; + +class SunEntity extends Entity { + SunEntity(Map rawData, String webHost) : super(rawData, webHost); +} \ No newline at end of file diff --git a/lib/entity_class/switch_entity.class.dart b/lib/entities/switch/switch_entity.class.dart similarity index 88% rename from lib/entity_class/switch_entity.class.dart rename to lib/entities/switch/switch_entity.class.dart index 082f7d5..ea24f04 100644 --- a/lib/entity_class/switch_entity.class.dart +++ b/lib/entities/switch/switch_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class SwitchEntity extends Entity { SwitchEntity(Map rawData, String webHost) : super(rawData, webHost); diff --git a/lib/entity_widgets/state/switch_state.dart b/lib/entities/switch/widget/switch_state.dart similarity index 98% rename from lib/entity_widgets/state/switch_state.dart rename to lib/entities/switch/widget/switch_state.dart index 70db6bc..278e85a 100644 --- a/lib/entity_widgets/state/switch_state.dart +++ b/lib/entities/switch/widget/switch_state.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class SwitchStateWidget extends StatefulWidget { diff --git a/lib/entity_class/text_entity.class.dart b/lib/entities/text/text_entity.class.dart similarity index 94% rename from lib/entity_class/text_entity.class.dart rename to lib/entities/text/text_entity.class.dart index c8382a2..82453c2 100644 --- a/lib/entity_class/text_entity.class.dart +++ b/lib/entities/text/text_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class TextEntity extends Entity { TextEntity(Map rawData, String webHost) : super(rawData, webHost); diff --git a/lib/entity_widgets/state/text_input_state.dart b/lib/entities/text/widgets/text_input_state.dart similarity index 98% rename from lib/entity_widgets/state/text_input_state.dart rename to lib/entities/text/widgets/text_input_state.dart index 06beebc..fc16900 100644 --- a/lib/entity_widgets/state/text_input_state.dart +++ b/lib/entities/text/widgets/text_input_state.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class TextInputStateWidget extends StatefulWidget { diff --git a/lib/entity_class/timer_entity.dart b/lib/entities/timer/timer_entity.class.dart similarity index 98% rename from lib/entity_class/timer_entity.dart rename to lib/entities/timer/timer_entity.class.dart index 17f219a..f0e5134 100644 --- a/lib/entity_class/timer_entity.dart +++ b/lib/entities/timer/timer_entity.class.dart @@ -1,4 +1,4 @@ -part of '../main.dart'; +part of '../../main.dart'; class TimerEntity extends Entity { TimerEntity(Map rawData, String webHost) : super(rawData, webHost); diff --git a/lib/entity_widgets/state/timer_state.dart b/lib/entities/timer/widgets/timer_state.dart similarity index 98% rename from lib/entity_widgets/state/timer_state.dart rename to lib/entities/timer/widgets/timer_state.dart index c5ce94e..4ae65ef 100644 --- a/lib/entity_widgets/state/timer_state.dart +++ b/lib/entities/timer/widgets/timer_state.dart @@ -1,4 +1,4 @@ -part of '../../main.dart'; +part of '../../../main.dart'; class TimerState extends StatefulWidget { //final bool expanded; diff --git a/lib/entity_widgets/state/simple_state.dart b/lib/entity_widgets/common/simple_state.dart similarity index 100% rename from lib/entity_widgets/state/simple_state.dart rename to lib/entity_widgets/common/simple_state.dart diff --git a/lib/main.dart b/lib/main.dart index db97a9b..562e0a1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -24,27 +24,28 @@ import 'package:device_info/device_info.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:in_app_purchase/in_app_purchase.dart'; -part 'entity_class/const.dart'; -part 'entity_class/entity.class.dart'; -part 'entity_class/entity_wrapper.class.dart'; -part 'entity_class/timer_entity.dart'; -part 'entity_class/switch_entity.class.dart'; -part 'entity_class/button_entity.class.dart'; -part 'entity_class/text_entity.class.dart'; -part 'entity_class/climate_entity.class.dart'; -part 'entity_class/cover_entity.class.dart'; -part 'entity_class/date_time_entity.class.dart'; -part 'entity_class/light_entity.class.dart'; -part 'entity_class/select_entity.class.dart'; -part 'entity_class/other_entity.class.dart'; -part 'entity_class/slider_entity.dart'; -part 'entity_class/media_player_entity.class.dart'; -part 'entity_class/lock_entity.class.dart'; -part 'entity_class/group_entity.class.dart'; -part 'entity_class/fan_entity.class.dart'; -part 'entity_class/automation_entity.dart'; -part 'entity_class/camera_entity.class.dart'; -part 'entity_class/alarm_control_panel.class.dart'; +part 'const.dart'; +part 'entities/entity.class.dart'; +part 'entities/entity_wrapper.class.dart'; +part 'entities/timer/timer_entity.class.dart'; +part 'entities/switch/switch_entity.class.dart'; +part 'entities/button/button_entity.class.dart'; +part 'entities/text/text_entity.class.dart'; +part 'entities/climate/climate_entity.class.dart'; +part 'entities/cover/cover_entity.class.dart'; +part 'entities/date_time/date_time_entity.class.dart'; +part 'entities/light/light_entity.class.dart'; +part 'entities/select/select_entity.class.dart'; +part 'entities/sun/sun_entity.class.dart'; +part 'entities/sensor/sensor_entity.class.dart'; +part 'entities/slider/slider_entity.dart'; +part 'entities/media_player/media_player_entity.class.dart'; +part 'entities/lock/lock_entity.class.dart'; +part 'entities/group/group_entity.class.dart'; +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'; @@ -69,31 +70,31 @@ 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 'entity_widgets/state/switch_state.dart'; -part 'entity_widgets/controls/slider_controls.dart'; -part 'entity_widgets/state/text_input_state.dart'; -part 'entity_widgets/state/select_state.dart'; -part 'entity_widgets/state/simple_state.dart'; -part 'entity_widgets/state/timer_state.dart'; -part 'entity_widgets/state/climate_state.dart'; -part 'entity_widgets/state/cover_state.dart'; -part 'entity_widgets/state/date_time_state.dart'; -part 'entity_widgets/state/lock_state.dart'; -part 'entity_widgets/controls/climate_controls.dart'; -part 'entity_widgets/controls/cover_controls.dart'; -part 'entity_widgets/controls/light_controls.dart'; -part 'entity_widgets/controls/media_player_widgets.dart'; -part 'entity_widgets/controls/fan_controls.dart'; -part 'entity_widgets/controls/alarm_control_panel_controls.dart'; -part 'settings.page.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/timer/widgets/timer_state.dart'; +part 'entities/climate/widgets/climate_state.widget.dart'; +part 'entities/cover/widgets/cover_state.dart'; +part 'entities/date_time/widgets/date_time_state.dart'; +part 'entities/lock/widgets/lock_state.dart'; +part 'entities/climate/widgets/climate_controls.dart'; +part 'entities/cover/widgets/cover_controls.widget.dart'; +part 'entities/light/widgets/light_controls.dart'; +part 'entities/media_player/widgets/media_player_widgets.dart'; +part 'entities/fan/widgets/fan_controls.dart'; +part 'entities/alarm_control_panel/widgets/alarm_control_panel_controls.widget.dart'; +part 'pages/settings.page.dart'; part 'pages/purchase.page.dart'; part 'pages/widgets/product_purchase.widget.dart'; part 'pages/widgets/page_loading_indicator.dart'; part 'pages/widgets/page_loading_error.dart'; -part 'panel.page.dart'; +part 'pages/panel.page.dart'; part 'home_assistant.class.dart'; -part 'log.page.dart'; -part 'entity.page.dart'; +part 'pages/log.page.dart'; +part 'pages/entity.page.dart'; part 'utils.class.dart'; part 'mdi.class.dart'; part 'entity_collection.class.dart'; diff --git a/lib/entity.page.dart b/lib/pages/entity.page.dart similarity index 98% rename from lib/entity.page.dart rename to lib/pages/entity.page.dart index 2b19124..7379ee4 100644 --- a/lib/entity.page.dart +++ b/lib/pages/entity.page.dart @@ -1,4 +1,4 @@ -part of 'main.dart'; +part of '../main.dart'; class EntityViewPage extends StatefulWidget { EntityViewPage({Key key, @required this.entityId, @required this.homeAssistant }) : super(key: key); diff --git a/lib/log.page.dart b/lib/pages/log.page.dart similarity index 97% rename from lib/log.page.dart rename to lib/pages/log.page.dart index 2d58c24..072ef6e 100644 --- a/lib/log.page.dart +++ b/lib/pages/log.page.dart @@ -1,4 +1,4 @@ -part of 'main.dart'; +part of '../main.dart'; class LogViewPage extends StatefulWidget { LogViewPage({Key key, this.title}) : super(key: key); diff --git a/lib/panel.page.dart b/lib/pages/panel.page.dart similarity index 96% rename from lib/panel.page.dart rename to lib/pages/panel.page.dart index 87388d1..a03bcc0 100644 --- a/lib/panel.page.dart +++ b/lib/pages/panel.page.dart @@ -1,4 +1,4 @@ -part of 'main.dart'; +part of '../main.dart'; class PanelPage extends StatefulWidget { PanelPage({Key key, this.title, this.panel}) : super(key: key); diff --git a/lib/settings.page.dart b/lib/pages/settings.page.dart similarity index 99% rename from lib/settings.page.dart rename to lib/pages/settings.page.dart index ca35707..300c5be 100644 --- a/lib/settings.page.dart +++ b/lib/pages/settings.page.dart @@ -1,4 +1,4 @@ -part of 'main.dart'; +part of '../main.dart'; class ConnectionSettingsPage extends StatefulWidget { ConnectionSettingsPage({Key key, this.title}) : super(key: key);