yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dead code

Browse Source
This commit is contained in:
estevez-dev 2019-09-01 00:12:16 +03:00
parent 1ecb839042
commit abdc0fc1c8
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/main.dart
View File

@ -150,7 +150,6 @@ void main() async {
class HAClientApp extends StatelessWidget { class HAClientApp extends StatelessWidget {
final HomeAssistant homeAssistant = HomeAssistant();
// This widget is the root of your application. // This widget is the root of your application.
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -161,9 +160,8 @@ class HAClientApp extends StatelessWidget {
), ),
initialRoute: "/", initialRoute: "/",
routes: { routes: {
"/": (context) => MainPage(title: 'HA Client', homeAssistant: homeAssistant,), "/": (context) => MainPage(title: 'HA Client'),
"/connection-settings": (context) => ConnectionSettingsPage(title: "Settings"), "/connection-settings": (context) => ConnectionSettingsPage(title: "Settings"),
"/configuration": (context) => PanelPage(title: "Configuration"),
"/putchase": (context) => PurchasePage(title: "Support app development"), "/putchase": (context) => PurchasePage(title: "Support app development"),
"/log-view": (context) => LogViewPage(title: "Log"), "/log-view": (context) => LogViewPage(title: "Log"),
"/login": (context) => WebviewScaffold( "/login": (context) => WebviewScaffold(
@ -191,10 +189,9 @@ class HAClientApp extends StatelessWidget {
} }
class MainPage extends StatefulWidget { class MainPage extends StatefulWidget {
MainPage({Key key, this.title, this.homeAssistant}) : super(key: key); MainPage({Key key, this.title}) : super(key: key);
final String title; final String title;
final HomeAssistant homeAssistant;
@override @override
_MainPageState createState() => new _MainPageState(); _MainPageState createState() => new _MainPageState();
@ -312,9 +309,9 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
} }
_fetchData() async { _fetchData() async {
await widget.homeAssistant.fetchData().then((_) { await HomeAssistant().fetchData().then((_) {
_hideBottomBar(); _hideBottomBar();
int currentViewCount = widget.homeAssistant.ui?.views?.length ?? 0; int currentViewCount = HomeAssistant().ui?.views?.length ?? 0;
if (_previousViewCount != currentViewCount) { if (_previousViewCount != currentViewCount) {
Logger.d("Views count changed ($_previousViewCount->$currentViewCount). Creating new tabs controller."); Logger.d("Views count changed ($_previousViewCount->$currentViewCount). Creating new tabs controller.");
_viewsTabController = TabController(vsync: this, length: currentViewCount); _viewsTabController = TabController(vsync: this, length: currentViewCount);
@ -505,7 +502,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => EntityViewPage(entityId: entityId, homeAssistant: widget.homeAssistant), builder: (context) => EntityViewPage(entityId: entityId),
) )
); );
} }
@ -520,8 +517,8 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
List<Tab> buildUIViewTabs() { List<Tab> buildUIViewTabs() {
List<Tab> result = []; List<Tab> result = [];
if (widget.homeAssistant.ui.views.isNotEmpty) { if (HomeAssistant().ui.views.isNotEmpty) {
widget.homeAssistant.ui.views.forEach((HAView view) { HomeAssistant().ui.views.forEach((HAView view) {
result.add(view.buildTab()); result.add(view.buildTab());
}); });
} }
@ -533,7 +530,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
List<Widget> menuItems = []; List<Widget> menuItems = [];
menuItems.add( menuItems.add(
UserAccountsDrawerHeader( UserAccountsDrawerHeader(
accountName: Text(widget.homeAssistant.userName), accountName: Text(HomeAssistant().userName),
accountEmail: Text(ConnectionManager().displayHostname ?? "Not configured"), accountEmail: Text(ConnectionManager().displayHostname ?? "Not configured"),
/*onDetailsPressed: () { /*onDetailsPressed: () {
setState(() { setState(() {
@ -542,7 +539,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
},*/ },*/
currentAccountPicture: CircleAvatar( currentAccountPicture: CircleAvatar(
child: Text( child: Text(
widget.homeAssistant.userAvatarText, HomeAssistant().userAvatarText,
style: TextStyle( style: TextStyle(
fontSize: 32.0 fontSize: 32.0
), ),
@ -550,8 +547,8 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
), ),
) )
); );
if (widget.homeAssistant.panels.isNotEmpty) { if (HomeAssistant().panels.isNotEmpty) {
widget.homeAssistant.panels.forEach((Panel panel) { HomeAssistant().panels.forEach((Panel panel) {
if (!panel.isHidden) { if (!panel.isHidden) {
menuItems.add( menuItems.add(
new ListTile( new ListTile(
@ -581,7 +578,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
title: Text("Connection settings"), title: Text("Connection settings"),
onTap: () { onTap: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
Navigator.of(context).pushNamed('/connection-settings', arguments: {"homeAssistant", widget.homeAssistant}); Navigator.of(context).pushNamed('/connection-settings');
}, },
) )
]); ]);
@ -820,7 +817,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
floating: true, floating: true,
pinned: true, pinned: true,
primary: true, primary: true,
title: Text(widget.homeAssistant.locationName ?? ""), title: Text(HomeAssistant().locationName ?? ""),
actions: <Widget>[ actions: <Widget>[
IconButton( IconButton(
icon: Icon(MaterialDesignIcons.getIconDataFromIconName( icon: Icon(MaterialDesignIcons.getIconDataFromIconName(
@ -834,7 +831,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
if (val == "reload") { if (val == "reload") {
_quickLoad(); _quickLoad();
} else if (val == "logout") { } else if (val == "logout") {
widget.homeAssistant.logout().then((_) { HomeAssistant().logout().then((_) {
_quickLoad(); _quickLoad();
}); });
} }
@ -865,7 +862,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
), ),
) )
: :
widget.homeAssistant.buildViews(context, _viewsTabController), HomeAssistant().buildViews(context, _viewsTabController),
); );
} }
@ -922,7 +919,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
} }
} }
// This method is rerun every time setState is called. // This method is rerun every time setState is called.
if (widget.homeAssistant.isNoViews) { if (HomeAssistant().isNoViews) {
return Scaffold( return Scaffold(
key: _scaffoldKey, key: _scaffoldKey,
primary: false, primary: false,

8
lib/pages/entity.page.dart
View File

@ -1,11 +1,9 @@
part of '../main.dart'; part of '../main.dart';
class EntityViewPage extends StatefulWidget { class EntityViewPage extends StatefulWidget {
EntityViewPage({Key key, @required this.entityId, @required this.homeAssistant }) : super(key: key); EntityViewPage({Key key, @required this.entityId}) : super(key: key);
final String entityId; final String entityId;
//TODO remove it!
final HomeAssistant homeAssistant;
@override @override
_EntityViewPageState createState() => new _EntityViewPageState(); _EntityViewPageState createState() => new _EntityViewPageState();
@ -32,7 +30,7 @@ class _EntityViewPageState extends State<EntityViewPage> {
} }
void _prepareData() async { void _prepareData() async {
_title = widget.homeAssistant.entities.get(widget.entityId).displayName; _title = HomeAssistant().entities.get(widget.entityId).displayName;
} }
@ -47,7 +45,7 @@ class _EntityViewPageState extends State<EntityViewPage> {
// the App.build method, and use it to set our appbar title. // the App.build method, and use it to set our appbar title.
title: new Text(_title), title: new Text(_title),
), ),
body: widget.homeAssistant.entities.get(widget.entityId).buildEntityPageWidget(context), body: HomeAssistant().entities.get(widget.entityId).buildEntityPageWidget(context),
); );
} }