Project structure change in progress

lib/const.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of 'main.dart';
 
 class EntityState {
   static const on = 'on';

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);

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 {
 

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);

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);

lib/entities/camera/camera_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class CameraEntity extends Entity {
 

lib/entities/climate/climate_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class ClimateEntity extends Entity {
 

lib/entities/climate/widgets/climate_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class ClimateControlWidget extends StatefulWidget {
 

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

lib/entities/cover/cover_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class CoverEntity extends Entity {
 

lib/entities/cover/widgets/cover_controls.widget.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class CoverControlWidget extends StatefulWidget {
 

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) {

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);

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

lib/entities/fan/fan_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class FanEntity extends Entity {
 

lib/entities/fan/widgets/fan_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class FanControlsWidget extends StatefulWidget {
 

lib/entities/group/group_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class GroupEntity extends Entity {
 

lib/entities/light/light_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class LightEntity extends Entity {
 

lib/entities/light/widgets/light_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class LightControlsWidget extends StatefulWidget {
 

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);

lib/entities/lock/widgets/lock_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class LockStateWidget extends StatelessWidget {
 

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 {
 

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 {
   

lib/entities/select/select_entity.class.dart

@@ -1,4 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
 
 class SelectEntity extends Entity {
   List<String> get listOptions => attributes["options"] != null

lib/entities/select/widgets/select_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class SelectStateWidget extends StatefulWidget {
 

lib/entities/sensor/sensor_entity.class.dart

@@ -1,8 +1,4 @@
-part of '../main.dart';
+part of '../../main.dart';
-
-class SunEntity extends Entity {
-  SunEntity(Map rawData, String webHost) : super(rawData, webHost);
-}
 
 class SensorEntity extends Entity {
 

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);

lib/entities/slider/widgets/slider_controls.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class SliderControlsWidget extends StatefulWidget {
 

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);
+}

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);

lib/entities/switch/widget/switch_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class SwitchStateWidget extends StatefulWidget {
 

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);

lib/entities/text/widgets/text_input_state.dart

@@ -1,4 +1,4 @@
-part of '../../main.dart';
+part of '../../../main.dart';
 
 class TextInputStateWidget extends StatefulWidget {
 

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);

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;

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 'const.dart';
-part 'entity_class/entity.class.dart';
+part 'entities/entity.class.dart';
-part 'entity_class/entity_wrapper.class.dart';
+part 'entities/entity_wrapper.class.dart';
-part 'entity_class/timer_entity.dart';
+part 'entities/timer/timer_entity.class.dart';
-part 'entity_class/switch_entity.class.dart';
+part 'entities/switch/switch_entity.class.dart';
-part 'entity_class/button_entity.class.dart';
+part 'entities/button/button_entity.class.dart';
-part 'entity_class/text_entity.class.dart';
+part 'entities/text/text_entity.class.dart';
-part 'entity_class/climate_entity.class.dart';
+part 'entities/climate/climate_entity.class.dart';
-part 'entity_class/cover_entity.class.dart';
+part 'entities/cover/cover_entity.class.dart';
-part 'entity_class/date_time_entity.class.dart';
+part 'entities/date_time/date_time_entity.class.dart';
-part 'entity_class/light_entity.class.dart';
+part 'entities/light/light_entity.class.dart';
-part 'entity_class/select_entity.class.dart';
+part 'entities/select/select_entity.class.dart';
-part 'entity_class/other_entity.class.dart';
+part 'entities/sun/sun_entity.class.dart';
-part 'entity_class/slider_entity.dart';
+part 'entities/sensor/sensor_entity.class.dart';
-part 'entity_class/media_player_entity.class.dart';
+part 'entities/slider/slider_entity.dart';
-part 'entity_class/lock_entity.class.dart';
+part 'entities/media_player/media_player_entity.class.dart';
-part 'entity_class/group_entity.class.dart';
+part 'entities/lock/lock_entity.class.dart';
-part 'entity_class/fan_entity.class.dart';
+part 'entities/group/group_entity.class.dart';
-part 'entity_class/automation_entity.dart';
+part 'entities/fan/fan_entity.class.dart';
-part 'entity_class/camera_entity.class.dart';
+part 'entities/automation/automation_entity.class.dart';
-part 'entity_class/alarm_control_panel.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 'entities/switch/widget/switch_state.dart';
-part 'entity_widgets/controls/slider_controls.dart';
+part 'entities/slider/widgets/slider_controls.dart';
-part 'entity_widgets/state/text_input_state.dart';
+part 'entities/text/widgets/text_input_state.dart';
-part 'entity_widgets/state/select_state.dart';
+part 'entities/select/widgets/select_state.dart';
-part 'entity_widgets/state/simple_state.dart';
+part 'entity_widgets/common/simple_state.dart';
-part 'entity_widgets/state/timer_state.dart';
+part 'entities/timer/widgets/timer_state.dart';
-part 'entity_widgets/state/climate_state.dart';
+part 'entities/climate/widgets/climate_state.widget.dart';
-part 'entity_widgets/state/cover_state.dart';
+part 'entities/cover/widgets/cover_state.dart';
-part 'entity_widgets/state/date_time_state.dart';
+part 'entities/date_time/widgets/date_time_state.dart';
-part 'entity_widgets/state/lock_state.dart';
+part 'entities/lock/widgets/lock_state.dart';
-part 'entity_widgets/controls/climate_controls.dart';
+part 'entities/climate/widgets/climate_controls.dart';
-part 'entity_widgets/controls/cover_controls.dart';
+part 'entities/cover/widgets/cover_controls.widget.dart';
-part 'entity_widgets/controls/light_controls.dart';
+part 'entities/light/widgets/light_controls.dart';
-part 'entity_widgets/controls/media_player_widgets.dart';
+part 'entities/media_player/widgets/media_player_widgets.dart';
-part 'entity_widgets/controls/fan_controls.dart';
+part 'entities/fan/widgets/fan_controls.dart';
-part 'entity_widgets/controls/alarm_control_panel_controls.dart';
+part 'entities/alarm_control_panel/widgets/alarm_control_panel_controls.widget.dart';
-part 'settings.page.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 'pages/log.page.dart';
-part 'entity.page.dart';
+part 'pages/entity.page.dart';
 part 'utils.class.dart';
 part 'mdi.class.dart';
 part 'entity_collection.class.dart';

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);

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);

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);

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);